taxtank-core 0.16.10 → 0.16.11
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 +23 -18
- package/bundles/taxtank-core.umd.js.map +1 -1
- package/esm2015/lib/collections/income-source.collection.js +4 -1
- package/esm2015/lib/db/Enums/income-source-type-list-other.enum.js +1 -1
- package/esm2015/lib/db/Enums/income-source-type-list-work.enum.js +2 -1
- package/esm2015/lib/db/Enums/income-source-type.enum.js +3 -4
- package/esm2015/lib/models/income-source/income-source-type.js +4 -6
- package/esm2015/lib/models/income-source/income-source.js +4 -2
- package/esm2015/lib/services/account-setup/account-setup.service.js +11 -7
- package/fesm2015/taxtank-core.js +22 -18
- package/fesm2015/taxtank-core.js.map +1 -1
- package/lib/collections/income-source.collection.d.ts +1 -0
- package/lib/db/Enums/income-source-type-list-work.enum.d.ts +1 -0
- package/lib/db/Enums/income-source-type.enum.d.ts +3 -4
- package/lib/models/income-source/income-source-type.d.ts +1 -1
- package/lib/services/account-setup/account-setup.service.d.ts +3 -2
- package/package.json +1 -1
- package/esm2015/lib/db/Enums/income-source-type-list-salary.enum.js +0 -5
- package/lib/db/Enums/income-source-type-list-salary.enum.d.ts +0 -3
|
@@ -21,6 +21,9 @@ export class IncomeSourceCollection extends Collection {
|
|
|
21
21
|
filterByTypes(types) {
|
|
22
22
|
return this.items.filter((incomeSource) => types.includes(incomeSource.type));
|
|
23
23
|
}
|
|
24
|
+
getSalary() {
|
|
25
|
+
return this.items.filter((incomeSource) => incomeSource.isSalaryIncome());
|
|
26
|
+
}
|
|
24
27
|
/**
|
|
25
28
|
* Get income sources list of forecasts
|
|
26
29
|
*/
|
|
@@ -28,4 +31,4 @@ export class IncomeSourceCollection extends Collection {
|
|
|
28
31
|
return this.items.map((incomeSource) => incomeSource.forecasts).flat();
|
|
29
32
|
}
|
|
30
33
|
}
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5jb21lLXNvdXJjZS5jb2xsZWN0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL2NvbGxlY3Rpb25zL2luY29tZS1zb3VyY2UuY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRTFDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUkxRDs7R0FFRztBQUNILE1BQU0sT0FBTyxzQkFBdUIsU0FBUSxVQUF3QjtJQUNsRSxZQUFZLENBQUMsSUFBa0I7UUFDN0IsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLFlBQTBCLEVBQUUsRUFBRTtZQUN0RCxRQUFRLElBQUksRUFBRTtnQkFDWixLQUFLLFlBQVksQ0FBQyxLQUFLO29CQUNyQixPQUFPLFlBQVksQ0FBQyxhQUFhLEVBQUUsQ0FBQztnQkFDdEM7b0JBQ0UsT0FBTyxZQUFZLENBQUMsY0FBYyxFQUFFLElBQUksWUFBWSxDQUFDLFlBQVksRUFBRSxDQUFDO2FBQ3ZFO1FBQ0gsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsYUFBYSxDQUFDLEtBQTZCO1FBQ3pDLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQyxZQUEwQixFQUFFLEVBQUUsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO0lBQzlGLENBQUM7SUFFRCxTQUFTO1FBQ1AsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLFlBQTBCLEVBQUUsRUFBRSxDQUFDLFlBQVksQ0FBQyxjQUFjLEVBQUUsQ0FBQyxDQUFDO0lBQzFGLENBQUM7SUFFRDs7T0FFRztJQUNILElBQUksU0FBUztRQUNYLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxZQUEwQixFQUFFLEVBQUUsQ0FBQyxZQUFZLENBQUMsU0FBUyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDdkYsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29sbGVjdGlvbiB9IGZyb20gJy4vY29sbGVjdGlvbic7XG5pbXBvcnQgeyBJbmNvbWVTb3VyY2UgfSBmcm9tICcuLi9tb2RlbHMvaW5jb21lLXNvdXJjZS9pbmNvbWUtc291cmNlJztcbmltcG9ydCB7IFRhbmtUeXBlRW51bSB9IGZyb20gJy4uL2RiL0VudW1zL3RhbmstdHlwZS5lbnVtJztcbmltcG9ydCB7IEluY29tZVNvdXJjZVR5cGVFbnVtIH0gZnJvbSAnLi4vZGIvRW51bXMvaW5jb21lLXNvdXJjZS10eXBlLmVudW0nO1xuaW1wb3J0IHsgSUluY29tZVNvdXJjZUZvcmVjYXN0IH0gZnJvbSAnLi4vaW50ZXJmYWNlcy9pbmNvbWUtc291cmNlLWZvcmVjYXN0LmludGVyZmFjZSc7XG5cbi8qKlxuICogQ29sbGVjdGlvbiBvZiBpbmNvbWUgc291cmNlc1xuICovXG5leHBvcnQgY2xhc3MgSW5jb21lU291cmNlQ29sbGVjdGlvbiBleHRlbmRzIENvbGxlY3Rpb248SW5jb21lU291cmNlPiB7XG4gIGZpbHRlckJ5VGFuayh0YW5rOiBUYW5rVHlwZUVudW0pOiBJbmNvbWVTb3VyY2VbXSB7XG4gICAgcmV0dXJuIHRoaXMuaXRlbXMuZmlsdGVyKChpbmNvbWVTb3VyY2U6IEluY29tZVNvdXJjZSkgPT4ge1xuICAgICAgc3dpdGNoICh0YW5rKSB7XG4gICAgICAgIGNhc2UgVGFua1R5cGVFbnVtLk9USEVSOlxuICAgICAgICAgIHJldHVybiBpbmNvbWVTb3VyY2UuaXNPdGhlckluY29tZSgpO1xuICAgICAgICBkZWZhdWx0OlxuICAgICAgICAgIHJldHVybiBpbmNvbWVTb3VyY2UuaXNTYWxhcnlJbmNvbWUoKSB8fCBpbmNvbWVTb3VyY2UuaXNXb3JrSW5jb21lKCk7XG4gICAgICB9XG4gICAgfSk7XG4gIH1cblxuICAvKipcbiAgICogRmlsdGVyIGluY29tZSBzb3VyY2VzIGJ5IHByb3ZpZGVkIHR5b2VzXG4gICAqIEBwYXJhbSB0eXBlc1xuICAgKi9cbiAgZmlsdGVyQnlUeXBlcyh0eXBlczogSW5jb21lU291cmNlVHlwZUVudW1bXSk6IEluY29tZVNvdXJjZVtdIHtcbiAgICByZXR1cm4gdGhpcy5pdGVtcy5maWx0ZXIoKGluY29tZVNvdXJjZTogSW5jb21lU291cmNlKSA9PiB0eXBlcy5pbmNsdWRlcyhpbmNvbWVTb3VyY2UudHlwZSkpO1xuICB9XG5cbiAgZ2V0U2FsYXJ5KCk6IEluY29tZVNvdXJjZVtdIHtcbiAgICByZXR1cm4gdGhpcy5pdGVtcy5maWx0ZXIoKGluY29tZVNvdXJjZTogSW5jb21lU291cmNlKSA9PiBpbmNvbWVTb3VyY2UuaXNTYWxhcnlJbmNvbWUoKSk7XG4gIH1cblxuICAvKipcbiAgICogR2V0IGluY29tZSBzb3VyY2VzIGxpc3Qgb2YgZm9yZWNhc3RzXG4gICAqL1xuICBnZXQgZm9yZWNhc3RzKCk6IElJbmNvbWVTb3VyY2VGb3JlY2FzdFtdIHtcbiAgICByZXR1cm4gdGhpcy5pdGVtcy5tYXAoKGluY29tZVNvdXJjZTogSW5jb21lU291cmNlKSA9PiBpbmNvbWVTb3VyY2UuZm9yZWNhc3RzKS5mbGF0KCk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -5,4 +5,4 @@ export var IncomeSourceTypeListOtherEnum;
|
|
|
5
5
|
IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["PARTNERSHIPS_AND_TRUSTS"] = 9] = "PARTNERSHIPS_AND_TRUSTS";
|
|
6
6
|
IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["OTHER_INCOME"] = 10] = "OTHER_INCOME";
|
|
7
7
|
})(IncomeSourceTypeListOtherEnum || (IncomeSourceTypeListOtherEnum = {}));
|
|
8
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5jb21lLXNvdXJjZS10eXBlLWxpc3Qtb3RoZXIuZW51bS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9kYi9FbnVtcy9pbmNvbWUtc291cmNlLXR5cGUtbGlzdC1vdGhlci5lbnVtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE1BQU0sQ0FBTixJQUFZLDZCQUtYO0FBTEQsV0FBWSw2QkFBNkI7SUFDdkMsK0VBQU8sQ0FBQTtJQUNQLCtGQUFlLENBQUE7SUFDZix1SEFBMkIsQ0FBQTtJQUMzQixrR0FBaUIsQ0FBQTtBQUNuQixDQUFDLEVBTFcsNkJBQTZCLEtBQTdCLDZCQUE2QixRQUt4QyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBlbnVtIEluY29tZVNvdXJjZVR5cGVMaXN0T3RoZXJFbnVtIHtcbiAgUFNJID0gNixcbiAgU09MRV9UUkFERVIgPSA3LFxuICBQQVJUTkVSU0hJUFNfQU5EX1RSVVNUUyA9IDksXG4gIE9USEVSX0lOQ09NRSA9IDEwLFxufVxuIl19
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export var IncomeSourceTypeListWorkEnum;
|
|
2
2
|
(function (IncomeSourceTypeListWorkEnum) {
|
|
3
|
+
IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["BONUSES"] = 1] = "BONUSES";
|
|
3
4
|
IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["DIRECTOR_FEES"] = 2] = "DIRECTOR_FEES";
|
|
4
5
|
IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["DIVIDENDS"] = 3] = "DIVIDENDS";
|
|
5
6
|
IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["INTEREST"] = 4] = "INTEREST";
|
|
@@ -7,4 +8,4 @@ export var IncomeSourceTypeListWorkEnum;
|
|
|
7
8
|
IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["SUPERANNUATION"] = 8] = "SUPERANNUATION";
|
|
8
9
|
IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["ATTRIBUTED_P_S_I"] = 11] = "ATTRIBUTED_P_S_I";
|
|
9
10
|
})(IncomeSourceTypeListWorkEnum || (IncomeSourceTypeListWorkEnum = {}));
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5jb21lLXNvdXJjZS10eXBlLWxpc3Qtd29yay5lbnVtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL2RiL0VudW1zL2luY29tZS1zb3VyY2UtdHlwZS1saXN0LXdvcmsuZW51bS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLENBQU4sSUFBWSw0QkFRWDtBQVJELFdBQVksNEJBQTRCO0lBQ3RDLHFGQUFXLENBQUE7SUFDWCxpR0FBaUIsQ0FBQTtJQUNqQix5RkFBYSxDQUFBO0lBQ2IsdUZBQVksQ0FBQTtJQUNaLHFIQUEyQixDQUFBO0lBQzNCLG1HQUFrQixDQUFBO0lBQ2xCLHdHQUFxQixDQUFBO0FBQ3ZCLENBQUMsRUFSVyw0QkFBNEIsS0FBNUIsNEJBQTRCLFFBUXZDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGVudW0gSW5jb21lU291cmNlVHlwZUxpc3RXb3JrRW51bSB7XG4gIEJPTlVTRVMgPSAxLFxuICBESVJFQ1RPUl9GRUVTID0gMixcbiAgRElWSURFTkRTID0gMyxcbiAgSU5URVJFU1QgPSA0LFxuICBQRU5TSU9OU19BTkRfQUxMT1dBTkNFUyA9IDUsXG4gIFNVUEVSQU5OVUFUSU9OID0gOCxcbiAgQVRUUklCVVRFRF9QX1NfSSA9IDExLFxufVxuIl19
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
export var IncomeSourceTypeEnum;
|
|
2
2
|
(function (IncomeSourceTypeEnum) {
|
|
3
|
-
IncomeSourceTypeEnum[IncomeSourceTypeEnum["
|
|
4
|
-
IncomeSourceTypeEnum[IncomeSourceTypeEnum["
|
|
3
|
+
IncomeSourceTypeEnum[IncomeSourceTypeEnum["WORK"] = 1] = "WORK";
|
|
4
|
+
IncomeSourceTypeEnum[IncomeSourceTypeEnum["SOLE"] = 2] = "SOLE";
|
|
5
5
|
IncomeSourceTypeEnum[IncomeSourceTypeEnum["OTHER"] = 3] = "OTHER";
|
|
6
|
-
IncomeSourceTypeEnum[IncomeSourceTypeEnum["SOLE"] = 4] = "SOLE";
|
|
7
6
|
})(IncomeSourceTypeEnum || (IncomeSourceTypeEnum = {}));
|
|
8
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
7
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5jb21lLXNvdXJjZS10eXBlLmVudW0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvZGIvRW51bXMvaW5jb21lLXNvdXJjZS10eXBlLmVudW0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxDQUFOLElBQVksb0JBSVg7QUFKRCxXQUFZLG9CQUFvQjtJQUM5QiwrREFBUSxDQUFBO0lBQ1IsK0RBQVEsQ0FBQTtJQUNSLGlFQUFTLENBQUE7QUFDWCxDQUFDLEVBSlcsb0JBQW9CLEtBQXBCLG9CQUFvQixRQUkvQiIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBlbnVtIEluY29tZVNvdXJjZVR5cGVFbnVtIHtcbiAgV09SSyA9IDEsXG4gIFNPTEUgPSAyLFxuICBPVEhFUiA9IDMsXG59XG4iXX0=
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import { IncomeSourceType as IncomeSourceTypeBase } from '../../db/Models/incomeSource/income-source-type';
|
|
2
|
-
import { IncomeSourceTypeListSalaryEnum } from '../../db/Enums/income-source-type-list-salary.enum';
|
|
3
2
|
import { IncomeSourceTypeListWorkEnum } from '../../db/Enums/income-source-type-list-work.enum';
|
|
4
3
|
import { IncomeSourceTypeListOtherEnum } from '../../db/Enums/income-source-type-list-other.enum';
|
|
5
4
|
import { IncomeSourceTypeEnum } from '../../db/Enums/income-source-type.enum';
|
|
6
5
|
export class IncomeSourceType extends IncomeSourceTypeBase {
|
|
7
|
-
|
|
8
|
-
return
|
|
6
|
+
isBonuses() {
|
|
7
|
+
return this.id === IncomeSourceTypeListWorkEnum.BONUSES;
|
|
9
8
|
}
|
|
10
9
|
isWork() {
|
|
11
10
|
return !!IncomeSourceTypeListWorkEnum[this.id];
|
|
@@ -14,12 +13,11 @@ export class IncomeSourceType extends IncomeSourceTypeBase {
|
|
|
14
13
|
return !!IncomeSourceTypeListOtherEnum[this.id];
|
|
15
14
|
}
|
|
16
15
|
isSole() {
|
|
16
|
+
// @TODO use IncomeSourceTypeListSoleEnum when sole tank ready
|
|
17
17
|
return !!IncomeSourceTypeListOtherEnum[this.id];
|
|
18
18
|
}
|
|
19
19
|
get type() {
|
|
20
20
|
switch (true) {
|
|
21
|
-
case this.isSalary():
|
|
22
|
-
return IncomeSourceTypeEnum.SALARY;
|
|
23
21
|
case this.isWork():
|
|
24
22
|
return IncomeSourceTypeEnum.WORK;
|
|
25
23
|
case this.isSole():
|
|
@@ -29,4 +27,4 @@ export class IncomeSourceType extends IncomeSourceTypeBase {
|
|
|
29
27
|
}
|
|
30
28
|
}
|
|
31
29
|
}
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5jb21lLXNvdXJjZS10eXBlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL21vZGVscy9pbmNvbWUtc291cmNlL2luY29tZS1zb3VyY2UtdHlwZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsZ0JBQWdCLElBQUksb0JBQW9CLEVBQUUsTUFBTSxpREFBaUQsQ0FBQztBQUMzRyxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSxrREFBa0QsQ0FBQztBQUNoRyxPQUFPLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSxtREFBbUQsQ0FBQztBQUNsRyxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx3Q0FBd0MsQ0FBQztBQUU5RSxNQUFNLE9BQU8sZ0JBQWlCLFNBQVEsb0JBQW9CO0lBQ3hELFNBQVM7UUFDUCxPQUFPLElBQUksQ0FBQyxFQUFFLEtBQUssNEJBQTRCLENBQUMsT0FBTyxDQUFDO0lBQzFELENBQUM7SUFFRCxNQUFNO1FBQ0osT0FBTyxDQUFDLENBQUMsNEJBQTRCLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ2pELENBQUM7SUFFRCxPQUFPO1FBQ0wsT0FBTyxDQUFDLENBQUMsNkJBQTZCLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ2xELENBQUM7SUFFRCxNQUFNO1FBQ0osOERBQThEO1FBQzlELE9BQU8sQ0FBQyxDQUFDLDZCQUE2QixDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUNsRCxDQUFDO0lBRUQsSUFBSSxJQUFJO1FBQ04sUUFBUSxJQUFJLEVBQUU7WUFDWixLQUFLLElBQUksQ0FBQyxNQUFNLEVBQUU7Z0JBQ2hCLE9BQU8sb0JBQW9CLENBQUMsSUFBSSxDQUFDO1lBQ25DLEtBQUssSUFBSSxDQUFDLE1BQU0sRUFBRTtnQkFDaEIsT0FBTyxvQkFBb0IsQ0FBQyxJQUFJLENBQUM7WUFDbkM7Z0JBQ0UsT0FBTyxvQkFBb0IsQ0FBQyxLQUFLLENBQUM7U0FDckM7SUFDSCxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmNvbWVTb3VyY2VUeXBlIGFzIEluY29tZVNvdXJjZVR5cGVCYXNlIH0gZnJvbSAnLi4vLi4vZGIvTW9kZWxzL2luY29tZVNvdXJjZS9pbmNvbWUtc291cmNlLXR5cGUnO1xuaW1wb3J0IHsgSW5jb21lU291cmNlVHlwZUxpc3RXb3JrRW51bSB9IGZyb20gJy4uLy4uL2RiL0VudW1zL2luY29tZS1zb3VyY2UtdHlwZS1saXN0LXdvcmsuZW51bSc7XG5pbXBvcnQgeyBJbmNvbWVTb3VyY2VUeXBlTGlzdE90aGVyRW51bSB9IGZyb20gJy4uLy4uL2RiL0VudW1zL2luY29tZS1zb3VyY2UtdHlwZS1saXN0LW90aGVyLmVudW0nO1xuaW1wb3J0IHsgSW5jb21lU291cmNlVHlwZUVudW0gfSBmcm9tICcuLi8uLi9kYi9FbnVtcy9pbmNvbWUtc291cmNlLXR5cGUuZW51bSc7XG5cbmV4cG9ydCBjbGFzcyBJbmNvbWVTb3VyY2VUeXBlIGV4dGVuZHMgSW5jb21lU291cmNlVHlwZUJhc2Uge1xuICBpc0JvbnVzZXMoKTogYm9vbGVhbiB7XG4gICAgcmV0dXJuIHRoaXMuaWQgPT09IEluY29tZVNvdXJjZVR5cGVMaXN0V29ya0VudW0uQk9OVVNFUztcbiAgfVxuXG4gIGlzV29yaygpOiBib29sZWFuIHtcbiAgICByZXR1cm4gISFJbmNvbWVTb3VyY2VUeXBlTGlzdFdvcmtFbnVtW3RoaXMuaWRdO1xuICB9XG5cbiAgaXNPdGhlcigpOiBib29sZWFuIHtcbiAgICByZXR1cm4gISFJbmNvbWVTb3VyY2VUeXBlTGlzdE90aGVyRW51bVt0aGlzLmlkXTtcbiAgfVxuXG4gIGlzU29sZSgpOiBib29sZWFuIHtcbiAgICAvLyBAVE9ETyB1c2UgSW5jb21lU291cmNlVHlwZUxpc3RTb2xlRW51bSB3aGVuIHNvbGUgdGFuayByZWFkeVxuICAgIHJldHVybiAhIUluY29tZVNvdXJjZVR5cGVMaXN0T3RoZXJFbnVtW3RoaXMuaWRdO1xuICB9XG5cbiAgZ2V0IHR5cGUoKTogSW5jb21lU291cmNlVHlwZUVudW0ge1xuICAgIHN3aXRjaCAodHJ1ZSkge1xuICAgICAgY2FzZSB0aGlzLmlzV29yaygpOlxuICAgICAgICByZXR1cm4gSW5jb21lU291cmNlVHlwZUVudW0uV09SSztcbiAgICAgIGNhc2UgdGhpcy5pc1NvbGUoKTpcbiAgICAgICAgcmV0dXJuIEluY29tZVNvdXJjZVR5cGVFbnVtLlNPTEU7XG4gICAgICBkZWZhdWx0OlxuICAgICAgICByZXR1cm4gSW5jb21lU291cmNlVHlwZUVudW0uT1RIRVI7XG4gICAgfVxuICB9XG59XG4iXX0=
|
|
@@ -8,7 +8,9 @@ import { IncomeSourceForecast } from './income-source-forecast';
|
|
|
8
8
|
import { FinancialYear } from '../financial-year/financial-year';
|
|
9
9
|
export class IncomeSource extends IncomeSourceBase {
|
|
10
10
|
isSalaryIncome() {
|
|
11
|
-
return this.
|
|
11
|
+
return !!this.salaryForecasts.length;
|
|
12
|
+
// @TODO Vik: old code
|
|
13
|
+
// return this.type === IncomeSourceTypeEnum.SALARY;
|
|
12
14
|
}
|
|
13
15
|
isSoleIncome() {
|
|
14
16
|
return this.type === IncomeSourceTypeEnum.SOLE;
|
|
@@ -55,4 +57,4 @@ __decorate([
|
|
|
55
57
|
__decorate([
|
|
56
58
|
Type(() => Date)
|
|
57
59
|
], IncomeSource.prototype, "dateTo", void 0);
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5jb21lLXNvdXJjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9tb2RlbHMvaW5jb21lLXNvdXJjZS9pbmNvbWUtc291cmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxPQUFPLEVBQUUsWUFBWSxJQUFJLGdCQUFnQixFQUFFLE1BQU0sNENBQTRDLENBQUM7QUFDOUYsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sd0NBQXdDLENBQUM7QUFFOUUsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3pDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNuRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDL0MsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDaEUsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBRWpFLE1BQU0sT0FBTyxZQUFhLFNBQVEsZ0JBQWdCO0lBZ0JoRCxjQUFjO1FBQ1osT0FBTyxDQUFDLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxNQUFNLENBQUM7UUFDckMsc0JBQXNCO1FBQ3RCLG9EQUFvRDtJQUN0RCxDQUFDO0lBRUQsWUFBWTtRQUNWLE9BQU8sSUFBSSxDQUFDLElBQUksS0FBSyxvQkFBb0IsQ0FBQyxJQUFJLENBQUM7SUFDakQsQ0FBQztJQUVELFlBQVk7UUFDVixPQUFPLElBQUksQ0FBQyxJQUFJLEtBQUssb0JBQW9CLENBQUMsSUFBSSxDQUFDO0lBQ2pELENBQUM7SUFFRCxhQUFhO1FBQ1gsT0FBTyxJQUFJLENBQUMsSUFBSSxLQUFLLG9CQUFvQixDQUFDLEtBQUssQ0FBQztJQUNsRCxDQUFDO0lBRUQ7O09BRUc7SUFDSCxJQUFJLFNBQVM7UUFDWCxPQUFPLENBQUMsR0FBRyxJQUFJLENBQUMsZUFBZSxFQUFFLEdBQUcsSUFBSSxDQUFDLHFCQUFxQixFQUFFLEdBQUcsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQ3pGLENBQUM7SUFFRDs7T0FFRztJQUNILElBQUksY0FBYztRQUNoQixPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDM0IsQ0FBQztJQUVEOzs7T0FHRztJQUNILGVBQWUsQ0FBQyxVQUFrQjtRQUNoQyxNQUFNLFNBQVMsR0FBUyxJQUFJLGFBQWEsRUFBRSxDQUFDLFlBQVksQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUNyRSxPQUFPLENBQUMsQ0FBQyxJQUFJLENBQUMsUUFBUSxJQUFJLFNBQVMsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLElBQUksU0FBUyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNyRyxDQUFDO0NBQ0Y7QUF0REM7SUFEQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsY0FBYyxDQUFDO3FEQUNPO0FBR2xDO0lBREMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLFlBQVksQ0FBQzttREFDSztBQUc5QjtJQURDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxvQkFBb0IsQ0FBQzsyREFDYTtBQUc5QztJQURDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUM7OENBQ0Y7QUFHZjtJQURDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUM7NENBQ0oiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmNvbWVTb3VyY2UgYXMgSW5jb21lU291cmNlQmFzZSB9IGZyb20gJy4uLy4uL2RiL01vZGVscy9pbmNvbWVTb3VyY2UvaW5jb21lLXNvdXJjZSc7XHJcbmltcG9ydCB7IEluY29tZVNvdXJjZVR5cGVFbnVtIH0gZnJvbSAnLi4vLi4vZGIvRW51bXMvaW5jb21lLXNvdXJjZS10eXBlLmVudW0nO1xyXG5pbXBvcnQgeyBJSW5jb21lU291cmNlRm9yZWNhc3QgfSBmcm9tICcuLi8uLi9pbnRlcmZhY2VzL2luY29tZS1zb3VyY2UtZm9yZWNhc3QuaW50ZXJmYWNlJztcclxuaW1wb3J0IHsgVHlwZSB9IGZyb20gJ2NsYXNzLXRyYW5zZm9ybWVyJztcclxuaW1wb3J0IHsgU2FsYXJ5Rm9yZWNhc3QgfSBmcm9tICcuL3NhbGFyeS1mb3JlY2FzdCc7XHJcbmltcG9ydCB7IFNvbGVGb3JlY2FzdCB9IGZyb20gJy4vc29sZS1mb3JlY2FzdCc7XHJcbmltcG9ydCB7IEluY29tZVNvdXJjZUZvcmVjYXN0IH0gZnJvbSAnLi9pbmNvbWUtc291cmNlLWZvcmVjYXN0JztcclxuaW1wb3J0IHsgRmluYW5jaWFsWWVhciB9IGZyb20gJy4uL2ZpbmFuY2lhbC15ZWFyL2ZpbmFuY2lhbC15ZWFyJztcclxuXHJcbmV4cG9ydCBjbGFzcyBJbmNvbWVTb3VyY2UgZXh0ZW5kcyBJbmNvbWVTb3VyY2VCYXNlIHtcclxuICBAVHlwZSgoKSA9PiBTYWxhcnlGb3JlY2FzdClcclxuICBzYWxhcnlGb3JlY2FzdHM6IFNhbGFyeUZvcmVjYXN0W107XHJcblxyXG4gIEBUeXBlKCgpID0+IFNvbGVGb3JlY2FzdClcclxuICBzb2xlRm9yZWNhc3RzOiBTb2xlRm9yZWNhc3RbXTtcclxuXHJcbiAgQFR5cGUoKCkgPT4gSW5jb21lU291cmNlRm9yZWNhc3QpXHJcbiAgaW5jb21lU291cmNlRm9yZWNhc3RzOiBJbmNvbWVTb3VyY2VGb3JlY2FzdFtdO1xyXG5cclxuICBAVHlwZSgoKSA9PiBEYXRlKVxyXG4gIGRhdGVGcm9tOiBEYXRlO1xyXG5cclxuICBAVHlwZSgoKSA9PiBEYXRlKVxyXG4gIGRhdGVUbzogRGF0ZTtcclxuXHJcbiAgaXNTYWxhcnlJbmNvbWUoKTogYm9vbGVhbiB7XHJcbiAgICByZXR1cm4gISF0aGlzLnNhbGFyeUZvcmVjYXN0cy5sZW5ndGg7XHJcbiAgICAvLyBAVE9ETyBWaWs6IG9sZCBjb2RlXHJcbiAgICAvLyByZXR1cm4gdGhpcy50eXBlID09PSBJbmNvbWVTb3VyY2VUeXBlRW51bS5TQUxBUlk7XHJcbiAgfVxyXG5cclxuICBpc1NvbGVJbmNvbWUoKTogYm9vbGVhbiB7XHJcbiAgICByZXR1cm4gdGhpcy50eXBlID09PSBJbmNvbWVTb3VyY2VUeXBlRW51bS5TT0xFO1xyXG4gIH1cclxuXHJcbiAgaXNXb3JrSW5jb21lKCk6IGJvb2xlYW4ge1xyXG4gICAgcmV0dXJuIHRoaXMudHlwZSA9PT0gSW5jb21lU291cmNlVHlwZUVudW0uV09SSztcclxuICB9XHJcblxyXG4gIGlzT3RoZXJJbmNvbWUoKTogYm9vbGVhbiB7XHJcbiAgICByZXR1cm4gdGhpcy50eXBlID09PSBJbmNvbWVTb3VyY2VUeXBlRW51bS5PVEhFUjtcclxuICB9XHJcblxyXG4gIC8qKlxyXG4gICAqIEdldCBzYWxhcnkgYW5kIG90aGVyIGluY29tZSBmb3JlY2FzdHNcclxuICAgKi9cclxuICBnZXQgZm9yZWNhc3RzKCk6IElJbmNvbWVTb3VyY2VGb3JlY2FzdFtdIHtcclxuICAgIHJldHVybiBbLi4udGhpcy5zYWxhcnlGb3JlY2FzdHMsIC4uLnRoaXMuaW5jb21lU291cmNlRm9yZWNhc3RzLCAuLi50aGlzLnNvbGVGb3JlY2FzdHNdO1xyXG4gIH1cclxuXHJcbiAgLyoqXHJcbiAgICogR2V0IGFjdHVhbCAoMXN0IGZyb20gdGhlIGxpc3QpIGZvcmVjYXN0XHJcbiAgICovXHJcbiAgZ2V0IGFjdHVhbEZvcmVjYXN0KCk6IElJbmNvbWVTb3VyY2VGb3JlY2FzdCB7XHJcbiAgICByZXR1cm4gdGhpcy5mb3JlY2FzdHNbMF07XHJcbiAgfVxyXG5cclxuICAvKipcclxuICAgKiBDaGVjayBpZiB1c2VyIHdhcyB3b3JraW5nIGluIG1vbnRoIHRha2VuIGJ5IHRoZSBpbmRleFxyXG4gICAqIEBwYXJhbSBtb250aEluZGV4IGJ5IHdoaWNoIG1vbnRoIHNob3VsZCBiZSB0YWtlblxyXG4gICAqL1xyXG4gIGlzV29ya2VkSW5Nb250aChtb250aEluZGV4OiBudW1iZXIpOiBib29sZWFuIHtcclxuICAgIGNvbnN0IG1vbnRoRGF0ZTogRGF0ZSA9IG5ldyBGaW5hbmNpYWxZZWFyKCkuZ2V0TW9udGhEYXRlKG1vbnRoSW5kZXgpO1xyXG4gICAgcmV0dXJuICghdGhpcy5kYXRlRnJvbSB8fCBtb250aERhdGUgPj0gdGhpcy5kYXRlRnJvbSkgJiYgKCF0aGlzLmRhdGVUbyB8fCBtb250aERhdGUgPCB0aGlzLmRhdGVUbyk7XHJcbiAgfVxyXG59XHJcbiJdfQ==
|
|
@@ -3,7 +3,6 @@ import { ACCOUNT_SETUP_ITEMS } from '../../models/account-setup/account-setup-it
|
|
|
3
3
|
import { AccountSetupItemsEnum } from '../../models/account-setup/account-setup-items.enum';
|
|
4
4
|
import { ClientIncomeTypes } from '../../models/client/client-income-types';
|
|
5
5
|
import { IncomeSourceCollection } from '../../collections/income-source.collection';
|
|
6
|
-
import { IncomeSourceTypeEnum } from '../../db/Enums/income-source-type.enum';
|
|
7
6
|
import { combineLatest, of, ReplaySubject } from 'rxjs';
|
|
8
7
|
import { filter, map, mergeMap } from 'rxjs/operators';
|
|
9
8
|
import { AccountSetupItemCollection } from '../../collections/account-setup-item.collection';
|
|
@@ -88,11 +87,11 @@ export class AccountSetupService {
|
|
|
88
87
|
const batch = [];
|
|
89
88
|
// Salary item is completed when user added salary income source
|
|
90
89
|
if (incomeTypes.salary) {
|
|
91
|
-
batch.push(this.create(AccountSetupItemsEnum.SALARY, this.
|
|
90
|
+
batch.push(this.create(AccountSetupItemsEnum.SALARY, this.getIncomeSources(true)));
|
|
92
91
|
}
|
|
93
92
|
// Other income item is completed when user added at least one other income source
|
|
94
93
|
if (incomeTypes.dividends || incomeTypes.other) {
|
|
95
|
-
batch.push(this.create(AccountSetupItemsEnum.OTHER_INCOME, this.
|
|
94
|
+
batch.push(this.create(AccountSetupItemsEnum.OTHER_INCOME, this.getIncomeSources()));
|
|
96
95
|
}
|
|
97
96
|
// Rental income item is completed when user added at least one property
|
|
98
97
|
if (incomeTypes.property) {
|
|
@@ -117,11 +116,16 @@ export class AccountSetupService {
|
|
|
117
116
|
return combineLatest(batch).pipe(map((items) => new AccountSetupItemCollection(items)));
|
|
118
117
|
}
|
|
119
118
|
/**
|
|
120
|
-
* @TODO work with collection when services refactored
|
|
119
|
+
* @TODO Alex: work with collection when services refactored
|
|
120
|
+
* @TODO Vik: waiting for income sources refactoring
|
|
121
121
|
*/
|
|
122
|
-
|
|
122
|
+
getIncomeSources(isSalary = false) {
|
|
123
123
|
return this.incomeSourceService.get().pipe(map((incomeSources) => {
|
|
124
|
-
|
|
124
|
+
const collection = new IncomeSourceCollection(incomeSources);
|
|
125
|
+
if (isSalary) {
|
|
126
|
+
return collection.getSalary();
|
|
127
|
+
}
|
|
128
|
+
return collection.items.filter((incomeSource) => !incomeSource.isSalaryIncome() && !incomeSource.isSoleIncome());
|
|
125
129
|
}));
|
|
126
130
|
}
|
|
127
131
|
/**
|
|
@@ -147,4 +151,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
|
|
|
147
151
|
providedIn: 'root'
|
|
148
152
|
}]
|
|
149
153
|
}], ctorParameters: function () { return [{ type: i1.ClientIncomeTypesService }, { type: i2.PropertyService }, { type: i3.IncomeSourceService }, { type: i4.BankAccountService }, { type: i5.TransactionAllocationService }, { type: i6.VehicleClaimService }, { type: i7.TransactionService }]; } });
|
|
150
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"account-setup.service.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/services/account-setup/account-setup.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sDAAsD,CAAC;AAE3F,OAAO,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AAE5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAG5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AAEpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAG9E,OAAO,EAAE,aAAa,EAAc,EAAE,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AACpE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAC;AAE7F,OAAO,SAAS,MAAM,kBAAkB,CAAC;AACzC,OAAO,SAAS,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;;;;;;;;;AAEjF;;;GAGG;AAIH,MAAM,OAAO,mBAAmB;IAK9B,YACU,wBAAkD,EAClD,eAAgC,EAChC,mBAAwC,EACxC,mBAAuC,EACvC,4BAA0D,EAC1D,mBAAwC,EACxC,kBAAsC;QANtC,6BAAwB,GAAxB,wBAAwB,CAA0B;QAClD,oBAAe,GAAf,eAAe,CAAiB;QAChC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,wBAAmB,GAAnB,mBAAmB,CAAoB;QACvC,iCAA4B,GAA5B,4BAA4B,CAA8B;QAC1D,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,uBAAkB,GAAlB,kBAAkB,CAAoB;QAVhD,iBAAY,GAA8C,IAAI,aAAa,CAA6B,CAAC,CAAC,CAAC;IAY3G,CAAC;IAED;;OAEG;IACH,GAAG;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACf,IAAI,CAAC,KAAK,GAAG,IAAI,0BAA0B,CAAC,EAAE,CAAC,CAAC;YAEhD,IAAI,CAAC,wBAAwB,CAAC,GAAG,EAAE;iBAChC,IAAI;YACH,yEAAyE;YACzE,MAAM,CAAC,CAAC,WAA8B,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,EAChE,QAAQ,CAAC,CAAC,WAA8B,EAAE,EAAE;gBAC1C,IAAI,CAAC,mBAAmB,GAAG,WAAW,CAAC,EAAE,CAAC;gBAE1C,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;YACvC,CAAC,CAAC,CACH;iBACA,SAAS,CAAC,CAAC,KAAiC,EAAE,EAAE;gBAC/C,QAAQ,IAAI,EAAE;oBACZ,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;oBACjB,KAAK,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,MAAM,KAAK,KAAK,CAAC,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC;oBAC9F,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM;wBACrC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;wBAC9B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBACtC;YACH,CAAC,CAAC,CAAC;SACN;QAED,OAAO,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,IAAsB;QACvC,OAAO,YAAY,CACjB,iBAAiB,EACjB,MAAM,CAAC,MAAM,CAAC,EAAC,EAAE,EAAE,IAAI,CAAC,mBAAmB,EAAC,EAAE,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CACtH,CAAA;IACH,CAAC;IAED;;OAEG;IACK,MAAM,CAAC,QAA+B,EAAE,OAA6B;QAC3E,OAAO,OAAO,CAAC,IAAI,CACjB,GAAG,CAAC,CAAC,MAAgB,EAAoB,EAAE;YACzC,MAAM,IAAI,GAAqB,mBAAmB,CAAC,QAAQ,CAAC,CAAC;YAE7D,IAAI,MAAM,CAAC,MAAM,EAAE;gBACjB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;aACzB;iBAAM;gBACL,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;aAC1B;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED;;;OAGG;IACK,WAAW,CAAC,WAA8B;QAChD,MAAM,KAAK,GAAmC,EAAE,CAAC;QAEjD,gEAAgE;QAChE,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,KAAK,CAAC,IAAI,CACR,IAAI,CAAC,MAAM,CACT,qBAAqB,CAAC,MAAM,EAC5B,IAAI,CAAC,sBAAsB,CAAC,oBAAoB,CAAC,IAAI,CAAC,CACvD,CACF,CAAC;SACH;QAED,kFAAkF;QAClF,IAAI,WAAW,CAAC,SAAS,IAAI,WAAW,CAAC,KAAK,EAAE;YAC9C,KAAK,CAAC,IAAI,CACR,IAAI,CAAC,MAAM,CACT,qBAAqB,CAAC,YAAY,EAClC,IAAI,CAAC,sBAAsB,CAAC,oBAAoB,CAAC,KAAK,CAAC,CACxD,CACF,CAAC;SACH;QAED,wEAAwE;QACxE,IAAI,WAAW,CAAC,QAAQ,EAAE;YACxB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;SACrF;QAED,2FAA2F;QAC3F,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,UAAU,EAAE,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAE1F,uGAAuG;QACvG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;QAElC,4CAA4C;QAC5C,yEAAyE;QACzE,gCAAgC;QAChC,gBAAgB;QAChB,wBAAwB;QACxB,2CAA2C;QAC3C,+DAA+D;QAC/D,QAAQ;QACR,OAAO;QACP,IAAI;QAEJ,mFAAmF;QACnF,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,WAAW,EAAE,IAAI,CAAC,4BAA4B,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAEpG,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAyB,EAAE,EAAE,CAAC,IAAI,0BAA0B,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC9G,CAAC;IAED;;OAEG;IACK,sBAAsB,CAAC,IAA0B;QACvD,OAAO,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAC,IAAI,CACxC,GAAG,CAAC,CAAC,aAA6B,EAAkB,EAAE;YACpD,OAAO,IAAI,sBAAsB,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;QACjF,CAAC,CAAC,CACH,CAAA;IACH,CAAC;IAED;;OAEG;IACK,cAAc;QACpB,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE;aACjC,IAAI;QACH,mEAAmE;QACnE,GAAG,CAAC,CAAC,YAA2B,EAAE,EAAE,CAAC,IAAI,qBAAqB,CAAC,YAAY,CAAC,CAAC,EAC7E,QAAQ,CAAC,CAAC,YAAmC,EAAE,EAAE;YAC/C,IAAI,YAAY,CAAC,sBAAsB,EAAE,CAAC,MAAM,EAAE;gBAChD,OAAO,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,YAAY,EAAE,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAC,CAAC;aACxF;YAED,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC,CAAC,CACH,CAAC;IACN,CAAC;;iHA9JU,mBAAmB;qHAAnB,mBAAmB,cAFlB,MAAM;4FAEP,mBAAmB;kBAH/B,UAAU;mBAAC;oBACV,UAAU,EAAE,MAAM;iBACnB","sourcesContent":["import { Injectable } from '@angular/core';\nimport { ACCOUNT_SETUP_ITEMS } from '../../models/account-setup/account-setup-items.const';\nimport { AccountSetupItem } from '../../models/account-setup/account-setup-item';\nimport { AccountSetupItemsEnum } from '../../models/account-setup/account-setup-items.enum';\nimport { BankAccountService } from '../http/bank/bank-account/bank-account.service';\nimport { ClientIncomeTypes } from '../../models/client/client-income-types';\nimport { ClientIncomeTypesService } from '../http/firm/client-income/client-income-types.service';\nimport { IncomeSource } from '../../models/income-source/income-source';\nimport { IncomeSourceCollection } from '../../collections/income-source.collection';\nimport { IncomeSourceService } from '../http/income-source/income-source.service';\nimport { IncomeSourceTypeEnum } from '../../db/Enums/income-source-type.enum';\nimport { PropertyService } from '../http/property/property.service';\nimport { TransactionAllocationService } from '../http/transaction/transaction-allocation/transaction-allocation.service';\nimport { combineLatest, Observable, of, ReplaySubject } from 'rxjs';\nimport { filter, map, mergeMap } from 'rxjs/operators';\nimport { AccountSetupItemCollection } from '../../collections/account-setup-item.collection';\nimport { VehicleClaimService } from '../http/vehicle/vehicle-claim.service';\nimport fromPairs from 'lodash/fromPairs';\nimport cloneDeep from 'lodash/cloneDeep';\nimport { plainToClass } from 'class-transformer';\nimport { TransactionService } from '../http/transaction/transaction.service';\nimport { Transaction } from '../../models/transaction/transaction';\nimport { TransactionCollection } from '../../collections/transaction.collection';\n\n/**\n * Service handling user's account setup process.\n * Checks required steps and their completion\n */\n@Injectable({\n  providedIn: 'root'\n})\nexport class AccountSetupService {\n  cache: AccountSetupItemCollection;\n  cacheSubject: ReplaySubject<AccountSetupItemCollection> = new ReplaySubject<AccountSetupItemCollection>(1);\n  clientIncomeTypesId: number;\n\n  constructor(\n    private clientIncomeTypesService: ClientIncomeTypesService,\n    private propertyService: PropertyService,\n    private incomeSourceService: IncomeSourceService,\n    private bankAccountsService: BankAccountService,\n    private transactionAllocationService: TransactionAllocationService,\n    private vehicleClaimService: VehicleClaimService,\n    private transactionService: TransactionService\n  ) {\n  }\n\n  /**\n   * Get list of account setup items for current user\n   */\n  get(): Observable<AccountSetupItemCollection> {\n    if (!this.cache) {\n      this.cache = new AccountSetupItemCollection([]);\n\n      this.clientIncomeTypesService.get()\n        .pipe(\n          // we need account setup only when user selected at least one income type\n          filter((incomeTypes: ClientIncomeTypes) => !!incomeTypes.length),\n          mergeMap((incomeTypes: ClientIncomeTypes) => {\n            this.clientIncomeTypesId = incomeTypes.id;\n\n            return this.createBatch(incomeTypes);\n          })\n        )\n        .subscribe((items: AccountSetupItemCollection) => {\n          switch (true) {\n            case !this.cache:\n            case this.cache.getBy('isCompleted', true).length !== items.getBy('isCompleted', true).length:\n            case this.cache.length !== items.length:\n              this.cache = cloneDeep(items);\n              this.cacheSubject.next(this.cache);\n          }\n        });\n    }\n\n    return this.cacheSubject.asObservable();\n  }\n\n  /**\n   * Prepare client income types to update to hide depended account setup items\n   */\n  prepareIncomeTypes(item: AccountSetupItem): ClientIncomeTypes {\n    return plainToClass(\n      ClientIncomeTypes,\n      Object.assign({id: this.clientIncomeTypesId}, fromPairs(item.clientIncomeTypes.map((type: string) => [type, false])))\n    )\n  }\n\n  /**\n   * Get a single AccountSetupItem and check it's completion\n   */\n  private create(itemType: AccountSetupItemsEnum, request: Observable<object[]>): Observable<AccountSetupItem> {\n    return request.pipe(\n      map((result: object[]): AccountSetupItem => {\n        const item: AccountSetupItem = ACCOUNT_SETUP_ITEMS[itemType];\n\n        if (result.length) {\n          item.isCompleted = true;\n        } else {\n          item.isCompleted = false;\n        }\n\n        return item;\n      })\n    );\n  }\n\n  /**\n   * Get batch of requests to get list of required AccountSetupItem's.\n   * Some items are optional and depends of user's client income types\n   */\n  private createBatch(incomeTypes: ClientIncomeTypes): Observable<AccountSetupItemCollection> {\n    const batch: Observable<AccountSetupItem>[] = [];\n\n    // Salary item is completed when user added salary income source\n    if (incomeTypes.salary) {\n      batch.push(\n        this.create(\n          AccountSetupItemsEnum.SALARY,\n          this.getIncomeSourcesByType(IncomeSourceTypeEnum.WORK)\n        )\n      );\n    }\n\n    // Other income item is completed when user added at least one other income source\n    if (incomeTypes.dividends || incomeTypes.other) {\n      batch.push(\n        this.create(\n          AccountSetupItemsEnum.OTHER_INCOME,\n          this.getIncomeSourcesByType(IncomeSourceTypeEnum.OTHER)\n        )\n      );\n    }\n\n    // Rental income item is completed when user added at least one property\n    if (incomeTypes.property) {\n      batch.push(this.create(AccountSetupItemsEnum.PROPERTY, this.propertyService.get()));\n    }\n\n    // Bank feeds item is completed when user added at least one bank account (basiq or manual)\n    batch.push(this.create(AccountSetupItemsEnum.BANK_FEEDS, this.bankAccountsService.get()));\n\n    // Logbook item is completed when user has at least one vehicle claim with any method (klms or logbook)\n    batch.push(this.getLogbookItem());\n\n    // @TODO waiting for sole tank forecast page\n    // Sole item is completed when user added at least one sole income source\n    // if (incomeTypes.soleTrader) {\n    //   batch.push(\n    //     this.prepareItem(\n    //       AccountSetupItemsEnum.SOLE_INCOME,\n    //       this.getIncomeSourcesByType(IncomeSourceTypeEnum.SOLE)\n    //     )\n    //   );\n    // }\n\n    // Allocation item is completed when user added at least one transaction allocation\n    batch.push(this.create(AccountSetupItemsEnum.TRANSACTION, this.transactionAllocationService.get()));\n\n    return combineLatest(batch).pipe(map((items: AccountSetupItem[]) => new AccountSetupItemCollection(items)));\n  }\n\n  /**\n   * @TODO work with collection when services refactored\n   */\n  private getIncomeSourcesByType(type: IncomeSourceTypeEnum): Observable<IncomeSource[]> {\n    return this.incomeSourceService.get().pipe(\n      map((incomeSources: IncomeSource[]): IncomeSource[] => {\n        return new IncomeSourceCollection(incomeSources).getBy('type', type).toArray();\n      })\n    )\n  }\n\n  /**\n   * Show logbook item when user has at least 1 vehicle transaction\n   */\n  private getLogbookItem(): Observable<AccountSetupItem> {\n    return this.transactionService.get()\n      .pipe(\n        // @TODO Alex: remove map when services start work with collections\n        map((transactions: Transaction[]) => new TransactionCollection(transactions)),\n        mergeMap((transactions: TransactionCollection) => {\n          if (transactions.getVehicleTransactions().length) {\n            return this.create(AccountSetupItemsEnum.WORK_LOGBOOK, this.vehicleClaimService.get());\n          }\n\n          return of(null);\n        })\n      );\n  }\n}\n"]}
|
|
154
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"account-setup.service.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/services/account-setup/account-setup.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { ACCOUNT_SETUP_ITEMS } from '../../models/account-setup/account-setup-items.const';\nimport { AccountSetupItem } from '../../models/account-setup/account-setup-item';\nimport { AccountSetupItemsEnum } from '../../models/account-setup/account-setup-items.enum';\nimport { BankAccountService } from '../http/bank/bank-account/bank-account.service';\nimport { ClientIncomeTypes } from '../../models/client/client-income-types';\nimport { ClientIncomeTypesService } from '../http/firm/client-income/client-income-types.service';\nimport { IncomeSource } from '../../models/income-source/income-source';\nimport { IncomeSourceCollection } from '../../collections/income-source.collection';\nimport { IncomeSourceService } from '../http/income-source/income-source.service';\nimport { IncomeSourceTypeEnum } from '../../db/Enums/income-source-type.enum';\nimport { PropertyService } from '../http/property/property.service';\nimport { TransactionAllocationService } from '../http/transaction/transaction-allocation/transaction-allocation.service';\nimport { combineLatest, Observable, of, ReplaySubject } from 'rxjs';\nimport { filter, map, mergeMap } from 'rxjs/operators';\nimport { AccountSetupItemCollection } from '../../collections/account-setup-item.collection';\nimport { VehicleClaimService } from '../http/vehicle/vehicle-claim.service';\nimport fromPairs from 'lodash/fromPairs';\nimport cloneDeep from 'lodash/cloneDeep';\nimport { plainToClass } from 'class-transformer';\nimport { TransactionService } from '../http/transaction/transaction.service';\nimport { Transaction } from '../../models/transaction/transaction';\nimport { TransactionCollection } from '../../collections/transaction.collection';\n\n/**\n * Service handling user's account setup process.\n * Checks required steps and their completion\n */\n@Injectable({\n  providedIn: 'root'\n})\nexport class AccountSetupService {\n  cache: AccountSetupItemCollection;\n  cacheSubject: ReplaySubject<AccountSetupItemCollection> = new ReplaySubject<AccountSetupItemCollection>(1);\n  clientIncomeTypesId: number;\n\n  constructor(\n    private clientIncomeTypesService: ClientIncomeTypesService,\n    private propertyService: PropertyService,\n    private incomeSourceService: IncomeSourceService,\n    private bankAccountsService: BankAccountService,\n    private transactionAllocationService: TransactionAllocationService,\n    private vehicleClaimService: VehicleClaimService,\n    private transactionService: TransactionService\n  ) {\n  }\n\n  /**\n   * Get list of account setup items for current user\n   */\n  get(): Observable<AccountSetupItemCollection> {\n    if (!this.cache) {\n      this.cache = new AccountSetupItemCollection([]);\n\n      this.clientIncomeTypesService.get()\n        .pipe(\n          // we need account setup only when user selected at least one income type\n          filter((incomeTypes: ClientIncomeTypes) => !!incomeTypes.length),\n          mergeMap((incomeTypes: ClientIncomeTypes) => {\n            this.clientIncomeTypesId = incomeTypes.id;\n\n            return this.createBatch(incomeTypes);\n          })\n        )\n        .subscribe((items: AccountSetupItemCollection) => {\n          switch (true) {\n            case !this.cache:\n            case this.cache.getBy('isCompleted', true).length !== items.getBy('isCompleted', true).length:\n            case this.cache.length !== items.length:\n              this.cache = cloneDeep(items);\n              this.cacheSubject.next(this.cache);\n          }\n        });\n    }\n\n    return this.cacheSubject.asObservable();\n  }\n\n  /**\n   * Prepare client income types to update to hide depended account setup items\n   */\n  prepareIncomeTypes(item: AccountSetupItem): ClientIncomeTypes {\n    return plainToClass(\n      ClientIncomeTypes,\n      Object.assign({id: this.clientIncomeTypesId}, fromPairs(item.clientIncomeTypes.map((type: string) => [type, false])))\n    )\n  }\n\n  /**\n   * Get a single AccountSetupItem and check it's completion\n   */\n  private create(itemType: AccountSetupItemsEnum, request: Observable<object[]>): Observable<AccountSetupItem> {\n    return request.pipe(\n      map((result: object[]): AccountSetupItem => {\n        const item: AccountSetupItem = ACCOUNT_SETUP_ITEMS[itemType];\n\n        if (result.length) {\n          item.isCompleted = true;\n        } else {\n          item.isCompleted = false;\n        }\n\n        return item;\n      })\n    );\n  }\n\n  /**\n   * Get batch of requests to get list of required AccountSetupItem's.\n   * Some items are optional and depends of user's client income types\n   */\n  private createBatch(incomeTypes: ClientIncomeTypes): Observable<AccountSetupItemCollection> {\n    const batch: Observable<AccountSetupItem>[] = [];\n\n    // Salary item is completed when user added salary income source\n    if (incomeTypes.salary) {\n      batch.push(\n        this.create(\n          AccountSetupItemsEnum.SALARY,\n          this.getIncomeSources(true)\n        )\n      );\n    }\n\n    // Other income item is completed when user added at least one other income source\n    if (incomeTypes.dividends || incomeTypes.other) {\n      batch.push(\n        this.create(\n          AccountSetupItemsEnum.OTHER_INCOME,\n          this.getIncomeSources()\n        )\n      );\n    }\n\n    // Rental income item is completed when user added at least one property\n    if (incomeTypes.property) {\n      batch.push(this.create(AccountSetupItemsEnum.PROPERTY, this.propertyService.get()));\n    }\n\n    // Bank feeds item is completed when user added at least one bank account (basiq or manual)\n    batch.push(this.create(AccountSetupItemsEnum.BANK_FEEDS, this.bankAccountsService.get()));\n\n    // Logbook item is completed when user has at least one vehicle claim with any method (klms or logbook)\n    batch.push(this.getLogbookItem());\n\n    // @TODO waiting for sole tank forecast page\n    // Sole item is completed when user added at least one sole income source\n    // if (incomeTypes.soleTrader) {\n    //   batch.push(\n    //     this.prepareItem(\n    //       AccountSetupItemsEnum.SOLE_INCOME,\n    //       this.getIncomeSourcesByType(IncomeSourceTypeEnum.SOLE)\n    //     )\n    //   );\n    // }\n\n    // Allocation item is completed when user added at least one transaction allocation\n    batch.push(this.create(AccountSetupItemsEnum.TRANSACTION, this.transactionAllocationService.get()));\n\n    return combineLatest(batch).pipe(map((items: AccountSetupItem[]) => new AccountSetupItemCollection(items)));\n  }\n\n  /**\n   * @TODO Alex: work with collection when services refactored\n   * @TODO Vik: waiting for income sources refactoring\n   */\n  private getIncomeSources(isSalary: boolean = false): Observable<IncomeSource[]> {\n    return this.incomeSourceService.get().pipe(\n      map((incomeSources: IncomeSource[]): IncomeSource[] => {\n        const collection: IncomeSourceCollection = new IncomeSourceCollection(incomeSources);\n        if (isSalary) {\n          return collection.getSalary();\n        }\n\n        return collection.items.filter((incomeSource: IncomeSource) => !incomeSource.isSalaryIncome() && !incomeSource.isSoleIncome());\n      })\n    )\n  }\n\n  /**\n   * Show logbook item when user has at least 1 vehicle transaction\n   */\n  private getLogbookItem(): Observable<AccountSetupItem> {\n    return this.transactionService.get()\n      .pipe(\n        // @TODO Alex: remove map when services start work with collections\n        map((transactions: Transaction[]) => new TransactionCollection(transactions)),\n        mergeMap((transactions: TransactionCollection) => {\n          if (transactions.getVehicleTransactions().length) {\n            return this.create(AccountSetupItemsEnum.WORK_LOGBOOK, this.vehicleClaimService.get());\n          }\n\n          return of(null);\n        })\n      );\n  }\n}\n"]}
|
package/fesm2015/taxtank-core.js
CHANGED
|
@@ -1621,6 +1621,9 @@ class IncomeSourceCollection extends Collection {
|
|
|
1621
1621
|
filterByTypes(types) {
|
|
1622
1622
|
return this.items.filter((incomeSource) => types.includes(incomeSource.type));
|
|
1623
1623
|
}
|
|
1624
|
+
getSalary() {
|
|
1625
|
+
return this.items.filter((incomeSource) => incomeSource.isSalaryIncome());
|
|
1626
|
+
}
|
|
1624
1627
|
/**
|
|
1625
1628
|
* Get income sources list of forecasts
|
|
1626
1629
|
*/
|
|
@@ -3176,10 +3179,9 @@ class IncomeSource$1 extends AbstractModel {
|
|
|
3176
3179
|
|
|
3177
3180
|
var IncomeSourceTypeEnum;
|
|
3178
3181
|
(function (IncomeSourceTypeEnum) {
|
|
3179
|
-
IncomeSourceTypeEnum[IncomeSourceTypeEnum["
|
|
3180
|
-
IncomeSourceTypeEnum[IncomeSourceTypeEnum["
|
|
3182
|
+
IncomeSourceTypeEnum[IncomeSourceTypeEnum["WORK"] = 1] = "WORK";
|
|
3183
|
+
IncomeSourceTypeEnum[IncomeSourceTypeEnum["SOLE"] = 2] = "SOLE";
|
|
3181
3184
|
IncomeSourceTypeEnum[IncomeSourceTypeEnum["OTHER"] = 3] = "OTHER";
|
|
3182
|
-
IncomeSourceTypeEnum[IncomeSourceTypeEnum["SOLE"] = 4] = "SOLE";
|
|
3183
3185
|
})(IncomeSourceTypeEnum || (IncomeSourceTypeEnum = {}));
|
|
3184
3186
|
|
|
3185
3187
|
class SalaryForecast$1 extends AbstractModel {
|
|
@@ -3222,13 +3224,9 @@ var SalaryForecastFrequencyEnum;
|
|
|
3222
3224
|
class IncomeSourceType$1 extends AbstractModel {
|
|
3223
3225
|
}
|
|
3224
3226
|
|
|
3225
|
-
var IncomeSourceTypeListSalaryEnum;
|
|
3226
|
-
(function (IncomeSourceTypeListSalaryEnum) {
|
|
3227
|
-
IncomeSourceTypeListSalaryEnum[IncomeSourceTypeListSalaryEnum["BONUSES"] = 1] = "BONUSES";
|
|
3228
|
-
})(IncomeSourceTypeListSalaryEnum || (IncomeSourceTypeListSalaryEnum = {}));
|
|
3229
|
-
|
|
3230
3227
|
var IncomeSourceTypeListWorkEnum;
|
|
3231
3228
|
(function (IncomeSourceTypeListWorkEnum) {
|
|
3229
|
+
IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["BONUSES"] = 1] = "BONUSES";
|
|
3232
3230
|
IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["DIRECTOR_FEES"] = 2] = "DIRECTOR_FEES";
|
|
3233
3231
|
IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["DIVIDENDS"] = 3] = "DIVIDENDS";
|
|
3234
3232
|
IncomeSourceTypeListWorkEnum[IncomeSourceTypeListWorkEnum["INTEREST"] = 4] = "INTEREST";
|
|
@@ -3246,8 +3244,8 @@ var IncomeSourceTypeListOtherEnum;
|
|
|
3246
3244
|
})(IncomeSourceTypeListOtherEnum || (IncomeSourceTypeListOtherEnum = {}));
|
|
3247
3245
|
|
|
3248
3246
|
class IncomeSourceType extends IncomeSourceType$1 {
|
|
3249
|
-
|
|
3250
|
-
return
|
|
3247
|
+
isBonuses() {
|
|
3248
|
+
return this.id === IncomeSourceTypeListWorkEnum.BONUSES;
|
|
3251
3249
|
}
|
|
3252
3250
|
isWork() {
|
|
3253
3251
|
return !!IncomeSourceTypeListWorkEnum[this.id];
|
|
@@ -3256,12 +3254,11 @@ class IncomeSourceType extends IncomeSourceType$1 {
|
|
|
3256
3254
|
return !!IncomeSourceTypeListOtherEnum[this.id];
|
|
3257
3255
|
}
|
|
3258
3256
|
isSole() {
|
|
3257
|
+
// @TODO use IncomeSourceTypeListSoleEnum when sole tank ready
|
|
3259
3258
|
return !!IncomeSourceTypeListOtherEnum[this.id];
|
|
3260
3259
|
}
|
|
3261
3260
|
get type() {
|
|
3262
3261
|
switch (true) {
|
|
3263
|
-
case this.isSalary():
|
|
3264
|
-
return IncomeSourceTypeEnum.SALARY;
|
|
3265
3262
|
case this.isWork():
|
|
3266
3263
|
return IncomeSourceTypeEnum.WORK;
|
|
3267
3264
|
case this.isSole():
|
|
@@ -3299,7 +3296,9 @@ __decorate([
|
|
|
3299
3296
|
|
|
3300
3297
|
class IncomeSource extends IncomeSource$1 {
|
|
3301
3298
|
isSalaryIncome() {
|
|
3302
|
-
return this.
|
|
3299
|
+
return !!this.salaryForecasts.length;
|
|
3300
|
+
// @TODO Vik: old code
|
|
3301
|
+
// return this.type === IncomeSourceTypeEnum.SALARY;
|
|
3303
3302
|
}
|
|
3304
3303
|
isSoleIncome() {
|
|
3305
3304
|
return this.type === IncomeSourceTypeEnum.SOLE;
|
|
@@ -8050,11 +8049,11 @@ class AccountSetupService {
|
|
|
8050
8049
|
const batch = [];
|
|
8051
8050
|
// Salary item is completed when user added salary income source
|
|
8052
8051
|
if (incomeTypes.salary) {
|
|
8053
|
-
batch.push(this.create(AccountSetupItemsEnum.SALARY, this.
|
|
8052
|
+
batch.push(this.create(AccountSetupItemsEnum.SALARY, this.getIncomeSources(true)));
|
|
8054
8053
|
}
|
|
8055
8054
|
// Other income item is completed when user added at least one other income source
|
|
8056
8055
|
if (incomeTypes.dividends || incomeTypes.other) {
|
|
8057
|
-
batch.push(this.create(AccountSetupItemsEnum.OTHER_INCOME, this.
|
|
8056
|
+
batch.push(this.create(AccountSetupItemsEnum.OTHER_INCOME, this.getIncomeSources()));
|
|
8058
8057
|
}
|
|
8059
8058
|
// Rental income item is completed when user added at least one property
|
|
8060
8059
|
if (incomeTypes.property) {
|
|
@@ -8079,11 +8078,16 @@ class AccountSetupService {
|
|
|
8079
8078
|
return combineLatest(batch).pipe(map((items) => new AccountSetupItemCollection(items)));
|
|
8080
8079
|
}
|
|
8081
8080
|
/**
|
|
8082
|
-
* @TODO work with collection when services refactored
|
|
8081
|
+
* @TODO Alex: work with collection when services refactored
|
|
8082
|
+
* @TODO Vik: waiting for income sources refactoring
|
|
8083
8083
|
*/
|
|
8084
|
-
|
|
8084
|
+
getIncomeSources(isSalary = false) {
|
|
8085
8085
|
return this.incomeSourceService.get().pipe(map((incomeSources) => {
|
|
8086
|
-
|
|
8086
|
+
const collection = new IncomeSourceCollection(incomeSources);
|
|
8087
|
+
if (isSalary) {
|
|
8088
|
+
return collection.getSalary();
|
|
8089
|
+
}
|
|
8090
|
+
return collection.items.filter((incomeSource) => !incomeSource.isSalaryIncome() && !incomeSource.isSoleIncome());
|
|
8087
8091
|
}));
|
|
8088
8092
|
}
|
|
8089
8093
|
/**
|