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

fix: refs #7917 fixtures, getTickets, tback
gitea/salix/pipeline/pr-dev There was a failure building this commit Details

This commit is contained in:
Carlos Satorres 2024-12-04 09:16:58 +01:00
parent 80e8071ae0
commit 5fea011222
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4034,3 +4034,10 @@ INSERT IGNORE INTO vn.saySimpleConfig (url, defaultChannel)
INSERT INTO vn.workerIrpf (workerFk,spouseNif, geographicMobilityDate) INSERT INTO vn.workerIrpf (workerFk,spouseNif, geographicMobilityDate)
VALUES (1106,'26493101E','2019-09-20'); VALUES (1106,'26493101E','2019-09-20');
INSERT INTO vn.supplier (name, account, street, city, provinceFk, countryFk, nif, isOfficial, retAccount, phone, commission, nickname, payMethodFk, payDay, payDemFk, created, isReal, note, postcodeFk, postCode, isActive, taxTypeSageFk, withholdingSageFk, transactionTypeSageFk, isTrucker, workerFk, supplierActivityFk, healthRegister, isPayMethodChecked, isVies, stamp, companySize, geoFk, editorFk)
VALUES('TEST', '7185001382', 'supplier address 4', 'GOTHAM', 1, 1, '99999999A', 1, NULL, NULL, 0.0, 'Test', 1, 15, 2, '2001-01-01 00:00:00.000', 0, NULL, NULL, '46000', 1, 6, 9, 3, 0, 18, 'complements', '400664487V', 1, 0, NULL, NULL, NULL, 100);
UPDATE vn.supplierAgencyTerm
SET supplierFk=1382
WHERE agencyFk=3;

2
modules/route/back/methods/route/getTickets.js
View File

@ -99,10 +99,12 @@ module.exports = Self => {
const where = filter.where; const where = filter.where;
where['r.id'] = filter.id; where['r.id'] = filter.id;
console.log('filter', filter);
stmt.merge(conn.makeWhere(filter.where)); stmt.merge(conn.makeWhere(filter.where));
stmt.merge(conn.makeGroupBy('t.id')); stmt.merge(conn.makeGroupBy('t.id'));
stmt.merge(conn.makeOrderBy(filter.order)); stmt.merge(conn.makeOrderBy(filter.order));
console.log('stmt: ', stmt);
return conn.executeStmt(stmt, myOptions); return conn.executeStmt(stmt, myOptions);
}; };

2
modules/route/back/methods/route/specs/getTickets.spec.js
View File

@ -18,7 +18,7 @@ fdescribe('route getTickets()', () => {
id: 1101 // ID del proveedor ficticio id: 1101 // ID del proveedor ficticio
}); });
let result = await app.models.Route.getTickets(ctx, filter, options); let result = await app.models.Route.getTickets(ctx, filter);
console.log('ctx: ', ctx); console.log('ctx: ', ctx);
// Verifica que todas las rutas pertenecen al proveedor simulado // Verifica que todas las rutas pertenecen al proveedor simulado

3
modules/supplier/back/models/supplier.js
View File

@ -171,7 +171,10 @@ module.exports = Self => {
Object.assign(myOptions, options); Object.assign(myOptions, options);
const client = await Self.app.models.Client.findById(userId, null, myOptions); const client = await Self.app.models.Client.findById(userId, null, myOptions);
console.log('client: ', client);
const supplier = await Self.app.models.Supplier.findOne({where: {nif: client.fi}}, myOptions); const supplier = await Self.app.models.Supplier.findOne({where: {nif: client.fi}}, myOptions);
console.log('supplier: ', supplier);
return supplier; return supplier;
}; };
}; };