bpost - Version 1.3.1

Version Notes

Multiple account bug and mysql error fix

Download this release

Release Info

Developer PHPro
Extension bpost
Version 1.3.1
Comparing to
See all releases


Code changes from version 1.3.0 to 1.3.1

Files changed (15) hide show
  1. app/code/community/Bpost/ShM/Block/Adminhtml/Sales/AllOrders/Grid.php +20 -10
  2. app/code/community/Bpost/ShM/Block/Adminhtml/Sales/Grid.php +3 -2
  3. app/code/community/Bpost/ShM/Block/Adminhtml/Sales/PendingOrders/Grid.php +21 -11
  4. app/code/community/Bpost/ShM/Block/Carrier/Bpost.php +1 -1
  5. app/code/community/Bpost/ShM/Helper/Data.php +3 -1
  6. app/code/community/Bpost/ShM/Model/Adminhtml/Bpostgrid.php +4 -2
  7. app/code/community/Bpost/ShM/Model/Adminhtml/Observer.php +3 -2
  8. app/code/community/Bpost/ShM/Model/Api.php +2 -1
  9. app/code/community/Bpost/ShM/Model/Api/Abstract.php +13 -6
  10. app/code/community/Bpost/ShM/Model/Observer.php +2 -1
  11. app/code/community/Bpost/ShM/Model/Returnlabel.php +3 -1
  12. app/code/community/Bpost/ShM/Model/Shipping/Carrier/BpostShM.php +12 -8
  13. app/code/community/Bpost/ShM/etc/config.xml +1 -1
  14. package.xml +6 -6
  15. skin/frontend/base/default/images/bpost/.DS_Store +0 -0
app/code/community/Bpost/ShM/Block/Adminhtml/Sales/AllOrders/Grid.php CHANGED
@@ -21,17 +21,27 @@ class Bpost_ShM_Block_Adminhtml_Sales_AllOrders_Grid extends Bpost_ShM_Block_Adm
21
  */
22
  protected function _prepareCollection()
