Merge branch 'dev' of http://git.verdnatura.es/salix into dev

client/ticket/src/card/index.js

@@ -19,14 +19,13 @@ class Controller {
                     },
                 },
                 {
-                    relation: 'tracking',
+                    relation: 'state',
                     scope: {
                         fields: ['stateFk'],
                         include: {
                             relation: 'state',
-                            fields: ['name'],
+                            fields: ['id', 'name'],
-                        },
+                        }
-                        order: 'created DESC'
                     },
                 },
             ],
@@ -55,5 +54,5 @@ Controller.$inject = ['$http', '$state'];
 
 ngModule.component('vnTicketCard', {
     template: require('./index.html'),
-    controller: Controller,
+    controller: Controller
 });

client/ticket/src/sale/index.html

@@ -275,3 +275,11 @@
     message="Continue anyway?"
     on-response="$ctrl.onRemoveLinesClick(response)">
 </vn-confirm>
+<vn-float-button 
+    ng-show="$ctrl.isEditable"
+    ng-click="$ctrl.newOrderFromTicket()"
+    icon="add"
+    vn-tooltip="New item"
+    vn-bind="+"
+    fixed-bottom-right>
+</vn-float-button>

client/ticket/src/sale/index.js

@@ -68,7 +68,7 @@ class Controller {
 
     get isEditable() {
         try {
-            return !this.ticket.tracking.state.alertLevel;
+            return !this.ticket.state.state.alertLevel;
         } catch (e) {}
 
         return true;
@@ -324,6 +324,13 @@ class Controller {
             this.$scope.model.refresh();
         });
     }
+
+    newOrderFromTicket() {
+        this.$http.post(`/api/Orders/newFromTicket`, {ticketFk: this.ticket.id}).then(res => {
+            this.$state.go('order.card.catalog', {id: res.data});
+            this.vnApp.showSuccess(this.$translate.instant('Order created'));
+        });
+    }
 }
 
 Controller.$inject = ['$scope', '$state', '$http', 'vnApp', '$translate'];

e2e/paths/ticket-module/07_edit_sale.spec.js

@@ -615,6 +615,17 @@ describe('Ticket Edit sale path', () => {
 
             expect(result).toEqual(1);
         });
+
+        it(`should click on the search result to access to the ticket Sale`, async () => {
+            const url = await nightmare
+                .waitForTextInElement(selectors.ticketsIndex.searchResult, 'address 21')
+                .waitToClick(selectors.ticketsIndex.searchResult)
+                .waitToClick(selectors.ticketSales.saleButton)
+                .waitForURL('/sale')
+                .url();
+
+            expect(url).toContain('/sale');
+        });
     });
 
     describe('when state is preparation and loged as salesPerson', () => {

services/loopback/common/models/ticket.json

@@ -81,7 +81,7 @@
             "foreignKey": "ticketFk"
         },
         "tracking": {
-        "type": "hasOne",
+            "type": "hasMany",
             "model": "TicketTracking",
             "foreignKey": "ticketFk"
         },
@@ -94,6 +94,11 @@
             "type": "hasOne",
             "model": "TicketState",
             "foreignKey": "ticketFk"
+        },
+        "state": {
+            "type": "hasOne",
+            "model": "TicketState",
+            "foreignKey": "ticketFk"
         }
     }
 }