Merge pull request #593 from Blair2004/v4.6.x

Update

Author: Blair2004

config/nexopos.php

@@ -1,6 +1,6 @@
 <?php
 return [
-    'version'       =>  '4.6.14',
+    'version'       =>  '4.6.15',
     'languages'     =>  [
         'en'        =>  'English',
         'fr'        =>  'Français',

public/css/app.css

@@ -1,16 +1,16 @@
 {
     "/js/bootstrap.min.js": "/js/bootstrap.min.js?id=fe31330bf4f450ea1510ba6571cebda1",
     "/js/lang-loader.min.js": "/js/lang-loader.min.js?id=e3abce5c9ceb16c7dcbaf00710b9ad8a",
-    "/js/app.min.js": "/js/app.min.js?id=28ee7a6023d074bca91063a61fe03704",
+    "/js/app.min.js": "/js/app.min.js?id=4e6d474708959d6f455e7c30d17e9029",
     "/js/dashboard.min.js": "/js/dashboard.min.js?id=d84adbf74bac6693a9bc63d716a2ec4a",
     "/js/cashier.min.js": "/js/cashier.min.js?id=1177672fac425ea64d2adf3cf92110fc",
     "/js/update.min.js": "/js/update.min.js?id=359c7559d2e051df01ab3d8b1e8456bc",
-    "/js/pos-init.min.js": "/js/pos-init.min.js?id=a0116502e64e7553682d67f4dfcf923d",
-    "/js/pos.min.js": "/js/pos.min.js?id=1b0189cd1bce79c11474f9d29e472217",
+    "/js/pos-init.min.js": "/js/pos-init.min.js?id=264dc8e29e9ac89967ef3699b5d0ba5a",
+    "/js/pos.min.js": "/js/pos.min.js?id=cf4204ed94965b0bb1128d38d7a8ef45",
     "/js/auth.min.js": "/js/auth.min.js?id=7acb5663107a1dedc67cdb4eb5a1e1ab",
     "/js/setup.min.js": "/js/setup.min.js?id=666d58849dcf16f6a5d892ecadde8a0f",
     "/js/popups.min.js": "/js/popups.min.js?id=ee58fd1f72508533f5d879e131fd0957",
     "/js/manifest.js": "/js/manifest.js?id=98d0d5bf30a419e7d32bb8a49007ef77",
-    "/css/app.css": "/css/app.css?id=0e6c60e1072276654fbe7a7861fe6738",
-    "/js/vendor.js": "/js/vendor.js?id=aa25096dc938366dad69aa9d1545bb58"
+    "/css/app.css": "/css/app.css?id=c23108e26514a2b540aa04d2becc2aee",
+    "/js/vendor.js": "/js/vendor.js?id=ca667ecee33937a4e775c11e3bbd9f6d"
 }

public/js/app.min.js

@@ -527,15 +527,17 @@ export class POS {
                 nsHttpClient.get(`/api/nexopos/v4/taxes/groups/${order.tax_group_id}`)
                     .subscribe({
                         next: (tax: any) => {
-                            order.tax_groups = order.tax_groups || [];
-                            order.taxes = tax.taxes.map(tax => {
+                            tax.taxes   =   tax.taxes.map(_tax => {
                                 return {
-                                    tax_id: tax.id,
-                                    tax_name: tax.name,
-                                    rate: parseFloat(tax.rate),
-                                    tax_value: this.getVatValue(order.subtotal, tax.rate, order.tax_type)
+                                    tax_id: _tax.id,
+                                    tax_name: _tax.name,
+                                    rate: parseFloat(_tax.rate),
+                                    tax_value: this.getVatValue(order.subtotal, _tax.rate, order.tax_type)
                                 };
                             });
+
+                            order.tax_groups = order.tax_groups || [];
+                            order.taxes = tax.taxes;
 
                             /**
                              * this is set to cache the 
@@ -1549,8 +1551,6 @@ export class POS {
             product.tax_value = product.$quantities().custom_price_tax * product.quantity;
         }
 
-        console.log( product );
-
         /**
          * computing the discount when it's 
          * based on a percentage