Merge branch '1975-delivery_note_tags' of verdnatura/salix into dev

front/salix/components/layout/style.scss

@@ -87,8 +87,7 @@ vn-layout {
         & > * {
             display: block;
             padding: $spacing-md;
-            box-sizing: border-box;
+            box-sizing: border-box
-            height: 100%
         }
         &.ng-enter {
             vn-side-menu {

front/salix/components/module-card/style.scss

@@ -2,4 +2,5 @@
 
 .vn-module-card {
     padding: 0;
+    height: 100%
 }

front/salix/components/module-main/style.scss

@@ -2,4 +2,5 @@
 
 .vn-module-main {
     padding: 0;
+    height: 100%
 }

modules/claim/front/index.js

@@ -10,4 +10,4 @@ import './descriptor';
 import './development';
 import './search-panel';
 import './summary';
-import './dms/index';
+import './photos';

modules/claim/front/photos/index.js

@@ -1,4 +1,4 @@
-import ngModule from '../../module';
+import ngModule from '../module';
 import './style.scss';
 
 class Controller {
@@ -108,7 +108,7 @@ class Controller {
 
 Controller.$inject = ['$stateParams', '$scope', '$http', '$translate', 'vnToken', 'vnApp', 'vnConfig'];
 
-ngModule.component('vnClaimDmsIndex', {
+ngModule.component('vnClaimPhotos', {
     template: require('./index.html'),
     controller: Controller,
     bindings: {

modules/claim/front/photos/index.spec.js

@@ -2,7 +2,7 @@ import './index';
 import crudModel from 'core/mocks/crud-model';
 
 describe('Claim', () => {
-    describe('Component vnClaimDmsIndex', () => {
+    describe('Component vnClaimPhotos', () => {
         let $componentController;
         let $scope;
         let $httpBackend;
@@ -16,7 +16,7 @@ describe('Claim', () => {
             $httpParamSerializer = _$httpParamSerializer_;
             $httpBackend = _$httpBackend_;
             $scope = $rootScope.$new();
-            controller = $componentController('vnClaimDmsIndex', {$: $scope});
+            controller = $componentController('vnClaimPhotos', {$: $scope});
             controller.$.model = crudModel;
             controller.claim = {
                 id: 1,

modules/claim/front/photos/style.scss

@@ -0,0 +1,32 @@
+@import "./variables";
+
+vn-claim-photos {
+    height: 100%;
+
+    .drop-zone {
+        color: $color-font-secondary;
+        box-sizing: border-box;
+        border-radius: 0.5em;
+        text-align: center;
+        min-height: 100%;
+        
+        .empty-rows {
+            padding: 5em $spacing-md;
+            font-size: 1.4em
+        }
+
+        vn-icon {
+            font-size: 3em
+        }
+    }
+
+    .photo-list {
+        padding: $spacing-md;
+        min-height: 100%;
+
+        .photo {
+            width: 32em;
+            height: 18em;
+        }
+    }
+}

modules/claim/front/routes.json

@@ -11,7 +11,7 @@
         "card": [
             {"state": "claim.card.basicData", "icon": "settings"},
             {"state": "claim.card.detail", "icon": "icon-details"},
-            {"state": "claim.card.dms.index", "icon": "image"},
+            {"state": "claim.card.photos", "icon": "image"},
             {"state": "claim.card.development", "icon": "icon-traceability"},
             {"state": "claim.card.action", "icon": "icon-actions"}
         ]
@@ -81,14 +81,9 @@
             },
             "acl": ["salesAssistant"]
         }, {
-            "url": "/dms",
+            "url": "/photos",
-            "state": "claim.card.dms",
+            "state": "claim.card.photos",
-            "abstract": true,
+            "component": "vn-claim-photos",
-            "component": "ui-view"
-        }, {
-            "url" : "/index",
-            "state": "claim.card.dms.index",
-            "component": "vn-claim-dms-index",
             "description": "Photos",
             "params": {
                 "claim": "$ctrl.claim"

modules/client/front/sms/index.html

@@ -2,22 +2,24 @@
     vn-id="SMSDialog"
     on-response="$ctrl.onResponse($response)">
     <tpl-body>
-        <h5 class="vn-py-sm" translate>Send SMS</h5>
+        <section class="SMSDialog">
-        <vn-horizontal>
+            <h5 class="vn-py-sm" translate>Send SMS</h5>
-            <vn-textfield
+            <vn-horizontal>
-                vn-one
+                <vn-textfield
-                label="Destination"
+                    vn-one
-                ng-model="$ctrl.sms.destination">
+                    label="Destination"
-            </vn-textfield>
+                    ng-model="$ctrl.sms.destination">
-        </vn-horizontal>
+                </vn-textfield>
-        <vn-horizontal >
+            </vn-horizontal>
-            <vn-textarea
+            <vn-horizontal >
-                vn-one
+                <vn-textarea vn-one
-                label="Message" 
+                    label="Message" 
-                ng-model="$ctrl.sms.message"
+                    ng-model="$ctrl.sms.message"
-                rule>
+                    rows="5"
-            </vn-textarea>
+                    rule>
-        </vn-horizontal>
+                </vn-textarea>
+            </vn-horizontal>
+        </section>
     </tpl-body>
     <tpl-buttons>
         <input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>

modules/client/front/sms/style.scss

@@ -1,7 +1,5 @@
 @import "variables";
 
-vn-client-sms {
+.SMSDialog {
-    textarea {
+    min-width: 25em
-        height: 8em
-    }
 }

modules/ticket/front/descriptor/locale/es.yml

@@ -13,9 +13,7 @@ Send Delivery Note: Enviar albarán
 Show pallet report: Ver hoja de pallet
 Change shipped hour: Cambiar hora de envío
 Shipped hour: Hora de envío
-SMSPayment: >-
+SMSPayment: "Verdnatura le comunica:\rSu pedido está pendiente de pago.\rPor favor, entre en la página web y efectue el pago con tarjeta.\rMuchas gracias."
-  Verdnatura le comunica: Su pedido está pendiente de pago. 
-  Por favor, entre en la página web y efectue el pago con tarjeta. Muchas gracias.
 Ticket invoiced: Ticket facturado
 Make invoice: Crear factura
 Regenerate invoice: Regenerar factura

modules/ticket/front/sale/locale/es.yml

@@ -24,9 +24,7 @@ Sales to transfer: Líneas a transferir
 Destination ticket: Ticket destinatario
 Change ticket state to 'Ok': Cambiar estado del ticket a 'Ok'
 Reserved: Reservado
-SMSAvailability: >-
+SMSAvailability: "Verdnatura le comunica:\rPedido {{ticketFk}} día {{created | date: 'dd/MM/yyyy'}}.\r{{notAvailables}} no disponible/s.\rDisculpe las molestias."
-    Verdnatura le comunica: Pedido {{ticketFk}} día {{created | date: "dd/MM/yyyy"}}. 
-    {{notAvailables}} no disponible/s. Disculpe las molestias.
 Continue anyway?: ¿Continuar de todas formas?
 This ticket is now empty: El ticket ha quedado vacio
 Do you want to delete it?: ¿Quieres eliminarlo?