diff --git a/install.xml b/install.xml
old mode 100755
new mode 100644
index 707c1e6..34701cf
--- a/install.xml
+++ b/install.xml
@@ -5,7 +5,7 @@
 -->
 <modification>
     <name>MyParcel NL</name>
-    <version>1.0.5</version>
+    <version>1.1.2</version>
     <code>MyParcelNL</code>
     <author>MyParcel NL</author>
     <link>https://www.myparcel.nl/</link>
@@ -20,13 +20,13 @@
             <add><![CDATA[
                 <td>Ship To</td>
 
-				<td$1column_header_myparcel$2</td>
+                <td$1column_header_myparcel$2</td>
 
-				<td$1column_action$2</td>
+                <td$1column_action$2</td>
             ]]></add>
         </operation>
 
-		<operation>
+        <operation>
             <search regex="true"><![CDATA[/<td(.*)order.date_modified(.*)<\/td>/]]></search>
             <add><![CDATA[
                 <td$1order.date_modified$2</td>
@@ -41,14 +41,14 @@
                 </td>
                 <!-- Tap.Nguyen -->
 
-				<td class="text-right" id="column-myparcel-order-{{ order.order_id }}">{{ order.column_myparcel }}</td>
+                <td class="text-right" id="column-myparcel-order-{{ order.order_id }}">{{ order.column_myparcel }}</td>
             ]]></add>
         </operation>
 
         <operation><!-- no -->
             <search regex="true"><![CDATA[/<td(.*)order.order_status(.*)<\/td>/]]></search>
             <add><![CDATA[
-				<td id="column-status-order-{{ order.order_id }}"$1order.order_status$2</td>
+                <td id="column-status-order-{{ order.order_id }}"$1order.order_status$2</td>
             ]]></add>
         </operation>
 
@@ -145,16 +145,18 @@
     <!-- ****** ORDER CONTROLLER ADMIN/SALE/ORDER.PHP ****** -->
     <!-- *************************************************** -->
 
-	<file path="admin/controller/sale/order.php"><!-- checked -->
+    <file path="admin/controller/sale/order.php"><!-- checked -->
         <!-- 1X -->
-		<operation><!-- yes -->
+        <operation><!-- yes -->
             <search><![CDATA[
             public function index() {
             ]]></search>
             <add position="after"><![CDATA[
                 $this->load->model('extension/myparcelnl/helper');
-				$this->document->addStyle($this->model_extension_myparcelnl_helper->getCssUrl() . 'order.css');
-				$this->document->addScript($this->model_extension_myparcelnl_helper->getJsUrl() . 'order.js');
+                $this->document->addStyle($this->model_extension_myparcelnl_helper->getCssUrl() . 'order.css');
+                $this->document->addStyle($this->model_extension_myparcelnl_helper->getCssUrl() . 'sweetalert.min.css');
+                $this->document->addScript($this->model_extension_myparcelnl_helper->getJsUrl() . 'order.js');
+                $this->document->addScript($this->model_extension_myparcelnl_helper->getJsUrl() . 'sweetalert.min.js');
             ]]></add>
         </operation>
 
@@ -164,8 +166,8 @@
             ]]></search>
             <add position="after"><![CDATA[
                 $this->load->model('extension/myparcelnl/helper');
-				$this->document->addStyle($this->model_extension_myparcelnl_helper->getCssUrl() . 'order.css');
-				$this->document->addScript($this->model_extension_myparcelnl_helper->getJsUrl() . 'order.js');
+                $this->document->addStyle($this->model_extension_myparcelnl_helper->getCssUrl() . 'order.css');
+                $this->document->addScript($this->model_extension_myparcelnl_helper->getJsUrl() . 'order.js');
             ]]></add>
         </operation>
 
@@ -175,9 +177,9 @@
             ]]></search>
             <add position="after"><![CDATA[
                 $this->load->model('extension/myparcelnl/helper');
-				$this->document->addStyle($this->model_extension_myparcelnl_helper->getCssUrl() . 'order.css');
-				$this->document->addScript($this->model_extension_myparcelnl_helper->getJsUrl() . 'order.js');
-				$data['use_addition_address'] =  Myparcel($this->registry)->settings->general->use_addition_address_as_number_suffix;
+                $this->document->addStyle($this->model_extension_myparcelnl_helper->getCssUrl() . 'order.css');
+                $this->document->addScript($this->model_extension_myparcelnl_helper->getJsUrl() . 'order.js');
+                $data['use_addition_address'] =  Myparcel($this->registry)->settings->general->use_addition_address_as_number_suffix;
             ]]></add>
         </operation>
 
@@ -185,18 +187,18 @@
             <search regex="true"><![CDATA[/'customer'(.*)=> \$result\['customer'],/]]></search>
             <add><![CDATA[
                 'customer'$1=> $result['customer'],
-				'column_myparcel' 			=> $this->model_extension_myparcelnl_helper->getContent('column_myparcel', array('order_id' => $result['order_id'])),
-				'ship_to_myparcel'       => $this->model_extension_myparcelnl_helper->getContent('ship_to_myparcel', array('order_id' => $result['order_id'])),
+                'column_myparcel'           => $this->model_extension_myparcelnl_helper->getContent('column_myparcel', array('order_id' => $result['order_id'])),
+                'ship_to_myparcel'       => $this->model_extension_myparcelnl_helper->getContent('ship_to_myparcel', array('order_id' => $result['order_id'])),
                 'mp_packet_type' => $this->model_extension_myparcelnl_helper->getContent('myparcel_packet_type', array('order_id' => $result['order_id'])),
             ]]></add>
         </operation>
 
-		<operation><!-- no -->
+        <operation><!-- no -->
             <search regex="true"><![CDATA[/\$data\['user_token'](.*);/]]></search>
             <add><![CDATA[
                 $data['user_token']$1;
-				$data['column_header_myparcel'] = $this->model_extension_myparcelnl_helper->getContent('column_header_myparcel');
-				$data['myparcel_popup_modal'] = $this->model_extension_myparcelnl_helper->getContent('myparcel_popup_modal');
+                $data['column_header_myparcel'] = $this->model_extension_myparcelnl_helper->getContent('column_header_myparcel');
+                $data['myparcel_popup_modal'] = $this->model_extension_myparcelnl_helper->getContent('myparcel_popup_modal');
             ]]></add>
         </operation>
 
@@ -238,17 +240,17 @@
     <!-- ************************************************************************* -->
 
     <file path="admin/controller/common/header.php"><!-- checked -->
-    <operation><!-- yes -->
-        <search><![CDATA[
+        <operation><!-- yes -->
+            <search><![CDATA[
             public function index() {
             ]]></search>
-        <add position="after"><![CDATA[
+            <add position="after"><![CDATA[
                 /* MyParcel Ocmod Start */
                     $this->load->model('extension/myparcelnl/helper');
                     $data['myparcel_order_header'] = $this->model_extension_myparcelnl_helper->getContent('myparcel_order_header');
                 /* MyParcel Ocmod End */
             ]]></add>
-    </operation>
+        </operation>
     </file>
 
     <!-- ****** CATALOG COMMON HEADER CONTROLLER CATALOG/CONTROLLER/COMMON/HEADER.PHP ****** -->
@@ -280,6 +282,43 @@
                 $data['tracktrace'] = $this->model_extension_myparcelnl_helper->getContent('myparcel_email_tracktrace', array('order_id' => $order_info['order_id']));
             ]]></add>
         </operation>
+        <operation><!-- no -->
+            <search><![CDATA[// Vouchers]]></search>
+            <add position="before"><![CDATA[
+                if(isset($this->session->data['myparcel']['data'])){
+                    $myparcel = str_replace('&quot;','"',$this->session->data['myparcel']['data']);
+                    $myparcel = json_decode($myparcel,true);
+                    if(isset($myparcel['location'])){
+                        $language->load('extension/module/myparcel');
+                        $data['text_pickup_location'] = 'Pickup Location';
+                        $data['pickup_location'] = implode("<br>", array($myparcel['location'],$myparcel['street'] . ' ' . $myparcel['number'], $myparcel['city'] . ' (' . $myparcel['distance'] . 'm)'));
+                    }
+                }
+                else if(isset($this->session->data['myparcel_order_id'])){
+                    $this->load->model('extension/myparcelnl/shipment');
+                    $myparcel_delivery_options = $this->model_extension_myparcelnl_shipment->getMyParcelDeliveryOptions($this->session->data['myparcel_order_id']);
+                    if(isset($myparcel_delivery_options['location'])){
+                        $data['text_pickup_location'] = 'Pickup Location';
+                        $data['pickup_location'] = implode("<br>", array($myparcel_delivery_options['location'],$myparcel_delivery_options['street'] . ' ' . $myparcel_delivery_options['number'], $myparcel_delivery_options['city'] . ' (' . $myparcel_delivery_options['distance'] . 'm)'));
+                    }
+                }
+                if(!isset($data['pickup_location'])){
+                    if(isset($this->session->data['myparcel_shipping_choosed'])){
+                        $myparcel_delivery_options = $this->session->data['myparcel_shipping_choosed'];
+                        if(isset($myparcel_delivery_options['location'])){
+                            $data['text_pickup_location'] = 'Pickup Location';
+                            $data['pickup_location'] = implode("<br>", array($myparcel_delivery_options['location'],$myparcel_delivery_options['street'] . ' ' . $myparcel_delivery_options['number'], $myparcel_delivery_options['city'] . ' (' . $myparcel_delivery_options['distance'] . 'm)'));
+                        }
+                    }
+                }
+            ]]></add>
+        </operation>
+        <operation><!-- no -->
+            <search><![CDATA['title' => $order_total['title'],]]></search>
+            <add position="replace"><![CDATA[
+                'title' => strip_tags($order_total['title']),
+            ]]></add>
+        </operation>
     </file>
 
     <file path="catalog/view/theme/*/template/mail/order_add.twig"><!-- checked -->
@@ -290,6 +329,22 @@
                 {% if tracktrace %} <p>{{ tracktrace.text }} {{ tracktrace.code|join(', ') }}</p> {% endif %}
             ]]></add>
         </operation>
+        <operation><!-- no -->
+            <search><![CDATA[<td style="font-size: 12px; border-right: 1px solid #DDDDDD; border-bottom: 1px solid #DDDDDD; background-color: #EFEFEF; font-weight: bold; text-align: left; padding: 7px; color: #222222;">{{ text_shipping_address }}</td>]]></search>
+            <add position="after"><![CDATA[
+                {% if pickup_location %}
+                <td style="font-size: 12px; border-right: 1px solid #DDDDDD; border-bottom: 1px solid #DDDDDD; background-color: #EFEFEF; font-weight: bold; text-align: left; padding: 7px; color: #222222;">{{ text_pickup_location  }}</td>
+                {% endif %}
+            ]]></add>
+        </operation>
+        <operation><!-- no -->
+            <search><![CDATA[<td style="font-size: 12px;	border-right: 1px solid #DDDDDD; border-bottom: 1px solid #DDDDDD; text-align: left; padding: 7px;">{{ shipping_address }}</td>]]></search>
+            <add position="after"><![CDATA[
+                {% if pickup_location %}
+                  <td style="font-size: 12px;	border-right: 1px solid #DDDDDD; border-bottom: 1px solid #DDDDDD; text-align: left; padding: 7px;">{{ pickup_location }}</td>
+                {% endif %}
+            ]]></add>
+        </operation>
     </file>
     <file path="catalog/model/checkout/order.php">
         <operation>
@@ -304,8 +359,21 @@
     <!-- ______________________________________________________________________ -->
     <file path="catalog/view/theme/*/template/account/order_list.twig"><!-- checked -->
         <operation><!-- no -->
-            <search><![CDATA[<td class="text-right"><a href="{{ order.view }}" data-toggle="tooltip" title="{{ button_view }}" class="btn btn-info"><i class="fa fa-eye"></i></a></td>]]></search>
-            <add position="replace"><![CDATA[<td class="text-right"><a href="{{ order.view }}" data-toggle="tooltip" title="{{ button_view }}" class="btn btn-info"><i class="fa fa-eye"></i></a>{{ order.tracktrace_myaccount }}</td>]]></add>
+            <search><![CDATA[<td class="text-left">{{ column_date_added }}</td>]]></search>
+            <add position="after"><![CDATA[
+                {% if is_show_track_trace %}
+                    <td class="text-left">{{ entry_track_trace }}</td>
+                {% endif %}
+            ]]></add>
+        </operation>
+        <operation><!-- no -->
+            <search><![CDATA[<td class="text-left">{{ order.date_added }}</td>]]></search>
+            <add position="after"><![CDATA[
+                {% if is_show_track_trace %}
+                    <td class="text-left">{{ order.tracktrace_myaccount }}</td>
+                {% endif %}
+              <?php } ?>
+            ]]></add>
         </operation>
     </file>
 
@@ -336,7 +404,16 @@
                 $order_total = $this->model_account_order->getTotalOrders();
             ]]></search>
             <add position="after"><![CDATA[
+                if (!class_exists('MyParcel')) {
+                    require_once DIR_SYSTEM . 'library/myparcelnl/class_myparcel.php';
+                    MyParcel($this->registry);
+                }
                 $this->load->model('extension/myparcelnl/helper');
+                $this->load->language('extension/module/myparcelnl');
+                if(MyParcel()->settings->general->trackandtrace_myaccount){
+                    $data['is_show_track_trace'] = MyParcel()->settings->general->trackandtrace_myaccount;
+                    $data['entry_track_trace'] = $this->language->get('entry_track_trace');
+                }
             ]]></add>
         </operation>
         <operation>
@@ -344,7 +421,7 @@
             <add position="after"><![CDATA[
                 $this->load->model('extension/myparcelnl/helper');
                 $data['myparcel_order_header'] = $this->model_extension_myparcelnl_helper->getContent('myparcel_order_header');
-				$this->document->addScript($this->model_extension_myparcelnl_helper->getJsUrl() . 'order.js');
+                $this->document->addScript($this->model_extension_myparcelnl_helper->getJsUrl() . 'order.js');
             ]]></add>
         </operation>
     </file>
@@ -401,6 +478,12 @@
                 {% endif %}
             ]]></add>
         </operation>
+        <operation>
+            <search><![CDATA[$('#button-save').button('reset');]]></search>
+            <add position="after"><![CDATA[
+                $('#button-refresh').click();
+            ]]></add>
+        </operation>
     </file>
 
     <!-- ________________ catalog/view/theme/journal2/template/journal2/checkout/address_form.twig ________________ -->
@@ -420,6 +503,33 @@
         </operation>
     </file>
 
