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,9 +140,6 @@ 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';

src/app/invoice/invoice.component.html

@@ -52,19 +52,19 @@
 					</td>
 				</tr>
 				<tr *ngIf="order.taxAmount > 0">
-					<td class="newOrdertbdetail" style="text-align: right;">{{ vE.invoiceTax }}</td>
+					<td class="newOrdertbdetail" style="text-align: right;">Sales Tax</td>
 					<td class="newOrdertbdetail" style="text-align: right;"></td>
 					<td class="newOrdertbdetail" style="text-align: right;">{{ order.taxAmount | currency: order.currency.toUpperCase() }}</td>
 					<td></td>
 				</tr>
 				<tr *ngIf="order.vatAmount > 0">
-					<td class="newOrdertbdetail" style="text-align: right;">{{ vE.invoiceVAT }}</td>
+					<td class="newOrdertbdetail" style="text-align: right;">Value-Added Tax</td>
 					<td class="newOrdertbdetail" style="text-align: right;"></td>
 					<td class="newOrdertbdetail" style="text-align: right;">{{ order.vatAmount | currency: order.currency.toUpperCase() }}</td>
 					<td></td>
 				</tr>
 				<tr *ngIf="order.tipAmount > 0">
-					<td class="newOrdertbdetail" style="text-align: right;">{{ vE.invoiceTip }}</td> 
+					<td class="newOrdertbdetail" style="text-align: right;">Tip</td>
 					<td class="newOrdertbdetail" style="text-align: right;"></td>
 					<td class="newOrdertbdetail" style="text-align: right;">{{ order.tipAmount | currency: order.currency.toUpperCase() }}</td>
 					<td></td>

src/app/invoice/invoice.component.ts

@@ -90,10 +90,7 @@ export class InvoiceComponent implements OnInit {
 		invoiceCopyamountError : '',
 		invoiceCopymemoError : '',
 		invoiceInvalidId : '',
-		invoiceInfoNotavail : '',
-		invoiceTax : '',
-		invoiceVAT : '',
-		invoiceTip : ''
+		invoiceInfoNotavail : ''
 	};
 	//
 	constructor(
@@ -281,9 +278,6 @@ 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); }

src/app/listorders/listorders.component.html

@@ -155,19 +155,19 @@
 					</td>
 				</tr>
 				<tr class="tbdetail" *ngIf="order.taxAmount > 0">
-					<td class="newOrdertbdetail" style="text-align: right;">{{ vE.listordersTax }}</td>
+					<td class="newOrdertbdetail" style="text-align: right;">Sales Tax</td>
 					<td class="newOrdertbdetail" style="text-align: right;"></td>
 					<td class="newOrdertbdetail" style="text-align: right;">{{ order.taxAmount | currency: order.currency.toUpperCase() }}</td>
 					<td></td>
 				</tr>
 				<tr class="tbdetail" *ngIf="order.vatAmount > 0">
-					<td class="newOrdertbdetail" style="text-align: right;">{{ vE.listordersVAT }}</td>
+					<td class="newOrdertbdetail" style="text-align: right;">Value-Added Tax</td>
 					<td class="newOrdertbdetail" style="text-align: right;"></td>
 					<td class="newOrdertbdetail" style="text-align: right;">{{ order.vatAmount | currency: order.currency.toUpperCase() }}</td>
 					<td></td>
 				</tr>
 				<tr class="tbdetail" *ngIf="order.tipAmount > 0">
-					<td class="newOrdertbdetail" style="text-align: right;">{{ vE.listordersTip }}</td>
+					<td class="newOrdertbdetail" style="text-align: right;">Tip</td>
 					<td class="newOrdertbdetail" style="text-align: right;"></td>
 					<td class="newOrdertbdetail" style="text-align: right;">{{ order.tipAmount | currency: order.currency.toUpperCase() }}</td>
 					<td></td>

src/app/listorders/listorders.component.ts

@@ -87,10 +87,7 @@ export class ListOrdersComponent implements OnInit, OnDestroy{
 		listordersInvoiceBtn : '',
 		listordersReceiptBtn : '',
 		listordersNoOrders : '',
-		listordersEndDate : '',
-		listordersTax : '',
-		listordersVAT : '',
-		listordersTip : ''
+		listordersEndDate : ''
 	}
 	//
 
@@ -247,9 +244,6 @@ 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); }

src/app/receipt/receipt.component.html

@@ -52,19 +52,19 @@
 						</td>
 					</tr>
 					<tr *ngIf="order.taxAmount > 0">
-						<td class="newOrdertbdetail" style="text-align: right;">{{ vE.receiptTax }}</td>
+						<td class="newOrdertbdetail" style="text-align: right;">Sales Tax</td>
 						<td class="newOrdertbdetail" style="text-align: right;"></td>
 						<td class="newOrdertbdetail" style="text-align: right;">{{ order.taxAmount | currency: order.currency.toUpperCase() }}</td>
 						<td></td>
 					</tr>
 					<tr *ngIf="order.vatAmount > 0">
-						<td class="newOrdertbdetail" style="text-align: right;">{{ vE.receiptVAT }}</td>
+						<td class="newOrdertbdetail" style="text-align: right;">Value-Added Tax</td>
 						<td class="newOrdertbdetail" style="text-align: right;"></td>
 						<td class="newOrdertbdetail" style="text-align: right;">{{ order.vatAmount | currency: order.currency.toUpperCase() }}</td>
 						<td></td>
 					</tr>
 					<tr *ngIf="order.tipAmount > 0">
-						<td class="newOrdertbdetail" style="text-align: right;">{{ vE.receiptTip }}</td>
+						<td class="newOrdertbdetail" style="text-align: right;">Tip</td>
 						<td class="newOrdertbdetail" style="text-align: right;"></td>
 						<td class="newOrdertbdetail" style="text-align: right;">{{ order.tipAmount | currency: order.currency.toUpperCase() }}</td>
 						<td></td>

src/app/receipt/receipt.component.ts

@@ -56,10 +56,7 @@ export class ReceiptComponent implements OnInit {
   	receiptQtyLbl : '',
   	receiptOrderPrice : '',
   	receiptInvalidId : '',
-  	receiptInfoNotavail : '',
-  	receiptTax : '',
-  	receiptVAT : '',
-  	receiptTip : ''
+  	receiptInfoNotavail : ''
 	}	
 
   constructor(
@@ -105,9 +102,6 @@ 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); }
         );