Merge branch 'dev' into 2678-Delete_description_on_travel_thermograph

modules/item/back/methods/item/filter.js

@@ -119,6 +119,7 @@ module.exports = Self => {
                     ori.code AS origin,
                     ic.name AS category,
                     i.density,
+                    i.stemMultiplier,
                     b.grouping,
                     b.packing,
                     itn.code AS niche, @visibleCalc

modules/item/back/models/item.json

@@ -65,7 +65,10 @@
             "type": "Number",
             "description": "Density"
         },
-        "image": {
+        "stemMultiplier": {
+            "type": "Number",
+            "description": "Multiplier"
+        },"image": {
             "type": "String",
             "description": "Image"
         },

modules/item/front/index/index.html

@@ -25,6 +25,7 @@
                 <vn-th field="origin" shrink>Origin</vn-th>
                 <vn-th field="salesperson" shrink>Buyer</vn-th>
                 <vn-th field="density" shrink>Density</vn-th>
+                <vn-th field="stemMultiplier" shrink>Multiplier</vn-th>
                 <vn-th field="active" shrink>Active</vn-th>
                 <vn-th></vn-th>
             </vn-tr>
@@ -78,6 +79,7 @@
                     </span>
                 </vn-td>
                 <vn-td shrink>{{::item.density}}</vn-td>
+                <vn-td shrink >{{::item.stemMultiplier}}</vn-td>
                 <vn-td shrink>
                     <vn-check
                         disabled="true"

modules/ticket/front/services/index.html

@@ -6,6 +6,7 @@
     auto-load="true">
 </vn-crud-model>
 <vn-crud-model
+    vn-id="typesModel"
     auto-load="true"
     url="TicketServiceTypes"
     data="ticketServiceTypes"

modules/ticket/front/services/index.js

@@ -35,6 +35,10 @@ class Controller extends Section {
             throw new UserError(`Name can't be empty`);
 
         return this.$http.post(`TicketServiceTypes`, this.$.newServiceType)
+            .then(res => {
+                this.$.typesModel.refresh();
+                return res;
+            })
             .then(res => service.ticketServiceTypeFk = res.data.id);
     }
 

modules/ticket/front/services/index.spec.js

@@ -1,4 +1,5 @@
 import './index.js';
+import crudModel from 'core/mocks/crud-model';
 
 describe('Ticket component vnTicketService', () => {
     let controller;
@@ -11,7 +12,7 @@ describe('Ticket component vnTicketService', () => {
     beforeEach(inject(($componentController, _$httpBackend_, $rootScope) => {
         $httpBackend = _$httpBackend_;
         $scope = $rootScope.$new();
-
+        $scope.typesModel = crudModel;
         $element = angular.element(`<div></div>`);
         controller = $componentController('vnTicketService', {$scope, $element});
     }));