Merge branch 'release/1.2.7'

Author: devAsadNur

README.md

@@ -3,11 +3,11 @@
 **Donate Link:** http://tareq.co/donate/
 **Tags:** WooCommerce POS, point of sale, free pos, pos plugin, woocommerce point of sale
 **Requires at least:** 5.4
-**Tested up to:** 6.1.1
+**Tested up to:** 6.4.2
 **WC requires at least:** 5.0.0
-**WC tested up to:** 7.2.2
+**WC tested up to:** 8.4.0
 **Requires PHP:** 7.2
-**Stable tag:** 1.2.6
+**Stable tag:** 1.2.7
 **License:** GPLv2 or later
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -60,6 +60,9 @@ No FAQ
 
 ## Changelog ##
 
+### v1.2.7 -> 27 December, 2023 ###
+- **Enhancement:** Tax calculation implementation based on discounts and fees instead of base price of products
+
 ### v1.2.6 -> 30 December, 2022 ###
 - **New:** Integrated Vue date range picker, select2 and Vue chart JS packages
 - **New:** Added helper methods for getting day JS and date range picker date formats

assets/js/admin.js

@@ -53,28 +53,37 @@ export default {
             return taxLineTotal;
         },
         getTotalTax( state ) {
-            var self = this,
+            let self = this,
                 taxLineTotal = 0,
                 taxFeeTotal = 0;
             weLo_.forEach( state.cartdata.line_items, function( item, key ) {
                 taxLineTotal += Math.abs( item.tax_amount * item.quantity );
-            });
+            } );
 
             if ( state.settings.woo_tax != undefined && state.settings.woo_tax.wc_tax_display_cart == 'incl' ) {
                 taxLineTotal = 0;
             }
 
             weLo_.forEach( state.cartdata.fee_lines, function( item, key ) {
-                if ( item.type == 'fee' ) {
-                    if ( item.tax_status == 'taxable' ) {
-                        var itemTaxClass = item.tax_class === '' ? 'standard' : item.tax_class;
-                        var taxClass = weLo_.find( state.availableTax, { 'class' : itemTaxClass.toString() } );
-                        if ( taxClass !== undefined ) {
-                            taxFeeTotal += ( Math.abs(item.total)*Math.abs( taxClass.rate ) )/100;
-                        }
-                    }
+                if ( item.tax_status !== 'taxable' ) {
+                    return;
                 }
-            });
+
+                let itemTaxClass = item.tax_class === '' ? 'standard' : item.tax_class;
+                let taxClass     = weLo_.find( state.availableTax, { 'class' : itemTaxClass.toString() } );
+
+                if ( ! taxClass ) {
+                    return;
+                }
+
+                if ( item.type === 'discount' ) {
+                    taxLineTotal += item.total / taxClass.rate;
+                }
+
+                if ( item.type === 'fee' ) {
+                    taxFeeTotal += ( Math.abs( item.total ) * Math.abs( taxClass.rate ) ) / 100;
+                }
+            } );
 
             return taxLineTotal + taxFeeTotal;
         },
@@ -170,7 +179,7 @@ export default {
                 value: discountData.value.toString(),
                 isEdit: false,
                 discount_type: discountData.type,
-                tax_status: 'none',
+                tax_status: 'taxable',
                 tax_class: '',
                 total: 0
             });
@@ -183,7 +192,7 @@ export default {
                 value: feeData.value.toString(),
                 isEdit: false,
                 fee_type: feeData.type,
-                tax_status: 'none',
+                tax_status: 'taxable',
                 tax_class: '',
                 total: 0
             });

assets/js/admin.min.js

@@ -1,14 +1,14 @@
-# Copyright (C) 2022 weDevs
+# Copyright (C) 2023 weDevs
 # This file is distributed under the GPL2.
 msgid ""
 msgstr ""
-"Project-Id-Version: wePOS - Point Of Sale (POS) for WooCommerce 1.2.6\n"
+"Project-Id-Version: wePOS - Point Of Sale (POS) for WooCommerce 1.2.7\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wepos\n"
-"POT-Creation-Date: 2022-12-30 09:08:57+00:00\n"
+"POT-Creation-Date: 2023-12-27 04:21:05+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2022-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2023-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "X-Generator: wp-vue-i18n 1.1.4\n"