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,
t.name as town,
p.name as province,
c.name as country
c.name country
FROM
postCode pc
JOIN town t on t.id = pc.townFk

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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