Andreani - Version 0.1.8

Version Notes

Release Version 0.1.8

Funcionalidades:
- Arreglo en valor de volumen
- Arreglo en el detalle de productos que se envia al WS (repite los productos)
- % de descuento o aumento para servicio (Admin)
- Aplicar promociones en el precio cuando se aplican reglas.
- Activaciòn de cache de sucursales para optimizar llamadas al WS

Download this release

Release Info

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

Code changes from version 0.1.7 to 0.1.8

Files changed (27) hide show

app/code/local/Ecloud/Andreani/Block/Adminhtml/Config/Edit.php +1 -1
app/code/local/Ecloud/Andreani/Block/Adminhtml/Config/Form/Field/Medida.php +2 -2
app/code/local/Ecloud/Andreani/Block/Adminhtml/Pedidos.php +1 -1
app/code/local/Ecloud/Andreani/Block/Adminhtml/Pedidos/Edit.php +1 -1
app/code/local/Ecloud/Andreani/Block/Adminhtml/Pedidos/Edit/Form.php +1 -1
app/code/local/Ecloud/Andreani/Block/Adminhtml/Pedidos/Edit/Renderer/Button.php +1 -1
app/code/local/Ecloud/Andreani/Block/Adminhtml/Pedidos/Grid.php +1 -1
app/code/local/Ecloud/Andreani/Block/Andreani.php +1 -1
app/code/local/Ecloud/Andreani/Helper/Data.php +21 -11
app/code/local/Ecloud/Andreani/Model/Andreani.php +44 -16
app/code/local/Ecloud/Andreani/Model/Carrier/Andreani.php +121 -39
app/code/local/Ecloud/Andreani/Model/Carrier/Andreaniestandar.php +1 -1
app/code/local/Ecloud/Andreani/Model/Carrier/Andreanisucursal.php +1 -1
app/code/local/Ecloud/Andreani/Model/Carrier/Andreaniurgente.php +1 -1
app/code/local/Ecloud/Andreani/Model/Config/Medida.php +1 -1
app/code/local/Ecloud/Andreani/Model/Config/TestMode.php +1 -1
app/code/local/Ecloud/Andreani/Model/Observer.php +2 -4
app/code/local/Ecloud/Andreani/Model/Order.php +1 -1
app/code/local/Ecloud/Andreani/Model/Resource/Order.php +1 -1
app/code/local/Ecloud/Andreani/Model/Resource/Order/Collection.php +1 -1
app/code/local/Ecloud/Andreani/controllers/Adminhtml/Pedidos/PedidosController.php +1 -1
app/code/local/Ecloud/Andreani/controllers/Adminhtml/PedidosController.php +1 -1
app/code/local/Ecloud/Andreani/etc/config.xml +11 -7
app/code/local/Ecloud/Andreani/etc/system.xml +66 -15
app/code/local/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.7-0.1.8.php +7 -0
app/design/frontend/default/default/template/persistent/checkout/onepage/billing.phtml +209 -0
package.xml +11 -6

app/code/local/Ecloud/Andreani/Block/Adminhtml/Config/Edit.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version 0.1.7 03.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/


1	<?php
2	/**
3	+ * @version 0.1.8 04.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/

app/code/local/Ecloud/Andreani/Block/Adminhtml/Config/Form/Field/Medida.php CHANGED Viewed

	@@ -1,13 +1,13 @@
1	<?php
2	/**
3	- * @version 0.1.7 03.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/
7	?>
8	<?php
9	/**
10	- * @version 0.1.7 03.07.2014
11	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
12	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
13	*/


1	<?php
2	/**
3	+ * @version 0.1.8 04.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/
7	?>
8	<?php
9	/**
10	+ * @version 0.1.8 04.07.2014
11	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
12	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
13	*/

app/code/local/Ecloud/Andreani/Block/Adminhtml/Pedidos.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version 0.1.7 03.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/


1	<?php
2	/**
3	+ * @version 0.1.8 04.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/

app/code/local/Ecloud/Andreani/Block/Adminhtml/Pedidos/Edit.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version 0.1.7 03.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/


1	<?php
2	/**
3	+ * @version 0.1.8 04.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/

app/code/local/Ecloud/Andreani/Block/Adminhtml/Pedidos/Edit/Form.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version 0.1.7 03.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/


1	<?php
2	/**
3	+ * @version 0.1.8 04.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/

app/code/local/Ecloud/Andreani/Block/Adminhtml/Pedidos/Edit/Renderer/Button.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version 0.1.7 03.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/


1	<?php
2	/**
3	+ * @version 0.1.8 04.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/

app/code/local/Ecloud/Andreani/Block/Adminhtml/Pedidos/Grid.php CHANGED Viewed

	@@ -1,7 +1,7 @@
1
2	<?php
3	/**
4	- * @version 0.1.7 03.07.2014
5	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
6	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
7	*/


1
2	<?php
3	/**
4	+ * @version 0.1.8 04.07.2014
5	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
6	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
7	*/

app/code/local/Ecloud/Andreani/Block/Andreani.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version 0.1.7 03.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/


1	<?php
2	/**
3	+ * @version 0.1.8 04.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/

app/code/local/Ecloud/Andreani/Helper/Data.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version 0.1.7 03.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/
	@@ -65,12 +65,12 @@ class Ecloud_Andreani_Helper_Data extends Mage_Core_Helper_Abstract
65	}
66
67	$estadoenvio = array(
68	- "Nropieza" => $request->Pieza->NroPieza,
69	- "NombreEnvio" => $request->Pieza->Envios->Envio->NombreEnvio,
70	- "Codigotracking" => $request->Pieza->Envios->Envio->NroAndreani,
71	- "FechAlta" => $request->Pieza->Envios->Envio->FechaAlta,
72	- "Eventos" => $eventos
73	- );
74
75	return $estadoenvio;
76
	@@ -80,12 +80,22 @@ class Ecloud_Andreani_Helper_Data extends Mage_Core_Helper_Abstract
80
81	}
82
83	- }
84	- ?>

85





86

87

88


89
90	-
91	-


1	<?php
2	/**
3	+ * @version 0.1.8 04.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/

65	}
66
67	$estadoenvio = array(
68	+ "Nropieza" => $request->Pieza->NroPieza,
69	+ "NombreEnvio" => $request->Pieza->Envios->Envio->NombreEnvio,
70	+ "Codigotracking" => $request->Pieza->Envios->Envio->NroAndreani,
71	+ "FechAlta" => $request->Pieza->Envios->Envio->FechaAlta,
72	+ "Eventos" => $eventos
73	+ );
74
75	return $estadoenvio;
76

80
81	}
82
83	+ public function getWeight() {
84	+ $peso = 11;
85	+ $medida = 1000;
86
87	+ $cart = Mage::getModel('checkout/cart')->getQuote();
88	+ foreach ($cart->getAllItems() as $item) {
89	+ $datos["cantidad"][] = $item->getProduct()->getQty();
90	+ $datos["peso"][] = $item->getProduct()->getWeight();
91	+ $datos["name"][] = $item->getProduct()->getName();
92
93	+ $datos["total"] = ($item->getProduct()->getQty() * $item->getProduct()->getWeight() * $medida) + $datos["total"];
94
95	+ }
96
97	+ return $datos;
98	+ }
99
100	+ }
101	+ ?>

app/code/local/Ecloud/Andreani/Model/Andreani.php CHANGED Viewed

@@ -1,17 +1,45 @@
-            -
            <?php
-            -
            /**
-            -
             * @version   0.1.7 03.07.2014
-            -
             * @author    ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
-            -
             * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
-            -
             */
