@freteclick/quasar-financial-ui 1.0.97 → 1.0.99

package/package.json

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

package/src/components/invoice/client/details/InvoiceInvoice.vue

@@ -1,27 +1,70 @@
 <template>
   <div class="row items-center justify-center">
     <div class="flex flex-center" v-if="isLoading">
-      <q-circular-progress :indeterminate="isLoading"
-        size ="sm"
+      <q-circular-progress
+        :indeterminate="isLoading"
+        size="sm"
         color="primary"
         class="q-ma-md"
       />
       Carregando...
     </div>
 
-    <!-- BILLET VIEWER -->
+    <div :class="showInfoBox ? 'full-width q-pa-lg' : 'hidden'">
+      <div class="q-pa-md q-gutter-sm">
+        <q-banner inline-actions rounded class="bg-primary text-white text-center">
+          <h6>Este boleto não pode ser gerado agora, pois a fatura está em aberto.</h6>
+        </q-banner>
+      </div>
+    </div>
+
+    <!-- BILLET VIEWER SICRED -->
+    <div :class="showBilletSicred ? 'full-width q-pa-lg' : 'hidden'">
+      <div class="col-12 q-pt-lg" v-if="paymentInstitution === 'sicred'">
+        <!-- <div class="row justify-center items-center">
+          <q-btn
+              icon="money"
+              size="lg"
+              color="primary"
+              label="Abrir Boleto Pix"
+              :loading="isLoadingDownload"
+              @click="clickDownloadBilletSicred()"
+              :disable="isPaid"
+          />
+        </div> -->
+
+        <div style="height: 1200px">
+            <iframe
+                :src="invoiceUrlSicred"
+                name="BILLETINTER" id="billet_sicred" width="100%" height="100%" frameBorder="0">
+              <p>This browser does not support IFrame.</p>
+            </iframe>
+          </div>
+      </div>
+    </div>
+
+    <!-- BILLET VIEWER INTER -->
+    <div :class="showBilletInter ? 'full-width q-pa-lg' : 'hidden'">
+      <div style="height: 1200px">
+        <iframe
+            :src="invoiceUrlInter"
+            name="BILLETINTER" id="billet_inter" width="100%" height="100%" frameBorder="0">
+          <p>This browser does not support IFrame.</p>
+        </iframe>
+      </div>
+    </div>
 
+    <!-- BILLET VIEWER ITAU -->
     <div :class="showBillet ? 'full-width q-pa-lg' : 'hidden'">
       <q-form
-        ref    ="myForm"
-        :action="payment !== null ? payment.invoiceUrl : ''"
-        method ="post"
-        class  ="q-mt-sm row justify-center items-center"
-        target ="BILLET"
+          ref="myForm"
+          :action="payment !== null ? payment.invoiceUrl : ''"
+          method="post"
+          class="q-mt-sm row justify-center items-center"
+          target="BILLET"
       >
-        <input type="hidden" name="DC" :value="itauHash" />
+        <input type="hidden" name="DC" :value="itauHash"/>
       </q-form>
-
       <div style="height: 1200px">
         <iframe name="BILLET" width="100%" height="100%" frameBorder="0">
           <p>This browser does not support IFrame.</p>
@@ -30,41 +73,44 @@
     </div>
 
     <!-- BILLET GENERATOR TRIGGER -->
-
-    <div class="col-12 q-pt-lg" v-if="paymentIsPending && billetMustBeCreated">
-      <div
-        style="min-height: 80vh;"
-        class="row justify-center items-center"
-      >
+    <div class="col-12 q-pt-lg" v-if="paymentIsPending && billetMustBeCreated && paymentInstitution === 'itau'">
+      <div style="min-height: 80vh;" class="row justify-center items-center">
+        <q-btn
+            icon="money"
+            size="lg"
+            color="primary"
+            label="Gerar boleto"
+            :loading="retrievingHash"
+            @click="() => {
+            this.retrievingHash = true;
+            this.getItauHash().then(hash => {
+                if (hash !== null) {
+                  this.loadOnFocus = true;
+                  this.$refs.billetForm.$el.submit();
+                }
+              }).finally(() => {
+                this.retrievingHash = false;
+              });
+          }"
+            :disable="isPaid"
+        />
         <q-form
