diff --git a/Client/src/app/components/add-transaction-page/add-transaction-page.component.ts b/Client/src/app/components/add-transaction-page/add-transaction-page.component.ts index 2dcb45c..afaf7e3 100644 --- a/Client/src/app/components/add-transaction-page/add-transaction-page.component.ts +++ b/Client/src/app/components/add-transaction-page/add-transaction-page.component.ts @@ -62,7 +62,8 @@ export class AddTransactionPageComponent implements OnInit { contributor: contrib ? contrib : undefined, typeId: lastTransaction ? lastTransaction.typeId : TransactionType.Cash, fundId: lastTransaction ? (lastTransaction.fundId === Fund.General ? Fund.Missions : Fund.General) : Fund.General, - checkNumber: lastTransaction ? lastTransaction.checkNumber : '' + checkNumber: lastTransaction ? lastTransaction.checkNumber : '', + goodsOrServices: false } }); diff --git a/Client/src/app/components/add-transaction-page/add-transaction-popup/add-transaction-popup.component.html b/Client/src/app/components/add-transaction-page/add-transaction-popup/add-transaction-popup.component.html index 3890e69..0937392 100644 --- a/Client/src/app/components/add-transaction-page/add-transaction-popup/add-transaction-popup.component.html +++ b/Client/src/app/components/add-transaction-page/add-transaction-popup/add-transaction-popup.component.html @@ -1,5 +1,5 @@
-

Add Event

+

Add Transaction

@@ -41,6 +41,10 @@
+ + Goods or Services Received + +
diff --git a/Client/src/app/components/add-transaction-page/add-transaction-popup/add-transaction-popup.component.ts b/Client/src/app/components/add-transaction-page/add-transaction-popup/add-transaction-popup.component.ts index 5490117..a0aa5e1 100644 --- a/Client/src/app/components/add-transaction-page/add-transaction-popup/add-transaction-popup.component.ts +++ b/Client/src/app/components/add-transaction-page/add-transaction-popup/add-transaction-popup.component.ts @@ -19,7 +19,8 @@ export interface DialogData { fundId: number, checkNumber: string, description: string, - taxYear: number + taxYear: number, + goodsOrServices: boolean } @@ -56,7 +57,8 @@ export class AddTransactionPopupComponent implements OnInit { checkNumber: [this.data.checkNumber], description: [this.data.description], amount: ['', [Validators.required]], - taxYear: [this.data.taxYear || new Date().getFullYear(), [Validators.required]] + taxYear: [this.data.taxYear || new Date().getFullYear(), [Validators.required]], + goodsOrServices: [this.data.goodsOrServices || false] }); } diff --git a/Client/src/app/components/add-transaction-page/transaction.ts b/Client/src/app/components/add-transaction-page/transaction.ts index 7c8fe60..fab2968 100644 --- a/Client/src/app/components/add-transaction-page/transaction.ts +++ b/Client/src/app/components/add-transaction-page/transaction.ts @@ -7,4 +7,5 @@ export class Transaction { fundId: number; taxYear: number; typeId: number; + goodsOrServices: boolean; } \ No newline at end of file