ENG26-51 Fix error in syncronizer around incrementing boolean

Author: wsaDemo

CHANGELOG-PUBLIC.md

@@ -860,3 +860,7 @@ SHQ23-6150 Cast method titles to string instead of Phrase
 INFRA-1328 - Removed incorrect case-sensitive version of file
 
 
+## 20.61.2 (2026-01-13)
+ENG26-51 Fix error in syncronizer around incrementing boolean
+
+

CHANGELOG.md

@@ -860,3 +860,7 @@ SHQ23-6150 Cast method titles to string instead of Phrase
 INFRA-1328 - Removed incorrect case-sensitive version of file
 
 
+## 20.61.2 (2026-01-13)
+ENG26-51 Fix error in syncronizer around incrementing boolean
+
+

composer.json

@@ -2,7 +2,7 @@
   "name": "shipperhq/module-shipper",
   "description": "Magento Shipping integration with ShipperHQ",
   "type": "magento2-module",
-  "version": "20.61.1",
+  "version": "20.61.2",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

src/Model/Synchronizer.php

@@ -619,6 +619,7 @@ public function synchronizeData()
     private function updateAll($updateData)
     {
         $result = 0;
+        $hasError = false;
 
         foreach ($updateData as $attributeUpdate) {
             if ($attributeUpdate['attribute_type'] == 'product') {
@@ -636,7 +637,7 @@ private function updateAll($updateData)
                             'Unable to add attribute option',
                             'Error: ' . $e->getMessage()
                         );
-                        $result = false;
+                        $hasError = true;
                     }
                 } elseif ($attributeUpdate['status'] == self::AUTO_REMOVE_ATTRIBUTE_OPTION) {
                     try {
@@ -651,7 +652,7 @@ private function updateAll($updateData)
                             'Unable to remove attribute option',
                             'Error: ' . $e->getMessage()
                         );
-                        $result = false;
+                        $hasError = true;
                     }
                 }
             } elseif ($attributeUpdate['attribute_type'] == 'global_setting') {
@@ -710,7 +711,7 @@ private function updateAll($updateData)
 
         $this->carrierConfigHandler->refreshConfig();
 
-        if ($result >= 0) {
+        if (!$hasError && $result >= 0) {
             $this->checkSynchStatus(true);
         }
         return $result;

src/Plugin/Quote/QuoteManagementPlugin.php

@@ -37,6 +37,7 @@
 use Magento\Quote\Model\QuoteManagement;
 use ShipperHQ\Shipper\Helper\CarrierGroup;
 use ShipperHQ\Shipper\Helper\LogAssist;
+use ShipperHQ\Shipper\Model\ResourceModel\Quote\AddressDetail\CollectionFactory as AddressDetailCollectionFactory;
 
 class QuoteManagementPlugin
 {
@@ -65,18 +66,25 @@ class QuoteManagementPlugin
      */
     private $logger;
 
+    /**
+     * @var AddressDetailCollectionFactory
+     */
+    private $addressDetailCollectionFactory;
+
     public function __construct(
         CartRepositoryInterface $quoteRepository,
         ManagerInterface $eventManager,
         DataObjectFactory $objectFactory,
         CarrierGroup $carrierGroupHelper,
-        LogAssist $logger
+        LogAssist $logger,
+        AddressDetailCollectionFactory $addressDetailCollectionFactory
     ) {
         $this->quoteRepository = $quoteRepository;
         $this->eventManager = $eventManager;
         $this->objectFactory = $objectFactory;
         $this->carrierGroupHelper = $carrierGroupHelper;
         $this->logger = $logger;
+        $this->addressDetailCollectionFactory = $addressDetailCollectionFactory;
     }
 
     /**
@@ -115,11 +123,17 @@ private function updateCarrierGroupDetails(int $cartId): void
             if (!$address) {
                 return;
             }
+
             $shippingMethod = (string) $address->getShippingMethod();
             if (!$shippingMethod) {
                 return;
             }
 
+            // Extension attributes have been wiped by this point as they're just held in memory and Magento
+            // has reloaded the quote address from the DB now. Let's get them from shipperhq_quote_address_detail
+            // which has been updated at this point to have the correct values
+            $addressExtensionAttributes = $this->getQuoteAddressDetails($address->getId());
+
             $additionalDetail = $this->objectFactory->create();
             $carrierCode = '';
             if (strpos($shippingMethod, '_') !== false) {
@@ -130,7 +144,7 @@ private function updateCarrierGroupDetails(int $cartId): void
             $this->eventManager->dispatch(
                 'shipperhq_additional_detail_checkout',
                 [
-                    'address_extn_attributes' => $address->getExtensionAttributes(),
+                    'address_extn_attributes' => $addressExtensionAttributes,
                     'additional_detail' => $additionalDetail,
                     'carrier_code' => $carrierCode,
                     'address' => $address,
@@ -143,6 +157,8 @@ private function updateCarrierGroupDetails(int $cartId): void
                 $shippingMethod,
                 $additionalDetail->convertToArray()
             );
+
+
         } catch (\Throwable $e) {
             $this->logger->postCritical(
                 'Shipperhq_Shipper',
@@ -151,4 +167,44 @@ private function updateCarrierGroupDetails(int $cartId): void
             );
         }
     }
+
+    /**
+     * Get quote address details for a given address ID and extract what would have been extension attributes
+     *
+     * @param int $addressId
+     * @return \Magento\Framework\DataObject
+     */
+    private function getQuoteAddressDetails(int $addressId)
+    {
+        $collection = $this->addressDetailCollectionFactory->create()
+            ->addAddressToFilter($addressId);
+
+        $extensionAttributes = $this->objectFactory->create();
+
+        foreach ($collection as $detail) {
+            if ($detail->getDeliveryDate()) {
+                $extensionAttributes->setDeliveryDate($detail->getDeliveryDate());
+
+                if ($detail->getTimeSlot()) {
+                    $extensionAttributes->setTimeSlot($detail->getTimeSlot());
+                }
+            }
+
+            if ($detail->getPickupLocationId()) {
+                $extensionAttributes->setLocationId($detail->getPickupLocationId());
+            }
+
+            if ($detail->getPickupLocation()) {
+                $extensionAttributes->setLocationAddress($detail->getPickupLocation());
+            }
+
+            $this->logger->postDebug(
+                'Shipperhq_Shipper',
+                'Extension Attributes Extracted from Address Detail',
+                $extensionAttributes->getData()
+            );
+        }
+
+        return $extensionAttributes;
+    }
 }

src/composer.json

@@ -2,7 +2,7 @@
   "name": "shipperhq/module-shipper",
   "description": "Magento Shipping integration with ShipperHQ",
   "type": "magento2-module",
-  "version": "20.61.1",
+  "version": "20.61.2",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

src/etc/config.xml

@@ -72,7 +72,7 @@
                 <ws_timeout>30</ws_timeout>
                 <use_cache>0</use_cache>
                 <always_use_cache>1</always_use_cache>
-                <extension_version>20.61.1</extension_version>
+                <extension_version>20.61.2</extension_version>
                 <allowed_methods></allowed_methods>
                 <magento_version></magento_version>
                 <cache_timeout>300</cache_timeout>