taxtank-core 0.28.31 → 0.28.33
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/taxtank-core.umd.js +8 -14
- package/bundles/taxtank-core.umd.js.map +1 -1
- package/esm2015/lib/collections/transaction/transaction-base.collection.js +3 -3
- package/esm2015/lib/db/Models/transaction/transaction-base.js +1 -1
- package/esm2015/lib/forms/abstract.form.js +2 -1
- package/esm2015/lib/forms/sole/sole-business-loss.form.js +4 -4
- package/esm2015/lib/models/report/sole/sole-business/sole-business-loss-report.js +3 -7
- package/esm2015/lib/models/sole/sole-business-loss.js +1 -5
- package/fesm2015/taxtank-core.js +7 -15
- package/fesm2015/taxtank-core.js.map +1 -1
- package/lib/forms/abstract.form.d.ts +1 -0
- package/lib/forms/sole/sole-business-loss.form.d.ts +1 -1
- package/lib/models/report/sole/sole-business/sole-business-loss-report.d.ts +0 -5
- package/lib/models/sole/sole-business-loss.d.ts +0 -1
- package/package.json +1 -1
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Collection } from '../collection';
|
|
2
|
+
import { Depreciation } from '../../models/depreciation/depreciation';
|
|
2
3
|
export class TransactionBaseCollection extends Collection {
|
|
3
4
|
getClaimAmountByBusiness(business) {
|
|
4
|
-
return this.filterBy('business.id', business.id)
|
|
5
|
-
.sumBy('claimAmount');
|
|
5
|
+
return +this.filterBy('business.id', business.id).items.map((transaction) => transaction instanceof Depreciation ? -transaction.claimAmount : transaction['claimAmount']).reduce((sum, claimAmount) => sum + claimAmount).toFixed(2);
|
|
6
6
|
}
|
|
7
7
|
}
|
|
8
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tYmFzZS5jb2xsZWN0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL2NvbGxlY3Rpb25zL3RyYW5zYWN0aW9uL3RyYW5zYWN0aW9uLWJhc2UuY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUMsVUFBVSxFQUFDLE1BQU0sZUFBZSxDQUFDO0FBRXpDLE9BQU8sRUFBQyxZQUFZLEVBQUMsTUFBTSx3Q0FBd0MsQ0FBQztBQUVwRSxNQUFNLE9BQU8seUJBQTBCLFNBQVEsVUFBMkI7SUFDeEUsd0JBQXdCLENBQUMsUUFBc0I7UUFDN0MsT0FBTyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsYUFBYSxFQUFFLFFBQVEsQ0FBQyxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUN6RCxDQUFDLFdBQTRCLEVBQUUsRUFBRSxDQUFDLFdBQVcsWUFBWSxZQUFZLENBQUMsQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLGFBQWEsQ0FBQyxDQUM5SCxDQUFDLE1BQU0sQ0FBQyxDQUFDLEdBQUcsRUFBRSxXQUFtQixFQUFFLEVBQUUsQ0FBQyxHQUFHLEdBQUcsV0FBVyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3ZFLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7VHJhbnNhY3Rpb25CYXNlfSBmcm9tICcuLi8uLi9kYi9Nb2RlbHMvdHJhbnNhY3Rpb24vdHJhbnNhY3Rpb24tYmFzZSc7XG5pbXBvcnQge0NvbGxlY3Rpb259IGZyb20gJy4uL2NvbGxlY3Rpb24nO1xuaW1wb3J0IHtTb2xlQnVzaW5lc3N9IGZyb20gJy4uLy4uL21vZGVscyc7XG5pbXBvcnQge0RlcHJlY2lhdGlvbn0gZnJvbSAnLi4vLi4vbW9kZWxzL2RlcHJlY2lhdGlvbi9kZXByZWNpYXRpb24nO1xuXG5leHBvcnQgY2xhc3MgVHJhbnNhY3Rpb25CYXNlQ29sbGVjdGlvbiBleHRlbmRzIENvbGxlY3Rpb248VHJhbnNhY3Rpb25CYXNlPiB7XG4gIGdldENsYWltQW1vdW50QnlCdXNpbmVzcyhidXNpbmVzczogU29sZUJ1c2luZXNzKTogbnVtYmVyIHtcbiAgICByZXR1cm4gK3RoaXMuZmlsdGVyQnkoJ2J1c2luZXNzLmlkJywgYnVzaW5lc3MuaWQpLml0ZW1zLm1hcChcbiAgICAgICh0cmFuc2FjdGlvbjogVHJhbnNhY3Rpb25CYXNlKSA9PiB0cmFuc2FjdGlvbiBpbnN0YW5jZW9mIERlcHJlY2lhdGlvbiA/IC10cmFuc2FjdGlvbi5jbGFpbUFtb3VudCA6IHRyYW5zYWN0aW9uWydjbGFpbUFtb3VudCddXG4gICAgKS5yZWR1Y2UoKHN1bSwgY2xhaW1BbW91bnQ6IG51bWJlcikgPT4gc3VtICsgY2xhaW1BbW91bnQpLnRvRml4ZWQoMik7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -56,4 +56,4 @@ __decorate([
|
|
|
56
56
|
return obj.file;
|
|
57
57
|
})
|
|
58
58
|
], TransactionBase.prototype, "file", void 0);
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tYmFzZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9kYi9Nb2RlbHMvdHJhbnNhY3Rpb24vdHJhbnNhY3Rpb24tYmFzZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBRUEsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRWxELE9BQU8sRUFBRSxPQUFPLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzdELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUMxRCxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxnRUFBZ0UsQ0FBQztBQUUzRyxNQUFNLE9BQU8sZUFBZ0IsU0FBUSxhQUFhO0lBcUJoRCxJQUFJLFFBQVE7UUFDVixRQUFRLElBQUksRUFBRTtZQUNaLEtBQUssSUFBSSxDQUFDLGNBQWMsRUFBRTtnQkFDeEIsT0FBTyxZQUFZLENBQUMsUUFBUSxDQUFDO1lBQy9CLEtBQUssSUFBSSxDQUFDLFVBQVUsRUFBRTtnQkFDcEIsT0FBTyxZQUFZLENBQUMsSUFBSSxDQUFDO1lBQzNCLEtBQUssSUFBSSxDQUFDLFVBQVUsRUFBRTtnQkFDcEIsT0FBTyxZQUFZLENBQUMsSUFBSSxDQUFDO1lBQzNCO2dCQUNFLE9BQU8sWUFBWSxDQUFDLEtBQUssQ0FBQztTQUM3QjtJQUNILENBQUM7SUFFRDs7T0FFRztJQUNILGNBQWM7UUFDWixnREFBZ0Q7UUFDaEQsSUFBSSxJQUFJLENBQUMsYUFBYSxFQUFFO1lBQ3RCLE9BQU8seUJBQXlCLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1NBQ2pGO1FBRUQsT0FBTyxDQUFDLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQztJQUN6QixDQUFDO0lBRUQ7O09BRUc7SUFDSCxVQUFVOztRQUNSLGdEQUFnRDtRQUNoRCxJQUFJLElBQUksQ0FBQyxhQUFhLEVBQUU7WUFDdEIsT0FBTyx5QkFBeUIsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQUEsSUFBSSxDQUFDLGFBQWEsMENBQUUsUUFBUSxDQUFDLENBQUM7U0FDOUU7UUFFRCxPQUFPLENBQUMsSUFBSSxDQUFDLGNBQWMsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO0lBQ3RELENBQUM7SUFFRDs7T0FFRztJQUNILFVBQVU7O1FBQ1IsZ0RBQWdEO1FBQ2hELElBQUksSUFBSSxDQUFDLGFBQWEsRUFBRTtZQUN0QixPQUFPLHlCQUF5QixDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsTUFBQSxJQUFJLENBQUMsYUFBYSwwQ0FBRSxRQUFRLENBQUMsQ0FBQztTQUM5RTtRQUVELE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUM7SUFDekIsQ0FBQztDQUNGO0FBbkRDO0lBTEMsT0FBTyxDQUFDLEVBQUMsV0FBVyxFQUFFLElBQUksRUFBQyxDQUFDO0lBQzVCLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxNQUFNLENBQUM7SUFDbEIsU0FBUyxDQUFDLENBQUMsRUFBQyxHQUFHLEVBQUMsRUFBRSxFQUFFO1FBQ25CLE9BQU8sR0FBRyxDQUFDLElBQUksQ0FBQztJQUNsQixDQUFDLENBQUM7NkNBQ1MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBQcm9wZXJ0eSB9IGZyb20gJy4uL3Byb3BlcnR5L3Byb3BlcnR5JztcbmltcG9ydCB7IENoYXJ0QWNjb3VudHMgfSBmcm9tICcuLi9jaGFydC1hY2NvdW50cy9jaGFydC1hY2NvdW50cyc7XG5pbXBvcnQgeyBBYnN0cmFjdE1vZGVsIH0gZnJvbSAnLi4vYWJzdHJhY3QtbW9kZWwnO1xuaW1wb3J0IHsgU29sZUJ1c2luZXNzIH0gZnJvbSAnLi4vc29sZS9zb2xlLWJ1c2luZXNzJztcbmltcG9ydCB7IEV4Y2x1ZGUsIFRyYW5zZm9ybSwgVHlwZSB9IGZyb20gJ2NsYXNzLXRyYW5zZm9ybWVyJztcbmltcG9ydCB7IFRhbmtUeXBlRW51bSB9IGZyb20gJy4uLy4uL0VudW1zL3RhbmstdHlwZS5lbnVtJztcbmltcG9ydCB7IENIQVJUX0FDQ09VTlRTX0NBVEVHT1JJRVMgfSBmcm9tICcuLi8uLi8uLi9tb2RlbHMvY2hhcnQtYWNjb3VudHMvY2hhcnQtYWNjb3VudHMtY2F0ZWdvcmllcy5jb25zdCc7XG5cbmV4cG9ydCBjbGFzcyBUcmFuc2FjdGlvbkJhc2UgZXh0ZW5kcyBBYnN0cmFjdE1vZGVsIHtcbiAgaWQ/OiBudW1iZXI7XG4gIGFtb3VudD86IG51bWJlcjtcbiAgcHJvcGVydHk/OiBQcm9wZXJ0eTtcbiAgYnVzaW5lc3M/OiBTb2xlQnVzaW5lc3M7XG4gIGRhdGU/OiBEYXRlO1xuICBjaGFydEFjY291bnRzPzogQ2hhcnRBY2NvdW50cztcbiAgZGVzY3JpcHRpb24/OiBzdHJpbmc7XG5cbiAgLyoqXG4gICAqIGNvdWxkIGJlIEZpbGUgd2hlbiBqdXN0IGFkZGVkIG5ldyBpbWFnZVxuICAgKiBAVE9ETyBBbGV4IHBsYWluVG9DbGFzcyBkb2Vzbid0IHdvcmsgd2l0aCBGaWxlIHdpdGhvdXQgdGhpcyBoYWNrIGh0dHBzOi8vZ2l0aHViLmNvbS90eXBlc3RhY2svY2xhc3MtdHJhbnNmb3JtZXIvaXNzdWVzLzExNzhcbiAgICovXG4gIEBFeGNsdWRlKHt0b1BsYWluT25seTogdHJ1ZX0pXG4gIEBUeXBlKCgpID0+IE9iamVjdClcbiAgQFRyYW5zZm9ybSgoe29ian0pID0+IHtcbiAgICByZXR1cm4gb2JqLmZpbGU7XG4gIH0pXG4gIGZpbGU6IEZpbGU7XG4gIGNsYWltUGVyY2VudD86IG51bWJlcjtcblxuICBnZXQgdGFua1R5cGUoKTogVGFua1R5cGVFbnVtIHtcbiAgICBzd2l0Y2ggKHRydWUpIHtcbiAgICAgIGNhc2UgdGhpcy5pc1Byb3BlcnR5VGFuaygpOlxuICAgICAgICByZXR1cm4gVGFua1R5cGVFbnVtLlBST1BFUlRZO1xuICAgICAgY2FzZSB0aGlzLmlzV29ya1RhbmsoKTpcbiAgICAgICAgcmV0dXJuIFRhbmtUeXBlRW51bS5XT1JLO1xuICAgICAgY2FzZSB0aGlzLmlzU29sZVRhbmsoKTpcbiAgICAgICAgcmV0dXJuIFRhbmtUeXBlRW51bS5TT0xFO1xuICAgICAgZGVmYXVsdDpcbiAgICAgICAgcmV0dXJuIFRhbmtUeXBlRW51bS5PVEhFUjtcbiAgICB9XG4gIH1cblxuICAvKipcbiAgICogQ2hlY2sgaWYgY3VycmVudCB0YW5rIGlzIFByb3BlcnR5XG4gICAqL1xuICBpc1Byb3BlcnR5VGFuaygpOiBib29sZWFuIHtcbiAgICAvLyBjaGFydCBhY2NvdW50cyBtYXkgYmUgZW1wdHkgZm9yIG5ldyBpbnN0YW5jZXNcbiAgICBpZiAodGhpcy5jaGFydEFjY291bnRzKSB7XG4gICAgICByZXR1cm4gQ0hBUlRfQUNDT1VOVFNfQ0FURUdPUklFUy5wcm9wZXJ0eS5pbmNsdWRlcyh0aGlzLmNoYXJ0QWNjb3VudHMuY2F0ZWdvcnkpO1xuICAgIH1cblxuICAgIHJldHVybiAhIXRoaXMucHJvcGVydHk7XG4gIH1cblxuICAvKipcbiAgICogQ2hlY2sgaWYgY3VycmVudCB0YW5rIGlzIFdvcmtcbiAgICovXG4gIGlzV29ya1RhbmsoKTogYm9vbGVhbiB7XG4gICAgLy8gY2hhcnQgYWNjb3VudHMgbWF5IGJlIGVtcHR5IGZvciBuZXcgaW5zdGFuY2VzXG4gICAgaWYgKHRoaXMuY2hhcnRBY2NvdW50cykge1xuICAgICAgcmV0dXJuIENIQVJUX0FDQ09VTlRTX0NBVEVHT1JJRVMud29yay5pbmNsdWRlcyh0aGlzLmNoYXJ0QWNjb3VudHM/LmNhdGVnb3J5KTtcbiAgICB9XG5cbiAgICByZXR1cm4gIXRoaXMuaXNQcm9wZXJ0eVRhbmsoKSAmJiAhdGhpcy5pc1NvbGVUYW5rKCk7XG4gIH1cblxuICAvKipcbiAgICogQ2hlY2sgaWYgY3VycmVudCB0YW5rIGlzIFNvbGVcbiAgICovXG4gIGlzU29sZVRhbmsoKTogYm9vbGVhbiB7XG4gICAgLy8gY2hhcnQgYWNjb3VudHMgbWF5IGJlIGVtcHR5IGZvciBuZXcgaW5zdGFuY2VzXG4gICAgaWYgKHRoaXMuY2hhcnRBY2NvdW50cykge1xuICAgICAgcmV0dXJuIENIQVJUX0FDQ09VTlRTX0NBVEVHT1JJRVMuc29sZS5pbmNsdWRlcyh0aGlzLmNoYXJ0QWNjb3VudHM/LmNhdGVnb3J5KTtcbiAgICB9XG5cbiAgICByZXR1cm4gISF0aGlzLmJ1c2luZXNzO1xuICB9XG59XG4iXX0=
|
|
@@ -11,6 +11,7 @@ export class AbstractForm extends FormGroup {
|
|
|
11
11
|
constructor(controls, model, validatorOrOpts, asyncValidator) {
|
|
12
12
|
super(controls, validatorOrOpts, asyncValidator);
|
|
13
13
|
/**
|
|
14
|
+
* @TODO Alex bad name, it's also about unchanged
|
|
14
15
|
* Flag display if some form values changed
|
|
15
16
|
*/
|
|
16
17
|
this.unsaved = false;
|
|
@@ -63,4 +64,4 @@ export class AbstractForm extends FormGroup {
|
|
|
63
64
|
});
|
|
64
65
|
}
|
|
65
66
|
}
|
|
66
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
67
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWJzdHJhY3QuZm9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9mb3Jtcy9hYnN0cmFjdC5mb3JtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBNkQsU0FBUyxFQUFlLE1BQU0sZ0JBQWdCLENBQUM7QUFDbkgsT0FBTyxFQUFFLFlBQVksRUFBUSxNQUFNLGVBQWUsQ0FBQztBQUNuRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDakQsT0FBTyxPQUFPLE1BQU0sZ0JBQWdCLENBQUM7QUFFckM7Ozs7R0FJRztBQUNILE1BQU0sT0FBZ0IsWUFBb0IsU0FBUSxTQUFTO0lBa0J6RCxZQUNFLFFBQTBDLEVBQzFDLEtBQWEsRUFDYixlQUE2RSxFQUM3RSxjQUE2RDtRQUU3RCxLQUFLLENBQUMsUUFBUSxFQUFFLGVBQWUsRUFBRSxjQUFjLENBQUMsQ0FBQztRQWRuRDs7O1dBR0c7UUFDSCxZQUFPLEdBQVksS0FBSyxDQUFDO1FBRXpCLGFBQVEsR0FBd0IsSUFBSSxZQUFZLEVBQUUsQ0FBQztRQVNqRCxJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssSUFBSSxJQUFJLENBQUMsbUJBQW1CLEVBQUUsQ0FBQztRQUNqRCxJQUFJLENBQUMsVUFBVSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsV0FBOEIsQ0FBQztRQUM1RCxJQUFJLENBQUMsWUFBWSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUM7UUFFL0IsSUFBSSxLQUFLLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQUU7WUFDekIsSUFBSSxDQUFDLGFBQWEsRUFBRSxDQUFDO1NBQ3RCO1FBRUQsSUFBSSxDQUFDLGtCQUFrQixFQUFFLENBQUM7SUFDNUIsQ0FBQztJQUVELElBQUksS0FBSztRQUNQLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQ3ZCLENBQUM7SUFFRCxJQUFJLFlBQVk7UUFDZCxPQUFPLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRSxJQUFJLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDckYsQ0FBQztJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsT0FBZSxFQUFFO1FBQ3RCLElBQUksQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDO1FBQ3RCLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO1FBRXhCLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRTtZQUNqQyxPQUFPLElBQUksQ0FBQztTQUNiO1FBRUQsTUFBTSxLQUFLLEdBQVUsSUFBSSxDQUFDLG1CQUFtQixDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFLElBQUksQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFDO1FBRS9GLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzFCLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUVELFVBQVUsQ0FBQyxJQUFZLEVBQUUsT0FBd0IsRUFBRSxPQUFpQztRQUNsRixLQUFLLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFFekMsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsYUFBYTtRQUNYLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDO0lBQ3RCLENBQUM7SUFFRCxXQUFXO1FBQ1QsSUFBSSxDQUFDLE9BQU8sR0FBRyxLQUFLLENBQUM7SUFDdkIsQ0FBQztJQUVPLG1CQUFtQixDQUFDLE9BQWUsRUFBRTtRQUMzQyxPQUFPLFlBQVksQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQzdDLENBQUM7SUFFTyxrQkFBa0I7UUFDeEIsSUFBSSxDQUFDLFlBQVksQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFO1lBQy9CLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxJQUFJLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUM7UUFDM0gsQ0FBQyxDQUFDLENBQUE7SUFDSixDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBYnN0cmFjdENvbnRyb2wsIEFic3RyYWN0Q29udHJvbE9wdGlvbnMsIEFzeW5jVmFsaWRhdG9yRm4sIEZvcm1Hcm91cCwgVmFsaWRhdG9yRm4gfSBmcm9tICdAYW5ndWxhci9mb3Jtcyc7XG5pbXBvcnQgeyBFdmVudEVtaXR0ZXIsIFR5cGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IHBsYWluVG9DbGFzcyB9IGZyb20gJ2NsYXNzLXRyYW5zZm9ybWVyJztcbmltcG9ydCBpc0VxdWFsIGZyb20gJ2xvZGFzaC9pc0VxdWFsJztcblxuLyoqXG4gKiBBYnN0cmFjdCBmb3JtIGNsYXNzXG4gKiBAVE9ETyByZW5hbWUgdG8gQWJzdHJhY3RGb3JtR3JvdXBcbiAqIEBUT0RPIEFsZXggVFQtMjE5MDogcmVmYWN0b3I6IGNoZWNrIGFuZCBpbXByb3ZlIGxvZ2ljXG4gKi9cbmV4cG9ydCBhYnN0cmFjdCBjbGFzcyBBYnN0cmFjdEZvcm08TW9kZWw+IGV4dGVuZHMgRm9ybUdyb3VwIHtcbiAgLyoqXG4gICAqIEluaXRpYWwgZm9ybSB2YWx1ZSBmb3IgY29tcGFyaXNvbiB3aXRoIGNoYW5nZXMgdG8gY2hlY2sgc2F2ZWQvdW5zYXZlZCBzdGF0ZVxuICAgKi9cbiAgcHJpdmF0ZSBpbml0aWFsVmFsdWU6IG9iamVjdDtcblxuICBwcm90ZWN0ZWQgbW9kZWxDbGFzczogVHlwZTxNb2RlbD47XG4gIG1vZGVsOiBNb2RlbDtcbiAgc3VibWl0dGVkOiBib29sZWFuO1xuXG4gIC8qKlxuICAgKiBAVE9ETyBBbGV4IGJhZCBuYW1lLCBpdCdzIGFsc28gYWJvdXQgdW5jaGFuZ2VkXG4gICAqIEZsYWcgZGlzcGxheSBpZiBzb21lIGZvcm0gdmFsdWVzIGNoYW5nZWRcbiAgICovXG4gIHVuc2F2ZWQ6IGJvb2xlYW4gPSBmYWxzZTtcblxuICBvblN1Ym1pdDogRXZlbnRFbWl0dGVyPE1vZGVsPiA9IG5ldyBFdmVudEVtaXR0ZXIoKTtcblxuICBwcm90ZWN0ZWQgY29uc3RydWN0b3IoXG4gICAgY29udHJvbHM6IHtba2V5OiBzdHJpbmddOiBBYnN0cmFjdENvbnRyb2x9LFxuICAgIG1vZGVsPzogTW9kZWwsXG4gICAgdmFsaWRhdG9yT3JPcHRzPzogVmFsaWRhdG9yRm4gfCBWYWxpZGF0b3JGbltdIHwgQWJzdHJhY3RDb250cm9sT3B0aW9ucyB8IG51bGwsXG4gICAgYXN5bmNWYWxpZGF0b3I/OiBBc3luY1ZhbGlkYXRvckZuIHwgQXN5bmNWYWxpZGF0b3JGbltdIHwgbnVsbFxuICApIHtcbiAgICBzdXBlcihjb250cm9scywgdmFsaWRhdG9yT3JPcHRzLCBhc3luY1ZhbGlkYXRvcik7XG4gICAgdGhpcy5tb2RlbCA9IG1vZGVsIHx8IHRoaXMuY3JlYXRlTW9kZWxJbnN0YW5jZSgpO1xuICAgIHRoaXMubW9kZWxDbGFzcyA9IHRoaXMubW9kZWwuY29uc3RydWN0b3IgYXMgbmV3ICgpID0+IE1vZGVsO1xuICAgIHRoaXMuaW5pdGlhbFZhbHVlID0gdGhpcy52YWx1ZTtcblxuICAgIGlmIChtb2RlbCAmJiAhbW9kZWxbJ2lkJ10pIHtcbiAgICAgIHRoaXMubWFya0FzVW5zYXZlZCgpO1xuICAgIH1cblxuICAgIHRoaXMubGlzdGVuVmFsdWVDaGFuZ2VzKCk7XG4gIH1cblxuICBnZXQgc2F2ZWQoKTogYm9vbGVhbiB7XG4gICAgcmV0dXJuICF0aGlzLnVuc2F2ZWQ7XG4gIH1cblxuICBnZXQgY3VycmVudFZhbHVlKCk6IE1vZGVsIHtcbiAgICByZXR1cm4gdGhpcy5jcmVhdGVNb2RlbEluc3RhbmNlKE9iamVjdC5hc3NpZ24oe30sIHRoaXMubW9kZWwsIHRoaXMuZ2V0UmF3VmFsdWUoKSkpO1xuICB9XG5cbiAgLyoqXG4gICAqIENoZWNrIHZhbGlkYXRpb24gYW5kIHJldHVybiBhIG5ldyBpbnN0YW5jZSBvZiBnZW5lcmljIG1vZGVsLlxuICAgKiBNZXJnZSBmb3JtIHZhbHVlIHRvIGluaXRpYWwgb2JqZWN0XG4gICAqIEBwYXJhbSBkYXRhIEFkZGl0aW9uYWwgZGF0YSBvYmplY3Qgd2hpY2ggYmUgbWVyZ2VkIHRvIGZvcm0gdmFsdWVcbiAgICovXG4gIHN1Ym1pdChkYXRhOiBvYmplY3QgPSB7fSk6IE1vZGVsIHtcbiAgICB0aGlzLnN1Ym1pdHRlZCA9IHRydWU7XG4gICAgdGhpcy5tYXJrQWxsQXNUb3VjaGVkKCk7XG5cbiAgICBpZiAoIXRoaXMuZGlzYWJsZWQgJiYgIXRoaXMudmFsaWQpIHtcbiAgICAgIHJldHVybiBudWxsO1xuICAgIH1cblxuICAgIGNvbnN0IG1vZGVsOiBNb2RlbCA9IHRoaXMuY3JlYXRlTW9kZWxJbnN0YW5jZShPYmplY3QuYXNzaWduKHt9LCB0aGlzLm1vZGVsLCB0aGlzLnZhbHVlLCBkYXRhKSk7XG5cbiAgICB0aGlzLm9uU3VibWl0LmVtaXQobW9kZWwpO1xuICAgIHJldHVybiBtb2RlbDtcbiAgfVxuXG4gIGFkZENvbnRyb2wobmFtZTogc3RyaW5nLCBjb250cm9sOiBBYnN0cmFjdENvbnRyb2wsIG9wdGlvbnM/OiB7IGVtaXRFdmVudD86IGJvb2xlYW4gfSk6IHRoaXMge1xuICAgIHN1cGVyLmFkZENvbnRyb2wobmFtZSwgY29udHJvbCwgb3B0aW9ucyk7XG5cbiAgICByZXR1cm4gdGhpcztcbiAgfVxuXG4gIG1hcmtBc1Vuc2F2ZWQoKTogdm9pZCB7XG4gICAgdGhpcy51bnNhdmVkID0gdHJ1ZTtcbiAgfVxuXG4gIG1hcmtBc1NhdmVkKCk6IHZvaWQge1xuICAgIHRoaXMudW5zYXZlZCA9IGZhbHNlO1xuICB9XG5cbiAgcHJpdmF0ZSBjcmVhdGVNb2RlbEluc3RhbmNlKGRhdGE6IG9iamVjdCA9IHt9KTogTW9kZWwge1xuICAgIHJldHVybiBwbGFpblRvQ2xhc3ModGhpcy5tb2RlbENsYXNzLCBkYXRhKTtcbiAgfVxuXG4gIHByaXZhdGUgbGlzdGVuVmFsdWVDaGFuZ2VzKCk6IHZvaWQge1xuICAgIHRoaXMudmFsdWVDaGFuZ2VzLnN1YnNjcmliZSgoKSA9PiB7XG4gICAgICAhIXRoaXMubW9kZWwgJiYgISF0aGlzLm1vZGVsWydpZCddICYmIGlzRXF1YWwodGhpcy52YWx1ZSwgdGhpcy5pbml0aWFsVmFsdWUpID8gdGhpcy5tYXJrQXNTYXZlZCgpIDogdGhpcy5tYXJrQXNVbnNhdmVkKCk7XG4gICAgfSlcbiAgfVxufVxuIl19
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { AbstractForm } from '../abstract.form';
|
|
2
2
|
import { FormControl, Validators } from '@angular/forms';
|
|
3
3
|
export class SoleBusinessLossForm extends AbstractForm {
|
|
4
|
-
constructor(loss,
|
|
4
|
+
constructor(loss, profit) {
|
|
5
5
|
var _a;
|
|
6
6
|
super({
|
|
7
7
|
openBalance: new FormControl(loss.openBalance, Validators.required),
|
|
8
8
|
offsetRule: new FormControl((_a = loss.offsetRule) === null || _a === void 0 ? void 0 : _a.id),
|
|
9
9
|
// sum of depreciations/transactions claim amount - openBalance
|
|
10
|
-
balance: new FormControl({ value:
|
|
10
|
+
balance: new FormControl({ value: profit - loss.openBalance, disabled: true }),
|
|
11
11
|
}, loss);
|
|
12
12
|
this.loss = loss;
|
|
13
13
|
this.get('openBalance').valueChanges.subscribe((openBalance) => {
|
|
14
|
-
this.get('balance').setValue(
|
|
14
|
+
this.get('balance').setValue(profit - openBalance);
|
|
15
15
|
});
|
|
16
16
|
}
|
|
17
17
|
/**
|
|
@@ -22,4 +22,4 @@ export class SoleBusinessLossForm extends AbstractForm {
|
|
|
22
22
|
return super.submit({ offsetRule: this.get('offsetRule').value ? { id: this.get('offsetRule').value } : null });
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29sZS1idXNpbmVzcy1sb3NzLmZvcm0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvZm9ybXMvc29sZS9zb2xlLWJ1c2luZXNzLWxvc3MuZm9ybS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFaEQsT0FBTyxFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUV6RCxNQUFNLE9BQU8sb0JBQXFCLFNBQVEsWUFBOEI7SUFDdEUsWUFBb0IsSUFBc0IsRUFBRSxNQUFjOztRQUN4RCxLQUFLLENBQUM7WUFDSixXQUFXLEVBQUUsSUFBSSxXQUFXLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDO1lBQ25FLFVBQVUsRUFBRSxJQUFJLFdBQVcsQ0FBQyxNQUFBLElBQUksQ0FBQyxVQUFVLDBDQUFFLEVBQUUsQ0FBQztZQUNoRCwrREFBK0Q7WUFDL0QsT0FBTyxFQUFFLElBQUksV0FBVyxDQUFDLEVBQUMsS0FBSyxFQUFFLE1BQU0sR0FBRyxJQUFJLENBQUMsV0FBVyxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUMsQ0FBQztTQUM3RSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBTlMsU0FBSSxHQUFKLElBQUksQ0FBa0I7UUFReEMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQyxZQUFZLENBQUMsU0FBUyxDQUFDLENBQUMsV0FBbUIsRUFBRSxFQUFFO1lBQ3JFLElBQUksQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sR0FBRyxXQUFXLENBQUMsQ0FBQztRQUNyRCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRDs7O09BR0c7SUFDSCxNQUFNO1FBQ0osT0FBTyxLQUFLLENBQUMsTUFBTSxDQUFDLEVBQUUsVUFBVSxFQUFFLElBQUksQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQ2xILENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFic3RyYWN0Rm9ybSB9IGZyb20gJy4uL2Fic3RyYWN0LmZvcm0nO1xuaW1wb3J0IHtTb2xlQnVzaW5lc3NMb3NzfSBmcm9tICcuLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHsgRm9ybUNvbnRyb2wsIFZhbGlkYXRvcnMgfSBmcm9tICdAYW5ndWxhci9mb3Jtcyc7XG5cbmV4cG9ydCBjbGFzcyBTb2xlQnVzaW5lc3NMb3NzRm9ybSBleHRlbmRzIEFic3RyYWN0Rm9ybTxTb2xlQnVzaW5lc3NMb3NzPiB7XG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgbG9zczogU29sZUJ1c2luZXNzTG9zcywgcHJvZml0OiBudW1iZXIpIHtcbiAgICBzdXBlcih7XG4gICAgICBvcGVuQmFsYW5jZTogbmV3IEZvcm1Db250cm9sKGxvc3Mub3BlbkJhbGFuY2UsIFZhbGlkYXRvcnMucmVxdWlyZWQpLFxuICAgICAgb2Zmc2V0UnVsZTogbmV3IEZvcm1Db250cm9sKGxvc3Mub2Zmc2V0UnVsZT8uaWQpLFxuICAgICAgLy8gc3VtIG9mIGRlcHJlY2lhdGlvbnMvdHJhbnNhY3Rpb25zIGNsYWltIGFtb3VudCAtIG9wZW5CYWxhbmNlXG4gICAgICBiYWxhbmNlOiBuZXcgRm9ybUNvbnRyb2woe3ZhbHVlOiBwcm9maXQgLSBsb3NzLm9wZW5CYWxhbmNlLCBkaXNhYmxlZDogdHJ1ZX0pLFxuICAgIH0sIGxvc3MpO1xuXG4gICAgdGhpcy5nZXQoJ29wZW5CYWxhbmNlJykudmFsdWVDaGFuZ2VzLnN1YnNjcmliZSgob3BlbkJhbGFuY2U6IG51bWJlcikgPT4ge1xuICAgICAgdGhpcy5nZXQoJ2JhbGFuY2UnKS5zZXRWYWx1ZShwcm9maXQgLSBvcGVuQmFsYW5jZSk7XG4gICAgfSk7XG4gIH1cblxuICAvKipcbiAgICogcmFkaW8gYnV0dG9ucyBjYW4ndCB3b3JrIHdpdGggb2JqZWN0XG4gICAqIGh0dHBzOi8vZ2l0aHViLmNvbS9hbmd1bGFyL2NvbXBvbmVudHMvaXNzdWVzLzEwNDk1XG4gICAqL1xuICBzdWJtaXQoKTogU29sZUJ1c2luZXNzTG9zcyB7XG4gICAgcmV0dXJuIHN1cGVyLnN1Ym1pdCh7IG9mZnNldFJ1bGU6IHRoaXMuZ2V0KCdvZmZzZXRSdWxlJykudmFsdWUgPyB7IGlkOiB0aGlzLmdldCgnb2Zmc2V0UnVsZScpLnZhbHVlIH0gOiBudWxsIH0pO1xuICB9XG59XG4iXX0=
|
|
@@ -7,12 +7,8 @@ export class SoleBusinessLossReport extends AbstractModel {
|
|
|
7
7
|
constructor(loss, transactions, depreciations) {
|
|
8
8
|
super();
|
|
9
9
|
this.openBalance = loss.openBalance;
|
|
10
|
-
this.netIncome = transactions.sumBy('claimAmount')
|
|
11
|
-
this.
|
|
12
|
-
this.closeBalance = Math.max(this.taxableIncome, 0);
|
|
13
|
-
}
|
|
14
|
-
calculateTaxableIncome() {
|
|
15
|
-
return this.netIncome - this.openBalance;
|
|
10
|
+
this.netIncome = transactions.sumBy('claimAmount') - depreciations.sumBy('claimAmount');
|
|
11
|
+
this.closeBalance = this.netIncome - this.openBalance;
|
|
16
12
|
}
|
|
17
13
|
}
|
|
18
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
14
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29sZS1idXNpbmVzcy1sb3NzLXJlcG9ydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9tb2RlbHMvcmVwb3J0L3NvbGUvc29sZS1idXNpbmVzcy9zb2xlLWJ1c2luZXNzLWxvc3MtcmVwb3J0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUVyRTs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sc0JBQXVCLFNBQVEsYUFBYTtJQWF2RCxZQUFZLElBQXNCLEVBQUUsWUFBbUMsRUFBRSxhQUFxQztRQUM1RyxLQUFLLEVBQUUsQ0FBQztRQUNSLElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQztRQUNwQyxJQUFJLENBQUMsU0FBUyxHQUFHLFlBQVksQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLEdBQUcsYUFBYSxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUN4RixJQUFJLENBQUMsWUFBWSxHQUFHLElBQUksQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQztJQUN4RCxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBTb2xlQnVzaW5lc3NMb3NzIH0gZnJvbSAnLi4vLi4vLi4vc29sZSc7XG5pbXBvcnQgeyBUcmFuc2FjdGlvbkNvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi8uLi8uLi9jb2xsZWN0aW9ucy90cmFuc2FjdGlvbi90cmFuc2FjdGlvbi5jb2xsZWN0aW9uJztcbmltcG9ydCB7IERlcHJlY2lhdGlvbkNvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi8uLi8uLi9jb2xsZWN0aW9ucy9kZXByZWNpYXRpb24uY29sbGVjdGlvbic7XG5pbXBvcnQgeyBBYnN0cmFjdE1vZGVsIH0gZnJvbSAnLi4vLi4vLi4vLi4vZGIvTW9kZWxzL2Fic3RyYWN0LW1vZGVsJztcblxuLyoqXG4gKiBDbGFzcyB3aXRoIGJ1c2luZXNzIGxvc3MgZGV0YWlsc1xuICogaHR0cHM6Ly90YXh0YW5rLmF0bGFzc2lhbi5uZXQvd2lraS9zcGFjZXMvVEFYVEFOSy9wYWdlcy80NjQxMzU3OTMwL1J1bGVzK3doZW4rYStidXNpbmVzcyttYWtlcythK2xvc3MrVGF4K1N1bW1hcnlcbiAqL1xuZXhwb3J0IGNsYXNzIFNvbGVCdXNpbmVzc0xvc3NSZXBvcnQgZXh0ZW5kcyBBYnN0cmFjdE1vZGVsIHtcbiAgLyoqXG4gICAqIEJ1c2luZXNzIHByaW9yIHllYXIgbG9zc2VzXG4gICAqL1xuICBvcGVuQmFsYW5jZTogbnVtYmVyO1xuXG4gIC8qKlxuICAgKiBOZXQgaW5jb21lIHJlZHVjZWQgYnkgdGhlIG9wZW5pbmcgYmFsYW5jZSBhbW91bnQsIHRoYXQgd2lsbCBiZSBjYXJyaWVkIG92ZXIgdG8gdGhlIG5leHQgeWVhciwgaWYgaXQgaXMgcG9zaXRpdmVcbiAgICovXG4gIGNsb3NlQmFsYW5jZTogbnVtYmVyO1xuXG4gIG5ldEluY29tZTogbnVtYmVyO1xuXG4gIGNvbnN0cnVjdG9yKGxvc3M6IFNvbGVCdXNpbmVzc0xvc3MsIHRyYW5zYWN0aW9uczogVHJhbnNhY3Rpb25Db2xsZWN0aW9uLCBkZXByZWNpYXRpb25zOiBEZXByZWNpYXRpb25Db2xsZWN0aW9uKSB7XG4gICAgc3VwZXIoKTtcbiAgICB0aGlzLm9wZW5CYWxhbmNlID0gbG9zcy5vcGVuQmFsYW5jZTtcbiAgICB0aGlzLm5ldEluY29tZSA9IHRyYW5zYWN0aW9ucy5zdW1CeSgnY2xhaW1BbW91bnQnKSAtIGRlcHJlY2lhdGlvbnMuc3VtQnkoJ2NsYWltQW1vdW50Jyk7XG4gICAgdGhpcy5jbG9zZUJhbGFuY2UgPSB0aGlzLm5ldEluY29tZSAtIHRoaXMub3BlbkJhbGFuY2U7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -4,10 +4,6 @@ import { SoleBusiness } from './sole-business';
|
|
|
4
4
|
import { Type } from 'class-transformer';
|
|
5
5
|
import { SoleBusinessLossOffsetRule } from './sole-business-loss-offset-rule';
|
|
6
6
|
export class SoleBusinessLoss extends SoleBusinessLossBase {
|
|
7
|
-
constructor() {
|
|
8
|
-
super(...arguments);
|
|
9
|
-
this.openBalance = 0;
|
|
10
|
-
}
|
|
11
7
|
get hasOffset() {
|
|
12
8
|
return !!this.offsetRule;
|
|
13
9
|
}
|
|
@@ -18,4 +14,4 @@ __decorate([
|
|
|
18
14
|
__decorate([
|
|
19
15
|
Type(() => SoleBusinessLossOffsetRule)
|
|
20
16
|
], SoleBusinessLoss.prototype, "offsetRule", void 0);
|
|
21
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29sZS1idXNpbmVzcy1sb3NzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL21vZGVscy9zb2xlL3NvbGUtYnVzaW5lc3MtbG9zcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsT0FBTyxFQUFFLGdCQUFnQixJQUFJLG9CQUFvQixFQUFFLE1BQU0seUNBQXlDLENBQUM7QUFDbkcsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQy9DLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN6QyxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUU5RSxNQUFNLE9BQU8sZ0JBQWlCLFNBQVEsb0JBQW9CO0lBT3hELElBQUksU0FBUztRQUNYLE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUM7SUFDM0IsQ0FBQztDQUNGO0FBUkM7SUFEQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsWUFBWSxDQUFDO2tEQUNGO0FBR3ZCO0lBREMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLDBCQUEwQixDQUFDO29EQUNBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgU29sZUJ1c2luZXNzTG9zcyBhcyBTb2xlQnVzaW5lc3NMb3NzQmFzZSB9IGZyb20gJy4uLy4uL2RiL01vZGVscy9zb2xlL3NvbGUtYnVzaW5lc3MtbG9zcyc7XG5pbXBvcnQgeyBTb2xlQnVzaW5lc3MgfSBmcm9tICcuL3NvbGUtYnVzaW5lc3MnO1xuaW1wb3J0IHsgVHlwZSB9IGZyb20gJ2NsYXNzLXRyYW5zZm9ybWVyJztcbmltcG9ydCB7IFNvbGVCdXNpbmVzc0xvc3NPZmZzZXRSdWxlIH0gZnJvbSAnLi9zb2xlLWJ1c2luZXNzLWxvc3Mtb2Zmc2V0LXJ1bGUnO1xuXG5leHBvcnQgY2xhc3MgU29sZUJ1c2luZXNzTG9zcyBleHRlbmRzIFNvbGVCdXNpbmVzc0xvc3NCYXNlIHtcbiAgQFR5cGUoKCkgPT4gU29sZUJ1c2luZXNzKVxuICBidXNpbmVzczogU29sZUJ1c2luZXNzO1xuXG4gIEBUeXBlKCgpID0+IFNvbGVCdXNpbmVzc0xvc3NPZmZzZXRSdWxlKVxuICBvZmZzZXRSdWxlOiBTb2xlQnVzaW5lc3NMb3NzT2Zmc2V0UnVsZTtcblxuICBnZXQgaGFzT2Zmc2V0KCk6IGJvb2xlYW4ge1xuICAgIHJldHVybiAhIXRoaXMub2Zmc2V0UnVsZTtcbiAgfVxufVxuIl19
|
package/fesm2015/taxtank-core.js
CHANGED
|
@@ -2065,10 +2065,6 @@ __decorate([
|
|
|
2065
2065
|
], SoleBusinessLossOffsetRule.prototype, "parent", void 0);
|
|
2066
2066
|
|
|
2067
2067
|
class SoleBusinessLoss extends SoleBusinessLoss$1 {
|
|
2068
|
-
constructor() {
|
|
2069
|
-
super(...arguments);
|
|
2070
|
-
this.openBalance = 0;
|
|
2071
|
-
}
|
|
2072
2068
|
get hasOffset() {
|
|
2073
2069
|
return !!this.offsetRule;
|
|
2074
2070
|
}
|
|
@@ -5912,8 +5908,7 @@ class TransactionAllocationCollection extends Collection {
|
|
|
5912
5908
|
|
|
5913
5909
|
class TransactionBaseCollection extends Collection {
|
|
5914
5910
|
getClaimAmountByBusiness(business) {
|
|
5915
|
-
return this.filterBy('business.id', business.id)
|
|
5916
|
-
.sumBy('claimAmount');
|
|
5911
|
+
return +this.filterBy('business.id', business.id).items.map((transaction) => transaction instanceof Depreciation ? -transaction.claimAmount : transaction['claimAmount']).reduce((sum, claimAmount) => sum + claimAmount).toFixed(2);
|
|
5917
5912
|
}
|
|
5918
5913
|
}
|
|
5919
5914
|
|
|
@@ -9208,12 +9203,8 @@ class SoleBusinessLossReport extends AbstractModel {
|
|
|
9208
9203
|
constructor(loss, transactions, depreciations) {
|
|
9209
9204
|
super();
|
|
9210
9205
|
this.openBalance = loss.openBalance;
|
|
9211
|
-
this.netIncome = transactions.sumBy('claimAmount')
|
|
9212
|
-
this.
|
|
9213
|
-
this.closeBalance = Math.max(this.taxableIncome, 0);
|
|
9214
|
-
}
|
|
9215
|
-
calculateTaxableIncome() {
|
|
9216
|
-
return this.netIncome - this.openBalance;
|
|
9206
|
+
this.netIncome = transactions.sumBy('claimAmount') - depreciations.sumBy('claimAmount');
|
|
9207
|
+
this.closeBalance = this.netIncome - this.openBalance;
|
|
9217
9208
|
}
|
|
9218
9209
|
}
|
|
9219
9210
|
|
|
@@ -14606,6 +14597,7 @@ class AbstractForm extends FormGroup {
|
|
|
14606
14597
|
constructor(controls, model, validatorOrOpts, asyncValidator) {
|
|
14607
14598
|
super(controls, validatorOrOpts, asyncValidator);
|
|
14608
14599
|
/**
|
|
14600
|
+
* @TODO Alex bad name, it's also about unchanged
|
|
14609
14601
|
* Flag display if some form values changed
|
|
14610
14602
|
*/
|
|
14611
14603
|
this.unsaved = false;
|
|
@@ -15055,17 +15047,17 @@ class SoleBusinessAllocationsForm extends FormArray {
|
|
|
15055
15047
|
}
|
|
15056
15048
|
|
|
15057
15049
|
class SoleBusinessLossForm extends AbstractForm {
|
|
15058
|
-
constructor(loss,
|
|
15050
|
+
constructor(loss, profit) {
|
|
15059
15051
|
var _a;
|
|
15060
15052
|
super({
|
|
15061
15053
|
openBalance: new FormControl(loss.openBalance, Validators.required),
|
|
15062
15054
|
offsetRule: new FormControl((_a = loss.offsetRule) === null || _a === void 0 ? void 0 : _a.id),
|
|
15063
15055
|
// sum of depreciations/transactions claim amount - openBalance
|
|
15064
|
-
balance: new FormControl({ value:
|
|
15056
|
+
balance: new FormControl({ value: profit - loss.openBalance, disabled: true }),
|
|
15065
15057
|
}, loss);
|
|
15066
15058
|
this.loss = loss;
|
|
15067
15059
|
this.get('openBalance').valueChanges.subscribe((openBalance) => {
|
|
15068
|
-
this.get('balance').setValue(
|
|
15060
|
+
this.get('balance').setValue(profit - openBalance);
|
|
15069
15061
|
});
|
|
15070
15062
|
}
|
|
15071
15063
|
/**
|