Andreani - Version 0.1.12

Version Notes

Release Version 0.1.12

- Imprimir constancia se llama directamente desde el Estado de pedidos (solo una vez, luego se guarda en DB)

- Si falla la conexión al crear envío, se muestra mensaje de error y se corta el flujo.

- Varios fixes menores y mejoras de estabilidad

Download this release

Release Info

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


Code changes from version 0.1.11 to 0.1.12

Files changed (34) hide show
  1. app/code/community/Ecloud/Andreani/Block/Adminhtml/Config/Edit.php +2 -2
  2. app/code/community/Ecloud/Andreani/Block/Adminhtml/Config/Form/Field/Medida.php +2 -9
  3. app/code/community/Ecloud/Andreani/Block/Adminhtml/Pedidos.php +2 -2
  4. app/code/community/Ecloud/Andreani/Block/Adminhtml/Pedidos/Edit.php +2 -2
  5. app/code/community/Ecloud/Andreani/Block/Adminhtml/Pedidos/Edit/Form.php +2 -2
  6. app/code/community/Ecloud/Andreani/Block/Adminhtml/Pedidos/Edit/Renderer/Button.php +11 -14
  7. app/code/community/Ecloud/Andreani/Block/Adminhtml/Pedidos/Grid.php +2 -2
  8. app/code/community/Ecloud/Andreani/Block/Andreani.php +2 -2
  9. app/code/community/Ecloud/Andreani/Helper/Data.php +2 -2
  10. app/code/community/Ecloud/Andreani/Model/Andreani.php +2 -2
  11. app/code/community/Ecloud/Andreani/Model/Carrier/Andreani.php +16 -10
  12. app/code/community/Ecloud/Andreani/Model/Carrier/Andreaniestandar.php +2 -2
  13. app/code/community/Ecloud/Andreani/Model/Carrier/Andreanisucursal.php +2 -2
  14. app/code/community/Ecloud/Andreani/Model/Carrier/Andreaniurgente.php +2 -2
  15. app/code/community/Ecloud/Andreani/Model/Config/Medida.php +2 -2
  16. app/code/community/Ecloud/Andreani/Model/Config/Metodo.php +2 -2
  17. app/code/community/Ecloud/Andreani/Model/Config/Pesomax.php +2 -2
  18. app/code/community/Ecloud/Andreani/Model/Config/TestMode.php +2 -2
  19. app/code/community/Ecloud/Andreani/Model/Observer.php +22 -16
  20. app/code/community/Ecloud/Andreani/Model/Order.php +2 -2
  21. app/code/community/Ecloud/Andreani/Model/Resource/Order.php +2 -2
  22. app/code/community/Ecloud/Andreani/Model/Resource/Order/Collection.php +2 -2
  23. app/code/community/Ecloud/Andreani/controllers/Adminhtml/OrdersController.php +40 -0
  24. app/code/community/Ecloud/Andreani/controllers/Adminhtml/Pedidos/PedidosController.php +2 -3
  25. app/code/community/Ecloud/Andreani/controllers/Adminhtml/PedidosController.php +55 -2
  26. app/code/community/Ecloud/Andreani/etc/config.xml +28 -7
  27. app/code/community/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.11-0.1.11.1.php +15 -0
  28. app/code/community/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.11.1-0.1.12.php +7 -0
  29. app/design/frontend/default/default/template/checkout/onepage/shipping.phtml +0 -148
  30. app/design/frontend/default/default/template/customer/address/edit.phtml +0 -158
  31. app/design/frontend/default/default/template/persistent/checkout/onepage/billing.phtml +0 -209
  32. app/design/frontend/default/default/template/shipping/tracking/popup.phtml +0 -201
  33. app/etc/modules/Ecloud_Andreani.xml +1 -1
  34. package.xml +8 -20
app/code/community/Ecloud/Andreani/Block/Adminhtml/Config/Edit.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?>
8
  <?php
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?>
8
  <?php
app/code/community/Ecloud/Andreani/Block/Adminhtml/Config/Form/Field/Medida.php CHANGED
@@ -1,15 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.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.11 09.10.2014
11
- * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
12
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
13
  */
14
  ?>
15
  <?php
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
 
 
 
 
 
 
 
6
  */
7
  ?>
8
  <?php
app/code/community/Ecloud/Andreani/Block/Adminhtml/Pedidos.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?><?php
8
  class Ecloud_Andreani_Block_Adminhtml_Pedidos extends Mage_Adminhtml_Block_Widget_Grid_Container
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?><?php
8
  class Ecloud_Andreani_Block_Adminhtml_Pedidos extends Mage_Adminhtml_Block_Widget_Grid_Container
app/code/community/Ecloud/Andreani/Block/Adminhtml/Pedidos/Edit.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?>
8
  <?php
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?>
8
  <?php
app/code/community/Ecloud/Andreani/Block/Adminhtml/Pedidos/Edit/Form.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?>
8
  <?php
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?>
8
  <?php
app/code/community/Ecloud/Andreani/Block/Adminhtml/Pedidos/Edit/Renderer/Button.php CHANGED
@@ -1,15 +1,15 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.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
  class Ecloud_Andreani_Block_Adminhtml_Pedidos_Edit_Renderer_Button extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract {
10
 
11
  public function render(Varien_Object $row) {
12
- $columnaID = $row->getId();
13
  //You can write html for your button here
14
  $model = Mage::getModel('andreani/order')->load($columnaID);
15
  $constanciaURL = $model->getData('constancia');
@@ -17,19 +17,16 @@ class Ecloud_Andreani_Block_Adminhtml_Pedidos_Edit_Renderer_Button extends Mage_
17
  $estadoenvio = $model->getData('estado');
18
 
19
  if ($constancia != '') {
20
- $html = '<a href="'.$constanciaURL.'" target="_blank"><button >Imprimir Constancia</button></a>';
 
 
 
 
 
 
 
21
  }
22
- else{
23
- $html = '<span>No hay ninguna constancia para ser impresa.</span>';
24
- if ($estadoenvio != 'Enviado') {
25
-
26
- $html = $html . "El Pedido no ha sido Enviado.";
27
-
28
- }
29
- }
30
-
31
  return $html;
32
-
33
  }
34
  }
35
  ?>
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?>
8
  <?php
9
  class Ecloud_Andreani_Block_Adminhtml_Pedidos_Edit_Renderer_Button extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract {
10
 
11
  public function render(Varien_Object $row) {
12
+ $columnaID = $row->getId();
13
  //You can write html for your button here
14
  $model = Mage::getModel('andreani/order')->load($columnaID);
15
  $constanciaURL = $model->getData('constancia');
17
  $estadoenvio = $model->getData('estado');
18
 
19
  if ($constancia != '') {
20
+ $html = '<a href="'.$constanciaURL.'" target="_blank"><button >Imprimir Constancia</button></a>';
21
+ }else{
22
+ $html = '<span>No hay ninguna constancia para ser impresa.</span>';
23
+ if ($estadoenvio != 'Enviado') {
24
+ $html = $html . "El Pedido no ha sido Enviado.";
25
+ }else{
26
+ $html = '<a href="'.$this->getUrl('*/*/getConstancia', array('id' => $row->getId())).'" target="_blank"><button >Imprimir Constancia</button></a>';
27
+ }
28
  }
 
 
 
 
 
 
 
 
 
29
  return $html;
 
30
  }
31
  }
32
  ?>
app/code/community/Ecloud/Andreani/Block/Adminhtml/Pedidos/Grid.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?>
8
  <?php
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?>
8
  <?php
app/code/community/Ecloud/Andreani/Block/Andreani.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?>
8
  <?php
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?>
8
  <?php
app/code/community/Ecloud/Andreani/Helper/Data.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?>
8
  <?php require_once Mage::getBaseDir('lib') . '/Andreani/wsseAuth.php';
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?>
8
  <?php require_once Mage::getBaseDir('lib') . '/Andreani/wsseAuth.php';
app/code/community/Ecloud/Andreani/Model/Andreani.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?><?php
8
  class Ecloud_Andreani_Model_Andreani extends Mage_Core_Model_Abstract
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?><?php
8
  class Ecloud_Andreani_Model_Andreani extends Mage_Core_Model_Abstract
