Merge pull request #345 from yrestom/develop

Version: 6.0.4
ucraft-com · Jun 27, 2023 · cffbb74 · cffbb74
2 parents e8d9f92 + 46812d9
commit cffbb74
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/posawesome/__init__.py b/posawesome/__init__.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = "6.0.3"
+__version__ = "6.0.4"
 
 
 def console(*data):

diff --git a/posawesome/public/js/posapp/components/pos/Payments.vue b/posawesome/public/js/posapp/components/pos/Payments.vue
@@ -294,6 +294,19 @@
               :prefix="currencySymbol(invoice_doc.currency)"
             ></v-text-field>
           </v-col>
+          <v-col v-if="invoice_doc.rounded_total" cols="6">
+            <v-text-field
+              dense
+              outlined
+              color="primary"
+              :label="frappe._('Rounded Total')"
+              background-color="white"
+              hide-details
+              :value="formtCurrency(invoice_doc.rounded_total)"
+              disabled
+              :prefix="currencySymbol(invoice_doc.currency)"
+            ></v-text-field>
+          </v-col>
           <v-col
             cols="6"
             v-if="pos_profile.posa_allow_sales_order && invoiceType == 'Order'"
@@ -757,7 +770,8 @@ export default {
 
       if (
         !this.pos_profile.posa_allow_partial_payment &&
-        this.total_payments < this.invoice_doc.grand_total
+        this.total_payments <
+          (this.invoice_doc.rounded_total || this.invoice_doc.grand_total)
       ) {
         evntBus.$emit('show_mesage', {
           text: `The amount paid is not complete`,
@@ -821,7 +835,8 @@ export default {
 
       if (
         !this.invoice_doc.is_return &&
-        this.redeemed_customer_credit > this.invoice_doc.grand_total
+        this.redeemed_customer_credit >
+          (this.invoice_doc.rounded_total || this.invoice_doc.grand_total)
       ) {
         evntBus.$emit('show_mesage', {
           text: `can not redeam customer credit more than invoice total`,
@@ -883,7 +898,10 @@ export default {
     },
     set_full_amount(idx) {
       this.invoice_doc.payments.forEach((payment) => {
-        payment.amount = payment.idx == idx ? this.invoice_doc.grand_total : 0;
+        payment.amount =
+          payment.idx == idx
+            ? this.invoice_doc.rounded_total || this.invoice_doc.grand_total
+            : 0;
       });
     },
     set_rest_amount(idx) {
@@ -1214,7 +1232,8 @@ export default {
     },
     diff_payment() {
       let diff_payment = this.flt(
-        this.invoice_doc.grand_total - this.total_payments,
+        (this.invoice_doc.rounded_total || this.invoice_doc.grand_total) -
+          this.total_payments,
         this.currency_precision
       );
       this.paid_change = -diff_payment;
@@ -1298,7 +1317,7 @@ export default {
         this.is_write_off_change = 0;
         if (default_payment) {
           default_payment.amount = this.flt(
-            invoice_doc.grand_total,
+            invoice_doc.rounded_total || invoice_doc.grand_total,
             this.currency_precision
           );
         }