bpost - Version 1.0.1

Version Notes

Translations and Bugfixing

Download this release

Release Info

Developer PHPro
Extension bpost
Version 1.0.1
Comparing to
See all releases


Code changes from version 1.0.0 to 1.0.1

Files changed (23) hide show
  1. app/code/community/Bpost/ShM/.DS_Store +0 -0
  2. app/code/community/Bpost/ShM/Block/Adminhtml/Sales/AllOrders/Grid.php +1 -1
  3. app/code/community/Bpost/ShM/Block/Adminhtml/Sales/PendingOrders/Grid.php +1 -1
  4. app/code/community/Bpost/ShM/Block/Carrier/Bpost.php +1 -0
  5. app/code/community/Bpost/ShM/Controller/.DS_Store +0 -0
  6. app/code/community/Bpost/ShM/Controller/ShM/Order.php +8 -4
  7. app/code/community/Bpost/ShM/Helper/Data.php +2 -3
  8. app/code/community/Bpost/ShM/Model/.DS_Store +0 -0
  9. app/code/community/Bpost/ShM/Model/Adminhtml/Bpostgrid.php +57 -50
  10. app/code/community/Bpost/ShM/Model/Api/Domcreator.php +23 -16
  11. app/code/community/Bpost/ShM/Model/Observer.php +29 -25
  12. app/code/community/Bpost/ShM/Model/Shipping/Carrier/BpostShM.php +31 -28
  13. app/code/community/Bpost/ShM/etc/config.xml +3 -4
  14. app/code/community/Bpost/ShM/sql/.DS_Store +0 -0
  15. app/design/frontend/base/default/template/bpost/shm/append_bpost_shippingmethod.phtml +3 -2
  16. app/locale/en_US/Bpost_ShM.csv +107 -115
  17. app/locale/nl_NL/Bpost_ShM.csv +126 -130
  18. js/bpost/.DS_Store +0 -0
  19. js/bpost/shm/checkout.js +11 -6
  20. js/bpost/shm/onestepcheckout_shipping.js +61 -4
  21. package.xml +5 -5
  22. skin/frontend/base/default/css/bpost/checkout.css +39 -13
  23. skin/frontend/base/default/js/bpost/onestepcheckout.js +19 -7
app/code/community/Bpost/ShM/.DS_Store DELETED
Binary file
app/code/community/Bpost/ShM/Block/Adminhtml/Sales/AllOrders/Grid.php CHANGED
@@ -31,7 +31,7 @@ class Bpost_ShM_Block_Adminhtml_Sales_AllOrders_Grid extends Bpost_ShM_Block_Adm
31
  'bpost_status' => 'bpost_status',
32
  'state' => 'state'
33
  ));
34
- $collection->addAttributeToFilter('shipping_method', array('like' => '%bpost%'));
35
  $this->setCollection($collection);
36
 
37
  parent::_prepareCollection();
31
  'bpost_status' => 'bpost_status',
32
  'state' => 'state'
33
  ));
34
+ $collection->addAttributeToFilter('shipping_method', array('like' => '%bpostshm%'));
35
  $this->setCollection($collection);
36
 
37
  parent::_prepareCollection();
app/code/community/Bpost/ShM/Block/Adminhtml/Sales/PendingOrders/Grid.php CHANGED
@@ -31,7 +31,7 @@ class Bpost_ShM_Block_Adminhtml_Sales_PendingOrders_Grid extends Bpost_ShM_Block
31
  'bpost_status' => 'bpost_status',
32
  'state' => 'state'
33
  ));
34
- $collection->addAttributeToFilter('shipping_method', array('like' => '%bpost%'));
35
  $collection->addAttributeToFilter('main_table.status', array('nin' => array('complete', 'closed', 'canceled')));
36
 
37
  $this->setCollection($collection);
31
  'bpost_status' => 'bpost_status',
32
  'state' => 'state'
33
  ));
34
+ $collection->addAttributeToFilter('shipping_method', array('like' => '%bpostshm%'));
35
  $collection->addAttributeToFilter('main_table.status', array('nin' => array('complete', 'closed', 'canceled')));
36
 
37
  $this->setCollection($collection);
app/code/community/Bpost/ShM/Block/Carrier/Bpost.php CHANGED
@@ -31,6 +31,7 @@ class Bpost_ShM_Block_Carrier_Bpost extends Mage_Core_Block_Template
31
  "saturday" => $bpostHelper->__('Saturday'),
32
  "sunday" => $bpostHelper->__('Sunday'),
33
  "closed" => $bpostHelper->__('Closed'),
 
34
  "select_text" => $bpostHelper->__('Click here to choose a bpost pick-up point.'),
35
  "select_text_parcel_locker" => $bpostHelper->__('Click here to choose a bpost parcel locker point.'),
36
  "change_text" => $bpostHelper->__('Click here to change the bpost pick-up point.'),
31
  "saturday" => $bpostHelper->__('Saturday'),
32
  "sunday" => $bpostHelper->__('Sunday'),
33
  "closed" => $bpostHelper->__('Closed'),
34
+ "close_label" => $bpostHelper->__('Close'),
35
  "select_text" => $bpostHelper->__('Click here to choose a bpost pick-up point.'),
36
  "select_text_parcel_locker" => $bpostHelper->__('Click here to choose a bpost parcel locker point.'),
37
  "change_text" => $bpostHelper->__('Click here to change the bpost pick-up point.'),
app/code/community/Bpost/ShM/Controller/.DS_Store DELETED
Binary file
app/code/community/Bpost/ShM/Controller/ShM/Order.php CHANGED
@@ -26,10 +26,11 @@ class Bpost_ShM_Controller_ShM_Order extends Mage_Adminhtml_Controller_Action
26
 
27
  $messages = array("success" => array(), "error" => array(), "notice" => array());
28
 
