Ydral_Yupick - Version 0.6.1

Version Notes

- Corregidos varios errores de diseño.

- Ahora muestra y selecciona por defecto el punto Yupick! del pedido original al hacer un Reorder.

Download this release

Release Info

Developer Ydral
Extension Ydral_Yupick
Version 0.6.1
Comparing to
See all releases


Code changes from version 0.6.0 to 0.6.1

Files changed (9) hide show
  1. app/code/local/Ydral/Yupick/etc/config.xml +1 -1
  2. app/design/adminhtml/default/default/template/yupick/form.phtml +19 -9
  3. app/design/adminhtml/default/default/template/yupick/tab_info.phtml +6 -2
  4. app/design/frontend/base/default/layout/yupick.xml +2 -1
  5. app/design/frontend/base/default/template/yupick/onestepcheckout_shipping_method.phtml +1 -0
  6. app/design/frontend/base/default/template/yupick/shipping.phtml +1 -0
  7. js/yupick.js +20 -7
  8. package.xml +6 -8
  9. skin/frontend/default/default/js/yupick.js +0 -217
app/code/local/Ydral/Yupick/etc/config.xml CHANGED
@@ -3,7 +3,7 @@
3
  <config>
4
  <modules>
5
  <Ydral_Yupick>
6
- <version>0.5.1</version>
7
  </Ydral_Yupick>
8
  </modules>
9
  <global>
3
  <config>
4
  <modules>
5
  <Ydral_Yupick>
6
+ <version>0.6.1</version>
7
  </Ydral_Yupick>
8
  </modules>
9
  <global>
app/design/adminhtml/default/default/template/yupick/form.phtml CHANGED
@@ -32,7 +32,13 @@
32
  <dd>
33
  <ul>
34
  <?php foreach ($_rates as $_rate): ?>
35
- <?php $_radioProperty = 'name="order[shipping_method]" type="radio" onclick="order.setShippingMethod(this.value)"' ?>
 
 
 
 
 
 
36
  <?php $_code=$_rate->getCode() ?>
37
  <li>
38
  <?php if ($_rate->getErrorMessage()): ?>
@@ -91,8 +97,8 @@
91
 
92
  <div id="yupick_carrier_principal" class="yupick_carrier_principal" style="display: none; ">
93
  <!-- OJO cambios -->
94
- Calle: <input type="text" id="direccion" name="direccion" size="50" value="<?php echo $this->getQuote()->getShippingAddress()->getStreetFull() . ', ' . $this->getQuote()->getShippingAddress()->getCity() . ', ' . $this->getQuote()->getShippingAddress()->getRegion();?>" />
95
- &nbsp;C&oacute;d.Postal:<input type="text" id="codigoPostal" name="codigoPostal" size="10" value="<?php echo $this->getQuote()->getShippingAddress()->getPostcode(); ?>" />
96
  <br>
97
  <input id="option_mas20" name="option_mas20" type="checkbox" value="on" />&nbsp;<label><?php echo $this->__('Est&aacute; abierto m&aacute;s de las 20h.'); ?></label>
98
  <input id="option_sabados" name="option_sabados" type="checkbox" value="on" />&nbsp;<label><?php echo $this->__('Abierto los s&aacute;bados tarde.'); ?></label>
@@ -118,13 +124,13 @@
118
  <?php /* </form> */ ?>
119
  <br />
120
  <div id="oficinas_yupick_content" style="display: none; ">
121
- <select id="oficinas_yupick" name="oficinas_yupick" onchange="PuntosYupick.yupickInfo();"></select>
122
  <input type="hidden" id="oficinas_yupick_data" name="oficinas_yupick_data" value="" />
123
  </div>
124
 
125
  <div class="yclear"></div>
126
- <div id="yupick_info_map" style="display: none; "></div>
127
- <div id="yupick_info_time" style="display: none; "></div>
128
  <div class="yclear"></div>
129
  <div id="yupick_info_user" style="display: none; ">
130
  <p><?php echo $this->__('&iquest;C&oacute;mo prefiere ser informado de cuando puede recoger su compra?') ?></p>
@@ -141,10 +147,10 @@
141
  </div>
142
  <div class="yclear"><br /></div>
143
 
144
- <div id="loadingmask" style="display: none;">
145
  <div class="loader" id="loading-mask-loader"><img src="<?php echo($this->getSkinUrl('images/yupick/opc-ajax-loader.gif')) ?>" alt="<?php echo $this->__('Loading...') ?>" /> <?php echo $this->__('Loading...') ?></div>
146
- <div id="loading-mask"></div>
147
- </div>
148
 
149
  <?php endif; ?>
150
 
