7430_devToTest #2490

Merged
alexm merged 306 commits from 7430_devToTest into test 2024-05-21 09:15:04 +00:00
14 changed files with 15 additions and 15 deletions
Showing only changes of commit fd7dcf2781 - Show all commits

View File

@ -62,7 +62,7 @@ module.exports = Self => {
pc.code, pc.code,
t.name as town, t.name as town,
p.name as province, p.name as province,
c.name as country c.name country
FROM FROM
postCode pc postCode pc
JOIN town t on t.id = pc.townFk JOIN town t on t.id = pc.townFk

View File

@ -23,8 +23,8 @@ async function test() {
const opts = getopts(process.argv.slice(2), { const opts = getopts(process.argv.slice(2), {
boolean: ['show'] boolean: ['show']
}); });
// if (opts.show) if (opts.show)
process.env.E2E_SHOW = true; process.env.E2E_SHOW = true;
console.log('Building and running DB container.'); console.log('Building and running DB container.');
const myt = new Myt(); const myt = new Myt();

View File

@ -123,7 +123,7 @@ module.exports = Self => {
c.hasLcr, c.hasLcr,
c.hasCoreVnl, c.hasCoreVnl,
ct.id AS countryFk, ct.id AS countryFk,
ct.name AS country, ct.name country,
p.id AS provinceFk, p.id AS provinceFk,
p.name AS province, p.name AS province,
u.id AS salesPersonFk, u.id AS salesPersonFk,

View File

@ -69,7 +69,7 @@ module.exports = Self => {
uw.name workerName, uw.name workerName,
c.creditInsurance, c.creditInsurance,
d.defaulterSinced, d.defaulterSinced,
cn.name AS country, cn.name country,
c.countryFk, c.countryFk,
pm.name payMethod pm.name payMethod
FROM vn.defaulter d FROM vn.defaulter d

View File

@ -59,7 +59,7 @@ module.exports = Self => {
`CREATE OR REPLACE TEMPORARY TABLE tmp.filter `CREATE OR REPLACE TEMPORARY TABLE tmp.filter
ENGINE = MEMORY ENGINE = MEMORY
SELECT co.code company, SELECT co.code company,
cou.name AS country, cou.name country,
c.id clientId, c.id clientId,
c.socialName clientSocialName, c.socialName clientSocialName,
u.nickname workerSocialName, u.nickname workerSocialName,

View File

@ -103,7 +103,7 @@ module.exports = Self => {
SELECT t.cmrFk, SELECT t.cmrFk,
t.id ticketFk, t.id ticketFk,
t.routeFk, t.routeFk,
co.name AS country, co.name country,
t.clientFk, t.clientFk,
IF(sub.id, TRUE, FALSE) hasCmrDms, IF(sub.id, TRUE, FALSE) hasCmrDms,
DATE(t.shipped) shipped DATE(t.shipped) shipped

View File

@ -6,7 +6,7 @@ SELECT
c.id, c.id,
c.name AS clientName, c.name AS clientName,
p.name AS province, p.name AS province,
co.name AS country co.name country
FROM client c FROM client c
JOIN province p ON c.provinceFk = p.id JOIN province p ON c.provinceFk = p.id
JOIN country co ON c.countryFk = co.id JOIN country co ON c.countryFk = co.id

View File

@ -8,7 +8,7 @@ SELECT
a.street, a.street,
a.nickname, a.nickname,
p.name AS province, p.name AS province,
ct.name AS country, ct.name country,
IFNULL(c.phone, cc.phone) AS phone IFNULL(c.phone, cc.phone) AS phone
FROM claim cl FROM claim cl
JOIN client c ON c.id = cl.clientFk JOIN client c ON c.id = cl.clientFk

View File

@ -6,7 +6,7 @@ SELECT
c.city, c.city,
c.fi, c.fi,
p.name AS province, p.name AS province,
ct.name AS country ct.name country
FROM client c FROM client c
JOIN country ct ON ct.id = c.countryFk JOIN country ct ON ct.id = c.countryFk
LEFT JOIN province p ON p.id = c.provinceFk LEFT JOIN province p ON p.id = c.provinceFk

View File

@ -4,7 +4,7 @@ SELECT
c.name, c.name,
c.fi, c.fi,
c.street, c.street,
cty.name AS country cty.name country
FROM client c FROM client c
JOIN country cty ON cty.id = c.countryFk JOIN country cty ON cty.id = c.countryFk
WHERE c.id = ? WHERE c.id = ?

View File

@ -6,7 +6,7 @@ SELECT
c.city, c.city,
c.fi, c.fi,
p.name AS province, p.name AS province,
ct.name AS country ct.name country
FROM client c FROM client c
JOIN country ct ON ct.id = c.countryFk JOIN country ct ON ct.id = c.countryFk
LEFT JOIN province p ON p.id = c.provinceFk LEFT JOIN province p ON p.id = c.provinceFk

View File

@ -7,7 +7,7 @@ SELECT
c.city, c.city,
c.fi, c.fi,
p.name AS province, p.name AS province,
ct.name AS country, ct.name country,
ct.code AS countryCode, ct.code AS countryCode,
ct.ibanLength AS ibanLength ct.ibanLength AS ibanLength
FROM client c FROM client c

View File

@ -2,7 +2,7 @@ SELECT
m.code mandateCode, m.code mandateCode,
s.name, s.name,
s.street, s.street,
sc.name AS country, sc.name country,
s.postCode, s.postCode,
s.city, s.city,
sp.name province, sp.name province,

View File

@ -5,7 +5,7 @@ SELECT
s.id, s.id,
s.name AS supplierName, s.name AS supplierName,
p.name AS province, p.name AS province,
co.name AS country co.name country
FROM supplier s FROM supplier s
JOIN province p ON s.provinceFk = p.id JOIN province p ON s.provinceFk = p.id
JOIN country co ON s.countryFk = co.id JOIN country co ON s.countryFk = co.id