Fixes jsonToArray() check

Fixes EshopCommunity namespace issue
OXID-eSales · Jan 17, 2025 · e2f10b5 · e2f10b5
1 parent cf39db1
commit e2f10b5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/Controller/Admin/OrderArticle.php b/src/Controller/Admin/OrderArticle.php
@@ -9,7 +9,6 @@
 
 use OxidEsales\Eshop\Core\Exception\DatabaseConnectionException;
 use OxidEsales\Eshop\Core\Exception\DatabaseErrorException;
-use OxidEsales\EshopCommunity\Core\Request;
 use OxidSolutionCatalysts\AmazonPay\Core\Config;
 use OxidSolutionCatalysts\AmazonPay\Core\Constants;
 use OxidSolutionCatalysts\AmazonPay\Core\Logger;
@@ -40,10 +39,9 @@ private function refundAmazon()
         if (!$config->automatedRefundActivated()) {
             return;
         }
-        $request = new Request();
         // get article id
         /** @var string $sOrderArtId */
-        $sOrderArtId = $request->getRequestParameter('sArtID') ?: '';
+        $sOrderArtId = Registry::getRequest()->getRequestParameter('sArtID') ?: '';
         $sOrderId = $this->getEditObjectId() ?: '';
 
         $oOrderArticle = oxNew(\OxidEsales\Eshop\Application\Model\OrderArticle::class);

diff --git a/src/Model/Order.php b/src/Model/Order.php
@@ -156,7 +156,11 @@ public function updateAmazonPayOrderStatus(string $amazonPayStatus, array $data
             case "AMZ_AUTH_AND_CAPT_FAILED":
                 $remark = 'AmazonPay: ERROR';
                 if (!empty($data['result']['response'])) {
-                    $response = PhpHelper::jsonToArray($data['result']['response']);
+                    if (is_string($data['result']['response'])) {
+                        $response = PhpHelper::jsonToArray($data['result']['response']);
+                    } else {
+                        $response = $data['result']['response'];
+                    }
                     $remark .= ' (' . $response['reasonCode'] . ')';
                 }
 
@@ -191,7 +195,11 @@ public function updateAmazonPayOrderStatus(string $amazonPayStatus, array $data
             case "AMZ_AUTH_OR_CAPT_DECLINED":
                 $remark = 'AmazonPay: Auth or Capture Declined';
                 if (!empty($data['result']['response'])) {
-                    $response = PhpHelper::jsonToArray($data['result']['response']);
+                    if (is_string($data['result']['response'])){
+                        $response = PhpHelper::jsonToArray($data['result']['response']);
+                    } else {
+                        $response = $data['result']['response'];
+                    }
                     $remark .= ' (' . $response['reasonCode'] . ')';
                 }
                 $this->setFieldData('oxtransstatus', 'NOT_FINISHED');