@@ -170,6 +176,10 @@
170
  (<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
171
  <?php endif; ?>
172
  </strong>
 
 
 
 
173
  <!--input type="text" class="input-text" style="width:70px"/-->
174
  <br/>
175
  <a href="#" onclick="$('order-shipping-method-info').hide();$('order-shipping-method-choose').show();return false">
32
  <dd>
33
  <ul>
34
  <?php foreach ($_rates as $_rate): ?>
35
+ <?php $_radioProperty = 'name="order[shipping_method]" type="radio"';
36
+ if ($_rate->getCode() === 'yupick_yupick') {
37
+ $_radioProperty .= 'onclick="PuntosYupick.getPuntosYupick();order.setShippingMethod(this.value);$(\'loading-mask\').hide();"';
38
+ } else {
39
+ $_radioProperty .= 'onclick="order.setShippingMethod(this.value)"';
40
+ }
41
+ ?>
42
  <?php $_code=$_rate->getCode() ?>
43
  <li>
44
  <?php if ($_rate->getErrorMessage()): ?>
97
 
98
  <div id="yupick_carrier_principal" class="yupick_carrier_principal" style="display: none; ">
99
  <!-- OJO cambios -->
100
+ Calle: <input type="text" id="direccion" name="direccion" size="50" value="<?php echo Mage::getSingleton('core/session', array('name' => 'adminhtml'))->getYupickInfo();?>" />
101
+ &nbsp;C&oacute;d.Postal:<input type="text" id="codigoPostal" name="codigoPostal" size="10" value="" />
102
  <br>
103
  <input id="option_mas20" name="option_mas20" type="checkbox" value="on" />&nbsp;<label><?php echo $this->__('Est&aacute; abierto m&aacute;s de las 20h.'); ?></label>
104
  <input id="option_sabados" name="option_sabados" type="checkbox" value="on" />&nbsp;<label><?php echo $this->__('Abierto los s&aacute;bados tarde.'); ?></label>
124
  <?php /* </form> */ ?>
125
  <br />
126
  <div id="oficinas_yupick_content" style="display: none; ">
127
+ <select id="oficinas_yupick" name="oficinas_yupick" onchange="PuntosYupick.yupickInfo();" style="min-width: 380px;"></select>
128
  <input type="hidden" id="oficinas_yupick_data" name="oficinas_yupick_data" value="" />
129
  </div>
130
 
131
  <div class="yclear"></div>
132
+ <div id="yupick_info_map" style="display: none; width: 380px"></div>
133
+ <div id="yupick_info_time" style="display: none; width: 380px"></div>
134
  <div class="yclear"></div>
135
  <div id="yupick_info_user" style="display: none; ">
136
  <p><?php echo $this->__('&iquest;C&oacute;mo prefiere ser informado de cuando puede recoger su compra?') ?></p>
147
  </div>
148
  <div class="yclear"><br /></div>
149
 
150
+ <!-- <div id="loadingmask" style="display: none;">
151
  <div class="loader" id="loading-mask-loader"><img src="<?php echo($this->getSkinUrl('images/yupick/opc-ajax-loader.gif')) ?>" alt="<?php echo $this->__('Loading...') ?>" /> <?php echo $this->__('Loading...') ?></div>
152
+ <div id="loading-mask" style="display: none;></div>
153
+ </div> -->
154
 
155
  <?php endif; ?>
156
 
176
  (<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
177
  <?php endif; ?>
178
  </strong>
179
+ <?php if ($_rate->getCode() === 'yupick_yupick'): ?>
180
+ <?php echo "<br/>" . Mage::getSingleton('core/session', array('name' => 'adminhtml'))->getYupickInfo(); ?>
181
+ <?php endif; ?>
182
+ <input type="hidden" id="txtIdPunto" name="txtIdPunto" value="<?php echo Mage::getSingleton('core/session', array('name' => 'adminhtml'))->getYupickId(); ?>">
183
  <!--input type="text" class="input-text" style="width:70px"/-->
184
  <br/>
185
  <a href="#" onclick="$('order-shipping-method-info').hide();$('order-shipping-method-choose').show();return false">
app/design/adminhtml/default/default/template/yupick/tab_info.phtml CHANGED
@@ -24,7 +24,10 @@
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
- <?php $_order = $this->getOrder() ?>
 
 
 
28
  <div>
29
  <div id="order-messages">
30
  <?php echo $this->getChildHtml('order_messages') ?>
@@ -70,11 +73,12 @@
70
  <?php
71
  /* YUPICK START */
72
  if ($_order->getShippingMethod() == 'yupick_yupick'):
73
-
74
  $_dataRecogida = Mage::getModel('yupick/ydral_recogeroficina')->readCheckoutData('order', $_order->getRealOrderId());
75
  if ($_dataRecogida)
76
  {
77
  echo '<br />'.$_dataRecogida['info_oficina'];
 
 
78
  }
79
  ?>
80
  <br />
24
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
  */
26
  ?>
27
+ <?php $_order = $this->getOrder();
28
+ Mage::getSingleton('core/session')->setYupickInfo('');
29
+ Mage::getSingleton('core/session')->setYupickId('');
30
+ ?>
31
  <div>
32
  <div id="order-messages">
33
  <?php echo $this->getChildHtml('order_messages') ?>
73
  <?php
74
  /* YUPICK START */
75
  if ($_order->getShippingMethod() == 'yupick_yupick'):
 
76
  $_dataRecogida = Mage::getModel('yupick/ydral_recogeroficina')->readCheckoutData('order', $_order->getRealOrderId());
77
  if ($_dataRecogida)
78
  {
79
  echo '<br />'.$_dataRecogida['info_oficina'];
80
+ Mage::getSingleton('core/session')->setYupickInfo($_dataRecogida['info_oficina']);
81
+ Mage::getSingleton('core/session')->setYupickId($_dataRecogida['oficina_recogida']);
82
  }
83
  ?>
84
  <br />
app/design/frontend/base/default/layout/yupick.xml CHANGED
@@ -24,7 +24,8 @@
24
  <onestepcheckout_index_index>
25
  <reference name="head" ifconfig="carriers/yupick/active">
26
  <action method="addCss"><stylesheet>css/yupick.css</stylesheet></action>
27
- <action method="addItem"><type>skin_js</type><name>js/yupick.js</name></action>
 
28
  <!-- <block type="core/text" name="gmap.api.js"><action method="setText"><text><![CDATA[<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>]]></text></action></block>-->
29
  <block type="core/template" name="maps">
30
  <action method="setTemplate"><template>yupick/linksmaps.phtml</template></action>
24
  <onestepcheckout_index_index>
25
  <reference name="head" ifconfig="carriers/yupick/active">
26
  <action method="addCss"><stylesheet>css/yupick.css</stylesheet></action>
27
+ <!-- <action method="addItem"><type>skin_js</type><name>js/yupick.js</name></action>-->
28
+ <action method="addJs"><file>yupick.js</file></action>
29
  <!-- <block type="core/text" name="gmap.api.js"><action method="setText"><text><![CDATA[<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>]]></text></action></block>-->
30
  <block type="core/template" name="maps">
31
  <action method="setTemplate"><template>yupick/linksmaps.phtml</template></action>
app/design/frontend/base/default/template/yupick/onestepcheckout_shipping_method.phtml CHANGED
@@ -110,6 +110,7 @@
110
  <div id="oficinas_yupick_content" style="display: none; ">
111
  <select id="oficinas_yupick" name="oficinas_yupick" onchange="PuntosYupick.yupickInfo();" style="width: 240px; min-width: 240px; "></select>
112
  <input type="hidden" id="oficinas_yupick_data" name="oficinas_yupick_data" value="" />
 
113
  </div>
114
 
115
  <div class="yclear"></div>
110
  <div id="oficinas_yupick_content" style="display: none; ">
111
  <select id="oficinas_yupick" name="oficinas_yupick" onchange="PuntosYupick.yupickInfo();" style="width: 240px; min-width: 240px; "></select>
112
  <input type="hidden" id="oficinas_yupick_data" name="oficinas_yupick_data" value="" />
113
+ <input type="hidden" id="txtIdPunto" name="txtIdPunto" value="">
114
  </div>
115
 
116
  <div class="yclear"></div>
app/design/frontend/base/default/template/yupick/shipping.phtml CHANGED
@@ -131,6 +131,7 @@
131
  <div id="oficinas_yupick_content" style="display: none; ">
132
  <select id="oficinas_yupick" name="oficinas_yupick" onchange="PuntosYupick.yupickInfo();"></select>
133
  <input type="hidden" id="oficinas_yupick_data" name="oficinas_yupick_data" value="" />
 
134
  </div>
135
 
136
  <div class="yclear"></div>
131
  <div id="oficinas_yupick_content" style="display: none; ">
132
  <select id="oficinas_yupick" name="oficinas_yupick" onchange="PuntosYupick.yupickInfo();"></select>
133
  <input type="hidden" id="oficinas_yupick_data" name="oficinas_yupick_data" value="" />
134
+ <input type="hidden" id="txtIdPunto" name="txtIdPunto" value="">
135
  </div>
136
 
137
  <div class="yclear"></div>
js/yupick.js CHANGED
@@ -1,4 +1,3 @@
1
-
2
  PuntosYupick = Class.create();
3
  PuntosYupick.prototype = {
4
 
@@ -41,7 +40,7 @@ PuntosYupick.prototype = {
41
  $('direccion').focus();
42
  } else {
43
  this.reloadurl = $('checkUrl').value;
44
- Element.show('loadingmask');
45
  if (!$('option_parking').checked) {
46
  $('option_parking').value = '';
47
  } else {
@@ -82,7 +81,6 @@ PuntosYupick.prototype = {
82
  } else {
83
  $('option_domingos').value = 'on';
84
  }
85
-
86
  new Ajax.Request(this.reloadurl, {
87
  method: 'post',
88
  //OJO Cambios
@@ -103,7 +101,7 @@ PuntosYupick.prototype = {
103
  },
104
 
105
  reloadChildren: function(transport){
106
- Element.hide('loadingmask');
107
  $('oficinas_yupick_content').setStyle({display: 'block'});
108
  var jsonResponse=transport.responseText.evalJSON(true);
109
  this.yupickResultados = jsonResponse;
@@ -122,7 +120,7 @@ PuntosYupick.prototype = {
122
  }
123
  );
124
 
125
- this.yupickInfo()
126
 
127
  },
128
 
@@ -139,9 +137,25 @@ PuntosYupick.prototype = {
139
  },
140
 
141
  yupickInfo:function()
 
 
 
 
 
142
  {
143
 
144
- var puntoActual = $('oficinas_yupick').value;
 
 
 
 
 
 
 
 
 
 
 
145
  this.yupickResultados.puntoentrega.each(
146
  function(e) {
147
  if (e.id == puntoActual)
@@ -158,7 +172,6 @@ PuntosYupick.prototype = {
158
 
159
  }
160
  }.bind(this));
161
-
162
  },
163
 
164
  infoGoogleMaps:function(e)
 
1
  PuntosYupick = Class.create();
2
  PuntosYupick.prototype = {
3
 
40
  $('direccion').focus();
41
  } else {
42
  this.reloadurl = $('checkUrl').value;
43
+ //Element.show('loadingmask');
44
  if (!$('option_parking').checked) {
45
  $('option_parking').value = '';
46
  } else {
81
  } else {
82
  $('option_domingos').value = 'on';
83
  }
 
84
  new Ajax.Request(this.reloadurl, {
85
  method: 'post',
86
  //OJO Cambios
101
  },
102
 
103
  reloadChildren: function(transport){
104
+ //Element.hide('loadingmask');
105
  $('oficinas_yupick_content').setStyle({display: 'block'});
106
  var jsonResponse=transport.responseText.evalJSON(true);
107
  this.yupickResultados = jsonResponse;
120
  }
121
  );
122
 
123
+ this.yupickInfoBuscar(true);
124
 
125
  },
126
 
137
  },
138
 
139
  yupickInfo:function()
140
+ {
141
+ this.yupickInfoBuscar(false);
142
+ },
143
+
144
+ yupickInfoBuscar:function(buscar)
145
  {
146
 
147
+ if (buscar) {
148
+ if ($('txtIdPunto').value != "") {
149
+ var p = $('txtIdPunto').value;
150
+ $$('select#oficinas_yupick option').each(function(o) {
151
+ if (o.value == p) {
152
+ o.selected = true;
153
+ $break;
154
+ }
155
+ });
156
+ }
157
+ }
158
+ var puntoActual = $('oficinas_yupick').value;
159
  this.yupickResultados.puntoentrega.each(
160
  function(e) {
161
  if (e.id == puntoActual)
172
 
173
  }
174
  }.bind(this));
 
175
  },
176
 
177
  infoGoogleMaps:function(e)
package.xml CHANGED
@@ -1,22 +1,20 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Ydral_Yupick</name>
4
- <version>0.6.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL 3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>M&#xF3;dulo para Magento para integrar los puntos de recogida de Yupick!</summary>
10
  <description>M&#xF3;dulo para Magento para integrar los puntos de recogida de Yupick!</description>
11
- <notes>- Compatibilidad con m&#xF3;dulo OneStepCheckOut.com&#xD;
12
  &#xD;
13
- - Implementada funcionalidad puntos Yupick en la opci&#xF3;n Reorder del BackOffice.&#xD;
14
- &#xD;
15
- - Al enviar la confirmaci&#xF3;n por correo, se incluyen los datos del Punto Yupick! seleccionado.</notes>
16
  <authors><author><name>Ydral</name><user>Ydral</user><email>webmaster@ydral.com</email></author><author><name>Luis</name><user>Alvarez</user><email>lalvarez@boyaca.es</email></author></authors>
17
- <date>2013-01-28</date>
18
- <time>08:38:59</time>
19
- <contents><target name="magelocal"><dir name="Ydral"><dir name="Yupick"><dir name="Block"><dir name="Checkout"><dir name="Onepage"><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="1034cd37c90415b735712913a7367521"/></dir></dir></dir></dir><file name="Email.php" hash="affa2d386e25e2e517c70bca39988f7b"/><file name="Yupick.php" hash="a44a88ca6668066be57617ef4bc59796"/></dir><dir name="Helper"><file name="Data.php" hash="f91a2150e927d4a07b5280e8eff2575c"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Boyaca"><file name="Collection.php" hash="546fd69029d924657d7ce322dbd588c5"/></dir><file name="Yupick.php" hash="3bbbd6befd30bfdf844011407fa4db1b"/></dir><file name="Observer.php" hash="881fb29024fee91bc6bf3ba800b1eeaf"/><dir name="Type"><file name="Onepage.php" hash="e7ba6c24d95bb588bff8e69a79cf71a0"/></dir><dir name="Ydral"><file name="Recogeroficina.php" hash="3e0f0105d2b129dffd4c7ec0639d1eb0"/><file name="Shipment.php" hash="59e8d255241f2261d65df8e6545b06ba"/><dir name="Source"><file name="Method.php" hash="99a702161e108c27f731626d8d1a32db"/></dir></dir><file name="Yupick.php" hash="d87f52757d55a01e5ed3de0952681234"/></dir><dir name="controllers"><file name="IndexController.php" hash="0c18e19eae0e199a7bf6a4802761ea5b"/></dir><dir name="etc"><file name="config.xml" hash="88d26f19e2a937535775eae8d2cc8533"/><file name="system.xml" hash="52213ea9b1f0ea4f1ee1ac09ecda0965"/></dir><dir name="sql"><dir name="yupick_setup"><file name="mysql4-install-0.1.0.php" hash="ad2f5cd741181e0cd71fbab193a80094"/><file name="mysql4-upgrade-0.1.0-0.2.0.php" hash="a91ac4d35130ff6d11d876c711f810e2"/><file name="mysql4-upgrade-0.2.0-0.3.0.php" hash="a91ac4d35130ff6d11d876c711f810e2"/><file name="mysql4-upgrade-0.3.0-0.4.0.php" hash="a91ac4d35130ff6d11d876c711f810e2"/><file name="mysql4-upgrade-0.4.0-0.5.0.php" hash="a91ac4d35130ff6d11d876c711f810e2"/><file name="mysql4-upgrade-0.5.0-0.6.0.php" hash="a91ac4d35130ff6d11d876c711f810e2"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="yupick.xml" hash="47e25e15b6e638e6faa9b1c541ee2976"/></dir><dir name="template"><dir name="yupick"><file name="email.phtml" hash="c7880fe03a742e36e1f6fc1cea5c59a0"/><file name="info.phtml" hash="e0eb4891c623f2042a16ac2b3d0666d2"/><file name="linksmaps.phtml" hash="33ec7673296ffff4418b2a15f676b2a8"/><file name="onestepcheckout_shipping_method.phtml" hash="528c73f19b203e326c326ae19dd66da4"/><file name="shipping.phtml" hash="8a2ab4744fc9a4c2a907907b8fdb0771"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="yupick.xml" hash="f468af9371e3873ba8230fd69261fa97"/></dir><dir name="template"><dir name="yupick"><file name="form.phtml" hash="f042f294268c6b006e6bb19f9acabd58"/><file name="linksmaps.phtml" hash="b225326c5e2c60642d28cc9c983e4756"/><file name="tab_info.phtml" hash="494f48c9cf084fd08e2b7020513b88b5"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Ydral_Yupick.xml" hash="f420cc41a8935a25faa4c0df7ef4c1db"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="default"><dir name="default"><dir name="css"><file name="yupick.css" hash="8b41ae7949b8bde7ab6f0b0b31e48d13"/></dir><dir name="images"><dir name="yupick"><file name="globo.png" hash="d8880a99065ebb3ab173df27613abf93"/><file name="globosombra.png" hash="1a50fd383f17fe25cc74da661ddd6b5a"/><file name="logo.gif" hash="21a6ab44b6300a61ac978284c7bb09ad"/><file name="logo_small.gif" hash="1ea5b75df0babbde827d4761c942a746"/><file name="opc-ajax-loader.gif" hash="e805ea7eca1f34c75ba0f93780d32d38"/></dir></dir><dir name="js"><file name="yupick.js" hash="a0339cecae081e76723a4e9d84dfff0d"/></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><file name="yupick.css" hash="8b41ae7949b8bde7ab6f0b0b31e48d13"/><dir name="images"><dir name="yupick"><file name="logo_small.gif" hash="1ea5b75df0babbde827d4761c942a746"/><file name="opc-ajax-loader.gif" hash="e805ea7eca1f34c75ba0f93780d32d38"/></dir></dir></dir></dir></dir></target><target name="mage"><dir name="js"><file name="yupick.js" hash="a0339cecae081e76723a4e9d84dfff0d"/></dir></target><target name="magelocale"><dir name="en_US"><dir name="template"><dir name="email"><dir name="sales"><file name="order_new_yupick.html" hash="0a813bcb2c89e335999d0efa7adac31c"/></dir></dir></dir></dir></target></contents>
20
  <compatible/>
21
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
22
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Ydral_Yupick</name>
4
+ <version>0.6.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL 3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>M&#xF3;dulo para Magento para integrar los puntos de recogida de Yupick!</summary>
10
  <description>M&#xF3;dulo para Magento para integrar los puntos de recogida de Yupick!</description>
11
+ <notes>- Corregidos varios errores de dise&#xF1;o.&#xD;
12
  &#xD;
13
+ - Ahora muestra y selecciona por defecto el punto Yupick! del pedido original al hacer un Reorder.</notes>
 
 
14
  <authors><author><name>Ydral</name><user>Ydral</user><email>webmaster@ydral.com</email></author><author><name>Luis</name><user>Alvarez</user><email>lalvarez@boyaca.es</email></author></authors>
15
+ <date>2013-02-05</date>
16
+ <time>08:44:12</time>
17
+ <contents><target name="magelocal"><dir name="Ydral"><dir name="Yupick"><dir name="Block"><dir name="Checkout"><dir name="Onepage"><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="1034cd37c90415b735712913a7367521"/></dir></dir></dir></dir><file name="Email.php" hash="affa2d386e25e2e517c70bca39988f7b"/><file name="Yupick.php" hash="a44a88ca6668066be57617ef4bc59796"/></dir><dir name="Helper"><file name="Data.php" hash="f91a2150e927d4a07b5280e8eff2575c"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Boyaca"><file name="Collection.php" hash="546fd69029d924657d7ce322dbd588c5"/></dir><file name="Yupick.php" hash="3bbbd6befd30bfdf844011407fa4db1b"/></dir><file name="Observer.php" hash="881fb29024fee91bc6bf3ba800b1eeaf"/><dir name="Type"><file name="Onepage.php" hash="e7ba6c24d95bb588bff8e69a79cf71a0"/></dir><dir name="Ydral"><file name="Recogeroficina.php" hash="3e0f0105d2b129dffd4c7ec0639d1eb0"/><file name="Shipment.php" hash="59e8d255241f2261d65df8e6545b06ba"/><dir name="Source"><file name="Method.php" hash="99a702161e108c27f731626d8d1a32db"/></dir></dir><file name="Yupick.php" hash="d87f52757d55a01e5ed3de0952681234"/></dir><dir name="controllers"><file name="IndexController.php" hash="0c18e19eae0e199a7bf6a4802761ea5b"/></dir><dir name="etc"><file name="config.xml" hash="488b8a4609d04a571fdcc809fbcf1ef8"/><file name="system.xml" hash="52213ea9b1f0ea4f1ee1ac09ecda0965"/></dir><dir name="sql"><dir name="yupick_setup"><file name="mysql4-install-0.1.0.php" hash="ad2f5cd741181e0cd71fbab193a80094"/><file name="mysql4-upgrade-0.1.0-0.2.0.php" hash="a91ac4d35130ff6d11d876c711f810e2"/><file name="mysql4-upgrade-0.2.0-0.3.0.php" hash="a91ac4d35130ff6d11d876c711f810e2"/><file name="mysql4-upgrade-0.3.0-0.4.0.php" hash="a91ac4d35130ff6d11d876c711f810e2"/><file name="mysql4-upgrade-0.4.0-0.5.0.php" hash="a91ac4d35130ff6d11d876c711f810e2"/><file name="mysql4-upgrade-0.5.0-0.6.0.php" hash="a91ac4d35130ff6d11d876c711f810e2"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="yupick.xml" hash="fa7d5d2fb025b2c71d8d98f2f1a0ba48"/></dir><dir name="template"><dir name="yupick"><file name="email.phtml" hash="c7880fe03a742e36e1f6fc1cea5c59a0"/><file name="info.phtml" hash="e0eb4891c623f2042a16ac2b3d0666d2"/><file name="linksmaps.phtml" hash="33ec7673296ffff4418b2a15f676b2a8"/><file name="onestepcheckout_shipping_method.phtml" hash="9c278d3da11cb183191a216ce350ea55"/><file name="shipping.phtml" hash="c2352552050e2e87de66a3522ea347de"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="yupick.xml" hash="f468af9371e3873ba8230fd69261fa97"/></dir><dir name="template"><dir name="yupick"><file name="form.phtml" hash="799cf8f5e3d9515a169eb53cc6e3b94e"/><file name="linksmaps.phtml" hash="b225326c5e2c60642d28cc9c983e4756"/><file name="tab_info.phtml" hash="16421da1294a00af43ddb97b1de6738f"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Ydral_Yupick.xml" hash="f420cc41a8935a25faa4c0df7ef4c1db"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="default"><dir name="default"><dir name="css"><file name="yupick.css" hash="8b41ae7949b8bde7ab6f0b0b31e48d13"/></dir><dir name="images"><dir name="yupick"><file name="globo.png" hash="d8880a99065ebb3ab173df27613abf93"/><file name="globosombra.png" hash="1a50fd383f17fe25cc74da661ddd6b5a"/><file name="logo.gif" hash="21a6ab44b6300a61ac978284c7bb09ad"/><file name="logo_small.gif" hash="1ea5b75df0babbde827d4761c942a746"/><file name="opc-ajax-loader.gif" hash="e805ea7eca1f34c75ba0f93780d32d38"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><file name="yupick.css" hash="8b41ae7949b8bde7ab6f0b0b31e48d13"/><dir name="images"><dir name="yupick"><file name="logo_small.gif" hash="1ea5b75df0babbde827d4761c942a746"/><file name="opc-ajax-loader.gif" hash="e805ea7eca1f34c75ba0f93780d32d38"/></dir></dir></dir></dir></dir></target><target name="mage"><dir name="js"><file name="yupick.js" hash="3cf84a3cb5a9f74d7cbba555f75f452a"/></dir></target><target name="magelocale"><dir name="en_US"><dir name="template"><dir name="email"><dir name="sales"><file name="order_new_yupick.html" hash="0a813bcb2c89e335999d0efa7adac31c"/></dir></dir></dir></dir></target></contents>
18
  <compatible/>
19
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
20
  </package>
skin/frontend/default/default/js/yupick.js DELETED
@@ -1,217 +0,0 @@
1
-
2
- PuntosYupick = Class.create();
3
- PuntosYupick.prototype = {
4
-
5
- initialize: function()
6
- {
7
- this.yupickResultados = '';
8
-
9
- Event.observe(window, 'load', function()
10
- {
11
-
12
- $$('.main').invoke('observe', 'click', function(e)
13
- {
14
- var element = e.element();
15
- //OJO: prueba error
16
- if (element.getValue)
17
- {
18
- if (element.getValue() == 'yupick_yupick')
19
- {
20
- PuntosYupick.getPuntosYupick();
21
- }
22
- }
23
- });
24
- });
25
-
26
- },
27
-
28
- getPuntosYupick:function()
29
- {
30
- if ($('direccion').value == ', , ' && $('codigoPostal').value == '') {
31
- $('direccion').value = '';
32
- var index = $('billing:region_id').selectedIndex;
33
- var provincia = index >= 0 ? $('billing:region_id').options[index].innerHTML : '';
34
- $('direccion').value = $('billing:street1').value + ' ' + $('billing:street2').value
35
- + ', ' + $('billing:city').value + ', '
36
- + provincia;
37
- $('codigoPostal').value = $('billing:postcode').value;
38
- }
39
- if ($('direccion').value == '' && $('codigoPostal').value == '') {
40
- alert('Debe introducir la Calle y/o el Código Postal');
41
- $('direccion').focus();
42
- } else {
43
- this.reloadurl = $('checkUrl').value;
44
- Element.show('loadingmask');
45
- if (!$('option_parking').checked) {
46
- $('option_parking').value = '';
47
- } else {
48
- $('option_parking').value = 'on';
49
- }
50
- if (!$('option_wifi').checked) {
51
- $('option_wifi').value = '';
52
- } else {
53
- $('option_wifi').value = 'on';
54
- }
55
- if (!$('option_alimentacion').checked) {
56
- $('option_alimentacion').value = '';
57
- } else {
58
- $('option_alimentacion').value = 'on';
59
- }
60
- if (!$('option_prensa').checked) {
61
- $('option_prensa').value = '';
62
- } else {
63
- $('option_prensa').value = 'on';
64
- }
65
- if (!$('option_tarjeta').checked) {
66
- $('option_tarjeta').value = '';
67
- } else {
68
- $('option_tarjeta').value = 'on';
69
- }
70
- if (!$('option_mas20').checked) {
71
- $('option_mas20').value = '';
72
- } else {
73
- $('option_mas20').value = 'on';
74
- }
75
- if (!$('option_sabados').checked) {
76
- $('option_sabados').value = '';
77
- } else {
78
- $('option_sabados').value = 'on';
79
- }
80
- if (!$('option_domingos').checked) {
81
- $('option_domingos').value = '';
82
- } else {
83
- $('option_domingos').value = 'on';
84
- }
85
-
86
- new Ajax.Request(this.reloadurl, {
87
- method: 'post',
88
- //OJO Cambios
89
- parameters: {direccion: $('direccion').value,
90
- codigoPostal: $('codigoPostal').value,
91
- option_parking: $('option_parking').value,
92
- option_wifi: $('option_wifi').value,
93
- option_alimentacion: $('option_alimentacion').value,
94
- option_prensa: $('option_prensa').value,
95
- option_tarjeta: $('option_tarjeta').value,
96
- option_mas20: $('option_mas20').value,
97
- option_sabados: $('option_sabados').value,
98
- option_domingos: $('option_domingos').value},
99
- onComplete: this.reloadChildren.bind(this)
100
- });
101
- }
102
-
103
- },
104
-
105
- reloadChildren: function(transport){
106
- Element.hide('loadingmask');
107
- $('oficinas_yupick_content').setStyle({display: 'block'});
108
- var jsonResponse=transport.responseText.evalJSON(true);
109
- this.yupickResultados = jsonResponse;
110
-
111
- this.fillDropDownYupick ($('oficinas_yupick'), this.yupickResultados.puntoentrega);
112
- },
113
-
114
- fillDropDownYupick:function (field, data)
115
- {
116
-
117
- for(i=field.options.length-1;i>=0;i--) { field.remove(i); }
118
-
119
- data.each(
120
- function(e) {
121
- field.options.add(new Option(e.nombre+' - '+e.direccion+" - "+e.localidad+' ('+e.provincia+')',e.id));
122
- }
123
- );
124
-
125
- this.yupickInfo()
126
-
127
- },
128
-
129
- changeYupickOptions:function ()
130
- {
131
- $('yupick_carrier_principal').toggle();
132
- $('yupick_carrier_secundario').toggle();
133
- if ($('yupick_carrier_secundario').visible())
134
- {
135
- $('yupick_options_text').replace('<span id="yupick_options_text">Menos opciones de b&uacute;squeda</span>');
136
- } else {
137
- $('yupick_options_text').replace('<span id="yupick_options_text">M&aacute;s opciones de b&uacute;squeda</span>');
138
- }
139
- },
140
-
141
- yupickInfo:function()
142
- {
143
-
144
- var puntoActual = $('oficinas_yupick').value;
145
- this.yupickResultados.puntoentrega.each(
146
- function(e) {
147
- if (e.id == puntoActual)
148
- {
149
- $('yupick_info_map').setStyle({display: 'block'});
150
- $('yupick_info_time').setStyle({display: 'block'});
151
- $('yupick_info_user').setStyle({display: 'block'});
152
-
153
- $('oficinas_yupick_data').value = e.nombre+' - '+e.direccion+" - "+e.localidad+' ('+e.provincia+')';
154
-
155
- // info del punto
156
- this.infoGoogleMaps(e);
157
- this.infoHorarios(e);
158
-
159
- }
160
- }.bind(this));
161
-
162
- },
163
-
164
- infoGoogleMaps:function(e)
165
- {
166
- var latlng = new google.maps.LatLng(e.poslatitud, e.poslongitud);
167
- var myOptions = {
168
- zoom: 16,
169
- center: latlng,
170
- mapTypeId: google.maps.MapTypeId.ROADMAP
171
- };
172
-
173
- var imagen = new google.maps.MarkerImage($('skinPath').value + 'frontend/default/default/images/yupick/globo.png', new google.maps.Size(100,47), new google.maps.Point(0,0), new google.maps.Point(50,47));
174
- var sombra = new google.maps.MarkerImage($('skinPath').value + 'frontend/default/default/images/yupick/globosombra.png', new google.maps.Size(100,19), new google.maps.Point(0,0), new google.maps.Point(31,19));
175
-
176
- var map = new google.maps.Map(document.getElementById("yupick_info_map"), myOptions);
177
-
178
- var beachMarker = new google.maps.Marker({
179
- position: latlng,
180
- map: map,
181
- icon: imagen,
182
- shadow: sombra
183
- });
184
-
185
- },
186
-
187
-
188
- infoHorarios: function (e)
189
- {
190
-
191
- var tablaHorarios = '<table><tr><th>&nbsp;</th><th>Ma&ntilde;ana</th><th>Tarde</td></tr>';
192
- tablaHorarios += '<tr class="odd"><td>Lunes</td><td>'+e.horario.lunes.manana+'</td><td>'+e.horario.lunes.tarde+'</td></tr>';
193
- tablaHorarios += '<tr class="even"><td>Martes</td><td>'+e.horario.martes.manana+'</td><td>'+e.horario.martes.tarde+'</td></tr>';
194
- tablaHorarios += '<tr class="odd"><td>Mi&eacute;rcoles</td><td>'+e.horario.miercoles.manana+'</td><td>'+e.horario.miercoles.tarde+'</td></tr>';
195
- tablaHorarios += '<tr class="even"><td>Jueves</td><td>'+e.horario.jueves.manana+'</td><td>'+e.horario.jueves.tarde+'</td></tr>';
196
- tablaHorarios += '<tr class="odd"><td>Viernes</td><td>'+e.horario.viernes.manana+'</td><td>'+e.horario.viernes.tarde+'</td></tr>';
197
- tablaHorarios += '<tr class="even"><td>S&aacute;bado</td><td>'+e.horario.sabado.manana+'</td><td>'+e.horario.sabado.tarde+'</td></tr>';
198
- tablaHorarios += '<tr class="odd"><td>Domingo</td><td>'+e.horario.domingo.manana+'</td><td>'+e.horario.domingo.tarde+'</td></tr>';
199
- tablaHorarios += '</table>';
200
-
201
- $('yupick_info_time').update(tablaHorarios);
202
-
203
- }
204
- }
205
-
206
- var PuntosYupick = new PuntosYupick();
207
-
208
- var win = null;
209
-
210
- function nuevaVentana(mypage, myname, w, h, scroll)
211
- {
212
- lpos = (screen.width) ? (screen.width-w)/2 : 0;
213
- tpos = (screen.height) ? (screen.height-h)/2 : 0;
214
- settings = 'height=' + h + ',width=' + w + ',top=' + tpos + ',left=' + lpos + ',scrollbars=' + scroll + ',resizable';
215
- //alert(settings);
216
- win = window.open(mypage,myname,settings);
217
- }