23
  {
 
24
  $collection = Mage::getResourceModel('sales/order_grid_collection');
25
- $collection->getSelect()->join(Mage::getConfig()->getTablePrefix() . 'sales_flat_order as sfo', 'sfo.entity_id=`main_table`.entity_id', array(
26
- 'shipping_method' => 'shipping_method',
27
- 'total_qty_ordered' => 'ROUND(total_qty_ordered,0)',
28
- 'bpost_label_exported' => 'bpost_label_exported',
29
- 'bpost_label_exists' => 'bpost_label_exists',
30
- 'bpost_drop_date' => 'bpost_drop_date',
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();
21
  */
22
  protected function _prepareCollection()
23
  {
24
+ /** @var Mage_Sales_Model_Resource_Order_Grid_Collection $collection */
25
  $collection = Mage::getResourceModel('sales/order_grid_collection');
26
+ $collection->getSelect()->join(
27
+ Mage::getConfig()->getTablePrefix() . 'sales_flat_order as sfo',
28
+ 'sfo.entity_id=`main_table`.entity_id',
29
+ array(
30
+ 'shipping_method' => 'shipping_method',
31
+ 'total_qty_ordered' => 'ROUND(sfo.total_qty_ordered,0)',
32
+ 'bpost_label_exported' => 'bpost_label_exported',
33
+ 'bpost_label_exists' => 'bpost_label_exists',
34
+ 'bpost_drop_date' => 'bpost_drop_date',
35
+ 'bpost_status' => 'bpost_status',
36
+ 'state' => 'state'
37
+ )
38
+ );
39
+ $collection->addExpressionFieldToSelect(
40
+ 'shipping_customer_name',
41
+ "IF(sfo.shipping_method='bpostshm_bpost_international', CONCAT('International: ', main_table.shipping_name), main_table.shipping_name)" ,
42
+ 'shipping_customer_name'
43
+ );
44
+ $collection->addAttributeToFilter('sfo.shipping_method', array('like' => '%bpostshm%'));
45
  $this->setCollection($collection);
46
 
47
  parent::_prepareCollection();
app/code/community/Bpost/ShM/Block/Adminhtml/Sales/Grid.php CHANGED
@@ -21,7 +21,6 @@ class Bpost_ShM_Block_Adminhtml_Sales_Grid extends Mage_Adminhtml_Block_Widget_G
21
  $this->getCollection()->getSize();
22
 
23
  if ($this->getCollection()) {
24
- $this->getCollection()->addExpressionFieldToSelect('shipping_customer_name', "IF(shipping_method='bpostshm_bpost_international', CONCAT('International: ', shipping_name), shipping_name)" ,'shipping_customer_name');
25
  $this->getCollection()->getSelect()->joinLeft(Mage::getConfig()->getTablePrefix() . 'sales_flat_shipment as sfs', 'sfs.order_id=`main_table`.entity_id', array(
26
  'bpost_label_path' => 'bpost_label_path',
27
  ))->group('main_table.entity_id');
@@ -37,6 +36,8 @@ class Bpost_ShM_Block_Adminhtml_Sales_Grid extends Mage_Adminhtml_Block_Widget_G
37
  */
38
  protected function _prepareColumns()
39
  {
 
 
40
  $helper = Mage::helper('bpost_shm');
41
  $this->addColumn('real_order_id', array(
42
  'header' => $helper->__('Order #'),
@@ -108,7 +109,7 @@ class Bpost_ShM_Block_Adminhtml_Sales_Grid extends Mage_Adminhtml_Block_Widget_G
108
  'options' => array('1' => 'Yes', '0' => 'No'),
109
  'filter_index' => 'sfo.bpost_label_exists'
110
  ));
111
- if (Mage::getStoreConfig('shipping/bpost_shm/display_delivery_date')) {
112
  $this->addColumn('bpost_drop_date', array(
113
  'header' => $helper->__('Drop date'),
114
  'index' => 'bpost_drop_date',
21
  $this->getCollection()->getSize();
22
 
23
  if ($this->getCollection()) {
 
24
  $this->getCollection()->getSelect()->joinLeft(Mage::getConfig()->getTablePrefix() . 'sales_flat_shipment as sfs', 'sfs.order_id=`main_table`.entity_id', array(
25
  'bpost_label_path' => 'bpost_label_path',
26
  ))->group('main_table.entity_id');
36
  */
37
  protected function _prepareColumns()
38
  {
39
+ $configHelper = Mage::helper('bpost_shm/system_config');
40
+
41
  $helper = Mage::helper('bpost_shm');
42
  $this->addColumn('real_order_id', array(
43
  'header' => $helper->__('Order #'),
109
  'options' => array('1' => 'Yes', '0' => 'No'),
110
  'filter_index' => 'sfo.bpost_label_exists'
111
  ));
112
+ if ($configHelper->getBpostShippingConfig('display_delivery_date', Mage::app()->getStore()->getId())) {
113
  $this->addColumn('bpost_drop_date', array(
114
  'header' => $helper->__('Drop date'),
115
  'index' => 'bpost_drop_date',
app/code/community/Bpost/ShM/Block/Adminhtml/Sales/PendingOrders/Grid.php CHANGED
@@ -22,22 +22,32 @@ class Bpost_ShM_Block_Adminhtml_Sales_PendingOrders_Grid extends Bpost_ShM_Block
22
  protected function _prepareCollection()
23
  {
24
  $collection = Mage::getResourceModel('sales/order_grid_collection');
25
- $collection->getSelect()->join(Mage::getConfig()->getTablePrefix() . 'sales_flat_order as sfo', 'sfo.entity_id=`main_table`.entity_id', array(
26
- 'shipping_method' => 'shipping_method',
27
- 'total_qty_ordered' => 'ROUND(total_qty_ordered,0)',
28
- 'bpost_label_exported' => 'bpost_label_exported',
29
- 'bpost_label_exists' => 'bpost_label_exists',
30
- 'bpost_drop_date' => 'bpost_drop_date',
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);
38
  parent::_prepareCollection();
39
 
40
- if (Mage::getStoreConfig('shipping/bpost_shm/display_delivery_date')) {
 
41
  $this->_setCollectionOrder($this->_columns['bpost_drop_date']);
42
  }
43
 
22
  protected function _prepareCollection()
23
  {
24
  $collection = Mage::getResourceModel('sales/order_grid_collection');
25
+ $collection->getSelect()->join(
26
+ Mage::getConfig()->getTablePrefix() . 'sales_flat_order as sfo',
27
+ 'sfo.entity_id=`main_table`.entity_id',
28
+ array(
29
+ 'shipping_method' => 'shipping_method',
30
+ 'total_qty_ordered' => 'ROUND(sfo.total_qty_ordered,0)',
31
+ 'bpost_label_exported' => 'bpost_label_exported',
32
+ 'bpost_label_exists' => 'bpost_label_exists',
33
+ 'bpost_drop_date' => 'bpost_drop_date',
34
+ 'bpost_status' => 'bpost_status',
35
+ 'state' => 'state'
36
+ )
37
+ );
38
+ $collection->addExpressionFieldToSelect(
39
+ 'shipping_customer_name',
40
+ "IF(sfo.shipping_method='bpostshm_bpost_international', CONCAT('International: ', main_table.shipping_name), main_table.shipping_name)" ,
41
+ 'shipping_customer_name'
42
+ );
43
+ $collection->addAttributeToFilter('sfo.shipping_method', array('like' => '%bpostshm%'));
44
  $collection->addAttributeToFilter('main_table.status', array('nin' => array('complete', 'closed', 'canceled')));
45
 
46
  $this->setCollection($collection);
47
  parent::_prepareCollection();
48
 
49
+ $configHelper = Mage::helper('bpost_shm/system_config');
50
+ if ($configHelper->getBpostShippingConfig('display_delivery_date', $this->getStore())) {
51
  $this->_setCollectionOrder($this->_columns['bpost_drop_date']);
52
  }
53
 
app/code/community/Bpost/ShM/Block/Carrier/Bpost.php CHANGED
@@ -54,7 +54,7 @@ class Bpost_ShM_Block_Carrier_Bpost extends Mage_Core_Block_Template
54
  "location_postpoint_default_image" => $this->getSkinUrl('images/bpost/location_postpoint_default.png'),
55
  "location_parcellocker_default_image" => $this->getSkinUrl('images/bpost/location_parcellocker_default.png'),
56
  "location_clickcollect_default_image" => $this->getSkinUrl('images/bpost/location_clickcollect_default.png'),
57
- "location_clickcollect_custom_image" => (Mage::getStoreConfig('carriers/bpost_clickcollect/marker') ? Mage::getBaseUrl('media') . "bpost/" . $configHelper->getBpostCarriersConfig("marker", "bpost_clickcollect", Mage::app()->getStore()->getId()) : ""),
58
  "base_url" => Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK, Mage::app()->getStore()->isCurrentlySecure()),
59
  "datepicker_display" => (bool)$configHelper->getBpostShippingConfig("display_delivery_date", Mage::app()->getStore()->getId()),
60
  "datepicker_choose" => (bool)$configHelper->getBpostShippingConfig("choose_delivery_date", Mage::app()->getStore()->getId()),
54
  "location_postpoint_default_image" => $this->getSkinUrl('images/bpost/location_postpoint_default.png'),
55
  "location_parcellocker_default_image" => $this->getSkinUrl('images/bpost/location_parcellocker_default.png'),
56
  "location_clickcollect_default_image" => $this->getSkinUrl('images/bpost/location_clickcollect_default.png'),
57
+ "location_clickcollect_custom_image" => ($configHelper->getBpostCarriersConfig('marker', 'bpost_clickcollect', Mage::app()->getStore()->getId()) ? Mage::getBaseUrl('media') . "bpost/" . $configHelper->getBpostCarriersConfig("marker", "bpost_clickcollect", Mage::app()->getStore()->getId()) : ""),
58
  "base_url" => Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK, Mage::app()->getStore()->isCurrentlySecure()),
59
  "datepicker_display" => (bool)$configHelper->getBpostShippingConfig("display_delivery_date", Mage::app()->getStore()->getId()),
60
  "datepicker_choose" => (bool)$configHelper->getBpostShippingConfig("choose_delivery_date", Mage::app()->getStore()->getId()),
app/code/community/Bpost/ShM/Helper/Data.php CHANGED
@@ -284,7 +284,9 @@ class Bpost_ShM_Helper_Data extends Mage_Core_Helper_Abstract
284
  * @return boolean|string
285
  */
286
  public function getBpostStatus($order){
287
- $apiModel = Mage::getModel("bpost_shm/api", true);
 
 
288
  $apiResponse = $apiModel->retrieveOrderDetails($order);
289
 
290
  if(!$apiResponse){
284
  * @return boolean|string
285
  */
286
  public function getBpostStatus($order){
287
+ /** @var Bpost_ShM_Model_Api $apiModel */
288
+ $apiModel = Mage::getModel('bpost_shm/api');
289
+ $apiModel->initialize($order->getStoreId());
290
  $apiResponse = $apiModel->retrieveOrderDetails($order);
291
 
292
  if(!$apiResponse){
app/code/community/Bpost/ShM/Model/Adminhtml/Bpostgrid.php CHANGED
@@ -243,7 +243,8 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer
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) {
@@ -268,7 +269,8 @@ class Bpost_ShM_Model_Adminhtml_Bpostgrid extends Varien_Event_Observer
268
  $bpostHelper = Mage::helper("bpost_shm");
269
  $pdfName = null;
270
 
271
- $webserviceModel = Mage::getModel("bpost_shm/api", true);
 
272
  $response = $webserviceModel->createLabelByOrder($order, $this->_addReturnLabels);
273
 
274
  if ($response) {
243
  {
244
  $bpostHelper = Mage::helper("bpost_shm");
245
 
246
+ $webserviceModel = Mage::getModel('bpost_shm/api');
247
+ $webserviceModel->initialize($order->getStoreId());
248
  $response = $webserviceModel->createOrder($order);
249
 
250
  if (!$response) {
269
  $bpostHelper = Mage::helper("bpost_shm");
270
  $pdfName = null;
271
 
272
+ $webserviceModel = Mage::getModel('bpost_shm/api');
273
+ $webserviceModel->initialize($order->getStoreId());
274
  $response = $webserviceModel->createLabelByOrder($order, $this->_addReturnLabels);
275
 
276
  if ($response) {
app/code/community/Bpost/ShM/Model/Adminhtml/Observer.php CHANGED
@@ -169,11 +169,12 @@ class Bpost_ShM_Model_Adminhtml_Observer extends Varien_Event_Observer
169
 
170
  protected function _checkAndTriggerClickCollect($apiResponseBody){
171
  $xml = simplexml_load_string($apiResponseBody);
 
172
  foreach ($xml->deliveryMethod as $deliveryMethodData) {
173
  if($deliveryMethodData['name'] == "Click & Collect" && $deliveryMethodData['visiblity'] == "VISIBLE"){
174
  Mage::getConfig()->saveConfig('carriers/bpost_clickcollect/activated', '1');
175
  Mage::getConfig()->saveConfig('carriers/bpost_clickcollect/active', '1');
176
- if(Mage::getStoreConfig('carriers/bpost_clickcollect/marker') == ""){
177
 
178
  $src = Mage::getBaseDir('skin') .
179
  DS . 'frontend' .
@@ -192,7 +193,7 @@ class Bpost_ShM_Model_Adminhtml_Observer extends Varien_Event_Observer
192
  Mage::app()->getCacheInstance()->cleanType('config');
193
  return $this;
194
  }
195
- elseif(Mage::getStoreConfig('carriers/bpost_clickcollect/activated') == 1){
196
  Mage::getConfig()->saveConfig('carriers/bpost_clickcollect/activated', '0');
197
  Mage::getConfig()->saveConfig('carriers/bpost_clickcollect/active', '0');
198
  Mage::app()->getCacheInstance()->cleanType('config');
169
 
170
  protected function _checkAndTriggerClickCollect($apiResponseBody){
171
  $xml = simplexml_load_string($apiResponseBody);
172
+ $configHelper = Mage::helper('bpost_shm/system_config');
173
  foreach ($xml->deliveryMethod as $deliveryMethodData) {
174
  if($deliveryMethodData['name'] == "Click & Collect" && $deliveryMethodData['visiblity'] == "VISIBLE"){
175
  Mage::getConfig()->saveConfig('carriers/bpost_clickcollect/activated', '1');
176
  Mage::getConfig()->saveConfig('carriers/bpost_clickcollect/active', '1');
177
+ if($configHelper->getBpostCarriersConfig('marker', 'bpost_clickcollect') == ""){
178
 
179
  $src = Mage::getBaseDir('skin') .
180
  DS . 'frontend' .
193
  Mage::app()->getCacheInstance()->cleanType('config');
194
  return $this;
195
  }
196
+ elseif($configHelper->getBpostCarriersConfig('activated', 'bpost_clickcollect') == 1){
197
  Mage::getConfig()->saveConfig('carriers/bpost_clickcollect/activated', '0');
198
  Mage::getConfig()->saveConfig('carriers/bpost_clickcollect/active', '0');
199
  Mage::app()->getCacheInstance()->cleanType('config');
app/code/community/Bpost/ShM/Model/Api.php CHANGED
@@ -67,7 +67,8 @@ class Bpost_ShM_Model_Api extends Bpost_ShM_Model_Api_Abstract
67
 
68
  //now we create a new dom element
69
  //we use the domcreator class for this
70
- $domCreator = Mage::getModel("bpost_shm/api_domcreator", true);
 
71
  $document = $domCreator->getCreateOrderDomDocument($order, $returnOrder);
72
 
73
  $errorHandlingData = array("request_name" => "createOrder", "order_id" => $order->getIncrementId());
67
 
68
  //now we create a new dom element
69
  //we use the domcreator class for this
70
+ $domCreator = Mage::getModel("bpost_shm/api_domcreator");
71
+ $domCreator->initialize($order->getStoreId());
72
  $document = $domCreator->getCreateOrderDomDocument($order, $returnOrder);
73
 
74
  $errorHandlingData = array("request_name" => "createOrder", "order_id" => $order->getIncrementId());
app/code/community/Bpost/ShM/Model/Api/Abstract.php CHANGED
@@ -52,13 +52,20 @@ class Bpost_ShM_Model_Api_Abstract extends Mage_Core_Model_Abstract
52
  }
53
 
54
 
55
- //we set the api domain, account id and passphrase
56
- public function initialize(){
57
- $configHelper = Mage::helper("bpost_shm/system_config");
 
 
 
 
 
 
 
58
 
59
- $this->_apiUriBase = $configHelper->getBpostShippingConfig("api_url", Mage::app()->getStore()->getId());
60
- $this->_accountId = $this->_bpostConfigHelper->getBpostShippingConfig("accountid", Mage::app()->getStore()->getId());
61
- $this->_passphrase = $this->_bpostConfigHelper->getBpostShippingConfig("passphrase", Mage::app()->getStore()->getId());
62
  $this->_authorization = base64_encode($this->_accountId . ':' . $this->_passphrase);
63
  $this->_initialized = true;
64
  }
52
  }
53
 
54
 
55
+ /**
56
+ * Set the api domain, account id and passphrase of the given store
57
+ *
58
+ * @param null|int $storeId
59
+ */
60
+ public function initialize($storeId = null)
61
+ {
62
+ if (!$storeId) {
63
+ $storeId = Mage::app()->getStore()->getId();
64
+ }
65
 
66
+ $this->_apiUriBase = $this->_bpostConfigHelper->getBpostShippingConfig('api_url', $storeId);
67
+ $this->_accountId = $this->_bpostConfigHelper->getBpostShippingConfig('accountid', $storeId);
68
+ $this->_passphrase = $this->_bpostConfigHelper->getBpostShippingConfig('passphrase', $storeId);
69
  $this->_authorization = base64_encode($this->_accountId . ':' . $this->_passphrase);
70
  $this->_initialized = true;
71
  }
app/code/community/Bpost/ShM/Model/Observer.php CHANGED
@@ -263,7 +263,8 @@ class Bpost_ShM_Model_Observer extends Varien_Event_Observer
263
  $manageLabels = $configHelper->getBpostShippingConfig("manage_labels_with_magento");
264
 
265
  if (!$manageLabels) {
266
- $apiModel = Mage::getModel("bpost_shm/api", true);
 
267
  $apiModel->createOrder($order);
268
  $order->setBpostReference($order->getIncrementId());
269
  }
263
  $manageLabels = $configHelper->getBpostShippingConfig("manage_labels_with_magento");
264
 
265
  if (!$manageLabels) {
266
+ $apiModel = Mage::getModel("bpost_shm/api");
267
+ $apiModel->initialize($order->getStoreId());
268
  $apiModel->createOrder($order);
269
  $order->setBpostReference($order->getIncrementId());
270
  }
app/code/community/Bpost/ShM/Model/Returnlabel.php CHANGED
@@ -37,7 +37,9 @@ class Bpost_ShM_Model_Returnlabel extends Mage_Core_Model_Abstract
37
  $returnLabelHelper = Mage::helper("bpost_shm/returnlabel");
38
 
39
  //check for return order
40
- $returnlabelResponse = Mage::getModel('bpost_shm/api', true)->createReturnLabel($order);
 
 
41
 
42
  if(!$returnlabelResponse){
43
  Mage::throwException("Failed to create a return label. Please check your error logs.");
37
  $returnLabelHelper = Mage::helper("bpost_shm/returnlabel");
38
 
39
  //check for return order
40
+ $api = Mage::getModel('bpost_shm/api');
41
+ $api->initialize($order->getStoreId());
42
+ $returnlabelResponse = $api->createReturnLabel($order);
43
 
44
  if(!$returnlabelResponse){
45
  Mage::throwException("Failed to create a return label. Please check your error logs.");
app/code/community/Bpost/ShM/Model/Shipping/Carrier/BpostShM.php CHANGED
@@ -168,7 +168,7 @@ class Bpost_ShM_Model_Shipping_Carrier_BpostShM extends Mage_Shipping_Model_Carr
168
  protected function _getCarriersErrorMessage($shippingMethodCode)
169
  {
170
  $error = Mage::getModel('shipping/rate_result_error');
171
- $msg = Mage::getStoreConfig("carriers/$shippingMethodCode/specificerrmsg");
172
 
173
  if ($msg && $msg != '') {
174
  $error->setData("error_message", $msg);
@@ -188,11 +188,11 @@ class Bpost_ShM_Model_Shipping_Carrier_BpostShM extends Mage_Shipping_Model_Carr
188
  public function getAllowedMethods()
189
  {
190
  $allowedMethods = array(
191
- 'bpost_homedelivery' => Mage::getStoreConfig('carriers/bpost_homedelivery/name', $this->getStore()),
192
- 'bpost_international' => Mage::getStoreConfig('carriers/bpost_international/name', $this->getStore()),
193
- 'bpost_parcellocker' => Mage::getStoreConfig('carriers/bpost_parcellocker/name', $this->getStore()),
194
- 'bpost_pickuppoint' => Mage::getStoreConfig('carriers/bpost_pickuppoint/name', $this->getStore()),
195
- 'bpost_clickcollect' => Mage::getStoreConfig('carriers/bpost_clickcollect/name', $this->getStore())
196
  );
197
 
198
  return $allowedMethods;
@@ -210,8 +210,12 @@ class Bpost_ShM_Model_Shipping_Carrier_BpostShM extends Mage_Shipping_Model_Carr
210
  if (empty($code)) {
211
  return false;
212
  }
213
- $path = 'carriers/' . $code . '/' . $field;
214
- return Mage::getStoreConfig($path, $this->getStore());
 
 
 
 
215
  }
216
 
217
  /**
168
  protected function _getCarriersErrorMessage($shippingMethodCode)
169
  {
170
  $error = Mage::getModel('shipping/rate_result_error');
171
+ $msg = $this->getBpostConfigData('specificerrmsg', $shippingMethodCode);
172
 
173
  if ($msg && $msg != '') {
174
  $error->setData("error_message", $msg);
188
  public function getAllowedMethods()
189
  {
190
  $allowedMethods = array(
191
+ 'bpost_homedelivery' => $this->getBpostConfigData('name', 'bpost_homedelivery'),
192
+ 'bpost_international' => $this->getBpostConfigData('name', 'bpost_international'),
193
+ 'bpost_parcellocker' => $this->getBpostConfigData('name', 'bpost_parcellocker'),
194
+ 'bpost_pickuppoint' => $this->getBpostConfigData('name', 'bpost_pickuppoint'),
195
+ 'bpost_clickcollect' => $this->getBpostConfigData('name', 'bpost_clickcollect')
196
  );
197
 
198
  return $allowedMethods;
210
  if (empty($code)) {
211
  return false;
212
  }
213
+
214
+ return Mage::helper('bpost_shm/system_config')->getBpostCarriersConfig(
215
+ $field,
216
+ $code,
217
+ $this->getStore()
218
+ );
219
  }
220
 
221
  /**
app/code/community/Bpost/ShM/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Bpost_ShM>
5
- <version>1.3.0</version>
6
  </Bpost_ShM>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <Bpost_ShM>
5
+ <version>1.3.1</version>
6
  </Bpost_ShM>
7
  </modules>
8
  <global>
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>bpost</name>
4
- <version>1.3.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>Onestepcheckout compatibility 4.5.5 and pickup points fix</notes>
12
  <authors><author><name>PHPro</name><user>heremke</user><email>info@phpro.be</email></author></authors>
13
- <date>2016-06-03</date>
14
- <time>12:04:10</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="ae7c83f9baabda1db4627833d1f4f942"/><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="Clickcollect"><file name="Grid.php" hash="8f4a7990122ab6ccdb079f7fe06e75bb"/></dir><dir name="Homedelivery"><file name="Grid.php" hash="edc472d70d53b81685e0f861a50cd4fd"/></dir><dir name="International"><file name="Grid.php" hash="c76e5042c0f6ff9ed96d978f45336c2c"/></dir><dir name="Parcellocker"><file name="Grid.php" hash="f5de661468fc82c0b0a51baad560ebb4"/></dir><dir name="Pickuppoint"><file name="Grid.php" hash="23151dff9b96415cd8648429260481c9"/></dir></dir></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Api"><dir name="Import"><file name="Countries.php" hash="1f2d94c2ffb8f43d81050b7b9da42a42"/></dir></dir><dir name="Field"><file name="Cacheinfo.php" hash="5de9cf047e274154839d2f658c48f9e2"/><file name="Choose.php" hash="ef813927a3ba26302cd8e4c7c5fb62a8"/><file name="Clickcollect.php" hash="b4667cb7e4fe0abcfbc7113f65c859ee"/><file name="Hour.php" hash="763b955bff596cddf2ceabd4ce85816d"/><file name="Info.php" hash="421631d66f10176e4cca80d30df625eb"/><file name="Logo.php" hash="83cc7232c4a0a05b6857aa5e7cd00beb"/><file name="Subheader.php" hash="1b52d6781e07b134c341eae891ac9979"/></dir><dir name="Tablerates"><dir name="Export"><file name="Clickcollect.php" hash="294325998821cba4d98d113c5832d981"/><file name="Homedelivery.php" hash="beb4c5c59ef77d06a425a31d90893255"/><file name="International.php" hash="7806c48c000e996b707e87e58ac1f166"/><file name="Parcellocker.php" hash="e32815fa7846b08318a87c02a7374990"/><file name="Pickuppoint.php" hash="8cb4911d631d257332ce542db49c3672"/></dir></dir></dir></dir></dir></dir><dir name="Carrier"><file name="Bpost.php" hash="31a57fac5a8b4d329c99d25b5b3e0d49"/></dir></dir><dir name="Controller"><dir name="ShM"><file name="Order.php" hash="7ab38959baaf721d9e7fe16bd34e9dab"/></dir></dir><dir name="Helper"><file name="Data.php" hash="6374ae7aaaa80431742869d34b653256"/><file name="Returnlabel.php" hash="e3fb05a9f08577dfe90866669d3f7613"/><dir name="System"><file name="Config.php" hash="393353ca26ef2b398769ecbb59fdcbf9"/></dir></dir><dir name="Model"><dir name="Adminhtml"><file name="Bpostgrid.php" hash="a8728ed9efdb88b5e67be037153c9304"/><file name="Observer.php" hash="9dc75e175bddf0a49b65e0580ade53a4"/><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Shipping"><dir name="Tablerates"><file name="Clickcollect.php" hash="8247e2d2a93a438f79ea71d91b8c01f2"/><file name="Homedelivery.php" hash="26758346e7e09d2b3075cb0613a00b79"/><file name="International.php" hash="c6ba9e8b7e42893a7faf31392e0d647f"/><file name="Parcellocker.php" hash="2fa265b0623de5740b15ea27284a3b47"/><file name="Pickuppoint.php" hash="84ccd80c14f33de89b8164e396ef3241"/></dir></dir></dir><dir name="Source"><file name="Datecomment.php" hash="a67ca74e2f81cbfaec6b7ed0ce8aa9f2"/><file name="Shipping.php" hash="a19f622f5f64ee64c8f8e6667d6d9323"/></dir></dir></dir></dir><dir name="Api"><file name="Abstract.php" hash="6096aebaabe58c044b8f5724661336c1"/><file name="Domcreator.php" hash="2c51ab00bd06265d49cb9cbf62605575"/></dir><file name="Api.php" hash="0661d5bd1cc72642faf6e7ec1b4857c6"/><file name="Country.php" hash="7ca2d7fee06b4672ee8679dcc0d437cf"/><file name="Holidays.php" hash="85d3ad2c06516d3bd42d6cf25b6c1c1b"/><file name="Observer.php" hash="429734398830f14aa1a8a79f6d3acd7e"/><dir name="Resource"><dir name="Country"><file name="Collection.php" hash="173cb7acd05ead3fa4bb29f1a2200188"/></dir><file name="Country.php" hash="3ed62dc4bae568879a781400724e2b31"/><dir name="Holidays"><file name="Collection.php" hash="b39c602b1b6c7802a8e298ccabd3b88d"/></dir><file name="Holidays.php" hash="8410fabf516cce95e6e6a69e52abb6ec"/><dir name="Returnlabel"><file name="Collection.php" hash="d34adb537d24116270238ae1fa377a05"/></dir><file name="Returnlabel.php" hash="419fda598a2630ccc773ce0b0eacbd79"/><dir name="Tablerates"><dir name="Clickcollect"><file name="Collection.php" hash="a076e1266785fc9342fc134ac9268280"/></dir><file name="Clickcollect.php" hash="56ab4e22b459339db3190bfbd102d94f"/><dir name="Homedelivery"><file name="Collection.php" hash="7a34c249b5015ecda8ad26cbf42c6280"/></dir><file name="Homedelivery.php" hash="a94baf3909962e162813d8003583cc77"/><dir name="International"><file name="Collection.php" hash="6ba99077f1625a8c81990ea3afcb14b8"/></dir><file name="International.php" hash="ca3e45f29f9ef44f00ff41b509e0f0a1"/><dir name="Parcellocker"><file name="Collection.php" hash="9aa78e0bc7d389e93e958472a0fc40b6"/></dir><file name="Parcellocker.php" hash="66bb509267844a48ff5b054c82a47254"/><dir name="Pickuppoint"><file name="Collection.php" hash="1f9db3d5ff7f1a9e9d2eccddf6860513"/></dir><file name="Pickuppoint.php" hash="33e26bc93dcea5aabbee59343043413d"/></dir></dir><file name="Returnlabel.php" hash="169bca5baa7726cd51e2a76e1b9a35a8"/><dir name="Shipping"><dir name="Carrier"><file name="BpostShM.php" hash="64515e312b7575e6480e44e7e3c12a0d"/></dir><file name="Geocode.php" hash="d613ba4d1e5d14f8698fcfe9dfd03a66"/><dir name="Rate"><file name="Result.php" hash="77e9fc98f15441edfdc478fd589e41a8"/></dir></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Country.php" hash="f49cbe30d05cffb6f516a3df6ddc1b7b"/><file name="Product.php" hash="cb74b0fc8d3f661d0be4ac9f9c5b840d"/><file name="Ratetypes.php" hash="42f1f3f8dc000ea5e5336ca1ad7ab85c"/><file name="Weightunit.php" hash="e0c0a9975395245c4d16d975c0334c31"/></dir></dir></dir><dir name="Tablerates"><file name="Clickcollect.php" hash="9d589684df3b1b7e11441dc808a9627c"/><file name="Homedelivery.php" hash="d60385de528eb957a2874af6306d4aae"/><file name="International.php" hash="d02e02a7cddbda576530d6acbd6d02e8"/><file name="Parcellocker.php" hash="805a9669f9d024a4c018d611e5c71afd"/><file name="Pickuppoint.php" hash="49dff9f40e26163b8d0c6b8be9f6ee51"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Bpost"><dir name="ShM"><file name="AllOrdersController.php" hash="08df25d3e3718e183c40f68d8722782a"/><file name="ConfigController.php" hash="2537dbc05936e758c6353e46016180f9"/><file name="DownloadController.php" hash="87a534445edd2ff9ae3601fbe99637a5"/><file name="PendingOrdersController.php" hash="300f5472999194f90658737311b94df4"/></dir></dir></dir><file name="AjaxController.php" hash="ba6df7ff9999259273b7414e6bd51f1c"/></dir><dir name="etc"><file name="adminhtml.xml" hash="cba525a2c3c394cb15c144f887e081cc"/><file name="config.xml" hash="43d63aabfb1f644bbf5495376eb32c97"/><file name="system.xml" hash="89a58cb287d88eab93df6294b789a9b5"/></dir><dir name="sql"><dir name="bpost_shm_setup"><file name="install-0.0.1.php" hash="441ce29ddd9b04c052f03699e8ecc704"/><file name="upgrade-0.0.1-0.0.2.php" hash="7c5bb7a9609d6bec38a927e07eaad066"/><file name="upgrade-0.0.10-0.1.0.php" hash="c1523f2fd829372143c4686376512b37"/><file name="upgrade-0.0.2-0.0.3.php" hash="7e441f96e071efaa42d629815be8379c"/><file name="upgrade-0.0.3-0.0.4.php" hash="e2009ca70b9b268024433be7ac74ba19"/><file name="upgrade-0.0.4-0.0.5.php" hash="a51391f3bf810a5c6ae5c0bdbc5d9603"/><file name="upgrade-0.0.5-0.0.6.php" hash="2d8d624be7f829029b3e9fceb6d6c3b8"/><file name="upgrade-0.0.6-0.0.7.php" hash="82a7a64e3234c8b6e20367fcc80e1049"/><file name="upgrade-0.0.7-0.0.8.php" hash="a3b337a855d92202b5d625269edf4cb8"/><file name="upgrade-0.0.8-0.0.9.php" hash="20a344294274390515a891a89facfcb3"/><file name="upgrade-0.0.9-0.0.10.php" hash="74d06a2bbf41c5c8d9cb7870898a3eb3"/><file name="upgrade-0.1.0-0.1.1.php" hash="ed824736e9cd0f8e98a4dc62c41ecf96"/><file name="upgrade-0.1.1-0.1.2.php" hash="bb7cf544bc07ef2209b82753ac2b950d"/><file name="upgrade-0.1.2-0.1.3.php" hash="04f9ab295e48b018e80da482bdf23132"/><file name="upgrade-0.1.3-0.1.4.php" hash="9e8f6f1e2522917b8efeb379d21cd953"/><file name="upgrade-0.1.4-0.1.5.php" hash="16333b0f3faa92e98d6bb6f75b4273cd"/><file name="upgrade-0.1.5-0.1.6.php" hash="f2f1f169a5ad2fbd0650ffbef3217b08"/><file name="upgrade-0.1.6-0.1.7.php" hash="95eebc7f870fa36c0a0997a06cb47076"/><file name="upgrade-0.1.7-0.1.8.php" hash="56a4bc5320b56309c943a90df00464e8"/><file name="upgrade-0.1.8-1.1.3.php" hash="d2058a8a86a501111fca4053a1f49ba2"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><dir name="bpost"><file name="shm.xml" hash="8a5ceb93674efcbd6e8063437877d9d5"/></dir></dir><dir name="template"><dir name="bpost"><file name="empty.phtml" hash="45a92398f5adc3dd6dda9527f95ef4d5"/><file name="informationpopup.phtml" hash="42432ed861bb8b5b34a39d879c164979"/><file name="screenshotpopup.phtml" hash="5ad6a05c55ea41e550262ceed28626ae"/><dir name="widget"><dir name="grid"><file name="massaction.phtml" hash="f9b9aa54fe683d66fd535f95afb07dfe"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><dir name="bpost"><file name="shm.xml" hash="fdf8ce174a2af269f7c5831311474c87"/></dir></dir><dir name="template"><dir name="bpost"><dir name="shm"><file name="append_bpost_shippingmethod.phtml" hash="36beca46e5a8e2246161fbb807886883"/><file name="gmapsapi.phtml" hash="ac4dea1786701a6968a1c771a54e06fd"/><file name="oscwindowjs.phtml" hash="253fbb8eb44a41bf76495d26ab74b1ef"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="zBpost_ShM.xml" hash="791aeaa9ddf185a0b053728b20b06ea0"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Bpost_ShM.csv" hash="ed46d79674f4af306343332fca1dd1d2"/><dir name="template"><dir name="email"><dir name="bpost"><file name="returnlabel.html" hash="fa9b1779caf12fe6e8c85e44899e7e66"/><file name="errorhandling_create_order.html" hash="5458114b6bfee6f66841f4fe19e13675"/></dir></dir></dir></dir><dir name="fr_FR"><file name="Bpost_ShM.csv" hash="2c28271ca71add5c1eb748d388c4672e"/></dir><dir name="nl_NL"><file name="Bpost_ShM.csv" hash="bef78c98957327ef45635ab13469c9c1"/></dir></target><target name="mageweb"><dir name="js"><dir name="bpost"><dir name="shm"><dir name="adminhtml"><file name="informationpopup.js" hash="dd25216084d43f70b7de4beaf1ef23c5"/></dir><file name="checkout.js" hash="d0d9d11bb87513f5cf72bfc4a260b432"/><file name="infobox.js" hash="4b42bb1b029f60ecda0ceeabb4726e5d"/><file name="onestepcheckout_shipping.js" hash="5543fb8c7b6b9a4fa03eb11fad70960d"/><file name="window.js" hash="6595b93b8c84328f26071fee485b797e"/></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="bpost"><file name="checkout.css" hash="1def6c20f733f736de8fc16b4cb40b79"/></dir></dir><dir name="images"><dir name="bpost"><file name="ajax-loader-button.gif" hash="cbdad94ec5d22b17d7aae4c6d245069a"/><file name="ajax-loader-wheel.gif" hash="faa74e8c61fc64d5edb11613c7eead2c"/><file name="bpost_logo_RGB72_L.png" hash="ca8a5de3a37cfbbdac7c0fec6e4f9f28"/><file name="bpost_logo_RGB72_M.png" hash="feb4bb3bb7c9c4100612b62cde7037e5"/><file name="bpost_sym_RGB72_S.png" hash="18e774a968be600664d11a9e0691a424"/><file name="btn_close.png" hash="d6ecac0a01a600ef15efc9004ccc9fb7"/><file name="icon-close.png" hash="54d0827f50c1d294c61e88e316e61059"/><file name="icon-info.png" hash="e4de51e3c12327403a9b966aac98a9d6"/><file name="location_clickcollect_default.png" hash="dba619d29c0013538003f3fec98da652"/><file name="location_parcellocker_default.png" hash="8906b0e09067eab6f31b712d54ecf547"/><file name="location_postoffice_default.png" hash="ea147b38b01449e8a1cff3ebff6b2741"/><file name="location_postpoint_default.png" hash="c53f598daafbec4d042b165d21116719"/></dir></dir><dir name="js"><dir name="bpost"><file name="onestepcheckout.js" hash="a0e4b3df8643ffaa798e679fe20f116c"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="css"><dir name="bpost"><file name="informationpopup.css" hash="bffce6ef1182a763f626a0b3288b3887"/></dir></dir><dir name="images"><dir name="bpost"><file name="ajax-loader-red.gif" hash="7bf0fa0e5a55c6a7cd122a9bb461006d"/><file name="bpost_logo_RGB72_L.png" hash="ca8a5de3a37cfbbdac7c0fec6e4f9f28"/><file name="bpost_logo_RGB72_M.png" hash="feb4bb3bb7c9c4100612b62cde7037e5"/><file name="btn_close.png" hash="d6ecac0a01a600ef15efc9004ccc9fb7"/><file name="ce-screenshot.png" hash="ff6f4a630cd17efc1abbe8eca6e015a5"/><file name="ee-screenshot.png" hash="ff6f4a630cd17efc1abbe8eca6e015a5"/><file name="pdf_icon.png" hash="95b561422892384337eb2eabb968a558"/></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
- <dependencies><required><php><min>5.2.0</min><max>7.0.2</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>bpost</name>
4
+ <version>1.3.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>Multiple account bug and mysql error fix</notes>
12
  <authors><author><name>PHPro</name><user>heremke</user><email>info@phpro.be</email></author></authors>
13
+ <date>2016-06-09</date>
14
+ <time>14:22:29</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="19a74f01863f31cde9cfe04191adaee1"/></dir><file name="AllOrders.php" hash="c9bed128109004f6007a2c51c0b13687"/><dir name="Grid"><dir name="Renderer"><dir name="Dropdate"><file name="Dateformat.php" hash="dc59c761bbc587cf9d9c3b46881cd5a2"/></dir><dir name="Label"><file name="Download.php" hash="6848a41d5eb1bad1e9da43937e279468"/></dir></dir></dir><file name="Grid.php" hash="5282ae6c40008d094e310b861d4df677"/><dir name="Order"><dir name="View"><dir name="Tab"><file name="Returnbarcode.php" hash="d271b69bca3b77dc0a5a624d56628a1d"/><file name="Returnlabels.php" hash="3a281c4942cf722ab58523e9869113eb"/></dir></dir></dir><dir name="PendingOrders"><file name="Grid.php" hash="f17b1ec3dc0b7bdab2dbe03eda054ede"/></dir><file name="PendingOrders.php" hash="584198acc69c0fad60ac793238ca6c8f"/></dir><dir name="Shipping"><dir name="Carrier"><dir name="Bpost"><dir name="Tablerate"><dir name="Clickcollect"><file name="Grid.php" hash="8f4a7990122ab6ccdb079f7fe06e75bb"/></dir><dir name="Homedelivery"><file name="Grid.php" hash="edc472d70d53b81685e0f861a50cd4fd"/></dir><dir name="International"><file name="Grid.php" hash="c76e5042c0f6ff9ed96d978f45336c2c"/></dir><dir name="Parcellocker"><file name="Grid.php" hash="f5de661468fc82c0b0a51baad560ebb4"/></dir><dir name="Pickuppoint"><file name="Grid.php" hash="23151dff9b96415cd8648429260481c9"/></dir></dir></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Api"><dir name="Import"><file name="Countries.php" hash="1f2d94c2ffb8f43d81050b7b9da42a42"/></dir></dir><dir name="Field"><file name="Cacheinfo.php" hash="5de9cf047e274154839d2f658c48f9e2"/><file name="Choose.php" hash="ef813927a3ba26302cd8e4c7c5fb62a8"/><file name="Clickcollect.php" hash="b4667cb7e4fe0abcfbc7113f65c859ee"/><file name="Hour.php" hash="763b955bff596cddf2ceabd4ce85816d"/><file name="Info.php" hash="421631d66f10176e4cca80d30df625eb"/><file name="Logo.php" hash="83cc7232c4a0a05b6857aa5e7cd00beb"/><file name="Subheader.php" hash="1b52d6781e07b134c341eae891ac9979"/></dir><dir name="Tablerates"><dir name="Export"><file name="Clickcollect.php" hash="294325998821cba4d98d113c5832d981"/><file name="Homedelivery.php" hash="beb4c5c59ef77d06a425a31d90893255"/><file name="International.php" hash="7806c48c000e996b707e87e58ac1f166"/><file name="Parcellocker.php" hash="e32815fa7846b08318a87c02a7374990"/><file name="Pickuppoint.php" hash="8cb4911d631d257332ce542db49c3672"/></dir></dir></dir></dir></dir></dir><dir name="Carrier"><file name="Bpost.php" hash="d13a75675dfd60c81a4efdb5345cb47b"/></dir></dir><dir name="Controller"><dir name="ShM"><file name="Order.php" hash="7ab38959baaf721d9e7fe16bd34e9dab"/></dir></dir><dir name="Helper"><file name="Data.php" hash="d264edf27df0eebca2bc65846fdabceb"/><file name="Returnlabel.php" hash="e3fb05a9f08577dfe90866669d3f7613"/><dir name="System"><file name="Config.php" hash="393353ca26ef2b398769ecbb59fdcbf9"/></dir></dir><dir name="Model"><dir name="Adminhtml"><file name="Bpostgrid.php" hash="47cec02b0eb54ff1cd144dc95d9885e6"/><file name="Observer.php" hash="0bb2d5c40c8fb4e0441ef1df808db266"/><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Shipping"><dir name="Tablerates"><file name="Clickcollect.php" hash="8247e2d2a93a438f79ea71d91b8c01f2"/><file name="Homedelivery.php" hash="26758346e7e09d2b3075cb0613a00b79"/><file name="International.php" hash="c6ba9e8b7e42893a7faf31392e0d647f"/><file name="Parcellocker.php" hash="2fa265b0623de5740b15ea27284a3b47"/><file name="Pickuppoint.php" hash="84ccd80c14f33de89b8164e396ef3241"/></dir></dir></dir><dir name="Source"><file name="Datecomment.php" hash="a67ca74e2f81cbfaec6b7ed0ce8aa9f2"/><file name="Shipping.php" hash="a19f622f5f64ee64c8f8e6667d6d9323"/></dir></dir></dir></dir><dir name="Api"><file name="Abstract.php" hash="ce70d0fe49174c81ff6b68f75355420c"/><file name="Domcreator.php" hash="2c51ab00bd06265d49cb9cbf62605575"/></dir><file name="Api.php" hash="a04f7a2f3738c5c08d43866372dcaf0c"/><file name="Country.php" hash="7ca2d7fee06b4672ee8679dcc0d437cf"/><file name="Holidays.php" hash="85d3ad2c06516d3bd42d6cf25b6c1c1b"/><file name="Observer.php" hash="40caf55b3ef82bbe1eda8c151e30c85c"/><dir name="Resource"><dir name="Country"><file name="Collection.php" hash="173cb7acd05ead3fa4bb29f1a2200188"/></dir><file name="Country.php" hash="3ed62dc4bae568879a781400724e2b31"/><dir name="Holidays"><file name="Collection.php" hash="b39c602b1b6c7802a8e298ccabd3b88d"/></dir><file name="Holidays.php" hash="8410fabf516cce95e6e6a69e52abb6ec"/><dir name="Returnlabel"><file name="Collection.php" hash="d34adb537d24116270238ae1fa377a05"/></dir><file name="Returnlabel.php" hash="419fda598a2630ccc773ce0b0eacbd79"/><dir name="Tablerates"><dir name="Clickcollect"><file name="Collection.php" hash="a076e1266785fc9342fc134ac9268280"/></dir><file name="Clickcollect.php" hash="56ab4e22b459339db3190bfbd102d94f"/><dir name="Homedelivery"><file name="Collection.php" hash="7a34c249b5015ecda8ad26cbf42c6280"/></dir><file name="Homedelivery.php" hash="a94baf3909962e162813d8003583cc77"/><dir name="International"><file name="Collection.php" hash="6ba99077f1625a8c81990ea3afcb14b8"/></dir><file name="International.php" hash="ca3e45f29f9ef44f00ff41b509e0f0a1"/><dir name="Parcellocker"><file name="Collection.php" hash="9aa78e0bc7d389e93e958472a0fc40b6"/></dir><file name="Parcellocker.php" hash="66bb509267844a48ff5b054c82a47254"/><dir name="Pickuppoint"><file name="Collection.php" hash="1f9db3d5ff7f1a9e9d2eccddf6860513"/></dir><file name="Pickuppoint.php" hash="33e26bc93dcea5aabbee59343043413d"/></dir></dir><file name="Returnlabel.php" hash="60e5a2d76a101bda76bbd3509558a2ed"/><dir name="Shipping"><dir name="Carrier"><file name="BpostShM.php" hash="558e4fa12b50e17b6637fe01602d5f5a"/></dir><file name="Geocode.php" hash="d613ba4d1e5d14f8698fcfe9dfd03a66"/><dir name="Rate"><file name="Result.php" hash="77e9fc98f15441edfdc478fd589e41a8"/></dir></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Country.php" hash="f49cbe30d05cffb6f516a3df6ddc1b7b"/><file name="Product.php" hash="cb74b0fc8d3f661d0be4ac9f9c5b840d"/><file name="Ratetypes.php" hash="42f1f3f8dc000ea5e5336ca1ad7ab85c"/><file name="Weightunit.php" hash="e0c0a9975395245c4d16d975c0334c31"/></dir></dir></dir><dir name="Tablerates"><file name="Clickcollect.php" hash="9d589684df3b1b7e11441dc808a9627c"/><file name="Homedelivery.php" hash="d60385de528eb957a2874af6306d4aae"/><file name="International.php" hash="d02e02a7cddbda576530d6acbd6d02e8"/><file name="Parcellocker.php" hash="805a9669f9d024a4c018d611e5c71afd"/><file name="Pickuppoint.php" hash="49dff9f40e26163b8d0c6b8be9f6ee51"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Bpost"><dir name="ShM"><file name="AllOrdersController.php" hash="08df25d3e3718e183c40f68d8722782a"/><file name="ConfigController.php" hash="2537dbc05936e758c6353e46016180f9"/><file name="DownloadController.php" hash="87a534445edd2ff9ae3601fbe99637a5"/><file name="PendingOrdersController.php" hash="300f5472999194f90658737311b94df4"/></dir></dir></dir><file name="AjaxController.php" hash="ba6df7ff9999259273b7414e6bd51f1c"/></dir><dir name="etc"><file name="adminhtml.xml" hash="cba525a2c3c394cb15c144f887e081cc"/><file name="config.xml" hash="44679a78ca3b9aeb1ec6c12aae6f5627"/><file name="system.xml" hash="89a58cb287d88eab93df6294b789a9b5"/></dir><dir name="sql"><dir name="bpost_shm_setup"><file name="install-0.0.1.php" hash="441ce29ddd9b04c052f03699e8ecc704"/><file name="upgrade-0.0.1-0.0.2.php" hash="7c5bb7a9609d6bec38a927e07eaad066"/><file name="upgrade-0.0.10-0.1.0.php" hash="c1523f2fd829372143c4686376512b37"/><file name="upgrade-0.0.2-0.0.3.php" hash="7e441f96e071efaa42d629815be8379c"/><file name="upgrade-0.0.3-0.0.4.php" hash="e2009ca70b9b268024433be7ac74ba19"/><file name="upgrade-0.0.4-0.0.5.php" hash="a51391f3bf810a5c6ae5c0bdbc5d9603"/><file name="upgrade-0.0.5-0.0.6.php" hash="2d8d624be7f829029b3e9fceb6d6c3b8"/><file name="upgrade-0.0.6-0.0.7.php" hash="82a7a64e3234c8b6e20367fcc80e1049"/><file name="upgrade-0.0.7-0.0.8.php" hash="a3b337a855d92202b5d625269edf4cb8"/><file name="upgrade-0.0.8-0.0.9.php" hash="20a344294274390515a891a89facfcb3"/><file name="upgrade-0.0.9-0.0.10.php" hash="74d06a2bbf41c5c8d9cb7870898a3eb3"/><file name="upgrade-0.1.0-0.1.1.php" hash="ed824736e9cd0f8e98a4dc62c41ecf96"/><file name="upgrade-0.1.1-0.1.2.php" hash="bb7cf544bc07ef2209b82753ac2b950d"/><file name="upgrade-0.1.2-0.1.3.php" hash="04f9ab295e48b018e80da482bdf23132"/><file name="upgrade-0.1.3-0.1.4.php" hash="9e8f6f1e2522917b8efeb379d21cd953"/><file name="upgrade-0.1.4-0.1.5.php" hash="16333b0f3faa92e98d6bb6f75b4273cd"/><file name="upgrade-0.1.5-0.1.6.php" hash="f2f1f169a5ad2fbd0650ffbef3217b08"/><file name="upgrade-0.1.6-0.1.7.php" hash="95eebc7f870fa36c0a0997a06cb47076"/><file name="upgrade-0.1.7-0.1.8.php" hash="56a4bc5320b56309c943a90df00464e8"/><file name="upgrade-0.1.8-1.1.3.php" hash="d2058a8a86a501111fca4053a1f49ba2"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><dir name="bpost"><file name="shm.xml" hash="8a5ceb93674efcbd6e8063437877d9d5"/></dir></dir><dir name="template"><dir name="bpost"><file name="empty.phtml" hash="45a92398f5adc3dd6dda9527f95ef4d5"/><file name="informationpopup.phtml" hash="42432ed861bb8b5b34a39d879c164979"/><file name="screenshotpopup.phtml" hash="5ad6a05c55ea41e550262ceed28626ae"/><dir name="widget"><dir name="grid"><file name="massaction.phtml" hash="f9b9aa54fe683d66fd535f95afb07dfe"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><dir name="bpost"><file name="shm.xml" hash="fdf8ce174a2af269f7c5831311474c87"/></dir></dir><dir name="template"><dir name="bpost"><dir name="shm"><file name="append_bpost_shippingmethod.phtml" hash="36beca46e5a8e2246161fbb807886883"/><file name="gmapsapi.phtml" hash="ac4dea1786701a6968a1c771a54e06fd"/><file name="oscwindowjs.phtml" hash="253fbb8eb44a41bf76495d26ab74b1ef"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="zBpost_ShM.xml" hash="791aeaa9ddf185a0b053728b20b06ea0"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Bpost_ShM.csv" hash="ed46d79674f4af306343332fca1dd1d2"/><dir name="template"><dir name="email"><dir name="bpost"><file name="returnlabel.html" hash="fa9b1779caf12fe6e8c85e44899e7e66"/><file name="errorhandling_create_order.html" hash="5458114b6bfee6f66841f4fe19e13675"/></dir></dir></dir></dir><dir name="fr_FR"><file name="Bpost_ShM.csv" hash="2c28271ca71add5c1eb748d388c4672e"/></dir><dir name="nl_NL"><file name="Bpost_ShM.csv" hash="bef78c98957327ef45635ab13469c9c1"/></dir></target><target name="mageweb"><dir name="js"><dir name="bpost"><dir name="shm"><dir name="adminhtml"><file name="informationpopup.js" hash="dd25216084d43f70b7de4beaf1ef23c5"/></dir><file name="checkout.js" hash="d0d9d11bb87513f5cf72bfc4a260b432"/><file name="infobox.js" hash="4b42bb1b029f60ecda0ceeabb4726e5d"/><file name="onestepcheckout_shipping.js" hash="5543fb8c7b6b9a4fa03eb11fad70960d"/><file name="window.js" hash="6595b93b8c84328f26071fee485b797e"/></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="bpost"><file name="checkout.css" hash="1def6c20f733f736de8fc16b4cb40b79"/></dir></dir><dir name="images"><dir name="bpost"><file name="ajax-loader-button.gif" hash="cbdad94ec5d22b17d7aae4c6d245069a"/><file name="ajax-loader-wheel.gif" hash="faa74e8c61fc64d5edb11613c7eead2c"/><file name="bpost_logo_RGB72_L.png" hash="ca8a5de3a37cfbbdac7c0fec6e4f9f28"/><file name="bpost_logo_RGB72_M.png" hash="feb4bb3bb7c9c4100612b62cde7037e5"/><file name="bpost_sym_RGB72_S.png" hash="18e774a968be600664d11a9e0691a424"/><file name="btn_close.png" hash="d6ecac0a01a600ef15efc9004ccc9fb7"/><file name="icon-close.png" hash="54d0827f50c1d294c61e88e316e61059"/><file name="icon-info.png" hash="e4de51e3c12327403a9b966aac98a9d6"/><file name="location_clickcollect_default.png" hash="dba619d29c0013538003f3fec98da652"/><file name="location_parcellocker_default.png" hash="8906b0e09067eab6f31b712d54ecf547"/><file name="location_postoffice_default.png" hash="ea147b38b01449e8a1cff3ebff6b2741"/><file name="location_postpoint_default.png" hash="c53f598daafbec4d042b165d21116719"/><file name=".DS_Store" hash="194577a7e20bdcc7afbb718f502c134c"/></dir></dir><dir name="js"><dir name="bpost"><file name="onestepcheckout.js" hash="a0e4b3df8643ffaa798e679fe20f116c"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="css"><dir name="bpost"><file name="informationpopup.css" hash="bffce6ef1182a763f626a0b3288b3887"/></dir></dir><dir name="images"><dir name="bpost"><file name="ajax-loader-red.gif" hash="7bf0fa0e5a55c6a7cd122a9bb461006d"/><file name="bpost_logo_RGB72_L.png" hash="ca8a5de3a37cfbbdac7c0fec6e4f9f28"/><file name="bpost_logo_RGB72_M.png" hash="feb4bb3bb7c9c4100612b62cde7037e5"/><file name="btn_close.png" hash="d6ecac0a01a600ef15efc9004ccc9fb7"/><file name="ce-screenshot.png" hash="ff6f4a630cd17efc1abbe8eca6e015a5"/><file name="ee-screenshot.png" hash="ff6f4a630cd17efc1abbe8eca6e015a5"/><file name="pdf_icon.png" hash="95b561422892384337eb2eabb968a558"/></dir></dir></dir></dir></dir></target></contents>
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/images/bpost/.DS_Store ADDED
Binary file