diff --git a/CHANGELOG.md b/CHANGELOG.md index d9690d5..8856916 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ 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 + +--- + ## 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 e4a8e6b..8049641 100644 Binary files a/README.md and b/README.md differ diff --git a/composer.json b/composer.json index ecc56fc..1938dea 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": { @@ -33,7 +33,7 @@ } }, "require": { - "oxid-esales/oxideshop-ce": "6.5 - 6.5" + "oxid-esales/oxideshop-ce": "6.5 - 6.8" }, "autoload": { "psr-4": { diff --git a/src/Modules/Application/Model/d3_dev_oxorder.php b/src/Modules/Application/Model/d3_dev_oxorder.php index 20eabf5..bf00dc5 100644 --- a/src/Modules/Application/Model/d3_dev_oxorder.php +++ b/src/Modules/Application/Model/d3_dev_oxorder.php @@ -58,12 +58,16 @@ 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 ".$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); } diff --git a/src/metadata.php b/src/metadata.php index 7f9791d..a9af422 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,19 +56,19 @@ $aModule = array(

Sicherheitshinweis