From a2bbf4474d4a801ece1cb52d57f61f55ecfe2ebb Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 6 Nov 2024 13:52:59 +0100
Subject: [PATCH 1/2] fix(InvoiceOutGlobal): parallelism

---
 src/pages/InvoiceOut/InvoiceOutGlobalForm.vue |  7 ++--
 src/stores/invoiceOutGlobal.js                | 37 +++++++++----------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index 5bcb21001..e85f1f44c 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -13,7 +13,7 @@ const { t } = useI18n();
 const invoiceOutGlobalStore = useInvoiceOutGlobalStore();
 
 // invoiceOutGlobalStore state and getters
-const { initialDataLoading, formInitialData, invoicing, status } =
+const { initialDataLoading, formInitialData, status } =
     storeToRefs(invoiceOutGlobalStore);
 
 // invoiceOutGlobalStore actions
@@ -151,9 +151,8 @@ onMounted(async () => {
                 rounded
             />
         </div>
-
         <QBtn
-            v-if="!invoicing"
+            v-if="!getStatus || getStatus === 'stopping'"
             :label="t('invoiceOut')"
             type="submit"
             color="primary"
@@ -163,7 +162,7 @@ onMounted(async () => {
             dense
         />
         <QBtn
-            v-if="invoicing"
+            v-else
             :label="t('stop')"
             color="primary"
             class="q-mt-md full-width"
diff --git a/src/stores/invoiceOutGlobal.js b/src/stores/invoiceOutGlobal.js
index 42acac013..b17f41564 100644
--- a/src/stores/invoiceOutGlobal.js
+++ b/src/stores/invoiceOutGlobal.js
@@ -93,7 +93,7 @@ export const useInvoiceOutGlobalStore = defineStore({
 
         async makeInvoice(formData, clientsToInvoice) {
             this.invoicing = true;
-            this.status = 'packageInvoicing';
+            const promises = [];
             try {
                 this.printer = formData.printer;
                 const params = {
@@ -118,10 +118,11 @@ export const useInvoiceOutGlobalStore = defineStore({
                     );
                     throw new Error("There aren't addresses to invoice");
                 }
-
-                for (const address of this.addresses) {
-                    await this.invoiceClient(address, formData);
+                this.status = 'invoicing';
+                for (let index = 0; index < this.parallelism; index++) {
+                    promises.push(this.invoiceClient(formData, index));
                 }
+                await Promise.all(promises);
             } catch (err) {
                 this.handleError(err);
             }
@@ -171,17 +172,15 @@ export const useInvoiceOutGlobalStore = defineStore({
             }
         },
 
-        async invoiceClient(address, formData) {
+        async invoiceClient(formData, index) {
+            const address = this.addresses[index];
+            if (!address || !this.status || this.status == 'stopping') {
+                this.status = 'stopping';
+                this.invoicing = false;
+                return;
+            }
+            console.log('address: ', address);
             try {
-                if (this.nRequests === this.parallelism || this.isInvoicing) return;
-
-                if (this.status === 'stopping') {
-                    if (this.nRequests) return;
-                    this.invoicing = false;
-                    this.status = 'done';
-                    return;
-                }
-
                 const params = {
                     clientId: address.clientId,
                     addressId: address.id,
@@ -191,13 +190,11 @@ export const useInvoiceOutGlobalStore = defineStore({
                     serialType: formData.serialType,
                 };
 
-                this.status = 'invoicing';
                 this.invoicing = true;
 
                 const { data } = await axios.post('InvoiceOuts/invoiceClient', params);
 
                 if (data) await this.makePdfAndNotify(data, address);
-                this.addressIndex++;
                 this.isInvoicing = false;
             } catch (err) {
                 if (err?.response?.status >= 400 && err?.response?.status < 500) {
@@ -205,13 +202,16 @@ export const useInvoiceOutGlobalStore = defineStore({
                     return;
                 } else {
                     this.invoicing = false;
-                    this.status = 'done';
                     notify(
                         'invoiceOut.globalInvoices.errors.criticalInvoiceError',
                         'negative'
                     );
                     throw new Error('Critical invoicing error, process stopped');
                 }
+            } finally {
+                this.addressIndex++;
+                if (this.status != 'stopping')
+                    await this.invoiceClient(formData, this.addressIndex);
             }
         },
 
@@ -234,7 +234,6 @@ export const useInvoiceOutGlobalStore = defineStore({
 
         handleError(err) {
             this.invoicing = false;
-            this.status = null;
             throw err;
         },
 
@@ -279,7 +278,7 @@ export const useInvoiceOutGlobalStore = defineStore({
                 return 0;
             }
             let porcentaje = (state.addressIndex / this.getNAddresses) * 100;
-            return porcentaje;
+            return porcentaje?.toFixed(2);
         },
         getAddressNumber(state) {
             return state.addressIndex;

From ead241e7daa826608dfe522349f4691a06dbc2c9 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 6 Nov 2024 13:53:58 +0100
Subject: [PATCH 2/2] chore: remove console.log

---
 src/stores/invoiceOutGlobal.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/stores/invoiceOutGlobal.js b/src/stores/invoiceOutGlobal.js
index b17f41564..35f834f3d 100644
--- a/src/stores/invoiceOutGlobal.js
+++ b/src/stores/invoiceOutGlobal.js
@@ -179,7 +179,6 @@ export const useInvoiceOutGlobalStore = defineStore({
                 this.invoicing = false;
                 return;
             }
-            console.log('address: ', address);
             try {
                 const params = {
                     clientId: address.clientId,