Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
commit
97f02187e3
|
|
@ -1,16 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `bi`.`nz`(vData DOUBLE)
|
||||
RETURNS double
|
||||
DETERMINISTIC
|
||||
BEGIN
|
||||
/**
|
||||
* Devuelve 0, si el parámetro es NULL:
|
||||
*/
|
||||
DECLARE vResult DOUBLE;
|
||||
|
||||
SET vResult = IFNULL(vData,0);
|
||||
|
||||
RETURN vResult;
|
||||
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -130,13 +130,13 @@ BEGIN
|
|||
-- Calculamos el porcentaje del recobro para añadirlo al precio de venta
|
||||
UPDATE bi.claims_ratio cr
|
||||
JOIN (
|
||||
SELECT Id_Cliente, nz(SUM(Importe)) AS Greuge
|
||||
SELECT Id_Cliente, IFNULL(SUM(Importe), 0) AS Greuge
|
||||
FROM vn2008.Greuges
|
||||
WHERE Fecha <= util.VN_CURDATE()
|
||||
GROUP BY Id_Cliente
|
||||
) g ON g.Id_Cliente = cr.Id_Cliente
|
||||
SET recobro = GREATEST(0,round(nz(Greuge) /
|
||||
(nz(Consumo) * vMonthToRefund / 12 ) ,3));
|
||||
SET recobro = GREATEST(0,round(IFNULL(Greuge, 0) /
|
||||
(IFNULL(Consumo, 0) * vMonthToRefund / 12 ) ,3));
|
||||
|
||||
-- Protección neonatos
|
||||
UPDATE bi.claims_ratio cr
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`accountNumberToIban`(
|
||||
vAccount VARCHAR(20)
|
||||
vAccount VARCHAR(20)
|
||||
)
|
||||
RETURNS varchar(4) CHARSET utf8mb3 COLLATE utf8mb3_general_ci
|
||||
DETERMINISTIC
|
||||
|
|
@ -18,41 +18,41 @@ BEGIN
|
|||
CONCAT('ES',
|
||||
RIGHT(
|
||||
CONCAT(0,
|
||||
98-MOD(
|
||||
CONCAT(
|
||||
MOD(
|
||||
CONCAT(
|
||||
MOD(
|
||||
CONCAT(
|
||||
MOD(
|
||||
SUBSTRING(vAccount, 1, 8),
|
||||
97
|
||||
),
|
||||
SUBSTRING(vAccount,9,8)
|
||||
98-MOD(
|
||||
CONCAT(
|
||||
MOD(
|
||||
CONCAT(
|
||||
MOD(
|
||||
CONCAT(
|
||||
MOD(
|
||||
SUBSTRING(vAccount, 1, 8),
|
||||
97
|
||||
),
|
||||
SUBSTRING(vAccount,9,8)
|
||||
),
|
||||
97
|
||||
),
|
||||
97
|
||||
),
|
||||
SUBSTRING(
|
||||
CONCAT(vAccount, 142800),
|
||||
17,
|
||||
8
|
||||
)
|
||||
),
|
||||
97
|
||||
),
|
||||
97
|
||||
),
|
||||
SUBSTRING(
|
||||
CONCAT(vAccount, 142800),
|
||||
25,
|
||||
2
|
||||
)
|
||||
),
|
||||
97
|
||||
)
|
||||
97
|
||||
)
|
||||
),
|
||||
2
|
||||
)
|
||||
2
|
||||
)
|
||||
) INTO vIban;
|
||||
|
||||
RETURN vIban;
|
||||
RETURN vIban;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`nz`(vQuantity DOUBLE)
|
||||
RETURNS double
|
||||
DETERMINISTIC
|
||||
BEGIN
|
||||
|
||||
DECLARE vResult DOUBLE;
|
||||
|
||||
SET vResult = IFNULL(vQuantity,0);
|
||||
|
||||
RETURN vResult;
|
||||
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -48,7 +48,7 @@ BEGIN
|
|||
SELECT lc.companyFk,
|
||||
c.id,
|
||||
0,
|
||||
- (NZ(lc.credit) - NZ(lc.debit))
|
||||
- (IFNULL(lc.credit, 0) - IFNULL(lc.debit, 0))
|
||||
FROM tmp.ledgerComparative lc
|
||||
JOIN client c ON c.accountingAccount = lc.account
|
||||
WHERE lc.`date` BETWEEN vDateFrom AND vDateTo
|
||||
|
|
|
|||
|
|
@ -15,11 +15,13 @@ BEGIN
|
|||
p.code,
|
||||
ish.id,
|
||||
s.priority,
|
||||
ish.isChecked
|
||||
ish.isChecked,
|
||||
ic.url
|
||||
FROM itemShelving ish
|
||||
JOIN item i ON i.id = ish.itemFk
|
||||
JOIN shelving s ON vSelf = s.code COLLATE utf8_unicode_ci
|
||||
LEFT JOIN parking p ON s.parkingFk = p.id
|
||||
JOIN hedera.imageConfig ic
|
||||
WHERE ish.shelvingFk COLLATE utf8_unicode_ci = vSelf;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ BEGIN
|
|||
SELECT lc.companyFk,
|
||||
s.id,
|
||||
0,
|
||||
- (NZ(lc.debit) - NZ(lc.credit))
|
||||
- (IFNULL(lc.debit, 0) - IFNULL(lc.credit, 0))
|
||||
FROM tmp.ledgerComparative lc
|
||||
JOIN supplier s ON s.account = lc.account
|
||||
WHERE lc.`date` BETWEEN vDateFrom AND vDateTo
|
||||
|
|
|
|||
|
|
@ -4,22 +4,22 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`expedition_beforeInse
|
|||
FOR EACH ROW
|
||||
BEGIN
|
||||
DECLARE intcounter INT;
|
||||
DECLARE vShipFk INT;
|
||||
DECLARE vShipFk INT;
|
||||
|
||||
SET NEW.editorFk = account.myUser_getId();
|
||||
|
||||
IF NEW.freightItemFk IS NOT NULL THEN
|
||||
|
||||
UPDATE ticket SET packages = nz(packages) + 1 WHERE id = NEW.ticketFk;
|
||||
UPDATE ticket SET packages = IFNULL(packages, 0) + 1 WHERE id = NEW.ticketFk;
|
||||
|
||||
SELECT IFNULL(MAX(counter),0) +1 INTO intcounter
|
||||
FROM expedition e
|
||||
FROM expedition e
|
||||
INNER JOIN ticket t1 ON e.ticketFk = t1.id
|
||||
LEFT JOIN ticketState ts ON ts.ticketFk = t1.id
|
||||
LEFT JOIN ticketState ts ON ts.ticketFk = t1.id
|
||||
INNER JOIN ticket t2 ON t2.addressFk = t1.addressFk AND DATE(t2.shipped) = DATE(t1.shipped)
|
||||
AND t1.warehouseFk = t2.warehouseFk
|
||||
AND t1.warehouseFk = t2.warehouseFk
|
||||
WHERE t2.id = NEW.ticketFk AND ts.alertLevel < 3 AND t1.companyFk = t2.companyFk
|
||||
AND t1.agencyModeFk = t2.agencyModeFk;
|
||||
AND t1.agencyModeFk = t2.agencyModeFk;
|
||||
|
||||
SET NEW.`counter` = intcounter;
|
||||
END IF;
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn2008`.`nz`(dblCANTIDAD DOUBLE)
|
||||
RETURNS double
|
||||
DETERMINISTIC
|
||||
BEGIN
|
||||
|
||||
DECLARE dblRESULT DOUBLE;
|
||||
|
||||
SET dblRESULT = IFNULL(dblCANTIDAD,0);
|
||||
|
||||
RETURN dblRESULT;
|
||||
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -1 +0,0 @@
|
|||
REVOKE EXECUTE ON FUNCTION vn2008.red FROM hrBoss, salesPerson;
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId)
|
||||
VALUES ('Supplier', 'updateAllFiscalData', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
|
||||
('Supplier', 'updateFiscalData', 'WRITE', 'ALLOW', 'ROLE', 'buyer');
|
||||
|
|
@ -1 +1,60 @@
|
|||
REVOKE EXECUTE ON FUNCTION vn2008.cc_to_iban FROM hr, financial;
|
||||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`accountNumberToIban`(
|
||||
vAccount VARCHAR(20)
|
||||
)
|
||||
RETURNS varchar(4) CHARSET utf8mb3 COLLATE utf8mb3_general_ci
|
||||
DETERMINISTIC
|
||||
BEGIN
|
||||
/**
|
||||
* Calcula y genera el código IBAN correspondiente
|
||||
* a un número de cuenta bancaria español.
|
||||
*
|
||||
* @param vAccount Número de cuenta bancaria
|
||||
* @return vIban Código IBAN de 4 caracteres.
|
||||
*/
|
||||
DECLARE vIban VARCHAR(4);
|
||||
|
||||
SELECT
|
||||
CONCAT('ES',
|
||||
RIGHT(
|
||||
CONCAT(0,
|
||||
98-MOD(
|
||||
CONCAT(
|
||||
MOD(
|
||||
CONCAT(
|
||||
MOD(
|
||||
CONCAT(
|
||||
MOD(
|
||||
SUBSTRING(vAccount, 1, 8),
|
||||
97
|
||||
),
|
||||
SUBSTRING(vAccount,9,8)
|
||||
),
|
||||
97
|
||||
),
|
||||
SUBSTRING(
|
||||
CONCAT(vAccount, 142800),
|
||||
17,
|
||||
8
|
||||
)
|
||||
),
|
||||
97
|
||||
),
|
||||
SUBSTRING(
|
||||
CONCAT(vAccount, 142800),
|
||||
25,
|
||||
2
|
||||
)
|
||||
),
|
||||
97
|
||||
)
|
||||
),
|
||||
2
|
||||
)
|
||||
) INTO vIban;
|
||||
|
||||
RETURN vIban;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
||||
GRANT EXECUTE ON FUNCTION util.accountNumberToIban TO hr, financial;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`intrastat_estimateNet`(
|
||||
vSelf INT,
|
||||
vStems INT
|
||||
)
|
||||
RETURNS double
|
||||
DETERMINISTIC
|
||||
BEGIN
|
||||
/**
|
||||
* Calcula un valor neto estimado en función de
|
||||
* datos históricos de facturas intrastat.
|
||||
*
|
||||
* @param vSelf Id de intrastat
|
||||
* @param vStems Número de unidades
|
||||
* @return vNet
|
||||
*/
|
||||
DECLARE vNet DOUBLE;
|
||||
|
||||
SELECT ROUND(vStems / (SUM(average) / COUNT(average)), 2) INTO vNet
|
||||
FROM (
|
||||
SELECT *, stems / net average
|
||||
FROM invoiceInIntrastat
|
||||
WHERE intrastatFk = vSelf
|
||||
AND net
|
||||
AND stems > 0
|
||||
ORDER BY dated DESC
|
||||
LIMIT 20
|
||||
) sub;
|
||||
|
||||
RETURN vNet/2;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
||||
GRANT EXECUTE ON FUNCTION vn.intrastat_estimateNet TO administrative;
|
||||
|
|
@ -18,11 +18,13 @@ services:
|
|||
memory: 1G
|
||||
back:
|
||||
image: registry.verdnatura.es/salix-back:${VERSION:?}
|
||||
build: .
|
||||
build:
|
||||
context: .
|
||||
dockerfile: back/Dockerfile
|
||||
environment:
|
||||
- TZ
|
||||
- NODE_ENV
|
||||
- DEBUG
|
||||
- TZ
|
||||
ports:
|
||||
- 3000
|
||||
configs:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
/* eslint-disable no-console */
|
||||
require('@babel/register')({presets: ['@babel/env']});
|
||||
require('core-js/stable');
|
||||
require('regenerator-runtime/runtime');
|
||||
require('vn-loopback/server/boot/date')();
|
||||
const getopts = require('getopts');
|
||||
|
||||
const path = require('path');
|
||||
const Myt = require('@verdnatura/myt/myt');
|
||||
|
|
@ -18,12 +20,16 @@ process.on('warning', warning => {
|
|||
});
|
||||
|
||||
async function test() {
|
||||
if (process.argv[2] === 'show')
|
||||
process.env.E2E_SHOW = true;
|
||||
const opts = getopts(process.argv.slice(2), {
|
||||
boolean: ['show']
|
||||
});
|
||||
process.env.E2E_SHOW = opts.show;
|
||||
|
||||
console.log('Building and running DB container.');
|
||||
const myt = new Myt();
|
||||
await myt.init({workspace: path.join(__dirname, '../..')});
|
||||
await myt.run(Run);
|
||||
await myt.deinit();
|
||||
|
||||
const Jasmine = require('jasmine');
|
||||
const jasmine = new Jasmine();
|
||||
|
|
@ -70,12 +76,10 @@ async function test() {
|
|||
|
||||
jasmine.jasmine.DEFAULT_TIMEOUT_INTERVAL = 30000;
|
||||
await jasmine.execute();
|
||||
|
||||
await myt.deinit();
|
||||
}
|
||||
|
||||
async function backendStatus() {
|
||||
log('Awaiting backend connection...');
|
||||
log('Awaiting backend connection.');
|
||||
|
||||
const milliseconds = 1000;
|
||||
const maxAttempts = 10;
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
import 'angular';
|
||||
import 'angular-mocks';
|
||||
import core from './front/core/module.js';
|
||||
import './front/salix/components/app/app.js';
|
||||
import './modules/zone/front/module.js';
|
||||
import './modules/claim/front/module.js';
|
||||
import './modules/client/front/module.js';
|
||||
import './modules/invoiceOut/front/module.js';
|
||||
import './modules/invoiceIn/front/module.js';
|
||||
import './modules/item/front/module.js';
|
||||
import './modules/order/front/module.js';
|
||||
import './modules/route/front/module.js';
|
||||
import './modules/ticket/front/module.js';
|
||||
import './modules/travel/front/module.js';
|
||||
import './modules/worker/front/module.js';
|
||||
import './modules/shelving/front/module.js';
|
||||
import core from './core/module.js';
|
||||
import './salix/components/app/app.js';
|
||||
import '../modules/zone/front/module.js';
|
||||
import '../modules/claim/front/module.js';
|
||||
import '../modules/client/front/module.js';
|
||||
import '../modules/invoiceOut/front/module.js';
|
||||
import '../modules/invoiceIn/front/module.js';
|
||||
import '../modules/item/front/module.js';
|
||||
import '../modules/order/front/module.js';
|
||||
import '../modules/route/front/module.js';
|
||||
import '../modules/ticket/front/module.js';
|
||||
import '../modules/travel/front/module.js';
|
||||
import '../modules/worker/front/module.js';
|
||||
import '../modules/shelving/front/module.js';
|
||||
import 'vn-loopback/server/boot/date';
|
||||
|
||||
// Set NODE_ENV
|
||||
|
|
@ -2,7 +2,6 @@
|
|||
require('require-yaml');
|
||||
const gulp = require('gulp');
|
||||
const PluginError = require('plugin-error');
|
||||
const argv = require('minimist')(process.argv.slice(2));
|
||||
const log = require('fancy-log');
|
||||
const Myt = require('@verdnatura/myt/myt');
|
||||
const Run = require('@verdnatura/myt/myt-run');
|
||||
|
|
@ -12,9 +11,6 @@ const Start = require('@verdnatura/myt/myt-start');
|
|||
|
||||
let isWindows = /^win/.test(process.platform);
|
||||
|
||||
if (argv.NODE_ENV)
|
||||
process.env.NODE_ENV = argv.NODE_ENV;
|
||||
|
||||
let langs = ['es', 'en'];
|
||||
let srcDir = './front';
|
||||
let modulesDir = './modules';
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ module.exports = {
|
|||
},
|
||||
testEnvironment: 'jsdom',
|
||||
setupFilesAfterEnv: [
|
||||
'./jest-front.js'
|
||||
'./front/jest-setup.js'
|
||||
],
|
||||
testMatch: [
|
||||
'**/front/**/*.spec.js',
|
||||
|
|
@ -37,7 +37,7 @@ module.exports = {
|
|||
],
|
||||
moduleNameMapper: {
|
||||
'\\.(css|scss)$': 'identity-obj-proxy',
|
||||
'\\.(jpg|ico|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/fileMock.js',
|
||||
'\\.(jpg|ico|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/front/jest-mock.js',
|
||||
},
|
||||
testURL: 'http://localhost',
|
||||
verbose: false,
|
||||
|
|
|
|||
|
|
@ -206,6 +206,6 @@
|
|||
"Incorrect pin": "Incorrect pin.",
|
||||
"The notification subscription of this worker cant be modified": "The notification subscription of this worker cant be modified",
|
||||
"Name should be uppercase": "Name should be uppercase",
|
||||
"Fecha fuera de rango": "Fecha fuera de rango",
|
||||
"There is no zone for these parameters 34": "There is no zone for these parameters 34"
|
||||
}
|
||||
"You cannot update these fields": "You cannot update these fields",
|
||||
"CountryFK cannot be empty": "Country cannot be empty"
|
||||
}
|
||||
|
|
@ -340,5 +340,7 @@
|
|||
"This ticket already has a cmr saved": "Este ticket ya tiene un cmr guardado",
|
||||
"Name should be uppercase": "El nombre debe ir en mayúscula",
|
||||
"Bank entity must be specified": "La entidad bancaria es obligatoria",
|
||||
"An email is necessary": "Es necesario un email"
|
||||
"An email is necessary": "Es necesario un email",
|
||||
"You cannot update these fields": "No puedes actualizar estos campos",
|
||||
"CountryFK cannot be empty": "El país no puede estar vacío"
|
||||
}
|
||||
|
|
@ -66,6 +66,7 @@ module.exports = Self => {
|
|||
cou.country,
|
||||
c.id clientId,
|
||||
c.socialName clientSocialName,
|
||||
u.nickname workerSocialName,
|
||||
SUM(s.quantity * s.price * ( 100 - s.discount ) / 100) amount,
|
||||
negativeBase.taxableBase,
|
||||
negativeBase.ticketFk,
|
||||
|
|
@ -80,6 +81,7 @@ module.exports = Self => {
|
|||
JOIN vn.client c ON c.id = t.clientFk
|
||||
JOIN vn.country cou ON cou.id = c.countryFk
|
||||
LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
|
||||
JOIN account.user u ON u.id = w.id
|
||||
LEFT JOIN (
|
||||
SELECT ticketFk, taxableBase
|
||||
FROM tmp.ticketAmount
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ class Controller extends Section {
|
|||
this.filter = {
|
||||
where: {
|
||||
itemFk: this.$params.id,
|
||||
shipped: {
|
||||
landed: {
|
||||
between: [from, to]
|
||||
}
|
||||
}
|
||||
|
|
@ -36,7 +36,7 @@ class Controller extends Section {
|
|||
const to = new Date(this._dateTo);
|
||||
to.setHours(23, 59, 59, 59);
|
||||
|
||||
this.filter.where.shipped = {
|
||||
this.filter.where.landed = {
|
||||
between: [from, to]
|
||||
};
|
||||
this.$.model.refresh();
|
||||
|
|
@ -53,7 +53,7 @@ class Controller extends Section {
|
|||
const to = new Date(value);
|
||||
to.setHours(23, 59, 59, 59);
|
||||
|
||||
this.filter.where.shipped = {
|
||||
this.filter.where.landed = {
|
||||
between: [from, to]
|
||||
};
|
||||
this.$.model.refresh();
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
const UserError = require('vn-loopback/util/user-error');
|
||||
module.exports = Self => {
|
||||
Self.remoteMethodCtx('driverRouteEmail', {
|
||||
description: 'Sends the driver route email with an attached PDF',
|
||||
|
|
@ -9,24 +10,14 @@ module.exports = Self => {
|
|||
required: true,
|
||||
description: 'The client id',
|
||||
http: {source: 'path'}
|
||||
},
|
||||
{
|
||||
arg: 'recipient',
|
||||
type: 'string',
|
||||
description: 'The recipient email',
|
||||
required: true,
|
||||
},
|
||||
{
|
||||
}, {
|
||||
arg: 'replyTo',
|
||||
type: 'string',
|
||||
description: 'The sender email to reply to',
|
||||
required: false
|
||||
},
|
||||
{
|
||||
}, {
|
||||
arg: 'recipientId',
|
||||
type: 'number',
|
||||
description: 'The recipient id to send to the recipient preferred language',
|
||||
required: false
|
||||
}
|
||||
],
|
||||
returns: {
|
||||
|
|
@ -39,5 +30,28 @@ module.exports = Self => {
|
|||
}
|
||||
});
|
||||
|
||||
Self.driverRouteEmail = ctx => Self.sendTemplate(ctx, 'driver-route');
|
||||
Self.driverRouteEmail = async(ctx, id) => {
|
||||
const models = Self.app.models;
|
||||
const {workerFk, agencyMode} = await Self.findById(id, {
|
||||
fields: ['workerFk', 'agencyModeFk'],
|
||||
include: {relation: 'agencyMode'}
|
||||
});
|
||||
const {reportMail} = agencyMode();
|
||||
let user;
|
||||
let account;
|
||||
|
||||
if (workerFk) {
|
||||
user = await models.VnUser.findById(workerFk, {
|
||||
fields: ['active', 'id'],
|
||||
include: {relation: 'emailUser'}
|
||||
});
|
||||
account = await models.Account.findById(workerFk);
|
||||
}
|
||||
|
||||
if (user?.active && account) ctx.args.recipient = user.emailUser().email;
|
||||
else ctx.args.recipient = reportMail;
|
||||
|
||||
if (!ctx.args.recipient) throw new UserError('An email is necessary');
|
||||
return Self.sendTemplate(ctx, 'driver-route');
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,92 +1,142 @@
|
|||
const app = require('vn-loopback/server/server');
|
||||
const models = require('vn-loopback/server/server').models;
|
||||
const LoopBackContext = require('loopback-context');
|
||||
|
||||
describe('Supplier updateFiscalData', () => {
|
||||
describe('Supplier updateFiscalData()', () => {
|
||||
const supplierId = 1;
|
||||
const administrativeId = 5;
|
||||
const employeeId = 1;
|
||||
const defaultData = {
|
||||
name: 'PLANTS SL',
|
||||
nif: '06089160W',
|
||||
account: '4100000001',
|
||||
sageTaxTypeFk: 4,
|
||||
sageWithholdingFk: 1,
|
||||
sageTransactionTypeFk: 1,
|
||||
postCode: '15214',
|
||||
city: 'PONTEVEDRA',
|
||||
provinceFk: 1,
|
||||
countryFk: 1,
|
||||
};
|
||||
const buyerId = 35;
|
||||
|
||||
it('should return an error if the user is not administrative', async() => {
|
||||
const ctx = {req: {accessToken: {userId: employeeId}}};
|
||||
ctx.args = {};
|
||||
const name = 'NEW PLANTS';
|
||||
const city = 'PONTEVEDRA';
|
||||
const nif = 'A68446004';
|
||||
const account = '4000000005';
|
||||
const sageTaxTypeFk = 5;
|
||||
const sageWithholdingFk = 2;
|
||||
const sageTransactionTypeFk = 2;
|
||||
const postCode = '46460';
|
||||
const phone = 456129367;
|
||||
const street = ' Fake address 12 3 flat';
|
||||
const provinceFk = 2;
|
||||
const countryFk = 1;
|
||||
const supplierActivityFk = 'animals';
|
||||
const healthRegister = '400664487H';
|
||||
|
||||
let error;
|
||||
await app.models.Supplier.updateFiscalData(ctx, supplierId)
|
||||
.catch(e => {
|
||||
error = e;
|
||||
});
|
||||
let ctx;
|
||||
let options;
|
||||
let tx;
|
||||
|
||||
expect(error.message).toBeDefined();
|
||||
});
|
||||
|
||||
it('should check that the supplier fiscal data is untainted', async() => {
|
||||
const supplier = await app.models.Supplier.findById(supplierId);
|
||||
|
||||
expect(supplier.name).toEqual(defaultData.name);
|
||||
expect(supplier.nif).toEqual(defaultData.nif);
|
||||
expect(supplier.account).toEqual(defaultData.account);
|
||||
expect(supplier.sageTaxTypeFk).toEqual(defaultData.sageTaxTypeFk);
|
||||
expect(supplier.sageWithholdingFk).toEqual(defaultData.sageWithholdingFk);
|
||||
expect(supplier.sageTransactionTypeFk).toEqual(defaultData.sageTransactionTypeFk);
|
||||
expect(supplier.postCode).toEqual(defaultData.postCode);
|
||||
expect(supplier.city).toEqual(defaultData.city);
|
||||
expect(supplier.provinceFk).toEqual(defaultData.provinceFk);
|
||||
expect(supplier.countryFk).toEqual(defaultData.countryFk);
|
||||
});
|
||||
|
||||
it('should update the supplier fiscal data and return the count if changes made', async() => {
|
||||
const activeCtx = {
|
||||
accessToken: {userId: administrativeId},
|
||||
beforeEach(async() => {
|
||||
ctx = {
|
||||
req: {
|
||||
accessToken: {userId: buyerId},
|
||||
headers: {origin: 'http://localhost'},
|
||||
__: value => value
|
||||
},
|
||||
args: {}
|
||||
};
|
||||
const ctx = {req: activeCtx};
|
||||
|
||||
spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
|
||||
active: activeCtx
|
||||
active: ctx.req
|
||||
});
|
||||
|
||||
ctx.args = {
|
||||
name: 'WEAPON DEALER',
|
||||
nif: 'A68446004',
|
||||
account: '4000000005',
|
||||
sageTaxTypeFk: 5,
|
||||
sageWithholdingFk: 2,
|
||||
sageTransactionTypeFk: 2,
|
||||
postCode: '46460',
|
||||
city: 'VALENCIA',
|
||||
provinceFk: 2,
|
||||
countryFk: 1,
|
||||
supplierActivityFk: 'animals',
|
||||
healthRegister: '400664487H'
|
||||
};
|
||||
options = {transaction: tx};
|
||||
tx = await models.Sale.beginTransaction({});
|
||||
options.transaction = tx;
|
||||
});
|
||||
|
||||
const result = await app.models.Supplier.updateFiscalData(ctx, supplierId);
|
||||
afterEach(async() => {
|
||||
await tx.rollback();
|
||||
});
|
||||
|
||||
expect(result.name).toEqual('WEAPON DEALER');
|
||||
expect(result.nif).toEqual('A68446004');
|
||||
expect(result.account).toEqual('4000000005');
|
||||
expect(result.sageTaxTypeFk).toEqual(5);
|
||||
expect(result.sageWithholdingFk).toEqual(2);
|
||||
expect(result.sageTransactionTypeFk).toEqual(2);
|
||||
expect(result.postCode).toEqual('46460');
|
||||
expect(result.city).toEqual('VALENCIA');
|
||||
expect(result.provinceFk).toEqual(2);
|
||||
expect(result.countryFk).toEqual(1);
|
||||
expect(result.supplierActivityFk).toEqual('animals');
|
||||
expect(result.healthRegister).toEqual('400664487H');
|
||||
it('should throw an error if it is a buyer and tries to update forbidden fiscal data', async() => {
|
||||
try {
|
||||
await models.Supplier.updateFiscalData(ctx,
|
||||
supplierId,
|
||||
name,
|
||||
nif,
|
||||
account,
|
||||
undefined,
|
||||
sageTaxTypeFk,
|
||||
undefined,
|
||||
sageTransactionTypeFk,
|
||||
undefined,
|
||||
undefined,
|
||||
undefined,
|
||||
provinceFk,
|
||||
countryFk,
|
||||
supplierActivityFk,
|
||||
healthRegister,
|
||||
undefined,
|
||||
undefined,
|
||||
options);
|
||||
} catch (e) {
|
||||
expect(e.message).toEqual('You cannot update these fields');
|
||||
}
|
||||
});
|
||||
|
||||
// Restores
|
||||
ctx.args = defaultData;
|
||||
await app.models.Supplier.updateFiscalData(ctx, supplierId);
|
||||
it('should update the granted fiscal data if it is a buyer', async() => {
|
||||
const supplier = await models.Supplier.updateFiscalData(ctx,
|
||||
supplierId,
|
||||
undefined,
|
||||
undefined,
|
||||
account,
|
||||
phone,
|
||||
undefined,
|
||||
undefined,
|
||||
undefined,
|
||||
postCode,
|
||||
street,
|
||||
city,
|
||||
provinceFk,
|
||||
undefined,
|
||||
undefined,
|
||||
undefined,
|
||||
undefined,
|
||||
undefined,
|
||||
options);
|
||||
|
||||
expect(supplier.account).toEqual(account);
|
||||
expect(supplier.phone).toEqual(phone);
|
||||
expect(supplier.postCode).toEqual(postCode);
|
||||
expect(supplier.account).toEqual(account);
|
||||
expect(supplier.city).toEqual(city);
|
||||
expect(supplier.provinceFk).toEqual(provinceFk);
|
||||
});
|
||||
|
||||
it('should update all fiscalData if it is an administative', async() => {
|
||||
const supplier = await models.Supplier.updateFiscalData(ctx,
|
||||
supplierId,
|
||||
name,
|
||||
nif,
|
||||
account,
|
||||
phone,
|
||||
sageTaxTypeFk,
|
||||
sageWithholdingFk,
|
||||
sageTransactionTypeFk,
|
||||
postCode,
|
||||
street,
|
||||
city,
|
||||
provinceFk,
|
||||
countryFk,
|
||||
supplierActivityFk,
|
||||
healthRegister,
|
||||
undefined,
|
||||
undefined,
|
||||
options);
|
||||
|
||||
expect(supplier.name).toEqual(name);
|
||||
expect(supplier.nif).toEqual(nif);
|
||||
expect(supplier.account).toEqual(account);
|
||||
expect(supplier.phone).toEqual(phone);
|
||||
expect(supplier.sageTaxTypeFk).toEqual(sageTaxTypeFk);
|
||||
expect(supplier.sageWithholdingFk).toEqual(sageWithholdingFk);
|
||||
expect(supplier.sageTransactionTypeFk).toEqual(sageTransactionTypeFk);
|
||||
expect(supplier.postCode).toEqual(postCode);
|
||||
expect(supplier.street).toEqual(street);
|
||||
expect(supplier.city).toEqual(city);
|
||||
expect(supplier.provinceFk).toEqual(provinceFk);
|
||||
expect(supplier.countryFk).toEqual(countryFk);
|
||||
expect(supplier.supplierActivityFk).toEqual(supplierActivityFk);
|
||||
expect(supplier.healthRegister).toEqual(healthRegister);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,75 +1,59 @@
|
|||
const UserError = require('vn-loopback/util/user-error');
|
||||
module.exports = Self => {
|
||||
Self.remoteMethod('updateFiscalData', {
|
||||
Self.remoteMethodCtx('updateFiscalData', {
|
||||
description: 'Updates fiscal data of a supplier',
|
||||
accessType: 'WRITE',
|
||||
accepts: [{
|
||||
arg: 'ctx',
|
||||
type: 'Object',
|
||||
http: {source: 'context'}
|
||||
},
|
||||
{
|
||||
arg: 'id',
|
||||
type: 'Number',
|
||||
description: 'The supplier id',
|
||||
http: {source: 'path'}
|
||||
},
|
||||
{
|
||||
}, {
|
||||
arg: 'name',
|
||||
type: 'string'
|
||||
},
|
||||
{
|
||||
}, {
|
||||
arg: 'nif',
|
||||
type: 'string'
|
||||
},
|
||||
{
|
||||
}, {
|
||||
arg: 'account',
|
||||
type: 'any'
|
||||
},
|
||||
{
|
||||
}, {
|
||||
arg: 'phone',
|
||||
type: 'string'
|
||||
}, {
|
||||
arg: 'sageTaxTypeFk',
|
||||
type: 'any'
|
||||
},
|
||||
{
|
||||
}, {
|
||||
arg: 'sageWithholdingFk',
|
||||
type: 'any'
|
||||
},
|
||||
{
|
||||
}, {
|
||||
arg: 'sageTransactionTypeFk',
|
||||
type: 'any'
|
||||
},
|
||||
{
|
||||
}, {
|
||||
arg: 'postCode',
|
||||
type: 'any'
|
||||
},
|
||||
{
|
||||
}, {
|
||||
arg: 'street',
|
||||
type: 'any'
|
||||
},
|
||||
{
|
||||
}, {
|
||||
arg: 'city',
|
||||
type: 'string'
|
||||
},
|
||||
{
|
||||
}, {
|
||||
arg: 'provinceFk',
|
||||
type: 'any'
|
||||
},
|
||||
{
|
||||
}, {
|
||||
arg: 'countryFk',
|
||||
type: 'any'
|
||||
},
|
||||
{
|
||||
}, {
|
||||
arg: 'supplierActivityFk',
|
||||
type: 'string'
|
||||
},
|
||||
{
|
||||
}, {
|
||||
arg: 'healthRegister',
|
||||
type: 'string'
|
||||
},
|
||||
{
|
||||
}, {
|
||||
arg: 'isVies',
|
||||
type: 'boolean'
|
||||
},
|
||||
{
|
||||
}, {
|
||||
arg: 'isTrucker',
|
||||
type: 'boolean'
|
||||
}],
|
||||
|
|
@ -84,15 +68,42 @@ module.exports = Self => {
|
|||
}
|
||||
});
|
||||
|
||||
Self.updateFiscalData = async(ctx, supplierId) => {
|
||||
Self.updateFiscalData = async(ctx, supplierId, name, nif, account, phone, sageTaxTypeFk, sageWithholdingFk, sageTransactionTypeFk, postCode, street, city, provinceFk, countryFk, supplierActivityFk, healthRegister, isVies, isTrucker, options) => {
|
||||
const models = Self.app.models;
|
||||
const args = ctx.args;
|
||||
const {args} = ctx;
|
||||
const myOptions = {};
|
||||
const supplier = await models.Supplier.findById(supplierId);
|
||||
|
||||
// Remove unwanted properties
|
||||
if (typeof options == 'object') Object.assign(myOptions, options);
|
||||
|
||||
delete args.ctx;
|
||||
delete args.id;
|
||||
|
||||
return supplier.updateAttributes(args);
|
||||
const updateAllFiscalData = await models.ACL.checkAccessAcl(ctx, 'Supplier', 'updateAllFiscalData', 'WRITE');
|
||||
if (!updateAllFiscalData) {
|
||||
for (const arg in args) {
|
||||
if (args[arg] && !['street', 'postCode', 'city', 'provinceFk', 'phone'].includes(arg))
|
||||
throw new UserError('You cannot update these fields');
|
||||
}
|
||||
}
|
||||
|
||||
return supplier.updateAttributes({
|
||||
name,
|
||||
nif,
|
||||
account,
|
||||
phone,
|
||||
sageTaxTypeFk,
|
||||
sageWithholdingFk,
|
||||
sageTransactionTypeFk,
|
||||
postCode,
|
||||
street,
|
||||
city,
|
||||
provinceFk,
|
||||
countryFk,
|
||||
supplierActivityFk,
|
||||
healthRegister,
|
||||
isVies,
|
||||
isTrucker
|
||||
}, myOptions);
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -90,7 +90,6 @@
|
|||
"js-yaml": "^4.1.0",
|
||||
"json-loader": "^0.5.7",
|
||||
"merge-stream": "^1.0.1",
|
||||
"minimist": "^1.2.5",
|
||||
"node-sass": "^9.0.0",
|
||||
"nodemon": "^2.0.16",
|
||||
"plugin-error": "^1.0.1",
|
||||
|
|
|
|||
|
|
@ -232,9 +232,6 @@ devDependencies:
|
|||
merge-stream:
|
||||
specifier: ^1.0.1
|
||||
version: 1.0.1
|
||||
minimist:
|
||||
specifier: ^1.2.5
|
||||
version: 1.2.8
|
||||
node-sass:
|
||||
specifier: ^9.0.0
|
||||
version: 9.0.0
|
||||
|
|
|
|||
Loading…
Reference in New Issue