bpost - Version 1.3.6

Version Notes

- Onestepcheckout is now more compatible with the plugin
- International shipping cost is now taken into account on with onestepcheckout
- Error messages on onestepcheckout have been updated
- BPACK 24Business is added on the bpost home delivery method
- Label generation for parcel locker fixed
- Fixed french translations

Download this release

Release Info

Developer	PHPro
Extension	bpost
Version	1.3.6
Comparing to
See all releases

Code changes from version 1.3.4 to 1.3.6

Files changed (12) hide show

app/code/community/Bpost/ShM/Block/Adminhtml/System/Config/Form/Field/Bpack.php +138 -0
app/code/community/Bpost/ShM/Helper/Data.php +2 -1
app/code/community/Bpost/ShM/Model/Api/Domcreator.php +13 -4
app/code/community/Bpost/ShM/Model/Shipping/Carrier/BpostShM.php +1 -1
app/code/community/Bpost/ShM/Model/System/Config/Backend/Product/Bpack.php +28 -0
app/code/community/Bpost/ShM/Model/System/Config/Source/Product/Bpack.php +44 -0
app/code/community/Bpost/ShM/etc/config.xml +2 -1
app/code/community/Bpost/ShM/etc/system.xml +13 -0
app/locale/fr_FR/Bpost_ShM.csv +2 -2
app/locale/nl_NL/Bpost_ShM.csv +2 -2
package.xml +10 -7
skin/frontend/base/default/js/bpost/onestepcheckout.js +27 -27

app/code/community/Bpost/ShM/Block/Adminhtml/System/Config/Form/Field/Bpack.php ADDED Viewed

	@@ -0,0 +1,138 @@


1	+ <?php
2	+
3	+ /**
4	+ * Created by PHPro
5	+ *
6	+ * @package Bpost
7	+ * @subpackage ShM
8	+ * @author PHPro (info@phpro.be)
9	+ *
10	+ * Class Bpost_ShM_Block_Adminhtml_System_Config_Form_Field_Bpack
11	+ */
12	+ class Bpost_ShM_Block_Adminhtml_System_Config_Form_Field_Bpack extends Mage_Adminhtml_Block_System_Config_Form_Field
13	+ {
14	+ const CACHE_KEY = 'bpost_product_config_cache';
15	+ const BPACK_BUSINESS = 'bpack 24h business';
16	+ /**
17	+ * @var bool
18	+ */
19	+ protected $_showElement = false;
20	+
21	+ /**
22	+ * Enter description here...
23	+ *
24	+ * @param Varien_Data_Form_Element_Abstract $element
25	+ * @return string
26	+ */
27	+ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
28	+ {
29	+ try {
30	+ $xml = $this->getProductConfig();
31	+
32	+ $this->_showElement = false;
33	+ foreach ($xml->deliveryMethod as $deliveryMethodData) {
34	+ foreach ($deliveryMethodData->product as $productData) {
35	+ $attributes = $productData->attributes();
36	+ $productName = (string) $attributes["name"];
37	+ if ($productName == self::BPACK_BUSINESS) {
38	+ $this->_showElement = true;
39	+ }
40	+ }
41	+ }
42	+ } catch (Exception $e) {
43	+ $element->setValue(0);
44	+ $this->_showElement = false;
45	+ }
46	+
47	+ return $element->getElementHtml();
48	+ }
49	+
50	+ /**
51	+ * Decorate field row html
52	+ *
53	+ * @param Varien_Data_Form_Element_Abstract $element
54	+ * @param string $html
55	+ * @return string
56	+ */
57	+ protected function _decorateRowHtml($element, $html)
58	+ {
59	+ if ($this->showElement()) {
60	+ return '<tr id="row_' . $element->getHtmlId() . '">' . $html . '</tr>' . $this->getJavascript($element);
61	+ }
62	+
63	+ return '<tr id="row_' . $element->getHtmlId() . '" style="display:none">' . $html . '</tr>';
64	+ }
65	+
66	+ /**
67	+ * @param Varien_Data_Form_Element_Abstract $element
68	+ * @return string
69	+ */
70	+ protected function getJavascript($element)
71	+ {
72	+ $javascript = <<<EOT
73	+ <script type="text/javascript">
74	+ document.observe('dom:loaded', onBpackProductChange);
75	+ Event.observe('{$element->getHtmlId()}', 'change', onBpackProductChange);
76	+
77	+ function onBpackProductChange()
78	+ {
79	+ specific=$('{$element->getHtmlId()}').value;
80	+ $('{$this->getSecondPresentationElementId($element)}').disabled = (specific==1);
81	+ $('{$this->getSecondPresentationElementId($element)}_from').disabled = (specific==1);
82	+ if (specific == 1) {
83	+ $('{$this->getSecondPresentationElementId($element)}').value = 1;
84	+ $('{$this->getSecondPresentationElementId($element)}_from').value = 0;
85	+ }
86	+
87	+ $('row_{$this->getSecondPresentationElementId($element)}_from').hide();
88	+ if ($('{$this->getSecondPresentationElementId($element)}').value == 1) {
89	+ $('row_{$this->getSecondPresentationElementId($element)}_from').show();
90	+ }
91	+ }
92	+ </script>
93	+ EOT;
94	+
95	+ return $javascript;
96	+ }
97	+
98	+ /**
99	+ * @param $element
100	+ * @return string
101	+ */
102	+ protected function getSecondPresentationElementId($element)
103	+ {
104	+ return substr($element->getId(), 0, strpos($element->getId(), 'product')) . 'second_presentation';
105	+ }
106	+
107	+ /**
108	+ * Weather or not to show the element.
109	+ *
110	+ * @return string
111	+ */
112	+ protected function showElement()
113	+ {
114	+ return (bool) $this->_showElement;
115	+ }
116	+
117	+ /**
118	+ * @return SimpleXMLElement
119	+ */
120	+ protected function getProductConfig()
121	+ {
122	+ $cache = Mage::app()->getCache();
123	+
124	+ if (false === $cache->load(self::CACHE_KEY)) {
125	+ $api = Mage::getModel('bpost_shm/api', true);
126	+ $apiResponse = $api->getProductConfig();
127	+
128	+ if (!$apiResponse) {
129	+ Mage::throwException('Failed to authenticate with bpost, please check your credentials.');
130	+ }
131	+
132	+ $xml = $apiResponse->getBody();
133	+ $cache->save($xml, self::CACHE_KEY, array('bpost_cache'), 60*60);
134	+ }
135	+
136	+ return simplexml_load_string($cache->load(self::CACHE_KEY));
137	+ }
138	+ }

app/code/community/Bpost/ShM/Helper/Data.php CHANGED Viewed

	@@ -544,7 +544,8 @@ class Bpost_ShM_Helper_Data extends Mage_Core_Helper_Abstract
544	'bpost_homedelivery' => false,
545	'bpost_pickuppoint' => false,
546	'bpost_parcellocker' => false,
547	- 'bpost_clickcollect' => false

