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

client/ticket/routes.json

@@ -37,7 +37,13 @@
         {
             "url" : "/data",
             "state": "ticket.card.data",
-            "component": "vn-ticket-data",
+            "component": "ui-view",
+            "abstract": true            
+        },
+        {
+            "url" : "/step-one",
+            "state": "ticket.card.data.stepOne",
+            "component": "vn-ticket-data-step-one",
             "params": {
                 "ticket": "$ctrl.ticket"
             },
@@ -46,6 +52,16 @@
                 "icon": "settings"
             }
         },
+        {
+            "url" : "/step-two",
+            "state": "ticket.card.data.stepTwo",
+            "component": "vn-ticket-data-step-two"
+        },
+        {
+            "url" : "/step-three",
+            "state": "ticket.card.data.stepThree",
+            "component": "vn-ticket-data-step-three"
+        },
         {
             "url": "/observation",
             "state": "ticket.card.observation",

client/ticket/src/data/step-one/step-one.html

@@ -0,0 +1,54 @@
+<form name="form" ng-submit="$ctrl.onSubmit()" ng-cloak>
+    <vn-card pad-large>
+        <vn-title>Basic data</vn-title>
+        <vn-horizontal>
+            <vn-autocomplete vn-one
+                url="/api/Clients"
+                label="Client"
+                show-field="name"
+                value-field="id"
+                field="$ctrl.ticket.clientFk"
+                initial-data="$ctrl.ticket.clientFk">
+            </vn-autocomplete>
+            <vn-autocomplete vn-one
+                url="/api/Addresses"
+                label="Address"
+                show-field="nickname"
+                value-field="id"
+                field="$ctrl.ticket.addressFk"
+                initial-data="$ctrl.ticket.addressFk">
+            </vn-autocomplete>
+            <vn-autocomplete vn-one
+                url="/api/AgencyModes/active"
+                label="Agency"
+                show-field="name"
+                value-field="id"
+                field="$ctrl.ticket.agencyModeFk"
+                initial-data="$ctrl.ticket.agencyModeFk">
+            </vn-autocomplete>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-date-picker vn-one 
+                label="Shipment" 
+                model="$ctrl.ticket.shipped"
+                ini-options="{enableTime: true, dateFormat: 'd-m-Y h:i', time_24hr: true}">
+            </vn-date-picker>
+            <vn-date-picker vn-one 
+                label="Landing" 
+                model="$ctrl.ticket.landed"
+                ini-options="{enableTime: true, dateFormat: 'd-m-Y h:i', time_24hr: true}">
+            </vn-date-picker>
+            <vn-autocomplete vn-one
+                url="/api/Companies"
+                label="Company"
+                show-field="code"
+                value-field="id"
+                field="$ctrl.ticket.companyFk"
+                initial-data="$ctrl.ticket.companyFk">
+            </vn-autocomplete>
+        </vn-horizontal>
+    </vn-card>
+    <vn-button-bar>
+            <vn-submit label="Next"></vn-submit>
+    </vn-button-bar>
+</form>

client/ticket/src/data/step-one/step-one.js

@@ -0,0 +1,22 @@
+import ngModule from '../../module';
+
+class Controller {
+    constructor($scope, $timeout, $state) {
+        this.$scope = $scope;
+        this.$timeout = $timeout;
+        this.$state = $state;
+    }
+    onSubmit() {
+        this.$state.go('ticket.card.data.stepTwo');
+    }
+}
+
+Controller.$inject = ['$scope', '$timeout', '$state'];
+
+ngModule.component('vnTicketDataStepOne', {
+    template: require('./step-one.html'),
+    bindings: {
+        ticket: '<'
+    },
+    controller: Controller
+});

client/ticket/src/locale/es.yml

@@ -1,29 +1,37 @@
+#Ordenar alfabeticamente
+Address: Consignatario
+Agency: Agencia
 Amount: Importe
 Basic data: Datos básicos
-Description: Descripción
+Checked: Comprobado
-Discount: Descuento
+Client: Cliente
-Item: Articulo
+Company: Empresa
+Counter: Contador
+Date : Fecha
 Delete: Borrar
 delete expedition: borrar expedición
+Description: Descripción
+Discount: Descuento
+Employee : Empleado
 Expedition: Expedición
+Item: Articulo
 Name: Nombre
-Package type: Tipo de porte
+New : Nuevo
-Counter: Contador
+New state: Nuevo estado
-Checked: Comprobado
-Worker: Trabajador
 Notes: Notas
+Landing: Llegada
 Observation type: Tipo de observación
+Package type: Tipo de porte
 Price: Precio
 Quantity: Cantidad
 Sale: Lineas del pedido
+Sale Checked: Control clientes
+Shipment: Salida
+Next: Siguiente
 Some fields are invalid: Algunos campos no son válidos
+State: Estado
 The observation type must be unique: El tipo de observación debe ser único
 Tickets: Tickets
-Date : Fecha
-Employee : Empleado
-State: Estado
 Tracking: Revisión
+Worker: Trabajador
 Created : Añadido
-New : Nuevo
-New state: Nuevo estado
-Sale Checked: Control clientes

client/ticket/src/ticket.js

@@ -4,7 +4,9 @@ import './list/ticket-list';
 import './create/ticket-create';
 import './card/ticket-card';
 import './summary/ticket-summary';
-import './data/ticket-data';
+import './data/step-one/step-one';
+import './data/step-two/step-two';
+import './data/step-three/step-three';
 import './note/ticket-observation';
 import './expedition/ticket-expedition';
 import './volume/ticket-volume';

package.json

@@ -19,7 +19,7 @@
     "fs-extra": "^5.0.0",
     "material-design-lite": "^1.3.0",
     "mg-crud": "^1.1.2",
-    "npm": "^5.7.1",
+    "npm": "^5.8.0",
     "oclazyload": "^0.6.3",
     "require-yaml": "0.0.1",
     "validator": "^6.2.1"

services/client/server/model-config.json

@@ -8,9 +8,6 @@
   "ClientObservation": {
     "dataSource": "vn"
   },
-  "Company": {
-    "dataSource": "vn"
-  },
   "Greuge": {
     "dataSource": "vn"
   },

services/loopback/server/model-config.json

@@ -39,6 +39,9 @@
   "ClientCreditLimit": {
     "dataSource": "vn"
   },
+  "Company": {
+    "dataSource": "vn"
+  },
   "ContactChannel": {
     "dataSource": "vn"
   },