Chronopost - Version 1.0.3

Version Notes

Version destinée à Magento 1.6.X et supérieures. Testée sur Magento 1.7.0.
------------
Intégration de l'API Google Maps v3.
Ajout d'un exemple de configuration de tarifs spécifiques pour la Corse.
Correction d'un bug qui passait les commandes en invité au lieu de créer le compte pour un nouveau client.
Divers correctifs mineurs.

Download this release

Release Info

Developer Benjamin GOSSELET
Extension Chronopost
Version 1.0.3
Comparing to
See all releases


Code changes from version 1.0.2 to 1.0.3

Files changed (13) hide show
  1. app/code/community/Chronopost/Chronorelais/Helper/Webservice.php +1 -1
  2. app/code/community/Chronopost/Chronorelais/Model/Carrier/AbstractChronorelaisShipping.php +3 -3
  3. app/code/community/Chronopost/Chronorelais/controllers/AjaxController.php +13 -7
  4. app/code/community/Chronopost/Chronorelais/controllers/ExportController.php +5 -2
  5. app/code/community/Chronopost/Chronorelais/controllers/Sales/ImpressionController.php +8 -2
  6. app/code/community/Chronopost/Chronorelais/controllers/Sales/Order/ShipmentController.php +5 -2
  7. app/code/community/Chronopost/Chronorelais/etc/config.xml +1 -1
  8. app/code/community/Chronopost/Chronorelais/includes/ChronorelaisShippingHelper.php +3 -2
  9. app/code/community/Chronopost/Chronorelais/includes/countries.inc.php +6 -4
  10. app/design/adminhtml/default/default/layout/chronorelais.xml +19 -0
  11. package.xml +4 -4
  12. skin/adminhtml/default/default/chronorelais/chronorelais.css +47 -0
  13. skin/adminhtml/default/default/chronorelais/picto.gif +0 -0
app/code/community/Chronopost/Chronorelais/Helper/Webservice.php CHANGED
@@ -364,7 +364,7 @@ class Chronopost_Chronorelais_Helper_Webservice extends Mage_Core_Helper_Abstrac
364
  /*
365
  * Return true si la méthode de livraison fait partie du contrat
366
  */
367
- public function getMethodIsAllowed($code,$quote) {
368
  $quote = Mage::getSingleton('checkout/cart')->init()->getQuote();
369
  $address = $quote->getShippingAddress();
370
  $helperData = Mage::helper('chronorelais');
364
  /*
365
  * Return true si la méthode de livraison fait partie du contrat
366
  */
367
+ public function getMethodIsAllowed($code,$quote = '') {
368
  $quote = Mage::getSingleton('checkout/cart')->init()->getQuote();
369
  $address = $quote->getShippingAddress();
370
  $helperData = Mage::helper('chronorelais');
app/code/community/Chronopost/Chronorelais/Model/Carrier/AbstractChronorelaisShipping.php CHANGED
@@ -344,8 +344,8 @@ abstract class Chronopost_Chronorelais_Model_Carrier_AbstractChronorelaisShippin
344
  }
345
  }
346
 
347
- /* Si C10, CClassic ou Express => On vérifie si la méthode fait partie du contrat */
348
- $methodsToCheck = array('chronoexpress','chronopostc10','chronopostcclassic');
349
  if(in_array($this->_code, $methodsToCheck))
