SQL webZone fixes

db/changes/10032-webZone/00-catalog_calcFromItem.sql

@@ -11,6 +11,11 @@ BEGIN
  * Calculates available and price for a single item.
  *
  * @param vItemFk The item id
+ * @return tmp.ticketCalculateItem
+ * @return tmp.ticketComponentPrice
+ * @return tmp.ticketComponent
+ * @return tmp.ticketLot
+ * @return tmp.zoneGetShipped
  */
 	DROP TEMPORARY TABLE IF EXISTS tmp.item;
 	CREATE TEMPORARY TABLE tmp.item

db/changes/10032-webZone/00-catalog_calcFromMyAddress.sql

@@ -0,0 +1,41 @@
+
+DROP procedure IF EXISTS `hedera`.`catalog_calcFromMyAddress`;
+DELIMITER $$
+CREATE DEFINER=`root`@`%` PROCEDURE `hedera`.`catalog_calcFromMyAddress`(vDelivery DATE, vAddress INT)
+BEGIN
+/**
+ * Gets the available items list.
+ *
+ * @param vDelivery Delivery date
+ * @param vAddress Address id
+ * @return tmp.ticketCalculateItem
+ * @return tmp.ticketComponentPrice
+ * @return tmp.ticketComponent
+ * @return tmp.ticketLot
+ * @return tmp.zoneGetShipped
+ */  
+    DECLARE vAgencyMode INT;
+    
+	SELECT a.agencyModeFk
+			INTO vAgencyMode
+		FROM myClient c
+			JOIN vn.address a ON a.clientFk = c.id
+		WHERE a.id = vAddress;      
+
+	CALL vn.available_calc(vDelivery, vAddress, vAgencyMode);
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.item;
+	CREATE TEMPORARY TABLE tmp.item
+		(INDEX (itemFk))
+        ENGINE = MEMORY
+		SELECT c.item_id itemFk
+			FROM `cache`.available c
+				JOIN tmp.availableCalc a ON a.calcFk = c.calc_id
+			WHERE c.available > 0
+			GROUP BY c.item_id;
+ 
+	CALL vn.ticketCalculate(vDelivery, vAddress, vAgencyMode);
+
+	DROP TEMPORARY TABLE tmp.item;
+END$$
+DELIMITER ;

db/changes/10032-webZone/00-deprecate.sql

@@ -238,3 +238,105 @@ END$$
 
 DELIMITER ;
 ;
+
+
+USE `hedera`;
+DROP procedure IF EXISTS `hedera`.`myItemGetAvailableFromDate`;
+
+DELIMITER $$
+USE `hedera`$$
+CREATE DEFINER=`root`@`%` PROCEDURE `__myItemGetAvailableFromDate`(vDelivery DATE)
+BEGIN
+/**
+ * Gets the available items list.
+ *
+ * @deprecated Use item_calcCatalogFromMyAddress()
+ * @param vDelivery Delivery date
+ */
+	DECLARE vAddress INT;
+	DECLARE vAgencyMode INT;
+        
+	SELECT a.agencyModeFk, a.id 
+			INTO vAgencyMode, vAddress
+		FROM myClient c
+			JOIN vn.address a ON a.id = c.defaultAddressFk;    
+  
+	CALL vn2008.bionic_available_ (vDelivery, vAddress, vAgencyMode);
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.item;
+	CREATE TEMPORARY TABLE tmp.item
+		(INDEX (itemFk))
+        ENGINE = MEMORY
+		SELECT c.item_id itemFk
+			FROM cache.available c
+				JOIN vn2008.t_bionic_available a ON c.calc_id = a.calc_id
+			WHERE c.available > 0
+			GROUP BY c.item_id;
+ 
+	CALL vn.ticketCalculate(vDelivery, vAddress, vAgencyMode);
+-- -------------------
+	/*SELECT b.itemFk, b.item, b.available, b.price
+		FROM tmp.ticketCalculateItem b
+			JOIN vn.item i ON i.id = b.itemFk
+		WHERE b.available > 0
+		ORDER BY i.relevancy DESC, i.name, i.size;
+        
+    select * from tmp.ticketComponentPrice;*/
+-- -------------------
+	DROP TEMPORARY TABLE vn2008.t_bionic_available;
+END$$
+
+DELIMITER ;
+;
+
+
+USE `hedera`;
+DROP procedure IF EXISTS `hedera`.`myItemGetAvailable`;
+
+DELIMITER $$
+USE `hedera`$$
+CREATE DEFINER=`root`@`%` PROCEDURE `__myItemGetAvailable`(vDelivery DATE, vAddress INT)
+BEGIN
+/**
+ * Gets the available items list.
+ *
+ * @deprecated Use item_calcCatalogFromMyAddress()
+ * @param vDelivery Delivery date
+ * @param vAddress Id Address
+ */  
+    DECLARE vAgencyMode INT;
+    
+	SELECT a.agencyModeFk
+			INTO vAgencyMode
+		FROM myClient c
+			JOIN vn.address a ON a.clientFk = c.id
+		WHERE a.id = vAddress;      
+
+	CALL vn2008.bionic_available_ (vDelivery, vAddress, vAgencyMode);
+
+	DROP TEMPORARY TABLE IF EXISTS tmp.item;
+	CREATE TEMPORARY TABLE tmp.item
+		(INDEX (itemFk))
+        ENGINE = MEMORY
+		SELECT c.item_id itemFk
+			FROM cache.available c
+				JOIN vn2008.t_bionic_available a ON c.calc_id = a.calc_id
+			WHERE c.available > 0
+			GROUP BY c.item_id;
+ 
+	CALL vn.ticketCalculate(vDelivery, vAddress, vAgencyMode);
+-- -------------------
+	/*SELECT b.itemFk, b.item, b.available, b.price
+		FROM tmp.ticketCalculateItem b
+			JOIN vn.item i ON i.id = b.itemFk
+		WHERE b.available > 0
+		ORDER BY i.relevancy DESC, i.name, i.size;
+        
+    select * from tmp.ticketComponentPrice;*/
+-- -------------------
+	DROP TEMPORARY TABLE vn2008.t_bionic_available;
+END$$
+
+DELIMITER ;
+;
+

