taxtank-core 0.33.22 → 0.33.24

Sign up to get free protection for your applications and to get access to all the features.
@@ -6,11 +6,8 @@ export class TransactionReportItemCollection extends Collection {
6
6
  const priorTransactionsByChartAccounts = priorTransactions.groupBy('chartAccounts.id');
7
7
  return new TransactionReportItemCollection(transactionsByChartAccounts.keys.map(chartAccountsId => new TransactionReportItem(transactionsByChartAccounts.get(chartAccountsId), priorTransactionsByChartAccounts.get(chartAccountsId))));
8
8
  }
9
- get months() {
10
- return this.first?.months.map((value, key) => this.reduce((sum, item) => sum + item.months[key], 0));
11
- }
12
9
  sumBy(path, abs = false) {
13
10
  return super.sumBy(path, abs);
14
11
  }
15
12
  }
16
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tcmVwb3J0LWl0ZW0uY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9jb2xsZWN0aW9ucy9yZXBvcnQvaW5jb21lLWV4cGVuc2UvdHJhbnNhY3Rpb24tcmVwb3J0LWl0ZW0uY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFHL0QsTUFBTSxPQUFPLCtCQUFnQyxTQUFRLFVBQWlDO0lBQ3BGLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxZQUFtQyxFQUFFLGlCQUF3QztRQUNuRyxNQUFNLDJCQUEyQixHQUFHLFlBQVksQ0FBQyxPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0FBQztRQUM3RSxNQUFNLGdDQUFnQyxHQUFHLGlCQUFpQixDQUFDLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO1FBRXZGLE9BQU8sSUFBSSwrQkFBK0IsQ0FBQywyQkFBMkIsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUM3RSxlQUFlLENBQUMsRUFBRSxDQUFDLElBQUkscUJBQXFCLENBQUMsMkJBQTJCLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxFQUFFLGdDQUFnQyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUN0SixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsSUFBSSxNQUFNO1FBQ1IsT0FBTyxJQUFJLENBQUMsS0FBSyxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxLQUFLLEVBQUUsR0FBRyxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsR0FBRyxFQUFFLElBQUksRUFBRSxFQUFFLENBQUMsR0FBRyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN2RyxDQUFDO0lBRUQsS0FBSyxDQUFDLElBQVksRUFBRSxHQUFHLEdBQUcsS0FBSztRQUM3QixPQUFPLEtBQUssQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQ2hDLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi9jb2xsZWN0aW9uJztcbmltcG9ydCB7IFRyYW5zYWN0aW9uUmVwb3J0SXRlbSB9IGZyb20gJy4uLy4uLy4uL21vZGVscy9yZXBvcnQnO1xuaW1wb3J0IHsgVHJhbnNhY3Rpb25Db2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vdHJhbnNhY3Rpb24nO1xuXG5leHBvcnQgY2xhc3MgVHJhbnNhY3Rpb25SZXBvcnRJdGVtQ29sbGVjdGlvbiBleHRlbmRzIENvbGxlY3Rpb248VHJhbnNhY3Rpb25SZXBvcnRJdGVtPiB7XG4gIHN0YXRpYyBmcm9tVHJhbnNhY3Rpb25zKHRyYW5zYWN0aW9uczogVHJhbnNhY3Rpb25Db2xsZWN0aW9uLCBwcmlvclRyYW5zYWN0aW9uczogVHJhbnNhY3Rpb25Db2xsZWN0aW9uKSB7XG4gICAgY29uc3QgdHJhbnNhY3Rpb25zQnlDaGFydEFjY291bnRzID0gdHJhbnNhY3Rpb25zLmdyb3VwQnkoJ2NoYXJ0QWNjb3VudHMuaWQnKTtcbiAgICBjb25zdCBwcmlvclRyYW5zYWN0aW9uc0J5Q2hhcnRBY2NvdW50cyA9IHByaW9yVHJhbnNhY3Rpb25zLmdyb3VwQnkoJ2NoYXJ0QWNjb3VudHMuaWQnKTtcblxuICAgIHJldHVybiBuZXcgVHJhbnNhY3Rpb25SZXBvcnRJdGVtQ29sbGVjdGlvbih0cmFuc2FjdGlvbnNCeUNoYXJ0QWNjb3VudHMua2V5cy5tYXAoXG4gICAgICBjaGFydEFjY291bnRzSWQgPT4gbmV3IFRyYW5zYWN0aW9uUmVwb3J0SXRlbSh0cmFuc2FjdGlvbnNCeUNoYXJ0QWNjb3VudHMuZ2V0KGNoYXJ0QWNjb3VudHNJZCksIHByaW9yVHJhbnNhY3Rpb25zQnlDaGFydEFjY291bnRzLmdldChjaGFydEFjY291bnRzSWQpKVxuICAgICkpO1xuICB9XG5cbiAgZ2V0IG1vbnRocygpOiBudW1iZXJbXSB7XG4gICAgcmV0dXJuIHRoaXMuZmlyc3Q/Lm1vbnRocy5tYXAoKHZhbHVlLCBrZXkpID0+IHRoaXMucmVkdWNlKChzdW0sIGl0ZW0pID0+IHN1bSArIGl0ZW0ubW9udGhzW2tleV0sIDApKTtcbiAgfVxuXG4gIHN1bUJ5KHBhdGg6IHN0cmluZywgYWJzID0gZmFsc2UpOiBudW1iZXIge1xuICAgIHJldHVybiBzdXBlci5zdW1CeShwYXRoLCBhYnMpO1xuICB9XG59XG4iXX0=
13
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tcmVwb3J0LWl0ZW0uY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9jb2xsZWN0aW9ucy9yZXBvcnQvaW5jb21lLWV4cGVuc2UvdHJhbnNhY3Rpb24tcmVwb3J0LWl0ZW0uY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFHL0QsTUFBTSxPQUFPLCtCQUFnQyxTQUFRLFVBQWlDO0lBQ3BGLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxZQUFtQyxFQUFFLGlCQUF3QztRQUNuRyxNQUFNLDJCQUEyQixHQUFHLFlBQVksQ0FBQyxPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0FBQztRQUM3RSxNQUFNLGdDQUFnQyxHQUFHLGlCQUFpQixDQUFDLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO1FBRXZGLE9BQU8sSUFBSSwrQkFBK0IsQ0FBQywyQkFBMkIsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUM3RSxlQUFlLENBQUMsRUFBRSxDQUFDLElBQUkscUJBQXFCLENBQUMsMkJBQTJCLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxFQUFFLGdDQUFnQyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUN0SixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsS0FBSyxDQUFDLElBQVksRUFBRSxHQUFHLEdBQUcsS0FBSztRQUM3QixPQUFPLEtBQUssQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQ2hDLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi9jb2xsZWN0aW9uJztcbmltcG9ydCB7IFRyYW5zYWN0aW9uUmVwb3J0SXRlbSB9IGZyb20gJy4uLy4uLy4uL21vZGVscy9yZXBvcnQnO1xuaW1wb3J0IHsgVHJhbnNhY3Rpb25Db2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vdHJhbnNhY3Rpb24nO1xuXG5leHBvcnQgY2xhc3MgVHJhbnNhY3Rpb25SZXBvcnRJdGVtQ29sbGVjdGlvbiBleHRlbmRzIENvbGxlY3Rpb248VHJhbnNhY3Rpb25SZXBvcnRJdGVtPiB7XG4gIHN0YXRpYyBmcm9tVHJhbnNhY3Rpb25zKHRyYW5zYWN0aW9uczogVHJhbnNhY3Rpb25Db2xsZWN0aW9uLCBwcmlvclRyYW5zYWN0aW9uczogVHJhbnNhY3Rpb25Db2xsZWN0aW9uKSB7XG4gICAgY29uc3QgdHJhbnNhY3Rpb25zQnlDaGFydEFjY291bnRzID0gdHJhbnNhY3Rpb25zLmdyb3VwQnkoJ2NoYXJ0QWNjb3VudHMuaWQnKTtcbiAgICBjb25zdCBwcmlvclRyYW5zYWN0aW9uc0J5Q2hhcnRBY2NvdW50cyA9IHByaW9yVHJhbnNhY3Rpb25zLmdyb3VwQnkoJ2NoYXJ0QWNjb3VudHMuaWQnKTtcblxuICAgIHJldHVybiBuZXcgVHJhbnNhY3Rpb25SZXBvcnRJdGVtQ29sbGVjdGlvbih0cmFuc2FjdGlvbnNCeUNoYXJ0QWNjb3VudHMua2V5cy5tYXAoXG4gICAgICBjaGFydEFjY291bnRzSWQgPT4gbmV3IFRyYW5zYWN0aW9uUmVwb3J0SXRlbSh0cmFuc2FjdGlvbnNCeUNoYXJ0QWNjb3VudHMuZ2V0KGNoYXJ0QWNjb3VudHNJZCksIHByaW9yVHJhbnNhY3Rpb25zQnlDaGFydEFjY291bnRzLmdldChjaGFydEFjY291bnRzSWQpKVxuICAgICkpO1xuICB9XG5cbiAgc3VtQnkocGF0aDogc3RyaW5nLCBhYnMgPSBmYWxzZSk6IG51bWJlciB7XG4gICAgcmV0dXJuIHN1cGVyLnN1bUJ5KHBhdGgsIGFicyk7XG4gIH1cbn1cbiJdfQ==
@@ -1,2 +1,2 @@
1
- export const MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec', 'Jan'];
2
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9udGhzLmNvbnN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL21vZGVscy9maW5hbmNpYWwteWVhci9tb250aHMuY29uc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxDQUFDLE1BQU0sTUFBTSxHQUFhLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsS0FBSyxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgY29uc3QgTU9OVEhTOiBzdHJpbmdbXSA9IFsnSmFuJywgJ0ZlYicsICdNYXInLCAnQXByJywgJ01heScsICdKdW4nLCAnSnVsJywgJ0F1ZycsICdTZXAnLCAnT2N0JywgJ05vdicsICdEZWMnLCAnSmFuJ107XG4iXX0=
1
+ export const MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
2
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9udGhzLmNvbnN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL21vZGVscy9maW5hbmNpYWwteWVhci9tb250aHMuY29uc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxDQUFDLE1BQU0sTUFBTSxHQUFhLENBQUMsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBjb25zdCBNT05USFM6IHN0cmluZ1tdID0gWydKYW4nLCAnRmViJywgJ01hcicsICdBcHInLCAnTWF5JywgJ0p1bicsICdKdWwnLCAnQXVnJywgJ1NlcCcsICdPY3QnLCAnTm92JywgJ0RlYyddO1xuIl19
@@ -1,17 +1,16 @@
1
1
  import { FinancialYear } from '../../financial-year';