350
  {
351
  $isAllowed = $helperWS->getMethodIsAllowed($this->_code);
@@ -359,7 +359,7 @@ abstract class Chronopost_Chronorelais_Model_Carrier_AbstractChronorelaisShippin
359
  foreach ($process['config'] as $row) {
360
  $result = $this->_helper->processRow($process,$row);
361
  $this->_addMessages($this->_helper->getMessages());
362
- if ($result->success) {
363
  $value_found = true;
364
  $fees = $result->result;
365
  if($applicationFee) { $fees += $applicationFee; }
344
  }
345
  }
346
 
347
+ /* Si C10, CClassic ou C18 => On vérifie si la méthode fait partie du contrat */
348
+ $methodsToCheck = array('chronopostc18','chronopostc10','chronopostcclassic');
349
  if(in_array($this->_code, $methodsToCheck))
350
  {
351
  $isAllowed = $helperWS->getMethodIsAllowed($this->_code);
359
  foreach ($process['config'] as $row) {
360
  $result = $this->_helper->processRow($process,$row);
361
  $this->_addMessages($this->_helper->getMessages());
362
+ if ($result && $result->success) {
363
  $value_found = true;
364
  $fees = $result->result;
365
  if($applicationFee) { $fees += $applicationFee; }
app/code/community/Chronopost/Chronorelais/controllers/AjaxController.php CHANGED
@@ -183,14 +183,18 @@ class Chronopost_Chronorelais_AjaxController extends Chronopost_Chronorelais_Con
183
  if (preg_match('# *([^,(]+) *(-)? *(?:\( *(-)? *(.*)\))? *#s', $address_filter, $result)) {
184
  $country_code = $result[1];
185
 
186
- $region_codes = explode(',', $result[4]);
187
- $in_array = false;
188
- for ($i = count($region_codes); --$i >= 0;) {
189
- $code = trim($region_codes[$i]);
190
- $region_codes[$i] = $code;
 
 
 
191
  }
 
192
  /* $in_array = in_array($address['region_code'],$region_codes,true) || in_array($address['postcode'],$region_codes,true); */
193
- $excluding_region = $result[2] == '-' || $result[3] == '-';
194
  $output['countries'][] = array(
195
  'excluding' => $excluding_region,
196
  'country_code' => $country_code,
@@ -254,13 +258,15 @@ class Chronopost_Chronorelais_AjaxController extends Chronopost_Chronorelais_Con
254
  foreach ($properties as $property_key => $label) {
255
  $cleaned_property = $this->cleanKey($property_key);
256
  $value = isset($row[$property_key]) ? trim($row[$property_key]['value']) : '';
 
 
257
  $list .= "<li id=\"r-" . $row_id . "-p-" . $cleaned_property . "-item\" class=\"property-item" . ($j == 0 ? ' selected' : '')
258
  . (empty($value) ? ' empty' : '')
259
  . "\" onclick=\"ocseditor.selectProperty('" . $row_id . "','" . $cleaned_property . "');\">" . $this->__($label) . "</li>";
260
  $output .= "<div id=\"r-" . $row_id . "-p-" . $cleaned_property . "-container\" class=\"property-container"
261
  . ($j == 0 ? ' selected' : '') . "\" property-name=\"" . $property_key . "\">"
262
  . "<div class=\"buttons-set\" style=\"text-align:right;\">" . $this->button('Help', "ocseditor.help('property." . $property_key . "');", 'help') . "</div>"
263
- . $this->getPropertyHelper($row_id, $property_key, $row[$property_key]) . "</div>";
264
  $j++;
265
  }
266
  foreach ($row as $property_key => $property) {
183
  if (preg_match('# *([^,(]+) *(-)? *(?:\( *(-)? *(.*)\))? *#s', $address_filter, $result)) {
184
  $country_code = $result[1];
185
 
186
+ $region_codes = array();
187
+ if(isset($result[4])) {
188
+ $region_codes = explode(',', $result[4]);
189
+ $in_array = false;
190
+ for ($i = count($region_codes); --$i >= 0;) {
191
+ $code = trim($region_codes[$i]);
192
+ $region_codes[$i] = $code;
193
+ }
194
  }
195
+
196
  /* $in_array = in_array($address['region_code'],$region_codes,true) || in_array($address['postcode'],$region_codes,true); */
197
+ $excluding_region = (isset($result[2]) && $result[2] == '-') || (isset($result[3]) && $result[3] == '-');
198
  $output['countries'][] = array(
199
  'excluding' => $excluding_region,
200
  'country_code' => $country_code,
258
  foreach ($properties as $property_key => $label) {
259
  $cleaned_property = $this->cleanKey($property_key);
260
  $value = isset($row[$property_key]) ? trim($row[$property_key]['value']) : '';
261
+ $property = isset($row[$property_key]) ? $row[$property_key] : '';
262
+
263
  $list .= "<li id=\"r-" . $row_id . "-p-" . $cleaned_property . "-item\" class=\"property-item" . ($j == 0 ? ' selected' : '')
264
  . (empty($value) ? ' empty' : '')
265
  . "\" onclick=\"ocseditor.selectProperty('" . $row_id . "','" . $cleaned_property . "');\">" . $this->__($label) . "</li>";
266
  $output .= "<div id=\"r-" . $row_id . "-p-" . $cleaned_property . "-container\" class=\"property-container"
267
  . ($j == 0 ? ' selected' : '') . "\" property-name=\"" . $property_key . "\">"
268
  . "<div class=\"buttons-set\" style=\"text-align:right;\">" . $this->button('Help', "ocseditor.help('property." . $property_key . "');", 'help') . "</div>"
269
+ . $this->getPropertyHelper($row_id, $property_key, $property) . "</div>";
270
  $j++;
271
  }
272
  foreach ($row as $property_key => $property) {
app/code/community/Chronopost/Chronorelais/controllers/ExportController.php CHANGED
@@ -24,7 +24,8 @@ class Chronopost_Chronorelais_ExportController extends Mage_Adminhtml_Controller
24
  }
25
 
26
  public function removeSpclChars($text) {
27
- return ereg_replace("[^0-9a-zA-Z]", "", $text);
 
28
  }
29
 
30
  public function massLivraisonSamediStatusAction() {
@@ -280,7 +281,9 @@ class Chronopost_Chronorelais_ExportController extends Mage_Adminhtml_Controller
280
  $content = $this->_addFieldToCsv($content, $delimiter, $this->getValue($address->getFirstname()));
281
  $content .= $separator;
282
  /* telephone */
283
- $telephone = trim(ereg_replace("[^0-9.-]", " ", $address->getTelephone()));
 
 
284
  $telephone = (strlen($telephone) >= 10 ? $telephone : '');
285
  $content = $this->_addFieldToCsv($content, $delimiter, $telephone);
286
  $content .= $separator;
24
  }
25
 
26
  public function removeSpclChars($text) {
27
+ //return ereg_replace("[^0-9a-zA-Z]", "", $text);
28
+ return preg_replace("/[^0-9a-zA-Z]/", "", $text);
29
  }
30
 
31
  public function massLivraisonSamediStatusAction() {
281
  $content = $this->_addFieldToCsv($content, $delimiter, $this->getValue($address->getFirstname()));
282
  $content .= $separator;
283
  /* telephone */
284
+ //$telephone = trim(ereg_replace("[^0-9.-]", " ", $address->getTelephone()));
285
+ $telephone = trim(preg_replace("/[^0-9\.\-]/", " ", $address->getTelephone()));
286
+
287
  $telephone = (strlen($telephone) >= 10 ? $telephone : '');
288
  $content = $this->_addFieldToCsv($content, $delimiter, $telephone);
289
  $content .= $separator;
app/code/community/Chronopost/Chronorelais/controllers/Sales/ImpressionController.php CHANGED
@@ -267,7 +267,9 @@ class Chronopost_Chronorelais_Sales_ImpressionController extends Mage_Adminhtml_
267
  $recipientName = $this->getFilledValue($_shippingAddress->getCompany()); //RelayPoint Name if chronorelais or Companyname if chronopost and
268
  $recipientName2 = $this->getFilledValue($_shippingAddress->getFirstname() . ' ' . $_shippingAddress->getLastname());
269
  //remove any alphabets in phone number
270
- $recipientPhone = trim(ereg_replace("[^0-9.-]", " ", $_shippingAddress->getTelephone()));
 
 
271
 
272
  $recipient = array(
273
  'recipientAdress1' => substr($this->getFilledValue($recipient_address[0]), 0, 38),
@@ -889,7 +891,11 @@ class Chronopost_Chronorelais_Sales_ImpressionController extends Mage_Adminhtml_
889
  $recipientName = $this->getFilledValue($_shippingAddress->getCompany()); //RelayPoint Name if chronorelais or Companyname if chronopost and
890
  $recipientName2 = $this->getFilledValue($_shippingAddress->getFirstname() . ' ' . $_shippingAddress->getLastname());
891
  //remove any alphabets in phone number
892
- $recipientPhone = trim(ereg_replace("[^0-9.-]", " ", $_shippingAddress->getTelephone()));
 
 
 
 
893
  $shipper = array(
894
  'shipperAdress1' => substr($this->getFilledValue($recipient_address[0]), 0, 38),
895
  'shipperAdress2' => substr($this->getFilledValue($recipient_address[1]), 0, 38),
267
  $recipientName = $this->getFilledValue($_shippingAddress->getCompany()); //RelayPoint Name if chronorelais or Companyname if chronopost and
268
  $recipientName2 = $this->getFilledValue($_shippingAddress->getFirstname() . ' ' . $_shippingAddress->getLastname());
269
  //remove any alphabets in phone number
270
+
271
+ //$recipientPhone = trim(ereg_replace("[^0-9.-]", " ", $_shippingAddress->getTelephone()));
272
+ $recipientPhone = trim(preg_replace("/[^0-9\.\-]/", " ", $_shippingAddress->getTelephone()));
273
 
274
  $recipient = array(
275
  'recipientAdress1' => substr($this->getFilledValue($recipient_address[0]), 0, 38),
891
  $recipientName = $this->getFilledValue($_shippingAddress->getCompany()); //RelayPoint Name if chronorelais or Companyname if chronopost and
892
  $recipientName2 = $this->getFilledValue($_shippingAddress->getFirstname() . ' ' . $_shippingAddress->getLastname());
893
  //remove any alphabets in phone number
894
+
895
+ //$recipientPhone = trim(ereg_replace("[^0-9.-]", " ", $_shippingAddress->getTelephone()));
896
+ $recipientPhone = trim(preg_replace("/[^0-9\.\-]/", " ", $_shippingAddress->getTelephone()));
897
+
898
+
899
  $shipper = array(
900
  'shipperAdress1' => substr($this->getFilledValue($recipient_address[0]), 0, 38),
901
  'shipperAdress2' => substr($this->getFilledValue($recipient_address[1]), 0, 38),
app/code/community/Chronopost/Chronorelais/controllers/Sales/Order/ShipmentController.php CHANGED
@@ -105,7 +105,9 @@ class Chronopost_Chronorelais_Sales_Order_ShipmentController extends Mage_Adminh
105
  $recipientName = $this->getFilledValue($_shippingAddress->getCompany()); //RelayPoint Name if chronorelais or Companyname if chronopost and
106
  $recipientName2 = $this->getFilledValue($_shippingAddress->getFirstname() . ' ' . $_shippingAddress->getLastname());
107
  //remove any alphabets in phone number
108
- $recipientPhone = trim(ereg_replace("[^0-9.-]", " ", $_shippingAddress->getTelephone()));
 
 
109
 
110
  $recipient = array(
111
  'recipientAdress1' => substr($this->getFilledValue($recipient_address[0]), 0, 38),
@@ -366,7 +368,8 @@ class Chronopost_Chronorelais_Sales_Order_ShipmentController extends Mage_Adminh
366
  } catch (Exception $e) {
367
  $this->_getSession()->addError($this->__('Can not save shipment: ' . $e->getMessage()));
368
  }
369
- $this->_redirect('*/*/new', array('order_id' => $this->getRequest()->getParam('order_id')));
 
370
  }
371
 
372
  public function removeaccents($string) {
105
  $recipientName = $this->getFilledValue($_shippingAddress->getCompany()); //RelayPoint Name if chronorelais or Companyname if chronopost and
106
  $recipientName2 = $this->getFilledValue($_shippingAddress->getFirstname() . ' ' . $_shippingAddress->getLastname());
107
  //remove any alphabets in phone number
108
+
109
+ //$recipientPhone = trim(ereg_replace("[^0-9.-]", " ", $_shippingAddress->getTelephone()));
110
+ $recipientPhone = trim(preg_replace("/[^0-9\.\-]/", " ", $_shippingAddress->getTelephone()));
111
 
112
  $recipient = array(
113
  'recipientAdress1' => substr($this->getFilledValue($recipient_address[0]), 0, 38),
368
  } catch (Exception $e) {
369
  $this->_getSession()->addError($this->__('Can not save shipment: ' . $e->getMessage()));
370
  }
371
+ //$this->_redirect('*/*/new', array('order_id' => $this->getRequest()->getParam('order_id')));
372
+ $this->_redirect('adminhtml/sales_order/view', array('order_id' => $orderId));
373
  }
374
 
375
  public function removeaccents($string) {
app/code/community/Chronopost/Chronorelais/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Chronopost_Chronorelais>
5
- <version>1.0.1</version>
6
  <depends>
7
  <Mage_Shipping />
8
  <Mage_Sales />
2
  <config>
3
  <modules>
4
  <Chronopost_Chronorelais>
5
+ <version>1.0.3</version>
6
  <depends>
7
  <Mage_Shipping />
8
  <Mage_Sales />
app/code/community/Chronopost/Chronorelais/includes/ChronorelaisShippingHelper.php CHANGED
@@ -194,7 +194,7 @@ class ChronorelaisShippingHelper {
194
  }
195
 
196
  public function processRow($process, &$row, $is_checking = false) {
197
- if (!isset($row['*code']))
198
  return;
199
 
200
  self::debug('process row <span class="osh-key">' . $row['*code'] . '</span>', 1);
@@ -1109,7 +1109,8 @@ class ChronorelaisShippingHelper {
1109
  }
1110
  if (trim($config_string) != '') {
1111
  $this->_addIgnoredLines(trim($config_string));
1112
- $this->addMessage('info', $row = null, null, 'Ignored lines %s', '<div class="code">' . trim($config_string) . '</div>');
 
1113
  }
1114
  }
1115
 
194
  }
195
 
196
  public function processRow($process, &$row, $is_checking = false) {
197
+ if (!isset($row['*code']) || !isset($process['data']['carrier.code']))
198
  return;
199
 
200
  self::debug('process row <span class="osh-key">' . $row['*code'] . '</span>', 1);
1109
  }
1110
  if (trim($config_string) != '') {
1111
  $this->_addIgnoredLines(trim($config_string));
1112
+ $row = null;
1113
+ $this->addMessage('info', $row, null, 'Ignored lines %s', '<div class="code">' . trim($config_string) . '</div>');
1114
  }
1115
  }
1116
 
app/code/community/Chronopost/Chronorelais/includes/countries.inc.php CHANGED
@@ -294,7 +294,7 @@ class Country
294
  );
295
 
296
  public static function loadCache() {
297
- $filename = 'cache/countries';
298
  if (!file_exists($filename)) {
299
  self::$COUNTRIES['code2soft-cleaned-name'] = array();
300
  self::$COUNTRIES['code2hard-cleaned-name'] = array();
@@ -303,9 +303,11 @@ class Country
303
  self::$COUNTRIES['code2soft-cleaned-name'][$_code] = $soft_cleaned;
304
  self::$COUNTRIES['code2hard-cleaned-name'][$_code] = self::hardClean($soft_cleaned);
305
  }
306
- file_put_contents('cache/countries',serialize(self::$COUNTRIES));
 
 
307
  } else {
308
- self::$COUNTRIES = unserialize(file_get_contents('cache/countries'));
309
  }
310
  }
311
 
@@ -365,7 +367,7 @@ class AddressFilter extends Country
365
  private $address_filters_list;
366
 
367
  public function AddressFilter($data) {
368
- $input = trim($input);
369
  $this->data = $data;
370
  $this->classes = array();
371
  $this->address_filters_list = null;
294
  );
295
 
296
  public static function loadCache() {
297
+ $filename = 'var/cache/countries.txt';
298
  if (!file_exists($filename)) {
299
  self::$COUNTRIES['code2soft-cleaned-name'] = array();
300
  self::$COUNTRIES['code2hard-cleaned-name'] = array();
303
  self::$COUNTRIES['code2soft-cleaned-name'][$_code] = $soft_cleaned;
304
  self::$COUNTRIES['code2hard-cleaned-name'][$_code] = self::hardClean($soft_cleaned);
305
  }
306
+ $fp = fopen($filename,'w');
307
+ fwrite($fp, serialize(self::$COUNTRIES));
308
+ //file_put_contents('var/cache/countries.txt',serialize(self::$COUNTRIES));
309
  } else {
310
+ self::$COUNTRIES = unserialize(file_get_contents($filename));
311
  }
312
  }
313
 
367
  private $address_filters_list;
368
 
369
  public function AddressFilter($data) {
370
+ //$input = trim($input);
371
  $this->data = $data;
372
  $this->classes = array();
373
  $this->address_filters_list = null;
app/design/adminhtml/default/default/layout/chronorelais.xml ADDED
@@ -0,0 +1,19 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?xml version="1.0"?>
2
+ <layout version="0.1.0">
3
+ <default>
4
+ <reference name="content">
5
+ <block type="chronorelais/adminhtml_notification" />
6
+ </reference>
7
+ </default>
8
+ <adminhtml_sales_order_view>
9
+ <reference name="order_tab_info">
10
+ <action method="setTemplate" translate="value"><value>chronorelais/sales/order/view/tab/info.phtml</value></action>
11
+ </reference>
12
+ </adminhtml_sales_order_view>
13
+ <adminhtml_system_config_edit>
14
+ <reference name="head">
15
+ <action method="addItem"><type>skin_css</type><value>chronorelais/chronorelais.css</value></action>
16
+ <action method="addItem"><type>js</type><value>chronopost/chronorelais/chronorelais.js</value></action>
17
+ </reference>
18
+ </adminhtml_system_config_edit>
19
+ </layout>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Chronopost</name>
4
- <version>1.0.2</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
@@ -36,9 +36,9 @@ Correction d'un bug qui passait les commandes en invit&#xE9; au lieu de cr&#xE9;
36
  Divers correctifs mineurs.&#xD;
37
  </notes>
38
  <authors><author><name>Benjamin GOSSELET</name><user>Chronopost</user><email>bgosselet@adexos.fr</email></author></authors>
39
- <date>2013-07-19</date>
40
- <time>12:54:58</time>
41
- <contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="chronorelais"><dir name="bordereau"><file name="grid.phtml" hash="0eca2119f27219d6bb568c2d1f50dbaf"/></dir><dir name="config"><file name="checklogin.phtml" hash="5455c412136bb8aee5dc7376ec7db2e8"/></dir><dir name="import"><file name="form.phtml" hash="356aadf2bb0182b23f7af38888a0cd38"/></dir><file name="notification.phtml" hash="e706e5d080a768c30e399b0259bdeb6a"/><dir name="sales"><dir name="order"><dir name="view"><dir name="tab"><file name="info.phtml" hash="3c30b03519879b7ef0e5b37f44f4d823"/></dir></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="chronorelais.xml" hash="940f6bbecfea90954bd6166cde50ad99"/></dir><dir name="template"><dir name="chronorelais"><dir name="checkout"><dir name="multishipping"><file name="shipping.phtml" hash="907963f1564fe4b8e54492d66bc69b4b"/><dir name="shipping_method"><file name="chronorelais.phtml" hash="6b5d24fc6b59bba4a18185e4d5df84a8"/></dir></dir><dir name="onepage"><dir name="shipping_method"><file name="available.phtml" hash="d0596b238d7daf5e858583add7da7b3f"/><file name="chronorelais.phtml" hash="061e1430d504c505ef6845d4435235af"/></dir><file name="shipping_method.phtml" hash="c218579e6c7f82921fd36a9a4d3a39af"/></dir></dir><dir name="sales"><dir name="order"><file name="history.phtml" hash="0fbf2362562fc2ee25d9843d1fc3ab3e"/><file name="recent.phtml" hash="2c9a57fd83862a931956a8e95a2d82bb"/></dir></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="Chronopost"><dir name="Chronorelais"><dir name="Block"><dir name="Adminhtml"><file name="Notification.php" hash="f8496d3e31ae22a567cabd35ad99f320"/><dir name="System"><dir name="Config"><file name="Checklogin.php" hash="163f40010cc47a564a7655ede95d73b0"/><dir name="Form"><dir name="Field"><file name="Config.php" hash="b38741ddd97fcae5dd276239fb3c6b70"/><file name="Enabled.php" hash="c04ab5ade5716bdb3da170961215d7bf"/></dir><file name="Fieldsetassurance.php" hash="b5dbc90058d4d2cd8365965e2a2dc821"/></dir></dir></dir></dir><dir name="Checkout"><dir name="Multishipping"><dir name="Shipping"><dir name="Method"><file name="Chronorelais.php" hash="867238885e2aee05a729ba2e8b6f5d51"/></dir></dir></dir><dir name="Onepage"><dir name="Shipping"><dir name="Method"><file name="Chronorelais.php" hash="2abbc99d42ac0b6d3c97a4de32130cd6"/></dir></dir></dir></dir><file name="Detail.php" hash="42437d3c2c262e10f62e7b83ad73ccad"/><dir name="Export"><dir name="Orders"><file name="Grid.php" hash="ff2868c86da4e6b7eaeb1aa0bf30487b"/></dir><file name="Orders.php" hash="9ada10bd85cb58122e722b3e82c71e37"/></dir><file name="Filter.php" hash="07712e19ee91e331e8e141d075a787a3"/><dir name="Import"><file name="Form.php" hash="56c6e3787c05e58d57b48ec4b1421468"/></dir><dir name="Sales"><dir name="Bordereau"><file name="Grid.php" hash="9448cd1620e69f11c6f21641a90a9902"/></dir><file name="Bordereau.php" hash="699028f61947ea13f6939c2d2e1be01d"/><file name="Impression.php" hash="619599b136b9cc49f01dba5b08ee8428"/><dir name="Order"><dir name="Shipment"><file name="View.php" hash="f5407d7d14aa59acb844479da5046900"/></dir></dir><dir name="Shipment"><dir name="Grid"><dir name="Renderer"><file name="Retoursav.php" hash="c3a1fb0229bc2a4fa4d24d5808f58114"/></dir></dir><file name="Grid.php" hash="b03748ccfa87407c6433f4c8921c53e4"/></dir></dir></dir><dir name="Controller"><file name="Abstract.php" hash="94680cd88c6af59764dedb613b08d5f6"/></dir><dir name="Helper"><file name="Data.php" hash="1d2dee890e665476c4810afc4d0dc98b"/><file name="Webservice.php" hash="1ed2917d19f0f95bc41e02fc43da7f5f"/></dir><dir name="Model"><dir name="Carrier"><file name="AbstractChronorelais.php" hash="f4957f6d660c4adb0328f9f2d73da1e2"/><file name="AbstractChronorelaisShipping.php" hash="300ca74ab4846b1c097e78b7a1085c8f"/><file name="Chronoexpress.php" hash="bc867a6b98966ada549a0b81ec334b64"/><file name="Chronopost.php" hash="c4d4525447d2801d28d921eaedc35a9a"/><file name="ChronopostC10.php" hash="bb642a19103ce9a40ef1725fd5cf22bd"/><file name="ChronopostC18.php" hash="85419f76cf74e93d7385dd98c04587a7"/><file name="ChronopostCClassic.php" hash="2195866755728930b16695d06d06feb1"/><file name="Chronorelais.php" hash="5cfcb83c23d05585fdc50f8b2747fc40"/></dir><dir name="Config"><dir name="Source"><file name="Civility.php" hash="fe6ec6eebe6faffdd0bb65479d91cd5d"/><file name="EndOfLineCharacter.php" hash="3fe6b6069a9efdc29ad0d3f7d1cf4794"/><file name="FieldDelimiter.php" hash="3e023d40aeca50932e62ff97eed6317e"/><file name="FieldSeparator.php" hash="ce30c5974a893bd5467334d574dd578a"/><file name="FileCharset.php" hash="6cc4ebab95735bd121af16e0eedd90d6"/><file name="FileExtension.php" hash="597c3e78e7584bf7c4b7b2ebad6d2a65"/><file name="PrintMode.php" hash="67e8a6e98e12c7e72624ba5322076c00"/><file name="WeightUnit.php" hash="97ed82ddf61e05a094ba1a04982d0010"/></dir></dir><dir name="Sales"><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Shipping.php" hash="2e69db363011f84ef2cdb5d0e9d4c4df"/></dir></dir></dir></dir></dir><dir name="controllers"><file name="AjaxController.php" hash="6a50dd7b5e74a9132d6986b7e596147b"/><dir name="Checkout"><file name="MultishippingController.php" hash="5841817a54f05995454e4b0bbc792f4d"/><file name="OnepageController.php" hash="b70eea145708edc145858d7cf5fae091"/></dir><file name="ExportController.php" hash="c9adf4b0f9ed478efc2a5bc75cf0bbef"/><file name="ImportController.php" hash="964bf705b593bede1fc3b93e02fb37f2"/><file name="RelaisController.php" hash="5d48155ddb7cc2d4effbbfdeb4f3946d"/><dir name="Sales"><file name="BordereauController.php" hash="1102091b04b0af8f0d88bb6888f5fffd"/><file name="ImpressionController.php" hash="06d4777f7a51620a1e211c71dfcc7227"/><dir name="Order"><file name="ShipmentController.php" hash="db0aa2ad9e99d4b4e23548a0c5b5a743"/></dir></dir></dir><dir name="etc"><file name="config.xml" hash="78a1b10ce676b87a2d9f7be71079765a"/><file name="system.xml" hash="c4cf1c01931456dfa97c87a32ff5ff36"/></dir><dir name="includes"><file name="ChronorelaisShippingHelper.php" hash="47dc5560d25bcd940560c05238b5e913"/><file name="countries.inc.php" hash="ba7f3ed0d1adb87d928a6389fc722906"/></dir><dir name="sql"><dir name="chronorelais_setup"><file name="mysql4-install-0.1.0.php" hash="c307802a7bd10c1ecce06799b04569c2"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="ea3358055a851a96b673c721202045be"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="961f41dc1012d0917504f9bb5f5d106c"/><file name="mysql4-upgrade-0.1.2-0.1.3.php" hash="b85470889421f652c3d01b96072f579c"/><file name="mysql4-upgrade-0.1.3-0.1.4.php" hash="def69d0ae26b0d130d2ce6e0838e5d7f"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Chronopost_Chronorelais.csv" hash="76475aa4fa500c135a666e47bab62ddf"/></dir><dir name="fr_FR"><file name="Chronopost_Chronorelais.csv" hash="3f383558f7019b884d9c01ceab372ce4"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="default"><dir name="default"><dir name="chronorelais"><file name="Logo-Chronopost.jpg" hash="cc1226ebcd7236ce021076657ac22265"/><file name="Picto_Chrono_Relais.png" hash="1ea0f0c410d237adf23d5905cd8431f5"/><file name="Thumbs.db" hash="2e16ed23c37d1aa29a6caf73f513a648"/><file name="ac.png" hash="0c04f70da35d43a2636cfbd6ad2b10d5"/><file name="chronopost.png" hash="51ec3f1b8f0c970749ff24000bf7c162"/><file name="chronorelais.css" hash="a8d0ec0c82669a100a8951b31e6604ea"/><file name="chronorelais.png" hash="b3a8e94469113e5814c268cc6de66a2e"/><file name="chronorelaismap.js" hash="eee78175275ed0545dcdc710186ddbef"/><file name="home.png" hash="7904b495e94047eb3406e260bc660cce"/><file name="ico_ac_shaded.gif" hash="e55d9b2071fb976cf5331b6273a40731"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="WSChronopost_Chronorelais.xml" hash="e614759d6b46c0c25f6c26d6e9dff45a"/></dir></target><target name="mage"><dir name="js"><dir name="chronopost"><dir name="chronorelais"><file name="chronorelais.js" hash="9c55c7a13327be44a8c4fde0f272fb35"/><file name="ocseditor.css" hash="1bfc847153768d6729cdad7cb1abe443"/><file name="ocseditor.js" hash="8b7f29ddf7faff2fd3a63af18ba666aa"/></dir></dir></dir></target></contents>
42
  <compatible/>
43
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
44
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Chronopost</name>
4
+ <version>1.0.3</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
36
  Divers correctifs mineurs.&#xD;
37
  </notes>
38
  <authors><author><name>Benjamin GOSSELET</name><user>Chronopost</user><email>bgosselet@adexos.fr</email></author></authors>
39
+ <date>2013-12-04</date>
40
+ <time>09:44:41</time>
41
+ <contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="chronorelais"><dir name="bordereau"><file name="grid.phtml" hash="0eca2119f27219d6bb568c2d1f50dbaf"/></dir><dir name="config"><file name="checklogin.phtml" hash="5455c412136bb8aee5dc7376ec7db2e8"/></dir><dir name="import"><file name="form.phtml" hash="356aadf2bb0182b23f7af38888a0cd38"/></dir><file name="notification.phtml" hash="e706e5d080a768c30e399b0259bdeb6a"/><dir name="sales"><dir name="order"><dir name="view"><dir name="tab"><file name="info.phtml" hash="3c30b03519879b7ef0e5b37f44f4d823"/></dir></dir></dir></dir></dir></dir><dir name="layout"><file name="chronorelais.xml" hash="98a5bb79ecf4b9924dc3157cdada3c67"/></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="chronorelais.xml" hash="940f6bbecfea90954bd6166cde50ad99"/></dir><dir name="template"><dir name="chronorelais"><dir name="checkout"><dir name="multishipping"><file name="shipping.phtml" hash="907963f1564fe4b8e54492d66bc69b4b"/><dir name="shipping_method"><file name="chronorelais.phtml" hash="6b5d24fc6b59bba4a18185e4d5df84a8"/></dir></dir><dir name="onepage"><dir name="shipping_method"><file name="available.phtml" hash="d0596b238d7daf5e858583add7da7b3f"/><file name="chronorelais.phtml" hash="061e1430d504c505ef6845d4435235af"/></dir><file name="shipping_method.phtml" hash="c218579e6c7f82921fd36a9a4d3a39af"/></dir></dir><dir name="sales"><dir name="order"><file name="history.phtml" hash="0fbf2362562fc2ee25d9843d1fc3ab3e"/><file name="recent.phtml" hash="2c9a57fd83862a931956a8e95a2d82bb"/></dir></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="Chronopost"><dir name="Chronorelais"><dir name="Block"><dir name="Adminhtml"><file name="Notification.php" hash="f8496d3e31ae22a567cabd35ad99f320"/><dir name="System"><dir name="Config"><file name="Checklogin.php" hash="163f40010cc47a564a7655ede95d73b0"/><dir name="Form"><dir name="Field"><file name="Config.php" hash="b38741ddd97fcae5dd276239fb3c6b70"/><file name="Enabled.php" hash="c04ab5ade5716bdb3da170961215d7bf"/></dir><file name="Fieldsetassurance.php" hash="b5dbc90058d4d2cd8365965e2a2dc821"/></dir></dir></dir></dir><dir name="Checkout"><dir name="Multishipping"><dir name="Shipping"><dir name="Method"><file name="Chronorelais.php" hash="867238885e2aee05a729ba2e8b6f5d51"/></dir></dir></dir><dir name="Onepage"><dir name="Shipping"><dir name="Method"><file name="Chronorelais.php" hash="2abbc99d42ac0b6d3c97a4de32130cd6"/></dir></dir></dir></dir><file name="Detail.php" hash="42437d3c2c262e10f62e7b83ad73ccad"/><dir name="Export"><dir name="Orders"><file name="Grid.php" hash="ff2868c86da4e6b7eaeb1aa0bf30487b"/></dir><file name="Orders.php" hash="9ada10bd85cb58122e722b3e82c71e37"/></dir><file name="Filter.php" hash="07712e19ee91e331e8e141d075a787a3"/><dir name="Import"><file name="Form.php" hash="56c6e3787c05e58d57b48ec4b1421468"/></dir><dir name="Sales"><dir name="Bordereau"><file name="Grid.php" hash="9448cd1620e69f11c6f21641a90a9902"/></dir><file name="Bordereau.php" hash="699028f61947ea13f6939c2d2e1be01d"/><file name="Impression.php" hash="619599b136b9cc49f01dba5b08ee8428"/><dir name="Order"><dir name="Shipment"><file name="View.php" hash="f5407d7d14aa59acb844479da5046900"/></dir></dir><dir name="Shipment"><dir name="Grid"><dir name="Renderer"><file name="Retoursav.php" hash="c3a1fb0229bc2a4fa4d24d5808f58114"/></dir></dir><file name="Grid.php" hash="b03748ccfa87407c6433f4c8921c53e4"/></dir></dir></dir><dir name="Controller"><file name="Abstract.php" hash="94680cd88c6af59764dedb613b08d5f6"/></dir><dir name="Helper"><file name="Data.php" hash="1d2dee890e665476c4810afc4d0dc98b"/><file name="Webservice.php" hash="edb401b16e629107b9a0bb1dacf9fb83"/></dir><dir name="Model"><dir name="Carrier"><file name="AbstractChronorelais.php" hash="f4957f6d660c4adb0328f9f2d73da1e2"/><file name="AbstractChronorelaisShipping.php" hash="7f02d9e251beb198cec128aaf59efcaf"/><file name="Chronoexpress.php" hash="bc867a6b98966ada549a0b81ec334b64"/><file name="Chronopost.php" hash="c4d4525447d2801d28d921eaedc35a9a"/><file name="ChronopostC10.php" hash="bb642a19103ce9a40ef1725fd5cf22bd"/><file name="ChronopostC18.php" hash="85419f76cf74e93d7385dd98c04587a7"/><file name="ChronopostCClassic.php" hash="2195866755728930b16695d06d06feb1"/><file name="Chronorelais.php" hash="5cfcb83c23d05585fdc50f8b2747fc40"/></dir><dir name="Config"><dir name="Source"><file name="Civility.php" hash="fe6ec6eebe6faffdd0bb65479d91cd5d"/><file name="EndOfLineCharacter.php" hash="3fe6b6069a9efdc29ad0d3f7d1cf4794"/><file name="FieldDelimiter.php" hash="3e023d40aeca50932e62ff97eed6317e"/><file name="FieldSeparator.php" hash="ce30c5974a893bd5467334d574dd578a"/><file name="FileCharset.php" hash="6cc4ebab95735bd121af16e0eedd90d6"/><file name="FileExtension.php" hash="597c3e78e7584bf7c4b7b2ebad6d2a65"/><file name="PrintMode.php" hash="67e8a6e98e12c7e72624ba5322076c00"/><file name="WeightUnit.php" hash="97ed82ddf61e05a094ba1a04982d0010"/></dir></dir><dir name="Sales"><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Shipping.php" hash="2e69db363011f84ef2cdb5d0e9d4c4df"/></dir></dir></dir></dir></dir><dir name="controllers"><file name="AjaxController.php" hash="bed16f4f85b7fadd6301962ddc6220d1"/><dir name="Checkout"><file name="MultishippingController.php" hash="5841817a54f05995454e4b0bbc792f4d"/><file name="OnepageController.php" hash="b70eea145708edc145858d7cf5fae091"/></dir><file name="ExportController.php" hash="95c2e7ced2aa718b6ed8140095bed4ff"/><file name="ImportController.php" hash="964bf705b593bede1fc3b93e02fb37f2"/><file name="RelaisController.php" hash="5d48155ddb7cc2d4effbbfdeb4f3946d"/><dir name="Sales"><file name="BordereauController.php" hash="1102091b04b0af8f0d88bb6888f5fffd"/><file name="ImpressionController.php" hash="1ce3e14175a18178f3553aa41154730d"/><dir name="Order"><file name="ShipmentController.php" hash="c29fa819dfef9be64404be682b86dd8a"/></dir></dir></dir><dir name="etc"><file name="config.xml" hash="d9da736b2ff001c09cf1c492a896b3e8"/><file name="system.xml" hash="c4cf1c01931456dfa97c87a32ff5ff36"/></dir><dir name="includes"><file name="ChronorelaisShippingHelper.php" hash="832b11c52bff65c0dfe69fd798f218ce"/><file name="countries.inc.php" hash="04ff96cd7f0b985c4dfda52b8609b9d5"/></dir><dir name="sql"><dir name="chronorelais_setup"><file name="mysql4-install-0.1.0.php" hash="c307802a7bd10c1ecce06799b04569c2"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="ea3358055a851a96b673c721202045be"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="961f41dc1012d0917504f9bb5f5d106c"/><file name="mysql4-upgrade-0.1.2-0.1.3.php" hash="b85470889421f652c3d01b96072f579c"/><file name="mysql4-upgrade-0.1.3-0.1.4.php" hash="def69d0ae26b0d130d2ce6e0838e5d7f"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Chronopost_Chronorelais.csv" hash="76475aa4fa500c135a666e47bab62ddf"/></dir><dir name="fr_FR"><file name="Chronopost_Chronorelais.csv" hash="3f383558f7019b884d9c01ceab372ce4"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="default"><dir name="default"><dir name="chronorelais"><file name="Logo-Chronopost.jpg" hash="cc1226ebcd7236ce021076657ac22265"/><file name="Picto_Chrono_Relais.png" hash="1ea0f0c410d237adf23d5905cd8431f5"/><file name="Thumbs.db" hash="2e16ed23c37d1aa29a6caf73f513a648"/><file name="ac.png" hash="0c04f70da35d43a2636cfbd6ad2b10d5"/><file name="chronopost.png" hash="51ec3f1b8f0c970749ff24000bf7c162"/><file name="chronorelais.css" hash="a8d0ec0c82669a100a8951b31e6604ea"/><file name="chronorelais.png" hash="b3a8e94469113e5814c268cc6de66a2e"/><file name="chronorelaismap.js" hash="eee78175275ed0545dcdc710186ddbef"/><file name="home.png" hash="7904b495e94047eb3406e260bc660cce"/><file name="ico_ac_shaded.gif" hash="e55d9b2071fb976cf5331b6273a40731"/></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="chronorelais"><file name="chronorelais.css" hash="0a50cd0eebbe49540ad32294b4ffa2bd"/><file name="picto.gif" hash="9b11332763c74ebe43a25f8329b5347b"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="WSChronopost_Chronorelais.xml" hash="e614759d6b46c0c25f6c26d6e9dff45a"/></dir></target><target name="mage"><dir name="js"><dir name="chronopost"><dir name="chronorelais"><file name="chronorelais.js" hash="9c55c7a13327be44a8c4fde0f272fb35"/><file name="ocseditor.css" hash="1bfc847153768d6729cdad7cb1abe443"/><file name="ocseditor.js" hash="8b7f29ddf7faff2fd3a63af18ba666aa"/></dir></dir></dir></target></contents>
42
  <compatible/>
43
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
44
  </package>
skin/adminhtml/default/default/chronorelais/chronorelais.css ADDED
@@ -0,0 +1,47 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ fieldset#chronorelais_assurance {
2
+ position: relative;
3
+ min-height: 100px;
4
+ }
5
+
6
+ .chronorelais_assurance {
7
+ position: absolute;
8
+ top: 3px;
9
+ left: 620px;
10
+ }
11
+ .chronorelais_assurance .chronorelais_assurance_picto{
12
+ float: left;
13
+ margin-right: 10px;
14
+ margin-top: 12px;
15
+ cursor: pointer;
16
+ }
17
+ .chronorelais_assurance .chronorelais_assurance_infobulle{
18
+ float: left;
19
+ width: 300px;
20
+ border: 2px solid #f3bf8f;
21
+ }
22
+
23
+ .chronorelais_assurance .chronorelais_assurance_infobulle .chronorelais_assurance_infobulle_header {
24
+ background: #f3bf8f;
25
+ padding-bottom: 2px;
26
+ }
27
+ .chronorelais_assurance .chronorelais_assurance_infobulle .chronorelais_assurance_infobulle_header .chronorelais_assurance_infobulle_header_title{
28
+ float: left;
29
+ margin-left: 5px;
30
+ line-height: 20px;
31
+ color: #FFF;
32
+ }
33
+ .chronorelais_assurance .chronorelais_assurance_infobulle .chronorelais_assurance_infobulle_header .chronorelais_assurance_infobulle_header_close{
34
+ float: right;
35
+ }
36
+ .chronorelais_assurance .chronorelais_assurance_infobulle .chronorelais_assurance_infobulle_header .chronorelais_assurance_infobulle_header_close{} button.close {}
37
+ .chronorelais_assurance .chronorelais_assurance_infobulle .chronorelais_assurance_infobulle_header .chronorelais_assurance_infobulle_header_close{} button.close span {
38
+ padding-left: 18px;
39
+ background-image: url("../images/bkg_btn-close2.gif");
40
+ }
41
+ .chronorelais_assurance .chronorelais_assurance_infobulle .chronorelais_assurance_infobulle_content{
42
+ background: #FFF;
43
+ font-size: 11px;
44
+ line-height: 13px;
45
+ padding: 6px;
46
+ padding-bottom: 10px;
47
+ }
skin/adminhtml/default/default/chronorelais/picto.gif ADDED
Binary file