From b6eb402a39eb0beb6ee7c1f438224392683262e1 Mon Sep 17 00:00:00 2001 From: Rene Vergara Date: Sun, 22 Oct 2023 08:07:51 -0500 Subject: [PATCH] Add new fields to orders --- src/app/invoice/invoice.component.ts | 3 +++ src/app/order/order.model.ts | 7 +++++-- src/app/pmtservice/pmtservice.component.ts | 3 +++ src/app/receipt.service.ts | 3 +++ src/app/receipt/receipt.component.ts | 3 +++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/app/invoice/invoice.component.ts b/src/app/invoice/invoice.component.ts index 5c6bda0..ff53c93 100644 --- a/src/app/invoice/invoice.component.ts +++ b/src/app/invoice/invoice.component.ts @@ -49,6 +49,9 @@ export class InvoiceComponent implements OnInit { externalInvoice: '', shortCode: '', token: '', + taxAmount: 0, + vatAmount: 0, + tipAmount: 0, lines: [ { qty: 1, diff --git a/src/app/order/order.model.ts b/src/app/order/order.model.ts index 081e67c..05c59cd 100644 --- a/src/app/order/order.model.ts +++ b/src/app/order/order.model.ts @@ -1,7 +1,7 @@ import { LineItem } from '../items/lineitem.model'; export interface Order { - _id?: string, + _id?: string|null, address: string, session: string, timestamp?: string, @@ -14,5 +14,8 @@ export interface Order { paid: boolean, externalInvoice: string, shortCode: string, - token: string + token: string, + taxAmount: number, + vatAmount: number, + tipAmount: number } diff --git a/src/app/pmtservice/pmtservice.component.ts b/src/app/pmtservice/pmtservice.component.ts index b324e65..f290a4a 100644 --- a/src/app/pmtservice/pmtservice.component.ts +++ b/src/app/pmtservice/pmtservice.component.ts @@ -68,6 +68,9 @@ export class PmtserviceComponent implements OnInit { externalInvoice: '', shortCode: '', token: '', + taxAmount: 0, + vatAmount: 0, + tipAmount: 0, lines: [ { qty: 1, diff --git a/src/app/receipt.service.ts b/src/app/receipt.service.ts index 99be879..177fcde 100644 --- a/src/app/receipt.service.ts +++ b/src/app/receipt.service.ts @@ -47,6 +47,9 @@ export class ReceiptService { externalInvoice: '', shortCode: '', token: '', + taxAmount: 0, + vatAmount: 0, + tipAmount: 0, lines: [ { qty: 1, diff --git a/src/app/receipt/receipt.component.ts b/src/app/receipt/receipt.component.ts index 2b95dda..5146817 100644 --- a/src/app/receipt/receipt.component.ts +++ b/src/app/receipt/receipt.component.ts @@ -32,6 +32,9 @@ export class ReceiptComponent implements OnInit { externalInvoice: '', shortCode: '', token: '', + taxAmount: 0, + vatAmount: 0, + tipAmount: 0, lines: [ { qty: 1,