db/changes/10032-webZone/00-myBasket_calcCatalogFromItem.sql

@@ -12,6 +12,7 @@ BEGIN
  * @return tmp.ticketComponentPrice
  * @return tmp.ticketComponent
  * @return tmp.ticketLot
+ * @return tmp.zoneGetShipped
  */
 	CALL order_calcCatalogFromItem(myBasket_getId(), vItem);
 END$$

db/changes/10032-webZone/00-myBasket_calcCatalogFull.sql

@@ -10,7 +10,9 @@ BEGIN
  * @table tmp.item(itemFk)
  * @return tmp.ticketCalculateItem
  * @return tmp.ticketComponentPrice
+ * @return tmp.ticketComponent
  * @return tmp.ticketLot
+ * @return tmp.zoneGetShipped
  */
 	CALL order_calcCatalogFull(myBasket_getId());
 END$$

db/changes/10032-webZone/00-order_addItem.sql

@@ -6,7 +6,15 @@ CREATE DEFINER=`root`@`%` PROCEDURE `hedera`.`order_addItem`(
     vWarehouse INT,
     vItem INT,
 	vAmount INT)
-BEGIN	
+BEGIN
+/**
+ * Adds an item to the order, checking availability and grouping.
+ *
+ * @param vSelf The order id
+ * @param vWarehouse The warehouse id
+ * @param vItem The item id
+ * @param vAmount The amount to add
+ */
 	DECLARE vRow INT;
 	DECLARE vAdd INT;
 	DECLARE vAvailable INT;

db/changes/10032-webZone/00-order_calcCatalogFromItem.sql

@@ -13,6 +13,7 @@ BEGIN
  * @return tmp.ticketComponentPrice
  * @return tmp.ticketComponent
  * @return tmp.ticketLot
+ * @return tmp.zoneGetShipped
  */
 	DECLARE vDate DATE;
 	DECLARE vAddress INT;

db/changes/10032-webZone/00-order_calcCatalogFull.sql

@@ -11,7 +11,9 @@ BEGIN
  * @table tmp.item(itemFk)
  * @return tmp.ticketCalculateItem
  * @return tmp.ticketComponentPrice
+ * @return tmp.ticketComponent
  * @return tmp.ticketLot
+ * @return tmp.zoneGetShipped
  */
 	DECLARE vDate DATE;
 	DECLARE vAddress INT;

db/changes/10032-webZone/00-order_update.sql

@@ -4,7 +4,7 @@ DELIMITER $$
 CREATE DEFINER=`root`@`%` PROCEDURE `hedera`.`order_update`(vSelf INT)
 proc: BEGIN
 /**
- * Actualiza la líneas de un pedido.
+ * Actualiza las líneas de un pedido.
  *
  * @param vSelf Id del pedido
  */

db/changes/10032-webZone/98-rename.sql

@@ -0,0 +1 @@
+RENAME TABLE hedera.myOrderMyTicket TO hedera.myOrderTicket;

db/changes/10032-webZone/99-privs.sql

@@ -3,4 +3,5 @@ GRANT EXECUTE ON PROCEDURE hedera.myBasket_calcCatalogFromItem TO `guest`@`%`;
 GRANT EXECUTE ON PROCEDURE hedera.myBasket_calcCatalogFull TO `guest`@`%`;
 GRANT EXECUTE ON PROCEDURE hedera.myBasket_getAvailable TO `guest`@`%`;
 GRANT EXECUTE ON PROCEDURE hedera.myOrder_getAvailable TO `guest`@`%`;
+GRANT EXECUTE ON PROCEDURE hedera.catalog_calcFromMyAddress TO account@'%';
 CALL account.privSync;