+    <!-- ________________ catalog/view/theme/journal2/template/journal2/checkout/checkout.twig ________________ -->
+    <!-- _______________________ All Address Form Info Template _______________________ -->
+    <!-- _________________________________________________________________________ -->
+    <file path="catalog/view/theme/journal2/template/journal2/checkout/checkout.twig">
+        <operation>
+            <search><![CDATA[$('.checkout-cart').replaceWith(html);]]></search>
+            <add position="after"><![CDATA[
+            setInterval(function(){
+                  var cookieValue = document.cookie;
+                  cookieValue = cookieValue.split(';')
+                  $.each( cookieValue, function( key, value ) {
+                      value = value.split('=');
+                      if($.trim(value[0]) == 'myparcel_empty_results' && value[1] == 1){
+                          $('#journal-checkout-confirm-button').prop('disabled', true);
+                      }
+                  });
+              }, 2000);
+            ]]></add>
+        </operation>
+        <operation>
+            <search><![CDATA[$(document).on('journal_checkout_shipping_changed', function (e, value) {]]></search>
+            <add position="after"><![CDATA[
+            document.cookie = "myparcel_empty_results=0";
+            ]]></add>
+        </operation>
+    </file>
+
     <!-- ________________ catalog/view/theme/*/template/checkout/guest.twig ________________ -->
     <!-- _______________________ Billing Info Guest Template _______________________ -->
     <!-- _________________________________________________________________________ -->
@@ -462,6 +572,734 @@
         </operation>
     </file>
 
+    <file path="catalog/controller/extension/module/xtensions/checkout/xpayment_address.php">
+        <operation>
+            <search><![CDATA[if (!$json['error'] && isset($this->request->get['showpayment'])) {]]></search>
+            <add position="before"><![CDATA[
+            //Myparcel plugin - start
+            if($this->cart->hasShipping()  && isset($this->session->data['shipping_method']['code']) && ($this->session->data['shipping_method']['code'] == 'myparcel_delivery.myparcel_delivery' || $this->session->data['shipping_method']['code'] == 'myparcel_pickup.myparcel_pickup')){
+                if (!class_exists('MyParcel')) {
+                    require_once DIR_SYSTEM . 'library/myparcelnl/class_myparcel.php';
+                    MyParcel($this->registry);
+                }
+                $myparcel_error = $this->load->controller(MyParcel()->getMyparcelXtensionControllerPath().'/externalValidate');
+                if($myparcel_error){
+                    $json['error'] = $myparcel_error;
+                }
+            }
+            //Myparcel plugin - end
+                ]]></add>
+        </operation>
+        <operation>
+            <search><![CDATA[$this->template = $this->config->get('xtensions_view_path').'xpayment_address';]]></search>
+            <add position="before"><![CDATA[
+            if(isset($this->session->data['myparcel_api_errors'])){
+                $this->data['myparcel_api_errors'] = $this->session->data['myparcel_api_errors'];
+            }
+            ]]></add>
+        </operation>
+    </file>
+
+    <file path="catalog/controller/extension/module/xtensions/checkout/xpayment_method.php">
+        <operation>
+            <search><![CDATA[if(isset($this->request->get['direct'])){]]></search>
+            <add position="before"><![CDATA[
+            //Myparcel plugin - start
+            if($this->cart->hasShipping()  && isset($this->session->data['shipping_method']['code']) && ($this->session->data['shipping_method']['code'] == 'myparcel_delivery.myparcel_delivery' || $this->session->data['shipping_method']['code'] == 'myparcel_pickup.myparcel_pickup')){
+                if (!class_exists('MyParcel')) {
+                    require_once DIR_SYSTEM . 'library/myparcelnl/class_myparcel.php';
+                    MyParcel($this->registry);
+                }
+                $myparcel_error = $this->load->controller(MyParcel()->getMyparcelXtensionControllerPath().'/externalValidate');
+                if($myparcel_error){
+                    $json['error'] = $myparcel_error;
+                }
+            }
+            //Myparcel plugin - end
+                ]]></add>
+        </operation>
+    </file>
+    <file path="catalog/controller/extension/module/xtensions/checkout/xlogin.php">
+        <operation>
+            <search><![CDATA[$json['next'] = $child['matter'];]]></search>
+            <add position="before"><![CDATA[
+            if(isset($this->session->data['shipping_address'])){
+                $json['address_exit'] = 1;
+            }
+            ]]></add>
+        </operation>
+    </file>
+
+    <file path="catalog/controller/extension/module/xtensions/checkout/xcvc.php">
+        <operation>
+            <search><![CDATA[$sort_order[$key] = $value['sort_order'];]]></search>
+            <add position="after"><![CDATA[
+            //Myparcel plugin - start
+            //get pickup location
+            if($value['code'] == 'shipping' && isset($this->session->data['myparcel_price_pickup'])
+				&& isset($this->session->data['shipping_method']['code']) && strpos($this->session->data['shipping_method']['code'],$this->session->data['myparcel_price_pickup']['shipping_method_code']) !== false){
+                $myparcel_delivery_options = $this->session->data['myparcel_price_pickup']['myparcel_shipping_choosed'];
+                if(isset($myparcel_delivery_options['location'])){
+                    $this->language->load('extension/module/myparcelnl');
+                    $this->data['myparcel_pickup_price_summary']['title'] = $this->language->get('entry_title_location');
+                    $this->data['myparcel_pickup_price_summary']['location'] = $myparcel_delivery_options['location']. ', ' .$myparcel_delivery_options['street'] . ' ' . $myparcel_delivery_options['number'] .', ' . $myparcel_delivery_options['city'];
+                    $this->data['myparcel_pickup_price_summary']['shipping_title'] = $value['title'];
+                }
+            }
+            //Myparcel plugin - end
+                ]]></add>
+        </operation>
+    </file>
+    <!-- ________________ catalog/controller/extension/module/xtensions/checkout/xshipping_method.php ________________ -->
+    <!-- _______________________ XShipping Method Module _______________________ -->
+    <!-- _________________________________________________________________________ -->
+    <file path="catalog/controller/extension/module/xtensions/checkout/xshipping_method.php">
+        <operation>
+            <search><![CDATA[public function index() {]]></search>
+            <add position="after"><![CDATA[
+            $this->load->model('extension/myparcelnl/helper');
+            $this->document->addStyle($this->model_extension_myparcelnl_helper->getCssUrl() . 'checkout.css');
+            ]]></add>
+        </operation>
+        <operation>
+            <search><![CDATA[array_multisort($sort_order, SORT_ASC, $quote_data);]]></search>
+            <add position="after"><![CDATA[
+            if (!class_exists('MyParcel')) {
+                require_once DIR_SYSTEM . 'library/myparcelnl/class_myparcel.php';
+                MyParcel($this->registry);
+            }
+            if(isset($this->session->data['shipping_method'])){
+                if(isset($this->session->data['myparcel_shipping_choosed'])){
+                    $shipping_method = $this->session->data['shipping_method'];
+                    $myparcel_shipping_choosed = $this->session->data['myparcel_shipping_choosed'];
+                    if(explode('.',$shipping_method['code'])[0] != $myparcel_shipping_choosed['code']){
+                        unset($this->session->data['myparcel_shipping_choosed']);
+                    }
+                }
+            }
+            else{
+                if(isset($this->session->data['myparcel_shipping_choosed'])){
+                    unset($this->session->data['myparcel_shipping_choosed']);
+                }
+            }
+            if (!empty($shipping_address) && ($shipping_address['iso_code_2'] == 'NL' || $shipping_address['iso_code_2'] == 'BE')) {
+                $api = MyParcel()->api;
+                $registry = MyParcel::$registry;
+                /** @var \Cart\Currency $currency **/
+                $currency = $registry->get('currency');
+                $current_currency_code = $this->session->data['currency'];
+                $shipment_class = MyParcel()->shipment;
+                /** @var MyParcel_Shipment_Checkout $checkout_helper **/
+                $checkout_helper = $shipment_class->checkout;
+                $config = $registry->get('config');
+                $myparcelnl_checkout_settings = $config->get('module_myparcelnl_fields_checkout');
+                $default_price_0_text = isset($myparcelnl_checkout_settings['default_price_0_text']) ? $myparcelnl_checkout_settings['default_price_0_text'] : '';
+                if(isset($myparcelnl_checkout_settings['enable_delivery']) && $myparcelnl_checkout_settings['enable_delivery'] == 1){
+                    $delivery_params = MyParcel()->helper->getDeliveryParams($shipping_address);
+                    $myparcel_delivery = $api->getDeliveryOptions($delivery_params);
+
+                    if(isset($myparcel_delivery['code']) && $myparcel_delivery['code'] == 200 && !isset($myparcel_delivery['body']['errors'])){
+                        $myparcel_delivery = MyParcel()->helper->formatDeliveryPrice($myparcel_delivery, $shipping_address ,$this->cart->getSubTotal(),$this->language,$current_currency_code);
+
+
+                        $shipping_method_code = null;
+                        $myparcel_option_title = [];
+                        if (isset($this->session->data['shipping_method']['code'])){
+                            $shipping_method_code = $this->session->data['shipping_method']['code'];
+                            $shipping_method_code = explode('.',$shipping_method_code)[0];
+                        }
+                        $this->data['myparcel_option_title'] = array();
+                        $arrMyparcelShippingKey = [];
+                        foreach ($myparcel_delivery['body']['data'] as $key => $value){
+                            if(count($value)) {
+                                $sort_order = count($quote_data);
+                                $key_delivery = 'myparcel_' . $key;
+                                $cost = 0;
+                                $cost_with_tax = 0;
+                                $price_key = 'myparcel_price_' . $key;
+                                if (!isset($this->session->data[$price_key])) {
+                                    MyParcel()->helper->saveDefaultMyparcelMethodXtension($value,$key);
+                                }
+                                if (isset($this->session->data[$price_key])) {
+                                    $myparcel_price = $this->session->data[$price_key];
+                                    $text_price_detail = explode(' - ',$myparcel_price['text_myparcel_price_'.$key]);
+                                    //recalculate price choose
+                                    switch ($myparcel_price['shipping_method_code']){
+                                        case 'delivery':
+                                            foreach ($value as $k => $v){
+                                                if(date('Y-m-d',strtotime($v['date'])) == date('Y-m-d',strtotime($text_price_detail[0]))){
+                                                    foreach ($v['time'] as $time){
+                                                        if(date('H:i',strtotime($time['start'])) == date('H:i',strtotime($text_price_detail[1])) && date('H:i',strtotime($time['end'])) == date('H:i',strtotime($text_price_detail[2]))){
+                                                            $myparcel_price['amount'] = $time['price']['amount'];
+                                                            $myparcel_price['amount_with_tax'] = $time['price']['amount_with_tax'];
+                                                            break;
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                            break;
+                                        case 'pickup':
+                                            foreach ($value as $k => $v){
+                                                if($v['location'] == trim($text_price_detail[0])){
+                                                    foreach ($v['time'] as $time){
+                                                        if(date('H:i',strtotime($time['start'])) == date('H:i',strtotime($text_price_detail[2])) ){
+                                                            $myparcel_price['amount'] = $time['price']['amount'];
+                                                            $myparcel_price['amount_with_tax'] = $time['price']['amount_with_tax'];
+                                                            break;
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                            break;
+                                    } // end recalculate price choose
+
+                                    if ($myparcel_price['shipping_method_code'] == $key) {
+                                        $cost = $currency->convert($myparcel_price['amount'], $myparcel_price['currency'], $current_currency_code);
+                                        $cost_with_tax = $currency->convert($myparcel_price['amount_with_tax'], $myparcel_price['currency'], $current_currency_code);
+                                    };
+                                    if ($shipping_address['iso_code_2'] == 'NL' && isset($this->session->data['additional_service_checked'][$key])) {
+                                        if (isset($this->session->data['additional_service'])) {
+                                            $additional_service = $this->session->data['additional_service'];
+
+                                            $delivery_prices = $checkout_helper->getDeliveryPrices(false, true, '', false, 0,$this->cart->getSubTotal());
+                                            $delivery_prices_format = $checkout_helper->getDeliveryPrices(false, true, '', true, 0,$this->cart->getSubTotal());
+                                            foreach ($additional_service as $service_name => $service_value) {
+                                                if(isset($delivery_prices[$shipping_address['iso_code_2']][$service_name]) && $delivery_prices[$shipping_address['iso_code_2']][$service_name] !== 'disable'){
+                                                    $additional_service[$service_name]['amount'] = round($currency->convert($delivery_prices[$shipping_address['iso_code_2']][$service_name],'EUR',$current_currency_code),2);
+                                                    $additional_service[$service_name]['amount_with_tax'] = round($currency->convert($delivery_prices_format[$shipping_address['iso_code_2']][$service_name],'EUR',$current_currency_code),2);
+                                                    $additional_service[$service_name]['text_amount'] = $currency->format($delivery_prices_format[$shipping_address['iso_code_2']][$service_name],$current_currency_code);
+                                                }
+                                            }
+                                            $additional_service_checked = $this->session->data['additional_service_checked'][$key];
+                                            foreach ($additional_service_checked as $service_name => $service_value) {
+                                                if ($service_value) {
+                                                    $cost += $additional_service[$service_name]['amount'];
+                                                    $cost_with_tax += $additional_service[$service_name]['amount_with_tax'];
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                                else{
+                                    //delivery default select standard for delivery or first location for  pickup  if not selected
+                                    switch ($key){
+                                        case 'delivery':
+                                            foreach ($value as $k => $v){
+                                                foreach ($v['time'] as $k => $time){
+                                                    if($time['price_comment'] == 'standard'){
+                                                        $cost = $time['price']['amount'];
+                                                        $cost_with_tax = $time['price']['amount_with_tax'];
+                                                        break;
+                                                    }
+                                                }
+                                            }
+                                            break;
+                                        case 'pickup':
+                                            $pickup = $value[0];
+                                            $time = $pickup['time'][0];
+                                            $cost = $time['price']['amount'];
+                                            $cost_with_tax = $time['price']['amount_with_tax'];
+                                            break;
+                                    }
+
+                                }
+
+                                $arrQuote = array(
+                                    'code' => $key_delivery . '.' . $key_delivery,
+                                    'title' => $this->language->get('entry_myparcel_' . $key),
+                                    'cost' => $cost,
+                                    'tax_class_id' => $checkout_helper->getTaxFromCart(),
+                                    'text' => ($cost_with_tax == 0 && $default_price_0_text != '') ? $default_price_0_text :$currency->format($cost_with_tax, $current_currency_code),
+                                );
+                                $arrShipping = array(
+                                    'title' => $this->language->get('entry_myparcel_' . $key),
+                                    'sort_order' => $sort_order,
+                                    'error' => ''
+                                );
+                                if ($shipping_method_code == $key_delivery) {
+                                    $arrQuote['headingtitle'] = $this->language->get('entry_select_myparcel_' . $key);
+                                }
+                                $myparcel_option_title['title_heading_myparcel_' . $key] = $this->language->get('entry_select_myparcel_' . $key);
+                                $myparcel_option_title['text_edit_myparcel_' . $key] = (isset($myparcel_price['text_myparcel_price_'.$key])) ? $myparcel_price['text_myparcel_price_'.$key] : $this->language->get('entry_edit_myparcel_' . $key);
+                                $arrShipping['quote'][$key_delivery] = $arrQuote;
+                                $quote_data[$key_delivery] = $arrShipping;
+                                $arrMyparcelShippingKey[] = $key_delivery;
+                            }
+                        }
+                        $this->session->data['myparcel_option_title'] = $myparcel_option_title;
+                        $this->session->data['myparcel_delivery'] = $myparcel_delivery['body']['data'];
+                        if(isset($this->session->data['myparcel_api_errors'])){
+                            unset($this->session->data['myparcel_api_errors']);
+                        }
+
+                        //make myparcel shipping method to first.
+                        if(count($arrMyparcelShippingKey)){
+                            $arrMyparcelShippingKey = array_reverse($arrMyparcelShippingKey);
+                            foreach ($arrMyparcelShippingKey as $key){
+                                if(isset($quote_data[$key])) {
+                                    $value = $quote_data[$key];
+                                    unset($quote_data[$key]);
+                                    $quote_data = array($key => $value) + $quote_data;
+                                }
+                            }
+                        }
+                    }
+                    else{
+                        if(isset($myparcel_delivery['body']['errors'])){
+                            $myparcel_errors = $myparcel_delivery['body']['errors'];
+                            $error_message = [];
+                            if(is_array($myparcel_errors) && count($myparcel_errors)){
+                                 foreach($myparcel_errors as $error){
+                                    $error_language_key = 'entry_myparcel_api_error_code_' . $error['code'];
+                                    $error_message[] = ($this->language->get($error_language_key) != $error_language_key) ? $this->language->get($error_language_key) : $error['message'];
+                                }
+                                $this->session->data['myparcel_api_errors'] = htmlspecialchars(implode('.',$error_message), ENT_QUOTES);
+                            }
+                        }
+                    }}
+                else{
+                    if(isset($this->session->data['myparcel_api_errors'])){
+                        unset($this->session->data['myparcel_api_errors']);
+                    }
+                }
+            }
+            else{
+                if(isset($this->session->data['myparcel_api_errors'])){
+                    unset($this->session->data['myparcel_api_errors']);
+                }
+            }
+            ]]></add>
+        </operation>
+        <operation>
+            <search><![CDATA[$this->template = $this->config->get('xtensions_view_path').'xshipping_method';]]></search>
+            <add position="before"><![CDATA[
+            if (!class_exists('MyParcel')) {
+				require_once DIR_SYSTEM . 'library/myparcelnl/class_myparcel.php';
+				MyParcel($this->registry);
+			}
+            if(isset($this->session->data['myparcel_api_errors'])){
+                $this->data['myparcel_api_errors'] = $this->session->data['myparcel_api_errors'];
+            }
+            if(isset($this->session->data['myparcel_option_title'])){
+                $this->data['myparcel_option_title'] = $this->session->data['myparcel_option_title'];
+            }
+            ($_SERVER['HTTPS'] && defined(HTTPS_SERVER)) ? $url_server = HTTPS_SERVER : $url_server = HTTP_SERVER;
+            $this->data['myparcel_action'] = $url_server . 'index.php?route=' . MyParcel()->getMyparcelXtensionControllerPath();
+            ]]></add>
+        </operation>
+    </file>
+
+    <file path="catalog/view/theme/*/template/extension/module/xtensions/checkout/xcheckout.twig">
+        <operation>
+            <search><![CDATA[$(document).on("click", "#couponbtn1", function(event) {]]></search>
+            <add position="before"><![CDATA[
+                $(document).on("change", "input[name='myparcel_option']", function(event) {
+                var element = this;
+                showLoader();
+                $.ajax({
+                    url: 'index.php?route='+$(element).attr('action')+'/save',
+                    type: 'post',
+                    data: $('#xdeldateandtimeslots input[type=\'text\'], .xdeltimeslots-table input[type=\'radio\']:checked'),
+                    dataType: 'json',
+                    beforeSend: function() {
+
+                    },
+                    success: function(json) {
+                        if(json['success']){
+                            loadShippingMethods(true);
+                            $('#modal-shipping-dependancy').modal('hide');
+                        }
+                        hideLoader();
+                    }
+                });
+            });
+
+            $(document).on("change", "select[name='myparcel_pickup_location']", function(event) {
+                var element = this;
+                showLoader();
+                $.ajax({
+                    url: 'index.php?route='+$(element).attr('action')+'/change',
+                    type: 'post',
+                    data: {
+                        'myparcel_pickup_location': $('#myparcel_pickup_location :selected').val()
+                    },
+                    dataType: 'json',
+                    beforeSend: function() {
+                        $('.xdeldateandtimeslots .alert').remove();
+                        $('.xdelslotselected').removeClass('xdelslotselected');
+                        $(element).closest('tr').addClass('xdelslotselected');
+                    },
+                    success: function(json) {
+                        if(json['error']){
+                            if(json['error']['date']){
+                                $('#xdeltimeslots').before('<div class="alert alert-warning">'+json['error']['date']+'<button type="button" class="close" data-dismiss="alert">&times;</button></div>');
+                            }
+                            if(json['error']['timeslot']){
+                                loadSlots();
+                                $('#xdeltimeslots').before('<div class="alert alert-warning">'+json['error']['timeslot']+'<button type="button" class="close" data-dismiss="alert">&times;</button></div>');
+                            }
+                        }else if(json['success']){
+                            $('.myparcel-pickup-table').html(json['html']);
+                            loadShippingMethods(true);
+                        }
+                        hideLoader();
+                    }
+                });
+            });
+            function changeAdditionalService(obj,name) {
+                var element = obj;
+                var id = obj.id.toString();
+                console.log(id);
+                $.ajax({
+                    url: 'index.php?route='+$(obj).attr('action')+'/save',
+                    type: 'post',
+                    data: {
+                        'addition_name' : name,
+                        'addition_value': obj.checked
+                    },
+                    dataType: 'json',
+                    beforeSend: function() {
+                        $('.xdeldateandtimeslots .alert').remove();
+                        $('.xdelslotselected').removeClass('xdelslotselected');
+                        $(element).closest('tr').addClass('xdelslotselected');
+                    },
+                    success: function(json) {
+                        if(json['error']){
+                            if(json['error']['date']){
+                                $('#xdeltimeslots').before('<div class="alert alert-warning">'+json['error']['date']+'<button type="button" class="close" data-dismiss="alert">&times;</button></div>');
+                            }
+                            if(json['error']['timeslot']){
+                                loadSlots();
+                                $('#xdeltimeslots').before('<div class="alert alert-warning">'+json['error']['timeslot']+'<button type="button" class="close" data-dismiss="alert">&times;</button></div>');
+                            }
+                        }else if(json['success']){
+                            loadShippingMethods();
+                        }
+
+                    }
+                });
+            };
+            function loadMyparcelDelivery(action,headingtitle){
+                $('#modal-shipping-dependancy').remove();
+                $('.bootstrap-datetimepicker-widget').remove();
+                $.ajax({
+                    url: action,
+                    type: 'post',
+                    data: $('#shipping_method input[type=\'radio\']:checked'),
+                    dataType: 'html',
+                    beforeSend: function() {
+
+                    },
+                    success: function(data) {
+                        html  = '<div id="modal-shipping-dependancy" class="modal modal_dependancy" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">';
+                        html += '  <div class="modal-dialog">';
+                        html += '    <div class="modal-content">';
+                        html += '      <div class="modal-header">';
+                        html += '        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>';
+                        html += '        <h4 class="modal-title">'+headingtitle+'</h4>';
+                        html += '      </div>';
+                        html += '      <div class="modal-body">'+ data +'</div>';
+                        html += '    </div';
+                        html += '  </div>';
+                        html += '</div>';
+                        $('body').append(html);
+                        $('#modal-shipping-dependancy').modal('show');
+                    }
+                });
+            }
+            $(document).on("hidden.bs.modal", "#modal-shipping-dependancy", function(event) {
+                loadShippingMethods();
+            });
+            ]]></add>
+        </operation>
+
+
+        <operation>
+            <search><![CDATA[function loadShippingMethods(){]]></search>
+            <add position="after"><![CDATA[
+            showLoader();
+            ]]></add>
+        </operation>
+        <operation>
+            <search><![CDATA[if(json.redirect){]]></search>
+            <add position="before"><![CDATA[
+            hideLoader();
+            ]]></add>
+        </operation>
+        <operation>
+            <search><![CDATA[}else if(json.xpayment_method){]]></search>
+            <add position="before"><![CDATA[
+            }else if(json.error){
+                hideLoader();
+                $('#button-payment').removeClass('progress-bar-striped active');
+                alert(json.error.warning);
+                if(json['error']['action']){
+                    loadMyparcelDelivery(json['error']['action'],json['error']['title']);
+                }
+            ]]></add>
+        </operation>
+        <operation>
+            <search><![CDATA[$('#step_payment_panel').html(json.xpayment_method);]]></search>
+            <add position="before"><![CDATA[
+            if(json.error){
+                hideLoader();
+                $('#button-payment').removeClass('progress-bar-striped active');
+                alert(json.error.warning);
+                if(json['error']['action']){
+                    loadMyparcelDelivery(json['error']['action'],json['error']['title']);
+                }
+                return false;
+            }
+            ]]></add>
+        </operation>
+        <operation>
+            <search><![CDATA[$('#step_address_panel').html(html);]]></search>
+            <add position="after"><![CDATA[
+            var eleError = $('#myparcel_api_errors');
+            if(eleError.length){
+                alert(eleError.val());
+                var radioValue = $("input[name='address_id']:checked").val();
+                var elementAddress = $('.editAddress');
+                var clickEl;
+                for(var i=0; i < elementAddress.length; i++){
+                    var link = ($(elementAddress[i]).attr('link'));
+                    if(link.indexOf('address_id=' + radioValue) > -1){
+                        clickEl = $(elementAddress[i]);
+                    }
+                }
+                clickEl.click();
+            }
+            ]]></add>
+        </operation>
+        <operation>
+            <search><![CDATA[$('#addressModal_edit').modal('hide');]]></search>
+            <add position="after"><![CDATA[
+            var eleError = $('#myparcel_api_errors');
+            if(eleError.length){
+                alert(eleError.val());
+                var radioValue = $("input[name='address_id']:checked").val();
+                var elementAddress = $('.editAddress');
+                var clickEl;
+                for(var i=0; i < elementAddress.length; i++){
+                    var link = ($(elementAddress[i]).attr('link'));
+                    if(link.indexOf('address_id=' + radioValue) > -1){
+                        clickEl = $(elementAddress[i]);
+                    }
+                }
+                clickEl.click();
+            }
+            ]]></add>
+        </operation>
+        <operation>
+            <search><![CDATA[$('#step_address_panel #shipping_method .shipping-table').html(json.shipping_method);]]></search>
+            <add position="after"><![CDATA[
+            var eleError = $('#myparcel_api_errors');
+            if(eleError.length){
+                alert(eleError.val());
+                var radioValue = $("input[name='address_id']:checked").val();
+                var elementAddress = $('.editAddress');
+                if(elementAddress.length){
+                    var clickEl;
+                    for(var i=0; i < elementAddress.length; i++){
+                        var link = ($(elementAddress[i]).attr('link'));
+                        if(link.indexOf('address_id=' + radioValue) > -1){
+                            clickEl = $(elementAddress[i]);
+                        }
+                    }
+                    clickEl.click();
+                }
+                else{
+                    toggleElement('#guestPanel, #guest_payment_panel');
+                    $('.col-md-3.lborder').addClass('xblur');
+                }
+            }
+            ]]></add>
+        </operation>
+        <operation>
+            <search><![CDATA[$('#step_login_panel #totals').html(json.xtotals);]]></search>
+            <add position="after"><![CDATA[
+            loadShippingMethods();
+            ]]></add>
+        </operation>
+        <operation>
+            <search><![CDATA[} else if (json.xguest) {]]></search>
+            <add position="after"><![CDATA[
+            $.ajax({
+                url : 'index.php?route=extension/myparcelnl/myparcel_xtension_delivery/forgetMyParcelChoosed',
+                type: 'get',
+                success:function (data) {
+                    loadShippingMethods();
+                }
+            });
+            ]]></add>
+        </operation>
+        <operation>
+            <search><![CDATA[}else if (json.next) {]]></search>
+            <add position="after"><![CDATA[
+            if(json.address_exit){
+                loadShippingMethods();
+            }
+            ]]></add>
+        </operation>
+        <operation>
+            <search><![CDATA[$('#step_address_panel #shipping_method').html(json.xshipping_method);]]></search>
+            <add position="after"><![CDATA[
+            $.ajax({
+                url : 'index.php?route=extension/myparcelnl/myparcel_xtension_delivery/forgetMyParcelChoosed',
+                type: 'get',
+                success:function (data) {
+                    loadShippingMethods();
+                }
+            });
+            ]]></add>
+        </operation>
+    </file>
+
+    <file path="catalog/view/theme/*/template/extension/module/xtensions/checkout/xshipping_method.twig">
+        <operation>
+            <search><![CDATA[{% if shipping_methods  %}]]></search>
+            <add position="before"><![CDATA[
+            <script>
+                $(document).ready(function() {
+                    {%  if myparcel_api_errors %}
+                        var eleError = $('#myparcel_api_errors');
+                        if(eleError.length == 0){
+                            $('body').append('<input type="hidden" id="myparcel_api_errors" value="{{  myparcel_api_errors }}">');
+                        }
+                    {%  else  %}
+                        var eleError = $('#myparcel_api_errors');
+                        if(eleError.length){
+                            $(eleError).remove();
+                        }
+                    {% endif %}
+
+                    var elms = $("input[id^='myparcel_']");
+                    var myparcel_action = '{{ myparcel_action }}';
+                    for(var i=0; i < elms.length; i++){
+                        var id = elms[i].id;
+                        if(id != 'myparcel_shipping.myparcel_shipping' && id != 'myparcel_api_errors'){
+                            id = id.split('.');
+                            var title = $('#title_heading_' + id[0]).val();
+                            var textEdit = $('#text_edit_' + id[0]).val();
+                            $(elms[i]).attr('onClick',"loadMyparcelDelivery('"+ myparcel_action +"','"+ title + "' )");
+                            $(elms[i]).parent().parent().parent().addClass('myparcel');
+                            var divEle = '<div class="editmyparcel" id="text_'+ id[0] +'">'+ textEdit +'</div>';
+                            $(elms[i]).parent().append(divEle);
+                        }
+                    }
+                });
+            </script>
+            {% if myparcel_option_title %}
+                {% for  key , value in myparcel_option_title %}
+                    <input type="hidden" id="{{ key }}" value="{{ value }}">
+                {% endfor %}
+            {% endif %}
+            ]]></add>
+        </operation>
+    </file>
+
+    <file path="catalog/view/theme/*/template/extension/module/xtensions/checkout/xtotals.twig">
+        <operation>
+            <search><![CDATA[<tr><td>{{ total.title }}:</td><td class="text-right">{{ total.text }}</td></tr>]]></search>
+            <add position="after"><![CDATA[
+            {% if  myparcel_pickup_price_summary and total.title == myparcel_pickup_price_summary.shipping_title %}
+                <tr><td>{{ myparcel_pickup_price_summary.title }}:</td><td class="text-right">{{ myparcel_pickup_price_summary.location }} </td> </tr>
+            {% endif %}
+            ]]></add>
+        </operation>
+    </file>
+
+    <file path="catalog/view/theme/*/template/extension/module/xtensions/checkout/xpayment_address.twig">
+        <operation>
+            <search><![CDATA[{% if force_redirect %}]]></search>
+            <add position="before"><![CDATA[
+                    <script>
+                        $(document).ready(function () {
+                            {%  if myparcel_api_errors %}
+                            var eleError = $('#myparcel_api_errors');
+                            if(eleError.length == 0){
+                                $('body').append('<input type="hidden" id="myparcel_api_errors" value="{{  myparcel_api_errors }}">');
+                            }
+                            {%  else  %}
+                            var eleError = $('#myparcel_api_errors');
+                            if(eleError.length){
+                                $(eleError).remove();
+                            }
+                            {% endif %}
+                        });
+                    </script>
+                ]]></add>
+        </operation>
+    </file>
+    <file path="catalog/controller/checkout/success.php">
+        <operation>
+            <search><![CDATA[unset($this->session->data['shipping_method']);]]></search>
+            <add position="before"><![CDATA[
+            if(isset($this->session->data['myparcel_shipping_choosed']) && isset($this->session->data['shipping_method']['code'])
+                        && ($this->session->data['shipping_method']['code'] == ($this->session->data['myparcel_shipping_choosed']['code'] . '.' . $this->session->data['myparcel_shipping_choosed']['code']))){
+                if (!class_exists('MyParcel')) {
+                    require_once DIR_SYSTEM . 'library/myparcelnl/class_myparcel.php';
+                    MyParcel($this->registry);
+                }
+                $registry = MyParcel::$registry;
+                $loader = $registry->get('load');
+                $loader->model(MyParcel()->getModelPath('shipment'));
+                $model_shipment = $registry->get('model_extension_myparcelnl_shipment');
+                $myparcel_shipping_choosed = $this->session->data['myparcel_shipping_choosed'];
+                $additional_service = $myparcel_shipping_choosed['additional_service'];
+                $myparcel_shipping_code = $myparcel_shipping_choosed['code'];
+                unset($myparcel_shipping_choosed['code']);
+                unset($myparcel_shipping_choosed['additional_service']);
+                $signed = (isset($additional_service['signed']) && $additional_service['signed'] ) ? 1: 0;
+                $recipient_only = (isset($additional_service['only_recipient']) && $additional_service['only_recipient'] ) ? 1: 0;
+                $current_prices = null;
+                if(isset($this->session->data['additional_service'])){
+                    $current_prices = array(
+                        'NL' => $this->session->data['additional_service']
+                    );
+                }
+                $model_shipment->saveDeliveryOptions($this->session->data['order_id'], $myparcel_shipping_choosed, $signed, $recipient_only, $current_prices);
+                $model_shipment->update($this->session->data['order_id'],'type',$myparcel_shipping_code . '.' . $myparcel_shipping_code);
+            }
+            if(isset($this->session->data['myparcel_shipping_choosed'])){
+                unset($this->session->data['myparcel_shipping_choosed']);
+            }
+            if(isset($this->session->data['additional_service'])){
+                unset($this->session->data['additional_service']);
+            }
+            if(isset($this->session->data['pickup_time_start'])){
+                unset($this->session->data['pickup_time_start']);
+            }
+            if(isset($this->session->data['additional_service_checked'])){
+                unset($this->session->data['additional_service_checked']);
+            }
+            if(isset($this->session->data['pickup_time_start'])){
+                unset($this->session->data['pickup_time_start']);
+            }
+            if(isset($this->session->data['myparcel_price_pickup'])){
+                unset($this->session->data['myparcel_price_pickup']);
+            }
+            if(isset($this->session->data['myparcel_price_delivery'])){
+                unset($this->session->data['myparcel_price_delivery']);
+            }
+            if(isset($this->session->data['delivery_time_start'])){
+                unset($this->session->data['delivery_time_start']);
+            }
+            if(isset($this->session->data['delivery_time_end'])){
+                unset($this->session->data['delivery_time_end']);
+            }
+            if(isset($this->session->data['delivery_date'])){
+                unset($this->session->data['delivery_date']);
+            }
+            if(isset($this->session->data['pickup_location'])){
+                unset($this->session->data['pickup_location']);
+            }
+            ]]></add>
+        </operation>
+    </file>
+
+
+
     <!-- ________________ catalog/view/theme/*/template/checkout/guest_shipping.twig ________________ -->
     <!-- _______________________ Shipping Info Guest Template _______________________ -->
     <!-- _________________________________________________________________________ -->
@@ -594,8 +1432,8 @@
             <search regex="true"><![CDATA[/elseif(.*)(\r\n|\r|\n)(\s*)\$json(.*)error_address(.*)(\r\n|\r|\n)(\s*)\}/]]></search>
             <add position="replace"><![CDATA[
             elseif (!in_array($this->request->post['address_id'], array_keys($this->model_account_address->getAddresses()))) {
-					$json['error']['warning'] = $this->language->get('error_address');
-			}
+                    $json['error']['warning'] = $this->language->get('error_address');
+            }
             elseif (in_array($this->request->post['address_id'], array_keys($this->model_account_address->getAddresses()))) {
                 $this->load->model('extension/myparcelnl/helper');
                 $use_addition_address =  MyParcel($this->registry)->settings->general->use_addition_address_as_number_suffix;
@@ -657,8 +1495,8 @@
             <search regex="true"><![CDATA[/elseif(.*)(\r\n|\r|\n)(\s*)\$json(.*)error_address(.*)(\r\n|\r|\n)(\s*)\}/]]></search>
             <add position="replace"><![CDATA[
             elseif (!in_array($this->request->post['address_id'], array_keys($this->model_account_address->getAddresses()))) {
-				$json['error']['warning'] = $this->language->get('error_address');
-			}
+                $json['error']['warning'] = $this->language->get('error_address');
+            }
             elseif (in_array($this->request->post['address_id'], array_keys($this->model_account_address->getAddresses()))) {
                 $this->load->model('extension/myparcelnl/helper');
                 $use_addition_address =  MyParcel($this->registry)->settings->general->use_addition_address_as_number_suffix;
@@ -725,7 +1563,45 @@
         </operation>
     </file>
 
-    <!-- ________________ catalog/controller/api/cart.php ________________ -->
+    <!-- ________________ catalog/controller/api/order.php ________________ -->
+    <!-- _____________ Set order delivery options to session _____________ -->
+    <!-- _________________________________________________________________ -->
+    <file path="catalog/controller/api/order.php">
+        <operation>
+            <search><![CDATA[$this->session->data['shipping_method'] = $this->session->data['shipping_methods'][$shipping[0]]['quote'][$shipping[1]];]]></search>
+            <add position="after"><![CDATA[
+                $shipping_method = $this->session->data['shipping_method'];
+                if(isset($shipping_method['main_title'])){
+                    $shipping_method['title'] = $shipping_method['main_title'];
+                    $this->session->data['shipping_method'] = $shipping_method;
+                }
+            ]]></add>
+        </operation>
+        <operation>
+            <search><![CDATA[$this->model_checkout_order->editOrder($order_id, $order_data);]]></search>
+            <add position="after"><![CDATA[
+                //myparcel update delivery option
+                if(isset($this->session->data['myparcel_delivery_option']) ){
+                    $myparcel_delivery_option = $this->session->data['myparcel_delivery_option'];
+                    if (!class_exists('MyParcel')) {
+                        require_once DIR_SYSTEM . 'library/myparcelnl/class_myparcel.php';
+                        MyParcel($this->registry);
+                    }
+                    $registry = MyParcel::$registry;
+                    $loader = $registry->get('load');
+                    $loader->model(MyParcel()->getModelPath('shipment'));
+                    $model_shipment = $registry->get('model_extension_myparcelnl_shipment');
+                    if($order_data['shipping_code'] == $myparcel_delivery_option){
+                        $model_shipment->update($order_id,'delivery_options',$myparcel_delivery_option);
+                    }
+                    $model_shipment->update($order_id,'type',$myparcel_delivery_option['shipping_code']);
+
+                }
+            ]]></add>
+        </operation>
+    </file>
+
+    <!-- ________________ catalog/controller/api/shipping.php ________________ -->
     <!-- _____________ Set order delivery options to session _____________ -->
     <!-- _________________________________________________________________ -->
     <file path="catalog/controller/api/shipping.php">
@@ -749,6 +1625,76 @@
                 }
             ]]></add>
         </operation>
+        <operation>
+            <search><![CDATA[$results = $this->model_setting_extension->getExtensions('shipping');]]></search>
+            <add position="after"><![CDATA[
+                $this->load->model('checkout/order');
+                $order_data = $this->model_checkout_order->getOrder($this->request->get['order_id']);
+                $myparcel_key = null;
+                if($this->request->get['order_id']){
+                    if (!class_exists('MyParcel')) {
+                        require_once DIR_SYSTEM . 'library/myparcelnl/class_myparcel.php';
+                        MyParcel($this->registry);
+                    }
+
+                    $api = MyParcel()->api;
+                    $registry = MyParcel::$registry;
+                    /** @var \Cart\Currency $currency **/
+                    $currency = $registry->get('currency');
+                    $current_currency_code = $this->session->data['currency'];
+                    $shipping_address = $this->session->data['shipping_address'];
+                    $delivery_params = MyParcel()->helper->getDeliveryParams($shipping_address);
+                    $delivery_params = MyParcel()->helper->formatDeliveryParamsEditOrder($delivery_params, $this->request->get['order_id']);
+                    $myparcel_delivery = $api->getDeliveryOptions($delivery_params);
+                    if(isset($myparcel_delivery['code']) && $myparcel_delivery['code'] == 200 && !isset($myparcel_delivery['body']['errors'])){
+                        $next_delivery_option = MyParcel()->helper->getDeliveryOptionChange($myparcel_delivery['body']['data'],$order_data);
+                        if(!empty($next_delivery_option) && $next_delivery_option['shipping_code'] != null){
+                            $shipping_code = $next_delivery_option['shipping_code'];
+                            $myparcel_key = 'myparcel_'. $next_delivery_option['shipping_code'];
+                            $next_delivery_option['shipping_code'] = $myparcel_key . '.' . $myparcel_key;
+                            $this->session->data['myparcel_delivery_option'] = $next_delivery_option;
+                            $myparcel_quote = array(
+                                'title' => 'MyParcel ' . ucfirst($shipping_code),
+                                'sort_order' => 1,
+                                'error' => ''
+                            );
+                            $time_delivery = $next_delivery_option['time'];
+                            if(count($time_delivery) == 1){
+                                $time_delivery = array_shift($next_delivery_option['time']);
+                            }
+                            $title = 'MyParcel ' . ucfirst($shipping_code). ' ' . date('Y-m-d',strtotime($next_delivery_option['date']));
+                            if(!isset($time_delivery['price'])){
+                                $time_delivery = $time_delivery[0];
+                            }
+                            switch ($shipping_code){
+                                case "delivery":
+                                    $title .= ' ( ' .ucfirst($time_delivery['price_comment']) . ' )';
+                                    break;
+                                case "pickup":
+                                    $title .= ' ( ' . $next_delivery_option['location'] . ')';
+                                    break;
+                            }
+                            $myparcel_quote['quote'][$myparcel_key] = array(
+                                'code' => $myparcel_key . '.' . $myparcel_key,
+                                'title' => $title,
+                                'cost' => $time_delivery['price']['amount'],
+                                'tax_class_id' => '',
+                                'text' => isset($time_delivery['price']['text_amount']) ? $time_delivery['price']['text_amount'] : $currency->format($currency->convert($time_delivery['price']['amount'], $time_delivery['price']['currency'], $current_currency_code), $current_currency_code),
+                                'main_title' => $myparcel_quote['title']
+                            );
+                        }
+                    }
+                }
+            ]]></add>
+        </operation>
+        <operation>
+            <search><![CDATA[array_multisort($sort_order, SORT_ASC, $json['shipping_methods']);]]></search>
+            <add position="after"><![CDATA[
+                if($myparcel_key != null){
+                    $json['shipping_methods'][$myparcel_key] = $myparcel_quote;
+                }
+            ]]></add>
+        </operation>
     </file>
 
     <!-- ________________ SHIPPING.PHP ________________ -->
@@ -760,9 +1706,9 @@
             <add position="after"><![CDATA[
                  /* MyParcel Ocmod Start */
                  if (!class_exists('MyParcel')) {
-					require_once DIR_SYSTEM . 'library/myparcelnl/class_myparcel.php';
-					MyParcel($this->registry);
-				 }
+                    require_once DIR_SYSTEM . 'library/myparcelnl/class_myparcel.php';
+                    MyParcel($this->registry);
+                 }
 
                 if (function_exists('MyParcel') && MyParcel()->shipment->checkout->appliedByParcel($total)) {
                     return $total;
@@ -770,6 +1716,78 @@
                 /* MyParcel Ocmod End */
             ]]></add>
         </operation>
+        <operation>
+            <search><![CDATA[public function methods() {]]></search>
+            <add position="after"><![CDATA[
+                if (isset($this->request->get['order_id'])) {
+                    $this->session->data['myparcel_order_id'] = $this->request->get['order_id'];
+                }
+            ]]></add>
+        </operation>
+        <operation>
+            <search><![CDATA[$results = $this->model_setting_extension->getExtensions('shipping');]]></search>
+            <add position="after"><![CDATA[
+                $this->load->model('checkout/order');
+                $order_data = $this->model_checkout_order->getOrder($this->request->get['order_id']);
+                if (!class_exists('MyParcel')) {
+                    require_once DIR_SYSTEM . 'library/myparcelnl/class_myparcel.php';
+                    MyParcel($this->registry);
+                }
+                $myparcel_key = null;
+                $api = MyParcel()->api;
+                $shipping_address = $this->session->data['shipping_address'];
+                $delivery_params = MyParcel()->helper->getDeliveryParams($shipping_address);
+                $delivery_params = MyParcel()->helper->formatDeliveryParamsEditOrder($delivery_params, $this->request->get['order_id']);
+                $myparcel_delivery = $api->getDeliveryOptions($delivery_params);
+                if(isset($myparcel_delivery['code']) && $myparcel_delivery['code'] == 200 && !isset($myparcel_delivery['body']['errors'])){
+                    $next_delivery_option = MyParcel()->helper->getDeliveryOptionChange($myparcel_delivery['body']['data'],$order_data);
+                    if(!empty($next_delivery_option) && $next_delivery_option['shipping_code'] != null){
+                        $myparcel_key = 'myparcel_'. $next_delivery_option['shipping_code'];
+                        $myparcel_quote = array(
+                            'title' => 'MyParcel ' . ucfirst($next_delivery_option['shipping_code']),
+                            'sort_order' => 1,
+                            'error' => ''
+                        );
+                        $time_delivery = $next_delivery_option['time'];
+                        if(count($time_delivery) == 1){
+                            $time_delivery = array_shift($next_delivery_option['time']);
+                        }
+                        $title = 'MyParcel ' . ucfirst($next_delivery_option['shipping_code']). ' ' . date('Y-m-d',strtotime($next_delivery_option['date']));
+
+                        switch ($next_delivery_option['shipping_code']){
+                            case "delivery":
+                                $title .= ' ( ' .ucfirst($time_delivery['price_comment']) . ' )';
+                                break;
+                            case "pickup":
+                                $title .= ' ( ' . $next_delivery_option['location'] . ')';
+                                break;
+                        }
+
+                        if(!isset($time_delivery['price'])){
+                            $time_delivery = $time_delivery[0];
+                        }
+                        $myparcel_quote['quote'][$myparcel_key] = array(
+                            'code' => $myparcel_key . '.' . $myparcel_key,
+                            'title' => $title,
+                            'cost' => $time_delivery['price']['amount'],
+                            'tax_class_id' => '',
+                            'text' => $time_delivery['price']['text_amount'],
+                            'main_title' => $myparcel_quote['title']
+                        );
+                        $next_delivery_option['shipping_code'] = $myparcel_key . '.' . $myparcel_key;
+                        $this->session->data['myparcel_delivery_option'] = $next_delivery_option;
+                    }
+                }
+            ]]></add>
+        </operation>
+        <operation>
+            <search><![CDATA[array_multisort($sort_order, SORT_ASC, $json['shipping_methods']);]]></search>
+            <add position="after"><![CDATA[
+                if($myparcel_key != null){
+                    $json['shipping_methods'][$myparcel_key] = $myparcel_quote;
+                }
+            ]]></add>
+        </operation>
     </file>
 
     <!-- ________________ COLUMN_LEFT.PHP ________________ -->
@@ -845,4 +1863,4 @@
         </operation>
     </file>
 
-</modification>
\ No newline at end of file
+</modification>
diff --git a/upload/.DS_Store b/upload/.DS_Store
deleted file mode 100644
index 5008ddf..0000000
Binary files a/upload/.DS_Store and /dev/null differ
diff --git a/upload/admin/controller/extension/module/myparcelnl.php b/upload/admin/controller/extension/module/myparcelnl.php
old mode 100755
new mode 100644
index 822a0cd..20482f1
--- a/upload/admin/controller/extension/module/myparcelnl.php
+++ b/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'),
         );
     }
 
diff --git a/upload/admin/controller/extension/shipping/myparcel_shipping.php b/upload/admin/controller/extension/shipping/myparcel_shipping.php
old mode 100755
new mode 100644
diff --git a/upload/admin/controller/extension/total/myparcel_total.php b/upload/admin/controller/extension/total/myparcel_total.php
old mode 100755
new mode 100644
diff --git a/upload/admin/language/en-gb/extension/module/myparcelnl.php b/upload/admin/language/en-gb/extension/module/myparcelnl.php
old mode 100755
new mode 100644
index 57c1c2a..244e871
--- a/upload/admin/language/en-gb/extension/module/myparcelnl.php
+++ b/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.';
\ No newline at end of file
+$_['error_cut_off_not_correct_format'] = 'Cut off time is not in correct format.';
diff --git a/upload/admin/language/en-gb/extension/shipping/myparcel_shipping.php b/upload/admin/language/en-gb/extension/shipping/myparcel_shipping.php
old mode 100755
new mode 100644
diff --git a/upload/admin/language/en-gb/extension/total/myparcel_total.php b/upload/admin/language/en-gb/extension/total/myparcel_total.php
old mode 100755
new mode 100644
diff --git a/upload/admin/model/extension/myparcelnl/helper.php b/upload/admin/model/extension/myparcelnl/helper.php
old mode 100755
new mode 100644
diff --git a/upload/admin/model/extension/myparcelnl/init.php b/upload/admin/model/extension/myparcelnl/init.php
old mode 100755
new mode 100644
index e6e4e4f..a18bdf1
--- a/upload/admin/model/extension/myparcelnl/init.php
+++ b/upload/admin/model/extension/myparcelnl/init.php
@@ -71,21 +71,21 @@ 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);
@@ -93,7 +93,7 @@ function installMyParcelShipping()
         } 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);
     }
-}
\ No newline at end of file
+}
diff --git a/upload/admin/model/extension/myparcelnl/shipment.php b/upload/admin/model/extension/myparcelnl/shipment.php
old mode 100755
new mode 100644
diff --git a/upload/admin/model/extension/myparcelnl/shipping.php b/upload/admin/model/extension/myparcelnl/shipping.php
old mode 100755
new mode 100644
diff --git a/upload/admin/view/template/extension/module/myparcelnl.twig b/upload/admin/view/template/extension/module/myparcelnl.twig
old mode 100755
new mode 100644
index 1f7e582..4d330ea
--- a/upload/admin/view/template/extension/module/myparcelnl.twig
+++ b/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 }}
\ No newline at end of file
+{{ footer }}
diff --git a/upload/admin/view/template/extension/shipping/myparcel_shipping.twig b/upload/admin/view/template/extension/shipping/myparcel_shipping.twig
old mode 100755
new mode 100644
diff --git a/upload/admin/view/template/extension/total/myparcel_total.twig b/upload/admin/view/template/extension/total/myparcel_total.twig
old mode 100755
new mode 100644
diff --git a/upload/catalog/controller/extension/myparcelnl/myparcel_delivery.php b/upload/catalog/controller/extension/myparcelnl/myparcel_delivery.php
old mode 100755
new mode 100644
index 092a76d..00a2378
--- a/upload/catalog/controller/extension/myparcelnl/myparcel_delivery.php
+++ b/upload/catalog/controller/extension/myparcelnl/myparcel_delivery.php
@@ -32,9 +32,9 @@ function address()
                 $address_data['street'] = isset($address_data['address_1']) ? $address_data['address_1'] : '';
                 $address_data['number'] = isset($address_data['address_2']) ? $address_data['address_2'] : '';
             } else {
-            $address_parts = MyParcel($this->registry)->helper->getAddressComponents($address_data['address_1']);
-            $address_data['number'] = isset($address_parts['house_number']) ? $address_parts['house_number'] : '';
-            $address_data['street'] = isset($address_parts['street']) ? $address_parts['street'] : '';
+                $address_parts = MyParcel($this->registry)->helper->getAddressComponents($address_data['address_1']);
+                $address_data['number'] = isset($address_parts['house_number']) ? $address_parts['house_number'] : '';
+                $address_data['street'] = isset($address_parts['street']) ? $address_parts['street'] : '';
             }
 
             if (!empty($address_data)) {
@@ -112,9 +112,9 @@ function address_session()
                 $address_data['street'] = isset($address_data['address_1']) ? $address_data['address_1'] : '';
                 $address_data['number'] = isset($address_data['address_2']) ? $address_data['address_2'] : '';
             } else {
-            $address_parts = MyParcel($this->registry)->helper->getAddressComponents($address_data['address_1']);
-            $address_data['number'] = isset($address_parts['house_number']) ? $address_parts['house_number'] : '';
-            $address_data['street'] = isset($address_parts['street']) ? $address_parts['street'] : '';
+                $address_parts = MyParcel($this->registry)->helper->getAddressComponents($address_data['address_1']);
+                $address_data['number'] = isset($address_parts['house_number']) ? $address_parts['house_number'] : '';
+                $address_data['street'] = isset($address_parts['street']) ? $address_parts['street'] : '';
             }
 
             // If Opencart 1x
@@ -149,7 +149,7 @@ function address_session()
     /**
      * Ajax function
      * @return array containing Street and House number
-    **/
+     **/
     function address_components()
     {
         require_once DIR_SYSTEM . 'library/myparcelnl/class_myparcel.php';
@@ -163,10 +163,10 @@ function address_components()
                 $address_data['number'] = isset($_REQUEST['address_2']) ? $_REQUEST['address_2'] : '';
                 $address_data['number_addition'] = isset($_REQUEST['custom_field']['address']['address_3']) ? $_REQUEST['custom_field']['address']['address_3'] : '';
             } else {
-            $address_parts = MyParcel($this->registry)->helper->getAddressComponents($address_1);
-            $address_data['street'] = isset($address_parts['street']) ? $address_parts['street'] : '';
-            $address_data['number'] = isset($address_parts['house_number']) ? $address_parts['house_number'] : '';
-            $address_data['number_addition'] = isset($address_parts['number_addition']) ? $address_parts['number_addition'] : '';
+                $address_parts = MyParcel($this->registry)->helper->getAddressComponents($address_1);
+                $address_data['street'] = isset($address_parts['street']) ? $address_parts['street'] : '';
+                $address_data['number'] = isset($address_parts['house_number']) ? $address_parts['house_number'] : '';
+                $address_data['number_addition'] = isset($address_parts['number_addition']) ? $address_parts['number_addition'] : '';
             }
 
             if (!empty($address_data)) {
@@ -226,7 +226,7 @@ function total_details()
         MyParcel($this->registry);
         $registry = MyParcel::$registry;
         $session = $registry->get('session');
-
+        $config = $registry->get('config');
         /** @var MyParcel_Shipment_Checkout $checkout_helper **/
         $checkout_helper = MyParcel()->shipment->checkout;
         if (isset($_POST['delivery_options'])) {
@@ -239,40 +239,49 @@ function total_details()
 
         $order_id = isset($_POST['myparcel_order_id']) ? $_POST['myparcel_order_id'] : null;
 
+        $theme = !empty($config->get('config_template')) ? $config->get('config_template') : $config->get('config_theme');
+
         $total_array = $checkout_helper->getTotalArray($data, true, $order_id, 'excl ', false); // Get total with prices saved in myparcel_shipment
 
         ob_start();
         foreach ($total_array as $total_code => $total_item) {
-?>
-            <?php if (isset($_POST['aqc'])) { ?>
-                <div class="row myparcel-total">
-                    <label class="<?php echo $_POST['label_class'] ?>">
-                        <?php echo $total_item['title'] ?>
-                    </label>
-                    <div class="<?php echo $_POST['price_class'] ?>"><?php echo $total_item['price'] ?></div>
-                </div>
+            ?>
+            <?php if($theme == 'journal3' && ((!isset($_POST['admin'])) || ((isset($_POST['admin'])) && !$_POST['admin'])) ){ ?>
+                <tr class="myparcel-total">
+                    <td colspan="7" class="text-right"><?php echo $total_item['title'] ?>:</td>
+                    <td class="text-right"><?php echo $total_item['price'] ?></td>
+                </tr>
             <?php } else { ?>
-                <?php if (version_compare(VERSION, '2.1.0.0', '>=')) { ?>
-                    <tr class="myparcel-total">
-                        <td colspan="4" class="text-right"><?php echo $total_item['title'] ?>:</td>
-                        <td class="text-right"><?php echo $total_item['price'] ?></td>
-                    </tr>
+                <?php if (isset($_POST['aqc'])) { ?>
+                    <div class="row myparcel-total">
+                        <label class="<?php echo $_POST['label_class'] ?>">
+                            <?php echo $total_item['title'] ?>
+                        </label>
+                        <div class="<?php echo $_POST['price_class'] ?>"><?php echo $total_item['price'] ?></div>
+                    </div>
                 <?php } else { ?>
-                    <?php if (version_compare(VERSION, '2.0.3.1', '>=')) { ?>
+                    <?php if (version_compare(VERSION, '2.1.0.0', '>=')) { ?>
                         <tr class="myparcel-total">
-                            <td colspan="3"></td>
-                            <td class="<?php echo (isset($_POST['admin']) ? 'right' : 'text-right') ?>"><?php echo $total_item['title'] ?>:</td>
-                            <td class="<?php echo (isset($_POST['admin']) ? 'right' : 'text-right') ?>"><?php echo $total_item['price'] ?></td>
+                            <td colspan="4" class="text-right"><?php echo $total_item['title'] ?>:</td>
+                            <td class="text-right"><?php echo $total_item['price'] ?></td>
                         </tr>
                     <?php } else { ?>
-                        <tr class="myparcel-total">
-                            <td colspan="4" class="<?php echo (isset($_POST['admin']) ? 'right' : 'text-right') ?>"><?php echo $total_item['title'] ?>:</td>
-                            <td class="<?php echo (isset($_POST['admin']) ? 'right' : 'text-right') ?>"><?php echo $total_item['price'] ?></td>
-                        </tr>
+                        <?php if (version_compare(VERSION, '2.0.3.1', '>=')) { ?>
+                            <tr class="myparcel-total">
+                                <td colspan="3"></td>
+                                <td class="<?php echo (isset($_POST['admin']) ? 'right' : 'text-right') ?>"><?php echo $total_item['title'] ?>:</td>
+                                <td class="<?php echo (isset($_POST['admin']) ? 'right' : 'text-right') ?>"><?php echo $total_item['price'] ?></td>
+                            </tr>
+                        <?php } else { ?>
+                            <tr class="myparcel-total">
+                                <td colspan="4" class="<?php echo (isset($_POST['admin']) ? 'right' : 'text-right') ?>"><?php echo $total_item['title'] ?>:</td>
+                                <td class="<?php echo (isset($_POST['admin']) ? 'right' : 'text-right') ?>"><?php echo $total_item['price'] ?></td>
+                            </tr>
+                        <?php } ?>
                     <?php } ?>
                 <?php } ?>
             <?php } ?>
-<?php
+            <?php
         }
 
         $html = ob_get_clean();
@@ -332,6 +341,7 @@ function delivery_options()
      **/
     function iframe_content()
     {
+
         $this->load->model('extension/myparcelnl/helper');
         $this->model_extension_myparcelnl_helper->initMyParcel();
         $html = $this->model_extension_myparcelnl_helper->getContent('iframe_delivery_options');
@@ -351,15 +361,65 @@ function iframe_content()
      **/
     function set_session()
     {
+        $update_page = false;
+        $html = '';
+        //hardcode myparcel shipping method
+        $myparcel_code = 'myparcel_shipping.myparcel_shipping';
         if (!empty($_POST['mypa_data'])) {
-            $this->session->data['myparcel']['data'] = $_POST['mypa_data'];
-            $this->session->data['myparcel']['signed'] = $_POST['mypa_signed'];
-            $this->session->data['myparcel']['recipient_only'] = $_POST['mypa_recipient_only'];
+            if(!isset($_POST['is_change_option']) || (isset($_POST['is_change_option']) && !$_POST['is_change_option'])){
+                if(isset($this->session->data['shipping_method']) && ($this->session->data['shipping_method']['code'] != $myparcel_code )){
+                    if(isset($this->session->data['myparcel'])){
+                        unset($this->session->data['myparcel']);
+                    }
+                    echo json_encode(
+                        array(
+                            'status' => 'success',
+                            'session' => [],
+                            'update_page' => $update_page,
+                            'html'      => $html,
+                            'shipping_method_code' =>  $this->session->data['shipping_method']['code'],
+                            'is_close_delivery_options' => true,
+                            'myparcel_shipping_code' => $myparcel_code
+                        )
+                    );die;
+                }
+                if(!isset($this->session->data['myparcel'])){
+                    $update_page = true;
+                    $this->session->data['myparcel']['data'] = $_POST['mypa_data'];
+                    $this->session->data['myparcel']['signed'] = isset( $_POST['mypa_signed']) ? $_POST['mypa_signed'] : 'off';
+                    $this->session->data['myparcel']['recipient_only'] = isset( $_POST['mypa_recipient_only']) ? $_POST['mypa_recipient_only'] : 'off';
+                }
+            }
+            else{
+                if(!isset($this->session->data['shipping_method']) || ($this->session->data['shipping_method']['code'] != $myparcel_code )){
+                    if(isset($this->session->data['shipping_methods'])){
+                        foreach ($this->session->data['shipping_methods'] as $method) {
+                            foreach ($method['quote'] as $quote){
+                                if($quote['code'] == $myparcel_code){
+                                    $this->session->data['shipping_method'] = $quote;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+                $this->session->data['myparcel']['data'] = $_POST['mypa_data'];
+                $this->session->data['myparcel']['signed'] = isset( $_POST['mypa_signed']) ? $_POST['mypa_signed'] : 'off';
+                $this->session->data['myparcel']['recipient_only'] = isset( $_POST['mypa_recipient_only']) ? $_POST['mypa_recipient_only'] : 'off';
+            }
+
+            if(isset($_POST['is_change_option']) && $_POST['is_change_option']){
+                $html = $this->totals();
+            }
 
             echo json_encode(
                 array(
                     'status' => 'success',
-                    'session' => $this->session->data['myparcel']
+                    'session' => $this->session->data['myparcel'],
+                    'update_page' => $update_page,
+                    'html'      => $html,
+                    'shipping_method_code' =>  $this->session->data['shipping_method']['code'],
+                    'myparcel_shipping_code' => $myparcel_code
                 )
             );die;
         }
@@ -371,4 +431,68 @@ function set_session()
         );
         die;
     }
-}
\ No newline at end of file
+
+    private function totals() {
+
+        require_once DIR_SYSTEM . 'library/myparcelnl/class_myparcel.php';
+        MyParcel($this->registry);
+        $registry = MyParcel::$registry;
+        $currency = $registry->get('currency');
+        $current_currency_code = $this->session->data['currency'];
+
+        $totals = array();
+        $taxes = $this->cart->getTaxes();
+        $total = 0;
+
+        // Because __call can not keep var references so we put them into an array.
+        $total_data = array(
+            'totals' => &$totals,
+            'taxes'  => &$taxes,
+            'total'  => &$total,
+        );
+
+        $sort_order = array();
+
+        $this->load->model('setting/extension');
+
+        $results = $this->model_setting_extension->getExtensions('total');
+
+        foreach ($results as $key => $value) {
+            $sort_order[$key] = $this->config->get('total_' . $value['code'] . '_sort_order');
+        }
+
+        array_multisort($sort_order, SORT_ASC, $results);
+
+        foreach ($results as $result) {
+            if ($this->config->get('total_' . $result['code'] . '_status')) {
+                $this->load->model('extension/total/' . $result['code']);
+
+                // We have to put the totals in an array so that they pass by reference.
+                $this->{'model_extension_total_' . $result['code']}->getTotal($total_data);
+            }
+        }
+
+        $sort_order = array();
+
+        foreach ($totals as $key => $value) {
+            $sort_order[$key] = $value['sort_order'];
+        }
+
+        array_multisort($sort_order, SORT_ASC, $totals);
+        ob_start();
+        ?>
+        <tfoot>
+        <?php foreach ($totals as $item){ ?>
+            <tr>
+                <td colspan="7" class="text-right"><strong> <?php echo $item['title']; ?>: </strong></td>
+                <td class="text-right"><?php echo $currency->format($item['value'], $current_currency_code); ?></td>
+            </tr>
+        <?php } ?>
+        </tfoot>
+
+        <?php
+        return ob_get_clean();
+    }
+
+
+}
diff --git a/upload/catalog/controller/extension/myparcelnl/myparcel_order.php b/upload/catalog/controller/extension/myparcelnl/myparcel_order.php
old mode 100755
new mode 100644
diff --git a/upload/catalog/controller/extension/myparcelnl/myparcel_xtension_delivery.php b/upload/catalog/controller/extension/myparcelnl/myparcel_xtension_delivery.php
old mode 100755
new mode 100644
index 4f68d44..0567a27
--- a/upload/catalog/controller/extension/myparcelnl/myparcel_xtension_delivery.php
+++ b/upload/catalog/controller/extension/myparcelnl/myparcel_xtension_delivery.php
@@ -58,6 +58,8 @@ function index()
         if(isset($myparcel_delivery[$shipping_method_code])){
             $this->data['myparcel_delivery_option'] = $myparcel_delivery[$shipping_method_code];
             $this->data['shipping_method_code'] = $shipping_method_code;
+
+
             if($shipping_method_code == 'delivery'){
                 $this->data['min_date'] = date('Y-m-d',strtotime($this->data['myparcel_delivery_option'][0]['date']));
                 $this->data['max_date'] = date('Y-m-d',strtotime($this->data['myparcel_delivery_option'][count($this->data['myparcel_delivery_option']) - 1]['date']));
@@ -67,6 +69,24 @@ function index()
                 $this->data['delivery_time_start'] = isset($this->session->data['delivery_time_start']) ? $this->session->data['delivery_time_start'] : '';
                 $this->data['delivery_time_end'] = isset($this->session->data['delivery_time_end']) ? $this->session->data['delivery_time_end'] : '';
                 $this->data['dropoff_days']= implode(',' , MyParcel()->helper->getDisableDropoffDays($myparcel_delivery));
+
+                if(isset($this->session->data['myparcel_price_delivery']['myparcel_shipping_choosed'])){
+                    $this->session->data['myparcel_shipping_choosed'] = $this->session->data['myparcel_price_delivery']['myparcel_shipping_choosed'];
+                }
+                //select default option
+                if(empty($this->data['delivery_time_start']) && empty($this->data['delivery_time_end'])){
+                    foreach ($this->data['myparcel_delivery_option'] as $value){
+                        if($value['date'] == $this->data['date_pick']){
+                            foreach ($value['time'] as $time){
+                                if($time['price_comment'] == 'standard'){
+                                    $this->saveMyparcelPriceDelivery($value, $shipping_method_code, $time);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+
             }
             else{
                 if(isset($this->session->data['pickup_location'])){
@@ -80,9 +100,18 @@ function index()
                 if(!isset($this->data['pickup_detail'])){
                     $this->data['pickup_detail'] = $this->data['myparcel_delivery_option'][0];
                 }
+
                 $this->data['entry_date'] = $this->language->get('entry_date');
                 $this->data['entry_pickup_from'] = $this->language->get('entry_pickup_from');
                 $this->data['pickup_time_start'] = isset($this->session->data['pickup_time_start']) ? $this->session->data['pickup_time_start'] : '';
+
+                if(empty($this->data['pickup_time_start'])){
+                    $this->saveMyparcelPricePickup($this->data['pickup_detail'],$shipping_method_code, $this->data['pickup_detail']['time'][0]);
+                }
+
+                if(isset($this->session->data['myparcel_price_pickup']['myparcel_shipping_choosed'])){
+                    $this->session->data['myparcel_shipping_choosed'] = $this->session->data['myparcel_price_pickup']['myparcel_shipping_choosed'];
+                }
             }
         }
 
@@ -146,13 +175,14 @@ function change(){
                     $this->session->data['pickup_location'] = $value['location'];
 //                    $this->session->data['pickup_time_start'] = $value['time'][0]['start'];
                     $this->data['pickup_detail'] = $value;
-                    $this->data['pickup_time_start'] = '';
-                    if(isset($this->session->data['pickup_time_start'])){
-                        unset($this->session->data['pickup_time_start']);
-                    }
-                    if(isset($this->session->data['myparcel_price_pickup'])){
-                        unset($this->session->data['myparcel_price_pickup']);
-                    }
+                    $this->saveMyparcelPricePickup($value, $shipping_method_code, $value['time'][0]);
+//                    $this->data['pickup_time_start'] = '';
+//                    if(isset($this->session->data['pickup_time_start'])){
+//                        unset($this->session->data['pickup_time_start']);
+//                    }
+//                    if(isset($this->session->data['myparcel_price_pickup'])){
+//                        unset($this->session->data['myparcel_price_pickup']);
+//                    }
                     break;
                 }
             }
@@ -164,15 +194,22 @@ function change(){
             $delivery_date = date('Y-m-d',strtotime($this->request->post['delivery_date']));
             foreach ($myparcel_delivery[$shipping_method_code] as $value){
                 if(date('m-d-Y',strtotime($value['date'])) == date('m-d-Y',strtotime($delivery_date)) ) {
-                    $this->data['delivery_time_start'] = '';
-                    $this->data['delivery_time_end'] = '';
+//                    $this->data['delivery_time_start'] = '';
+//                    $this->data['delivery_time_end'] = '';
                     $this->data['delivery_detail'] = $value;
-
-                    $this->session->data['delivery_time_start'] = '';
-                    $this->session->data['delivery_time_end'] = '';
+//
+//                    $this->session->data['delivery_time_start'] = '';
+//                    $this->session->data['delivery_time_end'] = '';
                     $this->session->data['delivery_date'] = $delivery_date;
-                    if(isset($this->session->data['myparcel_price_delivery'])){
-                        unset($this->session->data['myparcel_price_delivery']);
+//                    if(isset($this->session->data['myparcel_price_delivery'])){
+//                        unset($this->session->data['myparcel_price_delivery']);
+//                    }
+
+                    foreach ($value['time'] as $time){
+                        if($time['price_comment'] == 'standard'){
+                            $this->saveMyparcelPriceDelivery($value, $shipping_method_code, $time);
+                            break;
+                        }
                     }
                     break;
                 }
@@ -251,15 +288,17 @@ function save(){
                             if($time['start'] == $this->session->data['delivery_time_start'] && $time['end'] == $this->session->data['delivery_time_end']){
                                 $shipping_methods[$key_shipping]['quote'][$key_shipping]['cost'] = $time['price']['current_currency_amount'];
                                 $shipping_methods[$key_shipping]['quote'][$key_shipping]['text'] = $time['price']['current_currency_amount'];
-                                $this->session->data['myparcel_shipping_choosed']['date'] = date('Y-m-d',strtotime($value['date']));
-                                $this->session->data['myparcel_shipping_choosed']['time'][] = $time;
-                                $this->session->data['myparcel_shipping_choosed']['code'] = 'myparcel_'. $shipping_method_code;
-                                $this->session->data['myparcel_shipping_choosed']['additional_service'] = (isset($this->session->data['additional_service_checked']['delivery'])) ? $this->session->data['additional_service_checked']['delivery'] : [];
-                                $time['price']['shipping_method_code'] = $shipping_method_code;
-                                $time['price']['text_myparcel_price_delivery'] = date('d-m-Y',strtotime($value['date'])) . ' - ' . date('H:i',strtotime($time['start'])) . ' - ' .date('H:i',strtotime($time['end']));
-                                $this->session->data['myparcel_price_delivery'] = $time['price'];
                                 $this->session->data['shipping_methods'] = $shipping_methods;
 
+//                                $this->session->data['myparcel_shipping_choosed']['date'] = date('Y-m-d',strtotime($value['date']));
+//                                $this->session->data['myparcel_shipping_choosed']['time'][] = $time;
+//                                $this->session->data['myparcel_shipping_choosed']['code'] = 'myparcel_'. $shipping_method_code;
+//                                $this->session->data['myparcel_shipping_choosed']['additional_service'] = (isset($this->session->data['additional_service_checked']['delivery'])) ? $this->session->data['additional_service_checked']['delivery'] : [];
+//                                $time['price']['shipping_method_code'] = $shipping_method_code;
+//                                $time['price']['text_myparcel_price_delivery'] = date('d-m-Y',strtotime($value['date'])) . ' - ' . date('H:i',strtotime($time['start'])) . ' - ' .date('H:i',strtotime($time['end']));
+//                                $this->session->data['myparcel_price_delivery'] = $time['price'];
+//                                $this->session->data['myparcel_price_delivery']['myparcel_shipping_choosed'] = $this->session->data['myparcel_shipping_choosed'];
+                                $this->saveMyparcelPriceDelivery($value, $shipping_method_code, $time);
                                 break;
                             }
                         }
@@ -278,16 +317,18 @@ function save(){
                             if($time['start'] == $pickup_option_time[1]){
                                 $shipping_methods[$key_shipping]['quote'][$key_shipping]['cost'] = $time['price']['current_currency_amount'];
                                 $shipping_methods[$key_shipping]['quote'][$key_shipping]['text'] = $time['price']['current_currency_amount'];
-                                $time['price']['shipping_method_code'] = $shipping_method_code;
-                                $time['price']['text_myparcel_price_pickup'] =  $value['location'] . ' - ' .date('d-m-Y',strtotime($value['date'])) . ' - ' . date('H:i',strtotime($time['start']));
-                                $this->session->data['myparcel_price_pickup'] = $time['price'];
                                 $this->session->data['shipping_methods'] = $shipping_methods;
-                                $value['code'] = 'myparcel_'. $shipping_method_code;
-                                $value['additional_service'] = [];
-                                $value['time'] = [];
-                                $value['time'][] = $time;
-                                $this->session->data['myparcel_shipping_choosed'] = $value;
-                                $this->session->data['pickup_time_start'] = $time['start'];
+//                                $time['price']['shipping_method_code'] = $shipping_method_code;
+//                                $time['price']['text_myparcel_price_pickup'] =  $value['location'] . ' - ' .date('d-m-Y',strtotime($value['date'])) . ' - ' . date('H:i',strtotime($time['start']));
+//                                $this->session->data['myparcel_price_pickup'] = $time['price'];
+//                                $value['code'] = 'myparcel_'. $shipping_method_code;
+//                                $value['additional_service'] = [];
+//                                $value['time'] = [];
+//                                $value['time'][] = $time;
+//                                $this->session->data['myparcel_shipping_choosed'] = $value;
+//                                $this->session->data['myparcel_price_pickup']['myparcel_shipping_choosed'] = $this->session->data['myparcel_shipping_choosed'];
+//                                $this->session->data['pickup_time_start'] = $time['start'];
+                                $this->saveMyparcelPricePickup($value,$shipping_method_code,$time);
                                 break;
                             }
                         }
@@ -313,6 +354,13 @@ function save(){
     }
 
     function externalValidate(){
+        $myparcel_shipping_key = explode('.',$this->session->data['shipping_method']['code'])[0];
+        $myparcel_shipping_key = explode('_',$myparcel_shipping_key)[1];
+
+        if(isset($this->session->data['myparcel_price_' . $myparcel_shipping_key]['myparcel_shipping_choosed'])){
+            $this->session->data['myparcel_shipping_choosed'] = $this->session->data['myparcel_price_' . $myparcel_shipping_key]['myparcel_shipping_choosed'];
+        }
+
         if(!isset($this->session->data['myparcel_shipping_choosed'])){
             $json['warning'] = $this->language->get('error_external_validate');
             $json['action'] = 'index.php?route=' .MyParcel()->getMyparcelXtensionControllerPath();
@@ -363,4 +411,37 @@ function forgetMyParcelChoosed(){
         echo json_encode(array('status' => true));
         die();
     }
-}
\ No newline at end of file
+
+    function saveMyparcelPriceDelivery($delivery_option , $shipping_method_code, $time){
+
+        $this->data['delivery_time_start'] = $time['start'];
+        $this->data['delivery_time_end'] = $time['end'];
+        if(isset($this->session->data['myparcel_shipping_choosed'])){
+            unset($this->session->data['myparcel_shipping_choosed']);
+        }
+        $this->session->data['myparcel_shipping_choosed']['date'] = date('Y-m-d',strtotime($delivery_option['date']));
+        $this->session->data['myparcel_shipping_choosed']['time'][] = $time;
+        $this->session->data['myparcel_shipping_choosed']['code'] = 'myparcel_'. $shipping_method_code;
+        $this->session->data['myparcel_shipping_choosed']['additional_service'] = (isset($this->session->data['additional_service_checked']['delivery'])) ? $this->session->data['additional_service_checked']['delivery'] : [];
+        $time['price']['shipping_method_code'] = $shipping_method_code;
+        $time['price']['text_myparcel_price_delivery'] = date('d-m-Y',strtotime($delivery_option['date'])) . ' - ' . date('H:i',strtotime($time['start'])) . ' - ' .date('H:i',strtotime($time['end']));
+        $this->session->data['myparcel_price_delivery'] = $time['price'];
+        $this->session->data['myparcel_price_delivery']['myparcel_shipping_choosed'] = $this->session->data['myparcel_shipping_choosed'];
+    }
+
+    function saveMyparcelPricePickup($pickup_detail , $shipping_method_code, $time){
+        //select default option
+        $time['price']['shipping_method_code'] = $shipping_method_code;
+        $time['price']['text_myparcel_price_pickup'] =  $pickup_detail['location'] . ' - ' .date('d-m-Y',strtotime($pickup_detail['date'])) . ' - ' . date('H:i',strtotime($time['start']));
+        $this->session->data['myparcel_price_pickup'] = $time['price'];
+        $pickup_detail['code'] = 'myparcel_'. $shipping_method_code;
+        $pickup_detail['additional_service'] = [];
+        $pickup_detail['time'] = [];
+        $pickup_detail['time'][] = $time;
+        $this->session->data['myparcel_shipping_choosed'] = $pickup_detail;
+        $this->session->data['myparcel_price_pickup']['myparcel_shipping_choosed'] = $this->session->data['myparcel_shipping_choosed'];
+        $this->session->data['pickup_time_start'] = $time['start'];
+        $this->data['pickup_time_start'] = $time['start'];
+    }
+
+}
diff --git a/upload/catalog/controller/extension/myparcelnl/test.php b/upload/catalog/controller/extension/myparcelnl/test.php
old mode 100755
new mode 100644
diff --git a/upload/catalog/language/en-gb/extension/module/myparcelnl.php b/upload/catalog/language/en-gb/extension/module/myparcelnl.php
old mode 100755
new mode 100644
index 4c35b5a..9f16884
--- a/upload/catalog/language/en-gb/extension/module/myparcelnl.php
+++ b/upload/catalog/language/en-gb/extension/module/myparcelnl.php
@@ -5,6 +5,7 @@
 $_['mssg_order_status_changed_by_myparcel'] = 'MyParcel Order Status Automation';
 $_['email_track_trace'] = 'You can track your order with the following PostNL track&trace code:';
 
+$_['entry_track_trace'] = 'Track & Trace';
 $_['entry_delivery_date'] = 'Delivery date';
 $_['date_format'] = 'Y-m-d';
 $_['entry_delivery_time'] = 'Delivery time';
@@ -60,3 +61,7 @@
 $_['entry_delivery_morning'] = 'Morning';
 $_['entry_delivery_standard'] = 'Standard';
 $_['entry_delivery_avond'] = 'Avond';
+
+$_['entry_title_location'] = 'Location';
+
+$_['entry_myparcel_api_error_code_3505'] = 'The zip code entered is incorrect';
diff --git a/upload/catalog/language/nl-nl/extension/module/myparcelnl.php b/upload/catalog/language/nl-nl/extension/module/myparcelnl.php
old mode 100755
new mode 100644
index 9c9accc..9c35bcc
--- a/upload/catalog/language/nl-nl/extension/module/myparcelnl.php
+++ b/upload/catalog/language/nl-nl/extension/module/myparcelnl.php
@@ -5,6 +5,7 @@
 $_['mssg_order_status_changed_by_myparcel'] = 'Postnl Order Status Automation';
 $_['email_track_trace'] = 'Volg uw bestelling via de volgende PostNL track&trace code:';
 
+$_['entry_track_trace'] = 'Track & Trace';
 $_['entry_delivery_date'] = 'Bezorgdatum';
 $_['date_format'] = 'Y-m-d';
 $_['entry_delivery_time'] = 'Bezorgtijd';
@@ -53,10 +54,14 @@
 $_['entry_myparcel_pickup'] = 'Postnl Afhalen';
 $_['entry_select'] = 'Selecteer';
 $_['entry_date'] = 'Datum';
-$_['entry_pickup_from'] = 'Ophalen bij';
+$_['entry_pickup_from'] = 'Ophalen om';
 $_['entry_edit_myparcel_delivery'] = 'Bezorgdatum bewerken';
 $_['entry_edit_myparcel_pickup'] = 'Bewerk ophaaloptie';
 
 $_['entry_delivery_morning'] = 'Ochtend';
 $_['entry_delivery_standard'] = 'Standaard';
 $_['entry_delivery_avond'] = 'Avond';
+
+$_['entry_title_location'] = 'Plaats';
+
+$_['entry_myparcel_api_error_code_3505'] = 'De ingevoerde postcode is incorrect';
diff --git a/upload/catalog/model/extension/myparcelnl/helper.php b/upload/catalog/model/extension/myparcelnl/helper.php
old mode 100755
new mode 100644
diff --git a/upload/catalog/model/extension/myparcelnl/shipment.php b/upload/catalog/model/extension/myparcelnl/shipment.php
old mode 100755
new mode 100644
diff --git a/upload/catalog/model/extension/shipping/myparcel_shipping.php b/upload/catalog/model/extension/shipping/myparcel_shipping.php
old mode 100755
new mode 100644
diff --git a/upload/catalog/model/extension/total/myparcel_total.php b/upload/catalog/model/extension/total/myparcel_total.php
old mode 100755
new mode 100644
diff --git a/upload/catalog/view/theme/default/template/extension/myparcelnl/myparcel_xtension_delivery.twig b/upload/catalog/view/theme/default/template/extension/myparcelnl/myparcel_xtension_delivery.twig
old mode 100755
new mode 100644
diff --git a/upload/catalog/view/theme/default/template/extension/myparcelnl/myparcel_xtension_delivery_change.twig b/upload/catalog/view/theme/default/template/extension/myparcelnl/myparcel_xtension_delivery_change.twig
old mode 100755
new mode 100644
diff --git a/upload/catalog/view/theme/default/template/extension/myparcelnl/myparcel_xtension_pickup_change.twig b/upload/catalog/view/theme/default/template/extension/myparcelnl/myparcel_xtension_pickup_change.twig
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/.htaccess b/upload/system/library/myparcelnl/assets/.htaccess
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/css/checkout.css b/upload/system/library/myparcelnl/assets/css/checkout.css
old mode 100755
new mode 100644
index 31686f4..7af4a13
--- a/upload/system/library/myparcelnl/assets/css/checkout.css
+++ b/upload/system/library/myparcelnl/assets/css/checkout.css
@@ -82,4 +82,8 @@
     font-weight: 600;
     color: #777;
     margin-left: 25px;
-}
\ No newline at end of file
+}
+#myparcel_pickup_location{
+    font-size: 15px;
+    height: 40px;
+}
diff --git a/upload/system/library/myparcelnl/assets/css/colorpicker.css b/upload/system/library/myparcelnl/assets/css/colorpicker.css
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/css/magnific-popup.css b/upload/system/library/myparcelnl/assets/css/magnific-popup.css
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/css/myparcel_global.css b/upload/system/library/myparcelnl/assets/css/myparcel_global.css
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/css/myparcelnl.css b/upload/system/library/myparcelnl/assets/css/myparcelnl.css
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/css/order.css b/upload/system/library/myparcelnl/assets/css/order.css
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/css/select2.css b/upload/system/library/myparcelnl/assets/css/select2.css
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/css/sweetalert.min.css b/upload/system/library/myparcelnl/assets/css/sweetalert.min.css
new file mode 100644
index 0000000..62ea723
--- /dev/null
+++ b/upload/system/library/myparcelnl/assets/css/sweetalert.min.css
@@ -0,0 +1 @@
+.sweet-alert,.sweet-overlay{position:fixed;display:none}.sweet-alert,.sweet-alert .form-group,.sweet-alert .form-group .sa-input-error{display:none}@keyframes showSweetAlert{0%{transform:scale(.7)}45%{transform:scale(1.05)}80%{transform:scale(.95)}100%{transform:scale(1)}}@keyframes hideSweetAlert{0%{transform:scale(1)}100%{transform:scale(.5)}}@keyframes slideFromTop{0%{top:0}100%{top:50%}}@keyframes slideToTop{0%{top:50%}100%{top:0}}@keyframes slideFromBottom{0%{top:70%}100%{top:50%}}@keyframes slideToBottom{0%{top:50%}100%{top:70%}}.showSweetAlert{animation:showSweetAlert .3s}.showSweetAlert[data-animation=none]{animation:none}.showSweetAlert[data-animation=slide-from-top]{animation:slideFromTop .3s}.showSweetAlert[data-animation=slide-from-bottom]{animation:slideFromBottom .3s}.hideSweetAlert{animation:hideSweetAlert .3s}.hideSweetAlert[data-animation=none]{animation:none}.hideSweetAlert[data-animation=slide-from-top]{animation:slideToTop .3s}.hideSweetAlert[data-animation=slide-from-bottom]{animation:slideToBottom .3s}@keyframes animateSuccessTip{0%,54%{width:0;left:1px;top:19px}70%{width:50px;left:-8px;top:37px}84%{width:17px;left:21px;top:48px}100%{width:25px;left:14px;top:45px}}@keyframes animateSuccessLong{0%,65%{width:0;right:46px;top:54px}84%{width:55px;right:0;top:35px}100%{width:47px;right:8px;top:38px}}@keyframes rotatePlaceholder{0%,5%{transform:rotate(-45deg)}100%,12%{transform:rotate(-405deg)}}.animateSuccessTip{animation:animateSuccessTip .75s}.animateSuccessLong{animation:animateSuccessLong .75s}.sa-icon.sa-success.animate::after{animation:rotatePlaceholder 4.25s ease-in}@keyframes animateErrorIcon{0%{transform:rotateX(100deg);opacity:0}100%{transform:rotateX(0);opacity:1}}.animateErrorIcon{animation:animateErrorIcon .5s}@keyframes animateXMark{0%,50%{transform:scale(.4);margin-top:26px;opacity:0}80%{transform:scale(1.15);margin-top:-6px}100%{transform:scale(1);margin-top:0;opacity:1}}.animateXMark{animation:animateXMark .5s}@keyframes pulseWarning{0%{border-color:#F8D486}100%{border-color:#F8BB86}}.pulseWarning{animation:pulseWarning .75s infinite alternate}@keyframes pulseWarningIns{0%{background-color:#F8D486}100%{background-color:#F8BB86}}.pulseWarningIns{animation:pulseWarningIns .75s infinite alternate}@keyframes rotate-loading{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}body.stop-scrolling{height:100%;overflow:hidden}.sweet-overlay{background-color:rgba(0,0,0,.4);left:0;right:0;top:0;bottom:0;z-index:1040}.sweet-alert{background-color:#fff;width:478px;padding:17px;border-radius:5px;text-align:center;left:50%;top:50%;margin-left:-256px;margin-top:-200px;overflow:hidden;z-index:2000}@media all and (max-width:767px){.sweet-alert{width:auto;margin-left:0;margin-right:0;left:15px;right:15px}}.sweet-alert.show-input .form-group{display:block}.sweet-alert .sa-confirm-button-container{display:inline-block;position:relative}.sweet-alert .la-ball-fall{position:absolute;left:50%;top:50%;margin-left:-27px;margin-top:-9px;opacity:0;visibility:hidden}.sweet-alert button[disabled]{opacity:.6;cursor:default}.sweet-alert button.confirm[disabled]{color:transparent}.sweet-alert button.confirm[disabled]~.la-ball-fall{opacity:1;visibility:visible;transition-delay:0s}.sweet-alert .sa-icon{width:80px;height:80px;border:4px solid gray;border-radius:50%;margin:20px auto;position:relative;box-sizing:content-box}.sweet-alert .sa-icon.sa-error{border-color:#d43f3a}.sweet-alert .sa-icon.sa-error .sa-x-mark{position:relative;display:block}.sweet-alert .sa-icon.sa-error .sa-line{position:absolute;height:5px;width:47px;background-color:#d9534f;display:block;top:37px;border-radius:2px}.sweet-alert .sa-icon.sa-error .sa-line.sa-left{transform:rotate(45deg);left:17px}.sweet-alert .sa-icon.sa-error .sa-line.sa-right{transform:rotate(-45deg);right:16px}.sweet-alert .sa-icon.sa-warning{border-color:#eea236}.sweet-alert .sa-icon.sa-warning .sa-body{position:absolute;width:5px;height:47px;left:50%;top:10px;border-radius:2px;margin-left:-2px;background-color:#f0ad4e}.sweet-alert .sa-icon.sa-warning .sa-dot{position:absolute;width:7px;height:7px;border-radius:50%;margin-left:-3px;left:50%;bottom:10px;background-color:#f0ad4e}.sweet-alert .sa-icon.sa-info::after,.sweet-alert .sa-icon.sa-info::before{content:"";background-color:#5bc0de;position:absolute}.sweet-alert .sa-icon.sa-info{border-color:#46b8da}.sweet-alert .sa-icon.sa-info::before{width:5px;height:29px;left:50%;bottom:17px;border-radius:2px;margin-left:-2px}.sweet-alert .sa-icon.sa-info::after{width:7px;height:7px;border-radius:50%;margin-left:-3px;top:19px}.sweet-alert .sa-icon.sa-success{border-color:#4cae4c}.sweet-alert .sa-icon.sa-success::after,.sweet-alert .sa-icon.sa-success::before{content:'';position:absolute;width:60px;height:120px;background:#fff}.sweet-alert .sa-icon.sa-success::before{border-radius:120px 0 0 120px;top:-7px;left:-33px;transform:rotate(-45deg);transform-origin:60px 60px}.sweet-alert .sa-icon.sa-success::after{border-radius:0 120px 120px 0;top:-11px;left:30px;transform:rotate(-45deg);transform-origin:0 60px}.sweet-alert .sa-icon.sa-success .sa-placeholder{width:80px;height:80px;border:4px solid rgba(92,184,92,.2);border-radius:50%;box-sizing:content-box;position:absolute;left:-4px;top:-4px;z-index:2}.sweet-alert .sa-icon.sa-success .sa-fix{width:5px;height:90px;background-color:#fff;position:absolute;left:28px;top:8px;z-index:1;transform:rotate(-45deg)}.sweet-alert .sa-icon.sa-success .sa-line{height:5px;background-color:#5cb85c;display:block;border-radius:2px;position:absolute;z-index:2}.sweet-alert .sa-icon.sa-success .sa-line.sa-tip{width:25px;left:14px;top:46px;transform:rotate(45deg)}.sweet-alert .sa-icon.sa-success .sa-line.sa-long{width:47px;right:8px;top:38px;transform:rotate(-45deg)}.sweet-alert .sa-icon.sa-custom{background-size:contain;border-radius:0;border:none;background-position:center center;background-repeat:no-repeat}.sweet-alert .btn-default:focus{border-color:#ccc;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(204,204,204,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(204,204,204,.6)}.sweet-alert .btn-success:focus{border-color:#4cae4c;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(76,174,76,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(76,174,76,.6)}.sweet-alert .btn-info:focus{border-color:#46b8da;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(70,184,218,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(70,184,218,.6)}.sweet-alert .btn-danger:focus{border-color:#d43f3a;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(212,63,58,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(212,63,58,.6)}.sweet-alert .btn-warning:focus{border-color:#eea236;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(238,162,54,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(238,162,54,.6)}.sweet-alert button::-moz-focus-inner{border:0}.la-ball-fall,.la-ball-fall>div{position:relative;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.la-ball-fall{display:block;font-size:0;color:#fff;width:54px;height:18px}.la-ball-fall.la-dark{color:#333}.la-ball-fall>div{display:inline-block;float:none;background-color:currentColor;border:0 solid currentColor;width:10px;height:10px;margin:4px;border-radius:100%;opacity:0;-webkit-animation:ball-fall 1s ease-in-out infinite;-moz-animation:ball-fall 1s ease-in-out infinite;-o-animation:ball-fall 1s ease-in-out infinite;animation:ball-fall 1s ease-in-out infinite}.la-ball-fall>div:nth-child(1){-webkit-animation-delay:-.2s;-moz-animation-delay:-.2s;-o-animation-delay:-.2s;animation-delay:-.2s}.la-ball-fall>div:nth-child(2){-webkit-animation-delay:-.1s;-moz-animation-delay:-.1s;-o-animation-delay:-.1s;animation-delay:-.1s}.la-ball-fall>div:nth-child(3){-webkit-animation-delay:0s;-moz-animation-delay:0s;-o-animation-delay:0s;animation-delay:0s}.la-ball-fall.la-sm{width:26px;height:8px}.la-ball-fall.la-sm>div{width:4px;height:4px;margin:2px}.la-ball-fall.la-2x{width:108px;height:36px}.la-ball-fall.la-2x>div{width:20px;height:20px;margin:8px}.la-ball-fall.la-3x{width:162px;height:54px}.la-ball-fall.la-3x>div{width:30px;height:30px;margin:12px}@-webkit-keyframes ball-fall{0%{opacity:0;-webkit-transform:translateY(-145%);transform:translateY(-145%)}10%,90%{opacity:.5}20%,80%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}100%{opacity:0;-webkit-transform:translateY(145%);transform:translateY(145%)}}@-moz-keyframes ball-fall{0%{opacity:0;-moz-transform:translateY(-145%);transform:translateY(-145%)}10%,90%{opacity:.5}20%,80%{opacity:1;-moz-transform:translateY(0);transform:translateY(0)}100%{opacity:0;-moz-transform:translateY(145%);transform:translateY(145%)}}@-o-keyframes ball-fall{0%{opacity:0;-o-transform:translateY(-145%);transform:translateY(-145%)}10%,90%{opacity:.5}20%,80%{opacity:1;-o-transform:translateY(0);transform:translateY(0)}100%{opacity:0;-o-transform:translateY(145%);transform:translateY(145%)}}@keyframes ball-fall{0%{opacity:0;-webkit-transform:translateY(-145%);-moz-transform:translateY(-145%);-o-transform:translateY(-145%);transform:translateY(-145%)}10%,90%{opacity:.5}20%,80%{opacity:1;-webkit-transform:translateY(0);-moz-transform:translateY(0);-o-transform:translateY(0);transform:translateY(0)}100%{opacity:0;-webkit-transform:translateY(145%);-moz-transform:translateY(145%);-o-transform:translateY(145%);transform:translateY(145%)}}/*# sourceMappingURL=sweetalert.min.css.map */
\ No newline at end of file
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/blank.gif b/upload/system/library/myparcelnl/assets/img/colorpicker/blank.gif
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_background.png b/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_background.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_hex.png b/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_hex.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_hsb_b.png b/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_hsb_b.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_hsb_h.png b/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_hsb_h.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_hsb_s.png b/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_hsb_s.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_indic.gif b/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_indic.gif
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_overlay.png b/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_overlay.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_rgb_b.png b/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_rgb_b.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_rgb_g.png b/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_rgb_g.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_rgb_r.png b/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_rgb_r.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_select.gif b/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_select.gif
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_submit.png b/upload/system/library/myparcelnl/assets/img/colorpicker/colorpicker_submit.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/custom_background.png b/upload/system/library/myparcelnl/assets/img/colorpicker/custom_background.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/custom_hex.png b/upload/system/library/myparcelnl/assets/img/colorpicker/custom_hex.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/custom_hsb_b.png b/upload/system/library/myparcelnl/assets/img/colorpicker/custom_hsb_b.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/custom_hsb_h.png b/upload/system/library/myparcelnl/assets/img/colorpicker/custom_hsb_h.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/custom_hsb_s.png b/upload/system/library/myparcelnl/assets/img/colorpicker/custom_hsb_s.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/custom_indic.gif b/upload/system/library/myparcelnl/assets/img/colorpicker/custom_indic.gif
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/custom_rgb_b.png b/upload/system/library/myparcelnl/assets/img/colorpicker/custom_rgb_b.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/custom_rgb_g.png b/upload/system/library/myparcelnl/assets/img/colorpicker/custom_rgb_g.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/custom_rgb_r.png b/upload/system/library/myparcelnl/assets/img/colorpicker/custom_rgb_r.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/custom_submit.png b/upload/system/library/myparcelnl/assets/img/colorpicker/custom_submit.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/select.png b/upload/system/library/myparcelnl/assets/img/colorpicker/select.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/select2.png b/upload/system/library/myparcelnl/assets/img/colorpicker/select2.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/colorpicker/slider.png b/upload/system/library/myparcelnl/assets/img/colorpicker/slider.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/download-pdf.png b/upload/system/library/myparcelnl/assets/img/download-pdf.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/icon.png b/upload/system/library/myparcelnl/assets/img/icon.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/icon_delivery_details.png b/upload/system/library/myparcelnl/assets/img/icon_delivery_details.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/icon_delivery_options.png b/upload/system/library/myparcelnl/assets/img/icon_delivery_options.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/icon_track_trace.png b/upload/system/library/myparcelnl/assets/img/icon_track_trace.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/loading.gif b/upload/system/library/myparcelnl/assets/img/loading.gif
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/myparcel-pdf.png b/upload/system/library/myparcelnl/assets/img/myparcel-pdf.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/myparcel-retour.png b/upload/system/library/myparcelnl/assets/img/myparcel-retour.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/myparcel-spin.gif b/upload/system/library/myparcelnl/assets/img/myparcel-spin.gif
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/img/myparcel-up.png b/upload/system/library/myparcelnl/assets/img/myparcel-up.png
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/js/checkout.aqc.js b/upload/system/library/myparcelnl/assets/js/checkout.aqc.js
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/js/checkout.js b/upload/system/library/myparcelnl/assets/js/checkout.js
old mode 100755
new mode 100644
index edd6ec3..b39258b
--- a/upload/system/library/myparcelnl/assets/js/checkout.js
+++ b/upload/system/library/myparcelnl/assets/js/checkout.js
@@ -17,7 +17,6 @@ var MYPARCEL_CHECKOUT = MYPARCEL_CHECKOUT || {};
 
     MYPARCEL_CHECKOUT.event = {
         addEventListener: function() {
-
             /**
              * [Event Ajax Complete]
              * Executed when an ajax after checkout is fired
@@ -41,6 +40,19 @@ var MYPARCEL_CHECKOUT = MYPARCEL_CHECKOUT || {};
                     return true;
                 }
 
+                if(settings.url.indexOf('route=journal3/checkout/payment') > 0){
+
+                    var height = '450px';
+                    if($('#myparcel_delivery_iframe_height').length > 0){
+                        height = $('#myparcel_delivery_iframe_height').val();
+                    }
+
+                    $("#myparcel-iframe").css({'height': height});
+                    var a = MYPARCEL_CHECKOUT.activateIframe();
+                    return true;
+                }
+
+
                 if (
                     settings.url.indexOf('checkout/shipping_address') >= 0
                     ||
@@ -160,10 +172,10 @@ var MYPARCEL_CHECKOUT = MYPARCEL_CHECKOUT || {};
             });
 
             $(document).on('change', '#mypa-input', function() {
-               if ($(this).val()) {
-                   $('#button-shipping-method').prop('disabled', false);
-                   document.cookie = "myparcel_empty_results=0";
-               }
+                if ($(this).val()) {
+                    $('#button-shipping-method').prop('disabled', false);
+                    document.cookie = "myparcel_empty_results=0";
+                }
             });
             /**
              * [Event Click]
@@ -295,7 +307,6 @@ var MYPARCEL_CHECKOUT = MYPARCEL_CHECKOUT || {};
     };
 
     MYPARCEL_CHECKOUT.isActive = function() {
-
         return window.enable_delivery;
     };
 
@@ -346,14 +357,12 @@ var MYPARCEL_CHECKOUT = MYPARCEL_CHECKOUT || {};
     MYPARCEL_CHECKOUT.activateIframe = function() {
 
         $('#button-shipping-method').prop('disabled', true);
-
         // If delivery iFrame is not enabled then ignore this function
         if (!MYPARCEL_CHECKOUT.isActive()) {
             return true;
         }
 
         el = document.getElementById('myparcel-iframe');
-
         if (typeof el === 'undefined' || !el) {
             return false;
         }
@@ -419,7 +428,7 @@ var MYPARCEL_CHECKOUT = MYPARCEL_CHECKOUT || {};
         });
     };
 
-    MYPARCEL_CHECKOUT.journalThemeEventActivated = function () {
+    MYPARCEL_CHECKOUT.journalThemeEventActivated = function (upload_page = false, option_change = false) {
         var currentTheme = window.myparcel_current_theme;//$(".journal-checkout").length;
         if (currentTheme == 'journal2') {
             $.ajax({
@@ -450,11 +459,65 @@ var MYPARCEL_CHECKOUT = MYPARCEL_CHECKOUT || {};
                 }
             });
         }
+        else if(currentTheme == 'journal3'){
+            option_change = (option_change) ? 1 : 0;
+            $('#is_change_option').val(option_change);
+            $.ajax({
+                cache: false,
+                url: 'index.php?route=extension/myparcelnl/myparcel_delivery/set_session',
+                type: 'post',
+                data: $('.parcel-shipping-method, #mypa-input, #mypa-signed:checked, #mypa-recipient-only:checked, #is_change_option'),
+                dataType: 'json',
+                success: function (response) {
+                    if(response.status == 'success'){
+                        if((typeof response.update_page != 'undefined' && response.update_page) || upload_page){
+                            window['_QuickCheckout'].save();
+                        }
+                        if(response.html != ''){
+                            var element = $('.cart-section').find('.table-bordered');
+                            element = element[element.length-1];
+                            $(element).find('tfoot').remove();
+                            $(element).html(response.html);
+                        }
+
+                        if(typeof response.shipping_method_code !='undefined'){
+                            if(typeof response.myparcel_shipping_code != 'undefined' && response.myparcel_shipping_code == response.shipping_method_code ){
+                                window['_QuickCheckout'].order_data.shipping_code = response.shipping_method_code;
+                            }
+                            var shipping_method_elements = $("input[name=shipping_method]");
+                            for (var i = 0; i< shipping_method_elements.length ; i++ ){
+                                if($(shipping_method_elements[i]).val() == response.shipping_method_code){
+                                    $(shipping_method_elements[i]).prop('checked', true);
+                                }
+                                else{
+                                    $(shipping_method_elements[i]).prop('checked', false);
+                                }
+                            }
+                        }
+                        if(typeof response.is_close_delivery_options != 'undefined' && response.is_close_delivery_options){
+
+                            var shipping_method_quote = $('input[name="shipping_method"]:checked').val();
+
+                            var parts = shipping_method_quote.split(".");
+                            if (parts && parts.length == 2) {
+                                var shipping_method = parts[0];
+                                // If current shipping method does not belong to Parcel, hide iframe or saved delivery options
+                                if ($.inArray(shipping_method, window.myparcel_delivery_options_shipping_methods) === -1) {
+                                    window.parent.window.MYPARCEL_CHECKOUT.eventDeactivated()
+                                }
+                            }
+                        }
+                    }
+                },
+                error: function (xhr, ajaxOptions, thrownError) {
+                    console.error && console.error(thrownError + "\r\n" + xhr.statusText + "\r\n" + xhr.responseText);
+                }
+            });
+        }
     }
-    
+
     $(document).ready(function ($) {
         MYPARCEL_CHECKOUT.initialize.onReady();
-
         $(document).delegate('input[name*="address_1"], input[name*="address_2"]', 'change', function () {
             var $this = $('input[name="shipping_address"]');
 
@@ -470,4 +533,4 @@ var MYPARCEL_CHECKOUT = MYPARCEL_CHECKOUT || {};
     window.mypaLoaded = function() {
         return true;
     };
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/upload/system/library/myparcelnl/assets/js/colorpicker.js b/upload/system/library/myparcelnl/assets/js/colorpicker.js
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/js/delivery-iframe/moment.min.js b/upload/system/library/myparcelnl/assets/js/delivery-iframe/moment.min.js
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/js/delivery-iframe/myparcel-iframe.js b/upload/system/library/myparcelnl/assets/js/delivery-iframe/myparcel-iframe.js
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/js/delivery-iframe/myparcel.js b/upload/system/library/myparcelnl/assets/js/delivery-iframe/myparcel.js
old mode 100755
new mode 100644
index e3a69d4..6ed5ba3
--- a/upload/system/library/myparcelnl/assets/js/delivery-iframe/myparcel.js
+++ b/upload/system/library/myparcelnl/assets/js/delivery-iframe/myparcel.js
@@ -474,7 +474,7 @@
         // End custom code
         // Custom code for journal2 theme
         $("#mypa-delivery-options-container").on("click", "input[name='mypa-delivery-time'], input[name='mypa-delivery-type'], .mypa-onoffswitch-checkbox,  input[name='mypa-pickup-option']", function(){
-            window.parent.window.MYPARCEL_CHECKOUT.journalThemeEventActivated();
+            window.parent.window.MYPARCEL_CHECKOUT.journalThemeEventActivated(false,true);
         });
         return updateInputField();
     };
@@ -796,4 +796,4 @@
         }
     };
 
-}).call(this);
\ No newline at end of file
+}).call(this);
diff --git a/upload/system/library/myparcelnl/assets/js/delivery-iframe/myparcel_old.js b/upload/system/library/myparcelnl/assets/js/delivery-iframe/myparcel_old.js
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/js/delivery-iframe/webcomponents.min.js b/upload/system/library/myparcelnl/assets/js/delivery-iframe/webcomponents.min.js
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/js/magnific-popup.min.js b/upload/system/library/myparcelnl/assets/js/magnific-popup.min.js
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/js/myparcel_global.js b/upload/system/library/myparcelnl/assets/js/myparcel_global.js
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/js/myparcelnl.js b/upload/system/library/myparcelnl/assets/js/myparcelnl.js
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/js/order.js b/upload/system/library/myparcelnl/assets/js/order.js
old mode 100755
new mode 100644
index 7fe3f30..af5ec6a
--- a/upload/system/library/myparcelnl/assets/js/order.js
+++ b/upload/system/library/myparcelnl/assets/js/order.js
@@ -24,10 +24,10 @@ var MYPARCEL_SHIPMENT = MYPARCEL_SHIPMENT || {};
                 var button_id = '#btn-myparcel-' + action + '-' + order_id;
 
                 var data = {
-                        order_ids: [order_id],
-                        action: action,
-                        screen: screen
-                    };
+                    order_ids: [order_id],
+                    action: action,
+                    screen: screen
+                };
 
                 $.ajax({
                     url: $(this).attr('href'),
@@ -50,7 +50,7 @@ var MYPARCEL_SHIPMENT = MYPARCEL_SHIPMENT || {};
                             }
                         }
                         else{
-                            alert(res.errors.join('.'));
+                            swal(res.errors.join('.'));
                         }
                         MYPARCEL_SHIPMENT.helper.enableActionButtons(order_id);
                     },
@@ -87,7 +87,8 @@ var MYPARCEL_SHIPMENT = MYPARCEL_SHIPMENT || {};
                     }
                 }
                 if(position_label.length > 1){
-                    alert('You only choose 1 position.')
+                    $('#position_label_modal_' + order_id).modal('hide');
+                    swal('You only choose 1 position.');
                     return false;
                 }
 
@@ -291,9 +292,9 @@ var MYPARCEL_SHIPMENT = MYPARCEL_SHIPMENT || {};
 
                                 $('input[name="selected[]"]').prop('checked', false)
                             }
-                            
+
                         } else{
-                            alert(error_text);
+                            swal(error_text);
                             console.log(res.errors);
                             location.reload();
                         }
@@ -312,17 +313,52 @@ var MYPARCEL_SHIPMENT = MYPARCEL_SHIPMENT || {};
                 if ($('input[name="selected[]"]:checked').length <= 0) {
                     return false;
                 }
-                unCheckAllPaper();
-                var elePosition = $('#position_label_modal .a6-label');
+
                 var eleInputSeleted = $('input[name="selected[]"]:checked');
-                var count = elePosition.length;
-                if(count > eleInputSeleted.length){
-                    count = eleInputSeleted.length
+                //order have not been exported yet
+                var orderNotExported = new Array();
+                var errorMessage = '';
+                for (i = 0; i < eleInputSeleted.length; i++){
+                    if($('#btn-myparcel-get_labels-' + $(eleInputSeleted[i]).val()).length == 0){
+                        orderNotExported.push('#'+ $(eleInputSeleted[i]).val());
+                        $(eleInputSeleted[i]).prop('checked',false);
+                    }
                 }
-                for (var i = 0; i < count; i++){
-                    $(elePosition[i]).click();
+                if(orderNotExported.length > 0){
+                    if(orderNotExported.length > 1){
+                        var lastOrderId = orderNotExported.pop();
+                        errorMessage = 'You are trying to download labels but Orders ' + orderNotExported.join(',') + ' and ' + lastOrderId + ' have not been exported yet.'
+                    }
+                    else{
+                        errorMessage = 'You are trying to download labels but Order ' + orderNotExported.pop() + ' has not been exported yet.'
+                    }
+
+                    if ($('input[name="selected[]"]:checked').length <= 0) {
+                        // alert(errorMessage  + ' Please choose other orders!');
+                        swal(errorMessage  + ' Please choose other orders!');
+                        return false;
+                    }
+                    extensionMessage = 'Do you want to download the labels of the orders which have been exported?';
+                    swal({
+                            title: "",
+                            text: errorMessage + extensionMessage,
+                            type: "warning",
+                            showCancelButton: true,
+                            confirmButtonClass: "btn-primary",
+                            confirmButtonText: "OK",
+                            cancelButtonText: "Cancel",
+                            closeOnConfirm: true,
+                            closeOnCancel: true
+                        },
+                        function(isConfirm) {
+                            if (isConfirm) {
+                                showPositionModal();
+                            }
+                        });
+                    return false;
                 }
-                $('#position_label_modal').modal('show');
+
+                showPositionModal();
                 return false;
 
             });
@@ -341,7 +377,8 @@ var MYPARCEL_SHIPMENT = MYPARCEL_SHIPMENT || {};
                     }
                 }
                 if(position_label.length > eleInputSeleted.length){
-                    alert('You can only select up to '+ eleInputSeleted.length +' position.')
+                    $('#position_label_modal').modal('hide');
+                    swal('You can only select up to '+ eleInputSeleted.length +' position.');
                     return false;
                 }
                 //position_label.sort();
@@ -355,19 +392,34 @@ var MYPARCEL_SHIPMENT = MYPARCEL_SHIPMENT || {};
             $(document).on('click','.a6-label',function () {
                 var element = this;
 
-               if($(element).hasClass('active')){
-                   $(element).removeClass('active');
-                   $(element).find('.fa-check').addClass('hidden');
-                   $(element).find('.fa-times').removeClass('hidden');
-               }
-               else{
-                   $(element).addClass('active');
-                   $(element).find('.fa-check').removeClass('hidden');
-                   $(element).find('.fa-times').addClass('hidden');
-               }
+                if($(element).hasClass('active')){
+                    $(element).removeClass('active');
+                    $(element).find('.fa-check').addClass('hidden');
+                    $(element).find('.fa-times').removeClass('hidden');
+                }
+                else{
+                    $(element).addClass('active');
+                    $(element).find('.fa-check').removeClass('hidden');
+                    $(element).find('.fa-times').addClass('hidden');
+                }
 
             });
 
+            function showPositionModal() {
+                unCheckAllPaper();
+                var elePosition = $('#position_label_modal .a6-label');
+                var eleInputSeleted = $('input[name="selected[]"]:checked');
+                var count = elePosition.length;
+                if(count > eleInputSeleted.length){
+                    count = eleInputSeleted.length
+                }
+                for (var i = 0; i < count; i++){
+                    $(elePosition[i]).click();
+                }
+                $('#position_label_modal').modal('show');
+                return false;
+            }
+
             function unCheckAllPaper(){
                 var element = $('#position_label_modal .a6-label');
                 for(var i = 0; i< element.length; i++){
@@ -453,14 +505,14 @@ var MYPARCEL_SHIPMENT = MYPARCEL_SHIPMENT || {};
                     order_id:   order_id,
                     form_data:  form_data,
                 };
-                
+
                 $.ajax({
                     url: url,
                     data: data,
                     type: 'POST',
                     dataType: 'json',
                     beforeSend: function() {
-                       $form.find('.oc_save_shipment_settings .waiting').show();
+                        $form.find('.oc_save_shipment_settings .waiting').show();
                     },
                     success: function(res) {
                         if (res.status == 'error') {
@@ -471,7 +523,7 @@ var MYPARCEL_SHIPMENT = MYPARCEL_SHIPMENT || {};
                         }else{
                             // set main text to selection
                             $package_type_text_element.text(package_type);
-                        
+
                             // hide spinner
                             $form.find('.oc_save_shipment_settings .waiting').hide();
                             //remove div errors
@@ -479,7 +531,7 @@ var MYPARCEL_SHIPMENT = MYPARCEL_SHIPMENT || {};
 
                             // hide the form
                             $form.slideUp();
-                            
+
                         }
                     },
 
@@ -490,15 +542,30 @@ var MYPARCEL_SHIPMENT = MYPARCEL_SHIPMENT || {};
             // hide all options if not a parcel
             $(document).on('change', 'select.package_type', function () {
                 var parcel_options  = $( this ).closest('table').parent().find('.parcel_options');
+                var digital_stamp_options  = $( this ).closest('table').parent().find('.digital_stamp_options');
                 if ( $( this ).val() == '1') {
                     // parcel
                     $( parcel_options ).find('input, textarea, button, select').prop('disabled', false);
                     $( parcel_options ).show();
                     $( parcel_options ).find('.insured').change();
+                    $( digital_stamp_options ).find(' select').prop('disabled', true);
+                    $( digital_stamp_options ).hide();
+                } else if($( this ).val() == '4'){
+                    //digital stamp type
+                    $( digital_stamp_options ).find(' select').prop('disabled', false);
+                    $( digital_stamp_options ).show();
+
+                    $( parcel_options ).find('input, textarea, button, select').prop('disabled', true);
+                    $( parcel_options ).hide();
+
                 } else {
                     // not a parcel
                     $( parcel_options ).find('input, textarea, button, select').prop('disabled', true);
                     $( parcel_options ).hide();
+
+                    //disable digital stamp options
+                    $( digital_stamp_options ).find(' select').prop('disabled', true);
+                    $( digital_stamp_options ).hide();
                     // No need the 2 lines below because "not a parcel" packages have no addition options and "insured" will be filtered in backend code
                     //$( parcel_options ).find('.insured').prop('checked', false);
                     //$( parcel_options ).find('.insured').change();
@@ -566,7 +633,7 @@ var MYPARCEL_SHIPMENT = MYPARCEL_SHIPMENT || {};
                         $( insured_input ).prop('disabled', true);
                         $( insured_input ).closest('tr').hide();
                     }
-                    
+
                 }
             }).change(); //ensure visible state matches initially
             $('.ocmyparcel_settings_table select.insured_amount').change();
@@ -600,4 +667,4 @@ var MYPARCEL_SHIPMENT = MYPARCEL_SHIPMENT || {};
 
 function htmlEntities(str) {
     return String(str).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
-}
\ No newline at end of file
+}
diff --git a/upload/system/library/myparcelnl/assets/js/select2.min.js b/upload/system/library/myparcelnl/assets/js/select2.min.js
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/assets/js/sweetalert.min.js b/upload/system/library/myparcelnl/assets/js/sweetalert.min.js
new file mode 100644
index 0000000..53960d6
--- /dev/null
+++ b/upload/system/library/myparcelnl/assets/js/sweetalert.min.js
@@ -0,0 +1 @@
+!function(a,b,c){"use strict";!function d(a,b,c){function e(g,h){if(!b[g]){if(!a[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=b[g]={exports:{}};a[g][0].call(k.exports,function(b){var c=a[g][1][b];return e(c?c:b)},k,k.exports,d,a,b,c)}return b[g].exports}for(var f="function"==typeof require&&require,g=0;g<c.length;g++)e(c[g]);return e}({1:[function(a,b,c){Object.defineProperty(c,"__esModule",{value:!0});var d={title:"",text:"",type:null,allowOutsideClick:!1,showConfirmButton:!0,showCancelButton:!1,closeOnConfirm:!0,closeOnCancel:!0,confirmButtonText:"OK",confirmButtonClass:"btn-primary",cancelButtonText:"Cancel",cancelButtonClass:"btn-default",containerClass:"",titleClass:"",textClass:"",imageUrl:null,imageSize:null,timer:null,customClass:"",html:!1,animation:!0,allowEscapeKey:!0,inputType:"text",inputPlaceholder:"",inputValue:"",showLoaderOnConfirm:!1};c["default"]=d},{}],2:[function(b,d,e){Object.defineProperty(e,"__esModule",{value:!0}),e.handleCancel=e.handleConfirm=e.handleButton=c;var f=(b("./handle-swal-dom"),b("./handle-dom")),g=function(b,c,d){var e,g,j,k=b||a.event,l=k.target||k.srcElement,m=-1!==l.className.indexOf("confirm"),n=-1!==l.className.indexOf("sweet-overlay"),o=(0,f.hasClass)(d,"visible"),p=c.doneFunction&&"true"===d.getAttribute("data-has-done-function");switch(m&&c.confirmButtonColor&&(e=c.confirmButtonColor,g=colorLuminance(e,-.04),j=colorLuminance(e,-.14)),k.type){case"click":var q=d===l,r=(0,f.isDescendant)(d,l);if(!q&&!r&&o&&!c.allowOutsideClick)break;m&&p&&o?h(d,c):p&&o||n?i(d,c):(0,f.isDescendant)(d,l)&&"BUTTON"===l.tagName&&sweetAlert.close()}},h=function(a,b){var c=!0;(0,f.hasClass)(a,"show-input")&&(c=a.querySelector("input").value,c||(c="")),b.doneFunction(c),b.closeOnConfirm&&sweetAlert.close(),b.showLoaderOnConfirm&&sweetAlert.disableButtons()},i=function(a,b){var c=String(b.doneFunction).replace(/\s/g,""),d="function("===c.substring(0,9)&&")"!==c.substring(9,10);d&&b.doneFunction(!1),b.closeOnCancel&&sweetAlert.close()};e.handleButton=g,e.handleConfirm=h,e.handleCancel=i},{"./handle-dom":3,"./handle-swal-dom":5}],3:[function(c,d,e){Object.defineProperty(e,"__esModule",{value:!0});var f=function(a,b){return new RegExp(" "+b+" ").test(" "+a.className+" ")},g=function(a,b){f(a,b)||(a.className+=" "+b)},h=function(a,b){var c=" "+a.className.replace(/[\t\r\n]/g," ")+" ";if(f(a,b)){for(;c.indexOf(" "+b+" ")>=0;)c=c.replace(" "+b+" "," ");a.className=c.replace(/^\s+|\s+$/g,"")}},i=function(a){var c=b.createElement("div");return c.appendChild(b.createTextNode(a)),c.innerHTML},j=function(a){a.style.opacity="",a.style.display="block"},k=function(a){if(a&&!a.length)return j(a);for(var b=0;b<a.length;++b)j(a[b])},l=function(a){a.style.opacity="",a.style.display="none"},m=function(a){if(a&&!a.length)return l(a);for(var b=0;b<a.length;++b)l(a[b])},n=function(a,b){for(var c=b.parentNode;null!==c;){if(c===a)return!0;c=c.parentNode}return!1},o=function(a){a.style.left="-9999px",a.style.display="block";var b,c=a.clientHeight;return b="undefined"!=typeof getComputedStyle?parseInt(getComputedStyle(a).getPropertyValue("padding-top"),10):parseInt(a.currentStyle.padding),a.style.left="",a.style.display="none","-"+parseInt((c+b)/2)+"px"},p=function(a,b){if(+a.style.opacity<1){b=b||16,a.style.opacity=0,a.style.display="block";var c=+new Date,d=function e(){a.style.opacity=+a.style.opacity+(new Date-c)/100,c=+new Date,+a.style.opacity<1&&setTimeout(e,b)};d()}a.style.display="block"},q=function(a,b){b=b||16,a.style.opacity=1;var c=+new Date,d=function e(){a.style.opacity=+a.style.opacity-(new Date-c)/100,c=+new Date,+a.style.opacity>0?setTimeout(e,b):a.style.display="none"};d()},r=function(c){if("function"==typeof MouseEvent){var d=new MouseEvent("click",{view:a,bubbles:!1,cancelable:!0});c.dispatchEvent(d)}else if(b.createEvent){var e=b.createEvent("MouseEvents");e.initEvent("click",!1,!1),c.dispatchEvent(e)}else b.createEventObject?c.fireEvent("onclick"):"function"==typeof c.onclick&&c.onclick()},s=function(b){"function"==typeof b.stopPropagation?(b.stopPropagation(),b.preventDefault()):a.event&&a.event.hasOwnProperty("cancelBubble")&&(a.event.cancelBubble=!0)};e.hasClass=f,e.addClass=g,e.removeClass=h,e.escapeHtml=i,e._show=j,e.show=k,e._hide=l,e.hide=m,e.isDescendant=n,e.getTopMargin=o,e.fadeIn=p,e.fadeOut=q,e.fireClick=r,e.stopEventPropagation=s},{}],4:[function(b,d,e){Object.defineProperty(e,"__esModule",{value:!0});var f=b("./handle-dom"),g=b("./handle-swal-dom"),h=function(b,d,e){var h=b||a.event,i=h.keyCode||h.which,j=e.querySelector("button.confirm"),k=e.querySelector("button.cancel"),l=e.querySelectorAll("button[tabindex]");if(-1!==[9,13,32,27].indexOf(i)){for(var m=h.target||h.srcElement,n=-1,o=0;o<l.length;o++)if(m===l[o]){n=o;break}9===i?(m=-1===n?j:n===l.length-1?l[0]:l[n+1],(0,f.stopEventPropagation)(h),m.focus(),d.confirmButtonColor&&(0,g.setFocusStyle)(m,d.confirmButtonColor)):13===i?("INPUT"===m.tagName&&(m=j,j.focus()),m=-1===n?j:c):27===i&&d.allowEscapeKey===!0?(m=k,(0,f.fireClick)(m,h)):m=c}};e["default"]=h},{"./handle-dom":3,"./handle-swal-dom":5}],5:[function(d,e,f){function g(a){return a&&a.__esModule?a:{"default":a}}Object.defineProperty(f,"__esModule",{value:!0}),f.fixVerticalPosition=f.resetInputError=f.resetInput=f.openModal=f.getInput=f.getOverlay=f.getModal=f.sweetAlertInitialize=c;var h=d("./handle-dom"),i=d("./default-params"),j=g(i),k=d("./injected-html"),l=g(k),m=".sweet-alert",n=".sweet-overlay",o=function(){var a=b.createElement("div");for(a.innerHTML=l["default"];a.firstChild;)b.body.appendChild(a.firstChild)},p=function w(){var a=b.querySelector(m);return a||(o(),a=w()),a},q=function(){var a=p();return a?a.querySelector("input"):void 0},r=function(){return b.querySelector(n)},s=function(c){var d=p();(0,h.fadeIn)(r(),10),(0,h.show)(d),(0,h.addClass)(d,"showSweetAlert"),(0,h.removeClass)(d,"hideSweetAlert"),a.previousActiveElement=b.activeElement;var e=d.querySelector("button.confirm");e.focus(),setTimeout(function(){(0,h.addClass)(d,"visible")},500);var f=d.getAttribute("data-timer");if("null"!==f&&""!==f){var g=c;d.timeout=setTimeout(function(){var a=(g||null)&&"true"===d.getAttribute("data-has-done-function");a?g(null):sweetAlert.close()},f)}},t=function(){var a=p(),b=q();(0,h.removeClass)(a,"show-input"),b.value=j["default"].inputValue,b.setAttribute("type",j["default"].inputType),b.setAttribute("placeholder",j["default"].inputPlaceholder),u()},u=function(a){if(a&&13===a.keyCode)return!1;var b=p(),c=b.querySelector(".sa-input-error");(0,h.removeClass)(c,"show");var d=b.querySelector(".form-group");(0,h.removeClass)(d,"has-error")},v=function(){var a=p();a.style.marginTop=(0,h.getTopMargin)(p())};f.sweetAlertInitialize=o,f.getModal=p,f.getOverlay=r,f.getInput=q,f.openModal=s,f.resetInput=t,f.resetInputError=u,f.fixVerticalPosition=v},{"./default-params":1,"./handle-dom":3,"./injected-html":6}],6:[function(a,b,c){Object.defineProperty(c,"__esModule",{value:!0});var d='<div class="sweet-overlay" tabIndex="-1"></div><div class="sweet-alert" tabIndex="-1"><div class="sa-icon sa-error">\n      <span class="sa-x-mark">\n        <span class="sa-line sa-left"></span>\n        <span class="sa-line sa-right"></span>\n      </span>\n    </div><div class="sa-icon sa-warning">\n      <span class="sa-body"></span>\n      <span class="sa-dot"></span>\n    </div><div class="sa-icon sa-info"></div><div class="sa-icon sa-success">\n      <span class="sa-line sa-tip"></span>\n      <span class="sa-line sa-long"></span>\n\n      <div class="sa-placeholder"></div>\n      <div class="sa-fix"></div>\n    </div><div class="sa-icon sa-custom"></div><h2>Title</h2>\n    <p class="lead text-muted">Text</p>\n    <div class="form-group">\n      <input type="text" class="form-control" tabIndex="3" />\n      <span class="sa-input-error help-block">\n        <span class="glyphicon glyphicon-exclamation-sign"></span> <span class="sa-help-text">Not valid</span>\n      </span>\n    </div><div class="sa-button-container">\n      <button class="cancel btn btn-lg" tabIndex="2">Cancel</button>\n      <div class="sa-confirm-button-container">\n        <button class="confirm btn btn-lg" tabIndex="1">OK</button><div class="la-ball-fall">\n          <div></div>\n          <div></div>\n          <div></div>\n        </div>\n      </div>\n    </div></div>';c["default"]=d},{}],7:[function(a,b,c){Object.defineProperty(c,"__esModule",{value:!0});var d="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(a){return typeof a}:function(a){return a&&"function"==typeof Symbol&&a.constructor===Symbol?"symbol":typeof a},e=a("./utils"),f=a("./handle-swal-dom"),g=a("./handle-dom"),h=["error","warning","info","success","input","prompt"],i=function(a){var b=(0,f.getModal)(),c=b.querySelector("h2"),i=b.querySelector("p"),j=b.querySelector("button.cancel"),k=b.querySelector("button.confirm");if(c.innerHTML=a.html?a.title:(0,g.escapeHtml)(a.title).split("\n").join("<br>"),i.innerHTML=a.html?a.text:(0,g.escapeHtml)(a.text||"").split("\n").join("<br>"),a.text&&(0,g.show)(i),a.customClass)(0,g.addClass)(b,a.customClass),b.setAttribute("data-custom-class",a.customClass);else{var l=b.getAttribute("data-custom-class");(0,g.removeClass)(b,l),b.setAttribute("data-custom-class","")}if((0,g.hide)(b.querySelectorAll(".sa-icon")),a.type&&!(0,e.isIE8)()){var m=function(){for(var c=!1,d=0;d<h.length;d++)if(a.type===h[d]){c=!0;break}if(!c)return logStr("Unknown alert type: "+a.type),{v:!1};var e=["success","error","warning","info"],i=void 0;-1!==e.indexOf(a.type)&&(i=b.querySelector(".sa-icon.sa-"+a.type),(0,g.show)(i));var j=(0,f.getInput)();switch(a.type){case"success":(0,g.addClass)(i,"animate"),(0,g.addClass)(i.querySelector(".sa-tip"),"animateSuccessTip"),(0,g.addClass)(i.querySelector(".sa-long"),"animateSuccessLong");break;case"error":(0,g.addClass)(i,"animateErrorIcon"),(0,g.addClass)(i.querySelector(".sa-x-mark"),"animateXMark");break;case"warning":(0,g.addClass)(i,"pulseWarning"),(0,g.addClass)(i.querySelector(".sa-body"),"pulseWarningIns"),(0,g.addClass)(i.querySelector(".sa-dot"),"pulseWarningIns");break;case"input":case"prompt":j.setAttribute("type",a.inputType),j.value=a.inputValue,j.setAttribute("placeholder",a.inputPlaceholder),(0,g.addClass)(b,"show-input"),setTimeout(function(){j.focus(),j.addEventListener("keyup",swal.resetInputError)},400)}}();if("object"===("undefined"==typeof m?"undefined":d(m)))return m.v}if(a.imageUrl){var n=b.querySelector(".sa-icon.sa-custom");n.style.backgroundImage="url("+a.imageUrl+")",(0,g.show)(n);var o=80,p=80;if(a.imageSize){var q=a.imageSize.toString().split("x"),r=q[0],s=q[1];r&&s?(o=r,p=s):logStr("Parameter imageSize expects value with format WIDTHxHEIGHT, got "+a.imageSize)}n.setAttribute("style",n.getAttribute("style")+"width:"+o+"px; height:"+p+"px")}b.setAttribute("data-has-cancel-button",a.showCancelButton),a.showCancelButton?j.style.display="inline-block":(0,g.hide)(j),b.setAttribute("data-has-confirm-button",a.showConfirmButton),a.showConfirmButton?k.style.display="inline-block":(0,g.hide)(k),a.cancelButtonText&&(j.innerHTML=(0,g.escapeHtml)(a.cancelButtonText)),a.confirmButtonText&&(k.innerHTML=(0,g.escapeHtml)(a.confirmButtonText)),k.className="confirm btn btn-lg",(0,g.addClass)(b,a.containerClass),(0,g.addClass)(k,a.confirmButtonClass),(0,g.addClass)(j,a.cancelButtonClass),(0,g.addClass)(c,a.titleClass),(0,g.addClass)(i,a.textClass),b.setAttribute("data-allow-outside-click",a.allowOutsideClick);var t=!!a.doneFunction;b.setAttribute("data-has-done-function",t),a.animation?"string"==typeof a.animation?b.setAttribute("data-animation",a.animation):b.setAttribute("data-animation","pop"):b.setAttribute("data-animation","none"),b.setAttribute("data-timer",a.timer)};c["default"]=i},{"./handle-dom":3,"./handle-swal-dom":5,"./utils":8}],8:[function(b,c,d){Object.defineProperty(d,"__esModule",{value:!0});var e=function(a,b){for(var c in b)b.hasOwnProperty(c)&&(a[c]=b[c]);return a},f=function(){return a.attachEvent&&!a.addEventListener},g=function(b){a.console&&a.console.log("SweetAlert: "+b)};d.extend=e,d.isIE8=f,d.logStr=g},{}],9:[function(d,e,f){function g(a){return a&&a.__esModule?a:{"default":a}}Object.defineProperty(f,"__esModule",{value:!0});var h,i,j,k,l="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(a){return typeof a}:function(a){return a&&"function"==typeof Symbol&&a.constructor===Symbol?"symbol":typeof a},m=d("./modules/handle-dom"),n=d("./modules/utils"),o=d("./modules/handle-swal-dom"),p=d("./modules/handle-click"),q=d("./modules/handle-key"),r=g(q),s=d("./modules/default-params"),t=g(s),u=d("./modules/set-params"),v=g(u);f["default"]=j=k=function(){function d(a){var b=e;return b[a]===c?t["default"][a]:b[a]}var e=arguments[0];if((0,m.addClass)(b.body,"stop-scrolling"),(0,o.resetInput)(),e===c)return(0,n.logStr)("SweetAlert expects at least 1 attribute!"),!1;var f=(0,n.extend)({},t["default"]);switch("undefined"==typeof e?"undefined":l(e)){case"string":f.title=e,f.text=arguments[1]||"",f.type=arguments[2]||"";break;case"object":if(e.title===c)return(0,n.logStr)('Missing "title" argument!'),!1;f.title=e.title;for(var g in t["default"])f[g]=d(g);f.confirmButtonText=f.showCancelButton?"Confirm":t["default"].confirmButtonText,f.confirmButtonText=d("confirmButtonText"),f.doneFunction=arguments[1]||null;break;default:return(0,n.logStr)('Unexpected type of argument! Expected "string" or "object", got '+("undefined"==typeof e?"undefined":l(e))),!1}(0,v["default"])(f),(0,o.fixVerticalPosition)(),(0,o.openModal)(arguments[1]);for(var j=(0,o.getModal)(),q=j.querySelectorAll("button"),s=["onclick"],u=function(a){return(0,p.handleButton)(a,f,j)},w=0;w<q.length;w++)for(var x=0;x<s.length;x++){var y=s[x];q[w][y]=u}(0,o.getOverlay)().onclick=u,h=a.onkeydown;var z=function(a){return(0,r["default"])(a,f,j)};a.onkeydown=z,a.onfocus=function(){setTimeout(function(){i!==c&&(i.focus(),i=c)},0)},k.enableButtons()},j.setDefaults=k.setDefaults=function(a){if(!a)throw new Error("userParams is required");if("object"!==("undefined"==typeof a?"undefined":l(a)))throw new Error("userParams has to be a object");(0,n.extend)(t["default"],a)},j.close=k.close=function(){var d=(0,o.getModal)();(0,m.fadeOut)((0,o.getOverlay)(),5),(0,m.fadeOut)(d,5),(0,m.removeClass)(d,"showSweetAlert"),(0,m.addClass)(d,"hideSweetAlert"),(0,m.removeClass)(d,"visible");var e=d.querySelector(".sa-icon.sa-success");(0,m.removeClass)(e,"animate"),(0,m.removeClass)(e.querySelector(".sa-tip"),"animateSuccessTip"),(0,m.removeClass)(e.querySelector(".sa-long"),"animateSuccessLong");var f=d.querySelector(".sa-icon.sa-error");(0,m.removeClass)(f,"animateErrorIcon"),(0,m.removeClass)(f.querySelector(".sa-x-mark"),"animateXMark");var g=d.querySelector(".sa-icon.sa-warning");return(0,m.removeClass)(g,"pulseWarning"),(0,m.removeClass)(g.querySelector(".sa-body"),"pulseWarningIns"),(0,m.removeClass)(g.querySelector(".sa-dot"),"pulseWarningIns"),setTimeout(function(){var a=d.getAttribute("data-custom-class");(0,m.removeClass)(d,a)},300),(0,m.removeClass)(b.body,"stop-scrolling"),a.onkeydown=h,a.previousActiveElement&&a.previousActiveElement.focus(),i=c,clearTimeout(d.timeout),!0},j.showInputError=k.showInputError=function(a){var b=(0,o.getModal)(),c=b.querySelector(".sa-input-error");(0,m.addClass)(c,"show");var d=b.querySelector(".form-group");(0,m.addClass)(d,"has-error"),d.querySelector(".sa-help-text").innerHTML=a,setTimeout(function(){j.enableButtons()},1),b.querySelector("input").focus()},j.resetInputError=k.resetInputError=function(a){if(a&&13===a.keyCode)return!1;var b=(0,o.getModal)(),c=b.querySelector(".sa-input-error");(0,m.removeClass)(c,"show");var d=b.querySelector(".form-group");(0,m.removeClass)(d,"has-error")},j.disableButtons=k.disableButtons=function(a){var b=(0,o.getModal)(),c=b.querySelector("button.confirm"),d=b.querySelector("button.cancel");c.disabled=!0,d.disabled=!0},j.enableButtons=k.enableButtons=function(a){var b=(0,o.getModal)(),c=b.querySelector("button.confirm"),d=b.querySelector("button.cancel");c.disabled=!1,d.disabled=!1},"undefined"!=typeof a?a.sweetAlert=a.swal=j:(0,n.logStr)("SweetAlert is a frontend module!")},{"./modules/default-params":1,"./modules/handle-click":2,"./modules/handle-dom":3,"./modules/handle-key":4,"./modules/handle-swal-dom":5,"./modules/set-params":7,"./modules/utils":8}]},{},[9]),"function"==typeof define&&define.amd?define(function(){return sweetAlert}):"undefined"!=typeof module&&module.exports&&(module.exports=sweetAlert)}(window,document);
\ No newline at end of file
diff --git a/upload/system/library/myparcelnl/class_myparcel.php b/upload/system/library/myparcelnl/class_myparcel.php
old mode 100755
new mode 100644
index 2f901c2..b7b319e
--- a/upload/system/library/myparcelnl/class_myparcel.php
+++ b/upload/system/library/myparcelnl/class_myparcel.php
@@ -18,6 +18,7 @@ class MyParcel
     const PACKAGE_TYPE_STANDARD = 1;
     const PACKAGE_TYPE_MAILBOX = 2;
     const PACKAGE_TYPE_LETTER = 3;
+    const PACKAGE_TYPE_DIGITAL_STAMP = 4;
     /**
      * MyParcel constructor.
      * @param null $registry
@@ -236,4 +237,4 @@ function loadMyparcelLang($lang = null)
 function MyParcel($registry = null)
 {
     return MyParcel::instance($registry);
-}
\ No newline at end of file
+}
diff --git a/upload/system/library/myparcelnl/includes/class_myparcel_api.php b/upload/system/library/myparcelnl/includes/class_myparcel_api.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/includes/class_myparcel_curl.php b/upload/system/library/myparcelnl/includes/class_myparcel_curl.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/includes/class_myparcel_helper.php b/upload/system/library/myparcelnl/includes/class_myparcel_helper.php
old mode 100755
new mode 100644
index 9cc7e9c..5342c02
--- a/upload/system/library/myparcelnl/includes/class_myparcel_helper.php
+++ b/upload/system/library/myparcelnl/includes/class_myparcel_helper.php
@@ -320,7 +320,7 @@ function _splitStreet($fullStreet)
     /** START @Since the fix for negative house number (64-69)
      * 64 is house number and 69 is additional number
      **/
-    function _splitMultipleHouseNumberStreet($address, $force=true)
+    function _splitMultipleHouseNumberStreet($address, $number_addition = '', $force=true)
     {
         $ret = array();
         $ret['house_number']    = '';
@@ -336,6 +336,10 @@ function _splitMultipleHouseNumberStreet($address, $force=true)
             $ret['street']          = trim($matches[1] . $matches[2]);
             $ret['house_number']    = trim($matches[3]);
             $ret['number_addition'] = trim($matches[4]);
+            if($number_addition != ''){
+                $ret['number_addition'] = str_replace('-','',$ret['number_addition']);
+                $ret['number_addition'].= ' ' . $number_addition;
+            }
         }
         else // no street part
         {
@@ -357,6 +361,15 @@ function getAddressComponents($address)
         $address = trim($address);
         $is_single_word = (strpos($address, ' ') === false) ? true : false;
 
+
+        $arrExclude = [' bus ', '/bus ', '/ bus ', ' bte ', '/bte ', '/ bte ', ' box ', '/box ', '/ box ', ' boîte ','/boîte ', '/ boîte '];
+        foreach ($arrExclude as $value){
+            if(strpos($address,$value) !== false){
+                $address = explode($value,$address)[0];
+                break;
+            }
+        }
+
         if ($is_single_word) {
             $ret['street']          = $address;
             $ret['house_number']    = '';
@@ -398,7 +411,7 @@ function getAddressComponents($address)
             $ret['street'] = str_replace('-', '', $ret['street']);
             $ret['street'] .= ' -' . $ret['house_number'];
             $ret['force_addition_number'] = true;
-            return $this->_splitMultipleHouseNumberStreet( $ret['street'] );
+            return $this->_splitMultipleHouseNumberStreet( $ret['street'] ,$ret['number_addition']);
         }
         /** END @Since the fix for negative house number (64-69) **/
 
@@ -694,6 +707,7 @@ function set_module_text($language)
         $data['entry_tab_2_title_empty_parcel_weight']       = $language->get('entry_tab_2_title_empty_parcel_weight');
         $data['entry_tab_2_textbox_empty_parcel_weight']     = $language->get('entry_tab_2_textbox_empty_parcel_weight');
         $data['entry_tab_2_select_package_types']            = $language->get('entry_tab_2_select_package_types');
+        $data['entry_tab_2_default_weight']            = $language->get('entry_tab_2_default_weight');
 
         $data['entry_tab_2_select_insured_up_to_50']  = $language->get('entry_tab_2_select_insured_up_to_50');
         $data['entry_tab_2_select_insured_up_to_250'] = $language->get('entry_tab_2_select_insured_up_to_250');
@@ -701,6 +715,7 @@ function set_module_text($language)
         $data['entry_tab_2_select_insured_500']       = $language->get('entry_tab_2_select_insured_500');
 
         $data['entry_subtotal'] = $language->get('entry_subtotal');
+        $data['entry_tab_3_enable_myparcel_shipping_message'] = $language->get('entry_tab_3_enable_myparcel_shipping_message');
         $data['entry_tab_3_title_delivery_option'] = $language->get('entry_tab_3_title_delivery_option');
         $data['entry_tab_3_label_enable_delivery'] = $language->get('entry_tab_3_label_enable_delivery');
         $data['entry_tab_3_label_home_address_only'] = $language->get('entry_tab_3_label_home_address_only');
@@ -772,9 +787,37 @@ function set_module_text($language)
         $data['button_save'] = $language->get('button_save');
         $data['button_cancel'] = $language->get('button_cancel');
 
+        // add digital_stamp default weight
+        $data['digital_stamp_default_weight'] = $this->_getDigitalStampDefaultWeight();
+        $data['digital_stamp_code'] = $this->_getDigitalStampCode();
+
         return $data;
     }
 
+    /**
+     * Retrieve Digital Stamp Default Weight
+     * @return array of weight key - value pairs
+     **/
+    public function _getDigitalStampDefaultWeight()
+    {
+        return array(
+            20 => '0 - 20 gram',
+            50 => '20 - 50 gram',
+            100 => '50 - 100 gram',
+            350 => '100 - 350 gram',
+            2000 => '350 - 2000 gram',
+        );
+    }
+
+    /**
+     * Retrieve Digital Stamp code
+     * @return int Digital Stamp code
+     **/
+    public function _getDigitalStampCode()
+    {
+        return 4;
+    }
+
     /**
      * Validate cut off time format hh:mm
      **/
@@ -832,9 +875,9 @@ function getAddressNumberXNLPostcode($shipping_address, $prefix = ''){
         }
         if($field){
             if(in_array($field, array('address_2','company'))){
-                return $shipping_address[$prefix . $field];
+                return (isset($shipping_address[$prefix . $field])) ? $shipping_address[$prefix . $field] : '';
             }else{
-                return $shipping_address[$prefix . 'custom_field'][$field];
+                return (isset($shipping_address[$prefix . 'custom_field'][$field])) ? $shipping_address[$prefix . 'custom_field'][$field] : '';
             }
         }
         return $shipping_address[$prefix . 'address_2'];
@@ -896,8 +939,8 @@ public function getDeliveryParams($shipping_address, $prefix = ''){
 
         $delivery_params = array(
             'cc' => $shipping_address[$prefix.'iso_code_2'],
-            'postal_code'   => $shipping_address[$prefix.'postcode'],
-            'street'        => isset($address_parts['street']) ? $address_parts['street'] :"",
+            'postal_code'   => str_replace(' ', '',$shipping_address[$prefix.'postcode']),
+            'street'        => isset($address_parts['street']) ? strtolower($address_parts['street']) :"",
             'number'        => $house_number,
             'carrier'       => 1,
             'cutoff_time'   => $cut_off_time,
@@ -1118,6 +1161,55 @@ function getDisableDropoffDays($myparcel_delivery){
         return array_diff(range(0,6),$enable_days);
     }
 
+    public function saveDefaultMyparcelMethodXtension($options, $code){
+        if(!count($options)){
+            return;
+        }
+
+        $registry = MyParcel::$registry;
+        $session = $registry->get('session');
+        // set the first option to the default option
+        $delivery_option = $options[0];
+
+        switch ($code){
+            case "delivery":
+                foreach ($delivery_option['time'] as $time){
+                    if($time['price_comment'] == 'standard'){
+                        $time['price']['shipping_method_code'] = $code;
+                        $time['price']['text_myparcel_price_delivery'] = date('d-m-Y',strtotime($delivery_option['date'])) . ' - ' . date('H:i',strtotime($time['start'])) . ' - ' .date('H:i',strtotime($time['end']));
+                        $session->data['myparcel_price_delivery'] = $time['price'];
+
+                        $myparcel_shipping_choosed['date'] = date('Y-m-d',strtotime($delivery_option['date']));
+                        $myparcel_shipping_choosed['time'][] = $time;
+                        $myparcel_shipping_choosed['code'] = 'myparcel_'. $code;
+                        $myparcel_shipping_choosed['additional_service'] = (isset($session->data['additional_service_checked'][$code])) ? $session->data['additional_service_checked'][$code] : [];
+                        $session->data['myparcel_price_delivery']['myparcel_shipping_choosed'] = $myparcel_shipping_choosed;
+                        if(!isset($session->data['myparcel_shipping_choosed'])){
+                            $session->data['myparcel_shipping_choosed'] = $myparcel_shipping_choosed;
+                        }
+                        break;
+                    }
+                }
+                break;
+            case "pickup":
+                $pickup_detail = $delivery_option;
+                $time = $pickup_detail['time'][0];
+                $time['price']['shipping_method_code'] = $code;
+                $time['price']['text_myparcel_price_pickup'] =  $pickup_detail['location'] . ' - ' .date('d-m-Y',strtotime($pickup_detail['date'])) . ' - ' . date('H:i',strtotime($time['start']));
+                $session->data['myparcel_price_pickup'] = $time['price'];
+
+                $pickup_detail['code'] = 'myparcel_'. $code;
+                $pickup_detail['additional_service'] = [];
+                $pickup_detail['time'] = [];
+                $pickup_detail['time'][] = $time;
+                $session->data['myparcel_price_pickup']['myparcel_shipping_choosed'] = $pickup_detail;
+                if(!isset($session->data['myparcel_shipping_choosed'])){
+                    $session->data['myparcel_shipping_choosed'] = $pickup_detail;
+                }
+                break;
+        }
+    }
+
     public function getDeliveryNextWorkingDate($delivery_type = MyParcel_Shipment_Checkout::DELIVERY_TYPE_STANDARD,$order_data , $is_pickup = false){
         $disable_days = [0];
         //if delivery option is not standard, explude Saturday when choose the next day working
@@ -1195,7 +1287,7 @@ public function getTaxRate($tax_rate_id){
     }
 
     public function getHeightMyparcelIframe($sub_total,$iso_code_2){
-        $height = 250; //default height
+        $height = 315; //default height
 
         $shipment_class = MyParcel()->shipment;
         /** @var MyParcel_Shipment_Checkout $checkout_helper **/
@@ -1210,6 +1302,63 @@ public function getHeightMyparcelIframe($sub_total,$iso_code_2){
         }
         return $height.'px';
     }
+
+    public function getUpdateIframeAddressFromSession(){
+        $registry = MyParcel::$registry;
+        $session = $registry->get('session');
+        $result = [];
+        if (version_compare(VERSION, '2.0.0.0', '>=')) {
+            // Get shipping address from session data if possible
+            if (!empty($session->data['shipping_address'])) {
+                $shipping_address = $session->data['shipping_address'];
+                $country_code = $shipping_address['iso_code_2'];
+                $result['postal_code'] = $shipping_address['postcode'];
+                $result['cc'] = $country_code;
+
+                $use_addition_address_as_number_suffix = MyParcel()->settings->general->use_addition_address_as_number_suffix;
+                if ($use_addition_address_as_number_suffix == 2) {
+                    $result['street'] = isset($shipping_address['address_1']) ? $shipping_address['address_1'] : '';
+                    $result['number'] = isset($shipping_address['address_2']) ? $shipping_address['address_2'] : '';
+                } else {
+
+                    //'Address field 1' and 'address field 2' will both be used for the full address
+                    if($use_addition_address_as_number_suffix == 0){
+                        $shipping_address['address_1'] .=  ' ' .$shipping_address['address_2'];
+                    }
+
+                    $address_parts = MyParcel()->helper->getAddressComponents($shipping_address['address_1']);
+                    $result['number'] = isset($address_parts['house_number']) ? $address_parts['house_number'] : '';
+                    $result['street'] = isset($address_parts['street']) ? $address_parts['street'] : '';
+                }
+            }
+        } else {
+            if (!empty($session->data['shipping_country_id'])) {
+                $registry = MyParcel::$registry;
+                $loader = $registry->get('load');
+                $address_1 = '';
+
+                if (!empty($session->data['shipping_address_id'])) {
+                    $address_id = $session->data['shipping_address_id'];
+                    $loader->model('account/address');
+                    $model_address = $registry->get('model_account_address');
+                    $address_data = $model_address->getAddress($address_id);
+                    $address_1 = $address_data['address_1'];
+                    $country_code = $address_data['iso_code_2'];
+                } else {
+                    if (!empty($session->data['guest']['shipping']['address_1'])) {
+                        $address_1 = $session->data['guest']['shipping']['address_1'];
+                        $country_code = $session->data['guest']['shipping']['iso_code_2'];
+                    }
+                }
+
+                $address_parts = MyParcel()->helper->getAddressComponents($address_1);
+                $result['number'] = isset($address_parts['house_number']) ? $address_parts['house_number'] : '';
+                $result['street'] = isset($address_parts['street']) ? $address_parts['street'] : '';
+                $result['postal_code'] = $session->data['shipping_postcode'];
+            }
+        }
+        return $result;
+    }
 }
 
-return new MyParcel_Helper();
\ No newline at end of file
+return new MyParcel_Helper();
diff --git a/upload/system/library/myparcelnl/includes/class_myparcel_log.php b/upload/system/library/myparcelnl/includes/class_myparcel_log.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/includes/class_myparcel_notice.php b/upload/system/library/myparcelnl/includes/class_myparcel_notice.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/includes/class_myparcel_session.php b/upload/system/library/myparcelnl/includes/class_myparcel_session.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/includes/class_myparcel_setting.php b/upload/system/library/myparcelnl/includes/class_myparcel_setting.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/includes/class_myparcel_shipment.php b/upload/system/library/myparcelnl/includes/class_myparcel_shipment.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/includes/class_myparcel_shipment_checkout.php b/upload/system/library/myparcelnl/includes/class_myparcel_shipment_checkout.php
old mode 100755
new mode 100644
index 66fbc53..a6daa85
--- a/upload/system/library/myparcelnl/includes/class_myparcel_shipment_checkout.php
+++ b/upload/system/library/myparcelnl/includes/class_myparcel_shipment_checkout.php
@@ -130,7 +130,7 @@ public function getDeliveryTotalsFromSavedData($myparcel_delivery_options, $sign
         if (!$delivery_type_text) {
             $delivery_type_text = 'default';
         }
-		
+
 		$registry = MyParcel::$registry;
 		$cart = $registry->get('cart');
 
@@ -393,7 +393,12 @@ function getDeliveryPrices($price_format = true, $color_format = true, $prefix =
                 if ($price_type == 0 && (float)($checkout_settings['belgium_' . $option . '_fee']) >= 0) {
                     $fee = (float)$checkout_settings['belgium_' . $option . '_fee'];
                     $fee = $this->convertPriceToFloat($fee);
-                    $fee_including_tax = $this->getTotalDeliveryTaxAmountFromCart($fee, $cart);
+//                    $fee_including_tax = $this->getTotalDeliveryTaxAmountFromCart($fee, $cart);
+                    if ($taxIncluded) {
+                        $fee_including_tax = $this->getTotalDeliveryTaxAmountFromCart($fee, $cart);
+                    } else {
+                        $fee_including_tax = $fee;
+                    }
                     //$fee_including_tax = $fee;
                     if ($price_format) {
                         $formatted_fee = $this->formatDeliveryPrice($fee_including_tax, $currency, $color_format, $prefix);
@@ -405,7 +410,12 @@ function getDeliveryPrices($price_format = true, $color_format = true, $prefix =
                 if ($price_type == 1 && (float)($checkout_settings['belgium_' . $option . '_fee2']) >= 0) {
                     $fee = (float)$checkout_settings['belgium_' . $option . '_fee2'];
                     $fee = $this->convertPriceToFloat($fee);
-                    $fee_including_tax = $this->getTotalDeliveryTaxAmountFromCart($fee, $cart);
+//                    $fee_including_tax = $this->getTotalDeliveryTaxAmountFromCart($fee, $cart);
+                    if ($taxIncluded) {
+                        $fee_including_tax = $this->getTotalDeliveryTaxAmountFromCart($fee, $cart);
+                    } else {
+                        $fee_including_tax = $fee;
+                    }
                     //$fee_including_tax = $fee;
                     if ($price_format) {
                         $formatted_fee = $this->formatDeliveryPrice($fee_including_tax, $currency, $color_format, $prefix);
@@ -905,4 +915,4 @@ function getMyParcelShippingCost()
         }
         return 0;
     }
-}
\ No newline at end of file
+}
diff --git a/upload/system/library/myparcelnl/includes/class_myparcel_shipment_helper.php b/upload/system/library/myparcelnl/includes/class_myparcel_shipment_helper.php
old mode 100755
new mode 100644
index c8921c3..62c08d7
--- a/upload/system/library/myparcelnl/includes/class_myparcel_shipment_helper.php
+++ b/upload/system/library/myparcelnl/includes/class_myparcel_shipment_helper.php
@@ -32,6 +32,12 @@ public function getOrderShipmentData($order_id)
                 $shipment['pickup']['retail_network_id'] = $pickup['retail_network_id'];
             }
         }
+
+        // get physical properties
+        $shipment['physical_properties'] = $this->getPhysicalProperties($order_id, $shipment['options']['package_type']);
+        if(empty($shipment['physical_properties'])){
+            unset($shipment['physical_properties']);
+        }
         if($shipment['options'] == null){
             return null;
         }
@@ -54,46 +60,75 @@ public function getRecipient( $order )
 
         $use_addition_address_as_number_suffix = MyParcel()->settings->general->use_addition_address_as_number_suffix;
         $general_custom_field_homenumber_suffix = MyParcel()->settings->general->general_custom_field_homenumber_suffix;
-		// MyParcel_Helper $helper
-		$helper = MyParcel()->helper;
+        // MyParcel_Helper $helper
+        $helper = MyParcel()->helper;
         $iso_code = @ $order['shipping_iso_code_2'];
-		
+
         switch ($iso_code) {
-			default:
+            default:
                 if ((!empty($order['shipping_address_2']) && is_numeric(($order['shipping_address_2'])) && !$use_addition_address_as_number_suffix) || !$use_addition_address_as_number_suffix) {
-					$order['shipping_address_1'] = $order['shipping_address_1'] . ' ' . $order['shipping_address_2'];
-				}
+                    $order['shipping_address_1'] = $order['shipping_address_1'] . ' ' . $order['shipping_address_2'];
+                }
 
-				$address_parts = $helper->getAddressComponents($order['shipping_address_1']);
+                $address_parts = $helper->getAddressComponents($order['shipping_address_1']);
 
-				if ($use_addition_address_as_number_suffix == 1) {
-					$number_addition = isset($order['shipping_address_2']) ? $order['shipping_address_2'] : '';
-				} elseif ($use_addition_address_as_number_suffix == 2) {
-					$address_parts['street'] = isset($order['shipping_address_1']) ? $order['shipping_address_1'] : '';
-					$address_parts['house_number'] = isset($order['shipping_address_2']) ? $order['shipping_address_2'] : '';
+                if ($use_addition_address_as_number_suffix == 1) {
+                    $number_addition = isset($order['shipping_address_2']) ? $order['shipping_address_2'] : '';
+                } elseif ($use_addition_address_as_number_suffix == 2) {
+                    $address_parts['street'] = isset($order['shipping_address_1']) ? $order['shipping_address_1'] : '';
+                    $address_parts['house_number'] = isset($order['shipping_address_2']) ? $order['shipping_address_2'] : '';
 //					$number_addition = isset($order['shipping_custom_field']['address_3']) ? $order['shipping_custom_field']['address_3'] : '';
                     $number_addition = isset($order['shipping_custom_field'][$general_custom_field_homenumber_suffix]) ? $order['shipping_custom_field'][$general_custom_field_homenumber_suffix] : '';
-				} else {
-					$number_addition = isset($address_parts['number_addition']) ? $address_parts['number_addition'] : '';
-				}
-
-				$address_intl = array(
-					'street' => isset($address_parts['street']) ? $address_parts['street'] : '',
-					'number' => isset($address_parts['house_number']) ? $address_parts['house_number'] : '',
-					'number_suffix' => $number_addition,
-					'postal_code' => $order['shipping_postcode'],
-				);
-        }
-        if($address_intl['number'] == ''){
-            if(MyParcel()->helper->isModuleExist('xnlpostcode', true)){
-                $address_intl['number'] = MyParcel()->helper->getAddressNumberXNLPostcode($order,'shipping_');
-            }
+                } else {
+                    $number_addition = isset($address_parts['number_addition']) ? $address_parts['number_addition'] : '';
+                }
+
+                if($helper->isModuleExist('xnlpostcode', true)){
+                    $house_number = $helper->getAddressNumberXNLPostcode($order, 'shipping_');
+                }else{
+                    $house_number = isset($address_parts['house_number']) ? trim($address_parts['house_number']) : '';
+                }
+                $address_intl = array(
+                    'street' => isset($address_parts['street']) ? $address_parts['street'] : '',
+                    'number' => $house_number,
+                    'number_suffix' => $number_addition,
+                    'postal_code' => $order['shipping_postcode'],
+                );
         }
         $address = array_merge($address, $address_intl);
 
         return $address;
     }
 
+    public function getPhysicalProperties($order_id, $package_type){
+        /** @var ModelMyparcelnlShipment $model_shipment **/
+        $registry = MyParcel::$registry;
+        $loader = $registry->get('load');
+        $loader->model(MyParcel()->getModelPath('shipment'));
+        $model_shipment = $registry->get('model_extension_myparcelnl_shipment');
+
+        $config = $registry->get('config');
+
+        $default_export_settings = $config->get('module_myparcelnl_fields_export');
+        $saved_export_settings = $model_shipment->getSavedExportSettings($order_id);
+
+        $properties = [];
+        switch ($package_type){
+            case '4':
+                if(isset($saved_export_settings['digital_stamp_weight'])){
+                    $properties['weight'] = intval($saved_export_settings['digital_stamp_weight']);
+                }
+                elseif(isset($default_export_settings['digital_stamp_default_weight'])){
+                    $properties['weight'] = intval($default_export_settings['digital_stamp_default_weight']);
+                }
+                break;
+            default:
+                break;
+        }
+
+        return $properties;
+    }
+
     /**
      * Retrieve shipment options from default export settings or saved exported data
      * The returned data will be used to display shipment form on admin order page or send to MyParcel via API
@@ -101,7 +136,7 @@ public function getRecipient( $order )
      * @param boolean $view
      * @return array
      *
-    **/
+     **/
     public function getOptions( $order_data , $view = false , $export = false)
     {
         /** @var ModelMyparcelnlShipment $model_shipment **/
@@ -149,7 +184,7 @@ public function getOptions( $order_data , $view = false , $export = false)
 
         $shipping_country_code = isset($order_data['shipping_iso_code_2']) ? $order_data['shipping_iso_code_2'] : '';
         // If country is not NL, disable mailbox package
-        if ($shipping_country_code != 'NL' && isset($package_type) && $package_type == MyParcel::PACKAGE_TYPE_MAILBOX ) {
+        if ($shipping_country_code != 'NL' && isset($package_type) && ($package_type == MyParcel::PACKAGE_TYPE_MAILBOX || $package_type == MyParcel::PACKAGE_TYPE_DIGITAL_STAMP)  ) {
             $package_type = MyParcel::PACKAGE_TYPE_STANDARD;
         }
 
@@ -179,7 +214,7 @@ public function getOptions( $order_data , $view = false , $export = false)
             );
             $options = array_merge($defaults, $saved_export_settings);
 
-        // If shipment options from order is not saved, get options from default export settings
+            // If shipment options from order is not saved, get options from default export settings
         } else {
 
             // Parse description
@@ -291,6 +326,18 @@ public function getOptions( $order_data , $view = false , $export = false)
             $options['signature'] = 1;
         }
 
+        //digital stamp type option
+        if($options['package_type'] == 4){
+            $options = array(
+                'package_type' => intval($options['package_type']),
+                'label_description' => $options['label_description']
+            );
+            if(empty($options['label_description'])){
+                unset($options['label_description']);
+            }
+            return $options;
+        }
+
         // delivery date (postponed delivery & pickup)
         if ($delivery_date = $checkout_helper->getDeliveryDateFromSavedData( $myparcel_delivery_options ) ) {
             $date_time = explode(' ', $delivery_date); // split date and time
@@ -339,7 +386,7 @@ public function getOptions( $order_data , $view = false , $export = false)
         /**
          * Note that only when no settings saved for a shipment
          * the settings from checkout can be used
-        **/
+         **/
         if (empty($saved_export_settings)) {
             // Get options signed & recipient only from frontend checkout
             $signed = $model_shipment->getMyParcelSigned($order_id);
@@ -390,7 +437,7 @@ public function getOptions( $order_data , $view = false , $export = false)
      * Save shipment options to table myparcel_shipment
      * Each order has a shipment option
      * @param array $form_data
-    **/
+     **/
     public function saveOptions($form_data = null, $is_ajax = true)
     {
         $registry = MyParcel::$registry;
@@ -486,7 +533,7 @@ public function saveOptions($form_data = null, $is_ajax = true)
      * @param int order_id
      * @param array $myparcel_delivery_options
      * @return boolean
-    **/
+     **/
     public function isPickup( $order_id = null, $myparcel_delivery_options = array() )
     {
         /** @var ModelMyparcelnlShipment $model_shipment **/
@@ -511,7 +558,7 @@ public function isPickup( $order_id = null, $myparcel_delivery_options = array()
      * Get the shipping method code from the shipping quote retrieved from order data
      * @param string $shipping_quote (flat.flat, free.free, pickup.express, pickup.standard,...)
      * @return string shipping code
-    **/
+     **/
     function getShippingCodeByShippingQuote($shipping_quote)
     {
         $parts = explode('.', $shipping_quote);
@@ -749,7 +796,7 @@ public function getOrderShipments( $order_id, $exclude_concepts = false, $only_l
      * @param integer $order_id
      * @param array $options
      * @return array shipment options
-    **/
+     **/
     public function prepareReturnShipmentData( $order_id, $options )
     {
         $registry = MyParcel::$registry;
@@ -869,7 +916,7 @@ public function prepareReturnShipmentData( $order_id, $options )
      * Get latest package type that was exported to MyParcel via API
      * @param int $order_id
      * @return array
-    **/
+     **/
     function getLatestPackageType($order_id)
     {
         $options = $this->getLatestExportedShipmentOptions($order_id);
@@ -884,7 +931,7 @@ function getLatestPackageType($order_id)
      * Get latest shipment options that were exported to MyParcel via API
      * @param int $order_id
      * @return array
-    **/
+     **/
     function getLatestExportedShipmentOptions($order_id)
     {
         $registry = MyParcel::$registry;
@@ -1002,7 +1049,7 @@ public function getProductOptionValue($product_id, $product_option_value_id) {
      * Store the delivery options from checkout page into session
      * @param array $post_data
      * @return boolean save success or not
-    **/
+     **/
     function saveDeliveryOptionsInCheckout($post_data)
     {
         $registry = MyParcel::$registry;
@@ -1092,4 +1139,4 @@ function parseDescription($desc, $order)
 
         return $description;
     }
-}
\ No newline at end of file
+}
diff --git a/upload/system/library/myparcelnl/includes/class_myparcel_url.php b/upload/system/library/myparcelnl/includes/class_myparcel_url.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/includes/class_myparcel_view.php b/upload/system/library/myparcelnl/includes/class_myparcel_view.php
old mode 100755
new mode 100644
index e0893e1..0567b55
--- a/upload/system/library/myparcelnl/includes/class_myparcel_view.php
+++ b/upload/system/library/myparcelnl/includes/class_myparcel_view.php
@@ -162,7 +162,7 @@ function column_myparcel($order_id, $screen = 'order_overview')
                 'url' => $listing_actions['get_labels']['url'],
             );
         }
-        
+
         ob_start();
         $this->render('view_column_myparcel', array('listing_actions' => $listing_actions,'listing_position_label' => $listing_position_label ,'order_id' => $order_id, 'screen' => $screen));
         $html = ob_get_clean();
@@ -185,7 +185,7 @@ function myparcel_popup_modal()
      * This function is able to render multiple order ids
      * @param array $order_ids
      * @return HTML of shipment options form
-    **/
+     **/
     function return_shipment_form($order_ids, $screen)
     {
         $total = count($order_ids);
@@ -263,19 +263,22 @@ function ship_to_myparcel($order_id, $return = false, $screen = 'order_overview'
         $data['button_send_to_customer'] = $lang->get('button_send_to_customer');
 
         $data['package_types'] = array(
-                                1 => $lang->get('package_type_parcel'),
-                                2 => $lang->get('package_type_mailbox'),
-                                3 => $lang->get('package_type_unpaid_letter'),
-                                );
+            1 => $lang->get('package_type_parcel'),
+            2 => $lang->get('package_type_mailbox'),
+            3 => $lang->get('package_type_unpaid_letter'),
+            4 => $lang->get('package_type_digital_stamp'),
 
-        $data['insured_amounts'] = array(
-                                        '49'  => $lang->get('entry_tab_2_select_insured_up_to_50'),
-                                        '249' => $lang->get('entry_tab_2_select_insured_up_to_250'),
-                                        '499' => $lang->get('entry_tab_2_select_insured_up_to_500'),
-                                        ''    => $lang->get('entry_tab_2_select_insured_500'),
-                                    );
+        );
 
+        $data['insured_amounts'] = array(
+            '49'  => $lang->get('entry_tab_2_select_insured_up_to_50'),
+            '249' => $lang->get('entry_tab_2_select_insured_up_to_250'),
+            '499' => $lang->get('entry_tab_2_select_insured_up_to_500'),
+            ''    => $lang->get('entry_tab_2_select_insured_500'),
+        );
 
+        $data['entry_weight'] = $lang->get('entry_weight');
+        $data['digital_stamp_weights'] = MyParcel()->helper->_getDigitalStampDefaultWeight();
 
 
         $token = $session->data['user_token'];
@@ -323,7 +326,7 @@ function myparcel_tracktrace($order_id)
             // skip concepts, letters & mailbox packages
             if (empty($shipment_data['tracktrace'])) {
                 unset($consignments[$shipment_id]);
-               // continue;
+                // continue;
             }
 
             $api = MyParcel()->api;
@@ -362,10 +365,10 @@ function myparcel_shipment_summary($order_id)
         $export_settings = $model_shipment->getSavedExportSettings($order_id);
 
         $package_types = array(
-                            1 => $lang->get('package_type_parcel'),
-                            2 => $lang->get('package_type_mailbox'),
-                            3 => $lang->get('package_type_unpaid_letter'),
-                            );
+            1 => $lang->get('package_type_parcel'),
+            2 => $lang->get('package_type_mailbox'),
+            3 => $lang->get('package_type_unpaid_letter'),
+        );
 
         $option_strings = array(
             'large_format'      => $lang->get('entry_order_myparcel_text_extra_large_size'),
@@ -442,7 +445,7 @@ function myparcel_packet_type($order_id)
             'state'         => "",
             'postcode'      => isset($order_data['shipping_postcode'])?$order_data['shipping_postcode']:"",
             'country'       => isset($order_data['shipping_country'])?$order_data['shipping_country']:""
-            );
+        );
         $address_map_url = urlencode( implode( ', ', $address_info ) );
         /*tap.nguyen test address*/
         $address = "";
@@ -469,6 +472,9 @@ function myparcel_packet_type($order_id)
                 case '3':
                     $package_type = $lang->get('package_type_unpaid_letter');
                     break;
+                case '4':
+                    $package_type = $lang->get('package_type_digital_stamp');
+                    break;
                 default:
                     $package_type = $lang->get('package_type_parcel');
                     break;
@@ -488,7 +494,7 @@ function myparcel_packet_type($order_id)
      * Display checkout delivery options
      * In Order Info
      * Use the function iframe_delivery_options() to render delivery options
-    **/
+     **/
     function myparcel_admin_checkout_delivery_options($order_id)
     {
         $registry = MyParcel::$registry;
@@ -582,7 +588,7 @@ function tracktrace_myaccount($order_id)
     /**
      * Display Iframe Delivery Options
      * @return HTML content of the delivery options
-    **/
+     **/
     function iframe_delivery_options($order_info = false)
     {
         global $config;
@@ -631,7 +637,8 @@ function iframe_delivery_options($order_info = false)
         if (!$order_info && !$country_allowed && !MyParcel()->helper->isModuleExist('d_quickcheckout', true)) {
             return '';
         }
-
+//        echo "<pre>";
+//        var_dump($session->data);die();
         $lang = MyParcel()->lang;
         ob_start();
         $this->render('view_iframe_delivery_options', array('data' => $data, 'lang' => $lang, 'myparcel_country' => $myparcel_country, 'is_order_info' => $order_info));
@@ -649,8 +656,9 @@ function iframe_base_delivery_options($data)
         if (empty($delivery_enable)) {
             return '';
         }
+        $shipping_address = json_encode(MyParcel()->helper->getUpdateIframeAddressFromSession());
         ob_start();
-        $this->render('view_iframe_base_delivery_options', array());
+        $this->render('view_iframe_base_delivery_options', array('shipping_address' => $shipping_address));
         return ob_get_clean();
     }
 
@@ -681,4 +689,4 @@ function myparcel_order_header()
     }
 }
 
-return new MyParcel_View();
\ No newline at end of file
+return new MyParcel_View();
diff --git a/upload/system/library/myparcelnl/includes/class_myparcel_view_core.php b/upload/system/library/myparcelnl/includes/class_myparcel_view_core.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/includes/ssl/ca-bundle.pem b/upload/system/library/myparcelnl/includes/ssl/ca-bundle.pem
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/logs/.htaccess b/upload/system/library/myparcelnl/logs/.htaccess
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/logs/myparcel_log.txt b/upload/system/library/myparcelnl/logs/myparcel_log.txt
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/myparcel.aqc.ocmod.xml b/upload/system/library/myparcelnl/myparcel.aqc.ocmod.xml
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/myparcel.checkout.ocmod.xml b/upload/system/library/myparcelnl/myparcel.checkout.ocmod.xml
old mode 100755
new mode 100644
index 8c7b9e2..8628b1e
--- a/upload/system/library/myparcelnl/myparcel.checkout.ocmod.xml
+++ b/upload/system/library/myparcelnl/myparcel.checkout.ocmod.xml
@@ -226,6 +226,87 @@
         </operation>
     </file>
 
+
+    <file path="catalog/controller/journal3/checkout.php">
+        <operation>
+            <search><![CDATA[public function index() {]]></search>
+            <add position="after"><![CDATA[
+                 /* MyParcel Ocmod Start */
+                $this->load->model('extension/myparcelnl/helper');
+
+                $this->model_extension_myparcelnl_helper->addCompatibleScript('delivery_iframe', $this->document);
+                $this->document->addStyle($this->model_extension_myparcelnl_helper->getCssUrl() . 'checkout.css');
+
+                /* MyParcel Ocmod End */
+            ]]></add>
+        </operation>
+        <operation>
+            <search><![CDATA[$data['checkout_data'] = $this->getCheckoutData($this->model_journal3_checkout->init());]]></search>
+            <add position="after"><![CDATA[
+                 /* MyParcel Ocmod Start */
+                $this->load->model('extension/myparcelnl/helper');
+                $this->model_extension_myparcelnl_helper->initMyParcel();
+                $data['checkout_data']['myparcel_delivery_iframe'] = $this->model_extension_myparcelnl_helper->getContent('iframe_delivery_options');
+                $data['myparcel_delivery_checkout_header'] = $this->model_extension_myparcelnl_helper->getContent('iframe_delivery_checkout_header');
+                if (!class_exists('MyParcel')) {
+                    require_once DIR_SYSTEM . 'library/myparcelnl/class_myparcel.php';
+                    MyParcel($this->registry);
+                }
+
+                $data['checkout_data']['myparcel_delivery_iframe_height'] = MyParcel()->helper->getHeightMyparcelIframe($this->cart->getSubTotal(),$this->session->data['shipping_address']['iso_code_2']);
+
+                /* MyParcel Ocmod End */
+            ]]></add>
+        </operation>
+        <operation>
+            <search><![CDATA[$total_items = $this->cart->countProducts() + (isset($this->session->data['vouchers']) ? count($this->session->data['vouchers']) : 0);]]></search>
+            <add position="after"><![CDATA[
+                /* MyParcel Ocmod Start */
+                $shipping_methods = $this->session->data['shipping_methods'];
+                foreach ($shipping_methods as $i => $shipping_method) {
+                    $shipping_methods[$i]['is_visible_shipping_quote'] = MyParcel()->shipment->checkout->isVisibleShippingQuote($shipping_method);
+                    $shipping_methods[$i]['is_parcel_shipping_method'] = MyParcel()->shipment->checkout->isParcelShippingMethod($shipping_method);
+                }
+                $this->session->data['shipping_methods'] = $shipping_methods;
+                /* MyParcel Ocmod End */
+            ]]></add>
+        </operation>
+    </file>
+
+    <file path="catalog/view/theme/journal3/template/journal3/checkout/checkout.twig">
+        <operation>
+            <search><![CDATA[<script type="text/html" id="quick-checkout">]]></search>
+            <add position="before"><![CDATA[
+                {{ myparcel_delivery_checkout_header }}
+            ]]></add>
+        </operation>
+    </file>
+    <file path="catalog/view/theme/journal3/template/journal3/checkout/shipping_method.twig">
+        <operation>
+            <search><![CDATA[<div v-if="Object.keys(shipping_methods).length === 0" class="alert alert-warning"><i class="fa fa-exclamation-circle"></i>{{ error_warning }}</div>]]></search>
+            <add position="after"><![CDATA[
+                <input type="hidden" id="myparcel_delivery_iframe_height" v-bind:value="myparcel_delivery_iframe_height">
+                <input type="hidden" name='is_change_option' id="is_change_option" value="0">
+            ]]></add>
+        </operation>
+        <operation>
+            <search><![CDATA[<label>]]></search>
+            <add position="replace"><![CDATA[
+                <label v-if="shipping_method.is_parcel_shipping_method === false" >
+            ]]></add>
+        </operation>
+        <operation>
+            <search><![CDATA[</label>]]></search>
+            <add position="after"><![CDATA[
+                <label v-else>
+                    <input v-on:change="save()" v-bind:value="quote.code" type="radio" class="parcel-shipping-method" name="shipping_method" v-model="order_data.shipping_code" />
+                    <div v-html="myparcel_delivery_iframe"></div>
+                    <span class="shipping-quote-desc" v-if="quote.desc" v-html="quote.desc"></span>
+                </label>
+            ]]></add>
+        </operation>
+    </file>
+
     <!-- ____________ SHIPPING_METHOD.TWIG _____________ -->
     <!-- ______________________________________________ -->
     <file path="catalog/view/theme/*/template/checkout/shipping_method.twig">
@@ -337,4 +418,4 @@
             <add position="replace"><![CDATA[data: $('#collapse-shipping-method input[type=\'radio\']:checked, #collapse-shipping-method textarea, #mypa-input, #mypa-signed:checked, #mypa-recipient-only:checked'),]]></add>
         </operation>
     </file>
-</modification>
\ No newline at end of file
+</modification>
diff --git a/upload/system/library/myparcelnl/myparcel.ocmod.xml b/upload/system/library/myparcelnl/myparcel.ocmod.xml
old mode 100755
new mode 100644
index 387e1ff..34701cf
--- a/upload/system/library/myparcelnl/myparcel.ocmod.xml
+++ b/upload/system/library/myparcelnl/myparcel.ocmod.xml
@@ -5,7 +5,7 @@
 -->
 <modification>
     <name>MyParcel NL</name>
-    <version>1.1.0</version>
+    <version>1.1.2</version>
     <code>MyParcelNL</code>
     <author>MyParcel NL</author>
     <link>https://www.myparcel.nl/</link>
@@ -154,7 +154,9 @@
             <add position="after"><![CDATA[
                 $this->load->model('extension/myparcelnl/helper');
                 $this->document->addStyle($this->model_extension_myparcelnl_helper->getCssUrl() . 'order.css');
+                $this->document->addStyle($this->model_extension_myparcelnl_helper->getCssUrl() . 'sweetalert.min.css');
                 $this->document->addScript($this->model_extension_myparcelnl_helper->getJsUrl() . 'order.js');
+                $this->document->addScript($this->model_extension_myparcelnl_helper->getJsUrl() . 'sweetalert.min.js');
             ]]></add>
         </operation>
 
@@ -300,6 +302,21 @@
                         $data['pickup_location'] = implode("<br>", array($myparcel_delivery_options['location'],$myparcel_delivery_options['street'] . ' ' . $myparcel_delivery_options['number'], $myparcel_delivery_options['city'] . ' (' . $myparcel_delivery_options['distance'] . 'm)'));
                     }
                 }
+                if(!isset($data['pickup_location'])){
+                    if(isset($this->session->data['myparcel_shipping_choosed'])){
+                        $myparcel_delivery_options = $this->session->data['myparcel_shipping_choosed'];
+                        if(isset($myparcel_delivery_options['location'])){
+                            $data['text_pickup_location'] = 'Pickup Location';
+                            $data['pickup_location'] = implode("<br>", array($myparcel_delivery_options['location'],$myparcel_delivery_options['street'] . ' ' . $myparcel_delivery_options['number'], $myparcel_delivery_options['city'] . ' (' . $myparcel_delivery_options['distance'] . 'm)'));
+                        }
+                    }
+                }
+            ]]></add>
+        </operation>
+        <operation><!-- no -->
+            <search><![CDATA['title' => $order_total['title'],]]></search>
+            <add position="replace"><![CDATA[
+                'title' => strip_tags($order_total['title']),
             ]]></add>
         </operation>
     </file>
@@ -342,8 +359,21 @@
     <!-- ______________________________________________________________________ -->
     <file path="catalog/view/theme/*/template/account/order_list.twig"><!-- checked -->
         <operation><!-- no -->
-            <search><![CDATA[<td class="text-right"><a href="{{ order.view }}" data-toggle="tooltip" title="{{ button_view }}" class="btn btn-info"><i class="fa fa-eye"></i></a></td>]]></search>
-            <add position="replace"><![CDATA[<td class="text-right"><a href="{{ order.view }}" data-toggle="tooltip" title="{{ button_view }}" class="btn btn-info"><i class="fa fa-eye"></i></a>{{ order.tracktrace_myaccount }}</td>]]></add>
+            <search><![CDATA[<td class="text-left">{{ column_date_added }}</td>]]></search>
+            <add position="after"><![CDATA[
+                {% if is_show_track_trace %}
+                    <td class="text-left">{{ entry_track_trace }}</td>
+                {% endif %}
+            ]]></add>
+        </operation>
+        <operation><!-- no -->
+            <search><![CDATA[<td class="text-left">{{ order.date_added }}</td>]]></search>
+            <add position="after"><![CDATA[
+                {% if is_show_track_trace %}
+                    <td class="text-left">{{ order.tracktrace_myaccount }}</td>
+                {% endif %}
+              <?php } ?>
+            ]]></add>
         </operation>
     </file>
 
@@ -374,7 +404,16 @@
                 $order_total = $this->model_account_order->getTotalOrders();
             ]]></search>
             <add position="after"><![CDATA[
+                if (!class_exists('MyParcel')) {
+                    require_once DIR_SYSTEM . 'library/myparcelnl/class_myparcel.php';
+                    MyParcel($this->registry);
+                }
                 $this->load->model('extension/myparcelnl/helper');
+                $this->load->language('extension/module/myparcelnl');
+                if(MyParcel()->settings->general->trackandtrace_myaccount){
+                    $data['is_show_track_trace'] = MyParcel()->settings->general->trackandtrace_myaccount;
+                    $data['entry_track_trace'] = $this->language->get('entry_track_trace');
+                }
             ]]></add>
         </operation>
         <operation>
@@ -590,10 +629,38 @@
             ]]></add>
         </operation>
     </file>
+
+    <file path="catalog/controller/extension/module/xtensions/checkout/xcvc.php">
+        <operation>
+            <search><![CDATA[$sort_order[$key] = $value['sort_order'];]]></search>
+            <add position="after"><![CDATA[
+            //Myparcel plugin - start
+            //get pickup location
+            if($value['code'] == 'shipping' && isset($this->session->data['myparcel_price_pickup'])
+				&& isset($this->session->data['shipping_method']['code']) && strpos($this->session->data['shipping_method']['code'],$this->session->data['myparcel_price_pickup']['shipping_method_code']) !== false){
+                $myparcel_delivery_options = $this->session->data['myparcel_price_pickup']['myparcel_shipping_choosed'];
+                if(isset($myparcel_delivery_options['location'])){
+                    $this->language->load('extension/module/myparcelnl');
+                    $this->data['myparcel_pickup_price_summary']['title'] = $this->language->get('entry_title_location');
+                    $this->data['myparcel_pickup_price_summary']['location'] = $myparcel_delivery_options['location']. ', ' .$myparcel_delivery_options['street'] . ' ' . $myparcel_delivery_options['number'] .', ' . $myparcel_delivery_options['city'];
+                    $this->data['myparcel_pickup_price_summary']['shipping_title'] = $value['title'];
+                }
+            }
+            //Myparcel plugin - end
+                ]]></add>
+        </operation>
+    </file>
     <!-- ________________ catalog/controller/extension/module/xtensions/checkout/xshipping_method.php ________________ -->
     <!-- _______________________ XShipping Method Module _______________________ -->
     <!-- _________________________________________________________________________ -->
     <file path="catalog/controller/extension/module/xtensions/checkout/xshipping_method.php">
+        <operation>
+            <search><![CDATA[public function index() {]]></search>
+            <add position="after"><![CDATA[
+            $this->load->model('extension/myparcelnl/helper');
+            $this->document->addStyle($this->model_extension_myparcelnl_helper->getCssUrl() . 'checkout.css');
+            ]]></add>
+        </operation>
         <operation>
             <search><![CDATA[array_multisort($sort_order, SORT_ASC, $quote_data);]]></search>
             <add position="after"><![CDATA[
@@ -642,6 +709,7 @@
                             $shipping_method_code = explode('.',$shipping_method_code)[0];
                         }
                         $this->data['myparcel_option_title'] = array();
+                        $arrMyparcelShippingKey = [];
                         foreach ($myparcel_delivery['body']['data'] as $key => $value){
                             if(count($value)) {
                                 $sort_order = count($quote_data);
@@ -649,6 +717,9 @@
                                 $cost = 0;
                                 $cost_with_tax = 0;
                                 $price_key = 'myparcel_price_' . $key;
+                                if (!isset($this->session->data[$price_key])) {
+                                    MyParcel()->helper->saveDefaultMyparcelMethodXtension($value,$key);
+                                }
                                 if (isset($this->session->data[$price_key])) {
                                     $myparcel_price = $this->session->data[$price_key];
                                     $text_price_detail = explode(' - ',$myparcel_price['text_myparcel_price_'.$key]);
@@ -752,6 +823,7 @@
                                 $myparcel_option_title['text_edit_myparcel_' . $key] = (isset($myparcel_price['text_myparcel_price_'.$key])) ? $myparcel_price['text_myparcel_price_'.$key] : $this->language->get('entry_edit_myparcel_' . $key);
                                 $arrShipping['quote'][$key_delivery] = $arrQuote;
                                 $quote_data[$key_delivery] = $arrShipping;
+                                $arrMyparcelShippingKey[] = $key_delivery;
                             }
                         }
                         $this->session->data['myparcel_option_title'] = $myparcel_option_title;
@@ -759,14 +831,31 @@
                         if(isset($this->session->data['myparcel_api_errors'])){
                             unset($this->session->data['myparcel_api_errors']);
                         }
+
+                        //make myparcel shipping method to first.
+                        if(count($arrMyparcelShippingKey)){
+                            $arrMyparcelShippingKey = array_reverse($arrMyparcelShippingKey);
+                            foreach ($arrMyparcelShippingKey as $key){
+                                if(isset($quote_data[$key])) {
+                                    $value = $quote_data[$key];
+                                    unset($quote_data[$key]);
+                                    $quote_data = array($key => $value) + $quote_data;
+                                }
+                            }
+                        }
                     }
                     else{
-                        $myparcel_errors = $myparcel_delivery['body']['errors'];
-                        $error_message = [];
-                        foreach($myparcel_errors as $error){
-                            $error_message[] = $error['message'];
+                        if(isset($myparcel_delivery['body']['errors'])){
+                            $myparcel_errors = $myparcel_delivery['body']['errors'];
+                            $error_message = [];
+                            if(is_array($myparcel_errors) && count($myparcel_errors)){
+                                 foreach($myparcel_errors as $error){
+                                    $error_language_key = 'entry_myparcel_api_error_code_' . $error['code'];
+                                    $error_message[] = ($this->language->get($error_language_key) != $error_language_key) ? $this->language->get($error_language_key) : $error['message'];
+                                }
+                                $this->session->data['myparcel_api_errors'] = htmlspecialchars(implode('.',$error_message), ENT_QUOTES);
+                            }
                         }
-                        $this->session->data['myparcel_api_errors'] = htmlspecialchars(implode('.',$error_message), ENT_QUOTES);
                     }}
                 else{
                     if(isset($this->session->data['myparcel_api_errors'])){
@@ -884,7 +973,7 @@
                                 $('#xdeltimeslots').before('<div class="alert alert-warning">'+json['error']['timeslot']+'<button type="button" class="close" data-dismiss="alert">&times;</button></div>');
                             }
                         }else if(json['success']){
-                            loadShippingMethods(true);
+                            loadShippingMethods();
                         }
 
                     }
@@ -918,6 +1007,9 @@
                     }
                 });
             }
+            $(document).on("hidden.bs.modal", "#modal-shipping-dependancy", function(event) {
+                loadShippingMethods();
+            });
             ]]></add>
         </operation>
 
@@ -1032,7 +1124,13 @@
         <operation>
             <search><![CDATA[} else if (json.xguest) {]]></search>
             <add position="after"><![CDATA[
-            loadShippingMethods();
+            $.ajax({
+                url : 'index.php?route=extension/myparcelnl/myparcel_xtension_delivery/forgetMyParcelChoosed',
+                type: 'get',
+                success:function (data) {
+                    loadShippingMethods();
+                }
+            });
             ]]></add>
         </operation>
         <operation>
@@ -1099,6 +1197,18 @@
             ]]></add>
         </operation>
     </file>
+
+    <file path="catalog/view/theme/*/template/extension/module/xtensions/checkout/xtotals.twig">
+        <operation>
+            <search><![CDATA[<tr><td>{{ total.title }}:</td><td class="text-right">{{ total.text }}</td></tr>]]></search>
+            <add position="after"><![CDATA[
+            {% if  myparcel_pickup_price_summary and total.title == myparcel_pickup_price_summary.shipping_title %}
+                <tr><td>{{ myparcel_pickup_price_summary.title }}:</td><td class="text-right">{{ myparcel_pickup_price_summary.location }} </td> </tr>
+            {% endif %}
+            ]]></add>
+        </operation>
+    </file>
+
     <file path="catalog/view/theme/*/template/extension/module/xtensions/checkout/xpayment_address.twig">
         <operation>
             <search><![CDATA[{% if force_redirect %}]]></search>
@@ -1125,7 +1235,8 @@
         <operation>
             <search><![CDATA[unset($this->session->data['shipping_method']);]]></search>
             <add position="before"><![CDATA[
-            if(isset($this->session->data['myparcel_shipping_choosed'])){
+            if(isset($this->session->data['myparcel_shipping_choosed']) && isset($this->session->data['shipping_method']['code'])
+                        && ($this->session->data['shipping_method']['code'] == ($this->session->data['myparcel_shipping_choosed']['code'] . '.' . $this->session->data['myparcel_shipping_choosed']['code']))){
                 if (!class_exists('MyParcel')) {
                     require_once DIR_SYSTEM . 'library/myparcelnl/class_myparcel.php';
                     MyParcel($this->registry);
@@ -1149,40 +1260,39 @@
                 }
                 $model_shipment->saveDeliveryOptions($this->session->data['order_id'], $myparcel_shipping_choosed, $signed, $recipient_only, $current_prices);
                 $model_shipment->update($this->session->data['order_id'],'type',$myparcel_shipping_code . '.' . $myparcel_shipping_code);
-                if(isset($this->session->data['myparcel_shipping_choosed'])){
-                    unset($this->session->data['myparcel_shipping_choosed']);
-                }
-                if(isset($this->session->data['additional_service'])){
-                    unset($this->session->data['additional_service']);
-                }
-                if(isset($this->session->data['pickup_time_start'])){
-                    unset($this->session->data['pickup_time_start']);
-                }
-                if(isset($this->session->data['additional_service_checked'])){
-                    unset($this->session->data['additional_service_checked']);
-                }
-                if(isset($this->session->data['pickup_time_start'])){
-                    unset($this->session->data['pickup_time_start']);
-                }
-                if(isset($this->session->data['myparcel_price_pickup'])){
-                    unset($this->session->data['myparcel_price_pickup']);
-                }
-                if(isset($this->session->data['myparcel_price_delivery'])){
-                    unset($this->session->data['myparcel_price_delivery']);
-                }
-                if(isset($this->session->data['delivery_time_start'])){
-                    unset($this->session->data['delivery_time_start']);
-                }
-                if(isset($this->session->data['delivery_time_end'])){
-                    unset($this->session->data['delivery_time_end']);
-                }
-                if(isset($this->session->data['delivery_date'])){
-                    unset($this->session->data['delivery_date']);
-                }
-                if(isset($this->session->data['pickup_location'])){
-                    unset($this->session->data['pickup_location']);
-                }
-
+            }
+            if(isset($this->session->data['myparcel_shipping_choosed'])){
+                unset($this->session->data['myparcel_shipping_choosed']);
+            }
+            if(isset($this->session->data['additional_service'])){
+                unset($this->session->data['additional_service']);
+            }
+            if(isset($this->session->data['pickup_time_start'])){
+                unset($this->session->data['pickup_time_start']);
+            }
+            if(isset($this->session->data['additional_service_checked'])){
+                unset($this->session->data['additional_service_checked']);
+            }
+            if(isset($this->session->data['pickup_time_start'])){
+                unset($this->session->data['pickup_time_start']);
+            }
+            if(isset($this->session->data['myparcel_price_pickup'])){
+                unset($this->session->data['myparcel_price_pickup']);
+            }
+            if(isset($this->session->data['myparcel_price_delivery'])){
+                unset($this->session->data['myparcel_price_delivery']);
+            }
+            if(isset($this->session->data['delivery_time_start'])){
+                unset($this->session->data['delivery_time_start']);
+            }
+            if(isset($this->session->data['delivery_time_end'])){
+                unset($this->session->data['delivery_time_end']);
+            }
+            if(isset($this->session->data['delivery_date'])){
+                unset($this->session->data['delivery_date']);
+            }
+            if(isset($this->session->data['pickup_location'])){
+                unset($this->session->data['pickup_location']);
             }
             ]]></add>
         </operation>
@@ -1753,4 +1863,4 @@
         </operation>
     </file>
 
-</modification>
\ No newline at end of file
+</modification>
diff --git a/upload/system/library/myparcelnl/myparcel_trait.php b/upload/system/library/myparcelnl/myparcel_trait.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/views/myparcel_packet_type.php b/upload/system/library/myparcelnl/views/myparcel_packet_type.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/views/view_admin_checkout_delivery_details.php b/upload/system/library/myparcelnl/views/view_admin_checkout_delivery_details.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/views/view_admin_checkout_delivery_options.php b/upload/system/library/myparcelnl/views/view_admin_checkout_delivery_options.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/views/view_column_myparcel.php b/upload/system/library/myparcelnl/views/view_column_myparcel.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/views/view_column_myparcel_popup.php b/upload/system/library/myparcelnl/views/view_column_myparcel_popup.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/views/view_export_batch.php b/upload/system/library/myparcelnl/views/view_export_batch.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/views/view_export_print_batch.php b/upload/system/library/myparcelnl/views/view_export_print_batch.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/views/view_iframe_base_delivery_options.php b/upload/system/library/myparcelnl/views/view_iframe_base_delivery_options.php
old mode 100755
new mode 100644
index 5e91e7f..c006c43
--- a/upload/system/library/myparcelnl/views/view_iframe_base_delivery_options.php
+++ b/upload/system/library/myparcelnl/views/view_iframe_base_delivery_options.php
@@ -667,6 +667,11 @@
                 <?php $settings_decoded = html_entity_decode(urldecode($_GET['mypa_settings'])) ?>
                 <?php if (!empty($settings_decoded)) : ?>
                     window.mypa.settings = <?php echo $settings_decoded ?>;
+                    var shipping_address = <?php echo $shipping_address; ?>;
+                    window.mypa.settings.postal_code = shipping_address.postal_code;
+                    window.mypa.settings.number = shipping_address.number;
+                    window.mypa.settings.street = shipping_address.street;
+                    window.mypa.settings.cc = shipping_address.cc;
                 <?php endif; ?>
             <?php endif; ?>
         }
diff --git a/upload/system/library/myparcelnl/views/view_iframe_delivery_checkout_header.php b/upload/system/library/myparcelnl/views/view_iframe_delivery_checkout_header.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/views/view_iframe_delivery_options.php b/upload/system/library/myparcelnl/views/view_iframe_delivery_options.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/views/view_myparcel_order_header.php b/upload/system/library/myparcelnl/views/view_myparcel_order_header.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/views/view_order_details_myparcel_actions.php b/upload/system/library/myparcelnl/views/view_order_details_myparcel_actions.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/views/view_print_batch.php b/upload/system/library/myparcelnl/views/view_print_batch.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/views/view_ship_to_myparcel.php b/upload/system/library/myparcelnl/views/view_ship_to_myparcel.php
old mode 100755
new mode 100644
index 5f18d09..cb1d206
--- a/upload/system/library/myparcelnl/views/view_ship_to_myparcel.php
+++ b/upload/system/library/myparcelnl/views/view_ship_to_myparcel.php
@@ -1,110 +1,114 @@
 <table class="ocmyparcel_settings_table" style="width: auto">
-	<tr>
-		<td>
-			<?php echo $data['entry_order_myparcel_shipment_type']; ?>:<br/>
-			<small class="calculated_weight"><?php echo sprintf($data['entry_order_myparcel_calculated_weight'], MyParcel()->shipment->shipment_helper->getTotalOrderWeight($order_id)); ?></small>
-		</td>
-		<td>
-			<?php
-				if (isset($recipient['cc']) && !MyParcel()->helper->isEUCountry($recipient['cc'])) {
-					unset($data['package_types'][2]); // mailbox package
-				}
-
-				if ($is_pickup) {
-					unset($data['package_types'][2]); // mailbox package
-					unset($data['package_types'][3]); // unpaid letter
-					$data['package_types'][1] .= ' (Pakjegemak)';
-				}
-				if ($return) {
-					unset($data['package_types'][2]); // mailbox package
-					unset($data['package_types'][3]); // unpaid letter
-				}
-			?>
-			<select name="myparcel_options[<?php echo $order_id; ?>][package_type]" class="package_type">
-				<?php foreach ($data['package_types'] as $key => $package_type) : ?>
-					<?php $selected = (isset($export_settings['package_type']) && ($export_settings['package_type'] == $key) ? 'selected="selected"' : '' ) ?>
-					<option <?php echo $selected ?> value="<?php echo $key; ?>" ><?php echo $package_type; ?></option>
-				<?php endforeach; ?>
-			</select>
-		</td>
-	</tr>
-	<?php if (!$return) : ?>
-	<tr>
-		<td>
-			<?php echo $data['entry_order_myparcel_number_of_label']; ?>:
-		</td>
-		<td>
-			<input type="number" step="1" min="1" name="myparcel_options[<?php echo $order_id; ?>][extra_options][number_of_copies]" value="<?php echo !empty($number_of_copies)?$number_of_copies:1;?>" size="2">
-		</td>
-	</tr>
-	<?php endif; ?>
+    <tr>
+        <td>
+            <?php echo $data['entry_order_myparcel_shipment_type']; ?>:<br/>
+            <small class="calculated_weight"><?php echo sprintf($data['entry_order_myparcel_calculated_weight'], MyParcel()->shipment->shipment_helper->getTotalOrderWeight($order_id)); ?></small>
+        </td>
+        <td>
+            <?php
+            if (isset($recipient['cc']) && !MyParcel()->helper->isEUCountry($recipient['cc'])) {
+                unset($data['package_types'][2]); // mailbox package
+            }
+            if(isset($recipient['cc']) && $recipient['cc'] != 'NL'){
+                unset($data['package_types'][4]);//digital stamp
+            }
+            if ($is_pickup) {
+                unset($data['package_types'][2]); // mailbox package
+                unset($data['package_types'][3]); // unpaid letter
+                unset($data['package_types'][4]); // degital stamp
+                $data['package_types'][1] .= ' (Pakjegemak)';
+            }
+            if ($return) {
+                unset($data['package_types'][2]); // mailbox package
+                unset($data['package_types'][3]); // unpaid letter
+                unset($data['package_types'][4]); // degital stamp
+            }
+            ?>
+            <select name="myparcel_options[<?php echo $order_id; ?>][package_type]" class="package_type">
+                <?php foreach ($data['package_types'] as $key => $package_type) : ?>
+                    <?php $selected = (isset($export_settings['package_type']) && ($export_settings['package_type'] == $key) ? 'selected="selected"' : '' ) ?>
+                    <option <?php echo $selected ?> value="<?php echo $key; ?>" ><?php echo $package_type; ?></option>
+                <?php endforeach; ?>
+            </select>
+        </td>
+    </tr>
+    <?php if (!$return) : ?>
+        <tr>
+            <td>
+                <?php echo $data['entry_order_myparcel_number_of_label']; ?>:
+            </td>
+            <td>
+                <input type="number" step="1" min="1" name="myparcel_options[<?php echo $order_id; ?>][extra_options][number_of_copies]" value="<?php echo !empty($number_of_copies)?$number_of_copies:1;?>" size="2">
+            </td>
+        </tr>
+    <?php endif; ?>
 </table>
 <?php if ($return) : ?>
-<br>
+    <br>
 <?php endif; ?>
 <?php
-	if (isset($recipient['cc']) && !MyParcel()->helper->isEUCountry($recipient['cc'])) {
-		$export_settings['insured'] = 1;
-		$export_settings['insurance']['amount'] = 499;
-		$is_eu = false;
-	} else {
-		$is_eu = true;
-	}
+if (isset($recipient['cc']) && !MyParcel()->helper->isEUCountry($recipient['cc'])) {
+    $export_settings['insured'] = 1;
+    $export_settings['insurance']['amount'] = 499;
+    $is_eu = false;
+} else {
+    $is_eu = true;
+}
 ?>
 
 <table class="ocmyparcel_settings_table parcel_options">
-	<tbody>
-		<tr>
-			<td>
-				<?php
-                    $checked = (isset($export_settings['large_format']) && ($export_settings['large_format']==1))?'checked="checked"':'';
-                ?>
-				<input type="hidden" name="myparcel_options[<?php echo $order_id; ?>][large_format]" value="0" />
-				<input <?php echo $checked; ?> type="checkbox" name="myparcel_options[<?php echo $order_id; ?>][large_format]" value="1" class=""><?php echo $data['entry_order_myparcel_text_extra_large_size']; ?>
-			</td>
-			<td class="oc_option_cost">
+    <tbody>
+    <tr>
+        <td>
+            <?php
+            $checked = (isset($export_settings['large_format']) && ($export_settings['large_format']==1))?'checked="checked"':'';
+            ?>
+            <input type="hidden" name="myparcel_options[<?php echo $order_id; ?>][large_format]" value="0" />
+            <input <?php echo $checked; ?> type="checkbox" name="myparcel_options[<?php echo $order_id; ?>][large_format]" value="1" class=""><?php echo $data['entry_order_myparcel_text_extra_large_size']; ?>
+        </td>
+        <td class="oc_option_cost">
 
-			</td>
-		</tr>
+        </td>
+    </tr>
 
-		<?php if ($is_eu): ?>
-		<tr>
-			<td>
-				<?php
-                    $checked = (isset($export_settings['only_recipient']) && ($export_settings['only_recipient']==1))?'checked="checked"':'';
+    <?php if ($is_eu): ?>
+        <tr>
+            <td>
+                <?php
+                $checked = (isset($export_settings['only_recipient']) && ($export_settings['only_recipient']==1))?'checked="checked"':'';
                 ?>
-				<input type="hidden" name="myparcel_options[<?php echo $order_id; ?>][only_recipient]" value="0" />
-				<input <?php echo $checked; ?> type="checkbox" name="myparcel_options[<?php echo $order_id; ?>][only_recipient]" value="1" class=""><?php echo $data['entry_order_myparcel_text_home_address_only']; ?>
-			</td>
-			<td class="oc_option_cost">
+                <input type="hidden" name="myparcel_options[<?php echo $order_id; ?>][only_recipient]" value="0" />
+                <input <?php echo $checked; ?> type="checkbox" name="myparcel_options[<?php echo $order_id; ?>][only_recipient]" value="1" class=""><?php echo $data['entry_order_myparcel_text_home_address_only']; ?>
+            </td>
+            <td class="oc_option_cost">
 
-			</td>
-		</tr>
+            </td>
+        </tr>
 
 
-		<tr>
-			<td>
-				<?php
-                    $checked = (isset($export_settings['signature']) && ($export_settings['signature']==1))?'checked="checked"':'';
+        <tr>
+            <td>
+                <?php
+                $checked = (isset($export_settings['signature']) && ($export_settings['signature']==1))?'checked="checked"':'';
                 ?>
-				<input type="hidden" name="myparcel_options[<?php echo $order_id; ?>][signature]" value="0" />
-				<input <?php echo $checked; ?> type="checkbox" name="myparcel_options[<?php echo $order_id; ?>][signature]" value="1" class=""><?php echo $data['entry_order_myparcel_text_signature_on_delivery']; ?>
-			</td>
-			<td class="oc_option_cost"></td>
-		</tr>
+                <input type="hidden" name="myparcel_options[<?php echo $order_id; ?>][signature]" value="0" />
+                <input <?php echo $checked; ?> type="checkbox" name="myparcel_options[<?php echo $order_id; ?>][signature]" value="1" class=""><?php echo $data['entry_order_myparcel_text_signature_on_delivery']; ?>
+            </td>
+            <td class="oc_option_cost"></td>
+        </tr>
 
-		<tr>
-			<td>
-				<?php
-                    $checked = (isset($export_settings['return']) && ($export_settings['return']==1))?'checked="checked"':'';
+        <tr>
+            <td>
+                <?php
+                $checked = (isset($export_settings['return']) && ($export_settings['return']==1))?'checked="checked"':'';
                 ?>
-				<input type="hidden" name="myparcel_options[<?php echo $order_id; ?>][return]" value="0" />
-				<input <?php echo $checked; ?> type="checkbox" name="myparcel_options[<?php echo $order_id; ?>][return]" value="1" class=""><?php echo $data['entry_order_myparcel_text_return_if_no_answer']; ?>
-			</td>
-			<td class="oc_option_cost">
-			</td>
-		</tr>
-		<tr>
+                <input type="hidden" name="myparcel_options[<?php echo $order_id; ?>][return]" value="0" />
+                <input <?php echo $checked; ?> type="checkbox" name="myparcel_options[<?php echo $order_id; ?>][return]" value="1" class=""><?php echo $data['entry_order_myparcel_text_return_if_no_answer']; ?>
+            </td>
+            <td class="oc_option_cost">
+            </td>
+        </tr>
+        <tr>
             <td>
                 <?php
                 $checked = (isset($export_settings['age_check']) && ($export_settings['age_check']==1))?'checked="checked"':'';
@@ -115,102 +119,118 @@
             <td class="oc_option_cost">
             </td>
         </tr>
-		<tr>
-			<td>
-				<?php
-					$checked = (isset($export_settings['insured']) &&  $export_settings['insured']==1)?'checked="checked"':'';
-					if (!isset($export_settings['insurance'])) {
-						$export_settings['insurance']['amount'] = '';
-					}
+        <tr>
+            <td>
+                <?php
+                $checked = (isset($export_settings['insured']) &&  $export_settings['insured']==1)?'checked="checked"':'';
+                if (!isset($export_settings['insurance'])) {
+                    $export_settings['insurance']['amount'] = '';
+                }
                 ?>
-				<input type="hidden" name="myparcel_options[<?php echo $order_id; ?>][insured]" value="0" />
-				<input <?php echo $checked; ?> type="checkbox" name="myparcel_options[<?php echo $order_id; ?>][insured]" value="1" class="insured"><?php echo $data['entry_order_myparcel_text_insured_home']; ?>
-				<input type="hidden" name="" class="insured_enable" value="<?php echo (isset($export_settings['insured']))?$export_settings['insured']:0; ?>" />
-			</td>
-			<td class="oc_option_cost">
-			</td>
-		</tr>
-		<?php else: ?>
-		<tr>
-			<td>
-				<input type="hidden" name="myparcel_options[<?php echo $order_id; ?>][insured]" value="1" class="insured" /><?php echo $data['entry_order_myparcel_text_standar_insurance']; ?>
-			</td>
-			<td class="oc_option_cost">
-			</td>
-		</tr>
-		<?php endif; ?>
+                <input type="hidden" name="myparcel_options[<?php echo $order_id; ?>][insured]" value="0" />
+                <input <?php echo $checked; ?> type="checkbox" name="myparcel_options[<?php echo $order_id; ?>][insured]" value="1" class="insured"><?php echo $data['entry_order_myparcel_text_insured_home']; ?>
+                <input type="hidden" name="" class="insured_enable" value="<?php echo (isset($export_settings['insured']))?$export_settings['insured']:0; ?>" />
+            </td>
+            <td class="oc_option_cost">
+            </td>
+        </tr>
+    <?php else: ?>
+        <tr>
+            <td>
+                <input type="hidden" name="myparcel_options[<?php echo $order_id; ?>][insured]" value="1" class="insured" /><?php echo $data['entry_order_myparcel_text_standar_insurance']; ?>
+            </td>
+            <td class="oc_option_cost">
+            </td>
+        </tr>
+    <?php endif; ?>
 
 
 
-		<?php if ($is_eu): ?>
-		<tr <?php echo (!empty($checked) ? '' : 'style="display:none"') ?>>
-			<td><?php echo $data['entry_order_myparcel_text_insurance']; ?></td>
-			<td>
-				<select name="myparcel_options[<?php echo $order_id; ?>][insured_amount_selectbox]" class="insured_amount">
-					<?php foreach ($data['insured_amounts'] as $key => $insured_amount) : ?>
+    <?php if ($is_eu): ?>
+        <tr <?php echo (!empty($checked) ? '' : 'style="display:none"') ?>>
+            <td><?php echo $data['entry_order_myparcel_text_insurance']; ?></td>
+            <td>
+                <select name="myparcel_options[<?php echo $order_id; ?>][insured_amount_selectbox]" class="insured_amount">
+                    <?php foreach ($data['insured_amounts'] as $key => $insured_amount) : ?>
                         <?php $selected = ((!empty($export_settings['insured_amount_selectbox']) && ($export_settings['insured_amount_selectbox']) == $key) ? 'selected="selected"' : '' ) ?>
-					<option <?php echo $selected ?> value="<?php echo $key; ?>"><?php echo $insured_amount; ?></option>
-					<?php endforeach; ?>
-				</select>
-			</td>
-		</tr>
-		<tr <?php echo (!empty($checked) ? '' : 'style="display:none"') ?>>
-			<td>
-				<?php echo $data['entry_order_myparcel_text_insurance_amount']; ?>
-			</td>
-			<td>
-				<input type="text" name="myparcel_options[<?php echo $order_id; ?>][insured_amount_custom]" value="<?php echo (isset($export_settings['insured_amount_custom']))?$export_settings['insured_amount_custom']:0; ?>" style="width:100%" class="insured_amount">
-			</td>
-		</tr>
-		<?php else: ?>
-		<tr>
-			<td colspan="2" style="display:none;">
-				<input type="hidden" name="myparcel_options[<?php echo $order_id; ?>][insured_amount_input_not_eu]" value="<?php echo (isset($export_settings['insured_amount_custom']))?($export_settings['insured_amount_custom']/100):0; ?>">
-			</td>
-		</tr>
-		<?php endif; ?>
-	</tbody>
+                        <option <?php echo $selected ?> value="<?php echo $key; ?>"><?php echo $insured_amount; ?></option>
+                    <?php endforeach; ?>
+                </select>
+            </td>
+        </tr>
+        <tr <?php echo (!empty($checked) ? '' : 'style="display:none"') ?>>
+            <td>
+                <?php echo $data['entry_order_myparcel_text_insurance_amount']; ?>
+            </td>
+            <td>
+                <input type="text" name="myparcel_options[<?php echo $order_id; ?>][insured_amount_custom]" value="<?php echo (isset($export_settings['insured_amount_custom']))?$export_settings['insured_amount_custom']:0; ?>" style="width:100%" class="insured_amount">
+            </td>
+        </tr>
+    <?php else: ?>
+        <tr>
+            <td colspan="2" style="display:none;">
+                <input type="hidden" name="myparcel_options[<?php echo $order_id; ?>][insured_amount_input_not_eu]" value="<?php echo (isset($export_settings['insured_amount_custom']))?($export_settings['insured_amount_custom']/100):0; ?>">
+            </td>
+        </tr>
+    <?php endif; ?>
+    </tbody>
+</table>
+<table class="ocmyparcel_settings_table digital_stamp_options">
+    <tbody>
+    <tr>
+        <td>
+            <?php echo $data['entry_weight'] ?>
+        </td>
+        <td >
+            <select name="myparcel_options[<?php echo $order_id; ?>][digital_stamp_weight]" >
+                <?php foreach ($data['digital_stamp_weights'] as $key => $weight) : ?>
+                    <?php $selected = (isset($myparcel_options[$order_id]['digital_stamp_weight'])) ? 'selected="selected"' : '' ; ?>
+                    <option <?php echo $selected ?> value="<?php echo $key ?>"><?php echo $weight ?></option>
+                <?php endforeach; ?>
+            </select>
+        </td>
+    </tr>
+    </tbody>
 </table>
-
 <?php
-	$description = isset($export_settings['label_description'])?$export_settings['label_description']:"";
+$description = isset($export_settings['label_description'])?$export_settings['label_description']:"";
 ?>
 
 <table class="ocmyparcel_settings_table">
-	<tbody>
-		<tr>
-			<td><?php echo $data['entry_order_myparcel_custom_id']; ?></td>
-			<td>
-				<input type="text" name="myparcel_options[<?php echo $order_id; ?>][label_description]" value="<?php echo $description ?>" style="width:100%">
-			</td>
-		</tr>
+    <tbody>
+    <tr>
+        <td><?php echo $data['entry_order_myparcel_custom_id']; ?></td>
+        <td>
+            <input type="text" name="myparcel_options[<?php echo $order_id; ?>][label_description]" value="<?php echo $description ?>" style="width:100%">
+        </td>
+    </tr>
 
-		<?php if ($description && trim($description) == '[ORDER_NR]') : ?>
-		<tr>
-			<td>
-			</td>
-			<td>
-				<label>Order ID: <?php echo $order_id; ?></label>
-			</td>
-		</tr>
-		<?php endif; ?>
-	</tbody>
+    <?php if ($description && trim($description) == '[ORDER_NR]') : ?>
+        <tr>
+            <td>
+            </td>
+            <td>
+                <label>Order ID: <?php echo $order_id; ?></label>
+            </td>
+        </tr>
+    <?php endif; ?>
+    </tbody>
 </table>
 
 <div class="oc_save_shipment_settings <?php echo ($return ? 'clearfix' : '') ?>">
-	<?php if ($return) : ?>
-		<a 	class="button save btn btn-primary pull-right"
-		   	id="btn-myparcel-submit-return"
-		  	data-order="<?php echo $order_id; ?>"
-		   	data-url="<?php echo $url; ?>"
-			data-order-id="<?php echo $order_id; ?>"
-			data-loader="<?php echo MyParcel()->getImageUrl() . 'myparcel-spin.gif' ?>"
-		    data-screen="<?php echo $screen; ?>"
-		>
-			<?php echo $data['button_send_to_customer'] ?>
-		</a>
-	<?php else : ?>
-		<a class="button save btn btn-primary" data-order="<?php echo $order_id; ?>" data-url="<?php echo $url; ?>"><?php echo $data['button_save'] ?></a>
-		<img src="<?php echo MyParcel()->getImageUrl() . 'myparcel-spin.gif' ?>" class="oc_spinner waiting">
-	<?php endif; ?>
-</div>
\ No newline at end of file
+    <?php if ($return) : ?>
+        <a 	class="button save btn btn-primary pull-right"
+              id="btn-myparcel-submit-return"
+              data-order="<?php echo $order_id; ?>"
+              data-url="<?php echo $url; ?>"
+              data-order-id="<?php echo $order_id; ?>"
+              data-loader="<?php echo MyParcel()->getImageUrl() . 'myparcel-spin.gif' ?>"
+              data-screen="<?php echo $screen; ?>"
+        >
+            <?php echo $data['button_send_to_customer'] ?>
+        </a>
+    <?php else : ?>
+        <a class="button save btn btn-primary" data-order="<?php echo $order_id; ?>" data-url="<?php echo $url; ?>"><?php echo $data['button_save'] ?></a>
+        <img src="<?php echo MyParcel()->getImageUrl() . 'myparcel-spin.gif' ?>" class="oc_spinner waiting">
+    <?php endif; ?>
+</div>
diff --git a/upload/system/library/myparcelnl/views/view_shipment_summary_myparcel.php b/upload/system/library/myparcelnl/views/view_shipment_summary_myparcel.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/views/view_tracktrace_myaccount_myparcel.php b/upload/system/library/myparcelnl/views/view_tracktrace_myaccount_myparcel.php
old mode 100755
new mode 100644
diff --git a/upload/system/library/myparcelnl/views/view_tracktrace_myparcel.php b/upload/system/library/myparcelnl/views/view_tracktrace_myparcel.php
old mode 100755
new mode 100644