2
2
  export class TransactionReportItem {
3
3
  constructor(transactions, priorTransactions) {
4
- this.months = [];
5
4
  const firstTransaction = transactions.first;
6
- this.tankType = firstTransaction.tankType;
7
- this.category = firstTransaction.chartAccounts.name;
5
+ this.category = firstTransaction.chartAccounts.category;
6
+ this.name = firstTransaction.chartAccounts.name;
8
7
  new FinancialYear().getPastMonths().forEach(month => {
9
- this.months.push(transactions.getByMonth(month).sumBy('amount'));
8
+ this[month] = transactions.getByMonth(month).sumBy('grossAmount');
10
9
  });
11
- this.amount = transactions.sumBy('amount');
12
- this.claimAmount = transactions.sumBy('claimAmount');
13
- this.priorAmount = priorTransactions.sumBy('amount');
14
- this.priorClaimAmount = priorTransactions.sumBy('claimAmount');
10
+ this.amount = transactions.sumBy('grossAmount');
11
+ this.claimAmount = transactions.sumBy('grossClaimAmount');
12
+ this.priorAmount = priorTransactions.sumBy('grossAmount');
13
+ this.priorClaimAmount = priorTransactions.sumBy('grossClaimAmount');
15
14
  }
16
15
  }
17
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tcmVwb3J0LWl0ZW0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvbW9kZWxzL3JlcG9ydC9pbmNvbWUtZXhwZW5zZS90cmFuc2FjdGlvbi1yZXBvcnQtaXRlbS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFHckQsTUFBTSxPQUFPLHFCQUFxQjtJQVNoQyxZQUFZLFlBQW1DLEVBQUUsaUJBQXdDO1FBTnpGLFdBQU0sR0FBYSxFQUFFLENBQUM7UUFPcEIsTUFBTSxnQkFBZ0IsR0FBRyxZQUFZLENBQUMsS0FBSyxDQUFDO1FBQzVDLElBQUksQ0FBQyxRQUFRLEdBQUcsZ0JBQWdCLENBQUMsUUFBUSxDQUFDO1FBQzFDLElBQUksQ0FBQyxRQUFRLEdBQUcsZ0JBQWdCLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQztRQUNwRCxJQUFJLGFBQWEsRUFBRSxDQUFDLGFBQWEsRUFBRSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRTtZQUNsRCxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBQ25FLENBQUMsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLE1BQU0sR0FBRyxZQUFZLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQzNDLElBQUksQ0FBQyxXQUFXLEdBQUcsWUFBWSxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNyRCxJQUFJLENBQUMsV0FBVyxHQUFHLGlCQUFpQixDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNyRCxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsaUJBQWlCLENBQUMsS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQ2pFLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFRyYW5zYWN0aW9uQ29sbGVjdGlvbiB9IGZyb20gJy4uLy4uLy4uL2NvbGxlY3Rpb25zJztcbmltcG9ydCB7IEZpbmFuY2lhbFllYXIgfSBmcm9tICcuLi8uLi9maW5hbmNpYWwteWVhcic7XG5pbXBvcnQgeyBUYW5rVHlwZUVudW0gfSBmcm9tICcuLi8uLi8uLi9kYi9FbnVtcy90YW5rLXR5cGUuZW51bSc7XG5cbmV4cG9ydCBjbGFzcyBUcmFuc2FjdGlvblJlcG9ydEl0ZW0ge1xuICB0YW5rVHlwZTogVGFua1R5cGVFbnVtO1xuICBjYXRlZ29yeTogc3RyaW5nO1xuICBtb250aHM6IG51bWJlcltdID0gW107XG4gIGFtb3VudDogbnVtYmVyO1xuICBjbGFpbUFtb3VudDogbnVtYmVyO1xuICBwcmlvckFtb3VudDogbnVtYmVyO1xuICBwcmlvckNsYWltQW1vdW50OiBudW1iZXI7XG5cbiAgY29uc3RydWN0b3IodHJhbnNhY3Rpb25zOiBUcmFuc2FjdGlvbkNvbGxlY3Rpb24sIHByaW9yVHJhbnNhY3Rpb25zOiBUcmFuc2FjdGlvbkNvbGxlY3Rpb24pIHtcbiAgICBjb25zdCBmaXJzdFRyYW5zYWN0aW9uID0gdHJhbnNhY3Rpb25zLmZpcnN0O1xuICAgIHRoaXMudGFua1R5cGUgPSBmaXJzdFRyYW5zYWN0aW9uLnRhbmtUeXBlO1xuICAgIHRoaXMuY2F0ZWdvcnkgPSBmaXJzdFRyYW5zYWN0aW9uLmNoYXJ0QWNjb3VudHMubmFtZTtcbiAgICBuZXcgRmluYW5jaWFsWWVhcigpLmdldFBhc3RNb250aHMoKS5mb3JFYWNoKG1vbnRoID0+IHtcbiAgICAgIHRoaXMubW9udGhzLnB1c2godHJhbnNhY3Rpb25zLmdldEJ5TW9udGgobW9udGgpLnN1bUJ5KCdhbW91bnQnKSk7XG4gICAgfSk7XG4gICAgdGhpcy5hbW91bnQgPSB0cmFuc2FjdGlvbnMuc3VtQnkoJ2Ftb3VudCcpO1xuICAgIHRoaXMuY2xhaW1BbW91bnQgPSB0cmFuc2FjdGlvbnMuc3VtQnkoJ2NsYWltQW1vdW50Jyk7XG4gICAgdGhpcy5wcmlvckFtb3VudCA9IHByaW9yVHJhbnNhY3Rpb25zLnN1bUJ5KCdhbW91bnQnKTtcbiAgICB0aGlzLnByaW9yQ2xhaW1BbW91bnQgPSBwcmlvclRyYW5zYWN0aW9ucy5zdW1CeSgnY2xhaW1BbW91bnQnKTtcbiAgfVxufVxuIl19
16
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tcmVwb3J0LWl0ZW0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvbW9kZWxzL3JlcG9ydC9pbmNvbWUtZXhwZW5zZS90cmFuc2FjdGlvbi1yZXBvcnQtaXRlbS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFHckQsTUFBTSxPQUFPLHFCQUFxQjtJQVFoQyxZQUFZLFlBQW1DLEVBQUUsaUJBQXdDO1FBQ3ZGLE1BQU0sZ0JBQWdCLEdBQUcsWUFBWSxDQUFDLEtBQUssQ0FBQztRQUM1QyxJQUFJLENBQUMsUUFBUSxHQUFHLGdCQUFnQixDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUM7UUFDeEQsSUFBSSxDQUFDLElBQUksR0FBRyxnQkFBZ0IsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDO1FBQ2hELElBQUksYUFBYSxFQUFFLENBQUMsYUFBYSxFQUFFLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQ2xELElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxZQUFZLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNwRSxDQUFDLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxNQUFNLEdBQUcsWUFBWSxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNoRCxJQUFJLENBQUMsV0FBVyxHQUFHLFlBQVksQ0FBQyxLQUFLLENBQUMsa0JBQWtCLENBQUMsQ0FBQztRQUMxRCxJQUFJLENBQUMsV0FBVyxHQUFHLGlCQUFpQixDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUMxRCxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsaUJBQWlCLENBQUMsS0FBSyxDQUFDLGtCQUFrQixDQUFDLENBQUM7SUFDdEUsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVHJhbnNhY3Rpb25Db2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vLi4vY29sbGVjdGlvbnMnO1xuaW1wb3J0IHsgRmluYW5jaWFsWWVhciB9IGZyb20gJy4uLy4uL2ZpbmFuY2lhbC15ZWFyJztcbmltcG9ydCB7IENoYXJ0QWNjb3VudHNDYXRlZ29yeUVudW0gfSBmcm9tICcuLi8uLi8uLi9kYi9FbnVtcyc7XG5cbmV4cG9ydCBjbGFzcyBUcmFuc2FjdGlvblJlcG9ydEl0ZW0ge1xuICBjYXRlZ29yeTogQ2hhcnRBY2NvdW50c0NhdGVnb3J5RW51bTtcbiAgbmFtZTogc3RyaW5nO1xuICBhbW91bnQ6IG51bWJlcjtcbiAgY2xhaW1BbW91bnQ6IG51bWJlcjtcbiAgcHJpb3JBbW91bnQ6IG51bWJlcjtcbiAgcHJpb3JDbGFpbUFtb3VudDogbnVtYmVyO1xuXG4gIGNvbnN0cnVjdG9yKHRyYW5zYWN0aW9uczogVHJhbnNhY3Rpb25Db2xsZWN0aW9uLCBwcmlvclRyYW5zYWN0aW9uczogVHJhbnNhY3Rpb25Db2xsZWN0aW9uKSB7XG4gICAgY29uc3QgZmlyc3RUcmFuc2FjdGlvbiA9IHRyYW5zYWN0aW9ucy5maXJzdDtcbiAgICB0aGlzLmNhdGVnb3J5ID0gZmlyc3RUcmFuc2FjdGlvbi5jaGFydEFjY291bnRzLmNhdGVnb3J5O1xuICAgIHRoaXMubmFtZSA9IGZpcnN0VHJhbnNhY3Rpb24uY2hhcnRBY2NvdW50cy5uYW1lO1xuICAgIG5ldyBGaW5hbmNpYWxZZWFyKCkuZ2V0UGFzdE1vbnRocygpLmZvckVhY2gobW9udGggPT4ge1xuICAgICAgdGhpc1ttb250aF0gPSB0cmFuc2FjdGlvbnMuZ2V0QnlNb250aChtb250aCkuc3VtQnkoJ2dyb3NzQW1vdW50Jyk7XG4gICAgfSk7XG4gICAgdGhpcy5hbW91bnQgPSB0cmFuc2FjdGlvbnMuc3VtQnkoJ2dyb3NzQW1vdW50Jyk7XG4gICAgdGhpcy5jbGFpbUFtb3VudCA9IHRyYW5zYWN0aW9ucy5zdW1CeSgnZ3Jvc3NDbGFpbUFtb3VudCcpO1xuICAgIHRoaXMucHJpb3JBbW91bnQgPSBwcmlvclRyYW5zYWN0aW9ucy5zdW1CeSgnZ3Jvc3NBbW91bnQnKTtcbiAgICB0aGlzLnByaW9yQ2xhaW1BbW91bnQgPSBwcmlvclRyYW5zYWN0aW9ucy5zdW1CeSgnZ3Jvc3NDbGFpbUFtb3VudCcpO1xuICB9XG59XG4iXX0=
@@ -1,9 +1,8 @@
1
1
  import { __decorate } from "tslib";
