Merge pull request 'ticket create now takes clientFk from params' (#643) from 2946-ticket_create_from_client_tickets into dev

Reviewed-on: #643
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

e2e/helpers/selectors.js

@@ -474,7 +474,7 @@ export default {
         advancedSearchDaysOnward: 'vn-ticket-search-panel vn-input-number[ng-model="filter.scopeDays"]',
         advancedSearchClient: 'vn-ticket-search-panel vn-textfield[ng-model="filter.clientFk"]',
         advancedSearchButton: 'vn-ticket-search-panel button[type=submit]',
-        newTicketButton: 'vn-ticket-index a[ui-sref="ticket.create"]',
+        newTicketButton: 'vn-ticket-index vn-button[icon="add"]',
         searchResult: 'vn-ticket-index vn-card > vn-table > div > vn-tbody > a.vn-tr',
         firstTicketCheckbox: 'vn-ticket-index vn-tbody > a:nth-child(1) > vn-td:nth-child(1) > vn-check',
         secondTicketCheckbox: 'vn-ticket-index vn-tbody > a:nth-child(2) > vn-td:nth-child(1) > vn-check',

modules/ticket/front/create/card.js

@@ -101,7 +101,7 @@ class Controller extends Component {
 
             this.$http.get(`Agencies/getAgenciesWithWarehouse`, {params}).then(res => {
                 this.agencies = res.data;
-                const defaultAgency = this.agencies.find(agency=> {
+                const defaultAgency = this.agencies.find(agency => {
                     return agency.agencyModeFk == this.defaultAddress.agencyModeFk;
                 });
                 if (defaultAgency)

modules/ticket/front/index/index.html

@@ -166,7 +166,7 @@
             vn-tooltip="Payment on account..."
             tooltip-position="left">
         </vn-button>
-        <a ui-sref="ticket.create" vn-bind="+">
+        <a ui-sref="ticket.create($ctrl.clientParams())" vn-bind="+">
             <vn-button class="round md vn-mb-sm"
                 icon="add"
                 vn-tooltip="New ticket"

modules/ticket/front/index/index.js

@@ -151,6 +151,14 @@ export default class Controller extends Section {
 
         return [minHour, maxHour];
     }
+
+    clientParams() {
+        if (this.$params.q) {
+            const params = JSON.parse(this.$params.q);
+            if (params.clientFk) return {clientFk: params.clientFk};
+        }
+        return {};
+    }
 }
 Controller.$inject = ['$element', '$scope', 'vnReport'];