@freteclick/quasar-financial-ui 1.0.94 → 1.0.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freteclick/quasar-financial-ui",
-  "version": "1.0.94",
+  "version": "1.0.95",
   "author": "FreteClick",
   "description": "FreteClick financial Quasar UI Component",
   "license": "MIT",

package/src/components/invoice/receive/InvoiceDetails.vue

@@ -66,15 +66,23 @@
                     <td class="text-left text-bold">Desconto</td>
                     <td class="text-left">
 
-                      <EditInvoiceDiscount :discount="discount" :invoiceId="invoice['@id'] || ''"
-                        @saved="(data) => (discount = data)" />
+                      <EditInvoiceDiscount v-if="discount" :discount="discount" :invoiceId="invoice['@id'] || ''"
+                        @saved="requestInvoice(invoiceId)" />
+
+                      <div v-else>
+                        <EditInvoiceDiscount :discount="discount" :invoiceId="invoice['@id'] || ''"
+                        @saved="requestInvoice(invoiceId)" />
+                      </div>
 
                     </td>
                   </tr>
 
                   <tr>
                     <td class="text-left text-bold">Total a Pagar</td>
-                    <td class="text-left">
+                    <td class="text-left" v-if="discount">
+                      {{ formatMoney(this.invoice.realPrice) }}
+                    </td>
+                    <td class="text-left" v-else>
                       {{ formatMoney(this.invoice.price) }}
                     </td>
                   </tr>
@@ -121,11 +129,11 @@
             </q-tab-panel>
 
             <q-tab-panel name="orders" class="q-pa-none">
-              <InvoiceOrders :invoiceId="invoiceId" :invoice="{
+              <!-- <InvoiceOrders :invoiceId="invoiceId" :invoice="{
                 '@id': invoice ? invoice['@id'] : null,
                 status: invoice ? invoice.status.realStatus : null,
                 billet: editDueDate = true,
-              }" />
+              }" /> -->
             </q-tab-panel>
           </q-tab-panels>
         </div>
@@ -173,7 +181,7 @@ export default {
 
     if (this.myCompany !== null && this.invoiceId !== null) {
       this.requestInvoice(this.invoiceId);
-      this.requestInvoiceDiscount(this.invoiceId);
+      // this.requestInvoiceDiscount(this.invoiceId);
     }
   },
 
@@ -207,15 +215,15 @@ export default {
     myCompany(company) {
       if (company !== null) {
         this.requestInvoice(this.invoiceId);
-        this.requestInvoiceDiscount(this.invoiceId);
+        // this.requestInvoiceDiscount(this.invoiceId);
       }
     },
   },
 
   methods: {
     ...mapActions({
-      getInvoice: "receiveInvoice/getInvoice",
       getInvoiceDiscount: "receiveInvoice/getInvoiceDiscount",
+      getInvoice: "receiveInvoice/getInvoice",
       renewInvoice: "receiveInvoice/renewInvoice",
     }),
 
@@ -252,26 +260,6 @@ export default {
         });
     },
 
-
-    async requestInvoiceDiscount(invoiceId) {
-      try {
-        this.isLoading = true;
-
-        const data = await this.getInvoiceDiscount({ invoiceId });
-
-        this.isLoading = false;
-
-        if (data["hydra:member"]) {
-          this.discount = data["hydra:member"][0];
-        }
-      } catch (error) {
-        this.isLoading = false;
-        this.discount = null;
-      }
-    },
-
-
-
     requestInvoice(invoiceId) {
       if (this.isLoading) return;
 
@@ -285,6 +273,8 @@ export default {
         .then((data) => {
           this.isLoading = false;
 
+          this.requestInvoiceDiscount(invoiceId);
+
           if (data["@id"]) {
             this.invoice = data;
             this.notFound = false;
@@ -322,6 +312,29 @@ export default {
           this.notFound = true;
         });
     },
+
+    // consulta descontos para esta fatura
+    requestInvoiceDiscount(invoiceId) {
+        // if (this.isLoading) return;
+
+        this.isLoading = true;
+
+        this.getInvoiceDiscount({ invoiceId })
+        .then((data) => {
+
+          this.isLoading = false;
+
+          if (data["hydra:member"]) {
+            this.discount = data["hydra:member"][0];
+          }
+
+        })
+        .catch((error) => {
+            this.isLoading = false;
+            this.discount = null;
+        })
+    },
+
   },
 };
 </script>