taxtank-core 0.30.111 → 0.30.112
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/esm2020/lib/db/Models/sole/sole-business.mjs +1 -1
- package/esm2020/lib/forms/sole/sole-business.form.mjs +6 -6
- package/esm2020/lib/models/sole/sole-business.mjs +10 -7
- package/fesm2015/taxtank-core.mjs +46 -42
- package/fesm2015/taxtank-core.mjs.map +1 -1
- package/fesm2020/taxtank-core.mjs +46 -42
- package/fesm2020/taxtank-core.mjs.map +1 -1
- package/lib/db/Models/sole/sole-business.d.ts +1 -0
- package/lib/forms/sole/sole-business.form.d.ts +1 -1
- package/lib/models/sole/sole-business.d.ts +7 -6
- package/package.json +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { AbstractModel } from '../abstract-model';
|
|
2
2
|
export class SoleBusiness extends AbstractModel {
|
|
3
3
|
}
|
|
4
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29sZS1idXNpbmVzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9kYi9Nb2RlbHMvc29sZS9zb2xlLWJ1c2luZXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUtsRCxNQUFNLE9BQU8sWUFBYSxTQUFRLGFBQWE7Q0FtQjlDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVXNlciB9IGZyb20gJy4uL3VzZXIvdXNlcic7XG5pbXBvcnQgeyBTb2xlQnVzaW5lc3NBbGxvY2F0aW9uIH0gZnJvbSAnLi9zb2xlLWJ1c2luZXNzLWFsbG9jYXRpb24nO1xuaW1wb3J0IHsgU29sZUJ1c2luZXNzTG9zcyB9IGZyb20gJy4vc29sZS1idXNpbmVzcy1sb3NzJztcbmltcG9ydCB7IFNvbGVJbnZvaWNlIH0gZnJvbSAnLi9zb2xlLWludm9pY2UnO1xuaW1wb3J0IHsgU29sZUludm9pY2VUZW1wbGF0ZSB9IGZyb20gJy4vc29sZS1pbnZvaWNlLXRlbXBsYXRlJztcbmltcG9ydCB7IFZlaGljbGVDbGFpbSB9IGZyb20gJy4uL3ZlaGljbGUvdmVoaWNsZS1jbGFpbSc7XG5pbXBvcnQgeyBUcmFuc2FjdGlvbiB9IGZyb20gJy4uL3RyYW5zYWN0aW9uL3RyYW5zYWN0aW9uJztcbmltcG9ydCB7IERlcHJlY2lhdGlvbiB9IGZyb20gJy4uL2RlcHJlY2lhdGlvbi9kZXByZWNpYXRpb24nO1xuaW1wb3J0IHsgQWJzdHJhY3RNb2RlbCB9IGZyb20gJy4uL2Fic3RyYWN0LW1vZGVsJztcbmltcG9ydCB7IFZlaGljbGVMb2dib29rIH0gZnJvbSAnLi4vdmVoaWNsZS92ZWhpY2xlLWxvZ2Jvb2snO1xuaW1wb3J0IHsgU29sZUJ1c2luZXNzQWN0aXZpdHkgfSBmcm9tICcuL3NvbGUtYnVzaW5lc3MtYWN0aXZpdHknO1xuaW1wb3J0IHsgSW5jb21lU291cmNlIH0gZnJvbSAnLi4vaW5jb21lU291cmNlL2luY29tZS1zb3VyY2UnO1xuXG5leHBvcnQgY2xhc3MgU29sZUJ1c2luZXNzIGV4dGVuZHMgQWJzdHJhY3RNb2RlbCB7XG4gIG5hbWU/OiBzdHJpbmc7XG4gIGRlc2NyaXB0aW9uPzogc3RyaW5nO1xuICB3ZWJzaXRlPzogc3RyaW5nO1xuICBsb2dvPzogc3RyaW5nO1xuICBpZD86IG51bWJlcjtcbiAgZGVsZXRlZEF0PzogRGF0ZTtcbiAgdXNlcj86IFVzZXI7XG4gIGFjdGl2aXR5PzogU29sZUJ1c2luZXNzQWN0aXZpdHk7XG4gIGlzUHJpbWFyeVByb2R1Y3Rpb24/OiBib29sZWFuO1xuICBhbGxvY2F0aW9ucz86IFNvbGVCdXNpbmVzc0FsbG9jYXRpb25bXTtcbiAgbG9zc2VzPzogU29sZUJ1c2luZXNzTG9zc1tdO1xuICBpbnZvaWNlcz86IFNvbGVJbnZvaWNlW107XG4gIGludm9pY2VUZW1wbGF0ZXM/OiBTb2xlSW52b2ljZVRlbXBsYXRlW107XG4gIGluY29tZVNvdXJjZT86IEluY29tZVNvdXJjZTtcbiAgdmVoaWNsZUNsYWltcz86IFZlaGljbGVDbGFpbVtdO1xuICB2ZWhpY2xlTG9nYm9va3M/OiBWZWhpY2xlTG9nYm9va1tdO1xuICB0cmFuc2FjdGlvbnM/OiBUcmFuc2FjdGlvbltdO1xuICBkZXByZWNpYXRpb25zPzogRGVwcmVjaWF0aW9uW107XG59XG4iXX0=
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import { AbstractForm } from '../abstract.form';
|
|
2
|
-
import { SoleBusiness } from '../../models';
|
|
2
|
+
import { SoleBusiness, FinancialYear } from '../../models';
|
|
3
3
|
import { plainToClass } from 'class-transformer';
|
|
4
|
-
import { UntypedFormArray, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
|
|
5
|
-
import { IncomeSourceTypeEnum } from '../../db/Enums/income-source
|
|
6
|
-
import { FinancialYear } from '../../models/financial-year/financial-year';
|
|
4
|
+
import { UntypedFormArray, UntypedFormControl, UntypedFormGroup, Validators, FormControl } from '@angular/forms';
|
|
5
|
+
import { IncomeSourceTypeEnum } from '../../db/Enums/income-source';
|
|
7
6
|
export class SoleBusinessForm extends AbstractForm {
|
|
8
7
|
constructor(business = plainToClass(SoleBusiness, {})) {
|
|
9
8
|
super({
|
|
10
9
|
name: new UntypedFormControl(business.name, Validators.required),
|
|
11
10
|
activity: new UntypedFormControl(business.activity, Validators.required),
|
|
12
11
|
description: new UntypedFormControl(business.description),
|
|
13
|
-
website: new UntypedFormControl(business.website)
|
|
12
|
+
website: new UntypedFormControl(business.website),
|
|
13
|
+
isPrimaryProduction: new FormControl(business.isPrimaryProduction),
|
|
14
14
|
}, business);
|
|
15
15
|
this.business = business;
|
|
16
16
|
// User have to create income source with new business.
|
|
@@ -66,4 +66,4 @@ export class SoleBusinessForm extends AbstractForm {
|
|
|
66
66
|
});
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29sZS1idXNpbmVzcy5mb3JtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL2Zvcm1zL3NvbGUvc29sZS1idXNpbmVzcy5mb3JtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUNoRCxPQUFPLEVBQUUsWUFBWSxFQUFFLGFBQWEsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUMzRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDakQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLGtCQUFrQixFQUFFLGdCQUFnQixFQUFFLFVBQVUsRUFBRSxXQUFXLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUNqSCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUdwRSxNQUFNLE9BQU8sZ0JBQWlCLFNBQVEsWUFBMEI7SUFDOUQsWUFDVSxXQUF5QixZQUFZLENBQUMsWUFBWSxFQUFFLEVBQUUsQ0FBQztRQUUvRCxLQUFLLENBQUM7WUFDSixJQUFJLEVBQUUsSUFBSSxrQkFBa0IsQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxRQUFRLENBQUM7WUFDaEUsUUFBUSxFQUFFLElBQUksa0JBQWtCLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDO1lBQ3hFLFdBQVcsRUFBRSxJQUFJLGtCQUFrQixDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUM7WUFDekQsT0FBTyxFQUFFLElBQUksa0JBQWtCLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQztZQUNqRCxtQkFBbUIsRUFBRSxJQUFJLFdBQVcsQ0FBQyxRQUFRLENBQUMsbUJBQW1CLENBQUM7U0FDbkUsRUFBRSxRQUFRLENBQUMsQ0FBQztRQVJMLGFBQVEsR0FBUixRQUFRLENBQStDO1FBVS9ELHVEQUF1RDtRQUN2RCw4Q0FBOEM7UUFDOUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLEVBQUU7WUFDaEIscURBQXFEO1lBQ3JELElBQUksQ0FBQyxVQUFVLENBQUMsY0FBYyxFQUFFLElBQUksZ0JBQWdCLENBQUM7Z0JBQ25ELElBQUksRUFBRSxJQUFJLGtCQUFrQixDQUFDLG9CQUFvQixDQUFDLElBQUksRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDO2dCQUM1RSxJQUFJLEVBQUUsSUFBSSxrQkFBa0IsQ0FBQyxJQUFJLEVBQUUsVUFBVSxDQUFDLFFBQVEsQ0FBQztnQkFDdkQsYUFBYSxFQUFFLElBQUksZ0JBQWdCLENBQUM7b0JBQ2xDLElBQUksZ0JBQWdCLENBQUM7d0JBQ25CLGFBQWEsRUFBRSxJQUFJLGtCQUFrQixDQUFDLElBQUksYUFBYSxFQUFFLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxRQUFRLENBQUM7d0JBQ3BGLE1BQU0sRUFBRSxJQUFJLGtCQUFrQixDQUFDLElBQUksRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDO3dCQUN6RCxjQUFjLEVBQUUsSUFBSSxrQkFBa0IsQ0FBQyxJQUFJLEVBQUUsVUFBVSxDQUFDLFFBQVEsQ0FBQztxQkFDbEUsQ0FBQztpQkFDSCxDQUFDO2FBQ0gsQ0FBQyxDQUFDLENBQUE7WUFFSCxJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxJQUFJLGdCQUFnQixDQUFDO2dCQUM3QyxJQUFJLGdCQUFnQixDQUFDO29CQUNuQixhQUFhLEVBQUUsSUFBSSxrQkFBa0IsQ0FBQyxJQUFJLGFBQWEsRUFBRSxDQUFDLElBQUksQ0FBQztvQkFDL0QsV0FBVyxFQUFFLElBQUksa0JBQWtCLENBQUMsSUFBSSxFQUFFLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7aUJBQ3BGLENBQUM7YUFDSCxDQUFDLENBQUMsQ0FBQTtTQUNKO1FBRUQsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO0lBQ3RCLENBQUM7SUFFRCxZQUFZO1FBQ1YsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQyxFQUFFO1lBQ2pDLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO1NBQzFCO0lBQ0gsQ0FBQztJQUVEOztPQUVHO0lBQ0gsSUFBSSxpQkFBaUI7UUFDbkIsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUUsRUFBRTtZQUNwQixPQUFPLElBQUksQ0FBQztTQUNiO1FBRUQsT0FBUSxJQUFJLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQXNCLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBcUIsQ0FBQztJQUN2RyxDQUFDO0lBRUQ7O09BRUc7SUFDSCxJQUFJLGFBQWE7UUFDZixJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsRUFBRSxFQUFFO1lBQ3BCLE9BQU8sSUFBSSxDQUFDO1NBQ2I7UUFFRCxPQUFRLElBQUksQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFzQixDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQXFCLENBQUM7SUFDNUUsQ0FBQztJQUVPLGlCQUFpQjtRQUN2QixJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDLFlBQVksQ0FBQyxTQUFTLENBQUMsQ0FBQyxJQUFZLEVBQUUsRUFBRTtZQUN2RCxJQUFJLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDdEQsQ0FBQyxDQUFDLENBQUE7SUFDSixDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBYnN0cmFjdEZvcm0gfSBmcm9tICcuLi9hYnN0cmFjdC5mb3JtJztcbmltcG9ydCB7IFNvbGVCdXNpbmVzcywgRmluYW5jaWFsWWVhciB9IGZyb20gJy4uLy4uL21vZGVscyc7XG5pbXBvcnQgeyBwbGFpblRvQ2xhc3MgfSBmcm9tICdjbGFzcy10cmFuc2Zvcm1lcic7XG5pbXBvcnQgeyBVbnR5cGVkRm9ybUFycmF5LCBVbnR5cGVkRm9ybUNvbnRyb2wsIFVudHlwZWRGb3JtR3JvdXAsIFZhbGlkYXRvcnMsIEZvcm1Db250cm9sIH0gZnJvbSAnQGFuZ3VsYXIvZm9ybXMnO1xuaW1wb3J0IHsgSW5jb21lU291cmNlVHlwZUVudW0gfSBmcm9tICcuLi8uLi9kYi9FbnVtcy9pbmNvbWUtc291cmNlJztcbmltcG9ydCB7IElFdmVudExpc3RlbmVyIH0gZnJvbSAnLi4vLi4vaW50ZXJmYWNlcyc7XG5cbmV4cG9ydCBjbGFzcyBTb2xlQnVzaW5lc3NGb3JtIGV4dGVuZHMgQWJzdHJhY3RGb3JtPFNvbGVCdXNpbmVzcz4gaW1wbGVtZW50cyBJRXZlbnRMaXN0ZW5lciB7XG4gIGNvbnN0cnVjdG9yKFxuICAgIHByaXZhdGUgYnVzaW5lc3M6IFNvbGVCdXNpbmVzcyA9IHBsYWluVG9DbGFzcyhTb2xlQnVzaW5lc3MsIHt9KVxuICApIHtcbiAgICBzdXBlcih7XG4gICAgICBuYW1lOiBuZXcgVW50eXBlZEZvcm1Db250cm9sKGJ1c2luZXNzLm5hbWUsIFZhbGlkYXRvcnMucmVxdWlyZWQpLFxuICAgICAgYWN0aXZpdHk6IG5ldyBVbnR5cGVkRm9ybUNvbnRyb2woYnVzaW5lc3MuYWN0aXZpdHksIFZhbGlkYXRvcnMucmVxdWlyZWQpLFxuICAgICAgZGVzY3JpcHRpb246IG5ldyBVbnR5cGVkRm9ybUNvbnRyb2woYnVzaW5lc3MuZGVzY3JpcHRpb24pLFxuICAgICAgd2Vic2l0ZTogbmV3IFVudHlwZWRGb3JtQ29udHJvbChidXNpbmVzcy53ZWJzaXRlKSxcbiAgICAgIGlzUHJpbWFyeVByb2R1Y3Rpb246IG5ldyBGb3JtQ29udHJvbChidXNpbmVzcy5pc1ByaW1hcnlQcm9kdWN0aW9uKSxcbiAgICB9LCBidXNpbmVzcyk7XG5cbiAgICAvLyBVc2VyIGhhdmUgdG8gY3JlYXRlIGluY29tZSBzb3VyY2Ugd2l0aCBuZXcgYnVzaW5lc3MuXG4gICAgLy8gSW5jb21lIHNvdXJjZSBpcyBub3QgYWJsZSBmb3IgZWRpdCBidXNpbmVzc1xuICAgIGlmICghYnVzaW5lc3MuaWQpIHtcbiAgICAgIC8vIEBUT0RPIEFsZXggKFRULTIzMDQpOiBtb3ZlIHRvIHNlcGFyYXRlZCBmb3JtIGNsYXNzXG4gICAgICB0aGlzLmFkZENvbnRyb2woJ2luY29tZVNvdXJjZScsIG5ldyBVbnR5cGVkRm9ybUdyb3VwKHtcbiAgICAgICAgdHlwZTogbmV3IFVudHlwZWRGb3JtQ29udHJvbChJbmNvbWVTb3VyY2VUeXBlRW51bS5TT0xFLCBWYWxpZGF0b3JzLnJlcXVpcmVkKSxcbiAgICAgICAgbmFtZTogbmV3IFVudHlwZWRGb3JtQ29udHJvbChudWxsLCBWYWxpZGF0b3JzLnJlcXVpcmVkKSxcbiAgICAgICAgc29sZUZvcmVjYXN0czogbmV3IFVudHlwZWRGb3JtQXJyYXkoW1xuICAgICAgICAgIG5ldyBVbnR5cGVkRm9ybUdyb3VwKHtcbiAgICAgICAgICAgIGZpbmFuY2lhbFllYXI6IG5ldyBVbnR5cGVkRm9ybUNvbnRyb2wobmV3IEZpbmFuY2lhbFllYXIoKS55ZWFyLCBWYWxpZGF0b3JzLnJlcXVpcmVkKSxcbiAgICAgICAgICAgIGFtb3VudDogbmV3IFVudHlwZWRGb3JtQ29udHJvbChudWxsLCBWYWxpZGF0b3JzLnJlcXVpcmVkKSxcbiAgICAgICAgICAgIHRheEluc3RhbG1lbnRzOiBuZXcgVW50eXBlZEZvcm1Db250cm9sKG51bGwsIFZhbGlkYXRvcnMucmVxdWlyZWQpXG4gICAgICAgICAgfSlcbiAgICAgICAgXSlcbiAgICAgIH0pKVxuXG4gICAgICB0aGlzLmFkZENvbnRyb2woJ2xvc3NlcycsIG5ldyBVbnR5cGVkRm9ybUFycmF5KFtcbiAgICAgICAgbmV3IFVudHlwZWRGb3JtR3JvdXAoe1xuICAgICAgICAgIGZpbmFuY2lhbFllYXI6IG5ldyBVbnR5cGVkRm9ybUNvbnRyb2wobmV3IEZpbmFuY2lhbFllYXIoKS55ZWFyKSxcbiAgICAgICAgICBvcGVuQmFsYW5jZTogbmV3IFVudHlwZWRGb3JtQ29udHJvbChudWxsLCBbVmFsaWRhdG9ycy5yZXF1aXJlZCwgVmFsaWRhdG9ycy5taW4oMCldKVxuICAgICAgICB9KVxuICAgICAgXSkpXG4gICAgfVxuXG4gICAgdGhpcy5saXN0ZW5FdmVudHMoKTtcbiAgfVxuXG4gIGxpc3RlbkV2ZW50cygpOiB2b2lkIHtcbiAgICBpZiAodGhpcy5jb250YWlucygnaW5jb21lU291cmNlJykpIHtcbiAgICAgIHRoaXMubGlzdGVuTmFtZUNoYW5nZXMoKTtcbiAgICB9XG4gIH1cblxuICAvKipcbiAgICogV2UgdGFrZSB0aGUgZmlyc3QgZm9yZWNhc3QgYmVjYXVzZSBpbmNvbWUgc291cmNlcyBhdmFpbGFibGUgb25seSBmb3IgbmV3IGJ1c2luZXNzLCBzbyB3ZSBoYXZlIG9ubHkgb25lIGZvcmVjYXN0XG4gICAqL1xuICBnZXQgZm9yZWNhc3RGb3JtR3JvdXAoKTogVW50eXBlZEZvcm1Hcm91cCB7XG4gICAgaWYgKHRoaXMuYnVzaW5lc3MuaWQpIHtcbiAgICAgIHJldHVybiBudWxsO1xuICAgIH1cblxuICAgIHJldHVybiAodGhpcy5nZXQoJ2luY29tZVNvdXJjZScpLmdldCgnc29sZUZvcmVjYXN0cycpIGFzIFVudHlwZWRGb3JtQXJyYXkpLmF0KDApIGFzIFVudHlwZWRGb3JtR3JvdXA7XG4gIH1cblxuICAvKipcbiAgICogV2UgdGFrZSB0aGUgZmlyc3QgbG9zcyBiZWNhdXNlIGxvc3NlcyBhdmFpbGFibGUgb25seSBmb3IgbmV3IGJ1c2luZXNzLCBzbyB3ZSBoYXZlIG9ubHkgb25lIGxvc3NcbiAgICovXG4gIGdldCBsb3NzRm9ybUdyb3VwKCk6IFVudHlwZWRGb3JtR3JvdXAge1xuICAgIGlmICh0aGlzLmJ1c2luZXNzLmlkKSB7XG4gICAgICByZXR1cm4gbnVsbDtcbiAgICB9XG5cbiAgICByZXR1cm4gKHRoaXMuZ2V0KCdsb3NzZXMnKSBhcyBVbnR5cGVkRm9ybUFycmF5KS5hdCgwKSBhcyBVbnR5cGVkRm9ybUdyb3VwO1xuICB9XG5cbiAgcHJpdmF0ZSBsaXN0ZW5OYW1lQ2hhbmdlcygpOiB2b2lkIHtcbiAgICB0aGlzLmdldCgnbmFtZScpLnZhbHVlQ2hhbmdlcy5zdWJzY3JpYmUoKG5hbWU6IHN0cmluZykgPT4ge1xuICAgICAgdGhpcy5nZXQoJ2luY29tZVNvdXJjZScpLmdldCgnbmFtZScpLnNldFZhbHVlKG5hbWUpO1xuICAgIH0pXG4gIH1cbn1cbiJdfQ==
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import { __decorate } from "tslib";
|
|
2
2
|
import { SoleBusiness as SoleBusinessBase } from '../../db/Models/sole/sole-business';
|
|
3
|
-
import { User } from '../user
|
|
3
|
+
import { User } from '../user';
|
|
4
4
|
import { SoleBusinessAllocation } from './sole-business-allocation';
|
|
5
5
|
import { SoleBusinessLoss } from './sole-business-loss';
|
|
6
6
|
import { SoleInvoice } from './sole-invoice';
|
|
7
7
|
import { SoleInvoiceTemplate } from './sole-invoice-template';
|
|
8
|
-
import { Type } from 'class-transformer';
|
|
8
|
+
import { Type, Transform } from 'class-transformer';
|
|
9
9
|
import { VehicleClaim } from '../vehicle';
|
|
10
|
-
import { Depreciation } from '../depreciation
|
|
11
|
-
import { Transaction } from '../transaction
|
|
12
|
-
import { SoleBusinessActivity } from '../../db/Models
|
|
13
|
-
import { IncomeSource } from '../income-source
|
|
10
|
+
import { Depreciation } from '../depreciation';
|
|
11
|
+
import { Transaction } from '../transaction';
|
|
12
|
+
import { SoleBusinessActivity } from '../../db/Models';
|
|
13
|
+
import { IncomeSource } from '../income-source';
|
|
14
14
|
export class SoleBusiness extends SoleBusinessBase {
|
|
15
15
|
getPhotoPlaceholder() {
|
|
16
16
|
return `${this.name[0]}${this.name[1]}`;
|
|
@@ -53,4 +53,7 @@ __decorate([
|
|
|
53
53
|
__decorate([
|
|
54
54
|
Type(() => IncomeSource)
|
|
55
55
|
], SoleBusiness.prototype, "incomeSource", void 0);
|
|
56
|
-
|
|
56
|
+
__decorate([
|
|
57
|
+
Transform(({ value }) => value || false)
|
|
58
|
+
], SoleBusiness.prototype, "isPrimaryProduction", void 0);
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29sZS1idXNpbmVzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9tb2RlbHMvc29sZS9zb2xlLWJ1c2luZXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxPQUFPLEVBQUUsWUFBWSxJQUFJLGdCQUFnQixFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFDdEYsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUMvQixPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUNwRSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN4RCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDN0MsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDOUQsT0FBTyxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNwRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQzFDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUMvQyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFN0MsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDdkQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRWhELE1BQU0sT0FBTyxZQUFhLFNBQVEsZ0JBQWdCO0lBdUNoRCxtQkFBbUI7UUFDakIsT0FBTyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO0lBQzFDLENBQUM7SUFFRCxRQUFRO1FBQ04sT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDO0lBQ25CLENBQUM7O0FBNUNEOztHQUVHO0FBQ0ksNEJBQWUsR0FBRyxDQUFDLENBQUM7QUFHM0I7SUFEQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDOzBDQUNOO0FBR1g7SUFEQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsc0JBQXNCLENBQUM7aURBQ0c7QUFHdEM7SUFEQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsZ0JBQWdCLENBQUM7NENBQ0Y7QUFHM0I7SUFEQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsV0FBVyxDQUFDOzhDQUNBO0FBR3hCO0lBREMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLG1CQUFtQixDQUFDO3NEQUNRO0FBR3hDO0lBREMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLFlBQVksQ0FBQzttREFDSztBQUc5QjtJQURDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxXQUFXLENBQUM7a0RBQ0k7QUFHNUI7SUFEQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsWUFBWSxDQUFDO21EQUNLO0FBRzlCO0lBREMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLG9CQUFvQixDQUFDOzhDQUNGO0FBRy9CO0lBREMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLFlBQVksQ0FBQztrREFDRTtBQUczQjtJQURDLFNBQVMsQ0FBQyxDQUFDLEVBQUMsS0FBSyxFQUFDLEVBQUUsRUFBRSxDQUFDLEtBQUssSUFBSSxLQUFLLENBQUM7eURBQ1YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBTb2xlQnVzaW5lc3MgYXMgU29sZUJ1c2luZXNzQmFzZSB9IGZyb20gJy4uLy4uL2RiL01vZGVscy9zb2xlL3NvbGUtYnVzaW5lc3MnO1xuaW1wb3J0IHsgVXNlciB9IGZyb20gJy4uL3VzZXInO1xuaW1wb3J0IHsgU29sZUJ1c2luZXNzQWxsb2NhdGlvbiB9IGZyb20gJy4vc29sZS1idXNpbmVzcy1hbGxvY2F0aW9uJztcbmltcG9ydCB7IFNvbGVCdXNpbmVzc0xvc3MgfSBmcm9tICcuL3NvbGUtYnVzaW5lc3MtbG9zcyc7XG5pbXBvcnQgeyBTb2xlSW52b2ljZSB9IGZyb20gJy4vc29sZS1pbnZvaWNlJztcbmltcG9ydCB7IFNvbGVJbnZvaWNlVGVtcGxhdGUgfSBmcm9tICcuL3NvbGUtaW52b2ljZS10ZW1wbGF0ZSc7XG5pbXBvcnQgeyBUeXBlLCBUcmFuc2Zvcm0gfSBmcm9tICdjbGFzcy10cmFuc2Zvcm1lcic7XG5pbXBvcnQgeyBWZWhpY2xlQ2xhaW0gfSBmcm9tICcuLi92ZWhpY2xlJztcbmltcG9ydCB7IERlcHJlY2lhdGlvbiB9IGZyb20gJy4uL2RlcHJlY2lhdGlvbic7XG5pbXBvcnQgeyBUcmFuc2FjdGlvbiB9IGZyb20gJy4uL3RyYW5zYWN0aW9uJztcbmltcG9ydCB7IFBob3RvYWJsZSB9IGZyb20gJy4uLy4uL2ludGVyZmFjZXMnO1xuaW1wb3J0IHsgU29sZUJ1c2luZXNzQWN0aXZpdHkgfSBmcm9tICcuLi8uLi9kYi9Nb2RlbHMnO1xuaW1wb3J0IHsgSW5jb21lU291cmNlIH0gZnJvbSAnLi4vaW5jb21lLXNvdXJjZSc7XG5cbmV4cG9ydCBjbGFzcyBTb2xlQnVzaW5lc3MgZXh0ZW5kcyBTb2xlQnVzaW5lc3NCYXNlIGltcGxlbWVudHMgUGhvdG9hYmxlIHtcbiAgLyoqXG4gICAqIE1heGltdW0gbnVtYmVyIG9mIGJ1c2luZXNzZXMgdGhhdCBhIHBlcnNvbiBjYW4gaGF2ZSwgYWNjb3JkaW5nIHRvIHRoZSBBVE9cbiAgICovXG4gIHN0YXRpYyBidXNpbmVzc2VzTGltaXQgPSA2O1xuXG4gIEBUeXBlKCgpID0+IFVzZXIpXG4gIHVzZXI6IFVzZXI7XG5cbiAgQFR5cGUoKCkgPT4gU29sZUJ1c2luZXNzQWxsb2NhdGlvbilcbiAgYWxsb2NhdGlvbnM6IFNvbGVCdXNpbmVzc0FsbG9jYXRpb25bXTtcblxuICBAVHlwZSgoKSA9PiBTb2xlQnVzaW5lc3NMb3NzKVxuICBsb3NzZXM6IFNvbGVCdXNpbmVzc0xvc3NbXTtcblxuICBAVHlwZSgoKSA9PiBTb2xlSW52b2ljZSlcbiAgaW52b2ljZXM6IFNvbGVJbnZvaWNlW107XG5cbiAgQFR5cGUoKCkgPT4gU29sZUludm9pY2VUZW1wbGF0ZSlcbiAgaW52b2ljZVRlbXBsYXRlczogU29sZUludm9pY2VUZW1wbGF0ZVtdO1xuXG4gIEBUeXBlKCgpID0+IFZlaGljbGVDbGFpbSlcbiAgdmVoaWNsZUNsYWltczogVmVoaWNsZUNsYWltW107XG5cbiAgQFR5cGUoKCkgPT4gVHJhbnNhY3Rpb24pXG4gIHRyYW5zYWN0aW9uczogVHJhbnNhY3Rpb25bXTtcblxuICBAVHlwZSgoKSA9PiBEZXByZWNpYXRpb24pXG4gIGRlcHJlY2lhdGlvbnM6IERlcHJlY2lhdGlvbltdO1xuXG4gIEBUeXBlKCgpID0+IFNvbGVCdXNpbmVzc0FjdGl2aXR5KVxuICBhY3Rpdml0eTogU29sZUJ1c2luZXNzQWN0aXZpdHk7XG5cbiAgQFR5cGUoKCkgPT4gSW5jb21lU291cmNlKVxuICBpbmNvbWVTb3VyY2U6IEluY29tZVNvdXJjZTtcblxuICBAVHJhbnNmb3JtKCh7dmFsdWV9KSA9PiB2YWx1ZSB8fCBmYWxzZSlcbiAgaXNQcmltYXJ5UHJvZHVjdGlvbjogYm9vbGVhbjtcblxuICBnZXRQaG90b1BsYWNlaG9sZGVyKCk6IHN0cmluZyB7XG4gICAgcmV0dXJuIGAke3RoaXMubmFtZVswXX0ke3RoaXMubmFtZVsxXX1gO1xuICB9XG5cbiAgZ2V0UGhvdG8oKTogc3RyaW5nIHtcbiAgICByZXR1cm4gdGhpcy5sb2dvO1xuICB9XG59XG4iXX0=
|
|
@@ -21,7 +21,7 @@ import moment from 'moment';
|
|
|
21
21
|
import { DateRange } from 'moment-range';
|
|
22
22
|
import intersection from 'lodash/intersection';
|
|
23
23
|
import range from 'lodash/range';
|
|
24
|
-
import { Validators, UntypedFormGroup, UntypedFormControl, UntypedFormArray, FormArray, FormGroup
|
|
24
|
+
import { Validators, UntypedFormGroup, UntypedFormControl, UntypedFormArray, FormControl, FormArray, FormGroup } from '@angular/forms';
|
|
25
25
|
import compact from 'lodash/compact';
|
|
26
26
|
import concat from 'lodash/concat';
|
|
27
27
|
import cloneDeep$1 from 'lodash/cloneDeep';
|
|
@@ -4678,46 +4678,6 @@ class DepreciationReceipt extends DepreciationReceipt$1 {
|
|
|
4678
4678
|
}
|
|
4679
4679
|
}
|
|
4680
4680
|
|
|
4681
|
-
class SoleBusinessAllocation extends SoleBusinessAllocation$1 {
|
|
4682
|
-
}
|
|
4683
|
-
__decorate([
|
|
4684
|
-
Type(() => BankAccount)
|
|
4685
|
-
], SoleBusinessAllocation.prototype, "bankAccount", void 0);
|
|
4686
|
-
__decorate([
|
|
4687
|
-
Type(() => SoleBusiness)
|
|
4688
|
-
], SoleBusinessAllocation.prototype, "business", void 0);
|
|
4689
|
-
__decorate([
|
|
4690
|
-
Transform(({ value }) => value || 100),
|
|
4691
|
-
Expose()
|
|
4692
|
-
], SoleBusinessAllocation.prototype, "percent", void 0);
|
|
4693
|
-
|
|
4694
|
-
class SoleBusinessLossOffsetRule extends SoleBusinessLossOffsetRule$1 {
|
|
4695
|
-
}
|
|
4696
|
-
__decorate([
|
|
4697
|
-
Type(() => SoleBusinessLossOffsetRule)
|
|
4698
|
-
], SoleBusinessLossOffsetRule.prototype, "parent", void 0);
|
|
4699
|
-
|
|
4700
|
-
/**
|
|
4701
|
-
* If a sole trader business makes a tax loss in a current year, you can generally carry forward that loss and offset profit in future years.
|
|
4702
|
-
* https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4641357930/Rules+when+a+business+makes+a+loss+Tax+Summary#Offsetting-current-year-business-losses
|
|
4703
|
-
*/
|
|
4704
|
-
class SoleBusinessLoss extends SoleBusinessLoss$1 {
|
|
4705
|
-
constructor() {
|
|
4706
|
-
super(...arguments);
|
|
4707
|
-
this.openBalance = 0;
|
|
4708
|
-
this.financialYear = new FinancialYear().year;
|
|
4709
|
-
}
|
|
4710
|
-
get hasOffset() {
|
|
4711
|
-
return !!this.offsetRule;
|
|
4712
|
-
}
|
|
4713
|
-
}
|
|
4714
|
-
__decorate([
|
|
4715
|
-
Type(() => SoleBusiness)
|
|
4716
|
-
], SoleBusinessLoss.prototype, "business", void 0);
|
|
4717
|
-
__decorate([
|
|
4718
|
-
Type(() => SoleBusinessLossOffsetRule)
|
|
4719
|
-
], SoleBusinessLoss.prototype, "offsetRule", void 0);
|
|
4720
|
-
|
|
4721
4681
|
var MyAccountHistoryInitiatedByEnum;
|
|
4722
4682
|
(function (MyAccountHistoryInitiatedByEnum) {
|
|
4723
4683
|
MyAccountHistoryInitiatedByEnum[MyAccountHistoryInitiatedByEnum["OWNER"] = 0] = "OWNER";
|
|
@@ -4767,6 +4727,46 @@ const USER_ROLES = {
|
|
|
4767
4727
|
class UserToRegister {
|
|
4768
4728
|
}
|
|
4769
4729
|
|
|
4730
|
+
class SoleBusinessAllocation extends SoleBusinessAllocation$1 {
|
|
4731
|
+
}
|
|
4732
|
+
__decorate([
|
|
4733
|
+
Type(() => BankAccount)
|
|
4734
|
+
], SoleBusinessAllocation.prototype, "bankAccount", void 0);
|
|
4735
|
+
__decorate([
|
|
4736
|
+
Type(() => SoleBusiness)
|
|
4737
|
+
], SoleBusinessAllocation.prototype, "business", void 0);
|
|
4738
|
+
__decorate([
|
|
4739
|
+
Transform(({ value }) => value || 100),
|
|
4740
|
+
Expose()
|
|
4741
|
+
], SoleBusinessAllocation.prototype, "percent", void 0);
|
|
4742
|
+
|
|
4743
|
+
class SoleBusinessLossOffsetRule extends SoleBusinessLossOffsetRule$1 {
|
|
4744
|
+
}
|
|
4745
|
+
__decorate([
|
|
4746
|
+
Type(() => SoleBusinessLossOffsetRule)
|
|
4747
|
+
], SoleBusinessLossOffsetRule.prototype, "parent", void 0);
|
|
4748
|
+
|
|
4749
|
+
/**
|
|
4750
|
+
* If a sole trader business makes a tax loss in a current year, you can generally carry forward that loss and offset profit in future years.
|
|
4751
|
+
* https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4641357930/Rules+when+a+business+makes+a+loss+Tax+Summary#Offsetting-current-year-business-losses
|
|
4752
|
+
*/
|
|
4753
|
+
class SoleBusinessLoss extends SoleBusinessLoss$1 {
|
|
4754
|
+
constructor() {
|
|
4755
|
+
super(...arguments);
|
|
4756
|
+
this.openBalance = 0;
|
|
4757
|
+
this.financialYear = new FinancialYear().year;
|
|
4758
|
+
}
|
|
4759
|
+
get hasOffset() {
|
|
4760
|
+
return !!this.offsetRule;
|
|
4761
|
+
}
|
|
4762
|
+
}
|
|
4763
|
+
__decorate([
|
|
4764
|
+
Type(() => SoleBusiness)
|
|
4765
|
+
], SoleBusinessLoss.prototype, "business", void 0);
|
|
4766
|
+
__decorate([
|
|
4767
|
+
Type(() => SoleBusinessLossOffsetRule)
|
|
4768
|
+
], SoleBusinessLoss.prototype, "offsetRule", void 0);
|
|
4769
|
+
|
|
4770
4770
|
class SoleInvoiceItem extends SoleInvoiceItem$1 {
|
|
4771
4771
|
constructor() {
|
|
4772
4772
|
super(...arguments);
|
|
@@ -5177,6 +5177,9 @@ __decorate([
|
|
|
5177
5177
|
__decorate([
|
|
5178
5178
|
Type(() => IncomeSource)
|
|
5179
5179
|
], SoleBusiness.prototype, "incomeSource", void 0);
|
|
5180
|
+
__decorate([
|
|
5181
|
+
Transform(({ value }) => value || false)
|
|
5182
|
+
], SoleBusiness.prototype, "isPrimaryProduction", void 0);
|
|
5180
5183
|
|
|
5181
5184
|
class SoleBusinessActivity extends SoleBusinessActivity$1 {
|
|
5182
5185
|
}
|
|
@@ -18593,7 +18596,8 @@ class SoleBusinessForm extends AbstractForm {
|
|
|
18593
18596
|
name: new UntypedFormControl(business.name, Validators.required),
|
|
18594
18597
|
activity: new UntypedFormControl(business.activity, Validators.required),
|
|
18595
18598
|
description: new UntypedFormControl(business.description),
|
|
18596
|
-
website: new UntypedFormControl(business.website)
|
|
18599
|
+
website: new UntypedFormControl(business.website),
|
|
18600
|
+
isPrimaryProduction: new FormControl(business.isPrimaryProduction),
|
|
18597
18601
|
}, business);
|
|
18598
18602
|
this.business = business;
|
|
18599
18603
|
// User have to create income source with new business.
|