-            -
            ?><?php
-            -
            class Ecloud_Andreani_Model_Andreani extends Mage_Core_Model_Abstract
-            -
            {
-            -
                 public function _construct()
-            -
                 {
-            -
                     parent::_construct();
-            -
                     $this->_init('andreani/andreani');
-            -
                 }
-            -
-            -
            }
             ?>


1	+ <?php
2	+ /**
3	+ * @version 0.1.8 04.07.2014
4	+ * @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	+ * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	+ */
7	+ ?><?php
8	+ class Ecloud_Andreani_Model_Andreani extends Mage_Core_Model_Abstract
9	+ {
10	+ public function _construct()
11	+ {
12	+ parent::_construct();
13	+ $this->_init('andreani/andreani');
14	+
15	+ foreach ($request->getAllItems() as $_item) {
16	+ // Tomamos el attr "medida" segun la configuracion del cliente
17	+ if (Mage::getStoreConfig('carriers/andreaniconfig/medida',Mage::app()->getStore())=="") {
18	+ $datos["medida"] = "gramos";
19	+ } else {
20	+ $datos["medida"] = Mage::getStoreConfig('carriers/andreaniconfig/medida',Mage::app()->getStore());
21	+ }
22	+
23	+ if ($datos["medida"]=="kilos") {
24	+ $datos["medida"] = 1000;
25	+ } elseif ($datos["medida"]=="gramos") {
26	+ $datos["medida"] = 1;
27	+ } else {
28	+ $datos["medida"] = 1; //si está vacio: "gramos"
29	+ }
30	+ $datos["peso"] = ($_item->getQty() * $_item->getWeight() * $datos["medida"]) + $datos["peso"];
31	+ $datos["valorDeclarado"] = ($_item->getQty() * $_item->getPrice()) + $datos["valorDeclarado"];
32	+
33	+ $product = Mage::getModel('catalog/product')->loadByAttribute('sku', $_item->getSku(), array('volumen'));
34	+ $datos["volumen"] = ($_item->getQty() * $product->getVolumen() * $datos["medida"]) + $datos["volumen"];
35	+
36	+ // Creamos un string con el detalle de cada producto
37	+ $datos["DetalleProductos"] = "(" . $_item->getQty() . ") " .$_item->getName() . " + " . $datos["DetalleProductos"];
38	+ }
39	+
40	+ die(var_dump($datos["volumen"]));
41	+
42	+ }
43	+
44	+ }
45	?>

app/code/local/Ecloud/Andreani/Model/Carrier/Andreani.php CHANGED Viewed

@@ -1,6 +1,6 @@
             <?php
             /**
-            -
             * @version   0.1.6 20.02.2014
              * @author    ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
              * @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
              */
@@ -28,34 +28,56 @@
                         $datos["valorDeclarado"]    = 0;
                         $datos["volumen"]           = 0;
                         $datos["DetalleProductos"]  = "";
                         Mage::getSingleton('core/session')->unsAndreani();
-            -
                        // Reiniciar variable Sucursales si cambio la dirección, ciudad, provincia o cp.
-            -
                        //Mage::getSingleton('core/session')->unsSucursales();
                         foreach ($request->getAllItems() as $_item) {
-            -
                            // Tomamos el attr "medida" segun la configuracion del cliente
-            -
                            if (Mage::getStoreConfig('carriers/andreaniconfig/medida',Mage::app()->getStore())=="") {
-            -
                                $datos["medida"] = "gramos";
-            -
                            } else {
-            -
                                $datos["medida"] = Mage::getStoreConfig('carriers/andreaniconfig/medida',Mage::app()->getStore());
-            -
                            }
-            -
                            if ($datos["medida"]=="kilos") {
-            -
                                $datos["medida"] = 1000;
-            -
                            } elseif ($datos["medida"]=="gramos") {
-            -
                                $datos["medida"] = 1;
-            -
                            } else {
-            -
                                $datos["medida"] = 1; //si está vacio: "gramos"
-            -
                            }
-            -
                            $datos["peso"]           = ($_item->getQty() * $_item->getWeight() * $datos["medida"]) + $datos["peso"];
-            -
                            $datos["valorDeclarado"] = ($_item->getQty() * $_item->getPrice()) + $datos["valorDeclarado"];
-            -
-            -
                            $product = Mage::getModel('catalog/product')->loadByAttribute('sku', $_item->getSku(), array('volumen'));
-            -
                            $datos["volumen"] = ($_item->getQty() * $product->getVolumen() * $datos["medida"]) + $datos["volumen"];
-            -
                            // Creamos un string con el detalle de cada producto
-            -
                            $datos["DetalleProductos"] = "(" . $_item->getQty() . ") " .$_item->getName() . " + " . $datos["DetalleProductos"];
+                        }
                         $cart   = Mage::getSingleton('checkout/cart');
                         $quote  = $cart->getQuote();
@@ -78,14 +100,43 @@
                         $result = Mage::getModel('shipping/rate_result');
                         $method = Mage::getModel('shipping/rate_result_method');
                         if ($this->_code == "andreaniestandar" & Mage::getStoreConfig('carriers/andreaniestandar/active',Mage::app()->getStore()) == 1) {
-            -
                            $result->append($this->_getAndreaniEstandar($datos));
+                        }
                         if ($this->_code == "andreaniurgente" & Mage::getStoreConfig('carriers/andreaniurgente/active',Mage::app()->getStore()) == 1) {
-            -
                            $result->append($this->_getAndreaniUrgente($datos));
+                        }
                         if ($this->_code == "andreanisucursal" & Mage::getStoreConfig('carriers/andreanisucursal/active',Mage::app()->getStore()) == 1) {
-            -
                            $result->append($this->_getAndreaniSucursal($datos));
+                        }
                         return $result;
@@ -97,7 +148,7 @@
                     * @param Datos del usuario y el carrito de compras $data
                     * @return Los datos para armar el Método de envío $rate
                     */
