Merge branch 'task/sw53x/RATEPLUG-14_delete_order' into 5.3.15-dev

* task/sw53x/RATEPLUG-14_delete_order: RATEPLUG-14: delete order: add ordernumber to request on cancellation
ratepay · Oct 13, 2020 · c357da8 · c357da8
2 parents 0dfc9f3 + 66d5865
commit c357da8
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/Component/Mapper/ModelFactory.php b/Component/Mapper/ModelFactory.php
@@ -152,10 +152,11 @@ public function callPaymentConfirm($countryCode = false)
      * get request head
      *
      * @param bool $countryCode
+     * @param null $orderId
      * @return \RatePAY\ModelBuilder
      * @throws Exception
      */
-    private function getHead($countryCode = null)
+    private function getHead($countryCode = null, $orderId = null)
     {
         $systemId = $this->getSystemId();
         $bootstrap = new \Shopware_Plugins_Frontend_RpayRatePay_Bootstrap('ratepay_config');
@@ -180,9 +181,9 @@ private function getHead($countryCode = null)
             ]
         ];
 
-        $orderId = $this->_orderId;
+        $orderId = $orderId ? : $this->_orderId;
         if (!empty($orderId)) {
-            $head['External']['OrderId'] = $this->_orderId;
+            $head['External']['OrderId'] = $orderId;
         }
 
         //side effect
@@ -632,7 +633,7 @@ public function callPaymentChange($operationData)
             $this->setZPercent();
         }
 
-        $mbHead = $this->getHead($countryCode);
+        $mbHead = $this->getHead($countryCode, $order->getNumber());
 
         $shoppingItems = $this->createBasketArray($order->getCurrency(), $operationData['items'], $operationData['subtype'], $operationData['orderId']);
         $shoppingBasket = [