Merge pull request #90 from ratepay/M2-110-Wrong-sandbox-mode

M2-110 - Use sandbox mode that is saved in the db for after-order pro…

Author: FatchipRobert

Model/Api/SendConfirmationDeliver.php

@@ -167,11 +167,17 @@ public function sendRatepayDeliverCall($order, $paymentMethod, $inv = null)
         $sProfileId = null;
         $sSecurityCode = null;
         $blSandbox = null;
+        if (is_numeric($order->getRatepaySandboxUsed())) {
+            $blSandbox = (bool)$order->getRatepaySandboxUsed();
+        }
         if ($order->getRatepayProfileId()) {
             $sProfileId = $order->getRatepayProfileId();
             $sSecurityCode = $this->profileConfigHelper->getSecurityCodeForProfileId($sProfileId, $paymentMethod);
+        }
+        if ($blSandbox === null) {
             $blSandbox = $this->profileConfigHelper->getSandboxModeForProfileId($sProfileId, $paymentMethod);
         }
+
         $inv->setShippingDescription($order->getShippingDescription());
 
         $head = $this->rpLibraryModel->getRequestHead($order, 'CONFIRMATION_DELIVER', null, null, $sProfileId, $sSecurityCode, $this->getTrackingInfo($order));

Model/Handler/Cancel.php

@@ -75,9 +75,14 @@ public function sendRatepayCancelCall($order, $methodInstance)
         $sProfileId = null;
         $sSecurityCode = null;
         $blSandbox = null;
+        if (is_numeric($order->getRatepaySandboxUsed())) {
+            $blSandbox = (bool)$order->getRatepaySandboxUsed();
+        }
         if ($order->getRatepayProfileId()) {
             $sProfileId = $order->getRatepayProfileId();
             $sSecurityCode = $this->profileConfigHelper->getSecurityCodeForProfileId($sProfileId, $methodInstance->getCode());
+        }
+        if ($blSandbox === null) {
             $blSandbox = $this->profileConfigHelper->getSandboxModeForProfileId($sProfileId, $methodInstance->getCode());
         }
 

Model/Handler/Refund.php

@@ -191,9 +191,14 @@ public function callRatepayReturn($order, $creditMemo, $methodInstance)
             $sProfileId = null;
             $sSecurityCode = null;
             $blSandbox = null;
+            if (is_numeric($order->getRatepaySandboxUsed())) {
+                $blSandbox = (bool)$order->getRatepaySandboxUsed();
+            }
             if ($order->getRatepayProfileId()) {
                 $sProfileId = $order->getRatepayProfileId();
                 $sSecurityCode = $this->profileConfigHelper->getSecurityCodeForProfileId($sProfileId, $methodInstance->getCode());
+            }
+            if ($blSandbox === null) {
                 $blSandbox = $this->profileConfigHelper->getSandboxModeForProfileId($sProfileId, $methodInstance->getCode());
             }
 
@@ -231,9 +236,14 @@ public function callRatepayCredit($order, $creditMemo, $methodInstance)
         $sProfileId = null;
         $sSecurityCode = null;
         $blSandbox = null;
+        if (is_numeric($order->getRatepaySandboxUsed())) {
+            $blSandbox = (bool)$order->getRatepaySandboxUsed();
+        }
         if ($order->getRatepayProfileId()) {
             $sProfileId = $order->getRatepayProfileId();
             $sSecurityCode = $this->profileConfigHelper->getSecurityCodeForProfileId($sProfileId, $methodInstance->getCode());
+        }
+        if ($blSandbox === null) {
             $blSandbox = $this->profileConfigHelper->getSandboxModeForProfileId($sProfileId, $methodInstance->getCode());
         }