taxtank-core 0.12.1 → 0.12.2

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.
Files changed (9) hide show
  1. package/bundles/taxtank-core.umd.js +3 -3
  2. package/bundles/taxtank-core.umd.js.map +1 -1
  3. package/esm2015/lib/db/Models/client-income-types.js +1 -1
  4. package/esm2015/lib/forms/client/client-income-types.form.js +3 -3
  5. package/esm2015/lib/services/account-setup/account-setup.service.js +2 -2
  6. package/fesm2015/taxtank-core.js +3 -3
  7. package/fesm2015/taxtank-core.js.map +1 -1
  8. package/lib/db/Models/client-income-types.d.ts +2 -2
  9. package/package.json +1 -1
package/esm2015/lib/db/Models/client-income-types.js CHANGED
@@ -1,3 +1,3 @@
1
1
  export class ClientIncomeTypes {
2
2
  }
3
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LWluY29tZS10eXBlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9kYi9Nb2RlbHMvY2xpZW50LWluY29tZS10eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxNQUFNLE9BQU8saUJBQWlCO0NBUzdCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtDbGllbnREZXRhaWxzfSBmcm9tICcuL2NsaWVudC1kZXRhaWxzJztcblxuZXhwb3J0IGNsYXNzIENsaWVudEluY29tZVR5cGVzIHtcblx0c2FsYXJ5PzogYm9vbGVhbjtcblx0cmVudGFsPzogYm9vbGVhbjtcblx0c29sZVRyYWRlcj86IGJvb2xlYW47XG5cdGRpdmlkZW5kcz86IGJvb2xlYW47XG5cdG90aGVyPzogYm9vbGVhbjtcblx0aWQ/OiBudW1iZXI7XG5cdGRlbGV0ZWRBdD86IERhdGU7XG5cdGNsaWVudERldGFpbHM/OiBDbGllbnREZXRhaWxzO1xufSJdfQ==
3
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LWluY29tZS10eXBlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9kYi9Nb2RlbHMvY2xpZW50LWluY29tZS10eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxNQUFNLE9BQU8saUJBQWlCO0NBUzdCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtDbGllbnREZXRhaWxzfSBmcm9tICcuL2NsaWVudC1kZXRhaWxzJztcblxuZXhwb3J0IGNsYXNzIENsaWVudEluY29tZVR5cGVzIHtcbiAgc2FsYXJ5PzogYm9vbGVhbjtcbiAgcHJvcGVydHk/OiBib29sZWFuO1xuICBzb2xlPzogYm9vbGVhbjtcbiAgZGl2aWRlbmRzPzogYm9vbGVhbjtcbiAgb3RoZXI/OiBib29sZWFuO1xuICBpZD86IG51bWJlcjtcbiAgZGVsZXRlZEF0PzogRGF0ZTtcbiAgY2xpZW50RGV0YWlscz86IENsaWVudERldGFpbHM7XG59XG4iXX0=
package/esm2015/lib/forms/client/client-income-types.form.js CHANGED
@@ -5,8 +5,8 @@ export class ClientIncomeTypesForm extends AbstractForm {
5
5
  constructor(clientIncomeTypes) {
6
6
  super({
7
7
  salary: new FormControl(clientIncomeTypes.salary),
8
- rental: new FormControl(clientIncomeTypes.rental),
9
- soleTrader: new FormControl(clientIncomeTypes.soleTrader),
8
+ property: new FormControl(clientIncomeTypes.property),
9
+ sole: new FormControl(clientIncomeTypes.sole),
10
10
  dividends: new FormControl(clientIncomeTypes.dividends),
11
11
  other: new FormControl(clientIncomeTypes.other)
12
12
  }, atLeastOneCheckedValidator());
@@ -19,4 +19,4 @@ export class ClientIncomeTypesForm extends AbstractForm {
19
19
  return Object.assign({}, this.clientIncomeTypes, this.value);
20
20
  }
21
21
  }
22
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LWluY29tZS10eXBlcy5mb3JtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL2Zvcm1zL2NsaWVudC9jbGllbnQtaW5jb21lLXR5cGVzLmZvcm0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ2hELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUU3QyxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUU5RCxNQUFNLE9BQU8scUJBQXNCLFNBQVEsWUFBWTtJQUNyRCxZQUNVLGlCQUFvQztRQUU1QyxLQUFLLENBQUM7WUFDSixNQUFNLEVBQUUsSUFBSSxXQUFXLENBQUMsaUJBQWlCLENBQUMsTUFBTSxDQUFDO1lBQ2pELE1BQU0sRUFBRSxJQUFJLFdBQVcsQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLENBQUM7WUFDakQsVUFBVSxFQUFFLElBQUksV0FBVyxDQUFDLGlCQUFpQixDQUFDLFVBQVUsQ0FBQztZQUN6RCxTQUFTLEVBQUUsSUFBSSxXQUFXLENBQUMsaUJBQWlCLENBQUMsU0FBUyxDQUFDO1lBQ3ZELEtBQUssRUFBRSxJQUFJLFdBQVcsQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUM7U0FDaEQsRUFBRSwwQkFBMEIsRUFBRSxDQUFDLENBQUM7UUFSekIsc0JBQWlCLEdBQWpCLGlCQUFpQixDQUFtQjtJQVM5QyxDQUFDO0lBRUQsTUFBTTtRQUNKLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFO1lBQ2YsT0FBTyxJQUFJLENBQUM7U0FDYjtRQUVELE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFFLEVBQUUsSUFBSSxDQUFDLGlCQUFpQixFQUFFLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUMvRCxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBYnN0cmFjdEZvcm0gfSBmcm9tICcuLi9hYnN0cmFjdC5mb3JtJztcbmltcG9ydCB7IEZvcm1Db250cm9sIH0gZnJvbSAnQGFuZ3VsYXIvZm9ybXMnO1xuaW1wb3J0IHsgQ2xpZW50SW5jb21lVHlwZXMgfSBmcm9tICcuLi8uLi9tb2RlbHMvY2xpZW50L2NsaWVudC1pbmNvbWUtdHlwZXMnO1xuaW1wb3J0IHsgYXRMZWFzdE9uZUNoZWNrZWRWYWxpZGF0b3IgfSBmcm9tICcuLi8uLi92YWxpZGF0b3JzJztcblxuZXhwb3J0IGNsYXNzIENsaWVudEluY29tZVR5cGVzRm9ybSBleHRlbmRzIEFic3RyYWN0Rm9ybSB7XG4gIGNvbnN0cnVjdG9yKFxuICAgIHByaXZhdGUgY2xpZW50SW5jb21lVHlwZXM6IENsaWVudEluY29tZVR5cGVzXG4gICkge1xuICAgIHN1cGVyKHtcbiAgICAgIHNhbGFyeTogbmV3IEZvcm1Db250cm9sKGNsaWVudEluY29tZVR5cGVzLnNhbGFyeSksXG4gICAgICByZW50YWw6IG5ldyBGb3JtQ29udHJvbChjbGllbnRJbmNvbWVUeXBlcy5yZW50YWwpLFxuICAgICAgc29sZVRyYWRlcjogbmV3IEZvcm1Db250cm9sKGNsaWVudEluY29tZVR5cGVzLnNvbGVUcmFkZXIpLFxuICAgICAgZGl2aWRlbmRzOiBuZXcgRm9ybUNvbnRyb2woY2xpZW50SW5jb21lVHlwZXMuZGl2aWRlbmRzKSxcbiAgICAgIG90aGVyOiBuZXcgRm9ybUNvbnRyb2woY2xpZW50SW5jb21lVHlwZXMub3RoZXIpXG4gICAgfSwgYXRMZWFzdE9uZUNoZWNrZWRWYWxpZGF0b3IoKSk7XG4gIH1cblxuICBzdWJtaXQoKTogb2JqZWN0IHtcbiAgICBpZiAoIXRoaXMudmFsaWQpIHtcbiAgICAgIHJldHVybiBudWxsO1xuICAgIH1cblxuICAgIHJldHVybiBPYmplY3QuYXNzaWduKHt9LCB0aGlzLmNsaWVudEluY29tZVR5cGVzLCB0aGlzLnZhbHVlKTtcbiAgfVxufVxuIl19
22
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LWluY29tZS10eXBlcy5mb3JtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL2Zvcm1zL2NsaWVudC9jbGllbnQtaW5jb21lLXR5cGVzLmZvcm0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ2hELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUU3QyxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUU5RCxNQUFNLE9BQU8scUJBQXNCLFNBQVEsWUFBWTtJQUNyRCxZQUNVLGlCQUFvQztRQUU1QyxLQUFLLENBQUM7WUFDSixNQUFNLEVBQUUsSUFBSSxXQUFXLENBQUMsaUJBQWlCLENBQUMsTUFBTSxDQUFDO1lBQ2pELFFBQVEsRUFBRSxJQUFJLFdBQVcsQ0FBQyxpQkFBaUIsQ0FBQyxRQUFRLENBQUM7WUFDckQsSUFBSSxFQUFFLElBQUksV0FBVyxDQUFDLGlCQUFpQixDQUFDLElBQUksQ0FBQztZQUM3QyxTQUFTLEVBQUUsSUFBSSxXQUFXLENBQUMsaUJBQWlCLENBQUMsU0FBUyxDQUFDO1lBQ3ZELEtBQUssRUFBRSxJQUFJLFdBQVcsQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUM7U0FDaEQsRUFBRSwwQkFBMEIsRUFBRSxDQUFDLENBQUM7UUFSekIsc0JBQWlCLEdBQWpCLGlCQUFpQixDQUFtQjtJQVM5QyxDQUFDO0lBRUQsTUFBTTtRQUNKLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFO1lBQ2YsT0FBTyxJQUFJLENBQUM7U0FDYjtRQUVELE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFFLEVBQUUsSUFBSSxDQUFDLGlCQUFpQixFQUFFLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUMvRCxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBYnN0cmFjdEZvcm0gfSBmcm9tICcuLi9hYnN0cmFjdC5mb3JtJztcbmltcG9ydCB7IEZvcm1Db250cm9sIH0gZnJvbSAnQGFuZ3VsYXIvZm9ybXMnO1xuaW1wb3J0IHsgQ2xpZW50SW5jb21lVHlwZXMgfSBmcm9tICcuLi8uLi9tb2RlbHMvY2xpZW50L2NsaWVudC1pbmNvbWUtdHlwZXMnO1xuaW1wb3J0IHsgYXRMZWFzdE9uZUNoZWNrZWRWYWxpZGF0b3IgfSBmcm9tICcuLi8uLi92YWxpZGF0b3JzJztcblxuZXhwb3J0IGNsYXNzIENsaWVudEluY29tZVR5cGVzRm9ybSBleHRlbmRzIEFic3RyYWN0Rm9ybSB7XG4gIGNvbnN0cnVjdG9yKFxuICAgIHByaXZhdGUgY2xpZW50SW5jb21lVHlwZXM6IENsaWVudEluY29tZVR5cGVzXG4gICkge1xuICAgIHN1cGVyKHtcbiAgICAgIHNhbGFyeTogbmV3IEZvcm1Db250cm9sKGNsaWVudEluY29tZVR5cGVzLnNhbGFyeSksXG4gICAgICBwcm9wZXJ0eTogbmV3IEZvcm1Db250cm9sKGNsaWVudEluY29tZVR5cGVzLnByb3BlcnR5KSxcbiAgICAgIHNvbGU6IG5ldyBGb3JtQ29udHJvbChjbGllbnRJbmNvbWVUeXBlcy5zb2xlKSxcbiAgICAgIGRpdmlkZW5kczogbmV3IEZvcm1Db250cm9sKGNsaWVudEluY29tZVR5cGVzLmRpdmlkZW5kcyksXG4gICAgICBvdGhlcjogbmV3IEZvcm1Db250cm9sKGNsaWVudEluY29tZVR5cGVzLm90aGVyKVxuICAgIH0sIGF0TGVhc3RPbmVDaGVja2VkVmFsaWRhdG9yKCkpO1xuICB9XG5cbiAgc3VibWl0KCk6IG9iamVjdCB7XG4gICAgaWYgKCF0aGlzLnZhbGlkKSB7XG4gICAgICByZXR1cm4gbnVsbDtcbiAgICB9XG5cbiAgICByZXR1cm4gT2JqZWN0LmFzc2lnbih7fSwgdGhpcy5jbGllbnRJbmNvbWVUeXBlcywgdGhpcy52YWx1ZSk7XG4gIH1cbn1cbiJdfQ==
package/esm2015/lib/services/account-setup/account-setup.service.js CHANGED
@@ -68,7 +68,7 @@ export class AccountSetupService {
68
68
  batch.push(this.create(AccountSetupItemsEnum.OTHER_INCOME, this.getIncomeSourcesByType(IncomeSourceTypeEnum.OTHER)));
69
69
  }
70
70
  // Rental income item is completed when user added at least one property
71
- if (incomeTypes.rental) {
71
+ if (incomeTypes.property) {
72
72
  batch.push(this.create(AccountSetupItemsEnum.PROPERTY, this.propertyService.get()));
73
73
  }
74
74
  // Bank feeds item is completed when user added at least one bank account (basiq or manual)
@@ -106,4 +106,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
106
106
  providedIn: 'root'
107
107
  }]