29
-
30
  if (!is_array($orderIds)) {
31
  try {
32
- $gridModel->generateAndCompleteOrder($orderIds);
 
 
33
 
34
  if(!is_object(Mage::getSingleton('core/session')->getMessages()->getLastAddedMessage())){
35
  $message = Mage::helper('bpost_shm')->__("Your label has been generated and statuses have been changed.");
@@ -44,9 +45,11 @@ class Bpost_ShM_Controller_ShM_Order extends Mage_Adminhtml_Controller_Action
44
  }else {
45
 
46
  try {
47
- foreach ($orderIds as $orderId) {
 
 
48
  try {
49
- $counter += $gridModel->generateAndCompleteOrder($orderId);
50
  } catch (Exception $e) {
51
  Mage::helper('bpost_shm')->log($e->getMessage(), Zend_Log::ERR);
52
  $messages["error"][] = $e->getMessage();
@@ -108,6 +111,7 @@ class Bpost_ShM_Controller_ShM_Order extends Mage_Adminhtml_Controller_Action
108
  {
109
  $orderIds = $this->getRequest()->getParam('entity_id');
110
  try {
 
111
  $fileName = Mage::getModel('bpost_shm/adminhtml_bpostgrid')->processUndownloadedLabels($orderIds);
112
 
113
  if (!$fileName) {
26
 
27
  $messages = array("success" => array(), "error" => array(), "notice" => array());
28
 
 
29
  if (!is_array($orderIds)) {
30
  try {
31
+
32
+ $order = Mage::getModel("sales/order")->load($orderIds);
33
+ $gridModel->generateAndCompleteOrder($order);
34
 
35
  if(!is_object(Mage::getSingleton('core/session')->getMessages()->getLastAddedMessage())){
36
  $message = Mage::helper('bpost_shm')->__("Your label has been generated and statuses have been changed.");
45
  }else {
46
 
47
  try {
48
+ $orderCollection = Mage::getModel("sales/order")->getCollection()->addFieldToFilter("entity_id", array("in" => $orderIds));
49
+
50
+ foreach ($orderCollection as $order) {
51
  try {
52
+ $counter += $gridModel->generateAndCompleteOrder($order);
53
  } catch (Exception $e) {
54
  Mage::helper('bpost_shm')->log($e->getMessage(), Zend_Log::ERR);
55
  $messages["error"][] = $e->getMessage();
111
  {
112
  $orderIds = $this->getRequest()->getParam('entity_id');
113
  try {
114
+
115
  $fileName = Mage::getModel('bpost_shm/adminhtml_bpostgrid')->processUndownloadedLabels($orderIds);
116
 
117
  if (!$fileName) {
app/code/community/Bpost/ShM/Helper/Data.php CHANGED
@@ -509,7 +509,7 @@ class Bpost_ShM_Helper_Data extends Mage_Core_Helper_Abstract
509
  //quote object
510
  $quote = Mage::getSingleton('checkout/session')->getQuote();
511
  $grandTotal = $quote->getGrandTotal();
512
-
513
  //bpost helper
514
  $helper = Mage::helper('bpost_shm');
515
 
@@ -548,9 +548,8 @@ class Bpost_ShM_Helper_Data extends Mage_Core_Helper_Abstract
548
  //get saturday delivery flags
549
  $saturdayDelivery = (bool)$configHelper->getBpostCarriersConfig("saturday_delivery", $method, Mage::app()->getStore()->getId());
550
  $saturdayDeliveryFrom = $this->formatSaturdayDeliveryCost($configHelper->getBpostCarriersConfig("saturday_delivery_from", $method, Mage::app()->getStore()->getId()));
551
-
552
  //don't allow saturday delivery if saturday delivery 'yes' and 'as from' amount not exceeded
553
- if($grandTotal < $saturdayDeliveryFrom) {
554
  $saturdayDelivery = false;
555
  }
556
 
509
  //quote object
510
  $quote = Mage::getSingleton('checkout/session')->getQuote();
511
  $grandTotal = $quote->getGrandTotal();
512
+ $shippingCost = $quote->getShippingAddress()->getData('shipping_incl_tax');
513
  //bpost helper
514
  $helper = Mage::helper('bpost_shm');
515
 
548
  //get saturday delivery flags
549
  $saturdayDelivery = (bool)$configHelper->getBpostCarriersConfig("saturday_delivery", $method, Mage::app()->getStore()->getId());
550
  $saturdayDeliveryFrom = $this->formatSaturdayDeliveryCost($configHelper->getBpostCarriersConfig("saturday_delivery_from", $method, Mage::app()->getStore()->getId()));
 
551
  //don't allow saturday delivery if saturday delivery 'yes' and 'as from' amount not exceeded
552
+ if(($grandTotal - $shippingCost) < $saturdayDeliveryFrom) {
553
  $saturdayDelivery = false;
554
  }
555
 
app/code/community/Bpost/ShM/Model/.DS_Store DELETED
Binary file
app/code/community/Bpost/ShM/Model/Adminhtml/Bpostgrid.php CHANGED
@@ -1,4 +1,5 @@
1
  <?php
 
2
  /**
3
  * Created by PHPro
4
  *
@@ -6,7 +7,8 @@
6
  * @subpackage ShM
7
  * @author PHPro (info@phpro.be)
8
  */
9
- class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
 
10
 
11
  const MEDIA_LABEL_PATH = "/bpost/orderlabels/";
12
  protected $_transaction = null;
@@ -20,15 +22,14 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
20
  * @param $order
21
  * @return bool
22
  */
23
- public function generateAndCompleteOrder($orderId)
24
  {
25
- $order = Mage::getModel('sales/order')->load($orderId);
26
  $shipmentCollection = $order->getShipmentsCollection();
27
  $collectionCount = $shipmentCollection->count();
28
  $shipment = false;
29
 
30
  $retryAutomatedShipment = false;
31
- if($collectionCount == 1 && $shipmentCollection->getFirstItem()->getBpostShipmentAutomated() == 1){
32
  $retryAutomatedShipment = true;
33
  }
34
 
@@ -37,7 +38,7 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
37
 
38
  } elseif (!$order->getBpostLabelExists()) {
39
 
40
- if($retryAutomatedShipment){
41
  $shipment = $shipmentCollection->getFirstItem();
42
  }
43
  return $this->_createBpostShipment($order, $shipment);
@@ -56,7 +57,7 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
56
  protected function _processAvailableShipments(&$order)
57
  {
58
  $configHelper = Mage::helper('bpost_shm/system_config');
59
- $bpostHelper = Mage::helper('bpost_shm');
60
 
61
  $this->_addReturnLabels = (bool)$configHelper->getBpostShippingConfig("automatic_retour_labels", $order->getStoreId());
62
  $locale = strtolower($bpostHelper->getLocaleByOrder($order, true));
@@ -76,7 +77,6 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
76
  }
77
 
78
  //first we create a bpost order
79
- Mage::log("creating order");
80
  $this->_createBpostOrder($order);
81
  $counter++;
82
  }
@@ -101,7 +101,7 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
101
  }
102
 
103
  $shipment->setBpostLabelPath($pdfBaseName);
104
- $shipment->setBpostTrackingUrl('<a target="_blank" href="' . Bpost_ShM_Model_Shipping_Carrier_BpostShM::SHIPMENT_TRACK_DOMAIN."etr/light/performSearch.do?searchByItemCode=true&oss_language=" . $locale . "&itemCodes=" . $order->getIncrementId() . '">' . Mage::helper('bpost_shm')->__('Track this shipment') . '</a>');
105
  $tracker->setData("number", $barcode);
106
 
107
  //add data to transaction
@@ -119,7 +119,7 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
119
 
120
  $order->addStatusHistoryComment(Mage::helper('bpost_shm')->__('Shipped with bpost generateLabelAndComplete'), true);
121
 
122
- if($this->_addReturnLabels){
123
  $order->setBpostReturnLabelExists(true);
124
  }
125
 
@@ -142,12 +142,12 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
142
  protected function _createBpostShipment(&$order, $shipment = false)
143
  {
144
  $configHelper = Mage::helper('bpost_shm/system_config');
145
- $bpostHelper = Mage::helper('bpost_shm');
146
 
147
  $this->_addReturnLabels = (bool)$configHelper->getBpostShippingConfig("automatic_retour_labels", $order->getStoreId());
148
  $locale = strtolower($bpostHelper->getLocaleByOrder($order, true));
149
 
150
- if(!$shipment){
151
  $shipment = $order->prepareShipment();
152
  $shipment->register()->setBpostShipmentAutomated(true)->save();
153
  }
@@ -172,12 +172,13 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
172
  $shipment->setBpostReturnBarcode($label['returnBarcode']);
173
  }
174
  $shipment->setBpostLabelPath($pdfBaseName);
175
- $shipment->setBpostTrackingUrl('<a target="_blank" href="' . Bpost_ShM_Model_Shipping_Carrier_BpostShM::SHIPMENT_TRACK_DOMAIN."etr/light/performSearch.do?searchByItemCode=true&oss_language=" . $locale . "&itemCodes=" . $order->getIncrementId() . '">' . Mage::helper('bpost_shm')->__('Track this shipment') . '</a>');
 
176
  $order->setIsInProcess(true);
177
  $order->addStatusHistoryComment(Mage::helper('bpost_shm')->__('Shipped with bpost generateLabelAndComplete'), true);
178
  $order->setBpostLabelExists(true);
179
 
180
- if($this->_addReturnLabels){
181
  $order->setBpostReturnLabelExists(true);
182
  }
183
 
@@ -189,12 +190,12 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
189
  ->setData('order_id', $shipment->getData('order_id'));
190
 
191
  try {
192
- //save all objects in 1 transaction
193
- //add data to the current transaction
194
- $this->_getTransaction()
195
- ->addObject($shipment)
196
- ->addObject($order)
197
- ->addObject($tracker);
198
  } catch (Exception $e) {
199
  Mage::helper('bpost_shm')->log($e->getMessage(), Zend_Log::ERR);
200
  }
@@ -208,7 +209,8 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
208
  * @param $labelData
209
  * function parses label data and returns it
210
  */
211
- protected function _parseLabelData($order, $barcodeIndex = 0){
 
212
  $bpostHelper = Mage::helper('bpost_shm');
213
 
214
  $returnData = array();
@@ -216,15 +218,15 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
216
 
217
  $returnData["locale"] = $locale;
218
 
219
- if(!isset($this->_barcodeArray[$barcodeIndex])){
220
  $returnData["barcode"] = "no-barcode";
221
- }else{
222
  $returnData["barcode"] = $this->_barcodeArray[$barcodeIndex];
223
  }
224
 
225
  //check if the barcode index isset
226
  //if so, a return barcode is available
227
- if(isset($this->_returnBarcodeArray[$barcodeIndex])){
228
  $returnData["returnBarcode"] = $this->_returnBarcodeArray[$barcodeIndex];
229
  }
230
 
@@ -237,23 +239,23 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
237
  * @param $order
238
  * @throws Mage_Core_Exception
239
  */
240
- protected function _createBpostOrder(&$order){
 
241
  $bpostHelper = Mage::helper("bpost_shm");
242
 
243
  $webserviceModel = Mage::getModel("bpost_shm/api", true);
244
  $response = $webserviceModel->createOrder($order);
245
 
246
- if(!$response){
247
  Mage::throwException($bpostHelper->__("Error while creating a bpost order for Magento order #%s. Please check your API log.", $order->getIncrementId()));
248
  }
249
 
250
- if(!$order->getBpostReference()){
251
  $order->setBpostReference($order->getIncrementId());
252
  }
253
  }
254
 
255
 
256
-
257
  /**
258
  * Generates a shipment label and saves it on the harddisk.
259
  *
@@ -261,7 +263,8 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
261
  * @param $shipment
262
  * @return mixed
263
  */
264
- protected function _generateLabelAndReturnLabelIfEnabled(&$order){
 
265
  $bpostHelper = Mage::helper("bpost_shm");
266
  $pdfName = null;
267
 
@@ -271,7 +274,7 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
271
  if ($responseLabelWebserviceCallback) {
272
  $parsedResponse = $bpostHelper->parseLabelApiResponse($responseLabelWebserviceCallback, $order);
273
 
274
- if(empty($parsedResponse) || !isset($parsedResponse["pdfString"])){
275
  $message = $bpostHelper->__("No label response received for Magento order #%s.", $order->getIncrementId());
276
  $bpostHelper->log($message, Zend_Log::ERR);
277
  return false;
@@ -279,22 +282,22 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
279
 
280
  $this->_barcodeArray = $parsedResponse["barcodeString"];
281
 
282
- if(array_key_exists("returnBarcodeString", $parsedResponse)) {
283
  $this->_returnBarcodeArray = $parsedResponse["returnBarcodeString"];
284
  }
285
 
286
  //loop array and save pdf files
287
  $loopNr = 0;
288
  $pdfName = "";
289
- foreach($parsedResponse["pdfString"] as $pdfString){
290
- if($loopNr){
291
  $pdfName .= ":";
292
  }
293
 
294
  $pdfName .= $bpostHelper->generatePdfAndSave($pdfString, "orderlabels", $order->getIncrementId());
295
  $pdfName .= ".pdf";
296
 
297
- if($this->_addReturnLabels){
298
  $order->setBpostReturnLabelExists(true);
299
  }
300
 
@@ -311,8 +314,9 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
311
  /**
312
  * function returns the current transaction
313
  */
314
- protected function _getTransaction(){
315
- if(is_null($this->_transaction)){
 
316
  $this->_transaction = Mage::getModel('core/resource_transaction');
317
  }
318
 
@@ -323,9 +327,10 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
323
  /**
324
  * function will save the current transaction
325
  */
326
- public function saveTransaction(){
 
327
  //make sure we have an object first before saving it
328
- if(is_object($this->_transaction)){
329
  $this->_transaction->save();
330
  }
331
  }
@@ -342,22 +347,24 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
342
  $file = new Varien_Io_File();
343
  $labelPdfArray = array();
344
  $i = 0;
345
- foreach ($orderIds as $orderId) {
346
- $order = Mage::getModel('sales/order')->load($orderId);
 
 
347
  $exported = false;
348
 
349
  if (!$order->getBpostLabelExported()) {
350
  $shippingCollection = Mage::getResourceModel('sales/order_shipment_collection')
351
- ->setOrderFilter($order)
352
- ->load();
353
 
354
  if (count($shippingCollection)) {
355
  foreach ($shippingCollection as $shipment) {
356
- if($shipment->getBpostLabelPath() != "" && !$exported){
357
  $labelPaths = explode(":", $shipment->getBpostLabelPath());
358
- foreach($labelPaths as $labelPath){
359
  $filePath = Mage::getBaseDir('media') . self::MEDIA_LABEL_PATH . $labelPath;
360
- if($file->fileExists($filePath)){
361
  $labelPdfArray[] = $filePath;
362
  $exported = true;
363
  }
@@ -389,7 +396,7 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
389
  $generated_name = date("Y_m_d_H_i_s") . "_undownloaded.zip";
390
 
391
  $file = new Varien_Io_File();
392
- $file->checkAndCreateFolder(Mage::getBaseDir('media') . self::MEDIA_LABEL_PATH."zips/");
393
 
394
  return $this->_zipLabelPdfArray($labelPdfArray, $generated_name, true, true);
395
  }
@@ -405,7 +412,7 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
405
  */
406
  protected function _zipLabelPdfArray($files = array(), $generated_name = '', $overwrite = false, $mergePdfFiles = false)
407
  {
408
- $destination = Mage::getBaseDir('media') . self::MEDIA_LABEL_PATH."zips/" . $generated_name;
409
  $varienFile = new Varien_Io_File();
410
  $bpostHelper = Mage::helper("bpost_shm");
411
 
@@ -433,11 +440,11 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
433
  }
434
 
435
  //save new pdf file is necessary
436
- if($mergePdfFiles){
437
  $mergedPdfName = $bpostHelper->generatePdfAndSave($pdfMerged->render(), "orderlabels", "merged");
438
- $mergedPdfName = $mergedPdfName.".pdf";
439
 
440
- if($mergedPdfName){
441
  $valid_files = array($mergedPdfName);
442
  }
443
  }
@@ -457,7 +464,7 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer{
457
 
458
  $zip->close();
459
  return $generated_name;
460
- } elseif($validFilesCount) {
461
  //we return the pdf path instead of creating a zip file
462
  $pdfName = $valid_files[0];
463
  return $pdfName;
1
  <?php
2
+
3
  /**
4
  * Created by PHPro
5
  *
7
  * @subpackage ShM
8
  * @author PHPro (info@phpro.be)
9
  */
10
+ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer
11
+ {
12
 
13
  const MEDIA_LABEL_PATH = "/bpost/orderlabels/";
14
  protected $_transaction = null;
22
  * @param $order
23
  * @return bool
24
  */
25
+ public function generateAndCompleteOrder($order)
26
  {
 
27
  $shipmentCollection = $order->getShipmentsCollection();
28
  $collectionCount = $shipmentCollection->count();
29
  $shipment = false;
30
 
31
  $retryAutomatedShipment = false;
32
+ if ($collectionCount == 1 && $shipmentCollection->getFirstItem()->getBpostShipmentAutomated() == 1) {
33
  $retryAutomatedShipment = true;
34
  }
35
 
38
 
39
  } elseif (!$order->getBpostLabelExists()) {
40
 
41
+ if ($retryAutomatedShipment) {
42
  $shipment = $shipmentCollection->getFirstItem();
43
  }
44
  return $this->_createBpostShipment($order, $shipment);
57
  protected function _processAvailableShipments(&$order)
58
  {
59
  $configHelper = Mage::helper('bpost_shm/system_config');
60
+ $bpostHelper = Mage::helper('bpost_shm');
61
 
62
  $this->_addReturnLabels = (bool)$configHelper->getBpostShippingConfig("automatic_retour_labels", $order->getStoreId());
63
  $locale = strtolower($bpostHelper->getLocaleByOrder($order, true));
77
  }
78
 
79
  //first we create a bpost order
 
80
  $this->_createBpostOrder($order);
81
  $counter++;
82
  }
101
  }
102
 
103
  $shipment->setBpostLabelPath($pdfBaseName);
104
+ $shipment->setBpostTrackingUrl('<a target="_blank" href="' . Bpost_ShM_Model_Shipping_Carrier_BpostShM::SHIPMENT_TRACK_DOMAIN . "etr/light/performSearch.do?searchByItemCode=true&oss_language='" . $locale . "&itemCodes=" . $barcode . '">' . Mage::helper('bpost_shm')->__('Track this shipment') . '</a>');
105
  $tracker->setData("number", $barcode);
106
 
107
  //add data to transaction
119
 
120
  $order->addStatusHistoryComment(Mage::helper('bpost_shm')->__('Shipped with bpost generateLabelAndComplete'), true);
121
 
122
+ if ($this->_addReturnLabels) {
123
  $order->setBpostReturnLabelExists(true);
124
  }
125
 
142
  protected function _createBpostShipment(&$order, $shipment = false)
143
  {
144
  $configHelper = Mage::helper('bpost_shm/system_config');
145
+ $bpostHelper = Mage::helper('bpost_shm');
146
 
147
  $this->_addReturnLabels = (bool)$configHelper->getBpostShippingConfig("automatic_retour_labels", $order->getStoreId());
148
  $locale = strtolower($bpostHelper->getLocaleByOrder($order, true));
149
 
150
+ if (!$shipment) {
151
  $shipment = $order->prepareShipment();
152
  $shipment->register()->setBpostShipmentAutomated(true)->save();
153
  }
172
  $shipment->setBpostReturnBarcode($label['returnBarcode']);
173
  }
174
  $shipment->setBpostLabelPath($pdfBaseName);
175
+ $shipment->setBpostTrackingUrl('<a target="_blank" href="' . Bpost_ShM_Model_Shipping_Carrier_BpostShM::SHIPMENT_TRACK_DOMAIN . "etr/light/performSearch.do?searchByItemCode=true&oss_language='" . $locale . "&itemCodes=" . $barcode . '">' . Mage::helper('bpost_shm')->__('Track this shipment') . '</a>');
176
+
177
  $order->setIsInProcess(true);
178
  $order->addStatusHistoryComment(Mage::helper('bpost_shm')->__('Shipped with bpost generateLabelAndComplete'), true);
179
  $order->setBpostLabelExists(true);
180
 
181
+ if ($this->_addReturnLabels) {
182
  $order->setBpostReturnLabelExists(true);
183
  }
184
 
190
  ->setData('order_id', $shipment->getData('order_id'));
191
 
192
  try {
193
+ $shipment->save();
194
+ $order->save();
195
+ $tracker->save();
196
+ if (Mage::getStoreConfig(Mage_Sales_Model_Order_Shipment::XML_PATH_EMAIL_ENABLED, $order->getStoreId())) {
197
+ $shipment->sendEmail(true, '');
198
+ }
199
  } catch (Exception $e) {
200
  Mage::helper('bpost_shm')->log($e->getMessage(), Zend_Log::ERR);
201
  }
209
  * @param $labelData
210
  * function parses label data and returns it
211
  */
212
+ protected function _parseLabelData($order, $barcodeIndex = 0)
213
+ {
214
  $bpostHelper = Mage::helper('bpost_shm');
215
 
216
  $returnData = array();
218
 
219
  $returnData["locale"] = $locale;
220
 
221
+ if (!isset($this->_barcodeArray[$barcodeIndex])) {
222
  $returnData["barcode"] = "no-barcode";
223
+ } else {
224
  $returnData["barcode"] = $this->_barcodeArray[$barcodeIndex];
225
  }
226
 
227
  //check if the barcode index isset
228
  //if so, a return barcode is available
229
+ if (isset($this->_returnBarcodeArray[$barcodeIndex])) {
230
  $returnData["returnBarcode"] = $this->_returnBarcodeArray[$barcodeIndex];
231
  }
232
 
239
  * @param $order
240
  * @throws Mage_Core_Exception
241
  */
242
+ protected function _createBpostOrder(&$order)
243
+ {
244
  $bpostHelper = Mage::helper("bpost_shm");
245
 
246
  $webserviceModel = Mage::getModel("bpost_shm/api", true);
247
  $response = $webserviceModel->createOrder($order);
248
 
249
+ if (!$response) {
250
  Mage::throwException($bpostHelper->__("Error while creating a bpost order for Magento order #%s. Please check your API log.", $order->getIncrementId()));
251
  }
252
 
253
+ if (!$order->getBpostReference()) {
254
  $order->setBpostReference($order->getIncrementId());
255
  }
256
  }
257
 
258
 
 
259
  /**
260
  * Generates a shipment label and saves it on the harddisk.
261
  *
263
  * @param $shipment
264
  * @return mixed
265
  */
266
+ protected function _generateLabelAndReturnLabelIfEnabled(&$order)
267
+ {
268
  $bpostHelper = Mage::helper("bpost_shm");
269
  $pdfName = null;
270
 
274
  if ($responseLabelWebserviceCallback) {
275
  $parsedResponse = $bpostHelper->parseLabelApiResponse($responseLabelWebserviceCallback, $order);
276
 
277
+ if (empty($parsedResponse) || !isset($parsedResponse["pdfString"])) {
278
  $message = $bpostHelper->__("No label response received for Magento order #%s.", $order->getIncrementId());
279
  $bpostHelper->log($message, Zend_Log::ERR);
280
  return false;
282
 
283
  $this->_barcodeArray = $parsedResponse["barcodeString"];
284
 
285
+ if (array_key_exists("returnBarcodeString", $parsedResponse)) {
286
  $this->_returnBarcodeArray = $parsedResponse["returnBarcodeString"];
287
  }
288
 
289
  //loop array and save pdf files
290
  $loopNr = 0;
291
  $pdfName = "";
292
+ foreach ($parsedResponse["pdfString"] as $pdfString) {
293
+ if ($loopNr) {
294
  $pdfName .= ":";
295
  }
296
 
297
  $pdfName .= $bpostHelper->generatePdfAndSave($pdfString, "orderlabels", $order->getIncrementId());
298
  $pdfName .= ".pdf";
299
 
300
+ if ($this->_addReturnLabels) {
301
  $order->setBpostReturnLabelExists(true);
302
  }
303
 
314
  /**
315
  * function returns the current transaction
316
  */
317
+ protected function _getTransaction()
318
+ {
319
+ if (is_null($this->_transaction)) {
320
  $this->_transaction = Mage::getModel('core/resource_transaction');
321
  }
322
 
327
  /**
328
  * function will save the current transaction
329
  */
330
+ public function saveTransaction()
331
+ {
332
  //make sure we have an object first before saving it
333
+ if (is_object($this->_transaction)) {
334
  $this->_transaction->save();
335
  }
336
  }
347
  $file = new Varien_Io_File();
348
  $labelPdfArray = array();
349
  $i = 0;
350
+
351
+ $orderCollection = Mage::getModel("sales/order")->getCollection()->addFieldToFilter("entity_id", array("in" => $orderIds));
352
+
353
+ foreach ($orderCollection as $order) {
354
  $exported = false;
355
 
356
  if (!$order->getBpostLabelExported()) {
357
  $shippingCollection = Mage::getResourceModel('sales/order_shipment_collection')
358
+ ->setOrderFilter($order)
359
+ ->load();
360
 
361
  if (count($shippingCollection)) {
362
  foreach ($shippingCollection as $shipment) {
363
+ if ($shipment->getBpostLabelPath() != "" && !$exported) {
364
  $labelPaths = explode(":", $shipment->getBpostLabelPath());
365
+ foreach ($labelPaths as $labelPath) {
366
  $filePath = Mage::getBaseDir('media') . self::MEDIA_LABEL_PATH . $labelPath;
367
+ if ($file->fileExists($filePath)) {
368
  $labelPdfArray[] = $filePath;
369
  $exported = true;
370
  }
396
  $generated_name = date("Y_m_d_H_i_s") . "_undownloaded.zip";
397
 
398
  $file = new Varien_Io_File();
399
+ $file->checkAndCreateFolder(Mage::getBaseDir('media') . self::MEDIA_LABEL_PATH . "zips/");
400
 
401
  return $this->_zipLabelPdfArray($labelPdfArray, $generated_name, true, true);
402
  }
412
  */
413
  protected function _zipLabelPdfArray($files = array(), $generated_name = '', $overwrite = false, $mergePdfFiles = false)
414
  {
415
+ $destination = Mage::getBaseDir('media') . self::MEDIA_LABEL_PATH . "zips/" . $generated_name;
416
  $varienFile = new Varien_Io_File();
417
  $bpostHelper = Mage::helper("bpost_shm");
418
 
440
  }
441
 
442
  //save new pdf file is necessary
443
+ if ($mergePdfFiles) {
444
  $mergedPdfName = $bpostHelper->generatePdfAndSave($pdfMerged->render(), "orderlabels", "merged");
445
+ $mergedPdfName = $mergedPdfName . ".pdf";
446
 
447
+ if ($mergedPdfName) {
448
  $valid_files = array($mergedPdfName);
449
  }
450
  }
464
 
465
  $zip->close();
466
  return $generated_name;
467
+ } elseif ($validFilesCount) {
468
  //we return the pdf path instead of creating a zip file
469
  $pdfName = $valid_files[0];
470
  return $pdfName;
app/code/community/Bpost/ShM/Model/Api/Domcreator.php CHANGED
@@ -34,7 +34,7 @@ class Bpost_ShM_Model_Api_Domcreator extends Bpost_ShM_Model_Api_Abstract
34
  $senderData->setCity($configHelper->getBpostShippingConfig("sender_city"));
35
  $senderData->setCountryId($configHelper->getBpostShippingConfig("sender_country"));
36
  $senderData->setEmail($configHelper->getBpostShippingConfig("sender_email"));
37
- $senderData->setTelephone($configHelper->getBpostShippingConfig("sender_phonenumber"));
38
 
39
  //get receiver
40
  $this->_shippingAddress = $order->getShippingAddress();
@@ -46,7 +46,10 @@ class Bpost_ShM_Model_Api_Domcreator extends Bpost_ShM_Model_Api_Abstract
46
  $tmpShippingAddress = $this->_shippingAddress;
47
  $this->_shippingAddress = $senderData;
48
  $senderData = $tmpShippingAddress;
49
- $senderData->setBpostName($this->_billingAddress->getFirstname()." ".$this->_billingAddress->getLastname());
 
 
 
50
 
51
  if($shippingMethod != "bpostshm_bpost_international"){
52
  //we force shipping to 'bpostshm_bpost_homedelivery' method because we are creating a return order
@@ -178,7 +181,7 @@ class Bpost_ShM_Model_Api_Domcreator extends Bpost_ShM_Model_Api_Abstract
178
  $senderEmail->appendChild($document->createTextNode($senderData->getEmail()));
179
 
180
  $senderPhoneNumber = $document->createElement('common:phoneNumber');
181
- $senderPhoneNumber->appendChild($document->createTextNode($senderData->getTelephone()));
182
 
183
  //add all sender info to the sender element
184
  $sender = $document->createElement('tns:sender');
@@ -223,12 +226,11 @@ class Bpost_ShM_Model_Api_Domcreator extends Bpost_ShM_Model_Api_Abstract
223
  $manageLabelsWithMagento = $configHelper->getBpostShippingConfig("manage_labels_with_magento");
224
 
225
  $requestedDeliveryDate = false;
226
- $dropDate = new DateTime($order->getBpostDropDate());
227
  $currentDate = new DateTime();
228
-
229
  if($dropDate && $dropDate > $currentDate) {
230
  $requestedDeliveryDate = $document->createElement('requestedDeliveryDate');
231
- $requestedDeliveryDate->appendChild($document->createTextNode($order->getBpostDropDate()));
232
  }
233
 
234
  //add product
@@ -283,7 +285,7 @@ class Bpost_ShM_Model_Api_Domcreator extends Bpost_ShM_Model_Api_Abstract
283
  $receiverEmailAddress->appendChild($document->createTextNode($this->_shippingAddress->getEmail()));
284
 
285
  $receiverPhoneNumber = $document->createElement('common:phoneNumber');
286
- $receiverPhoneNumber->appendChild($document->createTextNode($this->_shippingAddress->getTelephone()));
287
 
288
  //we add the receiver address data
289
  $streetName->appendChild($document->createTextNode($this->_shippingAddress->getBpostStreet()));
@@ -405,11 +407,8 @@ class Bpost_ShM_Model_Api_Domcreator extends Bpost_ShM_Model_Api_Abstract
405
 
406
  case "bpostshm_bpost_parcellocker":
407
 
408
- if(!$order->getBpostPickuplocationId()){
409
- //only throw error in backend
410
- if($manageLabelsWithMagento){
411
  Mage::throwException("No parcel locker data found.");
412
- }
413
  }
414
 
415
  $product->appendChild($document->createTextNode("bpack 24h Pro"));
@@ -461,7 +460,7 @@ class Bpost_ShM_Model_Api_Domcreator extends Bpost_ShM_Model_Api_Abstract
461
 
462
  if($order->getBpostNotificationSms()){
463
  $mobilePhone = $document->createElement('mobilePhone');
464
- $mobilePhone->appendChild($document->createTextNode($this->_shippingAddress->getTelephone()));
465
  $unregistered->appendChild($mobilePhone);
466
  }
467
 
@@ -479,6 +478,7 @@ class Bpost_ShM_Model_Api_Domcreator extends Bpost_ShM_Model_Api_Abstract
479
  $at247->appendChild($options);
480
  }
481
 
 
482
  $at247->appendChild($weight);
483
  $at247->appendChild($parcelsDepotId);
484
  $at247->appendChild($parcelsDepotName);
@@ -489,10 +489,13 @@ class Bpost_ShM_Model_Api_Domcreator extends Bpost_ShM_Model_Api_Abstract
489
  $at247->appendChild($receiverName);
490
  $at247->appendChild($receiverCompany);
491
 
 
 
 
 
492
  $nationalBox->appendChild($at247);
493
  break;
494
  }
495
-
496
  return $nationalBox;
497
  }
498
 
@@ -537,7 +540,7 @@ class Bpost_ShM_Model_Api_Domcreator extends Bpost_ShM_Model_Api_Abstract
537
  $receiverEmailAddress->appendChild($document->createTextNode($this->_shippingAddress->getEmail()));
538
 
539
  $receiverPhoneNumber = $document->createElement('common:phoneNumber');
540
- $receiverPhoneNumber->appendChild($document->createTextNode($this->_shippingAddress->getTelephone()));
541
 
542
  //add address info
543
  $streetName = $document->createElement('common:streetName');
@@ -633,8 +636,12 @@ class Bpost_ShM_Model_Api_Domcreator extends Bpost_ShM_Model_Api_Abstract
633
  $helper = Mage::helper("bpost_shm/system_config");
634
  $storeId = $order->getStoreId();
635
  $option = $helper->getBpostCarriersConfig($configName, $carrier, $storeId);
 
 
636
 
637
- if($bpostValue == "saturdayDelivery" && $order->getBpostDisableSaturdayDelivery()){
 
 
638
  return $options;
639
  }
640
 
@@ -687,7 +694,7 @@ class Bpost_ShM_Model_Api_Domcreator extends Bpost_ShM_Model_Api_Abstract
687
  $childElement->appendChild($document->createTextNode($shippingAddress->getEmail()));
688
  }else{
689
  $childElement = $document->createElement("common:mobilePhone");
690
- $childElement->appendChild($document->createTextNode($shippingAddress->getTelephone()));
691
  }
692
 
693
  $notificationElement->appendChild($childElement);
34
  $senderData->setCity($configHelper->getBpostShippingConfig("sender_city"));
35
  $senderData->setCountryId($configHelper->getBpostShippingConfig("sender_country"));
36
  $senderData->setEmail($configHelper->getBpostShippingConfig("sender_email"));
37
+ $senderData->setTelephone(preg_replace('/[^0-9]/s', '',$configHelper->getBpostShippingConfig("sender_phonenumber")));
38
 
39
  //get receiver
40
  $this->_shippingAddress = $order->getShippingAddress();
46
  $tmpShippingAddress = $this->_shippingAddress;
47
  $this->_shippingAddress = $senderData;
48
  $senderData = $tmpShippingAddress;
49
+
50
+ if($shippingMethod != "bpostshm_bpost_international" && $shippingMethod != "bpostshm_bpost_homedelivery"){
51
+ $senderData->setBpostName($this->_billingAddress->getFirstname()." ".$this->_billingAddress->getLastname());
52
+ }
53
 
54
  if($shippingMethod != "bpostshm_bpost_international"){
55
  //we force shipping to 'bpostshm_bpost_homedelivery' method because we are creating a return order
181
  $senderEmail->appendChild($document->createTextNode($senderData->getEmail()));
182
 
183
  $senderPhoneNumber = $document->createElement('common:phoneNumber');
184
+ $senderPhoneNumber->appendChild($document->createTextNode(preg_replace('/[^0-9]/s', '',$senderData->getTelephone())));
185
 
186
  //add all sender info to the sender element
187
  $sender = $document->createElement('tns:sender');
226
  $manageLabelsWithMagento = $configHelper->getBpostShippingConfig("manage_labels_with_magento");
227
 
228
  $requestedDeliveryDate = false;
229
+ $dropDate = new DateTime($order->getBpostDeliveryDate());
230
  $currentDate = new DateTime();
 
231
  if($dropDate && $dropDate > $currentDate) {
232
  $requestedDeliveryDate = $document->createElement('requestedDeliveryDate');
233
+ $requestedDeliveryDate->appendChild($document->createTextNode($order->getBpostDeliveryDate()));
234
  }
235
 
236
  //add product
285
  $receiverEmailAddress->appendChild($document->createTextNode($this->_shippingAddress->getEmail()));
286
 
287
  $receiverPhoneNumber = $document->createElement('common:phoneNumber');
288
+ $receiverPhoneNumber->appendChild($document->createTextNode(preg_replace('/[^0-9]/s', '',$this->_shippingAddress->getTelephone())));
289
 
290
  //we add the receiver address data
291
  $streetName->appendChild($document->createTextNode($this->_shippingAddress->getBpostStreet()));
407
 
408
  case "bpostshm_bpost_parcellocker":
409
 
410
+ if(!$order->getBpostPickuplocationId() && $manageLabelsWithMagento){
 
 
411
  Mage::throwException("No parcel locker data found.");
 
412
  }
413
 
414
  $product->appendChild($document->createTextNode("bpack 24h Pro"));
460
 
461
  if($order->getBpostNotificationSms()){
462
  $mobilePhone = $document->createElement('mobilePhone');
463
+ $mobilePhone->appendChild($document->createTextNode(preg_replace('/[^0-9]/s', '',$this->_shippingAddress->getTelephone())));
464
  $unregistered->appendChild($mobilePhone);
465
  }
466
 
478
  $at247->appendChild($options);
479
  }
480
 
481
+
482
  $at247->appendChild($weight);
483
  $at247->appendChild($parcelsDepotId);
484
  $at247->appendChild($parcelsDepotName);
489
  $at247->appendChild($receiverName);
490
  $at247->appendChild($receiverCompany);
491
 
492
+ if($requestedDeliveryDate) {
493
+ $at247->appendChild($requestedDeliveryDate);
494
+ }
495
+
496
  $nationalBox->appendChild($at247);
497
  break;
498
  }
 
499
  return $nationalBox;
500
  }
501
 
540
  $receiverEmailAddress->appendChild($document->createTextNode($this->_shippingAddress->getEmail()));
541
 
542
  $receiverPhoneNumber = $document->createElement('common:phoneNumber');
543
+ $receiverPhoneNumber->appendChild($document->createTextNode(preg_replace('/[^0-9]/s', '',$this->_shippingAddress->getTelephone())));
544
 
545
  //add address info
546
  $streetName = $document->createElement('common:streetName');
636
  $helper = Mage::helper("bpost_shm/system_config");
637
  $storeId = $order->getStoreId();
638
  $option = $helper->getBpostCarriersConfig($configName, $carrier, $storeId);
639
+ $deliveryDate = $order->getBpostDeliveryDate();
640
+ $dateModel = Mage::getSingleton('core/date');
641
 
642
+ if($dateModel->date('N', strtotime($deliveryDate)) != 6 &&
643
+ $bpostValue == "saturdayDelivery" &&
644
+ Mage::helper("bpost_shm/system_config")->getBpostShippingConfig("display_delivery_date",$storeId)){
645
  return $options;
646
  }
647
 
694
  $childElement->appendChild($document->createTextNode($shippingAddress->getEmail()));
695
  }else{
696
  $childElement = $document->createElement("common:mobilePhone");
697
+ $childElement->appendChild($document->createTextNode(preg_replace('/[^0-9]/s', '',$shippingAddress->getTelephone())));
698
  }
699
 
700
  $notificationElement->appendChild($childElement);
app/code/community/Bpost/ShM/Model/Observer.php CHANGED
@@ -106,7 +106,6 @@ class Bpost_ShM_Model_Observer extends Varien_Event_Observer
106
  public function controller_action_predispatch_checkout_onepage_saveAddress($observer)
107
  {
108
  $checkoutSession = Mage::getSingleton('checkout/session');
109
-
110
  //always reset the saturday delivery option so we don't see multiplied rates
111
  $checkoutSession->getQuote()->setBpostDisableSaturdayDelivery(true);
112
 
@@ -209,11 +208,18 @@ class Bpost_ShM_Model_Observer extends Varien_Event_Observer
209
  }
210
  }
211
 
 
212
  //set saturday delivery option flag so shipping prices incl. saturday delivery are calculated
213
- if(isset($params['bpost_saturday_delivery']) && !$params['bpost_saturday_delivery']) {
214
- $quote->setBpostDisableSaturdayDelivery(false);
 
 
 
 
 
 
215
  } elseif(isset($params['bpost_saturday_delivery']) && $params['bpost_saturday_delivery']) {
216
- $quote->setBpostDisableSaturdayDelivery(true);
217
  }
218
 
219
  //re-collect our rates
@@ -263,6 +269,7 @@ class Bpost_ShM_Model_Observer extends Varien_Event_Observer
263
  return $this;
264
  }
265
 
 
266
  /**
267
  * function sets default data on our quote
268
  * we need to do this for the onestepcheckout
@@ -270,14 +277,13 @@ class Bpost_ShM_Model_Observer extends Varien_Event_Observer
270
  public function sales_quote_collect_totals_before($observer){
271
  $checkoutSession = Mage::getSingleton('checkout/session');
272
  $quote = $checkoutSession->getQuote();
273
-
274
  $params = Mage::app()->getRequest()->getParams();
275
  $originalRatePrices = $checkoutSession->getOriginalRatePrices();
276
 
277
  if(isset($params["shipping_method"]) && $originalRatePrices){
278
  $bpostConfigHelper = Mage::helper("bpost_shm/system_config");
279
  $bpostHelper = Mage::helper("bpost_shm");
280
-
281
  $groups = $quote->getShippingAddress()->getGroupedAllShippingRates();
282
  foreach ($groups as $code => $_rates){
283
  foreach ($_rates as $_rate){
@@ -285,9 +291,9 @@ class Bpost_ShM_Model_Observer extends Varien_Event_Observer
285
  if($_rate->getCode() == $params["shipping_method"] && isset($originalRatePrices[$params["shipping_method"]])){
286
  $saturdayDeliveryCost = $bpostHelper->formatSaturdayDeliveryCost($bpostConfigHelper->getBpostShippingConfig("saturday_delivery_cost", Mage::app()->getStore()->getId()));
287
 
288
- if(isset($params["disable_saturday_delivery"]) && $params["disable_saturday_delivery"] == 1){
289
  //check if the option saturday delivery is active for the current shipping method
290
- if($quote->getBpostSaturdayCostApplied()){
291
  //remove extra cost
292
  $_rate->setPrice($originalRatePrices[$params["shipping_method"]]);
293
  $_rate->setSaturdayDelivery(0);
@@ -295,9 +301,9 @@ class Bpost_ShM_Model_Observer extends Varien_Event_Observer
295
  $quote->setBpostSaturdayCostApplied(false);
296
  }
297
 
298
- }elseif(isset($params["disable_saturday_delivery"]) && $params["disable_saturday_delivery"] == 0){
299
- if(!$quote->getBpostSaturdayCostApplied()){
300
  //add extra cost
 
301
  $_rate->setPrice($originalRatePrices[$params["shipping_method"]]+$saturdayDeliveryCost);
302
  $_rate->setSaturdayDelivery(1);
303
  //make sure the original prices are applied
@@ -337,24 +343,22 @@ class Bpost_ShM_Model_Observer extends Varien_Event_Observer
337
  return $this;
338
  }
339
 
 
 
 
340
  public function controller_action_predispatch_onestepcheckout_index_index($observer){
341
  $checkoutSession = Mage::getSingleton('checkout/session');
342
  $quote = $checkoutSession->getQuote();
343
- $shippingMethod = $quote->getShippingAddress()->getShippingMethod();
344
- $shippingMethod = str_replace('bpostshm_', '', $shippingMethod);
345
-
346
- $bpostConfigHelper = Mage::helper("bpost_shm/system_config");
347
- $saturdayDeliveryActive = $bpostConfigHelper->getBpostCarriersConfig("saturday_delivery", $shippingMethod, Mage::app()->getStore()->getId());
348
-
349
- if($saturdayDeliveryActive !== 0){
350
- //always reset the saturday delivery option so we don't see multiplied rates
351
- $quote->setBpostDisableSaturdayDelivery(false);
352
- $quote->setBpostSaturdayCostApplied(true);
353
- }else{
354
- $quote->setBpostDisableSaturdayDelivery(true);
355
- $quote->setBpostSaturdayCostApplied(false);
356
  }
357
-
358
- return $this;
359
  }
360
  }
106
  public function controller_action_predispatch_checkout_onepage_saveAddress($observer)
107
  {
108
  $checkoutSession = Mage::getSingleton('checkout/session');
 
109
  //always reset the saturday delivery option so we don't see multiplied rates
110
  $checkoutSession->getQuote()->setBpostDisableSaturdayDelivery(true);
111
 
208
  }
209
  }
210
 
211
+
212
  //set saturday delivery option flag so shipping prices incl. saturday delivery are calculated
213
+ $dateModel = Mage::getSingleton('core/date');
214
+ if(isset($params['bpost']['deliverydate']) && ($dateModel->date('N', strtotime($params['bpost']['deliverydate'])) == 6)){
215
+ $quote->setData("bpost_disable_saturday_delivery", false);
216
+ }elseif(isset($params['bpost']['deliverydate']) && !($dateModel->date('N', strtotime($params['bpost']['deliverydate'])) == 6)){
217
+ $quote->setData("bpost_disable_saturday_delivery", true);
218
+ }
219
+ elseif(isset($params['bpost_saturday_delivery']) && !$params['bpost_saturday_delivery']) {
220
+ $quote->setData("bpost_disable_saturday_delivery", false);
221
  } elseif(isset($params['bpost_saturday_delivery']) && $params['bpost_saturday_delivery']) {
222
+ $quote->setData("bpost_disable_saturday_delivery", true);
223
  }
224
 
225
  //re-collect our rates
269
  return $this;
270
  }
271
 
272
+
273
  /**
274
  * function sets default data on our quote
275
  * we need to do this for the onestepcheckout
277
  public function sales_quote_collect_totals_before($observer){
278
  $checkoutSession = Mage::getSingleton('checkout/session');
279
  $quote = $checkoutSession->getQuote();
 
280
  $params = Mage::app()->getRequest()->getParams();
281
  $originalRatePrices = $checkoutSession->getOriginalRatePrices();
282
 
283
  if(isset($params["shipping_method"]) && $originalRatePrices){
284
  $bpostConfigHelper = Mage::helper("bpost_shm/system_config");
285
  $bpostHelper = Mage::helper("bpost_shm");
286
+ $shippingMethodForConfig = str_replace('bpostshm_', '', $params["shipping_method"]);
287
  $groups = $quote->getShippingAddress()->getGroupedAllShippingRates();
288
  foreach ($groups as $code => $_rates){
289
  foreach ($_rates as $_rate){
291
  if($_rate->getCode() == $params["shipping_method"] && isset($originalRatePrices[$params["shipping_method"]])){
292
  $saturdayDeliveryCost = $bpostHelper->formatSaturdayDeliveryCost($bpostConfigHelper->getBpostShippingConfig("saturday_delivery_cost", Mage::app()->getStore()->getId()));
293
 
294
+ if(isset($params["disable_saturday_delivery"]) && $params["disable_saturday_delivery"] == 1 && Mage::helper("bpost_shm/system_config")->getBpostShippingConfig("display_delivery_date")){
295
  //check if the option saturday delivery is active for the current shipping method
296
+ if($bpostConfigHelper->getBpostCarriersConfig("saturday_delivery", $shippingMethodForConfig, Mage::app()->getStore()->getId())){
297
  //remove extra cost
298
  $_rate->setPrice($originalRatePrices[$params["shipping_method"]]);
299
  $_rate->setSaturdayDelivery(0);
301
  $quote->setBpostSaturdayCostApplied(false);
302
  }
303
 
304
+ }elseif(isset($params["disable_saturday_delivery"]) && $params["disable_saturday_delivery"] == 0 && Mage::helper("bpost_shm/system_config")->getBpostShippingConfig("display_delivery_date")){
 
305
  //add extra cost
306
+ if($bpostConfigHelper->getBpostCarriersConfig("saturday_delivery", $shippingMethodForConfig, Mage::app()->getStore()->getId())){
307
  $_rate->setPrice($originalRatePrices[$params["shipping_method"]]+$saturdayDeliveryCost);
308
  $_rate->setSaturdayDelivery(1);
309
  //make sure the original prices are applied
343
  return $this;
344
  }
345
 
346
+ /**
347
+ * @param $observer
348
+ */
349
  public function controller_action_predispatch_onestepcheckout_index_index($observer){
350
  $checkoutSession = Mage::getSingleton('checkout/session');
351
  $quote = $checkoutSession->getQuote();
352
+ $shippingMethod = str_replace("bpostshm_", "",$quote->getShippingAddress()->getShippingMethod());
353
+ $configHelper = Mage::helper("bpost_shm/system_config");
354
+ if(!$shippingMethod){
355
+ Mage::getSingleton('checkout/session')->getQuote()->setData("bpost_disable_saturday_delivery", true);
356
+ }elseif($configHelper->getBpostShippingConfig("choose_delivery_date", Mage::app()->getStore()->getId())){
357
+ Mage::getSingleton('checkout/session')->getQuote()->setData("bpost_disable_saturday_delivery", true);
358
+ }
359
+ else{
360
+ $dates = Mage::helper('bpost_shm')->getBpostShippingDates();
361
+ Mage::getSingleton('checkout/session')->getQuote()->setData("bpost_disable_saturday_delivery", !(bool)$dates[$shippingMethod]["is_saturday"]);
 
 
 
362
  }
 
 
363
  }
364
  }
app/code/community/Bpost/ShM/Model/Shipping/Carrier/BpostShM.php CHANGED
@@ -14,7 +14,7 @@
14
  class Bpost_ShM_Model_Shipping_Carrier_BpostShM extends Mage_Shipping_Model_Carrier_Abstract
15
  implements Mage_Shipping_Model_Carrier_Interface
16
  {
17
- const SHIPMENT_TRACK_DOMAIN = "http://track.bpost.be/";
18
 
19
  protected $_code = 'bpostshm';
20
  protected $_isFixed = true;
@@ -32,7 +32,9 @@ class Bpost_ShM_Model_Shipping_Carrier_BpostShM extends Mage_Shipping_Model_Carr
32
 
33
  $helper = Mage::helper("bpost_shm");
34
  $configHelper = Mage::helper("bpost_shm/system_config");
35
- $quote = Mage::getSingleton('checkout/session')->getQuote();
 
 
36
  $ratePriceByMethod = array();
37
 
38
  foreach ($this->getAllowedMethods() as $shippingMethodCode => $shippingMethodName) {
@@ -46,7 +48,8 @@ class Bpost_ShM_Model_Shipping_Carrier_BpostShM extends Mage_Shipping_Model_Carr
46
  $price = $this->getBpostConfigData('flat_rate_price', $shippingMethodCode);
47
  if ($request->getFreeShipping() === true ||
48
  ($this->getBpostConfigData('free_shipping', $shippingMethodCode) &&
49
- $request->getPackageValue() >= $this->getBpostConfigData('free_shipping_from', $shippingMethodCode))) {
 
50
  $price = 0;
51
  }
52
  } else {
@@ -118,31 +121,30 @@ class Bpost_ShM_Model_Shipping_Carrier_BpostShM extends Mage_Shipping_Model_Carr
118
  }
119
 
120
  $postCodeValidationResult = Mage::helper('bpost_shm')->validatePostcode($request->getDestCountryId(), $request->getDestPostcode());
121
- if(($shippingMethodCode == 'bpost_homedelivery' || $shippingMethodCode == 'bpost_international') && $postCodeValidationResult != 'passed'){
122
  $error = Mage::getModel('shipping/rate_result_error');
123
  $error->setCarrier($this->_code);
124
  $error->setCarrierTitle('Bpost ShippingManager');
125
- $error->setData('error_message', Mage::helper('bpost_shm')->__('The Bpost shipping method "%s" is not available because your postal code is not correct.' .
126
- ' For your country the format should be like "%s". Please correct the postal code in your shipping address.',$shippingMethodName, $postCodeValidationResult));
127
  $result->append($error);
128
  continue;
129
  }
130
 
131
  $saturdayDeliveryCost = $helper->formatSaturdayDeliveryCost($configHelper->getBpostShippingConfig("saturday_delivery_cost", Mage::app()->getStore()->getId()));
132
- $saturdayDeliveryActiveByCarrier = $helper->formatSaturdayDeliveryCost($configHelper->getBpostCarriersConfig("saturday_delivery", $shippingMethodCode, Mage::app()->getStore()->getId()));
133
- $ratePriceByMethod[$this->_code."_".$shippingMethodCode] = $price;
134
-
135
- if(!$quote->getBpostDisableSaturdayDelivery() && $saturdayDeliveryActiveByCarrier) {
136
- $shippingDates = $helper->getBpostShippingDates();
137
- if(isset($shippingDates[$shippingMethodCode]) && $shippingDates[$shippingMethodCode]["is_saturday"] == 1){
138
- $price = $price + $saturdayDeliveryCost;
139
- $quote->setBpostSaturdayCostApplied(true)->save();
140
- }
 
141
  }
142
-
143
  $method->setCarrier($this->_code);
144
  $method->setMethod($shippingMethodCode);
145
- $method->setMethodTitle($this->getBpostConfigData('name', $shippingMethodCode));
146
  $method->setCarrierTitle('Bpost');
147
  $method->setPrice($price);
148
  $method->setCost($price);
@@ -153,7 +155,6 @@ class Bpost_ShM_Model_Shipping_Carrier_BpostShM extends Mage_Shipping_Model_Carr
153
  return false;
154
  }
155
 
156
- $checkoutSession = Mage::getSingleton('checkout/session');
157
  $checkoutSession->setOriginalRatePrices($ratePriceByMethod);
158
 
159
  return $result;
@@ -165,11 +166,12 @@ class Bpost_ShM_Model_Shipping_Carrier_BpostShM extends Mage_Shipping_Model_Carr
165
  * @param $shippingMethodCode
166
  * @return Mage_Shipping_Model_Rate_Result_Error
167
  */
168
- protected function _getCarriersErrorMessage($shippingMethodCode){
 
169
  $error = Mage::getModel('shipping/rate_result_error');
170
  $msg = Mage::getStoreConfig("carriers/$shippingMethodCode/specificerrmsg");
171
 
172
- if($msg && $msg != ''){
173
  $error->setData("error_message", $msg);
174
  }
175
 
@@ -242,7 +244,7 @@ class Bpost_ShM_Model_Shipping_Carrier_BpostShM extends Mage_Shipping_Model_Carr
242
  $collection = Mage::getResourceModel('sales/order_shipment_track_collection')
243
  ->addFieldToFilter('track_number', $tracking_number)
244
  ->addAttributeToSelect("order_id")
245
- ->join('sales/order', 'order_id=`sales/order`.entity_id', array('increment_id'=>'increment_id', 'shipping_description' => 'shipping_description'), null,'left');
246
  $orderId = $collection->getFirstItem()->getIncrementId();
247
  $carrierTitle = $collection->getFirstItem()->getShippingDescription();
248
  $tracking_result = Mage::getModel('shipping/tracking_result');
@@ -255,7 +257,7 @@ class Bpost_ShM_Model_Shipping_Carrier_BpostShM extends Mage_Shipping_Model_Carr
255
  $trackDomainUrl = self::SHIPMENT_TRACK_DOMAIN;
256
  $tracking_status->addData(
257
  array(
258
- 'status' => '<a target="_blank" href="'.$trackDomainUrl.'etr/light/performSearch.do?searchByCustomerReference=true&oss_language=' . $localeExploded[0] . '&customerReference=' . $orderId . '"><img src="' . Mage::getDesign()->getSkinUrl('images/bpost/bpost_logo_RGB72_M.png') . '" /> <br />' . Mage::helper('bpost_shm')->__('Click here to track your bpost shipments.') . '</a>'
259
  )
260
  );
261
  $tracking_result->append($tracking_status);
@@ -296,9 +298,9 @@ class Bpost_ShM_Model_Shipping_Carrier_BpostShM extends Mage_Shipping_Model_Carr
296
  $bpostHelper = Mage::helper("bpost_shm/system_config");
297
  $countryId = $request->getDestCountryId();
298
 
299
- if ($speCountriesAllow == 1){
300
  $allowedCountries = $bpostHelper->getBpostCarriersConfig("specificcountry", "bpost_international");
301
- $availableCountries = explode(',',$allowedCountries);
302
 
303
  if (!empty($availableCountries) && in_array($countryId, $availableCountries)) {
304
  return true;
@@ -308,10 +310,11 @@ class Bpost_ShM_Model_Shipping_Carrier_BpostShM extends Mage_Shipping_Model_Carr
308
  }
309
 
310
  //we check on national shipping country Belgium
311
- if(($shippingMethodCode === "bpost_homedelivery" ||
312
- $shippingMethodCode === "bpost_parcellocker" ||
313
  $shippingMethodCode === "bpost_pickuppoint") &&
314
- $countryId != "BE"){
 
315
  return false;
316
  }
317
 
@@ -327,6 +330,6 @@ class Bpost_ShM_Model_Shipping_Carrier_BpostShM extends Mage_Shipping_Model_Carr
327
  */
328
  public function getRate($request, $shippingMethodCode)
329
  {
330
- return Mage::getResourceModel('bpost_shm/tablerates_' . str_replace('bpost_','',$shippingMethodCode))->getRate($request);
331
  }
332
  }
14
  class Bpost_ShM_Model_Shipping_Carrier_BpostShM extends Mage_Shipping_Model_Carrier_Abstract
15
  implements Mage_Shipping_Model_Carrier_Interface
16
  {
17
+ const SHIPMENT_TRACK_DOMAIN = "http://track.bpost.be/";
18
 
19
  protected $_code = 'bpostshm';
20
  protected $_isFixed = true;
32
 
33
  $helper = Mage::helper("bpost_shm");
34
  $configHelper = Mage::helper("bpost_shm/system_config");
35
+ $checkoutSession = Mage::getSingleton('checkout/session');
36
+
37
+ $quote = $checkoutSession->getQuote();
38
  $ratePriceByMethod = array();
39
 
40
  foreach ($this->getAllowedMethods() as $shippingMethodCode => $shippingMethodName) {
48
  $price = $this->getBpostConfigData('flat_rate_price', $shippingMethodCode);
49
  if ($request->getFreeShipping() === true ||
50
  ($this->getBpostConfigData('free_shipping', $shippingMethodCode) &&
51
+ $request->getPackageValue() >= $this->getBpostConfigData('free_shipping_from', $shippingMethodCode))
52
+ ) {
53
  $price = 0;
54
  }
55
  } else {
121
  }
122
 
123
  $postCodeValidationResult = Mage::helper('bpost_shm')->validatePostcode($request->getDestCountryId(), $request->getDestPostcode());
124
+ if (($shippingMethodCode == 'bpost_homedelivery' || $shippingMethodCode == 'bpost_international') && $postCodeValidationResult != 'passed') {
125
  $error = Mage::getModel('shipping/rate_result_error');
126
  $error->setCarrier($this->_code);
127
  $error->setCarrierTitle('Bpost ShippingManager');
128
+ $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, $postCodeValidationResult));
 
129
  $result->append($error);
130
  continue;
131
  }
132
 
133
  $saturdayDeliveryCost = $helper->formatSaturdayDeliveryCost($configHelper->getBpostShippingConfig("saturday_delivery_cost", Mage::app()->getStore()->getId()));
134
+ $saturdayDeliveryActiveByCarrier = $configHelper->getBpostCarriersConfig("saturday_delivery", $shippingMethodCode, Mage::app()->getStore()->getId());
135
+ $ratePriceByMethod[$this->_code . "_" . $shippingMethodCode] = $price;
136
+ if ((bool)$saturdayDeliveryActiveByCarrier &&
137
+ (bool)Mage::helper("bpost_shm/system_config")->getBpostShippingConfig("display_delivery_date") &&
138
+ !(bool)$checkoutSession->getQuote()->getData("bpost_disable_saturday_delivery")
139
+ ) {
140
+ $price = $price + $saturdayDeliveryCost;
141
+ $quote->setBpostSaturdayCostApplied(true)->save();
142
+ } else {
143
+ $quote->setBpostSaturdayCostApplied(false)->save();
144
  }
 
145
  $method->setCarrier($this->_code);
146
  $method->setMethod($shippingMethodCode);
147
+ $method->setMethodTitle($helper->__($this->getBpostConfigData('name', $shippingMethodCode)));
148
  $method->setCarrierTitle('Bpost');
149
  $method->setPrice($price);
150
  $method->setCost($price);
155
  return false;
156
  }
157
 
 
158
  $checkoutSession->setOriginalRatePrices($ratePriceByMethod);
159
 
160
  return $result;
166
  * @param $shippingMethodCode
167
  * @return Mage_Shipping_Model_Rate_Result_Error
168
  */
169
+ protected function _getCarriersErrorMessage($shippingMethodCode)
170
+ {
171
  $error = Mage::getModel('shipping/rate_result_error');
172
  $msg = Mage::getStoreConfig("carriers/$shippingMethodCode/specificerrmsg");
173
 
174
+ if ($msg && $msg != '') {
175
  $error->setData("error_message", $msg);
176
  }
177
 
244
  $collection = Mage::getResourceModel('sales/order_shipment_track_collection')
245
  ->addFieldToFilter('track_number', $tracking_number)
246
  ->addAttributeToSelect("order_id")
247
+ ->join('sales/order', 'order_id=`sales/order`.entity_id', array('increment_id' => 'increment_id', 'shipping_description' => 'shipping_description'), null, 'left');
248
  $orderId = $collection->getFirstItem()->getIncrementId();
249
  $carrierTitle = $collection->getFirstItem()->getShippingDescription();
250
  $tracking_result = Mage::getModel('shipping/tracking_result');
257
  $trackDomainUrl = self::SHIPMENT_TRACK_DOMAIN;
258
  $tracking_status->addData(
259
  array(
260
+ 'status' => '<a target="_blank" href="' . $trackDomainUrl . 'etr/light/performSearch.do?searchByItemCode=true&oss_language=' . $localeExploded[0] . '&itemCodes=' . $tracking_number . '"><img src="' . Mage::getDesign()->getSkinUrl('images/bpost/bpost_logo_RGB72_M.png') . '" /> <br />' . Mage::helper('bpost_shm')->__('Click here to track your bpost shipments.') . '</a>'
261
  )
262
  );
263
  $tracking_result->append($tracking_status);
298
  $bpostHelper = Mage::helper("bpost_shm/system_config");
299
  $countryId = $request->getDestCountryId();
300
 
301
+ if ($speCountriesAllow == 1) {
302
  $allowedCountries = $bpostHelper->getBpostCarriersConfig("specificcountry", "bpost_international");
303
+ $availableCountries = explode(',', $allowedCountries);
304
 
305
  if (!empty($availableCountries) && in_array($countryId, $availableCountries)) {
306
  return true;
310
  }
311
 
312
  //we check on national shipping country Belgium
313
+ if (($shippingMethodCode === "bpost_homedelivery" ||
314
+ $shippingMethodCode === "bpost_parcellocker" ||
315
  $shippingMethodCode === "bpost_pickuppoint") &&
316
+ $countryId != "BE"
317
+ ) {
318
  return false;
319
  }
320
 
330
  */
331
  public function getRate($request, $shippingMethodCode)
332
  {
333
+ return Mage::getResourceModel('bpost_shm/tablerates_' . str_replace('bpost_', '', $shippingMethodCode))->getRate($request);
334
  }
335
  }
app/code/community/Bpost/ShM/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Bpost_ShM>
5
- <version>0.1.8</version>
6
  </Bpost_ShM>
7
  </modules>
8
  <global>
@@ -11,7 +11,6 @@
11
  <class>Bpost_ShM_Block</class>
12
  </bpost_shm>
13
  </blocks>
14
-
15
  <models>
16
  <bpost_shm>
17
  <class>Bpost_ShM_Model</class>
@@ -378,7 +377,7 @@
378
  <log_level>3</log_level>
379
  <enable_log_api>1</enable_log_api>
380
  <enable_log>1</enable_log>
381
- <api_url>https://testapi.bpost.be</api_url>
382
  <frontend_api_url>https://shippingmanager.bpost.be/ShmFrontEnd/start</frontend_api_url>
383
  <sender_country>BE</sender_country>
384
  <manage_labels_with_magento>1</manage_labels_with_magento>
@@ -388,7 +387,7 @@
388
  <display_delivery_date>0</display_delivery_date>
389
  <choose_delivery_date>0</choose_delivery_date>
390
  <nr_of_delivery_days_shown>5</nr_of_delivery_days_shown>
391
- <next_day_delivery_allowed_till>17,00,00</next_day_delivery_allowed_till>
392
  <days_between_order_and_shipment>0</days_between_order_and_shipment>
393
  <weight_unit>1</weight_unit>
394
  </bpost_shm>
2
  <config>
3
  <modules>
4
  <Bpost_ShM>
5
+ <version>1.0.1</version>
6
  </Bpost_ShM>
7
  </modules>
8
  <global>
11
  <class>Bpost_ShM_Block</class>
12
  </bpost_shm>
13
  </blocks>
 
14
  <models>
15
  <bpost_shm>
16
  <class>Bpost_ShM_Model</class>
377
  <log_level>3</log_level>
378
  <enable_log_api>1</enable_log_api>
379
  <enable_log>1</enable_log>
380
+ <api_url>https://api.bpost.be</api_url>
381
  <frontend_api_url>https://shippingmanager.bpost.be/ShmFrontEnd/start</frontend_api_url>
382
  <sender_country>BE</sender_country>
383
  <manage_labels_with_magento>1</manage_labels_with_magento>
387
  <display_delivery_date>0</display_delivery_date>
388
  <choose_delivery_date>0</choose_delivery_date>
389
  <nr_of_delivery_days_shown>5</nr_of_delivery_days_shown>
390
+ <next_day_delivery_allowed_till>17,00</next_day_delivery_allowed_till>
391
  <days_between_order_and_shipment>0</days_between_order_and_shipment>
392
  <weight_unit>1</weight_unit>
393
  </bpost_shm>
app/code/community/Bpost/ShM/sql/.DS_Store DELETED
Binary file
app/design/frontend/base/default/template/bpost/shm/append_bpost_shippingmethod.phtml CHANGED
@@ -50,7 +50,7 @@
50
  <div class="cf"></div>
51
  <div class="bpost-saturday-delivery">
52
  <label for="bpost-saturday">
53
- <input type="checkbox" <?php if($bpostHelper->getIsOnestepCheckout()){ echo 'onclick="get_methods_separate();"';}?> name="bpost_saturday_delivery" id="bpost-saturday" value="1" <?php if($this->getQuote()->getBpostDisableSaturdayDelivery() || is_null($this->getQuote()->getBpostDisableSaturdayDelivery())){echo 'checked="checked"';}?>/>
54
  <div class="bpost-label-text"><?php echo $settings['datepicker_saturday_delivery_text'] ?><?php if($this->getSaturdayDeliveryCost()) { ?><br /><small><?php echo sprintf($settings['datepicker_saturday_delivery_cost'], $this->getSaturdayDeliveryCost()) ?></small><?php } ?></div>
55
  </label>
56
  </div>
@@ -59,7 +59,8 @@
59
 
60
  <script type="text/javascript">
61
  window.onestepcheckout_set_methods_separate = '<?php echo $this->getUrl('onestepcheckout/ajax/set_methods_separate', array('_secure'=>true));?>';
62
- window.bpostShM = new Bpost.ShM(<?php echo json_encode($settings); ?>, "<?php echo $this->getCurrentShippingMethod(); ?>");
 
63
 
64
  Validation.add('validate-bpostspot', "<?php echo Mage::helper('bpost_shm')->__('Please select a bpost pick-up point'); ?>", function (v) {
65
  return !($('s_method_bpostshm_bpost_pickuppoint').checked && Validation.get('IsEmpty').test(v))
50
  <div class="cf"></div>
51
  <div class="bpost-saturday-delivery">
52
  <label for="bpost-saturday">
53
+ <input type="checkbox" <?php if($bpostHelper->getIsOnestepCheckout()){ echo 'onclick="stopObserving(); triggerAjaxCallGetSeparateSaveMethods(\'' . $this->getUrl('onestepcheckout/ajax/set_methods_separate', array('_secure'=>true)) . '\', false);"';}?> name="bpost_saturday_delivery" id="bpost-saturday" value="1" />
54
  <div class="bpost-label-text"><?php echo $settings['datepicker_saturday_delivery_text'] ?><?php if($this->getSaturdayDeliveryCost()) { ?><br /><small><?php echo sprintf($settings['datepicker_saturday_delivery_cost'], $this->getSaturdayDeliveryCost()) ?></small><?php } ?></div>
55
  </label>
56
  </div>
59
 
60
  <script type="text/javascript">
61
  window.onestepcheckout_set_methods_separate = '<?php echo $this->getUrl('onestepcheckout/ajax/set_methods_separate', array('_secure'=>true));?>';
62
+ window.bpostSettings = <?php echo json_encode($settings); ?>;
63
+ window.bpostShM = new Bpost.ShM(window.bpostSettings, "<?php echo $this->getCurrentShippingMethod(); ?>");
64
 
65
  Validation.add('validate-bpostspot', "<?php echo Mage::helper('bpost_shm')->__('Please select a bpost pick-up point'); ?>", function (v) {
66
  return !($('s_method_bpostshm_bpost_pickuppoint').checked && Validation.get('IsEmpty').test(v))
app/locale/en_US/Bpost_ShM.csv CHANGED
@@ -1,35 +1,40 @@
1
- "Monday","Monday"
2
- "Tuesday","Tuesday"
3
- "Wednesday","Wednesday"
4
- "Thursday","Thursday"
5
- "Friday","Friday"
6
- "Saturday","Saturday"
7
- "Sunday","Sunday"
8
- "January","January"
9
- "February","February"
10
- "March","March"
11
- "April","April"
12
- "May","May"
13
- "June","June"
14
- "July","July"
15
- "August","August"
16
- "September","September"
17
- "October","October"
18
- "November","November"
19
- "December","December"
20
  "# of Items","# of Items"
21
  "%s label(s) have been generated and statuses have been changed.","%s label(s) have been generated and statuses have been changed."
22
  "%s orders already had downloaded labels.","%s orders already had downloaded labels."
23
  "(extra cost Saturday delivery: %s EUR)","(extra cost Saturday delivery: %s EUR)"
 
 
24
  "A previous version of the bpost extension was detected!","A previous version of the bpost extension was detected!"
 
25
  "Action","Action"
26
  "Actions","Actions"
 
27
  "All bposts orders","All bpost orders"
 
 
28
  "An error occurred while importing table rates.","An error occurred while importing table rates."
 
 
 
 
 
29
  "Barcode #","Barcode #"
 
30
  "Bill to Name","Bill to"
 
 
 
 
 
31
  "Bpost Shipping Manager is a service offered by Bpost","bpost Shipping Manager is a service offered by bpost"
32
- "By using this option","By using this option"
 
 
 
 
 
 
 
33
  "Click here for more information","Click here for more information"
34
  "Click here to change the bpost parcel locker point.","Click here to change the bpost parcel locker."
35
  "Click here to change the bpost pick-up point.","Click here to change the bpost pick-up point."
@@ -39,52 +44,95 @@
39
  "Closed","Closed"
40
  "Country","Country"
41
  "Date Created","Creation date"
42
- "Delivery Date","Delivery Date"
 
43
  "Delivery at home or at the office","Delivery at home or at the office"
 
44
  "Delivery in a parcel locker","Delivery in a parcel locker"
45
  "Delivery in a pick-up point or postal office","Delivery in a pick-up point"
 
46
  "Displays calculated delivery date in the frontend:","Displays calculated delivery date in the frontend:"
47
- "Download","Download"
 
48
  "Download all undownloaded","Download labels"
49
  "Download bpost label","Download bpost label"
 
50
  "Drop date","Drop date"
51
  "Duplicate Row #%s (Country ","Duplicate Row #%s (Country "
52
  "Email","Email"
 
53
  "Error creating bpost order","Error creating bpost order"
54
  "Error while creating a bpost order for Magento order #%s. Please check your API log.","Error while creating a bpost order for Magento order #%s. Please check your API log."
55
- "Example","Example"
56
  "Example screenshot of the bpost module.","Example screen of the bpost module."
 
57
  "Export CSV","Export CSV"
 
 
 
58
  "File has not been imported. See the following list of errors: %s","File has not been imported. See the following list of errors: %s"
59
  "Filepath","Filepath"
60
  "Filter","Search"
 
 
61
  "Flat Rate","Flat Rate"
 
62
  "Friday","Friday"
63
  "Furthermore","Furthermore"
64
  "G.T. (Purchased)","Order amount"
 
65
  "Generate Label and Complete","Generate shipping label"
 
 
66
  "How do you want to be notified when your parcel is available in the parcel locker?","Optional services"
67
  "How do you want to be notified when your parcel is available in the pick-up point?","How do you want to be notified when your parcel is available in the pick-up point?"
68
  "I don","I don"
69
  "I wish to use the reduced mobility zone","Use the reduced mobility zone"
 
 
 
 
 
 
 
 
70
  "Import","Import"
 
 
 
 
 
71
  "Invalid %s ","Invalid %s "
72
  "Invalid Country ","Invalid Country "
73
  "Invalid Region/State ","Invalid Region/State "
74
  "Invalid Shipping Price ","Invalid Shipping Price "
75
  "Invalid Table Rates File Format","Invalid Table Rates File Format"
76
  "Invalid Table Rates format in the Row #%s","Invalid Table Rates format in the Row #%s"
 
 
 
 
77
  "Label Barcode #","Label Barcode #"
78
  "Label download","Label download"
 
 
 
 
79
  "Monday","Monday"
80
- "No","No"
81
  "No bpost product configuration found for %s. Please check your bpost shipping manager for international delivery.","No bpost product configuration found for %s. Please check your bpost shipping manager for international delivery."
82
  "No label generated yet - please perform the ‘Generate Label and Complete’ action from the overview.","No label generated yet - please perform the ‘Generate shipping label’ action from the overview."
83
  "No label response received for Magento order #%s.","No label response received for Magento order #%s."
84
  "No more hassle and 100% transparent!","No more hassle and 100% transparent!"
85
  "No points could be found. Please use the filter above or drag the map to get a better result.","No points could be found. Please use the search functionality above or drag the map to get a better result."
 
86
  "No undownloaded labels found.","No undownloaded labels found."
 
 
 
 
 
87
  "Order #","Order #"
 
88
  "Pending bpost orders","Pending bpost orders"
89
  "Please remove or disable the old bpost extension prior to the installation of the new one.","Please remove or disable the old bpost extension prior to the installation of the new one."
90
  "Please select a bpost parcel locker","Please select a bpost parcel locker"
@@ -92,19 +140,38 @@
92
  "Please select a delivery date","Please select a delivery date"
93
  "Please select a postcode or city first.","Please select a postal code or city first."
94
  "Please wait. Loading bpost map based on your address","Please wait. Loading bpost map based on your address"
 
95
  "Purchased From (Store)","Purchased From (Store)"
96
  "Purchased On","Purchased On"
 
 
97
  "Region/State","Region/State"
 
 
98
  "Saturday","Saturday"
99
- "Select","Select"
100
  "Select All","Select All"
 
101
  "Select Visible","Select Visible"
102
  "Select your preferred delivery date","Select your preferred delivery date"
 
 
103
  "Send Email","Send Email"
 
 
 
 
 
 
 
 
 
 
 
104
  "Ship to Name","Ship to"
105
  "Shipment","Shipment"
106
  "Shipped with bpost generateLabelAndComplete","Shipped with bpost generateLabelAndComplete"
107
  "Shipping Price","Shipping Price"
 
108
  "Some of the selected orders are not ready to be shipped or have already been shipped","Some of the selected orders are not ready to be shipped or have already been shipped"
109
  "Something went wrong while processing order #%s","Something went wrong while processing order #%s"
110
  "Sorry","Sorry"
@@ -113,13 +180,18 @@
113
  "Successfully authenticated with bpost.","Successfully authenticated with bpost."
114
  "Successfully exported order(s). Download the file here: %s","Successfully exported order(s). Download the file here: %s"
115
  "Sunday","Sunday"
 
116
  "Table Rates","Table Rates"
117
  "The Bpost shipping method ","The bpost delivery method "
 
 
118
  "The email with return label has been sent to %s.","The email with return label has been sent to %s."
119
  "The file(s) could not be downloaded","The file(s) could not be downloaded"
120
  "The following delivery methods are currently supported:","The following delivery methods are currently supported:"
121
  "The order with id %s is not ready to be shipped or has already been shipped.","The order with id %s is not ready to be shipped or has already been shipped."
122
  "The order with id %s only has non-bpost shipments.","The order with id %s only has non-bpost shipments."
 
 
123
  "The requested file does not exist","The requested file does not exist"
124
  "This means that orders are automatically added to the bpost portal.","This means that orders are automatically added to the bpost portal."
125
  "Thursday","Thursday"
@@ -128,101 +200,21 @@
128
  "Type in a location","Type in a location"
129
  "Unselect All","Unselect All"
130
  "Unselect Visible","Unselect Visible"
 
 
 
 
 
 
131
  "View","View"
132
  "Wednesday","Wednesday"
133
  "When activated and correctly installed","When activated and correctly installed"
134
  "World Business","World Business"
135
  "World Express Pro","World Express Pro"
 
 
 
136
  "Your label has been generated and statuses have been changed.","Your label has been generated and statuses have been changed."
137
  "Your return has been generated and is available under -bpost Return labels- in this order.","Your return has been generated and is available under -bpost Return labels- in this order."
138
  "Your selected order is not ready to be shipped or has already been shipped","Your selected order is not ready to be shipped or has already been shipped"
139
- "Zip/Postal Code","Zip/Postal Code"
140
- "bpost","bpost"
141
- "bpost Return Barcodes","bpost Return Barcodes"
142
- "bpost Return Label","bpost Return Label"
143
- "bpost Return Labels","bpost Return Labels"
144
- "bpost status","bpost status"
145
- "items selected","items selected"
146
- "no telephone number found","no telephone number found"
147
- "send additional SMS notification","additional SMS next to standard email notification"
148
- "via E-mail","via E-mail"
149
- "via SMS","via SMS"
150
- "bpost Shipping Manager","bpost Shipping Manager"
151
- "Info text","Info text"
152
- "Logo","Logo"
153
- "Account id","Account id"
154
- "Passphrase","Passphrase"
155
- "The passphrase you entered in bpost Shipping Manager back-office application. This is not the password used to access bpost portal.","The passphrase you entered in bpost Shipping Manager back-office application. This is not the password used to access bpost portal."
156
- "API url","API url"
157
- "Do not modify this setting if you are not 100% sure of what you are doing.","Do not modify this setting if you are not 100% sure of what you are doing."
158
- "Sender name","Sender name"
159
- "Used in the webservice calls.","Used in the webservice calls."
160
- "Sender company","Sender company"
161
- "Sender streetname","Sender streetname"
162
- "Sender streetnumber","Sender streetnumber"
163
- "Sender boxnumber","Sender boxnumber"
164
- "Sender postal code","Sender postal code"
165
- "Sender city","Sender city"
166
- "Sender country","Sender country"
167
- "Sender email","Sender email"
168
- "Sender phonenumber","Sender phonenumber"
169
- "Use Magento to manage labels","Use Magento to manage labels"
170
- "If you enable this option","If you enable this option"
171
- "Label format","Label format"
172
- "Automatic retour labels","Automatic retour labels"
173
- "Automatic track and trace information","Automatic track and trace information"
174
- "Display delivery date","Display delivery date"
175
- "Displays calculated delivery date","Displays calculated delivery date"
176
- "Days between order and shipment","Days between order and shipment"
177
- "Choose delivery date","Choose delivery date"
178
- "Number of delivery days shown","Number of delivery days shown"
179
- "Next day delivery allowed till","Next day delivery allowed till"
180
- "Saturday delivery cost","Saturday delivery cost"
181
- "Google browser API key","Google browser API key"
182
- "Google server API key","Google server API key"
183
- "bpost Home delivery","bpost Home delivery"
184
- "General","General"
185
- "Enabled","Enabled"
186
- "Rates","Rates"
187
- "Free shipping","Free shipping"
188
- ".. as of",".. as of"
189
- "Rate type","Rate type"
190
- "You can use flat rate or calculated table rates.","You can use flat rate or calculated table rates."
191
- "Flat rate price","Flat rate price"
192
- "Importing and exporting table rates only possible on website scope. View the documentation for more information.","Importing and exporting table rates is only possible on website scope. View the documentation for more information."
193
- "Fixed fee for bpost Home delivery shipments","Fixed fee for bpost Home delivery shipments"
194
- "Table rates condition","Table rates condition"
195
- "Export table rates file","Export table rates file"
196
- "Export your table rates configuration here.","Export your table rates configuration here."
197
- "Import table rates file","Import table rates file"
198
- "Upload your table rates configuration here. Refer to the manual for more information.","Upload your table rates configuration here. Refer to the manual for more information."
199
- "Options","Options"
200
- "2nd presentation","2nd presentation"
201
- "The delivery happens against signature by the receiver. The parcel is delivered on Saturday if it is timely dropped in the bpost network.","The delivery happens against signature by the receiver. The parcel is delivered on Saturday if it is timely dropped in the bpost network."
202
- "Insurance","Insurance"
203
- "Insurance to insure your goods to a maximum of 500","Insurance to insure your goods to a maximum of 500 euro"
204
- "Signature","Signature"
205
- "The delivery happens against signature by the receiver.","The delivery happens against signature by the receiver."
206
- "Saturday delivery","Saturday delivery"
207
- "The parcel is delivered on Saturday if it is timely dropped in the bpost network.","The parcel is delivered on Saturday if it is timely dropped in the bpost network."
208
- "bpost Home delivery international","bpost Home delivery international"
209
- "Product","Product"
210
- "Import countries","Import countries"
211
- "Allowed countries","Allowed countries"
212
- "International insurance","International insurance"
213
- "Import your bpost configured countries here.","Import your bpost configured countries here."
214
-
215
- "Your 6 digits bpost account ID used for the Shipping Manager.<br/><a target='_blank' href='http://bpost.freshdesk.com/solution/articles/4000061189'>http://bpost.freshdesk.com/solution/articles/4000061189</a>","Your 6 digits bpost account ID used for the Shipping Manager.<br/><a target='_blank' href='http://bpost.freshdesk.com/solution/articles/4000061189'>http://bpost.freshdesk.com/solution/articles/4000061189</a>"
216
- "You need a user account from bpost to use this module. Call %s for more information.","You need a user account from bpost to use this module. Call %s for more information."
217
- "bpost uses Google Maps API to display the map in the frontend. <strong>
Note:</strong> This is optional if you will not meet the usage limits. Visit Google’s online documentation for more information.","bpost uses Google Maps API to display the map in the frontend. <strong>
Note:</strong> This is optional if you will not meet the usage limits. Visit Google’s online documentation for more information."
218
- "bpost uses Google Geocoding API to calculate GEO location based on the shipping address. <strong>
Note:</strong> This is optional if you will not meet the usage limits. Visit Google’s online documentation for more information.","bpost uses Google Geocoding API to calculate GEO location based on the shipping address. <strong>
Note:</strong> This is optional if you will not meet the usage limits. Visit Google’s online documentation for more information."
219
- "Additional fee when using saturday delivery option, e.g.: 4.95.","Additional fee when using saturday delivery option, e.g.: 4.95."
220
- "If the order is placed after this cut-off time, an extra day is added to the displayed date. Order placed = end of checkout.","If the order is placed after this cut-off time, this impacts the displayed delivery date(s). Order placed = end of checkout."
221
- "Allow customer to choose their delivery date","Allow customer to choose their delivery date"
222
- "If you enable this option, the bpost Track & Trace link will be added in the Magento mail templates. It is always possible to manually send these emails.<br/><a href='http://bpost.freshdesk.com/solution/articles/4000061636' target='_blank'>http://bpost.freshdesk.com/solution/articles/4000061636</a>","If you enable this option, the bpost Track & Trace link will be added in the Magento mail templates. It is always possible to manually send these emails.<br/><a href='http://bpost.freshdesk.com/solution/articles/4000061636' target='_blank'>http://bpost.freshdesk.com/solution/articles/4000061636</a>"
223
- "If you enable this option, a retour label is automatically added and printed when generating labels. If disabled, you are able to manually create retour labels.","If you enable this option, a retour label is automatically added and printed when generating labels. If disabled, you are able to manually create retour labels."
224
- Choose between A6 or A4 format;Choose between A6 or A4 format
225
- "If you enable this option, labels are generated directly within Magento. It is not needed to use the bpost Shipping Manager for these tasks.","If you enable this option, labels are generated directly within Magento. It is not needed to use the bpost Shipping Manager for these tasks."
226
- "Select one or more countries where bpost Home delivery international should be available for. Make sure your bpost shipping manager is configured properly. Otherwise no countries will be shown in this list after saving the 'Shipping Settings' configuration.","Select one or more countries where bpost Home delivery international should be available for. Make sure your bpost shipping manager is configured properly."
227
- "Belgium","Belgium"
228
- "Used to calculate the weight before sending it to bpost","Used to calculate the weight before sending it to bpost"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  "# of Items","# of Items"
2
  "%s label(s) have been generated and statuses have been changed.","%s label(s) have been generated and statuses have been changed."
3
  "%s orders already had downloaded labels.","%s orders already had downloaded labels."
4
  "(extra cost Saturday delivery: %s EUR)","(extra cost Saturday delivery: %s EUR)"
5
+ ".. as of",".. as of"
6
+ "2nd presentation","2nd presentation"
7
  "A previous version of the bpost extension was detected!","A previous version of the bpost extension was detected!"
8
+ "Account id","Account id"
9
  "Action","Action"
10
  "Actions","Actions"
11
+ "Additional fee when using saturday delivery option, e.g.: 4.95.","Additional fee when using saturday delivery option, e.g.: 4.95."
12
  "All bposts orders","All bpost orders"
13
+ "Allow customer to choose their delivery date","Allow customer to choose their delivery date"
14
+ "Allowed countries","Allowed countries"
15
  "An error occurred while importing table rates.","An error occurred while importing table rates."
16
+ "API url","API url"
17
+ "April","April"
18
+ "August","August"
19
+ "Automatic retour labels","Automatic retour labels"
20
+ "Automatic track and trace information","Automatic track and trace information"
21
  "Barcode #","Barcode #"
22
+ "Belgium","Belgium"
23
  "Bill to Name","Bill to"
24
+ "bpost Home delivery international","bpost Home delivery international"
25
+ "bpost Home delivery","bpost Home delivery"
26
+ "bpost Return Barcodes","bpost Return Barcodes"
27
+ "bpost Return Label","bpost Return Label"
28
+ "bpost Return Labels","bpost Return Labels"
29
  "Bpost Shipping Manager is a service offered by Bpost","bpost Shipping Manager is a service offered by bpost"
30
+ "bpost Shipping Manager","bpost Shipping Manager"
31
+ "bpost status","bpost status"
32
+ "bpost uses Google Geocoding API to calculate GEO location based on the shipping address. <strong>
Note:</strong> This is optional if you will not meet the usage limits. Visit Google’s online documentation for more information.","bpost uses Google Geocoding API to calculate GEO location based on the shipping address. <strong>Note:</strong> This is optional if you will not meet the usage limits. Visit Google’s online documentation for more information."
33
+ "bpost uses Google Maps API to display the map in the frontend. <strong>
Note:</strong> This is optional if you will not meet the usage limits. Visit Google’s online documentation for more information.","bpost uses Google Maps API to display the map in the frontend. <strong>Note:</strong> This is optional if you will not meet the usage limits. Visit Google’s online documentation for more information."
34
+ "bpost","bpost"
35
+ "By using this option, customers with reduced mobility can use the lockers of the machine easiest to reach.","By using this option, customers with reduced mobility can use the lockers of the machine easiest to reach."
36
+ "Choose between A6 or A4 format","Choose between A6 or A4 format"
37
+ "Choose delivery date","Choose delivery date"
38
  "Click here for more information","Click here for more information"
39
  "Click here to change the bpost parcel locker point.","Click here to change the bpost parcel locker."
40
  "Click here to change the bpost pick-up point.","Click here to change the bpost pick-up point."
44
  "Closed","Closed"
45
  "Country","Country"
46
  "Date Created","Creation date"
47
+ "Days between order and shipment","Days between order and shipment"
48
+ "December","December"
49
  "Delivery at home or at the office","Delivery at home or at the office"
50
+ "Delivery Date","Delivery Date"
51
  "Delivery in a parcel locker","Delivery in a parcel locker"
52
  "Delivery in a pick-up point or postal office","Delivery in a pick-up point"
53
+ "Display delivery date","Display delivery date"
54
  "Displays calculated delivery date in the frontend:","Displays calculated delivery date in the frontend:"
55
+ "Displays calculated delivery date","Displays calculated delivery date"
56
+ "Do not modify this setting if you are not 100% sure of what you are doing.","Do not modify this setting if you are not 100% sure of what you are doing."
57
  "Download all undownloaded","Download labels"
58
  "Download bpost label","Download bpost label"
59
+ "Download","Download"
60
  "Drop date","Drop date"
61
  "Duplicate Row #%s (Country ","Duplicate Row #%s (Country "
62
  "Email","Email"
63
+ "Enabled","Enabled"
64
  "Error creating bpost order","Error creating bpost order"
65
  "Error while creating a bpost order for Magento order #%s. Please check your API log.","Error while creating a bpost order for Magento order #%s. Please check your API log."
 
66
  "Example screenshot of the bpost module.","Example screen of the bpost module."
67
+ "Example","Example"
68
  "Export CSV","Export CSV"
69
+ "Export table rates file","Export table rates file"
70
+ "Export your table rates configuration here.","Export your table rates configuration here."
71
+ "February","February"
72
  "File has not been imported. See the following list of errors: %s","File has not been imported. See the following list of errors: %s"
73
  "Filepath","Filepath"
74
  "Filter","Search"
75
+ "Fixed fee for bpost Home delivery shipments","Fixed fee for bpost Home delivery shipments"
76
+ "Flat rate price","Flat rate price"
77
  "Flat Rate","Flat Rate"
78
+ "Free shipping","Free shipping"
79
  "Friday","Friday"
80
  "Furthermore","Furthermore"
81
  "G.T. (Purchased)","Order amount"
82
+ "General","General"
83
  "Generate Label and Complete","Generate shipping label"
84
+ "Google browser API key","Google browser API key"
85
+ "Google server API key","Google server API key"
86
  "How do you want to be notified when your parcel is available in the parcel locker?","Optional services"
87
  "How do you want to be notified when your parcel is available in the pick-up point?","How do you want to be notified when your parcel is available in the pick-up point?"
88
  "I don","I don"
89
  "I wish to use the reduced mobility zone","Use the reduced mobility zone"
90
+ "If the order is placed after this cut-off time, an extra day is added to the displayed date. Order placed = end of checkout.","If the order is placed after this cut-off time, this impacts the displayed delivery date(s). Order placed = end of checkout."
91
+ "If you enable this option","If you enable this option"
92
+ "If you enable this option, a retour label is automatically added and printed when generating labels. If disabled, you are able to manually create retour labels.","If you enable this option, a retour label is automatically added and printed when generating labels. If disabled, you are able to manually create retour labels."
93
+ "If you enable this option, labels are generated directly within Magento. It is not needed to use the bpost Shipping Manager for these tasks.","If you enable this option, labels are generated directly within Magento. It is not needed to use the bpost Shipping Manager for these tasks."
94
+ "If you enable this option, the bpost Track & Trace link will be added in the Magento mail templates. It is always possible to manually send these emails.<br/><a href='http://bpost.freshdesk.com/solution/articles/4000061636' target='_blank'>http://bpost.freshdesk.com/solution/articles/4000061636</a>","If you enable this option, the bpost Track & Trace link will be added in the Magento mail templates. It is always possible to manually send these emails.<br/><a href='http://bpost.freshdesk.com/solution/articles/4000061636' target='_blank'>http://bpost.freshdesk.com/solution/articles/4000061636</a>"
95
+ "Import countries","Import countries"
96
+ "Import table rates file","Import table rates file"
97
+ "Import your bpost configured countries here.","Import your bpost configured countries here."
98
  "Import","Import"
99
+ "Importing and exporting table rates only possible on website scope. View the documentation for more information.","Importing and exporting table rates is only possible on website scope. View the documentation for more information."
100
+ "Info text","Info text"
101
+ "Insurance to insure your goods to a maximum of 500","Insurance to insure your goods to a maximum of 500 euro"
102
+ "Insurance","Insurance"
103
+ "International insurance","International insurance"
104
  "Invalid %s ","Invalid %s "
105
  "Invalid Country ","Invalid Country "
106
  "Invalid Region/State ","Invalid Region/State "
107
  "Invalid Shipping Price ","Invalid Shipping Price "
108
  "Invalid Table Rates File Format","Invalid Table Rates File Format"
109
  "Invalid Table Rates format in the Row #%s","Invalid Table Rates format in the Row #%s"
110
+ "items selected","items selected"
111
+ "January","January"
112
+ "July","July"
113
+ "June","June"
114
  "Label Barcode #","Label Barcode #"
115
  "Label download","Label download"
116
+ "Label format","Label format"
117
+ "Logo","Logo"
118
+ "March","March"
119
+ "May","May"
120
  "Monday","Monday"
121
+ "Next day delivery allowed till","Next day delivery allowed till"
122
  "No bpost product configuration found for %s. Please check your bpost shipping manager for international delivery.","No bpost product configuration found for %s. Please check your bpost shipping manager for international delivery."
123
  "No label generated yet - please perform the ‘Generate Label and Complete’ action from the overview.","No label generated yet - please perform the ‘Generate shipping label’ action from the overview."
124
  "No label response received for Magento order #%s.","No label response received for Magento order #%s."
125
  "No more hassle and 100% transparent!","No more hassle and 100% transparent!"
126
  "No points could be found. Please use the filter above or drag the map to get a better result.","No points could be found. Please use the search functionality above or drag the map to get a better result."
127
+ "no telephone number found","no telephone number found"
128
  "No undownloaded labels found.","No undownloaded labels found."
129
+ "No","No"
130
+ "November","November"
131
+ "Number of delivery days shown","Number of delivery days shown"
132
+ "October","October"
133
+ "Options","Options"
134
  "Order #","Order #"
135
+ "Passphrase","Passphrase"
136
  "Pending bpost orders","Pending bpost orders"
137
  "Please remove or disable the old bpost extension prior to the installation of the new one.","Please remove or disable the old bpost extension prior to the installation of the new one."
138
  "Please select a bpost parcel locker","Please select a bpost parcel locker"
140
  "Please select a delivery date","Please select a delivery date"
141
  "Please select a postcode or city first.","Please select a postal code or city first."
142
  "Please wait. Loading bpost map based on your address","Please wait. Loading bpost map based on your address"
143
+ "Product","Product"
144
  "Purchased From (Store)","Purchased From (Store)"
145
  "Purchased On","Purchased On"
146
+ "Rate type","Rate type"
147
+ "Rates","Rates"
148
  "Region/State","Region/State"
149
+ "Saturday delivery cost","Saturday delivery cost"
150
+ "Saturday delivery","Saturday delivery"
151
  "Saturday","Saturday"
 
152
  "Select All","Select All"
153
+ "Select one or more countries where bpost Home delivery international should be available for. Make sure your bpost shipping manager is configured properly. Otherwise no countries will be shown in this list after saving the 'Shipping Settings' configuration.","Select one or more countries where bpost Home delivery international should be available for. Make sure your bpost shipping manager is configured properly."
154
  "Select Visible","Select Visible"
155
  "Select your preferred delivery date","Select your preferred delivery date"
156
+ "Select","Select"
157
+ "send additional SMS notification","additional SMS next to standard email notification"
158
  "Send Email","Send Email"
159
+ "Sender boxnumber","Sender boxnumber"
160
+ "Sender city","Sender city"
161
+ "Sender company","Sender company"
162
+ "Sender country","Sender country"
163
+ "Sender email","Sender email"
164
+ "Sender name","Sender name"
165
+ "Sender phonenumber","Sender phonenumber"
166
+ "Sender postal code","Sender postal code"
167
+ "Sender streetname","Sender streetname"
168
+ "Sender streetnumber","Sender streetnumber"
169
+ "September","September"
170
  "Ship to Name","Ship to"
171
  "Shipment","Shipment"
172
  "Shipped with bpost generateLabelAndComplete","Shipped with bpost generateLabelAndComplete"
173
  "Shipping Price","Shipping Price"
174
+ "Signature","Signature"
175
  "Some of the selected orders are not ready to be shipped or have already been shipped","Some of the selected orders are not ready to be shipped or have already been shipped"
176
  "Something went wrong while processing order #%s","Something went wrong while processing order #%s"
177
  "Sorry","Sorry"
180
  "Successfully authenticated with bpost.","Successfully authenticated with bpost."
181
  "Successfully exported order(s). Download the file here: %s","Successfully exported order(s). Download the file here: %s"
182
  "Sunday","Sunday"
183
+ "Table rates condition","Table rates condition"
184
  "Table Rates","Table Rates"
185
  "The Bpost shipping method ","The bpost delivery method "
186
+ "The delivery happens against signature by the receiver. The parcel is delivered on Saturday if it is timely dropped in the bpost network.","The delivery happens against signature by the receiver. The parcel is delivered on Saturday if it is timely dropped in the bpost network."
187
+ "The delivery happens against signature by the receiver.","The delivery happens against signature by the receiver."
188
  "The email with return label has been sent to %s.","The email with return label has been sent to %s."
189
  "The file(s) could not be downloaded","The file(s) could not be downloaded"
190
  "The following delivery methods are currently supported:","The following delivery methods are currently supported:"
191
  "The order with id %s is not ready to be shipped or has already been shipped.","The order with id %s is not ready to be shipped or has already been shipped."
192
  "The order with id %s only has non-bpost shipments.","The order with id %s only has non-bpost shipments."
193
+ "The parcel is delivered on Saturday if it is timely dropped in the bpost network.","The parcel is delivered on Saturday if it is timely dropped in the bpost network."
194
+ "The passphrase you entered in bpost Shipping Manager back-office application. This is not the password used to access bpost portal.","The passphrase you entered in bpost Shipping Manager back-office application. This is not the password used to access bpost portal."
195
  "The requested file does not exist","The requested file does not exist"
196
  "This means that orders are automatically added to the bpost portal.","This means that orders are automatically added to the bpost portal."
197
  "Thursday","Thursday"
200
  "Type in a location","Type in a location"
201
  "Unselect All","Unselect All"
202
  "Unselect Visible","Unselect Visible"
203
+ "Upload your table rates configuration here. Refer to the manual for more information.","Upload your table rates configuration here. Refer to the manual for more information."
204
+ "Use Magento to manage labels","Use Magento to manage labels"
205
+ "Used in the webservice calls.","Used in the webservice calls."
206
+ "Used to calculate the weight before sending it to bpost","Used to calculate the weight before sending it to bpost"
207
+ "via E-mail","via E-mail"
208
+ "via SMS","via SMS"
209
  "View","View"
210
  "Wednesday","Wednesday"
211
  "When activated and correctly installed","When activated and correctly installed"
212
  "World Business","World Business"
213
  "World Express Pro","World Express Pro"
214
+ "You can use flat rate or calculated table rates.","You can use flat rate or calculated table rates."
215
+ "You need a user account from bpost to use this module. Call %s for more information.","You need a user account from bpost to use this module. Call %s for more information."
216
+ "Your 6 digits bpost account ID used for the Shipping Manager.<br/><a target='_blank' href='http://bpost.freshdesk.com/solution/articles/4000061189'>http://bpost.freshdesk.com/solution/articles/4000061189</a>","Your 6 digits bpost account ID used for the Shipping Manager.<br/><a target='_blank' href='http://bpost.freshdesk.com/solution/articles/4000061189'>http://bpost.freshdesk.com/solution/articles/4000061189</a>"
217
  "Your label has been generated and statuses have been changed.","Your label has been generated and statuses have been changed."
218
  "Your return has been generated and is available under -bpost Return labels- in this order.","Your return has been generated and is available under -bpost Return labels- in this order."
219
  "Your selected order is not ready to be shipped or has already been shipped","Your selected order is not ready to be shipped or has already been shipped"
220
+ "Zip/Postal Code","Zip/Postal Code"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/locale/nl_NL/Bpost_ShM.csv CHANGED
@@ -1,35 +1,42 @@
1
- "Monday","Maandag"
2
- "Tuesday","Dinsdag"
3
- "Wednesday","Woensdag"
4
- "Thursday","Donderdag"
5
- "Friday","Vrijdag"
6
- "Saturday","Zaterdag"
7
- "Sunday","Zondag"
8
- "January","Januari"
9
- "February","Februari"
10
- "March","Maart"
11
- "April","April"
12
- "May","Mei"
13
- "June","Juni"
14
- "July","Juli"
15
- "August","Augustus"
16
- "September","September"
17
- "October","Oktober"
18
- "November","November"
19
- "December","December"
20
  "# of Items","# Items"
21
  "%s label(s) have been generated and statuses have been changed.","%s label(s) gegenereerd en statussen gewijzigd."
22
  "%s orders already had downloaded labels.","Voor %s order(s) zijn de labels reeds gedownload."
23
  "(extra cost Saturday delivery: %s EUR)","(extra kost zaterdaglevering: %s EUR)"
 
 
24
  "A previous version of the bpost extension was detected!","Een oudere versie van de bpost extensie werd gedetecteerd!"
 
25
  "Action","Actie"
26
  "Actions","Acties"
 
27
  "All bposts orders","Alle bpost orders"
 
 
 
28
  "An error occurred while importing table rates.","Er heeft zich een fout voorgedaan bij het importeren van de prijzen."
 
 
 
 
 
29
  "Barcode #","Barcode #"
 
30
  "Bill to Name","Facturatie aan"
 
 
 
 
 
31
  "Bpost Shipping Manager is a service offered by Bpost","bpost Shipping Manager is een dienst aangeboden door bpost"
32
- "By using this option","Door deze optie te gebruiken"
 
 
 
 
 
 
 
 
33
  "Click here for more information","Klik hier voor meer informatie"
34
  "Click here to change the bpost parcel locker point.","Klik hier om de pakjesautomaat te wijzigen."
35
  "Click here to change the bpost pick-up point.","Klik hier om het afhaalpunt te wijzigen."
@@ -37,74 +44,150 @@
37
  "Click here to choose a bpost pick-up point.","Klik hier om een bpost afhaalpunt te kiezen."
38
  "Click here to track your bpost shipments.","Klik hier om uw bpost zendingen te volgen."
39
  "Closed","Gesloten"
 
40
  "Country","Land"
41
  "Date Created","Creatiedatum"
42
- "Delivery Date","Leveringsdatum"
 
43
  "Delivery at home or at the office","Levering thuis of op kantoor"
 
 
 
44
  "Delivery in a parcel locker","Levering in een pakjesautomaat"
45
  "Delivery in a pick-up point or postal office","Levering in een afhaalpunt"
 
46
  "Displays calculated delivery date in the frontend:","De berekende leveringsdatum wordt getoond in de frontend:"
47
- "Download","Download"
 
48
  "Download all undownloaded","Download verzendetiketten"
49
  "Download bpost label","Download bpost verzendetiket"
 
50
  "Drop date","Dropdatum"
51
  "Duplicate Row #%s (Country ","Duplicate rij #%s (Land "
52
  "Email","Email"
 
53
  "Error creating bpost order","Fout bij het aanmaken van bpost order"
54
  "Error while creating a bpost order for Magento order #%s. Please check your API log.","Fout bij aanmaken bpost order voor Magento order #%s. Gelieve de API log na te kijken."
55
- "Example","Voorbeeld"
56
  "Example screenshot of the bpost module.","Voorbeeldscherm van de bpost module."
 
57
  "Export CSV","Export CSV"
 
 
 
58
  "File has not been imported. See the following list of errors: %s","File werd niet geïmporteerd. Zie errorlijst: %s"
59
  "Filepath","Filepad"
60
  "Filter","Zoek"
 
 
 
 
61
  "Flat Rate","Flat Rate"
 
62
  "Friday","Vrijdag"
63
  "Furthermore","Bovendien"
64
  "G.T. (Purchased)","Orderbedrag"
 
65
  "Generate Label and Complete","Verzendetiket genereren"
 
 
 
 
 
66
  "How do you want to be notified when your parcel is available in the parcel locker?","Optionele services"
67
  "How do you want to be notified when your parcel is available in the pick-up point?","Hoe wilt u verwittigd worden wanneer uw pakje beschikbaar is in het afhaalpunt?"
68
  "I don","Ik niet"
69
  "I wish to use the reduced mobility zone","Gebruik de beperkte mobiliteitszone"
 
 
 
 
 
 
 
 
 
 
70
  "Import","Importeren"
 
 
 
 
 
 
71
  "Invalid %s ","Ongeldig %s "
72
  "Invalid Country ","Ongeldig land "
73
  "Invalid Region/State ","Ongeldige regio "
74
  "Invalid Shipping Price ","Verzendingskost ongeldig "
75
  "Invalid Table Rates File Format","Ongeldig fileformaat tablerates"
76
  "Invalid Table Rates format in the Row #%s","Ongeldig formaat table rates in rij #%s"
 
 
 
 
77
  "Label Barcode #","Barcode verzendetiket #"
78
  "Label download","Download verzendetiket"
 
 
 
 
79
  "Monday","Maandag"
80
- "No","Neen"
81
  "No bpost product configuration found for %s. Please check your bpost shipping manager for international delivery.","Geen bpost productconfiguratie gevonden voor %s. Gelieve de instellingen voor internationale zendingen te verifiëren in uw bpost Shipping Manager."
82
  "No label generated yet - please perform the ‘Generate Label and Complete’ action from the overview.","Nog geen verzendetiket gegenereerd - Gelieve eerst de actie ‘Verzendetiket genereren’ uit te voeren."
83
  "No label response received for Magento order #%s.","Geen antwoord ontvangen voor Magento order #%s."
84
  "No more hassle and 100% transparent!","Supereenvoudig en 100% transparent!"
85
  "No points could be found. Please use the filter above or drag the map to get a better result.","Er werden geen punten gevonden. Gebruik de zoekfunctionaliteit bovenaan of sleep de map naar de gewenste positie."
 
86
  "No undownloaded labels found.","Geen verzendetiketten gevonden die nog niet zijn gedownload."
 
 
 
 
 
87
  "Order #","Order #"
 
 
88
  "Pending bpost orders","bpost orders in behandeling"
 
89
  "Please remove or disable the old bpost extension prior to the installation of the new one.","Gelieve de oude bpost extensie te verwijderen of deactiveren vooraleer de nieuwe te installeren."
90
  "Please select a bpost parcel locker","Gelieve een pakjesautomaat te kiezen"
91
  "Please select a bpost pick-up point","Gelieve een afhaalpunt te kiezeen"
92
  "Please select a delivery date","Gelieve een leveringsdatum te kiezen"
93
  "Please select a postcode or city first.","Gelieve eerst een postcode of stad te kiezen."
94
  "Please wait. Loading bpost map based on your address","Gelieve te wachten. De bpost map wordt geladen voor uw adres"
 
95
  "Purchased From (Store)","Aangekocht vanuit (Winkel)"
96
  "Purchased On","Aangekocht op"
 
 
97
  "Region/State","Regio"
 
 
98
  "Saturday","Zaterdag"
99
- "Select","Selecteer"
100
  "Select All","Selecteer alle"
 
101
  "Select Visible","Selecteer zichtbare"
 
102
  "Select your preferred delivery date","Kies gewenste leveringsdatum"
 
 
103
  "Send Email","Verstuur email"
 
 
 
 
 
 
 
 
 
 
 
104
  "Ship to Name","Verzenden naar"
105
  "Shipment","Zending"
106
  "Shipped with bpost generateLabelAndComplete","Verzending via bpost genereer verzendetiket"
107
  "Shipping Price","Verzendkost"
 
108
  "Some of the selected orders are not ready to be shipped or have already been shipped","Eén of meerdere van de geselecteerde orders zijn niet klaar om te verzenden of zijn reeds verzonden"
109
  "Something went wrong while processing order #%s","Er is iets misgegaan bij de verwerking van order #%s"
110
  "Sorry","Sorry"
@@ -113,132 +196,45 @@
113
  "Successfully authenticated with bpost.","Succesvol geconnecteerd met bpost."
114
  "Successfully exported order(s). Download the file here: %s","Order(s) succesvol geëxporteerd. Download bestand hier: %s"
115
  "Sunday","Zondag"
 
116
  "Table Rates","Table Rates"
117
  "The Bpost shipping method ","bpost verzendmethode "
 
 
118
  "The email with return label has been sent to %s.","Email met retouretiket werd verstuurd naar %s."
119
  "The file(s) could not be downloaded","Het bestand/de bestanden konden niet worden gedownload"
120
  "The following delivery methods are currently supported:","Volgende leveringsmethoden worden momenteel ondersteund:"
121
  "The order with id %s is not ready to be shipped or has already been shipped.","Order %s is niet klaar om verzonden te worden of werd reeds verzonden."
122
  "The order with id %s only has non-bpost shipments.","Order %s bevat enkel niet-bpost zendingen."
 
 
 
123
  "The requested file does not exist","Het gevraagde bestand bestaat niet"
124
  "This means that orders are automatically added to the bpost portal.","Orders worden automatisch toegevoegd in het bpost portaal."
 
125
  "Thursday","Donderdag"
126
  "Track this shipment","Volg deze zending"
127
  "Tuesday","Dinsdag"
128
  "Type in a location","Voer een locatie in"
129
  "Unselect All","Deselecteer alle"
130
  "Unselect Visible","Deselecteer zichtbare"
 
 
 
 
 
 
131
  "View","Detail"
132
  "Wednesday","Woensdag"
133
  "When activated and correctly installed","Indien geactiveerd en correct geïnstalleerd"
134
  "World Business","World Business"
135
  "World Express Pro","World Express Pro"
 
 
 
136
  "Your label has been generated and statuses have been changed.","Verzendetiket gegenereerd en statussen aangepast."
137
  "Your return has been generated and is available under -bpost Return labels- in this order.","Retouretiket is gegenereerdand en beschikbaar onder -bpost retouretiketten- van dit order."
138
  "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."
139
  "Zip/Postal Code","Postcode"
140
- "bpost","bpost"
141
- "bpost Return Barcodes","bpost retouretiketten"
142
- "bpost Return Label","bpost retouretiket"
143
- "bpost Return Labels","bpost retouretiketten"
144
- "bpost status","bpost status"
145
- "items selected","geselecteerde items"
146
- "no telephone number found","geen telefoonnummer gevonden"
147
- "send additional SMS notification","extra SMS naast de standaard E-mail notificatie"
148
- "via E-mail","via E-mail"
149
- "via SMS","via SMS"
150
- "bpost Shipping Manager","bpost Shipping Manager"
151
- "Info text","Infotekst"
152
- "Logo","Logo"
153
- "Account id","Account id"
154
- "Passphrase","Passphrase"
155
- "The passphrase you entered in bpost Shipping Manager back-office application. This is not the password used to access bpost portal.","De passphrase die u heeft ingegeven in de Shipping Manager applicatie. Dit is niet het paswoord om in te loggen in het bpost portaal."
156
- "API url","API url"
157
- "Do not modify this setting if you are not 100% sure of what you are doing.","wijzig deze setting niet als u niet 100% zeker bent van de implicties"
158
- "Sender name","Naam afzender"
159
- "Used in the webservice calls.","Gebruikt in de webservice calls."
160
- "Sender company","Bedrijf afzender"
161
- "Sender streetname","Straatnaam afzender"
162
- "Sender streetnumber","Straatnummer afzender"
163
- "Sender boxnumber","Busnummer afzender"
164
- "Sender postal code","Postcode afzender"
165
- "Sender city","Stad afzender"
166
- "Sender country","Land afzender"
167
- "Sender email","E-mail afzender"
168
- "Sender phonenumber","Telefoonnummer afzender"
169
- "Use Magento to manage labels","Verzendetiketten beheren in Magento"
170
- "If you enable this option","Indien u deze optie activeert"
171
- "Label format","Formaat verzendetiket"
172
- "Automatic retour labels","Automatische retouretiketten"
173
- "Automatic track and trace information","Automatische track & trace informatie"
174
- "Display delivery date","Leveringsdatum tonen"
175
- "Displays calculated delivery date","Toont de leveringsdatum berekend door het systeem obv parameters door u ingegeven"
176
- "Days between order and shipment","Aantal dagen tussen order en verzending"
177
- "Choose delivery date","Kies leveringsdatum"
178
- "Number of delivery days shown","Aantal getoonde leveringsdagen"
179
- "Next day delivery allowed till","Levering volgende dag mogelijk tot"
180
- "Saturday delivery cost","Kost zaterdaglevering"
181
- "Google browser API key","Google browser API key"
182
- "Google server API key","Google server API key"
183
- "bpost Home delivery","bpost thuislevering"
184
- "General","Algemeen"
185
- "Enabled","Geactiveerd"
186
- "Rates","Rates"
187
- "Free shipping","Gratis verzendingFree shipping"
188
- ".. as of",".. vanaf"
189
- "Rate type","Rate type"
190
- "You can use flat rate or calculated table rates.","U kan een flat rate of table rates gebruiken."
191
- "Flat rate price","Flat rate prijs"
192
- "Importing and exporting table rates only possible on website scope. View the documentation for more information.","Table rates importeren en exporteren is enkel mogelijk op websiteniveau. Bekijk de documentatie voor meer info."
193
- "Fixed fee for bpost Home delivery shipments","Vaste prijs voor bpost thuislevering"
194
- "Table rates condition","Table rates condities"
195
- "Export table rates file","Exporeer table rates bestand"
196
- "Export your table rates configuration here.","Exporteer table rates configuratie."
197
- "Import table rates file","Importeer table rates bestand"
198
- "Upload your table rates configuration here. Refer to the manual for more information.","Upload table rates configuratie. Bekijk de handleiding voor meer info."
199
- "Options","Opties"
200
- "2nd presentation","2e aanbieding"
201
- "The delivery happens against signature by the receiver. The parcel is delivered on Saturday if it is timely dropped in the bpost network.","Levering na handtekening van de ontvanger. Het pakje wordt geleverd op zaterdag indien het tijdig wordt afgegeven in het bpost netwerk."
202
- "Insurance","Verzekering"
203
- "Insurance to insure your goods to a maximum of 500","Verzeker uw goederen tot een maximum van 500 euro"
204
- "Signature","Handtekening"
205
- "The delivery happens against signature by the receiver.","Levering na handtekening van de ontvanger."
206
- "Saturday delivery","Zaterdaglevering"
207
- "The parcel is delivered on Saturday if it is timely dropped in the bpost network.","Het pakje wordt geleverd op zaterdag indien het tijd wordt afgegeven in het bpost netwerk."
208
- "bpost Home delivery international","bpost internationale thuislevering"
209
- "Product","Product"
210
- "Import countries","Importeer landen"
211
- "Allowed countries","Toegelaten landen"
212
- "International insurance","Internationale verzekering"
213
- "Import your bpost configured countries here.","Importeer landen geconfigureerd in bpost Shipping Manager."
214
-
215
- "Your 6 digits bpost account ID used for the Shipping Manager.<br/><a target='_blank' href='http://bpost.freshdesk.com/solution/articles/4000061189'>http://bpost.freshdesk.com/solution/articles/4000061189</a>","Uw bpost Shipping Manager account ID bestaande uit 6 karakters.<br/><a target='_blank' href='http://bpost.freshdesk.com/solution/articles/4000061189'>http://bpost.freshdesk.com/solution/articles/4000061189</a>"
216
- "You need a user account from bpost to use this module. Call %s for more information.","U heeft een bpost account nodig om deze module te gebruiken. Bel %s voor meer informatie."
217
- "bpost uses Google Maps API to display the map in the frontend. <strong>
Note:</strong> This is optional if you will not meet the usage limits. Visit Google’s online documentation for more information.","bpost gebruikt de Google Maps API om de map in de frontend weer te geven. <strong>Opmerking:</strong> Dit is optioneel indien u de gebruikslimiet niet overschrijdt. Bekijk de online documentatie van Google voor meer informatie."
218
- "bpost uses Google Geocoding API to calculate GEO location based on the shipping address. <strong>
Note:</strong> This is optional if you will not meet the usage limits. Visit Google’s online documentation for more information.","bpost gebruikt de Google Geocoding API om de geolocatie te berekenen op basis van het verzendadres. <strong>Opmerking:</strong> Dit is optioneel indien u de gebruikslimiet niet overschrijdt. Bekijk de online documentatie van Google voor meer informatie."
219
- "Additional fee when using saturday delivery option, e.g.: 4.95.","Additionale kost voor zaterdaglevering, e.g.: 4.95."
220
- "If the order is placed after this cut-off time, an extra day is added to the displayed date. Order placed = end of checkout.","Indien het order bevestigd wordt na deze cut-off tijd, heeft dit een impact op de weergegeven leveringsdag(en). Order geplaatst = einde checkout."
221
- "Allow customer to choose their delivery date","Uw klant toelaten om de leveringsdatum te kiezen"
222
- "If you enable this option, the bpost Track & Trace link will be added in the Magento mail templates. It is always possible to manually send these emails.<br/><a href='http://bpost.freshdesk.com/solution/articles/4000061636' target='_blank'>http://bpost.freshdesk.com/solution/articles/4000061636</a>","Indien u deze optie activeert,zal er automatisch een bpost Track & Trace link toegevoegd worden aan de Magento mailtemplates. Het is dan ook nog steeds mogelijk deze mails manueel te verzenden.<br/><a href='http://bpost.freshdesk.com/solution/articles/4000061636' target='_blank'>http://bpost.freshdesk.com/solution/articles/4000061636</a>"
223
- "If you enable this option, a retour label is automatically added and printed when generating labels. If disabled, you are able to manually create retour labels.","If you enable this option, a retour label is automatically added and printed when generating labels. If disabled, you are able to manually create retour labels."
224
- "Choose between A6 or A4 format","Kies tussen A6 of A4 formaat voor het afdrukken van uw verzendetiketten"
225
- "If you enable this option, labels are generated directly within Magento. It is not needed to use the bpost Shipping Manager for these tasks.","Indien u deze optie activeert, worden verzendetiketten direct gegenereerd in Magento. Het is dan niet nodig om hiervoor de bpost Shipping Manager te gebruiken."
226
-
227
- "Delivery at your doorstep or at your office? bpack@home is the most convenient option for you!","Levering bij u thuis of op kantoor? Dan is bpost thuislevering de handigste leveringsmethode voor u!"
228
- "Allow free shipping","Gratis verzending toelaten"
229
- "Choose your rate type (Flat rate or Table rate)","Kies uw rate type (Flat rate of Table rate)"
230
- "Fixed fee for bpost Home delivery shipments, e.g.: 4.95.","Vaste prijs voor bpost thuislevering, ex: 4.95."
231
- "This options provides automatically a second presentation at the receiver's address should he be absent upon first presentation.","Automatische tweede aanbieding op het adres van de ontvanger indien deze afwezig is bij de levering."
232
- "Insurance to insure your goods to a maximum of 500,00 euro.","Verzekering voor uw goederen voor een maximumbedrag van 500 euro."
233
- "The parcel is delivered on Saturday if it is timely dropped in the bpost network.","Het pakje wordt geleverd op zaterdag indien het tijd wordt afgegeven in het bpost netwerk."
234
- "Delivery at your doorstep or at your office outside Belgium? bpack@international is the most convenient option for you!","Levering buiten België? Dan is bpack international de gepaste leveringsmethode!"
235
- "Select which product to use for international shipments","Selecteer het te gebruiken product voor internationale zendingen"
236
- "Fixed fee for bpost Home delivery international shipments, e.g.: 4.95.","Vaste prijs voor bpost internationale thuislevering, bv.: 4.95."
237
- "Select one or more countries where bpost Home delivery international should be available for. Make sure your bpost shipping manager is configured properly. Otherwise no countries will be shown in this list after saving the 'Shipping Settings' configuration.","Selecteer de landen voor dewelke bpost thuislevering internationaal beschikbaar dient te zijn. Verifieer ook dat uw bpost shipping manager correct geconfigureerd is, zoniet zullen er geen landen getoond worden in deze lijst"
238
- "Get your parcel delivered in one of our 1.250 pick-up points.","Laat uw pakje leveren in één van onze 1.250 afhaalpunten."
239
- "The parcel is delivered on Saturday if it is timely dropped in the bpost network.","Levering na handtekening van de ontvanger. Het pakje wordt geleverd op zaterdag indien het tijdig wordt afgegeven in het bpost netwerk."
240
- "Have your parcels delivered in one of our parcel lockers. Very convenient, centrally located, always open, 24/7!","Laat uw pakjes leveren in een pakjesautomaat. U vindt de automaten op handige plaatsen en ze zijn altijd open, 24/7!"
241
- "Belgium","België"
242
- "If you enable this option, a retour label is automatically added and printed when generating labels. If disabled, you are able to manually create retour labels.","Indien u deze optie activeert, wordt er automatisch een retouretiket gegenereerd en geprint bij het genereren van etiketten. Indien niet geactiveerd kan u nog steeds manueel retouretiketten genereren."
243
- "If you enable this option, labels are generated directly within Magento. It is not needed to use the bpost Shipping Manager for these tasks. Pop-ups must be enabled in your browser, in order to view the printed labels. Click <a href='http://bpost.freshdesk.com/solution/articles/4000061188' target='_blank'>here</a> to learn more about this option.","Indien u deze optie activeert, worden verzendetiketten direct gegenereerd in Magento. Het is dan niet nodig om de bpost Shipping Manager hiervoor te gebruiken. Let erop dat pop-ups gedeactiveerd dienen te zijn in uw browser om de geprinte labels te zien. Klik <a href='http://bpost.freshdesk.com/solution/articles/4000061188' target='_blank'>hier</a> om meer te weten over deze optie."
244
- "Used to calculate the weight before sending it to bpost","Gebruikt om het gewicht te berekenen voordat het naar bpost wordt gestuurd"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  "# of Items","# Items"
2
  "%s label(s) have been generated and statuses have been changed.","%s label(s) gegenereerd en statussen gewijzigd."
3
  "%s orders already had downloaded labels.","Voor %s order(s) zijn de labels reeds gedownload."
4
  "(extra cost Saturday delivery: %s EUR)","(extra kost zaterdaglevering: %s EUR)"
5
+ ".. as of",".. vanaf"
6
+ "2nd presentation","2e aanbieding"
7
  "A previous version of the bpost extension was detected!","Een oudere versie van de bpost extensie werd gedetecteerd!"
8
+ "Account id","Account id"
9
  "Action","Actie"
10
  "Actions","Acties"
11
+ "Additional fee when using saturday delivery option, e.g.: 4.95.","Additionale kost voor zaterdaglevering, e.g.: 4.95."
12
  "All bposts orders","Alle bpost orders"
13
+ "Allow customer to choose their delivery date","Uw klant toelaten om de leveringsdatum te kiezen"
14
+ "Allow free shipping","Gratis verzending toelaten"
15
+ "Allowed countries","Toegelaten landen"
16
  "An error occurred while importing table rates.","Er heeft zich een fout voorgedaan bij het importeren van de prijzen."
17
+ "API url","API url"
18
+ "April","April"
19
+ "August","Augustus"
20
+ "Automatic retour labels","Automatische retouretiketten"
21
+ "Automatic track and trace information","Automatische track & trace informatie"
22
  "Barcode #","Barcode #"
23
+ "Belgium","België"
24
  "Bill to Name","Facturatie aan"
25
+ "bpost Home delivery international","bpost internationale thuislevering"
26
+ "bpost Home delivery","bpost thuislevering"
27
+ "bpost Return Barcodes","bpost retouretiketten"
28
+ "bpost Return Label","bpost retouretiket"
29
+ "bpost Return Labels","bpost retouretiketten"
30
  "Bpost Shipping Manager is a service offered by Bpost","bpost Shipping Manager is een dienst aangeboden door bpost"
31
+ "bpost Shipping Manager","bpost Shipping Manager"
32
+ "bpost status","bpost status"
33
+ "bpost uses Google Geocoding API to calculate GEO location based on the shipping address. <strong>
Note:</strong> This is optional if you will not meet the usage limits. Visit Google’s online documentation for more information.","bpost gebruikt de Google Geocoding API om de geolocatie te berekenen op basis van het verzendadres. <strong>Opmerking:</strong> Dit is optioneel indien u de gebruikslimiet niet overschrijdt. Bekijk de online documentatie van Google voor meer informatie."
34
+ "bpost uses Google Maps API to display the map in the frontend. <strong>
Note:</strong> This is optional if you will not meet the usage limits. Visit Google’s online documentation for more information.","bpost gebruikt de Google Maps API om de map in de frontend weer te geven. <strong>Opmerking:</strong> Dit is optioneel indien u de gebruikslimiet niet overschrijdt. Bekijk de online documentatie van Google voor meer informatie."
35
+ "bpost","bpost"
36
+ "By using this option, customers with reduced mobility can use the lockers of the machine easiest to reach.","Door deze optie te kiezen, kunnen klanten met beperkte mobiliteit gebruiken maken van de lockers van de makkelijkst bereikbare pakjesautomaat."
37
+ "Choose between A6 or A4 format","Kies tussen A6 of A4 formaat voor het afdrukken van uw verzendetiketten"
38
+ "Choose delivery date","Kies leveringsdatum"
39
+ "Choose your rate type (Flat rate or Table rate)","Kies uw rate type (Flat rate of Table rate)"
40
  "Click here for more information","Klik hier voor meer informatie"
41
  "Click here to change the bpost parcel locker point.","Klik hier om de pakjesautomaat te wijzigen."
42
  "Click here to change the bpost pick-up point.","Klik hier om het afhaalpunt te wijzigen."
44
  "Click here to choose a bpost pick-up point.","Klik hier om een bpost afhaalpunt te kiezen."
45
  "Click here to track your bpost shipments.","Klik hier om uw bpost zendingen te volgen."
46
  "Closed","Gesloten"
47
+ "Close","Sluiten"
48
  "Country","Land"
49
  "Date Created","Creatiedatum"
50
+ "Days between order and shipment","Aantal dagen tussen order en verzending"
51
+ "December","December"
52
  "Delivery at home or at the office","Levering thuis of op kantoor"
53
+ "Delivery at your doorstep or at your office outside Belgium? bpack@international is the most convenient option for you!","Levering buiten België? Dan is bpack international de gepaste leveringsmethode!"
54
+ "Delivery at your doorstep or at your office? bpack@home is the most convenient option for you!","Levering bij u thuis of op kantoor? Dan is bpost thuislevering de handigste leveringsmethode voor u!"
55
+ "Delivery Date","Leveringsdatum"
56
  "Delivery in a parcel locker","Levering in een pakjesautomaat"
57
  "Delivery in a pick-up point or postal office","Levering in een afhaalpunt"
58
+ "Display delivery date","Leveringsdatum tonen"
59
  "Displays calculated delivery date in the frontend:","De berekende leveringsdatum wordt getoond in de frontend:"
60
+ "Displays calculated delivery date","Toont de leveringsdatum berekend door het systeem obv parameters door u ingegeven"
61
+ "Do not modify this setting if you are not 100% sure of what you are doing.","wijzig deze setting niet als u niet 100% zeker bent van de implicties"
62
  "Download all undownloaded","Download verzendetiketten"
63
  "Download bpost label","Download bpost verzendetiket"
64
+ "Download","Download"
65
  "Drop date","Dropdatum"
66
  "Duplicate Row #%s (Country ","Duplicate rij #%s (Land "
67
  "Email","Email"
68
+ "Enabled","Geactiveerd"
69
  "Error creating bpost order","Fout bij het aanmaken van bpost order"
70
  "Error while creating a bpost order for Magento order #%s. Please check your API log.","Fout bij aanmaken bpost order voor Magento order #%s. Gelieve de API log na te kijken."
 
71
  "Example screenshot of the bpost module.","Voorbeeldscherm van de bpost module."
72
+ "Example","Voorbeeld"
73
  "Export CSV","Export CSV"
74
+ "Export table rates file","Exporeer table rates bestand"
75
+ "Export your table rates configuration here.","Exporteer table rates configuratie."
76
+ "February","Februari"
77
  "File has not been imported. See the following list of errors: %s","File werd niet geïmporteerd. Zie errorlijst: %s"
78
  "Filepath","Filepad"
79
  "Filter","Zoek"
80
+ "Fixed fee for bpost Home delivery international shipments, e.g.: 4.95.","Vaste prijs voor bpost internationale thuislevering, bv.: 4.95."
81
+ "Fixed fee for bpost Home delivery shipments","Vaste prijs voor bpost thuislevering"
82
+ "Fixed fee for bpost Home delivery shipments, e.g.: 4.95.","Vaste prijs voor bpost thuislevering, ex: 4.95."
83
+ "Flat rate price","Flat rate prijs"
84
  "Flat Rate","Flat Rate"
85
+ "Free shipping","Gratis verzendingFree shipping"
86
  "Friday","Vrijdag"
87
  "Furthermore","Bovendien"
88
  "G.T. (Purchased)","Orderbedrag"
89
+ "General","Algemeen"
90
  "Generate Label and Complete","Verzendetiket genereren"
91
+ "Get your parcel delivered in one of our 1.250 pick-up points.","Laat uw pakje leveren in één van onze 1.250 afhaalpunten."
92
+ "Google browser API key","Google browser API key"
93
+ "Google server API key","Google server API key"
94
+ "Have your parcels delivered in one of our parcel lockers. Very convenient, centrally located, always open, 24/7!","Laat uw pakjes leveren in een pakjesautomaat. U vindt de automaten op handige plaatsen en ze zijn altijd open, 24/7!"
95
+ "Home delivery","Thuislevering"
96
  "How do you want to be notified when your parcel is available in the parcel locker?","Optionele services"
97
  "How do you want to be notified when your parcel is available in the pick-up point?","Hoe wilt u verwittigd worden wanneer uw pakje beschikbaar is in het afhaalpunt?"
98
  "I don","Ik niet"
99
  "I wish to use the reduced mobility zone","Gebruik de beperkte mobiliteitszone"
100
+ "If the order is placed after this cut-off time, an extra day is added to the displayed date. Order placed = end of checkout.","Indien het order bevestigd wordt na deze cut-off tijd, heeft dit een impact op de weergegeven leveringsdag(en). Order geplaatst = einde checkout."
101
+ "If you enable this option","Indien u deze optie activeert"
102
+ "If you enable this option, a retour label is automatically added and printed when generating labels. If disabled, you are able to manually create retour labels.","If you enable this option, a retour label is automatically added and printed when generating labels. If disabled, you are able to manually create retour labels."
103
+ "If you enable this option, a retour label is automatically added and printed when generating labels. If disabled, you are able to manually create retour labels.","Indien u deze optie activeert, wordt er automatisch een retouretiket gegenereerd en geprint bij het genereren van etiketten. Indien niet geactiveerd kan u nog steeds manueel retouretiketten genereren."
104
+ "If you enable this option, labels are generated directly within Magento. It is not needed to use the bpost Shipping Manager for these tasks. Pop-ups must be enabled in your browser, in order to view the printed labels. Click <a href='http://bpost.freshdesk.com/solution/articles/4000061188' target='_blank'>here</a> to learn more about this option.","Indien u deze optie activeert, worden verzendetiketten direct gegenereerd in Magento. Het is dan niet nodig om de bpost Shipping Manager hiervoor te gebruiken. Let erop dat pop-ups gedeactiveerd dienen te zijn in uw browser om de geprinte labels te zien. Klik <a href='http://bpost.freshdesk.com/solution/articles/4000061188' target='_blank'>hier</a> om meer te weten over deze optie."
105
+ "If you enable this option, labels are generated directly within Magento. It is not needed to use the bpost Shipping Manager for these tasks.","Indien u deze optie activeert, worden verzendetiketten direct gegenereerd in Magento. Het is dan niet nodig om hiervoor de bpost Shipping Manager te gebruiken."
106
+ "If you enable this option, the bpost Track & Trace link will be added in the Magento mail templates. It is always possible to manually send these emails.<br/><a href='http://bpost.freshdesk.com/solution/articles/4000061636' target='_blank'>http://bpost.freshdesk.com/solution/articles/4000061636</a>","Indien u deze optie activeert,zal er automatisch een bpost Track & Trace link toegevoegd worden aan de Magento mailtemplates. Het is dan ook nog steeds mogelijk deze mails manueel te verzenden.<br/><a href='http://bpost.freshdesk.com/solution/articles/4000061636' target='_blank'>http://bpost.freshdesk.com/solution/articles/4000061636</a>"
107
+ "Import countries","Importeer landen"
108
+ "Import table rates file","Importeer table rates bestand"
109
+ "Import your bpost configured countries here.","Importeer landen geconfigureerd in bpost Shipping Manager."
110
  "Import","Importeren"
111
+ "Importing and exporting table rates only possible on website scope. View the documentation for more information.","Table rates importeren en exporteren is enkel mogelijk op websiteniveau. Bekijk de documentatie voor meer info."
112
+ "Info text","Infotekst"
113
+ "Insurance to insure your goods to a maximum of 500","Verzeker uw goederen tot een maximum van 500 euro"
114
+ "Insurance to insure your goods to a maximum of 500,00 euro.","Verzekering voor uw goederen voor een maximumbedrag van 500 euro."
115
+ "Insurance","Verzekering"
116
+ "International insurance","Internationale verzekering"
117
  "Invalid %s ","Ongeldig %s "
118
  "Invalid Country ","Ongeldig land "
119
  "Invalid Region/State ","Ongeldige regio "
120
  "Invalid Shipping Price ","Verzendingskost ongeldig "
121
  "Invalid Table Rates File Format","Ongeldig fileformaat tablerates"
122
  "Invalid Table Rates format in the Row #%s","Ongeldig formaat table rates in rij #%s"
123
+ "items selected","geselecteerde items"
124
+ "January","Januari"
125
+ "July","Juli"
126
+ "June","Juni"
127
  "Label Barcode #","Barcode verzendetiket #"
128
  "Label download","Download verzendetiket"
129
+ "Label format","Formaat verzendetiket"
130
+ "Logo","Logo"
131
+ "March","Maart"
132
+ "May","Mei"
133
  "Monday","Maandag"
134
+ "Next day delivery allowed till","Levering volgende dag mogelijk tot"
135
  "No bpost product configuration found for %s. Please check your bpost shipping manager for international delivery.","Geen bpost productconfiguratie gevonden voor %s. Gelieve de instellingen voor internationale zendingen te verifiëren in uw bpost Shipping Manager."
136
  "No label generated yet - please perform the ‘Generate Label and Complete’ action from the overview.","Nog geen verzendetiket gegenereerd - Gelieve eerst de actie ‘Verzendetiket genereren’ uit te voeren."
137
  "No label response received for Magento order #%s.","Geen antwoord ontvangen voor Magento order #%s."
138
  "No more hassle and 100% transparent!","Supereenvoudig en 100% transparent!"
139
  "No points could be found. Please use the filter above or drag the map to get a better result.","Er werden geen punten gevonden. Gebruik de zoekfunctionaliteit bovenaan of sleep de map naar de gewenste positie."
140
+ "no telephone number found","geen telefoonnummer gevonden"
141
  "No undownloaded labels found.","Geen verzendetiketten gevonden die nog niet zijn gedownload."
142
+ "No","Neen"
143
+ "November","November"
144
+ "Number of delivery days shown","Aantal getoonde leveringsdagen"
145
+ "October","Oktober"
146
+ "Options","Opties"
147
  "Order #","Order #"
148
+ "Parcel locker","Pakjesautomaat"
149
+ "Passphrase","Passphrase"
150
  "Pending bpost orders","bpost orders in behandeling"
151
+ "Pick-up point","Afhaalpunt"
152
  "Please remove or disable the old bpost extension prior to the installation of the new one.","Gelieve de oude bpost extensie te verwijderen of deactiveren vooraleer de nieuwe te installeren."
153
  "Please select a bpost parcel locker","Gelieve een pakjesautomaat te kiezen"
154
  "Please select a bpost pick-up point","Gelieve een afhaalpunt te kiezeen"
155
  "Please select a delivery date","Gelieve een leveringsdatum te kiezen"
156
  "Please select a postcode or city first.","Gelieve eerst een postcode of stad te kiezen."
157
  "Please wait. Loading bpost map based on your address","Gelieve te wachten. De bpost map wordt geladen voor uw adres"
158
+ "Product","Product"
159
  "Purchased From (Store)","Aangekocht vanuit (Winkel)"
160
  "Purchased On","Aangekocht op"
161
+ "Rate type","Rate type"
162
+ "Rates","Rates"
163
  "Region/State","Regio"
164
+ "Saturday delivery cost","Kost zaterdaglevering"
165
+ "Saturday delivery","Zaterdaglevering"
166
  "Saturday","Zaterdag"
 
167
  "Select All","Selecteer alle"
168
+ "Select one or more countries where bpost Home delivery international should be available for. Make sure your bpost shipping manager is configured properly. Otherwise no countries will be shown in this list after saving the 'Shipping Settings' configuration.","Selecteer de landen voor dewelke bpost thuislevering internationaal beschikbaar dient te zijn. Verifieer ook dat uw bpost shipping manager correct geconfigureerd is, zoniet zullen er geen landen getoond worden in deze lijst"
169
  "Select Visible","Selecteer zichtbare"
170
+ "Select which product to use for international shipments","Selecteer het te gebruiken product voor internationale zendingen"
171
  "Select your preferred delivery date","Kies gewenste leveringsdatum"
172
+ "Select","Selecteer"
173
+ "send additional SMS notification","extra SMS naast de standaard E-mail notificatie"
174
  "Send Email","Verstuur email"
175
+ "Sender boxnumber","Busnummer afzender"
176
+ "Sender city","Stad afzender"
177
+ "Sender company","Bedrijf afzender"
178
+ "Sender country","Land afzender"
179
+ "Sender email","E-mail afzender"
180
+ "Sender name","Naam afzender"
181
+ "Sender phonenumber","Telefoonnummer afzender"
182
+ "Sender postal code","Postcode afzender"
183
+ "Sender streetname","Straatnaam afzender"
184
+ "Sender streetnumber","Straatnummer afzender"
185
+ "September","September"
186
  "Ship to Name","Verzenden naar"
187
  "Shipment","Zending"
188
  "Shipped with bpost generateLabelAndComplete","Verzending via bpost genereer verzendetiket"
189
  "Shipping Price","Verzendkost"
190
+ "Signature","Handtekening"
191
  "Some of the selected orders are not ready to be shipped or have already been shipped","Eén of meerdere van de geselecteerde orders zijn niet klaar om te verzenden of zijn reeds verzonden"
192
  "Something went wrong while processing order #%s","Er is iets misgegaan bij de verwerking van order #%s"
193
  "Sorry","Sorry"
196
  "Successfully authenticated with bpost.","Succesvol geconnecteerd met bpost."
197
  "Successfully exported order(s). Download the file here: %s","Order(s) succesvol geëxporteerd. Download bestand hier: %s"
198
  "Sunday","Zondag"
199
+ "Table rates condition","Table rates condities"
200
  "Table Rates","Table Rates"
201
  "The Bpost shipping method ","bpost verzendmethode "
202
+ "The delivery happens against signature by the receiver. The parcel is delivered on Saturday if it is timely dropped in the bpost network.","Levering na handtekening van de ontvanger. Het pakje wordt geleverd op zaterdag indien het tijdig wordt afgegeven in het bpost netwerk."
203
+ "The delivery happens against signature by the receiver.","Levering na handtekening van de ontvanger."
204
  "The email with return label has been sent to %s.","Email met retouretiket werd verstuurd naar %s."
205
  "The file(s) could not be downloaded","Het bestand/de bestanden konden niet worden gedownload"
206
  "The following delivery methods are currently supported:","Volgende leveringsmethoden worden momenteel ondersteund:"
207
  "The order with id %s is not ready to be shipped or has already been shipped.","Order %s is niet klaar om verzonden te worden of werd reeds verzonden."
208
  "The order with id %s only has non-bpost shipments.","Order %s bevat enkel niet-bpost zendingen."
209
+ "The parcel is delivered on Saturday if it is timely dropped in the bpost network.","Het pakje wordt geleverd op zaterdag indien het tijd wordt afgegeven in het bpost netwerk."
210
+ "The parcel is delivered on Saturday if it is timely dropped in the bpost network.","Levering na handtekening van de ontvanger. Het pakje wordt geleverd op zaterdag indien het tijdig wordt afgegeven in het bpost netwerk."
211
+ "The passphrase you entered in bpost Shipping Manager back-office application. This is not the password used to access bpost portal.","De passphrase die u heeft ingegeven in de Shipping Manager applicatie. Dit is niet het paswoord om in te loggen in het bpost portaal."
212
  "The requested file does not exist","Het gevraagde bestand bestaat niet"
213
  "This means that orders are automatically added to the bpost portal.","Orders worden automatisch toegevoegd in het bpost portaal."
214
+ "This options provides automatically a second presentation at the receiver's address should he be absent upon first presentation.","Automatische tweede aanbieding op het adres van de ontvanger indien deze afwezig is bij de levering."
215
  "Thursday","Donderdag"
216
  "Track this shipment","Volg deze zending"
217
  "Tuesday","Dinsdag"
218
  "Type in a location","Voer een locatie in"
219
  "Unselect All","Deselecteer alle"
220
  "Unselect Visible","Deselecteer zichtbare"
221
+ "Upload your table rates configuration here. Refer to the manual for more information.","Upload table rates configuratie. Bekijk de handleiding voor meer info."
222
+ "Use Magento to manage labels","Verzendetiketten beheren in Magento"
223
+ "Used in the webservice calls.","Gebruikt in de webservice calls."
224
+ "Used to calculate the weight before sending it to bpost","Gebruikt om het gewicht te berekenen voordat het naar bpost wordt gestuurd"
225
+ "via E-mail","via E-mail"
226
+ "via SMS","via SMS"
227
  "View","Detail"
228
  "Wednesday","Woensdag"
229
  "When activated and correctly installed","Indien geactiveerd en correct geïnstalleerd"
230
  "World Business","World Business"
231
  "World Express Pro","World Express Pro"
232
+ "You can use flat rate or calculated table rates.","U kan een flat rate of table rates gebruiken."
233
+ "You need a user account from bpost to use this module. Call %s for more information.","U heeft een bpost account nodig om deze module te gebruiken. Bel %s voor meer informatie."
234
+ "Your 6 digits bpost account ID used for the Shipping Manager.<br/><a target='_blank' href='http://bpost.freshdesk.com/solution/articles/4000061189'>http://bpost.freshdesk.com/solution/articles/4000061189</a>","Uw bpost Shipping Manager account ID bestaande uit 6 karakters.<br/><a target='_blank' href='http://bpost.freshdesk.com/solution/articles/4000061189'>http://bpost.freshdesk.com/solution/articles/4000061189</a>"
235
  "Your label has been generated and statuses have been changed.","Verzendetiket gegenereerd en statussen aangepast."
236
  "Your return has been generated and is available under -bpost Return labels- in this order.","Retouretiket is gegenereerdand en beschikbaar onder -bpost retouretiketten- van dit order."
237
  "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."
238
  "Zip/Postal Code","Postcode"
239
+ "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."
240
+ "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."
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
js/bpost/.DS_Store DELETED
Binary file
js/bpost/shm/checkout.js CHANGED
@@ -315,10 +315,16 @@ Bpost.ShM = Class.create({
315
  var pickDates = '<ul>';
316
  var datepickArray = dates;
317
  var dates = datepickArray[currMethod];
318
- var addClass = '';
319
-
320
  for (var i = 0; i < dates.length; i++) {
321
- pickDates += '<li><label for="bpost-datepicker-'+i+'"><input type="radio" name="bpost[deliverydate]" id="bpost-datepicker-'+i+'" value="'+dates[i]['date']+'" /> '+dates[i]['date_format']+'</label></li>';
 
 
 
 
 
 
 
 
322
  }
323
  //add hidden input for validation message position
324
  pickDates += '<li><input type="radio" name="bpost[deliverydate]" class="validate-multiple-delivery-dates" id="bpost-datepicker-advice" style="display: none;" /></li>';
@@ -345,7 +351,6 @@ Bpost.ShM = Class.create({
345
  //saturday delivery option
346
  if(datepickArray[currMethod]['is_saturday']) {
347
  $$('.bpost-saturday-delivery')[0].style.display = 'block';
348
-
349
  if($('bpost-saturday').checked) {
350
  displayDate.innerHTML = datepickArray[currMethod]['next_date_format'];
351
  displayDate.style.display = 'block';
@@ -561,7 +566,7 @@ Bpost.ShM = Class.create({
561
  '</div>' +
562
  '</form></div>';
563
  this.html_clear = '<div style="clear:both;"></div>';
564
- this.html_close = '<div class="bpost-close-wrapper"><a class="bpost-close btn-bpost">Close</a></div>';
565
  this.html_list = '<ul class="list" id="bpostlist"></ul>';
566
  this.html_map = '<div id="map-canvas" class="map"></div>';
567
  this.html_loading = '<div class="bpost_loading"><span class="ajaxloading"></span><div class="image"></div><span class="bpost-please-wait">' + this.settings.label_loading + '</span></div>';
@@ -746,7 +751,7 @@ Bpost.ShM = Class.create({
746
  '<p>' + this.json.poilist.Poi[i].Record.Street + ' ' + this.json.poilist.Poi[i].Record.Number +
747
  '<br />' + this.json.poilist.Poi[i].Record.Zip + ' ' + this.json.poilist.Poi[i].Record.City +
748
  '</p><ul class="hours"></ul>' +
749
- '<a href="#" data-shopid="' + this.json.poilist.Poi[i].Record.Id + '" class="selectspot">Select &raquo;</a>');
750
 
751
  //add opening hours
752
  spots.push({
315
  var pickDates = '<ul>';
316
  var datepickArray = dates;
317
  var dates = datepickArray[currMethod];
 
 
318
  for (var i = 0; i < dates.length; i++) {
319
+ var date = new Date(dates[i]['date']);
320
+ window.clickVar = "";
321
+ if(date.getDay() == 6){
322
+ clickVar="window.isSaturdaySelected = true;";
323
+ }
324
+ else{
325
+ clickVar="window.isSaturdaySelected = false;";
326
+ }
327
+ pickDates += '<li><label for="bpost-datepicker-'+i+'"><input type="radio" name="bpost[deliverydate]" onclick="'+clickVar+'" id="bpost-datepicker-'+i+'" value="'+dates[i]['date']+'" /> '+dates[i]['date_format']+'</label></li>';
328
  }
329
  //add hidden input for validation message position
330
  pickDates += '<li><input type="radio" name="bpost[deliverydate]" class="validate-multiple-delivery-dates" id="bpost-datepicker-advice" style="display: none;" /></li>';
351
  //saturday delivery option
352
  if(datepickArray[currMethod]['is_saturday']) {
353
  $$('.bpost-saturday-delivery')[0].style.display = 'block';
 
354
  if($('bpost-saturday').checked) {
355
  displayDate.innerHTML = datepickArray[currMethod]['next_date_format'];
356
  displayDate.style.display = 'block';
566
  '</div>' +
567
  '</form></div>';
568
  this.html_clear = '<div style="clear:both;"></div>';
569
+ this.html_close = '<div class="bpost-close-wrapper"><a class="bpost-close btn-bpost">'+this.settings.close_label+'</a></div>';
570
  this.html_list = '<ul class="list" id="bpostlist"></ul>';
571
  this.html_map = '<div id="map-canvas" class="map"></div>';
572
  this.html_loading = '<div class="bpost_loading"><span class="ajaxloading"></span><div class="image"></div><span class="bpost-please-wait">' + this.settings.label_loading + '</span></div>';
751
  '<p>' + this.json.poilist.Poi[i].Record.Street + ' ' + this.json.poilist.Poi[i].Record.Number +
752
  '<br />' + this.json.poilist.Poi[i].Record.Zip + ' ' + this.json.poilist.Poi[i].Record.City +
753
  '</p><ul class="hours"></ul>' +
754
+ '<a href="#" data-shopid="' + this.json.poilist.Poi[i].Record.Id + '" class="selectspot">'+this.settings.label_select+' &raquo;</a>');
755
 
756
  //add opening hours
757
  spots.push({
js/bpost/shm/onestepcheckout_shipping.js CHANGED
@@ -12,7 +12,7 @@ Bpost.ShM.addMethods({
12
  overlayOpacity: 0.65,
13
  fade: true,
14
  fadeDuration: 0.3,
15
- position: 'center_once'
16
  });
17
 
18
 
@@ -44,7 +44,6 @@ Bpost.ShM.addMethods({
44
  this.placeDates(this.settings.datepicker_days, currMethod);
45
  }
46
  }
47
-
48
  this.selectPickupPointLinkClick = this.selectPickupPointLinkClick.bind(this);
49
  this.resolveSettings = this.resolveSettings.bind(this);
50
  this.openInline = this.openInline.bind(this);
@@ -81,7 +80,7 @@ Bpost.ShM.addMethods({
81
  anchor: new google.maps.Point(24, 36)
82
  };
83
  this.mapOptions = {
84
- zoom: 11,
85
  panControl: false,
86
  zoomControl: true,
87
  zoomControlOptions: {
@@ -128,11 +127,13 @@ Bpost.ShM.addMethods({
128
  }
129
 
130
  initialized = true;
 
 
 
131
  },
132
  selectPickupPointLinkClick: function () {
133
  //set shipping parameters
134
  this.setShippingParameters();
135
-
136
  //first check if all necessary parameters are set
137
  if(shippingParameters["address_id"] == null && shippingParameters["postcode"] == "" && shippingParameters["city"] == ""){
138
  alert(this.settings.onestepcheckout_shipping_address_error);
@@ -229,5 +230,61 @@ Bpost.ShM.addMethods({
229
  });
230
  }
231
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
232
  }
233
  })
12
  overlayOpacity: 0.65,
13
  fade: true,
14
  fadeDuration: 0.3,
15
+ position: 'center'
16
  });
17
 
18
 
44
  this.placeDates(this.settings.datepicker_days, currMethod);
45
  }
46
  }
 
47
  this.selectPickupPointLinkClick = this.selectPickupPointLinkClick.bind(this);
48
  this.resolveSettings = this.resolveSettings.bind(this);
49
  this.openInline = this.openInline.bind(this);
80
  anchor: new google.maps.Point(24, 36)
81
  };
82
  this.mapOptions = {
83
+ zoom: 13,
84
  panControl: false,
85
  zoomControl: true,
86
  zoomControlOptions: {
127
  }
128
 
129
  initialized = true;
130
+ if(this.settings.datepicker_display && this.settings.datepicker_choose) {
131
+ window.isSaturdaySelected = false;
132
+ }
133
  },
134
  selectPickupPointLinkClick: function () {
135
  //set shipping parameters
136
  this.setShippingParameters();
 
137
  //first check if all necessary parameters are set
138
  if(shippingParameters["address_id"] == null && shippingParameters["postcode"] == "" && shippingParameters["city"] == ""){
139
  alert(this.settings.onestepcheckout_shipping_address_error);
230
  });
231
  }
232
  }
233
+ }, placeDates: function (dates, currMethod) {
234
+
235
+ $$('.bpost-saturday-delivery')[0].style.display = 'none';
236
+ if(this.settings.datepicker_display && this.settings.datepicker_choose) {
237
+ $$('input[name="bpost[deliverydate]"]')[0].remove();
238
+
239
+ var pickDates = '<ul>';
240
+ var datepickArray = dates;
241
+ var dates = datepickArray[currMethod];
242
+ var saturdayPresent = false;
243
+ for (var i = 0; i < dates.length; i++) {
244
+ var date = new Date(dates[i]['date']);
245
+ window.clickVar = "";
246
+ if(date.getDay() == 6){
247
+ clickVar="window.isSaturdaySelected = true;";
248
+ }
249
+ else{
250
+ clickVar="window.isSaturdaySelected = false;";
251
+ }
252
+ pickDates += '<li><label for="bpost-datepicker-'+i+'"><input type="radio" name="bpost[deliverydate]" class="deliveryDates" onclick="'+clickVar+' triggerAjaxCallGetSeparateSaveMethods(\''+window.onestepcheckout_set_methods_separate+'\', false);" id="bpost-datepicker-'+i+'" value="'+dates[i]['date']+'" /> '+dates[i]['date_format']+'</label></li>';
253
+ }
254
+ //add hidden input for validation message position
255
+ pickDates += '<li><input type="radio" name="bpost[deliverydate]" class="validate-multiple-delivery-dates" id="bpost-datepicker-advice" style="display: none;" /></li>';
256
+ pickDates += '</ul>';
257
+
258
+ var chooseDate = $$('.bpost-choose-deliverydate')[0];
259
+ chooseDate.innerHTML = pickDates;
260
+ chooseDate.style.display = 'block';
261
+
262
+ } else if(this.settings.datepicker_display && !this.settings.datepicker_choose) {
263
+ var displayDate = $$('.bpost-display-deliverydate')[0];
264
+ var datepickArray = dates;
265
+
266
+ displayDate.innerHTML = datepickArray[currMethod]['date_format'];
267
+ displayDate.style.display = 'block';
268
+
269
+ //var inputElement = '<input type="hidden" name="bpost[deliverydate]" vale="'+datepickArray[currMethod]['date']+'"/>';
270
+ $$('input[name="bpost[deliverydate]"]')[0].value = datepickArray[currMethod]['date'];
271
+
272
+ if($('bpost-saturday-hidden') != undefined) {
273
+ $('bpost-saturday-hidden').remove();
274
+ }
275
+
276
+ //saturday delivery option
277
+ if(datepickArray[currMethod]['is_saturday']) {
278
+ $$('.bpost-saturday-delivery')[0].style.display = 'block';
279
+ if($('bpost-saturday').checked) {
280
+ displayDate.innerHTML = datepickArray[currMethod]['next_date_format'];
281
+ displayDate.style.display = 'block';
282
+ $$('input[name="bpost[deliverydate]"]')[0].value = datepickArray[currMethod]['next_date'];
283
+ } else {
284
+ //create hidden input if not checked but a saturday
285
+ $('bpost-saturday').insert({before: '<input type="hidden" name="bpost_saturday_delivery" id="bpost-saturday-hidden" value="" />'})
286
+ }
287
+ }
288
+ }
289
  }
290
  })
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>bpost</name>
4
- <version>1.0.0</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>Added translate Files and Emails</notes>
12
  <authors><author><name>PHPro</name><user>heremke</user><email>info@phpro.be</email></author></authors>
13
- <date>2015-09-08</date>
14
- <time>12:13:00</time>
15
- <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="e6c3e54711425d46a791a96b52d79a48"/></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="a1fbaee1e57a9a4dba925580658cbaf3"/><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="5d0634a86abf898610004f73d7ed5453"/></dir><file name="PendingOrders.php" hash="584198acc69c0fad60ac793238ca6c8f"/></dir><dir name="Shipping"><dir name="Carrier"><dir name="Bpost"><dir name="Tablerate"><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="Choose.php" hash="ef813927a3ba26302cd8e4c7c5fb62a8"/><file name="Hour.php" hash="763b955bff596cddf2ceabd4ce85816d"/><file name="Info.php" hash="421631d66f10176e4cca80d30df625eb"/><file name="Logo.php" hash="30d8127ce79649b4cbe228a05fa4205f"/><file name="Subheader.php" hash="1af7b5ce235f4f422ab53e281db3cf6f"/></dir><dir name="Tablerates"><dir name="Export"><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="a196d872fecee3f7c827d0d7da376d70"/></dir></dir><dir name="Controller"><dir name="ShM"><file name="Order.php" hash="43e2745bb676dbf8c1dedf14e00ecc20"/></dir><file name=".DS_Store" hash="3e624abbe850356dc518e8d865bb05a8"/></dir><dir name="Helper"><file name="Data.php" hash="6ff03d18bda4b66d52d2f2e029004b29"/><file name="Returnlabel.php" hash="8b27e238d29e7b577389231433167141"/><dir name="System"><file name="Config.php" hash="393353ca26ef2b398769ecbb59fdcbf9"/></dir></dir><dir name="Model"><dir name="Adminhtml"><file name="Bpostgrid.php" hash="2e7dea3d2bca7bd82de70f3e6105bb82"/><file name="Observer.php" hash="e40fbb7a4ad7338f88084eed36f59cc1"/><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Shipping"><dir name="Tablerates"><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="e2f0cd25ed8a1bb1e12171269f1ba6d9"/><file name="Shipping.php" hash="a19f622f5f64ee64c8f8e6667d6d9323"/></dir></dir></dir></dir><dir name="Api"><file name="Abstract.php" hash="1c174f96ada592113660356946094fa1"/><file name="Domcreator.php" hash="5491fa04ddc57c285a80857e6b7010e5"/></dir><file name="Api.php" hash="604467308efa121de1fbcd0a31894411"/><file name="Country.php" hash="7ca2d7fee06b4672ee8679dcc0d437cf"/><file name="Holidays.php" hash="85d3ad2c06516d3bd42d6cf25b6c1c1b"/><file name="Observer.php" hash="d99af84f32e787428703159d40081773"/><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="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="72e3631e3106cc8710270092c7f23ed1"/><dir name="Shipping"><dir name="Carrier"><file name="BpostShM.php" hash="e2ea2a1a71bf4dd21b497cdfc7cd0637"/></dir><file name="Geocode.php" hash="fe2273974154557204395f79c688be52"/><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="Homedelivery.php" hash="d60385de528eb957a2874af6306d4aae"/><file name="International.php" hash="d02e02a7cddbda576530d6acbd6d02e8"/><file name="Parcellocker.php" hash="805a9669f9d024a4c018d611e5c71afd"/><file name="Pickuppoint.php" hash="49dff9f40e26163b8d0c6b8be9f6ee51"/></dir><file name=".DS_Store" hash="0047fe0bc161a58c6088a4e959de43a4"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Bpost"><dir name="ShM"><file name="AllOrdersController.php" hash="01d0f8d2ec4180d854f18f913c8c164b"/><file name="ConfigController.php" hash="4162396a6ba56e940420fd9fe2c6ec5e"/><file name="DownloadController.php" hash="922f7565761811017a51882fb81d5669"/><file name="PendingOrdersController.php" hash="4589f63b6bf06850fe32c0b2160dab5a"/></dir></dir></dir><file name="AjaxController.php" hash="5319019be27bb45d40d536d086e74dec"/></dir><dir name="etc"><file name="adminhtml.xml" hash="cba525a2c3c394cb15c144f887e081cc"/><file name="config.xml" hash="f1f88eee1c4de171aa7bec7eb6150265"/><file name="system.xml" hash="e19af914361223c8c62c2b33542d7fb0"/></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="3366e57552fa19433772709a557d2ed3"/><file name="upgrade-0.0.8-0.0.9.php" hash="20a344294274390515a891a89facfcb3"/><file name="upgrade-0.0.9-0.0.10.php" hash="064df8d78b82bc05d44041af93ca1bff"/><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="e9f9ecec20e2f5e05e44db2dc153bd56"/><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"/></dir><file name=".DS_Store" hash="247fda627329429624d4c2a70ecd2548"/></dir><file name=".DS_Store" hash="4af56bbb3c9888516482dd6c916f7f0e"/></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="7950f7c44cc1b2a10846611251a37501"/></dir></dir><dir name="template"><dir name="bpost"><dir name="shm"><file name="append_bpost_shippingmethod.phtml" hash="1cfb8adf326ab846a01ad0de4215c42c"/><file name="gmapsapi.phtml" hash="8a5119f27b9537f9ede57ead12403a32"/></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="6df815c54e85758ff196e1da7cf529ff"/><dir name="template"><dir name="email"><dir name="bpost"><file name="returnlabel.html" hash="c006eca772b567c6eefddbe04238eef7"/><file name="errorhandling_create_order.html" hash="5458114b6bfee6f66841f4fe19e13675"/></dir></dir></dir></dir><dir name="fr_DR"><file name="Bpost_ShM.csv" hash=""/></dir><dir name="nl_NL"><file name="Bpost_ShM.csv" hash="b1598134c8742456df3a3e66450d5ccf"/></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="eec1d106f5e3a0bd91e6ab14809646a9"/><file name="onestepcheckout_shipping.js" hash="29903124602caaf62ad16cdcf7661239"/></dir><file name=".DS_Store" hash="9cb5eec7f2c81769f587e6bea95ca5e7"/></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="cca98b2e3ab7dbbb223ab269ab4b3001"/></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_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="ae2876b7d0d3daf156ec55f3772fab8d"/></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="ce01062469cdb18ba03c76c129912c00"/></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>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>bpost</name>
4
+ <version>1.0.1</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>Translations and Bugfixing</notes>
12
  <authors><author><name>PHPro</name><user>heremke</user><email>info@phpro.be</email></author></authors>
13
+ <date>2015-09-17</date>
14
+ <time>15:33:58</time>
15
+ <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="042d1860e8cbed473f36344cc9219bf7"/></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="a1fbaee1e57a9a4dba925580658cbaf3"/><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="bcdc263143e9d4c104b6014da45373f6"/></dir><file name="PendingOrders.php" hash="584198acc69c0fad60ac793238ca6c8f"/></dir><dir name="Shipping"><dir name="Carrier"><dir name="Bpost"><dir name="Tablerate"><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="Choose.php" hash="ef813927a3ba26302cd8e4c7c5fb62a8"/><file name="Hour.php" hash="763b955bff596cddf2ceabd4ce85816d"/><file name="Info.php" hash="421631d66f10176e4cca80d30df625eb"/><file name="Logo.php" hash="30d8127ce79649b4cbe228a05fa4205f"/><file name="Subheader.php" hash="1af7b5ce235f4f422ab53e281db3cf6f"/></dir><dir name="Tablerates"><dir name="Export"><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="6f58e340cfb76e37b7c3eb2155f6c5d7"/></dir></dir><dir name="Controller"><dir name="ShM"><file name="Order.php" hash="5ed0d85c210e731f7c2baa152281a1c4"/></dir></dir><dir name="Helper"><file name="Data.php" hash="73198954d969fee953ac78b1e3d4881e"/><file name="Returnlabel.php" hash="8b27e238d29e7b577389231433167141"/><dir name="System"><file name="Config.php" hash="393353ca26ef2b398769ecbb59fdcbf9"/></dir></dir><dir name="Model"><dir name="Adminhtml"><file name="Bpostgrid.php" hash="43d4c6679ef90dea08323cec7980495f"/><file name="Observer.php" hash="e40fbb7a4ad7338f88084eed36f59cc1"/><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Shipping"><dir name="Tablerates"><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="e2f0cd25ed8a1bb1e12171269f1ba6d9"/><file name="Shipping.php" hash="a19f622f5f64ee64c8f8e6667d6d9323"/></dir></dir></dir></dir><dir name="Api"><file name="Abstract.php" hash="1c174f96ada592113660356946094fa1"/><file name="Domcreator.php" hash="8e49b4e6aedba6c8c5f516d1bdb4c1ef"/></dir><file name="Api.php" hash="604467308efa121de1fbcd0a31894411"/><file name="Country.php" hash="7ca2d7fee06b4672ee8679dcc0d437cf"/><file name="Holidays.php" hash="85d3ad2c06516d3bd42d6cf25b6c1c1b"/><file name="Observer.php" hash="564e97b865f5229c4a8a300e5e7dc397"/><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="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="72e3631e3106cc8710270092c7f23ed1"/><dir name="Shipping"><dir name="Carrier"><file name="BpostShM.php" hash="e9f253c4821f6f311098298d0b942764"/></dir><file name="Geocode.php" hash="fe2273974154557204395f79c688be52"/><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="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="01d0f8d2ec4180d854f18f913c8c164b"/><file name="ConfigController.php" hash="4162396a6ba56e940420fd9fe2c6ec5e"/><file name="DownloadController.php" hash="922f7565761811017a51882fb81d5669"/><file name="PendingOrdersController.php" hash="4589f63b6bf06850fe32c0b2160dab5a"/></dir></dir></dir><file name="AjaxController.php" hash="5319019be27bb45d40d536d086e74dec"/></dir><dir name="etc"><file name="adminhtml.xml" hash="cba525a2c3c394cb15c144f887e081cc"/><file name="config.xml" hash="400349a42c504a4bcb7785a434a19ee0"/><file name="system.xml" hash="e19af914361223c8c62c2b33542d7fb0"/></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="3366e57552fa19433772709a557d2ed3"/><file name="upgrade-0.0.8-0.0.9.php" hash="20a344294274390515a891a89facfcb3"/><file name="upgrade-0.0.9-0.0.10.php" hash="064df8d78b82bc05d44041af93ca1bff"/><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="e9f9ecec20e2f5e05e44db2dc153bd56"/><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"/></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="7950f7c44cc1b2a10846611251a37501"/></dir></dir><dir name="template"><dir name="bpost"><dir name="shm"><file name="append_bpost_shippingmethod.phtml" hash="e55ca434e8fd22bccdf1914f3e5292ee"/><file name="gmapsapi.phtml" hash="8a5119f27b9537f9ede57ead12403a32"/></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="dc2696cafa7691c1a02c3fb7e6fcfea8"/><dir name="template"><dir name="email"><dir name="bpost"><file name="returnlabel.html" hash="c006eca772b567c6eefddbe04238eef7"/><file name="errorhandling_create_order.html" hash="5458114b6bfee6f66841f4fe19e13675"/></dir></dir></dir></dir><dir name="fr_DR"><file name="Bpost_ShM.csv" hash=""/></dir><dir name="nl_NL"><file name="Bpost_ShM.csv" hash="45850c54dbcc2c621617d93b526003eb"/></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="d83462f10d2dbf8451744e53f2f51ae9"/><file name="onestepcheckout_shipping.js" hash="1d6f538fff8b36ba3958584747e835de"/></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="b085e5c58f8068bbb491eb9b929db40d"/></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_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="b593635d5c0f5964c5bb34e27c66da92"/></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="ce01062469cdb18ba03c76c129912c00"/></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>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>
skin/frontend/base/default/css/bpost/checkout.css CHANGED
@@ -406,19 +406,6 @@ ul#bpostlist li .city {
406
  font-size: 12px;
407
  }
408
 
409
- @media only screen and (max-width: 667px) {
410
- #map-canvas {
411
- display: none;
412
- }
413
- #bpostlist {
414
- width: 100% !important;
415
- }
416
-
417
- .bpost-input-box .input {
418
- width: 80%;
419
- }
420
- }
421
-
422
  #bpostDelivery {
423
  display: none;
424
  width: 100%;
@@ -573,3 +560,42 @@ ul#bpostlist li .city {
573
  #bpostShm #notifications-parcel-locker h5, #bpostShm #notifications-pick-up-point h5, #bpostDelivery h5{
574
  color:#dc002e;
575
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
406
  font-size: 12px;
407
  }
408
 
 
 
 
 
 
 
 
 
 
 
 
 
 
409
  #bpostDelivery {
410
  display: none;
411
  width: 100%;
560
  #bpostShm #notifications-parcel-locker h5, #bpostShm #notifications-pick-up-point h5, #bpostDelivery h5{
561
  color:#dc002e;
562
  }
563
+
564
+ /* ********************* */
565
+ /* ***Media queries*** */
566
+ /* ********************* */
567
+
568
+ @media only screen and (max-width: 667px) {
569
+ #map-canvas {
570
+ display: none;
571
+ }
572
+ #bpostlist {
573
+ width: 100% !important;
574
+ }
575
+
576
+ .bpost-input-box .input {
577
+ width: 80%;
578
+ }
579
+ }
580
+
581
+ @media only screen and (max-width: 760px) {
582
+
583
+ .onestepcheckout-index-index #map-canvas {
584
+ display: none;
585
+ }
586
+
587
+ .onestepcheckout-index-index #bpostlist {
588
+ width: 100% !important;
589
+ }
590
+
591
+ .onestepcheckout-index-index .bpost-input-box .input {
592
+ width: 80%;
593
+ }
594
+ .onestepcheckout-index-index #bpost-info-wrapper{
595
+ width:100%;
596
+ }
597
+ .onestepcheckout-index-index div#bpostinfo ul.list{
598
+ margin-top:15px;
599
+ }
600
+
601
+ }
skin/frontend/base/default/js/bpost/onestepcheckout.js CHANGED
@@ -6,15 +6,30 @@ get_separate_save_methods_function = function get_separate_save_methods_function
6
 
7
  return function(e) {
8
  triggerAjaxCallGetSeparateSaveMethods(url, update_payments);
9
- }
10
  }
11
 
12
  triggerAjaxCallGetSeparateSaveMethods = function (url, update_payments){
 
 
 
 
 
 
13
  var saturdayDelivery = 0;
14
-
 
 
 
15
  //if undefined, page load
16
- if($('bpost-saturday')){
17
- if($('bpost-saturday').checked ){
 
 
 
 
 
 
18
  saturdayDelivery = 1;
19
  }
20
  }
@@ -26,9 +41,6 @@ triggerAjaxCallGetSeparateSaveMethods = function (url, update_payments){
26
  update_payments = false;
27
  }
28
  }
29
-
30
- var form = $('onestepcheckout-form');
31
- var shipping_method = $RF(form, 'shipping_method');
32
  var payment_method = $RF(form, 'payment[method]');
33
  var totals = get_totals_element();
34
 
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
+ if( window.bpostSettings){
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
  }
41
  update_payments = false;
42
  }
43
  }
 
 
 
44
  var payment_method = $RF(form, 'payment[method]');
45
  var totals = get_totals_element();
46