fix(checkout): consistently use correct package type for delivery opt…

…ions (#782)
myparcelnl · Nov 10, 2023 · 85aa4c3 · 85aa4c3
1 parent 6bef66b
commit 85aa4c3
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 23 deletions.
diff --git a/Model/Quote/Checkout.php b/Model/Quote/Checkout.php
@@ -81,11 +81,11 @@ public function getDeliveryOptions(array $forAddress = []): array
         $this->hideDeliveryOptionsForProduct();
 
         $data = [
-            'methods'    => [$this->helper->getParentMethodNameFromQuote($this->quoteId, $forAddress)],
+            'methods'    => explode(',', $this->helper->getGeneralConfig('shipping_methods/methods') ?? ''),
             'config'     => array_merge(
                 $this->getGeneralData(),
-                $this->getPackageType(),
-                $this->getDeliveryData()
+                $this->getDeliveryData(),
+                ['packageType' => $this->getPackageType()]
             ),
             'strings'    => $this->getDeliveryOptionsStrings(),
             'forAddress' => $forAddress,
@@ -119,17 +119,22 @@ private function getGeneralData()
     /**
      * Get general data
      *
-     * @return array
+     * @return string
      */
-    private function getPackageType(): array
+    private function getPackageType(): string
     {
+        $packageType    = AbstractConsignment::PACKAGE_TYPE_PACKAGE_NAME;
         $activeCarriers = $this->getActiveCarriers();
 
-        $packageType = [];
         foreach ($activeCarriers as $carrier) {
-            $packageType = [
-                'packageType' => $this->checkPackageType($carrier, null),
-            ];
+            $tentativePackageType = $this->checkPackageType($carrier);
+
+            switch ($tentativePackageType) {
+                case AbstractConsignment::PACKAGE_TYPE_DIGITAL_STAMP_NAME:
+                    return AbstractConsignment::PACKAGE_TYPE_DIGITAL_STAMP_NAME;
+                case AbstractConsignment::PACKAGE_TYPE_MAILBOX_NAME:
+                    $packageType = AbstractConsignment::PACKAGE_TYPE_MAILBOX_NAME;
+            }
         }
 
         return $packageType;
@@ -288,7 +293,7 @@ private function getDeliveryOptionsStrings(): array
      *
      * @return string
      */
-    public function checkPackageType(string $carrier, ?string $country): string
+    public function checkPackageType(string $carrier, ?string $country = null): string
     {
         try {
             $consignment = ConsignmentFactory::createByCarrierName($carrier);
@@ -359,7 +364,7 @@ public function hideDeliveryOptionsForProduct()
      */
     private function isPickupAllowed(string $carrier): bool
     {
-        $isMailboxPackage     = self::PACKAGE_TYPE_MAILBOX === $this->getPackageType()['packageType'];
+        $isMailboxPackage     = self::PACKAGE_TYPE_MAILBOX === $this->getPackageType();
         $pickupEnabled        = $this->helper->getBoolConfig($carrier, 'pickup/active');
         $showPickupForMailbox = $this->helper->getBoolConfig($carrier, 'mailbox/pickup_mailbox');
         $showPickup           = ! $isMailboxPackage || $showPickupForMailbox;

diff --git a/view/frontend/web/js/model/checkout.js b/view/frontend/web/js/model/checkout.js
@@ -101,15 +101,17 @@ function(
       Model.countryId(quote.shippingAddress().countryId);
       doRequest(Model.getDeliveryOptionsConfig, {onSuccess: Model.onInitializeSuccess});
 
-      quote.billingAddress.subscribe(function() {
+      function reloadConfig() {
         var shippingAddress = quote.shippingAddress();
 
         if (shippingAddress.countryId !== Model.countryId()) {
           doRequest(Model.getDeliveryOptionsConfig, {onSuccess: Model.onReFetchDeliveryOptionsConfig});
         }
 
         Model.countryId(shippingAddress.countryId);
-      });
+      }
+      quote.billingAddress.subscribe(reloadConfig);
+      quote.shippingAddress.subscribe(reloadConfig);
     },
 
     onReFetchDeliveryOptionsConfig: function(response) {
@@ -181,6 +183,16 @@ function(
         });
       }
 
+      if ('undefined' !== typeof MyParcelConfig && MyParcelConfig.hasOwnProperty('methods')) {
+        MyParcelConfig.methods.forEach(function(code) {
+          try {
+            document.getElementById('label_method_' + code + '_' + code).remove();
+          } catch (e) {
+            // when the element is not there as such, it is already ok
+          }
+        });
+      }
+
       rowsToHide.forEach(function(row) {
         row.style.display = 'none';
       });