MondialRelay_Pointsrelais

Version Notes

correction du paquet

Release Info

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

Code changes from version 1.3.3 to 1.4.0

Files changed (22) hide show

app/code/community/MondialRelay/Pointsrelais/Block/Info.php +0 -1
app/code/community/MondialRelay/Pointsrelais/Model/Carrier/Pointsrelais.php +7 -3
app/code/community/MondialRelay/Pointsrelais/Model/Carrier/Pointsrelaiscd.php +5 -0
app/code/community/MondialRelay/Pointsrelais/controllers/Sales/._ImpressionController.php +0 -0
app/code/community/MondialRelay/Pointsrelais/controllers/Sales/ImpressionController.php +22 -2
app/code/community/MondialRelay/Pointsrelais/controllers/Sales/Order/ShipmentController.php +4 -6
app/code/community/MondialRelay/Pointsrelais/etc/._config.xml +0 -0
app/code/community/MondialRelay/Pointsrelais/etc/config.xml +1 -1
app/design/adminhtml/default/mondialrelay/template/sales/order/invoice/create/form.phtml +111 -0
app/design/adminhtml/default/mondialrelay/template/sales/order/invoice/create/tracking.phtml +116 -0
app/design/adminhtml/default/mondialrelay/template/sales/order/shipment/create/form.phtml +88 -0
app/design/frontend/default/default/layout/pointsrelais.xml +16 -0
app/design/frontend/default/default/template/pointsrelais/baseurl.phtml +3 -0
app/design/frontend/default/default/template/pointsrelais/info.phtml +171 -0
app/etc/modules/MondialRelay_All.xml +9 -0
app/locale/fr_FR/MondialRelay_Pointsrelais.csv +19 -0
package.xml +5 -5
skin/frontend/base/default/css/pointsrelais.css +46 -0
skin/frontend/base/default/images/mondialrelay/img_fermer.gif +0 -0
skin/frontend/base/default/images/mondialrelay/img_fleche.gif +0 -0
skin/frontend/base/default/images/mondialrelay/logo_PR_01.gif +0 -0
skin/frontend/base/default/js/pointsrelais.js +92 -0

app/code/community/MondialRelay/Pointsrelais/Block/Info.php CHANGED Viewed

	@@ -35,7 +35,6 @@ class MondialRelay_Pointsrelais_Block_Info extends Mage_Core_Block_Template
35
36	// Et on effectue la requète
37	$detail_pointrelais = $client->WSI2_DetailPointRelais($params)->WSI2_DetailPointRelaisResult;
38	-
39	return $detail_pointrelais;
40	}
41


35
36	// Et on effectue la requète
37	$detail_pointrelais = $client->WSI2_DetailPointRelais($params)->WSI2_DetailPointRelaisResult;

38	return $detail_pointrelais;
39	}
40

app/code/community/MondialRelay/Pointsrelais/Model/Carrier/Pointsrelais.php CHANGED Viewed

	@@ -5,7 +5,7 @@ class MondialRelay_Pointsrelais_Model_Carrier_Pointsrelais extends Mage_Shipping
5
6	public function collectRates(Mage_Shipping_Model_Rate_Request $request)
7	{
8	-
9
10	$result = Mage::getModel('shipping/rate_result');
11	if (!$this->getConfigData('active')) {
	@@ -47,7 +47,7 @@ class MondialRelay_Pointsrelais_Model_Carrier_Pointsrelais extends Mage_Shipping
47	$params["Security"] = strtoupper(md5($code));
48
49	// On se connecte
50	- $client = new SoapClient("http://www.mondialrelay.fr/WebService/~~Web_Services~~.asmx?WSDL");
51
52	// Et on effectue la requète
53	$points_relais = $client->WSI2_RecherchePointRelais($params)->WSI2_RecherchePointRelaisResult;
	@@ -84,6 +84,10 @@ class MondialRelay_Pointsrelais_Model_Carrier_Pointsrelais extends Mage_Shipping
84	}
85
86	return $result;




87	}
88
89	public function getRate(Mage_Shipping_Model_Rate_Request $request)
	@@ -137,7 +141,7 @@ class MondialRelay_Pointsrelais_Model_Carrier_Pointsrelais extends Mage_Shipping
