From 663b5fb9aae6ecb19d3bb07d6f4517bd4f937b87 Mon Sep 17 00:00:00 2001
From: Carlos Jimenez Ruiz <jacarlosjimenezruiz@gmail.com>
Date: Fri, 3 Jul 2020 13:28:49 +0200
Subject: [PATCH 1/2] descriptor can now have 4 quicklinks

---
 front/salix/components/descriptor/index.js   |  3 ++-
 front/salix/components/descriptor/style.scss |  2 +-
 modules/ticket/front/descriptor/index.html   | 16 +++++++++++++++-
 modules/ticket/front/descriptor/index.js     |  6 ++++++
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/front/salix/components/descriptor/index.js b/front/salix/components/descriptor/index.js
index d87a4c3957..3d6dd1b3fa 100644
--- a/front/salix/components/descriptor/index.js
+++ b/front/salix/components/descriptor/index.js
@@ -94,7 +94,8 @@ ngModule.vnComponent('vnDescriptor', {
     transclude: {
         btnOne: '?btnOne',
         btnTwo: '?btnTwo',
-        btnThree: '?btnThree'
+        btnThree: '?btnThree',
+        btnFour: '?btnFour'
     }
 });
 
diff --git a/front/salix/components/descriptor/style.scss b/front/salix/components/descriptor/style.scss
index 03a9002d5f..3bddaaf441 100644
--- a/front/salix/components/descriptor/style.scss
+++ b/front/salix/components/descriptor/style.scss
@@ -88,7 +88,7 @@ vn-descriptor-content {
                         display: flex;
                         align-items: center;
                         justify-content: center;
-                        padding: 0 $spacing-md;
+                        padding: 10px 5px;
                         margin: 0 $spacing-sm;
 
                         & > vn-icon {
diff --git a/modules/ticket/front/descriptor/index.html b/modules/ticket/front/descriptor/index.html
index a82103f086..1ad27aac3e 100644
--- a/modules/ticket/front/descriptor/index.html
+++ b/modules/ticket/front/descriptor/index.html
@@ -146,6 +146,20 @@
                 </vn-quick-link>
             </div>
             <div ng-transclude="btnTwo">
+                <vn-quick-link
+                    tooltip="Client ticket list"
+                    state="['ticket.index', {q: $ctrl.filter}]"
+                    icon="icon-ticket">
+                </vn-quick-link>
+            </div>
+            <div ng-transclude="btnThree">
+                <vn-quick-link
+                    tooltip="New order"
+                    state="['order.create', {clientFk: $ctrl.ticket.clientFk}]"
+                    icon="icon-basketadd">
+                </vn-quick-link>
+            </div>
+            <div ng-transclude="btnFour">
                 <vn-quick-link
                     ng-if="$ctrl.ticket.stowaway"
                     tooltip="Ship stowaways"
@@ -153,7 +167,7 @@
                     icon="icon-stowaway">
                 </vn-quick-link>
             </div>
-            <div ng-transclude="btnThree">
+            <div ng-transclude="btnFour">
                 <vn-quick-link
                     ng-if="$ctrl.ticket.ship"
                     tooltip="Stowaway"
diff --git a/modules/ticket/front/descriptor/index.js b/modules/ticket/front/descriptor/index.js
index 7e002f1f61..7ce94f53d4 100644
--- a/modules/ticket/front/descriptor/index.js
+++ b/modules/ticket/front/descriptor/index.js
@@ -38,6 +38,12 @@ class Controller extends Descriptor {
         return this.ticket.stowaway || this.ticket.ship;
     }
 
+    get filter() {
+        if (this.ticket)
+            return JSON.stringify({clientFk: this.ticket.clientFk});
+        return null;
+    }
+
     isTicketEditable() {
         this.$http.get(`Tickets/${this.$state.params.id}/isEditable`).then(res => {
             this.isEditable = res.data;
-- 
2.40.1


From f2e1f00ae32778d968667fcd1eb6140553e1a905 Mon Sep 17 00:00:00 2001
From: Carlos Jimenez Ruiz <jacarlosjimenezruiz@gmail.com>
Date: Fri, 3 Jul 2020 16:43:45 +0200
Subject: [PATCH 2/2] using csss variables plus a traduction

---
 front/salix/components/descriptor/style.scss             | 2 +-
 print/templates/reports/claim-pickup-order/locale/es.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/front/salix/components/descriptor/style.scss b/front/salix/components/descriptor/style.scss
index 3bddaaf441..9649d61e5b 100644
--- a/front/salix/components/descriptor/style.scss
+++ b/front/salix/components/descriptor/style.scss
@@ -88,7 +88,7 @@ vn-descriptor-content {
                         display: flex;
                         align-items: center;
                         justify-content: center;
-                        padding: 10px 5px;
+                        padding: 0 $spacing-sm;
                         margin: 0 $spacing-sm;
 
                         & > vn-icon {
diff --git a/print/templates/reports/claim-pickup-order/locale/es.yml b/print/templates/reports/claim-pickup-order/locale/es.yml
index b37793b705..54990a05c2 100644
--- a/print/templates/reports/claim-pickup-order/locale/es.yml
+++ b/print/templates/reports/claim-pickup-order/locale/es.yml
@@ -11,5 +11,5 @@ clientSignature: Firma del cliente
 claim: Reclamación {0}
 sections:
   agency:
-    description: 'Para agilizar tu recogida, por favor, pónte en contacto con la oficina
+    description: 'Para agilizar su recogida, por favor, póngase en contacto con la oficina
       de integrados. <br/> Tlf: 96 166 77 88 - Ana Gómez (Ext. 2113) <em>(agomezf@integra2.es)</em>'
-- 
2.40.1