verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

7299_testToMaster #2411

Merged
alexm merged 342 commits from 7299_testToMaster into master 2024-05-07 05:30:42 +00:00
Conversation 0 Commits 342 Files Changed 216 +77 -83
19 changed files with 77 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7a557be09a - Show all commits

52
db/dump/fixtures.before.sql
View File

@ -1492,21 +1492,21 @@ INSERT INTO `bs`.`waste`(`buyer`, `year`, `week`, `family`, `itemFk`, `itemTypeF
INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packagingFk`,`stickers`,`freightValue`,`packageValue`,`comissionValue`,`packing`,`grouping`,`groupingMode`,`location`,`price1`,`price2`,`price3`, `printedStickers`,`isChecked`,`isIgnored`,`weight`, `created`) INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packagingFk`,`stickers`,`freightValue`,`packageValue`,`comissionValue`,`packing`,`grouping`,`groupingMode`,`location`,`price1`,`price2`,`price3`, `printedStickers`,`isChecked`,`isIgnored`,`weight`, `created`)
VALUES VALUES
(1, 1, 1, 50, 5000, 4, 1, 1.500, 1.500, 0.000, 1, 1, 1, NULL, 0.00, 99.6, 99.4, 0, 1, 0, 1, util.VN_CURDATE() - INTERVAL 2 MONTH), (1, 1, 1, 50, 5000, 4, 1, 1.500, 1.500, 0.000, 1, 1, 'packing', NULL, 0.00, 99.6, 99.4, 0, 1, 0, 1, util.VN_CURDATE() - INTERVAL 2 MONTH),
(2, 2, 1, 50, 100, 4, 1, 1.500, 1.500, 0.000, 1, 1, 1, NULL, 0.00, 99.6, 99.4, 0, 1, 0, 1, util.VN_CURDATE() - INTERVAL 1 MONTH), (2, 2, 1, 50, 100, 4, 1, 1.500, 1.500, 0.000, 1, 1, 'packing', NULL, 0.00, 99.6, 99.4, 0, 1, 0, 1, util.VN_CURDATE() - INTERVAL 1 MONTH),
(3, 3, 1, 50, 100, 4, 1, 1.500, 1.500, 0.000, 1, 1, 0, NULL, 0.00, 99.6, 99.4, 0, 1, 0, 1, util.VN_CURDATE()), (3, 3, 1, 50, 100, 4, 1, 1.500, 1.500, 0.000, 1, 1, NULL, NULL, 0.00, 99.6, 99.4, 0, 1, 0, 1, util.VN_CURDATE()),
(4, 2, 2, 5, 450, 3, 1, 1.000, 1.000, 0.000, 10, 10, 0, NULL, 0.00, 7.30, 7.00, 0, 1, 0, 2.5, util.VN_CURDATE()), (4, 2, 2, 5, 450, 3, 1, 1.000, 1.000, 0.000, 10, 10, NULL, NULL, 0.00, 7.30, 7.00, 0, 1, 0, 2.5, util.VN_CURDATE()),
(5, 3, 3, 55, 500, 5, 1, 1.000, 1.000, 0.000, 1, 1, 0, NULL, 0.00, 78.3, 75.6, 0, 1, 0, 2.5, util.VN_CURDATE()), (5, 3, 3, 55, 500, 5, 1, 1.000, 1.000, 0.000, 1, 1, NULL, NULL, 0.00, 78.3, 75.6, 0, 1, 0, 2.5, util.VN_CURDATE()),
(6, 4, 8, 50, 1000, 4, 1, 1.000, 1.000, 0.000, 1, 1, 1, NULL, 0.00, 99.6, 99.4, 0, 1, 0, 2.5, util.VN_CURDATE()), (6, 4, 8, 50, 1000, 4, 1, 1.000, 1.000, 0.000, 1, 1, 'grouping', NULL, 0.00, 99.6, 99.4, 0, 1, 0, 2.5, util.VN_CURDATE()),
(7, 4, 9, 20, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10, 1, NULL, 0.00, 30.50, 29.00, 0, 1, 0, 2.5, util.VN_CURDATE()), (7, 4, 9, 20, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10, 'packing', NULL, 0.00, 30.50, 29.00, 0, 1, 0, 2.5, util.VN_CURDATE()),
(8, 4, 4, 1.25, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67, 0, 1, 0, 2.5, util.VN_CURDATE()), (8, 4, 4, 1.25, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67, 0, 1, 0, 2.5, util.VN_CURDATE()),
(9, 4, 4, 1.25, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67, 0, 1, 0, 4, util.VN_CURDATE()), (9, 4, 4, 1.25, 1000, 3, 1, 0.500, 0.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67, 0, 1, 0, 4, util.VN_CURDATE()),
(10, 5, 1, 50, 10, 4, 1, 2.500, 2.500, 0.000, 1, 1, 1, NULL, 0.00, 99.6, 99.4, 0, 1, 0, 4, util.VN_CURDATE()), (10, 5, 1, 50, 10, 4, 1, 2.500, 2.500, 0.000, 1, 1, 'packing', NULL, 0.00, 99.6, 99.4, 0, 1, 0, 4, util.VN_CURDATE()),
(11, 5, 4, 1.25, 10, 3, 1, 2.500, 2.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67, 0, 1, 0, 4, util.VN_CURDATE()), (11, 5, 4, 1.25, 10, 3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67, 0, 1, 0, 4, util.VN_CURDATE()),
(12, 6, 4, 1.25, 0, 3, 1, 2.500, 2.500, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67, 0, 1, 0, 4, util.VN_CURDATE()), (12, 6, 4, 1.25, 0, 3, 1, 2.500, 2.500, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67, 0, 1, 0, 4, util.VN_CURDATE()),
(13, 7, 1, 50, 0, 3, 1, 2.000, 2.000, 0.000, 1, 1, 1, NULL, 0.00, 99.6, 99.4, 0, 1, 0, 4, util.VN_CURDATE()), (13, 7, 1, 50, 0, 3, 1, 2.000, 2.000, 0.000, 1, 1, 'packing', NULL, 0.00, 99.6, 99.4, 0, 1, 0, 4, util.VN_CURDATE()),
(14, 7, 2, 5, 0, 3, 1, 2.000, 2.000, 0.000, 10, 10, 1, NULL, 0.00, 7.30, 7.00, 0, 1, 0, 4, util.VN_CURDATE()), (14, 7, 2, 5, 0, 3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 7.30, 7.00, 0, 1, 0, 4, util.VN_CURDATE()),
(15, 7, 4, 1.25, 0, 3, 1, 2.000, 2.000, 0.000, 10, 10, 1, NULL, 0.00, 1.75, 1.67, 0, 1, 0, 4, util.VN_CURDATE()); (15, 7, 4, 1.25, 0, 3, 1, 2.000, 2.000, 0.000, 10, 10, 'grouping', NULL, 0.00, 1.75, 1.67, 0, 1, 0, 4, util.VN_CURDATE());
INSERT INTO `hedera`.`order`(`id`, `date_send`, `customer_id`, `delivery_method_id`, `agency_id`, `address_id`, `company_id`, `note`, `source_app`, `confirmed`,`total`, `date_make`, `first_row_stamp`, `confirm_date`) INSERT INTO `hedera`.`order`(`id`, `date_send`, `customer_id`, `delivery_method_id`, `agency_id`, `address_id`, `company_id`, `note`, `source_app`, `confirmed`,`total`, `date_make`, `first_row_stamp`, `confirm_date`)
VALUES VALUES
@ -3235,7 +3235,7 @@ INSERT INTO vn.buy
stickers = 1, stickers = 1,
packing = 20, packing = 20,
`grouping` = 1, `grouping` = 1,
groupingMode = 1, groupingMode = 'packing',
price1 = 1, price1 = 1,
price2 = 1, price2 = 1,
price3 = 1, price3 = 1,
@ -3273,7 +3273,7 @@ INSERT INTO vn.buy
stickers = 1, stickers = 1,
packing = 40, packing = 40,
`grouping` = 5, `grouping` = 5,
groupingMode = 1, groupingMode = 'packing',
price1 = 1, price1 = 1,
price2 = 1, price2 = 1,
price3 = 1, price3 = 1,
@ -3311,7 +3311,7 @@ INSERT INTO vn.buy
stickers = 2, stickers = 2,
packing = 10, packing = 10,
`grouping` = 5, `grouping` = 5,
groupingMode = 1, groupingMode = 'packing',
price1 = 1, price1 = 1,
price2 = 1, price2 = 1,
price3 = 1, price3 = 1,
@ -3357,7 +3357,7 @@ INSERT INTO vn.buy
stickers = 1, stickers = 1,
packing = 20, packing = 20,
`grouping` = 4, `grouping` = 4,
groupingMode = 1, groupingMode = 'packing',
price1 = 1, price1 = 1,
price2 = 1, price2 = 1,
price3 = 1, price3 = 1,
@ -3395,7 +3395,7 @@ INSERT INTO vn.buy
stickers = 1, stickers = 1,
packing = 20, packing = 20,
`grouping` = 1, `grouping` = 1,
groupingMode = 1, groupingMode = 'packing',
price1 = 1, price1 = 1,
price2 = 1, price2 = 1,
price3 = 1, price3 = 1,
@ -3434,7 +3434,7 @@ INSERT INTO vn.buy
stickers = 1, stickers = 1,
packing = 200, packing = 200,
`grouping` = 30, `grouping` = 30,
groupingMode = 1, groupingMode = 'packing',
price1 = 1, price1 = 1,
price2 = 1, price2 = 1,
price3 = 1, price3 = 1,
@ -3473,7 +3473,7 @@ INSERT INTO vn.buy
stickers = 1, stickers = 1,
packing = 500, packing = 500,
`grouping` = 10, `grouping` = 10,
groupingMode = 1, groupingMode = 'packing',
price1 = 1, price1 = 1,
price2 = 1, price2 = 1,
price3 = 1, price3 = 1,
@ -3512,7 +3512,7 @@ INSERT INTO vn.buy
stickers = 2, stickers = 2,
packing = 300, packing = 300,
`grouping` = 50, `grouping` = 50,
groupingMode = 1, groupingMode = 'packing',
price1 = 1, price1 = 1,
price2 = 1, price2 = 1,
price3 = 1, price3 = 1,
@ -3551,7 +3551,7 @@ INSERT INTO vn.buy
stickers = 2, stickers = 2,
packing = 50, packing = 50,
`grouping` = 5, `grouping` = 5,
groupingMode = 1, groupingMode = 'packing',
price1 = 1, price1 = 1,
price2 = 1, price2 = 1,
price3 = 1, price3 = 1,
@ -3591,7 +3591,7 @@ INSERT vn.buy
stickers = 1, stickers = 1,
packing = 5, packing = 5,
`grouping` = 2, `grouping` = 2,
groupingMode = 1, groupingMode = 'packing',
price1 = 7, price1 = 7,
price2 = 7, price2 = 7,
price3 = 7, price3 = 7,
@ -3630,7 +3630,7 @@ INSERT vn.buy
stickers = 1, stickers = 1,
packing = 100, packing = 100,
`grouping` = 5, `grouping` = 5,
groupingMode = 1, groupingMode = 'packing',
price1 = 7, price1 = 7,
price2 = 7, price2 = 7,
price3 = 7, price3 = 7,

3
db/routines/edi/procedures/ekt_load.sql
View File

@ -14,7 +14,6 @@ proc:BEGIN
DECLARE vPackage INT; DECLARE vPackage INT;
DECLARE vPutOrderFk INT; DECLARE vPutOrderFk INT;
DECLARE vIsLot BOOLEAN; DECLARE vIsLot BOOLEAN;
DECLARE vForceToPacking INT DEFAULT 2;
DECLARE vEntryFk INT; DECLARE vEntryFk INT;
DECLARE vHasToChangePackagingFk BOOLEAN; DECLARE vHasToChangePackagingFk BOOLEAN;
DECLARE vIsFloramondoDirect BOOLEAN; DECLARE vIsFloramondoDirect BOOLEAN;
@ -150,7 +149,7 @@ proc:BEGIN
@pac := IFNULL(i.stemMultiplier, 1) * e.pac / @t packing, @pac := IFNULL(i.stemMultiplier, 1) * e.pac / @t packing,
IFNULL(b.`grouping`, e.pac), IFNULL(b.`grouping`, e.pac),
@pac * e.qty, @pac * e.qty,
vForceToPacking, 'packing',
IF(vHasToChangePackagingFk OR b.packagingFk IS NULL, vPackage, b.packagingFk), IF(vHasToChangePackagingFk OR b.packagingFk IS NULL, vPackage, b.packagingFk),
(IFNULL(i.weightByPiece, 0) * @pac) / 1000 (IFNULL(i.weightByPiece, 0) * @pac) / 1000
FROM ekt e FROM ekt e

2
db/routines/edi/procedures/floramondo_offerRefresh.sql
View File

@ -417,7 +417,7 @@ proc: BEGIN
o.NumberOfUnits etiquetas, o.NumberOfUnits etiquetas,
o.NumberOfItemsPerCask packing, o.NumberOfItemsPerCask packing,
GREATEST(1, IFNULL(o.MinimumQuantity,0)) * o.NumberOfItemsPerCask `grouping`, GREATEST(1, IFNULL(o.MinimumQuantity,0)) * o.NumberOfItemsPerCask `grouping`,
2, -- Obliga al Packing 'packing',
o.embalageCode, o.embalageCode,
o.diId o.diId
FROM edi.offer o FROM edi.offer o

7
db/routines/vn/procedures/catalog_componentCalculate.sql
View File

@ -48,7 +48,7 @@ BEGIN
IF(i.hasMinPrice, GREATEST(i.minPrice,IFNULL(pf.rate3, b.price3)),IFNULL(pf.rate3, b.price3)) rate3, IF(i.hasMinPrice, GREATEST(i.minPrice,IFNULL(pf.rate3, b.price3)),IFNULL(pf.rate3, b.price3)) rate3,
IFNULL(pf.packing, GREATEST(b.grouping, b.packing)) packing, IFNULL(pf.packing, GREATEST(b.grouping, b.packing)) packing,
IFNULL(pf.`grouping`, b.`grouping`) `grouping`, IFNULL(pf.`grouping`, b.`grouping`) `grouping`,
ABS(IFNULL(pf.box, b.groupingMode)) groupingMode, b.groupingMode groupingMode,
tl.buyFk, tl.buyFk,
i.typeFk, i.typeFk,
IF(i.hasKgPrice, b.weight / b.packing, NULL) weightGrouping IF(i.hasKgPrice, b.weight / b.packing, NULL) weightGrouping
@ -252,14 +252,15 @@ BEGIN
SELECT tcc.warehouseFk, SELECT tcc.warehouseFk,
tcc.itemFk, tcc.itemFk,
1 rate, 1 rate,
IF(tcc.groupingMode = 1, tcc.`grouping`, 1) `grouping`, IF(tcc.groupingMode = 'grouping', tcc.`grouping`, 1) `grouping`,
CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) price, CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) price,
CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) / weightGrouping priceKg CAST(SUM(tcs.sumCost) AS DECIMAL(10,2)) / weightGrouping priceKg
FROM tmp.ticketComponentCalculate tcc FROM tmp.ticketComponentCalculate tcc
JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk
AND tcs.warehouseFk = tcc.warehouseFk AND tcs.warehouseFk = tcc.warehouseFk
WHERE IFNULL(tcs.classRate, 1) = 1 WHERE IFNULL(tcs.classRate, 1) = 1
AND tcc.groupingMode < 2 AND (tcc.packing > tcc.`grouping` or tcc.groupingMode = 0) AND NOT tcc.groupingMode = 'packing'
AND (tcc.packing > tcc.`grouping` OR tcc.groupingMode IS NULL)
GROUP BY tcs.warehouseFk, tcs.itemFk; GROUP BY tcs.warehouseFk, tcs.itemFk;
INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price, priceKg) INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price, priceKg)

4
db/routines/vn/procedures/collectionPlacement_get.sql
View File

@ -40,8 +40,8 @@ BEGIN
ENGINE = MEMORY ENGINE = MEMORY
SELECT b.itemFk, SELECT b.itemFk,
CASE b.groupingMode CASE b.groupingMode
WHEN 0 THEN 1 WHEN NULL THEN 1
WHEN 2 THEN b.packing WHEN 'packing' THEN b.packing
ELSE b.`grouping` ELSE b.`grouping`
END `grouping` END `grouping`
FROM buy b FROM buy b

2
db/routines/vn/procedures/inventoryMake.sql
View File

@ -116,7 +116,7 @@ BEGIN
freightValue decimal(10,3) DEFAULT '0.000', freightValue decimal(10,3) DEFAULT '0.000',
packing int(11) DEFAULT '1', packing int(11) DEFAULT '1',
`grouping` smallint(5) unsigned NOT NULL DEFAULT '1', `grouping` smallint(5) unsigned NOT NULL DEFAULT '1',
groupingMode tinyint(4) NOT NULL DEFAULT 0 , groupingMode enum('grouping', 'packing') DEFAULT NULL,
comissionValue decimal(10,3) DEFAULT '0.000', comissionValue decimal(10,3) DEFAULT '0.000',
packageValue decimal(10,3) DEFAULT '0.000', packageValue decimal(10,3) DEFAULT '0.000',
packageFk varchar(10) COLLATE utf8_unicode_ci DEFAULT '--', packageFk varchar(10) COLLATE utf8_unicode_ci DEFAULT '--',

4
db/routines/vn/procedures/item_getSimilar.sql
View File

@ -61,8 +61,8 @@ BEGIN
a.available, a.available,
IFNULL(ip.counter, 0) `counter`, IFNULL(ip.counter, 0) `counter`,
CASE CASE
WHEN b.groupingMode = 1 THEN b.grouping WHEN b.groupingMode = 'grouping' THEN b.grouping
WHEN b.groupingMode = 2 THEN b.packing WHEN b.groupingMode = 'packing' THEN b.packing
ELSE 1 ELSE 1
END AS minQuantity, END AS minQuantity,
iss.visible located iss.visible located

8
db/routines/vn/procedures/sale_replaceItem.sql
View File

@ -13,7 +13,7 @@ BEGIN
DECLARE vWarehouseFk SMALLINT; DECLARE vWarehouseFk SMALLINT;
DECLARE vDate DATE; DECLARE vDate DATE;
DECLARE vGrouping INT; DECLARE vGrouping INT;
DECLARE vGroupingModeFk INT; DECLARE vGroupingModeFk VARCHAR(255);
DECLARE vPacking INT; DECLARE vPacking INT;
DECLARE vRoundQuantity INT DEFAULT 1; DECLARE vRoundQuantity INT DEFAULT 1;
DECLARE vLanded DATE; DECLARE vLanded DATE;
@ -23,8 +23,6 @@ BEGIN
DECLARE vOldPrice DECIMAL(10,2); DECLARE vOldPrice DECIMAL(10,2);
DECLARE vOption VARCHAR(255); DECLARE vOption VARCHAR(255);
DECLARE vNewSaleFk INT; DECLARE vNewSaleFk INT;
DECLARE vForceToGrouping INT DEFAULT 1;
DECLARE vForceToPacking INT DEFAULT 2;
DECLARE vFinalPrice DECIMAL(10,2); DECLARE vFinalPrice DECIMAL(10,2);
DECLARE EXIT HANDLER FOR SQLEXCEPTION DECLARE EXIT HANDLER FOR SQLEXCEPTION
@ -63,10 +61,10 @@ BEGIN
JOIN tmp.buyUltimate tmp ON b.id = tmp.buyFk JOIN tmp.buyUltimate tmp ON b.id = tmp.buyFk
WHERE tmp.itemFk = vNewItemFk AND tmp.WarehouseFk = vWarehouseFk; WHERE tmp.itemFk = vNewItemFk AND tmp.WarehouseFk = vWarehouseFk;
IF vGroupingModeFk = vForceToPacking AND vPacking > 0 THEN IF vGroupingModeFk = 'packing' AND vPacking > 0 THEN
SET vRoundQuantity = vPacking; SET vRoundQuantity = vPacking;
END IF; END IF;
IF vGroupingModeFk = vForceToGrouping AND vGrouping > 0 THEN IF vGroupingModeFk = 'grouping' AND vGrouping > 0 THEN
SET vRoundQuantity = vGrouping; SET vRoundQuantity = vGrouping;
END IF; END IF;

2
db/routines/vn/triggers/buy_beforeInsert.sql
View File

@ -6,7 +6,7 @@ trig: BEGIN
DECLARE vWarehouse INT; DECLARE vWarehouse INT;
DECLARE vLanding DATE; DECLARE vLanding DATE;
DECLARE vGrouping INT; DECLARE vGrouping INT;
DECLARE vGroupingMode TINYINT; DECLARE vGroupingMode VARCHAR(255);
DECLARE vGenericFk INT; DECLARE vGenericFk INT;
DECLARE vGenericInDate BOOL; DECLARE vGenericInDate BOOL;
DECLARE vBuyerFk INT; DECLARE vBuyerFk INT;

2
db/versions/10997-crimsonCyca/00-part1.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE vn.buy ADD groupingMode2 enum('grouping', 'packing') DEFAULT NULL NULL;
ALTER TABLE vn.buy CHANGE groupingMode2 groupingMode2 enum('grouping', 'packing') DEFAULT NULL NULL AFTER groupingMode;

7
db/versions/10997-crimsonCyca/01-part2.sql Normal file
View File

@ -0,0 +1,7 @@
UPDATE vn.buy
SET groupingMode2 = 'packing'
WHERE groupingMode = 2;
UPDATE vn.buy
SET groupingMode2 = 'grouping'
WHERE groupingMode = 1;

2
db/versions/10997-crimsonCyca/02-part3.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE vn.buy DROP COLUMN groupingMode;
ALTER TABLE vn.buy CHANGE groupingMode2 groupingMode enum('grouping','packing') CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;

2
modules/entry/back/models/buy.json
View File

@ -34,7 +34,7 @@
"type": "number" "type": "number"
}, },
"groupingMode": { "groupingMode": {
"type": "number" "type": "string"
}, },
"comissionValue": { "comissionValue": {
"type": "number" "type": "number"

8
modules/entry/front/buy/index/index.html
View File

@ -119,13 +119,13 @@
<append> <append>
<vn-icon <vn-icon
pointer pointer
ng-show="buy.groupingMode == '2'" ng-show="buy.groupingMode == 'packing'"
ng-click="$ctrl.toggleGroupingMode(buy, 'packing')" ng-click="$ctrl.toggleGroupingMode(buy, 'packing')"
icon="lock"> icon="lock">
</vn-icon> </vn-icon>
<vn-icon <vn-icon
pointer pointer
ng-show="buy.groupingMode != '2'" ng-show="buy.groupingMode != 'packing'"
ng-click="$ctrl.toggleGroupingMode(buy, 'packing')" ng-click="$ctrl.toggleGroupingMode(buy, 'packing')"
icon="lock_open"> icon="lock_open">
</vn-icon> </vn-icon>
@ -140,13 +140,13 @@
<append> <append>
<vn-icon <vn-icon
pointer pointer
ng-show="buy.groupingMode == '1'" ng-show="buy.groupingMode == 'grouping'"
ng-click="$ctrl.toggleGroupingMode(buy, 'grouping')" ng-click="$ctrl.toggleGroupingMode(buy, 'grouping')"
icon="lock"> icon="lock">
</vn-icon> </vn-icon>
<vn-icon <vn-icon
pointer pointer
ng-show="buy.groupingMode != '1'" ng-show="buy.groupingMode != 'grouping'"
ng-click="$ctrl.toggleGroupingMode(buy, 'grouping')" ng-click="$ctrl.toggleGroupingMode(buy, 'grouping')"
icon="lock_open"> icon="lock_open">
</vn-icon> </vn-icon>

8
modules/entry/front/buy/index/index.js
View File

@ -53,12 +53,8 @@ export default class Controller extends Section {
} }
toggleGroupingMode(buy, mode) { toggleGroupingMode(buy, mode) {
const grouping = 1; const groupingMode = mode === 'grouping' ? mode : 'packing';
const packing = 2; const newGroupingMode = buy.groupingMode === groupingMode ? null : groupingMode;
const groupingMode = mode === 'grouping' ? grouping : packing;
const newGroupingMode = buy.groupingMode === groupingMode ? 0 : groupingMode;
const params = { const params = {
groupingMode: newGroupingMode groupingMode: newGroupingMode
}; };

27
modules/entry/front/buy/index/index.spec.js
View File

@ -57,45 +57,34 @@ describe('Entry buy', () => {
describe('toggleGroupingMode()', () => { describe('toggleGroupingMode()', () => {
it(`should toggle grouping mode from grouping to packing`, () => { it(`should toggle grouping mode from grouping to packing`, () => {
const grouping = 1; const buy = {id: 999, groupingMode: 'grouping'};
const packing = 2;
const buy = {id: 999, groupingMode: grouping};
const query = `Buys/${buy.id}`; const query = `Buys/${buy.id}`;
$httpBackend.expectPATCH(query, {groupingMode: packing}).respond(200); $httpBackend.expectPATCH(query, {groupingMode: 'packing'}).respond(200);
controller.toggleGroupingMode(buy, 'packing'); controller.toggleGroupingMode(buy, 'packing');
$httpBackend.flush(); $httpBackend.flush();
}); });
it(`should toggle grouping mode from packing to grouping`, () => { it(`should toggle grouping mode from packing to grouping`, () => {
const grouping = 1; const buy = {id: 999, groupingMode: 'packing'};
const packing = 2;
const buy = {id: 999, groupingMode: packing};
const query = `Buys/${buy.id}`; const query = `Buys/${buy.id}`;
$httpBackend.expectPATCH(query, {groupingMode: grouping}).respond(200); $httpBackend.expectPATCH(query, {groupingMode: 'grouping'}).respond(200);
controller.toggleGroupingMode(buy, 'grouping'); controller.toggleGroupingMode(buy, 'grouping');
$httpBackend.flush(); $httpBackend.flush();
}); });
it(`should toggle off the grouping mode if it was packing to packing`, () => { it(`should toggle off the grouping mode if it was packing to packing`, () => {
const noGrouping = 0; const buy = {id: 999, groupingMode: 'packing'};
const packing = 2;
const buy = {id: 999, groupingMode: packing};
const query = `Buys/${buy.id}`; const query = `Buys/${buy.id}`;
$httpBackend.expectPATCH(query, {groupingMode: noGrouping}).respond(200); $httpBackend.expectPATCH(query, {groupingMode: null}).respond(200);
controller.toggleGroupingMode(buy, 'packing'); controller.toggleGroupingMode(buy, 'packing');
$httpBackend.flush(); $httpBackend.flush();
}); });
it(`should toggle off the grouping mode if it was grouping to grouping`, () => { it(`should toggle off the grouping mode if it was grouping to grouping`, () => {
const noGrouping = 0; const buy = {id: 999, groupingMode: 'grouping'};
const grouping = 1;
const buy = {id: 999, groupingMode: grouping};
const query = `Buys/${buy.id}`; const query = `Buys/${buy.id}`;
$httpBackend.expectPATCH(query, {groupingMode: noGrouping}).respond(200); $httpBackend.expectPATCH(query, {groupingMode: null}).respond(200);
controller.toggleGroupingMode(buy, 'grouping'); controller.toggleGroupingMode(buy, 'grouping');
$httpBackend.flush(); $httpBackend.flush();
}); });

4
modules/entry/front/latest-buys/index.html
View File

@ -143,12 +143,12 @@
</span> </span>
</td> </td>
<td number> <td number>
<vn-chip class="transparent" translate-attr="buy.groupingMode == 2 ? {title: 'Minimun amount'} : {title: 'Packing'}" ng-class="{'message': buy.groupingMode == 2}"> <vn-chip class="transparent" translate-attr="buy.groupingMode == 'packing' ? {title: 'Minimun amount'} : {title: 'Packing'}" ng-class="{'message': buy.groupingMode == 'packing'}">
<span>{{::buy.packing | dashIfEmpty}}</span> <span>{{::buy.packing | dashIfEmpty}}</span>
</vn-chip> </vn-chip>
</td> </td>
<td number> <td number>
<vn-chip class="transparent" translate-attr="buy.groupingMode == 1 ? {title: 'Minimun amount'} : {title: 'Grouping'}" ng-class="{'message': buy.groupingMode == 1}"> <vn-chip class="transparent" translate-attr="buy.groupingMode == 'grouping' ? {title: 'Minimun amount'} : {title: 'Grouping'}" ng-class="{'message': buy.groupingMode == 'grouping'}">
<span>{{::buy.grouping | dashIfEmpty}}</span> <span>{{::buy.grouping | dashIfEmpty}}</span>
</vn-chip> </vn-chip>
</td> </td>

4
modules/entry/front/summary/index.html
View File

@ -121,12 +121,12 @@
<td center title="{{::line.packagingFk | dashIfEmpty}}">{{::line.packagingFk | dashIfEmpty}}</td> <td center title="{{::line.packagingFk | dashIfEmpty}}">{{::line.packagingFk | dashIfEmpty}}</td>
<td center title="{{::line.weight}}">{{::line.weight}}</td> <td center title="{{::line.weight}}">{{::line.weight}}</td>
<td center> <td center>
<vn-chip class="transparent" translate-attr="line.groupingMode == 2 ? {title: 'Minimun amount'} : {title: 'Packing'}" ng-class="{'message': line.groupingMode == 2}"> <vn-chip class="transparent" translate-attr="line.groupingMode == 'packing' ? {title: 'Minimun amount'} : {title: 'Packing'}" ng-class="{'message': line.groupingMode == 'packing'}">
<span>{{::line.packing | dashIfEmpty}}</span> <span>{{::line.packing | dashIfEmpty}}</span>
</vn-chip> </vn-chip>
</td> </td>
<td center> <td center>
<vn-chip class="transparent" translate-attr="line.groupingMode == 1 ? {title: 'Minimun amount'} : {title: 'Grouping'}" ng-class="{'message': line.groupingMode == 1}"> <vn-chip class="transparent" translate-attr="line.groupingMode == 'grouping' ? {title: 'Minimun amount'} : {title: 'Grouping'}" ng-class="{'message': line.groupingMode == 'grouping'}">
<span>{{::line.grouping | dashIfEmpty}}</span> <span>{{::line.grouping | dashIfEmpty}}</span>
</vn-chip> </vn-chip>
</vn-td> </vn-td>

4
modules/item/front/last-entries/index.html
View File

@ -71,12 +71,12 @@
</vn-td> </vn-td>
<vn-td number class="expendable">{{entry.stickers | dashIfEmpty}}</vn-td> <vn-td number class="expendable">{{entry.stickers | dashIfEmpty}}</vn-td>
<vn-td number> <vn-td number>
<vn-chip translate-attr="{title: 'Packing'}" ng-class="{'message': entry.groupingMode == 2}"> <vn-chip translate-attr="{title: 'Packing'}" ng-class="{'message': entry.groupingMode == 'packing'}">
<span>{{::entry.packing | dashIfEmpty}}</span> <span>{{::entry.packing | dashIfEmpty}}</span>
</vn-chip> </vn-chip>
</vn-td> </vn-td>
<vn-td number> <vn-td number>
<vn-chip translate-attr="{title: 'Grouping'}" ng-class="{'message': entry.groupingMode == 1}"> <vn-chip translate-attr="{title: 'Grouping'}" ng-class="{'message': entry.groupingMode == 'grouping'}">
<span>{{::entry.grouping | dashIfEmpty}}</span> <span>{{::entry.grouping | dashIfEmpty}}</span>
</vn-chip> </vn-chip>
</vn-td> </vn-td>