Merge pull request '8030-newPriceComponent' (!3010) from 8030-newPriceComponent into dev

Reviewed-on: #3010
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

db/routines/vn/procedures/catalog_componentCalculate.sql

@@ -25,18 +25,38 @@ BEGIN
 		FROM address
 		WHERE id = vAddressFk;
 
-    CREATE OR REPLACE TEMPORARY TABLE tSpecialPrice
+	CREATE OR REPLACE TEMPORARY TABLE tPriceDelta
 	(INDEX (itemFk))
-    ENGINE = MEMORY
-    SELECT * FROM (
+	ENGINE = MEMORY
+	SELECT i.id itemFk,
+		SUM(IFNULL(pd.absIncreasing,0)) absIncreasing,
+		SUM(IFNULL(pd.ratIncreasing,0)) ratIncreasing,
+		pd.warehouseFk
+		FROM item i
+			JOIN priceDelta pd 
+				ON pd.itemTypeFk = i.typeFk
+				AND (pd.minSize IS NULL OR pd.minSize <= i.`size`)
+				AND (pd.maxSize IS NULL OR pd.maxSize >= i.`size`)
+				AND (pd.inkFk IS NULL OR pd.inkFk = i.inkFk)
+				AND (pd.originFk IS NULL OR pd.originFk = i.originFk)
+				AND (pd.producerFk IS NULL OR pd.producerFk = i.producerFk)
+				AND (pd.warehouseFk IS NULL OR pd.warehouseFk = vWarehouseFk)
+		WHERE (pd.fromDated IS NULL OR pd.fromDated <= vShipped)
+			AND (pd.toDated IS NULL OR pd.toDated >= vShipped)
+		GROUP BY i.id;
+
+	CREATE OR REPLACE TEMPORARY TABLE tSpecialPrice
+	(INDEX (itemFk))
+	ENGINE = MEMORY
+	SELECT * FROM (
 		SELECT *
-            FROM specialPrice
-            WHERE (clientFk = vClientFk OR clientFk IS NULL)
-                AND started <= vShipped
-                AND (ended >= vShipped OR ended IS NULL)
-            ORDER BY (clientFk = vClientFk) DESC, id DESC
-            LIMIT 10000000000000000000) t
-        GROUP BY itemFk;
+			FROM specialPrice
+			WHERE (clientFk = vClientFk OR clientFk IS NULL)
+			AND started <= vShipped
+			AND (ended >= vShipped OR ended IS NULL)
+		ORDER BY (clientFk = vClientFk) DESC, id DESC
+		LIMIT 10000000000000000000) t
+		GROUP BY itemFk;
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketComponentCalculate
 	(PRIMARY KEY (itemFk, warehouseFk))
@@ -108,6 +128,19 @@ BEGIN
 				JOIN tmp.ticketComponentCalculate tcc ON tcc.itemFk = tc.itemFk AND tcc.warehouseFk = tc.warehouseFk
 			GROUP BY tc.itemFk, warehouseFk;
 
+	-- Bonus del comprador a un rango de productos
+	INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
+		SELECT 
+			tcb.warehouseFk,
+			tcb.itemFk,
+			c.id,
+			tcb.base * (1 + IFNULL(tpd.ratIncreasing,0)) + IFNULL(tpd.absIncreasing,0)
+			FROM tmp.ticketComponentBase tcb
+				JOIN component c ON c.code = 'bonus'
+				JOIN tPriceDelta tpd 
+					ON tpd.itemFk = tcb.itemFk 
+					AND tpd.warehouseFk = tcb.warehouseFk;
+
 	-- RECOBRO
 	INSERT INTO tmp.ticketComponent(warehouseFk, itemFk, componentFk, cost)
 		SELECT tcb.warehouseFk, tcb.itemFk, c2.id,
@@ -303,6 +336,7 @@ BEGIN
 		tmp.ticketComponentBase,
 		tmp.ticketComponentRate,
 		tmp.ticketComponentCopy,
-        tSpecialPrice;
+		tPriceDelta,
+		tSpecialPrice;
 END$$
 DELIMITER ;

db/versions/11258-silverTulip/00-firstScript.sql

@@ -0,0 +1,27 @@
+-- vn.priceDelta definition
+
+-- vn.priceDelta definition
+
+CREATE OR REPLACE TABLE vn.`priceDelta` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `itemTypeFk` smallint(5) unsigned NOT NULL,
+  `minSize` int(10) unsigned DEFAULT NULL COMMENT 'Minimum item.size',
+  `maxSize` int(10) unsigned DEFAULT NULL COMMENT 'Maximum item.size',
+  `inkFk` varchar(3) DEFAULT NULL,
+  `originFk` tinyint(2) unsigned DEFAULT NULL,
+  `producerFk` mediumint(3) unsigned DEFAULT NULL,
+  `fromDated` date DEFAULT NULL,
+  `toDated` date DEFAULT NULL,
+  `absIncreasing` decimal(10,3) DEFAULT NULL COMMENT 'Absolute increasing of final price',
+  `ratIncreasing` int(11) DEFAULT NULL COMMENT 'Increasing ratio for the cost price',
+  `warehouseFk` smallint(6) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `priceDelta_itemType_FK` (`itemTypeFk`),
+  KEY `priceDelta_ink_FK` (`inkFk`),
+  KEY `priceDelta_producer_FK` (`producerFk`),
+  KEY `priceDelta_warehouse_FK` (`warehouseFk`),
+  CONSTRAINT `priceDelta_ink_FK` FOREIGN KEY (`inkFk`) REFERENCES `ink` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `priceDelta_itemType_FK` FOREIGN KEY (`itemTypeFk`) REFERENCES `itemType` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `priceDelta_producer_FK` FOREIGN KEY (`producerFk`) REFERENCES `producer` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `priceDelta_warehouse_FK` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Defines the increasing o decreasing for ranges of items';