2
+ import { AbstractModel } from '../../db/Models';
2
3
  import { ReportItemDetails } from './report-item-details';
3
4
  import { Transform, Type } from 'class-transformer';
4
- import { ReportItemCollection } from '../../collections/tax-summary/report-item.collection';
5
- import { AbstractModel } from '../../db/Models/abstract-model';
6
- import { Collection } from '../../collections/collection';
5
+ import { Collection, ReportItemCollection } from '../../collections';
7
6
  /**
8
7
  * @Todo no base model - should be generated on backend side
9
8
  * Used in tax summary reports to show amounts relating to a tax return category entity and details of what this
@@ -26,4 +25,4 @@ __decorate([
26
25
  Type(() => ReportItemDetails),
27
26
  Transform(({ value }) => new Collection(value))
28
27
  ], ReportItem.prototype, "details", void 0);
29
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVwb3J0LWl0ZW0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvbW9kZWxzL3RheC1zdW1tYXJ5L3JlcG9ydC1pdGVtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFDQSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHNEQUFzRCxDQUFDO0FBQzVGLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUMvRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFFMUQ7Ozs7R0FJRztBQUNILE1BQU0sT0FBTyxVQUFXLFNBQVEsYUFBYTtJQWtCM0M7OztPQUdHO0lBQ0gsMkJBQTJCLENBQUMsSUFBWTtRQUN0QyxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsTUFBeUIsRUFBVyxFQUFFLENBQUMsTUFBTSxDQUFDLElBQUksS0FBSyxJQUFJLENBQUMsRUFBRSxNQUFNLElBQUksQ0FBQyxDQUFDO0lBQ3RHLENBQUM7Q0FDRjtBQWxCRztJQUZELElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxVQUFVLENBQUM7SUFDdEIsU0FBUyxDQUFDLENBQUMsRUFBQyxLQUFLLEVBQUMsRUFBRSxFQUFFLENBQUMsSUFBSSxvQkFBb0IsQ0FBQyxLQUFLLENBQUMsQ0FBQzt5Q0FDMUI7QUFTNUI7SUFGRCxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsaUJBQWlCLENBQUM7SUFDN0IsU0FBUyxDQUFDLENBQUMsRUFBQyxLQUFLLEVBQUMsRUFBRSxFQUFFLENBQUMsSUFBSSxVQUFVLENBQW9CLEtBQUssQ0FBQyxDQUFDOzJDQUN4QiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFRheFJldHVybkNhdGVnb3J5IH0gZnJvbSAnLi4vLi4vZGIvTW9kZWxzL3RheC1yZXR1cm4vdGF4LXJldHVybi1jYXRlZ29yeSc7XG5pbXBvcnQgeyBSZXBvcnRJdGVtRGV0YWlscyB9IGZyb20gJy4vcmVwb3J0LWl0ZW0tZGV0YWlscyc7XG5pbXBvcnQgeyBUcmFuc2Zvcm0sIFR5cGUgfSBmcm9tICdjbGFzcy10cmFuc2Zvcm1lcic7XG5pbXBvcnQgeyBSZXBvcnRJdGVtQ29sbGVjdGlvbiB9IGZyb20gJy4uLy4uL2NvbGxlY3Rpb25zL3RheC1zdW1tYXJ5L3JlcG9ydC1pdGVtLmNvbGxlY3Rpb24nO1xuaW1wb3J0IHsgQWJzdHJhY3RNb2RlbCB9IGZyb20gJy4uLy4uL2RiL01vZGVscy9hYnN0cmFjdC1tb2RlbCc7XG5pbXBvcnQgeyBDb2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vY29sbGVjdGlvbnMvY29sbGVjdGlvbic7XG5cbi8qKlxuICogQFRvZG8gbm8gYmFzZSBtb2RlbCAtIHNob3VsZCBiZSBnZW5lcmF0ZWQgb24gYmFja2VuZCBzaWRlXG4gKiBVc2VkIGluIHRheCBzdW1tYXJ5IHJlcG9ydHMgdG8gc2hvdyBhbW91bnRzIHJlbGF0aW5nIHRvIGEgdGF4IHJldHVybiBjYXRlZ29yeSBlbnRpdHkgYW5kIGRldGFpbHMgb2Ygd2hhdCB0aGlzXG4gKiBhbW91bnQgaXMgY29tcHJpc2VkIG9mLiBFeGFtcGxlIGhlcmUgc2hvd3MgYW4gYW1vdW50IG9mICQ5NTEuOTYgYW5kIGFsc28gZGV0YWlscyBvZiB3aGF0IHRoaXMgYW1vdW50IGlzIGNvbXByaXNlZCBvZjpcbiAqL1xuZXhwb3J0IGNsYXNzIFJlcG9ydEl0ZW0gZXh0ZW5kcyBBYnN0cmFjdE1vZGVsIHtcbiAgYW1vdW50OiBudW1iZXI7XG4gIHRheFJldHVybkNhdGVnb3J5OiBUYXhSZXR1cm5DYXRlZ29yeTtcbiAgdGl0bGU6IHN0cmluZztcblxuICBAVHlwZSgoKSA9PiBSZXBvcnRJdGVtKVxuICBAVHJhbnNmb3JtKCh7dmFsdWV9KSA9PiBuZXcgUmVwb3J0SXRlbUNvbGxlY3Rpb24odmFsdWUpKVxuICAgIGl0ZW1zOiBSZXBvcnRJdGVtQ29sbGVjdGlvbjtcblxuICAvKipcbiAgICogQFRvZG8gQWxleDogV2UgbmVlZCB0byBhcHBseSB0aGlzIGV2ZXJ5d2hlcmUgLSB0cmFuc2Zvcm0gYW4gYXJyYXkgaW50byBhIGNvbGxlY3Rpb24sXG4gICAqIGJ1dCBhdCB0aGUgbW9tZW50IHdlIGNhbid0IGRvIHRoaXMgZHVlIHRvIGluaGVyaXRhbmNlIGZyb20gdGhlIGJhc2UgbW9kZWwuXG4gICAqIFBvdGVudGlhbCBzb2x1dGlvbjogSW5oZXJpdCBDb2xsZWN0aW9uIGZyb20gQXJyYXlcbiAgICovXG4gIEBUeXBlKCgpID0+IFJlcG9ydEl0ZW1EZXRhaWxzKVxuICBAVHJhbnNmb3JtKCh7dmFsdWV9KSA9PiBuZXcgQ29sbGVjdGlvbjxSZXBvcnRJdGVtRGV0YWlscz4odmFsdWUpKVxuICAgIGRldGFpbHM6IENvbGxlY3Rpb248UmVwb3J0SXRlbURldGFpbHM+O1xuXG4gIC8qKlxuICAgKiBHZXQgYW1vdW50IGZvciBvbmUgaW5jb21lIHNvdXJjZVxuICAgKiBAcGFyYW0gbmFtZSBOYW1lIG9mIGluY29tZSBzb3VyY2UgZm9yIGZpbHRlclxuICAgKi9cbiAgZ2V0QW1vdW50QnlJbmNvbWVTb3VyY2VOYW1lKG5hbWU6IHN0cmluZyk6IG51bWJlciB7XG4gICAgcmV0dXJuIHRoaXMuZGV0YWlscy5maW5kKChkZXRhaWw6IFJlcG9ydEl0ZW1EZXRhaWxzKTogYm9vbGVhbiA9PiBkZXRhaWwubmFtZSA9PT0gbmFtZSk/LmFtb3VudCB8fCAwO1xuICB9XG59XG4iXX0=
28
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVwb3J0LWl0ZW0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvbW9kZWxzL3RheC1zdW1tYXJ5L3JlcG9ydC1pdGVtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxPQUFPLEVBQUUsYUFBYSxFQUFxQixNQUFNLGlCQUFpQixDQUFDO0FBQ25FLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzFELE9BQU8sRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDcEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxvQkFBb0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRXJFOzs7O0dBSUc7QUFDSCxNQUFNLE9BQU8sVUFBVyxTQUFRLGFBQWE7SUFrQjNDOzs7T0FHRztJQUNILDJCQUEyQixDQUFDLElBQVk7UUFDdEMsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLE1BQXlCLEVBQVcsRUFBRSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEtBQUssSUFBSSxDQUFDLEVBQUUsTUFBTSxJQUFJLENBQUMsQ0FBQztJQUN0RyxDQUFDO0NBQ0Y7QUFsQkM7SUFGQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsVUFBVSxDQUFDO0lBQ3RCLFNBQVMsQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxDQUFDLElBQUksb0JBQW9CLENBQUMsS0FBSyxDQUFDLENBQUM7eUNBQzlCO0FBUzVCO0lBRkMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLGlCQUFpQixDQUFDO0lBQzdCLFNBQVMsQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxDQUFDLElBQUksVUFBVSxDQUFvQixLQUFLLENBQUMsQ0FBQzsyQ0FDNUIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBYnN0cmFjdE1vZGVsLCBUYXhSZXR1cm5DYXRlZ29yeSB9IGZyb20gJy4uLy4uL2RiL01vZGVscyc7XG5pbXBvcnQgeyBSZXBvcnRJdGVtRGV0YWlscyB9IGZyb20gJy4vcmVwb3J0LWl0ZW0tZGV0YWlscyc7XG5pbXBvcnQgeyBUcmFuc2Zvcm0sIFR5cGUgfSBmcm9tICdjbGFzcy10cmFuc2Zvcm1lcic7XG5pbXBvcnQgeyBDb2xsZWN0aW9uLCBSZXBvcnRJdGVtQ29sbGVjdGlvbiB9IGZyb20gJy4uLy4uL2NvbGxlY3Rpb25zJztcblxuLyoqXG4gKiBAVG9kbyBubyBiYXNlIG1vZGVsIC0gc2hvdWxkIGJlIGdlbmVyYXRlZCBvbiBiYWNrZW5kIHNpZGVcbiAqIFVzZWQgaW4gdGF4IHN1bW1hcnkgcmVwb3J0cyB0byBzaG93IGFtb3VudHMgcmVsYXRpbmcgdG8gYSB0YXggcmV0dXJuIGNhdGVnb3J5IGVudGl0eSBhbmQgZGV0YWlscyBvZiB3aGF0IHRoaXNcbiAqIGFtb3VudCBpcyBjb21wcmlzZWQgb2YuIEV4YW1wbGUgaGVyZSBzaG93cyBhbiBhbW91bnQgb2YgJDk1MS45NiBhbmQgYWxzbyBkZXRhaWxzIG9mIHdoYXQgdGhpcyBhbW91bnQgaXMgY29tcHJpc2VkIG9mOlxuICovXG5leHBvcnQgY2xhc3MgUmVwb3J0SXRlbSBleHRlbmRzIEFic3RyYWN0TW9kZWwge1xuICBhbW91bnQ6IG51bWJlcjtcbiAgdGF4UmV0dXJuQ2F0ZWdvcnk6IFRheFJldHVybkNhdGVnb3J5O1xuICB0aXRsZTogc3RyaW5nO1xuXG4gIEBUeXBlKCgpID0+IFJlcG9ydEl0ZW0pXG4gIEBUcmFuc2Zvcm0oKHsgdmFsdWUgfSkgPT4gbmV3IFJlcG9ydEl0ZW1Db2xsZWN0aW9uKHZhbHVlKSlcbiAgaXRlbXM6IFJlcG9ydEl0ZW1Db2xsZWN0aW9uO1xuXG4gIC8qKlxuICAgKiBAVG9kbyBBbGV4OiBXZSBuZWVkIHRvIGFwcGx5IHRoaXMgZXZlcnl3aGVyZSAtIHRyYW5zZm9ybSBhbiBhcnJheSBpbnRvIGEgY29sbGVjdGlvbixcbiAgICogYnV0IGF0IHRoZSBtb21lbnQgd2UgY2FuJ3QgZG8gdGhpcyBkdWUgdG8gaW5oZXJpdGFuY2UgZnJvbSB0aGUgYmFzZSBtb2RlbC5cbiAgICogUG90ZW50aWFsIHNvbHV0aW9uOiBJbmhlcml0IENvbGxlY3Rpb24gZnJvbSBBcnJheVxuICAgKi9cbiAgQFR5cGUoKCkgPT4gUmVwb3J0SXRlbURldGFpbHMpXG4gIEBUcmFuc2Zvcm0oKHsgdmFsdWUgfSkgPT4gbmV3IENvbGxlY3Rpb248UmVwb3J0SXRlbURldGFpbHM+KHZhbHVlKSlcbiAgZGV0YWlsczogQ29sbGVjdGlvbjxSZXBvcnRJdGVtRGV0YWlscz47XG5cbiAgLyoqXG4gICAqIEdldCBhbW91bnQgZm9yIG9uZSBpbmNvbWUgc291cmNlXG4gICAqIEBwYXJhbSBuYW1lIE5hbWUgb2YgaW5jb21lIHNvdXJjZSBmb3IgZmlsdGVyXG4gICAqL1xuICBnZXRBbW91bnRCeUluY29tZVNvdXJjZU5hbWUobmFtZTogc3RyaW5nKTogbnVtYmVyIHtcbiAgICByZXR1cm4gdGhpcy5kZXRhaWxzLmZpbmQoKGRldGFpbDogUmVwb3J0SXRlbURldGFpbHMpOiBib29sZWFuID0+IGRldGFpbC5uYW1lID09PSBuYW1lKT8uYW1vdW50IHx8IDA7XG4gIH1cbn1cbiJdfQ==
@@ -1,7 +1,7 @@
1
1
  import { __decorate } from "tslib";
2
2
  import { TaxSummarySectionEnum } from '../../db/Enums/tax-summary-section.enum';
3
3
  import { ReportItem } from './report-item';
4
- import { ReportItemCollection } from '../../collections/tax-summary/report-item.collection';
4
+ import { ReportItemCollection } from '../../collections';
5
5
  import { Transform, Type } from 'class-transformer';
6
6
  /**
7
7
  * Base class for each sections of Tax Summary report, contains common properties/methods
@@ -29,4 +29,4 @@ __decorate([
29
29
  }
30
30
  })
31
31
  ], TaxSummarySection.prototype, "id", void 0);
32
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGF4LXN1bW1hcnktc2VjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9tb2RlbHMvdGF4LXN1bW1hcnkvdGF4LXN1bW1hcnktc2VjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0seUNBQXlDLENBQUM7QUFDaEYsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMzQyxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxzREFBc0QsQ0FBQztBQUM1RixPQUFPLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRXBEOzs7R0FHRztBQUNILE1BQU0sT0FBTyxpQkFBaUI7Q0F3QjdCO0FBbEJHO0lBRkQsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLFVBQVUsQ0FBQztJQUN0QixTQUFTLENBQUMsQ0FBQyxFQUFDLEtBQUssRUFBQyxFQUFFLEVBQUUsQ0FBQyxJQUFJLG9CQUFvQixDQUFDLEtBQUssQ0FBQyxDQUFDO2dEQUMxQjtBQWlCNUI7SUFkRCxTQUFTLENBQUMsQ0FBQyxFQUFDLEdBQUcsRUFBQyxFQUFFLEVBQUU7UUFDbkIsUUFBUSxHQUFHLENBQUMsT0FBTyxFQUFFO1lBQ25CLEtBQUsscUJBQXFCLENBQUMsU0FBUztnQkFDbEMsT0FBTyxvQkFBb0IsQ0FBQztZQUM5QixLQUFLLHFCQUFxQixDQUFDLGFBQWE7Z0JBQ3RDLE9BQU8sd0JBQXdCLENBQUM7WUFDbEMsS0FBSyxxQkFBcUIsQ0FBQyxVQUFVO2dCQUNuQyxPQUFPLHVCQUF1QixDQUFDO1lBQ2pDLEtBQUsscUJBQXFCLENBQUMsU0FBUztnQkFDbEMsT0FBTyxvQkFBb0IsQ0FBQztZQUM5QjtnQkFDRSxPQUFPLGlCQUFpQixDQUFDO1NBQzVCO0lBQ0gsQ0FBQyxDQUFDOzZDQUNZIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVGF4U3VtbWFyeVNlY3Rpb25FbnVtIH0gZnJvbSAnLi4vLi4vZGIvRW51bXMvdGF4LXN1bW1hcnktc2VjdGlvbi5lbnVtJztcbmltcG9ydCB7IFJlcG9ydEl0ZW0gfSBmcm9tICcuL3JlcG9ydC1pdGVtJztcbmltcG9ydCB7IFJlcG9ydEl0ZW1Db2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vY29sbGVjdGlvbnMvdGF4LXN1bW1hcnkvcmVwb3J0LWl0ZW0uY29sbGVjdGlvbic7XG5pbXBvcnQgeyBUcmFuc2Zvcm0sIFR5cGUgfSBmcm9tICdjbGFzcy10cmFuc2Zvcm1lcic7XG5cbi8qKlxuICogQmFzZSBjbGFzcyBmb3IgZWFjaCBzZWN0aW9ucyBvZiBUYXggU3VtbWFyeSByZXBvcnQsIGNvbnRhaW5zIGNvbW1vbiBwcm9wZXJ0aWVzL21ldGhvZHNcbiAqIFNlZSBhbHNvIFRheFN1bW1hcnkgbW9kZWxcbiAqL1xuZXhwb3J0IGNsYXNzIFRheFN1bW1hcnlTZWN0aW9uIHtcbiAgc2VjdGlvbjogVGF4U3VtbWFyeVNlY3Rpb25FbnVtO1xuICBuZXRBbW91bnQ6IG51bWJlcjtcblxuICBAVHlwZSgoKSA9PiBSZXBvcnRJdGVtKVxuICBAVHJhbnNmb3JtKCh7dmFsdWV9KSA9PiBuZXcgUmVwb3J0SXRlbUNvbGxlY3Rpb24odmFsdWUpKVxuICAgIGl0ZW1zOiBSZXBvcnRJdGVtQ29sbGVjdGlvbjtcblxuICAvLyBpZCB0aGF0IHdpbGwgYmUgYWRkZWQgYXMgSFRNTCBJZFxuICBAVHJhbnNmb3JtKCh7b2JqfSkgPT4ge1xuICAgIHN3aXRjaCAob2JqLnNlY3Rpb24pIHtcbiAgICAgIGNhc2UgVGF4U3VtbWFyeVNlY3Rpb25FbnVtLldPUktfVEFOSzpcbiAgICAgICAgcmV0dXJuICd0YXhTdW1tYXJ5V29ya1RhbmsnO1xuICAgICAgY2FzZSBUYXhTdW1tYXJ5U2VjdGlvbkVudW0uUFJPUEVSVFlfVEFOSzpcbiAgICAgICAgcmV0dXJuICd0YXhTdW1tYXJ5UHJvcGVydHlUYW5rJztcbiAgICAgIGNhc2UgVGF4U3VtbWFyeVNlY3Rpb25FbnVtLk9USEVSX1RBTks6XG4gICAgICAgIHJldHVybiAndGF4U3VtbWFyeU90aGVySW5jb21lJztcbiAgICAgIGNhc2UgVGF4U3VtbWFyeVNlY3Rpb25FbnVtLlNPTEVfVEFOSzpcbiAgICAgICAgcmV0dXJuICd0YXhTdW1tYXJ5U29sZVRhbmsnO1xuICAgICAgZGVmYXVsdDpcbiAgICAgICAgcmV0dXJuICd0YXhTdW1tYXJ5VG90YWwnO1xuICAgIH1cbiAgfSlcbiAgICBpZD86IHN0cmluZztcbn1cbiJdfQ==
32
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGF4LXN1bW1hcnktc2VjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9tb2RlbHMvdGF4LXN1bW1hcnkvdGF4LXN1bW1hcnktc2VjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0seUNBQXlDLENBQUM7QUFDaEYsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMzQyxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRXBEOzs7R0FHRztBQUNILE1BQU0sT0FBTyxpQkFBaUI7Q0F3QjdCO0FBbEJDO0lBRkMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLFVBQVUsQ0FBQztJQUN0QixTQUFTLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsQ0FBQyxJQUFJLG9CQUFvQixDQUFDLEtBQUssQ0FBQyxDQUFDO2dEQUM5QjtBQWlCNUI7SUFkQyxTQUFTLENBQUMsQ0FBQyxFQUFFLEdBQUcsRUFBRSxFQUFFLEVBQUU7UUFDckIsUUFBUSxHQUFHLENBQUMsT0FBTyxFQUFFO1lBQ25CLEtBQUsscUJBQXFCLENBQUMsU0FBUztnQkFDbEMsT0FBTyxvQkFBb0IsQ0FBQztZQUM5QixLQUFLLHFCQUFxQixDQUFDLGFBQWE7Z0JBQ3RDLE9BQU8sd0JBQXdCLENBQUM7WUFDbEMsS0FBSyxxQkFBcUIsQ0FBQyxVQUFVO2dCQUNuQyxPQUFPLHVCQUF1QixDQUFDO1lBQ2pDLEtBQUsscUJBQXFCLENBQUMsU0FBUztnQkFDbEMsT0FBTyxvQkFBb0IsQ0FBQztZQUM5QjtnQkFDRSxPQUFPLGlCQUFpQixDQUFDO1NBQzVCO0lBQ0gsQ0FBQyxDQUFDOzZDQUNVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVGF4U3VtbWFyeVNlY3Rpb25FbnVtIH0gZnJvbSAnLi4vLi4vZGIvRW51bXMvdGF4LXN1bW1hcnktc2VjdGlvbi5lbnVtJztcbmltcG9ydCB7IFJlcG9ydEl0ZW0gfSBmcm9tICcuL3JlcG9ydC1pdGVtJztcbmltcG9ydCB7IFJlcG9ydEl0ZW1Db2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vY29sbGVjdGlvbnMnO1xuaW1wb3J0IHsgVHJhbnNmb3JtLCBUeXBlIH0gZnJvbSAnY2xhc3MtdHJhbnNmb3JtZXInO1xuXG4vKipcbiAqIEJhc2UgY2xhc3MgZm9yIGVhY2ggc2VjdGlvbnMgb2YgVGF4IFN1bW1hcnkgcmVwb3J0LCBjb250YWlucyBjb21tb24gcHJvcGVydGllcy9tZXRob2RzXG4gKiBTZWUgYWxzbyBUYXhTdW1tYXJ5IG1vZGVsXG4gKi9cbmV4cG9ydCBjbGFzcyBUYXhTdW1tYXJ5U2VjdGlvbiB7XG4gIHNlY3Rpb246IFRheFN1bW1hcnlTZWN0aW9uRW51bTtcbiAgbmV0QW1vdW50OiBudW1iZXI7XG5cbiAgQFR5cGUoKCkgPT4gUmVwb3J0SXRlbSlcbiAgQFRyYW5zZm9ybSgoeyB2YWx1ZSB9KSA9PiBuZXcgUmVwb3J0SXRlbUNvbGxlY3Rpb24odmFsdWUpKVxuICBpdGVtczogUmVwb3J0SXRlbUNvbGxlY3Rpb247XG5cbiAgLy8gaWQgdGhhdCB3aWxsIGJlIGFkZGVkIGFzIEhUTUwgSWRcbiAgQFRyYW5zZm9ybSgoeyBvYmogfSkgPT4ge1xuICAgIHN3aXRjaCAob2JqLnNlY3Rpb24pIHtcbiAgICAgIGNhc2UgVGF4U3VtbWFyeVNlY3Rpb25FbnVtLldPUktfVEFOSzpcbiAgICAgICAgcmV0dXJuICd0YXhTdW1tYXJ5V29ya1RhbmsnO1xuICAgICAgY2FzZSBUYXhTdW1tYXJ5U2VjdGlvbkVudW0uUFJPUEVSVFlfVEFOSzpcbiAgICAgICAgcmV0dXJuICd0YXhTdW1tYXJ5UHJvcGVydHlUYW5rJztcbiAgICAgIGNhc2UgVGF4U3VtbWFyeVNlY3Rpb25FbnVtLk9USEVSX1RBTks6XG4gICAgICAgIHJldHVybiAndGF4U3VtbWFyeU90aGVySW5jb21lJztcbiAgICAgIGNhc2UgVGF4U3VtbWFyeVNlY3Rpb25FbnVtLlNPTEVfVEFOSzpcbiAgICAgICAgcmV0dXJuICd0YXhTdW1tYXJ5U29sZVRhbmsnO1xuICAgICAgZGVmYXVsdDpcbiAgICAgICAgcmV0dXJuICd0YXhTdW1tYXJ5VG90YWwnO1xuICAgIH1cbiAgfSlcbiAgaWQ/OiBzdHJpbmc7XG59XG4iXX0=
@@ -1827,7 +1827,7 @@ var MonthNumberEnum;
1827
1827
  MonthNumberEnum[MonthNumberEnum["JUNE"] = 5] = "JUNE";
1828
1828
  })(MonthNumberEnum || (MonthNumberEnum = {}));
1829
1829
 
1830
- const MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec', 'Jan'];
1830
+ const MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
1831
1831
 
1832
1832
  /**
1833
1833
  * @TODO refactor with Map
@@ -8260,17 +8260,16 @@ const REPORTS = {
8260
8260
 
8261
8261
  class TransactionReportItem {
8262
8262
  constructor(transactions, priorTransactions) {
8263
- this.months = [];
8264
8263
  const firstTransaction = transactions.first;
8265
- this.tankType = firstTransaction.tankType;
8266
- this.category = firstTransaction.chartAccounts.name;
8264
+ this.category = firstTransaction.chartAccounts.category;
8265
+ this.name = firstTransaction.chartAccounts.name;
8267
8266
  new FinancialYear().getPastMonths().forEach(month => {
8268
- this.months.push(transactions.getByMonth(month).sumBy('amount'));
8267
+ this[month] = transactions.getByMonth(month).sumBy('grossAmount');
8269
8268
  });
8270
- this.amount = transactions.sumBy('amount');
8271
- this.claimAmount = transactions.sumBy('claimAmount');
8272
- this.priorAmount = priorTransactions.sumBy('amount');
8273
- this.priorClaimAmount = priorTransactions.sumBy('claimAmount');
8269
+ this.amount = transactions.sumBy('grossAmount');
8270
+ this.claimAmount = transactions.sumBy('grossClaimAmount');
8271
+ this.priorAmount = priorTransactions.sumBy('grossAmount');
8272
+ this.priorClaimAmount = priorTransactions.sumBy('grossClaimAmount');
8274
8273
  }
8275
8274
  }
8276
8275
 
@@ -8345,9 +8344,6 @@ class TransactionReportItemCollection extends Collection {
8345
8344
  const priorTransactionsByChartAccounts = priorTransactions.groupBy('chartAccounts.id');
8346
8345
  return new TransactionReportItemCollection(transactionsByChartAccounts.keys.map(chartAccountsId => new TransactionReportItem(transactionsByChartAccounts.get(chartAccountsId), priorTransactionsByChartAccounts.get(chartAccountsId))));
8347
8346
  }
8348
- get months() {
8349
- return this.first?.months.map((value, key) => this.reduce((sum, item) => sum + item.months[key], 0));
8350
- }
8351
8347
  sumBy(path, abs = false) {
8352
8348
  return super.sumBy(path, abs);
8353
8349
  }