From d4a22f7962ae5b9333ce595d16e0e9059e6db900 Mon Sep 17 00:00:00 2001
From: Pau Navarro <pau@verdnatura.es>
Date: Thu, 27 Oct 2022 08:46:22 +0200
Subject: [PATCH] Apply requested changes

---
 .../ticket/front/descriptor-menu/index.html   | 37 +++++++++++++++++++
 modules/ticket/front/descriptor-menu/index.js | 17 +++++++++
 .../front/descriptor-menu/locale/es.yml       |  3 +-
 modules/ticket/front/descriptor/index.html    | 35 ------------------
 modules/ticket/front/descriptor/index.js      | 16 --------
 modules/ticket/front/descriptor/locale/es.yml |  1 -
 6 files changed, 56 insertions(+), 53 deletions(-)

diff --git a/modules/ticket/front/descriptor-menu/index.html b/modules/ticket/front/descriptor-menu/index.html
index ea84743bcd..0c04b42fb9 100644
--- a/modules/ticket/front/descriptor-menu/index.html
+++ b/modules/ticket/front/descriptor-menu/index.html
@@ -5,6 +5,13 @@
 
 <vn-menu vn-id="menu">
     <vn-list>
+        <vn-item
+            vn-acl="administrative"
+            vn-acl-action="remove"
+            ng-click="transferClient.show()"
+            translate>
+            Transfer client
+        </vn-item>
         <vn-item
             ng-click="addTurn.show()"
             vn-acl="buyer"
@@ -242,6 +249,36 @@
     </tpl-buttons>
 </vn-dialog>
 
+<!-- Transfer Client popup -->
+
+<vn-dialog 
+    vn-id="transferClient" 
+    title="transferClient"
+    size="sm"
+    on-accept="$ctrl.transferClient($client)">
+    <tpl-body>
+        <vn-autocomplete 
+            vn-one
+            vn-id="client"
+            required="true"
+            url="Clients"
+            label="Client"
+            show-field="name"
+            value-field="id"
+            search-function="{or: [{id: $search}, {name: {like: '%'+ $search +'%'}}]}"
+            ng-model="$ctrl.ticket.client.id"
+            initial-data="$ctrl.ticket.client.id"
+            order="id">
+                <tpl-item>
+                    #{{id}} - {{::name}}
+                </tpl-item>
+        </vn-autocomplete>
+    </tpl-body>
+    <tpl-buttons>
+        <button response="accept" translate>Transfer client</button>
+    </tpl-buttons>
+</vn-dialog>
+
 <!-- Send SMS popup -->
 <vn-ticket-sms
     vn-id="sms"
diff --git a/modules/ticket/front/descriptor-menu/index.js b/modules/ticket/front/descriptor-menu/index.js
index f73aae721b..e0e7ea849d 100644
--- a/modules/ticket/front/descriptor-menu/index.js
+++ b/modules/ticket/front/descriptor-menu/index.js
@@ -95,6 +95,23 @@ class Controller extends Section {
         });
     }
 
