From da08b322f43a86f37dafa84e4967d6c953d01fab Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Thu, 12 Nov 2020 09:09:56 +0100 Subject: [PATCH 1/8] change license --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ecc56fc..92859bc 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ ], "homepage": "https://www.oxidmodule.com/", "license": [ - "proprietary" + "GPL-3.0-or-later" ], "extra": { "oxideshop": { From 1379b76f2dcefbdf03a6ecaea017d9eb7f188fa4 Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Tue, 24 Nov 2020 20:47:59 +0100 Subject: [PATCH 2/8] make installable in OXID 6.2.3 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 92859bc..73b0dbb 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ } }, "require": { - "oxid-esales/oxideshop-ce": "6.5 - 6.5" + "oxid-esales/oxideshop-ce": "6.5 - 6.6" }, "autoload": { "psr-4": { From 622b2c7e57db1a4d61fb4627856b8e7b29a0f8b7 Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Tue, 24 Nov 2020 23:05:30 +0100 Subject: [PATCH 3/8] exclude orders from foreign shops and unset user ids --- src/Modules/Application/Model/d3_dev_oxorder.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Modules/Application/Model/d3_dev_oxorder.php b/src/Modules/Application/Model/d3_dev_oxorder.php index 20eabf5..8338832 100644 --- a/src/Modules/Application/Model/d3_dev_oxorder.php +++ b/src/Modules/Application/Model/d3_dev_oxorder.php @@ -63,7 +63,10 @@ class d3_dev_oxorder extends d3_dev_oxorder_parent } $parameters = [$orderNr]; - $sSelect = "SELECT oxid FROM ".oxNew(Order::class)->getViewName()." WHERE ".$sWhere." ORDER BY oxorderdate DESC LIMIT 1"; + $sSelect = "SELECT oxid FROM ".oxNew(Order::class)->getViewName()." WHERE ". + "oxuserid != '' AND ". + "oxshopid = ".Registry::getConfig()->getShopId()." AND ". + $sWhere." ORDER BY oxorderdate DESC LIMIT 1"; return DatabaseProvider::getDb(DatabaseProvider::FETCH_MODE_ASSOC)->getOne($sSelect, $parameters); } From 09fa1bce3189bc5be643871b30a0d4bb4ffc03cf Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Wed, 28 Apr 2021 15:58:16 +0200 Subject: [PATCH 4/8] make installable in OXID 6.3 --- CHANGELOG.md | 6 ++++++ README.md | Bin 6048 -> 6064 bytes composer.json | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9690d5..c9547a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. --- +## 3.0.0.1 (2021-04-28) +### Changed +- Modul verwendbar in OXID 6.3 + +--- + ## 3.0.0.0 (2020-11-11) ### Changed - Modul verwendbar in OXID 6.2, deprecated Code bestmöglich entfernt diff --git a/README.md b/README.md index e4a8e6b105e2283a9a9977524aa9c58d5d970dd8..c873467c218eeda147845f29945a3da3f0c57b54 100644 GIT binary patch delta 26 hcmZ3Wzd?UO3%>$G5<@0KF@pkw8G{~!@y2FZaR6Zt22TJ0 delta 10 Rcmdm>zd(ON%f=}(;s6<)1Umo# diff --git a/composer.json b/composer.json index 73b0dbb..1938dea 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ } }, "require": { - "oxid-esales/oxideshop-ce": "6.5 - 6.6" + "oxid-esales/oxideshop-ce": "6.5 - 6.8" }, "autoload": { "psr-4": { From 564ddd891dae003b0bed5ca9568c18d3ae5ffe49 Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Wed, 28 Apr 2021 16:14:29 +0200 Subject: [PATCH 5/8] prevent getting faulty config instance in composer installation --- src/metadata.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/metadata.php b/src/metadata.php index 7f9791d..ed3595b 100644 --- a/src/metadata.php +++ b/src/metadata.php @@ -30,6 +30,9 @@ use OxidEsales\Eshop\Core\Registry; $sMetadataVersion = '2.1'; $sLogo = '(D3) '; +$shopUrl = function_exists('oxNew') ? Registry::getConfig()->getCurrentShopUrl(false) : '../'; + + /** * Module information */ @@ -53,13 +56,13 @@ $aModule = array(

Sicherheitshinweis

  • unterbindet Löschen des Warenkorbs nach Bestellabschluss
    • '. - '
  • Thankyou-Seite ist ohne Bestellung aufrufbar*
    • '. + '
  • Thankyou-Seite ist ohne Bestellung aufrufbar*
    • '. '
  • Mail-Templates können im Browser ausgegeben werden'. '
    Jede dieser Optionen muss aus Sicherheitsgründen unter "Einstell." aktiviert werden. Weiterhin darf der Shop nicht im Produktivmodus betrieben werden.

    '. From 3d52203d943c8e0fbee2b65cc4003e6b58b3a1c0 Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Wed, 28 Apr 2021 22:41:03 +0200 Subject: [PATCH 6/8] fix prepared statement combination --- src/Modules/Application/Model/d3_dev_oxorder.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Modules/Application/Model/d3_dev_oxorder.php b/src/Modules/Application/Model/d3_dev_oxorder.php index 8338832..bf00dc5 100644 --- a/src/Modules/Application/Model/d3_dev_oxorder.php +++ b/src/Modules/Application/Model/d3_dev_oxorder.php @@ -58,10 +58,11 @@ class d3_dev_oxorder extends d3_dev_oxorder_parent { $orderNr = (int) Registry::getRequest()->getRequestEscapedParameter('d3ordernr'); $sWhere = 1; + $parameters = []; if ($orderNr) { $sWhere = ' oxordernr = ? '; + $parameters[] = $orderNr; } - $parameters = [$orderNr]; $sSelect = "SELECT oxid FROM ".oxNew(Order::class)->getViewName()." WHERE ". "oxuserid != '' AND ". From ea982a89d0d29bb3d5a8d794f119ae0fdf80dd5d Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Wed, 28 Apr 2021 22:43:55 +0200 Subject: [PATCH 7/8] adjust version informations --- CHANGELOG.md | 2 ++ src/metadata.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9547a4..8856916 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ All notable changes to this project will be documented in this file. ## 3.0.0.1 (2021-04-28) ### Changed - Modul verwendbar in OXID 6.3 +### Fixed +- falsche prepared statement Kombination korrigiert --- diff --git a/src/metadata.php b/src/metadata.php index ed3595b..a9af422 100644 --- a/src/metadata.php +++ b/src/metadata.php @@ -68,7 +68,7 @@ $aModule = array( '

Jede dieser Optionen muss aus Sicherheitsgründen unter "Einstell." aktiviert werden. Weiterhin darf der Shop nicht im Produktivmodus betrieben werden.

'. '* Ordernummer an URL ergänzen, wenn bestimmte Bestellungen angezeigt werden sollen', 'en' => ''], - 'version' => '3.0.0.0', + 'version' => '3.0.0.1', 'author' => 'D³ Data Development (Inh.: Thomas Dartsch)', 'email' => 'support@shopmodule.com', 'url' => 'http://www.oxidmodule.com/', From 67a046476f78e2dbc7e603ba3468e66139f15272 Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Wed, 28 Apr 2021 22:50:58 +0200 Subject: [PATCH 8/8] fix readme file encoding --- README.md | Bin 6064 -> 3066 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/README.md b/README.md index c873467c218eeda147845f29945a3da3f0c57b54..8049641ccd4c17fff648e4fad377e2f6c43e7d6b 100644 GIT binary patch literal 3066 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 KeeQvc#Ofb6hC@F9