Merge pull request #70 from Trunkrs/develop

Update: add check for optional parameter - postal code
Trunkrs · Sep 22, 2023 · 7df6080 · 7df6080
2 parents 0bde78f + 62e1750
commit 7df6080
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/Model/Carrier/Shipping.php b/Model/Carrier/Shipping.php
@@ -131,8 +131,14 @@ public function getTrunkrsShippingMethod()
             $urlHost = $this->getShipmentMethodEndpoint();
             $client = new Client();
 
+            if(!empty($postalCode)) {
+                $trunkrsEndpoint = $urlHost . "?country=" . $country . "&postalCode=" . $postalCode. "&orderValue=" . $totalAmount;
+            } else {
+                $trunkrsEndpoint = $urlHost . "?country=" . $country . "&orderValue=" . $totalAmount;
+            }
+
             $request = $client->get(
-                $urlHost . "?country=" . $country . "&postalCode=" . $postalCode. "&orderValue=" . $totalAmount, [
+                $trunkrsEndpoint, [
                 'headers' => [
                     'Authorization' => sprintf('Bearer %s', $this->getAccessToken()),
                     'Content-Type' => 'application/json; charset=utf-8'
@@ -207,7 +213,7 @@ public function isTrackingAvailable()
 
     /**
      * Retrieves customer country
-     * @return string
+     * @return string|null
      */
     public function getCountry()
     {
@@ -216,7 +222,7 @@ public function getCountry()
 
     /**
      * Retrieves customer postcode
-     * @return string
+     * @return string|null
      */
     public function getPostalCode()
     {

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     "trunkrs magento 2 shipping method"
   ],
   "type": "magento2-module",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "license": [
     "MIT"
   ],

diff --git a/etc/module.xml b/etc/module.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Trunkrs_Carrier" setup_version="2.4.0">
+    <module name="Trunkrs_Carrier" setup_version="2.4.1">
         <sequence>
             <module name="Magento_Backend"/>
             <module name="Magento_Config"/>

diff --git a/view/adminhtml/templates/system/config/trunkrs.phtml b/view/adminhtml/templates/system/config/trunkrs.phtml
@@ -31,7 +31,7 @@ echo "<div id='trunkrs-app'></div>";
             'browserInfo' => $_SERVER['HTTP_USER_AGENT'],
             'phpVersion' => phpversion(),
             'phpExtensions' => get_loaded_extensions(),
-            'pluginVersion' => 'v2.4.0'
+            'pluginVersion' => 'v2.4.1'
         ],
         'disableAutoShipment' => $block->getDisableAutoShipment()
     ]);