taxtank-core 0.33.42 → 0.33.44
Sign up to get free protection for your applications and to get access to all the features.
- package/esm2022/src/lib/collections/sole/sole-invoice.collection.mjs +2 -2
- package/esm2022/src/lib/db/Enums/client/timezone.enum.mjs +3 -1
- package/esm2022/src/lib/forms/transaction/transaction.form.mjs +1 -2
- package/fesm2022/taxtank-core.mjs +3 -2
- package/fesm2022/taxtank-core.mjs.map +1 -1
- package/package.json +1 -1
- package/src/lib/db/Enums/client/timezone.enum.d.ts +2 -0
|
@@ -23,7 +23,7 @@ export class SoleInvoiceCollection extends Collection {
|
|
|
23
23
|
const unpaidInvoices = this.getUnpaid(transactions);
|
|
24
24
|
invoicesByState.add(SoleInvoiceStateEnum.FULLY_PAID, this.getPaid(transactions));
|
|
25
25
|
invoicesByState.add(SoleInvoiceStateEnum.PAID, this.filterBy('id', transactions.filterByFinancialYear('date').map(transaction => transaction.invoiceId)));
|
|
26
|
-
invoicesByState.add(SoleInvoiceStatusesEnum.OPEN, invoicesByState.get(SoleInvoiceStatusesEnum.OPEN).remove(invoicesByState.get(SoleInvoiceStateEnum.
|
|
26
|
+
invoicesByState.add(SoleInvoiceStatusesEnum.OPEN, invoicesByState.get(SoleInvoiceStatusesEnum.OPEN).remove(invoicesByState.get(SoleInvoiceStateEnum.FULLY_PAID).toArray()));
|
|
27
27
|
invoicesByState.add(SoleInvoiceStateEnum.OVERDUE, unpaidInvoices.getOverdue());
|
|
28
28
|
return invoicesByState;
|
|
29
29
|
}
|
|
@@ -34,4 +34,4 @@ export class SoleInvoiceCollection extends Collection {
|
|
|
34
34
|
return flatten(this.map(invoice => invoice.allocate(bankTransaction, amount)));
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29sZS1pbnZvaWNlLmNvbGxlY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvY29sbGVjdGlvbnMvc29sZS9zb2xlLWludm9pY2UuY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTNDLE9BQU8sT0FBTyxNQUFNLGdCQUFnQixDQUFDO0FBRXJDLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSx1QkFBdUIsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRy9FLE1BQU0sT0FBTyxxQkFBc0IsU0FBUSxVQUF1QjtJQUNoRSxVQUFVO1FBQ1IsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsT0FBb0IsRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUM7SUFDcEUsQ0FBQztJQUVELE9BQU8sQ0FBQyxZQUFtQztRQUN6QyxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsVUFBVSxHQUFHLENBQUM7ZUFDL0MsWUFBWSxDQUFDLG1CQUFtQixFQUFFLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsSUFBSSxPQUFPLENBQUMsVUFBVSxDQUM1RSxDQUFDO0lBQ0osQ0FBQztJQUVELFNBQVMsQ0FBQyxZQUFtQztRQUMzQyxPQUFPLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsbUJBQW1CLEVBQUUsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQztJQUNuSCxDQUFDO0lBRUQsT0FBTztRQUNMLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLE9BQW9CLEVBQUUsRUFBRSxDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDO0lBQ2pFLENBQUM7SUFFRCxrQkFBa0I7UUFDaEIsT0FBTyxPQUFPLENBQ1osSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQ3hELENBQUM7SUFDSixDQUFDO0lBRUQsWUFBWSxDQUFDLFlBQW1DO1FBQzlDLE1BQU0sZUFBZSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDL0MsTUFBTSxjQUFjLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUVwRCxlQUFlLENBQUMsR0FBRyxDQUFDLG9CQUFvQixDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUM7UUFDakYsZUFBZSxDQUFDLEdBQUcsQ0FDakIsb0JBQW9CLENBQUMsSUFBSSxFQUN6QixJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxZQUFZLENBQUMscUJBQXFCLENBQUMsTUFBTSxDQUFDLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsV0FBVyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQzFHLENBQUM7UUFDRixlQUFlLENBQUMsR0FBRyxDQUNqQix1QkFBdUIsQ0FBQyxJQUFJLEVBQzVCLGVBQWUsQ0FBQyxHQUFHLENBQUMsdUJBQXVCLENBQUMsSUFBSSxDQUFDLENBQUMsTUFBTSxDQUFDLGVBQWUsQ0FBQyxHQUFHLENBQUMsb0JBQW9CLENBQUMsVUFBVSxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FDekgsQ0FBQztRQUNGLGVBQWUsQ0FBQyxHQUFHLENBQUMsb0JBQW9CLENBQUMsT0FBTyxFQUFFLGNBQWMsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUFDO1FBRS9FLE9BQU8sZUFBZSxDQUFBO0lBQ3hCLENBQUM7SUFFRCxlQUFlLENBQUMsWUFBbUM7UUFDakQsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxHQUFHLFlBQVksQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQzFGLENBQUM7SUFFRCxRQUFRLENBQUMsZUFBZ0MsRUFBRSxNQUFlO1FBQ3hELE9BQU8sT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLGVBQWUsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDakYsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29sbGVjdGlvbiB9IGZyb20gJy4uL2NvbGxlY3Rpb24nO1xuaW1wb3J0IHsgQmFua1RyYW5zYWN0aW9uLCBTb2xlSW52b2ljZSwgVHJhbnNhY3Rpb24gfSBmcm9tICcuLi8uLi9tb2RlbHMnO1xuaW1wb3J0IGZsYXR0ZW4gZnJvbSAnbG9kYXNoL2ZsYXR0ZW4nO1xuaW1wb3J0IHsgVHJhbnNhY3Rpb25Db2xsZWN0aW9uIH0gZnJvbSAnLi4vdHJhbnNhY3Rpb24nO1xuaW1wb3J0IHsgU29sZUludm9pY2VTdGF0ZUVudW0sIFNvbGVJbnZvaWNlU3RhdHVzZXNFbnVtIH0gZnJvbSAnLi4vLi4vZGIvRW51bXMnO1xuaW1wb3J0IHsgQ29sbGVjdGlvbkRpY3Rpb25hcnkgfSBmcm9tICcuLi9jb2xsZWN0aW9uLWRpY3Rpb25hcnknO1xuXG5leHBvcnQgY2xhc3MgU29sZUludm9pY2VDb2xsZWN0aW9uIGV4dGVuZHMgQ29sbGVjdGlvbjxTb2xlSW52b2ljZT4ge1xuICBnZXRPdmVyZHVlKCk6IHRoaXMge1xuICAgIHJldHVybiB0aGlzLmZpbHRlcigoaW52b2ljZTogU29sZUludm9pY2UpID0+IGludm9pY2UuaXNPdmVyZHVlKCkpO1xuICB9XG5cbiAgZ2V0UGFpZCh0cmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbik6IHRoaXMge1xuICAgIHJldHVybiB0aGlzLmZpbHRlcihpbnZvaWNlID0+IGludm9pY2UuZ3Jvc3NQcmljZSA+IDBcbiAgICAgICYmIHRyYW5zYWN0aW9ucy5nZXRBbW91bnRQZXJJbnZvaWNlKCkuZ2V0KGludm9pY2UuaWQpID49IGludm9pY2UuZ3Jvc3NQcmljZVxuICAgICk7XG4gIH1cblxuICBnZXRVbnBhaWQodHJhbnNhY3Rpb25zOiBUcmFuc2FjdGlvbkNvbGxlY3Rpb24pOiB0aGlzIHtcbiAgICByZXR1cm4gdGhpcy5nZXRPcGVuKCkuZmlsdGVyKGludm9pY2UgPT4gdHJhbnNhY3Rpb25zLmdldEFtb3VudFBlckludm9pY2UoKS5nZXQoaW52b2ljZS5pZCkgPCBpbnZvaWNlLmdyb3NzUHJpY2UpO1xuICB9XG5cbiAgZ2V0T3BlbigpOiB0aGlzIHtcbiAgICByZXR1cm4gdGhpcy5maWx0ZXIoKGludm9pY2U6IFNvbGVJbnZvaWNlKSA9PiBpbnZvaWNlLmlzT3BlbigpKTtcbiAgfVxuXG4gIGdldEludm9pY2VJdGVtc0lkcygpOiBudW1iZXJbXSB7XG4gICAgcmV0dXJuIGZsYXR0ZW4oXG4gICAgICB0aGlzLm1hcChpbnZvaWNlID0+IGludm9pY2UuaXRlbXMubWFwKGl0ZW0gPT4gaXRlbS5pZCkpXG4gICAgKTtcbiAgfVxuXG4gIGdyb3VwQnlTdGF0ZSh0cmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbik6IENvbGxlY3Rpb25EaWN0aW9uYXJ5PFNvbGVJbnZvaWNlQ29sbGVjdGlvbj4ge1xuICAgIGNvbnN0IGludm9pY2VzQnlTdGF0ZSA9IHRoaXMuZ3JvdXBCeSgnc3RhdHVzJyk7XG4gICAgY29uc3QgdW5wYWlkSW52b2ljZXMgPSB0aGlzLmdldFVucGFpZCh0cmFuc2FjdGlvbnMpO1xuXG4gICAgaW52b2ljZXNCeVN0YXRlLmFkZChTb2xlSW52b2ljZVN0YXRlRW51bS5GVUxMWV9QQUlELCB0aGlzLmdldFBhaWQodHJhbnNhY3Rpb25zKSk7XG4gICAgaW52b2ljZXNCeVN0YXRlLmFkZChcbiAgICAgIFNvbGVJbnZvaWNlU3RhdGVFbnVtLlBBSUQsXG4gICAgICB0aGlzLmZpbHRlckJ5KCdpZCcsIHRyYW5zYWN0aW9ucy5maWx0ZXJCeUZpbmFuY2lhbFllYXIoJ2RhdGUnKS5tYXAodHJhbnNhY3Rpb24gPT4gdHJhbnNhY3Rpb24uaW52b2ljZUlkKSlcbiAgICApO1xuICAgIGludm9pY2VzQnlTdGF0ZS5hZGQoXG4gICAgICBTb2xlSW52b2ljZVN0YXR1c2VzRW51bS5PUEVOLFxuICAgICAgaW52b2ljZXNCeVN0YXRlLmdldChTb2xlSW52b2ljZVN0YXR1c2VzRW51bS5PUEVOKS5yZW1vdmUoaW52b2ljZXNCeVN0YXRlLmdldChTb2xlSW52b2ljZVN0YXRlRW51bS5GVUxMWV9QQUlEKS50b0FycmF5KCkpXG4gICAgKTtcbiAgICBpbnZvaWNlc0J5U3RhdGUuYWRkKFNvbGVJbnZvaWNlU3RhdGVFbnVtLk9WRVJEVUUsIHVucGFpZEludm9pY2VzLmdldE92ZXJkdWUoKSk7XG5cbiAgICByZXR1cm4gaW52b2ljZXNCeVN0YXRlXG4gIH1cblxuICBnZXRVbnBhaWRBbW91bnQodHJhbnNhY3Rpb25zOiBUcmFuc2FjdGlvbkNvbGxlY3Rpb24pOiBudW1iZXIge1xuICAgIHJldHVybiB0aGlzLnN1bUJ5KCdncm9zc1ByaWNlJykgLSB0cmFuc2FjdGlvbnMuZ2V0QnlJbnZvaWNlcyh0aGlzKS5zdW1CeSgnZ3Jvc3NBbW91bnQnKTtcbiAgfVxuXG4gIGFsbG9jYXRlKGJhbmtUcmFuc2FjdGlvbjogQmFua1RyYW5zYWN0aW9uLCBhbW91bnQ/OiBudW1iZXIpOiBUcmFuc2FjdGlvbltdIHtcbiAgICByZXR1cm4gZmxhdHRlbih0aGlzLm1hcChpbnZvaWNlID0+IGludm9pY2UuYWxsb2NhdGUoYmFua1RyYW5zYWN0aW9uLCBhbW91bnQpKSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -2,8 +2,10 @@ export var TimezoneEnum;
|
|
|
2
2
|
(function (TimezoneEnum) {
|
|
3
3
|
TimezoneEnum["PERTH"] = "Australia/Perth";
|
|
4
4
|
TimezoneEnum["EUCLA"] = "Australia/Eucla";
|
|
5
|
+
TimezoneEnum["DARWIN"] = "Australia/Darwin";
|
|
6
|
+
TimezoneEnum["BRISBANE"] = "Australia/Brisbane";
|
|
5
7
|
TimezoneEnum["ADELAIDE"] = "Australia/Adelaide";
|
|
6
8
|
TimezoneEnum["SYDNEY"] = "Australia/Sydney";
|
|
7
9
|
TimezoneEnum["LORD_HOWE"] = "Australia/Lord_Howe";
|
|
8
10
|
})(TimezoneEnum || (TimezoneEnum = {}));
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGltZXpvbmUuZW51bS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9kYi9FbnVtcy9jbGllbnQvdGltZXpvbmUuZW51bS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLENBQU4sSUFBWSxZQVFYO0FBUkQsV0FBWSxZQUFZO0lBQ3RCLHlDQUF5QixDQUFBO0lBQ3pCLHlDQUF5QixDQUFBO0lBQ3pCLDJDQUEyQixDQUFBO0lBQzNCLCtDQUErQixDQUFBO0lBQy9CLCtDQUErQixDQUFBO0lBQy9CLDJDQUEyQixDQUFBO0lBQzNCLGlEQUFpQyxDQUFBO0FBQ25DLENBQUMsRUFSVyxZQUFZLEtBQVosWUFBWSxRQVF2QiIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBlbnVtIFRpbWV6b25lRW51bSB7XG4gIFBFUlRIID0gJ0F1c3RyYWxpYS9QZXJ0aCcsXG4gIEVVQ0xBID0gJ0F1c3RyYWxpYS9FdWNsYScsXG4gIERBUldJTiA9ICdBdXN0cmFsaWEvRGFyd2luJyxcbiAgQlJJU0JBTkUgPSAnQXVzdHJhbGlhL0JyaXNiYW5lJyxcbiAgQURFTEFJREUgPSAnQXVzdHJhbGlhL0FkZWxhaWRlJyxcbiAgU1lETkVZID0gJ0F1c3RyYWxpYS9TeWRuZXknLFxuICBMT1JEX0hPV0UgPSAnQXVzdHJhbGlhL0xvcmRfSG93ZScsXG59XG4iXX0=
|
|
@@ -12,7 +12,6 @@ export class TransactionForm extends TransactionBaseForm {
|
|
|
12
12
|
source: new UntypedFormControl(transaction.source || TransactionSourceEnum.BANK_TRANSACTION, Validators.required)
|
|
13
13
|
}));
|
|
14
14
|
this.get('date').addValidators([currentFinYearValidator()]);
|
|
15
|
-
console.log(transaction);
|
|
16
15
|
// convert child transactions to controls
|
|
17
16
|
transaction.transactions.map((transaction) => {
|
|
18
17
|
this.addTransactionControl(transaction);
|
|
@@ -60,4 +59,4 @@ export class TransactionForm extends TransactionBaseForm {
|
|
|
60
59
|
return super.submit(Object.assign(data, { transactions: this.buildTransactions(this.currentValue) }), true);
|
|
61
60
|
}
|
|
62
61
|
}
|
|
63
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"transaction.form.js","sourceRoot":"","sources":["../../../../../../../projects/tt-core/src/lib/forms/transaction/transaction.form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAyB,MAAM,cAAc,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpG,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAmB,gBAAgB,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACrH,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAE/E,MAAM,OAAO,eAAgB,SAAQ,mBAAgC;IACnE,YAAY,WAAwB,EAAE,gBAAyB,EAAE,WAAoC,EAAE,WAEnG,EAAE;QACJ,KAAK,CAAC,WAAW,EAAE,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC3D,YAAY,EAAE,IAAI,gBAAgB,CAAC,EAAE,CAAC;YACtC,MAAM,EAAE,IAAI,kBAAkB,CAAC,WAAW,CAAC,MAAM,IAAI,qBAAqB,CAAC,gBAAgB,EAAE,UAAU,CAAC,QAAQ,CAAC;SAClH,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC,uBAAuB,EAAE,CAAC,CAAC,CAAC;QAE5D,yCAAyC;QACzC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,WAAwB,EAAQ,EAAE;YAC9D,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,uDAAuD;QACvD,IAAI,WAAW,CAAC,QAAQ,EAAE;YACxB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,aAAa,CAC5B,gBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,qBAAqB,CAAC,CAC5F,CAAC;SACH;QAED,kFAAkF;QAClF,IAAI,CAAC,WAAW,CAAC,EAAE,IAAI,WAAW,CAAC,QAAQ,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,IAAI,WAAW,CAAC,QAAQ,EAAE,EAAE;YACzG,IAAI,CAAC,qBAAqB,EAAE,CAAC;SAC9B;QAED,gFAAgF;QAChF,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;SAC5B;IACH,CAAC;IAED,qBAAqB,CAAC,cAA2B,YAAY,CAAC,WAAW,EAAE,EAAE,CAAC;QAC5E,MAAM,SAAS,GAAqB,IAAI,gBAAgB,CAAC;YACvD,EAAE,EAAE,IAAI,kBAAkB,CAAC,WAAW,CAAC,EAAE,CAAC;YAC1C,aAAa,EAAE,IAAI,kBAAkB,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,qBAAqB,EAAE,CAAC,CAAC;YAChH,MAAM,EAAE,IAAI,kBAAkB,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;SAC1E,CAAC,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,cAAc,CAAsB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACjE,CAAC;IAED,wBAAwB,CAAC,KAAa;QACnC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAsB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACjE,CAAC;IAED;;;OAGG;IACH,iBAAiB,CAAC,WAAwB;QACxC,OAAO,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,gBAA6B,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CACxF;YACE,WAAW,EAAE,gBAAgB,CAAC,aAAa,EAAE,IAAI;YACjD,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,YAAY,EAAE,CAAC,WAAW,CAAC,YAAY,GAAG,gBAAgB,CAAC,aAAa,EAAE,cAAc,CAAC,GAAG,GAAG;YAC/F,MAAM,EAAE,qBAAqB,CAAC,gBAAgB;YAC9C,YAAY,EAAE,WAAW,CAAC,YAAY;YACtC,QAAQ,EAAE,WAAW,CAAC,QAAQ;SAC/B,EACD,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,KAAK,gBAAgB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAC9F,gBAAgB,CACjB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,OAAe,EAAE;QACtB,OAAO,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAC9G,CAAC;CACF","sourcesContent":["import { Transaction, TransactionAllocation } from '../../models';\nimport { TransactionBaseForm } from './transaction-base.form';\nimport { autocompleteValidator, currentFinYearValidator, minDateValidator } from '../../validators';\nimport { MessagesEnum } from './messages.enum';\nimport { AbstractControl, UntypedFormArray, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';\nimport { plainToClass } from 'class-transformer';\nimport { TransactionSourceEnum } from '../../db/Enums/transaction-source.enum';\n\nexport class TransactionForm extends TransactionBaseForm<Transaction> {\n  constructor(transaction: Transaction, registeredForGst: boolean, allocations: TransactionAllocation[], controls: {\n    [key: string]: AbstractControl\n  } = {}) {\n    super(transaction, registeredForGst, Object.assign(controls, {\n      transactions: new UntypedFormArray([]),\n      source: new UntypedFormControl(transaction.source || TransactionSourceEnum.BANK_TRANSACTION, Validators.required)\n    }));\n    this.get('date').addValidators([currentFinYearValidator()]);\n\n    // convert child transactions to controls\n    transaction.transactions.map((transaction: Transaction): void => {\n      this.addTransactionControl(transaction);\n    });\n\n    // forbid to add transactions before property ownership\n    if (transaction.property) {\n      this.get('date').addValidators(\n        minDateValidator(transaction.property.myShare.fromDate, MessagesEnum.DATE_VALIDATION_ERROR)\n      );\n    }\n\n    // property income usually comes with fees, add empty control for new transactions\n    if (!transaction.id && transaction.property && !transaction.transactions.length && transaction.isCredit()) {\n      this.addTransactionControl();\n    }\n\n    // forbid to edit amount for allocated transactions to prevent wrong allocations\n    if (allocations.length) {\n      this.get('amount').disable();\n      this.get('date').disable();\n    }\n  }\n\n  addTransactionControl(transaction: Transaction = plainToClass(Transaction, {})): void {\n    const formGroup: UntypedFormGroup = new UntypedFormGroup({\n      id: new UntypedFormControl(transaction.id),\n      chartAccounts: new UntypedFormControl(transaction.chartAccounts, [Validators.required, autocompleteValidator()]),\n      amount: new UntypedFormControl(transaction.amount, [Validators.required]),\n    });\n\n    (this.get('transactions') as UntypedFormArray).push(formGroup);\n  }\n\n  removeTransactionControl(index: number): void {\n    (this.get('transactions') as UntypedFormArray).removeAt(index);\n  }\n\n  /**\n   * income transactions might include adjustments (child transactions), like tips or fees.\n   * Adjustments inherit most of the fields from parent transaction\n   */\n  buildTransactions(transaction: Transaction): Transaction[] {\n    return this.get('transactions').value.map((childTransaction: Transaction) => Object.assign(\n      {\n        description: childTransaction.chartAccounts?.name,\n        date: transaction.date,\n        claimPercent: (transaction.claimPercent * childTransaction.chartAccounts?.taxablePercent) / 100,\n        source: TransactionSourceEnum.BANK_TRANSACTION,\n        incomeSource: transaction.incomeSource,\n        property: transaction.property\n      },\n      this.model.transactions.find((transaction) => transaction.id === childTransaction['id']) || {},\n      childTransaction,\n    ));\n  }\n\n  submit(data: object = {}): Transaction {\n    return super.submit(Object.assign(data, { transactions: this.buildTransactions(this.currentValue) }), true);\n  }\n}\n"]}
|
|
@@ -857,6 +857,8 @@ var TimezoneEnum;
|
|
|
857
857
|
(function (TimezoneEnum) {
|
|
858
858
|
TimezoneEnum["PERTH"] = "Australia/Perth";
|
|
859
859
|
TimezoneEnum["EUCLA"] = "Australia/Eucla";
|
|
860
|
+
TimezoneEnum["DARWIN"] = "Australia/Darwin";
|
|
861
|
+
TimezoneEnum["BRISBANE"] = "Australia/Brisbane";
|
|
860
862
|
TimezoneEnum["ADELAIDE"] = "Australia/Adelaide";
|
|
861
863
|
TimezoneEnum["SYDNEY"] = "Australia/Sydney";
|
|
862
864
|
TimezoneEnum["LORD_HOWE"] = "Australia/Lord_Howe";
|
|
@@ -8284,7 +8286,7 @@ class SoleInvoiceCollection extends Collection {
|
|
|
8284
8286
|
const unpaidInvoices = this.getUnpaid(transactions);
|
|
8285
8287
|
invoicesByState.add(SoleInvoiceStateEnum.FULLY_PAID, this.getPaid(transactions));
|
|
8286
8288
|
invoicesByState.add(SoleInvoiceStateEnum.PAID, this.filterBy('id', transactions.filterByFinancialYear('date').map(transaction => transaction.invoiceId)));
|
|
8287
|
-
invoicesByState.add(SoleInvoiceStatusesEnum.OPEN, invoicesByState.get(SoleInvoiceStatusesEnum.OPEN).remove(invoicesByState.get(SoleInvoiceStateEnum.
|
|
8289
|
+
invoicesByState.add(SoleInvoiceStatusesEnum.OPEN, invoicesByState.get(SoleInvoiceStatusesEnum.OPEN).remove(invoicesByState.get(SoleInvoiceStateEnum.FULLY_PAID).toArray()));
|
|
8288
8290
|
invoicesByState.add(SoleInvoiceStateEnum.OVERDUE, unpaidInvoices.getOverdue());
|
|
8289
8291
|
return invoicesByState;
|
|
8290
8292
|
}
|
|
@@ -23706,7 +23708,6 @@ class TransactionForm extends TransactionBaseForm {
|
|
|
23706
23708
|
source: new UntypedFormControl(transaction.source || TransactionSourceEnum.BANK_TRANSACTION, Validators.required)
|
|
23707
23709
|
}));
|
|
23708
23710
|
this.get('date').addValidators([currentFinYearValidator()]);
|
|
23709
|
-
console.log(transaction);
|
|
23710
23711
|
// convert child transactions to controls
|
|
23711
23712
|
transaction.transactions.map((transaction) => {
|
|
23712
23713
|
this.addTransactionControl(transaction);
|