-            -
                    protected function _getAndreaniEstandar($datos){
                         Mage::log("Andreani Estandar");
                         $rate = Mage::getModel('shipping/rate_result_method');
@@ -109,11 +160,11 @@
                         $datos["contrato"]      = Mage::getStoreConfig('carriers/andreaniestandar/contrato',Mage::app()->getStore());
                         if (Mage::getStoreConfig('carriers/andreaniconfig/testmode',Mage::app()->getStore()) == 1) {
-            -
                                $datos["urlCotizar"]        = 'https://www.e-andreani.com/CasaStaging/eCommerce/CotizacionEnvio.svc?wsdl';
-            -
                                $datos["urlSucursal"]       = 'https://www.e-andreani.com/CasaStaging/ecommerce/ConsultaSucursales.svc?wsdl';
                         } else {
-            -
                                $datos["urlCotizar"]        = 'https://www.e-andreani.com/CASAWS/eCommerce/CotizacionEnvio.svc?wsdl';
-            -
                                $datos["urlSucursal"]       = 'https://www.e-andreani.com/CASAWS/ecommerce/ConsultaSucursales.svc?wsdl';
+                        }
                         // Buscamos la sucursal mas cercana del cliente segun el CP ingresado
@@ -135,9 +186,19 @@
+                        }
                         $rate->setMethodTitle($texto);
-            -
                        $rate->setPrice($datos["precio"]);
-            -
                        $rate->setCost($datos["precio"]);
                         return $rate;
+                    }
@@ -148,7 +209,7 @@
                     * @param Datos del usuario y el carrito de compras $data
                     * @return Los datos para armar el Método de envío $rate
                     */
-            -
                    protected function _getAndreaniUrgente($datos){
                         Mage::log("Andreani Urgente");
                         $rate = Mage::getModel('shipping/rate_result_method');
@@ -186,8 +247,19 @@
+                        }
                         $rate->setMethodTitle($texto);
-            -
                        $rate->setPrice($datos["precio"]);
-            -
                        $rate->setCost($datos["precio"]);
                         return $rate;
+                    }
@@ -198,7 +270,7 @@
                     * @param Datos del usuario y el carrito de compras $data
                     * @return Los datos para armar el Método de envío $rate
                     */
-            -
                    protected function _getAndreaniSucursal($datos){
                         Mage::log("Andreani Sucursal");
                         $rate = Mage::getModel('shipping/rate_result_method');
@@ -238,8 +310,18 @@
                         $rate->setMethodTitle($texto);
-            -
                        $rate->setPrice($datos["precio"]);
-            -
                        $rate->setCost($datos["precio"]);
                         return $rate;
+                    }


1	<?php
2	/**
3	+ * @version 0.1.8 04.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/

28	$datos["valorDeclarado"] = 0;
29	$datos["volumen"] = 0;
30	$datos["DetalleProductos"] = "";
31	+ $sku = "";
32	+ $freeBoxes = 0;
33	Mage::getSingleton('core/session')->unsAndreani();


34
35	+ // Reiniciar variable Sucursales para descachear las Sucursales.
36	+ if(!Mage::getStoreConfig('carriers/andreaniconfig/cache',Mage::app()->getStore())) {
37	+ Mage::getSingleton('core/session')->unsSucursales();
38	+ }
39	+
40	+ // Tomamos el attr "medida" segun la configuracion del cliente
41	+ if (Mage::getStoreConfig('carriers/andreaniconfig/medida',Mage::app()->getStore())=="") {
42	+ $datos["medida"] = "gramos";
43	+ } else {
44	+ $datos["medida"] = Mage::getStoreConfig('carriers/andreaniconfig/medida',Mage::app()->getStore());
45	+ }
46	+
47	+ if ($datos["medida"]=="kilos") {
48	+ $datos["medida"] = 1000;
49	+ } elseif ($datos["medida"]=="gramos") {
50	+ $datos["medida"] = 1;
51	+ } else {
52	+ $datos["medida"] = 1; //si está vacio: "gramos"
53	+ }
54	+
55	foreach ($request->getAllItems() as $_item) {
56	+ if($sku != $_item->getSku()) {
57	+ $sku = $_item->getSku();
58	+ $datos["peso"] = ($_item->getQty() * $_item->getWeight() * $datos["medida"]) + $datos["peso"];
59	+ $datos["valorDeclarado"] = ($_item->getQty() * $_item->getPrice()) + $datos["valorDeclarado"];
60	+
61	+ $product = Mage::getModel('catalog/product')->loadByAttribute('sku', $_item->getSku(), array('volumen'));
62	+ $datos["volumen"] += ($_item->getQty() * $product->getVolumen() * $datos["medida"]);
63	+
64	+ //$datos["volumenstring"] = $_item->getQty() . " x " . $product->getVolumen() . " x " . $datos["medida"];
65	+ //Mage::log("Volumen String: " . print_r($datos["volumenstring"],true));
66	+ //Mage::log("Volumen: " . print_r($datos["volumen"],true));
67
68	+ // Creamos un string con el detalle de cada producto
69	+ $datos["DetalleProductos"] = "(" . $_item->getQty() . ") " .$_item->getName() . " + " . $datos["DetalleProductos"];










70
71	+ // Si la condicion de free shipping está seteada en el producto
72	+ if ($_item->getFreeShippingDiscount() && !$_item->getProduct()->isVirtual()) {
73	+ Mage::log("getFreeShippingDiscount: " . print_r($_item->getQty(),true));
74	+ $freeBoxes += $_item->getQty();
75	+ }
76	+ }
77	}
78	+
79	+ // Seteamos las reglas
80	+ if(isset($freeBoxes)) $this->setFreeBoxes($freeBoxes);
81
82	$cart = Mage::getSingleton('checkout/cart');
83	$quote = $cart->getQuote();

100	$result = Mage::getModel('shipping/rate_result');
101	$method = Mage::getModel('shipping/rate_result_method');
102
103	+ $error_msg = Mage::helper('andreani')->__("Su pedido supera el peso máximo de 35 kg permitido por Andreani. Por favor divida su orden en más pedidos o consulte al administrador de la tienda. Gracias y disculpe las molestias.");
104	+
105	if ($this->_code == "andreaniestandar" & Mage::getStoreConfig('carriers/andreaniestandar/active',Mage::app()->getStore()) == 1) {
106	+ // En CASAWS -> 35 kg
107	+ if($datos["volumen"] >= 35000){
108	+ $error = Mage::getModel('shipping/rate_result_error');
109	+ $error->setCarrier($this->_code);
110	+ $error->setCarrierTitle($this->getConfigData('title'));
111	+ $error->setErrorMessage($error_msg);
112	+ return $error;
113	+ } else {
114	+ $result->append($this->_getAndreaniEstandar($datos,$request));
115	+ }
116	}
117	if ($this->_code == "andreaniurgente" & Mage::getStoreConfig('carriers/andreaniurgente/active',Mage::app()->getStore()) == 1) {
118	+ // En CASAWS -> 35 kg
119	+ if($datos["volumen"] >= 35000){
120	+ $error = Mage::getModel('shipping/rate_result_error');
121	+ $error->setCarrier($this->_code);
122	+ $error->setCarrierTitle($this->getConfigData('title'));
123	+ $error->setErrorMessage($error_msg);
124	+ return $error;
125	+ } else {
126	+ $result->append($this->_getAndreaniUrgente($datos,$request));
127	+ }
128	}
129	if ($this->_code == "andreanisucursal" & Mage::getStoreConfig('carriers/andreanisucursal/active',Mage::app()->getStore()) == 1) {
130	+ // En CASAWS -> 35 kg
131	+ if($datos["volumen"] >= 35000){
132	+ $error = Mage::getModel('shipping/rate_result_error');
133	+ $error->setCarrier($this->_code);
134	+ $error->setCarrierTitle($this->getConfigData('title'));
135	+ $error->setErrorMessage($error_msg);
136	+ return $error;
137	+ } else {
138	+ $result->append($this->_getAndreaniSucursal($datos,$request));
139	+ }
140	}
141
142	return $result;

148	* @param Datos del usuario y el carrito de compras $data
149	* @return Los datos para armar el Método de envío $rate
150	*/
151	+ protected function _getAndreaniEstandar($datos,$request){
152	Mage::log("Andreani Estandar");
153
154	$rate = Mage::getModel('shipping/rate_result_method');

160	$datos["contrato"] = Mage::getStoreConfig('carriers/andreaniestandar/contrato',Mage::app()->getStore());
161
162	if (Mage::getStoreConfig('carriers/andreaniconfig/testmode',Mage::app()->getStore()) == 1) {
163	+ $datos["urlCotizar"] = 'https://www.e-andreani.com/CasaStaging/eCommerce/CotizacionEnvio.svc?wsdl';
164	+ $datos["urlSucursal"] = 'https://www.e-andreani.com/CasaStaging/ecommerce/ConsultaSucursales.svc?wsdl';
165	} else {
166	+ $datos["urlCotizar"] = 'https://www.e-andreani.com/CASAWS/eCommerce/CotizacionEnvio.svc?wsdl';
167	+ $datos["urlSucursal"] = 'https://www.e-andreani.com/CASAWS/ecommerce/ConsultaSucursales.svc?wsdl';
168	}
169
170	// Buscamos la sucursal mas cercana del cliente segun el CP ingresado

186	}
187
188	$rate->setMethodTitle($texto);
189	+
190	+ if($request->getFreeShipping() == true \|\| $request->getPackageQty() == $this->getFreeBoxes()) {
191	+ $shippingPrice = '0.00';
192	+ // cambiamos el titulo para indicar que el envio es gratis
193	+ $rate->setMethodTitle(Mage::helper('andreani')->__('Envío gratis.'));
194	+ } else {
195	+ $shippingPrice = $this->getFinalPriceWithHandlingFee($datos["precio"]);
196	+ }
197	+
198	+ $shippingPrice = $shippingPrice + ($shippingPrice * Mage::getStoreConfig('carriers/andreaniestandar/regla') / 100);
199
200	+ $rate->setPrice($shippingPrice);
201	+ $rate->setCost($shippingPrice);
202
203	return $rate;
204	}