-          :action="payment ? payment.invoiceUrl : ''"
-          method ="post"
-          target ="_blank"
+            ref="billetForm"
+            :action="payment ? payment.invoiceUrl : ''"
+            method="post"
+            target="_blank"
         >
-          <input type="hidden" name="DC" :value="itauHash" />
-          <q-btn
-            type    ="submit"
-            icon    ="money"
-            size    ="lg"
-            color   ="primary"
-            label   ="Gerar boleto"
-            @click  ="loadOnFocus = true"
-            :disable="isPaid"
-          />
+          <input type="hidden" name="DC" :value="itauHash"/>
         </q-form>
       </div>
     </div>
 
     <!-- PAID MESSAGE -->
-
     <div class="col-12" v-if="payment !== null && isPaid">
-      <div 
-        class="row items-center justify-center"
-        style="min-height: 90vh;"
-      >
+      <div class="row items-center justify-center" style="min-height: 90vh;">
         <q-banner class="text-white bg-positive text-center text-h3" rounded>
           <template v-slot:avatar>
-            <q-icon name="thumb_up" color="white" />
+            <q-icon name="thumb_up" color="white"/>
           </template>
           O boleto foi pago
         </q-banner>
@@ -74,23 +120,26 @@
 </template>
 
 <script>
-import { date, extend }           from 'quasar';
-import { mapActions, mapGetters } from 'vuex';
+import {mapActions, mapGetters} from 'vuex';
+import axios from 'axios';
+import {ENTRYPOINT} from '@freteclick/../../src/config/entrypoint';
 
 export default {
   props: {
     invoiceId: {
-      type    : String,
+      type: String,
       required: true,
     },
-    orderId  : {
-      type    : String,
+    orderId: {
+      type: String,
       required: true,
     },
   },
 
+  components: {},
+
   mounted() {
-    window.addEventListener   ('focus', this.loadItauDataOnFocus);
+    window.addEventListener('focus', this.loadItauDataOnFocus);
   },
 
   beforeDestroy() {
@@ -103,12 +152,20 @@ export default {
 
   data() {
     return {
-      isLoading  : false,
-      payment    : null,
-      isPaid     : false,
-      itauHash   : null,
-      showBillet : false,
+      invoiceUrlInter: null,
+      invoiceUrlSicred: null,
+      showBilletInter: null,
+      showBilletSicred: null,
+      showInfoBox: null,
+      isLoadingDownload: false,
+      isLoading: false,
+      payment: null,
+      isPaid: false,
+      itauHash: null,
+      showBillet: false,
       loadOnFocus: false,
+      retrievingHash: false,
+      paymentInstitution: null
     };
   },
 
@@ -116,27 +173,24 @@ export default {
     ...mapGetters({
       myCompany: 'people/currentCompany',
     }),
-
     paymentIsPending() {
       if (this.payment === null)
         return false;
 
-      return ['waiting payment', 'outdated billing']
-        .includes(this.payment.status);
+      return this.payment.invoiceRealStatus === 'pending';
     },
-
     billetMustBeCreated() {
       if (this.payment === null)
         return false;
 
-      return this.payment.paymentType == 'choose_pending';
+      return this.payment.paymentType === 'choose_pending' || this.payment.paymentStatus !== 'paid';
     },
   },
 
   watch: {
     myCompany(company) {
       if (company !== null) {
-        this.getPaymentStatus();
+        this.$router.push("/finance/receive");
       }
     },
 
@@ -144,28 +198,57 @@ export default {
       if (!data)
         return;
 
-      if (data.paymentType == 'choose_pending' || data.paymentStatus == 'no_finished') {
-        this.isPaid = false;        
-        this.getItauHash();
+      this.isPaid = data.paymentStatus === 'paid';
+
+      if(this.payment.paymentStatus === 'open')
+      {
+        this.showInfoBox = true;
       }
-      else {
-        if (data.paymentType == 'billet') {
-          if (data.paymentStatus == 'paid')
-            this.isPaid = true;
-          else {
-            this.isPaid = false;
 
-            if (data.paymentStatus == 'created')
-              this.getItauHash()
-                .then(hash => {
-                  if (hash !== null)
-                    this.showBillet = true;
-                });
-            else
-              this.showBillet = false;
+      if (data.paymentType == 'billet') {
+
+        if (data.paymentStatus !== 'open') {
+
+          this.showInfoBox = false;
+
+          if (this.paymentInstitution === 'itau') {
+            this.getItauHash().then(hash => {
+              if (hash !== null) {
+                this.showBillet = true;
+              }
+            });
+
+          } else if(this.paymentInstitution === 'inter') {
+
+            this.showBillet = false;
+            let urlTmp = ENTRYPOINT + `/vendor/pdf.js/web/viewer.html?file=/finance/${this.invoiceId}/download?timestamp${new Date().getTime()}`;
+            this.invoiceUrlInter = urlTmp;
+            this.isLoading = false;
+            this.showBilletInter = true;
+
           }
+          else {
+
+            this.showBillet = false;
+            let urlTmp = ENTRYPOINT + `/vendor/pdf.js/web/viewer.html?file=/finance/${this.invoiceId}/bank/sicred/download?timestamp${new Date().getTime()}`;
+            // let urlTmp = ENTRYPOINT + `/download?invoiceUrl=${this.payment.invoiceUrl}`;
+            this.invoiceUrlSicred = urlTmp;
+            this.isLoading = false;
+            this.showBilletSicred = true;
+
+            }
         }
+
       }
+
+      this.$emit(
+          'billetStatus',
+          {
+            hasBillet: data.paymentType === 'billet' && data.paymentStatus === 'created',
+            isPaid: data.paymentStatus === 'paid'
+          }
+      );
+
     },
 
     showBillet(show) {
@@ -177,73 +260,198 @@ export default {
 
   methods: {
     ...mapActions({
-      getItauData: 'payInvoice/bankItau',
+      getItauData: 'receiveInvoice/bankItau',
+      getInterData: 'receiveInvoice/bankInter',
+      getSicredData: 'receiveInvoice/bankSicred',
+      getBankPerInvoiceId: 'receiveInvoice/getBankPerInvoiceId',
     }),
 
+    mountInvoiceUrlInter() {
+      let invoiceUrl = encodeURIComponent(this.payment.invoiceUrl);
+      return axios({
+        url: ENTRYPOINT + `/download?invoiceUrl=${invoiceUrl}&timestamp=${new Date().getTime()}`,
+        method: 'get',
+        responseType: 'blob'
+      }).then((response) => {
+        let blob = new Blob([response.data], {type: 'application/pdf'}), url = window.URL.createObjectURL(blob);
+        return url;
+      });
+    },
+
+    clickDownloadBilletInter() {
+      let urlTmp = ENTRYPOINT + `/vendor/pdf.js/web/viewer.html?file=/finance/${this.invoiceId}/download?timestamp${new Date().getTime()}`;
+      window.open(urlTmp);
+    },
+
+    mountInvoiceUrlSicred() {
+      let invoiceUrl = encodeURIComponent(this.payment.invoiceUrl);
+      return axios({
+        url: ENTRYPOINT + `/download?invoiceUrl=${invoiceUrl}&timestamp=${new Date().getTime()}`,
+        method: 'get',
+        responseType: 'blob'
+      }).then((response) => {
+        let blob = new Blob([response.data], {type: 'application/pdf'}), url = window.URL.createObjectURL(blob);
+
+        console.log(url);
+
+        return url;
+      });
+    },
+
+    clickDownloadBilletSicred() {
+      let urlTmp = ENTRYPOINT + `/download?invoiceUrl=${this.payment.invoiceUrl}`;
+      window.open(urlTmp);
+    },
+
+    getBank() {
+      return this.getBankPerInvoiceId({
+        invoiceId: this.invoiceId
+      }).then(data => {
+        if (data !== null) {
+          this.paymentInstitution = data.config_value;
+          this.getPaymentStatus();
+          return data;
+        }
+        return null;
+      }).catch(error => {
+      });
+    },
+
+    refresh() {
+      this.getPaymentStatus();
+    },
+
     loadItauDataOnFocus() {
       if (this.loadOnFocus) {
-        this.getPaymentStatus()
-          .then(data => {
-            this.loadOnFocus = false;
-          });
+        this.getPaymentStatus().then(data => {
+          this.loadOnFocus = false;
+        });
       }
     },
 
     getItauHash() {
       let params = {};
 
-      this.isLoading = true;
-
       if (this.myCompany !== null)
         params['myCompany'] = this.myCompany.id;
 
       return this.getItauData({
         invoiceId: this.invoiceId,
         operation: 'itauhash',
-        params   : params
-      })
-        .then(data => {
-          if (data !== null) {
-            return this.itauHash = data;
-          }
+        params: params
+      }).then(data => {
+        if (data !== null) {
+          return this.itauHash = data;
+        }
+        return null;
+      }).catch(error => {
 
-          return null;
-        })
-        .catch(error => {
-          
-        })
-        .finally(() => {
-          this.isLoading = false;
-        });
+      });
     },
 
     getPaymentStatus() {
+
+      if (this.isLoading) {
+        return null;
+      }
+
       let params = {};
 
       this.isLoading = true;
 
-      if (this.myCompany !== null)
+      if (this.myCompany !== null) {
         params['myCompany'] = this.myCompany.id;
+      }
 
-      return this.getItauData({
-        invoiceId: this.invoiceId,
-        operation: 'payment',
-        params   : params
-      })
-        .then(data => {
-          if (data !== null) {
-            return this.payment = data;
-          }
+      return this.getBank().then(data2 => {
 
-          return null;
-        })
-        .catch(error => {
-          
-        })
-        .finally(() => {
-          this.isLoading = false;
-        });
+        if (this.paymentInstitution === 'itau') {
+
+          this.getItauData({
+            invoiceId: this.invoiceId,
+            operation: 'payment',
+            params: params
+          }).then(data => {
+            if (data !== null) {
+              return this.payment = data;
+            }
+            return null;
+          }).catch(error => {
+
+          }).finally(() => {
+            this.isLoading = false;
+            // this.isLoading = false;
+          });
+
+        } else if(this.paymentInstitution === 'inter'){
+
+          this.getInterData({
+            invoiceId: this.invoiceId,
+            operation: 'payment',
+            params: params
+          }).then(data => {
+            if (data !== null) {
+              if (!data.response.success) {
+                let msgErro = data.response.error;
+                this.$q.notify({
+                  message: msgErro,
+                  html: true,
+                  group: false,
+                  multiLine: true,
+                  position: 'bottom',
+                  type: 'negative',
+                });
+                return this.payment = null;
+              } else {
+                return this.payment = data.response.data;
+              }
+            } else {
+              return this.payment = null;
+            }
+            return null;
+          }).catch(error => {
+            console.table(error);
+          }).finally(() => {
+            this.isLoading = false;
+          });
+
+        }
+        else {
+
+          this.getSicredData({
+            invoiceId: this.invoiceId,
+            operation: 'payment',
+            params: params
+          }).then(data => {
+            if (data !== null) {
+              if (!data.response.success) {
+                let msgErro = data.response.error;
+                this.$q.notify({
+                  message: msgErro,
+                  html: true,
+                  group: false,
+                  multiLine: true,
+                  position: 'bottom',
+                  type: 'negative',
+                });
+                return this.payment = null;
+              } else {
+                return this.payment = data.response.data;
+              }
+            } else {
+              return this.payment = null;
+            }
+            return null;
+          }).catch(error => {
+            console.table(error);
+          }).finally(() => {
+            this.isLoading = false;
+          });
+
+        }
+
+      });
     },
   },
 };
-</script>
+</script>

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

@@ -34,31 +34,59 @@
                     <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">Vencimento</td>
+                    <td class="text-left">
+                      <EditInvoiceDuedate v-if="editDueDate" :dueDate="invoice.dueDate"
+                        :invoiceId="invoice['@id'] || ''" @saved="(data) => (invoice = data)" />
+                      <div v-else>
+                        {{ invoice.dueDate }}
+                      </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">Vencimento</td>
+                    <td class="text-left text-bold">Desconto</td>
                     <td class="text-left">
-                      <EditInvoiceDuedate v-if="editDueDate" :dueDate="invoice.dueDate"
-                        :invoiceId="invoice['@id'] || ''" @saved="(data) => (invoice = data)" />
+
+                      <EditInvoiceDiscount v-if="discount" :discount="discount" :invoiceId="invoice['@id'] || ''"
+                        @saved="requestInvoice(invoiceId)" />
+
                       <div v-else>
-                        {{ invoice.dueDate }}
+                        <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" v-if="discount">
+                      {{ formatMoney(this.invoice.realPrice) }}
+                    </td>
+                    <td class="text-left" v-else>
+                      {{ formatMoney(this.invoice.price) }}
+                    </td>
+                  </tr>
+
                 </tbody>
               </q-markup-table>
             </div>
@@ -74,12 +102,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 +122,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 +162,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 +172,7 @@ export default {
     EditInvoiceDuedate,
     InvoiceActions,
     InvoiceEditActions,
+    EditInvoiceDiscount,
   },
 
   created() {
@@ -152,6 +181,7 @@ export default {
 
     if (this.myCompany !== null && this.invoiceId !== null) {
       this.requestInvoice(this.invoiceId);
+      // this.requestInvoiceDiscount(this.invoiceId);
     }
   },
 
@@ -162,6 +192,7 @@ export default {
       invoiceId: null,
       orderId: null,
       invoice: null,
+      discount: null,
       isLoading: false,
       editDueDate: false,
       notFound: false,
@@ -184,12 +215,14 @@ export default {
     myCompany(company) {
       if (company !== null) {
         this.requestInvoice(this.invoiceId);
+        // this.requestInvoiceDiscount(this.invoiceId);
       }
     },
   },
 
   methods: {
     ...mapActions({
+      getInvoiceDiscount: "receiveInvoice/getInvoiceDiscount",
       getInvoice: "receiveInvoice/getInvoice",
       renewInvoice: "receiveInvoice/renewInvoice",
     }),
@@ -226,6 +259,7 @@ export default {
           this.notFound = true;
         });
     },
+
     requestInvoice(invoiceId) {
       if (this.isLoading) return;
 
@@ -239,6 +273,8 @@ export default {
         .then((data) => {
           this.isLoading = false;
 
+          this.requestInvoiceDiscount(invoiceId);
+
           if (data["@id"]) {
             this.invoice = data;
             this.notFound = false;
@@ -276,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>
+</script>

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

@@ -206,8 +206,8 @@ export default {
       data: [],
       filters: {
         orderType: {
-          label: "Todos",
-          value: null,
+          label: "Venda",
+          value: "sale",
         },
         date: {
           from: "",

package/src/components/invoice/receive/details/InvoiceInvoice.vue

@@ -1,16 +1,49 @@
 <template>
   <div class="row items-center justify-center">
     <div class="flex flex-center" v-if="isLoading">
-      <q-circular-progress :indeterminate="isLoading"
-                           size="sm"
-                           color="primary"
-                           class="q-ma-md"
+      <q-circular-progress
+        :indeterminate="isLoading"
+        size="sm"
+        color="primary"
+        class="q-ma-md"
       />
       Carregando...
     </div>
 
-    <!-- BILLET VIEWER INTER -->
+    <div :class="showInfoBox ? 'full-width q-pa-lg' : 'hidden'">
+      <div class="q-pa-md q-gutter-sm">
+        <q-banner inline-actions rounded class="bg-primary text-white text-center">
+          <h6>Este boleto não pode ser gerado agora, pois a fatura está em aberto.</h6>
+        </q-banner>
+      </div>
+    </div>
+
+    <!-- BILLET VIEWER SICRED -->
+    <div :class="showBilletSicred ? 'full-width q-pa-lg' : 'hidden'">
+      <div class="col-12 q-pt-lg" v-if="paymentInstitution === 'sicred'">
+        <!-- <div class="row justify-center items-center">
+          <q-btn
+              icon="money"
+              size="lg"
+              color="primary"
+              label="Abrir Boleto Pix"
+              :loading="isLoadingDownload"
+              @click="clickDownloadBilletSicred()"
+              :disable="isPaid"
+          />
+        </div> -->
+
+        <div style="height: 1200px">
+            <iframe
+                :src="invoiceUrlSicred"
+                name="BILLETINTER" id="billet_sicred" width="100%" height="100%" frameBorder="0">
+              <p>This browser does not support IFrame.</p>
+            </iframe>
+          </div>
+      </div>
+    </div>
 
+    <!-- BILLET VIEWER INTER -->
     <div :class="showBilletInter ? 'full-width q-pa-lg' : 'hidden'">
       <div style="height: 1200px">
         <iframe
@@ -22,7 +55,6 @@
     </div>
 
     <!-- BILLET VIEWER ITAU -->
-
     <div :class="showBillet ? 'full-width q-pa-lg' : 'hidden'">
       <q-form
           ref="myForm"
@@ -33,7 +65,6 @@
       >
         <input type="hidden" name="DC" :value="itauHash"/>
       </q-form>
-
       <div style="height: 1200px">
         <iframe name="BILLET" width="100%" height="100%" frameBorder="0">
           <p>This browser does not support IFrame.</p>
@@ -42,7 +73,6 @@
     </div>
 
     <!-- BILLET GENERATOR TRIGGER -->
-
     <div class="col-12 q-pt-lg" v-if="paymentIsPending && billetMustBeCreated && paymentInstitution === 'itau'">
       <div style="min-height: 80vh;" class="row justify-center items-center">
         <q-btn
@@ -75,22 +105,7 @@
       </div>
     </div>
 
-    <div class="col-12 q-pt-lg" v-if="paymentIsPending && paymentInstitution === 'inter'">
-      <div style="min-height: 80vh;" class="row justify-center items-center">
-        <q-btn
-            icon="money"
-            size="lg"
-            color="primary"
-            label="Abrir Boleto"
-            :loading="isLoadingDownload"
-            @click="clickDownloadBilletInter()"
-            :disable="isPaid"
-        />
-      </div>
-    </div>
-
     <!-- PAID MESSAGE -->
-
     <div class="col-12" v-if="payment !== null && isPaid">
       <div class="row items-center justify-center" style="min-height: 90vh;">
         <q-banner class="text-white bg-positive text-center text-h3" rounded>
@@ -107,7 +122,7 @@
 <script>
 import {mapActions, mapGetters} from 'vuex';
 import axios from 'axios';
-import {ENTRYPOINT} from '@app/src/config/entrypoint';
+import {ENTRYPOINT} from '@freteclick/../../src/config/entrypoint';
 
 export default {
   props: {
@@ -121,6 +136,8 @@ export default {
     },
   },
 
+  components: {},
+
   mounted() {
     window.addEventListener('focus', this.loadItauDataOnFocus);
   },
@@ -136,7 +153,10 @@ export default {
   data() {
     return {
       invoiceUrlInter: null,
+      invoiceUrlSicred: null,
       showBilletInter: null,
+      showBilletSicred: null,
+      showInfoBox: null,
       isLoadingDownload: false,
       isLoading: false,
       payment: null,
@@ -145,7 +165,7 @@ export default {
       showBillet: false,
       loadOnFocus: false,
       retrievingHash: false,
-      paymentInstitution: null // 'itau','inter'
+      paymentInstitution: null
     };
   },
 
@@ -180,9 +200,16 @@ export default {
 
       this.isPaid = data.paymentStatus === 'paid';
 
+      if(this.payment.paymentStatus === 'open')
+      {
+        this.showInfoBox = true;
+      }
+
       if (data.paymentType == 'billet') {
 
-        if (data.paymentStatus == 'created' && this.isPaid === false) {
+        if (data.paymentStatus !== 'open') {
+
+          this.showInfoBox = false;
 
           if (this.paymentInstitution === 'itau') {
             this.getItauHash().then(hash => {
@@ -191,7 +218,7 @@ export default {
               }
             });
 
-          } else { // -------------------------------------- Banco Inter
+          } else if(this.paymentInstitution === 'inter') {
 
             this.showBillet = false;
             let urlTmp = ENTRYPOINT + `/vendor/pdf.js/web/viewer.html?file=/finance/${this.invoiceId}/download?timestamp${new Date().getTime()}`;
@@ -200,11 +227,16 @@ export default {
             this.showBilletInter = true;
 
           }
-        } else {
-          this.showBillet = false;
-          if (this.paymentInstitution === 'inter') {
-            this.isPaid = data.status === 'paid';
-          }
+          else {
+
+            this.showBillet = false;
+            let urlTmp = ENTRYPOINT + `/vendor/pdf.js/web/viewer.html?file=/finance/${this.invoiceId}/bank/sicred/download?timestamp${new Date().getTime()}`;
+            // let urlTmp = ENTRYPOINT + `/download?invoiceUrl=${this.payment.invoiceUrl}`;
+            this.invoiceUrlSicred = urlTmp;
+            this.isLoading = false;
+            this.showBilletSicred = true;
+
+            }
         }
 
       }
@@ -230,6 +262,7 @@ export default {
     ...mapActions({
       getItauData: 'receiveInvoice/bankItau',
       getInterData: 'receiveInvoice/bankInter',
+      getSicredData: 'receiveInvoice/bankSicred',
       getBankPerInvoiceId: 'receiveInvoice/getBankPerInvoiceId',
     }),
 
@@ -250,6 +283,26 @@ export default {
       window.open(urlTmp);
     },
 
+    mountInvoiceUrlSicred() {
+      let invoiceUrl = encodeURIComponent(this.payment.invoiceUrl);
+      return axios({
+        url: ENTRYPOINT + `/download?invoiceUrl=${invoiceUrl}&timestamp=${new Date().getTime()}`,
+        method: 'get',
+        responseType: 'blob'
+      }).then((response) => {
+        let blob = new Blob([response.data], {type: 'application/pdf'}), url = window.URL.createObjectURL(blob);
+
+        console.log(url);
+
+        return url;
+      });
+    },
+
+    clickDownloadBilletSicred() {
+      let urlTmp = ENTRYPOINT + `/download?invoiceUrl=${this.payment.invoiceUrl}`;
+      window.open(urlTmp);
+    },
+
     getBank() {
       return this.getBankPerInvoiceId({
         invoiceId: this.invoiceId
@@ -312,7 +365,7 @@ export default {
 
       return this.getBank().then(data2 => {
 
-        if (this.paymentInstitution === 'itau') { // ------------------------------ Banco 'itau'
+        if (this.paymentInstitution === 'itau') {
 
           this.getItauData({
             invoiceId: this.invoiceId,
@@ -330,7 +383,7 @@ export default {
             // this.isLoading = false;
           });
 
-        } else { // ------------------------------ Banco 'inter'
+        } else if(this.paymentInstitution === 'inter'){
 
           this.getInterData({
             invoiceId: this.invoiceId,
@@ -363,6 +416,39 @@ export default {
           });
 
         }
+        else {
+
+          this.getSicredData({
+            invoiceId: this.invoiceId,
+            operation: 'payment',
+            params: params
+          }).then(data => {
+            if (data !== null) {
+              if (!data.response.success) {
+                let msgErro = data.response.error;
+                this.$q.notify({
+                  message: msgErro,
+                  html: true,
+                  group: false,
+                  multiLine: true,
+                  position: 'bottom',
+                  type: 'negative',
+                });
+                return this.payment = null;
+              } else {
+                return this.payment = data.response.data;
+              }
+            } else {
+              return this.payment = null;
+            }
+            return null;
+          }).catch(error => {
+            console.table(error);
+          }).finally(() => {
+            this.isLoading = false;
+          });
+
+        }
 
       });
     },

package/src/router/routes.js

@@ -2,7 +2,7 @@
 export const routes = [
     {
       path     : '/finance/',
-      component: () => import('@app/src/layouts/AdminLayout.vue'),
+      component: () => import('@freteclick/../../src/layouts/AdminLayout.vue'),
       children : [
         { name: 'ClientInvoiceIndex', path: 'client', component: () => import('../pages/Invoice/Client/Index.vue') },
         { name: 'ClientInvoiceDetails', path: 'client/id/:id', component: () => import('../pages/Invoice/Client/Details.vue') },

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

@@ -1,5 +1,5 @@
 import SubmissionError from '@freteclick/quasar-common-ui/src/error/SubmissionError';
-import { fetch }       from '@app/src/boot/myapi';
+import { fetch }       from '@freteclick/../../src/boot/myapi';
 import * as types      from './mutation_types';
 
 const RESOURCE_ENDPOINT = '/finance/comission';

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

@@ -1,5 +1,5 @@
 import SubmissionError from '@freteclick/quasar-common-ui/src/error/SubmissionError';
-import { fetch } from '@app/src/boot/myapi';
+import { fetch }       from '@freteclick/../../src/boot/myapi';
 
 
 

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

@@ -1,5 +1,5 @@
 import SubmissionError from '@freteclick/quasar-common-ui/src/error/SubmissionError';
-import { fetch } from '@app/src/boot/myapi';
+import { fetch }       from '@freteclick/../../src/boot/myapi';
 import * as types from './mutation_types';
 
 const RESOURCE_ENDPOINT = '/finance/pay';

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

@@ -1,5 +1,5 @@
 import SubmissionError from '@freteclick/quasar-common-ui/src/error/SubmissionError';
-import { fetch } from '@app/src/boot/myapi';
+import { fetch }       from '@freteclick/../../src/boot/myapi';
 import * as types from './mutation_types';
 
 const RESOURCE_ENDPOINT = '/finance/receive';
@@ -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 }) => {
 
@@ -104,6 +111,17 @@ export const bankInter = ({ commit }, { invoiceId, operation, params = {} }) =>
         });
 };
 
+export const bankSicred = ({ commit }, { invoiceId, operation, params = {} }) => {
+  return fetch(`/finance/receive/${invoiceId}/bank/sicred/${operation}`, { params })
+      .then(response => response.json())
+      .then(data => {
+          if (data.response) {
+              return data;
+          }
+          return null;
+      });
+};
+
 export const getBankPerInvoiceId = ({ commit }, { invoiceId, params = {} }) => {
     return fetch(`/finance/receive/${invoiceId}/bank`, { params })
         .then(response => response.json())
@@ -132,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',

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

@@ -1,5 +1,5 @@
 import SubmissionError from '@freteclick/quasar-common-ui/src/error/SubmissionError';
-import { fetch }       from '@app/src/boot/myapi';
+import { fetch }       from '@freteclick/../../src/boot/myapi';
 import * as types      from './mutation_types';
 
 const RESOURCE_ENDPOINT = '/finance/receive';