tig_myparcel - Version 1.4.1

Version Notes

=== v1.4.1 ===
=== Improvements ===
- Improved the control of transacional e-mails from the cron

=== v1.4.0 ===
==== New features ====
- Support for IWD One Step / Page Checkout added

=== v1.3.3 ===
=== Improvements ===
- Improvements for the installation via Magento Connect

=== v1.3.2 ===
=== Improvements ===
Support for the Magento Patch SUPEE-6285 solved

=== v1.3.1 ===
=== Improvements ===
- Added Magento Patch SUPEE-6788 compatibility

=== v1.3.0 ===
==== New features ====
- Shipping methods connected to MyParcel
- Minimal order price PakjeGemak
- Labels printing via shipping overview

==== Bug fixes ====
- Various bugs fixed

=== v1.1.4 ===
=== Improvements ===
- Pakjegemak extra address-validation on order detail page

=== Known bugs ===
None. Please contact us if you find a bug.

=== v1.1.3 ===
=== Improvements ===
- Print-position overlay optimised
- New translations
- Extended logging functionality

Download this release

Release Info

Developer	TIG
Extension	tig_myparcel
Version	1.4.1
Comparing to
See all releases

Code changes from version 1.3.3 to 1.4.1

Files changed (10) hide show

app/code/community/TIG/MyParcel2014/Helper/Data.php +14 -6
app/code/community/TIG/MyParcel2014/Model/Observer/Cron.php +88 -27
app/code/community/TIG/MyParcel2014/etc/config.xml +1 -1
app/design/adminhtml/default/default/template/TIG/MyParcel2014/system/config/supportTab.phtml +5 -2
app/design/frontend/base/default/layout/TIG/tig_myparcel.xml +21 -1
app/design/frontend/base/default/template/TIG/MyParcel2014/checkout/iwd_onepagecheckout/js.phtml +185 -0
app/locale/en_US/TIG_MyParcel2014.csv +2 -1
app/locale/nl_NL/TIG_MyParcel2014.csv +1 -0
package.xml +13 -5
skin/frontend/base/default/js/TIG/MyParcel2014/checkout.js +11 -3

app/code/community/TIG/MyParcel2014/Helper/Data.php CHANGED Viewed

	@@ -209,6 +209,19 @@ class TIG_MyParcel2014_Helper_Data extends Mage_Core_Helper_Abstract {
209	return false;
210	}
211