209	* @param Datos del usuario y el carrito de compras $data
210	* @return Los datos para armar el Método de envío $rate
211	*/
212	+ protected function _getAndreaniUrgente($datos,$request){
213	Mage::log("Andreani Urgente");
214
215	$rate = Mage::getModel('shipping/rate_result_method');

247	}
248
249	$rate->setMethodTitle($texto);
250	+
251	+ if($request->getFreeShipping() == true \|\| $request->getPackageQty() == $this->getFreeBoxes()) {
252	+ $shippingPrice = '0.00';
253	+ // cambiamos el titulo para indicar que el envio es gratis
254	+ $rate->setMethodTitle(Mage::helper('andreani')->__('Envío gratis.'));
255	+ } else {
256	+ $shippingPrice = $this->getFinalPriceWithHandlingFee($datos["precio"]);
257	+ }
258	+
259	+ $shippingPrice = $shippingPrice + ($shippingPrice * Mage::getStoreConfig('carriers/andreaniurgente/regla') / 100);
260	+
261	+ $rate->setPrice($shippingPrice);
262	+ $rate->setCost($shippingPrice);
263
264	return $rate;
265	}

270	* @param Datos del usuario y el carrito de compras $data
271	* @return Los datos para armar el Método de envío $rate
272	*/
273	+ protected function _getAndreaniSucursal($datos,$request){
274	Mage::log("Andreani Sucursal");
275
276	$rate = Mage::getModel('shipping/rate_result_method');

310
311	$rate->setMethodTitle($texto);
312
313	+ if($request->getFreeShipping() == true \|\| $request->getPackageQty() == $this->getFreeBoxes()) {
314	+ $shippingPrice = '0.00';
315	+ // cambiamos el titulo para indicar que el envio es gratis
316	+ $rate->setMethodTitle(Mage::helper('andreani')->__('Envío gratis.'));
317	+ } else {
318	+ $shippingPrice = $this->getFinalPriceWithHandlingFee($datos["precio"]);
319	+ }
320	+
321	+ $shippingPrice = $shippingPrice + ($shippingPrice * Mage::getStoreConfig('carriers/andreanisucursal/regla') / 100);
322	+
323	+ $rate->setPrice($shippingPrice);
324	+ $rate->setCost($shippingPrice);
325
326	return $rate;
327	}

app/code/local/Ecloud/Andreani/Model/Carrier/Andreaniestandar.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version 0.1.7 03.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/


