Pear-Trading/FoodLoop-Web
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

added recurring purchase inputs

Browse source
This commit is contained in:
piratefinn 2018-03-05 13:33:26 +00:00
parent 5f3c4c927f
commit 0a7b49a387
2 changed files with 59 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/app/dashboard/add-data.component.ts
View file

@ -33,6 +33,8 @@ export class AddDataComponent implements OnInit {
// Assumes Groceries is 1st category
categoryId: number = 1;
essentialPurchase = false;
recurringPurchase = false;
recurringType: string;
transactionAdditionType = 1;
storeList = [];
showAddStore = false;
@ -174,7 +176,9 @@ export class AddDataComponent implements OnInit {
transactionFormValidate() {
if (this.submitOrg.name.length === 0 ||
this.submitOrg.town.length === 0 ||
this.amount === 0 ) {
this.amount === 0 ||
this.recurringPurchase &&
this.recurringType === 0) {
this.transactionFormInvalid = true;
} else {
this.transactionFormInvalid = false;
@ -195,6 +199,7 @@ export class AddDataComponent implements OnInit {
organisation_id : this.organisationId,
category : this.categoryId,
essential : this.essentialPurchase,
recurring : this.recurringPurchase,
};
break;
case 2:
@ -204,6 +209,7 @@ export class AddDataComponent implements OnInit {
purchase_time : purchaseTime,
organisation_id : this.organisationId,
essential : this.essentialPurchase,
recurring : this.recurringPurchase,
};
break;
case 3:
@ -216,6 +222,7 @@ export class AddDataComponent implements OnInit {
town : this.submitOrg.town,
postcode : this.submitOrg.postcode,
essential : this.essentialPurchase,
recurring : this.recurringPurchase,
};
break;
}