137	public function getTrackingInfo($tracking_number)
138	{
139	$tracking_result = $this->getTracking($tracking_number);
140	-
141	if ($tracking_result instanceof Mage_Shipping_Model_Tracking_Result)
142	{
143	if ($trackings = $tracking_result->getAllTrackings())


5
6	public function collectRates(Mage_Shipping_Model_Rate_Request $request)
7	{
8	+ try{
9
10	$result = Mage::getModel('shipping/rate_result');
11	if (!$this->getConfigData('active')) {

47	$params["Security"] = strtoupper(md5($code));
48
49	// On se connecte
50	+ $client = new SoapClient("http://www.mondialrelay.fr/WebService/Web_Serfefzfvices.asmx?WSDL");
51
52	// Et on effectue la requète
53	$points_relais = $client->WSI2_RecherchePointRelais($params)->WSI2_RecherchePointRelaisResult;

84	}
85
86	return $result;
87	+ }catch(exception $e)
88	+ {
89	+ return 0;
90	+ }
91	}
92
93	public function getRate(Mage_Shipping_Model_Rate_Request $request)

141	public function getTrackingInfo($tracking_number)
142	{
143	$tracking_result = $this->getTracking($tracking_number);
144	+
145	if ($tracking_result instanceof Mage_Shipping_Model_Tracking_Result)
146	{
147	if ($trackings = $tracking_result->getAllTrackings())

app/code/community/MondialRelay/Pointsrelais/Model/Carrier/Pointsrelaiscd.php CHANGED Viewed

	@@ -5,6 +5,7 @@ class MondialRelay_Pointsrelais_Model_Carrier_Pointsrelaiscd extends Mage_Shippi
5
6	public function collectRates(Mage_Shipping_Model_Rate_Request $request)
7	{

8	$result = Mage::getModel('shipping/rate_result');
9	if (!$this->getConfigData('active')) {
10	return $result;
	@@ -85,6 +86,10 @@ class MondialRelay_Pointsrelais_Model_Carrier_Pointsrelaiscd extends Mage_Shippi
85	}
86
87	return $result;




88	}
89
90	public function getRate(Mage_Shipping_Model_Rate_Request $request)


5
6	public function collectRates(Mage_Shipping_Model_Rate_Request $request)
7	{
8	+ try{
9	$result = Mage::getModel('shipping/rate_result');
10	if (!$this->getConfigData('active')) {
11	return $result;

86	}
87
88	return $result;
89	+ }catch(exception $e)
90	+ {
91	+ return 0;
92	+ }
93	}
94
95	public function getRate(Mage_Shipping_Model_Rate_Request $request)

app/code/community/MondialRelay/Pointsrelais/controllers/Sales/._ImpressionController.php DELETED Viewed

Binary file

app/code/community/MondialRelay/Pointsrelais/controllers/Sales/ImpressionController.php CHANGED Viewed

	@@ -67,7 +67,8 @@ class MondialRelay_Pointsrelais_Sales_ImpressionController extends Mage_Adminhtm
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
	@@ -75,6 +76,7 @@ class MondialRelay_Pointsrelais_Sales_ImpressionController extends Mage_Adminhtm
75	//->addAttributeToFilter('carrier_code', array('like' => 'pointsrelais%'));
76
77	foreach ($tracks as $track) {

78
79	$trackingNumbersToReturn[] = $track->getnumber();
80
	@@ -85,6 +87,7 @@ class MondialRelay_Pointsrelais_Sales_ImpressionController extends Mage_Adminhtm
85
86	protected function getEtiquetteUrl($shipmentsIds)
87	{

88	//On récupère les infos d'expédition
89	if (is_array($shipmentsIds))
90	{
	@@ -92,6 +95,13 @@ class MondialRelay_Pointsrelais_Sales_ImpressionController extends Mage_Adminhtm
92	{
93	array_merge($this->_trackingNumbers, $this->getTrackingNumber($shipmentsId));
94	}







95	}
96	else
97	{
	@@ -123,9 +133,14 @@ class MondialRelay_Pointsrelais_Sales_ImpressionController extends Mage_Adminhtm
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	}
	@@ -136,6 +151,8 @@ class MondialRelay_Pointsrelais_Sales_ImpressionController extends Mage_Adminhtm
136	'Expeditions' => implode(';',$mrTrackingNumber),
137	'Langue' => 'FR',
138	);


139
140	//On crée le code de sécurité
141	$code = implode("",$params);
	@@ -148,7 +165,10 @@ class MondialRelay_Pointsrelais_Sales_ImpressionController extends Mage_Adminhtm
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	}


67
68	protected function getTrackingNumber($shipmentId)
69	{
70	+ Mage::Log('*getTrackingNumber**');
71	+ Mage::Log('*getTrackingNumber** 1 : '.$shipmentId);
72	$shipment = Mage::getModel('sales/order_shipment')->load($shipmentId);
73	$trackingNumbersToReturn = array();
74	//On récupère le numéro de tracking

76	//->addAttributeToFilter('carrier_code', array('like' => 'pointsrelais%'));
77
78	foreach ($tracks as $track) {
79	+ Mage::Log('*getTrackingNumber** 2 : '.$track->getnumber());
80
81	$trackingNumbersToReturn[] = $track->getnumber();
82

87
88	protected function getEtiquetteUrl($shipmentsIds)
89	{
90	+ Mage::Log('*getEtiquetteUrl**');
91	//On récupère les infos d'expédition
92	if (is_array($shipmentsIds))
93	{

95	{
96	array_merge($this->_trackingNumbers, $this->getTrackingNumber($shipmentsId));
97	}
98	+ foreach($this->_trackingNumbers as $trackingId)
99	+ {
100	+
101	+ Mage::Log('********');
102	+ Mage::Log('$trackingId : ',$trackingId);
103	+ Mage::Log('********');
104	+ }
105	}
106	else
107	{

133
134	protected function getEtiquetteUrlFromTrack($trackIds)
135	{
136	+ Mage::Log('*getEtiquetteUrlFromTrack**');
137	$mrTrackingNumber = array();
138	foreach($trackIds as $trackingId)
139	{
140	+
141	+ Mage::Log('********');
142	+ Mage::Log('$trackingId : '.$trackingId);
143	+ Mage::Log('********');
144	$trackObj = Mage::getModel('sales/order_shipment_track')->load($trackingId);
145	$mrTrackingNumber[] = $trackObj->getnumber();
146	}

151	'Expeditions' => implode(';',$mrTrackingNumber),
152	'Langue' => 'FR',
153	);
154	+
155	+ Mage::Log('$trackingIds : '.implode(';',$mrTrackingNumber));
156
157	//On crée le code de sécurité
158	$code = implode("",$params);

165	$client = new SoapClient("http://www.mondialrelay.com/WebService/Web_Services.asmx?WSDL");
166	// Et on effectue la requète
167	$etiquette = $client->WSI2_GetEtiquettes($params)->WSI2_GetEtiquettesResult;
168	+
169	+ Mage::Log('********2');
170	+ Mage::Log($etiquette);
171	+ Mage::Log('********2');
172	return $etiquette;
173
174	}

app/code/community/MondialRelay/Pointsrelais/controllers/Sales/Order/ShipmentController.php CHANGED Viewed

	@@ -109,12 +109,11 @@ class MondialRelay_Pointsrelais_Sales_Order_ShipmentController extends Mage_Admi
109	'LIV_Rel' => $_shippingMethod[1]
110	);//$_order->getWeight()*1000,
111	//On crée le code de sécurité
112	-
113	$select = "";
114	foreach($params as $key => $value){

115	$select .= "\t".'<option value="'.$key.'">' . $value.'</option>'."\r\n";
116	}
117	- Mage::Log('WSI2_CreationExpeditionResult$params : '.($select));
118
119	$code = implode("",$params);
120	$code .= $this->getConfigData('cle');
	@@ -186,11 +185,12 @@ class MondialRelay_Pointsrelais_Sales_Order_ShipmentController extends Mage_Admi
186	);//$_order->getWeight()*1000,
187	//On crée le code de sécurité
188

189	$select = "";
190	foreach($params as $key => $value){

191	$select .= "\t".'<option value="'.$key.'">' . $value.'</option>'."\r\n";
192	}
193	- Mage::Log('WSI2_CreationExpeditionResult$params : '.($select));
194
195	$code = implode("",$params);
196	$code .= $this->getConfigData('cle');
	@@ -204,7 +204,6 @@ class MondialRelay_Pointsrelais_Sales_Order_ShipmentController extends Mage_Admi
204	// Et on effectue la requète
205	$expedition = $client->WSI2_CreationExpedition($params)->WSI2_CreationExpeditionResult;
206
207	- Mage::Log('WSI2_CreationExpeditionResult : '.($expedition->STAT));
208	$track = Mage::getModel('sales/order_shipment_track')
209	->setNumber($expedition->ExpeditionNum)
210	->setCarrier('Mondial Relay')
	@@ -261,9 +260,9 @@ class MondialRelay_Pointsrelais_Sales_Order_ShipmentController extends Mage_Admi
261
262	$select = "";
263	foreach($params as $key => $value){

264	$select .= "\t".'<option value="'.$key.'">' . $value.'</option>'."\r\n";
265	}
266	- Mage::Log('WSI2_CreationExpeditionResult$params : '.($select));
267
268	$code = implode("",$params);
269	$code .= $this->getConfigData('cle');
	@@ -277,7 +276,6 @@ class MondialRelay_Pointsrelais_Sales_Order_ShipmentController extends Mage_Admi
277	// Et on effectue la requète
278	$expedition = $client->WSI2_CreationExpedition($params)->WSI2_CreationExpeditionResult;
279
280	- Mage::Log('WSI2_CreationExpeditionResult : '.($expedition->STAT));
281	$track = Mage::getModel('sales/order_shipment_track')
282	->setNumber($expedition->ExpeditionNum)
283	->setCarrier('Mondial Relay')


109	'LIV_Rel' => $_shippingMethod[1]
110	);//$_order->getWeight()*1000,
111	//On crée le code de sécurité

112	$select = "";
113	foreach($params as $key => $value){
114	+ $value = strtr($value,'��?!,;.:', 'aaaaaceeeeiiiinooooouuuuyyAAAAACEEEEIIIINOOOOOUUUUY ');
115	$select .= "\t".'<option value="'.$key.'">' . $value.'</option>'."\r\n";
116	}

117
118	$code = implode("",$params);
119	$code .= $this->getConfigData('cle');

185	);//$_order->getWeight()*1000,
186	//On crée le code de sécurité
187
188	+
189	$select = "";
190	foreach($params as $key => $value){
191	+ $value = strtr($value,'��?!,;.:', 'aaaaaceeeeiiiinooooouuuuyyAAAAACEEEEIIIINOOOOOUUUUY ');
192	$select .= "\t".'<option value="'.$key.'">' . $value.'</option>'."\r\n";
193	}

194
195	$code = implode("",$params);
196	$code .= $this->getConfigData('cle');

204	// Et on effectue la requète
205	$expedition = $client->WSI2_CreationExpedition($params)->WSI2_CreationExpeditionResult;
206

207	$track = Mage::getModel('sales/order_shipment_track')
208	->setNumber($expedition->ExpeditionNum)
209	->setCarrier('Mondial Relay')

260
261	$select = "";
262	foreach($params as $key => $value){
263	+ $value = strtr($value,'��?!,;.:', 'aaaaaceeeeiiiinooooouuuuyyAAAAACEEEEIIIINOOOOOUUUUY ');
264	$select .= "\t".'<option value="'.$key.'">' . $value.'</option>'."\r\n";
265	}

266
267	$code = implode("",$params);
268	$code .= $this->getConfigData('cle');

276	// Et on effectue la requète
277	$expedition = $client->WSI2_CreationExpedition($params)->WSI2_CreationExpeditionResult;
278

279	$track = Mage::getModel('sales/order_shipment_track')
280	->setNumber($expedition->ExpeditionNum)
281	->setCarrier('Mondial Relay')

app/code/community/MondialRelay/Pointsrelais/etc/._config.xml DELETED Viewed

Binary file

app/code/community/MondialRelay/Pointsrelais/etc/config.xml CHANGED Viewed

	@@ -2,7 +2,7 @@
2	<config>
3	<modules>
4	<MondialRelay_Pointsrelais>
5	- <version>1.3.3</version>
6	<depends>
7	<Mage_Adminhtml />
8	<Mage_Shipping />


2	<config>
3	<modules>
4	<MondialRelay_Pointsrelais>
5	+ <version>1.3.2</version>
6	<depends>
7	<Mage_Adminhtml />
8	<Mage_Shipping />

app/design/adminhtml/default/mondialrelay/template/sales/order/invoice/create/form.phtml ADDED Viewed

	@@ -0,0 +1,111 @@


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 ADDED Viewed

	@@ -0,0 +1,116 @@


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 ADDED Viewed

	@@ -0,0 +1,88 @@


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 ADDED Viewed

	@@ -0,0 +1,16 @@


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 ADDED Viewed

	@@ -0,0 +1,3 @@


1	+ <script type="text/javascript">
2	+ var baseUrl = '<?php echo $this->getUrl(); ?>';
3	+ </script>

app/design/frontend/default/default/template/pointsrelais/info.phtml ADDED Viewed

	@@ -0,0 +1,171 @@


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	+ <?php if($detail_pointrelais->URL_Plan): ?>
31	+ <div class="googlemap">
32	+ <iframe src="<?php echo $detail_pointrelais->URL_Plan ?>" height="230" width="390" frameborder="no" scrolling="no">Plan d'accès au magasin</iframe>
33	+ </div>
34	+ <?php else: ?>
35	+ <div class="googlemap">
36	+ <?php echo 'Plan non disponible' ;?>
37	+ </div>
38	+ <?php endif; ?>
39	+ </div>
40	+ <div class="colonne-droite">
41	+ <?php if($detail_pointrelais->URL_Photo) : ?>
42	+ <div class="photo">
43	+ <img src="<?php echo $detail_pointrelais->URL_Photo ?>" alt="<?php echo $detail_pointrelais->LgAdr1 ?>" />
44	+ </div>
45	+ <?php endif; ?>
46	+ <div class="horaires">
47	+ <h2><?php echo $this->__('Horaires d\'ouverture') ?></h2>
48	+ <table>
49	+ <tr>
50	+ <td class="jour"><?php echo $this->__('Lundi') ?></td>
51	+ <td>
52	+ <?php if($detail_pointrelais->Horaires_Lundi->string[0] != 0) : ?>
53	+ <?php echo substr($detail_pointrelais->Horaires_Lundi->string[0],-4,2) . "h". substr($detail_pointrelais->Horaires_Lundi->string[0],-2) . " - "; ?>
54	+ <?php echo substr($detail_pointrelais->Horaires_Lundi->string[1],-4,2) . "h". substr($detail_pointrelais->Horaires_Lundi->string[1],-2); ?>
55	+ <?php endif; ?>
56	+ </td>
57	+ <td>
58	+ <?php if($detail_pointrelais->Horaires_Lundi->string[2] != 0) : ?>
59	+ <?php echo substr($detail_pointrelais->Horaires_Lundi->string[2],-4,2) . "h". substr($detail_pointrelais->Horaires_Lundi->string[2],-2) . " - "; ?>
60	+ <?php echo substr($detail_pointrelais->Horaires_Lundi->string[3],-4,2) . "h". substr($detail_pointrelais->Horaires_Lundi->string[3],-2); ?>
61	+ <?php endif; ?>
62	+ </td>
63	+ </tr>
64	+ <tr>
65	+ <td class="jour"><?php echo $this->__('Mardi') ?></td>
66	+ <td>
67	+ <?php if($detail_pointrelais->Horaires_Mardi->string[0] != 0) : ?>
68	+ <?php echo substr($detail_pointrelais->Horaires_Mardi->string[0],-4,2) . "h". substr($detail_pointrelais->Horaires_Mardi->string[0],-2) . " - "; ?>
69	+ <?php echo substr($detail_pointrelais->Horaires_Mardi->string[1],-4,2) . "h". substr($detail_pointrelais->Horaires_Mardi->string[1],-2); ?>
70	+ <?php endif; ?>
71	+ </td>
72	+ <td>
73	+ <?php if($detail_pointrelais->Horaires_Mardi->string[2] != 0) : ?>
74	+ <?php echo substr($detail_pointrelais->Horaires_Mardi->string[2],-4,2) . "h". substr($detail_pointrelais->Horaires_Mardi->string[2],-2) . " - "; ?>
75	+ <?php echo substr($detail_pointrelais->Horaires_Mardi->string[3],-4,2) . "h". substr($detail_pointrelais->Horaires_Mardi->string[3],-2); ?>
76	+ <?php endif; ?>
77	+ </td>
78	+ </tr>
79	+ <tr>
80	+ <td class="jour"><?php echo $this->__('Mercredi') ?></td>
81	+ <td>
82	+ <?php if($detail_pointrelais->Horaires_Mercredi->string[0] != 0) : ?>
83	+ <?php echo substr($detail_pointrelais->Horaires_Mercredi->string[0],-4,2) . "h". substr($detail_pointrelais->Horaires_Mercredi->string[0],-2) . " - "; ?>
84	+ <?php echo substr($detail_pointrelais->Horaires_Mercredi->string[1],-4,2) . "h". substr($detail_pointrelais->Horaires_Mercredi->string[1],-2); ?>
85	+ <?php endif; ?>
86	+ </td>
87	+ <td>
88	+ <?php if($detail_pointrelais->Horaires_Mercredi->string[2] != 0) : ?>
89	+ <?php echo substr($detail_pointrelais->Horaires_Mercredi->string[2],-4,2) . "h". substr($detail_pointrelais->Horaires_Mercredi->string[2],-2) . " - "; ?>
90	+ <?php echo substr($detail_pointrelais->Horaires_Mercredi->string[3],-4,2) . "h". substr($detail_pointrelais->Horaires_Mercredi->string[3],-2); ?>
91	+ <?php endif; ?>
92	+ </td>
93	+ </tr>
94	+ <tr>
95	+ <td class="jour"><?php echo $this->__('Jeudi') ?></td>
96	+ <td>
97	+ <?php if($detail_pointrelais->Horaires_Jeudi->string[0] != 0) : ?>
98	+ <?php echo substr($detail_pointrelais->Horaires_Jeudi->string[0],-4,2) . "h". substr($detail_pointrelais->Horaires_Jeudi->string[0],-2) . " - "; ?>
99	+ <?php echo substr($detail_pointrelais->Horaires_Jeudi->string[1],-4,2) . "h". substr($detail_pointrelais->Horaires_Jeudi->string[1],-2); ?>
100	+ <?php endif; ?>
101	+ </td>
102	+ <td>
103	+ <?php if($detail_pointrelais->Horaires_Jeudi->string[2] != 0) : ?>
104	+ <?php echo substr($detail_pointrelais->Horaires_Jeudi->string[2],-4,2) . "h". substr($detail_pointrelais->Horaires_Jeudi->string[2],-2) . " - "; ?>
105	+ <?php echo substr($detail_pointrelais->Horaires_Jeudi->string[3],-4,2) . "h". substr($detail_pointrelais->Horaires_Jeudi->string[3],-2); ?>
106	+ <?php endif; ?>
107	+ </td>
108	+ </tr>
109	+ <tr>
110	+ <td class="jour"><?php echo $this->__('Vendredi') ?></td>
111	+ <td>
112	+ <?php if($detail_pointrelais->Horaires_Vendredi->string[0] != 0) : ?>
113	+ <?php echo substr($detail_pointrelais->Horaires_Vendredi->string[0],-4,2) . "h". substr($detail_pointrelais->Horaires_Vendredi->string[0],-2) . " - "; ?>
114	+ <?php echo substr($detail_pointrelais->Horaires_Vendredi->string[1],-4,2) . "h". substr($detail_pointrelais->Horaires_Vendredi->string[1],-2); ?>
115	+ <?php endif; ?>
116	+ </td>
117	+ <td>
118	+ <?php if($detail_pointrelais->Horaires_Vendredi->string[2] != 0) : ?>
119	+ <?php echo substr($detail_pointrelais->Horaires_Vendredi->string[2],-4,2) . "h". substr($detail_pointrelais->Horaires_Vendredi->string[2],-2) . " - "; ?>
120	+ <?php echo substr($detail_pointrelais->Horaires_Vendredi->string[3],-4,2) . "h". substr($detail_pointrelais->Horaires_Vendredi->string[3],-2); ?>
121	+ <?php endif; ?>
122	+ </td>
123	+ </tr>
124	+ <tr>
125	+ <td class="jour"><?php echo $this->__('Samedi') ?></td>
126	+ <td>
127	+ <?php if($detail_pointrelais->Horaires_Samedi->string[0] != 0) : ?>
128	+ <?php echo substr($detail_pointrelais->Horaires_Samedi->string[0],-4,2) . "h". substr($detail_pointrelais->Horaires_Samedi->string[0],-2) . " - "; ?>
129	+ <?php echo substr($detail_pointrelais->Horaires_Samedi->string[1],-4,2) . "h". substr($detail_pointrelais->Horaires_Samedi->string[1],-2); ?>
130	+ <?php endif; ?>
131	+ </td>
132	+ <td>
133	+ <?php if($detail_pointrelais->Horaires_Samedi->string[2] != 0) : ?>
134	+ <?php echo substr($detail_pointrelais->Horaires_Samedi->string[2],-4,2) . "h". substr($detail_pointrelais->Horaires_Samedi->string[2],-2) . " - "; ?>
135	+ <?php echo substr($detail_pointrelais->Horaires_Samedi->string[3],-4,2) . "h". substr($detail_pointrelais->Horaires_Samedi->string[3],-2); ?>
136	+ <?php endif; ?>
137	+ </td>
138	+ </tr>
139	+ <?php try { $detail_pointrelais->Horaires_Dimanche; ?>
140	+ <tr>
141	+ <td class="jour"><?php echo $this->__('Dimanche') ?></td>
142	+ <td>
143	+ <?php if($detail_pointrelais->Horaires_Dimanche->string[0] != 0) : ?>
144	+ <?php echo substr($detail_pointrelais->Horaires_Dimanche->string[0],-4,2) . "h". substr($detail_pointrelais->Horaires_Dimanche->string[0],-2) . " - "; ?>
145	+ <?php echo substr($detail_pointrelais->Horaires_Dimanche->string[1],-4,2) . "h". substr($detail_pointrelais->Horaires_Dimanche->string[1],-2); ?>
146	+ <?php endif; ?>
147	+ </td>
148	+ <td>
149	+ <?php if($detail_pointrelais->Horaires_Lundi->string[2] != 0) : ?>
150	+ <?php echo substr($detail_pointrelais->Horaires_Dimanche->string[2],-4,2) . "h". substr($detail_pointrelais->Horaires_Dimanche->string[2],-2) . " - "; ?>
151	+ <?php echo substr($detail_pointrelais->Horaires_Dimanche->string[3],-4,2) . "h". substr($detail_pointrelais->Horaires_Dimanche->string[3],-2); ?>
152	+ <?php endif; ?>
153	+ </td>
154	+ </tr>
155	+ <?php
156	+ }
157	+ catch (Exception $e) {
158	+ $errors[] = $e->getMessage();
159	+ }?>
160	+ </table>
161	+ <?php if ($this->getRequest()->getPost('popup_relais') == 1):?>
162	+ <div class="fermer"><a href="#" onclick="window.close(); return false;">Fermer</a></div>
163	+ <?php else:?>
164	+ <div class="fermer"><a href="#" onclick="PointsRelais.fermer(); return false;">Fermer</a></div>
165	+ <?php endif;?>
166	+ </div>
167	+
168	+ <?php if ($this->getRequest()->getPost('popup_relais') == 1):?>
169	+ </body>
170	+ </html>
171	+ <?php endif;?>

app/etc/modules/MondialRelay_All.xml ADDED Viewed

	@@ -0,0 +1,9 @@


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 ADDED Viewed

	@@ -0,0 +1,19 @@


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 Viewed

	@@ -1,18 +1,18 @@
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>


1	<?xml version="1.0"?>
2	<package>
3	<name>MondialRelay_Pointsrelais</name>
4	+ <version>1.4.0</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 du paquet</notes>
12	<authors><author><name>cyrille guillaud</name><user>auto-converted</user><email>cguillaud@cg-consulting.fr</email></author></authors>
13	+ <date>2012-04-06</date>
14	+ <time>16:16:51</time>
15	+ <contents><target name="mage"><dir name="app"><dir name="etc"><dir name="modules"><file name="MondialRelay_All.xml" hash="8257e76c52b260553f8ce663c2a8b3d1"/></dir></dir><dir name="code"><dir name="community"><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="e20ed95d76ed068f5e3f5a9a33d19a39"/></dir><dir name="controllers"><dir name="Sales"><dir name="Order"><file name="ShipmentController.php" hash="2ad5fd382c06f8a9388c678d29610abf"/></dir><file name="ImpressionController.php" hash="be24fbb76408466826f9df60db8531c5"/></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="4b89b1d578747c2d303a77ed5d3d1510"/><file name="Pointsrelaiscd.php" hash="33f6129d0ac1aa0af740a0f5ba6e693b"/><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-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></dir></dir><dir name="design"><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="4bbbeeaa297c90b6c587c4ccdc361297"/></dir></dir></dir></dir></dir><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><dir name="locale"><dir name="fr_FR"><file name="MondialRelay_Pointsrelais.csv" hash="64ed2a0c6bde5f02862e24a0697a6109"/></dir></dir></dir><dir name="skin"><dir name="frontend"><dir name="base"><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"/></dir></dir><dir name="js"><file name="pointsrelais.js" hash="8008e112e4dd2f468b5726c561a5f8b4"/></dir></dir></dir></dir></dir></target></contents>
16	<compatible/>
17	<dependencies/>
18	</package>

skin/frontend/base/default/css/pointsrelais.css ADDED Viewed

	@@ -0,0 +1,46 @@


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/base/default/images/mondialrelay/img_fermer.gif ADDED Viewed

Binary file

skin/frontend/base/default/images/mondialrelay/img_fleche.gif ADDED Viewed

Binary file

skin/frontend/base/default/images/mondialrelay/logo_PR_01.gif ADDED Viewed

Binary file

skin/frontend/base/default/js/pointsrelais.js ADDED Viewed

	@@ -0,0 +1,92 @@


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	+ }

MondialRelay_Pointsrelais - Version 1.4.0

Version Notes

Release Info

Code changes from version 1.3.3 to 1.4.0