1	<?php
2	/**
3	+ * @version 0.1.8 04.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/

app/code/local/Ecloud/Andreani/Model/Carrier/Andreanisucursal.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version 0.1.7 03.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/


1	<?php
2	/**
3	+ * @version 0.1.8 04.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/

app/code/local/Ecloud/Andreani/Model/Carrier/Andreaniurgente.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version 0.1.7 03.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/


1	<?php
2	/**
3	+ * @version 0.1.8 04.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/

app/code/local/Ecloud/Andreani/Model/Config/Medida.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version 0.1.7 03.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/


1	<?php
2	/**
3	+ * @version 0.1.8 04.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/

app/code/local/Ecloud/Andreani/Model/Config/TestMode.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version 0.1.7 03.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/


1	<?php
2	/**
3	+ * @version 0.1.8 04.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/

app/code/local/Ecloud/Andreani/Model/Observer.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version 0.1.7 03.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/
	@@ -139,7 +139,7 @@ class Ecloud_Andreani_Model_Observer extends Mage_Core_Model_Session_Abstract {
139	'SucursalRetiro' => $datos["sucursal_retiro"],
140	'Tarifa' => $datos["precio"],
141	'TipoDocumento' => "DNI",
142	- 'ValorACobrar' => ~~$datos[~~"~~precio~~"], // Si es contrarembolso deberiamos sumar el "ValorDeclarado"
143	'ValorDeclarado' => $datos["valor_declarado"],
144	'Volumen' => $datos["volumen"]
145	)));
	@@ -168,12 +168,10 @@ class Ecloud_Andreani_Model_Observer extends Mage_Core_Model_Session_Abstract {
168	Mage::getModel('andreani/order')->load($id)->setData('estado','Enviado')->save();
169	Mage::getModel('andreani/order')->load($id)->setData('constancia',$ConstanciaURL)->save();
170
171	-
172	} catch (SoapFault $e) {
173	Mage::log("Error: " . $e);
174	}
175
176	-
177	}
178
179	}


1	<?php
2	/**
3	+ * @version 0.1.8 04.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/

139	'SucursalRetiro' => $datos["sucursal_retiro"],
140	'Tarifa' => $datos["precio"],
141	'TipoDocumento' => "DNI",
142	+ 'ValorACobrar' => "", // Si es contrarembolso deberiamos sumar el "ValorDeclarado" -- $datos["precio"]
143	'ValorDeclarado' => $datos["valor_declarado"],
144	'Volumen' => $datos["volumen"]
145	)));

168	Mage::getModel('andreani/order')->load($id)->setData('estado','Enviado')->save();
169	Mage::getModel('andreani/order')->load($id)->setData('constancia',$ConstanciaURL)->save();
170

171	} catch (SoapFault $e) {
172	Mage::log("Error: " . $e);
173	}
174

175	}
176
177	}

app/code/local/Ecloud/Andreani/Model/Order.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version 0.1.7 03.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/


1	<?php
2	/**
3	+ * @version 0.1.8 04.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/

app/code/local/Ecloud/Andreani/Model/Resource/Order.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version 0.1.7 03.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/


1	<?php
2	/**
3	+ * @version 0.1.8 04.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/

app/code/local/Ecloud/Andreani/Model/Resource/Order/Collection.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version 0.1.7 03.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/


1	<?php
2	/**
3	+ * @version 0.1.8 04.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/

app/code/local/Ecloud/Andreani/controllers/Adminhtml/Pedidos/PedidosController.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version 0.1.7 03.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/


1	<?php
2	/**
3	+ * @version 0.1.8 04.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/

app/code/local/Ecloud/Andreani/controllers/Adminhtml/PedidosController.php CHANGED Viewed

	@@ -1,6 +1,6 @@
1	<?php
2	/**
3	- * @version 0.1.7 03.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/


1	<?php
2	/**
3	+ * @version 0.1.8 04.07.2014
4	* @author ecloud solutions http://www.ecloudsolutions.com <info@ecloudsolutions.com>
5	* @copyright Copyright (C) 2010 - 2014 ecloud solutions ®
6	*/

app/code/local/Ecloud/Andreani/etc/config.xml CHANGED Viewed

	@@ -2,7 +2,7 @@
2	<config>
3	<modules>
4	<Ecloud_Andreani>
5	- <version>0.1.7</version>
6	</Ecloud_Andreani>
7	</modules>
8	<global>
	@@ -156,14 +156,18 @@
156	</adminhtml>
157	<default>
158	<carriers>




159	<andreaniestandar>
160	<active>0</active>
161	<model>andreani/carrier_andreaniestandar</model>
162	<name>andreani</name>
163	<title>Andreani Estandar</title>
164	<description><![CDATA[Recibí el pedido en tu casa.]]></description>
165	- <sort_order>0</sort_order>
166	- <~~medida~~>~~kilos~~</~~medida~~>
167	</andreaniestandar>
168	<andreaniurgente>
169	<active>0</active>
	@@ -171,8 +175,8 @@
171	<name>andreaniurgente</name>
172	<title>Andreani Urgente</title>
173	<description><![CDATA[Recibí el pedido en tu casa en 24 hs!]]></description>
174	- <sort_order>10</sort_order>
175	- <~~medida~~>~~kilos~~</~~medida~~>
176	</andreaniurgente>
177	<andreanisucursal>
178	<active>0</active>
	@@ -180,8 +184,8 @@
180	<name>andreanisucursal</name>
181	<title>Andreani Sucursal</title>
182	<description><![CDATA[Busca el pedido en la sucursal más cercana: ]]></description>
183	- <sort_order>10</sort_order>
184	- <~~medida~~>~~kilos~~</~~medida~~>
185	</andreanisucursal>
186	</carriers>
187	</default>


2	<config>
3	<modules>
4	<Ecloud_Andreani>
5	+ <version>0.1.8</version>
6	</Ecloud_Andreani>
7	</modules>
8	<global>

156	</adminhtml>
157	<default>
158	<carriers>
159	+ <andreaniconfig>
160	+ <cache>0</cache>
161	+ <medida>kilos</medida>
162	+ </andreaniconfig>
163	<andreaniestandar>
164	<active>0</active>
165	<model>andreani/carrier_andreaniestandar</model>
166	<name>andreani</name>
167	<title>Andreani Estandar</title>
168	<description><![CDATA[Recibí el pedido en tu casa.]]></description>
169	+ <sort_order>10</sort_order>
170	+ <regla>0</regla>
171	</andreaniestandar>
172	<andreaniurgente>
173	<active>0</active>

175	<name>andreaniurgente</name>
176	<title>Andreani Urgente</title>
177	<description><![CDATA[Recibí el pedido en tu casa en 24 hs!]]></description>
178	+ <sort_order>20</sort_order>
179	+ <regla>0</regla>
180	</andreaniurgente>
181	<andreanisucursal>
182	<active>0</active>

184	<name>andreanisucursal</name>
185	<title>Andreani Sucursal</title>
186	<description><![CDATA[Busca el pedido en la sucursal más cercana: ]]></description>
187	+ <sort_order>30</sort_order>
188	+ <regla>0</regla>
189	</andreanisucursal>
190	</carriers>
191	</default>

app/code/local/Ecloud/Andreani/etc/system.xml CHANGED Viewed

	@@ -19,15 +19,39 @@
19	<show_in_store>1</show_in_store>
20	<model>andreani/carrier_andreani</model>
21	<comment><![CDATA[Contactate con un representante <strong>Andreani</strong> para obtener tus datos de cliente y empezar a utilizar nuestros servicios!<br /><a href="http://www.andreani.com/Contacts" target="_blank">www.andreani.com</a>]]></comment>
22	- <fields>
























23	<usuario translate="label">
24	<label>Nombre de Usuario: </label>
25	<default></default>

26	<frontend_type>text</frontend_type>
27	<show_in_default>1</show_in_default>
28	<show_in_website>1</show_in_website>
29	<show_in_store>1</show_in_store>
30	- <sort_order>40</sort_order>
31	</usuario>
32	<password translate="label">
33	<label>Contraseña:</label>
	@@ -36,7 +60,7 @@
