Merge pull request #485 from myparcelnl/Fix-digital-stamp-weight-sele…

…ction change id from insured_amount to digital_stamp
myparcelnl · Jan 14, 2020 · ad281fb · ad281fb
2 parents 162ad5a + 13b676c
commit ad281fb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/code/community/TIG/MyParcel2014/Model/Api/MyParcel.php b/app/code/community/TIG/MyParcel2014/Model/Api/MyParcel.php
@@ -798,7 +798,7 @@ protected function _getConsignmentData(TIG_MyParcel2014_Model_Shipment $myParcel
         if($data['options']['package_type'] == TIG_MyParcel2014_Model_Shipment::TYPE_DIGITAL_STAMP_NUMBER){
             foreach($items as $item) {
                 if($item->getProductType() == 'simple') {
-                    $WeightData = $this->getTotalWeight($totalWeight, $item);
+                    $WeightData = $this->getTotalWeight($totalWeight, $item, $myParcelShipment);
                 }
             }
             unset($data['options']['delivery_date']);

diff --git a/app/code/community/TIG/MyParcel2014/etc/config.xml b/app/code/community/TIG/MyParcel2014/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <TIG_MyParcel2014>
-            <version>1.19.0</version>
+            <version>1.19.1</version>
         </TIG_MyParcel2014>
     </modules>
     <global>

diff --git a/...t/default/template/TIG/MyParcel2014/sales/order/shipment/create/consignment_options.phtml b/...t/default/template/TIG/MyParcel2014/sales/order/shipment/create/consignment_options.phtml
@@ -193,8 +193,8 @@ if(true == $_isPakjegemak){
         <div id="myparcel_digital_stamp_options">
             <?php if ($this->getDestinationCountry() == 'NL'): ?>
                 <p>
-                    <label for="tig_myparcel_insured" class="normal">(<?php echo $this->__('Total order weight: ',$this->getOrderTotal());?>) <?php echo $this->__('Weight up to:');?> </label>
-                    <select id="tig_myparcel_insured_amount" name="tig_myparcel[insured_amount]" >
+                    <label for="tig_myparcel_digital_stamp" class="normal">(<?php echo $this->__('Total order weight: ',$this->getOrderTotal());?>) <?php echo $this->__('Weight up to:');?> </label>
+                    <select id="tig_myparcel_digital_stamp" name="tig_myparcel[digital_stamp]" >
                         <option value="20" <?php echo $_digitalStampUpTo == 20 ? 'selected="selected"' : '';?>>0 - 20 gram</option>
                         <option value="50" <?php echo $_digitalStampUpTo == 50 ? 'selected="selected"' : '';?>>20 - 50 gram</option>
                         <option value="100" <?php echo $_digitalStampUpTo == 100 ? 'selected="selected"' : '';?>>50 - 100 gram</option>