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

enabled jasme random + indentations

This commit is contained in:
Carlos Jimenez Ruiz 2020-10-05 10:04:00 +02:00
parent 9dca47be97
commit 9c139b49aa
2 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gulpfile.js
View File

@ -95,9 +95,7 @@ async function backTestOnce(done) {
let options = { let options = {
errorOnFail: false, errorOnFail: false,
config: { config: {}
random: true
}
}; };
if (argv.ci) { if (argv.ci) {

56
modules/order/back/methods/order/filter.js
View File

@ -138,34 +138,34 @@ module.exports = Self => {
stmt = new ParameterizedSQL( stmt = new ParameterizedSQL(
`SELECT `SELECT
o.id, o.id,
o.total, o.total,
o.date_send landed, o.date_send landed,
o.date_make created, o.date_make created,
o.customer_id clientFk, o.customer_id clientFk,
o.agency_id agencyModeFk, o.agency_id agencyModeFk,
o.address_id addressFk, o.address_id addressFk,
o.company_id companyFk, o.company_id companyFk,
o.source_app sourceApp, o.source_app sourceApp,
o.confirmed isConfirmed, o.confirmed isConfirmed,
c.name clientName, c.name clientName,
c.salesPersonFk, c.salesPersonFk,
u.nickname workerNickname, u.nickname workerNickname,
u.name name, u.name name,
co.code companyCode, co.code companyCode,
zed.zoneFk, zed.zoneFk,
zed.hourTheoretical, zed.hourTheoretical,
zed.hourEffective zed.hourEffective
FROM hedera.order o FROM hedera.order o
LEFT JOIN address a ON a.id = o.address_id LEFT JOIN address a ON a.id = o.address_id
LEFT JOIN agencyMode am ON am.id = o.agency_id LEFT JOIN agencyMode am ON am.id = o.agency_id
LEFT JOIN client c ON c.id = o.customer_id LEFT JOIN client c ON c.id = o.customer_id
LEFT JOIN worker wk ON wk.id = c.salesPersonFk LEFT JOIN worker wk ON wk.id = c.salesPersonFk
LEFT JOIN account.user u ON u.id = wk.userFk LEFT JOIN account.user u ON u.id = wk.userFk
LEFT JOIN company co ON co.id = o.company_id LEFT JOIN company co ON co.id = o.company_id
LEFT JOIN orderTicket ot ON ot.orderFk = o.id LEFT JOIN orderTicket ot ON ot.orderFk = o.id
LEFT JOIN ticket t ON t.id = ot.ticketFk LEFT JOIN ticket t ON t.id = ot.ticketFk
LEFT JOIN zoneEstimatedDelivery zed ON zed.zoneFk = t.zoneFk`); LEFT JOIN zoneEstimatedDelivery zed ON zed.zoneFk = t.zoneFk`);
if (args && args.ticketFk) { if (args && args.ticketFk) {
stmt.merge({ stmt.merge({