@freteclick/quasar-financial-ui 1.0.99 → 1.0.101

package/package.json

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

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

@@ -47,7 +47,7 @@
             <q-btn outline dense
               :to   ="{ name: 'ClientInvoiceDetails', params: { id: props.row.id } }"
               :label="props.cols[0].value"
-              :style="{color:props.row.color_status}"              
+              :style="{color:props.row.color_status}"
               class ="full-width"
             />
           </q-td>
@@ -353,11 +353,21 @@ export default {
           params['searchBy'] = this.filters.text;
       }
 
-      if (this.filters.status != null && this.filters.status.value != -1) {
-        params['status'] = this.filters.status.value;
-      }
-      else {
-        params['status.realStatus'] = ['open', 'pending'];
+      // if (this.filters.status != null && this.filters.status.value != -1) {
+      //   params['status'] = this.filters.status.value;
+      // }
+      // else {
+      //   params['status.realStatus'] = ['open', 'pending'];
+      // }
+
+      if (this.filters.status != null) {
+        if (this.filters.status.value > 0) {
+          params["status"] = this.filters.status.value;
+        } else {
+          if (this.filters.status.value == -1) {
+            params["status.realStatus"] = ["open", "pending", "pay"];
+          }
+        }
       }
 
       if (this.filters.company != null) {
@@ -380,4 +390,4 @@ export default {
     },
   },
 };
-</script>
+</script>

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

@@ -23,6 +23,7 @@
           {{ props.row.transportadora }}
         </q-td>
         <q-td key="preco" :props="props">{{ props.cols[8].value }}</q-td>
+        <q-td key="precoReal" :props="props">{{ props.cols[9].value }}</q-td>
       </q-tr>
     </template>
   </q-table>
@@ -44,6 +45,7 @@ const SETTINGS = {
     'entrega',
     'transportadora',
     'preco',
+    'precoReal'
   ],
   columns: [
     {
@@ -124,6 +126,19 @@ const SETTINGS = {
       },
       label: 'Preço'
     },
+    {
+      name: "precoReal",
+      field: "precoReal",
+      align: "left",
+      format: (val, row) => {
+        if (isNaN(val)) {
+          return val;
+        } else {
+          return formatMoney(val, "BRL", "pt-br");
+        }
+      },
+      label: "Preço Real",
+    },
   ],
 };
 
@@ -233,6 +248,7 @@ export default {
           'localEntrega': item.quote !== null ? `${item.quote.cityDestination.city} / ${item.quote.cityDestination.state.uf}` : '',
           'transportadora': item.quote !== null ? item.quote.carrier.name : '',
           'preco': item.price,
+          'precoReal':  this.getRealPrice(item), //item.realPrice == null  || item.realPrice == 0 ? "-----" :
         });
       }
 
@@ -261,6 +277,16 @@ export default {
       getStatuses: 'purchasingOrder/getStatuses',
     }),
 
+    getRealPrice(invoice) {
+      let price = 0;
+      invoice.invoice.forEach((element) => {
+        if (element.invoice.id == this.invoiceId) {
+          price = element.realPrice;
+        }
+      });
+      return price == invoice.price || price == 0  ? "-----" : price;
+    },
+
     requestStatuses() {
       this.loadingStatuses = true;
       this.getStatuses({
@@ -325,4 +351,4 @@ export default {
     },
   },
 };
-</script>
+</script>