From 0ffbb5fe2c422dcbeb545e7621d31357e8b21aa3 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Mon, 30 Jan 2023 12:13:01 +0100
Subject: [PATCH] feat: actualizada visualizacion de datos

---
 modules/invoiceOut/front/global-invoicing/index.html    | 7 ++++---
 modules/invoiceOut/front/global-invoicing/index.js      | 8 +++++---
 modules/invoiceOut/front/global-invoicing/locale/es.yml | 1 +
 modules/invoiceOut/front/global-invoicing/style.scss    | 6 ++++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/modules/invoiceOut/front/global-invoicing/index.html b/modules/invoiceOut/front/global-invoicing/index.html
index 8f1e909e1..e2d918bf8 100644
--- a/modules/invoiceOut/front/global-invoicing/index.html
+++ b/modules/invoiceOut/front/global-invoicing/index.html
@@ -1,7 +1,8 @@
 <vn-card class="vn-w-lg vn-ma-md">
     <h5 ng-if="$ctrl.packageInvoicing" translate text-center class="vn-pa-md">{{'Calculating packages to invoice...'}}</h5>
     <vn-vertical ng-if="$ctrl.clients.length" text-center class="vn-pa-md">
-            <h5 translate>Invoicing</h5>
+            <h5 translate ng-if="$ctrl.percentage != 100">Invoicing</h5>
+            <h5 translate ng-if="$ctrl.percentage == 100">Ended process</h5>
             <div>
                 {{'Current client id' | translate}}: {{$ctrl.currentClientId}}
             </div>
@@ -31,7 +32,7 @@
                         {{::client.id}}
                     </span>
                 </vn-td>
-                <vn-td>
+                <vn-td expand>
                     {{::client.address.nickname}}
                 </vn-td>
                 <vn-td number>
@@ -40,7 +41,7 @@
                 <vn-td expand>
                     {{::client.address.street}}
                 </vn-td>
-                <vn-td expand>
+                <vn-td expand id="error">
                     <vn-spinner
                         ng-if="client.status == 'waiting'"
                         enable="true">
diff --git a/modules/invoiceOut/front/global-invoicing/index.js b/modules/invoiceOut/front/global-invoicing/index.js
index 4e46d7a81..09d5fba59 100644
--- a/modules/invoiceOut/front/global-invoicing/index.js
+++ b/modules/invoiceOut/front/global-invoicing/index.js
@@ -39,7 +39,7 @@ class Controller extends Section {
     }
 
     getPercentage() {
-        this.percentage = (this.currentClient * 100) / this.clients.length;
+        this.percentage = ((this.currentClient - 1) * 100) / this.clients.length;
     }
 
     restartValues() {
@@ -49,7 +49,10 @@ class Controller extends Section {
 
     invoiceOut(invoice, clientsAndAddresses) {
         const [clientAndAddress] = clientsAndAddresses;
-        if (!clientAndAddress) return;
+        if (!clientAndAddress) {
+            this.percentage = 100;
+            return;
+        }
 
         this.currentClientId = clientAndAddress.clientId;
         this.currentClient = ++this.currentClient;
@@ -113,7 +116,6 @@ class Controller extends Section {
 
                     return this.invoiceOut(invoice, clientsAndAddresses);
                 })
-                .then(() => this.vnApp.showSuccess(this.$t('Data saved!')))
                 .finally(() => this.restartValues());
         } catch (e) {
             this.vnApp.showError(this.$t(e.message));
diff --git a/modules/invoiceOut/front/global-invoicing/locale/es.yml b/modules/invoiceOut/front/global-invoicing/locale/es.yml
index 5a453e5b9..0c4cf14fc 100644
--- a/modules/invoiceOut/front/global-invoicing/locale/es.yml
+++ b/modules/invoiceOut/front/global-invoicing/locale/es.yml
@@ -17,4 +17,5 @@ of: de
 Client: Cliente
 Current client id: Id cliente actual
 Invoicing: Facturando
+Ended process: Proceso finalizado
 Invoice out: Facturar
diff --git a/modules/invoiceOut/front/global-invoicing/style.scss b/modules/invoiceOut/front/global-invoicing/style.scss
index ae50adf6e..6fdfac0ba 100644
--- a/modules/invoiceOut/front/global-invoicing/style.scss
+++ b/modules/invoiceOut/front/global-invoicing/style.scss
@@ -6,8 +6,10 @@ vn-invoice-out-global-invoicing{
         color: $color-primary;
     }
 
-    .vn-table vn-tbody > * > vn-td {
-        overflow: visible;
+    #error {
+        line-break: normal;
+        overflow-wrap: break-word;
+        white-space: normal;
     }
 
 }