MondialRelay_Pointsrelais - Version 1.3.3

Version Notes

correction de la grille d'etiquettes

Download this release

Release Info

Developer Magento Core Team
Extension MondialRelay_Pointsrelais
Version 1.3.3
Comparing to
See all releases


Code changes from version 1.3.2 to 1.3.3

Files changed (21) hide show
  1. app/code/community/MondialRelay/Pointsrelais/Block/Sales/Shipment/Grid.php +10 -5
  2. app/code/community/MondialRelay/Pointsrelais/controllers/Sales/._ImpressionController.php +0 -0
  3. app/code/community/MondialRelay/Pointsrelais/controllers/Sales/ImpressionController.php +63 -24
  4. app/code/community/MondialRelay/Pointsrelais/etc/._config.xml +0 -0
  5. app/code/community/MondialRelay/Pointsrelais/etc/config.xml +1 -1
  6. app/code/community/MondialRelay/Pointsrelais/sql/pointsrelais_setup/mysql4-uninstall-0.1.0.php +12 -0
  7. app/design/adminhtml/default/mondialrelay/template/sales/order/invoice/create/form.phtml +0 -111
  8. app/design/adminhtml/default/mondialrelay/template/sales/order/invoice/create/tracking.phtml +0 -116
  9. app/design/adminhtml/default/mondialrelay/template/sales/order/shipment/create/form.phtml +0 -88
  10. app/design/frontend/default/default/layout/pointsrelais.xml +0 -16
  11. app/design/frontend/default/default/template/pointsrelais/baseurl.phtml +0 -3
  12. app/design/frontend/default/default/template/pointsrelais/info.phtml +0 -165
  13. app/etc/modules/MondialRelay_All.xml +0 -9
  14. app/locale/fr_FR/MondialRelay_Pointsrelais.csv +0 -19
  15. package.xml +5 -6
  16. skin/frontend/default/default/css/pointsrelais.css +0 -46
  17. skin/frontend/default/default/images/mondialrelay/Thumbs.db +0 -0
  18. skin/frontend/default/default/images/mondialrelay/img_fermer.gif +0 -0
  19. skin/frontend/default/default/images/mondialrelay/img_fleche.gif +0 -0
  20. skin/frontend/default/default/images/mondialrelay/logo_PR_01.gif +0 -0
  21. skin/frontend/default/default/js/pointsrelais.js +0 -92
app/code/community/MondialRelay/Pointsrelais/Block/Sales/Shipment/Grid.php CHANGED
@@ -64,6 +64,11 @@ class MondialRelay_Pointsrelais_Block_Sales_Shipment_Grid extends Mage_Adminhtml
64
 
65
  protected function _prepareColumns()
