Andreani - Version 0.1.10

Version Notes

Release Version 0.1.10

Fix:
- Cotizador ampliado hasta 50kg.

- Send tracking information no vuelve a llamar a ConfirmarCompra si la orden ya tiene un número de envío.

- Orden de Andreani -> Estado de pedidos es por ID Orden descendente.

- Versión PHP hasta 5.5.15.

- El contrato pasó a ser varchar(255).

- Se pasaron los archivos de "local" a "community"

Download this release

Release Info

Developer Gaspar Mac
Extension Andreani
Version 0.1.10
Comparing to
See all releases


Code changes from version 0.1.9 to 0.1.10

Files changed (38) hide show
  1. app/code/{local → community}/Ecloud/Andreani/Block/Adminhtml/Config/Edit.php +1 -1
  2. app/code/{local → community}/Ecloud/Andreani/Block/Adminhtml/Config/Form/Field/Medida.php +2 -2
  3. app/code/{local → community}/Ecloud/Andreani/Block/Adminhtml/Pedidos.php +1 -1
  4. app/code/{local → community}/Ecloud/Andreani/Block/Adminhtml/Pedidos/Edit.php +1 -1
  5. app/code/{local → community}/Ecloud/Andreani/Block/Adminhtml/Pedidos/Edit/Form.php +1 -1
  6. app/code/{local → community}/Ecloud/Andreani/Block/Adminhtml/Pedidos/Edit/Renderer/Button.php +1 -1
  7. app/code/{local → community}/Ecloud/Andreani/Block/Adminhtml/Pedidos/Grid.php +2 -2
  8. app/code/{local → community}/Ecloud/Andreani/Block/Andreani.php +1 -1
  9. app/code/{local → community}/Ecloud/Andreani/Helper/Data.php +1 -1
  10. app/code/{local → community}/Ecloud/Andreani/Model/Andreani.php +1 -1
  11. app/code/{local → community}/Ecloud/Andreani/Model/Carrier/Andreani.php +8 -8
  12. app/code/{local → community}/Ecloud/Andreani/Model/Carrier/Andreaniestandar.php +1 -1
  13. app/code/{local → community}/Ecloud/Andreani/Model/Carrier/Andreanisucursal.php +1 -1
  14. app/code/{local → community}/Ecloud/Andreani/Model/Carrier/Andreaniurgente.php +1 -1
  15. app/code/{local → community}/Ecloud/Andreani/Model/Config/Medida.php +1 -1
  16. app/code/{local → community}/Ecloud/Andreani/Model/Config/TestMode.php +1 -1
  17. app/code/{local → community}/Ecloud/Andreani/Model/Observer.php +10 -3
  18. app/code/{local → community}/Ecloud/Andreani/Model/Order.php +1 -1
  19. app/code/{local → community}/Ecloud/Andreani/Model/Resource/Order.php +1 -1
  20. app/code/{local → community}/Ecloud/Andreani/Model/Resource/Order/Collection.php +1 -1
  21. app/code/{local → community}/Ecloud/Andreani/controllers/Adminhtml/Pedidos/PedidosController.php +1 -1
  22. app/code/{local → community}/Ecloud/Andreani/controllers/Adminhtml/PedidosController.php +1 -1
  23. app/code/{local → community}/Ecloud/Andreani/etc/adminhtml.xml +0 -0
  24. app/code/{local → community}/Ecloud/Andreani/etc/config.xml +1 -1
  25. app/code/{local → community}/Ecloud/Andreani/etc/system.xml +0 -0
  26. app/code/{local → community}/Ecloud/Andreani/sql/andreani_setup/mysql4-install-0.1.0.php +0 -0
  27. app/code/{local → community}/Ecloud/Andreani/sql/andreani_setup/mysql4-install-0.1.1.php +0 -0
  28. app/code/{local → community}/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.1-0.1.2.php +0 -0
  29. app/code/{local → community}/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.2-0.1.3.php +0 -0
  30. app/code/{local → community}/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.3-0.1.4.php +0 -0
  31. app/code/{local → community}/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.4-0.1.5.php +0 -0
  32. app/code/{local → community}/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.5-0.1.6.php +0 -0
  33. app/code/{local → community}/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.6-0.1.7.php +0 -0
  34. app/code/community/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.9-0.1.10.php +15 -0
  35. app/code/local/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.7-0.1.8.php +0 -7
  36. app/code/local/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.8-0.1.9.php +0 -7
  37. app/etc/modules/Ecloud_Andreani.xml +2 -2
  38. package.xml +16 -9
