Merge remote-tracking branch 'origin/master' into 4.2

# Conflicts: # Helper/PurchaseHelper.php # Observer/PreAuth.php # composer.json # etc/module.xml
signifyd · Jul 6, 2021 · 28c7d83 · 28c7d83
2 parents e5bd3a4 + 779bd3c
commit 28c7d83
Showing 1 changed file with 24 additions and 2 deletions.
diff --git a/Helper/PurchaseHelper.php b/Helper/PurchaseHelper.php
@@ -756,7 +756,18 @@ public function makeShipments(Order $order)
 
     public function makeShipper($shippingMethod)
     {
-        $shippingCarrier = $shippingMethod->getCarrierCode();
+        if (is_string($shippingMethod)) {
+            $shippingMethodArray = explode('_', $shippingMethod);
+
+            if (count($shippingMethodArray) < 2) {
+                return false;
+            }
+
+            $shippingCarrier = $shippingMethodArray[0];
+        } else {
+            $shippingCarrier = $shippingMethod->getCarrierCode();
+        }
+
         $allowMethodsJson = $this->scopeConfigInterface->getValue('signifyd/general/shipper_config');
         $allowMethods = $this->jsonSerializer->unserialize($allowMethodsJson);
 
@@ -771,7 +782,18 @@ public function makeShipper($shippingMethod)
 
     public function makeshippingMethod($shippingMethod)
     {
-        $shippingMethodCode = $shippingMethod->getMethod();
+        if (is_string($shippingMethod)) {
+            $shippingMethodArray = explode('_', $shippingMethod);
+
+            if (count($shippingMethodArray) < 2) {
+                return false;
+            }
+
+            $shippingMethodCode = $shippingMethodArray[1];
+        } else {
+            $shippingMethodCode = $shippingMethod->getMethod();
+        }
+
         $allowMethodsJson = $this->scopeConfigInterface->getValue('signifyd/general/shipping_method_config');
         $allowMethods = $this->jsonSerializer->unserialize($allowMethodsJson);