Update new version

upload/admin/controller/extension/module/myparcelnl.php

@@ -357,6 +357,7 @@ private function _getPackageTypes()
             1 => $this->language->get('package_type_parcel'),
             2 => $this->language->get('package_type_mailbox'),
             3 => $this->language->get('package_type_unpaid_letter'),
+            4 => $this->language->get('package_type_digital_stamp'),
         );
     }
 

upload/admin/language/en-gb/extension/module/myparcelnl.php

@@ -1,6 +1,6 @@
 <?php
 // Heading
-$heading_title = 'Myparcel NL v1.1.0';
+$heading_title = 'Myparcel NL v1.1.2';
 $_['heading_title'] = $heading_title;
 // Text
 $_['text_module']         = 'Modules';
@@ -89,9 +89,11 @@
 $_['entry_tab_2_select_insured_500']       = '> &euro; 500 insured (+ &euro; 1.65 / &euro; 500)';
 $_['entry_tab_2_title_age_check']       = 'Age check';
 $_['entry_tab_2_title_age_check_desrition']       = 'The recipient must sign for the package and must be at least 18 years old.';
+$_['entry_tab_2_default_weight'] = 'Default Weight';
 
 
 $_['entry_subtotal']                                   = 'Subtotal';
+$_['entry_tab_3_enable_myparcel_shipping_message']     = 'Enable \'Myparcel Shipping\' to show the Myparcel delivery option in your checkout.(If don\'t use the Xtensions Best Checkout extension)';
 $_['entry_tab_3_title_delivery_option']                = 'Delivery options';
 $_['entry_tab_3_label_enable_delivery']                = 'Enable MyParcel delivery options';
 $_['entry_tab_3_label_home_address_only']              = 'Home address only';
@@ -171,6 +173,7 @@
 $_['entry_order_details_delivery_options'] = 'Delivery options';
 $_['entry_pickup_title'] = 'Pick up at PostNL';
 $_['entry_pickup_express_title'] = 'Extra early pick at TNT';
+$_['entry_weight'] = 'Weight';
 
 $_['Sunday']    = 'Sunday';
 $_['Monday']    = 'Monday';
@@ -207,6 +210,7 @@
 $_['package_type_parcel']          = 'Parcel';
 $_['package_type_mailbox']         = 'Mailbox package';
 $_['package_type_unpaid_letter']   = 'Unpaid letter';
+$_['package_type_digital_stamp']   = 'Digital Stamp';
 
 //order->myparcel
 $_['entry_order_myparcel_shipment_type'] = 'Shipment type';
@@ -263,4 +267,4 @@
 $_['error_sort_order_must_be_numeric'] = 'Sort order must be a number';
 $_['error_export_print_batch_error'] = 'Some of the selected orders might not be exported due to invalid address';
 $_['error_signature_required'] = 'Signature and Recipient Only are required for Pickup and Pick Express. It cannot be disabled.';
-$_['error_cut_off_not_correct_format'] = 'Cut off time is not in correct format.';
+$_['error_cut_off_not_correct_format'] = 'Cut off time is not in correct format.';

upload/admin/model/extension/myparcelnl/init.php

@@ -71,29 +71,29 @@ function installMyParcelShipping()
         /** Backward compatibility for Opencart 2.0.0.0 **/
         if(version_compare(VERSION, '2.3.0.0', '>=')) {
             $this->load->model('setting/extension');
-            $this->model_setting_extension->install('shipping', $shipping_name);
+            //$this->model_setting_extension->install('shipping', $shipping_name);
 
             $this->model_user_user_group->addPermission($this->user->getGroupId(), 'access', 'extension/shipping/' . $shipping_name);
             $this->model_user_user_group->addPermission($this->user->getGroupId(), 'modify', 'extension/shipping/' . $shipping_name);
             $this->load->controller('extension/shipping/' . $shipping_name . '/install');
         } else if(version_compare(VERSION, '2.3.0.0', '>=')) {
             $this->load->model('extension/extension');
-            $this->model_extension_extension->install('shipping', $shipping_name);
+            //$this->model_extension_extension->install('shipping', $shipping_name);
 
             $this->model_user_user_group->addPermission($this->user->getGroupId(), 'access', 'extension/shipping/' . $shipping_name);
             $this->model_user_user_group->addPermission($this->user->getGroupId(), 'modify', 'extension/shipping/' . $shipping_name);
             $this->load->controller('extension/shipping/' . $shipping_name . '/install');
         } elseif (version_compare(VERSION, '2.0.0.0', '>=')) {
             $this->load->model('extension/extension');
-            $this->model_extension_extension->install('shipping', $shipping_name);
+            //$this->model_extension_extension->install('shipping', $shipping_name);
 
             $this->model_user_user_group->addPermission($this->user->getGroupId(), 'access', 'shipping/' . $shipping_name);
             $this->model_user_user_group->addPermission($this->user->getGroupId(), 'modify', 'shipping/' . $shipping_name);
             $this->load->controller('shipping/' . $shipping_name . '/install');
         } else {
             // Opencart 1x
             $this->load->model('setting/extension');
-            $this->model_setting_extension->install('shipping', $shipping_name);
+            //$this->model_setting_extension->install('shipping', $shipping_name);
 
             $this->model_user_user_group->addPermission($this->user->getId(), 'access', 'shipping/' . $shipping_name);
             $this->model_user_user_group->addPermission($this->user->getId(), 'modify', 'shipping/' . $shipping_name);
@@ -474,4 +474,4 @@ function refreshOcmod()
         // Maintance mode back to original settings
         $this->model_setting_setting->editSettingValue('config', 'config_maintenance', $maintenance);
     }
-}
+}

upload/admin/view/template/extension/module/myparcelnl.twig

@@ -243,6 +243,22 @@
                                                             </select>
                                                         {%  endif %}
                                                     </td>
+                                                    {%  if( package_code == digital_stamp_code)  %}
+                                                        <td>
+                                                            {{  entry_tab_2_default_weight  }}
+                                                        </td>
+                                                        <td style="min-width: 200px;">
+                                                            <select name="module_myparcelnl_fields_export[digital_stamp_default_weight]" class="form-control" style="width:100%;">
+                                                                {%  for key , weight in digital_stamp_default_weight  %}
+                                                                    {% set selected = (module_myparcelnl_fields_export.digital_stamp_default_weight and key ==  module_myparcelnl_fields_export.digital_stamp_default_weight) ? 'selected="selected"' : ''  %}
+                                                                    <option {{ selected }} value="{{ key }}">{{  weight }}</option>
+                                                                {% endfor %}
+                                                            </select>
+                                                        </td>
+                                                    {% else %}
+                                                        <td></td>
+                                                        <td></td>
+                                                    {% endif %}
                                                 </tr>
                                             {% endfor %}
 
@@ -400,7 +416,7 @@
                             <!-- ___________________________________________________________________ -->
                             <div class="tab-pane" id="tab-checkout">
                                 <h2>{{ entry_tab_3_title_delivery_option }}</h2>
-
+                                <h4>{{  entry_tab_3_enable_myparcel_shipping_message }}</h4>
                                 <div class="form-group">
                                     <label class="text-left col-sm-2 control-label" for="input-title" >{{ entry_tab_3_label_enable_delivery }}</label>
                                     <div class="col-sm-10 col-md-6 col-lg-6">
@@ -844,4 +860,4 @@
         //-->
     </script>
 </div>
-{{ footer }}
+{{ footer }}