Merge pull request #192 from WGenie/feature/getcarriercode-on-null

Fatal error: Uncaught Error: Call to a member function getCarrierCode…
yireo · Sep 27, 2023 · b63898c · b63898c
2 parents 3c5123a + baf9e30
commit b63898c
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/DataLayer/Event/AddShippingInfo.php b/DataLayer/Event/AddShippingInfo.php
@@ -40,8 +40,7 @@ public function get(): array
 
         if (!$shippingMethod) {
             $quoteId = $this->checkoutSession->getQuote()->getId();
-            $shippingMethod = $this->shippingMethodManagement->get($quoteId);
-            $shippingMethod = $shippingMethod->getCarrierCode().'_'.$shippingMethod->getMethodCode();
+            $shippingMethod = $this->getShippingMethodFromQuote((int)$quoteId);
         }
 
         if (!$shippingMethod) {
@@ -56,4 +55,22 @@ public function get(): array
             ],
         ];
     }
+
+    /**
+     * Cart2Quote compatibility. When creating a quote there is no shipping info.
+     * shippingMethodManagement returns null and causes error on function getCarrierCode()
+     *
+     * @param int $quoteId
+     * @return string|null
+     */
+    public function getShippingMethodFromQuote(int $quoteId): ?string
+    {
+        $shippingMethod = $this->shippingMethodManagement->get($quoteId);
+        if(!is_null($shippingMethod)) {
+
+            return $shippingMethod->getCarrierCode().'_'.$shippingMethod->getMethodCode();
+        }
+
+        return null;
+    }
 }