+    transferClient() {
+        this.$http.get(`Clients/${this.ticket.client.id}`).then(client => {
+            const ticket = this.ticket;
+
+            const params =
+            {
+                clientFk: client.data.id,
+                addressFk: client.data.defaultAddressFk,
+            };
+
+            this.$http.patch(`Tickets/${ticket.id}`, params).then(() => {
+                this.vnApp.showSuccess(this.$t('Data saved!'));
+                this.reload();
+            });
+        });
+    }
+
     isTicketEditable() {
         if (!this.ticket) return;
 
diff --git a/modules/ticket/front/descriptor-menu/locale/es.yml b/modules/ticket/front/descriptor-menu/locale/es.yml
index b65159a3c5..968c61f841 100644
--- a/modules/ticket/front/descriptor-menu/locale/es.yml
+++ b/modules/ticket/front/descriptor-menu/locale/es.yml
@@ -9,4 +9,5 @@ Send CSV Delivery Note: Enviar albarán en CSV
 Send PDF Delivery Note: Enviar albarán en PDF
 Show Proforma: Ver proforma
 Refund all: Abonar todo
-The following refund ticket have been created: "Se ha creado siguiente ticket de abono: {{ticketId}}"
\ No newline at end of file
+The following refund ticket have been created: "Se ha creado siguiente ticket de abono: {{ticketId}}"
+Transfer client: Transferir cliente
\ No newline at end of file
diff --git a/modules/ticket/front/descriptor/index.html b/modules/ticket/front/descriptor/index.html
index 89b5fde8c8..75bcd28015 100644
--- a/modules/ticket/front/descriptor/index.html
+++ b/modules/ticket/front/descriptor/index.html
@@ -93,44 +93,9 @@
                     icon="icon-basketadd">
                 </vn-quick-link>
             </div>
-            <div ng-transclude="btnFour">
-                <vn-quick-link
-                    vn-acl="administrative"
-                    vn-acl-action="remove"
-                    tooltip="Transfer client"
-                    icon="people"
-                    ng-click="transferClient.show()">
-                </vn-quick-link>
         </div>
     </slot-body>
 </vn-descriptor-content>
-<vn-dialog 
-    vn-id="transferClient" 
-    title="transferClient"
-    size="sm"
-    on-accept="$ctrl.transferClient($client)">
-    <tpl-body>
-        <vn-autocomplete 
-            vn-one
-            vn-id="client"
-            required="true"
-            url="Clients"
-            label="Client"
-            show-field="name"
-            value-field="id"
-            search-function="{or: [{id: $search}, {name: {like: '%'+ $search +'%'}}]}"
-            ng-model="$ctrl.ticket.client.id"
-            initial-data="$ctrl.ticket.client.id"
-            order="id">
-                <tpl-item>
-                    #{{id}} - {{::name}}
-                </tpl-item>
-        </vn-autocomplete>
-    </tpl-body>
-    <tpl-buttons>
-        <button response="accept" translate>Transfer client</button>
-    </tpl-buttons>
-</vn-dialog>
 <vn-worker-descriptor-popover 
     vn-id="workerDescriptor">
 </vn-worker-descriptor-popover>
diff --git a/modules/ticket/front/descriptor/index.js b/modules/ticket/front/descriptor/index.js
index f41e800a1c..28d5eb953e 100644
--- a/modules/ticket/front/descriptor/index.js
+++ b/modules/ticket/front/descriptor/index.js
@@ -69,22 +69,6 @@ class Controller extends Descriptor {
         // Prevents error when not defined
     }
 
-    transferClient() {
-        this.$http.get(`Clients/${this.ticket.client.id}`).then(client => {
-            const ticket = this.ticket;
-
-            let params =
-            {
-                clientFk: client.data.id,
-                addressFk: client.data.defaultAddressFk,
-            };
-
-            this.$http.patch(`Tickets/${ticket.id}`, params);
-
-            this.cardReload();
-        });
-    }
-
     get filter() {
         return this.ticket ?
             JSON.stringify({clientFk: this.ticket.clientFk}) : null;
diff --git a/modules/ticket/front/descriptor/locale/es.yml b/modules/ticket/front/descriptor/locale/es.yml
index 5152a711d6..bce9e62d7c 100644
--- a/modules/ticket/front/descriptor/locale/es.yml
+++ b/modules/ticket/front/descriptor/locale/es.yml
@@ -23,4 +23,3 @@ Restore ticket: Restaurar ticket
 You are going to restore this ticket: Vas a restaurar este ticket
 Are you sure you want to restore this ticket?: ¿Seguro que quieres restaurar el ticket?
 Are you sure you want to refund all?: ¿Seguro que quieres abonar todo?
-Transfer client: Transferir cliente
\ No newline at end of file