Add third-party support

magepal · Jul 13, 2018 · e863e3e · e863e3e
1 parent 28859f9
commit e863e3e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/Plugin/Quote/Address/Total/ShippingPlugin.php b/Plugin/Quote/Address/Total/ShippingPlugin.php
@@ -62,14 +62,19 @@ public function aroundCollect(
                 foreach ($address->getAllShippingRates() as $rate) {
                     if ($rate->getCode() == $customOption['code']) {
                         $cost = $customOption['rate'];
+                        $description = trim($customOption['description']);
 
-                        $rate->setPrice($cost);
-                        //$rate->setMethodTitle($customOption['type']);
+                        //Empty by default. Use in third-party modules
+                        if (empty($description) || strlen($description) < 2) {
+                            $description = $rate->getCarrierTitle() . ' - ' . $rate->getMethodTitle();
+                        }
 
+                        $rate->setPrice($cost);
+                        $rate->setMethodTitle($description);
                         $address->setShippingMethod($customOption['code']);
                         $address->setShippingAmount($cost);
                         $address->setBaseShippingAmount($cost);
-                        $address->setShippingDescription($rate->getCarrierTitle() . ' - ' . $rate->getMethodTitle());
+                        $address->setShippingDescription($description);
                         $total->setShippingAmount($cost);
                         $total->setBaseShippingAmount($cost);
 
@@ -91,7 +96,8 @@ private function getCustomShippingJsonToArray($json)
         $customOption = [
             'code' => '',
             'rate' => 0,
-            'type' => ''
+            'type' => '',
+            'description' => ''
         ];
 
         $jsonToArray = (array)json_decode($json, true);
@@ -104,7 +110,7 @@ private function getCustomShippingJsonToArray($json)
             }
         }
 
-        if (is_array($jsonToArray) && count($jsonToArray) == 3) {
+        if (is_array($jsonToArray) && count($jsonToArray) == 4) {
             foreach ($jsonToArray as $key => $value) {
                 $customOption[$key] = $value;
             }

diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "magento 2 free shipping extension"
     ],
     "type": "magento2-module",
-    "version": "1.4.0",
+    "version": "1.4.1",
     "license": [
         "proprietary"
     ],