108
108
  }], ctorParameters: function () { return [{ type: i1.ClientIncomeTypesService }, { type: i2.PropertyService }, { type: i3.IncomeSourceService }, { type: i4.BankAccountService }, { type: i5.TransactionAllocationService }, { type: i6.VehicleClaimService }]; } });
109
- //# 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;AAK5F,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AAEpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAG9E,OAAO,EAAE,aAAa,EAAc,aAAa,EAAE,MAAM,MAAM,CAAC;AAChE,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAC;;;;;;;;AAG7F;;;GAGG;AAIH,MAAM,OAAO,mBAAmB;IAI9B,YACU,wBAAkD,EAClD,eAAgC,EAChC,mBAAwC,EACxC,mBAAuC,EACvC,4BAA0D,EAC1D,mBAAwC;QALxC,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;QARlD,iBAAY,GAA8C,IAAI,aAAa,CAA6B,CAAC,CAAC,CAAC;IAU3G,CAAC;IAED;;OAEG;IACH,GAAG;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACf,IAAI,CAAC,wBAAwB,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,WAA8B,EAAQ,EAAE;gBACrF,aAAa,CACX,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAC9B,CAAC,SAAS,CAAC,CAAC,KAAyB,EAAE,EAAE;oBACxC,IAAI,CAAC,KAAK,GAAG,IAAI,0BAA0B,CAAC,KAAK,CAAC,CAAC;oBACnD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACrC,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;IAC1C,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;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,MAAM,CAAC,CACzD,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,MAAM,EAAE;YACtB,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,MAAM,CAAC,qBAAqB,CAAC,YAAY,EAAE,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAE5F,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,KAAK,CAAC;IACf,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;;iHAjHU,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, ReplaySubject } from 'rxjs';\nimport { map } from 'rxjs/operators';\nimport { AccountSetupItemCollection } from '../../collections/account-setup-item.collection';\nimport { VehicleClaimService } from '../http/vehicle/vehicle-claim.service';\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\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  ) {\n  }\n\n  /**\n   * Get list of account setup items for current user\n   */\n  get(): Observable<AccountSetupItemCollection> {\n    if (!this.cache) {\n      this.clientIncomeTypesService.get().subscribe((incomeTypes: ClientIncomeTypes): void => {\n        combineLatest(\n          this.createBatch(incomeTypes)\n        ).subscribe((items: AccountSetupItem[]) => {\n          this.cache = new AccountSetupItemCollection(items);\n          this.cacheSubject.next(this.cache);\n        });\n      });\n    }\n\n    return this.cacheSubject.asObservable();\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        }\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<AccountSetupItem>[] {\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.SALARY)\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.rental) {\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.create(AccountSetupItemsEnum.WORK_LOGBOOK, this.vehicleClaimService.get()));\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 batch;\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"]}
109
+ //# 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, ReplaySubject } from 'rxjs';\nimport { map } from 'rxjs/operators';\nimport { AccountSetupItemCollection } from '../../collections/account-setup-item.collection';\nimport { VehicleClaimService } from '../http/vehicle/vehicle-claim.service';\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\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  ) {\n  }\n\n  /**\n   * Get list of account setup items for current user\n   */\n  get(): Observable<AccountSetupItemCollection> {\n    if (!this.cache) {\n      this.clientIncomeTypesService.get().subscribe((incomeTypes: ClientIncomeTypes): void => {\n        combineLatest(\n          this.createBatch(incomeTypes)\n        ).subscribe((items: AccountSetupItem[]) => {\n          this.cache = new AccountSetupItemCollection(items);\n          this.cacheSubject.next(this.cache);\n        });\n      });\n    }\n\n    return this.cacheSubject.asObservable();\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        }\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<AccountSetupItem>[] {\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.SALARY)\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.create(AccountSetupItemsEnum.WORK_LOGBOOK, this.vehicleClaimService.get()));\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 batch;\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"]}
package/fesm2015/taxtank-core.js CHANGED
@@ -7538,7 +7538,7 @@ class AccountSetupService {
7538
7538
  batch.push(this.create(AccountSetupItemsEnum.OTHER_INCOME, this.getIncomeSourcesByType(IncomeSourceTypeEnum.OTHER)));
7539
7539
  }
7540
7540
  // Rental income item is completed when user added at least one property
7541
- if (incomeTypes.rental) {
7541
+ if (incomeTypes.property) {
7542
7542
  batch.push(this.create(AccountSetupItemsEnum.PROPERTY, this.propertyService.get()));
7543
7543
  }
7544
7544
  // Bank feeds item is completed when user added at least one bank account (basiq or manual)
@@ -11228,8 +11228,8 @@ class ClientIncomeTypesForm extends AbstractForm {
11228
11228
  constructor(clientIncomeTypes) {
11229
11229
  super({
11230
11230
  salary: new FormControl(clientIncomeTypes.salary),
11231
- rental: new FormControl(clientIncomeTypes.rental),
11232
- soleTrader: new FormControl(clientIncomeTypes.soleTrader),
11231
+ property: new FormControl(clientIncomeTypes.property),
11232
+ sole: new FormControl(clientIncomeTypes.sole),
11233
11233
  dividends: new FormControl(clientIncomeTypes.dividends),
11234
11234
  other: new FormControl(clientIncomeTypes.other)
11235
11235
  }, atLeastOneCheckedValidator());