@freteclick/quasar-financial-ui 1.0.92 → 1.0.94

package/package.json

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

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

@@ -34,21 +34,16 @@
                     <td class="text-left text-bold">Número da fatura</td>
                     <td class="text-left">
                       {{
-                          `#${this.invoice["@id"].match(
-                            /^\/finance\/receive\/([a-z0-9-]*)$/
-                          )[1]
-                          }`
+                        `#${this.invoice["@id"].match(
+                          /^\/finance\/receive\/([a-z0-9-]*)$/
+                        )[1]
+                        }`
                       }}
 
                       <q-btn flat round dense color="positive" icon="autorenew" @click="confirm = true" />
                     </td>
                   </tr>
-                  <tr>
-                    <td class="text-left text-bold">Valor da fatura</td>
-                    <td class="text-left">
-                      {{ formatMoney(this.invoice.price) }}
-                    </td>
-                  </tr>
+
                   <tr>
                     <td class="text-left text-bold">Vencimento</td>
                     <td class="text-left">
@@ -59,6 +54,31 @@
                       </div>
                     </td>
                   </tr>
+
+                  <tr>
+                    <td class="text-left text-bold">Valor da fatura</td>
+                    <td class="text-left">
+                      {{ formatMoney(this.invoice.price) }}
+                    </td>
+                  </tr>
+
+                  <tr>
+                    <td class="text-left text-bold">Desconto</td>
+                    <td class="text-left">
+
+                      <EditInvoiceDiscount :discount="discount" :invoiceId="invoice['@id'] || ''"
+                        @saved="(data) => (discount = data)" />
+
+                    </td>
+                  </tr>
+
+                  <tr>
+                    <td class="text-left text-bold">Total a Pagar</td>
+                    <td class="text-left">
+                      {{ formatMoney(this.invoice.price) }}
+                    </td>
+                  </tr>
+
                 </tbody>
               </q-markup-table>
             </div>
@@ -74,12 +94,11 @@
             <div class="col-xs-12 text-h6 text-center">
               {{ $t(`invoice.statuses.${invoice.status.status}`) }}
             </div>
-            <InvoiceActions :invoice="invoice" @changed="
-              (newInvoice) => {
-                this.invoice = newInvoice;
-                this.$refs.invoiceBillet.refresh();
-              }
-            " />
+            <InvoiceActions :invoice="invoice" @changed="(newInvoice) => {
+              this.invoice = newInvoice;
+              this.$refs.invoiceBillet.refresh();
+            }
+              " />
           </div>
         </div>
       </div>
@@ -95,18 +114,17 @@
 
           <q-tab-panels v-model="currentTab">
             <q-tab-panel name="invoice" class="q-pa-none">
-              <InvoiceInvoice ref="invoiceBillet" :invoiceId="invoiceId" :orderId="orderId" @billetStatus="
-                (status) => {
-                  this.editDueDate = status.hasBillet === false;
-                }
-              " />
+              <InvoiceInvoice ref="invoiceBillet" :invoiceId="invoiceId" :orderId="orderId" @billetStatus="(status) => {
+                this.editDueDate = status.hasBillet === false;
+              }
+                " />
             </q-tab-panel>
 
             <q-tab-panel name="orders" class="q-pa-none">
               <InvoiceOrders :invoiceId="invoiceId" :invoice="{
                 '@id': invoice ? invoice['@id'] : null,
                 status: invoice ? invoice.status.realStatus : null,
-                billet: editDueDate ? false : true,
+                billet: editDueDate = true,
               }" />
             </q-tab-panel>
           </q-tab-panels>
@@ -136,6 +154,8 @@ import {
 import EditInvoiceDuedate from "@freteclick/quasar-common-ui/src/components/common/EditInvoiceDuedate.vue";
 import InvoiceActions from "@freteclick/quasar-common-ui/src/components/common/InvoiceActions.vue";
 import InvoiceEditActions from "@freteclick/quasar-common-ui/src/components/common/InvoiceEditActions.vue";
+import EditInvoiceDiscount from "@freteclick/quasar-common-ui/src/components/common/EditInvoiceDiscount.vue";
+
 
 export default {
   components: {
@@ -144,6 +164,7 @@ export default {
     EditInvoiceDuedate,
     InvoiceActions,
     InvoiceEditActions,
+    EditInvoiceDiscount,
   },
 
   created() {
@@ -152,6 +173,7 @@ export default {
 
     if (this.myCompany !== null && this.invoiceId !== null) {
       this.requestInvoice(this.invoiceId);
+      this.requestInvoiceDiscount(this.invoiceId);
     }
   },
 
@@ -162,6 +184,7 @@ export default {
       invoiceId: null,
       orderId: null,
       invoice: null,
+      discount: null,
       isLoading: false,
       editDueDate: false,
       notFound: false,
@@ -184,6 +207,7 @@ export default {
     myCompany(company) {
       if (company !== null) {
         this.requestInvoice(this.invoiceId);
+        this.requestInvoiceDiscount(this.invoiceId);
       }
     },
   },
@@ -191,6 +215,7 @@ export default {
   methods: {
     ...mapActions({
       getInvoice: "receiveInvoice/getInvoice",
+      getInvoiceDiscount: "receiveInvoice/getInvoiceDiscount",
       renewInvoice: "receiveInvoice/renewInvoice",
     }),
 
@@ -226,6 +251,27 @@ export default {
           this.notFound = true;
         });
     },
+
+
+    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;
 
@@ -278,4 +324,4 @@ export default {
     },
   },
 };
-</script>
+</script>

package/src/store/modules/invoice/receive/actions.js

@@ -63,6 +63,13 @@ export const getInvoice = ({ commit }, { invoiceId, params }) => {
         });
 };
 
+export const getInvoiceDiscount = ({ commit }, { invoiceId, params }) => {
+  return fetch(`/discounts?type=invoice&invoiceId=${invoiceId}`)
+      .then(response => response.json())
+      .then(data => {
+          return data;
+      });
+};
 
 export const renewInvoice = ({ commit }, { invoiceId, params }) => {
 
@@ -143,6 +150,23 @@ export const updateInvoiceDuedate = ({ commit }, { id, dueDate, params }) => {
         });
 };
 
+export const updateInvoiceDuedateApiSicred = ({commit}, {id, dueDate, params}) => {
+  let options = {
+    method: 'PUT',
+    body: JSON.stringify({ dueDate }),
+    params: params
+  };
+
+  return fetch(`${id}`, options)
+    .then(response => response.json())
+    .then(invoice => {
+        if (invoice['@id'])
+            return invoice;
+
+        return null;
+  });
+}
+
 export const deleteInvoiceOrder = ({ commit }, { invoiceId, orderId, params }) => {
     let options = {
         method: 'PUT',