36	<show_in_default>1</show_in_default>
37	<show_in_website>1</show_in_website>
38	<show_in_store>1</show_in_store>
39	- <sort_order>45</sort_order>
40	</password>
41	<nrocliente translate="label">
42	<label>Numero de Cliente:</label>
	@@ -58,21 +82,12 @@
58	<show_in_store>1</show_in_store>
59	<sort_order>60</sort_order>
60	</medida>
61	- <testmode translate="label">
62	- <label>Test Mode:</label>
63	- <frontend_type>select</frontend_type>
64	- <source_model>andreani/config_TestMode</source_model>
65	- <sort_order>20</sort_order>
66	- <show_in_default>1</show_in_default>
67	- <show_in_website>1</show_in_website>
68	- <show_in_store>1</show_in_store>
69	- </testmode>
70	</fields>
71	</andreaniconfig>
72	<andreanisucursal translate="label">
73	<label>Andreani Sucursal</label>
74	<frontend_type>text</frontend_type>
75	- <sort_order>10</sort_order>
76	<show_in_default>1</show_in_default>
77	<show_in_website>1</show_in_website>
78	<show_in_store>1</show_in_store>
	@@ -157,12 +172,24 @@
157	<show_in_store>1</show_in_store>
158	<sort_order>90</sort_order>
159	</gccontrato>












160	</fields>
161	</andreanisucursal>
162	<andreaniurgente translate="label">
163	<label>Andreani Urgente</label>
164	<frontend_type>text</frontend_type>
165	- <sort_order>10</sort_order>
166	<show_in_default>1</show_in_default>
167	<show_in_website>1</show_in_website>
168	<show_in_store>1</show_in_store>
	@@ -246,7 +273,19 @@
246	<show_in_website>1</show_in_website>
247	<show_in_store>1</show_in_store>
248	<sort_order>90</sort_order>
249	- </gccontrato>












250	</fields>
251	</andreaniurgente>
252	<andreaniestandar translate="label">
	@@ -340,6 +379,18 @@
340	<show_in_store>1</show_in_store>
341	<sort_order>90</sort_order>
342	</gccontrato>












343	</fields>
344	</andreaniestandar>
345	</groups>


19	<show_in_store>1</show_in_store>
20	<model>andreani/carrier_andreani</model>
21	<comment><![CDATA[Contactate con un representante <strong>Andreani</strong> para obtener tus datos de cliente y empezar a utilizar nuestros servicios!<br /><a href="http://www.andreani.com/Contacts" target="_blank">www.andreani.com</a>]]></comment>
22	+ <fields>
23	+ <testmode translate="label">
24	+ <label>Modo Testeo:</label>
25	+ <comment>
26	+ <![CDATA[Habilitar o deshabilitar el modo testeo para probarlo en distintos entornos.]]>
27	+ </comment>
28	+ <frontend_type>select</frontend_type>
29	+ <source_model>andreani/config_TestMode</source_model>
30	+ <sort_order>10</sort_order>
31	+ <show_in_default>1</show_in_default>
32	+ <show_in_website>1</show_in_website>
33	+ <show_in_store>1</show_in_store>
34	+ </testmode>
35	+ <cache translate="label">
36	+ <label>Cache:</label>
37	+ <comment>
38	+ <![CDATA[Optimiza las llamadas a las Sucursales y la distancia entre la sucursal y el cliente con Google Maps.]]>
39	+ </comment>
40	+ <frontend_type>select</frontend_type>
41	+ <source_model>adminhtml/system_config_source_yesno</source_model>
42	+ <sort_order>20</sort_order>
43	+ <show_in_default>1</show_in_default>
44	+ <show_in_website>1</show_in_website>
45	+ <show_in_store>1</show_in_store>
46	+ </cache>
47	<usuario translate="label">
48	<label>Nombre de Usuario: </label>
49	<default></default>
50	+ <sort_order>30</sort_order>
51	<frontend_type>text</frontend_type>
52	<show_in_default>1</show_in_default>
53	<show_in_website>1</show_in_website>
54	<show_in_store>1</show_in_store>

55	</usuario>
56	<password translate="label">
57	<label>Contraseña:</label>

60	<show_in_default>1</show_in_default>
61	<show_in_website>1</show_in_website>
62	<show_in_store>1</show_in_store>
63	+ <sort_order>40</sort_order>
64	</password>
65	<nrocliente translate="label">
66	<label>Numero de Cliente:</label>

82	<show_in_store>1</show_in_store>
83	<sort_order>60</sort_order>
84	</medida>









85	</fields>
86	</andreaniconfig>
87	<andreanisucursal translate="label">
88	<label>Andreani Sucursal</label>
89	<frontend_type>text</frontend_type>
90	+ <sort_order>30</sort_order>
91	<show_in_default>1</show_in_default>
92	<show_in_website>1</show_in_website>
93	<show_in_store>1</show_in_store>

172	<show_in_store>1</show_in_store>
173	<sort_order>90</sort_order>
174	</gccontrato>
175	+ <regla translate="label">
176	+ <label>Regla de precio (%):</label>
177	+ <comment>
178	+ <![CDATA[Usar . en valores con decimales<br> <span class="notice">Ejemplo: 0.49 </span>]]>
179	+ </comment>
180	+ <default>0</default>
181	+ <frontend_type>text</frontend_type>
182	+ <show_in_default>1</show_in_default>
183	+ <show_in_website>1</show_in_website>
184	+ <show_in_store>1</show_in_store>
185	+ <sort_order>90</sort_order>
186	+ </regla>
187	</fields>
188	</andreanisucursal>
189	<andreaniurgente translate="label">
190	<label>Andreani Urgente</label>
191	<frontend_type>text</frontend_type>
192	+ <sort_order>20</sort_order>
193	<show_in_default>1</show_in_default>
194	<show_in_website>1</show_in_website>
195	<show_in_store>1</show_in_store>

273	<show_in_website>1</show_in_website>
274	<show_in_store>1</show_in_store>
275	<sort_order>90</sort_order>
276	+ </gccontrato>
277	+ <regla translate="label">
278	+ <label>Regla de precio (%):</label>
279	+ <comment>
280	+ <![CDATA[Usar . en valores con decimales<br> <span class="notice">Ejemplo: 0.49 </span>]]>
281	+ </comment>
282	+ <default>0</default>
283	+ <frontend_type>text</frontend_type>
284	+ <show_in_default>1</show_in_default>
285	+ <show_in_website>1</show_in_website>
286	+ <show_in_store>1</show_in_store>
287	+ <sort_order>90</sort_order>
288	+ </regla>
289	</fields>
290	</andreaniurgente>
291	<andreaniestandar translate="label">

