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

refs #6220 remove concat

This commit is contained in:
Carlos Satorres 2023-12-13 15:05:41 +01:00
parent 78aa25d74f
commit 40499e44cf
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,16 +145,18 @@ module.exports = Self => {
c.name, c.name,
c.fi, c.fi,
c.socialName, c.socialName,
CONCAT(c.phone, ',',GROUP_CONCAT(DISTINCT a.phone)) phone, c.phone,
a.phone,
c.mobile, c.mobile,
CONCAT(c.city, ',',GROUP_CONCAT(DISTINCT a.city)) city, c.city,
a.city,
c.postcode, c.postcode,
a.postalCode, a.postalCode,
c.email, c.email,
c.isActive, c.isActive,
c.isFreezed, c.isFreezed,
p.id AS provinceFk2, p.id AS provinceClientFk,
a.provinceFk, a.provinceFk AS provinceAddressFk,
p.name AS province, p.name AS province,
u.id AS salesPersonFk, u.id AS salesPersonFk,
u.name AS salesPerson u.name AS salesPerson

2
modules/client/back/methods/client/specs/filter.spec.js
View File

@ -146,7 +146,7 @@ describe('client filter()', () => {
const randomResultClient = result[randomIndex]; const randomResultClient = result[randomIndex];
expect(result.length).toBeGreaterThanOrEqual(20); expect(result.length).toBeGreaterThanOrEqual(20);
expect(randomResultClient.city.toLowerCase()).toEqual('gotham,gotham'); expect(randomResultClient.city.toLowerCase()).toEqual('gotham');
await tx.rollback(); await tx.rollback();
} catch (e) { } catch (e) {