From 7516eaf11fcd3ec5a423d364d06b2e98f13220ce Mon Sep 17 00:00:00 2001 From: Rene Vergara Date: Wed, 3 Aug 2022 15:55:51 -0500 Subject: [PATCH] Add new fields to order model --- CHANGELOG.md | 5 +++++ src/app/invoice/invoice.component.ts | 2 ++ src/app/order/order.component.ts | 2 ++ src/app/order/order.model.ts | 4 +++- src/app/order/order.service.ts | 8 ++++++++ src/app/receipt.service.ts | 2 ++ src/app/receipt/receipt.component.ts | 2 ++ 7 files changed, 24 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31d5a77..37e9eae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +## Added + +- Add `crmToken` field to `owner.model.ts` +- Add `externalInvoice` field and `shortCode` field to `order.model.ts` + ## [1.2.1] - 2022-08-01 ### Changed diff --git a/src/app/invoice/invoice.component.ts b/src/app/invoice/invoice.component.ts index 5aeef5c..75e91ed 100644 --- a/src/app/invoice/invoice.component.ts +++ b/src/app/invoice/invoice.component.ts @@ -34,6 +34,8 @@ export class InvoiceComponent implements OnInit { total: 0, totalZec: 0, paid: false, + externalInvoice: '', + shortCode: '', lines: [ { qty: 1, diff --git a/src/app/order/order.component.ts b/src/app/order/order.component.ts index 6f74da7..e924f2d 100644 --- a/src/app/order/order.component.ts +++ b/src/app/order/order.component.ts @@ -41,6 +41,8 @@ export class OrderComponent implements OnInit{ total:0, totalZec: 0, paid: false, + externalInvoice: '', + shortCode: '', lines: [ { qty: 1, diff --git a/src/app/order/order.model.ts b/src/app/order/order.model.ts index 3b7e66f..57ce3d9 100644 --- a/src/app/order/order.model.ts +++ b/src/app/order/order.model.ts @@ -11,5 +11,7 @@ export interface Order { total: number, totalZec: number, lines: LineItem[], - paid: boolean + paid: boolean, + externalInvoice: string, + shortCode: string } diff --git a/src/app/order/order.service.ts b/src/app/order/order.service.ts index 7efe997..d52f419 100644 --- a/src/app/order/order.service.ts +++ b/src/app/order/order.service.ts @@ -63,6 +63,8 @@ export class OrderService { total: 0, totalZec: 0, paid: false, + externalInvoice: '', + shortCode: '', lines: [ { qty: 1, @@ -164,6 +166,8 @@ export class OrderService { price: 0, total: 0, paid: false, + externalInvoice: '', + shortCode: '', lines: [lineItem] }; let obs = this.http.post<{message: string, order: Order}>(this.beUrl+'api/order', {payload: order}, { headers: this.reqHeaders }); @@ -191,6 +195,8 @@ export class OrderService { totalZec: 0, price: 0, paid: false, + externalInvoice: '', + shortCode: '', lines: [ { qty: 1, @@ -224,6 +230,8 @@ export class OrderService { total: 0, totalZec: 0, paid: false, + externalInvoice: '', + shortCode: '', lines: [ { qty: 1, diff --git a/src/app/receipt.service.ts b/src/app/receipt.service.ts index 8d3f211..0460b6f 100644 --- a/src/app/receipt.service.ts +++ b/src/app/receipt.service.ts @@ -52,6 +52,8 @@ export class ReceiptService { total: 0, totalZec: 0, paid: false, + externalInvoice: '', + shortCode: '', lines: [ { qty: 1, diff --git a/src/app/receipt/receipt.component.ts b/src/app/receipt/receipt.component.ts index f0981e4..6f701ad 100644 --- a/src/app/receipt/receipt.component.ts +++ b/src/app/receipt/receipt.component.ts @@ -25,6 +25,8 @@ export class ReceiptComponent implements OnInit { total: 0, totalZec: 0, paid: false, + externalInvoice: '', + shortCode: '', lines: [ { qty: 1,