refs #6220 add filter address

modules/client/back/methods/client/filter.js

@@ -107,17 +107,29 @@ module.exports = Self => {
                 return {or: [
                     {'c.phone': {like: `%${value}%`}},
                     {'c.mobile': {like: `%${value}%`}},
+                    {'a.phone': {like: `%${value}%`}},
                 ]};
             case 'zoneFk':
-                param = 'a.postalCode';
-                return {[param]: {inq: postalCode}};
+                return {'a.postalCode': {inq: postalCode}};
+            case 'city':
+                return {or: [
+                    {'c.city': {like: `%${value}`}},
+                    {'a.city': {like: `%${value}`}}
+                ]};
+            case 'postcode':
+                return {or: [
+                    {'c.postcode': {like: `%${value}`}},
+                    {'a.postalCode': {like: `%${value}`}}
+                ]};
+            case 'provinceFk':
+                return {or: [
+                    {'p.name': {like: `%${value}`}},
+                    {'a.provinceFk': {like: `%${value}`}}
+                ]};
             case 'name':
             case 'salesPersonFk':
             case 'fi':
             case 'socialName':
-            case 'city':
-            case 'postcode':
-            case 'provinceFk':
             case 'email':
                 param = `c.${param}`;
                 return {[param]: {like: `%${value}%`}};
@@ -133,43 +145,28 @@ module.exports = Self => {
                     c.name,
                     c.fi,
                     c.socialName,
-            c.phone,
+                    CONCAT(c.phone, ',',GROUP_CONCAT(DISTINCT a.phone)) phone,
                     c.mobile,
-            c.city,
+                    CONCAT(c.city, ',',GROUP_CONCAT(DISTINCT a.city)) city,
                     c.postcode,
+                    a.postalCode,
                     c.email,
                     c.isActive,
                     c.isFreezed,
-            p.id,
-            p.name,
-            u.id,
-            u.name,
-            a.street,
-            a.city,
+                    p.id AS provinceFk2,
                     a.provinceFk,
-            a.postalCode,
-            a.phone,
-            a.mobile,
-            a.nickname,
-            a.isDefaultAddress,
-            a.agencyModeFk,
-            a.isActive,
-            a.longitude,
-            a.latitude,
-            a.isEqualizated,
-            a.customsAgentFk,
-            a.incotermsFk,
-            a.isLogifloraAllowed,
-            a.editorFk
+                    p.name AS province,
+                    u.id AS salesPersonFk,
+                    u.name AS salesPerson
                 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;
-
+                    JOIN address a ON a.clientFk = c.id
             `
         );
 
         stmt.merge(conn.makeWhere(filter.where));
+        stmt.merge('GROUP BY c.id');
         stmt.merge(conn.makePagination(filter));
 
         const clientsIndex = stmts.push(stmt) - 1;