@freteclick/quasar-financial-ui 1.0.112 → 1.0.114

package/package.json

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

package/src/components/common/Filters.vue

@@ -1,12 +1,34 @@
 <template>
-  <q-card class="row q-pa-md">
-    <div class="col-xs-12 q-pb-md text-h6">Faturas</div>
-    <div class="col-sm-6 col-xs-12 q-pa-md">
-      <q-input stack-label label="Buscar por" debounce="1000" v-model="filters.text" class="full-width" />
+  <q-card
+    class="row q-pa-md invoice-filters"
+    :class="{ 'invoice-filters--drawer': variant === 'receivables-drawer' }"
+  >
+    <div v-if="variant !== 'receivables-drawer'" class="col-xs-12 q-pb-md text-h6">
+      Faturas
     </div>
-    <div class="col-sm-6 col-xs-12 q-pa-md">
-      <q-select stack-label label="Status da fatura" v-model="filters.status" :options="statuses" class="full-width"
-        :loading="loadingStatuses">
+
+    <div class="col-sm-6 col-xs-12 q-pa-md invoice-filters__field">
+      <q-input
+        v-model="filters.text"
+        stack-label
+        label="Buscar por"
+        debounce="1000"
+        :outlined="variant === 'receivables-drawer'"
+        :dense="variant === 'receivables-drawer'"
+        class="full-width"
+      />
+    </div>
+    <div class="col-sm-6 col-xs-12 q-pa-md invoice-filters__field">
+      <q-select
+        v-model="filters.status"
+        :options="statuses"
+        stack-label
+        label="Status da fatura"
+        :outlined="variant === 'receivables-drawer'"
+        :dense="variant === 'receivables-drawer'"
+        :loading="loadingStatuses"
+        class="full-width"
+      >
         <template v-slot:no-option>
           <q-item>
             <q-item-section class="text-grey"> Sem resultados </q-item-section>
@@ -14,9 +36,35 @@
         </template>
       </q-select>
     </div>
-    <div class="col-6">
-      <q-select stack-label label="Tipo de Fatura" v-model="filters.orderType" :options="orderType" class="full-width"
-        :loading="loadingOrderType">
+    <div v-if="showCategory" class="col-sm-6 col-xs-12 q-pa-md invoice-filters__field">
+      <q-select
+        v-model="filters.category"
+        :options="categories"
+        stack-label
+        label="Categoria"
+        :outlined="variant === 'receivables-drawer'"
+        :dense="variant === 'receivables-drawer'"
+        :loading="loadingCategories"
+        class="full-width"
+      >
+        <template v-slot:no-option>
+          <q-item>
+            <q-item-section class="text-grey">Sem categorias</q-item-section>
+          </q-item>
+        </template>
+      </q-select>
+    </div>
+    <div class="col-6 q-pa-md invoice-filters__field">
+      <q-select
+        v-model="filters.orderType"
+        :options="orderType"
+        stack-label
+        label="Tipo de Fatura"
+        :outlined="variant === 'receivables-drawer'"
+        :dense="variant === 'receivables-drawer'"
+        :loading="loadingOrderType"
+        class="full-width"
+      >
         <template v-slot:no-option>
           <q-item>
             <q-item-section class="text-grey"> Sem resultados </q-item-section>
@@ -24,7 +72,7 @@
         </template>
       </q-select>
     </div>
-    <div class="col-6">
+    <div class="col-6 q-pa-md invoice-filters__field invoice-filters__date">
       <DataFilter :fromDate="filters.date.from" :toDate="filters.date.to" :showButton="false"
         @dateChanged="dateChanged" />
     </div>
@@ -45,10 +93,19 @@ export default {
       type: Object,
       required: true,
     },
