Version Notes
- Corregido error al hacer un Reorder. Se perdían los datos del Punto Seleccionado cuando no se modificaba nada para el nuevo pedido.
Download this release
Release Info
Developer | Ydral |
Extension | Ydral_Yupick |
Version | 0.6.2 |
Comparing to | |
See all releases |
Code changes from version 0.6.1 to 0.6.2
app/code/local/Ydral/Yupick/Helper/Data.php
CHANGED
@@ -55,14 +55,26 @@ class Ydral_Yupick_Helper_Data extends Mage_Core_Helper_Abstract
|
|
55 |
$idQuote = $order->getQuoteId();
|
56 |
$idOrder = $order->getIncrementId();
|
57 |
|
58 |
-
|
59 |
$idSelector = trim(strip_tags($this->_getRequest()->getPost('oficinas_yupick')));
|
60 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
61 |
|
62 |
$_tipoAviso = $this->_getRequest()->getPost('yupick_type_alert');
|
63 |
$_tipoAvisoSms = $this->_getRequest()->getPost('yupick_type_alert_phone');
|
64 |
$_tipoAvisoEmail = $this->_getRequest()->getPost('yupick_type_alert_email');
|
65 |
-
|
66 |
if (!empty($idSelector))
|
67 |
{
|
68 |
Mage::getModel('yupick/ydral_recogeroficina')->saveCheckoutData('quote', $idQuote, $idSelector, $nombrePunto, $_tipoAviso, $_tipoAvisoSms, $_tipoAvisoEmail);
|
55 |
$idQuote = $order->getQuoteId();
|
56 |
$idOrder = $order->getIncrementId();
|
57 |
|
|
|
58 |
$idSelector = trim(strip_tags($this->_getRequest()->getPost('oficinas_yupick')));
|
59 |
+
|
60 |
+
Mage::log("punto id 1: " . $idSelector);
|
61 |
+
if (empty($idSelector)) {
|
62 |
+
$idSelector = Mage::getSingleton('core/session', array('name' => 'adminhtml'))->getYupickId();
|
63 |
+
Mage::log("punto id 2: " . $idSelector);
|
64 |
+
}
|
65 |
+
|
66 |
+
$nombrePunto = $this->_getRequest()->getPost('oficinas_yupick_data');
|
67 |
+
|
68 |
+
Mage::log("punto nombre 1: " . $nombrePunto);
|
69 |
+
if (empty($nombrePunto)) {
|
70 |
+
$nombrePunto = Mage::getSingleton('core/session', array('name' => 'adminhtml'))->getYupickInfo();
|
71 |
+
Mage::log("punto nombre 2: " . $nombrePunto);
|
72 |
+
}
|
73 |
|
74 |
$_tipoAviso = $this->_getRequest()->getPost('yupick_type_alert');
|
75 |
$_tipoAvisoSms = $this->_getRequest()->getPost('yupick_type_alert_phone');
|
76 |
$_tipoAvisoEmail = $this->_getRequest()->getPost('yupick_type_alert_email');
|
77 |
+
|
78 |
if (!empty($idSelector))
|
79 |
{
|
80 |
Mage::getModel('yupick/ydral_recogeroficina')->saveCheckoutData('quote', $idQuote, $idSelector, $nombrePunto, $_tipoAviso, $_tipoAvisoSms, $_tipoAvisoEmail);
|
app/code/local/Ydral/Yupick/etc/config.xml
CHANGED
@@ -3,7 +3,7 @@
|
|
3 |
<config>
|
4 |
<modules>
|
5 |
<Ydral_Yupick>
|
6 |
-
<version>0.6.
|
7 |
</Ydral_Yupick>
|
8 |
</modules>
|
9 |
<global>
|
3 |
<config>
|
4 |
<modules>
|
5 |
<Ydral_Yupick>
|
6 |
+
<version>0.6.2</version>
|
7 |
</Ydral_Yupick>
|
8 |
</modules>
|
9 |
<global>
|
app/design/adminhtml/default/default/template/yupick/tab_info.phtml
CHANGED
@@ -77,6 +77,8 @@ Mage::getSingleton('core/session')->setYupickId('');
|
|
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 |
}
|
77 |
if ($_dataRecogida)
|
78 |
{
|
79 |
echo '<br />'.$_dataRecogida['info_oficina'];
|
80 |
+
Mage::log("tabinfo :" . $_dataRecogida['info_oficina']);
|
81 |
+
Mage::log("taboficina :" . $_dataRecogida['oficina_recogida']);
|
82 |
Mage::getSingleton('core/session')->setYupickInfo($_dataRecogida['info_oficina']);
|
83 |
Mage::getSingleton('core/session')->setYupickId($_dataRecogida['oficina_recogida']);
|
84 |
}
|
package.xml
CHANGED
@@ -1,20 +1,18 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Ydral_Yupick</name>
|
4 |
-
<version>0.6.
|
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ódulo para Magento para integrar los puntos de recogida de Yupick!</summary>
|
10 |
<description>Módulo para Magento para integrar los puntos de recogida de Yupick!</description>
|
11 |
-
<notes>-
|
12 |
-

|
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-
|
16 |
-
<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="
|
18 |
<compatible/>
|
19 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
20 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Ydral_Yupick</name>
|
4 |
+
<version>0.6.2</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ódulo para Magento para integrar los puntos de recogida de Yupick!</summary>
|
10 |
<description>Módulo para Magento para integrar los puntos de recogida de Yupick!</description>
|
11 |
+
<notes>- Corregido error al hacer un Reorder. Se perdían los datos del Punto Seleccionado cuando no se modificaba nada para el nuevo pedido.</notes>
|
|
|
|
|
12 |
<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>
|
13 |
+
<date>2013-04-18</date>
|
14 |
+
<time>13:39:13</time>
|
15 |
+
<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="37ea9b71166cdd4d0d3f491948b03b4d"/></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="4c14f2a211ab74e20c672b6bb9450001"/><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="005eb441e20304b72f6669d242f5a74f"/></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>
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
18 |
</package>
|