548	);
549	foreach ($shippingMethods as $method => $value) {
550	//get saturday delivery flags


544	'bpost_homedelivery' => false,
545	'bpost_pickuppoint' => false,
546	'bpost_parcellocker' => false,
547	+ 'bpost_clickcollect' => false,
548	+ 'bpost_international' => false,
549	);
550	foreach ($shippingMethods as $method => $value) {
551	//get saturday delivery flags

app/code/community/Bpost/ShM/Model/Api/Domcreator.php CHANGED Viewed

	@@ -265,7 +265,10 @@ class Bpost_ShM_Model_Api_Domcreator extends Bpost_ShM_Model_Api_Abstract
265	switch($shippingMethod){
266	case "bpostshm_bpost_homedelivery":
267	if(!$returnOrder){
268	- $~~product->appendChild(~~$~~document~~->~~createTextNode~~("~~bpack~~ ~~24h~~ ~~Pro"~~));



269
270	//then get config the option settings
271	$options = $this->_checkIfOptionIsValid($document, $options, $order, "bpost_homedelivery", "second_presentation", "automaticSecondPresentation");
	@@ -380,7 +383,9 @@ class Bpost_ShM_Model_Api_Domcreator extends Bpost_ShM_Model_Api_Abstract
380
381	$pugoAddress = $document->createElement('pugoAddress');
382	$pugoAddress->appendChild($streetName);
383	- ~~$pugoAddress->appendChild~~($~~streetNumber~~);


384	$pugoAddress->appendChild($streetPostalCode);
385	$pugoAddress->appendChild($locality);
386	$pugoAddress->appendChild($countryCode);
	@@ -438,7 +443,9 @@ class Bpost_ShM_Model_Api_Domcreator extends Bpost_ShM_Model_Api_Abstract
438
439	$parcelsDepotAddress = $document->createElement('parcelsDepotAddress');
440	$parcelsDepotAddress->appendChild($streetName);
441	- ~~$parcelsDepotAddress->appendChild~~($~~streetNumber~~);


442	$parcelsDepotAddress->appendChild($streetPostalCode);
443	$parcelsDepotAddress->appendChild($locality);
444	$parcelsDepotAddress->appendChild($countryCode);
	@@ -541,7 +548,9 @@ class Bpost_ShM_Model_Api_Domcreator extends Bpost_ShM_Model_Api_Abstract
541
542	$pugoAddress = $document->createElement('pugoAddress');
543	$pugoAddress->appendChild($streetName);
544	- ~~$pugoAddress->appendChild~~($~~streetNumber~~);


545	$pugoAddress->appendChild($streetPostalCode);
546	$pugoAddress->appendChild($locality);
547	$pugoAddress->appendChild($countryCode);


265	switch($shippingMethod){
266	case "bpostshm_bpost_homedelivery":
267	if(!$returnOrder){
268	+ $productType = $configHelper->getBpostCarriersConfig("product", "bpost_homedelivery", $order->getStoreId());
269	+ ($productType == 0 ? $productType = "bpack 24h Pro" : $productType = "bpack 24h business");
270	+
271	+ $product->appendChild($document->createTextNode($productType));
272
273	//then get config the option settings
274	$options = $this->_checkIfOptionIsValid($document, $options, $order, "bpost_homedelivery", "second_presentation", "automaticSecondPresentation");

383
384	$pugoAddress = $document->createElement('pugoAddress');
385	$pugoAddress->appendChild($streetName);
386	+ if (null !== $formattedAddress["number"]) {
387	+ $pugoAddress->appendChild($streetNumber);
388	+ }
389	$pugoAddress->appendChild($streetPostalCode);
390	$pugoAddress->appendChild($locality);
391	$pugoAddress->appendChild($countryCode);

443
444	$parcelsDepotAddress = $document->createElement('parcelsDepotAddress');
445	$parcelsDepotAddress->appendChild($streetName);
446	+ if (null !== $formattedAddress["number"]) {
447	+ $parcelsDepotAddress->appendChild($streetNumber);
448	+ }
449	$parcelsDepotAddress->appendChild($streetPostalCode);
450	$parcelsDepotAddress->appendChild($locality);
451	$parcelsDepotAddress->appendChild($countryCode);

548
549	$pugoAddress = $document->createElement('pugoAddress');
550	$pugoAddress->appendChild($streetName);
551	+ if (null !== $formattedAddress["number"]) {
552	+ $pugoAddress->appendChild($streetNumber);
553	+ }
554	$pugoAddress->appendChild($streetPostalCode);
555	$pugoAddress->appendChild($locality);
556	$pugoAddress->appendChild($countryCode);

app/code/community/Bpost/ShM/Model/Shipping/Carrier/BpostShM.php CHANGED Viewed

	@@ -131,7 +131,7 @@ class Bpost_ShM_Model_Shipping_Carrier_BpostShM extends Mage_Shipping_Model_Carr
131	$error = Mage::getModel('shipping/rate_result_error');
132	$error->setCarrier($this->_code);
133	$error->setCarrierTitle('Bpost ShippingManager');
134	- $error->setData('error_message', Mage::helper('bpost_shm')->__('~~The~~ ~~Bpost~~ ~~shipping~~ ~~method~~ "%s" is ~~not~~ ~~available~~ ~~because~~ ~~your~~ ~~postal~~ ~~code~~ is ~~not correct. For your country~~ the ~~format~~ ~~should~~ be ~~like~~ "%s". ~~Please correct the postal code in your shipping address~~.', $~~shippingMethodName~~, $~~pcValidationResult~~));
135	$result->append($error);
136	continue;
137	}


131	$error = Mage::getModel('shipping/rate_result_error');
132	$error->setCarrier($this->_code);
133	$error->setCarrierTitle('Bpost ShippingManager');
134	+ $error->setData('error_message', Mage::helper('bpost_shm')->__('Could you please use the following zipcode format "%s" for the selected country in order to make the bpost delivery method "%s" available.', $pcValidationResult, $shippingMethodName));
135	$result->append($error);
136	continue;
137	}

app/code/community/Bpost/ShM/Model/System/Config/Backend/Product/Bpack.php ADDED Viewed

	@@ -0,0 +1,28 @@


1	+ <?php
2	+
3	+ /**
4	+ * Created by PHPro
5	+ *
6	+ * @package Bpost
7	+ * @subpackage ShM
8	+ * @author PHPro (info@phpro.be)
9	+ *
10	+ * Class Bpost_ShM_Model_System_Config_Backend_Product_Bpack
11	+ */
12	+ class Bpost_ShM_Model_System_Config_Backend_Product_Bpack extends Mage_Core_Model_Config_Data
13	+ {
14	+ /**
15	+ * After enable flat category required reindex
16	+ *
17	+ * @return Bpost_ShM_Model_System_Config_Backend_Product_Bpack
18	+ */
19	+ protected function _afterSave()
20	+ {
21	+ if ($this->isValueChanged() && true == $this->getValue()) {
22	+ Mage::getConfig()->saveConfig('carriers/bpost_homedelivery/second_presentation', true);
23	+ Mage::getConfig()->saveConfig('carriers/bpost_homedelivery/second_presentation_from', 0);
24	+ }
25	+
26	+ return $this;
27	+ }
28	+ }

app/code/community/Bpost/ShM/Model/System/Config/Source/Product/Bpack.php ADDED Viewed

	@@ -0,0 +1,44 @@


1	+ <?php
2	+ /**
3	+ * Created by PHPro
4	+ *
5	+ * @package Bpost
6	+ * @subpackage ShM
7	+ * @author PHPro (info@phpro.be)
8	+ */
9	+ /**
10	+ * Class Bpost_ShM_Model_System_Config_Source_Product_Bpack
11	+ */
12	+ class Bpost_ShM_Model_System_Config_Source_Product_Bpack
13	+ {
14	+ /**
15	+ * Options getter.
16	+ * Returns an option array for Shipping cost handler.
17	+ *
18	+ * @return array
19	+ *
20	+ */
21	+ public function toOptionArray()
22	+ {
23	+ return array(
24	+ array('value' => 1, 'label' => Mage::helper('bpost_shm')->__('bpack 24h Business')),
25	+ array('value' => 0, 'label' => Mage::helper('bpost_shm')->__('bpack 24h Pro')),
26	+ );
27	+ }
28	+
29	+ /**
30	+ * Get options in "key-value" format.
31	+ * Returns an array for Shipping cost handler. (Magento basically expects both functions)
32	+ *
33	+ * @return array
34	+ *
35	+ */
36	+ public function toArray()
37	+ {
38	+ return array(
39	+ 0 => Mage::helper('bpost_shm')->__('bpack 24h Pro'),
40	+ 1 => Mage::helper('bpost_shm')->__('bpack 24h Business'),
41	+ );
42	+ }
43	+
44	+ }

app/code/community/Bpost/ShM/etc/config.xml CHANGED Viewed

	@@ -2,7 +2,7 @@
2	<config>
3	<modules>
4	<Bpost_ShM>
5	- <version>1.3.4</version>
6	</Bpost_ShM>
7	</modules>
8	<global>
	@@ -313,6 +313,7 @@
313	</bpostshm>
314	<bpost_homedelivery>
315	<active>1</active>

316	<title>bpost</title>
317	<name>Home delivery</name>
318	<free_shipping>0</free_shipping>


2	<config>
3	<modules>
4	<Bpost_ShM>
5	+ <version>1.3.6</version>
6	</Bpost_ShM>
7	</modules>
8	<global>

313	</bpostshm>
314	<bpost_homedelivery>
315	<active>1</active>
316	+ <product>0</product>
317	<title>bpost</title>
318	<name>Home delivery</name>
319	<free_shipping>0</free_shipping>

app/code/community/Bpost/ShM/etc/system.xml CHANGED Viewed

@@ -371,6 +371,19 @@
                                         <comment><![CDATA[Delivery at your doorstep or at your office? bpack@home is the most convenient option for you!]]></comment>
                                     </active>
                                     <subheader_rates translate="label">
                                         <label>Rates</label>
                                         <frontend_type>text</frontend_type>


371	<comment><![CDATA[Delivery at your doorstep or at your office? bpack@home is the most convenient option for you!]]></comment>
372	</active>
373
374	+ <product translate="label,comment">
375	+ <label>Product</label>
376	+ <frontend_type>select</frontend_type>
377	+ <frontend_model>bpost_shm/adminhtml_system_config_form_field_bpack</frontend_model>
378	+ <source_model>bpost_shm/system_config_source_product_bpack</source_model>
379	+ <backend_model>bpost_shm/system_config_backend_product_bpack</backend_model>
380	+ <sort_order>3</sort_order>
381	+ <show_in_default>1</show_in_default>
382	+ <show_in_website>1</show_in_website>
383	+ <show_in_store>1</show_in_store>
384	+ <comment><![CDATA[Select which product to use for bpack 24h shipments]]></comment>
385	+ </product>
386	+
387	<subheader_rates translate="label">
388	<label>Rates</label>
389	<frontend_type>text</frontend_type>

app/locale/fr_FR/Bpost_ShM.csv CHANGED Viewed

	@@ -166,7 +166,7 @@
166	"Select which product to use for international shipments","Choisissez le produit à utiliser pour les envois internationaux."
167	"Select your preferred delivery date","Choisissez le jour de livraison"
168	"Select","Sélectionner"
169	- "send additional SMS notification","notification ~~additionel~~ par SMS"
170	"Send Email","Envoyer par mail"
171	"Sender boxnumber","Numéro de boite de l'expéditeur"
172	"Sender city","Ville de l'expéditeur"
	@@ -234,7 +234,7 @@
234	"I don't want my parcel to be delivered on a Saturday","Je ne veux pas être livré un samedi"
235	"By using this option, customers with reduced mobility can use the lockers of the machine easiest to reach.","En utilisant la zone à mobilité réduite, les clients peuvent accèder au distributeur de paquets les plus accessibles."
236	"This order did not (yet) generate labels which automatically returned return label barcodes. This feature might not be actived. Please refer to the documentation and your Shipping Settings under 'System > Configuration > Sales' for more information.","Pour cette commande, il n'y a pas (encore) d' étiquettes avec des étiquettes de retour automatiques. Il est possible que cette fonctionalité n'est pas activée. Veuillez consulter la documentation et votre configuration d'envoi sous 'System > Configuration > Sales' pour plus d'informations."
237	- "~~The~~ ~~Bpost~~ ~~shipping~~ ~~method~~ ""%s"" is ~~not~~ ~~available~~ ~~because~~ ~~your~~ ~~postal~~ ~~code~~ is ~~not correct. For your country~~ the ~~format~~ ~~should~~ be ~~like~~ ""%s"". ~~Please~~ ~~correct~~ ~~the~~ ~~postal~~ ~~code~~ in ~~your~~ ~~shipping~~ ~~address.","La~~ ~~méthode~~ ~~de livraison~~ ""%s"" de ~~bpost~~ ~~n'est pas~~ disponible ~~parce~~ ~~que~~ ~~votre code postal n'est pas correct. Pour le pays~~ de ~~destination~~ ~~que~~ ~~vous avez choisi, le format doit être comme~~ ""%s"". ~~Veuillez corriger le code postal dans votre adresse d'envoi.~~"
238	"Your address could not be determined, please return to the shipping address step to correct it.","Votre adresse n'existe pas, veuillez corriger votre adresse de livraison."
239	"bpost Click & Collect","bpost Click & Collect"
240	"You would like to deliver your parcel in your own stores?","Vous désirez livrer vos paquets dans vos propres magasins?"


166	"Select which product to use for international shipments","Choisissez le produit à utiliser pour les envois internationaux."
167	"Select your preferred delivery date","Choisissez le jour de livraison"
168	"Select","Sélectionner"
169	+ "send additional SMS notification","notification additionnelle par SMS"
170	"Send Email","Envoyer par mail"
171	"Sender boxnumber","Numéro de boite de l'expéditeur"
172	"Sender city","Ville de l'expéditeur"

234	"I don't want my parcel to be delivered on a Saturday","Je ne veux pas être livré un samedi"
235	"By using this option, customers with reduced mobility can use the lockers of the machine easiest to reach.","En utilisant la zone à mobilité réduite, les clients peuvent accèder au distributeur de paquets les plus accessibles."
236	"This order did not (yet) generate labels which automatically returned return label barcodes. This feature might not be actived. Please refer to the documentation and your Shipping Settings under 'System > Configuration > Sales' for more information.","Pour cette commande, il n'y a pas (encore) d' étiquettes avec des étiquettes de retour automatiques. Il est possible que cette fonctionalité n'est pas activée. Veuillez consulter la documentation et votre configuration d'envoi sous 'System > Configuration > Sales' pour plus d'informations."
237	+ "Could you please use the following zipcode format ""%s"" for the selected country in order to make the bpost delivery method ""%s"" available.","Veuillez utiliser pour le pays selectionné, un code postal au format ""%s"", afin de rendre disponible la méthode de livraison bpost ""%s""."
238	"Your address could not be determined, please return to the shipping address step to correct it.","Votre adresse n'existe pas, veuillez corriger votre adresse de livraison."
239	"bpost Click & Collect","bpost Click & Collect"
240	"You would like to deliver your parcel in your own stores?","Vous désirez livrer vos paquets dans vos propres magasins?"

app/locale/nl_NL/Bpost_ShM.csv CHANGED Viewed

	@@ -236,7 +236,7 @@
236	"Your selected order is not ready to be shipped or has already been shipped","Dit order is niet klaar om te verzenden of werd reeds verzonden."
237	"Zip/Postal Code","Postcode"
238	"This order did not (yet) generate labels which automatically returned return label barcodes. This feature might not be actived. Please refer to the documentation and your Shipping Settings under 'System > Configuration > Sales' for more information.","Voor dit order zijn (nog) geen etiketten met automatische retouretiketten gegenereerd. Deze functionaliteit is mogelijk niet geactiveerd. Zie documentatie en Shipping Settings onder 'System > Configuration > Sales' voor meer informatie."
239	- "~~The~~ ~~Bpost~~ ~~shipping~~ ~~method~~ ""%s"" is ~~not~~ ~~available~~ ~~because~~ ~~your~~ ~~postal~~ ~~code~~ is ~~not correct. For your country~~ the ~~format~~ ~~should~~ be ~~like~~ ""%s"". ~~Please~~ ~~correct~~ ~~the~~ ~~postal~~ ~~code~~ in ~~your~~ ~~shipping~~ ~~address.~~","~~De bpost leveringsmethode ""~~%s"" is ~~niet~~ ~~beschikbaar~~ ~~omdat~~ de ~~ingegeven~~ ~~postcode~~ ~~niet correct is. Het postcodeformaat van het door u gekozen land is~~ ""%s"". ~~Gelieve~~ ~~de postcode in uw verzendadres te corrigeren~~."
240	"Your address could not be determined, please return to the shipping address step to correct it.","Het opgegeven adres kon niet verwerkt worden, gelieve uw leveringsadres te corrigeren."
241	"bpost Click & Collect","bpost Click & Collect"
242	"You would like to deliver your parcel in your own stores?","Indien u uw pakketten in uw eigen winkel wil laten leveren,"
	@@ -255,4 +255,4 @@
255	"If you have added or removed Click & Collect points in Shipping Manager, be aware that it will take up to 24h to be operational in the bpost Magento plugin.","Als u een Click & Collect punt toevoegt of verwijdert in uw Shipping Manager, duurt het 24u vooraleer dit operationeel wordt in uw bpost plugin voor Magento."
256	"If the points don’t appear after 24h, make sure to have cleared the Magento cache.","Als u deze afhaalpunten niet ziet verschijnen na 24u, verzeker u er dan van dat u de Magento cache hebt geleegd."
257	"Before using this delivery method, make sure that Click & Collect is duely activated. This is a 2 step process. Find out how here.","Vooraleer u met deze leveringsmethode van start kun gaan, moeten volgende activaties gebeurd zijn."
258	- "Additional fee when using saturday delivery option, e.g.: 4.95.<br />Dear customer, if you decide to offer your own consumers the option of Saturday delivery, you need to select 'Display delivery date' in the general parameters of the plugin and enter the requested information.","Additionale kost voor zaterdaglevering, e.g.: 4.95.<br />Beste klant, als u ervoor koos om uw klant de mogelijkheid te geven om zijn pakje zaterdag te laten leveren, kies dan 'De leveringsdatum tonen' in de algemene parameters van de plugin, en vul de gevraagde gegevens in."


236	"Your selected order is not ready to be shipped or has already been shipped","Dit order is niet klaar om te verzenden of werd reeds verzonden."
237	"Zip/Postal Code","Postcode"
238	"This order did not (yet) generate labels which automatically returned return label barcodes. This feature might not be actived. Please refer to the documentation and your Shipping Settings under 'System > Configuration > Sales' for more information.","Voor dit order zijn (nog) geen etiketten met automatische retouretiketten gegenereerd. Deze functionaliteit is mogelijk niet geactiveerd. Zie documentatie en Shipping Settings onder 'System > Configuration > Sales' voor meer informatie."
239	+ "Could you please use the following zipcode format ""%s"" for the selected country in order to make the bpost delivery method ""%s"" available.","Gelieve de postcode aan te passen naar het formaat ""%s"" voor het geselecteerde land, zodat de bpost leveringsmethode ""%s"" beschikbaar wordt."
240	"Your address could not be determined, please return to the shipping address step to correct it.","Het opgegeven adres kon niet verwerkt worden, gelieve uw leveringsadres te corrigeren."
241	"bpost Click & Collect","bpost Click & Collect"
242	"You would like to deliver your parcel in your own stores?","Indien u uw pakketten in uw eigen winkel wil laten leveren,"

255	"If you have added or removed Click & Collect points in Shipping Manager, be aware that it will take up to 24h to be operational in the bpost Magento plugin.","Als u een Click & Collect punt toevoegt of verwijdert in uw Shipping Manager, duurt het 24u vooraleer dit operationeel wordt in uw bpost plugin voor Magento."
256	"If the points don’t appear after 24h, make sure to have cleared the Magento cache.","Als u deze afhaalpunten niet ziet verschijnen na 24u, verzeker u er dan van dat u de Magento cache hebt geleegd."
257	"Before using this delivery method, make sure that Click & Collect is duely activated. This is a 2 step process. Find out how here.","Vooraleer u met deze leveringsmethode van start kun gaan, moeten volgende activaties gebeurd zijn."
258	+ "Additional fee when using saturday delivery option, e.g.: 4.95.<br />Dear customer, if you decide to offer your own consumers the option of Saturday delivery, you need to select 'Display delivery date' in the general parameters of the plugin and enter the requested information.","Additionale kost voor zaterdaglevering, e.g.: 4.95.<br />Beste klant, als u ervoor koos om uw klant de mogelijkheid te geven om zijn pakje zaterdag te laten leveren, kies dan 'De leveringsdatum tonen' in de algemene parameters van de plugin, en vul de gevraagde gegevens in."

package.xml CHANGED Viewed

	@@ -1,20 +1,23 @@
1	<?xml version="1.0"?>
2	<package>
3	<name>bpost</name>
4	- <version>1.3.4</version>
5	<stability>stable</stability>
6	<license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7	<channel>community</channel>
8	<extends/>
9	<summary>bpost shipping manager 2015</summary>
10	<description>bpost shipping manager By PHPro</description>
11	- <notes>- ~~Fixed~~ an ~~error~~ ~~when~~ ~~sending~~ with ~~international~~ ~~shipments for orders with a discount code of 100%&#~~xD;
12	- - ~~The~~ ~~free~~ shipping ~~price~~ is now ~~incl~~ ~~vat~~ ~~instead~~ of ~~excl~~ ~~vat.&#~~xD;
13	- - ~~Modified~~ ~~the~~ ~~notes~~ of ~~Saturday~~ ~~delivery~~ ~~in the configuration</notes>~~



14	<authors><author><name>PHPro</name><user>heremke</user><email>info@phpro.be</email></author></authors>
15	- <date>~~2016~~-10-04</date>
16	- <time>06:58:42</time>
17	- <contents><target name="magecommunity"><dir name="Bpost"><dir name="ShM"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="AllOrders"><file name="Grid.php" hash="19a74f01863f31cde9cfe04191adaee1"/></dir><file name="AllOrders.php" hash="c9bed128109004f6007a2c51c0b13687"/><dir name="Grid"><dir name="Renderer"><dir name="Dropdate"><file name="Dateformat.php" hash="dc59c761bbc587cf9d9c3b46881cd5a2"/></dir><dir name="Label"><file name="Download.php" hash="6848a41d5eb1bad1e9da43937e279468"/></dir></dir></dir><file name="Grid.php" hash="5282ae6c40008d094e310b861d4df677"/><dir name="Order"><dir name="View"><dir name="Tab"><file name="Returnbarcode.php" hash="d271b69bca3b77dc0a5a624d56628a1d"/><file name="Returnlabels.php" hash="3a281c4942cf722ab58523e9869113eb"/></dir></dir></dir><dir name="PendingOrders"><file name="Grid.php" hash="f17b1ec3dc0b7bdab2dbe03eda054ede"/></dir><file name="PendingOrders.php" hash="584198acc69c0fad60ac793238ca6c8f"/></dir><dir name="Shipping"><dir name="Carrier"><dir name="Bpost"><dir name="Tablerate"><dir name="Clickcollect"><file name="Grid.php" hash="8f4a7990122ab6ccdb079f7fe06e75bb"/></dir><dir name="Homedelivery"><file name="Grid.php" hash="edc472d70d53b81685e0f861a50cd4fd"/></dir><dir name="International"><file name="Grid.php" hash="c76e5042c0f6ff9ed96d978f45336c2c"/></dir><dir name="Parcellocker"><file name="Grid.php" hash="f5de661468fc82c0b0a51baad560ebb4"/></dir><dir name="Pickuppoint"><file name="Grid.php" hash="23151dff9b96415cd8648429260481c9"/></dir></dir></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Api"><dir name="Import"><file name="Countries.php" hash="1f2d94c2ffb8f43d81050b7b9da42a42"/></dir></dir><dir name="Field"><file name="Cacheinfo.php" hash="b6f0910c9698110b676ad0988647903e"/><file name="Choose.php" hash="ef813927a3ba26302cd8e4c7c5fb62a8"/><file name="Clickcollect.php" hash="b4667cb7e4fe0abcfbc7113f65c859ee"/><file name="Hour.php" hash="763b955bff596cddf2ceabd4ce85816d"/><file name="Info.php" hash="421631d66f10176e4cca80d30df625eb"/><file name="Logo.php" hash="83cc7232c4a0a05b6857aa5e7cd00beb"/><file name="Subheader.php" hash="1b52d6781e07b134c341eae891ac9979"/></dir><dir name="Tablerates"><dir name="Export"><file name="Clickcollect.php" hash="294325998821cba4d98d113c5832d981"/><file name="Homedelivery.php" hash="beb4c5c59ef77d06a425a31d90893255"/><file name="International.php" hash="7806c48c000e996b707e87e58ac1f166"/><file name="Parcellocker.php" hash="e32815fa7846b08318a87c02a7374990"/><file name="Pickuppoint.php" hash="8cb4911d631d257332ce542db49c3672"/></dir></dir></dir></dir></dir></dir><dir name="Carrier"><file name="Bpost.php" hash="d13a75675dfd60c81a4efdb5345cb47b"/></dir></dir><dir name="Controller"><dir name="ShM"><file name="Order.php" hash="7ab38959baaf721d9e7fe16bd34e9dab"/></dir></dir><dir name="Helper"><file name="Data.php" hash="d264edf27df0eebca2bc65846fdabceb"/><file name="Returnlabel.php" hash="e3fb05a9f08577dfe90866669d3f7613"/><dir name="System"><file name="Config.php" hash="393353ca26ef2b398769ecbb59fdcbf9"/></dir></dir><dir name="Model"><dir name="Adminhtml"><file name="Bpostgrid.php" hash="47cec02b0eb54ff1cd144dc95d9885e6"/><file name="Observer.php" hash="0bb2d5c40c8fb4e0441ef1df808db266"/><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Shipping"><dir name="Tablerates"><file name="Clickcollect.php" hash="8247e2d2a93a438f79ea71d91b8c01f2"/><file name="Homedelivery.php" hash="26758346e7e09d2b3075cb0613a00b79"/><file name="International.php" hash="c6ba9e8b7e42893a7faf31392e0d647f"/><file name="Parcellocker.php" hash="2fa265b0623de5740b15ea27284a3b47"/><file name="Pickuppoint.php" hash="84ccd80c14f33de89b8164e396ef3241"/></dir></dir></dir><dir name="Source"><file name="Datecomment.php" hash="a67ca74e2f81cbfaec6b7ed0ce8aa9f2"/><file name="Shipping.php" hash="a19f622f5f64ee64c8f8e6667d6d9323"/></dir></dir></dir></dir><dir name="Api"><file name="Abstract.php" hash="4dc3fce5af77439259a220bdb3c1f072"/><file name="Domcreator.php" hash="b55a9e3dc8ef144044810a00be4779cc"/></dir><file name="Api.php" hash="4ac11a8beb07d9472024131eba33e13c"/><file name="Country.php" hash="7ca2d7fee06b4672ee8679dcc0d437cf"/><file name="Holidays.php" hash="85d3ad2c06516d3bd42d6cf25b6c1c1b"/><file name="Observer.php" hash="40caf55b3ef82bbe1eda8c151e30c85c"/><dir name="Resource"><dir name="Country"><file name="Collection.php" hash="173cb7acd05ead3fa4bb29f1a2200188"/></dir><file name="Country.php" hash="3ed62dc4bae568879a781400724e2b31"/><dir name="Holidays"><file name="Collection.php" hash="b39c602b1b6c7802a8e298ccabd3b88d"/></dir><file name="Holidays.php" hash="8410fabf516cce95e6e6a69e52abb6ec"/><dir name="Returnlabel"><file name="Collection.php" hash="d34adb537d24116270238ae1fa377a05"/></dir><file name="Returnlabel.php" hash="419fda598a2630ccc773ce0b0eacbd79"/><dir name="Tablerates"><dir name="Clickcollect"><file name="Collection.php" hash="a076e1266785fc9342fc134ac9268280"/></dir><file name="Clickcollect.php" hash="56ab4e22b459339db3190bfbd102d94f"/><dir name="Homedelivery"><file name="Collection.php" hash="7a34c249b5015ecda8ad26cbf42c6280"/></dir><file name="Homedelivery.php" hash="a94baf3909962e162813d8003583cc77"/><dir name="International"><file name="Collection.php" hash="6ba99077f1625a8c81990ea3afcb14b8"/></dir><file name="International.php" hash="ca3e45f29f9ef44f00ff41b509e0f0a1"/><dir name="Parcellocker"><file name="Collection.php" hash="9aa78e0bc7d389e93e958472a0fc40b6"/></dir><file name="Parcellocker.php" hash="66bb509267844a48ff5b054c82a47254"/><dir name="Pickuppoint"><file name="Collection.php" hash="1f9db3d5ff7f1a9e9d2eccddf6860513"/></dir><file name="Pickuppoint.php" hash="33e26bc93dcea5aabbee59343043413d"/></dir></dir><file name="Returnlabel.php" hash="60e5a2d76a101bda76bbd3509558a2ed"/><dir name="Shipping"><dir name="Carrier"><file name="BpostShM.php" hash="d821ad195dc36f629c7a86fb1a2faa28"/></dir><file name="Geocode.php" hash="d613ba4d1e5d14f8698fcfe9dfd03a66"/><dir name="Rate"><file name="Result.php" hash="77e9fc98f15441edfdc478fd589e41a8"/></dir></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Country.php" hash="f49cbe30d05cffb6f516a3df6ddc1b7b"/><file name="Product.php" hash="cb74b0fc8d3f661d0be4ac9f9c5b840d"/><file name="Ratetypes.php" hash="42f1f3f8dc000ea5e5336ca1ad7ab85c"/><file name="Weightunit.php" hash="e0c0a9975395245c4d16d975c0334c31"/></dir></dir></dir><dir name="Tablerates"><file name="Clickcollect.php" hash="9d589684df3b1b7e11441dc808a9627c"/><file name="Homedelivery.php" hash="d60385de528eb957a2874af6306d4aae"/><file name="International.php" hash="d02e02a7cddbda576530d6acbd6d02e8"/><file name="Parcellocker.php" hash="805a9669f9d024a4c018d611e5c71afd"/><file name="Pickuppoint.php" hash="49dff9f40e26163b8d0c6b8be9f6ee51"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Bpost"><dir name="ShM"><file name="AllOrdersController.php" hash="08df25d3e3718e183c40f68d8722782a"/><file name="ConfigController.php" hash="2537dbc05936e758c6353e46016180f9"/><file name="DownloadController.php" hash="87a534445edd2ff9ae3601fbe99637a5"/><file name="PendingOrdersController.php" hash="300f5472999194f90658737311b94df4"/></dir></dir></dir><file name="AjaxController.php" hash="ba6df7ff9999259273b7414e6bd51f1c"/></dir><dir name="etc"><file name="adminhtml.xml" hash="cba525a2c3c394cb15c144f887e081cc"/><file name="config.xml" hash="f3d2588b31f8b7c67db3a2697dc7e47e"/><file name="system.xml" hash="1e179cf9039eefde2d1d5c8ae844fa0a"/></dir><dir name="sql"><dir name="bpost_shm_setup"><file name="install-0.0.1.php" hash="441ce29ddd9b04c052f03699e8ecc704"/><file name="upgrade-0.0.1-0.0.2.php" hash="7c5bb7a9609d6bec38a927e07eaad066"/><file name="upgrade-0.0.10-0.1.0.php" hash="c1523f2fd829372143c4686376512b37"/><file name="upgrade-0.0.2-0.0.3.php" hash="7e441f96e071efaa42d629815be8379c"/><file name="upgrade-0.0.3-0.0.4.php" hash="e2009ca70b9b268024433be7ac74ba19"/><file name="upgrade-0.0.4-0.0.5.php" hash="a51391f3bf810a5c6ae5c0bdbc5d9603"/><file name="upgrade-0.0.5-0.0.6.php" hash="2d8d624be7f829029b3e9fceb6d6c3b8"/><file name="upgrade-0.0.6-0.0.7.php" hash="82a7a64e3234c8b6e20367fcc80e1049"/><file name="upgrade-0.0.7-0.0.8.php" hash="a3b337a855d92202b5d625269edf4cb8"/><file name="upgrade-0.0.8-0.0.9.php" hash="20a344294274390515a891a89facfcb3"/><file name="upgrade-0.0.9-0.0.10.php" hash="74d06a2bbf41c5c8d9cb7870898a3eb3"/><file name="upgrade-0.1.0-0.1.1.php" hash="ed824736e9cd0f8e98a4dc62c41ecf96"/><file name="upgrade-0.1.1-0.1.2.php" hash="bb7cf544bc07ef2209b82753ac2b950d"/><file name="upgrade-0.1.2-0.1.3.php" hash="04f9ab295e48b018e80da482bdf23132"/><file name="upgrade-0.1.3-0.1.4.php" hash="9e8f6f1e2522917b8efeb379d21cd953"/><file name="upgrade-0.1.4-0.1.5.php" hash="16333b0f3faa92e98d6bb6f75b4273cd"/><file name="upgrade-0.1.5-0.1.6.php" hash="f2f1f169a5ad2fbd0650ffbef3217b08"/><file name="upgrade-0.1.6-0.1.7.php" hash="95eebc7f870fa36c0a0997a06cb47076"/><file name="upgrade-0.1.7-0.1.8.php" hash="56a4bc5320b56309c943a90df00464e8"/><file name="upgrade-0.1.8-1.1.3.php" hash="d2058a8a86a501111fca4053a1f49ba2"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><dir name="bpost"><file name="shm.xml" hash="8a5ceb93674efcbd6e8063437877d9d5"/></dir></dir><dir name="template"><dir name="bpost"><file name="empty.phtml" hash="45a92398f5adc3dd6dda9527f95ef4d5"/><file name="informationpopup.phtml" hash="42432ed861bb8b5b34a39d879c164979"/><file name="screenshotpopup.phtml" hash="5ad6a05c55ea41e550262ceed28626ae"/><dir name="widget"><dir name="grid"><file name="massaction.phtml" hash="f9b9aa54fe683d66fd535f95afb07dfe"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><dir name="bpost"><file name="shm.xml" hash="fdf8ce174a2af269f7c5831311474c87"/></dir></dir><dir name="template"><dir name="bpost"><dir name="shm"><file name="append_bpost_shippingmethod.phtml" hash="d88b99e5200c4eca2fc800c48ff8419f"/><file name="gmapsapi.phtml" hash="ac4dea1786701a6968a1c771a54e06fd"/><file name="oscwindowjs.phtml" hash="253fbb8eb44a41bf76495d26ab74b1ef"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="zBpost_ShM.xml" hash="791aeaa9ddf185a0b053728b20b06ea0"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Bpost_ShM.csv" hash="e79f717b0708805e4b32a9d7944eb19f"/><dir name="template"><dir name="email"><dir name="bpost"><file name="returnlabel.html" hash="fa9b1779caf12fe6e8c85e44899e7e66"/><file name="errorhandling_create_order.html" hash="5458114b6bfee6f66841f4fe19e13675"/></dir></dir></dir></dir><dir name="fr_FR"><file name="Bpost_ShM.csv" hash="318ec34e36274364c65bf2d0b95988c3"/></dir><dir name="nl_NL"><file name="Bpost_ShM.csv" hash="debfcefa91b7d9d8fd2dd95d8a3c992a"/></dir></target><target name="mageweb"><dir name="js"><dir name="bpost"><dir name="shm"><dir name="adminhtml"><file name="informationpopup.js" hash="dd25216084d43f70b7de4beaf1ef23c5"/></dir><file name="checkout.js" hash="d0d9d11bb87513f5cf72bfc4a260b432"/><file name="infobox.js" hash="4b42bb1b029f60ecda0ceeabb4726e5d"/><file name="onestepcheckout_shipping.js" hash="5543fb8c7b6b9a4fa03eb11fad70960d"/><file name="window.js" hash="6595b93b8c84328f26071fee485b797e"/></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="bpost"><file name="checkout.css" hash="1def6c20f733f736de8fc16b4cb40b79"/></dir></dir><dir name="images"><dir name="bpost"><file name="ajax-loader-button.gif" hash="cbdad94ec5d22b17d7aae4c6d245069a"/><file name="ajax-loader-wheel.gif" hash="faa74e8c61fc64d5edb11613c7eead2c"/><file name="bpost_logo_RGB72_L.png" hash="ca8a5de3a37cfbbdac7c0fec6e4f9f28"/><file name="bpost_logo_RGB72_M.png" hash="feb4bb3bb7c9c4100612b62cde7037e5"/><file name="bpost_sym_RGB72_S.png" hash="18e774a968be600664d11a9e0691a424"/><file name="btn_close.png" hash="d6ecac0a01a600ef15efc9004ccc9fb7"/><file name="icon-close.png" hash="54d0827f50c1d294c61e88e316e61059"/><file name="icon-info.png" hash="e4de51e3c12327403a9b966aac98a9d6"/><file name="location_clickcollect_default.png" hash="dba619d29c0013538003f3fec98da652"/><file name="location_parcellocker_default.png" hash="8906b0e09067eab6f31b712d54ecf547"/><file name="location_postoffice_default.png" hash="ea147b38b01449e8a1cff3ebff6b2741"/><file name="location_postpoint_default.png" hash="c53f598daafbec4d042b165d21116719"/></dir></dir><dir name="js"><dir name="bpost"><file name="onestepcheckout.js" hash="a0e4b3df8643ffaa798e679fe20f116c"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="css"><dir name="bpost"><file name="informationpopup.css" hash="bffce6ef1182a763f626a0b3288b3887"/></dir></dir><dir name="images"><dir name="bpost"><file name="ajax-loader-red.gif" hash="7bf0fa0e5a55c6a7cd122a9bb461006d"/><file name="bpost_logo_RGB72_L.png" hash="ca8a5de3a37cfbbdac7c0fec6e4f9f28"/><file name="bpost_logo_RGB72_M.png" hash="feb4bb3bb7c9c4100612b62cde7037e5"/><file name="btn_close.png" hash="d6ecac0a01a600ef15efc9004ccc9fb7"/><file name="ce-screenshot.png" hash="ff6f4a630cd17efc1abbe8eca6e015a5"/><file name="ee-screenshot.png" hash="ff6f4a630cd17efc1abbe8eca6e015a5"/><file name="pdf_icon.png" hash="95b561422892384337eb2eabb968a558"/></dir></dir></dir></dir></dir></target></contents>
18	<compatible/>
19	<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
20	</package>


1	<?xml version="1.0"?>
2	<package>
3	<name>bpost</name>
4	+ <version>1.3.6</version>
5	<stability>stable</stability>
6	<license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7	<channel>community</channel>
8	<extends/>
9	<summary>bpost shipping manager 2015</summary>
10	<description>bpost shipping manager By PHPro</description>
11	+ <notes>- Onestepcheckout is now more compatible with the plugin
12	+ - International shipping cost is now taken into account on with onestepcheckout
13	+ - Error messages on onestepcheckout have been updated
14	+ - BPACK 24Business is added on the bpost home delivery method
15	+ - Label generation for parcel locker fixed
16	+ - Fixed french translations</notes>
17	<authors><author><name>PHPro</name><user>heremke</user><email>info@phpro.be</email></author></authors>
18	+ <date>2017-03-30</date>
19	+ <time>05:51:50</time>
20	+ <contents><target name="magecommunity"><dir name="Bpost"><dir name="ShM"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="AllOrders"><file name="Grid.php" hash="19a74f01863f31cde9cfe04191adaee1"/></dir><file name="AllOrders.php" hash="c9bed128109004f6007a2c51c0b13687"/><dir name="Grid"><dir name="Renderer"><dir name="Dropdate"><file name="Dateformat.php" hash="dc59c761bbc587cf9d9c3b46881cd5a2"/></dir><dir name="Label"><file name="Download.php" hash="6848a41d5eb1bad1e9da43937e279468"/></dir></dir></dir><file name="Grid.php" hash="5282ae6c40008d094e310b861d4df677"/><dir name="Order"><dir name="View"><dir name="Tab"><file name="Returnbarcode.php" hash="d271b69bca3b77dc0a5a624d56628a1d"/><file name="Returnlabels.php" hash="3a281c4942cf722ab58523e9869113eb"/></dir></dir></dir><dir name="PendingOrders"><file name="Grid.php" hash="f17b1ec3dc0b7bdab2dbe03eda054ede"/></dir><file name="PendingOrders.php" hash="584198acc69c0fad60ac793238ca6c8f"/></dir><dir name="Shipping"><dir name="Carrier"><dir name="Bpost"><dir name="Tablerate"><dir name="Clickcollect"><file name="Grid.php" hash="8f4a7990122ab6ccdb079f7fe06e75bb"/></dir><dir name="Homedelivery"><file name="Grid.php" hash="edc472d70d53b81685e0f861a50cd4fd"/></dir><dir name="International"><file name="Grid.php" hash="c76e5042c0f6ff9ed96d978f45336c2c"/></dir><dir name="Parcellocker"><file name="Grid.php" hash="f5de661468fc82c0b0a51baad560ebb4"/></dir><dir name="Pickuppoint"><file name="Grid.php" hash="23151dff9b96415cd8648429260481c9"/></dir></dir></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Api"><dir name="Import"><file name="Countries.php" hash="1f2d94c2ffb8f43d81050b7b9da42a42"/></dir></dir><dir name="Field"><file name="Bpack.php" hash="79ea4b6ecc9d48255b04b57dafd70a0e"/><file name="Cacheinfo.php" hash="b6f0910c9698110b676ad0988647903e"/><file name="Choose.php" hash="ef813927a3ba26302cd8e4c7c5fb62a8"/><file name="Clickcollect.php" hash="b4667cb7e4fe0abcfbc7113f65c859ee"/><file name="Hour.php" hash="763b955bff596cddf2ceabd4ce85816d"/><file name="Info.php" hash="421631d66f10176e4cca80d30df625eb"/><file name="Logo.php" hash="83cc7232c4a0a05b6857aa5e7cd00beb"/><file name="Subheader.php" hash="1b52d6781e07b134c341eae891ac9979"/></dir><dir name="Tablerates"><dir name="Export"><file name="Clickcollect.php" hash="294325998821cba4d98d113c5832d981"/><file name="Homedelivery.php" hash="beb4c5c59ef77d06a425a31d90893255"/><file name="International.php" hash="7806c48c000e996b707e87e58ac1f166"/><file name="Parcellocker.php" hash="e32815fa7846b08318a87c02a7374990"/><file name="Pickuppoint.php" hash="8cb4911d631d257332ce542db49c3672"/></dir></dir></dir></dir></dir></dir><dir name="Carrier"><file name="Bpost.php" hash="d13a75675dfd60c81a4efdb5345cb47b"/></dir></dir><dir name="Controller"><dir name="ShM"><file name="Order.php" hash="7ab38959baaf721d9e7fe16bd34e9dab"/></dir></dir><dir name="Helper"><file name="Data.php" hash="eb65dfaf48d58eb4a310a8f5a1f7294b"/><file name="Returnlabel.php" hash="e3fb05a9f08577dfe90866669d3f7613"/><dir name="System"><file name="Config.php" hash="393353ca26ef2b398769ecbb59fdcbf9"/></dir></dir><dir name="Model"><dir name="Adminhtml"><file name="Bpostgrid.php" hash="47cec02b0eb54ff1cd144dc95d9885e6"/><file name="Observer.php" hash="0bb2d5c40c8fb4e0441ef1df808db266"/><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Shipping"><dir name="Tablerates"><file name="Clickcollect.php" hash="8247e2d2a93a438f79ea71d91b8c01f2"/><file name="Homedelivery.php" hash="26758346e7e09d2b3075cb0613a00b79"/><file name="International.php" hash="c6ba9e8b7e42893a7faf31392e0d647f"/><file name="Parcellocker.php" hash="2fa265b0623de5740b15ea27284a3b47"/><file name="Pickuppoint.php" hash="84ccd80c14f33de89b8164e396ef3241"/></dir></dir></dir><dir name="Source"><file name="Datecomment.php" hash="a67ca74e2f81cbfaec6b7ed0ce8aa9f2"/><file name="Shipping.php" hash="a19f622f5f64ee64c8f8e6667d6d9323"/></dir></dir></dir></dir><dir name="Api"><file name="Abstract.php" hash="4dc3fce5af77439259a220bdb3c1f072"/><file name="Domcreator.php" hash="e4c3c73ca7c0f32bbef580b91aa53674"/></dir><file name="Api.php" hash="4ac11a8beb07d9472024131eba33e13c"/><file name="Country.php" hash="7ca2d7fee06b4672ee8679dcc0d437cf"/><file name="Holidays.php" hash="85d3ad2c06516d3bd42d6cf25b6c1c1b"/><file name="Observer.php" hash="40caf55b3ef82bbe1eda8c151e30c85c"/><dir name="Resource"><dir name="Country"><file name="Collection.php" hash="173cb7acd05ead3fa4bb29f1a2200188"/></dir><file name="Country.php" hash="3ed62dc4bae568879a781400724e2b31"/><dir name="Holidays"><file name="Collection.php" hash="b39c602b1b6c7802a8e298ccabd3b88d"/></dir><file name="Holidays.php" hash="8410fabf516cce95e6e6a69e52abb6ec"/><dir name="Returnlabel"><file name="Collection.php" hash="d34adb537d24116270238ae1fa377a05"/></dir><file name="Returnlabel.php" hash="419fda598a2630ccc773ce0b0eacbd79"/><dir name="Tablerates"><dir name="Clickcollect"><file name="Collection.php" hash="a076e1266785fc9342fc134ac9268280"/></dir><file name="Clickcollect.php" hash="56ab4e22b459339db3190bfbd102d94f"/><dir name="Homedelivery"><file name="Collection.php" hash="7a34c249b5015ecda8ad26cbf42c6280"/></dir><file name="Homedelivery.php" hash="a94baf3909962e162813d8003583cc77"/><dir name="International"><file name="Collection.php" hash="6ba99077f1625a8c81990ea3afcb14b8"/></dir><file name="International.php" hash="ca3e45f29f9ef44f00ff41b509e0f0a1"/><dir name="Parcellocker"><file name="Collection.php" hash="9aa78e0bc7d389e93e958472a0fc40b6"/></dir><file name="Parcellocker.php" hash="66bb509267844a48ff5b054c82a47254"/><dir name="Pickuppoint"><file name="Collection.php" hash="1f9db3d5ff7f1a9e9d2eccddf6860513"/></dir><file name="Pickuppoint.php" hash="33e26bc93dcea5aabbee59343043413d"/></dir></dir><file name="Returnlabel.php" hash="60e5a2d76a101bda76bbd3509558a2ed"/><dir name="Shipping"><dir name="Carrier"><file name="BpostShM.php" hash="35c655aad5571fe87089347915df6368"/></dir><file name="Geocode.php" hash="d613ba4d1e5d14f8698fcfe9dfd03a66"/><dir name="Rate"><file name="Result.php" hash="77e9fc98f15441edfdc478fd589e41a8"/></dir></dir><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Product"><file name="Bpack.php" hash="373a04c61647dd0db1e20271085a3aa2"/></dir></dir><dir name="Source"><file name="Country.php" hash="f49cbe30d05cffb6f516a3df6ddc1b7b"/><dir name="Product"><file name="Bpack.php" hash="5eb1d4ba564e1f7cd290b5b0f0b864e6"/></dir><file name="Product.php" hash="cb74b0fc8d3f661d0be4ac9f9c5b840d"/><file name="Ratetypes.php" hash="42f1f3f8dc000ea5e5336ca1ad7ab85c"/><file name="Weightunit.php" hash="e0c0a9975395245c4d16d975c0334c31"/></dir></dir></dir><dir name="Tablerates"><file name="Clickcollect.php" hash="9d589684df3b1b7e11441dc808a9627c"/><file name="Homedelivery.php" hash="d60385de528eb957a2874af6306d4aae"/><file name="International.php" hash="d02e02a7cddbda576530d6acbd6d02e8"/><file name="Parcellocker.php" hash="805a9669f9d024a4c018d611e5c71afd"/><file name="Pickuppoint.php" hash="49dff9f40e26163b8d0c6b8be9f6ee51"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Bpost"><dir name="ShM"><file name="AllOrdersController.php" hash="08df25d3e3718e183c40f68d8722782a"/><file name="ConfigController.php" hash="2537dbc05936e758c6353e46016180f9"/><file name="DownloadController.php" hash="87a534445edd2ff9ae3601fbe99637a5"/><file name="PendingOrdersController.php" hash="300f5472999194f90658737311b94df4"/></dir></dir></dir><file name="AjaxController.php" hash="ba6df7ff9999259273b7414e6bd51f1c"/></dir><dir name="etc"><file name="adminhtml.xml" hash="cba525a2c3c394cb15c144f887e081cc"/><file name="config.xml" hash="871bdeaee971df40a8226a931844cdc5"/><file name="system.xml" hash="27bb0d8246ffa5198470649150996b39"/></dir><dir name="sql"><dir name="bpost_shm_setup"><file name="install-0.0.1.php" hash="441ce29ddd9b04c052f03699e8ecc704"/><file name="upgrade-0.0.1-0.0.2.php" hash="7c5bb7a9609d6bec38a927e07eaad066"/><file name="upgrade-0.0.10-0.1.0.php" hash="c1523f2fd829372143c4686376512b37"/><file name="upgrade-0.0.2-0.0.3.php" hash="7e441f96e071efaa42d629815be8379c"/><file name="upgrade-0.0.3-0.0.4.php" hash="e2009ca70b9b268024433be7ac74ba19"/><file name="upgrade-0.0.4-0.0.5.php" hash="a51391f3bf810a5c6ae5c0bdbc5d9603"/><file name="upgrade-0.0.5-0.0.6.php" hash="2d8d624be7f829029b3e9fceb6d6c3b8"/><file name="upgrade-0.0.6-0.0.7.php" hash="82a7a64e3234c8b6e20367fcc80e1049"/><file name="upgrade-0.0.7-0.0.8.php" hash="a3b337a855d92202b5d625269edf4cb8"/><file name="upgrade-0.0.8-0.0.9.php" hash="20a344294274390515a891a89facfcb3"/><file name="upgrade-0.0.9-0.0.10.php" hash="74d06a2bbf41c5c8d9cb7870898a3eb3"/><file name="upgrade-0.1.0-0.1.1.php" hash="ed824736e9cd0f8e98a4dc62c41ecf96"/><file name="upgrade-0.1.1-0.1.2.php" hash="bb7cf544bc07ef2209b82753ac2b950d"/><file name="upgrade-0.1.2-0.1.3.php" hash="04f9ab295e48b018e80da482bdf23132"/><file name="upgrade-0.1.3-0.1.4.php" hash="9e8f6f1e2522917b8efeb379d21cd953"/><file name="upgrade-0.1.4-0.1.5.php" hash="16333b0f3faa92e98d6bb6f75b4273cd"/><file name="upgrade-0.1.5-0.1.6.php" hash="f2f1f169a5ad2fbd0650ffbef3217b08"/><file name="upgrade-0.1.6-0.1.7.php" hash="95eebc7f870fa36c0a0997a06cb47076"/><file name="upgrade-0.1.7-0.1.8.php" hash="56a4bc5320b56309c943a90df00464e8"/><file name="upgrade-0.1.8-1.1.3.php" hash="d2058a8a86a501111fca4053a1f49ba2"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><dir name="bpost"><file name="shm.xml" hash="8a5ceb93674efcbd6e8063437877d9d5"/></dir></dir><dir name="template"><dir name="bpost"><file name="empty.phtml" hash="45a92398f5adc3dd6dda9527f95ef4d5"/><file name="informationpopup.phtml" hash="42432ed861bb8b5b34a39d879c164979"/><file name="screenshotpopup.phtml" hash="5ad6a05c55ea41e550262ceed28626ae"/><dir name="widget"><dir name="grid"><file name="massaction.phtml" hash="f9b9aa54fe683d66fd535f95afb07dfe"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><dir name="bpost"><file name="shm.xml" hash="fdf8ce174a2af269f7c5831311474c87"/></dir></dir><dir name="template"><dir name="bpost"><dir name="shm"><file name="append_bpost_shippingmethod.phtml" hash="d88b99e5200c4eca2fc800c48ff8419f"/><file name="gmapsapi.phtml" hash="ac4dea1786701a6968a1c771a54e06fd"/><file name="oscwindowjs.phtml" hash="253fbb8eb44a41bf76495d26ab74b1ef"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="zBpost_ShM.xml" hash="791aeaa9ddf185a0b053728b20b06ea0"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Bpost_ShM.csv" hash="e79f717b0708805e4b32a9d7944eb19f"/><dir name="template"><dir name="email"><dir name="bpost"><file name="returnlabel.html" hash="fa9b1779caf12fe6e8c85e44899e7e66"/><file name="errorhandling_create_order.html" hash="5458114b6bfee6f66841f4fe19e13675"/></dir></dir></dir></dir><dir name="fr_FR"><file name="Bpost_ShM.csv" hash="e7815b22c0c78d736d0e805dd91faaa4"/></dir><dir name="nl_NL"><file name="Bpost_ShM.csv" hash="74181e21050a7e65c08cfe95afa0716d"/></dir></target><target name="mageweb"><dir name="js"><dir name="bpost"><dir name="shm"><dir name="adminhtml"><file name="informationpopup.js" hash="dd25216084d43f70b7de4beaf1ef23c5"/></dir><file name="checkout.js" hash="d0d9d11bb87513f5cf72bfc4a260b432"/><file name="infobox.js" hash="4b42bb1b029f60ecda0ceeabb4726e5d"/><file name="onestepcheckout_shipping.js" hash="5543fb8c7b6b9a4fa03eb11fad70960d"/><file name="window.js" hash="6595b93b8c84328f26071fee485b797e"/></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="bpost"><file name="checkout.css" hash="1def6c20f733f736de8fc16b4cb40b79"/></dir></dir><dir name="images"><dir name="bpost"><file name="ajax-loader-button.gif" hash="cbdad94ec5d22b17d7aae4c6d245069a"/><file name="ajax-loader-wheel.gif" hash="faa74e8c61fc64d5edb11613c7eead2c"/><file name="bpost_logo_RGB72_L.png" hash="ca8a5de3a37cfbbdac7c0fec6e4f9f28"/><file name="bpost_logo_RGB72_M.png" hash="feb4bb3bb7c9c4100612b62cde7037e5"/><file name="bpost_sym_RGB72_S.png" hash="18e774a968be600664d11a9e0691a424"/><file name="btn_close.png" hash="d6ecac0a01a600ef15efc9004ccc9fb7"/><file name="icon-close.png" hash="54d0827f50c1d294c61e88e316e61059"/><file name="icon-info.png" hash="e4de51e3c12327403a9b966aac98a9d6"/><file name="location_clickcollect_default.png" hash="dba619d29c0013538003f3fec98da652"/><file name="location_parcellocker_default.png" hash="8906b0e09067eab6f31b712d54ecf547"/><file name="location_postoffice_default.png" hash="ea147b38b01449e8a1cff3ebff6b2741"/><file name="location_postpoint_default.png" hash="c53f598daafbec4d042b165d21116719"/></dir></dir><dir name="js"><dir name="bpost"><file name="onestepcheckout.js" hash="36f03ca5e46c6e628240520531b6ba6b"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="css"><dir name="bpost"><file name="informationpopup.css" hash="bffce6ef1182a763f626a0b3288b3887"/></dir></dir><dir name="images"><dir name="bpost"><file name="ajax-loader-red.gif" hash="7bf0fa0e5a55c6a7cd122a9bb461006d"/><file name="bpost_logo_RGB72_L.png" hash="ca8a5de3a37cfbbdac7c0fec6e4f9f28"/><file name="bpost_logo_RGB72_M.png" hash="feb4bb3bb7c9c4100612b62cde7037e5"/><file name="btn_close.png" hash="d6ecac0a01a600ef15efc9004ccc9fb7"/><file name="ce-screenshot.png" hash="ff6f4a630cd17efc1abbe8eca6e015a5"/><file name="ee-screenshot.png" hash="ff6f4a630cd17efc1abbe8eca6e015a5"/><file name="pdf_icon.png" hash="95b561422892384337eb2eabb968a558"/></dir></dir></dir></dir></dir></target></contents>
21	<compatible/>
22	<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
23	</package>

skin/frontend/base/default/js/bpost/onestepcheckout.js CHANGED Viewed

	@@ -1,44 +1,44 @@
1	- get_separate_save_methods_function = function get_separate_save_methods_function_bpost(url, update_payments)
2	- {
3	- if(typeof update_payments == 'undefined') {
4	var update_payments = false;
5	}
6
7	- return function(e) {
8	triggerAjaxCallGetSeparateSaveMethods(url, update_payments);
9	};
10	}
11
12	- triggerAjaxCallGetSeparateSaveMethods = function (url, update_payments){
13	var form = $('onestepcheckout-form');
14	var shipping_method = $RF(form, 'shipping_method');
15
16	- if( window.bpostSettings && shipping_method && shipping_method.indexOf("bpostshm_") > -1){
17	var shippingmethodDate = window.bpostSettings.datepicker_days[shipping_method.replace('bpostshm_', '')]['date'];
18	var currentDate = new Date(shippingmethodDate);
19	var currentDay = currentDate.getDay();
20	var saturdayDelivery = 0;
21	}
22	- else{
23	currentDay = "";
24	}
25	//if undefined, page load
26	- if(update_payments == true && window.bpostSettings.datepicker_choose == true){
27	window.isSaturdaySelected = false;
28	}
29
30	- if($('bpost-saturday') \|\| window.isSaturdaySelected !== undefined){
31	- if(($('bpost-saturday').checked && $$('.bpost-saturday-delivery')[0].visible())
32	\|\| (!window.isSaturdaySelected && window.isSaturdaySelected !== undefined)
33	- \|\| (currentDay != 6 && !window.bpostSettings.datepicker_choose)){
34	saturdayDelivery = 1;
35	}
36	}
37
38	- if(typeof e != 'undefined') {

39	var element = e.element();
40
41	- if(element.name != 'shipping_method') {
42	update_payments = false;
43	}
44	}
	@@ -46,14 +46,14 @@ triggerAjaxCallGetSeparateSaveMethods = function (url, update_payments){
46	var totals = get_totals_element();
47
48	var freeMethod = $('p_method_free');
49	- if(freeMethod){
50	payment.reloadcallback = true;
51	payment.countreload = 1;
52	}
53
54	totals.update('<div class="loading-ajax"> </div>');
55
56	- if(update_payments) {
57	var payment_methods = $$('div.payment-methods')[0];
58	payment_methods.update('<div class="loading-ajax"> </div>');
59	}
	@@ -62,7 +62,7 @@ triggerAjaxCallGetSeparateSaveMethods = function (url, update_payments){
62	var parameters = {
63	shipping_method: shipping_method,
64	payment_method: payment_method,
65	- disable_saturday_delivery:saturdayDelivery
66	}
67
68	/* Find payment parameters and include */
	@@ -70,38 +70,38 @@ triggerAjaxCallGetSeparateSaveMethods = function (url, update_payments){
70	var names = items.pluck('name');
71	var values = items.pluck('value');
72
73	- for(var x=0; x < names.length; x++) {
74	- if(names[x] != 'payment[method]') {
75	parameters[names[x]] = values[x];
76	}
77	}
78
79	new Ajax.Request(url, {
80	method: 'post',
81	- onSuccess: function(transport) {
82	- if(transport.status == 200) {
83	var data = transport.responseText.evalJSON();
84	var form = $('onestepcheckout-form');
85
86	totals.update(data.summary);
87
88	- if(update_payments) {
89
90	payment_methods.replace(data.payment_method);
91
92	$$('div.payment-methods input[name="payment\[method\]"]').invoke('observe', 'click', get_separate_save_methods_function(url));
93	- $$('div.payment-methods input[name="payment\[method\]"]').invoke('observe', 'click', function() {
94	- $$('div.onestepcheckout-payment-method-error').each(function(item) {
95	new Effect.Fade(item);
96	});
97	});
98
99	- if($RF($('onestepcheckout-form'), 'payment[method]') != null) {
100	- try {
101	var payment_method = $RF(form, 'payment[method]');
102	$('container_payment_method_' + payment_method).show();
103	$('payment_form_' + payment_method).show();
104	- } catch(err) {
105
106	}
107	}
	@@ -113,7 +113,7 @@ triggerAjaxCallGetSeparateSaveMethods = function (url, update_payments){
113	}
114
115	get_methods_separate = function () {
116	- if($('bpost-saturday').getStorage().get('prototype_event_registry') == undefined){
117	triggerAjaxCallGetSeparateSaveMethods(window.onestepcheckout_set_methods_separate, false);
118	}
119	}


1	+ get_separate_save_methods_function = function get_separate_save_methods_function_bpost(url, update_payments) {
2	+ if (typeof update_payments == 'undefined') {

3	var update_payments = false;
4	}
5
6	+ return function () {
7	triggerAjaxCallGetSeparateSaveMethods(url, update_payments);
8	};
9	}
10
11	+ triggerAjaxCallGetSeparateSaveMethods = function (url, update_payments) {
12	var form = $('onestepcheckout-form');
13	var shipping_method = $RF(form, 'shipping_method');
14
15	+ if (window.bpostSettings && shipping_method && shipping_method.indexOf("bpostshm_") > -1) {
16	var shippingmethodDate = window.bpostSettings.datepicker_days[shipping_method.replace('bpostshm_', '')]['date'];
17	var currentDate = new Date(shippingmethodDate);
18	var currentDay = currentDate.getDay();
19	var saturdayDelivery = 0;
20	}
21	+ else {
22	currentDay = "";
23	}
24	//if undefined, page load
25	+ if (update_payments == true && window.bpostSettings.datepicker_choose == true) {
26	window.isSaturdaySelected = false;
27	}
28
29	+ if ($('bpost-saturday') \|\| window.isSaturdaySelected !== undefined) {
30	+ if (($('bpost-saturday').checked && $$('.bpost-saturday-delivery')[0].visible())
31	\|\| (!window.isSaturdaySelected && window.isSaturdaySelected !== undefined)
32	+ \|\| (currentDay != 6 && !window.bpostSettings.datepicker_choose)) {
33	saturdayDelivery = 1;
34	}
35	}
36
37	+ if (typeof event != 'undefined') {
38	+ var e = event;
39	var element = e.element();
40
41	+ if (element.name != 'shipping_method') {
42	update_payments = false;
43	}
44	}

46	var totals = get_totals_element();
47
48	var freeMethod = $('p_method_free');
49	+ if (freeMethod) {
50	payment.reloadcallback = true;
51	payment.countreload = 1;
52	}
53
54	totals.update('<div class="loading-ajax"> </div>');
55
56	+ if (update_payments) {
57	var payment_methods = $$('div.payment-methods')[0];
58	payment_methods.update('<div class="loading-ajax"> </div>');
59	}

62	var parameters = {
63	shipping_method: shipping_method,
64	payment_method: payment_method,
65	+ disable_saturday_delivery: saturdayDelivery
66	}
67
68	/* Find payment parameters and include */

70	var names = items.pluck('name');
71	var values = items.pluck('value');
72
73	+ for (var x = 0; x < names.length; x++) {
74	+ if (names[x] != 'payment[method]') {
75	parameters[names[x]] = values[x];
76	}
77	}
78
79	new Ajax.Request(url, {
80	method: 'post',
81	+ onSuccess: function (transport) {
82	+ if (transport.status == 200) {
83	var data = transport.responseText.evalJSON();
84	var form = $('onestepcheckout-form');
85
86	totals.update(data.summary);
87
88	+ if (update_payments) {
89
90	payment_methods.replace(data.payment_method);
91
92	$$('div.payment-methods input[name="payment\[method\]"]').invoke('observe', 'click', get_separate_save_methods_function(url));
93	+ $$('div.payment-methods input[name="payment\[method\]"]').invoke('observe', 'click', function () {
94	+ $$('div.onestepcheckout-payment-method-error').each(function (item) {
95	new Effect.Fade(item);
96	});
97	});
98
99	+ if ($RF($('onestepcheckout-form'), 'payment[method]') != null) {
100	+ try {
101	var payment_method = $RF(form, 'payment[method]');
102	$('container_payment_method_' + payment_method).show();
103	$('payment_form_' + payment_method).show();
104	+ } catch (err) {
105
106	}
107	}

113	}
114
115	get_methods_separate = function () {
116	+ if ($('bpost-saturday').getStorage().get('prototype_event_registry') == undefined) {
117	triggerAjaxCallGetSeparateSaveMethods(window.onestepcheckout_set_methods_separate, false);
118	}
119	}