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

6220-addressFilter #1886

Merged
carlossa merged 13 commits from 6220-addressFilter into dev 2023-12-18 11:45:12 +00:00
Conversation 0 Commits 13 Files Changed 1 +37 -19
1 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c81ca94d2e - Show all commits

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

@ -129,25 +129,43 @@ module.exports = Self => {
const stmts = []; const stmts = [];
const stmt = new ParameterizedSQL( const stmt = new ParameterizedSQL(
`SELECT `SELECT
DISTINCT c.id, DISTINCT c.id,
c.name, c.name,
c.fi, c.fi,
c.socialName, c.socialName,
c.phone, c.phone,
c.mobile, c.mobile,
c.city, c.city,
c.postcode, c.postcode,
c.email, c.email,
c.isActive, c.isActive,
c.isFreezed, c.isFreezed,
p.id AS provinceFk, p.id AS provinceFk,
p.name AS province, p.name AS province,
u.id AS salesPersonFk, u.id AS salesPersonFk,
u.name AS salesPerson u.name AS salesPerson,
FROM client c a.street,
LEFT JOIN account.user u ON u.id = c.salesPersonFk a.city AS addressCity,
LEFT JOIN province p ON p.id = c.provinceFk a.provinceFk AS addressProvinceFk,
JOIN vn.address a ON a.clientFk = c.id a.postalCode AS addressPostalCode,
a.phone AS addressPhone,
a.mobile AS addressMobile,
a.nickname,
a.isDefaultAddress,
a.agencyModeFk AS addressAgencyModeFk,
a.isActive AS addressIsActive,
jgallego commented 2023-12-13 12:38:10 +00:00
Review
Copy Link

provinceClientFk

provinceClientFk
a.longitude AS addressLongitude,
jgallego commented 2023-12-13 12:38:01 +00:00
Review
Copy Link

provinceAddressFk

provinceAddressFk
a.latitude AS addressLatitude,
a.isEqualizated,
a.customsAgentFk AS addressCustomsAgentFk,
a.incotermsFk AS addressIncotermsFk,
a.isLogifloraAllowed,
a.editorFk AS addressEditorFk
FROM client c
LEFT JOIN account.user u ON u.id = c.salesPersonFk
LEFT JOIN province p ON p.id = c.provinceFk
JOIN vn.address a ON a.clientFk = c.id;
` `
); );