@freteclick/quasar-financial-ui 1.0.86 → 1.0.88

package/package.json

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

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

@@ -2,24 +2,59 @@
   <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"
+                           size="sm"
+                           color="primary"
+                           class="q-ma-md"
       />
       Carregando...
     </div>
 
-    <!-- BILLET VIEWER -->
+        <!-- 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="Baixar Boleto"
+            :loading="isLoadingDownload"
+            @click="clickDownloadBilletSicred()"
+            :disable="isPaid"
+        />
+
+
+
+      </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">
@@ -31,26 +66,34 @@
 
     <!-- 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>
@@ -58,13 +101,10 @@
     <!-- 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 +114,31 @@
 </template>
 
 <script>
-import { date, extend }           from 'quasar';
-import { mapActions, mapGetters } from 'vuex';
+import {mapActions, mapGetters} from 'vuex';
+import axios from 'axios';
+import {ENTRYPOINT} from '../../../../../../../../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 +151,19 @@ export default {
 
   data() {
     return {
-      isLoading  : false,
-      payment    : null,
-      isPaid     : false,
-      itauHash   : null,
-      showBillet : false,
+      invoiceUrlInter: null,
+      invoiceUrlSicred: null,
+      showBilletInter: null,
+      showBilletSicred: null,
+      isLoadingDownload: false,
+      isLoading: false,
+      payment: null,
+      isPaid: false,
+      itauHash: null,
+      showBillet: false,
       loadOnFocus: false,
+      retrievingHash: false,
+      paymentInstitution: null // 'itau','inter'
     };
   },
 
@@ -116,27 +171,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 +196,55 @@ export default {
       if (!data)
         return;
 
-      if (data.paymentType == 'choose_pending' || data.paymentStatus == 'no_finished') {
-        this.isPaid = false;        
-        this.getItauHash();
-      }
-      else {
-        if (data.paymentType == 'billet') {
-          if (data.paymentStatus == 'paid')
-            this.isPaid = true;
+      this.isPaid = data.paymentStatus === 'paid';
+
+      if (data.paymentType == 'billet') {
+
+        if (data.paymentStatus == 'created' && this.isPaid === 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.isPaid = false;
 
-            if (data.paymentStatus == 'created')
-              this.getItauHash()
-                .then(hash => {
-                  if (hash !== null)
-                    this.showBillet = true;
-                });
-            else
-              this.showBillet = false;
+            this.showBillet = false;
+            let urlTmp = ENTRYPOINT + `/download?invoiceUrl=${this.payment.invoiceUrl}`;
+            // let urlTmp = ENTRYPOINT + `/vendor/pdf.js/web/viewer.html?file=/finance/${this.invoiceId}/download?timestamp${new Date().getTime()}`;
+            this.invoiceUrlSicred = urlTmp;
+            this.isLoading = false;
+            this.showBilletSicred = true;
+
+            }
+        } else {
+          this.showBillet = false;
+          if (this.paymentInstitution === 'sicred') {
+            this.isPaid = data.status === 'paid';
           }
         }
+
       }
+
+      this.$emit(
+          'billetStatus',
+          {
+            hasBillet: data.paymentType === 'billet' && data.paymentStatus === 'created',
+            isPaid: data.paymentStatus === 'paid'
+          }
+      );
+
     },
 
     showBillet(show) {
@@ -177,73 +256,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') { // ------------------------------ Banco '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'){ // ------------------------------ Banco '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 { // ------------------------------ Banco 'Sicred'
+
+          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/details/InvoiceInvoice.vue

@@ -11,16 +11,27 @@
 
         <!-- BILLET VIEWER SICRED -->
 
-      <div :class="showBilletSicred ? 'full-width q-pa-lg' : 'hidden'">
-      <div style="height: 1200px">
-        <iframe
-            :src="invoiceUrlSicred"
-            name="BILLETINTER" id="billet_inter" width="100%" height="100%" frameBorder="0">
-          <p>This browser does not support IFrame.</p>
-        </iframe>
+    <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="Baixar Boleto"
+            :loading="isLoadingDownload"
+            @click="clickDownloadBilletSicred()"
+            :disable="isPaid"
+        />
+
+
+
       </div>
     </div>
 
+    </div>
+
     <!-- BILLET VIEWER INTER -->
 
     <div :class="showBilletInter ? 'full-width q-pa-lg' : 'hidden'">
@@ -87,20 +98,6 @@
       </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">
@@ -121,6 +118,9 @@ import {mapActions, mapGetters} from 'vuex';
 import axios from 'axios';
 import {ENTRYPOINT} from '../../../../../../../../src/config/entrypoint';
 
+
+
+
 export default {
   props: {
     invoiceId: {
@@ -133,6 +133,10 @@ export default {
     },
   },
 
+  components: {
+
+  },
+
   mounted() {
     window.addEventListener('focus', this.loadItauDataOnFocus);
   },
@@ -205,7 +209,7 @@ export default {
               }
             });
 
-          } else if(this.paymentInstitution === 'inter') { // -------------------------------------- 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()}`;
@@ -214,10 +218,11 @@ export default {
             this.showBilletInter = true;
 
           }
-          else { // -------------------------------------- Banco Sicred
+          else {
 
             this.showBillet = false;
-            let urlTmp = ENTRYPOINT + `/vendor/pdf.js/web/viewer.html?file=/finance/${this.invoiceId}/download?timestamp${new Date().getTime()}`;
+            let urlTmp = ENTRYPOINT + `/download?invoiceUrl=${this.payment.invoiceUrl}`;
+            // let urlTmp = ENTRYPOINT + `/vendor/pdf.js/web/viewer.html?file=/finance/${this.invoiceId}/download?timestamp${new Date().getTime()}`;
             this.invoiceUrlSicred = urlTmp;
             this.isLoading = false;
             this.showBilletSicred = true;
@@ -282,12 +287,15 @@ export default {
         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 + `/vendor/pdf.js/web/viewer.html?file=/finance/${this.invoiceId}/download?timestamp${new Date().getTime()}`;
+      let urlTmp = ENTRYPOINT + `/download?invoiceUrl=${this.payment.invoiceUrl}`;
       window.open(urlTmp);
     },