From 13f78359d5078832280f6542bbe5f3abe8dd3c7e Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Fri, 3 Sep 2021 14:00:47 +0200
Subject: [PATCH] fix(bank): the search by bank was not differentiating between
 numerical values and string values Refs: 3084

---
 front/salix/components/user-popover/index.html |  2 +-
 front/salix/components/user-popover/index.js   |  6 ++++++
 .../components/user-popover/index.spec.js      | 18 +++++++++++++++++-
 modules/client/front/balance/create/index.html |  2 +-
 modules/client/front/balance/create/index.js   |  6 ++++++
 .../client/front/balance/create/index.spec.js  | 16 ++++++++++++++++
 modules/ticket/front/sale/index.spec.js        | 16 ++++++++++++++++
 7 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/front/salix/components/user-popover/index.html b/front/salix/components/user-popover/index.html
index 22d86f1aa..0fa6800c5 100644
--- a/front/salix/components/user-popover/index.html
+++ b/front/salix/components/user-popover/index.html
@@ -63,7 +63,7 @@
             show-field="bank"
             order="id"
             value-field="id"
-            search-function="{or: [{id: $search}, {bank: {like: '%'+ $search +'%'}}]}">
+            search-function="$ctrl.bankSearchFunc($search)">
             <tpl-item>{{id}}: {{bank}}</tpl-item>
         </vn-autocomplete>
         <vn-autocomplete
diff --git a/front/salix/components/user-popover/index.js b/front/salix/components/user-popover/index.js
index 0d35d8995..6cc47db7d 100644
--- a/front/salix/components/user-popover/index.js
+++ b/front/salix/components/user-popover/index.js
@@ -78,6 +78,12 @@ class Controller {
         this.$.companies.refresh();
         this.$.popover.show(event.target);
     }
+
+    bankSearchFunc($search) {
+        return /^\d+$/.test($search)
+            ? {id: $search}
+            : {bank: {like: '%' + $search + '%'}};
+    }
 }
 Controller.$inject = ['$scope', '$translate', 'vnConfig', 'vnAuth', 'vnToken'];
 
diff --git a/front/salix/components/user-popover/index.spec.js b/front/salix/components/user-popover/index.spec.js
index aaba3c189..917c30221 100644
--- a/front/salix/components/user-popover/index.spec.js
+++ b/front/salix/components/user-popover/index.spec.js
@@ -61,12 +61,28 @@ describe('Salix', () => {
         });
 
         describe('getImageUrl()', () => {
-            it('should return de url image', () => {
+            it('should return the url image', () => {
                 const url = $root.imagePath('user', '160x160', userId);
 
                 expect(url).toBeDefined();
                 expect(url).toEqual(`/api/Images/user/160x160/${userId}/download?access_token=null`);
             });
         });
+
+        describe('bankSearchFunc()', () => {
+            it('should return the filter by id property for an input of a number', () => {
+                const bankId = 1;
+                const result = controller.bankSearchFunc(bankId);
+
+                expect(result).toEqual({id: bankId});
+            });
+
+            it('should return the filter by bank property for an input of an string', () => {
+                const bankName = 'Bank of America';
+                const result = controller.bankSearchFunc(bankName);
+
+                expect(result).toEqual({bank: {like: '%' + bankName + '%'}});
+            });
+        });
     });
 });
diff --git a/modules/client/front/balance/create/index.html b/modules/client/front/balance/create/index.html
index 357ae5d03..f9bf89b04 100644
--- a/modules/client/front/balance/create/index.html
+++ b/modules/client/front/balance/create/index.html
@@ -33,7 +33,7 @@
             fields="['accountingTypeFk']"
             include="{relation: 'accountingType'}"
             ng-model="$ctrl.bankFk"
-            search-function="{or: [{id: $search}, {bank: {like: '%'+ $search +'%'}}]}"
+            search-function="$ctrl.bankSearchFunc($search)"
             selection="$ctrl.bankSelection"
             order="id"
             required="true">
diff --git a/modules/client/front/balance/create/index.js b/modules/client/front/balance/create/index.js
index be05983ca..e78a9c1b2 100644
--- a/modules/client/front/balance/create/index.js
+++ b/modules/client/front/balance/create/index.js
@@ -137,6 +137,12 @@ class Controller extends Dialog {
                 }
             });
     }
+
+    bankSearchFunc($search) {
+        return /^\d+$/.test($search)
+            ? {id: $search}
+            : {bank: {like: '%' + $search + '%'}};
+    }
 }
 
 Controller.$inject = ['$element', '$scope', '$transclude', 'vnReport'];
diff --git a/modules/client/front/balance/create/index.spec.js b/modules/client/front/balance/create/index.spec.js
index 75ab6fa13..bd0607a79 100644
--- a/modules/client/front/balance/create/index.spec.js
+++ b/modules/client/front/balance/create/index.spec.js
@@ -118,5 +118,21 @@ describe('Client', () => {
                 expect(controller.receipt.compensationAccount).toEqual('4000000003');
             });
         });
+
+        describe('bankSearchFunc()', () => {
+            it('should return the filter by id property for an input of a number', () => {
+                const bankId = 1;
+                const result = controller.bankSearchFunc(bankId);
+
+                expect(result).toEqual({id: bankId});
+            });
+
+            it('should return the filter by bank property for an input of an string', () => {
+                const bankName = 'Bank of America';
+                const result = controller.bankSearchFunc(bankName);
+
+                expect(result).toEqual({bank: {like: '%' + bankName + '%'}});
+            });
+        });
     });
 });
diff --git a/modules/ticket/front/sale/index.spec.js b/modules/ticket/front/sale/index.spec.js
index 169b41c5f..cee1fe5b4 100644
--- a/modules/ticket/front/sale/index.spec.js
+++ b/modules/ticket/front/sale/index.spec.js
@@ -679,5 +679,21 @@ describe('Ticket', () => {
                 expect(controller.$.model.refresh).toHaveBeenCalledWith();
             });
         });
+
+        describe('itemSearchFunc()', () => {
+            it('should return the filter by id property for an input of a number', () => {
+                const itemId = 1;
+                const result = controller.itemSearchFunc(itemId);
+
+                expect(result).toEqual({id: itemId});
+            });
+
+            it('should return the filter by bank property for an input of an string', () => {
+                const itemName = 'Bow';
+                const result = controller.itemSearchFunc(itemName);
+
+                expect(result).toEqual({name: {like: '%' + itemName + '%'}});
+            });
+        });
     });
 });