Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
This commit is contained in:
commit
a3c8532661
|
@ -30,7 +30,7 @@ module.exports = Self => {
|
|||
path: `/:id/downloadFile`,
|
||||
verb: 'GET'
|
||||
},
|
||||
// accessScopes: ['read:multimedia']
|
||||
accessScopes: ['read:multimedia']
|
||||
});
|
||||
|
||||
Self.downloadFile = async function(ctx, id) {
|
||||
|
|
|
@ -43,7 +43,7 @@ module.exports = Self => {
|
|||
path: `/:id/download`,
|
||||
verb: 'GET'
|
||||
},
|
||||
// accessScopes: ['read:multimedia']
|
||||
accessScopes: ['read:multimedia']
|
||||
});
|
||||
|
||||
Self.download = async function(id, fileCabinet, filter) {
|
||||
|
|
|
@ -48,7 +48,7 @@ module.exports = Self => {
|
|||
path: `/:collection/:size/:id/download`,
|
||||
verb: 'GET'
|
||||
},
|
||||
// accessScopes: ['read:multimedia']
|
||||
accessScopes: ['read:multimedia']
|
||||
});
|
||||
|
||||
Self.download = async function(ctx, collection, size, id) {
|
||||
|
|
|
@ -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`)
|
||||
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),
|
||||
(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),
|
||||
(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()),
|
||||
(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()),
|
||||
(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()),
|
||||
(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()),
|
||||
(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()),
|
||||
(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()),
|
||||
(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()),
|
||||
(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()),
|
||||
(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()),
|
||||
(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()),
|
||||
(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()),
|
||||
(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()),
|
||||
(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());
|
||||
(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, '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, 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, 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, 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, '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, '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, '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, '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, '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, '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, '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, '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, '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, '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`)
|
||||
VALUES
|
||||
|
@ -3239,7 +3239,7 @@ INSERT INTO vn.buy
|
|||
stickers = 1,
|
||||
packing = 20,
|
||||
`grouping` = 1,
|
||||
groupingMode = 1,
|
||||
groupingMode = 'packing',
|
||||
price1 = 1,
|
||||
price2 = 1,
|
||||
price3 = 1,
|
||||
|
@ -3277,7 +3277,7 @@ INSERT INTO vn.buy
|
|||
stickers = 1,
|
||||
packing = 40,
|
||||
`grouping` = 5,
|
||||
groupingMode = 1,
|
||||
groupingMode = 'packing',
|
||||
price1 = 1,
|
||||
price2 = 1,
|
||||
price3 = 1,
|
||||
|
@ -3315,7 +3315,7 @@ INSERT INTO vn.buy
|
|||
stickers = 2,
|
||||
packing = 10,
|
||||
`grouping` = 5,
|
||||
groupingMode = 1,
|
||||
groupingMode = 'packing',
|
||||
price1 = 1,
|
||||
price2 = 1,
|
||||
price3 = 1,
|
||||
|
@ -3361,7 +3361,7 @@ INSERT INTO vn.buy
|
|||
stickers = 1,
|
||||
packing = 20,
|
||||
`grouping` = 4,
|
||||
groupingMode = 1,
|
||||
groupingMode = 'packing',
|
||||
price1 = 1,
|
||||
price2 = 1,
|
||||
price3 = 1,
|
||||
|
@ -3399,7 +3399,7 @@ INSERT INTO vn.buy
|
|||
stickers = 1,
|
||||
packing = 20,
|
||||
`grouping` = 1,
|
||||
groupingMode = 1,
|
||||
groupingMode = 'packing',
|
||||
price1 = 1,
|
||||
price2 = 1,
|
||||
price3 = 1,
|
||||
|
@ -3438,7 +3438,7 @@ INSERT INTO vn.buy
|
|||
stickers = 1,
|
||||
packing = 200,
|
||||
`grouping` = 30,
|
||||
groupingMode = 1,
|
||||
groupingMode = 'packing',
|
||||
price1 = 1,
|
||||
price2 = 1,
|
||||
price3 = 1,
|
||||
|
@ -3477,7 +3477,7 @@ INSERT INTO vn.buy
|
|||
stickers = 1,
|
||||
packing = 500,
|
||||
`grouping` = 10,
|
||||
groupingMode = 1,
|
||||
groupingMode = 'packing',
|
||||
price1 = 1,
|
||||
price2 = 1,
|
||||
price3 = 1,
|
||||
|
@ -3516,7 +3516,7 @@ INSERT INTO vn.buy
|
|||
stickers = 2,
|
||||
packing = 300,
|
||||
`grouping` = 50,
|
||||
groupingMode = 1,
|
||||
groupingMode = 'packing',
|
||||
price1 = 1,
|
||||
price2 = 1,
|
||||
price3 = 1,
|
||||
|
@ -3555,7 +3555,7 @@ INSERT INTO vn.buy
|
|||
stickers = 2,
|
||||
packing = 50,
|
||||
`grouping` = 5,
|
||||
groupingMode = 1,
|
||||
groupingMode = 'packing',
|
||||
price1 = 1,
|
||||
price2 = 1,
|
||||
price3 = 1,
|
||||
|
@ -3595,7 +3595,7 @@ INSERT vn.buy
|
|||
stickers = 1,
|
||||
packing = 5,
|
||||
`grouping` = 2,
|
||||
groupingMode = 1,
|
||||
groupingMode = 'packing',
|
||||
price1 = 7,
|
||||
price2 = 7,
|
||||
price3 = 7,
|
||||
|
@ -3634,7 +3634,7 @@ INSERT vn.buy
|
|||
stickers = 1,
|
||||
packing = 100,
|
||||
`grouping` = 5,
|
||||
groupingMode = 1,
|
||||
groupingMode = 'packing',
|
||||
price1 = 7,
|
||||
price2 = 7,
|
||||
price3 = 7,
|
||||
|
|
|
@ -14,7 +14,6 @@ proc:BEGIN
|
|||
DECLARE vPackage INT;
|
||||
DECLARE vPutOrderFk INT;
|
||||
DECLARE vIsLot BOOLEAN;
|
||||
DECLARE vForceToPacking INT DEFAULT 2;
|
||||
DECLARE vEntryFk INT;
|
||||
DECLARE vHasToChangePackagingFk BOOLEAN;
|
||||
DECLARE vIsFloramondoDirect BOOLEAN;
|
||||
|
@ -147,10 +146,10 @@ proc:BEGIN
|
|||
(@t := IF(i.stems, i.stems, 1)) * e.pri / IFNULL(i.stemMultiplier, 1) buyingValue,
|
||||
IFNULL(vItem, vDefaultEntry) itemFk,
|
||||
e.qty stickers,
|
||||
@pac := GREATEST(1, IFNULL(i.stemMultiplier * e.pac / @t, 0)) packing,
|
||||
@pac := GREATEST(1, IFNULL(i.stemMultiplier, 1) * e.pac / @t) packing,
|
||||
IFNULL(b.`grouping`, e.pac),
|
||||
@pac * e.qty,
|
||||
vForceToPacking,
|
||||
'packing',
|
||||
IF(vHasToChangePackagingFk OR b.packagingFk IS NULL, vPackage, b.packagingFk),
|
||||
(IFNULL(i.weightByPiece, 0) * @pac) / 1000
|
||||
FROM ekt e
|
||||
|
|
|
@ -417,7 +417,7 @@ proc: BEGIN
|
|||
o.NumberOfUnits etiquetas,
|
||||
o.NumberOfItemsPerCask packing,
|
||||
GREATEST(1, IFNULL(o.MinimumQuantity,0)) * o.NumberOfItemsPerCask `grouping`,
|
||||
2, -- Obliga al Packing
|
||||
'packing',
|
||||
o.embalageCode,
|
||||
o.diId
|
||||
FROM edi.offer o
|
||||
|
|
|
@ -48,7 +48,7 @@ BEGIN
|
|||
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.`grouping`, b.`grouping`) `grouping`,
|
||||
ABS(IFNULL(pf.box, b.groupingMode)) groupingMode,
|
||||
b.groupingMode groupingMode,
|
||||
tl.buyFk,
|
||||
i.typeFk,
|
||||
IF(i.hasKgPrice, b.weight / b.packing, NULL) weightGrouping
|
||||
|
@ -252,14 +252,15 @@ BEGIN
|
|||
SELECT tcc.warehouseFk,
|
||||
tcc.itemFk,
|
||||
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)) / weightGrouping priceKg
|
||||
FROM tmp.ticketComponentCalculate tcc
|
||||
JOIN tmp.ticketComponentSum tcs ON tcs.itemFk = tcc.itemFk
|
||||
AND tcs.warehouseFk = tcc.warehouseFk
|
||||
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;
|
||||
|
||||
INSERT INTO tmp.ticketComponentRate (warehouseFk, itemFk, rate, `grouping`, price, priceKg)
|
||||
|
|
|
@ -40,8 +40,8 @@ BEGIN
|
|||
ENGINE = MEMORY
|
||||
SELECT b.itemFk,
|
||||
CASE b.groupingMode
|
||||
WHEN 0 THEN 1
|
||||
WHEN 2 THEN b.packing
|
||||
WHEN NULL THEN 1
|
||||
WHEN 'packing' THEN b.packing
|
||||
ELSE b.`grouping`
|
||||
END `grouping`
|
||||
FROM buy b
|
||||
|
|
|
@ -7,195 +7,195 @@ BEGIN
|
|||
* @param vSelf company id
|
||||
* @param vMonthAgo time interval to be consulted
|
||||
*/
|
||||
DECLARE vStartingDate DATETIME DEFAULT TIMESTAMPADD (MONTH,- vMonthsAgo,util.VN_CURDATE());
|
||||
DECLARE vCurrencyEuroFk INT;
|
||||
DECLARE vStartDate DATE;
|
||||
DECLARE vInvalidBalances DOUBLE;
|
||||
DECLARE vStartingDate DATETIME DEFAULT TIMESTAMPADD (MONTH,- vMonthsAgo,util.VN_CURDATE());
|
||||
DECLARE vCurrencyEuroFk INT;
|
||||
DECLARE vStartDate DATE;
|
||||
DECLARE vInvalidBalances DOUBLE;
|
||||
|
||||
SELECT dated, invalidBalances INTO vStartDate, vInvalidBalances FROM supplierDebtConfig;
|
||||
SELECT id INTO vCurrencyEuroFk FROM currency WHERE code = 'EUR';
|
||||
SELECT dated, invalidBalances INTO vStartDate, vInvalidBalances FROM supplierDebtConfig;
|
||||
SELECT id INTO vCurrencyEuroFk FROM currency WHERE code = 'EUR';
|
||||
|
||||
DROP TEMPORARY TABLE IF EXISTS tOpeningBalances;
|
||||
CREATE TEMPORARY TABLE tOpeningBalances (
|
||||
supplierFk INT NOT NULL,
|
||||
companyFk INT NOT NULL,
|
||||
openingBalances DOUBLE NOT NULL,
|
||||
closingBalances DOUBLE NOT NULL,
|
||||
currencyFk INT NOT NULL,
|
||||
PRIMARY KEY (supplierFk, companyFk, currencyFk)
|
||||
) ENGINE = MEMORY;
|
||||
DROP TEMPORARY TABLE IF EXISTS tOpeningBalances;
|
||||
CREATE TEMPORARY TABLE tOpeningBalances (
|
||||
supplierFk INT NOT NULL,
|
||||
companyFk INT NOT NULL,
|
||||
openingBalances DOUBLE NOT NULL,
|
||||
closingBalances DOUBLE NOT NULL,
|
||||
currencyFk INT NOT NULL,
|
||||
PRIMARY KEY (supplierFk, companyFk, currencyFk)
|
||||
) ENGINE = MEMORY;
|
||||
|
||||
-- Calculates the opening and closing balance for each supplier
|
||||
INSERT INTO tOpeningBalances
|
||||
SELECT supplierFk,
|
||||
companyFk,
|
||||
SUM(amount * isBeforeStarting) AS openingBalances,
|
||||
SUM(amount) closingBalances,
|
||||
currencyFk
|
||||
FROM (
|
||||
SELECT p.supplierFk,
|
||||
p.companyFk,
|
||||
IF (p.currencyFk = vCurrencyEuroFk, p.amount, p.divisa) AS amount,
|
||||
p.dueDated < vStartingDate isBeforeStarting,
|
||||
p.currencyFk
|
||||
FROM payment p
|
||||
WHERE p.received > vStartDate
|
||||
AND p.companyFk = vSelf
|
||||
UNION ALL
|
||||
SELECT r.supplierFk,
|
||||
r.companyFk,
|
||||
- IF (r.currencyFk = vCurrencyEuroFk, rv.amount, rv.foreignValue) AS Total,
|
||||
rv.dueDated < vStartingDate isBeforeStarting,
|
||||
r.currencyFk
|
||||
FROM invoiceIn r
|
||||
INNER JOIN invoiceInDueDay rv ON r.id = rv.invoiceInFk
|
||||
WHERE r.issued > vStartDate
|
||||
AND r.isBooked
|
||||
AND r.companyFk = vSelf
|
||||
) sub GROUP BY companyFk, supplierFk, currencyFk;
|
||||
-- Calculates the opening and closing balance for each supplier
|
||||
INSERT INTO tOpeningBalances
|
||||
SELECT supplierFk,
|
||||
companyFk,
|
||||
SUM(amount * isBeforeStarting) AS openingBalances,
|
||||
SUM(amount) closingBalances,
|
||||
currencyFk
|
||||
FROM (
|
||||
SELECT p.supplierFk,
|
||||
p.companyFk,
|
||||
IF (p.currencyFk = vCurrencyEuroFk, p.amount, p.divisa) AS amount,
|
||||
p.dueDated < vStartingDate isBeforeStarting,
|
||||
p.currencyFk
|
||||
FROM payment p
|
||||
WHERE p.received > vStartDate
|
||||
AND p.companyFk = vSelf
|
||||
UNION ALL
|
||||
SELECT r.supplierFk,
|
||||
r.companyFk,
|
||||
- IF (r.currencyFk = vCurrencyEuroFk, rv.amount, rv.foreignValue) AS Total,
|
||||
rv.dueDated < vStartingDate isBeforeStarting,
|
||||
r.currencyFk
|
||||
FROM invoiceIn r
|
||||
INNER JOIN invoiceInDueDay rv ON r.id = rv.invoiceInFk
|
||||
WHERE r.issued > vStartDate
|
||||
AND r.isBooked
|
||||
AND r.companyFk = vSelf
|
||||
) sub GROUP BY companyFk, supplierFk, currencyFk;
|
||||
|
||||
DROP TEMPORARY TABLE IF EXISTS tPendingDuedates;
|
||||
CREATE TEMPORARY TABLE tPendingDuedates (
|
||||
id INT auto_increment,
|
||||
expirationId INT,
|
||||
dated DATE,
|
||||
supplierFk INT NOT NULL,
|
||||
companyFk INT NOT NULL,
|
||||
amount DECIMAL(10, 2) NOT NULL,
|
||||
currencyFk INT NOT NULL,
|
||||
pending DECIMAL(10, 2) DEFAULT 0,
|
||||
balance DECIMAL(10, 2) DEFAULT 0,
|
||||
endingBalance DECIMAL(10, 2) DEFAULT 0,
|
||||
isPayment BOOLEAN,
|
||||
isReconciled BOOLEAN,
|
||||
PRIMARY KEY (id),
|
||||
INDEX (supplierFk, companyFk, currencyFk)
|
||||
) ENGINE = MEMORY;
|
||||
DROP TEMPORARY TABLE IF EXISTS tPendingDuedates;
|
||||
CREATE TEMPORARY TABLE tPendingDuedates (
|
||||
id INT auto_increment,
|
||||
expirationId INT,
|
||||
dated DATE,
|
||||
supplierFk INT NOT NULL,
|
||||
companyFk INT NOT NULL,
|
||||
amount DECIMAL(10, 2) NOT NULL,
|
||||
currencyFk INT NOT NULL,
|
||||
pending DECIMAL(10, 2) DEFAULT 0,
|
||||
balance DECIMAL(10, 2) DEFAULT 0,
|
||||
endingBalance DECIMAL(10, 2) DEFAULT 0,
|
||||
isPayment BOOLEAN,
|
||||
isReconciled BOOLEAN,
|
||||
PRIMARY KEY (id),
|
||||
INDEX (supplierFk, companyFk, currencyFk)
|
||||
) ENGINE = MEMORY;
|
||||
|
||||
INSERT INTO tPendingDuedates (
|
||||
expirationId,
|
||||
dated,
|
||||
supplierFk,
|
||||
companyFk,
|
||||
amount,
|
||||
currencyFk,
|
||||
isPayment,
|
||||
isReconciled
|
||||
)SELECT p.id,
|
||||
p.dueDated,
|
||||
p.supplierFk,
|
||||
p.companyFk,
|
||||
IF (p.currencyFk = vCurrencyEuroFk, p.amount, p.divisa),
|
||||
p.currencyFk,
|
||||
TRUE isPayment,
|
||||
p.isConciliated
|
||||
FROM payment p
|
||||
WHERE p.dueDated >= vStartingDate
|
||||
AND p.companyFk = vSelf
|
||||
UNION ALL
|
||||
SELECT r.id,
|
||||
rv.dueDated,
|
||||
r.supplierFk,
|
||||
r.companyFk,
|
||||
-IF (r.currencyFk = vCurrencyEuroFk, rv.amount, rv.foreignValue),
|
||||
r.currencyFk,
|
||||
FALSE isPayment,
|
||||
TRUE
|
||||
FROM invoiceIn r
|
||||
LEFT JOIN tOpeningBalances si ON r.companyFk = si.companyFk
|
||||
AND r.supplierFk = si.supplierFk
|
||||
AND r.currencyFk = si.currencyFk
|
||||
JOIN invoiceInDueDay rv ON r.id = rv.invoiceInFk
|
||||
WHERE rv.dueDated >= vStartingDate
|
||||
AND (si.closingBalances IS NULL OR si.closingBalances <> 0)
|
||||
AND r.isBooked
|
||||
AND r.companyFk = vSelf
|
||||
ORDER BY supplierFk, companyFk, companyFk, dueDated, isPayment DESC, id;
|
||||
-- Now, we calculate the outstanding amount for each receipt in descending order
|
||||
SET @risk := 0.0;
|
||||
SET @supplier := 0.0;
|
||||
SET @company := 0.0;
|
||||
SET @moneda := 0.0;
|
||||
SET @pending := 0.0;
|
||||
SET @day := util.VN_CURDATE();
|
||||
INSERT INTO tPendingDuedates (
|
||||
expirationId,
|
||||
dated,
|
||||
supplierFk,
|
||||
companyFk,
|
||||
amount,
|
||||
currencyFk,
|
||||
isPayment,
|
||||
isReconciled
|
||||
)SELECT p.id,
|
||||
p.dueDated,
|
||||
p.supplierFk,
|
||||
p.companyFk,
|
||||
IF (p.currencyFk = vCurrencyEuroFk, p.amount, p.divisa),
|
||||
p.currencyFk,
|
||||
TRUE isPayment,
|
||||
p.isConciliated
|
||||
FROM payment p
|
||||
WHERE p.dueDated >= vStartingDate
|
||||
AND p.companyFk = vSelf
|
||||
UNION ALL
|
||||
SELECT r.id,
|
||||
rv.dueDated,
|
||||
r.supplierFk,
|
||||
r.companyFk,
|
||||
-IF (r.currencyFk = vCurrencyEuroFk, rv.amount, rv.foreignValue),
|
||||
r.currencyFk,
|
||||
FALSE isPayment,
|
||||
TRUE
|
||||
FROM invoiceIn r
|
||||
LEFT JOIN tOpeningBalances si ON r.companyFk = si.companyFk
|
||||
AND r.supplierFk = si.supplierFk
|
||||
AND r.currencyFk = si.currencyFk
|
||||
JOIN invoiceInDueDay rv ON r.id = rv.invoiceInFk
|
||||
WHERE rv.dueDated >= vStartingDate
|
||||
AND (si.closingBalances IS NULL OR si.closingBalances <> 0)
|
||||
AND r.isBooked
|
||||
AND r.companyFk = vSelf
|
||||
ORDER BY supplierFk, companyFk, companyFk, dueDated, isPayment DESC, id;
|
||||
-- Now, we calculate the outstanding amount for each receipt in descending order
|
||||
SET @risk := 0.0;
|
||||
SET @supplier := 0.0;
|
||||
SET @company := 0.0;
|
||||
SET @moneda := 0.0;
|
||||
SET @pending := 0.0;
|
||||
SET @day := util.VN_CURDATE();
|
||||
|
||||
UPDATE tPendingDuedates vp
|
||||
LEFT JOIN tOpeningBalances si ON vp.companyFk = si.companyFk
|
||||
AND vp.supplierFk = si.supplierFk
|
||||
AND vp.currencyFk = si.currencyFk
|
||||
SET vp.balance = @risk := (
|
||||
IF (
|
||||
@company <> vp.companyFk
|
||||
OR @supplier <> vp.supplierFk
|
||||
OR @moneda <> vp.currencyFk,
|
||||
IFNULL(si.openingBalances, 0),
|
||||
@risk
|
||||
) +
|
||||
vp.amount
|
||||
),
|
||||
-- if there is a change of company or supplier or currency, the balance is reset
|
||||
vp.pending = @pending := IF (
|
||||
@company <> vp.companyFk
|
||||
OR @supplier <> vp.supplierFk
|
||||
OR @moneda <> vp.currencyFk
|
||||
OR @day <> vp.dated,
|
||||
vp.amount * (NOT vp.isPayment),
|
||||
@pending + vp.amount
|
||||
),
|
||||
vp.companyFk = @company := vp.companyFk,
|
||||
vp.supplierFk = @supplier := vp.supplierFk,
|
||||
vp.currencyFk = @moneda := vp.currencyFk,
|
||||
vp.dated = @day := vp.dated,
|
||||
vp.balance = @risk,
|
||||
vp.pending = @pending;
|
||||
UPDATE tPendingDuedates vp
|
||||
LEFT JOIN tOpeningBalances si ON vp.companyFk = si.companyFk
|
||||
AND vp.supplierFk = si.supplierFk
|
||||
AND vp.currencyFk = si.currencyFk
|
||||
SET vp.balance = @risk := (
|
||||
IF (
|
||||
@company <> vp.companyFk
|
||||
OR @supplier <> vp.supplierFk
|
||||
OR @moneda <> vp.currencyFk,
|
||||
IFNULL(si.openingBalances, 0),
|
||||
@risk
|
||||
) +
|
||||
vp.amount
|
||||
),
|
||||
-- if there is a change of company or supplier or currency, the balance is reset
|
||||
vp.pending = @pending := IF (
|
||||
@company <> vp.companyFk
|
||||
OR @supplier <> vp.supplierFk
|
||||
OR @moneda <> vp.currencyFk
|
||||
OR @day <> vp.dated,
|
||||
vp.amount * (NOT vp.isPayment),
|
||||
@pending + vp.amount
|
||||
),
|
||||
vp.companyFk = @company := vp.companyFk,
|
||||
vp.supplierFk = @supplier := vp.supplierFk,
|
||||
vp.currencyFk = @moneda := vp.currencyFk,
|
||||
vp.dated = @day := vp.dated,
|
||||
vp.balance = @risk,
|
||||
vp.pending = @pending;
|
||||
|
||||
CREATE OR REPLACE TEMPORARY TABLE tRowsToDelete ENGINE = MEMORY
|
||||
SELECT expirationId,
|
||||
dated,
|
||||
supplierFk,
|
||||
companyFk,
|
||||
currencyFk,
|
||||
balance
|
||||
FROM tPendingDuedates
|
||||
WHERE balance < vInvalidBalances
|
||||
AND balance > - vInvalidBalances;
|
||||
CREATE OR REPLACE TEMPORARY TABLE tRowsToDelete ENGINE = MEMORY
|
||||
SELECT expirationId,
|
||||
dated,
|
||||
supplierFk,
|
||||
companyFk,
|
||||
currencyFk,
|
||||
balance
|
||||
FROM tPendingDuedates
|
||||
WHERE balance < vInvalidBalances
|
||||
AND balance > - vInvalidBalances;
|
||||
|
||||
DELETE vp.*
|
||||
FROM tPendingDuedates vp
|
||||
JOIN tRowsToDelete rd ON (
|
||||
vp.dated < rd.dated
|
||||
OR (vp.dated = rd.dated AND vp.expirationId <= rd.expirationId)
|
||||
)
|
||||
AND vp.supplierFk = rd.supplierFk
|
||||
AND vp.companyFk = rd.companyFk
|
||||
AND vp.currencyFk = rd.currencyFk
|
||||
WHERE NOT vp.isPayment;
|
||||
DELETE vp.*
|
||||
FROM tPendingDuedates vp
|
||||
JOIN tRowsToDelete rd ON (
|
||||
vp.dated < rd.dated
|
||||
OR (vp.dated = rd.dated AND vp.expirationId <= rd.expirationId)
|
||||
)
|
||||
AND vp.supplierFk = rd.supplierFk
|
||||
AND vp.companyFk = rd.companyFk
|
||||
AND vp.currencyFk = rd.currencyFk
|
||||
WHERE NOT vp.isPayment;
|
||||
|
||||
SELECT vp.expirationId,
|
||||
vp.dated,
|
||||
vp.supplierFk,
|
||||
vp.companyFk,
|
||||
vp.currencyFk,
|
||||
vp.amount,
|
||||
vp.pending,
|
||||
vp.balance,
|
||||
s.payMethodFk,
|
||||
vp.isPayment,
|
||||
vp.isReconciled,
|
||||
vp.endingBalance,
|
||||
cr.amount clientRiskAmount,
|
||||
co.CEE
|
||||
FROM tPendingDuedates vp
|
||||
LEFT JOIN supplier s ON s.id = vp.supplierFk
|
||||
LEFT JOIN client c ON c.fi = s.nif
|
||||
LEFT JOIN clientRisk cr ON cr.clientFk = c.id
|
||||
LEFT JOIN supplierAccount sa ON sa.supplierFk = s.id
|
||||
LEFT JOIN bankEntity be ON be.id = sa.bankEntityFk
|
||||
LEFT JOIN country co ON co.id = be.countryFk
|
||||
AND cr.companyFk = vp.companyFk;
|
||||
SELECT vp.expirationId,
|
||||
vp.dated,
|
||||
vp.supplierFk,
|
||||
vp.companyFk,
|
||||
vp.currencyFk,
|
||||
vp.amount,
|
||||
vp.pending,
|
||||
vp.balance,
|
||||
s.payMethodFk,
|
||||
vp.isPayment,
|
||||
vp.isReconciled,
|
||||
vp.endingBalance,
|
||||
cr.amount clientRiskAmount,
|
||||
co.CEE
|
||||
FROM tPendingDuedates vp
|
||||
LEFT JOIN supplier s ON s.id = vp.supplierFk
|
||||
LEFT JOIN client c ON c.fi = s.nif
|
||||
JOIN clientRisk cr ON cr.clientFk = c.id
|
||||
AND cr.companyFk = vp.companyFk
|
||||
LEFT JOIN supplierAccount sa ON sa.supplierFk = s.id
|
||||
LEFT JOIN bankEntity be ON be.id = sa.bankEntityFk
|
||||
LEFT JOIN country co ON co.id = be.countryFk;
|
||||
|
||||
DROP TEMPORARY TABLE tOpeningBalances;
|
||||
DROP TEMPORARY TABLE tPendingDuedates;
|
||||
DROP TEMPORARY TABLE tRowsToDelete;
|
||||
DROP TEMPORARY TABLE tOpeningBalances;
|
||||
DROP TEMPORARY TABLE tPendingDuedates;
|
||||
DROP TEMPORARY TABLE tRowsToDelete;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
|
@ -116,7 +116,7 @@ BEGIN
|
|||
freightValue decimal(10,3) DEFAULT '0.000',
|
||||
packing int(11) 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',
|
||||
packageValue decimal(10,3) DEFAULT '0.000',
|
||||
packageFk varchar(10) COLLATE utf8_unicode_ci DEFAULT '--',
|
||||
|
|
|
@ -61,8 +61,8 @@ BEGIN
|
|||
a.available,
|
||||
IFNULL(ip.counter, 0) `counter`,
|
||||
CASE
|
||||
WHEN b.groupingMode = 1 THEN b.grouping
|
||||
WHEN b.groupingMode = 2 THEN b.packing
|
||||
WHEN b.groupingMode = 'grouping' THEN b.grouping
|
||||
WHEN b.groupingMode = 'packing' THEN b.packing
|
||||
ELSE 1
|
||||
END AS minQuantity,
|
||||
iss.visible located
|
||||
|
|
|
@ -13,7 +13,7 @@ BEGIN
|
|||
DECLARE vWarehouseFk SMALLINT;
|
||||
DECLARE vDate DATE;
|
||||
DECLARE vGrouping INT;
|
||||
DECLARE vGroupingModeFk INT;
|
||||
DECLARE vGroupingMode VARCHAR(255);
|
||||
DECLARE vPacking INT;
|
||||
DECLARE vRoundQuantity INT DEFAULT 1;
|
||||
DECLARE vLanded DATE;
|
||||
|
@ -23,8 +23,6 @@ BEGIN
|
|||
DECLARE vOldPrice DECIMAL(10,2);
|
||||
DECLARE vOption VARCHAR(255);
|
||||
DECLARE vNewSaleFk INT;
|
||||
DECLARE vForceToGrouping INT DEFAULT 1;
|
||||
DECLARE vForceToPacking INT DEFAULT 2;
|
||||
DECLARE vFinalPrice DECIMAL(10,2);
|
||||
|
||||
DECLARE EXIT HANDLER FOR SQLEXCEPTION
|
||||
|
@ -58,15 +56,15 @@ BEGIN
|
|||
CALL buyUltimate(vWarehouseFk, vDate);
|
||||
|
||||
SELECT `grouping`, groupingMode, packing
|
||||
INTO vGrouping,vGroupingModeFk,vPacking
|
||||
INTO vGrouping,vGroupingMode,vPacking
|
||||
FROM buy b
|
||||
JOIN tmp.buyUltimate tmp ON b.id = tmp.buyFk
|
||||
WHERE tmp.itemFk = vNewItemFk AND tmp.WarehouseFk = vWarehouseFk;
|
||||
|
||||
IF vGroupingModeFk = vForceToPacking AND vPacking > 0 THEN
|
||||
IF vGroupingMode = 'packing' AND vPacking > 0 THEN
|
||||
SET vRoundQuantity = vPacking;
|
||||
END IF;
|
||||
IF vGroupingModeFk = vForceToGrouping AND vGrouping > 0 THEN
|
||||
IF vGroupingMode = 'grouping' AND vGrouping > 0 THEN
|
||||
SET vRoundQuantity = vGrouping;
|
||||
END IF;
|
||||
|
||||
|
@ -81,10 +79,6 @@ BEGIN
|
|||
ORDER BY (vQuantity % `grouping`) ASC
|
||||
LIMIT 1;
|
||||
|
||||
IF vNewPrice IS NULL THEN
|
||||
CALL util.throw('price retrieval failed');
|
||||
END IF;
|
||||
|
||||
IF vNewPrice > vOldPrice THEN
|
||||
SET vFinalPrice = vOldPrice;
|
||||
SET vOption = 'substitution';
|
||||
|
|
|
@ -6,7 +6,7 @@ trig: BEGIN
|
|||
DECLARE vWarehouse INT;
|
||||
DECLARE vLanding DATE;
|
||||
DECLARE vGrouping INT;
|
||||
DECLARE vGroupingMode TINYINT;
|
||||
DECLARE vGroupingMode VARCHAR(255);
|
||||
DECLARE vGenericFk INT;
|
||||
DECLARE vGenericInDate BOOL;
|
||||
DECLARE vBuyerFk INT;
|
||||
|
|
|
@ -0,0 +1,16 @@
|
|||
START TRANSACTION;
|
||||
|
||||
SET @isTriggerDisabled = TRUE;
|
||||
|
||||
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;
|
||||
|
||||
UPDATE vn.buy SET groupingMode2 = 'packing' WHERE groupingMode = 2;
|
||||
UPDATE vn.buy SET groupingMode2 = 'grouping' WHERE groupingMode = 1;
|
||||
|
||||
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;
|
||||
|
||||
SET @isTriggerDisabled = FALSE;
|
||||
|
||||
COMMIT;
|
|
@ -86,8 +86,7 @@ export default class Auth {
|
|||
return this.$http.get('VnUsers/ShareToken', {
|
||||
headers: {Authorization: json.data.token}
|
||||
}).then(({data}) => {
|
||||
// Usar data.multimediaToken.id cuando el resto de sistemas lo tengan completado
|
||||
this.vnToken.set(json.data.token, json.data.token, now, json.data.ttl, remember);
|
||||
this.vnToken.set(json.data.token, data.multimediaToken.id, now, json.data.ttl, remember);
|
||||
this.loadAcls().then(() => {
|
||||
let continueHash = this.$state.params.continue;
|
||||
if (continueHash)
|
||||
|
|
|
@ -59,8 +59,7 @@ export default class Token {
|
|||
|
||||
getStorage(storage) {
|
||||
this.token = storage.getItem('vnToken');
|
||||
// Cambio realizado temporalmente
|
||||
this.tokenMultimedia = this.token; // storage.getItem('vnTokenMultimedia');
|
||||
this.tokenMultimedia = storage.getItem('vnTokenMultimedia');
|
||||
if (!this.token) return;
|
||||
const created = storage.getItem('vnTokenCreated');
|
||||
this.created = created && new Date(created);
|
||||
|
|
|
@ -35,7 +35,7 @@ module.exports = Self => {
|
|||
path: '/:id/claim-pickup-pdf',
|
||||
verb: 'GET'
|
||||
},
|
||||
//accessScopes: ['read:multimedia']
|
||||
accessScopes: ['read:multimedia']
|
||||
});
|
||||
|
||||
Self.claimPickupPdf = (ctx, id) => Self.printReport(ctx, id, 'claim-pickup-order');
|
||||
|
|
|
@ -33,7 +33,7 @@ module.exports = Self => {
|
|||
path: `/:id/downloadFile`,
|
||||
verb: 'GET'
|
||||
},
|
||||
//accessScopes: ['read:multimedia']
|
||||
accessScopes: ['read:multimedia']
|
||||
});
|
||||
|
||||
Self.downloadFile = async function(ctx, id) {
|
||||
|
|
|
@ -46,7 +46,7 @@ module.exports = Self => {
|
|||
path: '/:id/campaign-metrics-pdf',
|
||||
verb: 'GET'
|
||||
},
|
||||
//accessScopes: ['read:multimedia']
|
||||
accessScopes: ['read:multimedia']
|
||||
});
|
||||
|
||||
Self.campaignMetricsPdf = (ctx, id) => Self.printReport(ctx, id, 'campaign-metrics');
|
||||
|
|
|
@ -34,7 +34,7 @@ module.exports = Self => {
|
|||
path: '/:id/entry-order-pdf',
|
||||
verb: 'GET'
|
||||
},
|
||||
//accessScopes: ['read:multimedia']
|
||||
accessScopes: ['read:multimedia']
|
||||
});
|
||||
|
||||
Self.entryOrderPdf = (ctx, id) => Self.printReport(ctx, id, 'entry-order');
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
"type": "number"
|
||||
},
|
||||
"groupingMode": {
|
||||
"type": "number"
|
||||
"type": "string"
|
||||
},
|
||||
"comissionValue": {
|
||||
"type": "number"
|
||||
|
|
|
@ -119,13 +119,13 @@
|
|||
<append>
|
||||
<vn-icon
|
||||
pointer
|
||||
ng-show="buy.groupingMode == '2'"
|
||||
ng-show="buy.groupingMode == 'packing'"
|
||||
ng-click="$ctrl.toggleGroupingMode(buy, 'packing')"
|
||||
icon="lock">
|
||||
</vn-icon>
|
||||
<vn-icon
|
||||
pointer
|
||||
ng-show="buy.groupingMode != '2'"
|
||||
ng-show="buy.groupingMode != 'packing'"
|
||||
ng-click="$ctrl.toggleGroupingMode(buy, 'packing')"
|
||||
icon="lock_open">
|
||||
</vn-icon>
|
||||
|
@ -140,13 +140,13 @@
|
|||
<append>
|
||||
<vn-icon
|
||||
pointer
|
||||
ng-show="buy.groupingMode == '1'"
|
||||
ng-show="buy.groupingMode == 'grouping'"
|
||||
ng-click="$ctrl.toggleGroupingMode(buy, 'grouping')"
|
||||
icon="lock">
|
||||
</vn-icon>
|
||||
<vn-icon
|
||||
pointer
|
||||
ng-show="buy.groupingMode != '1'"
|
||||
ng-show="buy.groupingMode != 'grouping'"
|
||||
ng-click="$ctrl.toggleGroupingMode(buy, 'grouping')"
|
||||
icon="lock_open">
|
||||
</vn-icon>
|
||||
|
|
|
@ -53,12 +53,8 @@ export default class Controller extends Section {
|
|||
}
|
||||
|
||||
toggleGroupingMode(buy, mode) {
|
||||
const grouping = 1;
|
||||
const packing = 2;
|
||||
const groupingMode = mode === 'grouping' ? grouping : packing;
|
||||
|
||||
const newGroupingMode = buy.groupingMode === groupingMode ? 0 : groupingMode;
|
||||
|
||||
const groupingMode = mode === 'grouping' ? mode : 'packing';
|
||||
const newGroupingMode = buy.groupingMode === groupingMode ? null : groupingMode;
|
||||
const params = {
|
||||
groupingMode: newGroupingMode
|
||||
};
|
||||
|
|
|
@ -57,45 +57,34 @@ describe('Entry buy', () => {
|
|||
|
||||
describe('toggleGroupingMode()', () => {
|
||||
it(`should toggle grouping mode from grouping to packing`, () => {
|
||||
const grouping = 1;
|
||||
const packing = 2;
|
||||
const buy = {id: 999, groupingMode: grouping};
|
||||
const buy = {id: 999, groupingMode: 'grouping'};
|
||||
|
||||
const query = `Buys/${buy.id}`;
|
||||
$httpBackend.expectPATCH(query, {groupingMode: packing}).respond(200);
|
||||
$httpBackend.expectPATCH(query, {groupingMode: 'packing'}).respond(200);
|
||||
controller.toggleGroupingMode(buy, 'packing');
|
||||
$httpBackend.flush();
|
||||
});
|
||||
|
||||
it(`should toggle grouping mode from packing to grouping`, () => {
|
||||
const grouping = 1;
|
||||
const packing = 2;
|
||||
const buy = {id: 999, groupingMode: packing};
|
||||
|
||||
const buy = {id: 999, groupingMode: 'packing'};
|
||||
const query = `Buys/${buy.id}`;
|
||||
$httpBackend.expectPATCH(query, {groupingMode: grouping}).respond(200);
|
||||
$httpBackend.expectPATCH(query, {groupingMode: 'grouping'}).respond(200);
|
||||
controller.toggleGroupingMode(buy, 'grouping');
|
||||
$httpBackend.flush();
|
||||
});
|
||||
|
||||
it(`should toggle off the grouping mode if it was packing to packing`, () => {
|
||||
const noGrouping = 0;
|
||||
const packing = 2;
|
||||
const buy = {id: 999, groupingMode: packing};
|
||||
|
||||
const buy = {id: 999, groupingMode: 'packing'};
|
||||
const query = `Buys/${buy.id}`;
|
||||
$httpBackend.expectPATCH(query, {groupingMode: noGrouping}).respond(200);
|
||||
$httpBackend.expectPATCH(query, {groupingMode: null}).respond(200);
|
||||
controller.toggleGroupingMode(buy, 'packing');
|
||||
$httpBackend.flush();
|
||||
});
|
||||
|
||||
it(`should toggle off the grouping mode if it was grouping to grouping`, () => {
|
||||
const noGrouping = 0;
|
||||
const grouping = 1;
|
||||
const buy = {id: 999, groupingMode: grouping};
|
||||
|
||||
const buy = {id: 999, groupingMode: 'grouping'};
|
||||
const query = `Buys/${buy.id}`;
|
||||
$httpBackend.expectPATCH(query, {groupingMode: noGrouping}).respond(200);
|
||||
$httpBackend.expectPATCH(query, {groupingMode: null}).respond(200);
|
||||
controller.toggleGroupingMode(buy, 'grouping');
|
||||
$httpBackend.flush();
|
||||
});
|
||||
|
|
|
@ -143,12 +143,12 @@
|
|||
</span>
|
||||
</td>
|
||||
<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>
|
||||
</vn-chip>
|
||||
</td>
|
||||
<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>
|
||||
</vn-chip>
|
||||
</td>
|
||||
|
|
|
@ -121,12 +121,12 @@
|
|||
<td center title="{{::line.packagingFk | dashIfEmpty}}">{{::line.packagingFk | dashIfEmpty}}</td>
|
||||
<td center title="{{::line.weight}}">{{::line.weight}}</td>
|
||||
<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>
|
||||
</vn-chip>
|
||||
</td>
|
||||
<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>
|
||||
</vn-chip>
|
||||
</vn-td>
|
||||
|
|
|
@ -32,7 +32,7 @@ module.exports = Self => {
|
|||
path: '/:id/download',
|
||||
verb: 'GET'
|
||||
},
|
||||
// accessScopes: ['read:multimedia']
|
||||
accessScopes: ['read:multimedia']
|
||||
});
|
||||
|
||||
Self.download = async function(ctx, id, options) {
|
||||
|
|
|
@ -32,7 +32,7 @@ module.exports = Self => {
|
|||
path: '/downloadZip',
|
||||
verb: 'GET'
|
||||
},
|
||||
// accessScopes: ['read:multimedia']
|
||||
accessScopes: ['read:multimedia']
|
||||
});
|
||||
|
||||
Self.downloadZip = async function(ctx, ids, options) {
|
||||
|
|
|
@ -35,7 +35,7 @@ module.exports = Self => {
|
|||
path: '/:reference/exportation-pdf',
|
||||
verb: 'GET'
|
||||
},
|
||||
// accessScopes: ['read:multimedia']
|
||||
accessScopes: ['read:multimedia']
|
||||
});
|
||||
|
||||
Self.exportationPdf = (ctx, reference) => Self.printReport(ctx, reference, 'exportation');
|
||||
|
|
|
@ -38,7 +38,7 @@ module.exports = Self => {
|
|||
path: '/:reference/invoice-csv',
|
||||
verb: 'GET'
|
||||
},
|
||||
// accessScopes: ['read:multimedia']
|
||||
accessScopes: ['read:multimedia']
|
||||
});
|
||||
|
||||
Self.invoiceCsv = async reference => {
|
||||
|
|
|
@ -40,7 +40,7 @@ module.exports = Self => {
|
|||
path: '/negativeBasesCsv',
|
||||
verb: 'GET'
|
||||
},
|
||||
// accessScopes: ['read:multimedia']
|
||||
accessScopes: ['read:multimedia']
|
||||
});
|
||||
|
||||
Self.negativeBasesCsv = async(ctx, options) => {
|
||||
|
|
|
@ -11,7 +11,7 @@ module.exports = Self => {
|
|||
path: `/download`,
|
||||
verb: 'POST',
|
||||
},
|
||||
//accessScopes: ['read:multimedia']
|
||||
accessScopes: ['read:multimedia']
|
||||
});
|
||||
|
||||
Self.download = async() => {
|
||||
|
|
|
@ -71,12 +71,12 @@
|
|||
</vn-td>
|
||||
<vn-td number class="expendable">{{entry.stickers | dashIfEmpty}}</vn-td>
|
||||
<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>
|
||||
</vn-chip>
|
||||
</vn-td>
|
||||
<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>
|
||||
</vn-chip>
|
||||
</vn-td>
|
||||
|
|
|
@ -29,7 +29,8 @@ module.exports = Self => {
|
|||
http: {
|
||||
path: '/:id/cmr',
|
||||
verb: 'GET'
|
||||
}
|
||||
},
|
||||
accessScopes: ['read:multimedia']
|
||||
});
|
||||
|
||||
Self.cmr = (ctx, id) => Self.printReport(ctx, id, 'cmr');
|
||||
|
|
|
@ -30,7 +30,7 @@ module.exports = Self => {
|
|||
path: '/downloadCmrsZip',
|
||||
verb: 'GET'
|
||||
},
|
||||
//accessScopes: ['read:multimedia']
|
||||
accessScopes: ['read:multimedia']
|
||||
});
|
||||
|
||||
Self.downloadCmrsZip = async function(ctx, ids, options) {
|
||||
|
|
|
@ -30,7 +30,7 @@ module.exports = Self => {
|
|||
path: '/downloadZip',
|
||||
verb: 'GET'
|
||||
},
|
||||
//accessScopes: ['read:multimedia']
|
||||
accessScopes: ['read:multimedia']
|
||||
});
|
||||
|
||||
Self.downloadZip = async function(ctx, id, options) {
|
||||
|
|
|
@ -35,7 +35,7 @@ module.exports = Self => {
|
|||
path: '/:id/driver-route-pdf',
|
||||
verb: 'GET'
|
||||
},
|
||||
//accessScopes: ['read:multimedia']
|
||||
accessScopes: ['read:multimedia']
|
||||
|
||||
});
|
||||
|
||||
|
|
|
@ -45,7 +45,7 @@ module.exports = Self => {
|
|||
path: '/:id/campaign-metrics-pdf',
|
||||
verb: 'GET'
|
||||
},
|
||||
// accessScopes: ['read:multimedia']
|
||||
accessScopes: ['read:multimedia']
|
||||
});
|
||||
|
||||
Self.campaignMetricsPdf = (ctx, id) => Self.printReport(ctx, id, 'supplier-campaign-metrics');
|
||||
|
|
|
@ -38,7 +38,7 @@ module.exports = Self => {
|
|||
path: '/:id/delivery-note-csv',
|
||||
verb: 'GET'
|
||||
},
|
||||
//accessScopes: ['read:multimedia']
|
||||
accessScopes: ['read:multimedia']
|
||||
});
|
||||
|
||||
Self.deliveryNoteCsv = async id => {
|
||||
|
|
|
@ -42,7 +42,7 @@ module.exports = Self => {
|
|||
path: '/:id/delivery-note-pdf',
|
||||
verb: 'GET'
|
||||
},
|
||||
//accessScopes: ['read:multimedia']
|
||||
accessScopes: ['read:multimedia']
|
||||
});
|
||||
|
||||
Self.deliveryNotePdf = (ctx, id) => Self.printReport(ctx, id, 'delivery-note');
|
||||
|
|
|
@ -79,7 +79,7 @@ module.exports = Self => {
|
|||
path: '/extra-community-pdf',
|
||||
verb: 'GET'
|
||||
},
|
||||
//accessScopes: ['read:multimedia']
|
||||
accessScopes: ['read:multimedia']
|
||||
});
|
||||
|
||||
Self.extraCommunityPdf = ctx => Self.printReport(ctx, null, 'extra-community');
|
||||
|
|
|
@ -30,7 +30,7 @@ module.exports = Self => {
|
|||
path: `/:id/downloadFile`,
|
||||
verb: 'GET'
|
||||
},
|
||||
//accessScopes: ['read:multimedia']
|
||||
accessScopes: ['read:multimedia']
|
||||
});
|
||||
|
||||
Self.downloadFile = async function(ctx, id) {
|
||||
|
|
Loading…
Reference in New Issue