212	/**
213	* Checks if country needs to have customs
214	*
	@@ -217,12 +230,7 @@ class TIG_MyParcel2014_Helper_Data extends Mage_Core_Helper_Abstract {
217	*/
218	public function countryNeedsCustoms($countryCode)
219	{
220	- $~~whitelist~~ = ~~array~~(
221	- 'NL','BE','BG','DK','DE','EE','FI','FR','HU','IE',
222	- 'IT','LV','LT','LU','MC','AT','PL','PT','RO','SI',
223	- 'SK','ES','CZ','GB','SE',
224	- );
225	- $whitelisted = in_array($countryCode, $whitelist);
226	if (!$whitelisted) {
227	return true;
228	}


209	return false;
210	}
211
212	+ /**
213	+ * Returns the whiteList codes for customs.
214	+ * @return array
215	+ */
216	+ public function whiteListCodes()
217	+ {
218	+ return array(
219	+ 'NL','BE','BG','DK','DE','EE','FI','FR','HU','IE',
220	+ 'IT','LV','LT','LU','MC','AT','PL','PT','RO','SI',
221	+ 'SK','ES','CZ','GB','SE'
222	+ );
223	+ }
224	+
225	/**
226	* Checks if country needs to have customs
227	*

230	*/
231	public function countryNeedsCustoms($countryCode)
232	{
233	+ $whitelisted = in_array($countryCode, $this->whiteListCodes());





234	if (!$whitelisted) {
235	return true;
236	}

app/code/community/TIG/MyParcel2014/Model/Observer/Cron.php CHANGED Viewed

@@ -25,64 +25,126 @@
              * It is available through the world-wide-web at this URL:
              * http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
              * If you are unable to obtain it through the world-wide-web, please send an email
-            -
             * to servicedesk@tig.nl so we can send you a copy immediately.
+             *
              * DISCLAIMER
+             *
              * Do not edit or add to this file if you wish to upgrade this module to newer
              * versions in the future. If you wish to customize this module for your
-            -
             * needs please contact servicedesk@tig.nl for more information.
+             *
-            -
             * @copyright   Copyright (c) 2014 Total Internet Group B.V. (http://www.tig.nl)
              * @license     http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
-            -
             *
-            -
             *
              */
             class TIG_MyParcel2014_Model_Observer_Cron
+            {
-            -
                public function checkStatus()
+                {
-            -
                    $helper = Mage::helper('tig_myparcel');
-            -
                    if(!$helper->isEnabled()){
                         return $this;
+                    }
-            -
                    //$helper->log('MyParcel checkStatus cron is started!');
-            -
                    //get all MyParcel shipments with no final status
-            -
                    $myparcelShipmentCollection = Mage::getResourceModel('tig_myparcel/shipment_collection');
-            -
                    $myparcelShipmentCollection->addFieldToFilter('is_final', array('eq' => '0'));
-            -
                    foreach ($myparcelShipmentCollection as $shipment)  {
                         $api           = Mage::getModel('tig_myparcel/api_myParcel');
                         $consignmentId = $shipment->getConsignmentId();
                         $barcode       = $shipment->getBarcode();
-            -
                        $status        = $shipment->getStatus();
                         $response = $api->createRetrieveStatusRequest($consignmentId)
-            -
                                        ->sendRequest()
-            -
                                        ->getRequestResponse();
                         if (is_array($response)) {
-            -
                            if($response['tracktrace'] != $barcode){
-            -
                                $helper->log('new barcode: '.$response['tracktrace']);
-            -
-            -
                                //check if e-mailtemplate isset
-            -
                                $isSend = $helper->sendBarcodeEmail($response['tracktrace'],$shipment);
-            -
                                if($isSend){
                                     //add comment to order-comment history
-            -
                                    $comment = $helper->__('Track&amp;Trace e-mail is send: %s',$barcode);
                                     $order = $shipment->getOrder();
                                     $order->addStatusHistoryComment($comment);
                                     $order->setEmailSent(true);
                                     $order->save();
+                                }
                                 $shipment->setBarcode($response['tracktrace']);
+                            }
-            -
                            if($response['status'] != $status){
                                 $shipment->setStatus($response['status']);
+                            }
@@ -93,11 +155,10 @@ class TIG_MyParcel2014_Model_Observer_Cron
                             if($shipment->hasDataChanges()){
                                 $shipment->save();
+                            }
                         } else {
-            -
                            $helper->log($api->getRequestErrorDetail(),Zend_Log::ERR);
+                        }
+                    }
-            -
-            -
                    return $this;
+                }
+            }


25	* It is available through the world-wide-web at this URL:
26	* http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
27	* If you are unable to obtain it through the world-wide-web, please send an email
28	+ * to servicedesk@totalinternetgroup.nl so we can send you a copy immediately.
29	*
30	* DISCLAIMER
31	*
32	* Do not edit or add to this file if you wish to upgrade this module to newer
33	* versions in the future. If you wish to customize this module for your
34	+ * needs please contact servicedesk@totalinternetgroup.nl for more information.
35	*
36	+ * @copyright Copyright (c) 2016 Total Internet Group B.V. (http://www.totalinternetgroup.nl)
37	* @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US


38	*/
39
40	class TIG_MyParcel2014_Model_Observer_Cron
41	{
42	+
43	+ /** @var TIG_MyParcel2014_Helper_Data $helper */
44	+ public $helper;
45	+
46	+ /**
47	+ * Init
48	+ */
49	+ public function _construct()
50	{
51	+ $this->helper = Mage::helper('tig_myparcel');
52	+ }
53
54	+ /**
55	+ * @return $this
56	+ */
57	+ public function checkStatus()
58	+ {
59	+ if (!$this->helper->isEnabled()) {
60	return $this;
61	}
62
63	+ $this->_checkEUShipments();
64	+ $this->_checkCDShipments();
65	+
66	+ return $this;
67	+ }
68	+
69	+ protected function _checkEUShipments()
70	+ {
71	+ $resource = Mage::getSingleton('core/resource');
72	+ $collection = Mage::getResourceModel('tig_myparcel/shipment_collection');
73	+
74	+ $collection->getSelect()->joinLeft(
75	+ array('shipping_address' => $resource->getTableName('sales/order_address')),
76	+ "main_table.entity_id=shipping_address.parent_id AND shipping_address.address_type='shipping'",
77	+ array());
78
79	+ $collection->addFieldToFilter('shipping_address.country_id', array(
80	+ 'in' => array($this->helper->whiteListCodes()))
81	+ );
82	+ $collection->addFieldToFilter('main_table.is_final', array('eq' => '0'));
83	+ $collection->addFieldToFilter('main_table.created_at', array(
84	+ 'gt' => date('Y-m-d', strtotime('-14 day')))
85	+ );
86
87	+ $this->_checkCollectionStatus($collection);
88	+ }
89	+
90	+ protected function _checkCDShipments()
91	+ {
92	+ $resource = Mage::getSingleton('core/resource');
93	+ $collection = Mage::getResourceModel('tig_myparcel/shipment_collection');
94	+
95	+ $collection->getSelect()->joinLeft(
96	+ array('shipping_address' => $resource->getTableName('sales/order_address')),
97	+ "main_table.entity_id=shipping_address.parent_id AND shipping_address.address_type='shipping'",
98	+ array());
99	+
100	+ $collection->addFieldToFilter('main_table.is_final', array('eq' => '0'));
101	+ $collection->addFieldToFilter('shipping_address.country_id', array(
102	+ 'nin' => array($this->helper->whiteListCodes()))
103	+ );
104	+
105	+ $this->_checkCollectionStatus($collection);
106	+ }
107	+
108	+ /**
109	+ * Retrieve shipment status from Myparcel
110	+ *
111	+ * @param $collection
112	+ *
113	+ * @throws Exception
114	+ */
115	+ protected function _checkCollectionStatus($collection)
116	+ {
117	+ /** @var TIG_MyParcel2014_Model_Shipment $shipment */
118	+ foreach ($collection as $shipment) {
119	$api = Mage::getModel('tig_myparcel/api_myParcel');
120	$consignmentId = $shipment->getConsignmentId();
121	$barcode = $shipment->getBarcode();

122
123	$response = $api->createRetrieveStatusRequest($consignmentId)
124	+ ->sendRequest()
125	+ ->getRequestResponse();
126
127	if (is_array($response)) {
128	+ // Check if there is an new barcode
129	+ if (!empty($response['tracktrace']) && $response['tracktrace'] != $barcode) {
130	+ // Send the barcode email, but first check if the e-mail tempalte is set.
131	+ $shipmentTime = strtotime($shipment->getCreatedAt());
132	+ if ($shipmentTime > strtotime('-1 hour')
133	+ && $this->helper->sendBarcodeEmail($response['tracktrace'],$shipment)) {
134	//add comment to order-comment history
135	+ $comment = $this->helper->__('Track&Trace e-mail is send: %s',$barcode);
136	+ /** @var Mage_Sales_Model_Order $order */
137	$order = $shipment->getOrder();
138	$order->addStatusHistoryComment($comment);
139	$order->setEmailSent(true);
140	$order->save();
141	}
142	+
143	$shipment->setBarcode($response['tracktrace']);
144	+ $this->helper->log('new barcode: '.$response['tracktrace']);
145	}
146
147	+ if($response['status'] != $shipment->getStatus()){
148	$shipment->setStatus($response['status']);
149	}
150

155	if($shipment->hasDataChanges()){
156	$shipment->save();
157	}
158	+
159	} else {
160	+ $this->helper->log($api->getRequestErrorDetail(), Zend_Log::ERR);
161	}
162	}


163	}
164	}

app/code/community/TIG/MyParcel2014/etc/config.xml CHANGED Viewed

	@@ -2,7 +2,7 @@
2	<config>
3	<modules>
4	<TIG_MyParcel2014>
5	- <version>1.3.3</version>
6	</TIG_MyParcel2014>
7	</modules>
8	<global>


2	<config>
3	<modules>
4	<TIG_MyParcel2014>
5	+ <version>1.4.1</version>
6	</TIG_MyParcel2014>
7	</modules>
8	<global>

app/design/adminhtml/default/default/template/TIG/MyParcel2014/system/config/supportTab.phtml CHANGED Viewed

	@@ -71,7 +71,10 @@
71	<li><?php echo $_helper->__('Magento Community Edition version');?> v1.6, v1.7, v1.8 & v1.9</li>
72	</ul>
73	<ul>
74	- <li><?php echo $_helper->__("Idev's OneStepCheckout version");?> v4.0 & v4.1</li>



75	</ul>
76	<ul>
77	<li><?php echo $_helper->__('We cannot guarantee perfect functionality of the MyParcel extension when you intend to use the extension on a version of Magento that is not supported or when you intend to use the extension together with a 3rd part extension that is not supported. If you have any questions please contact MyParcel.'); ?></li>
	@@ -151,4 +154,4 @@
151	</tr>
152	</table>
153	</td>
154	- </tr>


71	<li><?php echo $_helper->__('Magento Community Edition version');?> v1.6, v1.7, v1.8 & v1.9</li>
72	</ul>
73	<ul>
74	+ <li><?php echo $_helper->__("Idev's OneStepCheckout version");?> v4.0, v4.1 & v4.5</li>
75	+ </ul>
76	+ <ul>
77	+ <li><?php echo $_helper->__("IWD's OnePageCheckout version");?> v4.2.2</li>
78	</ul>
79	<ul>
80	<li><?php echo $_helper->__('We cannot guarantee perfect functionality of the MyParcel extension when you intend to use the extension on a version of Magento that is not supported or when you intend to use the extension together with a 3rd part extension that is not supported. If you have any questions please contact MyParcel.'); ?></li>

154	</tr>
155	</table>
156	</td>
157	+ </tr>

app/design/frontend/base/default/layout/TIG/tig_myparcel.xml CHANGED Viewed

@@ -94,4 +94,24 @@
                         <block type="tig_myparcel/checkout_js" name="myparcel_checkout_js" template="TIG/MyParcel2014/checkout/idev_onestepcheckout/js.phtml"/>
                     </reference>
                 </onestepcheckout_index_index>
-            -
            </layout>


94	<block type="tig_myparcel/checkout_js" name="myparcel_checkout_js" template="TIG/MyParcel2014/checkout/idev_onestepcheckout/js.phtml"/>
95	</reference>
96	</onestepcheckout_index_index>
97	+
98	+ <opc_index_index>
99	+ <reference name="head">
100	+ <action method="addItem">
101	+ <type>skin_js</type>
102	+ <file>js/TIG/MyParcel2014/MutationObserver.js</file>
103	+ </action>
104	+ <action method="addItem">
105	+ <type>skin_js</type>
106	+ <file>js/TIG/MyParcel2014/checkout.js</file>
107	+ </action>
108	+ <action method="addItem">
109	+ <type>skin_css</type>
110	+ <file>css/TIG/MyParcel2014/checkout.css</file>
111	+ </action>
112	+ </reference>
113	+ <reference name="before_body_end">
114	+ <block type="tig_myparcel/checkout_js" name="myparcel_checkout_js" template="TIG/MyParcel2014/checkout/iwd_onepagecheckout/js.phtml"/>
115	+ </reference>
116	+ </opc_index_index>
117	+ </layout>

app/design/frontend/base/default/template/TIG/MyParcel2014/checkout/iwd_onepagecheckout/js.phtml ADDED Viewed

	@@ -0,0 +1,185 @@


1	+ <?php
2	+ /**
3	+ * ___________ __ __
4	+ * \__ ___/____ _/ \|_ _____ \| \|
5	+ * \| \| / _ \\ __\\__ \ \| \|
6	+ * \| \| \| \|_\| \|\| \| / __ \_\| \|__
7	+ * \|____\| \____/ \|__\| (____ /\|____/
8	+ * \/
9	+ * ___ __ __
10	+ * \| \| ____ _/ \|_ ____ _______ ____ ____ _/ \|_
11	+ * \| \| / \\ __\_/ __ \\_ __ \ / \ _/ __ \\ __\
12	+ * \| \|\| \| \\| \| \ ___/ \| \| \/\| \| \\ ___/ \| \|
13	+ * \|___\|\|___\| /\|__\| \_____>\|__\| \|___\| / \_____>\|__\|
14	+ * \/ \/
15	+ * ________
16	+ * / _____/_______ ____ __ __ ______
17	+ * / \ ___\_ __ \ / _ \ \| \| \\____ \
18	+ * \ \_\ \\| \| \/\| \|_\| \|\| \| /\| \|_\| \|
19	+ * \______ /\|__\| \____/ \|____/ \| __/
20	+ * \/ \|__\|
21	+ *
22	+ * NOTICE OF LICENSE
23	+ *
24	+ * This source file is subject to the Creative Commons License.
25	+ * It is available through the world-wide-web at this URL:
26	+ * http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
27	+ * If you are unable to obtain it through the world-wide-web, please send an email
28	+ * to servicedesk@tig.nl so we can send you a copy immediately.
29	+ *
30	+ * DISCLAIMER
31	+ *
32	+ * Do not edit or add to this file if you wish to upgrade this module to newer
33	+ * versions in the future. If you wish to customize this module for your
34	+ * needs please contact servicedesk@tig.nl for more information.
35	+ *
36	+ * @copyright Copyright (c) 2015 Total Internet Group B.V. (http://www.tig.nl)
37	+ * @license http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US
38	+ */
39	+ ?>
40	+ <?php $_helper = Mage::helper('tig_myparcel'); ?>
41	+ <div id="myparcel_checkout_overlay_container" style="display:none;"></div>
42	+ <div id="myparcel_checkout_container" style="display:none;">
43	+ <div id="#{overlay_id}" class="responsive-add-location">
44	+ <div class="overlay close"></div>
45	+ <div id="#{overlay_window_id}">
46	+ <div class="logo">
47	+ <img src="<?php echo $this->getSkinUrl('images/TIG/MyParcel/checkout/logo_postnl.png');?>" alt="" />
48	+ <p class="powered-by"><?php echo $_helper->__('Powered by MyParcel'); ?></p>
49	+ </div>
50	+ <span class="close"><?php echo $_helper->__('Close'); ?></span>
51	+ <h3><?php echo $_helper->__('Choose a PostNL pickup location'); ?></h3>
52	+ <div class="responsive-location-search">
53	+ <div class="search-form">
54	+ <label for="#{postcode_field_id}"><?php echo $_helper->__('Search by zipcode and housenumber'); ?>:</label>
55	+ <input type="text" class="myparcel-input" name="" id="#{postcode_field_id}" value="" placeholder="<?php echo $_helper->__('Zipcode'); ?>" />
56	+ <label for="#{housenr_field_id}"><?php echo $_helper->__('Housenumber'); ?>:</label>
57	+ <input type="text" class="myparcel-input" name="" id="#{housenr_field_id}" value="" placeholder="<?php echo $_helper->__('Housenumber'); ?>" />
58	+ </div>
59	+ <div class="actions">
60	+ <div id="#{location_loader_id}" class="myparcel-loader" style="display:none;"></div>
61	+ <button class="myparcel-button" id="#{search_button_id}"><?php echo $_helper->__('Search'); ?></button>
62	+ </div>
63	+ </div>
64	+
65	+ <div class="responsive-location-results">
66	+ <div class="heading">
67	+ <h3><?php echo $_helper->__('Nearest myparcel pickup points'); ?></h3>
68	+ </div>
69	+
70	+ <ul class="list" id="#{location_list_id}">
71	+ </ul>
72	+ </div>
73	+ </div>
74	+ </div>
75	+ </div>
76	+ <div id="myparcel_checkout_location_template" style="display:none;">
77	+ <li class="location-details #{location_class}" id="#{location_id}" data-location_code="#{location_code}">
78	+ <div class="content">
79	+ <div class="location-info">
80	+ <span class="radio selected"></span><span class="address"><strong>#{location}</strong><br>#{street} #{street_number}<br>#{postcode} #{city}</span><span class="distance"><strong>#{distance} m</strong></span>
81	+ </div>
82	+ <a style="display:none;" href="#" class="info-link">More info</a>
83	+ <button class="myparcel-button" onclick="#{select_location_onclick}"><?php echo $_helper->__('Select'); ?></button>
84	+ </div>
85	+ <div class="more-info" id="#{location_info_id}" style="display:none;">
86	+ <table class="business-hours">
87	+ <thead>
88	+ <tr>
89	+ <th colspan="2"><?php echo $this->__('Business hours') ?></th>
90	+ </tr>
91	+ </thead>
92	+ <tbody>
93	+ <tr>
94	+ <th><?php echo $this->__('Mo') ?></th>
95	+ <td>#{opening_hours_monday}</td>
96	+ </tr>
97	+ <tr>
98	+ <th><?php echo $this->__('Tu') ?></th>
99	+ <td>#{opening_hours_tuesday}</td>
100	+ </tr>
101	+ <tr>
102	+ <th><?php echo $this->__('We') ?></th>
103	+ <td>#{opening_hours_wednesday}</td>
104	+ </tr>
105	+ <tr>
106	+ <th><?php echo $this->__('Th') ?></th>
107	+ <td>#{opening_hours_thursday}</td>
108	+ </tr>
109	+ <tr>
110	+ <th><?php echo $this->__('Fr') ?></th>
111	+ <td>#{opening_hours_friday}</td>
112	+ </tr>
113	+ <tr>
114	+ <th><?php echo $this->__('Sa') ?></th>
115	+ <td>#{opening_hours_saturday}</td>
116	+ </tr>
117	+ <tr>
118	+ <th><?php echo $this->__('Su') ?></th>
119	+ <td>#{opening_hours_sunday}</td>
120	+ </tr>
121	+ </tbody>
122	+ </table>
123	+ </div>
124	+ </li>
125	+ </div>
126	+ <div id="myparcel_checkout_location_error_template" style="display:none;">
127	+ <li id="no_locations_error" class="location-error-msg">
128	+ <?php echo $_helper->__('Unfortunately no locations could be found. Please check your postcode and house number combination.'); ?>
129	+ </li>
130	+ </div>
131	+ <div id="myparcel_checkout_selected_location_template" style="display:none;">
132	+ <div id="#{selected_location_id}" class="complete">
133	+ <label><?php echo $this->__('Selected post office location:') ?></label>
134	+ <address>
135	+ #{location}<br />
136	+ #{street} #{street_number}<br />
137	+ #{city}, #{postcode}<br />
138	+ Nederland<br />
139	+ T: #{phone_number}
140	+ <a href="#" onclick="myParcelCheckout.openOverlay();return false;" class="myparcel_checkout_edit_link"><?php echo $this->__('Edit'); ?></a>
141	+ </address>
142	+ </div>
143	+ </div>
144	+ <script type="text/javascript">
145	+ //<![CDATA[
146	+ var myParcelCheckout;
147	+ document.observe('dom:loaded', function() {
148	+ var checkoutContainer = $('myparcel_checkout_container');
149	+ var locationContainer = $('myparcel_checkout_location_template');
150	+ var locationErrorContainer = $('myparcel_checkout_location_error_template');
151	+ var selectedLocationContainer = $('myparcel_checkout_selected_location_template');
152	+ var templates = {
153	+ overlay : new Template(checkoutContainer.innerHTML),
154	+ location : new Template(locationContainer.innerHTML),
155	+ location_error : new Template(locationErrorContainer.innerHTML),
156	+ selected_location : new Template(selectedLocationContainer.innerHTML)
157	+ };
158	+
159	+ checkoutContainer.remove();
160	+ locationContainer.remove();
161	+ locationErrorContainer.remove();
162	+ selectedLocationContainer.remove();
163	+
164	+ var config = {
165	+ get_locations_url : '<?php echo $this->getUrl('myparcel2014/checkout/getLocations', array('_secure' => true)); ?>',
166	+ save_location_url : '<?php echo $this->getUrl('myparcel2014/checkout/saveLocation', array('_secure' => true)); ?>',
167	+ use_shipping_or_billing_checkbox : true,
168	+ save_location_on_select : true
169	+ };
170	+
171	+ var selectors = {
172	+ shipping_methods_container : '#checkout-shipping-method-load',
173	+ shipping_method : '#s_method_myparcel_pakjegemak',
174	+ billing_or_shipping_field : '#billing\\:use_for_shipping_yes'
175	+ };
176	+
177	+ myParcelCheckout = new MyParcelCheckout(config, selectors, templates, {});
178	+
179	+ var shippingMethod =$('s_method_myparcel_pakjegemak');
180	+ if (shippingMethod.checked) {
181	+ shippingMethod.checked = false;
182	+ }
183	+ });
184	+ //]]>
185	+ </script>

app/locale/en_US/TIG_MyParcel2014.csv CHANGED Viewed

	@@ -91,6 +91,7 @@ TIG_MyParcel2014::Magento & 3rd party version compatibility,Magento & 3r
91	TIG_MyParcel2014::Magento Community Edition version,Magento Community Edition version
92	TIG_MyParcel2014::Magento Enterprise Edition version,Magento Enterprise Edition version
93	TIG_MyParcel2014::Idev's OneStepCheckout version,Idev's OneStepCheckout version

94	"TIG_MyParcel2014::If you wish to use this extension on an unsupported Magento version or edition, or in combination with an unsupported 3rd party extension, we cannot guarantee the MyParcel extension will function as expected. For questions please contact the Total Internet Group servicedesk.","If you wish to use this extension on an unsupported Magento version or edition, or in combination with an unsupported 3rd party extension, we cannot guarantee the MyParcel extension will function as expected. For questions please contact the Total Internet Group servicedesk."
95	TIG_MyParcel2014::Support,Support
96	TIG_MyParcel2014::The extension is developed by Total Internet Group.,The extension is developed by Total Internet Group.
	@@ -176,4 +177,4 @@ TIG_MyParcel2014::Insured up to: € %s,Insured up to: € %s
176	TIG_MyParcel2014::Post Office Address,Post Office Address
177	"TIG_MyParcel2014::The selected shipment type cannot be used. Pakjegemak shipments can only be created with the normal shipment type.<br/> The Magento shipment has been created without a MyParcel shipment, select a different shipment type or go to the shipment page to create a single MyParcel shipment. <a target=""_blank"" href=""%s"">View shipment</a>","The selected shipment type cannot be used. Pakjegemak shipments can only be created with the normal shipment type.<br/> The Magento shipment has been created without a MyParcel shipment, select a different shipment type or go to the shipment page to create a single MyParcel shipment. <a target=""_blank"" href=""%s"">View shipment</a>"
178	TIG_MyParcel2014::Only for dutch shipments,Only for dutch shipments
179	- "TIG_MyParcel2014::Only for dutch shipments, shipments to outside of the EU are standard ensured up to &euro 200","Only for dutch shipments, shipments to outside of the EU are standard ensured up to &euro 200"


91	TIG_MyParcel2014::Magento Community Edition version,Magento Community Edition version
92	TIG_MyParcel2014::Magento Enterprise Edition version,Magento Enterprise Edition version
93	TIG_MyParcel2014::Idev's OneStepCheckout version,Idev's OneStepCheckout version
94	+ TIG_MyParcel2014::IWD's OnePageCheckout version,IWD's OnePageCheckout version
95	"TIG_MyParcel2014::If you wish to use this extension on an unsupported Magento version or edition, or in combination with an unsupported 3rd party extension, we cannot guarantee the MyParcel extension will function as expected. For questions please contact the Total Internet Group servicedesk.","If you wish to use this extension on an unsupported Magento version or edition, or in combination with an unsupported 3rd party extension, we cannot guarantee the MyParcel extension will function as expected. For questions please contact the Total Internet Group servicedesk."
96	TIG_MyParcel2014::Support,Support
97	TIG_MyParcel2014::The extension is developed by Total Internet Group.,The extension is developed by Total Internet Group.

177	TIG_MyParcel2014::Post Office Address,Post Office Address
178	"TIG_MyParcel2014::The selected shipment type cannot be used. Pakjegemak shipments can only be created with the normal shipment type.<br/> The Magento shipment has been created without a MyParcel shipment, select a different shipment type or go to the shipment page to create a single MyParcel shipment. <a target=""_blank"" href=""%s"">View shipment</a>","The selected shipment type cannot be used. Pakjegemak shipments can only be created with the normal shipment type.<br/> The Magento shipment has been created without a MyParcel shipment, select a different shipment type or go to the shipment page to create a single MyParcel shipment. <a target=""_blank"" href=""%s"">View shipment</a>"
179	TIG_MyParcel2014::Only for dutch shipments,Only for dutch shipments
180	+ "TIG_MyParcel2014::Only for dutch shipments, shipments to outside of the EU are standard ensured up to &euro 200","Only for dutch shipments, shipments to outside of the EU are standard ensured up to &euro 200"

app/locale/nl_NL/TIG_MyParcel2014.csv CHANGED Viewed

	@@ -91,6 +91,7 @@ TIG_MyParcel2014::Magento & 3rd party version compatibility,Magento & de
91	TIG_MyParcel2014::Magento Community Edition version,Magento Community Edition versie
92	TIG_MyParcel2014::Magento Enterprise Edition version,Magento Enterprise Edition versie
93	TIG_MyParcel2014::Idev's OneStepCheckout version,Idev's OneStepCheckout versie

94	"TIG_MyParcel2014::If you wish to use this extension on an unsupported Magento version or edition, or in combination with an unsupported 3rd party extension, we cannot guarantee the MyParcel extension will function as expected. For questions please contact the Total Internet Group servicedesk.","Indien u de extensie wilt gebruiken op een niet-ondersteunde versie of editie van Magento, of als u de extensie wilt gebruiken samen met een 3rd party extensie die niet ondersteund wordt, kunnen wij niet garanderen dat de MyParcel extensie feilloos zal functioneren. Voor vragen kunt u contact opnemen met MyParcel."
95	TIG_MyParcel2014::Support,Ondersteuning
96	TIG_MyParcel2014::The extension is developed by Total Internet Group.,Deze extensie is ontwikkeld door Total Internet Group.


91	TIG_MyParcel2014::Magento Community Edition version,Magento Community Edition versie
92	TIG_MyParcel2014::Magento Enterprise Edition version,Magento Enterprise Edition versie
93	TIG_MyParcel2014::Idev's OneStepCheckout version,Idev's OneStepCheckout versie
94	+ TIG_MyParcel2014::IWD's OnePageCheckout version,IWD's OnePageCheckout versie
95	"TIG_MyParcel2014::If you wish to use this extension on an unsupported Magento version or edition, or in combination with an unsupported 3rd party extension, we cannot guarantee the MyParcel extension will function as expected. For questions please contact the Total Internet Group servicedesk.","Indien u de extensie wilt gebruiken op een niet-ondersteunde versie of editie van Magento, of als u de extensie wilt gebruiken samen met een 3rd party extensie die niet ondersteund wordt, kunnen wij niet garanderen dat de MyParcel extensie feilloos zal functioneren. Voor vragen kunt u contact opnemen met MyParcel."
96	TIG_MyParcel2014::Support,Ondersteuning
97	TIG_MyParcel2014::The extension is developed by Total Internet Group.,Deze extensie is ontwikkeld door Total Internet Group.

package.xml CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?xml version="1.0"?>
2	<package>
3	<name>tig_myparcel</name>
4	- <version>1.3.3</version>
5	<stability>stable</stability>
6	<license uri="http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US">Creative Commons License</license>
7	<channel>community</channel>
	@@ -20,7 +20,15 @@ With this extension you can:
20	- Generate return-links for a shipment
21	- Ship world-wide with MyParcel
22	- Send Track&Trace information</description>
23	- <notes>=== v1.3.3 ===








24	=== Improvements ===
25	- Improvements for the installation via Magento Connect
26
	@@ -54,9 +62,9 @@ None. Please contact us if you find a bug.
54	- New translations
55	- Extended logging functionality</notes>
56	<authors><author><name>TIG</name><user>supporttotal</user><email>servicedesk@totalinternetgroup.nl</email></author></authors>
57	- <date>2016-03-29</date>
58	- <time>08:47:30</time>
59	- <contents><target name="magecommunity"><dir name="TIG"><dir name="MyParcel2014"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Shipment"><dir name="Create"><file name="ConsignmentOptions.php" hash="fdf0ec9cf1e5ada2c89638392d5a4106"/></dir><file name="ShippingInfo.php" hash="8371397f10be993791d5878160b06548"/></dir><dir name="View"><file name="ShippingInfo.php" hash="7e0ffdedc1cab6870991cbb7e7f752fc"/></dir></dir></dir><dir name="System"><dir name="Config"><file name="AdminSecure.php" hash="abfbc4f529358040f5f21fbc47f95c0a"/><file name="Hidden.php" hash="98e74d07fb637d7cbac3eed14a55b378"/><file name="SupportTab.php" hash="3ed95adf1523bd5a21c1fe19d61813dc"/></dir></dir><dir name="Widget"><dir name="Grid"><dir name="Column"><dir name="Renderer"><dir name="Shipment"><file name="ShippingStatus.php" hash="6250677ea5d6e6b36be23cdc6d21c151"/></dir><file name="ShippingStatus.php" hash="6a9bfdfcac2b362f6797186f94467115"/></dir></dir></dir></dir></dir><dir name="Checkout"><file name="Js.php" hash="2fcda151238c8bf53d8c0bcd25b2859a"/><file name="PgAddress.php" hash="b1a9ac7d2219b3b4f85cab5996f8c531"/><file name="Progress.php" hash="ff8ec8b6512b5785dd621366a06856de"/></dir></dir><file name="Exception.php" hash="17fbabfc37a1872da197dda8ae31eaad"/><dir name="Helper"><file name="AddressValidation.php" hash="a85c4dda15b569c42f5ba51e74fa5726"/><file name="Data.php" hash="~~8e8524b060c84e5a2514f212be6d329b~~"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="Observer"><file name="OrderGrid.php" hash="8486635dfa393a8055c6cd28b30052d9"/><file name="ShipmentGrid.php" hash="39c2804ebc9c89c3abee141e22cfb0ad"/><file name="SystemConfig.php" hash="556df530f658e0c4e179ffba534e5013"/><file name="ViewShipment.php" hash="75cd817a5603280143a3ac87a4672f3c"/></dir><dir name="Support"><file name="Logs.php" hash="8678ec28f8a98cf2bd6b5625dc55ac15"/></dir></dir><dir name="Api"><file name="Curl.php" hash="f006338a00df9cef0485a647bfefaca6"/><file name="MyParcel.php" hash="32b8c1b8442926751ca9b8acfa9359c1"/></dir><dir name="Carrier"><file name="MyParcel.php" hash="56d1cce86bbd2193e9122cd17b724681"/><dir name="System"><dir name="Config"><dir name="Source"><file name="RateType.php" hash="d0e2b78dc1040b1265e35d60ae2de76b"/></dir></dir></dir></dir><dir name="Checkout"><file name="Service.php" hash="73e0c2c9ff1512a1c927093e200cfed2"/><file name="Validate.php" hash="f411737f90a793ba75c18092cb2f1248"/></dir><dir name="Observer"><file name="Cron.php" hash="~~ea790b89e5bd5379b0711415623b3e1d~~"/><file name="SaveConfig.php" hash="3804317337df37ce33615280f6c3677b"/><file name="SavePgAddress.php" hash="b07e42bda2318a7272a48a52480dccc0"/><file name="SaveShipment.php" hash="a70cef74590a4952af19944a1e7bf502"/></dir><dir name="Resource"><dir name="Order"><dir name="Grid"><file name="Collection.php" hash="48fc092078dcdbcca40788c486ca0987"/></dir></dir><file name="Setup.php" hash="b16d3f9146b6544c1f90ff8e218b52bb"/><dir name="Shipment"><file name="Collection.php" hash="6af521845d88a214d283cfd3fecfbd2d"/><dir name="Grid"><file name="Collection.php" hash="52886710560d83ced9224c93c0e6489c"/></dir></dir><file name="Shipment.php" hash="7c7bb4b4349da9504015a279b9ff8a4f"/></dir><file name="Shipment.php" hash="fd15fb02034a52915d674e059d0d2056"/><dir name="System"><dir name="Config"><dir name="Source"><file name="A4a6.php" hash="9233248742c79824ea8408577a9b4f2e"/><file name="Customs.php" hash="9b5c4fd3a866fdabf44a7b532b9c3501"/><file name="ShippingMethods.php" hash="ee471d016cf4df58467e21620bbd680c"/><file name="StreetField.php" hash="f171261f2d8785ebf41f19d2bfeb7d58"/><file name="Yesno.php" hash="0c49e0c17e933924d25ffe823e2dab16"/></dir></dir></dir></dir><dir name="controllers"><file name="CheckoutController.php" hash="b62b65440631e6bc5d80d59b84c3f4df"/><dir name="MyparcelAdminhtml"><file name="ConfigController.php" hash="07a71e79e780affd44edf005747c9804"/><file name="ShipmentController.php" hash="8e681b902d5a9233594c18d36d223723"/></dir></dir><dir name="data"><dir name="tig_myparcel_setup"><file name="data-upgrade-0.1.0-1.1.1.php" hash="04cd4a74b8e7a2374586f2352c6716c4"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="3dd346b1fe2786ce0e56ef2a9c18568b"/><file name="config.xml" hash="~~cd53a18bcd99980e6a22de5e8c44cc5c~~"/><file name="system.xml" hash="9cc7401f0addb375843efeacb5ed232d"/></dir><dir name="sql"><dir name="tig_myparcel_setup"><file name="install-0.1.0.php" hash="6f0adc84b58a049b000997cec80946a3"/><file name="upgrade-1.1.4-1.2.0.php" hash="03f749e474005d691c8ecafa07f91deb"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="TIG_MyParcel2014.xml" hash="ea5b922031b3e792a2b381903077e66f"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><dir name="TIG"><file name="tig_myparcel.xml" hash="a944d8cfb23ade9b64dd6299a9f91cf5"/></dir></dir><dir name="template"><dir name="TIG"><dir name="MyParcel2014"><dir name="sales"><dir name="order"><dir name="address"><file name="warning.phtml" hash="fd5bf39bc5bf1ff6e79c41cad00de14b"/></dir><file name="mass_actions.phtml" hash="6a24b4431dac3412a9240bd8b68539b3"/><dir name="shipment"><dir name="create"><file name="consignment_options.phtml" hash="b32b4f46b7985c5285c71c9a7c028baf"/></dir><file name="mass_actions.phtml" hash="db772f2c96dc31f41649762e7663d5d6"/><file name="shipping_info.phtml" hash="17f3be5129d4f5ae68976e8a12cb0057"/></dir><dir name="view"><file name="shipping_info.phtml" hash="e6e8ca0fa33e940b00c5c4c138c55bac"/></dir></dir></dir><dir name="system"><dir name="config"><file name="edit.phtml" hash="3b3728e61a547322258ee4fd0026b271"/><file name="supportTab.phtml" hash="~~bd4e2c8d1496236c240e3356f3a2205e~~"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><dir name="TIG"><file name="tig_myparcel.xml" hash="~~8022c6c45dbb88195a951120dfd347c0~~"/></dir></dir><dir name="template"><dir name="TIG"><dir name="MyParcel2014"><dir name="checkout"><dir name="idev_onestepcheckout"><file name="js.phtml" hash="87965f66a877a3ed093642e2e94c54ea"/></dir><dir name="onepage"><file name="js.phtml" hash="b3861e23ba7a743d414e6e645dd6ea36"/><dir name="progress"><file name="pakje_gemak.phtml" hash="f08a5b6e16bc52bf6c605cb5189d9bf2"/></dir><file name="progress.phtml" hash="536f7f1d1d8bbdae7baac74267201f73"/></dir><file name="pg_address.phtml" hash="91808db0c3bdd7c1c3ce5c04c04dd04c"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="css"><dir name="TIG"><dir name="MyParcel2014"><file name="prototype_windows_themes_magento.css" hash="c1cfaf8dca98f8e18e2b83dc8e9f216d"/><file name="styles.css" hash="7c8cc3f0ea1f8b9bbaeb9ebaf7f91f9c"/><file name="system_config_edit.css" hash="429c1a64ac62e62ab80915236e6400cf"/><file name="system_config_edit_myparcel.css" hash="4ca2ff19c68359ebaf3750239da2bcc7"/><file name="system_config_edit_myparcel_magento16.css" hash="f9a8479639e2fe8d0da9cf602b1607c3"/></dir></dir></dir><dir name="images"><dir name="TIG"><dir name="MyParcel2014"><file name="bkg_tooltip.png" hash="56cfed3ed8a65b19f8de88946d1a0a01"/><file name="btn_download_icon.png" hash="142d5ebbe43ad09dde97cd32e1ef4303"/><file name="glyph_error.gif" hash="a138b803d772f552aa2e49e1c506edbd"/><file name="glyph_info.gif" hash="40f72d28be63ecf2b6ef44c7ea730104"/><file name="glyph_manual.png" hash="771db63b6ffc9de1c06da564796adc6e"/><file name="glyph_pdf.png" hash="a5ea929f4014a88d7320d0293913ace3"/><file name="glyph_success.gif" hash="465a056a3ba3d94367f51c3c0b751391"/><file name="glyph_warning.gif" hash="fa817cb6d49efb9855942ef2b739fc6c"/><file name="icon-tooltip.png" hash="5767601cd66b23d0b6fe8defc10dd48d"/><file name="legend.gif" hash="d8fb0642901868d489d31b426f3e3406"/><file name="logo_myparcel.png" hash="73b50ec4d9d63d1b4ee4822b8b5f4964"/><file name="logo_myparcel_19.png" hash="8b7463a2911050419d97b24890732472"/><file name="logo_myparcel_38.png" hash="20e50f897cd8a4133e15629a10a1fea2"/><dir name="magento"><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="content_bg.gif" hash="21278ea0da2d4256f4ced96b6080ba2e"/><file name="top_bg.gif" hash="26f28090de87d64f9b01bf624f89bfe2"/><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/></dir><file name="tig_logo_medium.gif" hash="3e1071908cfdb7b472438482c3331ac7"/><file name="tig_logo_medium.png" hash="ae24176891a64b6dcf1fa4b34326757a"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="TIG"><dir name="MyParcel2014"><file name="checkout.css" hash="621cd2a44f1b3d7a4946e834ed589ffe"/></dir></dir></dir><dir name="images"><dir name="TIG"><dir name="MyParcel"><dir name="checkout"><file name="loader_mini.gif" hash="f244ab6581d4329e3dbb7e289d47dfb2"/><file name="logo_myparcel.png" hash="73b50ec4d9d63d1b4ee4822b8b5f4964"/><file name="logo_postnl.png" hash="6fa95b3a5e83b6887848b5feb7369bf1"/></dir></dir></dir></dir><dir name="js"><dir name="TIG"><dir name="MyParcel2014"><file name="MutationObserver.js" hash="0ce653eab6a6aa85e827da86ddb71c2c"/><file name="checkout.js" hash="~~db71dd5e28bdb04a67c6a5828ca3911c~~"/></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="nl_NL"><file name="TIG_MyParcel2014.csv" hash="~~bd8ed3a48a5975c71ac2fc0cfeedcf82~~"/></dir><dir name="en_US"><file name="TIG_MyParcel2014.csv" hash="~~cc09aff93ca3efc5012a2801a512bb3e~~"/></dir></target></contents>
60	<compatible/>
61	<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
62	</package>


1	<?xml version="1.0"?>
2	<package>
3	<name>tig_myparcel</name>
4	+ <version>1.4.1</version>
5	<stability>stable</stability>
6	<license uri="http://creativecommons.org/licenses/by-nc-nd/3.0/nl/deed.en_US">Creative Commons License</license>
7	<channel>community</channel>

20	- Generate return-links for a shipment
21	- Ship world-wide with MyParcel
22	- Send Track&Trace information</description>
23	+ <notes>=== v1.4.1 ===
24	+ === Improvements ===
25	+ - Improved the control of transacional e-mails from the cron
26	+
27	+ === v1.4.0 ===
28	+ ==== New features ====
29	+ - Support for IWD One Step / Page Checkout added
30	+
31	+ === v1.3.3 ===
32	=== Improvements ===
33	- Improvements for the installation via Magento Connect
34

62	- New translations
63	- Extended logging functionality</notes>
64	<authors><author><name>TIG</name><user>supporttotal</user><email>servicedesk@totalinternetgroup.nl</email></author></authors>
65	+ <date>2016-04-14</date>
66	+ <time>10:20:41</time>
67	+ <contents><target name="magecommunity"><dir name="TIG"><dir name="MyParcel2014"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Shipment"><dir name="Create"><file name="ConsignmentOptions.php" hash="fdf0ec9cf1e5ada2c89638392d5a4106"/></dir><file name="ShippingInfo.php" hash="8371397f10be993791d5878160b06548"/></dir><dir name="View"><file name="ShippingInfo.php" hash="7e0ffdedc1cab6870991cbb7e7f752fc"/></dir></dir></dir><dir name="System"><dir name="Config"><file name="AdminSecure.php" hash="abfbc4f529358040f5f21fbc47f95c0a"/><file name="Hidden.php" hash="98e74d07fb637d7cbac3eed14a55b378"/><file name="SupportTab.php" hash="3ed95adf1523bd5a21c1fe19d61813dc"/></dir></dir><dir name="Widget"><dir name="Grid"><dir name="Column"><dir name="Renderer"><dir name="Shipment"><file name="ShippingStatus.php" hash="6250677ea5d6e6b36be23cdc6d21c151"/></dir><file name="ShippingStatus.php" hash="6a9bfdfcac2b362f6797186f94467115"/></dir></dir></dir></dir></dir><dir name="Checkout"><file name="Js.php" hash="2fcda151238c8bf53d8c0bcd25b2859a"/><file name="PgAddress.php" hash="b1a9ac7d2219b3b4f85cab5996f8c531"/><file name="Progress.php" hash="ff8ec8b6512b5785dd621366a06856de"/></dir></dir><file name="Exception.php" hash="17fbabfc37a1872da197dda8ae31eaad"/><dir name="Helper"><file name="AddressValidation.php" hash="a85c4dda15b569c42f5ba51e74fa5726"/><file name="Data.php" hash="bad76b2aed3fd465e62fc238acbbf1ef"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="Observer"><file name="OrderGrid.php" hash="8486635dfa393a8055c6cd28b30052d9"/><file name="ShipmentGrid.php" hash="39c2804ebc9c89c3abee141e22cfb0ad"/><file name="SystemConfig.php" hash="556df530f658e0c4e179ffba534e5013"/><file name="ViewShipment.php" hash="75cd817a5603280143a3ac87a4672f3c"/></dir><dir name="Support"><file name="Logs.php" hash="8678ec28f8a98cf2bd6b5625dc55ac15"/></dir></dir><dir name="Api"><file name="Curl.php" hash="f006338a00df9cef0485a647bfefaca6"/><file name="MyParcel.php" hash="32b8c1b8442926751ca9b8acfa9359c1"/></dir><dir name="Carrier"><file name="MyParcel.php" hash="56d1cce86bbd2193e9122cd17b724681"/><dir name="System"><dir name="Config"><dir name="Source"><file name="RateType.php" hash="d0e2b78dc1040b1265e35d60ae2de76b"/></dir></dir></dir></dir><dir name="Checkout"><file name="Service.php" hash="73e0c2c9ff1512a1c927093e200cfed2"/><file name="Validate.php" hash="f411737f90a793ba75c18092cb2f1248"/></dir><dir name="Observer"><file name="Cron.php" hash="42d8af70634d02932f704b93ca87084c"/><file name="SaveConfig.php" hash="3804317337df37ce33615280f6c3677b"/><file name="SavePgAddress.php" hash="b07e42bda2318a7272a48a52480dccc0"/><file name="SaveShipment.php" hash="a70cef74590a4952af19944a1e7bf502"/></dir><dir name="Resource"><dir name="Order"><dir name="Grid"><file name="Collection.php" hash="48fc092078dcdbcca40788c486ca0987"/></dir></dir><file name="Setup.php" hash="b16d3f9146b6544c1f90ff8e218b52bb"/><dir name="Shipment"><file name="Collection.php" hash="6af521845d88a214d283cfd3fecfbd2d"/><dir name="Grid"><file name="Collection.php" hash="52886710560d83ced9224c93c0e6489c"/></dir></dir><file name="Shipment.php" hash="7c7bb4b4349da9504015a279b9ff8a4f"/></dir><file name="Shipment.php" hash="fd15fb02034a52915d674e059d0d2056"/><dir name="System"><dir name="Config"><dir name="Source"><file name="A4a6.php" hash="9233248742c79824ea8408577a9b4f2e"/><file name="Customs.php" hash="9b5c4fd3a866fdabf44a7b532b9c3501"/><file name="ShippingMethods.php" hash="ee471d016cf4df58467e21620bbd680c"/><file name="StreetField.php" hash="f171261f2d8785ebf41f19d2bfeb7d58"/><file name="Yesno.php" hash="0c49e0c17e933924d25ffe823e2dab16"/></dir></dir></dir></dir><dir name="controllers"><file name="CheckoutController.php" hash="b62b65440631e6bc5d80d59b84c3f4df"/><dir name="MyparcelAdminhtml"><file name="ConfigController.php" hash="07a71e79e780affd44edf005747c9804"/><file name="ShipmentController.php" hash="8e681b902d5a9233594c18d36d223723"/></dir></dir><dir name="data"><dir name="tig_myparcel_setup"><file name="data-upgrade-0.1.0-1.1.1.php" hash="04cd4a74b8e7a2374586f2352c6716c4"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="3dd346b1fe2786ce0e56ef2a9c18568b"/><file name="config.xml" hash="fa01947019fc59c15c3472d03318c2db"/><file name="system.xml" hash="9cc7401f0addb375843efeacb5ed232d"/></dir><dir name="sql"><dir name="tig_myparcel_setup"><file name="install-0.1.0.php" hash="6f0adc84b58a049b000997cec80946a3"/><file name="upgrade-1.1.4-1.2.0.php" hash="03f749e474005d691c8ecafa07f91deb"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="TIG_MyParcel2014.xml" hash="ea5b922031b3e792a2b381903077e66f"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><dir name="TIG"><file name="tig_myparcel.xml" hash="a944d8cfb23ade9b64dd6299a9f91cf5"/></dir></dir><dir name="template"><dir name="TIG"><dir name="MyParcel2014"><dir name="sales"><dir name="order"><dir name="address"><file name="warning.phtml" hash="fd5bf39bc5bf1ff6e79c41cad00de14b"/></dir><file name="mass_actions.phtml" hash="6a24b4431dac3412a9240bd8b68539b3"/><dir name="shipment"><dir name="create"><file name="consignment_options.phtml" hash="b32b4f46b7985c5285c71c9a7c028baf"/></dir><file name="mass_actions.phtml" hash="db772f2c96dc31f41649762e7663d5d6"/><file name="shipping_info.phtml" hash="17f3be5129d4f5ae68976e8a12cb0057"/></dir><dir name="view"><file name="shipping_info.phtml" hash="e6e8ca0fa33e940b00c5c4c138c55bac"/></dir></dir></dir><dir name="system"><dir name="config"><file name="edit.phtml" hash="3b3728e61a547322258ee4fd0026b271"/><file name="supportTab.phtml" hash="b52269a8735b52464ad805fe914cb4bc"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><dir name="TIG"><file name="tig_myparcel.xml" hash="f9e71036ec624bb7e7b41b37b42cbc5d"/></dir></dir><dir name="template"><dir name="TIG"><dir name="MyParcel2014"><dir name="checkout"><dir name="idev_onestepcheckout"><file name="js.phtml" hash="87965f66a877a3ed093642e2e94c54ea"/></dir><dir name="iwd_onepagecheckout"><file name="js.phtml" hash="814cc57bf77479ef867715d36d0e8a79"/></dir><dir name="onepage"><file name="js.phtml" hash="b3861e23ba7a743d414e6e645dd6ea36"/><dir name="progress"><file name="pakje_gemak.phtml" hash="f08a5b6e16bc52bf6c605cb5189d9bf2"/></dir><file name="progress.phtml" hash="536f7f1d1d8bbdae7baac74267201f73"/></dir><file name="pg_address.phtml" hash="91808db0c3bdd7c1c3ce5c04c04dd04c"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="css"><dir name="TIG"><dir name="MyParcel2014"><file name="prototype_windows_themes_magento.css" hash="c1cfaf8dca98f8e18e2b83dc8e9f216d"/><file name="styles.css" hash="7c8cc3f0ea1f8b9bbaeb9ebaf7f91f9c"/><file name="system_config_edit.css" hash="429c1a64ac62e62ab80915236e6400cf"/><file name="system_config_edit_myparcel.css" hash="4ca2ff19c68359ebaf3750239da2bcc7"/><file name="system_config_edit_myparcel_magento16.css" hash="f9a8479639e2fe8d0da9cf602b1607c3"/></dir></dir></dir><dir name="images"><dir name="TIG"><dir name="MyParcel2014"><file name="bkg_tooltip.png" hash="56cfed3ed8a65b19f8de88946d1a0a01"/><file name="btn_download_icon.png" hash="142d5ebbe43ad09dde97cd32e1ef4303"/><file name="glyph_error.gif" hash="a138b803d772f552aa2e49e1c506edbd"/><file name="glyph_info.gif" hash="40f72d28be63ecf2b6ef44c7ea730104"/><file name="glyph_manual.png" hash="771db63b6ffc9de1c06da564796adc6e"/><file name="glyph_pdf.png" hash="a5ea929f4014a88d7320d0293913ace3"/><file name="glyph_success.gif" hash="465a056a3ba3d94367f51c3c0b751391"/><file name="glyph_warning.gif" hash="fa817cb6d49efb9855942ef2b739fc6c"/><file name="icon-tooltip.png" hash="5767601cd66b23d0b6fe8defc10dd48d"/><file name="legend.gif" hash="d8fb0642901868d489d31b426f3e3406"/><file name="logo_myparcel.png" hash="73b50ec4d9d63d1b4ee4822b8b5f4964"/><file name="logo_myparcel_19.png" hash="8b7463a2911050419d97b24890732472"/><file name="logo_myparcel_38.png" hash="20e50f897cd8a4133e15629a10a1fea2"/><dir name="magento"><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="content_bg.gif" hash="21278ea0da2d4256f4ced96b6080ba2e"/><file name="top_bg.gif" hash="26f28090de87d64f9b01bf624f89bfe2"/><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/></dir><file name="tig_logo_medium.gif" hash="3e1071908cfdb7b472438482c3331ac7"/><file name="tig_logo_medium.png" hash="ae24176891a64b6dcf1fa4b34326757a"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="TIG"><dir name="MyParcel2014"><file name="checkout.css" hash="621cd2a44f1b3d7a4946e834ed589ffe"/></dir></dir></dir><dir name="images"><dir name="TIG"><dir name="MyParcel"><dir name="checkout"><file name="loader_mini.gif" hash="f244ab6581d4329e3dbb7e289d47dfb2"/><file name="logo_myparcel.png" hash="73b50ec4d9d63d1b4ee4822b8b5f4964"/><file name="logo_postnl.png" hash="6fa95b3a5e83b6887848b5feb7369bf1"/></dir></dir></dir></dir><dir name="js"><dir name="TIG"><dir name="MyParcel2014"><file name="MutationObserver.js" hash="0ce653eab6a6aa85e827da86ddb71c2c"/><file name="checkout.js" hash="3585df2e150541300ef785c9208492df"/></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="nl_NL"><file name="TIG_MyParcel2014.csv" hash="8326030a6d4bd0b0dc3fd8fa718712ad"/></dir><dir name="en_US"><file name="TIG_MyParcel2014.csv" hash="6d5866d00e64549376b1d3ff8210185c"/></dir></target></contents>
68	<compatible/>
69	<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
70	</package>

skin/frontend/base/default/js/TIG/MyParcel2014/checkout.js CHANGED Viewed

	@@ -210,12 +210,20 @@ MyParcelCheckout.prototype = {
210	/**
211	* Observe the shipping method.
212	*/
213	- ~~var~~ ~~shippingMethod = $$~~(~~selectors.shipping_method~~);
214	- shippingMethod.invoke('observe', 'click', this._observers.shipping_method);
215
216	return this;
217	},
218









219	/**
220	* Initialize observers for the overlay window.
221	*
	@@ -861,4 +869,4 @@ MyParcelCheckout.prototype = {
861
862	return true;
863	}
864	- };


210	/**
211	* Observe the shipping method.
212	*/
213	+ document.observe('click', this.handleClick.bind(this));

214
215	return this;
216	},
217
218	+ /**
219	+ * Show the overlay window when the appropriate shipping method is being clicked on.
220	+ */
221	+ handleClick : function(e, el) {
222	+ if (el = e.findElement(this._selectors.shipping_method)) {
223	+ this._observers.shipping_method();
224	+ }
225	+ },
226	+
227	/**
228	* Initialize observers for the overlay window.
229	*

869
870	return true;
871	}
872	+ };