app/code/community/Ecloud/Andreani/Model/Carrier/Andreani.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?><?php require_once Mage::getBaseDir('lib') . '/Andreani/wsseAuth.php';
8
  class Ecloud_Andreani_Model_Carrier_Andreani extends Mage_Shipping_Model_Carrier_Abstract implements Mage_Shipping_Model_Carrier_Interface {
@@ -54,7 +54,7 @@
54
  foreach ($request->getAllItems() as $_item) {
55
  if($sku != $_item->getSku()) {
56
  $sku = $_item->getSku();
57
- $price = floor($_item->getPrice());
58
  $datos["peso"] = ($_item->getQty() * $_item->getWeight() * $datos["medida"]) + $datos["peso"];
59
  $datos["valorDeclarado"] = ($_item->getQty() * $price) + $datos["valorDeclarado"];
60
 
@@ -114,7 +114,7 @@
114
  $error_msg = Mage::helper('andreani')->__("Su pedido supera el peso máximo permitido por Andreani. Por favor divida su orden en más pedidos o consulte al administrador de la tienda. Gracias y disculpe las molestias.");
115
 
116
  if ($this->_code == "andreaniestandar" & Mage::getStoreConfig('carriers/andreaniestandar/active',Mage::app()->getStore()) == 1) {
117
- if($datos["volumen"] >= $pesoMaximo){
118
  $error = Mage::getModel('shipping/rate_result_error');
119
  $error->setCarrier($this->_code);
120
  $error->setCarrierTitle($this->getConfigData('title'));
@@ -134,7 +134,7 @@
134
  }
135
  }
136
  if ($this->_code == "andreaniurgente" & Mage::getStoreConfig('carriers/andreaniurgente/active',Mage::app()->getStore()) == 1) {
137
- if($datos["volumen"] >= $pesoMaximo){
138
  $error = Mage::getModel('shipping/rate_result_error');
139
  $error->setCarrier($this->_code);
140
  $error->setCarrierTitle($this->getConfigData('title'));
@@ -154,7 +154,7 @@
154
  }
155
  }
156
  if ($this->_code == "andreanisucursal" & Mage::getStoreConfig('carriers/andreanisucursal/active',Mage::app()->getStore()) == 1) {
157
- if($datos["volumen"] >= $pesoMaximo){
158
  $error = Mage::getModel('shipping/rate_result_error');
159
  $error->setCarrier($this->_code);
160
  $error->setCarrierTitle($this->getConfigData('title'));
@@ -320,16 +320,18 @@
320
 
321
  if($sucursales=="nosucursal"){
322
  return "No hay sucursales cerca de tu domicilio.";
323
- }
 
 
324
 
325
- $datos["sucursalRetiro"]= $sucursales->Sucursal;
326
  $datos["DireccionSucursal"] = $sucursales->Direccion;
327
 
328
  // Buscamos en eAndreani el costo del envio segun los parametros enviados
329
  $datos["precio"] = $this->cotizarEnvio($datos);
330
 
331
  if ($datos["precio"] == 0) {
332
- return $texto = Mage::helper('andreani')->__("Error en la conexión con Andreani. Por favor chequee los datos ingresados en la información de envio y vuelva a intentar.");
333
  } else {
334
  if($metodo != 'basico'){
335
  $texto = Mage::getStoreConfig('carriers/andreanisucursal/description',Mage::app()->getStore()) . " {$sucursales->Descripcion} ({$sucursales->Direccion}). Estas a {$this->distancia_final_txt} {$this->mode} ({$this->duracion_final}).";
@@ -348,7 +350,8 @@
348
  if($request->getFreeShipping() == true || $request->getPackageQty() == $this->getFreeBoxes()) {
349
  $shippingPrice = '0.00';
350
  // cambiamos el titulo para indicar que el envio es gratis
351
- $rate->setMethodTitle(Mage::helper('andreani')->__('Envío gratis.'));
 
352
  } else {
353
  $shippingPrice = $this->getFinalPriceWithHandlingFee($datos["precio"]);
354
  }
@@ -389,6 +392,9 @@
389
  $wsse_header = new WsseAuthHeader($params["username"], $params["password"]);
390
  $client = new SoapClient($params["urlCotizar"], $options);
391
  $client->__setSoapHeaders(array($wsse_header));
 
 
 
392
 
393
  $phpresponse = $client->CotizarEnvio(array(
394
  'cotizacionEnvio' =>array(
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?><?php require_once Mage::getBaseDir('lib') . '/Andreani/wsseAuth.php';
8
  class Ecloud_Andreani_Model_Carrier_Andreani extends Mage_Shipping_Model_Carrier_Abstract implements Mage_Shipping_Model_Carrier_Interface {
54
  foreach ($request->getAllItems() as $_item) {
55
  if($sku != $_item->getSku()) {
56
  $sku = $_item->getSku();
57
+ $price = floor($_item->getPrice());
58
  $datos["peso"] = ($_item->getQty() * $_item->getWeight() * $datos["medida"]) + $datos["peso"];
59
  $datos["valorDeclarado"] = ($_item->getQty() * $price) + $datos["valorDeclarado"];
60
 
114
  $error_msg = Mage::helper('andreani')->__("Su pedido supera el peso máximo permitido por Andreani. Por favor divida su orden en más pedidos o consulte al administrador de la tienda. Gracias y disculpe las molestias.");
115
 
116
  if ($this->_code == "andreaniestandar" & Mage::getStoreConfig('carriers/andreaniestandar/active',Mage::app()->getStore()) == 1) {
117
+ if($datos["peso"] >= $pesoMaximo){
118
  $error = Mage::getModel('shipping/rate_result_error');
119
  $error->setCarrier($this->_code);
120
  $error->setCarrierTitle($this->getConfigData('title'));
134
  }
135
  }
136
  if ($this->_code == "andreaniurgente" & Mage::getStoreConfig('carriers/andreaniurgente/active',Mage::app()->getStore()) == 1) {
137
+ if($datos["peso"] >= $pesoMaximo){
138
  $error = Mage::getModel('shipping/rate_result_error');
139
  $error->setCarrier($this->_code);
140
  $error->setCarrierTitle($this->getConfigData('title'));
154
  }
155
  }
156
  if ($this->_code == "andreanisucursal" & Mage::getStoreConfig('carriers/andreanisucursal/active',Mage::app()->getStore()) == 1) {
157
+ if($datos["peso"] >= $pesoMaximo){
158
  $error = Mage::getModel('shipping/rate_result_error');
159
  $error->setCarrier($this->_code);
160
  $error->setCarrierTitle($this->getConfigData('title'));
320
 
321
  if($sucursales=="nosucursal"){
322
  return "No hay sucursales cerca de tu domicilio.";
323
+ }elseif ($sucursales->Sucursal == 0) {
324
+ return "Lo siento ha fallado la comunicación con Andreani, por favor vuelve a intentarlo.";
325
+ }
326
 
327
+ $datos["sucursalRetiro"] = $sucursales->Sucursal;
328
  $datos["DireccionSucursal"] = $sucursales->Direccion;
329
 
330
  // Buscamos en eAndreani el costo del envio segun los parametros enviados
331
  $datos["precio"] = $this->cotizarEnvio($datos);
332
 
333
  if ($datos["precio"] == 0) {
334
+ return $texto = Mage::helper('andreani')->__("Error en la conexión con Andreani. Por favor chequee los datos ingresados en la información de envio y vuelva a intentar.");
335
  } else {
336
  if($metodo != 'basico'){
337
  $texto = Mage::getStoreConfig('carriers/andreanisucursal/description',Mage::app()->getStore()) . " {$sucursales->Descripcion} ({$sucursales->Direccion}). Estas a {$this->distancia_final_txt} {$this->mode} ({$this->duracion_final}).";
350
  if($request->getFreeShipping() == true || $request->getPackageQty() == $this->getFreeBoxes()) {
351
  $shippingPrice = '0.00';
352
  // cambiamos el titulo para indicar que el envio es gratis
353
+ $direSucu = " Sucursal: {$sucursales->Descripcion} ({$sucursales->Direccion}).";
354
+ $rate->setMethodTitle(Mage::helper('andreani')->__('Envío gratis.') . $direSucu);
355
  } else {
356
  $shippingPrice = $this->getFinalPriceWithHandlingFee($datos["precio"]);
357
  }
392
  $wsse_header = new WsseAuthHeader($params["username"], $params["password"]);
393
  $client = new SoapClient($params["urlCotizar"], $options);
394
  $client->__setSoapHeaders(array($wsse_header));
395
+
396
+ $sucursalRetiro = array('sucursalRetiro' => "");
397
+ $params = array_merge($sucursalRetiro, $params);
398
 
399
  $phpresponse = $client->CotizarEnvio(array(
400
  'cotizacionEnvio' =>array(
app/code/community/Ecloud/Andreani/Model/Carrier/Andreaniestandar.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?><?php
8
  class Ecloud_Andreani_Model_Carrier_Andreaniestandar extends Ecloud_Andreani_Model_Carrier_Andreani
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?><?php
8
  class Ecloud_Andreani_Model_Carrier_Andreaniestandar extends Ecloud_Andreani_Model_Carrier_Andreani
app/code/community/Ecloud/Andreani/Model/Carrier/Andreanisucursal.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?><?php
8
  class Ecloud_Andreani_Model_Carrier_Andreanisucursal extends Ecloud_Andreani_Model_Carrier_Andreani
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?><?php
8
  class Ecloud_Andreani_Model_Carrier_Andreanisucursal extends Ecloud_Andreani_Model_Carrier_Andreani
app/code/community/Ecloud/Andreani/Model/Carrier/Andreaniurgente.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?><?php
8
  class Ecloud_Andreani_Model_Carrier_Andreaniurgente extends Ecloud_Andreani_Model_Carrier_Andreani
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?><?php
8
  class Ecloud_Andreani_Model_Carrier_Andreaniurgente extends Ecloud_Andreani_Model_Carrier_Andreani
app/code/community/Ecloud/Andreani/Model/Config/Medida.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?><?php
8
  class Ecloud_Andreani_Model_Config_Medida
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?><?php
8
  class Ecloud_Andreani_Model_Config_Medida
app/code/community/Ecloud/Andreani/Model/Config/Metodo.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?><?php
8
  class Ecloud_Andreani_Model_Config_Metodo
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?><?php
8
  class Ecloud_Andreani_Model_Config_Metodo
app/code/community/Ecloud/Andreani/Model/Config/Pesomax.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?><?php
8
  class Ecloud_Andreani_Model_Config_Pesomax
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?><?php
8
  class Ecloud_Andreani_Model_Config_Pesomax
app/code/community/Ecloud/Andreani/Model/Config/TestMode.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?>
8
 
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?>
8
 
app/code/community/Ecloud/Andreani/Model/Observer.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?><?php require_once Mage::getBaseDir('lib') . '/Andreani/wsseAuth.php';
8
  class Ecloud_Andreani_Model_Observer extends Mage_Core_Model_Session_Abstract {
@@ -70,7 +70,6 @@ class Ecloud_Andreani_Model_Observer extends Mage_Core_Model_Session_Abstract {
70
  'estado' => 'Pendiente'
71
  ));
72
  $model = Mage::getModel('andreani/order')->addData($_dataSave);
73
- Mage::log("Datos a guardar" . print_r($_dataSave,true));
74
  $model->save();
75
 
76
  } catch (Exception $e) {
@@ -154,7 +153,7 @@ Mage::log("Datos a guardar" . print_r($_dataSave,true));
154
  'Localidad' => $datos["localidad"],
155
  'NombreApellido' => $datos["nombre"] . " " . $datos["apellido"],
156
  'NombreApellidoAlternativo' => NULL,
157
- 'Numero' => $datos["direccion"],
158
  'NumeroCelular' => $datos["telefono"],
159
  'NumeroDocumento' => $datos["dni"],
160
  'NumeroTelefono' => $datos["telefono"],
@@ -179,24 +178,15 @@ Mage::log("Datos a guardar" . print_r($_dataSave,true));
179
  ->setTitle('Andreani');
180
  $shipment->addTrack($track);
181
 
182
- //Enviamos numero Andreani, nos devolvera el url de la constancia que lo almacenaremos en la tabla andreani_order.
183
- $NroAndreani = $phpresponse->ConfirmarCompraResult->NumeroAndreani;
184
- $constanciaResponse = $client->ImprimirConstancia(array(
185
- 'entities' =>array(
186
- 'ParamImprimirConstancia' =>array(
187
- 'NumeroAndreani' => $NroAndreani
188
- ))));
189
- $ConstanciaURL = $constanciaResponse->ImprimirConstanciaResult->ResultadoImprimirConstancia->PdfLinkFile;
190
- Mage::log("Constancia de entrega URL " . print_r($ConstanciaURL,true));
191
-
192
  $id = intval($datos["id"]);
193
  Mage::getModel('andreani/order')->load($id)->setData('cod_tracking',$phpresponse->ConfirmarCompraResult->NumeroAndreani)->save();
194
  Mage::getModel('andreani/order')->load($id)->setData('recibo_tracking',$phpresponse->ConfirmarCompraResult->Recibo)->save();
195
  Mage::getModel('andreani/order')->load($id)->setData('estado','Enviado')->save();
196
- Mage::getModel('andreani/order')->load($id)->setData('constancia',$ConstanciaURL)->save();
197
 
198
  } catch (SoapFault $e) {
199
  Mage::log("Error: " . $e);
 
 
200
  }
201
 
202
  }
@@ -209,12 +199,28 @@ Mage::log("Datos a guardar" . print_r($_dataSave,true));
209
  // enviamos el mail con el tracking code
210
  if($shipment){
211
  if(!$shipment->getEmailSent()){
212
- $shipment->sendEmail(true);
213
  $shipment->setEmailSent(true);
214
  $shipment->save();
215
  }
216
  }
217
  }
218
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
219
  }
220
  ?>
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?><?php require_once Mage::getBaseDir('lib') . '/Andreani/wsseAuth.php';
8
  class Ecloud_Andreani_Model_Observer extends Mage_Core_Model_Session_Abstract {
70
  'estado' => 'Pendiente'
71
  ));
72
  $model = Mage::getModel('andreani/order')->addData($_dataSave);
 
73
  $model->save();
74
 
75
  } catch (Exception $e) {
153
  'Localidad' => $datos["localidad"],
154
  'NombreApellido' => $datos["nombre"] . " " . $datos["apellido"],
155
  'NombreApellidoAlternativo' => NULL,
156
+ 'Numero' => ".",
157
  'NumeroCelular' => $datos["telefono"],
158
  'NumeroDocumento' => $datos["dni"],
159
  'NumeroTelefono' => $datos["telefono"],
178
  ->setTitle('Andreani');
179
  $shipment->addTrack($track);
180
 
 
 
 
 
 
 
 
 
 
 
181
  $id = intval($datos["id"]);
182
  Mage::getModel('andreani/order')->load($id)->setData('cod_tracking',$phpresponse->ConfirmarCompraResult->NumeroAndreani)->save();
183
  Mage::getModel('andreani/order')->load($id)->setData('recibo_tracking',$phpresponse->ConfirmarCompraResult->Recibo)->save();
184
  Mage::getModel('andreani/order')->load($id)->setData('estado','Enviado')->save();
 
185
 
186
  } catch (SoapFault $e) {
187
  Mage::log("Error: " . $e);
188
+ Mage::throwException(Mage::helper('andreani')->__('Algo ha ido mal con la conexión a Andreani. Intente nuevamente. (envío no generado).'));
189
+
190
  }
191
 
192
  }
199
  // enviamos el mail con el tracking code
200
  if($shipment){
201
  if(!$shipment->getEmailSent()){
202
+ $shipment->sendEmail(true,'');
203
  $shipment->setEmailSent(true);
204
  $shipment->save();
205
  }
206
  }
207
  }
208
 
209
+ /**
210
+ * Agregar massAction al sales_order
211
+ */
212
+ public function addMassAction($observer) {
213
+ $block = $observer->getEvent()->getBlock();
214
+ if(($block instanceof Mage_Adminhtml_Block_Widget_Grid_Massaction || $block instanceof Enterprise_SalesArchive_Block_Adminhtml_Sales_Order_Grid_Massaction)
215
+ && $block->getRequest()->getControllerName() == 'sales_order')
216
+ {
217
+ $block->addItem('andreani', array(
218
+ 'label' => 'Imponer en Andreani',
219
+ 'url' => $block->getUrl('andreani/adminhtml_orders/impandreani'),
220
+ 'confirm' => Mage::helper('sales')->__('Desea imponer las ordenes en Andreani?')
221
+ ));
222
+ }
223
+ }
224
+
225
  }
226
  ?>
app/code/community/Ecloud/Andreani/Model/Order.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?>
8
  <?php
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?>
8
  <?php
app/code/community/Ecloud/Andreani/Model/Resource/Order.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?><?php
8
  class Ecloud_Andreani_Model_Resource_Order extends Mage_Core_Model_Mysql4_Abstract
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?><?php
8
  class Ecloud_Andreani_Model_Resource_Order extends Mage_Core_Model_Mysql4_Abstract
app/code/community/Ecloud/Andreani/Model/Resource/Order/Collection.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?><?php
8
  class Ecloud_Andreani_Model_Resource_Order_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?><?php
8
  class Ecloud_Andreani_Model_Resource_Order_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
app/code/community/Ecloud/Andreani/controllers/Adminhtml/OrdersController.php ADDED
@@ -0,0 +1,40 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * @version 0.1.12 19.03.2015
4
+ * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
+ */
7
+ ?>
8
+ <?php
9
+ class Ecloud_Andreani_Adminhtml_OrdersController extends Mage_Adminhtml_Controller_Action
10
+ {
11
+ public function impandreaniAction()
12
+ {
13
+ $orderIds = $this->getRequest()->getParam('order_ids');
14
+ foreach ($orderIds as $orderId) {
15
+ $order = Mage::getModel('sales/order')->load($orderId);
16
+ $metodo = $order->getShippingMethod();
17
+ if( $metodo == "andreaniestandar_andreaniestandar" OR
18
+ $metodo == "andreaniurgente_andreaniurgente" OR
19
+ $metodo == "andreanisucursal_andreanisucursal") {
20
+ try {
21
+ $itemQty = $order->getItemsCollection()->count();
22
+ $shipment = Mage::getModel('sales/service_order', $order)->prepareShipment($itemQty);
23
+ $shipment = new Mage_Sales_Model_Order_Shipment_Api();
24
+ $shipmentId = $shipment->create( $order->getIncrementId(), array(), 'Enviado por Andreani', true, true);
25
+ Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('andreani')->__('La orden n° '.$order->getIncrementId().' ha sido impuesta correctamente en Andreani'));
26
+
27
+ }catch (Exception $e) {
28
+ Mage::getSingleton('adminhtml/session')->addError('Ha ocurrido un error al tratar de imponer la orden n° '.$order->getIncrementId());
29
+ }
30
+ }else{
31
+ Mage::getSingleton('adminhtml/session')->addError('La orden n° '.$order->getIncrementId().' no corresponde a ser enviada por Andreani');
32
+ }
33
+ }
34
+
35
+ $this->_redirect('adminhtml/sales_order/index');
36
+
37
+ }
38
+ }
39
+
40
+ ?>
app/code/community/Ecloud/Andreani/controllers/Adminhtml/Pedidos/PedidosController.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?><?php
8
  class Ecloud_Andreani_Adminhtml_Tracking_PedidosController extends Mage_Adminhtml_Controller_Action
@@ -14,6 +14,5 @@ class Ecloud_Andreani_Adminhtml_Tracking_PedidosController extends Mage_Adminhtm
14
  $this->_addContent($this->getLayout()->createBlock('andreani/adminhtml_pedidos'));
15
  $this->renderLayout();
16
  }
17
-
18
  }
19
  ?>
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?><?php
8
  class Ecloud_Andreani_Adminhtml_Tracking_PedidosController extends Mage_Adminhtml_Controller_Action
14
  $this->_addContent($this->getLayout()->createBlock('andreani/adminhtml_pedidos'));
15
  $this->renderLayout();
16
  }
 
17
  }
18
  ?>
app/code/community/Ecloud/Andreani/controllers/Adminhtml/PedidosController.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * @version 0.1.11 09.10.2014
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
  */
7
  ?><?php require_once Mage::getBaseDir('lib') . '/Andreani/wsseAuth.php';
8
  class Ecloud_Andreani_Adminhtml_PedidosController extends Mage_Adminhtml_Controller_Action
@@ -198,5 +198,58 @@ class Ecloud_Andreani_Adminhtml_PedidosController extends Mage_Adminhtml_Control
198
  $this->_redirect('*/*/');
199
  }
200
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
201
  }
202
  ?>
1
  <?php
2
  /**
3
+ * @version 0.1.12 19.03.2015
4
  * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
+ * @copyright Copyright (C) 2010 - 2015 ecloud solutions ®
6
  */
7
  ?><?php require_once Mage::getBaseDir('lib') . '/Andreani/wsseAuth.php';
8
  class Ecloud_Andreani_Adminhtml_PedidosController extends Mage_Adminhtml_Controller_Action
198
  $this->_redirect('*/*/');
199
  }
200
 
201
+ public function getConstanciaAction() {
202
+
203
+ $id = $this->getRequest()->getParam('id');
204
+ $order = Mage::getModel('andreani/order')->load($id);
205
+
206
+ $datos = $order->getData();
207
+
208
+ if (Mage::getStoreConfig('carriers/andreaniconfig/testmode',Mage::app()->getStore()) == 1) {
209
+ $datos["urlConfirmar"] = "https://www.e-andreani.com/CASAStaging/eCommerce/ImposicionRemota.svc?wsdl";
210
+ } else {
211
+ $datos["urlConfirmar"] = "https://www.e-andreani.com/CASAWS/eCommerce/ImposicionRemota.svc?wsdl";
212
+ }
213
+
214
+ $datos["username"] = Mage::getStoreConfig('carriers/andreaniconfig/usuario',Mage::app()->getStore());
215
+ $datos["password"] = Mage::getStoreConfig('carriers/andreaniconfig/password',Mage::app()->getStore());
216
+
217
+
218
+ if ($datos["username"] == "" OR $datos["password"] == "") {
219
+ Mage::log("Andreani :: no existe nombre de usuario o contraseña para eAndreani");
220
+ die('Andreani :: no existe nombre de usuario o contraseña para eAndreani');
221
+ }
222
+
223
+ // 2. Conectarse a eAndreani
224
+ try {
225
+ $options = array(
226
+ 'soap_version' => SOAP_1_2,
227
+ 'exceptions' => true,
228
+ 'trace' => 1,
229
+ 'wdsl_local_copy' => true
230
+ );
231
+ $wsse_header = new WsseAuthHeader($datos["username"], $datos["password"]);
232
+ $client = new SoapClient($datos["urlConfirmar"], $options);
233
+ $client->__setSoapHeaders(array($wsse_header));
234
+
235
+ $constanciaResponse = $client->ImprimirConstancia(array(
236
+ 'entities' =>array(
237
+ 'ParamImprimirConstancia' =>array(
238
+ 'NumeroAndreani' => $datos['cod_tracking']
239
+ ))));
240
+ $ConstanciaURL = $constanciaResponse->ImprimirConstanciaResult->ResultadoImprimirConstancia->PdfLinkFile;
241
+
242
+ $this->_redirectUrl($ConstanciaURL);
243
+
244
+ Mage::getModel('andreani/order')->load($id)->setData('constancia',$ConstanciaURL)->save();
245
+
246
+ } catch (SoapFault $e) {
247
+ Mage::log("Error: " . $e);
248
+ Mage::getSingleton('adminhtml/session')->addError('Error Andreani: '.$e->getMessage().' - Por favor vuelva a intentar en unos minutos.');
249
+ $this->_redirect('*/*/index');
250
+ }
251
+
252
+ }
253
+
254
  }
255
  ?>
app/code/community/Ecloud/Andreani/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Ecloud_Andreani>
5
- <version>0.1.11</version>
6
  </Ecloud_Andreani>
7
  </modules>
8
  <global>
@@ -111,6 +111,13 @@
111
  </modules>
112
  </args>
113
  </adminhtml>
 
 
 
 
 
 
 
114
  </routers>
115
  <fieldsets>
116
  <customer_dataflow>
@@ -146,15 +153,19 @@
146
  </all>
147
  <admin>
148
  <children>
149
- <andreani translate="title" module="andreani">
150
- <title>Andreani</title>
151
- <sort_order>1000</sort_order>
152
  <children>
153
- <pedidos translate="title" module="andreani">
154
  <title>Andreani</title>
155
- </pedidos>
 
 
 
 
 
 
156
  </children>
157
- </andreani>
158
  </children>
159
  </admin>
160
  </resources>
@@ -166,6 +177,16 @@
166
  </andreani>
167
  </updates>
168
  </layout>
 
 
 
 
 
 
 
 
 
 
169
  </adminhtml>
170
  <default>
171
  <carriers>
2
  <config>
3
  <modules>
4
  <Ecloud_Andreani>
5
+ <version>0.1.12</version>
6
  </Ecloud_Andreani>
7
  </modules>
8
  <global>
111
  </modules>
112
  </args>
113
  </adminhtml>
114
+ <andreani>
115
+ <use>admin</use>
116
+ <args>
117
+ <module>Ecloud_Andreani</module>
118
+ <frontName>andreani</frontName>
119
+ </args>
120
+ </andreani>
121
  </routers>
122
  <fieldsets>
123
  <customer_dataflow>
153
  </all>
154
  <admin>
155
  <children>
156
+ <sales>
 
 
157
  <children>
158
+ <andreani translate="title" module="andreani">
159
  <title>Andreani</title>
160
+ <sort_order>1000</sort_order>
161
+ <children>
162
+ <pedidos translate="title">
163
+ <title>Andreani</title>
164
+ </pedidos>
165
+ </children>
166
+ </andreani>
167
  </children>
168
+ </sales>
169
  </children>
170
  </admin>
171
  </resources>
177
  </andreani>
178
  </updates>
179
  </layout>
180
+ <events>
181
+ <core_block_abstract_prepare_layout_before>
182
+ <observers>
183
+ <andreani_core_block_abstract_prepare_layout_before>
184
+ <class>andreani/observer</class>
185
+ <method>addMassAction</method>
186
+ </andreani_core_block_abstract_prepare_layout_before>
187
+ </observers>
188
+ </core_block_abstract_prepare_layout_before>
189
+ </events>
190
  </adminhtml>
191
  <default>
192
  <carriers>
app/code/community/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.11-0.1.11.1.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')} ADD `order_increment_id` int(11) NOT NULL ;
10
+ ");
11
+ } catch (Exception $e) {
12
+ Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
13
+ }
14
+
15
+ $setup->endSetup();
app/code/community/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.11.1-0.1.12.php ADDED
@@ -0,0 +1,7 @@
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ $setup = $this;
4
+
5
+ $setup->startSetup();
6
+
7
+ $setup->endSetup();
app/design/frontend/default/default/template/checkout/onepage/shipping.phtml DELETED
@@ -1,148 +0,0 @@
1
- <?php
2
- /**
3
- * @version 1.0 20.02.2014
4
- * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
- */
7
- ?>
8
- <form action="" id="co-shipping-form">
9
- <ul class="form-list">
10
- <?php if ($this->customerHasAddresses()): ?>
11
- <li class="wide">
12
- <label for="shipping-address-select"><?php echo $this->__('Select a shipping address from your address book or enter a new address.') ?></label>
13
- <div class="input-box">
14
- <?php echo $this->getAddressesHtmlSelect('shipping') ?>
15
- </div>
16
- </li>
17
- <?php endif ?>
18
- <li id="shipping-new-address-form"<?php if ($this->customerHasAddresses()): ?> style="display:none;"<?php endif ?>>
19
- <fieldset>
20
- <input type="hidden" name="shipping[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="shipping:address_id" />
21
- <ul>
22
- <li class="fields"><?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress())->setFieldIdFormat('shipping:%s')->setFieldNameFormat('shipping[%s]')->setFieldParams('onchange="shipping.setSameAsBilling(false)"')->toHtml() ?></li>
23
- <li class="fields">
24
- <div class="fields">
25
- <label for="shipping:company"><?php echo $this->__('Company') ?></label>
26
- <div class="input-box">
27
- <input type="text" id="shipping:company" name="shipping[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" onchange="shipping.setSameAsBilling(false);" />
28
- </div>
29
- </div>
30
- </li>
31
- <?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
32
- <li class="wide">
33
- <label for="shipping:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
34
- <div class="input-box">
35
- <input type="text" title="<?php echo $this->__('Street Address') ?>" name="shipping[street][]" id="shipping:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" onchange="shipping.setSameAsBilling(false);" />
36
- </div>
37
- </li>
38
- <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
39
- <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
40
- <li class="wide">
41
- <div class="input-box">
42
- <input type="text" title="<?php echo $this->__('Street Address %s', $_i) ?>" name="shipping[street][]" id="shipping:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" onchange="shipping.setSameAsBilling(false);" />
43
- </div>
44
- </li>
45
- <?php endfor; ?>
46
- <?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
47
- <li class="wide">
48
- <label for="billing:vat_id"><?php echo $this->__('VAT Number'); ?></label>
49
- <div class="input-box">
50
- <input type="text" id="shipping:vat_id" name="shipping[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()); ?>" title="<?php echo $this->__('VAT Number'); ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
51
- </div>
52
- </li>
53
- <?php endif; ?>
54
- <li class="fields">
55
- <div class="field">
56
- <label for="shipping:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
57
- <div class="input-box">
58
- <input type="text" title="<?php echo $this->__('City') ?>" name="shipping[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="shipping:city" onchange="shipping.setSameAsBilling(false);" />
59
- </div>
60
- </div>
61
- <div class="field">
62
- <label for="shipping:region" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
63
- <div class="input-box">
64
- <select id="shipping:region_id" name="shipping[region_id]" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
65
- <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
66
- </select>
67
- <script type="text/javascript">
68
- //<![CDATA[
69
- $('shipping:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
70
- //]]>
71
- </script>
72
- <input type="text" id="shipping:region" name="shipping[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
73
- </div>
74
- </div>
75
- </li>
76
- <li class="fields">
77
- <div class="field">
78
- <label for="shipping:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
79
- <div class="input-box">
80
- <input type="text" title="<?php echo $this->__('Zip/Postal Code') ?>" name="shipping[postcode]" id="shipping:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" onchange="shipping.setSameAsBilling(false);" />
81
- </div>
82
- </div>
83
- <div class="field">
84
- <label for="shipping:country_id" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
85
- <div class="input-box">
86
- <?php echo $this->getCountryHtmlSelect('shipping') ?>
87
- </div>
88
- </div>
89
- </li>
90
- <li class="fields">
91
- <div class="field">
92
- <label for="shipping:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
93
- <div class="input-box">
94
- <input type="text" name="shipping[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="shipping:telephone" onchange="shipping.setSameAsBilling(false);" />
95
- </div>
96
- </div>
97
- <div class="field">
98
- <label for="shipping:fax"><?php echo $this->__('Fax') ?></label>
99
- <div class="input-box">
100
- <input type="text" name="shipping[fax]" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" title="<?php echo $this->__('Fax') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('fax') ?>" id="shipping:fax" onchange="shipping.setSameAsBilling(false);" />
101
- </div>
102
- </div>
103
- </li>
104
-
105
- <!-- Requerido para Enviar con eAndreani -->
106
- <li class="fields">
107
- <div class="field">
108
- <label for="shipping:dni" class="required"><em>*</em><?php echo $this->__('DNI') ?></label>
109
- <div class="input-box">
110
- <input type="text" name="shipping[dni]" value="<?php echo $this->escapeHtml($this->getAddress()->getDni()) ?>" title="<?php echo $this->__('DNI') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('dni') ?>" id="shipping:dni" onchange="shipping.setSameAsBilling(false);" />
111
- </div>
112
- </div>
113
- </li>
114
-
115
- <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
116
- <li class="control">
117
- <input type="checkbox" name="shipping[save_in_address_book]" value="1" title="<?php echo $this->__('Save in address book') ?>" id="shipping:save_in_address_book" onchange="shipping.setSameAsBilling(false);"<?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /><label for="shipping:save_in_address_book"><?php echo $this->__('Save in address book') ?></label></li>
118
- <?php else:?>
119
- <li class="no-display"><input type="hidden" name="shipping[save_in_address_book]" value="1" /></li>
120
- <?php endif;?>
121
- </ul>
122
- </fieldset>
123
- </li>
124
- <li class="control">
125
- <input type="checkbox" name="shipping[same_as_billing]" id="shipping:same_as_billing" value="1"<?php if($this->getAddress()->getSameAsBilling()): ?> checked="checked"<?php endif; ?> title="<?php echo $this->__('Use Billing Address') ?>" onclick="shipping.setSameAsBilling(this.checked)" class="checkbox" /><label for="shipping:same_as_billing"><?php echo $this->__('Use Billing Address') ?></label>
126
- </li>
127
- </ul>
128
- <div class="buttons-set" id="shipping-buttons-container">
129
- <p class="required"><?php echo $this->__('* Required Fields') ?></p>
130
- <p class="back-link"><a href="#" onclick="checkout.back(); return false;"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
131
- <button type="button" class="button" title="<?php echo $this->__('Continue') ?>" onclick="shipping.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
132
- <span id="shipping-please-wait" class="please-wait" style="display:none;">
133
- <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Loading next step...') ?>" title="<?php echo $this->__('Loading next step...') ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
134
- </span>
135
- </div>
136
- </form>
137
- <script type="text/javascript">
138
- //<![CDATA[
139
- var shipping = new Shipping('co-shipping-form', '<?php echo $this->getUrl('checkout/onepage/getAddress') ?>address/', '<?php echo $this->getUrl('checkout/onepage/saveShipping') ?>',
140
- '<?php echo $this->getUrl('checkout/onepage/shippingMethod') ?>');
141
- var shippingForm = new VarienForm('co-shipping-form');
142
- shippingForm.extraChildParams = ' onchange="shipping.setSameAsBilling(false);"';
143
- //shippingForm.setElementsRelation('shipping:country_id', 'shipping:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
144
- $('shipping-address-select') && shipping.newAddress(!$('shipping-address-select').value);
145
-
146
- var shippingRegionUpdater = new RegionUpdater('shipping:country_id', 'shipping:region', 'shipping:region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'shipping:postcode');
147
- //]]>
148
- </script>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/default/default/template/customer/address/edit.phtml DELETED
@@ -1,158 +0,0 @@
1
- <?php
2
- /**
3
- * @version 1.0 20.02.2014
4
- * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
- */
7
- ?>
8
-
9
- <?php
10
- /**
11
- * Edit customer address template
12
- *
13
- * @see Mage_Customer_Block_Address_Edit
14
- */
15
- ?>
16
- <?php if($this->getTitle()): ?>
17
- <div class="page-title">
18
- <h1><?php echo $this->getTitle() ?></h1>
19
- </div>
20
- <?php endif; ?>
21
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
22
- <form action="<?php echo $this->getSaveUrl() ?>" method="post" id="form-validate">
23
- <div class="fieldset">
24
- <?php echo $this->getBlockHtml('formkey')?>
25
- <input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
26
- <input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
27
- <h2 class="legend"><?php echo $this->__('Contact Information') ?></h2>
28
- <ul class="form-list">
29
- <li class="fields">
30
- <?php echo $this->getNameBlockHtml() ?>
31
- </li>
32
- <li class="wide">
33
- <label for="company"><?php echo $this->__('Company') ?></label>
34
- <div class="input-box">
35
- <input type="text" name="company" id="company" title="<?php echo $this->__('Company') ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
36
- </div>
37
- </li>
38
- <li class="fields">
39
- <div class="field">
40
- <label for="telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
41
- <div class="input-box">
42
- <input type="text" name="telephone" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="telephone" />
43
- </div>
44
- </div>
45
- <div class="field">
46
- <label for="fax"><?php echo $this->__('Fax') ?></label>
47
- <div class="input-box">
48
- <input type="text" name="fax" id="fax" title="<?php echo $this->__('Fax') ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('fax') ?>" />
49
- </div>
50
- </div>
51
- </li>
52
- </ul>
53
- </div>
54
- <div class="fieldset">
55
- <h2 class="legend"><?php echo $this->__('Address') ?></h2>
56
- <ul class="form-list">
57
- <?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
58
- <li class="wide">
59
- <label for="street_1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
60
- <div class="input-box">
61
- <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" title="<?php echo $this->__('Street Address') ?>" id="street_1" class="input-text <?php echo $_streetValidationClass ?>" />
62
- </div>
63
- </li>
64
- <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
65
- <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
66
- <li class="wide">
67
- <div class="input-box">
68
- <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" title="<?php echo $this->__('Street Address %s', $_i) ?>" id="street_<?php echo $_i ?>" class="input-text <?php echo $_streetValidationClass ?>" />
69
- </div>
70
- </li>
71
- <?php endfor; ?>
72
- <?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
73
- <li class="wide">
74
- <label for="vat_id"><?php echo $this->__('VAT Number') ?></label>
75
- <div class="input-box">
76
- <input type="text" name="vat_id" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo $this->__('VAT Number') ?>" id="vat_id" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
77
- </div>
78
- </li>
79
- <?php endif; ?>
80
- <li class="fields">
81
- <div class="field">
82
- <label for="city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
83
- <div class="input-box">
84
- <input type="text" name="city" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" title="<?php echo $this->__('City') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="city" />
85
- </div>
86
- </div>
87
- <div class="field">
88
- <label for="region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
89
- <div class="input-box">
90
- <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
91
- <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
92
- </select>
93
- <script type="text/javascript">
94
- //<![CDATA[
95
- $('region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
96
- //]]>
97
- </script>
98
- <input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" />
99
- </div>
100
- </div>
101
- </li>
102
- <li class="fields">
103
- <div class="field">
104
- <label for="zip" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
105
- <div class="input-box">
106
- <input type="text" name="postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" title="<?php echo $this->__('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
107
- </div>
108
- </div>
109
- <div class="field">
110
- <label for="country" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
111
- <div class="input-box">
112
- <?php echo $this->getCountryHtmlSelect() ?>
113
- </div>
114
- </div>
115
- </li>
116
-
117
- <!-- Requerido para Enviar con eAndreani -->
118
- <li class="fields">
119
- <div class="field">
120
- <label for="dni" class="required"><em>*</em><?php echo $this->__('DNI') ?></label>
121
- <div class="input-box">
122
- <input type="text" name="dni" value="<?php echo $this->escapeHtml($this->getAddress()->getDni()) ?>" title="<?php echo $this->__('DNI') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('dni') ?>" />
123
- </div>
124
- </div>
125
- </li>
126
-
127
- <li<?php if($this->canSetAsDefaultBilling()) echo ' class="control"' ?>>
128
- <?php if($this->isDefaultBilling()): ?>
129
- <strong><?php echo $this->__('Default Billing Address') ?></strong>
130
- <?php elseif($this->canSetAsDefaultBilling()): ?>
131
- <input type="checkbox" id="primary_billing" name="default_billing" value="1" title="<?php echo $this->__('Use as My Default Billing Address') ?>" class="checkbox" /><label for="primary_billing"><?php echo $this->__('Use as my default billing address') ?></label>
132
- <?php else: ?>
133
- <input type="hidden" name="default_billing" value="1" />
134
- <?php endif; ?>
135
- </li>
136
- <li<?php if($this->canSetAsDefaultShipping()) echo ' class="control"' ?>>
137
- <?php if($this->isDefaultShipping()): ?>
138
- <strong><?php echo $this->__('Default Shipping Address') ?></strong>
139
- <?php elseif($this->canSetAsDefaultShipping()): ?>
140
- <input type="checkbox" id="primary_shipping" name="default_shipping" value="1" title="<?php echo $this->__('Use as My Default Shipping Address') ?>" class="checkbox" /><label for="primary_shipping"><?php echo $this->__('Use as my default shipping address') ?></label>
141
- <?php else: ?>
142
- <input type="hidden" name="default_shipping" value="1" />
143
- <?php endif; ?>
144
- </li>
145
- </ul>
146
- </div>
147
- <div class="buttons-set">
148
- <p class="required"><?php echo $this->__('* Required Fields') ?></p>
149
- <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
150
- <button type="submit" title="<?php echo $this->__('Save Address') ?>" class="button"><span><span><?php echo $this->__('Save Address') ?></span></span></button>
151
- </div>
152
- </form>
153
- <script type="text/javascript">
154
- //<![CDATA[
155
- var dataForm = new VarienForm('form-validate', true);
156
- new RegionUpdater('country', 'region', 'region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'zip');
157
- //]]>
158
- </script>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/default/default/template/persistent/checkout/onepage/billing.phtml DELETED
@@ -1,209 +0,0 @@
1
- <?php
2
- /**
3
- * @version 1.0 20.02.2014
4
- * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5
- * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6
- */
7
- ?>
8
-
9
- <form id="co-billing-form" action="">
10
- <fieldset>
11
- <ul class="form-list">
12
- <?php if ($this->customerHasAddresses()): ?>
13
- <li class="wide">
14
- <label for="billing-address-select"><?php echo $this->__('Select a billing address from your address book or enter a new address.') ?></label>
15
- <div class="input-box">
16
- <?php echo $this->getAddressesHtmlSelect('billing') ?>
17
- </div>
18
- </li>
19
- <?php endif; ?>
20
- <li id="billing-new-address-form"<?php if ($this->customerHasAddresses()): ?> style="display:none;"<?php endif; ?>>
21
- <fieldset>
22
- <input type="hidden" name="billing[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="billing:address_id" />
23
- <ul>
24
- <li class="fields"><?php echo $this->getLayout()->createBlock('customer/widget_name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getQuote()->getCustomer())->setForceUseCustomerRequiredAttributes(!$this->isCustomerLoggedIn())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?></li>
25
- <li class="fields">
26
- <div class="field">
27
- <label for="billing:company"><?php echo $this->__('Company') ?></label>
28
- <div class="input-box">
29
- <input type="text" id="billing:company" name="billing[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo $this->__('Company') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('company') ?>" />
30
- </div>
31
- </div>
32
- <?php if(!$this->isCustomerLoggedIn()): ?>
33
- <div class="field">
34
- <label for="billing:email" class="required"><em>*</em><?php echo $this->__('Email Address') ?></label>
35
- <div class="input-box">
36
- <input type="text" name="billing[email]" id="billing:email" value="<?php echo $this->escapeHtml($this->getAddress()->getEmail()) ?>" title="<?php echo $this->__('Email Address') ?>" class="input-text validate-email required-entry" />
37
- </div>
38
- </div>
39
- <?php endif; ?>
40
- </li>
41
- <?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
42
- <li class="wide">
43
- <label for="billing:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
44
- <div class="input-box">
45
- <input type="text" title="<?php echo $this->__('Street Address') ?>" name="billing[street][]" id="billing:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
46
- </div>
47
- </li>
48
- <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
49
- <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
50
- <li class="wide">
51
- <div class="input-box">
52
- <input type="text" title="<?php echo $this->__('Street Address %s', $_i) ?>" name="billing[street][]" id="billing:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
53
- </div>
54
- </li>
55
- <?php endfor; ?>
56
- <?php if ($this->helper('customer/address')->isVatAttributeVisible()) : ?>
57
- <li class="wide">
58
- <label for="billing:vat_id"><?php echo $this->__('VAT Number') ?></label>
59
- <div class="input-box">
60
- <input type="text" id="billing:vat_id" name="billing[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo $this->__('VAT Number') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('vat_id') ?>" />
61
- </div>
62
- </li>
63
- <?php endif; ?>
64
- <li class="fields">
65
- <div class="field">
66
- <label for="billing:city" class="required"><em>*</em><?php echo $this->__('City') ?></label>
67
- <div class="input-box">
68
- <input type="text" title="<?php echo $this->__('City') ?>" name="billing[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('city') ?>" id="billing:city" />
69
- </div>
70
- </div>
71
- <div class="field">
72
- <label for="billing:region_id" class="required"><em>*</em><?php echo $this->__('State/Province') ?></label>
73
- <div class="input-box">
74
- <select id="billing:region_id" name="billing[region_id]" title="<?php echo $this->__('State/Province') ?>" class="validate-select" style="display:none;">
75
- <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
76
- </select>
77
- <script type="text/javascript">
78
- //<![CDATA[
79
- $('billing:region_id').setAttribute('defaultValue', "<?php echo $this->getAddress()->getRegionId() ?>");
80
- //]]>
81
- </script>
82
- <input type="text" id="billing:region" name="billing[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('region') ?>" style="display:none;" />
83
- </div>
84
- </div>
85
- </li>
86
- <li class="fields">
87
- <div class="field">
88
- <label for="billing:postcode" class="required"><em>*</em><?php echo $this->__('Zip/Postal Code') ?></label>
89
- <div class="input-box">
90
- <input type="text" title="<?php echo $this->__('Zip/Postal Code') ?>" name="billing[postcode]" id="billing:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('customer/address')->getAttributeValidationClass('postcode') ?>" />
91
- </div>
92
- </div>
93
- <div class="field">
94
- <label for="billing:country_id" class="required"><em>*</em><?php echo $this->__('Country') ?></label>
95
- <div class="input-box">
96
- <?php echo $this->getCountryHtmlSelect('billing') ?>
97
- </div>
98
- </div>
99
- </li>
100
- <li class="fields">
101
- <div class="field">
102
- <label for="billing:telephone" class="required"><em>*</em><?php echo $this->__('Telephone') ?></label>
103
- <div class="input-box">
104
- <input type="text" name="billing[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo $this->__('Telephone') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('telephone') ?>" id="billing:telephone" />
105
- </div>
106
- </div>
107
- <div class="field">
108
- <label for="billing:fax"><?php echo $this->__('Fax') ?></label>
109
- <div class="input-box">
110
- <input type="text" name="billing[fax]" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" title="<?php echo $this->__('Fax') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('fax') ?>" id="billing:fax" />
111
- </div>
112
- </div>
113
- </li>
114
-
115
- <!-- Requerido para Enviar con eAndreani -->
116
- <li class="fields">
117
- <div class="field">
118
- <label for="billing:dni" class="required"><em>*</em><?php echo $this->__('DNI') ?></label>
119
- <div class="input-box">
120
- <input type="text" name="billing[dni]" value="<?php echo $this->escapeHtml($this->getAddress()->getDni()) ?>" title="<?php echo $this->__('DNI') ?>" class="input-text <?php echo $this->helper('customer/address')->getAttributeValidationClass('dni') ?>" id="billing:dni" />
121
- </div>
122
- </div>
123
- </li>
124
-
125
- <?php if(!$this->isCustomerLoggedIn()): ?>
126
-
127
- <?php $_dob = $this->getLayout()->createBlock('customer/widget_dob') ?>
128
- <?php $_gender = $this->getLayout()->createBlock('customer/widget_gender') ?>
129
- <?php if ($_dob->isEnabled() || $_gender->isEnabled()): ?>
130
- <li class="fields">
131
- <?php if ($_dob->isEnabled()): ?>
132
- <div class="field">
133
- <?php echo $_dob->setDate($this->getQuote()->getCustomerDob())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
134
- </div>
135
- <?php endif; ?>
136
- <?php if ($_gender->isEnabled()): ?>
137
- <div class="field">
138
- <?php echo $_gender->setGender($this->getQuote()->getCustomerGender())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
139
- </div>
140
- <?php endif ?>
141
- </li>
142
- <?php endif ?>
143
-
144
- <?php $_taxvat = $this->getLayout()->createBlock('customer/widget_taxvat') ?>
145
- <?php if ($_taxvat->isEnabled()): ?>
146
- <li>
147
- <?php echo $_taxvat->setTaxvat($this->getQuote()->getCustomerTaxvat())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
148
- </li>
149
- <?php endif ?>
150
-
151
- <li class="fields" id="register-customer-password">
152
- <div class="field">
153
- <label for="billing:customer_password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
154
- <div class="input-box">
155
- <input type="password" name="billing[customer_password]" id="billing:customer_password" title="<?php echo $this->__('Password') ?>" class="input-text required-entry validate-password" />
156
- </div>
157
- </div>
158
- <div class="field">
159
- <label for="billing:confirm_password" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
160
- <div class="input-box">
161
- <input type="password" name="billing[confirm_password]" title="<?php echo $this->__('Confirm Password') ?>" id="billing:confirm_password" class="input-text required-entry validate-cpassword" />
162
- </div>
163
- </div>
164
- </li>
165
- <?php endif; ?>
166
- <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
167
- <li class="control">
168
- <input type="checkbox" name="billing[save_in_address_book]" value="1" title="<?php echo $this->__('Save in address book') ?>" id="billing:save_in_address_book" onchange="if(window.shipping) shipping.setSameAsBilling(false);"<?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /><label for="billing:save_in_address_book"><?php echo $this->__('Save in address book') ?></label>
169
- </li>
170
- <?php else:?>
171
- <li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
172
- <?php endif; ?>
173
- <?php echo $this->getChildHtml('form.additional.info'); ?>
174
- </ul>
175
- </fieldset>
176
- </li>
177
- <?php /* Extensions placeholder */ ?>
178
- <?php echo $this->getChildHtml('checkout.onepage.billing.extra')?>
179
- <?php if ($this->canShip()): ?>
180
- <li class="control">
181
- <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_yes" value="1"<?php if ($this->isUseBillingAddressForShipping()) {?> checked="checked"<?php }?> title="<?php echo $this->__('Ship to this address') ?>" onclick="$('shipping:same_as_billing').checked = true;" class="radio" /><label for="billing:use_for_shipping_yes"><?php echo $this->__('Ship to this address') ?></label></li>
182
- <li class="control">
183
- <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_no" value="0"<?php if (!$this->isUseBillingAddressForShipping()) {?> checked="checked"<?php }?> title="<?php echo $this->__('Ship to different address') ?>" onclick="$('shipping:same_as_billing').checked = false;" class="radio" /><label for="billing:use_for_shipping_no"><?php echo $this->__('Ship to different address') ?></label>
184
- </li>
185
- <?php endif; ?>
186
- </ul>
187
- <?php if (!$this->canShip()): ?>
188
- <input type="hidden" name="billing[use_for_shipping]" value="1" />
189
- <?php endif; ?>
190
- <div class="buttons-set" id="billing-buttons-container">
191
- <p class="required"><?php echo $this->__('* Required Fields') ?></p>
192
- <button type="button" title="<?php echo $this->__('Continue') ?>" class="button" onclick="billing.save()"><span><span><?php echo $this->__('Continue') ?></span></span></button>
193
- <span class="please-wait" id="billing-please-wait" style="display:none;">
194
- <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo $this->__('Loading next step...') ?>" title="<?php echo $this->__('Loading next step...') ?>" class="v-middle" /> <?php echo $this->__('Loading next step...') ?>
195
- </span>
196
- </div>
197
- </fieldset>
198
- </form>
199
- <script type="text/javascript">
200
- //<![CDATA[
201
- var billing = new Billing('co-billing-form', '<?php echo $this->getUrl('checkout/onepage/getAddress') ?>address/', '<?php echo $this->getUrl('checkout/onepage/saveBilling') ?>');
202
- var billingForm = new VarienForm('co-billing-form');
203
-
204
- //billingForm.setElementsRelation('billing:country_id', 'billing:region', '<?php echo $this->getUrl('directory/json/childRegion') ?>', '<?php echo $this->__('Select State/Province...') ?>');
205
- $('billing-address-select') && billing.newAddress(!$('billing-address-select').value);
206
-
207
- var billingRegionUpdater = new RegionUpdater('billing:country_id', 'billing:region', 'billing:region_id', <?php echo $this->helper('directory')->getRegionJson() ?>, undefined, 'billing:postcode');
208
- //]]>
209
- </script>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/default/default/template/shipping/tracking/popup.phtml DELETED
@@ -1,201 +0,0 @@
1
- <?php
2
- /**
3
- * Magento
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Academic Free License (AFL 3.0)
8
- * that is bundled with this package in the file LICENSE_AFL.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://opensource.org/licenses/afl-3.0.php
11
- * If you did not receive a copy of the license and are unable to
12
- * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
- *
15
- * DISCLAIMER
16
- *
17
- * Do not edit or add to this file if you wish to upgrade Magento to newer
18
- * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
- *
21
- * @category design
22
- * @package base_default
23
- * @copyright Copyright (c) 2012 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
- <?php /** @var $this Mage_Shipping_Block_Tracking_Popup */
28
-
29
-
30
- ?>
31
- <?php $_results = $this->getTrackingInfo(); ?>
32
- <div class="page-title title-buttons">
33
- <h1><?php echo $this->__('Tracking Information'); ?></h1>
34
- </div>
35
- <?php if(sizeof($_results)>0): ?>
36
- <?php foreach($_results as $shipid => $_result): ?>
37
- <?php if($shipid): ?>
38
- <h2 class="sub-title"><?php echo $this->__('Shipment #').$shipid; ?></h2>
39
- <?php endif; ?>
40
- <?php if(sizeof($_result)>0): ?>
41
- <?php $rowCount = sizeof($_result); $counter = 1; ?>
42
- <?php $_id = 0; foreach($_result as $track): ?>
43
- <table class="tracking-table-popup data-table" id="tracking-table-popup-<?php echo $_id ?>">
44
- <col width="15%" />
45
- <col />
46
- <tbody>
47
- <?php if(is_object($track)): ?>
48
- <tr>
49
- <th class="label"><?php echo $this->__('Tracking Number:'); ?></th>
50
- <td class="value"><?php echo $this->escapeHtml($track->getTracking()); ?></td>
51
- </tr>
52
- <?php if ($track->getCarrierTitle()): ?>
53
- <tr>
54
- <th class="label"><?php echo $this->__('Carrier:'); ?></th>
55
- <td class="value"><?php echo $this->escapeHtml($track->getCarrierTitle()); ?></td>
56
- </tr>
57
- <?php endif; ?>
58
- <?php if($track->getErrorMessage()): ?>
59
- <tr>
60
- <th class="label"><?php echo $this->__('Error:'); ?></th>
61
- <td class="error"><?php echo $this->__('Tracking information is currently not available. Please '); if ($this->getContactUsEnabled()) : ?><a href="<?php echo $this->getContactUs() ?>" title="<?php echo $this->__('contact us') ?>" onclick="this.target='_blank'"><?php echo $this->__('contact us') ?></a><?php echo $this->__(' for more information or '); endif; echo $this->__('email us at '); ?><a href="mailto:<?php echo $this->getStoreSupportEmail() ?>"><?php echo $this->getStoreSupportEmail() ?></a></td>
62
- </tr>
63
- <?php elseif($track->getTrackSummary()): ?>
64
- <tr>
65
- <th class="label"><?php echo $this->__('Info:'); ?></th>
66
- <td class="value"><?php echo $track->getTrackSummary(); ?></td>
67
- </tr>
68
- <?php elseif($track->getUrl()): ?>
69
- <tr>
70
- <th class="label"><?php echo $this->__('Track:'); ?></th>
71
- <td class="value"><a href="<?php echo $this->escapeHtml($track->getUrl()); ?>" onclick="this.target='_blank'"><?php echo $this->escapeHtml($track->getUrl()); ?></a></td>
72
- </tr>
73
- <?php else: ?>
74
- <?php if ($track->getStatus()): ?>
75
- <tr>
76
- <th class="label"><?php echo $this->__('Status:'); ?></th>
77
- <td class="value"><?php echo $track->getStatus(); ?></td>
78
- </tr>
79
- <?php endif; ?>
80
-
81
- <?php if ($track->getDeliverydate()): ?>
82
- <tr>
83
- <th class="label"><?php echo $this->__('Delivered on:'); ?></th>
84
- <td class="value"><?php echo $this->formatDeliveryDateTime($track->getDeliverydate(),$track->getDeliverytime()); ?></td>
85
- </tr>
86
- <?php endif; ?>
87
-
88
- <?php if ($track->getSignedby()): ?>
89
- <tr>
90
- <th class="label"><?php echo $this->__('Signed by:'); ?></th>
91
- <td class="value"><?php echo $track->getSignedby(); ?></td>
92
- </tr>
93
- <?php endif; ?>
94
-
95
- <?php if ($track->getDeliveryLocation()): ?>
96
- <tr>
97
- <th class="label"><?php echo $this->__('Delivered to:'); ?></th>
98
- <td class="value"><?php echo $track->getDeliveryLocation(); ?></td>
99
- </tr>
100
- <?php endif; ?>
101
-
102
- <?php if ($track->getShippedDate()): ?>
103
- <tr>
104
- <th class="label"><?php echo $this->__('Shipped or billed on:'); ?></th>
105
- <td class="value"><?php echo $track->getShippedDate(); ?></td>
106
- </tr>
107
- <?php endif; ?>
108
-
109
- <?php if ($track->getService()): ?>
110
- <tr>
111
- <th class="label"><?php echo $this->__('Service Type:'); ?></th>
112
- <td class="value"><?php echo $track->getService(); ?></td>
113
- </tr>
114
- <?php endif; ?>
115
-
116
- <?php if ($track->getWeight()): ?>
117
- <tr>
118
- <th class="label"><?php echo $this->__('Weight:'); ?></th>
119
- <td class="value"><?php echo $track->getWeight(); ?></td>
120
- </tr>
121
- <?php endif; ?>
122
- <?php endif; ?>
123
- <?php elseif(isset($track['title']) && isset($track['number']) && $track['number']): ?>
124
- <!--if the tracking is custom value-->
125
- <tr>
126
- <th class="label"><?php echo ($track['title'] ? $this->escapeHtml($track['title']) : $this->__('N/A')); ?>:</th>
127
-
128
- <h2><?php echo $this->helper('andreani')->__("Número Andreani: ") . $track['number']; ?></h2>
129
- <br />
130
- <td class="value">
131
- <?php /** @var $this Mage_Shipping_Block_Tracking_Popup */
132
-
133
- $result = $this->helper('andreani')->getTrackingpopup($track['number']);
134
-
135
- echo $this->helper('andreani')->__($result["Nropieza"]) . "<br/>";
136
- echo $this->helper('andreani')->__("Identificación: ") . $result["NombreEnvio"] . "<br/>";
137
- echo "<hr>";
138
- $cont = 1;
139
- foreach ($result["Eventos"] as $value) {
140
- echo "<strong>" . $this->helper('andreani')->__("Evento N°: ") . $cont . "</strong><br/>";
141
- echo $this->helper('andreani')->__("Fecha del evento: ") . $value["Fecha"] . "<br/>";
142
- echo $this->helper('andreani')->__("Estado: ") . $value["Estado"] . "<br/>";
143
- echo $this->helper('andreani')->__("Motivo: ") . $value["Motivo"] . "<br/>";
144
- echo $this->helper('andreani')->__("Sucursal: ") . $value["Sucursal"] . "<br/>";
145
- echo "<hr>";
146
- $cont++;
147
- }
148
- ?>
149
- </td>
150
- </tr>
151
- <?php endif; ?>
152
- </tbody>
153
- </table>
154
- <script type="text/javascript">decorateTable('tracking-table-popup-<?php echo $_id++ ?>');</script>
155
- <?php if (is_object($track) && sizeof($track->getProgressdetail())>0): ?>
156
- <br />
157
- <table class="data-table" id="track-history-table-<?php echo $track->getTracking(); ?>">
158
- <col />
159
- <col width="1" />
160
- <col width="1" />
161
- <col />
162
- <thead>
163
- <tr>
164
- <th><?php echo $this->__('Location') ?></th>
165
- <th><?php echo $this->__('Date') ?></th>
166
- <th><?php echo $this->__('Local Time') ?></th>
167
- <th><?php echo $this->__('Description') ?></th>
168
- </tr>
169
- </thead>
170
- <tbody>
171
- <?php foreach($track->getProgressdetail() as $_detail): ?>
172
- <?php $_detailDate = (isset($_detail['deliverydate']) ? $this->formatDeliveryDate($_detail['deliverydate']) : '') ?>
173
- <?php $_detailTime = (isset($_detail['deliverytime']) ? $this->formatDeliveryTime($_detail['deliverytime'], $_detail['deliverydate']) : '') ?>
174
- <tr>
175
- <td><?php echo (isset($_detail['deliverylocation']) ? $_detail['deliverylocation'] : ''); ?></td>
176
- <td><span class="nobr"><?php echo $_detailDate ?></span></td>
177
- <td><span class="nobr"><?php echo $_detailTime ?></span></td>
178
- <td><?php echo (isset($_detail['activity']) ? $_detail['activity'] : '') ?></td>
179
- </tr>
180
- <?php endforeach; ?>
181
- </tbody>
182
- </table>
183
- <script type="text/javascript">decorateTable('track-history-table-<?php echo $track->getTracking(); ?>');</script>
184
- <?php endif; ?>
185
- <div class="divider"></div>
186
- <?php if($counter!=$rowCount): ?>
187
- <?php endif; ?>
188
- <?php $counter++; ?>
189
- <!--end for each tracking information-->
190
- <?php endforeach; ?>
191
- <?php else: ?>
192
- <p><?php echo $this->__('There is no tracking available for this shipment.'); ?></p>
193
- <?php endif; ?>
194
-
195
- <?php endforeach; ?>
196
- <?php else: ?>
197
- <p><?php echo $this->__('There is no tracking available.'); ?></p>
198
- <?php endif; ?>
199
- <div class="buttons-set">
200
- <button type="button" title="<?php echo $this->__('Close Window') ?>" class="button" onclick="window.close(); window.opener.focus();"><span><span><?php echo $this->__('Close Window') ?></span></span></button>
201
- </div>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/etc/modules/Ecloud_Andreani.xml CHANGED
@@ -7,7 +7,7 @@
7
  <depends>
8
  <Mage_Shipping />
9
  </depends>
10
- <version>0.1.11</version>
11
  </Ecloud_Andreani>
12
  </modules>
13
  </config>
7
  <depends>
8
  <Mage_Shipping />
9
  </depends>
10
+ <version>0.1.12</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.11</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,29 +24,17 @@ 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.11&#xD;
28
  &#xD;
29
- Fix:&#xD;
30
  &#xD;
31
- - Metodos de calcular envio: completo, medio, basico&#xD;
32
  &#xD;
33
- - Posibilidad de seleccionar el peso soportado por el cotizador&#xD;
34
- &#xD;
35
- - Se pueden crear ordenes desde el admin y calcular el envio con la extension&#xD;
36
- &#xD;
37
- - Arreglado error que siempre guardaba andreani sucursal&#xD;
38
- &#xD;
39
- - Si no encuentra sucursal, no permite seleccionar envio a sucursal&#xD;
40
- &#xD;
41
- - Estado de pedidos dropdown para filtrar enviados, entregados, etc.&#xD;
42
- &#xD;
43
- - ACL funciona correctamente&#xD;
44
- &#xD;
45
- - Se guarda la fecha cuando el pedido pasa a estado Entregado</notes>
46
  <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><author><name>Bruno Mininno</name><user>brunomininno</user><email>bruno.mininno@ecloudsolutions.com</email></author></authors>
47
- <date>2014-10-09</date>
48
- <time>16:39:21</time>
49
- <contents><target name="magecommunity"><dir name="Ecloud"><dir name="Andreani"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><file name="Edit.php" hash="1fb7ab7a8d7038b10bd21d892d290951"/><dir name="Form"><dir name="Field"><file name="Medida.php" hash="bd0e408266db98fc5983dd42846f4df6"/></dir></dir></dir><dir name="Pedidos"><dir name="Edit"><file name="Form.php" hash="2e1ad460f4574c4c966142fa254709e5"/><dir name="Renderer"><file name="Button.php" hash="ef247084cd66ff765d3d9d404c354f3d"/></dir></dir><file name="Edit.php" hash="0b0e66b3b3ea2ab0326d0dfe78c30bb6"/><file name="Grid.php" hash="45d4915fd3b3ef46613ebbb65d999913"/></dir><file name="Pedidos.php" hash="0f859e6b5863b67fff8c6a71bd04f58d"/></dir><file name="Andreani.php" hash="20fc1d1db2cf5a513455a383286745a2"/></dir><dir name="Helper"><file name="Data.php" hash="9e4f8bd045e3e5a81d1244c2447ce123"/></dir><dir name="Model"><file name="Andreani.php" hash="054bdd2c97d003a852030fdea16a9b9b"/><dir name="Carrier"><file name="Andreani.php" hash="c26699fba3f9a54547c630ba3ee1b9ed"/><file name="Andreaniestandar.php" hash="e00ac4c4af8ac421bd45fedbc5b3e909"/><file name="Andreanisucursal.php" hash="c51d67670a12cffff2aa209593d3ae00"/><file name="Andreaniurgente.php" hash="96c25ecdc5586b84c3b885cdbb402b37"/></dir><dir name="Config"><file name="Medida.php" hash="6d6c32fc7a74d33e143903922e4c7ad7"/><file name="Metodo.php" hash="2f56b9b116cef7e342b406a1920c40c9"/><file name="Pesomax.php" hash="b1230aaa4452fc8a9b6250ede13fbbc2"/><file name="TestMode.php" hash="f32f4ee2b572f121a205f5243a43b906"/></dir><file name="Observer.php" hash="3bb7abd474a3c81e78e2fb9b41bf7a3f"/><file name="Order.php" hash="c56f43ef722ee07f4146445a60030f6a"/><dir name="Resource"><dir name="Order"><file name="Collection.php" hash="a3962d4eee6254df24b7863514f425e9"/></dir><file name="Order.php" hash="69b3b1e098fc552652ca615ad253100f"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Pedidos"><file name="PedidosController.php" hash="a90d175284d7443f3b42609fca837a9d"/></dir><file name="PedidosController.php" hash="24f3ecab45083c2329d26f419b2b0f51"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="572688a74a8eb634953c6bf59d2635f2"/><file name="config.xml" hash="0cbad23336f948af5f14c3370c26d143"/><file name="system.xml" hash="8396ab20317b606a46592cf9d713635c"/></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.10-0.1.11.php" hash="49cb97b29c78ba1ab6f3497559bc6556"/><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="9feb8e71afd5c51f668787be514adcdd"/></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>
50
  <compatible/>
51
  <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>
52
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Andreani</name>
4
+ <version>0.1.12</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.12&#xD;
28
  &#xD;
29
+ - Imprimir constancia se llama directamente desde el Estado de pedidos (solo una vez, luego se guarda en DB)&#xD;
30
  &#xD;
31
+ - Si falla la conexi&#xF3;n al crear env&#xED;o, se muestra mensaje de error y se corta el flujo.&#xD;
32
  &#xD;
33
+ - Varios fixes menores y mejoras de estabilidad</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><author><name>Bruno Mininno</name><user>brunomininno</user><email>bruno.mininno@ecloudsolutions.com</email></author></authors>
35
+ <date>2015-03-19</date>
36
+ <time>17:28:55</time>
37
+ <contents><target name="magecommunity"><dir name="Ecloud"><dir name="Andreani"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><file name="Edit.php" hash="85135032678f604291f03f3866020036"/><dir name="Form"><dir name="Field"><file name="Medida.php" hash="6b558bd9bbccacb378561da0886cb04f"/></dir></dir></dir><dir name="Pedidos"><dir name="Edit"><file name="Form.php" hash="f2ff67ba517a3ae05d4731f87fbe101a"/><dir name="Renderer"><file name="Button.php" hash="07a0dea7e88aff3d192d2e64bf6e814f"/></dir></dir><file name="Edit.php" hash="3ba66480a728c573b3573c7135588f57"/><file name="Grid.php" hash="fa42a52b3fe145648f1e056af63627d4"/></dir><file name="Pedidos.php" hash="5af5fdeef962007f63146da5888cf34d"/></dir><file name="Andreani.php" hash="14de993133b649bea21178a3ec9abc04"/></dir><dir name="Helper"><file name="Data.php" hash="4c2d1efdcaa62059ebaecc333e0ecdcf"/></dir><dir name="Model"><file name="Andreani.php" hash="63458a5587445c02aebb848c0f053ea8"/><dir name="Carrier"><file name="Andreani.php" hash="81b15ad2b27fb8813cc3ea6464a48828"/><file name="Andreaniestandar.php" hash="cd5cb6ec2765b92591c3747555a46897"/><file name="Andreanisucursal.php" hash="e4fe2c13ecb2178784da250bde7e1a50"/><file name="Andreaniurgente.php" hash="f05e1770c13861eadc14872a117a5254"/></dir><dir name="Config"><file name="Medida.php" hash="2c3fc5e657966137be69f77c7f413eca"/><file name="Metodo.php" hash="84525436550fb7c431f917e78e029b8f"/><file name="Pesomax.php" hash="976a713b31c147c56905bced2fd66460"/><file name="TestMode.php" hash="f5fdd0f92f11cf8804dbe101f4338b7c"/></dir><file name="Observer.php" hash="edad9d0f235b0691df53998b37a740e8"/><file name="Order.php" hash="1b9106c8d4adcff11ed371694fa63278"/><dir name="Resource"><dir name="Order"><file name="Collection.php" hash="6e493cf6a3805aba931c574d5214aa6f"/></dir><file name="Order.php" hash="9962bb0bf59ccffc5a86b5c35dcb02be"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="OrdersController.php" hash="3d43bd59d9e250d1bdb2676460c9d021"/><dir name="Pedidos"><file name="PedidosController.php" hash="bc613585db8debe46922d0386c538db1"/></dir><file name="PedidosController.php" hash="b131436a47c97744c8b3269f3e5f49fb"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="572688a74a8eb634953c6bf59d2635f2"/><file name="config.xml" hash="880d3dbe685fc26a3230fddbb16d964f"/><file name="system.xml" hash="8396ab20317b606a46592cf9d713635c"/></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.10-0.1.11.php" hash="49cb97b29c78ba1ab6f3497559bc6556"/><file name="mysql4-upgrade-0.1.11-0.1.11.1.php" hash="62dad26e33e9bd0e0f251721d9b1fe08"/><file name="mysql4-upgrade-0.1.11.1-0.1.12.php" hash="2e5071273633e63d487fa573dc2a33d9"/><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="20b4ea24bc324772fc513d186b254331"/></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=""/></dir></dir><dir name="customer"><dir name="address"><file name="edit.phtml" hash=""/></dir></dir><dir name="persistent"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash=""/></dir></dir></dir><dir name="shipping"><dir name="tracking"><file name="popup.phtml" hash=""/></dir></dir></dir></dir></dir></dir></target></contents>
38
  <compatible/>
39
  <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>
40
  </package>