app/code/{local → community}/Ecloud/Andreani/Block/Adminhtml/Config/Edit.php RENAMED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 0.1.8 04.07.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
1
  <?php
2
  /**
3
+ * @version 0.1.10 04.08.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
app/code/{local → community}/Ecloud/Andreani/Block/Adminhtml/Config/Form/Field/Medida.php RENAMED
@@ -1,13 +1,13 @@
1
  <?php
2
  /**
3
- * @version 0.1.8 04.07.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?>
8
  <?php
9
  /**
10
- * @version 0.1.8 04.07.2014
11
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
12
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
13
  */
1
  <?php
2
  /**
3
+ * @version 0.1.10 04.08.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?>
8
  <?php
9
  /**
10
+ * @version 0.1.10 04.08.2014
11
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
12
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
13
  */
app/code/{local → community}/Ecloud/Andreani/Block/Adminhtml/Pedidos.php RENAMED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 0.1.8 04.07.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
1
  <?php
2
  /**
3
+ * @version 0.1.10 04.08.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
app/code/{local → community}/Ecloud/Andreani/Block/Adminhtml/Pedidos/Edit.php RENAMED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 0.1.8 04.07.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
1
  <?php
2
  /**
3
+ * @version 0.1.10 04.08.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
app/code/{local → community}/Ecloud/Andreani/Block/Adminhtml/Pedidos/Edit/Form.php RENAMED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 0.1.8 04.07.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
1
  <?php
2
  /**
3
+ * @version 0.1.10 04.08.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
app/code/{local → community}/Ecloud/Andreani/Block/Adminhtml/Pedidos/Edit/Renderer/Button.php RENAMED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 0.1.8 04.07.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
1
  <?php
2
  /**
3
+ * @version 0.1.10 04.08.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
app/code/{local → community}/Ecloud/Andreani/Block/Adminhtml/Pedidos/Grid.php RENAMED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 0.1.8 04.07.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
@@ -13,7 +13,7 @@ class Ecloud_Andreani_Block_Adminhtml_Pedidos_Grid extends Mage_Adminhtml_Block_
13
  {
14
  parent::__construct();
15
  $this->setId('andreani_order');
16
- $this->setDefaultSort('id');
17
  $this->setDefaultDir('DESC');
18
  $this->setSaveParametersInSession(true);
19
  $this->setUseAjax(true);
1
  <?php
2
  /**
3
+ * @version 0.1.10 04.08.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
13
  {
14
  parent::__construct();
15
  $this->setId('andreani_order');
16
+ $this->setDefaultSort('id_orden');
17
  $this->setDefaultDir('DESC');
18
  $this->setSaveParametersInSession(true);
19
  $this->setUseAjax(true);
app/code/{local → community}/Ecloud/Andreani/Block/Andreani.php RENAMED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 0.1.8 04.07.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
1
  <?php
2
  /**
3
+ * @version 0.1.10 04.08.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
app/code/{local → community}/Ecloud/Andreani/Helper/Data.php RENAMED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 0.1.8 04.07.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
1
  <?php
2
  /**
3
+ * @version 0.1.10 04.08.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
app/code/{local → community}/Ecloud/Andreani/Model/Andreani.php RENAMED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 0.1.8 04.07.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
1
  <?php
2
  /**
3
+ * @version 0.1.10 04.08.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
app/code/{local → community}/Ecloud/Andreani/Model/Carrier/Andreani.php RENAMED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 0.1.8 04.07.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
@@ -97,11 +97,11 @@
97
  $result = Mage::getModel('shipping/rate_result');
98
  $method = Mage::getModel('shipping/rate_result_method');
99
 
100
- $error_msg = Mage::helper('andreani')->__("Su pedido supera el peso máximo de 35 kg permitido por Andreani. Por favor divida su orden en más pedidos o consulte al administrador de la tienda. Gracias y disculpe las molestias.");
101
 
102
  if ($this->_code == "andreaniestandar" & Mage::getStoreConfig('carriers/andreaniestandar/active',Mage::app()->getStore()) == 1) {
103
- // En CASAWS -> 35 kg
104
- if($datos["volumen"] >= 35000){
105
  $error = Mage::getModel('shipping/rate_result_error');
106
  $error->setCarrier($this->_code);
107
  $error->setCarrierTitle($this->getConfigData('title'));
@@ -112,8 +112,8 @@
112
  }
113
  }
114
  if ($this->_code == "andreaniurgente" & Mage::getStoreConfig('carriers/andreaniurgente/active',Mage::app()->getStore()) == 1) {
115
- // En CASAWS -> 35 kg
116
- if($datos["volumen"] >= 35000){
117
  $error = Mage::getModel('shipping/rate_result_error');
118
  $error->setCarrier($this->_code);
119
  $error->setCarrierTitle($this->getConfigData('title'));
@@ -124,8 +124,8 @@
124
  }
125
  }
126
  if ($this->_code == "andreanisucursal" & Mage::getStoreConfig('carriers/andreanisucursal/active',Mage::app()->getStore()) == 1) {
127
- // En CASAWS -> 35 kg
128
- if($datos["volumen"] >= 35000){
129
  $error = Mage::getModel('shipping/rate_result_error');
130
  $error->setCarrier($this->_code);
131
  $error->setCarrierTitle($this->getConfigData('title'));
1
  <?php
2
  /**
3
+ * @version 0.1.10 04.08.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
97
  $result = Mage::getModel('shipping/rate_result');
98
  $method = Mage::getModel('shipping/rate_result_method');
99
 
100
+ $error_msg = Mage::helper('andreani')->__("Su pedido supera el peso máximo de 50 kg permitido por Andreani. Por favor divida su orden en más pedidos o consulte al administrador de la tienda. Gracias y disculpe las molestias.");
101
 
102
  if ($this->_code == "andreaniestandar" & Mage::getStoreConfig('carriers/andreaniestandar/active',Mage::app()->getStore()) == 1) {
103
+ // En CASAWS -> 50 kg
104
+ if($datos["volumen"] >= 50000){
105
  $error = Mage::getModel('shipping/rate_result_error');
106
  $error->setCarrier($this->_code);
107
  $error->setCarrierTitle($this->getConfigData('title'));
112
  }
113
  }
114
  if ($this->_code == "andreaniurgente" & Mage::getStoreConfig('carriers/andreaniurgente/active',Mage::app()->getStore()) == 1) {
115
+ // En CASAWS -> 50 kg
116
+ if($datos["volumen"] >= 50000){
117
  $error = Mage::getModel('shipping/rate_result_error');
118
  $error->setCarrier($this->_code);
119
  $error->setCarrierTitle($this->getConfigData('title'));
124
  }
125
  }
126
  if ($this->_code == "andreanisucursal" & Mage::getStoreConfig('carriers/andreanisucursal/active',Mage::app()->getStore()) == 1) {
127
+ // En CASAWS -> 50 kg
128
+ if($datos["volumen"] >= 50000){
129
  $error = Mage::getModel('shipping/rate_result_error');
130
  $error->setCarrier($this->_code);
131
  $error->setCarrierTitle($this->getConfigData('title'));
app/code/{local → community}/Ecloud/Andreani/Model/Carrier/Andreaniestandar.php RENAMED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 0.1.8 04.07.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
1
  <?php
2
  /**
3
+ * @version 0.1.10 04.08.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
app/code/{local → community}/Ecloud/Andreani/Model/Carrier/Andreanisucursal.php RENAMED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 0.1.8 04.07.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
1
  <?php
2
  /**
3
+ * @version 0.1.10 04.08.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
app/code/{local → community}/Ecloud/Andreani/Model/Carrier/Andreaniurgente.php RENAMED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 0.1.8 04.07.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
1
  <?php
2
  /**
3
+ * @version 0.1.10 04.08.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
app/code/{local → community}/Ecloud/Andreani/Model/Config/Medida.php RENAMED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 0.1.8 04.07.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
1
  <?php
2
  /**
3
+ * @version 0.1.10 04.08.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
app/code/{local → community}/Ecloud/Andreani/Model/Config/TestMode.php RENAMED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 0.1.8 04.07.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
1
  <?php
2
  /**
3
+ * @version 0.1.10 04.08.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
app/code/{local → community}/Ecloud/Andreani/Model/Observer.php RENAMED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 0.1.8 04.07.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
@@ -20,6 +20,8 @@ class Ecloud_Andreani_Model_Observer extends Mage_Core_Model_Session_Abstract {
20
  try {
21
  // 1. Tomamos todos los datos de la orden
22
  $datos = Mage::getSingleton('core/session')->getAndreani();
 
 
23
  // 2. Buscamos el ID de la orden
24
  $OrderId = $observer->getEvent()->getOrder()->getId();
25
  // 3. Los almacenamos en la tabla "andreani_order"
@@ -49,6 +51,7 @@ class Ecloud_Andreani_Model_Observer extends Mage_Core_Model_Session_Abstract {
49
  'estado' => 'Pendiente'
50
  ));
51
  $model = Mage::getModel('andreani/order')->addData($_dataSave);
 
52
  $model->save();
53
 
54
  } catch (Exception $e) {
@@ -66,7 +69,6 @@ class Ecloud_Andreani_Model_Observer extends Mage_Core_Model_Session_Abstract {
66
  $order = $shipment->getOrder();
67
  $OrderId = $order->getId();
68
 
69
-
70
  // Traemos los datos de la tabla "andreani_order" según el OrderId[0] y asignarla a $datos
71
  $collection = Mage::getModel('andreani/order')->getCollection()
72
  ->addFieldToFilter('id_orden', $OrderId);
@@ -87,7 +89,6 @@ class Ecloud_Andreani_Model_Observer extends Mage_Core_Model_Session_Abstract {
87
  $datos["urlConfirmar"] = "https://www.e-andreani.com/CASAWS/eCommerce/ImposicionRemota.svc?wsdl";
88
  }
89
 
90
-
91
  $datos["username"] = Mage::getStoreConfig('carriers/andreaniconfig/usuario',Mage::app()->getStore());
92
  $datos["password"] = Mage::getStoreConfig('carriers/andreaniconfig/password',Mage::app()->getStore());
93
 
@@ -96,6 +97,12 @@ class Ecloud_Andreani_Model_Observer extends Mage_Core_Model_Session_Abstract {
96
  Mage::log("Andreani :: no existe nombre de usuario o contraseña para eAndreani");
97
  return;
98
  }
 
 
 
 
 
 
99
  // 2. Conectarse a eAndreani
100
  try {
101
  $options = array(
1
  <?php
2
  /**
3
+ * @version 0.1.10 04.08.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
20
  try {
21
  // 1. Tomamos todos los datos de la orden
22
  $datos = Mage::getSingleton('core/session')->getAndreani();
23
+
24
+ Mage::log("Datos observer" . print_r($datos,true));
25
  // 2. Buscamos el ID de la orden
26
  $OrderId = $observer->getEvent()->getOrder()->getId();
27
  // 3. Los almacenamos en la tabla "andreani_order"
51
  'estado' => 'Pendiente'
52
  ));
53
  $model = Mage::getModel('andreani/order')->addData($_dataSave);
54
+ Mage::log("Datos a guardar" . print_r($_dataSave,true));
55
  $model->save();
56
 
57
  } catch (Exception $e) {
69
  $order = $shipment->getOrder();
70
  $OrderId = $order->getId();
71
 
 
72
  // Traemos los datos de la tabla "andreani_order" según el OrderId[0] y asignarla a $datos
73
  $collection = Mage::getModel('andreani/order')->getCollection()
74
  ->addFieldToFilter('id_orden', $OrderId);
89
  $datos["urlConfirmar"] = "https://www.e-andreani.com/CASAWS/eCommerce/ImposicionRemota.svc?wsdl";
90
  }
91
 
 
92
  $datos["username"] = Mage::getStoreConfig('carriers/andreaniconfig/usuario',Mage::app()->getStore());
93
  $datos["password"] = Mage::getStoreConfig('carriers/andreaniconfig/password',Mage::app()->getStore());
94
 
97
  Mage::log("Andreani :: no existe nombre de usuario o contraseña para eAndreani");
98
  return;
99
  }
100
+
101
+ // Si el envio ya tiene un codigo de tracking no hacemos nada
102
+ if ($datos["cod_tracking"] != ""){
103
+ return;
104
+ }
105
+
106
  // 2. Conectarse a eAndreani
107
  try {
108
  $options = array(
app/code/{local → community}/Ecloud/Andreani/Model/Order.php RENAMED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 0.1.8 04.07.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
1
  <?php
2
  /**
3
+ * @version 0.1.10 04.08.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
app/code/{local → community}/Ecloud/Andreani/Model/Resource/Order.php RENAMED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 0.1.8 04.07.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
1
  <?php
2
  /**
3
+ * @version 0.1.10 04.08.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
app/code/{local → community}/Ecloud/Andreani/Model/Resource/Order/Collection.php RENAMED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 0.1.8 04.07.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
1
  <?php
2
  /**
3
+ * @version 0.1.10 04.08.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
app/code/{local → community}/Ecloud/Andreani/controllers/Adminhtml/Pedidos/PedidosController.php RENAMED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 0.1.8 04.07.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
1
  <?php
2
  /**
3
+ * @version 0.1.10 04.08.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
app/code/{local → community}/Ecloud/Andreani/controllers/Adminhtml/PedidosController.php RENAMED
@@ -1,6 +1,6 @@
1
  <?php
2
  /**
3
- * @version 0.1.8 04.07.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
1
  <?php
2
  /**
3
+ * @version 0.1.10 04.08.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
  * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
app/code/{local → community}/Ecloud/Andreani/etc/adminhtml.xml RENAMED
File without changes
app/code/{local → community}/Ecloud/Andreani/etc/config.xml RENAMED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Ecloud_Andreani>
5
- <version>0.1.9</version>
6
  </Ecloud_Andreani>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <Ecloud_Andreani>
5
+ <version>0.1.10</version>
6
  </Ecloud_Andreani>
7
  </modules>
8
  <global>
app/code/{local → community}/Ecloud/Andreani/etc/system.xml RENAMED
File without changes
app/code/{local → community}/Ecloud/Andreani/sql/andreani_setup/mysql4-install-0.1.0.php RENAMED
File without changes
app/code/{local → community}/Ecloud/Andreani/sql/andreani_setup/mysql4-install-0.1.1.php RENAMED
File without changes
app/code/{local → community}/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.1-0.1.2.php RENAMED
File without changes
app/code/{local → community}/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.2-0.1.3.php RENAMED
File without changes
app/code/{local → community}/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.3-0.1.4.php RENAMED
File without changes
app/code/{local → community}/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.4-0.1.5.php RENAMED
File without changes
app/code/{local → community}/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.5-0.1.6.php RENAMED
File without changes
app/code/{local → community}/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.6-0.1.7.php RENAMED
File without changes
app/code/community/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.9-0.1.10.php ADDED
@@ -0,0 +1,15 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ $setup = $this;
4
+
5
+ $setup->startSetup();
6
+
7
+ try{
8
+ $setup->run("
9
+ ALTER TABLE {$this->getTable('andreani_order')} CHANGE `contrato` `contrato` VARCHAR( 255 ) NOT NULL;
10
+ ");
11
+ } catch (Exception $e) {
12
+ Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
13
+ }
14
+
15
+ $setup->endSetup();
app/code/local/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.7-0.1.8.php DELETED
@@ -1,7 +0,0 @@
1
- <?php
2
-
3
- $setup = $this;
4
-
5
- $setup->startSetup();
6
-
7
- $setup->endSetup();
 
 
 
 
 
 
 
app/code/local/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.8-0.1.9.php DELETED
@@ -1,7 +0,0 @@
1
- <?php
2
-
3
- $setup = $this;
4
-
5
- $setup->startSetup();
6
-
7
- $setup->endSetup();
 
 
 
 
 
 
 
app/etc/modules/Ecloud_Andreani.xml CHANGED
@@ -3,11 +3,11 @@
3
  <modules>
4
  <Ecloud_Andreani>
5
  <active>true</active>
6
- <codePool>local</codePool>
7
  <depends>
8
  <Mage_Shipping />
9
  </depends>
10
- <version>0.1.2</version>
11
  </Ecloud_Andreani>
12
  </modules>
13
  </config>
3
  <modules>
4
  <Ecloud_Andreani>
5
  <active>true</active>
6
+ <codePool>community</codePool>
7
  <depends>
8
  <Mage_Shipping />
9
  </depends>
10
+ <version>0.1.10</version>
11
  </Ecloud_Andreani>
12
  </modules>
13
  </config>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Andreani</name>
4
- <version>0.1.9</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/gpl-license.php">GNU General Public License (GPL)</license>
7
  <channel>community</channel>
@@ -24,17 +24,24 @@ For Customers:&#xD;
24
  Location and distance y distance to the nearest branch for "Shipments to branch".&#xD;
25
  Express delivery service.&#xD;
26
  Tracking of shipments.</description>
27
- <notes>Release Version 0.1.9&#xD;
28
  &#xD;
29
  Fix:&#xD;
30
- - Arreglo en la paginacion de "estado de pedidos".&#xD;
31
  &#xD;
32
- - Cambio en la ubicaci&#xF2;n del men&#xF9; a:&#xD;
33
- Ventas-&gt;Andreani</notes>
 
 
 
 
 
 
 
34
  <authors><author><name>Gaspar Mac</name><user>ecloudsolutions</user><email>gaspar@ecloudsolutions.com</email></author><author><name>Nicolas Demayo</name><user>nikete</user><email>nicolas.demayo@ecloudsolutions.com</email></author><author><name>Franco Sabolo</name><user>kako_ecloud</user><email>franco.sabolo@ecloudsolutions.com</email></author><author><name>Mariano Botti</name><user>mbotti89</user><email>mariano.botti@ecloudsolutions.com</email></author></authors>
35
- <date>2014-07-23</date>
36
- <time>16:15:10</time>
37
- <contents><target name="magelocal"><dir name="Ecloud"><dir name="Andreani"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><file name="Edit.php" hash="641bba2f29b24b971cf849e132799187"/><dir name="Form"><dir name="Field"><file name="Medida.php" hash="a42816e6aa4e0d8888d292ee35baf5bd"/></dir></dir></dir><dir name="Pedidos"><dir name="Edit"><file name="Form.php" hash="b8e6ec2ef089eb71d1ec262ef832531c"/><dir name="Renderer"><file name="Button.php" hash="be724d8798843b97dfb5a2d9f107abde"/></dir></dir><file name="Edit.php" hash="15055cc1f30b9e173c9ff6f5867e7785"/><file name="Grid.php" hash="4ed8da91e1f38f86d232c8f0b95f19c3"/></dir><file name="Pedidos.php" hash="c92fc91f2e1658b0db2d593fe4eb88b7"/></dir><file name="Andreani.php" hash="c25934ba95ab9d308e7dc71314bcec33"/></dir><dir name="Helper"><file name="Data.php" hash="44776b6d6ede13161ed89cb2c57a75bb"/></dir><dir name="Model"><file name="Andreani.php" hash="1c21ed28b766361188e2e88ea9a40827"/><dir name="Carrier"><file name="Andreani.php" hash="c121c40f4b5e34e998be4898cf5a1af9"/><file name="Andreaniestandar.php" hash="4b437809ac6ab904c5ccd04258536c5b"/><file name="Andreanisucursal.php" hash="dde8b46c16d7df1f87c3b0482d9ba578"/><file name="Andreaniurgente.php" hash="563e3cdc813bc4a5b430433c4b40b03f"/></dir><dir name="Config"><file name="Medida.php" hash="f1f08e98acdf9e31c8c269bb673bfdd4"/><file name="TestMode.php" hash="3f68f671445173f0cbbb5b69a360ff9f"/></dir><file name="Observer.php" hash="4f0a71a6dd3ece1e0ba9147543996f6c"/><file name="Order.php" hash="69c1469c3de5522810e4dfa6f42164c9"/><dir name="Resource"><dir name="Order"><file name="Collection.php" hash="59fbc843342805a3b8f0ea0f6b8b6504"/></dir><file name="Order.php" hash="4a7d26f63f80bb939873f6032bae1a2a"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Pedidos"><file name="PedidosController.php" hash="462649aad4dc7d05b9f880bfb1c1bdc6"/></dir><file name="PedidosController.php" hash="725ea09dc3c48d2e66276785234580f4"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="572688a74a8eb634953c6bf59d2635f2"/><file name="config.xml" hash="9a90e92f8df23abd4b49ce0f23f44afe"/><file name="system.xml" hash="ec1bf9a3739d671995cea0afb9289725"/></dir><dir name="sql"><dir name="andreani_setup"><file name="mysql4-install-0.1.0.php" hash="23b5ff1bb77faa3394279983279ef508"/><file name="mysql4-install-0.1.1.php" hash="af9c6884b1ef1e106f598e84d5ac97d5"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="19bbe941b87c48a7c976099f26b6df87"/><file name="mysql4-upgrade-0.1.2-0.1.3.php" hash="31485210af28297146e193090d0ae586"/><file name="mysql4-upgrade-0.1.3-0.1.4.php" hash="19bbe941b87c48a7c976099f26b6df87"/><file name="mysql4-upgrade-0.1.4-0.1.5.php" hash="19bbe941b87c48a7c976099f26b6df87"/><file name="mysql4-upgrade-0.1.5-0.1.6.php" hash="2e5071273633e63d487fa573dc2a33d9"/><file name="mysql4-upgrade-0.1.6-0.1.7.php" hash="2e5071273633e63d487fa573dc2a33d9"/><file name="mysql4-upgrade-0.1.7-0.1.8.php" hash="2e5071273633e63d487fa573dc2a33d9"/><file name="mysql4-upgrade-0.1.8-0.1.9.php" hash="2e5071273633e63d487fa573dc2a33d9"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Ecloud_Andreani.xml" hash="fb71162c7850ff07ee057cc012a609ad"/></dir></target><target name="magelib"><dir name="Andreani"><file name="wsseAuth.php" hash="7f7c0dcac241e7422a6bc657638fc5df"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="template"><dir name="checkout"><dir name="onepage"><file name="shipping.phtml" hash="dd07d8ad6a22cd9e2553109498057439"/></dir></dir><dir name="customer"><dir name="address"><file name="edit.phtml" hash="c6a693c55bec274da69b12839a5f4ef1"/></dir></dir><dir name="persistent"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="c4c0a62c21e9e1a6d2b1b872d0f8bdfc"/></dir></dir></dir><dir name="shipping"><dir name="tracking"><file name="popup.phtml" hash="cab9a1b01c732d7553be9b47e1e1b542"/></dir></dir></dir></dir></dir></dir></target></contents>
38
  <compatible/>
39
- <dependencies><required><php><min>5.2.0</min><max>5.4.25</max></php><extension><name>Core</name><min></min><max></max></extension><extension><name>soap</name><min></min><max></max></extension></required></dependencies>
40
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Andreani</name>
4
+ <version>0.1.10</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/gpl-license.php">GNU General Public License (GPL)</license>
7
  <channel>community</channel>
24
  Location and distance y distance to the nearest branch for "Shipments to branch".&#xD;
25
  Express delivery service.&#xD;
26
  Tracking of shipments.</description>
27
+ <notes>Release Version 0.1.10&#xD;
28
  &#xD;
29
  Fix:&#xD;
30
+ - Cotizador ampliado hasta 50kg.&#xD;
31
  &#xD;
32
+ - Send tracking information no vuelve a llamar a ConfirmarCompra si la orden ya tiene un n&#xFA;mero de env&#xED;o.&#xD;
33
+ &#xD;
34
+ - Orden de Andreani -&gt; Estado de pedidos es por ID Orden descendente.&#xD;
35
+ &#xD;
36
+ - Versi&#xF3;n PHP hasta 5.5.15.&#xD;
37
+ &#xD;
38
+ - El contrato pas&#xF3; a ser varchar(255).&#xD;
39
+ &#xD;
40
+ - Se pasaron los archivos de "local" a "community" </notes>
41
  <authors><author><name>Gaspar Mac</name><user>ecloudsolutions</user><email>gaspar@ecloudsolutions.com</email></author><author><name>Nicolas Demayo</name><user>nikete</user><email>nicolas.demayo@ecloudsolutions.com</email></author><author><name>Franco Sabolo</name><user>kako_ecloud</user><email>franco.sabolo@ecloudsolutions.com</email></author><author><name>Mariano Botti</name><user>mbotti89</user><email>mariano.botti@ecloudsolutions.com</email></author></authors>
42
+ <date>2014-08-04</date>
43
+ <time>19:57:35</time>
44
+ <contents><target name="magecommunity"><dir name="Ecloud"><dir name="Andreani"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><file name="Edit.php" hash="dff7e47f8890a0472a70557324c0b6b5"/><dir name="Form"><dir name="Field"><file name="Medida.php" hash="14891f54e3227d7346d9366390dee353"/></dir></dir></dir><dir name="Pedidos"><dir name="Edit"><file name="Form.php" hash="6d340eb5f24f9b5f3736917dbf3a77ec"/><dir name="Renderer"><file name="Button.php" hash="8080c62dd85520205aaf3a551a80647e"/></dir></dir><file name="Edit.php" hash="30212eb7939a12d937152e08f980ab64"/><file name="Grid.php" hash="3b2a519b42de33cfe673e508a759166e"/></dir><file name="Pedidos.php" hash="c5f9058d4b288696e721be500b25612d"/></dir><file name="Andreani.php" hash="8ba6082dfc04617177495bfea4bed381"/></dir><dir name="Helper"><file name="Data.php" hash="36f44a54652157203b49a91c45fa4560"/></dir><dir name="Model"><file name="Andreani.php" hash="a6037a578d62fa6ff0cd8630c11e676b"/><dir name="Carrier"><file name="Andreani.php" hash="e46e516b4242092b90803e3eef58f9fa"/><file name="Andreaniestandar.php" hash="bf4eaab3a133a01218043e2a6344859f"/><file name="Andreanisucursal.php" hash="751ffe7905199495a6a186fc3c39751c"/><file name="Andreaniurgente.php" hash="46a113d743e87a63bddb67dc6714d705"/></dir><dir name="Config"><file name="Medida.php" hash="8e09d61b3b6a6469a9e67a900c1f43c7"/><file name="TestMode.php" hash="aa0ed7043c6361f064240aeefa27d8ec"/></dir><file name="Observer.php" hash="e94e8099da3cd20a1ba5f355f47c9676"/><file name="Order.php" hash="462a8fee2bf5a25465bcd1f0a6a48f35"/><dir name="Resource"><dir name="Order"><file name="Collection.php" hash="b7fcefacf48e7934c1ccdf085f100cf4"/></dir><file name="Order.php" hash="630b4416bfa3590c5e9704b3fe38c307"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Pedidos"><file name="PedidosController.php" hash="6ad5521b707b5cf2af75dea017e759fd"/></dir><file name="PedidosController.php" hash="73fa3b7e309ffaaefb28a0b2087c12e0"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="572688a74a8eb634953c6bf59d2635f2"/><file name="config.xml" hash="6c028ee48dbd118e172cb7a8dc90fdd8"/><file name="system.xml" hash="ec1bf9a3739d671995cea0afb9289725"/></dir><dir name="sql"><dir name="andreani_setup"><file name="mysql4-install-0.1.0.php" hash="23b5ff1bb77faa3394279983279ef508"/><file name="mysql4-install-0.1.1.php" hash="af9c6884b1ef1e106f598e84d5ac97d5"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="19bbe941b87c48a7c976099f26b6df87"/><file name="mysql4-upgrade-0.1.2-0.1.3.php" hash="31485210af28297146e193090d0ae586"/><file name="mysql4-upgrade-0.1.3-0.1.4.php" hash="19bbe941b87c48a7c976099f26b6df87"/><file name="mysql4-upgrade-0.1.4-0.1.5.php" hash="19bbe941b87c48a7c976099f26b6df87"/><file name="mysql4-upgrade-0.1.5-0.1.6.php" hash="2e5071273633e63d487fa573dc2a33d9"/><file name="mysql4-upgrade-0.1.6-0.1.7.php" hash="2e5071273633e63d487fa573dc2a33d9"/><file name="mysql4-upgrade-0.1.9-0.1.10.php" hash="785667de6dde9f943af7a11ef410e00d"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Ecloud_Andreani.xml" hash="f328f654fd1a6505fc94a0f0bb4175bc"/></dir></target><target name="magelib"><dir name="Andreani"><file name="wsseAuth.php" hash="7f7c0dcac241e7422a6bc657638fc5df"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="template"><dir name="checkout"><dir name="onepage"><file name="shipping.phtml" hash="dd07d8ad6a22cd9e2553109498057439"/></dir></dir><dir name="customer"><dir name="address"><file name="edit.phtml" hash="c6a693c55bec274da69b12839a5f4ef1"/></dir></dir><dir name="persistent"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="c4c0a62c21e9e1a6d2b1b872d0f8bdfc"/></dir></dir></dir><dir name="shipping"><dir name="tracking"><file name="popup.phtml" hash="cab9a1b01c732d7553be9b47e1e1b542"/></dir></dir></dir></dir></dir></dir></target></contents>
45
  <compatible/>
46
+ <dependencies><required><php><min>5.2.0</min><max>5.5.15</max></php><extension><name>Core</name><min></min><max></max></extension><extension><name>soap</name><min></min><max></max></extension></required></dependencies>
47
  </package>