379	<show_in_store>1</show_in_store>
380	<sort_order>90</sort_order>
381	</gccontrato>
382	+ <regla translate="label">
383	+ <label>Regla de precio (%):</label>
384	+ <comment>
385	+ <![CDATA[Usar . en valores con decimales<br> <span class="notice">Ejemplo: 0.49 </span>]]>
386	+ </comment>
387	+ <default>0</default>
388	+ <frontend_type>text</frontend_type>
389	+ <show_in_default>1</show_in_default>
390	+ <show_in_website>1</show_in_website>
391	+ <show_in_store>1</show_in_store>
392	+ <sort_order>90</sort_order>
393	+ </regla>
394	</fields>
395	</andreaniestandar>
396	</groups>

app/code/local/Ecloud/Andreani/sql/andreani_setup/mysql4-upgrade-0.1.7-0.1.8.php ADDED Viewed

	@@ -0,0 +1,7 @@


1	+ <?php
2	+
3	+ $setup = $this;
4	+
5	+ $setup->startSetup();
6	+
7	+ $setup->endSetup();

app/design/frontend/default/default/template/persistent/checkout/onepage/billing.phtml CHANGED Viewed

	@@ -0,0 +1,209 @@


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>

package.xml CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?xml version="1.0"?>
2	<package>
3	<name>Andreani</name>
4	- <version>0.1.7</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,13 +24,18 @@ For Customers:
24	Location and distance y distance to the nearest branch for "Shipments to branch".
25	Express delivery service.
26	Tracking of shipments.</description>
27	- <notes>Release Version 0.1.~~7.&#~~xD;
28
29	- ~~Fix~~ ~~'detalle_productos' en ConfirmarCompra.</notes>~~





30	<authors><author><name>Gaspar Mac</name><user>ecloudsolutions</user><email>gaspar@ecloudsolutions.com</email></author><author><name>Nicolas Demayo</name><user>nikete</user><email>nicolas.demayo@ecloudsolutions.com</email></author><author><name>Franco Sabolo</name><user>kako_ecloud</user><email>franco.sabolo@ecloudsolutions.com</email></author><author><name>Mariano Botti</name><user>mbotti89</user><email>mariano.botti@ecloudsolutions.com</email></author></authors>
31	- <date>2014-07-03</date>
32	- <time>18:21:04</time>
33	- <contents><target name="magelocal"><dir name="Ecloud"><dir name="Andreani"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><file name="Edit.php" hash="~~0af1265c985ff7c6825d52bdcacc9bb5~~"/><dir name="Form"><dir name="Field"><file name="Medida.php" hash="~~73fc1384aac7ec077dd1c4b1f9a2acab~~"/></dir></dir></dir><dir name="Pedidos"><dir name="Edit"><file name="Form.php" hash="~~64884b5c67b8e153a1334aad7466e59a~~"/><dir name="Renderer"><file name="Button.php" hash="~~56dc256b470bb8cdecf16b907ad55bb5~~"/></dir></dir><file name="Edit.php" hash="~~cae525d3fdf69ced8d145c53d8c42f7b~~"/><file name="Grid.php" hash="~~445e205248ff3c187cba5da289bd1be7~~"/></dir><file name="Pedidos.php" hash="~~d7387a43459987bc0caffd02d1b44bd0~~"/></dir><file name="Andreani.php" hash="~~4ce366bd38afab460cda0efac94fed7a~~"/></dir><dir name="Helper"><file name="Data.php" hash="~~308ca1558be1af432edc7c3b5bdf6380~~"/></dir><dir name="Model"><file name="Andreani.php" hash="~~251cc45cf2e27a416e703bae78f6b7ed~~"/><dir name="Carrier"><file name="Andreani.php" hash="~~8468b25ea365a9ab6c0b8a8da494d5f8~~"/><file name="Andreaniestandar.php" hash="~~3eca0f7593e0989b6329c3e2519c5c6e~~"/><file name="Andreanisucursal.php" hash="~~2c34d0138d349eea5500e33adf1435c0~~"/><file name="Andreaniurgente.php" hash="~~36dcc70bd509e3d0bb110d2745f1a058~~"/></dir><dir name="Config"><file name="Medida.php" hash="~~1fc6e47f85c8b4c70f95385dd8a979f3~~"/><file name="TestMode.php" hash="~~c159fe76948f268999ba1af375a0854a~~"/></dir><file name="Observer.php" hash="~~49702c06e69e2ffbfa578c379b27f820~~"/><file name="Order.php" hash="~~c117f3c65c88fb2b56c535b3470f9535~~"/><dir name="Resource"><dir name="Order"><file name="Collection.php" hash="~~bd152386b13214a70a26bc06e4d9103f~~"/></dir><file name="Order.php" hash="~~9e107a1711a9081d4fd476369495cc34~~"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Pedidos"><file name="PedidosController.php" hash="~~da993ba8fed3055d3abef977dab25141~~"/></dir><file name="PedidosController.php" hash="~~f0e9d6ad79ece1a2ae8d2f9d258bb4e7~~"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="8f0a993a42b9844f15056ffd0d7b6312"/><file name="config.xml" hash="~~4f0385f766be6bb3fde562d6dc5b8ac3~~"/><file name="system.xml" hash="~~304609a84b1a4dbd6045b0f4bdb3c77b~~"/></dir><dir name="sql"><dir name="andreani_setup"><file name="mysql4-install-0.1.0.php" hash="23b5ff1bb77faa3394279983279ef508"/><file name="mysql4-install-0.1.1.php" hash="af9c6884b1ef1e106f598e84d5ac97d5"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="19bbe941b87c48a7c976099f26b6df87"/><file name="mysql4-upgrade-0.1.2-0.1.3.php" hash="31485210af28297146e193090d0ae586"/><file name="mysql4-upgrade-0.1.3-0.1.4.php" hash="19bbe941b87c48a7c976099f26b6df87"/><file name="mysql4-upgrade-0.1.4-0.1.5.php" hash="19bbe941b87c48a7c976099f26b6df87"/><file name="mysql4-upgrade-0.1.5-0.1.6.php" hash="2e5071273633e63d487fa573dc2a33d9"/><file name="mysql4-upgrade-0.1.6-0.1.7.php" hash="2e5071273633e63d487fa573dc2a33d9"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Ecloud_Andreani.xml" hash="fb71162c7850ff07ee057cc012a609ad"/></dir></target><target name="magelib"><dir name="Andreani"><file name="wsseAuth.php" hash="7f7c0dcac241e7422a6bc657638fc5df"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="template"><dir name="checkout"><dir name="onepage"><file name="shipping.phtml" hash="dd07d8ad6a22cd9e2553109498057439"/></dir></dir><dir name="customer"><dir name="address"><file name="edit.phtml" hash="c6a693c55bec274da69b12839a5f4ef1"/></dir></dir><dir name="persistent"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="~~d41d8cd98f00b204e9800998ecf8427e~~"/></dir></dir></dir><dir name="shipping"><dir name="tracking"><file name="popup.phtml" hash="cab9a1b01c732d7553be9b47e1e1b542"/></dir></dir></dir></dir></dir></dir></target></contents>
34	<compatible/>
35	<dependencies><required><php><min>5.2.0</min><max>5.4.25</max></php><extension><name>Core</name><min></min><max></max></extension><extension><name>soap</name><min></min><max></max></extension></required></dependencies>
36	</package>


