PS-9877: Adjusted shipment sanitizing

spryker · Apr 9, 2020 · 2419e5a · 2419e5a
1 parent ceb5795
commit 2419e5a
Showing 1 changed file with 19 additions and 0 deletions.
diff --git a/src/Spryker/Zed/ShipmentCartConnector/Business/Sanitizer/ShipmentSanitizer.php b/src/Spryker/Zed/ShipmentCartConnector/Business/Sanitizer/ShipmentSanitizer.php
@@ -41,6 +41,7 @@ public function clearShipmentMethod(CartChangeTransfer $cartChangeTransfer): Car
             return $cartChangeTransfer;
         }
 
+        $cartChangeTransfer = $this->clearQuoteLevelShipmentForEmptyQuote($cartChangeTransfer);
         $cartChangeTransfer = $this->clearQuoteLevelShipmentMethod($cartChangeTransfer);
         $cartChangeTransfer = $this->clearItemsShipmentMethod($cartChangeTransfer);
         $cartChangeTransfer = $this->clearShipmentExpenses($cartChangeTransfer);
@@ -85,6 +86,24 @@ protected function clearShipmentExpenses(CartChangeTransfer $cartChangeTransfer)
         return $cartChangeTransfer;
     }
 
+    /**
+     * @deprecated Exists for Backward Compatibility reasons only.
+     *
+     * @param \Generated\Shared\Transfer\CartChangeTransfer $cartChangeTransfer
+     *
+     * @return \Generated\Shared\Transfer\CartChangeTransfer
+     */
+    protected function clearQuoteLevelShipmentForEmptyQuote(CartChangeTransfer $cartChangeTransfer): CartChangeTransfer
+    {
+        $quoteTransfer = $cartChangeTransfer->getQuote();
+
+        if (!$quoteTransfer->getItems()->count()) {
+            $quoteTransfer->setShipment(null);
+        }
+
+        return $cartChangeTransfer;
+    }
+
     /**
      * @deprecated Exists for Backward Compatibility reasons only.
      *