From ded0c6a53a3d63112664d0b4c1656ac155bc8b76 Mon Sep 17 00:00:00 2001
From: Juan <juan@pc-juan.verdnatura.es>
Date: Wed, 4 Apr 2018 19:59:03 +0200
Subject: [PATCH] #166 - Item list ordered by name

---
 client/item/src/barcode/barcode.html          | 34 ++++++++++
 .../barcode/{item-barcode.js => barcode.js}   |  2 +-
 .../{item-barcode.spec.js => barcode.spec.js} |  2 +-
 .../{item-botanical.html => botanical.html}   |  0
 .../{item-botanical.js => botanical.js}       |  2 +-
 ...em-botanical.spec.js => botanical.spec.js} |  2 +-
 .../src/card/{item-card.html => card.html}    |  0
 .../item/src/card/{item-card.js => card.js}   |  2 +-
 .../card/{item-card.spec.js => card.spec.js}  |  2 +-
 .../create/{item-create.html => create.html}  |  0
 .../src/create/{item-create.js => create.js}  |  2 +-
 .../{item-create.spec.js => create.spec.js}   |  2 +-
 .../src/data/{item-data.html => data.html}    |  0
 .../item/src/data/{item-data.js => data.js}   |  2 +-
 .../{item-descriptor.html => descriptor.html} |  0
 .../{item-descriptor.js => descriptor.js}     |  2 +-
 .../item/src/filter-panel/filter-panel.html   | 66 ++++++++++++-------
 .../{item-history.html => history.html}       |  0
 .../history/{item-history.js => history.js}   |  2 +-
 client/item/src/item.js                       | 22 +++----
 client/item/src/list/list.js                  |  2 +-
 .../list/{item-product.html => product.html}  |  0
 .../src/list/{item-product.js => product.js}  |  2 +-
 client/item/src/niche/niche.html              | 58 ++++++++++++++++
 .../src/niche/{item-niche.js => niche.js}     |  2 +-
 .../{item-niche.spec.js => niche.spec.js}     |  2 +-
 .../{item-summary.html => summary.html}       |  0
 .../summary/{item-summary.js => summary.js}   |  2 +-
 .../src/tags/{item-tags.html => tags.html}    |  0
 .../item/src/tags/{item-tags.js => tags.js}   |  2 +-
 .../tags/{item-tags.spec.js => tags.spec.js}  |  2 +-
 .../item/src/tax/{item-tax.html => tax.html}  |  0
 client/item/src/tax/{item-tax.js => tax.js}   |  2 +-
 .../common/methods/client/createWithUser.js   |  4 +-
 .../loopback/common/methods/item/filter.js    | 18 ++---
 35 files changed, 177 insertions(+), 63 deletions(-)
 create mode 100644 client/item/src/barcode/barcode.html
 rename client/item/src/barcode/{item-barcode.js => barcode.js} (98%)
 rename client/item/src/barcode/{item-barcode.spec.js => barcode.spec.js} (99%)
 rename client/item/src/botanical/{item-botanical.html => botanical.html} (100%)
 rename client/item/src/botanical/{item-botanical.js => botanical.js} (95%)
 rename client/item/src/botanical/{item-botanical.spec.js => botanical.spec.js} (97%)
 rename client/item/src/card/{item-card.html => card.html} (100%)
 rename client/item/src/card/{item-card.js => card.js} (97%)
 rename client/item/src/card/{item-card.spec.js => card.spec.js} (98%)
 rename client/item/src/create/{item-create.html => create.html} (100%)
 rename client/item/src/create/{item-create.js => create.js} (91%)
 rename client/item/src/create/{item-create.spec.js => create.spec.js} (97%)
 rename client/item/src/data/{item-data.html => data.html} (100%)
 rename client/item/src/data/{item-data.js => data.js} (91%)
 rename client/item/src/descriptor/{item-descriptor.html => descriptor.html} (100%)
 rename client/item/src/descriptor/{item-descriptor.js => descriptor.js} (76%)
 rename client/item/src/history/{item-history.html => history.html} (100%)
 rename client/item/src/history/{item-history.js => history.js} (77%)
 rename client/item/src/list/{item-product.html => product.html} (100%)
 rename client/item/src/list/{item-product.js => product.js} (92%)
 create mode 100644 client/item/src/niche/niche.html
 rename client/item/src/niche/{item-niche.js => niche.js} (98%)
 rename client/item/src/niche/{item-niche.spec.js => niche.spec.js} (99%)
 rename client/item/src/summary/{item-summary.html => summary.html} (100%)
 rename client/item/src/summary/{item-summary.js => summary.js} (98%)
 rename client/item/src/tags/{item-tags.html => tags.html} (100%)
 rename client/item/src/tags/{item-tags.js => tags.js} (99%)
 rename client/item/src/tags/{item-tags.spec.js => tags.spec.js} (99%)
 rename client/item/src/tax/{item-tax.html => tax.html} (100%)
 rename client/item/src/tax/{item-tax.js => tax.js} (96%)

