20.53.2 SHQ23-1021 Fix issue with place order call not populating sit…

…e details

CHANGELOG-PUBLIC.md

@@ -764,3 +764,7 @@ SHQ23-531 Add support for PHP8.2
 SHQ23-1143 Minor enhancement to inventory logic
 
 
+## 20.53.2 (2023-10-02)
+SHQ23-1021 Fix issue with place order call not populating site details
+
+

CHANGELOG.MD

@@ -764,3 +764,7 @@ SHQ23-531 Add support for PHP8.2
 SHQ23-1143 Minor enhancement to inventory logic
 
 
+## 20.53.2 (2023-10-02)
+SHQ23-1021 Fix issue with place order call not populating site details
+
+

composer.json

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

src/Helper/PostOrder.php

@@ -28,6 +28,7 @@
 
 namespace ShipperHQ\Shipper\Helper;
 
+use Magento\Framework\Exception\NoSuchEntityException;
 use ShipperHQ\Shipper\Model\Carrier\Processor\ShipperMapper;
 use ShipperHQ\WS\Client\WebServiceClientFactory;
 use ShipperHQ\WS\PostOrder\Placeorder\Request\PlaceOrderRequestFactory;
@@ -194,13 +195,27 @@ private function getPlaceorderRequest($order, $rate)
                 $methodCode = $carrierGroupDetail['code'];
             }
 
+            // SHQ23-1021 Need to add site details. Call can error although unlikely so wrapped in try/catch.
+            $siteDetails = null;
+
+            try {
+                $siteDetails = $this->shipperMapper->getSiteDetails();
+            } catch (NoSuchEntityException $e) {
+                $this->shipperLogger->postWarning(
+                    'Shipperhq_Shipper',
+                    'PostOrder::getPlaceorderRequest - failed to find site details',
+                    ['error' => $e->getMessage()]
+                );
+            }
+
             $request = $this->placeOrderRequestFactory->create([
                 'orderNumber'  => $order->getIncrementId(),
                 'totalCharges' => $rate->getPrice(),
                 'carrierCode'  => $rate->getCarrier(),
                 'methodCode'   => $methodCode,
                 'transId'      => $transactionId,
-                'recipient'    => $this->getRecipient($order->getShippingAddress())
+                'recipient'    => $this->getRecipient($order->getShippingAddress()),
+                'siteDetails'  => $siteDetails,
             ]);
 
             $request->setCredentials($this->shipperMapper->getCredentials());

src/Model/Carrier/Processor/ShipperMapper.php

@@ -895,7 +895,8 @@ public function getSiteDetails($storeId = null, $ipAddress = null)
         $edition = $this->shipperDataHelper->getConfigValue('carriers/shipper/magento_edition');
         $url = $this->storeManager->getStore($storeId)->getBaseUrl(UrlInterface::URL_TYPE_LINK);
         $mobilePrepend = $this->shipperDataHelper->isMobile($this->httpHeader->getHttpUserAgent()) ? 'm' : '';
-        $siteDetails = $this->siteDetailsFactory->create([
+
+        return $this->siteDetailsFactory->create([
             'ecommerceCart'    => 'Magento 2 ' . $edition,
             'ecommerceVersion' => $this->shipperDataHelper->getConfigValue('carriers/shipper/magento_version'),
             'websiteUrl'       => $url,
@@ -906,8 +907,6 @@ public function getSiteDetails($storeId = null, $ipAddress = null)
             'appVersion'       => $this->shipperDataHelper->getConfigValue('carriers/shipper/extension_version'),
             'ipAddress'        => ($ipAddress === null) ? $mobilePrepend : $mobilePrepend . $ipAddress
         ]);
-
-        return $siteDetails;
     }
 
     /**

src/composer.json

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

src/etc/config.xml

@@ -67,7 +67,7 @@
                 <ws_timeout>30</ws_timeout>
                 <use_cache>0</use_cache>
                 <always_use_cache>1</always_use_cache>
-                <extension_version>20.53.1</extension_version>
+                <extension_version>20.53.2</extension_version>
                 <allowed_methods></allowed_methods>
                 <magento_version></magento_version>
                 <cache_timeout>300</cache_timeout>