+    variant: {
+      type: String,
+      default: "default",
+    },
+    showCategory: {
+      type: Boolean,
+      default: false,
+    },
   },
 
   created() {
     this.requestStatuses();
+    if (this.showCategory) this.requestCategories(this.filters.company);
   },
 
   data() {
@@ -56,7 +113,9 @@ export default {
 
     return {
       statuses: statuses,
+      categories: [{ label: "Todas", value: null }],
       loadingStatuses: false,
+      loadingCategories: false,
       loadingOrderType: false,
       orderType: [
         {
@@ -95,39 +154,80 @@ export default {
     "filters.status"() {
       this.$emit("onRequest");
     },
+    "filters.category"() {
+      if (this.showCategory) this.$emit("onRequest");
+    },
+    "filters.company"(company) {
+      if (this.showCategory) this.requestCategories(company);
+    },
   },
 
   methods: {
     ...mapActions({
       getStatuses: "receiveInvoice/getStatuses",
+      getCategories: "categories/getCategories",
     }),
 
+    requestCategories(company) {
+      if (!company || !company.id) {
+        this.categories = [{ label: "Todas", value: null }];
+        return Promise.resolve(this.categories);
+      }
+
+      this.loadingCategories = true;
+      return this.getCategories({
+        params: {
+          context: "expense",
+          company: company.id,
+        },
+      })
+        .then((members) => {
+          const options = [{ label: "Todas", value: null }];
+          (members || []).forEach((category) => {
+            const idFromIri = String(category["@id"] || "").match(/\/categories\/(\d+)$/);
+            const id = Number(category.id || (idFromIri && idFromIri[1]));
+
+            if (id) options.push({ label: category.name, value: id });
+          });
+          this.categories = options;
+          return options;
+        })
+        .catch(() => {
+          this.categories = [{ label: "Todas", value: null }];
+          return this.categories;
+        })
+        .finally(() => {
+          this.loadingCategories = false;
+        });
+    },
+
     requestStatuses() {
       this.loadingStatuses = true;
-      this.getStatuses({
+      return this.getStatuses({
         visibility: "public",
         context: "invoice",
         realStatus: ["open", "pending", "canceled", "closed"],
-      }).then((statuses) => {
-        if (statuses.length) {
-          let data = [];
+      })
+        .then((statuses) => {
+          const data = [{ label: "Todos", value: null }];
+          (Array.isArray(statuses) ? statuses : []).forEach((status) => {
+            const id = String(status["@id"] || "").replace(/[^0-9]/g, "");
+            if (!id) return;
 
-          data.push({
-            label: "Todos",
-            value: null,
-          });
-
-          for (let index in statuses) {
             data.push({
-              label: this.$t(`invoice.statuses.${statuses[index].status}`),
-              value: statuses[index]["@id"].replace(/[^0-9]/g, ""),
+              label: this.$t(`invoice.statuses.${status.status}`),
+              value: id,
             });
-          }
+          });
 
           this.statuses = data;
-        }
-        this.loadingStatuses = false;
-      });
+        })
+        .catch(() => {
+          this.statuses = [{ label: "Todos", value: null }];
+        })
+        .finally(() => {
+          this.loadingStatuses = false;
+        });
     },
     dateChanged(item) {
       this.filters.date = item;
@@ -135,4 +235,58 @@ export default {
     },
   },
 };
-</script>
+</script>
+
+<style lang="scss" scoped>
+.invoice-filters--drawer {
+  display: flex;
+  flex-flow: column nowrap;
+  align-items: stretch;
+  gap: 14px;
+  width: 100%;
+  padding: 0;
+  border: 0;
+  border-radius: 0;
+  background: transparent;
+  box-shadow: none;
+}
+
+.invoice-filters--drawer > .invoice-filters__field {
+  flex: 0 0 auto;
+  width: 100%;
+  min-width: 0;
+  max-width: none;
+  margin: 0;
+  padding: 0 !important;
+}
+
+.invoice-filters--drawer :deep(.q-field) {
+  width: 100%;
+  min-width: 0;
+}
+
+.invoice-filters--drawer :deep(.q-field__control),
+.invoice-filters--drawer :deep(.q-field__control:before),
+.invoice-filters--drawer :deep(.q-field__control:after) {
+  min-height: 42px;
+  border-radius: 10px;
+}
+
+.invoice-filters--drawer :deep(.container-filter) {
+  flex-direction: column;
+  align-items: stretch;
+  justify-content: flex-start;
+  gap: 10px;
+  padding: 0;
+}
+
+.invoice-filters--drawer :deep(.date-filter__field) {
+  flex: 0 0 auto;
+  width: 100%;
+  max-width: none;
+  min-width: 0;
+  min-height: 0;
+  margin: 0;
+}
+
+</style>

package/src/components/expense/FormExpense.vue

@@ -73,7 +73,7 @@
                 <q-date
                   v-model ="item.dueDate"
                   mask    ="DD/MM/YYYY"
-                  @input  ="() => $refs.qDateProxy1.hide()"
+                  @update:model-value  ="() => $refs.qDateProxy1.hide()"
                 />
               </q-popup-proxy>
             </q-icon>

package/src/components/expense/TableExpenses.vue

@@ -2,9 +2,9 @@
   <div>
     <q-table
         :loading        ="isLoading"
-        :data           ="items"
+        :rows           ="items"
         :columns        ="settings.columns"
-        :pagination.sync="pagination"
+        v-model:pagination="pagination"
         @request        ="onRequest"
         row-key         ="id"
         style           ="min-height: 90vh;"

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

@@ -2,9 +2,9 @@
   <div>
     <q-table
         :loading        ="isLoading"
-        :data           ="data"
+        :rows           ="data"
         :columns        ="settings.columns"
-        :pagination.sync="pagination"
+        v-model:pagination="pagination"
         @request        ="onRequest"
         row-key         ="id"
         :visible-columns="settings.visibleColumns"
@@ -192,7 +192,7 @@ export default {
     this.requestStatuses();
   },
 
-  beforeDestroy() {
+  beforeUnmount() {
     this.reset();
   },
 

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

@@ -18,7 +18,7 @@
       <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>
+          This browser does not support IFrame.
         </iframe>
       </div>
     </div>

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

@@ -1,5 +1,5 @@
 <template>
-  <q-table :loading="isLoading" :data="data" :columns="settings.columns" :pagination.sync="pagination"
+  <q-table :loading="isLoading" :rows="data" :columns="settings.columns" v-model:pagination="pagination"
     @request="onRequest" row-key="id" :visible-columns="settings.visibleColumns" style="min-height: 90vh;">
     <template v-slot:body="props">
       <q-tr :props="props">
@@ -169,7 +169,7 @@ export default {
     this.requestStatuses();
   },
 
-  beforeDestroy() {
+  beforeUnmount() {
     this.reset();
   },