diff --git a/client/item/src/barcode/barcode.html b/client/item/src/barcode/barcode.html
new file mode 100644
index 0000000000..37c17298be
--- /dev/null
+++ b/client/item/src/barcode/barcode.html
@@ -0,0 +1,34 @@
+<form name="form" ng-submit="$ctrl.submit()">
+    <vn-card pad-large>
+        <vn-title>Item barcode</vn-title>
+        <vn-horizontal ng-repeat="barcode in $ctrl.barcodes track by $index">
+            <vn-textfield
+                vn-three
+                label="Code"
+                model="barcode.code"
+                vn-acl="buyer, replenisher">
+            </vn-textfield>
+            <vn-one pad-medium-top>
+                <vn-icon
+                    vn-acl="buyer, replenisher"
+                    pointer 
+                    medium-grey
+                    icon="remove_circle_outline"
+                    ng-click="$ctrl.removeBarcode($index)">
+                </vn-icon>
+                <vn-icon
+                    vn-acl="buyer, replenisher"
+                    pointer 
+                    margin-medium-left
+                    orange
+                    icon="add_circle"
+                    ng-if = "barcode.showAddIcon" 
+                    ng-click="$ctrl.addBarcode()"
+                ></vn-icon>  
+            </vn-one>
+        </vn-horizontal>
+    </vn-card>
+    <vn-button-bar>
+        <vn-submit label="Save"></vn-submit>
+    </vn-button-bar>
+</form>
diff --git a/client/item/src/barcode/item-barcode.js b/client/item/src/barcode/barcode.js
similarity index 98%
rename from client/item/src/barcode/item-barcode.js
rename to client/item/src/barcode/barcode.js
index f51ac0ad88..2d65b57fca 100644
--- a/client/item/src/barcode/item-barcode.js
+++ b/client/item/src/barcode/barcode.js
@@ -125,6 +125,6 @@ export default class Controller {
 Controller.$inject = ['$state', '$scope', '$http', '$q', '$translate', 'vnApp'];
 
 ngModule.component('vnItemBarcode', {
-    template: require('./item-barcode.html'),
+    template: require('./barcode.html'),
     controller: Controller
 });
diff --git a/client/item/src/barcode/item-barcode.spec.js b/client/item/src/barcode/barcode.spec.js
similarity index 99%
rename from client/item/src/barcode/item-barcode.spec.js
rename to client/item/src/barcode/barcode.spec.js
index 98e645c267..25cd358318 100644
--- a/client/item/src/barcode/item-barcode.spec.js
+++ b/client/item/src/barcode/barcode.spec.js
@@ -1,4 +1,4 @@
-import './item-barcode.js';
+import './barcode.js';
 
 describe('Item', () => {
     describe('Component vnItemBarcode', () => {
diff --git a/client/item/src/botanical/item-botanical.html b/client/item/src/botanical/botanical.html
similarity index 100%
rename from client/item/src/botanical/item-botanical.html
rename to client/item/src/botanical/botanical.html
diff --git a/client/item/src/botanical/item-botanical.js b/client/item/src/botanical/botanical.js
similarity index 95%
rename from client/item/src/botanical/item-botanical.js
rename to client/item/src/botanical/botanical.js
index c747b6b0d9..16963e9956 100644
--- a/client/item/src/botanical/item-botanical.js
+++ b/client/item/src/botanical/botanical.js
@@ -31,6 +31,6 @@ class ItemBotanical {
 ItemBotanical.$inject = ['$http', '$state'];
 
 ngModule.component('vnItemBotanical', {
-    template: require('./item-botanical.html'),
+    template: require('./botanical.html'),
     controller: ItemBotanical
 });
diff --git a/client/item/src/botanical/item-botanical.spec.js b/client/item/src/botanical/botanical.spec.js
similarity index 97%
rename from client/item/src/botanical/item-botanical.spec.js
rename to client/item/src/botanical/botanical.spec.js
index f4e0e52d9f..2366c7eea4 100644
--- a/client/item/src/botanical/item-botanical.spec.js
+++ b/client/item/src/botanical/botanical.spec.js
@@ -1,4 +1,4 @@
-import './item-botanical.js';
+import './botanical.js';
 
 describe('ItemBotanical', () => {
     describe('Component vnItemBotanical', () => {
diff --git a/client/item/src/card/item-card.html b/client/item/src/card/card.html
similarity index 100%
rename from client/item/src/card/item-card.html
rename to client/item/src/card/card.html
diff --git a/client/item/src/card/item-card.js b/client/item/src/card/card.js
similarity index 97%
rename from client/item/src/card/item-card.js
rename to client/item/src/card/card.js
index a1e4d9994f..1c194acd3e 100644
--- a/client/item/src/card/item-card.js
+++ b/client/item/src/card/card.js
@@ -60,6 +60,6 @@ class ItemCard {
 ItemCard.$inject = ['$http', '$state', '$timeout'];
 
 ngModule.component('vnItemCard', {
-    template: require('./item-card.html'),
+    template: require('./card.html'),
     controller: ItemCard
 });
diff --git a/client/item/src/card/item-card.spec.js b/client/item/src/card/card.spec.js
similarity index 98%
rename from client/item/src/card/item-card.spec.js
rename to client/item/src/card/card.spec.js
index 50e3e0542a..07b1ddd374 100644
--- a/client/item/src/card/item-card.spec.js
+++ b/client/item/src/card/card.spec.js
@@ -1,4 +1,4 @@
-import './item-card.js';
+import './card.js';
 
 describe('Item', () => {
     describe('Component vnItemCard', () => {
diff --git a/client/item/src/create/item-create.html b/client/item/src/create/create.html
similarity index 100%
rename from client/item/src/create/item-create.html
rename to client/item/src/create/create.html
diff --git a/client/item/src/create/item-create.js b/client/item/src/create/create.js
similarity index 91%
rename from client/item/src/create/item-create.js
rename to client/item/src/create/create.js
index 415e67c4f6..a74394891f 100644
--- a/client/item/src/create/item-create.js
+++ b/client/item/src/create/create.js
@@ -18,6 +18,6 @@ class ItemCreate {
 ItemCreate.$inject = ['$scope', '$state'];
 
 ngModule.component('vnItemCreate', {
-    template: require('./item-create.html'),
+    template: require('./create.html'),
     controller: ItemCreate
 });
diff --git a/client/item/src/create/item-create.spec.js b/client/item/src/create/create.spec.js
similarity index 97%
rename from client/item/src/create/item-create.spec.js
rename to client/item/src/create/create.spec.js
index e63265ee74..afadc285f1 100644
--- a/client/item/src/create/item-create.spec.js
+++ b/client/item/src/create/create.spec.js
@@ -1,4 +1,4 @@
-import './item-create.js';
+import './create.js';
 
 describe('Item', () => {
     describe('Component vnItemCreate', () => {
diff --git a/client/item/src/data/item-data.html b/client/item/src/data/data.html
similarity index 100%
rename from client/item/src/data/item-data.html
rename to client/item/src/data/data.html
diff --git a/client/item/src/data/item-data.js b/client/item/src/data/data.js
similarity index 91%
rename from client/item/src/data/item-data.js
rename to client/item/src/data/data.js
index d9e7c551ba..bd3884555c 100644
--- a/client/item/src/data/item-data.js
+++ b/client/item/src/data/data.js
@@ -15,7 +15,7 @@ class ItemData {
 ItemData.$inject = ['$scope', '$timeout'];
 
 ngModule.component('vnItemData', {
-    template: require('./item-data.html'),
+    template: require('./data.html'),
     bindings: {
         item: '<'
     },
diff --git a/client/item/src/descriptor/item-descriptor.html b/client/item/src/descriptor/descriptor.html
similarity index 100%
rename from client/item/src/descriptor/item-descriptor.html
rename to client/item/src/descriptor/descriptor.html
diff --git a/client/item/src/descriptor/item-descriptor.js b/client/item/src/descriptor/descriptor.js
similarity index 76%
rename from client/item/src/descriptor/item-descriptor.js
rename to client/item/src/descriptor/descriptor.js
index 9108958487..e46267d835 100644
--- a/client/item/src/descriptor/item-descriptor.js
+++ b/client/item/src/descriptor/descriptor.js
@@ -1,7 +1,7 @@
 import ngModule from '../module';
 
 ngModule.component('vnItemDescriptor', {
-    template: require('./item-descriptor.html'),
+    template: require('./descriptor.html'),
     bindings: {
         item: '<',
         itemTags: '<',
diff --git a/client/item/src/filter-panel/filter-panel.html b/client/item/src/filter-panel/filter-panel.html
index 2f09c471c7..1a78e7ffb3 100644
--- a/client/item/src/filter-panel/filter-panel.html
+++ b/client/item/src/filter-panel/filter-panel.html
@@ -1,22 +1,47 @@
 <div pad-large style="min-width: 30em">
     <form ng-submit="$ctrl.onSearch()">
         <vn-horizontal>
-            <vn-textfield vn-one label="Id" model="$ctrl.filter.id" vn-focus></vn-textfield>
-            <vn-textfield vn-three label="Description" model="$ctrl.filter.description"></vn-textfield>
+            <vn-textfield
+                vn-one
+                label="Id"
+                model="$ctrl.filter.id"
+                vn-focus>
+            </vn-textfield>
+            <vn-textfield
+                vn-three
+                label="Description"
+                model="$ctrl.filter.description">
+            </vn-textfield>
         </vn-horizontal>
         <vn-horizontal>
-            <vn-textfield vn-one label="Category" type="number" model="$ctrl.filter.category"></vn-textfield>
-            <vn-textfield vn-one label="Size" type="number" model="$ctrl.filter.itemSize"></vn-textfield>
-        </vn-horizontal>
-        <vn-horizontal>
-            <vn-autocomplete vn-one
+            <vn-autocomplete
+                vn-one
                 url="/item/api/ItemTypes"
                 label="Type"
                 show-field="name"
                 value-field="id"
                 field="$ctrl.filter.typeFk">
             </vn-autocomplete>
-            <vn-autocomplete vn-one
+            <vn-autocomplete
+                vn-one
+                url="/item/api/Producers"
+                label="Producer"
+                show-field="name"
+                value-field="id"
+                field="$ctrl.filter.producerFk">
+            </vn-autocomplete>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-autocomplete
+                vn-one
+                url="/item/api/Origins"
+                label="Origin"
+                show-field="name"
+                value-field="id"
+                field="$ctrl.filter.originFk">
+            </vn-autocomplete>
+            <vn-autocomplete
+                vn-one
                 url="/item/api/Inks"
                 label="Ink"
                 show-field="name"
@@ -25,20 +50,17 @@
             </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal>
-            <vn-autocomplete vn-one
-                url="/item/api/Origins"
-                label="Origin"
-                show-field="name"
-                value-field="id"
-                field="$ctrl.filter.originFk">
-            </vn-autocomplete>
-            <vn-autocomplete vn-one
-                url="/item/api/Producers"
-                label="Producer"
-                show-field="name"
-                value-field="id"
-                field="$ctrl.filter.producerFk">
-            </vn-autocomplete>
+            <vn-textfield
+                vn-one
+                label="Category"
+                model="$ctrl.filter.category">
+            </vn-textfield>
+            <vn-textfield
+                vn-one
+                label="Size"
+                type="number"
+                model="$ctrl.filter.itemSize">
+            </vn-textfield>
         </vn-horizontal>
         <vn-horizontal margin-large-top>
             <vn-submit label="Search"></vn-submit>
diff --git a/client/item/src/history/item-history.html b/client/item/src/history/history.html
similarity index 100%
rename from client/item/src/history/item-history.html
rename to client/item/src/history/history.html
diff --git a/client/item/src/history/item-history.js b/client/item/src/history/history.js
similarity index 77%
rename from client/item/src/history/item-history.js
rename to client/item/src/history/history.js
index b89dca9284..a6f8d154ef 100644
--- a/client/item/src/history/item-history.js
+++ b/client/item/src/history/history.js
@@ -2,6 +2,6 @@ import ngModule from '../module';
 import FilterItemList from '../filter-item-list';
 
 ngModule.component('vnItemHistory', {
-    template: require('./item-history.html'),
+    template: require('./history.html'),
     controller: FilterItemList
 });
diff --git a/client/item/src/item.js b/client/item/src/item.js
index 504933d060..477173e79e 100644
--- a/client/item/src/item.js
+++ b/client/item/src/item.js
@@ -3,15 +3,15 @@ export * from './module';
 import './filter-item-list';
 import './list/list';
 import './filter-panel/filter-panel';
-import './create/item-create';
-import './card/item-card';
-import './descriptor/item-descriptor';
-import './data/item-data';
-import './tags/item-tags';
-import './tax/item-tax';
-import './history/item-history';
-import './niche/item-niche';
-import './botanical/item-botanical';
-import './barcode/item-barcode';
-import './summary/item-summary';
+import './create/create';
+import './card/card';
+import './descriptor/descriptor';
+import './data/data';
+import './tags/tags';
+import './tax/tax';
+import './history/history';
+import './niche/niche';
+import './botanical/botanical';
+import './barcode/barcode';
+import './summary/summary';
 
diff --git a/client/item/src/list/list.js b/client/item/src/list/list.js
index 388b890126..43d2a95e4d 100644
--- a/client/item/src/list/list.js
+++ b/client/item/src/list/list.js
@@ -1,5 +1,5 @@
 import ngModule from '../module';
-import './item-product';
+import './product';
 import './style.scss';
 
 class ItemList {
diff --git a/client/item/src/list/item-product.html b/client/item/src/list/product.html
similarity index 100%
rename from client/item/src/list/item-product.html
rename to client/item/src/list/product.html
diff --git a/client/item/src/list/item-product.js b/client/item/src/list/product.js
similarity index 92%
rename from client/item/src/list/item-product.js
rename to client/item/src/list/product.js
index 728b0cd80c..2d845a6d6a 100644
--- a/client/item/src/list/item-product.js
+++ b/client/item/src/list/product.js
@@ -18,7 +18,7 @@ class ItemProduct {
 }
 
 ngModule.component('vnItemProduct', {
-    template: require('./item-product.html'),
+    template: require('./product.html'),
     bindings: {
         item: '<'
     },
diff --git a/client/item/src/niche/niche.html b/client/item/src/niche/niche.html
new file mode 100644
index 0000000000..f8948e128a
--- /dev/null
+++ b/client/item/src/niche/niche.html
@@ -0,0 +1,58 @@
+<vn-watcher
+    vn-id="watcher"
+    data="$ctrl.item"
+    form="form">
+</vn-watcher>
+<form name="form" ng-submit="$ctrl.submit()">
+    <vn-card pad-large>
+        <vn-title>Item niches</vn-title>
+        <vn-horizontal ng-repeat="itemNiche in $ctrl.niches track by $index">
+            <vn-autocomplete
+                ng-if="!itemNiche.id"
+                vn-one
+                data="$ctrl.warehouses"
+                show-field="name"
+                value-field="id"
+                initial-data="itemNiche.warehouse"
+                field="itemNiche.warehouseFk"
+                label="Warehouse"
+                vn-acl="buyer,replenisher">
+            </vn-autocomplete>
+            <vn-textfield
+                ng-if="itemNiche.id"
+                vn-one
+                label="Warehouse"
+                model="itemNiche.warehouse.name"
+                disabled="true">
+            </vn-textfield>
+            <vn-textfield 
+                vn-two
+                label="Code"
+                model="itemNiche.code"
+                rule="itemNiche.code"
+                vn-acl="buyer,replenisher">
+            </vn-textfield>
+            <vn-one pad-medium-top>
+                <vn-icon
+                    vn-acl="buyer,replenisher"
+                    pointer 
+                    medium-grey
+                    icon="remove_circle_outline"
+                    ng-click="$ctrl.removeNiche($index)">
+                </vn-icon>
+                <vn-icon
+                    vn-acl="buyer, replenisher"
+                    pointer 
+                    margin-medium-left
+                    orange
+                    icon="add_circle"
+                    ng-if="itemNiche.showAddIcon" 
+                    ng-click="$ctrl.addNiche()">
+                </vn-icon>  
+            </vn-one>
+        </vn-horizontal>
+    </vn-card>
+    <vn-button-bar>
+        <vn-submit label="Save"></vn-submit>
+    </vn-button-bar>
+</form>
\ No newline at end of file
diff --git a/client/item/src/niche/item-niche.js b/client/item/src/niche/niche.js
similarity index 98%
rename from client/item/src/niche/item-niche.js
rename to client/item/src/niche/niche.js
index 95921263cc..d140e4b563 100644
--- a/client/item/src/niche/item-niche.js
+++ b/client/item/src/niche/niche.js
@@ -144,6 +144,6 @@ export default class Controller {
 Controller.$inject = ['$stateParams', '$scope', '$http', '$translate', 'vnApp'];
 
 ngModule.component('vnItemNiche', {
-    template: require('./item-niche.html'),
+    template: require('./niche.html'),
     controller: Controller
 });
diff --git a/client/item/src/niche/item-niche.spec.js b/client/item/src/niche/niche.spec.js
similarity index 99%
rename from client/item/src/niche/item-niche.spec.js
rename to client/item/src/niche/niche.spec.js
index e223133d93..3c29de40bd 100644
--- a/client/item/src/niche/item-niche.spec.js
+++ b/client/item/src/niche/niche.spec.js
@@ -1,4 +1,4 @@
-import './item-niche.js';
+import './niche.js';
 
 describe('Item', () => {
     describe('Component vnItemNiche', () => {
diff --git a/client/item/src/summary/item-summary.html b/client/item/src/summary/summary.html
similarity index 100%
rename from client/item/src/summary/item-summary.html
rename to client/item/src/summary/summary.html
diff --git a/client/item/src/summary/item-summary.js b/client/item/src/summary/summary.js
similarity index 98%
rename from client/item/src/summary/item-summary.js
rename to client/item/src/summary/summary.js
index 401d70f0a9..4101daaaae 100644
--- a/client/item/src/summary/item-summary.js
+++ b/client/item/src/summary/summary.js
@@ -86,7 +86,7 @@ class ItemSummary {
 ItemSummary.$inject = ['$http'];
 
 ngModule.component('vnItemSummary', {
-    template: require('./item-summary.html'),
+    template: require('./summary.html'),
     controller: ItemSummary,
     bindings: {
         item: '<'
diff --git a/client/item/src/tags/item-tags.html b/client/item/src/tags/tags.html
similarity index 100%
rename from client/item/src/tags/item-tags.html
rename to client/item/src/tags/tags.html
diff --git a/client/item/src/tags/item-tags.js b/client/item/src/tags/tags.js
similarity index 99%
rename from client/item/src/tags/item-tags.js
rename to client/item/src/tags/tags.js
index de750b294b..005446f751 100644
--- a/client/item/src/tags/item-tags.js
+++ b/client/item/src/tags/tags.js
@@ -144,7 +144,7 @@ class ItemTags {
 ItemTags.$inject = ['$stateParams', '$scope', '$http', '$translate', 'vnApp'];
 
 ngModule.component('vnItemTags', {
-    template: require('./item-tags.html'),
+    template: require('./tags.html'),
     controller: ItemTags,
     bindings: {
         itemTags: '='
diff --git a/client/item/src/tags/item-tags.spec.js b/client/item/src/tags/tags.spec.js
similarity index 99%
rename from client/item/src/tags/item-tags.spec.js
rename to client/item/src/tags/tags.spec.js
index fd1cd00c45..560e39ac7b 100644
--- a/client/item/src/tags/item-tags.spec.js
+++ b/client/item/src/tags/tags.spec.js
@@ -1,4 +1,4 @@
-import './item-tags.js';
+import './tags.js';
 
 describe('Item', () => {
     describe('Component vnItemTags', () => {
diff --git a/client/item/src/tax/item-tax.html b/client/item/src/tax/tax.html
similarity index 100%
rename from client/item/src/tax/item-tax.html
rename to client/item/src/tax/tax.html
diff --git a/client/item/src/tax/item-tax.js b/client/item/src/tax/tax.js
similarity index 96%
rename from client/item/src/tax/item-tax.js
rename to client/item/src/tax/tax.js
index 57b84fbab4..90a11b942f 100644
--- a/client/item/src/tax/item-tax.js
+++ b/client/item/src/tax/tax.js
@@ -38,7 +38,7 @@ export default class Controller {
 Controller.$inject = ['$stateParams', '$http'];
 
 ngModule.component('vnItemTax', {
-    template: require('./item-tax.html'),
+    template: require('./tax.html'),
     controller: Controller,
     bindings: {
         item: '<'
diff --git a/services/loopback/common/methods/client/createWithUser.js b/services/loopback/common/methods/client/createWithUser.js
index 54ec90579f..59aa2c8e87 100644
--- a/services/loopback/common/methods/client/createWithUser.js
+++ b/services/loopback/common/methods/client/createWithUser.js
@@ -42,11 +42,11 @@ module.exports = function(Self) {
                 provinceFk: data.provinceFk,
                 isEqualizated: data.isEqualizated
             };
-            newClient = await Self.create(client, {transaction});
+            newClient = await Self.create(client);
             await transaction.commit();
             return newClient;
         } catch (e) {
-            transaction.rollback();
+            await transaction.rollback();
             throw e;
         }
     };
diff --git a/services/loopback/common/methods/item/filter.js b/services/loopback/common/methods/item/filter.js
index b1a1457c13..a91b615857 100644
--- a/services/loopback/common/methods/item/filter.js
+++ b/services/loopback/common/methods/item/filter.js
@@ -2,15 +2,15 @@ module.exports = Self => {
     Self.installMethod('filter', filterParams);
 
     function filterParams(params) {
-        let filters = {
+        let filter = {
             where: {},
             skip: (params.page - 1) * params.size,
             limit: params.size,
-            order: params.order || 'relevancy DESC',
+            order: params.order || 'name, relevancy DESC',
             include: {
-                relation: "itemType",
+                relation: 'itemType',
                 scope: {
-                    fields: ["id", "name"]
+                    fields: ['id', 'name']
                 }
             }
         };
@@ -20,7 +20,7 @@ module.exports = Self => {
         delete params.order;
 
         if (params.search) {
-            filters.where.and = [
+            filter.where.and = [
                 {
                     or: [
                         {id: params.search},
@@ -38,16 +38,16 @@ module.exports = Self => {
 
         Object.keys(params).forEach(
             key => {
-                if (filters.where.and) {
+                if (filter.where.and) {
                     let filter = {};
                     filter[key] = (key === 'description' || key === 'name') ? {regexp: params[key]} : params[key];
-                    filters.where.and.push(filter);
+                    filter.where.and.push(filter);
                 } else {
-                    filters.where[key] = (key === 'description' || key === 'name') ? {regexp: params[key]} : params[key];
+                    filter.where[key] = (key === 'description' || key === 'name') ? {regexp: params[key]} : params[key];
                 }
             }
         );
 
-        return filters;
+        return filter;
     }
 };