taxtank-core 0.21.2 → 0.21.5
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 +32 -15
- package/bundles/taxtank-core.umd.js.map +1 -1
- package/esm2015/lib/forms/bank/bank-account/bank-account-add-manual.form.js +3 -2
- package/esm2015/lib/functions/mat-options-functions.js +4 -1
- package/esm2015/lib/models/bank/bank-account.js +7 -1
- package/esm2015/lib/services/http/bank/bank-connection/bank-connection.service.js +12 -10
- package/esm2015/lib/services/http/bank/basiq/basiq.service.js +5 -6
- package/esm2015/lib/services/http/chart-accounts/chart-accounts.service.js +8 -1
- package/fesm2015/taxtank-core.js +32 -15
- package/fesm2015/taxtank-core.js.map +1 -1
- package/lib/models/bank/bank-account.d.ts +4 -0
- package/package.json +1 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { AbstractForm } from '../../abstract.form';
|
|
2
2
|
import { BankAccount } from '../../../models/bank/bank-account';
|
|
3
3
|
import { FormControl, Validators } from '@angular/forms';
|
|
4
|
+
import { plainToClass } from 'class-transformer';
|
|
4
5
|
import { BankAccountLoanForm } from './bank-account-loan.form';
|
|
5
6
|
import { BankAccountPropertiesForm } from './bank-account-properties.form';
|
|
6
7
|
import { TankTypeEnum } from '../../../db/Enums/tank-type.enum';
|
|
@@ -15,7 +16,7 @@ export class BankAccountAddManualForm extends AbstractForm {
|
|
|
15
16
|
currentBalance: new FormControl(null, Validators.required),
|
|
16
17
|
accountNumber: new FormControl(null, [Validators.required, Validators.pattern(BankAccountAddManualForm.accountNumberPattern)]),
|
|
17
18
|
tankType: new FormControl(null, Validators.required),
|
|
18
|
-
});
|
|
19
|
+
}, plainToClass(BankAccount, {}));
|
|
19
20
|
this.connection = connection;
|
|
20
21
|
this.listenEvents();
|
|
21
22
|
}
|
|
@@ -72,4 +73,4 @@ export class BankAccountAddManualForm extends AbstractForm {
|
|
|
72
73
|
}
|
|
73
74
|
}
|
|
74
75
|
BankAccountAddManualForm.accountNumberPattern = '^[0-9]{6}[ ]{1}[0-9]{1,}$';
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
76
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFuay1hY2NvdW50LWFkZC1tYW51YWwuZm9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9mb3Jtcy9iYW5rL2JhbmstYWNjb3VudC9iYW5rLWFjY291bnQtYWRkLW1hbnVhbC5mb3JtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNuRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDaEUsT0FBTyxFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUN6RCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFHakQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFL0QsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDM0UsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBRWhFOztHQUVHO0FBQ0gsTUFBTSxPQUFPLHdCQUF5QixTQUFRLFlBQXlCO0lBR3JFLFlBQ1UsVUFBMEI7UUFFbEMsS0FBSyxDQUNIO1lBQ0UsSUFBSSxFQUFFLElBQUksV0FBVyxDQUFDLElBQUksRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDO1lBQ2hELFdBQVcsRUFBRSxJQUFJLFdBQVcsQ0FBQyxJQUFJLEVBQUUsVUFBVSxDQUFDLFFBQVEsQ0FBQztZQUN2RCxjQUFjLEVBQUUsSUFBSSxXQUFXLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxRQUFRLENBQUM7WUFDMUQsYUFBYSxFQUFFLElBQUksV0FBVyxDQUM1QixJQUFJLEVBQ0osQ0FBQyxVQUFVLENBQUMsUUFBUSxFQUFFLFVBQVUsQ0FBQyxPQUFPLENBQUMsd0JBQXdCLENBQUMsb0JBQW9CLENBQUMsQ0FBQyxDQUN6RjtZQUNELFFBQVEsRUFBRSxJQUFJLFdBQVcsQ0FBQyxJQUFJLEVBQUUsVUFBVSxDQUFDLFFBQVEsQ0FBQztTQUNyRCxFQUFFLFlBQVksQ0FBQyxXQUFXLEVBQUUsRUFBRSxDQUFDLENBQ2pDLENBQUM7UUFiTSxlQUFVLEdBQVYsVUFBVSxDQUFnQjtRQWVsQyxJQUFJLENBQUMsWUFBWSxFQUFFLENBQUM7SUFDdEIsQ0FBQztJQUVELFlBQVk7UUFDVixJQUFJLENBQUMsaUJBQWlCLEVBQUUsQ0FBQztRQUN6QixJQUFJLENBQUMscUJBQXFCLEVBQUUsQ0FBQztJQUMvQixDQUFDO0lBRUQ7O09BRUc7SUFDSyxpQkFBaUI7UUFDdkIsSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxZQUFZLENBQUMsU0FBUyxDQUFDLENBQUMsSUFBeUIsRUFBRSxFQUFFO1lBQ3BFLElBQUksV0FBVyxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQUU7Z0JBQ3hDLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLElBQUksbUJBQW1CLEVBQUUsQ0FBQyxDQUFDO2dCQUVuRCx1REFBdUQ7Z0JBQ3ZELElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyx1QkFBdUIsQ0FBQyxFQUFFO29CQUN6QyxJQUFJLENBQUMsR0FBRyxDQUFDLHVCQUF1QixDQUErQixDQUFDLGFBQWEsRUFBRSxDQUFDO2lCQUNsRjthQUNGO2lCQUFNO2dCQUNMLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLENBQUM7Z0JBRTNCLHVEQUF1RDtnQkFDdkQsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLHVCQUF1QixDQUFDLEVBQUU7b0JBQ3pDLElBQUksQ0FBQyxHQUFHLENBQUMsdUJBQXVCLENBQStCLENBQUMsY0FBYyxFQUFFLENBQUM7aUJBQ25GO2FBQ0Y7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRDs7T0FFRztJQUNLLHFCQUFxQjtRQUMzQixJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDLFlBQVksQ0FBQyxTQUFTLENBQUMsQ0FBQyxRQUFzQixFQUFFLEVBQUU7WUFDckUsSUFBSSxRQUFRLEtBQUssWUFBWSxDQUFDLFFBQVEsRUFBRTtnQkFDdEMsSUFBSSxDQUFDLFVBQVUsQ0FBQyx1QkFBdUIsRUFBRSxJQUFJLHlCQUF5QixFQUFFLENBQUMsQ0FBQTtnQkFFekUsdURBQXVEO2dCQUN2RCxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLEVBQUU7b0JBQ3hCLElBQUksQ0FBQyxHQUFHLENBQUMsdUJBQXVCLENBQStCLENBQUMsYUFBYSxFQUFFLENBQUM7aUJBQ2xGO3FCQUFNO29CQUNKLElBQUksQ0FBQyxHQUFHLENBQUMsdUJBQXVCLENBQStCLENBQUMsY0FBYyxFQUFFLENBQUM7aUJBQ25GO2FBQ0Y7aUJBQU07Z0JBQ0wsSUFBSSxDQUFDLGFBQWEsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDO2FBQzdDO1FBQ0gsQ0FBQyxDQUFDLENBQUE7SUFDSixDQUFDO0lBRUQ7O09BRUc7SUFDSCxNQUFNO1FBQ0osT0FBTyxLQUFLLENBQUMsTUFBTSxDQUFDLEVBQUMsY0FBYyxFQUFFLElBQUksQ0FBQyxVQUFVLEVBQUMsQ0FBQyxDQUFDO0lBQ3pELENBQUM7O0FBMUVNLDZDQUFvQixHQUFXLDJCQUEyQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQWJzdHJhY3RGb3JtIH0gZnJvbSAnLi4vLi4vYWJzdHJhY3QuZm9ybSc7XG5pbXBvcnQgeyBCYW5rQWNjb3VudCB9IGZyb20gJy4uLy4uLy4uL21vZGVscy9iYW5rL2JhbmstYWNjb3VudCc7XG5pbXBvcnQgeyBGb3JtQ29udHJvbCwgVmFsaWRhdG9ycyB9IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcbmltcG9ydCB7IHBsYWluVG9DbGFzcyB9IGZyb20gJ2NsYXNzLXRyYW5zZm9ybWVyJztcbmltcG9ydCB7IEJhbmtDb25uZWN0aW9uIH0gZnJvbSAnLi4vLi4vLi4vbW9kZWxzL2JhbmsvYmFuay1jb25uZWN0aW9uJztcbmltcG9ydCB7IElFdmVudExpc3RlbmVyIH0gZnJvbSAnLi4vLi4vLi4vaW50ZXJmYWNlcy9ldmVudC1saXN0ZW5lci5pbnRlcmZhY2UnO1xuaW1wb3J0IHsgQmFua0FjY291bnRMb2FuRm9ybSB9IGZyb20gJy4vYmFuay1hY2NvdW50LWxvYW4uZm9ybSc7XG5pbXBvcnQgeyBCYW5rQWNjb3VudFR5cGVFbnVtIH0gZnJvbSAnLi4vLi4vLi4vZGIvRW51bXMvYmFuay1hY2NvdW50LXR5cGUuZW51bSc7XG5pbXBvcnQgeyBCYW5rQWNjb3VudFByb3BlcnRpZXNGb3JtIH0gZnJvbSAnLi9iYW5rLWFjY291bnQtcHJvcGVydGllcy5mb3JtJztcbmltcG9ydCB7IFRhbmtUeXBlRW51bSB9IGZyb20gJy4uLy4uLy4uL2RiL0VudW1zL3RhbmstdHlwZS5lbnVtJztcblxuLyoqXG4gKiBGb3JtIGlzIHVzaW5nIGZvciBzaW5nbGUgbWFudWFsIGJhbmsgYWNjb3VudCBjcmVhdGlvbiAobm90IEJhc2lxKVxuICovXG5leHBvcnQgY2xhc3MgQmFua0FjY291bnRBZGRNYW51YWxGb3JtIGV4dGVuZHMgQWJzdHJhY3RGb3JtPEJhbmtBY2NvdW50PiBpbXBsZW1lbnRzIElFdmVudExpc3RlbmVyIHtcbiAgc3RhdGljIGFjY291bnROdW1iZXJQYXR0ZXJuOiBzdHJpbmcgPSAnXlswLTldezZ9WyBdezF9WzAtOV17MSx9JCc7XG5cbiAgY29uc3RydWN0b3IoXG4gICAgcHJpdmF0ZSBjb25uZWN0aW9uOiBCYW5rQ29ubmVjdGlvblxuICApIHtcbiAgICBzdXBlcihcbiAgICAgIHtcbiAgICAgICAgdHlwZTogbmV3IEZvcm1Db250cm9sKG51bGwsIFZhbGlkYXRvcnMucmVxdWlyZWQpLFxuICAgICAgICBhY2NvdW50TmFtZTogbmV3IEZvcm1Db250cm9sKG51bGwsIFZhbGlkYXRvcnMucmVxdWlyZWQpLFxuICAgICAgICBjdXJyZW50QmFsYW5jZTogbmV3IEZvcm1Db250cm9sKG51bGwsIFZhbGlkYXRvcnMucmVxdWlyZWQpLFxuICAgICAgICBhY2NvdW50TnVtYmVyOiBuZXcgRm9ybUNvbnRyb2woXG4gICAgICAgICAgbnVsbCxcbiAgICAgICAgICBbVmFsaWRhdG9ycy5yZXF1aXJlZCwgVmFsaWRhdG9ycy5wYXR0ZXJuKEJhbmtBY2NvdW50QWRkTWFudWFsRm9ybS5hY2NvdW50TnVtYmVyUGF0dGVybildXG4gICAgICAgICksXG4gICAgICAgIHRhbmtUeXBlOiBuZXcgRm9ybUNvbnRyb2wobnVsbCwgVmFsaWRhdG9ycy5yZXF1aXJlZCksXG4gICAgICB9LCBwbGFpblRvQ2xhc3MoQmFua0FjY291bnQsIHt9KVxuICAgICk7XG5cbiAgICB0aGlzLmxpc3RlbkV2ZW50cygpO1xuICB9XG5cbiAgbGlzdGVuRXZlbnRzKCk6IHZvaWQge1xuICAgIHRoaXMubGlzdGVuVHlwZUNoYW5nZXMoKTtcbiAgICB0aGlzLmxpc3RlblRhbmtUeXBlQ2hhbmdlcygpO1xuICB9XG5cbiAgLyoqXG4gICAqIEFkZC9SZW1vdmUgbG9hbiBmb3JtIGRlcGVuZHMgb24gc2VsZWN0ZWQgYmFuayBhY2NvdW50IHR5cGVcbiAgICovXG4gIHByaXZhdGUgbGlzdGVuVHlwZUNoYW5nZXMoKTogdm9pZCB7XG4gICAgdGhpcy5nZXQoJ3R5cGUnKS52YWx1ZUNoYW5nZXMuc3Vic2NyaWJlKCh0eXBlOiBCYW5rQWNjb3VudFR5cGVFbnVtKSA9PiB7XG4gICAgICBpZiAoQmFua0FjY291bnQubG9hblR5cGVzLmluY2x1ZGVzKHR5cGUpKSB7XG4gICAgICAgIHRoaXMuYWRkQ29udHJvbCgnbG9hbicsIG5ldyBCYW5rQWNjb3VudExvYW5Gb3JtKCkpO1xuXG4gICAgICAgIC8vIHByb3BlcnR5IHBlcmNlbnQgYWxsb3dlZCBvbmx5IGZvciBsb2FuIGJhbmsgYWNjb3VudHNcbiAgICAgICAgaWYgKHRoaXMuY29udGFpbnMoJ2JhbmtBY2NvdW50UHJvcGVydGllcycpKSB7XG4gICAgICAgICAgKHRoaXMuZ2V0KCdiYW5rQWNjb3VudFByb3BlcnRpZXMnKSBhcyBCYW5rQWNjb3VudFByb3BlcnRpZXNGb3JtKS5lbmFibGVQZXJjZW50KCk7XG4gICAgICAgIH1cbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIHRoaXMucmVtb3ZlQ29udHJvbCgnbG9hbicpO1xuXG4gICAgICAgIC8vIHByb3BlcnR5IHBlcmNlbnQgYWxsb3dlZCBvbmx5IGZvciBsb2FuIGJhbmsgYWNjb3VudHNcbiAgICAgICAgaWYgKHRoaXMuY29udGFpbnMoJ2JhbmtBY2NvdW50UHJvcGVydGllcycpKSB7XG4gICAgICAgICAgKHRoaXMuZ2V0KCdiYW5rQWNjb3VudFByb3BlcnRpZXMnKSBhcyBCYW5rQWNjb3VudFByb3BlcnRpZXNGb3JtKS5kaXNhYmxlUGVyY2VudCgpO1xuICAgICAgICB9XG4gICAgICB9XG4gICAgfSk7XG4gIH1cblxuICAvKipcbiAgICogQWRkL1JlbW92ZSBiYW5rIGFjY291bnQgcHJvcGVydGllcyBmb3JtIGRlcGVuZHMgb24gc2VsZWN0ZWQgdGFuayB0eXBlXG4gICAqL1xuICBwcml2YXRlIGxpc3RlblRhbmtUeXBlQ2hhbmdlcygpOiB2b2lkIHtcbiAgICB0aGlzLmdldCgndGFua1R5cGUnKS52YWx1ZUNoYW5nZXMuc3Vic2NyaWJlKCh0YW5rVHlwZTogVGFua1R5cGVFbnVtKSA9PiB7XG4gICAgICBpZiAodGFua1R5cGUgPT09IFRhbmtUeXBlRW51bS5QUk9QRVJUWSkge1xuICAgICAgICB0aGlzLmFkZENvbnRyb2woJ2JhbmtBY2NvdW50UHJvcGVydGllcycsIG5ldyBCYW5rQWNjb3VudFByb3BlcnRpZXNGb3JtKCkpXG5cbiAgICAgICAgLy8gcHJvcGVydHkgcGVyY2VudCBhbGxvd2VkIG9ubHkgZm9yIGxvYW4gYmFuayBhY2NvdW50c1xuICAgICAgICBpZiAodGhpcy5jb250YWlucygnbG9hbicpKSB7XG4gICAgICAgICAgKHRoaXMuZ2V0KCdiYW5rQWNjb3VudFByb3BlcnRpZXMnKSBhcyBCYW5rQWNjb3VudFByb3BlcnRpZXNGb3JtKS5lbmFibGVQZXJjZW50KCk7XG4gICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgKHRoaXMuZ2V0KCdiYW5rQWNjb3VudFByb3BlcnRpZXMnKSBhcyBCYW5rQWNjb3VudFByb3BlcnRpZXNGb3JtKS5kaXNhYmxlUGVyY2VudCgpO1xuICAgICAgICB9XG4gICAgICB9IGVsc2Uge1xuICAgICAgICB0aGlzLnJlbW92ZUNvbnRyb2woJ2JhbmtBY2NvdW50UHJvcGVydGllcycpO1xuICAgICAgfVxuICAgIH0pXG4gIH1cblxuICAvKipcbiAgICogQXR0YWNoIGJhbmsgY29ubmVjdGlvbiB0byBtYW51YWwgYmFuayBhY2NvdW50XG4gICAqL1xuICBzdWJtaXQoKTogQmFua0FjY291bnQge1xuICAgIHJldHVybiBzdXBlci5zdWJtaXQoe2JhbmtDb25uZWN0aW9uOiB0aGlzLmNvbm5lY3Rpb259KTtcbiAgfVxufVxuIl19
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
export function compareMatOptions(option, value) {
|
|
2
|
+
if (!option) {
|
|
3
|
+
return false;
|
|
4
|
+
}
|
|
2
5
|
return option.id === value.id;
|
|
3
6
|
}
|
|
4
7
|
export function displayMatOptions(option) {
|
|
@@ -7,4 +10,4 @@ export function displayMatOptions(option) {
|
|
|
7
10
|
}
|
|
8
11
|
return option['name'];
|
|
9
12
|
}
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWF0LW9wdGlvbnMtZnVuY3Rpb25zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL2Z1bmN0aW9ucy9tYXQtb3B0aW9ucy1mdW5jdGlvbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxVQUFVLGlCQUFpQixDQUFDLE1BQVcsRUFBRSxLQUFVO0lBQ3ZELElBQUksQ0FBQyxNQUFNLEVBQUU7UUFDWCxPQUFPLEtBQUssQ0FBQztLQUNkO0lBRUQsT0FBTyxNQUFNLENBQUMsRUFBRSxLQUFLLEtBQUssQ0FBQyxFQUFFLENBQUM7QUFDaEMsQ0FBQztBQUVELE1BQU0sVUFBVSxpQkFBaUIsQ0FBQyxNQUFjO0lBQzlDLElBQUksQ0FBQyxNQUFNLEVBQUU7UUFDWCxPQUFPLEVBQUUsQ0FBQztLQUNYO0lBRUQsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDeEIsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBmdW5jdGlvbiBjb21wYXJlTWF0T3B0aW9ucyhvcHRpb246IGFueSwgdmFsdWU6IGFueSk6IGJvb2xlYW4ge1xyXG4gIGlmICghb3B0aW9uKSB7XHJcbiAgICByZXR1cm4gZmFsc2U7XHJcbiAgfVxyXG5cclxuICByZXR1cm4gb3B0aW9uLmlkID09PSB2YWx1ZS5pZDtcclxufVxyXG5cclxuZXhwb3J0IGZ1bmN0aW9uIGRpc3BsYXlNYXRPcHRpb25zKG9wdGlvbjogb2JqZWN0KTogc3RyaW5nIHtcclxuICBpZiAoIW9wdGlvbikge1xyXG4gICAgcmV0dXJuICcnO1xyXG4gIH1cclxuXHJcbiAgcmV0dXJuIG9wdGlvblsnbmFtZSddO1xyXG59XHJcbiJdfQ==
|
|
@@ -57,6 +57,12 @@ export class BankAccount extends BankAccountBase {
|
|
|
57
57
|
isPropertyTank() {
|
|
58
58
|
return this.tankType === TankTypeEnum.PROPERTY;
|
|
59
59
|
}
|
|
60
|
+
/**
|
|
61
|
+
* check if bank account related to sole tank
|
|
62
|
+
*/
|
|
63
|
+
isSoleTank() {
|
|
64
|
+
return this.tankType === TankTypeEnum.SOLE;
|
|
65
|
+
}
|
|
60
66
|
/**
|
|
61
67
|
* Get Bank account property by id
|
|
62
68
|
* @param id Id of property
|
|
@@ -120,4 +126,4 @@ __decorate([
|
|
|
120
126
|
__decorate([
|
|
121
127
|
Type(() => BankConnection)
|
|
122
128
|
], BankAccount.prototype, "bankConnection", void 0);
|
|
123
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
129
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"bank-account.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/models/bank/bank-account.ts"],"names":[],"mappings":"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","sourcesContent":["import { BankAccount as BankAccountBase } from '../../db/Models/bank/bank-account';\nimport { BankAccountTypeEnum } from '../../db/Enums/bank-account-type.enum';\nimport { BankAccountStatusEnum } from '../../db/Enums/bank-account-status.enum';\nimport { Loan } from '../loan/loan';\nimport { TankTypeEnum } from '../../db/Enums/tank-type.enum';\nimport { BankAccountBalance } from '../../db/Models/bank/bank-account-balance';\nimport { FinancialYear } from '../financial-year/financial-year';\nimport { BankAccountProperty } from './bank-account-property';\nimport { BankConnection } from './bank-connection';\nimport { Type } from 'class-transformer';\n\n\nexport class BankAccount extends BankAccountBase {\n  static loanTypes: BankAccountTypeEnum[] = [BankAccountTypeEnum.LOAN, BankAccountTypeEnum.MORTGAGE];\n\n  // list of properties related with this bank account\n  @Type(() => BankAccountProperty)\n  bankAccountProperties: BankAccountProperty[];\n\n  @Type(() => BankAccountBalance)\n  balances: BankAccountBalance[];\n\n  // bank account's loan\n  @Type(() => Loan)\n  loan: Loan;\n\n  @Type(() => BankConnection)\n  bankConnection: BankConnection;\n\n  /**\n   * Get current opening balance amount\n   */\n  getOpeningBalance(): number {\n    return this.getCurrentYearBalance()?.openingBalance || 0;\n  }\n\n  /**\n   * Get bank account balance for current financial year\n   */\n  getCurrentYearBalance(): BankAccountBalance {\n    const currentFinYear: number = new FinancialYear().year;\n    return this.balances.find((balance: BankAccountBalance): boolean => balance.financialYear === currentFinYear);\n  }\n\n  /**\n   * check if bank account type is one of savings accounts\n   */\n  isSavingsAccount(): boolean {\n    return this.type === BankAccountTypeEnum.INVESTMENT ||\n      this.type === BankAccountTypeEnum.TERM_DEPOSIT ||\n      this.type === BankAccountTypeEnum.SAVINGS;\n  }\n\n  /**\n   * check if bank account type is Loan\n   * @TODO nicole check\n   */\n  isLoan(): boolean {\n    return [BankAccountTypeEnum.MORTGAGE, BankAccountTypeEnum.LOAN].includes(this.type);\n  }\n\n  /**\n   * check if bank account type is Credit card\n   */\n  isCreditCard(): boolean {\n    return this.type === BankAccountTypeEnum.CREDIT_CARD;\n  }\n\n  /**\n   * check if bank account related to work tank\n   */\n  isWorkTank(): boolean {\n    return this.tankType === TankTypeEnum.WORK;\n  }\n\n  /**\n   * check if bank account related to work tank\n   */\n  isPropertyTank(): boolean {\n    return this.tankType === TankTypeEnum.PROPERTY;\n  }\n\n  /**\n   * check if bank account related to sole tank\n   */\n  isSoleTank(): boolean {\n    return this.tankType === TankTypeEnum.SOLE;\n  }\n\n  /**\n   * Get Bank account property by id\n   * @param id Id of property\n   */\n  getPropertyById(id: number): BankAccountProperty {\n    return this.bankAccountProperties.find((bankAccountProperty: BankAccountProperty): boolean => bankAccountProperty.property.id === id);\n  }\n\n  /**\n   * check if bank account is related with passed property by id\n   * @param propertyId Property id for checking\n   */\n  hasProperty(propertyId: number): boolean {\n    return !!this.getPropertyById(propertyId);\n  }\n\n  /**\n   * Get decimal percentage for property\n   * @param propertyId Id of property\n   */\n  getPropertyPercentage(propertyId: number): number {\n    if (!this.hasProperty(propertyId)) {\n      return 0;\n    }\n\n    return this.getPropertyById(propertyId).percent / 100;\n  }\n\n  /**\n   * Get balance amount for property by id\n   * @param propertyId Id of property\n   */\n  getPropertyBalanceAmount(propertyId: number): number {\n    return this.currentBalance * this.getPropertyPercentage(propertyId);\n  }\n\n  /**\n   * Check if bank account is active (has 'active' status or hasn't been paid out/refinanced)\n   */\n  isActive(): boolean {\n    return this.status === BankAccountStatusEnum.ACTIVE;\n  }\n\n  /**\n   * first import (transactions) of basiq accounts\n   */\n  isFirstImport(): boolean {\n    return !this.lastTransactionDate && !this.isManual;\n  }\n\n  /**\n   * Check if passed user id is owner of bank account\n   */\n  isOwner(userId: number): boolean {\n    return this.bankConnection.user.id === userId;\n  }\n}\n"]}
|
|
@@ -28,15 +28,17 @@ export class BankConnectionService extends RestService {
|
|
|
28
28
|
const connection = plainToClass(BankConnection, bankConnectionBase);
|
|
29
29
|
// We use this endpoint for create and reconnect bank connections because of basiq logic.
|
|
30
30
|
// So we try to replace bank connection in cache for reconnection case.
|
|
31
|
-
if (
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
31
|
+
if (this.cache) {
|
|
32
|
+
if (bankConnection.id) {
|
|
33
|
+
const tempCache = cloneDeep(this.cache);
|
|
34
|
+
replace(tempCache, connection);
|
|
35
|
+
this.cache = tempCache;
|
|
36
|
+
this.cacheSubject.next(this.cache);
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
this.cache.push(connection);
|
|
40
|
+
this.cacheSubject.next(cloneDeep(this.cache));
|
|
41
|
+
}
|
|
40
42
|
}
|
|
41
43
|
return plainToClass(BankConnection, connection);
|
|
42
44
|
}));
|
|
@@ -65,4 +67,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
|
|
|
65
67
|
providedIn: 'root'
|
|
66
68
|
}]
|
|
67
69
|
}] });
|
|
68
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFuay1jb25uZWN0aW9uLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvc2VydmljZXMvaHR0cC9iYW5rL2JhbmstY29ubmVjdGlvbi9iYW5rLWNvbm5lY3Rpb24uc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTNDLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUVyQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDakQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQ3pFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN0RCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSw4Q0FBOEMsQ0FBQztBQUVoRixPQUFPLFNBQVMsTUFBTSxrQkFBa0IsQ0FBQztBQUN6QyxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFdEQsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sdURBQXVELENBQUM7O0FBRXBHOzs7R0FHRztBQUlILE1BQU0sT0FBTyxxQkFBc0IsU0FBUSxXQUErQztJQUgxRjs7UUFJRSxlQUFVLEdBQUcsY0FBYyxDQUFDO1FBQzVCLFFBQUcsR0FBVyxrQkFBa0IsQ0FBQztLQWlEbEM7SUEvQ0MsWUFBWTtRQUNWLElBQUksQ0FBQyx5QkFBeUIsRUFBRSxDQUFDO1FBQ2pDLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO0lBQzdCLENBQUM7SUFFRCxHQUFHLENBQUMsY0FBOEI7UUFDaEMsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxJQUFJLElBQUksQ0FBQyxHQUFHLEVBQUUsRUFBRSxjQUFjLENBQUM7YUFDM0UsSUFBSSxDQUNILEdBQUcsQ0FBQyxDQUFDLGtCQUFzQyxFQUFFLEVBQUU7WUFDN0MsTUFBTSxVQUFVLEdBQW1CLFlBQVksQ0FBQyxjQUFjLEVBQUUsa0JBQWtCLENBQUMsQ0FBQztZQUVwRix5RkFBeUY7WUFDekYsdUVBQXVFO1lBQ3ZFLElBQUksSUFBSSxDQUFDLEtBQUssRUFBRTtnQkFDZCxJQUFJLGNBQWMsQ0FBQyxFQUFFLEVBQUU7b0JBQ3JCLE1BQU0sU0FBUyxHQUFxQixTQUFTLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO29CQUMxRCxPQUFPLENBQUMsU0FBUyxFQUFFLFVBQVUsQ0FBQyxDQUFDO29CQUUvQixJQUFJLENBQUMsS0FBSyxHQUFHLFNBQVMsQ0FBQztvQkFDdkIsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO2lCQUNwQztxQkFBTTtvQkFDTCxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQTtvQkFDM0IsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO2lCQUMvQzthQUNGO1lBRUQsT0FBTyxZQUFZLENBQUMsY0FBYyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBQ2xELENBQUMsQ0FBQyxDQUNILENBQUM7SUFDTixDQUFDO0lBRUQseUJBQXlCO1FBQ3ZCLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxFQUFFLENBQUMsZ0JBQWdCLENBQUMsb0JBQW9CLENBQUMsQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFO1lBQ25GLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUNwQixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRDs7T0FFRztJQUNILG1CQUFtQjtRQUNqQixJQUFJLENBQUMsc0JBQXNCLENBQUMsRUFBRSxDQUFDLGdCQUFnQixDQUFDLGtCQUFrQixDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsWUFBMEIsRUFBRSxFQUFFO1lBQzNHLElBQUksQ0FBQyxZQUFZLENBQUMsTUFBTSxJQUFJLFlBQVksQ0FBQyxTQUFTLEtBQUssMkJBQTJCLENBQUMsd0JBQXdCLEVBQUU7Z0JBQzNHLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQzthQUNuQjtRQUNILENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQzs7bUhBbERVLHFCQUFxQjt1SEFBckIscUJBQXFCLGNBRnBCLE1BQU07NEZBRVAscUJBQXFCO2tCQUhqQyxVQUFVO21CQUFDO29CQUNWLFVBQVUsRUFBRSxNQUFNO2lCQUNuQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IE9ic2VydmFibGUgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IG1hcCB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcbmltcG9ydCB7IEJhbmtDb25uZWN0aW9uIGFzIEJhbmtDb25uZWN0aW9uQmFzZSB9IGZyb20gJy4uLy4uLy4uLy4uL2RiL01vZGVscy9iYW5rL2JhbmstY29ubmVjdGlvbic7XG5pbXBvcnQgeyBwbGFpblRvQ2xhc3MgfSBmcm9tICdjbGFzcy10cmFuc2Zvcm1lcic7XG5pbXBvcnQgeyBCYW5rQ29ubmVjdGlvbiB9IGZyb20gJy4uLy4uLy4uLy4uL21vZGVscy9iYW5rL2JhbmstY29ubmVjdGlvbic7XG5pbXBvcnQgeyBSZXN0U2VydmljZSB9IGZyb20gJy4uLy4uL3Jlc3QvcmVzdC5zZXJ2aWNlJztcbmltcG9ydCB7IEFwcEV2ZW50VHlwZUVudW0gfSBmcm9tICcuLi8uLi8uLi8uLi9tb2RlbHMvZXZlbnQvYXBwLWV2ZW50LXR5cGUuZW51bSc7XG5pbXBvcnQgeyBJRXZlbnRMaXN0ZW5lciB9IGZyb20gJy4uLy4uLy4uLy4uL2ludGVyZmFjZXMvZXZlbnQtbGlzdGVuZXIuaW50ZXJmYWNlJztcbmltcG9ydCBjbG9uZURlZXAgZnJvbSAnbG9kYXNoL2Nsb25lRGVlcCc7XG5pbXBvcnQgeyByZXBsYWNlIH0gZnJvbSAnLi4vLi4vLi4vLi4vZnVuY3Rpb25zL2FycmF5JztcbmltcG9ydCB7IE5vdGlmaWNhdGlvbiB9IGZyb20gJy4uLy4uLy4uLy4uL21vZGVscy9ub3RpZmljYXRpb24vbm90aWZpY2F0aW9uJztcbmltcG9ydCB7IFVzZXJFdmVudFR5cGVDbGllbnRUeXBlRW51bSB9IGZyb20gJy4uLy4uLy4uLy4uL2RiL0VudW1zL3VzZXItZXZlbnQtdHlwZS1jbGllbnQtdHlwZS5lbnVtJztcblxuLyoqXG4gKiBCYW5rQ29ubmVjdGlvbiBtZWFucyB1c2VyIGFjY291bnQgYXQgc3BlY2lmaWMgYmFuayAodXN1YWxseSBlYWNoIHVzZXIgaGFzIG9ubHkgb25lIGF0IHRoZSBzYW1lIGJhbmspXG4gKiBzZXJ2aWNlIGhhbmRsZXMgQmFua0Nvbm5lY3Rpb24gbWFuYWdlbWVudFxuICovXG5ASW5qZWN0YWJsZSh7XG4gIHByb3ZpZGVkSW46ICdyb290J1xufSlcbmV4cG9ydCBjbGFzcyBCYW5rQ29ubmVjdGlvblNlcnZpY2UgZXh0ZW5kcyBSZXN0U2VydmljZTxCYW5rQ29ubmVjdGlvbkJhc2UsIEJhbmtDb25uZWN0aW9uPiBpbXBsZW1lbnRzIElFdmVudExpc3RlbmVyIHtcbiAgbW9kZWxDbGFzcyA9IEJhbmtDb25uZWN0aW9uO1xuICB1cmw6IHN0cmluZyA9ICdiYW5rLWNvbm5lY3Rpb25zJztcblxuICBsaXN0ZW5FdmVudHMoKTogdm9pZCB7XG4gICAgdGhpcy5saXN0ZW5Ub0FkZGVkQmFua0FjY291bnRzKCk7XG4gICAgdGhpcy5saXN0ZW5Ob3RpZmljYXRpb25zKCk7XG4gIH1cblxuICBhZGQoYmFua0Nvbm5lY3Rpb246IEJhbmtDb25uZWN0aW9uKTogT2JzZXJ2YWJsZTxCYW5rQ29ubmVjdGlvbj4ge1xuICAgIHJldHVybiB0aGlzLmh0dHAucG9zdChgJHt0aGlzLmVudmlyb25tZW50LmFwaVYyfS8ke3RoaXMudXJsfWAsIGJhbmtDb25uZWN0aW9uKVxuICAgICAgLnBpcGUoXG4gICAgICAgIG1hcCgoYmFua0Nvbm5lY3Rpb25CYXNlOiBCYW5rQ29ubmVjdGlvbkJhc2UpID0+IHtcbiAgICAgICAgICBjb25zdCBjb25uZWN0aW9uOiBCYW5rQ29ubmVjdGlvbiA9IHBsYWluVG9DbGFzcyhCYW5rQ29ubmVjdGlvbiwgYmFua0Nvbm5lY3Rpb25CYXNlKTtcblxuICAgICAgICAgIC8vIFdlIHVzZSB0aGlzIGVuZHBvaW50IGZvciBjcmVhdGUgYW5kIHJlY29ubmVjdCBiYW5rIGNvbm5lY3Rpb25zIGJlY2F1c2Ugb2YgYmFzaXEgbG9naWMuXG4gICAgICAgICAgLy8gU28gd2UgdHJ5IHRvIHJlcGxhY2UgYmFuayBjb25uZWN0aW9uIGluIGNhY2hlIGZvciByZWNvbm5lY3Rpb24gY2FzZS5cbiAgICAgICAgICBpZiAodGhpcy5jYWNoZSkge1xuICAgICAgICAgICAgaWYgKGJhbmtDb25uZWN0aW9uLmlkKSB7XG4gICAgICAgICAgICAgIGNvbnN0IHRlbXBDYWNoZTogQmFua0Nvbm5lY3Rpb25bXSA9IGNsb25lRGVlcCh0aGlzLmNhY2hlKTtcbiAgICAgICAgICAgICAgcmVwbGFjZSh0ZW1wQ2FjaGUsIGNvbm5lY3Rpb24pO1xuXG4gICAgICAgICAgICAgIHRoaXMuY2FjaGUgPSB0ZW1wQ2FjaGU7XG4gICAgICAgICAgICAgIHRoaXMuY2FjaGVTdWJqZWN0Lm5leHQodGhpcy5jYWNoZSk7XG4gICAgICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgICAgICB0aGlzLmNhY2hlLnB1c2goY29ubmVjdGlvbilcbiAgICAgICAgICAgICAgdGhpcy5jYWNoZVN1YmplY3QubmV4dChjbG9uZURlZXAodGhpcy5jYWNoZSkpO1xuICAgICAgICAgICAgfVxuICAgICAgICAgIH1cblxuICAgICAgICAgIHJldHVybiBwbGFpblRvQ2xhc3MoQmFua0Nvbm5lY3Rpb24sIGNvbm5lY3Rpb24pO1xuICAgICAgICB9KVxuICAgICAgKTtcbiAgfVxuXG4gIGxpc3RlblRvQWRkZWRCYW5rQWNjb3VudHMoKTogdm9pZCB7XG4gICAgdGhpcy5ldmVudERpc3BhdGNoZXJTZXJ2aWNlLm9uKEFwcEV2ZW50VHlwZUVudW0uQkFOS19BQ0NPVU5UX0NSRUFURUQpLnN1YnNjcmliZSgoKSA9PiB7XG4gICAgICB0aGlzLnJlc2V0Q2FjaGUoKTtcbiAgICB9KTtcbiAgfVxuXG4gIC8qKlxuICAgKiBVcGRhdGUgY2FjaGUgd2hlbiBiYXNpcSBsb2dpbiBmYWlsZWQgdG8gZ2V0IGFjdHVhbCBjb25uZWN0aW9ucyBzdGF0dXNlc1xuICAgKi9cbiAgbGlzdGVuTm90aWZpY2F0aW9ucygpOiB2b2lkIHtcbiAgICB0aGlzLmV2ZW50RGlzcGF0Y2hlclNlcnZpY2Uub24oQXBwRXZlbnRUeXBlRW51bS5OT1RJRklDQVRJT05fQURERUQpLnN1YnNjcmliZSgobm90aWZpY2F0aW9uOiBOb3RpZmljYXRpb24pID0+IHtcbiAgICAgIGlmICghbm90aWZpY2F0aW9uLmlzUmVhZCAmJiBub3RpZmljYXRpb24uZXZlbnRUeXBlID09PSBVc2VyRXZlbnRUeXBlQ2xpZW50VHlwZUVudW0uQkFTSVFfQVVUSE9SSVpBVElPTl9GQUlMKSB7XG4gICAgICAgIHRoaXMucmVzZXRDYWNoZSgpO1xuICAgICAgfVxuICAgIH0pO1xuICB9XG59XG4iXX0=
|
|
@@ -61,12 +61,11 @@ export class BasiqService extends RestService {
|
|
|
61
61
|
* we interact with basiq service.
|
|
62
62
|
*/
|
|
63
63
|
updateConnection(data, userId, connection) {
|
|
64
|
-
// Send login data to basiq API to create a basiq job
|
|
64
|
+
// Send login data and connection id to basiq API to create a basiq job
|
|
65
65
|
return this.http.post(`${BasiqService.basiqApiUrl}/users/${userId}/connections`, Object.assign(data, { id: connection.externalId }))
|
|
66
|
-
.pipe(
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
return this.bankConnectionService.add(plainToClass(BankConnection, Object.assign({ id: connection.id, basiqJob: { externalId: response.id } })));
|
|
66
|
+
.pipe(mergeMap((response) => {
|
|
67
|
+
// Create bank connection based on basiq job
|
|
68
|
+
return this.bankConnectionService.add(plainToClass(BankConnection, { id: connection.id, basiqJob: { externalId: response.id } }));
|
|
70
69
|
}), catchError((error) => {
|
|
71
70
|
// Show error when user provided wrong login data
|
|
72
71
|
if (error.status === 401) {
|
|
@@ -112,4 +111,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
|
|
|
112
111
|
type: Inject,
|
|
113
112
|
args: ['environment']
|
|
114
113
|
}] }, { type: i3.ToastService }, { type: i4.BankConnectionService }]; } });
|
|
115
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"basiq.service.js","sourceRoot":"","sources":["../../../../../../../../projects/tt-core/src/lib/services/http/bank/basiq/basiq.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE3D,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AASzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iDAAiD,CAAC;AACxF,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;;;;;;AAEzF;;;GAGG;AAIH,MAAM,OAAO,YAAa,SAAQ,WAAyC;IAMzE,YACY,IAAgB,EAChB,sBAA8C,EACvB,WAAgB,EACvC,YAA0B,EAC5B,qBAA4C;QAEpD,KAAK,CAAC,IAAI,EAAE,sBAAsB,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;QANrD,SAAI,GAAJ,IAAI,CAAY;QAChB,2BAAsB,GAAtB,sBAAsB,CAAwB;QACvB,gBAAW,GAAX,WAAW,CAAK;QACvC,iBAAY,GAAZ,YAAY,CAAc;QAC5B,0BAAqB,GAArB,qBAAqB,CAAuB;QARtD,QAAG,GAAW,gBAAgB,CAAC;QAC/B,eAAU,GAAG,WAAW,CAAC;IAUzB,CAAC;IAED;;OAEG;IACH,YAAY;QACV,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC7B,CAAC;IAED;;;;;OAKG;IACH,gBAAgB,CAAC,SAAwB,EAAE,MAAc;QACvD,qDAAqD;QACrD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,WAAW,UAAU,MAAM,cAAc,EAAE,SAAS,CAAC;aACxF,IAAI,CACH,QAAQ,CAAC,CAAC,QAAkC,EAAE,EAAE;YAC9C,4CAA4C;YAC5C,OAAO,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,YAAY,CAAC,cAAc,EAAE,EAAC,QAAQ,EAAE,EAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,EAAC,EAAC,CAAC,CAAC,CAAC;QAC7G,CAAC,CAAC,EACF,UAAU,CAAC,CAAC,KAAwB,EAAE,EAAE;YACtC,iDAAiD;YACjD,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE;gBACxB,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;aAChD;YAED,OAAO,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC,CAAC,CACH,CAAC;IACN,CAAC;IAED;;;;;OAKG;IACH,gBAAgB,CAAC,IAAmB,EAAE,MAAc,EAAE,UAA0B;QAC9E,qDAAqD;QACrD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,WAAW,UAAU,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAC,EAAE,EAAE,UAAU,CAAC,UAAU,EAAC,CAAC,CAAC;aAC/H,IAAI;QACH,4CAA4C;QAC5C,QAAQ,CAAC,CAAC,QAAkC,EAAE,EAAE;YAC9C,OAAO,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,YAAY,CAAC,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,EAAC,EAAE,EAAE,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,EAAC,EAAC,CAAC,CAAC,CAAC,CAAC;QAC/I,CAAC,CAAC,EACF,UAAU,CAAC,CAAC,KAAwB,EAAE,EAAE;YACtC,iDAAiD;YACjD,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE;gBACxB,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;aAChD;YAED,yEAAyE;YACzE,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE;gBACxB,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;aACnE;YAED,OAAO,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC,CAAC,CACH,CAAC;IACN,CAAC;IAED,eAAe,CAAC,UAA0B;QACxC,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CACpB,GAAG,CAAC,CAAC,YAA2B,EAAE,EAAE;YAClC,OAAO,IAAI,qBAAqB,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,mBAAmB,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;QAC9F,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,0BAA0B,CAAC,aAAoC,EAAE,UAA0B;QACzF,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,IAAI,CAC1C,GAAG,CAAC,CAAC,YAAmC,EAAE,EAAE;YAC1C,OAAO,YAAY,CAAC,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;QAC9E,CAAC,CAAC,CACH,CAAA;IACH,CAAC;IAED;;OAEG;IACK,mBAAmB;QACzB,IAAI,CAAC,sBAAsB,CAAC,EAAE,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAC,SAAS,CAAC,CAAC,YAA0B,EAAQ,EAAE;YACjH,IAAI,CAAC,YAAY,CAAC,MAAM,IAAI,YAAY,CAAC,SAAS,KAAK,2BAA2B,CAAC,kBAAkB,EAAE;gBACrG,IAAI,CAAC,UAAU,EAAE,CAAC;aACnB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;;AAtGM,wBAAW,GAAW,yBAAyB,CAAC;0GAD5C,YAAY,kFASb,aAAa;8GATZ,YAAY,cAFX,MAAM;4FAEP,YAAY;kBAHxB,UAAU;mBAAC;oBACV,UAAU,EAAE,MAAM;iBACnB;;0BAUI,MAAM;2BAAC,aAAa","sourcesContent":["import { Inject, Injectable } from '@angular/core';\nimport { Observable } from 'rxjs';\nimport { catchError, map, mergeMap } from 'rxjs/operators';\nimport { BankAccount as BankAccountBase } from '../../../../db/Models/bank/bank-account';\nimport { UserEventTypeClientTypeEnum } from '../../../../db/Enums/user-event-type-client-type.enum';\nimport { RestService } from '../../rest/rest.service';\nimport { BankAccount } from '../../../../models/bank/bank-account';\nimport { AppEventTypeEnum } from '../../../../models/event/app-event-type.enum';\nimport { BankConnection } from '../../../../models/bank/bank-connection';\nimport { Notification } from '../../../../models/notification/notification';\nimport { IEventListener } from '../../../../interfaces/event-listener.interface';\nimport { HttpClient, HttpErrorResponse } from '@angular/common/http';\nimport { EventDispatcherService } from '../../../event/event-dispatcher.service';\nimport { BankConnectionService } from '../bank-connection/bank-connection.service';\nimport { ToastService } from '../../../toast/toast.service';\nimport { BasiqConnectionsResponse } from './basiq-connections-response.interface';\nimport { BankLoginData } from '../../../../models/bank/bank-login-data';\nimport { BankAccountCollection } from '../../../../collections/bank-account.collection';\nimport { plainToClass } from 'class-transformer';\nimport { throwError as observableThrowError } from 'rxjs/internal/observable/throwError';\n\n/**\n * basiq is a middleman between bank and user\n * service is responsible for fetching bank related information\n */\n@Injectable({\n  providedIn: 'root'\n})\nexport class BasiqService extends RestService<BankAccountBase, BankAccount> implements IEventListener {\n  static basiqApiUrl: string = 'https://au-api.basiq.io';\n\n  url: string = 'basiq/accounts';\n  modelClass = BankAccount;\n\n  constructor(\n    protected http: HttpClient,\n    protected eventDispatcherService: EventDispatcherService,\n    @Inject('environment') protected environment: any,\n    protected toastService: ToastService,\n    private bankConnectionService: BankConnectionService\n  ) {\n    super(http, eventDispatcherService, environment, toastService);\n  }\n\n  /**\n   * Listen events from Event Dispatcher service\n   */\n  listenEvents(): void {\n    this.listenNotifications();\n  }\n\n  /**\n   * Create a new Bank connection based on Basiq job.\n   * Here we have nested requests because we need to get a job id before we create a bank connection.\n   * There is no way to use event dispatcher because we expect some errors from bank-connections API, but in components\n   * we interact with basiq service.\n   */\n  createConnection(loginData: BankLoginData, userId: string): Observable<BankConnection> {\n    // Send login data to basiq API to create a basiq job\n    return this.http.post(`${BasiqService.basiqApiUrl}/users/${userId}/connections`, loginData)\n      .pipe(\n        mergeMap((response: BasiqConnectionsResponse) => {\n          // Create bank connection based on basiq job\n          return this.bankConnectionService.add(plainToClass(BankConnection, {basiqJob: {externalId: response.id}}));\n        }),\n        catchError((error: HttpErrorResponse) => {\n          // Show error when user provided wrong login data\n          if (error.status === 401) {\n            this.toastService.error('Invalid credentials');\n          }\n\n          return observableThrowError(error);\n        })\n      );\n  }\n\n  /**\n   * Update disconnected bank connection\n   * Here we have nested requests because we need to get a job id before we create a bank connection.\n   * There is no way to use event dispatcher because we expect some errors from bank-connections API, but in components\n   * we interact with basiq service.\n   */\n  updateConnection(data: BankLoginData, userId: string, connection: BankConnection): Observable<BankConnection> {\n    // Send login data to basiq API to create a basiq job\n    return this.http.post(`${BasiqService.basiqApiUrl}/users/${userId}/connections`, Object.assign(data, {id: connection.externalId}))\n      .pipe(\n        // Create bank connection based on basiq job\n        mergeMap((response: BasiqConnectionsResponse) => {\n          return this.bankConnectionService.add(plainToClass(BankConnection, Object.assign({id: connection.id, basiqJob: {externalId: response.id}})));\n        }),\n        catchError((error: HttpErrorResponse) => {\n          // Show error when user provided wrong login data\n          if (error.status === 401) {\n            this.toastService.error('Invalid credentials');\n          }\n\n          // Show error when user provided another login (not login he used before)\n          if (error.status === 400) {\n            this.toastService.error('Please enter the login you used before');\n          }\n\n          return observableThrowError(error);\n        })\n      );\n  }\n\n  getByConnection(connection: BankConnection): Observable<BankAccountCollection> {\n    return this.get().pipe(\n      map((bankAccounts: BankAccount[]) => {\n        return new BankAccountCollection(bankAccounts).filterBy('bankConnection.id', connection.id);\n      })\n    );\n  }\n\n  getNotImportedByConnection(savedAccounts: BankAccountCollection, connection: BankConnection): Observable<BankAccountCollection> {\n    return this.getByConnection(connection).pipe(\n      map((bankAccounts: BankAccountCollection) => {\n        return bankAccounts.removeBy('accountId', savedAccounts.mapBy('accountId'));\n      })\n    )\n  }\n\n  /**\n   * listen to notifications to update basiq accounts list\n   */\n  private listenNotifications(): void {\n    this.eventDispatcherService.on(AppEventTypeEnum.NOTIFICATION_ADDED).subscribe((notification: Notification): void => {\n      if (!notification.isRead && notification.eventType === UserEventTypeClientTypeEnum.BASIQ_NEW_ACCOUNTS) {\n        this.resetCache();\n      }\n    });\n  }\n}\n"]}
|
|
114
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"basiq.service.js","sourceRoot":"","sources":["../../../../../../../../projects/tt-core/src/lib/services/http/bank/basiq/basiq.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Inject, Injectable } from '@angular/core';\nimport { Observable } from 'rxjs';\nimport { catchError, map, mergeMap } from 'rxjs/operators';\nimport { BankAccount as BankAccountBase } from '../../../../db/Models/bank/bank-account';\nimport { UserEventTypeClientTypeEnum } from '../../../../db/Enums/user-event-type-client-type.enum';\nimport { RestService } from '../../rest/rest.service';\nimport { BankAccount } from '../../../../models/bank/bank-account';\nimport { AppEventTypeEnum } from '../../../../models/event/app-event-type.enum';\nimport { BankConnection } from '../../../../models/bank/bank-connection';\nimport { Notification } from '../../../../models/notification/notification';\nimport { IEventListener } from '../../../../interfaces/event-listener.interface';\nimport { HttpClient, HttpErrorResponse } from '@angular/common/http';\nimport { EventDispatcherService } from '../../../event/event-dispatcher.service';\nimport { BankConnectionService } from '../bank-connection/bank-connection.service';\nimport { ToastService } from '../../../toast/toast.service';\nimport { BasiqConnectionsResponse } from './basiq-connections-response.interface';\nimport { BankLoginData } from '../../../../models/bank/bank-login-data';\nimport { BankAccountCollection } from '../../../../collections/bank-account.collection';\nimport { plainToClass } from 'class-transformer';\nimport { throwError as observableThrowError } from 'rxjs/internal/observable/throwError';\n\n/**\n * basiq is a middleman between bank and user\n * service is responsible for fetching bank related information\n */\n@Injectable({\n  providedIn: 'root'\n})\nexport class BasiqService extends RestService<BankAccountBase, BankAccount> implements IEventListener {\n  static basiqApiUrl: string = 'https://au-api.basiq.io';\n\n  url: string = 'basiq/accounts';\n  modelClass = BankAccount;\n\n  constructor(\n    protected http: HttpClient,\n    protected eventDispatcherService: EventDispatcherService,\n    @Inject('environment') protected environment: any,\n    protected toastService: ToastService,\n    private bankConnectionService: BankConnectionService\n  ) {\n    super(http, eventDispatcherService, environment, toastService);\n  }\n\n  /**\n   * Listen events from Event Dispatcher service\n   */\n  listenEvents(): void {\n    this.listenNotifications();\n  }\n\n  /**\n   * Create a new Bank connection based on Basiq job.\n   * Here we have nested requests because we need to get a job id before we create a bank connection.\n   * There is no way to use event dispatcher because we expect some errors from bank-connections API, but in components\n   * we interact with basiq service.\n   */\n  createConnection(loginData: BankLoginData, userId: string): Observable<BankConnection> {\n    // Send login data to basiq API to create a basiq job\n    return this.http.post(`${BasiqService.basiqApiUrl}/users/${userId}/connections`, loginData)\n      .pipe(\n        mergeMap((response: BasiqConnectionsResponse) => {\n          // Create bank connection based on basiq job\n          return this.bankConnectionService.add(plainToClass(BankConnection, {basiqJob: {externalId: response.id}}));\n        }),\n        catchError((error: HttpErrorResponse) => {\n          // Show error when user provided wrong login data\n          if (error.status === 401) {\n            this.toastService.error('Invalid credentials');\n          }\n\n          return observableThrowError(error);\n        })\n      );\n  }\n\n  /**\n   * Update disconnected bank connection\n   * Here we have nested requests because we need to get a job id before we create a bank connection.\n   * There is no way to use event dispatcher because we expect some errors from bank-connections API, but in components\n   * we interact with basiq service.\n   */\n  updateConnection(data: BankLoginData, userId: string, connection: BankConnection): Observable<BankConnection> {\n    // Send login data and connection id to basiq API to create a basiq job\n    return this.http.post(`${BasiqService.basiqApiUrl}/users/${userId}/connections`, Object.assign(data, {id: connection.externalId}))\n      .pipe(\n        mergeMap((response: BasiqConnectionsResponse) => {\n          // Create bank connection based on basiq job\n          return this.bankConnectionService.add(plainToClass(BankConnection, {id: connection.id, basiqJob: {externalId: response.id}}));\n        }),\n        catchError((error: HttpErrorResponse) => {\n          // Show error when user provided wrong login data\n          if (error.status === 401) {\n            this.toastService.error('Invalid credentials');\n          }\n\n          // Show error when user provided another login (not login he used before)\n          if (error.status === 400) {\n            this.toastService.error('Please enter the login you used before');\n          }\n\n          return observableThrowError(error);\n        })\n      );\n  }\n\n  getByConnection(connection: BankConnection): Observable<BankAccountCollection> {\n    return this.get().pipe(\n      map((bankAccounts: BankAccount[]) => {\n        return new BankAccountCollection(bankAccounts).filterBy('bankConnection.id', connection.id);\n      })\n    );\n  }\n\n  getNotImportedByConnection(savedAccounts: BankAccountCollection, connection: BankConnection): Observable<BankAccountCollection> {\n    return this.getByConnection(connection).pipe(\n      map((bankAccounts: BankAccountCollection) => {\n        return bankAccounts.removeBy('accountId', savedAccounts.mapBy('accountId'));\n      })\n    )\n  }\n\n  /**\n   * listen to notifications to update basiq accounts list\n   */\n  private listenNotifications(): void {\n    this.eventDispatcherService.on(AppEventTypeEnum.NOTIFICATION_ADDED).subscribe((notification: Notification): void => {\n      if (!notification.isRead && notification.eventType === UserEventTypeClientTypeEnum.BASIQ_NEW_ACCOUNTS) {\n        this.resetCache();\n      }\n    });\n  }\n}\n"]}
|
|
@@ -27,6 +27,13 @@ export class ChartAccountsService {
|
|
|
27
27
|
return response.map((item) => plainToClass(ChartAccounts, item));
|
|
28
28
|
}))
|
|
29
29
|
.subscribe((chartAccounts) => {
|
|
30
|
+
// Sort personal chart accounts by name (TT-1950)
|
|
31
|
+
chartAccounts.sort((a, b) => {
|
|
32
|
+
if (a.isPersonal() && b.isPersonal()) {
|
|
33
|
+
return a.name > b.name ? 1 : -1;
|
|
34
|
+
}
|
|
35
|
+
return 0;
|
|
36
|
+
});
|
|
30
37
|
this._chartAccounts = chartAccounts;
|
|
31
38
|
this.chartAccountsSubject.next(this._chartAccounts);
|
|
32
39
|
});
|
|
@@ -86,4 +93,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
|
|
|
86
93
|
type: Inject,
|
|
87
94
|
args: ['environment']
|
|
88
95
|
}] }]; } });
|
|
89
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"chart-accounts.service.js","sourceRoot":"","sources":["../../../../../../../projects/tt-core/src/lib/services/http/chart-accounts/chart-accounts.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Inject, Injectable } from '@angular/core';\nimport { HttpClient } from '@angular/common/http';\nimport { Observable, ReplaySubject } from 'rxjs';\nimport { map } from 'rxjs/operators';\nimport { ChartAccountsCategoryEnum } from '../../../db/Enums/chart-accounts-category.enum';\nimport { ChartAccounts as ChartAccountBase } from '../../../db/Models/chart-accounts/chart-accounts';\nimport { plainToClass } from 'class-transformer';\nimport { ChartAccounts } from '../../../models/chart-accounts/chart-accounts';\nimport { ChartAccountsHeading } from '../../../models/chart-accounts/chart-accounts-heading';\nimport { CHART_ACCOUNTS_CATEGORIES } from '../../../models/chart-accounts/chart-accounts-categories.const';\n\n/**\n * Chart accounts service\n */\n@Injectable({\n  providedIn: 'root'\n})\nexport class ChartAccountsService {\n  _chartAccounts: ChartAccounts[];\n  chartAccountsSubject: ReplaySubject<ChartAccounts[]> = new ReplaySubject<ChartAccounts[]>(1);\n\n  constructor(\n    private http: HttpClient,\n    @Inject('environment') private environment: any\n  ) {\n  }\n\n  /**\n   * get all parent and child chart accounts and group it\n   */\n  getChartAccounts(): Observable<ChartAccounts[]> {\n    if (!this._chartAccounts) {\n      this._chartAccounts = [];\n      this.http.get(`${this.environment.apiV2}/chart-accounts`)\n        .pipe(\n          map((response: ChartAccountBase[]) => {\n            return response.map((item: ChartAccountBase) => plainToClass(ChartAccounts, item));\n          })\n        )\n        .subscribe((chartAccounts: ChartAccounts[]) => {\n          // Sort personal chart accounts by name (TT-1950)\n          chartAccounts.sort((a: ChartAccounts, b: ChartAccounts) => {\n            if (a.isPersonal() && b.isPersonal()) {\n              return a.name > b.name ? 1 : -1;\n            }\n\n            return 0;\n          })\n          this._chartAccounts = chartAccounts;\n          this.chartAccountsSubject.next(this._chartAccounts);\n        });\n    }\n\n    return this.chartAccountsSubject.asObservable();\n  }\n\n  /**\n   * Get list of chart accounts heading\n   * @param categories\n   */\n  getChartAccountsHeadings(categories: ChartAccountsCategoryEnum[] = CHART_ACCOUNTS_CATEGORIES.all): Observable<ChartAccountsHeading[]> {\n    return this.getChartAccounts()\n      .pipe(\n        map((chartAccounts: ChartAccounts[]) => {\n          const filteredChartAccounts: ChartAccounts[] = chartAccounts.filter((ca: ChartAccounts) => categories.includes(ca.category));\n          const headings: ChartAccountsHeading[] = [];\n\n          filteredChartAccounts.forEach((ca: ChartAccounts) => {\n            let heading: ChartAccountsHeading = headings.find((h: ChartAccountsHeading) => h.id === ca.heading?.id);\n\n            if (!heading) {\n              heading = plainToClass(ChartAccountsHeading, ca.heading);\n              heading.chartAccounts = [];\n              headings.push(heading);\n            }\n\n            heading.chartAccounts.push(ca);\n          });\n          return headings;\n        })\n      );\n  }\n\n  /**\n   * Get heading of chart accounts by it Id\n   * @param id\n   */\n  getHeadingByChartAccountsId(id: number): Observable<ChartAccountsHeading> {\n    return this.getChartAccountsById(id)\n      .pipe(\n        map((chartAccounts: ChartAccounts) => {\n          return chartAccounts.heading;\n        })\n      );\n  }\n\n  /**\n   * Get chart accounts by Id\n   * @param id\n   */\n  getChartAccountsById(id: number): Observable<ChartAccounts> {\n    return this.getChartAccounts()\n      .pipe(\n        map((chartAccountsList: ChartAccounts[]) => {\n          return chartAccountsList.find((chartAccounts: ChartAccounts) => chartAccounts.id === id);\n        })\n      );\n  }\n}\n"]}
|
package/fesm2015/taxtank-core.js
CHANGED
|
@@ -2490,6 +2490,12 @@ class BankAccount extends BankAccount$1 {
|
|
|
2490
2490
|
isPropertyTank() {
|
|
2491
2491
|
return this.tankType === TankTypeEnum.PROPERTY;
|
|
2492
2492
|
}
|
|
2493
|
+
/**
|
|
2494
|
+
* check if bank account related to sole tank
|
|
2495
|
+
*/
|
|
2496
|
+
isSoleTank() {
|
|
2497
|
+
return this.tankType === TankTypeEnum.SOLE;
|
|
2498
|
+
}
|
|
2493
2499
|
/**
|
|
2494
2500
|
* Get Bank account property by id
|
|
2495
2501
|
* @param id Id of property
|
|
@@ -2710,15 +2716,17 @@ class BankConnectionService extends RestService {
|
|
|
2710
2716
|
const connection = plainToClass(BankConnection, bankConnectionBase);
|
|
2711
2717
|
// We use this endpoint for create and reconnect bank connections because of basiq logic.
|
|
2712
2718
|
// So we try to replace bank connection in cache for reconnection case.
|
|
2713
|
-
if (
|
|
2714
|
-
|
|
2715
|
-
|
|
2716
|
-
|
|
2717
|
-
|
|
2718
|
-
|
|
2719
|
-
|
|
2720
|
-
|
|
2721
|
-
|
|
2719
|
+
if (this.cache) {
|
|
2720
|
+
if (bankConnection.id) {
|
|
2721
|
+
const tempCache = cloneDeep$1(this.cache);
|
|
2722
|
+
replace(tempCache, connection);
|
|
2723
|
+
this.cache = tempCache;
|
|
2724
|
+
this.cacheSubject.next(this.cache);
|
|
2725
|
+
}
|
|
2726
|
+
else {
|
|
2727
|
+
this.cache.push(connection);
|
|
2728
|
+
this.cacheSubject.next(cloneDeep$1(this.cache));
|
|
2729
|
+
}
|
|
2722
2730
|
}
|
|
2723
2731
|
return plainToClass(BankConnection, connection);
|
|
2724
2732
|
}));
|
|
@@ -2796,12 +2804,11 @@ class BasiqService extends RestService {
|
|
|
2796
2804
|
* we interact with basiq service.
|
|
2797
2805
|
*/
|
|
2798
2806
|
updateConnection(data, userId, connection) {
|
|
2799
|
-
// Send login data to basiq API to create a basiq job
|
|
2807
|
+
// Send login data and connection id to basiq API to create a basiq job
|
|
2800
2808
|
return this.http.post(`${BasiqService.basiqApiUrl}/users/${userId}/connections`, Object.assign(data, { id: connection.externalId }))
|
|
2801
|
-
.pipe(
|
|
2802
|
-
|
|
2803
|
-
|
|
2804
|
-
return this.bankConnectionService.add(plainToClass(BankConnection, Object.assign({ id: connection.id, basiqJob: { externalId: response.id } })));
|
|
2809
|
+
.pipe(mergeMap((response) => {
|
|
2810
|
+
// Create bank connection based on basiq job
|
|
2811
|
+
return this.bankConnectionService.add(plainToClass(BankConnection, { id: connection.id, basiqJob: { externalId: response.id } }));
|
|
2805
2812
|
}), catchError((error) => {
|
|
2806
2813
|
// Show error when user provided wrong login data
|
|
2807
2814
|
if (error.status === 401) {
|
|
@@ -9427,6 +9434,13 @@ class ChartAccountsService {
|
|
|
9427
9434
|
return response.map((item) => plainToClass(ChartAccounts, item));
|
|
9428
9435
|
}))
|
|
9429
9436
|
.subscribe((chartAccounts) => {
|
|
9437
|
+
// Sort personal chart accounts by name (TT-1950)
|
|
9438
|
+
chartAccounts.sort((a, b) => {
|
|
9439
|
+
if (a.isPersonal() && b.isPersonal()) {
|
|
9440
|
+
return a.name > b.name ? 1 : -1;
|
|
9441
|
+
}
|
|
9442
|
+
return 0;
|
|
9443
|
+
});
|
|
9430
9444
|
this._chartAccounts = chartAccounts;
|
|
9431
9445
|
this.chartAccountsSubject.next(this._chartAccounts);
|
|
9432
9446
|
});
|
|
@@ -12403,6 +12417,9 @@ function getDocIcon(document) {
|
|
|
12403
12417
|
}
|
|
12404
12418
|
|
|
12405
12419
|
function compareMatOptions(option, value) {
|
|
12420
|
+
if (!option) {
|
|
12421
|
+
return false;
|
|
12422
|
+
}
|
|
12406
12423
|
return option.id === value.id;
|
|
12407
12424
|
}
|
|
12408
12425
|
function displayMatOptions(option) {
|
|
@@ -12573,7 +12590,7 @@ class BankAccountAddManualForm extends AbstractForm {
|
|
|
12573
12590
|
currentBalance: new FormControl(null, Validators.required),
|
|
12574
12591
|
accountNumber: new FormControl(null, [Validators.required, Validators.pattern(BankAccountAddManualForm.accountNumberPattern)]),
|
|
12575
12592
|
tankType: new FormControl(null, Validators.required),
|
|
12576
|
-
});
|
|
12593
|
+
}, plainToClass(BankAccount, {}));
|
|
12577
12594
|
this.connection = connection;
|
|
12578
12595
|
this.listenEvents();
|
|
12579
12596
|
}
|