From d2729e67e93ed0153d3c45d66b0da10760e551ff Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 22 Nov 2021 08:27:14 +0100
Subject: [PATCH] feat(item and latest-buys: add supplier filter

---
 .../entry/back/methods/entry/latestBuysFilter.js    | 11 ++++++++++-
 .../entry/front/latest-buys-search-panel/index.html | 11 +++++++++++
 modules/item/back/methods/item/filter.js            | 11 ++++++++++-
 modules/item/front/search-panel/index.html          | 13 ++++++++++++-
 4 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/modules/entry/back/methods/entry/latestBuysFilter.js b/modules/entry/back/methods/entry/latestBuysFilter.js
index 7711bc0f1..3b6da1acd 100644
--- a/modules/entry/back/methods/entry/latestBuysFilter.js
+++ b/modules/entry/back/methods/entry/latestBuysFilter.js
@@ -39,6 +39,11 @@ module.exports = Self => {
                 type: 'integer',
                 description: 'The buyer of the item',
             },
+            {
+                arg: 'supplierFk',
+                type: 'integer',
+                description: 'The supplier of the item',
+            },
             {
                 arg: 'active',
                 type: 'boolean',
@@ -99,6 +104,8 @@ module.exports = Self => {
                 return {'ic.id': value};
             case 'salesPersonFk':
                 return {'it.workerFk': value};
+            case 'supplierFk':
+                return {'s.id': value};
             case 'code':
                 return {'it.code': value};
             case 'active':
@@ -172,7 +179,9 @@ module.exports = Self => {
                 LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
                 LEFT JOIN itemType t ON t.id = i.typeFk
                 LEFT JOIN intrastat intr ON intr.id = i.intrastatFk
-                LEFT JOIN origin ori ON ori.id = i.originFk`
+                LEFT JOIN origin ori ON ori.id = i.originFk
+                LEFT JOIN entry e ON e.id = b.entryFk
+                    LEFT JOIN supplier s ON s.id = e.supplierFk`
         );
 
         if (ctx.args.tags) {
diff --git a/modules/entry/front/latest-buys-search-panel/index.html b/modules/entry/front/latest-buys-search-panel/index.html
index 4693141f8..7d570f798 100644
--- a/modules/entry/front/latest-buys-search-panel/index.html
+++ b/modules/entry/front/latest-buys-search-panel/index.html
@@ -46,6 +46,17 @@
                 where="{role: {inq: ['logistic', 'buyer']}}"
                 label="Buyer">
             </vn-autocomplete>
+            <vn-autocomplete
+                vn-one
+                label="Supplier"
+                ng-model="filter.supplierFk"
+                url="Suppliers"
+                fields="['name','nickname']"
+                search-function="{or: [{nickname: {like: '%'+ $search +'%'}}, {name: {like: '%'+ $search +'%'}}]}"
+                show-field="name"
+                value-field="id">
+                <tpl-item>{{name}}: {{nickname}}</tpl-item>
+            </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal>
             <vn-check
diff --git a/modules/item/back/methods/item/filter.js b/modules/item/back/methods/item/filter.js
index 29099c7ec..790277cb6 100644
--- a/modules/item/back/methods/item/filter.js
+++ b/modules/item/back/methods/item/filter.js
@@ -48,6 +48,11 @@ module.exports = Self => {
                 type: 'integer',
                 description: 'The buyer of the item',
             },
+            {
+                arg: 'supplierFk',
+                type: 'integer',
+                description: 'The supplier of the item',
+            },
             {
                 arg: 'description',
                 type: 'string',
@@ -120,6 +125,8 @@ module.exports = Self => {
                 return {'ic.id': value};
             case 'buyerFk':
                 return {'it.workerFk': value};
+            case 'supplierFk':
+                return {'s.id': value};
             case 'origin':
                 return {'ori.code': value};
             case 'intrastat':
@@ -170,7 +177,9 @@ module.exports = Self => {
                     LEFT JOIN producer pr ON pr.id = i.producerFk
                     LEFT JOIN origin ori ON ori.id = i.originFk
                     LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = it.warehouseFk
-                    LEFT JOIN vn.buy b ON b.id = lb.buy_id`
+                    LEFT JOIN buy b ON b.id = lb.buy_id
+                    LEFT JOIN entry e ON e.id = b.entryFk
+                    LEFT JOIN supplier s ON s.id = e.supplierFk`
         );
 
         if (ctx.args.tags) {
diff --git a/modules/item/front/search-panel/index.html b/modules/item/front/search-panel/index.html
index 57f05bb54..7cbe9c56d 100644
--- a/modules/item/front/search-panel/index.html
+++ b/modules/item/front/search-panel/index.html
@@ -43,10 +43,21 @@
                 ng-model="filter.buyerFk"
                 url="Items/activeBuyers"
                 show-field="nickname"
-                search-function="{firstName: $search}"
+                search-function="{nickname: {like: '%'+ $search +'%'}}"
                 value-field="workerFk"
                 label="Buyer">
             </vn-autocomplete>
+            <vn-autocomplete
+                vn-one
+                label="Supplier"
+                ng-model="filter.supplierFk"
+                url="Suppliers"
+                fields="['name','nickname']"
+                search-function="{or: [{nickname: {like: '%'+ $search +'%'}}, {name: {like: '%'+ $search +'%'}}]}"
+                show-field="name"
+                value-field="id">
+                <tpl-item>{{name}}: {{nickname}}</tpl-item>
+            </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal class="vn-pt-sm">
             <vn-one class="text-subtitle1" translate>