refs #4914 @1h

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

@@ -91,7 +91,18 @@ module.exports = Self => {
             case 'search':
                 return /^\d+$/.test(value)
                     ? {'c.id': {inq: value}}
-                    : {'c.name': {like: `%${value}%`}};
+                    : {or: [
+                        {'c.name': {like: `%${value}%`}},
+                        {'c.socialName': {like: `%${value}%`}},
+                    ]};
+            case 'phone':
+                return {or: [
+                    {'c.phone': {like: `%${value}%`}},
+                    {'c.mobile': {like: `%${value}%`}},
+                ]};
+            case 'zoneFk':
+                param = 'a.postalCode';
+                return {[param]: {inq: postalCode}};
             case 'name':
             case 'salesPersonFk':
             case 'fi':
@@ -100,12 +111,8 @@ module.exports = Self => {
             case 'postcode':
             case 'provinceFk':
             case 'email':
-            case 'phone':
                 param = `c.${param}`;
-                return {[param]: value};
-            case 'zoneFk':
-                param = 'a.postalCode';
-                return {[param]: {inq: postalCode}};
+                return {[param]: {like: `%${value}%`}};
             }
         });
 
@@ -119,6 +126,7 @@ module.exports = Self => {
                     c.fi,
                     c.socialName,
                     c.phone,
+                    c.mobile,
                     c.city,
                     c.postcode,
                     c.email,
@@ -132,7 +140,7 @@ module.exports = Self => {
                     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
-                    `
+            `
         );
 
         stmt.merge(conn.makeWhere(filter.where));