66
  {
 
 
 
 
 
67
  $this->addColumn('increment_id', array(
68
  'header' => Mage::helper('sales')->__('Shipment #'),
69
  'index' => 'increment_id',
@@ -105,7 +110,7 @@ class MondialRelay_Pointsrelais_Block_Sales_Shipment_Grid extends Mage_Adminhtml
105
  'header' => Mage::helper('sales')->__('Action'),
106
  'width' => '50px',
107
  'type' => 'action',
108
- 'getter' => 'getId',
109
  'actions' => array(
110
  array(
111
  'caption' => Mage::helper('sales')->__('View'),
@@ -130,17 +135,17 @@ class MondialRelay_Pointsrelais_Block_Sales_Shipment_Grid extends Mage_Adminhtml
130
  return false;
131
  }
132
 
133
- return $this->getUrl('*/sales_shipment/view',
134
  array(
135
- 'shipment_id'=> $row->getId(),
136
  )
137
  );
138
  }
139
-
140
  protected function _prepareMassaction()
141
  {
142
  $this->setMassactionIdField('entity_id');
143
- $this->getMassactionBlock()->setFormFieldName('shipment_ids');
144
  $this->getMassactionBlock()->setUseSelectAll(false);
145
 
146
  // Impression des étiquettes
64
 
65
  protected function _prepareColumns()
66
  {
67
+ $this->addColumn('parent_id', array(
68
+ 'header' => Mage::helper('sales')->__('Shipment #'),
69
+ 'index' => 'parent_id',
70
+ 'type' => 'text',
71
+ ));
72
  $this->addColumn('increment_id', array(
73
  'header' => Mage::helper('sales')->__('Shipment #'),
74
  'index' => 'increment_id',
110
  'header' => Mage::helper('sales')->__('Action'),
111
  'width' => '50px',
112
  'type' => 'action',
113
+ 'getter' => 'getParentId',
114
  'actions' => array(
115
  array(
116
  'caption' => Mage::helper('sales')->__('View'),
135
  return false;
136
  }
137
 
138
+ return $this->getUrl('adminhtml/sales_shipment/view',
139
  array(
140
+ 'shipment_id'=> $row->getParentId(),
141
  )
142
  );
143
  }
144
+
145
  protected function _prepareMassaction()
146
  {
147
  $this->setMassactionIdField('entity_id');
148
+ $this->getMassactionBlock()->setFormFieldName('track_ids');
149
  $this->getMassactionBlock()->setUseSelectAll(false);
150
 
151
  // Impression des étiquettes
app/code/community/MondialRelay/Pointsrelais/controllers/Sales/._ImpressionController.php ADDED
Binary file
app/code/community/MondialRelay/Pointsrelais/controllers/Sales/ImpressionController.php CHANGED
@@ -2,7 +2,7 @@
2
 
3
  class MondialRelay_Pointsrelais_Sales_ImpressionController extends Mage_Adminhtml_Controller_Action
4
  {
5
- protected $_trackingNumbers = '';
6
 
7
  /**
8
  * Additional initialization
@@ -67,18 +67,20 @@ class MondialRelay_Pointsrelais_Sales_ImpressionController extends Mage_Adminhtm
67
 
68
  protected function getTrackingNumber($shipmentId)
69
  {
 
70
  $shipment = Mage::getModel('sales/order_shipment')->load($shipmentId);
71
-
72
  //On récupère le numéro de tracking
73
  $tracks = $shipment->getTracksCollection();
 
 
74
  foreach ($tracks as $track) {
75
- if ( $track->getParentId() == $shipmentId)
76
- {
77
- $this->_trackingNumbers .= $track->getnumber();
78
- }
79
  }
80
 
81
- return $this->_trackingNumbers;
82
  }
83
 
84
  protected function getEtiquetteUrl($shipmentsIds)
@@ -86,25 +88,21 @@ class MondialRelay_Pointsrelais_Sales_ImpressionController extends Mage_Adminhtm
86
  //On récupère les infos d'expédition
87
  if (is_array($shipmentsIds))
88
  {
89
- for ($i = 0; $i < count($shipmentsIds); $i++)
90
  {
91
- $this->getTrackingNumber($shipmentsIds[$i]);
92
- if ( $i < count($shipmentsIds)-1)
93
- {
94
- $this->_trackingNumbers .= ';';
95
- }
96
  }
97
  }
98
  else
99
  {
100
  $shipmentId = $shipmentsIds;
101
- $this->getTrackingNumber($shipmentId);
102
  };
103
 
104
  // On met en place les paramètres de la requète
105
  $params = array(
106
  'Enseigne' => $this->getConfigData('enseigne'),
107
- 'Expeditions' => $this->_trackingNumbers,
108
  'Langue' => 'FR',
109
  );
110
  //On crée le code de sécurité
@@ -123,16 +121,57 @@ class MondialRelay_Pointsrelais_Sales_ImpressionController extends Mage_Adminhtm
123
  return $etiquette->URL_PDF_A5;
124
  }
125
 
126
- public function printMassAction()
127
  {
128
- $shipmentsIds = $this->getRequest()->getPost('shipment_ids');
 
 
 
 
 
129
 
130
- try {
131
- $urlEtiquette = $this->getEtiquetteUrl($shipmentsIds);
132
- $this->_processDownload('http://www.mondialrelay.fr' . $urlEtiquette, 'url');
133
- exit(0);
134
- } catch (Mage_Core_Exception $e) {
135
- $this->_getSession()->addError(Mage::helper('pointsrelais')->__('Désolé, une erreure est survenu lors de la récupération de l\'étiquetes. Merci de contacter Mondial Relay ou de réessayer plus tard'));
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
136
  }
137
  return $this->_redirectReferer();
138
 
@@ -145,7 +184,7 @@ class MondialRelay_Pointsrelais_Sales_ImpressionController extends Mage_Adminhtm
145
  try {
146
  $urlEtiquette = $this->getEtiquetteUrl($shipmentId);
147
  $this->_processDownload('http://www.mondialrelay.fr' . $urlEtiquette, 'url');
148
- exit(0);
149
  } catch (Mage_Core_Exception $e) {
150
  $this->_getSession()->addError(Mage::helper('pointsrelais')->__('Désolé, une erreure est survenu lors de la récupération de l\'étiquetes. Merci de contacter Mondial Relay ou de réessayer plus tard'));
151
  }
2
 
3
  class MondialRelay_Pointsrelais_Sales_ImpressionController extends Mage_Adminhtml_Controller_Action
4
  {
5
+ protected $_trackingNumbers = array();
6
 
7
  /**
8
  * Additional initialization
67
 
68
  protected function getTrackingNumber($shipmentId)
69
  {
70
+
71
  $shipment = Mage::getModel('sales/order_shipment')->load($shipmentId);
72
+ $trackingNumbersToReturn = array();
73
  //On récupère le numéro de tracking
74
  $tracks = $shipment->getTracksCollection();
75
+ //->addAttributeToFilter('carrier_code', array('like' => 'pointsrelais%'));
76
+
77
  foreach ($tracks as $track) {
78
+
79
+ $trackingNumbersToReturn[] = $track->getnumber();
80
+
 
81
  }
82
 
83
+ return $trackingNumbersToReturn;
84
  }
85
 
86
  protected function getEtiquetteUrl($shipmentsIds)
88
  //On récupère les infos d'expédition
89
  if (is_array($shipmentsIds))
90
  {
91
+ foreach($shipmentsIds as $shipmentsId)
92
  {
93
+ array_merge($this->_trackingNumbers, $this->getTrackingNumber($shipmentsId));
 
 
 
 
94
  }
95
  }
96
  else
97
  {
98
  $shipmentId = $shipmentsIds;
99
+ $this->_trackingNumbers = $this->getTrackingNumber($shipmentId);
100
  };
101
 
102
  // On met en place les paramètres de la requète
103
  $params = array(
104
  'Enseigne' => $this->getConfigData('enseigne'),
105
+ 'Expeditions' => implode(';',$this->_trackingNumbers),
106
  'Langue' => 'FR',
107
  );
108
  //On crée le code de sécurité
121
  return $etiquette->URL_PDF_A5;
122
  }
123
 
124
+ protected function getEtiquetteUrlFromTrack($trackIds)
125
  {
126
+ $mrTrackingNumber = array();
127
+ foreach($trackIds as $trackingId)
128
+ {
129
+ $trackObj = Mage::getModel('sales/order_shipment_track')->load($trackingId);
130
+ $mrTrackingNumber[] = $trackObj->getnumber();
131
+ }
132
 
133
+ // On met en place les paramètres de la requète
134
+ $params = array(
135
+ 'Enseigne' => $this->getConfigData('enseigne'),
136
+ 'Expeditions' => implode(';',$mrTrackingNumber),
137
+ 'Langue' => 'FR',
138
+ );
139
+
140
+ //On crée le code de sécurité
141
+ $code = implode("",$params);
142
+ $code .= $this->getConfigData('cle');
143
+
144
+ //On le rajoute aux paramètres
145
+ $params["Security"] = strtoupper(md5($code));
146
+
147
+ // On se connecte
148
+ $client = new SoapClient("http://www.mondialrelay.com/WebService/Web_Services.asmx?WSDL");
149
+ // Et on effectue la requète
150
+ $etiquette = $client->WSI2_GetEtiquettes($params)->WSI2_GetEtiquettesResult;
151
+
152
+ return $etiquette;
153
+
154
+ }
155
+
156
+ public function printMassAction()
157
+ {
158
+ $trackIds = $this->getRequest()->getPost('track_ids');
159
+ if(!is_array($trackIds)) {
160
+ Mage::getSingleton('adminhtml/session')->addError(Mage::helper('adminhtml')->__('Merci de sélectionner des commandes.'));
161
+
162
+ } else {
163
+ try {
164
+ $etiquette = $this->getEtiquetteUrlFromTrack($trackIds);
165
+ if($etiquette->STAT == 0){
166
+ $this->_processDownload('http://www.mondialrelay.fr' . $etiquette->URL_PDF_A5, 'url');
167
+ }else{
168
+ $this->_getSession()->addError(Mage::helper('pointsrelais')->__('Désolé, une erreure est survenu lors de la récupération de l\'étiquetes. Merci de contacter Mondial Relay ou de réessayer plus tard, erreur '.$etiquette->STAT.'.'));
169
+ }
170
+ // exit(0);
171
+ } catch (Exception $e) {
172
+ Mage::Log('$Mage_Core_Exception : ',$e->getMessage());
173
+ $this->_getSession()->addError(Mage::helper('pointsrelais')->__('Désolé, une erreure est survenu lors de la récupération de l\'étiquetes. Merci de contacter Mondial Relay ou de réessayer plus tard.'));
174
+ }
175
  }
176
  return $this->_redirectReferer();
177
 
184
  try {
185
  $urlEtiquette = $this->getEtiquetteUrl($shipmentId);
186
  $this->_processDownload('http://www.mondialrelay.fr' . $urlEtiquette, 'url');
187
+ // exit(0);
188
  } catch (Mage_Core_Exception $e) {
189
  $this->_getSession()->addError(Mage::helper('pointsrelais')->__('Désolé, une erreure est survenu lors de la récupération de l\'étiquetes. Merci de contacter Mondial Relay ou de réessayer plus tard'));
190
  }
app/code/community/MondialRelay/Pointsrelais/etc/._config.xml ADDED
Binary file
app/code/community/MondialRelay/Pointsrelais/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <MondialRelay_Pointsrelais>
5
- <version>1.3.2</version>
6
  <depends>
7
  <Mage_Adminhtml />
8
  <Mage_Shipping />
2
  <config>
3
  <modules>
4
  <MondialRelay_Pointsrelais>
5
+ <version>1.3.3</version>
6
  <depends>
7
  <Mage_Adminhtml />
8
  <Mage_Shipping />
app/code/community/MondialRelay/Pointsrelais/sql/pointsrelais_setup/mysql4-uninstall-0.1.0.php ADDED
@@ -0,0 +1,12 @@
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ $installer = $this;
3
+
4
+ $installer->startSetup();
5
+
6
+ $installer->run("
7
+ DROP TABLE IF EXISTS {$this->getTable('mondialrelay_pointsrelais')};
8
+ DELETE FROM {$this->getTable('core/config_data')} WHERE path like 'carriers/pointsrelais/%';
9
+ DELETE FROM {$this->getTable('core/resource')} WHERE code like 'pointsrelais_setup';
10
+ ");
11
+
12
+ $installer->endSetup();
app/design/adminhtml/default/mondialrelay/template/sales/order/invoice/create/form.phtml DELETED
@@ -1,111 +0,0 @@
1
- <?php
2
- /**
3
- * Magento
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Academic Free License (AFL 3.0)
8
- * that is bundled with this package in the file LICENSE_AFL.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://opensource.org/licenses/afl-3.0.php
11
- * If you did not receive a copy of the license and are unable to
12
- * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
- *
15
- * DISCLAIMER
16
- *
17
- * Do not edit or add to this file if you wish to upgrade Magento to newer
18
- * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
- *
21
- * @category design
22
- * @package default_default
23
- * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
- */
26
- ?>
27
- <form id="edit_form" method="post" action="<?php echo $this->getSaveUrl() ?>">
28
- <?php echo $this->getBlockHtml('formkey')?>
29
- <?php $_order = $this->getInvoice()->getOrder() ?>
30
- <?php echo $this->getChildHtml('order_info') ?>
31
- <?php if (!$_order->getIsVirtual()): ?>
32
- <div class="box-left">
33
- <?php else: ?>
34
- <div class="box-right">
35
- <?php endif; ?>
36
-
37
- <div class="entry-edit">
38
- <div class="entry-edit-head">
39
- <h4 class="icon-head head-payment-method"><?php echo Mage::helper('sales')->__('Payment Information') ?></h4>
40
- </div>
41
- <fieldset>
42
- <div><?php echo $this->getChildHtml('order_payment') ?></div>
43
- <div><?php echo Mage::helper('sales')->__('Order was placed using %s', $_order->getOrderCurrencyCode()) ?></div>
44
- </fieldset>
45
- </div>
46
- </div>
47
- <?php if (!$_order->getIsVirtual()): ?>
48
- <div class="box-right">
49
- <!--Shipping Address-->
50
- <div class="entry-edit">
51
- <div class="entry-edit-head">
52
- <h4 class="icon-head head-shipping-method"><?php echo Mage::helper('sales')->__('Shipping Information') ?></h4>
53
- </div>
54
- <fieldset>
55
- <div>
56
- <strong><?php echo $_order->getShippingDescription() ?></strong>
57
- <?php echo $this->helper('sales')->__('Total Shipping Charges'); ?>:
58
-
59
- <?php if ($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
60
- <?php $_excl = $this->displayShippingPriceInclTax($_order); ?>
61
- <?php else: ?>
62
- <?php $_excl = $this->displayPriceAttribute('shipping_amount', false, ' '); ?>
63
- <?php endif; ?>
64
- <?php $_incl = $this->displayShippingPriceInclTax($_order); ?>
65
-
66
- <?php echo $_excl; ?>
67
- <?php if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl): ?>
68
- (<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
69
- <?php endif; ?>
70
- </div>
71
- <?php $_order = Mage::registry('current_invoice')->getOrder(); ?>
72
- <?php $_shippingMethod = $_order->getShippingCarrier()->getCarrierCode(); ?>
73
- <?php if ($this->canCreateShipment() && $this->canShipPartiallyItem()
74
- && ($_shippingMethod != 'pointsrelais') && ($_shippingMethod != 'pointsrelaiscd') && ($_shippingMethod != 'pointsrelaisld1') && ($_shippingMethod != 'pointsrelaislds')): ?>
75
- <p class="nm">
76
- <label for="invoice_do_shipment" class="normal"><?php echo Mage::helper('sales')->__('Create Shipment') ?></label>
77
- <input type="checkbox" name="invoice[do_shipment]" id="invoice_do_shipment" value="1" onclick="if ( this.checked==true ) { document.getElementById('tracking').style.display = 'block'} else { document.getElementById('tracking').style.display = 'none' }"<?php echo $this->hasInvoiceShipmentTypeMismatch()?' disabled="disabled"':'' ?> />
78
- </p>
79
- <?php if ($this->hasInvoiceShipmentTypeMismatch()): ?>
80
- <small><?php echo $this->__('Some items in this order have different invoice and shipment types. You can create shipment only after the invoice is created.') ?></small>
81
- <?php endif; ?>
82
- <?php endif; ?>
83
- <div id="tracking" style="display:none;"><?php echo $this->getChildHtml('tracking',false) ?></div>
84
- </fieldset>
85
- </div>
86
- </div>
87
- <?php endif; ?>
88
- <div class="clear"></div>
89
-
90
- <div class="entry-edit">
91
- <div class="entry-edit-head">
92
- <?php
93
- $_itemsGridLabel = $this->getForcedShipmentCreate()?'Items to Invoice and Ship':'Items to Invoice';
94
- ?>
95
- <h4 class="icon-head head-products"><?php echo Mage::helper('sales')->__('%s', $_itemsGridLabel) ?></h4>
96
- </div>
97
- </div>
98
- <div id="invoice_item_container">
99
- <?php echo $this->getChildHtml('order_items') ?>
100
- </div>
101
- </form>
102
- <script>
103
- /*forced creating of shipment*/
104
- var forcedShipmentCreate = <?php echo $this->getForcedShipmentCreate() ?>;
105
- var shipmentElement = $('invoice_do_shipment');
106
- if (forcedShipmentCreate && shipmentElement) {
107
- shipmentElement.checked = true;
108
- shipmentElement.disabled = true;
109
- document.getElementById('tracking').style.display = 'block';
110
- }
111
- </script>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/adminhtml/default/mondialrelay/template/sales/order/invoice/create/tracking.phtml DELETED
@@ -1,116 +0,0 @@
1
- <?php
2
- /**
3
- * Magento
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Academic Free License (AFL 3.0)
8
- * that is bundled with this package in the file LICENSE_AFL.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://opensource.org/licenses/afl-3.0.php
11
- * If you did not receive a copy of the license and are unable to
12
- * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
- *
15
- * DISCLAIMER
16
- *
17
- * Do not edit or add to this file if you wish to upgrade Magento to newer
18
- * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
- *
21
- * @category design
22
- * @package default_default
23
- * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
24
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
- */
26
- ?>
27
- <script type="text/javascript">
28
- var trackingControl = {};
29
- trackingControl = {
30
- index : 0,
31
- add : function () {
32
- this.index++;
33
- var data = {index:this.index};
34
- Element.insert($('track_row_container'), {bottom: this.template.evaluate(data)});
35
- $('trackingC' + this.index).disabled = false;
36
- $('trackingT' + this.index).disabled = false;
37
- $('trackingN' + this.index).disabled = false;
38
- this.bindCurrierOnchange();
39
- },
40
- deleteRow : function(event) {
41
- var row = Event.findElement(event, 'tr');
42
- if (row) {
43
- row.parentNode.removeChild(row)
44
- }
45
- },
46
- bindCurrierOnchange : function() {
47
- var elems = $('tracking_numbers_table').select('.select');
48
- elems.each(function (elem) {
49
- if (!elem.onchangeBound) {
50
- elem.onchangeBound = true;
51
- elem.valueInput = $(elem.parentNode.parentNode).select('.number-title')[0];
52
- elem.observe('change', this.currierOnchange);
53
- }
54
- }.bind(this));
55
- },
56
- currierOnchange : function(event) {
57
- var elem = Event.element(event);
58
- var option = elem.options[elem.selectedIndex];
59
- if (option.value && option.value != 'custom') {
60
- elem.valueInput.value = option.text;
61
- }
62
- else {
63
- elem.valueInput.value = '';
64
- }
65
- }
66
- }
67
- </script>
68
- <?php $_order = Mage::registry('current_invoice')->getOrder(); ?>
69
- <?php $_shippingMethod = $_order->getShippingCarrier()->getCarrierCode(); ?>
70
-
71
- <div class="grid">
72
- <table cellspacing="0" class="data" id="tracking_numbers_table">
73
- <?php if (($_shippingMethod == 'pointsrelais') || ($_shippingMethod == 'pointsrelaiscd') || ($_shippingMethod == 'pointsrelaisld1') || ($_shippingMethod == 'pointsrelaislds')) : ?>
74
- <div><?php echo $this->helper('pointsrelais')->__('Le numéro de tracking sera ajouté automatiquement'); ?></div>
75
- <?php else: ?>
76
- <col width="100" />
77
- <col />
78
- <col />
79
- <col width="80" />
80
- <thead>
81
- <tr class="headings">
82
- <th><?php echo Mage::helper('sales')->__('Carrier') ?></th>
83
- <th><?php echo Mage::helper('sales')->__('Title') ?></th>
84
- <th><?php echo Mage::helper('sales')->__('Number') ?></th>
85
- <th class="last"><?php echo Mage::helper('sales')->__('Action') ?></th>
86
- </tr>
87
- </thead>
88
- <tfoot>
89
- <tr>
90
- <td colspan="4" class="a-center last" style="padding:8px;"><?php echo $this->getChildHtml('add_button') ?></td>
91
- </tr>
92
- </tfoot>
93
- <tbody id="track_row_container">
94
- <tr id="track_row_template" class="template no-display">
95
-
96
- <td>
97
- <select name="tracking[__index__][carrier_code]" id="trackingC__index__" class="select carrier" style="width:110px;" disabled="disabled">
98
- <?php foreach ($this->getCarriers() as $_code=>$_name): ?>
99
- <option value="<?php echo $_code ?>"><?php echo $_name ?></option>
100
- <?php endforeach; ?>
101
- </select>
102
- </td>
103
- <td><input class="input-text number-title" type="text" name="tracking[__index__][title]" id="trackingT__index__" value="" disabled="disabled" /></td>
104
- <td><input class="input-text" type="text" name="tracking[__index__][number]" id="trackingN__index__" value="" disabled="disabled" /></td>
105
- <td class="last"><a href="#" onclick="trackingControl.deleteRow(event);return false"><?php echo $this->__('Delete') ?></a></td>
106
-
107
- </tr>
108
- </tbody>
109
- <?php endif; ?>
110
- </table>
111
- </div>
112
- <script type="text/javascript">
113
- //<![CDATA[
114
- trackingControl.template = new Template('<tr>' + $('track_row_template').innerHTML.replace(/__index__/g, '#{index}') + '<\/tr>');
115
- //]]>
116
- </script>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/adminhtml/default/mondialrelay/template/sales/order/shipment/create/form.phtml DELETED
@@ -1,88 +0,0 @@
1
- <?php
2
- /**
3
- * Magento
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Academic Free License (AFL 3.0)
8
- * that is bundled with this package in the file LICENSE_AFL.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://opensource.org/licenses/afl-3.0.php
11
- * If you did not receive a copy of the license and are unable to
12
- * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
- *
15
- * DISCLAIMER
16
- *
17
- * Do not edit or add to this file if you wish to upgrade Magento to newer
18
- * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
- *
21
- * @category design_default
22
- * @package Mage
23
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
24
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
- */
26
- ?>
27
- <form id="edit_form" method="post" action="<?php echo $this->getSaveUrl() ?>">
28
- <?php echo $this->getBlockHtml('formkey')?>
29
- <?php $_order = $this->getShipment()->getOrder() ?>
30
- <?php $_shippingMethod = explode("_",$_order->getShippingMethod()); ?>
31
- <?php echo $this->getChildHtml('order_info') ?>
32
-
33
-
34
- <div class="box-left">
35
- <!--Billing Address-->
36
- <div class="entry-edit">
37
- <div class="entry-edit-head">
38
- <h4 class="icon-head head-payment-method"><?php echo Mage::helper('sales')->__('Payment Information') ?></h4>
39
- </div>
40
- <fieldset>
41
- <div><?php echo $this->getPaymentHtml() ?></div>
42
- <div><?php echo Mage::helper('sales')->__('Order was placed using %s', $_order->getOrderCurrencyCode()) ?></div>
43
- </fieldset>
44
- </div>
45
- </div>
46
- <div class="box-right">
47
- <!--Shipping Address-->
48
- <div class="entry-edit">
49
- <div class="entry-edit-head">
50
- <h4 class="icon-head head-shipping-method"><?php echo Mage::helper('sales')->__('Shipping Information') ?></h4>
51
- </div>
52
- <fieldset>
53
- <div>
54
- <strong><?php echo $_order->getShippingDescription() ?></strong>
55
- <?php echo $this->helper('sales')->__('Total Shipping Charges'); ?>:
56
-
57
- <?php if ($this->helper('tax')->displayShippingPriceIncludingTax()): ?>
58
- <?php $_excl = $this->displayShippingPriceInclTax($_order); ?>
59
- <?php else: ?>
60
- <?php $_excl = $this->displayPriceAttribute('shipping_amount', false, ' '); ?>
61
- <?php endif; ?>
62
- <?php $_incl = $this->displayShippingPriceInclTax($_order); ?>
63
-
64
- <?php echo $_excl; ?>
65
- <?php if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl): ?>
66
- (<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
67
- <?php endif; ?>
68
- </div>
69
- <?php Mage::Log($_shippingMethod[0]); ?>
70
- <?php if (($_shippingMethod[0] == 'pointsrelais') || ($_shippingMethod[0] == 'pointsrelaiscd') || ($_shippingMethod[0] == 'pointsrelaisld1') || ($_shippingMethod[0] == 'pointsrelaislds')) : ?>
71
- <div><?php echo $this->helper('pointsrelais')->__('Le numéro de tracking sera ajouté automatiquement'); ?></div>
72
- <?php else: ?>
73
- <div><?php echo $this->getChildHtml('shipment_tracking') ?></div>
74
- <?php endif; ?>
75
- </fieldset>
76
- </div>
77
- </div>
78
- <div class="clear"></div>
79
-
80
- <div class="entry-edit">
81
- <div class="entry-edit-head">
82
- <h4 class="icon-head head-products"><?php echo Mage::helper('sales')->__('Items to Ship') ?></h4>
83
- </div>
84
- </div>
85
- <div id="ship_items_container">
86
- <?php echo $this->getItemsHtml() ?>
87
- </div>
88
- </form>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/default/default/layout/pointsrelais.xml DELETED
@@ -1,16 +0,0 @@
1
- <?xml version="1.0"?>
2
- <layout version="0.1.0">
3
-
4
- <default>
5
- <reference name="head">
6
- <block type="page/html" name="baseurl" template="pointsrelais/baseurl.phtml" />
7
- <action method="addItem"><type>skin_js</type><name>js/pointsrelais.js</name></action>
8
- <action method="addCss"><stylesheet>css/pointsrelais.css</stylesheet></action>
9
- <action method="addItem"><type>skin_css</type><name>css/iepointsrelais.css</name><params/><if>lt IE 7</if></action>
10
- </reference>
11
- </default>
12
-
13
- <pointsrelais_index_index>
14
- <block type="pointsrelais/info" name="root" output="toHtml" template="pointsrelais/info.phtml" />
15
- </pointsrelais_index_index>
16
- </layout>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/default/default/template/pointsrelais/baseurl.phtml DELETED
@@ -1,3 +0,0 @@
1
- <script type="text/javascript">
2
- var baseUrl = '<?php echo $this->getUrl(); ?>';
3
- </script>
 
 
 
app/design/frontend/default/default/template/pointsrelais/info.phtml DELETED
@@ -1,165 +0,0 @@
1
- <?php
2
-
3
- //On récupère les details du point relais
4
- $detail_pointrelais = $this->getDetailPointRelais();
5
-
6
- ?>
7
- <?php if ($this->getRequest()->getPost('popup_relais') != 1):?>
8
- <div id="backgroundLighbox" style="height: <?php echo $this->getRequest()->getPost('hauteur') ?>px; width: <?php echo $this->getRequest()->getPost('largeur') ?>px; " ></div>
9
- <?php endif;?>
10
- <div id="detailsPointRelais"">
11
- <div class="colonne-gauche">
12
- <h1><?php echo $this->__('Votre') ?> <span style="font-weight: bold;"><?php echo $this->__('Point Relais') ?></span></h1>
13
- <div class="adresse">
14
- <h2><?php echo $detail_pointrelais->LgAdr1 ?></h2>
15
- <?php if($detail_pointrelais->LgAdr2) : ?>
16
- <p><?php echo '<p>' . strtolower($detail_pointrelais->LgAdr2) ?></p>
17
- <?php endif; ?>
18
- <?php if($detail_pointrelais->LgAdr3) : ?>
19
- <p><?php echo strtolower($detail_pointrelais->LgAdr3) ?></p>
20
- <?php endif; ?>
21
- <?php if($detail_pointrelais->LgAdr4) : ?>
22
- <p><?php echo strtolower($detail_pointrelais->LgAdr4) ?></p>
23
- <?php endif; ?>
24
- <p><?php echo $detail_pointrelais->CP . " " . $detail_pointrelais->Ville; ?></p>
25
- <div class="situation">
26
- <p><?php echo $detail_pointrelais->Localisation1 ?></p>
27
- <p><?php echo $detail_pointrelais->Localisation2 ?></p>
28
- </div>
29
- </div>
30
- <div class="googlemap">
31
- <iframe src="<?php echo $detail_pointrelais->URL_Plan ?>" height="230" width="390" frameborder="no" scrolling="no">Plan d'accès au magasin</iframe>
32
- </div>
33
- </div>
34
- <div class="colonne-droite">
35
- <?php if($detail_pointrelais->URL_Photo) : ?>
36
- <div class="photo">
37
- <img src="<?php echo $detail_pointrelais->URL_Photo ?>" alt="<?php echo $detail_pointrelais->LgAdr1 ?>" />
38
- </div>
39
- <?php endif; ?>
40
- <div class="horaires">
41
- <h2><?php echo $this->__('Horaires d\'ouverture') ?></h2>
42
- <table>
43
- <tr>
44
- <td class="jour"><?php echo $this->__('Lundi') ?></td>
45
- <td>
46
- <?php if($detail_pointrelais->Horaires_Lundi->string[0] != 0) : ?>
47
- <?php echo substr($detail_pointrelais->Horaires_Lundi->string[0],-4,2) . "h". substr($detail_pointrelais->Horaires_Lundi->string[0],-2) . " - "; ?>
48
- <?php echo substr($detail_pointrelais->Horaires_Lundi->string[1],-4,2) . "h". substr($detail_pointrelais->Horaires_Lundi->string[1],-2); ?>
49
- <?php endif; ?>
50
- </td>
51
- <td>
52
- <?php if($detail_pointrelais->Horaires_Lundi->string[2] != 0) : ?>
53
- <?php echo substr($detail_pointrelais->Horaires_Lundi->string[2],-4,2) . "h". substr($detail_pointrelais->Horaires_Lundi->string[2],-2) . " - "; ?>
54
- <?php echo substr($detail_pointrelais->Horaires_Lundi->string[3],-4,2) . "h". substr($detail_pointrelais->Horaires_Lundi->string[3],-2); ?>
55
- <?php endif; ?>
56
- </td>
57
- </tr>
58
- <tr>
59
- <td class="jour"><?php echo $this->__('Mardi') ?></td>
60
- <td>
61
- <?php if($detail_pointrelais->Horaires_Mardi->string[0] != 0) : ?>
62
- <?php echo substr($detail_pointrelais->Horaires_Mardi->string[0],-4,2) . "h". substr($detail_pointrelais->Horaires_Mardi->string[0],-2) . " - "; ?>
63
- <?php echo substr($detail_pointrelais->Horaires_Mardi->string[1],-4,2) . "h". substr($detail_pointrelais->Horaires_Mardi->string[1],-2); ?>
64
- <?php endif; ?>
65
- </td>
66
- <td>
67
- <?php if($detail_pointrelais->Horaires_Mardi->string[2] != 0) : ?>
68
- <?php echo substr($detail_pointrelais->Horaires_Mardi->string[2],-4,2) . "h". substr($detail_pointrelais->Horaires_Mardi->string[2],-2) . " - "; ?>
69
- <?php echo substr($detail_pointrelais->Horaires_Mardi->string[3],-4,2) . "h". substr($detail_pointrelais->Horaires_Mardi->string[3],-2); ?>
70
- <?php endif; ?>
71
- </td>
72
- </tr>
73
- <tr>
74
- <td class="jour"><?php echo $this->__('Mercredi') ?></td>
75
- <td>
76
- <?php if($detail_pointrelais->Horaires_Mercredi->string[0] != 0) : ?>
77
- <?php echo substr($detail_pointrelais->Horaires_Mercredi->string[0],-4,2) . "h". substr($detail_pointrelais->Horaires_Mercredi->string[0],-2) . " - "; ?>
78
- <?php echo substr($detail_pointrelais->Horaires_Mercredi->string[1],-4,2) . "h". substr($detail_pointrelais->Horaires_Mercredi->string[1],-2); ?>
79
- <?php endif; ?>
80
- </td>
81
- <td>
82
- <?php if($detail_pointrelais->Horaires_Mercredi->string[2] != 0) : ?>
83
- <?php echo substr($detail_pointrelais->Horaires_Mercredi->string[2],-4,2) . "h". substr($detail_pointrelais->Horaires_Mercredi->string[2],-2) . " - "; ?>
84
- <?php echo substr($detail_pointrelais->Horaires_Mercredi->string[3],-4,2) . "h". substr($detail_pointrelais->Horaires_Mercredi->string[3],-2); ?>
85
- <?php endif; ?>
86
- </td>
87
- </tr>
88
- <tr>
89
- <td class="jour"><?php echo $this->__('Jeudi') ?></td>
90
- <td>
91
- <?php if($detail_pointrelais->Horaires_Jeudi->string[0] != 0) : ?>
92
- <?php echo substr($detail_pointrelais->Horaires_Jeudi->string[0],-4,2) . "h". substr($detail_pointrelais->Horaires_Jeudi->string[0],-2) . " - "; ?>
93
- <?php echo substr($detail_pointrelais->Horaires_Jeudi->string[1],-4,2) . "h". substr($detail_pointrelais->Horaires_Jeudi->string[1],-2); ?>
94
- <?php endif; ?>
95
- </td>
96
- <td>
97
- <?php if($detail_pointrelais->Horaires_Jeudi->string[2] != 0) : ?>
98
- <?php echo substr($detail_pointrelais->Horaires_Jeudi->string[2],-4,2) . "h". substr($detail_pointrelais->Horaires_Jeudi->string[2],-2) . " - "; ?>
99
- <?php echo substr($detail_pointrelais->Horaires_Jeudi->string[3],-4,2) . "h". substr($detail_pointrelais->Horaires_Jeudi->string[3],-2); ?>
100
- <?php endif; ?>
101
- </td>
102
- </tr>
103
- <tr>
104
- <td class="jour"><?php echo $this->__('Vendredi') ?></td>
105
- <td>
106
- <?php if($detail_pointrelais->Horaires_Vendredi->string[0] != 0) : ?>
107
- <?php echo substr($detail_pointrelais->Horaires_Vendredi->string[0],-4,2) . "h". substr($detail_pointrelais->Horaires_Vendredi->string[0],-2) . " - "; ?>
108
- <?php echo substr($detail_pointrelais->Horaires_Vendredi->string[1],-4,2) . "h". substr($detail_pointrelais->Horaires_Vendredi->string[1],-2); ?>
109
- <?php endif; ?>
110
- </td>
111
- <td>
112
- <?php if($detail_pointrelais->Horaires_Vendredi->string[2] != 0) : ?>
113
- <?php echo substr($detail_pointrelais->Horaires_Vendredi->string[2],-4,2) . "h". substr($detail_pointrelais->Horaires_Vendredi->string[2],-2) . " - "; ?>
114
- <?php echo substr($detail_pointrelais->Horaires_Vendredi->string[3],-4,2) . "h". substr($detail_pointrelais->Horaires_Vendredi->string[3],-2); ?>
115
- <?php endif; ?>
116
- </td>
117
- </tr>
118
- <tr>
119
- <td class="jour"><?php echo $this->__('Samedi') ?></td>
120
- <td>
121
- <?php if($detail_pointrelais->Horaires_Samedi->string[0] != 0) : ?>
122
- <?php echo substr($detail_pointrelais->Horaires_Samedi->string[0],-4,2) . "h". substr($detail_pointrelais->Horaires_Samedi->string[0],-2) . " - "; ?>
123
- <?php echo substr($detail_pointrelais->Horaires_Samedi->string[1],-4,2) . "h". substr($detail_pointrelais->Horaires_Samedi->string[1],-2); ?>
124
- <?php endif; ?>
125
- </td>
126
- <td>
127
- <?php if($detail_pointrelais->Horaires_Samedi->string[2] != 0) : ?>
128
- <?php echo substr($detail_pointrelais->Horaires_Samedi->string[2],-4,2) . "h". substr($detail_pointrelais->Horaires_Samedi->string[2],-2) . " - "; ?>
129
- <?php echo substr($detail_pointrelais->Horaires_Samedi->string[3],-4,2) . "h". substr($detail_pointrelais->Horaires_Samedi->string[3],-2); ?>
130
- <?php endif; ?>
131
- </td>
132
- </tr>
133
- <?php try { $detail_pointrelais->Horaires_Dimanche; ?>
134
- <tr>
135
- <td class="jour"><?php echo $this->__('Dimanche') ?></td>
136
- <td>
137
- <?php if($detail_pointrelais->Horaires_Dimanche->string[0] != 0) : ?>
138
- <?php echo substr($detail_pointrelais->Horaires_Dimanche->string[0],-4,2) . "h". substr($detail_pointrelais->Horaires_Dimanche->string[0],-2) . " - "; ?>
139
- <?php echo substr($detail_pointrelais->Horaires_Dimanche->string[1],-4,2) . "h". substr($detail_pointrelais->Horaires_Dimanche->string[1],-2); ?>
140
- <?php endif; ?>
141
- </td>
142
- <td>
143
- <?php if($detail_pointrelais->Horaires_Lundi->string[2] != 0) : ?>
144
- <?php echo substr($detail_pointrelais->Horaires_Dimanche->string[2],-4,2) . "h". substr($detail_pointrelais->Horaires_Dimanche->string[2],-2) . " - "; ?>
145
- <?php echo substr($detail_pointrelais->Horaires_Dimanche->string[3],-4,2) . "h". substr($detail_pointrelais->Horaires_Dimanche->string[3],-2); ?>
146
- <?php endif; ?>
147
- </td>
148
- </tr>
149
- <?php
150
- }
151
- catch (Exception $e) {
152
- $errors[] = $e->getMessage();
153
- }?>
154
- </table>
155
- <?php if ($this->getRequest()->getPost('popup_relais') == 1):?>
156
- <div class="fermer"><a href="#" onclick="window.close(); return false;">Fermer</a></div>
157
- <?php else:?>
158
- <div class="fermer"><a href="#" onclick="PointsRelais.fermer(); return false;">Fermer</a></div>
159
- <?php endif;?>
160
- </div>
161
-
162
- <?php if ($this->getRequest()->getPost('popup_relais') == 1):?>
163
- </body>
164
- </html>
165
- <?php endif;?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/etc/modules/MondialRelay_All.xml DELETED
@@ -1,9 +0,0 @@
1
- <?xml version="1.0"?>
2
- <config>
3
- <modules>
4
- <MondialRelay_Pointsrelais>
5
- <active>true</active>
6
- <codePool>community</codePool>
7
- </MondialRelay_Pointsrelais>
8
- </modules>
9
- </config>
 
 
 
 
 
 
 
 
 
app/locale/fr_FR/MondialRelay_Pointsrelais.csv DELETED
@@ -1,19 +0,0 @@
1
- "Point Relais","Point Relais"
2
- "Plan d\'acc̬s au magasin","Plan d\'acc̬s au magasin"
3
- "Horaires d\'ouverture","Horaires d\'ouverture"
4
- "Lundi","Lundi"
5
- "Mardi","Mardi"
6
- "Mercredi","Mercredi"
7
- "Jeudi","Jeudi"
8
- "Vendredi","Vendredi"
9
- "Samedi","Samedi"
10
- "Dimanche","Dimanche"
11
- "Fermer","Fermer"
12
- "Le num̩ro de tracking sera ajout̩ automatiquement","Le num̩ro de tracking sera ajout̩ automatiquement"
13
- "Impressions des ̩tiquettes Mondial Relay","Impressions des ̩tiquettes Mondial Relay"
14
- Etiquette Mondial Relay","Etiquette Mondial Relay"
15
- "Etiquettes","Etiquettes"
16
- "Imprimer","Imprimer"
17
- "Imprimer les ̩tiquettes","Imprimer les ̩tiquettes"
18
- "D̩sol̩, une erreure est survenu lors de la r̩cup̩ration de l\'̩tiquetes. Merci de contacter Mondial Relay ou de r̩essayer plus tard","D̩sol̩, une erreure est survenu lors de la r̩cup̩ration de l\'̩tiquetes. Merci de contacter Mondial Relay ou de r̩essayer plus tard"
19
- "default developed length","longueur d̬velopp̬ par d̬faut"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
package.xml CHANGED
@@ -1,19 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>MondialRelay_Pointsrelais</name>
4
- <version>1.3.2</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Module de livraison Mondial Relay</summary>
10
  <description>Module de livraison Mondial Relay</description>
11
- <notes>validation de la 1.4.2
12
- correction de la grille d'impression.</notes>
13
  <authors><author><name>cyrille guillaud</name><user>auto-converted</user><email>cguillaud@cg-consulting.fr</email></author></authors>
14
- <date>2011-01-19</date>
15
- <time>08:55:18</time>
16
- <contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="mondialrelay"><dir name="template"><dir name="sales"><dir name="order"><dir name="invoice"><dir name="create"><file name="form.phtml" hash="195ad76f25d4100df2461709e2eb6afa"/><file name="tracking.phtml" hash="a30e1d66bd837b4e11d63ee578c2be87"/></dir></dir><dir name="shipment"><dir name="create"><file name="form.phtml" hash="a0180e191534e9e92db20808327abe51"/></dir></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="pointsrelais.xml" hash="cecd44caa45a4124f3ed64a36137fd17"/></dir><dir name="template"><dir name="pointsrelais"><file name="baseurl.phtml" hash="ddbe6d60de42248171c32ac6279ae46d"/><file name="info.phtml" hash="bd616597f35a48a71bcd7bd1e4ad6575"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="default"><dir name="default"><dir name="css"><file name="pointsrelais.css" hash="229d09977ee2eac2e72dcb89bf8eb05c"/></dir><dir name="images"><dir name="mondialrelay"><file name="img_fermer.gif" hash="5901eaf779aa6fa3eac84d1dd9520113"/><file name="img_fleche.gif" hash="908f8a69124b7b16e3ec2caefc78d948"/><file name="logo_PR_01.gif" hash="7066eb60e2645b304d1b926d0a4c31e2"/><file name="Thumbs.db" hash="51da41310be9652f9360715494dc6b03"/></dir></dir><dir name="js"><file name="pointsrelais.js" hash="8008e112e4dd2f468b5726c561a5f8b4"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="fr_FR"><file name="MondialRelay_Pointsrelais.csv" hash="64ed2a0c6bde5f02862e24a0697a6109"/></dir></target><target name="mageetc"><dir name="modules"><file name="MondialRelay_All.xml" hash="8257e76c52b260553f8ce663c2a8b3d1"/></dir></target><target name="magecommunity"><dir name="MondialRelay"><dir name="Pointsrelais"><dir name="Block"><dir name="Sales"><dir name="Order"><dir name="Shipment"><file name="View.php" hash="f27d3b193dd33dcd94a5a83f57502e78"/></dir></dir><dir name="Shipment"><file name="Grid.php" hash="158adf3519e15f65977fafddc566613c"/></dir><file name="Impression.php" hash="0685fabf03cb81a76a643e2fbc7d90bd"/></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Exportpointsrelais.php" hash="770095d552bf84b666577c64ce867404"/><file name="Exportpointsrelaiscd.php" hash="90f3ced57bf858b6e69795055b724009"/><file name="Exportpointsrelaisld1.php" hash="04bbf4fbf5f6015c618ef6e8780a896a"/><file name="Exportpointsrelaislds.php" hash="a82da5ceaaf45eafeb71d14dd691fc4c"/></dir></dir><file name="Form.php" hash="2fe314af15d89324aa020e7be2c9c492"/></dir></dir><file name="Info.php" hash="d24bd6bcffe1eae00144d320f595d40d"/></dir><dir name="controllers"><dir name="Sales"><dir name="Order"><file name="ShipmentController.php" hash="e0a7682994918e3669421f07e0b37486"/></dir><file name="ImpressionController.php" hash="2b5f808c845c1306ba16a82493e6cc95"/></dir><dir name="System"><file name="ConfigController.php" hash="291a57f80a7e1d6a6e2c757dea54869a"/></dir><file name="IndexController.php" hash="0b3068c6075d1ad50f32f802a91bdf38"/></dir><dir name="etc"><file name="config.xml" hash="1fde28f602f73615af23601d34b1d759"/><file name="system.xml" hash="f0d59b6905c82f871263fbd0d42c708b"/></dir><dir name="Helper"><file name="Data.php" hash="1aa9920b55f6cba7fd2d0fd57be0db13"/></dir><dir name="Model"><dir name="Carrier"><file name="Pointsrelais.php" hash="28fbd326bd914ae12a1c856972c601a4"/><file name="Pointsrelaiscd.php" hash="5226ae8f885de7cbe1c3f89401da8854"/><file name="Pointsrelaisld1.php" hash="c71c209cd2699a40eb51198465a90645"/><file name="Pointsrelaislds.php" hash="57af150f69fe9bb6fed91c0ff26463fb"/></dir><dir name="Mysql4"><dir name="Carrier"><dir name="Pointsrelais"><file name="Collection.php" hash="8c7735c2b69a53f234628b8ac0d946cd"/></dir><dir name="Pointsrelaiscd"><file name="Collection.php" hash="94e736c84e3a30561c8032551aecb9b7"/></dir><dir name="Pointsrelaisld1"><file name="Collection.php" hash="a844776e9aaa2b90ac2a491f2c2c3013"/></dir><dir name="Pointsrelaislds"><file name="Collection.php" hash="2d9338b9f0d9b2e4e7aa5baed24780b9"/></dir><file name="Pointsrelais.php" hash="c1d5c5f50611d060612ad557111152ce"/><file name="Pointsrelaiscd.php" hash="3b54fad46a50ea4a0d84cef8881738f4"/><file name="Pointsrelaisld1.php" hash="4db6f346ff99567b6eafdeac201c7726"/><file name="Pointsrelaislds.php" hash="64957492e8b2ce9b6e2ab0e6f5b6c7b0"/></dir></dir><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Shipping"><file name="Pointsrelais.php" hash="39881a493e895b1921f27b3b144450ee"/><file name="Pointsrelaiscd.php" hash="a03f6c213c222ea48652a9d885794682"/><file name="Pointsrelaisld1.php" hash="0ed2ee4ee8c3c725fa5f3c1cde0c6626"/><file name="Pointsrelaislds.php" hash="b1bbea361c6aeb38528af5892237d791"/></dir></dir><dir name="Source"><dir name="Shipping"><file name="Pointsrelais.php" hash="a75b6978fea52d78b0aabce1401cf9d3"/><file name="Pointsrelaiscd.php" hash="e68ff21b790e9c14fe7bc7c645fbfd02"/><file name="Pointsrelaisld1.php" hash="b8e21537df53d6eaba905855d0c459f2"/><file name="Pointsrelaislds.php" hash="9af32669854321d6136f2fa368566411"/></dir></dir></dir></dir><file name="Observer.php" hash="1538e54242450741dc7a64a74174584b"/></dir><dir name="sql"><dir name="pointsrelais_setup"><file name="mysql4-install-0.1.0.php" hash="bcef01a55bfd48286a132bba6a202ac4"/><file name="mysql4-install-1.2.0.php" hash="4b752ac0e50c7046f0c95516f17d6984"/><file name="mysql4-uninstall-1.2.0.php" hash="ddba123ff4181617d314cdb61dfd2f62"/><file name="mysql4-upgrade-0.1.0-1.0.4.php" hash="caf165761a59a5a9e5caf71c3654ce94"/><file name="mysql4-upgrade-1.0.4-1.2.0.php" hash="5e725e4377df89a26d7a6ff1cc8f32d6"/><file name="mysql4-upgrade-1.2.4-1.3.0.php" hash="b3eb7947cf0056d5e0a081329fc93d86"/></dir></dir></dir></dir></target></contents>
17
  <compatible/>
18
  <dependencies/>
19
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>MondialRelay_Pointsrelais</name>
4
+ <version>1.3.3</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Module de livraison Mondial Relay</summary>
10
  <description>Module de livraison Mondial Relay</description>
11
+ <notes>correction de la grille d'etiquettes</notes>
 
12
  <authors><author><name>cyrille guillaud</name><user>auto-converted</user><email>cguillaud@cg-consulting.fr</email></author></authors>
13
+ <date>2011-10-10</date>
14
+ <time>09:18:03</time>
15
+ <contents><target name="magecommunity"><dir name="MondialRelay"><dir name="Pointsrelais"><dir name="Block"><dir name="Sales"><dir name="Order"><dir name="Shipment"><file name="View.php" hash="f27d3b193dd33dcd94a5a83f57502e78"/></dir></dir><dir name="Shipment"><file name="Grid.php" hash="def6137648c86155f1919ab28dcca804"/></dir><file name="Impression.php" hash="0685fabf03cb81a76a643e2fbc7d90bd"/></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Exportpointsrelais.php" hash="770095d552bf84b666577c64ce867404"/><file name="Exportpointsrelaiscd.php" hash="90f3ced57bf858b6e69795055b724009"/><file name="Exportpointsrelaisld1.php" hash="04bbf4fbf5f6015c618ef6e8780a896a"/><file name="Exportpointsrelaislds.php" hash="a82da5ceaaf45eafeb71d14dd691fc4c"/></dir></dir><file name="Form.php" hash="2fe314af15d89324aa020e7be2c9c492"/></dir></dir><file name="Info.php" hash="d24bd6bcffe1eae00144d320f595d40d"/></dir><dir name="Helper"><file name="Data.php" hash="1aa9920b55f6cba7fd2d0fd57be0db13"/></dir><dir name="Model"><dir name="Carrier"><file name="Pointsrelais.php" hash="28fbd326bd914ae12a1c856972c601a4"/><file name="Pointsrelaiscd.php" hash="5226ae8f885de7cbe1c3f89401da8854"/><file name="Pointsrelaisld1.php" hash="c71c209cd2699a40eb51198465a90645"/><file name="Pointsrelaislds.php" hash="57af150f69fe9bb6fed91c0ff26463fb"/></dir><dir name="Mysql4"><dir name="Carrier"><dir name="Pointsrelais"><file name="Collection.php" hash="8c7735c2b69a53f234628b8ac0d946cd"/></dir><dir name="Pointsrelaiscd"><file name="Collection.php" hash="94e736c84e3a30561c8032551aecb9b7"/></dir><dir name="Pointsrelaisld1"><file name="Collection.php" hash="a844776e9aaa2b90ac2a491f2c2c3013"/></dir><dir name="Pointsrelaislds"><file name="Collection.php" hash="2d9338b9f0d9b2e4e7aa5baed24780b9"/></dir><file name="Pointsrelais.php" hash="c1d5c5f50611d060612ad557111152ce"/><file name="Pointsrelaiscd.php" hash="3b54fad46a50ea4a0d84cef8881738f4"/><file name="Pointsrelaisld1.php" hash="4db6f346ff99567b6eafdeac201c7726"/><file name="Pointsrelaislds.php" hash="64957492e8b2ce9b6e2ab0e6f5b6c7b0"/></dir></dir><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Shipping"><file name="Pointsrelais.php" hash="39881a493e895b1921f27b3b144450ee"/><file name="Pointsrelaiscd.php" hash="a03f6c213c222ea48652a9d885794682"/><file name="Pointsrelaisld1.php" hash="0ed2ee4ee8c3c725fa5f3c1cde0c6626"/><file name="Pointsrelaislds.php" hash="b1bbea361c6aeb38528af5892237d791"/></dir></dir><dir name="Source"><dir name="Shipping"><file name="Pointsrelais.php" hash="a75b6978fea52d78b0aabce1401cf9d3"/><file name="Pointsrelaiscd.php" hash="e68ff21b790e9c14fe7bc7c645fbfd02"/><file name="Pointsrelaisld1.php" hash="b8e21537df53d6eaba905855d0c459f2"/><file name="Pointsrelaislds.php" hash="9af32669854321d6136f2fa368566411"/></dir></dir></dir></dir><file name="Observer.php" hash="1538e54242450741dc7a64a74174584b"/></dir><dir name="controllers"><dir name="Sales"><dir name="Order"><file name="ShipmentController.php" hash="e0a7682994918e3669421f07e0b37486"/></dir><file name="ImpressionController.php" hash="99d5e03f73c28f7477c089f80a3f7c1b"/><file name="._ImpressionController.php" hash="5dc409f773424a791b0be0c8b6f701f0"/></dir><dir name="System"><file name="ConfigController.php" hash="291a57f80a7e1d6a6e2c757dea54869a"/></dir><file name="IndexController.php" hash="0b3068c6075d1ad50f32f802a91bdf38"/></dir><dir name="etc"><file name="config.xml" hash="c74156538ca64cbee6e647aa8535f5bc"/><file name="system.xml" hash="f0d59b6905c82f871263fbd0d42c708b"/><file name="._config.xml" hash="1fa442361e70234490b4020ffde4bd9b"/></dir><dir name="sql"><dir name="pointsrelais_setup"><file name="mysql4-install-0.1.0.php" hash="bcef01a55bfd48286a132bba6a202ac4"/><file name="mysql4-install-1.2.0.php" hash="4b752ac0e50c7046f0c95516f17d6984"/><file name="mysql4-uninstall-0.1.0.php" hash="fe48b6326faa98cadaa69b3c54973b10"/><file name="mysql4-uninstall-1.2.0.php" hash="ddba123ff4181617d314cdb61dfd2f62"/><file name="mysql4-upgrade-0.1.0-1.0.4.php" hash="caf165761a59a5a9e5caf71c3654ce94"/><file name="mysql4-upgrade-1.0.4-1.2.0.php" hash="5e725e4377df89a26d7a6ff1cc8f32d6"/><file name="mysql4-upgrade-1.2.4-1.3.0.php" hash="b3eb7947cf0056d5e0a081329fc93d86"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="pointsrelais.xml" hash=""/></dir></dir></dir></dir></target><target name="magelocale"><dir name="fr_FR"><file name="MondialRelay_Pointsrelais.csv" hash=""/></dir></target><target name="mageskin"><dir name="frontend"><dir name="default"><dir name="default"><dir name="js"><file name="pointsrelais.js" hash=""/></dir><dir name="css"><file name="pointsrelais.css" hash=""/></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>
skin/frontend/default/default/css/pointsrelais.css DELETED
@@ -1,46 +0,0 @@
1
- /* Mise en place de la lightbox */
2
-
3
- #backgroundLighbox {
4
- -khtml-opacity: .8;
5
- -moz-opacity: .8;
6
- filter: alpha(opacity=80);
7
- opacity: .8;
8
- background: #000;
9
- height: 100%;
10
- width: 100%;
11
- position: fixed;
12
- left: 0;
13
- top: 0;
14
- z-index: 1000;
15
- }
16
-
17
- #detailsPointRelais {
18
- border:16px solid #fff;
19
- width: 742px;
20
- height:360px;
21
- position: fixed;
22
- top:50%;
23
- left:50%;
24
- margin:-180px 0 0 -371px;
25
- background:#fff;
26
- overflow: hidden;
27
- z-index: 1001;
28
- }
29
-
30
- /* Mise en page du contenu */
31
- #detailsPointRelais { text-align:left; font-size:11px; }
32
- #detailsPointRelais .colonne-gauche { float:left; width:420px; }
33
- #detailsPointRelais h1 { color:red; font-weight:normal; font-size:17pt; padding:0 0 0 50px; background:url(../images/mondialrelay/img_fleche.gif) no-repeat; }
34
- #detailsPointRelais p { margin:0; line-height:1em; }
35
- #detailsPointRelais .adresse { padding:0 0 0 70px; margin:20px 0 0; background:url(../images/mondialrelay/logo_PR_01.gif) no-repeat; }
36
- #detailsPointRelais .adresse h2 { font-size:11px; font-weight:bold; color:#000; }
37
- #detailsPointRelais .situation { margin:10px 0 0; }
38
- #detailsPointRelais .googlemap { position:absolute; bottom:0; left:0; }
39
- #detailsPointRelais .colonne-droite { float:right; width:310px; margin:0 0 0 10px;}
40
- #detailsPointRelais .horaires { margin:0 0 0 50px; }
41
- #detailsPointRelais .horaires h2 { margin:20px 0 5px; color:red; font-weight:normal; font-size:17pt; }
42
- #detailsPointRelais .horaires td { line-height:1em; width:100px; }
43
- #detailsPointRelais .horaires td.jour { font-weight:bold; }
44
- #detailsPointRelais .fermer { position:absolute; right:10px; bottom:0px; padding:0 0 0 25px; background:url(../images/mondialrelay/img_fermer.gif) no-repeat; }
45
- #detailsPointRelais .fermer a { color:red; text-decoration:none; font-weight:bold; }
46
-
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
skin/frontend/default/default/images/mondialrelay/Thumbs.db DELETED
Binary file
skin/frontend/default/default/images/mondialrelay/img_fermer.gif DELETED
Binary file
skin/frontend/default/default/images/mondialrelay/img_fleche.gif DELETED
Binary file
skin/frontend/default/default/images/mondialrelay/logo_PR_01.gif DELETED
Binary file
skin/frontend/default/default/js/pointsrelais.js DELETED
@@ -1,92 +0,0 @@
1
- var PointsRelais = new Object();
2
- PointsRelais = {
3
-
4
- //On nomme le module pour aller chercher le controller
5
- module: 'pointsrelais',
6
-
7
- //On récupère l'url de Base et on ajoute le nom du controller
8
- getUrl: function()
9
- {
10
- return baseUrl+this.module;
11
- },
12
-
13
- //On cache les select à cause d'IE.
14
- toggleSelectElements : function(visibility)
15
- {
16
- var selects = document.getElementsByTagName('select');
17
- for(var i = 0; i < selects.length; i++) {
18
- selects[i].style.visibility = visibility;
19
- };
20
- },
21
-
22
- //On change le pointer de la souris sur les liens
23
- toggleLinkPointer : function(style)
24
- {
25
- var liens = $A($$('a'));
26
- liens.each( function(element) { element.style.cursor = style; });
27
- },
28
-
29
- //On va chercher les infos du point relais
30
- showInfo: function(Id)
31
- {
32
- document.body.insert({top:'<div id="PointRelais"></div>'});
33
-
34
- var hauteur = document.body.getHeight();
35
- var largeur = document.body.getWidth();
36
- var protocol = document.location.protocol || 'http:' ;
37
-
38
- if (protocol != 'http:'){
39
- //ouvrir popup
40
- if ($('relai_post')){
41
- $('Id_Relais').value = Id;
42
- $('Pays').value = $('pays').innerHTML;
43
- $('hauteur').value = hauteur;
44
- $('largeur').value = largeur;
45
- } else {
46
- var form = new Element('form', { action: this.getUrl(), method: "post", name: "relai_post", id: "relai_post", target: "popup_relais", className: "no-display"});
47
- var id_relais = new Element('input', { name: "Id_Relais", value:Id, id: "Id_Relais" });
48
- var pays = new Element('input', { name: "Pays", value: $('pays').innerHTML, id: "Pays" });
49
- var phauteur = new Element('input', { name: "hauteur", value: hauteur, id: "hauteur" });
50
- var plargeur = new Element('input', { name: "largeur", value: largeur, id: "largeur" });
51
- var popup_relais = new Element('input', { name: "popup_relais", value: 1, id: "popup_relais" });
52
- form.insert(id_relais);
53
- form.insert(pays);
54
- form.insert(phauteur);
55
- form.insert(plargeur);
56
- form.insert(popup_relais);
57
- document.body.insert(form);
58
- }
59
-
60
- window.open(baseUrl+'blank-page', 'popup_relais',' width=900,height=450,scrollbars=no');
61
- the_form = eval(document.forms['relai_post']);
62
- the_form.submit();
63
- } else {
64
- //ouverture div
65
- new Ajax.Request( this.getUrl() ,
66
- {
67
- evalScripts : true,
68
- parameters : {Id_Relais: Id, Pays:$('pays').innerHTML, hauteur: hauteur, largeur: largeur},
69
- onCreate : function() {
70
- document.body.style.cursor = 'wait';
71
- PointsRelais.toggleLinkPointer('wait');
72
- },
73
- onSuccess : function(transport) {
74
- document.body.style.cursor = 'default';
75
- PointsRelais.toggleLinkPointer('pointer');
76
- PointsRelais.toggleSelectElements('hidden');
77
- $('PointRelais').update();
78
- $('PointRelais').update(transport.responseText);
79
- }
80
- });
81
- }
82
- },
83
-
84
- //On ferme la lightbox
85
- fermer: function ()
86
- {
87
- this.toggleSelectElements('visible');
88
- $('PointRelais').remove();
89
- },
90
-
91
- baseUrl: ""
92
- }