From 73bcf9fc15059b0bb61512033fb774c32c3d3d4d Mon Sep 17 00:00:00 2001
From: Rene Vergara <rene@vergara.network>
Date: Mon, 23 Oct 2023 10:53:58 -0500
Subject: [PATCH] Enable taxes and tips display

---
 src/app/invoice/invoice.component.html       | 18 ++++++++++++++++++
 src/app/listorders/listorders.component.html | 18 ++++++++++++++++++
 src/app/order/order.component.html           |  4 ++--
 src/app/receipt/receipt.component.html       | 20 +++++++++++++++++++-
 4 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/src/app/invoice/invoice.component.html b/src/app/invoice/invoice.component.html
index 91ac922..2a6baaf 100644
--- a/src/app/invoice/invoice.component.html
+++ b/src/app/invoice/invoice.component.html
@@ -51,6 +51,24 @@
 					   {{( item.qty * item.cost ) | number : '1.02' | currency: order.currency.toUpperCase()}} 
 					</td>
 				</tr>
+				<tr *ngIf="order.taxAmount > 0">
+					<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;">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;">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>
+				</tr>
 			    <tr class="invoice-title">
 					<th width="55%"
 					    class="detailLineRight">
diff --git a/src/app/listorders/listorders.component.html b/src/app/listorders/listorders.component.html
index a02ea90..cfa2040 100644
--- a/src/app/listorders/listorders.component.html
+++ b/src/app/listorders/listorders.component.html
@@ -154,6 +154,24 @@
 					    width="30%">{{item.qty * item.cost | number:'1.02' | currency: order.currency.toUpperCase() }} 
 					</td>
 				</tr>
+				<tr class="tbdetail" *ngIf="order.taxAmount > 0">
+					<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;">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;">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>
+				</tr>
 			</tbody>
 		</table>
 		<div style="display: flex;
diff --git a/src/app/order/order.component.html b/src/app/order/order.component.html
index 4f1eaf7..48626a0 100644
--- a/src/app/order/order.component.html
+++ b/src/app/order/order.component.html
@@ -75,13 +75,13 @@
 					   </a>
 					</td>
 				</tr>
-				<tr>
+				<tr *ngIf="tax > 0">
 					<td class="newOrdertbdetail" style="text-align: right;">Sales Tax</td>
 					<td class="newOrdertbdetail" style="text-align: right;">{{ tax / 100 | percent:'1.2-4'}}</td>
 					<td class="newOrdertbdetail" style="text-align: right;">{{ total * tax / 100 | currency: getCurrency() }}</td>
 					<td></td>
 				</tr>
-				<tr>
+				<tr *ngIf="vat > 0">
 					<td class="newOrdertbdetail" style="text-align: right;">Value-Added Tax</td>
 					<td class="newOrdertbdetail" style="text-align: right;">{{ vat / 100 | percent:'1.2-4' }}</td>
 					<td class="newOrdertbdetail" style="text-align: right;">{{ total * vat / 100 | currency: getCurrency() }}</td>
diff --git a/src/app/receipt/receipt.component.html b/src/app/receipt/receipt.component.html
index b948cf0..342b9bf 100644
--- a/src/app/receipt/receipt.component.html
+++ b/src/app/receipt/receipt.component.html
@@ -51,6 +51,24 @@
 						   {{( item.qty * item.cost ) | number : '1.02' | currency: order.currency.toUpperCase()}} 
 						</td>
 					</tr>
+					<tr *ngIf="order.taxAmount > 0">
+						<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;">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;">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>
+					</tr>
 				    <tr class="invoice-title">
 						<th width="55%"
 						    class="detailLineRight">
@@ -92,4 +110,4 @@
 			</mat-card-actions>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>