Fix admin price not saving

magepal · Jul 19, 2018 · 367f0c8 · 367f0c8
1 parent e863e3e
commit 367f0c8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Plugin/Quote/Address/Total/ShippingPlugin.php b/Plugin/Quote/Address/Total/ShippingPlugin.php
@@ -102,7 +102,7 @@ private function getCustomShippingJsonToArray($json)
 
         $jsonToArray = (array)json_decode($json, true);
 
-        if (!$json || count($jsonToArray) != 3) {
+        if (!$json || count($jsonToArray) != 4) {
             $json = $this->getQuote()->getCustomShippingRateJson();
 
             if ($json) {

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

diff --git a/view/adminhtml/templates/order/create/shipping/method/form.phtml b/view/adminhtml/templates/order/create/shipping/method/form.phtml
@@ -150,9 +150,11 @@ require(['prototype'], function(){
 <script type="text/javascript">
     function getCustomShippingCost(){
         var rate = $('custom-shipment-rate').value;
-        var code  = $('custom-shipment-title')[$('custom-shipment-title').selectedIndex].value;
+        var type  = $('custom-shipment-title')[$('custom-shipment-title').selectedIndex].value;
+        var code = 'customshippingrate_' + type;
+        var desc = '';
 
-        var val = '{"rate" : "' + rate + '", "code" : "customshippingrate_' + code  + '", "type" : "' + code + '"}';
+        var val = '{"rate" : "' + rate + '", "code" : "' + code  + '", "type" : "' + type + '", "description" : "' + desc + '"}';
 
         return val;
     }