diff --git a/src/app/db-export/db-export.component.ts b/src/app/db-export/db-export.component.ts index 4b2561f..581674d 100644 --- a/src/app/db-export/db-export.component.ts +++ b/src/app/db-export/db-export.component.ts @@ -39,8 +39,8 @@ export class DbExportComponent implements OnInit { expiration: new Date(Date.now()).toISOString(), payconf: false, crmToken: '', - viewkey: '', - tips: false + viewkey: '', + tips: false }; _ordersOk = false; @@ -140,6 +140,9 @@ export class DbExportComponent implements OnInit { this.orders[i].total + ',' + this.orders[i].price! + ',' + this.orders[i].totalZec + ',' + + this.orders[i].taxAmount + ',' + + this.orders[i].vatAmount + ',' + + this.orders[i].tipAmount + ',' + paid + ',"' + this.orders[i].externalInvoice + '"' + '\n'; diff --git a/src/app/invoice/invoice.component.html b/src/app/invoice/invoice.component.html index 2a6baaf..3fc3b55 100644 --- a/src/app/invoice/invoice.component.html +++ b/src/app/invoice/invoice.component.html @@ -52,19 +52,19 @@ - Sales Tax + {{ vE.invoiceTax }} {{ order.taxAmount | currency: order.currency.toUpperCase() }} - Value-Added Tax + {{ vE.invoiceVAT }} {{ order.vatAmount | currency: order.currency.toUpperCase() }} - Tip + {{ vE.invoiceTip }} {{ order.tipAmount | currency: order.currency.toUpperCase() }} diff --git a/src/app/invoice/invoice.component.ts b/src/app/invoice/invoice.component.ts index ff53c93..36ed22a 100644 --- a/src/app/invoice/invoice.component.ts +++ b/src/app/invoice/invoice.component.ts @@ -90,7 +90,10 @@ export class InvoiceComponent implements OnInit { invoiceCopyamountError : '', invoiceCopymemoError : '', invoiceInvalidId : '', - invoiceInfoNotavail : '' + invoiceInfoNotavail : '', + invoiceTax : '', + invoiceVAT : '', + invoiceTip : '' }; // constructor( @@ -278,6 +281,9 @@ export class InvoiceComponent implements OnInit { this.vE.invoiceCopymemoError = response.data.invoice_copymemo_error; this.vE.invoiceInvalidId = response.data.invoice_invalid_id; this.vE.invoiceInfoNotavail = response.data.invoice_info_notavail; + this.vE.invoiceTax = response.data.invoice_tax; + this.vE.invoiceVAT = response.data.invoice_vat; + this.vE.invoiceTip = response.data.invoice_tip; }, error => { console.log('Error >> ',error); } diff --git a/src/app/language.service.ts b/src/app/language.service.ts index cda0886..d89056b 100644 --- a/src/app/language.service.ts +++ b/src/app/language.service.ts @@ -12,7 +12,7 @@ var Buffer = require('buffer/').Buffer; export class LanguageService { // // URL for test using REST API to local MariaDB database -// private baseURL = 'http://localhost:8080/zgointl'; +// private baseURL = 'http://192.168.1.18:8080/zgointl'; // // URL for test using REST API to local MongoDB database // private baseURL = 'http://localhost:5000/zgointl'; @@ -54,6 +54,8 @@ export class LanguageService { // Get component's text data from language database // const params = new HttpParams().append('session', this.session!); +// console.log("Params -> "); +// console.log(params); if (viewName === 'login') { return this.http.get(this.loginURL + '/?lang=' + this.zgoLanguage, {headers: reqHeaders, params: params}); } else if (viewName === 'main') { @@ -71,7 +73,7 @@ export class LanguageService { ,{ headers : reqHeaders , params: params } - ); + ); } } } diff --git a/src/app/listorders/listorders.component.html b/src/app/listorders/listorders.component.html index cfa2040..9e04dce 100644 --- a/src/app/listorders/listorders.component.html +++ b/src/app/listorders/listorders.component.html @@ -155,19 +155,19 @@ - Sales Tax + {{ vE.listordersTax }} {{ order.taxAmount | currency: order.currency.toUpperCase() }} - Value-Added Tax + {{ vE.listordersVAT }} {{ order.vatAmount | currency: order.currency.toUpperCase() }} - Tip + {{ vE.listordersTip }} {{ order.tipAmount | currency: order.currency.toUpperCase() }} diff --git a/src/app/listorders/listorders.component.ts b/src/app/listorders/listorders.component.ts index cd6b945..3d4f225 100644 --- a/src/app/listorders/listorders.component.ts +++ b/src/app/listorders/listorders.component.ts @@ -87,7 +87,10 @@ export class ListOrdersComponent implements OnInit, OnDestroy{ listordersInvoiceBtn : '', listordersReceiptBtn : '', listordersNoOrders : '', - listordersEndDate : '' + listordersEndDate : '', + listordersTax : '', + listordersVAT : '', + listordersTip : '' } // @@ -244,6 +247,9 @@ export class ListOrdersComponent implements OnInit, OnDestroy{ this.vE.listordersReceiptBtn = response.data.listorders_receipt_btn; this.vE.listordersNoOrders = response.data.listorders_no_orders; this.vE.listordersEndDate = response.data.listorders_end_date; + this.vE.listordersTax = response.data.listorders_tax; + this.vE.listordersVAT = response.data.listorders_vat; + this.vE.listordersTip = response.data.listorders_tip; }, error: error => { console.log('Error >> ',error); } diff --git a/src/app/receipt/receipt.component.html b/src/app/receipt/receipt.component.html index 342b9bf..688585f 100644 --- a/src/app/receipt/receipt.component.html +++ b/src/app/receipt/receipt.component.html @@ -52,19 +52,19 @@ - Sales Tax + {{ vE.receiptTax }} {{ order.taxAmount | currency: order.currency.toUpperCase() }} - Value-Added Tax + {{ vE.receiptVAT }} {{ order.vatAmount | currency: order.currency.toUpperCase() }} - Tip + {{ vE.receiptTip }} {{ order.tipAmount | currency: order.currency.toUpperCase() }} diff --git a/src/app/receipt/receipt.component.ts b/src/app/receipt/receipt.component.ts index 5146817..353be74 100644 --- a/src/app/receipt/receipt.component.ts +++ b/src/app/receipt/receipt.component.ts @@ -56,7 +56,10 @@ export class ReceiptComponent implements OnInit { receiptQtyLbl : '', receiptOrderPrice : '', receiptInvalidId : '', - receiptInfoNotavail : '' + receiptInfoNotavail : '', + receiptTax : '', + receiptVAT : '', + receiptTip : '' } constructor( @@ -102,6 +105,9 @@ export class ReceiptComponent implements OnInit { this.vE.receiptOrderPrice = response.data.receipt_order_price; this.vE.receiptInvalidId = response.data.receipt_invalid_id; this.vE.receiptInfoNotavail = response.data.receipt_info_notavail; + this.vE.receiptTax = response.data.receipt_tax; + this.vE.receiptVAT = response.data.receipt_vat; + this.vE.receiptTip = response.data.receipt_tip; }, error => { console.log('Error >> ',error); } ); diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html index 93475a1..9206aa3 100644 --- a/src/app/settings/settings.component.html +++ b/src/app/settings/settings.component.html @@ -3,12 +3,12 @@
+ style="height: 620px;">
@@ -47,18 +47,22 @@ + - + + - + +
{{ vE.settingsUseTips }} +
{{ vE.settingsUseTax }} @@ -71,7 +75,9 @@ formControlName="taxRate"> +
{{ vE.settingsUseVAT }} @@ -88,11 +94,11 @@
-
+ align-items: center; + margin-top: -20px;">
+