1	<?xml version="1.0"?>
2	<package>
3	<name>Andreani</name>
4	+ <version>0.1.8</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".
25	Express delivery service.
26	Tracking of shipments.</description>
27	+ <notes>Release Version 0.1.8
28
29	+ Funcionalidades:
30	+ - Arreglo en valor de volumen
31	+ - Arreglo en el detalle de productos que se envia al WS (repite los productos)
32	+ - % de descuento o aumento para servicio (Admin)
33	+ - Aplicar promociones en el precio cuando se aplican reglas.
34	+ - Activaciòn de cache de sucursales para optimizar llamadas al WS</notes>
35	<authors><author><name>Gaspar Mac</name><user>ecloudsolutions</user><email>gaspar@ecloudsolutions.com</email></author><author><name>Nicolas Demayo</name><user>nikete</user><email>nicolas.demayo@ecloudsolutions.com</email></author><author><name>Franco Sabolo</name><user>kako_ecloud</user><email>franco.sabolo@ecloudsolutions.com</email></author><author><name>Mariano Botti</name><user>mbotti89</user><email>mariano.botti@ecloudsolutions.com</email></author></authors>
36	+ <date>2014-07-14</date>
37	+ <time>17:54:19</time>
38	+ <contents><target name="magelocal"><dir name="Ecloud"><dir name="Andreani"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><file name="Edit.php" hash="641bba2f29b24b971cf849e132799187"/><dir name="Form"><dir name="Field"><file name="Medida.php" hash="a42816e6aa4e0d8888d292ee35baf5bd"/></dir></dir></dir><dir name="Pedidos"><dir name="Edit"><file name="Form.php" hash="b8e6ec2ef089eb71d1ec262ef832531c"/><dir name="Renderer"><file name="Button.php" hash="be724d8798843b97dfb5a2d9f107abde"/></dir></dir><file name="Edit.php" hash="15055cc1f30b9e173c9ff6f5867e7785"/><file name="Grid.php" hash="04654bf26be359c27c282322296d3e83"/></dir><file name="Pedidos.php" hash="c92fc91f2e1658b0db2d593fe4eb88b7"/></dir><file name="Andreani.php" hash="c25934ba95ab9d308e7dc71314bcec33"/></dir><dir name="Helper"><file name="Data.php" hash="44776b6d6ede13161ed89cb2c57a75bb"/></dir><dir name="Model"><file name="Andreani.php" hash="1c21ed28b766361188e2e88ea9a40827"/><dir name="Carrier"><file name="Andreani.php" hash="57788b074420f2526d4f69c21e1c9db7"/><file name="Andreaniestandar.php" hash="4b437809ac6ab904c5ccd04258536c5b"/><file name="Andreanisucursal.php" hash="dde8b46c16d7df1f87c3b0482d9ba578"/><file name="Andreaniurgente.php" hash="563e3cdc813bc4a5b430433c4b40b03f"/></dir><dir name="Config"><file name="Medida.php" hash="f1f08e98acdf9e31c8c269bb673bfdd4"/><file name="TestMode.php" hash="3f68f671445173f0cbbb5b69a360ff9f"/></dir><file name="Observer.php" hash="85f2e49d97326723c3b14feee39e3396"/><file name="Order.php" hash="69c1469c3de5522810e4dfa6f42164c9"/><dir name="Resource"><dir name="Order"><file name="Collection.php" hash="59fbc843342805a3b8f0ea0f6b8b6504"/></dir><file name="Order.php" hash="4a7d26f63f80bb939873f6032bae1a2a"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Pedidos"><file name="PedidosController.php" hash="462649aad4dc7d05b9f880bfb1c1bdc6"/></dir><file name="PedidosController.php" hash="c1966200d99d9f88cb928dd0a99a9896"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="8f0a993a42b9844f15056ffd0d7b6312"/><file name="config.xml" hash="568e141291de4b88b83824dbfa9e4279"/><file name="system.xml" hash="ec1bf9a3739d671995cea0afb9289725"/></dir><dir name="sql"><dir name="andreani_setup"><file name="mysql4-install-0.1.0.php" hash="23b5ff1bb77faa3394279983279ef508"/><file name="mysql4-install-0.1.1.php" hash="af9c6884b1ef1e106f598e84d5ac97d5"/><file name="mysql4-upgrade-0.1.1-0.1.2.php" hash="19bbe941b87c48a7c976099f26b6df87"/><file name="mysql4-upgrade-0.1.2-0.1.3.php" hash="31485210af28297146e193090d0ae586"/><file name="mysql4-upgrade-0.1.3-0.1.4.php" hash="19bbe941b87c48a7c976099f26b6df87"/><file name="mysql4-upgrade-0.1.4-0.1.5.php" hash="19bbe941b87c48a7c976099f26b6df87"/><file name="mysql4-upgrade-0.1.5-0.1.6.php" hash="2e5071273633e63d487fa573dc2a33d9"/><file name="mysql4-upgrade-0.1.6-0.1.7.php" hash="2e5071273633e63d487fa573dc2a33d9"/><file name="mysql4-upgrade-0.1.7-0.1.8.php" hash="2e5071273633e63d487fa573dc2a33d9"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Ecloud_Andreani.xml" hash="fb71162c7850ff07ee057cc012a609ad"/></dir></target><target name="magelib"><dir name="Andreani"><file name="wsseAuth.php" hash="7f7c0dcac241e7422a6bc657638fc5df"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="template"><dir name="checkout"><dir name="onepage"><file name="shipping.phtml" hash="dd07d8ad6a22cd9e2553109498057439"/></dir></dir><dir name="customer"><dir name="address"><file name="edit.phtml" hash="c6a693c55bec274da69b12839a5f4ef1"/></dir></dir><dir name="persistent"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="c4c0a62c21e9e1a6d2b1b872d0f8bdfc"/></dir></dir></dir><dir name="shipping"><dir name="tracking"><file name="popup.phtml" hash="cab9a1b01c732d7553be9b47e1e1b542"/></dir></dir></dir></dir></dir></dir></target></contents>
39	<compatible/>
40	<dependencies><required><php><min>5.2.0</min><max>5.4.25</max></php><extension><name>Core</name><min></min><max></max></extension><extension><name>soap</name><min></min><max></max></extension></required></dependencies>
41	</package>