taxtank-core 0.29.9 → 0.29.12-1
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 +38 -32
- package/bundles/taxtank-core.umd.js.map +1 -1
- package/esm2015/lib/collections/report/property/property-report-item-depreciation.collection.js +2 -2
- package/esm2015/lib/db/Models/transaction/transaction-base.js +2 -2
- package/esm2015/lib/forms/depreciation/depreciation.form.js +5 -2
- package/esm2015/lib/forms/phone/phone.form.js +9 -7
- package/esm2015/lib/forms/sole/sole-contact.form.js +2 -4
- package/esm2015/lib/forms/transaction/transaction-base.form.js +3 -5
- package/esm2015/lib/models/property/property-document.js +2 -2
- package/esm2015/lib/services/report/property/property-transaction-report.service.js +3 -1
- package/fesm2015/taxtank-core.js +34 -29
- package/fesm2015/taxtank-core.js.map +1 -1
- package/lib/forms/depreciation/depreciation.form.d.ts +2 -1
- package/package.json +1 -1
package/esm2015/lib/collections/report/property/property-report-item-depreciation.collection.js
CHANGED
|
@@ -12,11 +12,11 @@ export class PropertyReportItemDepreciationCollection extends PropertyReportItem
|
|
|
12
12
|
setItems(depreciations, properties, chartAccounts) {
|
|
13
13
|
this.items = [];
|
|
14
14
|
properties.items.forEach((property) => {
|
|
15
|
-
const depreciationsByType = new CollectionDictionary(depreciations, 'type');
|
|
15
|
+
const depreciationsByType = new CollectionDictionary(depreciations.filterBy('property.id', property.id), 'type');
|
|
16
16
|
depreciationsByType.keys.map((type) => {
|
|
17
17
|
this.items.push(new PropertyReportItemDepreciation(depreciationsByType.get(type), property, chartAccounts.findBy('id', depreciationsByType.get(type).first.chartAccounts.id)));
|
|
18
18
|
});
|
|
19
19
|
});
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcGVydHktcmVwb3J0LWl0ZW0tZGVwcmVjaWF0aW9uLmNvbGxlY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvY29sbGVjdGlvbnMvcmVwb3J0L3Byb3BlcnR5L3Byb3BlcnR5LXJlcG9ydC1pdGVtLWRlcHJlY2lhdGlvbi5jb2xsZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ25FLE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLG1FQUFtRSxDQUFDO0FBQ25ILE9BQU8sRUFBRSw0QkFBNEIsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBR2pGOztHQUVHO0FBQ0gsTUFBTSxPQUFPLHdDQUF5QyxTQUFRLDRCQUE0QjtJQUN4RixZQUNFLGFBQXFDLEVBQ3JDLFVBQThCLEVBQzlCLGFBQXdDO1FBRXhDLEtBQUssRUFBRSxDQUFDO1FBQ1IsSUFBSSxDQUFDLFFBQVEsQ0FBQyxhQUFhLEVBQUUsVUFBVSxFQUFFLGFBQWEsQ0FBQyxDQUFBO0lBQ3pELENBQUM7SUFFTyxRQUFRLENBQUMsYUFBcUMsRUFBRSxVQUE4QixFQUFFLGFBQXdDO1FBQzlILElBQUksQ0FBQyxLQUFLLEdBQUcsRUFBRSxDQUFDO1FBRWhCLFVBQVUsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsUUFBa0IsRUFBRSxFQUFFO1lBQzlDLE1BQU0sbUJBQW1CLEdBQWlELElBQUksb0JBQW9CLENBQ2hHLGFBQWEsQ0FBQyxRQUFRLENBQUMsYUFBYSxFQUFFLFFBQVEsQ0FBQyxFQUFFLENBQUMsRUFDbEQsTUFBTSxDQUNQLENBQUM7WUFFRixtQkFBbUIsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBWSxFQUFFLEVBQUU7Z0JBQzVDLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksOEJBQThCLENBQ2hELG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFDN0IsUUFBUSxFQUNSLGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLEVBQUUsQ0FBQyxDQUNqRixDQUFDLENBQUM7WUFDTCxDQUFDLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29sbGVjdGlvbiB9IGZyb20gJy4uLy4uL2NvbGxlY3Rpb24nO1xuaW1wb3J0IHsgUHJvcGVydHkgfSBmcm9tICcuLi8uLi8uLi9tb2RlbHMvcHJvcGVydHkvcHJvcGVydHknO1xuaW1wb3J0IHsgQ2hhcnRBY2NvdW50cyB9IGZyb20gJy4uLy4uLy4uL21vZGVscy9jaGFydC1hY2NvdW50cy9jaGFydC1hY2NvdW50cyc7XG5pbXBvcnQgeyBEZXByZWNpYXRpb25Db2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vZGVwcmVjaWF0aW9uLmNvbGxlY3Rpb24nO1xuaW1wb3J0IHsgQ29sbGVjdGlvbkRpY3Rpb25hcnkgfSBmcm9tICcuLi8uLi9jb2xsZWN0aW9uLWRpY3Rpb25hcnknO1xuaW1wb3J0IHsgUHJvcGVydHlSZXBvcnRJdGVtRGVwcmVjaWF0aW9uIH0gZnJvbSAnLi4vLi4vLi4vbW9kZWxzL3JlcG9ydC9wcm9wZXJ0eS9wcm9wZXJ0eS1yZXBvcnQtaXRlbS1kZXByZWNpYXRpb24nO1xuaW1wb3J0IHsgUHJvcGVydHlSZXBvcnRJdGVtQ29sbGVjdGlvbiB9IGZyb20gJy4vcHJvcGVydHktcmVwb3J0LWl0ZW0uY29sbGVjdGlvbic7XG5pbXBvcnQge1Byb3BlcnR5Q29sbGVjdGlvbn0gZnJvbSAnLi4vLi4vcHJvcGVydHkvcHJvcGVydHkuY29sbGVjdGlvbic7XG5cbi8qKlxuICogQ29sbGVjdGlvbiB0byB3b3JrIHdpdGggZGVwcmVjaWF0aW9uLWJhc2VkIHByb3BlcnR5IHJlcG9ydCBpdGVtc1xuICovXG5leHBvcnQgY2xhc3MgUHJvcGVydHlSZXBvcnRJdGVtRGVwcmVjaWF0aW9uQ29sbGVjdGlvbiBleHRlbmRzIFByb3BlcnR5UmVwb3J0SXRlbUNvbGxlY3Rpb24ge1xuICBjb25zdHJ1Y3RvcihcbiAgICBkZXByZWNpYXRpb25zOiBEZXByZWNpYXRpb25Db2xsZWN0aW9uLFxuICAgIHByb3BlcnRpZXM6IFByb3BlcnR5Q29sbGVjdGlvbixcbiAgICBjaGFydEFjY291bnRzOiBDb2xsZWN0aW9uPENoYXJ0QWNjb3VudHM+XG4gICkge1xuICAgIHN1cGVyKCk7XG4gICAgdGhpcy5zZXRJdGVtcyhkZXByZWNpYXRpb25zLCBwcm9wZXJ0aWVzLCBjaGFydEFjY291bnRzKVxuICB9XG5cbiAgcHJpdmF0ZSBzZXRJdGVtcyhkZXByZWNpYXRpb25zOiBEZXByZWNpYXRpb25Db2xsZWN0aW9uLCBwcm9wZXJ0aWVzOiBQcm9wZXJ0eUNvbGxlY3Rpb24sIGNoYXJ0QWNjb3VudHM6IENvbGxlY3Rpb248Q2hhcnRBY2NvdW50cz4pOiB2b2lkIHtcbiAgICB0aGlzLml0ZW1zID0gW107XG5cbiAgICBwcm9wZXJ0aWVzLml0ZW1zLmZvckVhY2goKHByb3BlcnR5OiBQcm9wZXJ0eSkgPT4ge1xuICAgICAgY29uc3QgZGVwcmVjaWF0aW9uc0J5VHlwZTogQ29sbGVjdGlvbkRpY3Rpb25hcnk8RGVwcmVjaWF0aW9uQ29sbGVjdGlvbj4gPSBuZXcgQ29sbGVjdGlvbkRpY3Rpb25hcnk8RGVwcmVjaWF0aW9uQ29sbGVjdGlvbj4oXG4gICAgICAgIGRlcHJlY2lhdGlvbnMuZmlsdGVyQnkoJ3Byb3BlcnR5LmlkJywgcHJvcGVydHkuaWQpLFxuICAgICAgICAndHlwZSdcbiAgICAgICk7XG5cbiAgICAgIGRlcHJlY2lhdGlvbnNCeVR5cGUua2V5cy5tYXAoKHR5cGU6IHN0cmluZykgPT4ge1xuICAgICAgICB0aGlzLml0ZW1zLnB1c2gobmV3IFByb3BlcnR5UmVwb3J0SXRlbURlcHJlY2lhdGlvbihcbiAgICAgICAgICBkZXByZWNpYXRpb25zQnlUeXBlLmdldCh0eXBlKSxcbiAgICAgICAgICBwcm9wZXJ0eSxcbiAgICAgICAgICBjaGFydEFjY291bnRzLmZpbmRCeSgnaWQnLCBkZXByZWNpYXRpb25zQnlUeXBlLmdldCh0eXBlKS5maXJzdC5jaGFydEFjY291bnRzLmlkKVxuICAgICAgICApKTtcbiAgICAgIH0pO1xuICAgIH0pO1xuICB9XG59XG4iXX0=
|
|
@@ -52,7 +52,7 @@ export class TransactionBase extends ObservableModel {
|
|
|
52
52
|
return !!this.business;
|
|
53
53
|
}
|
|
54
54
|
get amountWithGst() {
|
|
55
|
-
return this.isGST ? +(this.amount * ChartAccounts.GSTCoefficient).toFixed(2) : this.amount;
|
|
55
|
+
return this.isGST ? +(Math.round(this.amount * ChartAccounts.GSTCoefficient)).toFixed(2) : this.amount;
|
|
56
56
|
}
|
|
57
57
|
get gstAmount() {
|
|
58
58
|
return +(this.amountWithGst - this.amount).toFixed(2);
|
|
@@ -86,4 +86,4 @@ __decorate([
|
|
|
86
86
|
__decorate([
|
|
87
87
|
Exclude()
|
|
88
88
|
], TransactionBase.prototype, "gstClaimAmount", null);
|
|
89
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tYmFzZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9kYi9Nb2RlbHMvdHJhbnNhY3Rpb24vdHJhbnNhY3Rpb24tYmFzZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBRUEsT0FBTyxFQUFFLGFBQWEsRUFBRSx5QkFBeUIsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTNFLE9BQU8sRUFBRSxPQUFPLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzdELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFdEQsTUFBTSxPQUFPLGVBQWdCLFNBQVEsZUFBZTtJQTBCbEQsSUFBSSxVQUFVO1FBQ1osT0FBTyxJQUFJLENBQUMsWUFBWSxHQUFHLEdBQUcsQ0FBQztJQUNqQyxDQUFDO0lBRUQsSUFBSSxRQUFRO1FBQ1YsUUFBUSxJQUFJLEVBQUU7WUFDWixLQUFLLElBQUksQ0FBQyxjQUFjLEVBQUU7Z0JBQ3hCLE9BQU8sWUFBWSxDQUFDLFFBQVEsQ0FBQztZQUMvQixLQUFLLElBQUksQ0FBQyxVQUFVLEVBQUU7Z0JBQ3BCLE9BQU8sWUFBWSxDQUFDLElBQUksQ0FBQztZQUMzQixLQUFLLElBQUksQ0FBQyxVQUFVLEVBQUU7Z0JBQ3BCLE9BQU8sWUFBWSxDQUFDLElBQUksQ0FBQztZQUMzQjtnQkFDRSxPQUFPLFlBQVksQ0FBQyxLQUFLLENBQUM7U0FDN0I7SUFDSCxDQUFDO0lBRUQ7O09BRUc7SUFDSCxjQUFjO1FBQ1osZ0RBQWdEO1FBQ2hELElBQUksSUFBSSxDQUFDLGFBQWEsRUFBRTtZQUN0QixPQUFPLHlCQUF5QixDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsQ0FBQztTQUNqRjtRQUVELE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUM7SUFDekIsQ0FBQztJQUVEOztPQUVHO0lBQ0gsVUFBVTs7UUFDUixnREFBZ0Q7UUFDaEQsSUFBSSxJQUFJLENBQUMsYUFBYSxFQUFFO1lBQ3RCLE9BQU8seUJBQXlCLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFBLElBQUksQ0FBQyxhQUFhLDBDQUFFLFFBQVEsQ0FBQyxDQUFDO1NBQzlFO1FBRUQsT0FBTyxDQUFDLElBQUksQ0FBQyxjQUFjLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztJQUN0RCxDQUFDO0lBRUQ7O09BRUc7SUFDSCxVQUFVOztRQUNSLGdEQUFnRDtRQUNoRCxJQUFJLElBQUksQ0FBQyxhQUFhLEVBQUU7WUFDdEIsT0FBTyx5QkFBeUIsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQUEsSUFBSSxDQUFDLGFBQWEsMENBQUUsUUFBUSxDQUFDLENBQUM7U0FDOUU7UUFFRCxPQUFPLENBQUMsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDO0lBQ3pCLENBQUM7SUFHRCxJQUFJLGFBQWE7UUFDZixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxNQUFNLEdBQUcsYUFBYSxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDO0lBQ3pHLENBQUM7SUFHRCxJQUFJLFNBQVM7UUFDWCxPQUFPLENBQUMsQ0FBQyxJQUFJLENBQUMsYUFBYSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDeEQsQ0FBQztJQUdELElBQUksY0FBYztRQUNoQixPQUFPLElBQUksQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDLFVBQVUsQ0FBQztJQUMxQyxDQUFDO0lBRUQ7O09BRUc7SUFDSCxJQUFJLFdBQVc7UUFDYixPQUFPLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQztJQUN0QyxDQUFDO0lBRUQsSUFBSSxnQkFBZ0I7UUFDbEIsT0FBTyxJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUM7SUFDNUMsQ0FBQztDQUNGO0FBakZDO0lBTEMsT0FBTyxDQUFDLEVBQUMsV0FBVyxFQUFFLElBQUksRUFBQyxDQUFDO0lBQzVCLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxNQUFNLENBQUM7SUFDbEIsU0FBUyxDQUFDLENBQUMsRUFBQyxHQUFHLEVBQUMsRUFBRSxFQUFFO1FBQ25CLE9BQU8sR0FBRyxDQUFDLElBQUksQ0FBQztJQUNsQixDQUFDLENBQUM7NkNBQ1M7QUF5RFg7SUFEQyxPQUFPLEVBQUU7b0RBR1Q7QUFHRDtJQURDLE9BQU8sRUFBRTtnREFHVDtBQUdEO0lBREMsT0FBTyxFQUFFO3FEQUdUIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgUHJvcGVydHkgfSBmcm9tICcuLi9wcm9wZXJ0eS9wcm9wZXJ0eSc7XG5pbXBvcnQgeyBDaGFydEFjY291bnRzIGFzIENoYXJ0QWNjb3VudHNCYXNlIH0gZnJvbSAnLi4vY2hhcnQtYWNjb3VudHMvY2hhcnQtYWNjb3VudHMnO1xuaW1wb3J0IHsgQ2hhcnRBY2NvdW50cywgQ0hBUlRfQUNDT1VOVFNfQ0FURUdPUklFUyB9IGZyb20gJy4uLy4uLy4uL21vZGVscyc7XG5pbXBvcnQgeyBTb2xlQnVzaW5lc3MgfSBmcm9tICcuLi9zb2xlL3NvbGUtYnVzaW5lc3MnO1xuaW1wb3J0IHsgRXhjbHVkZSwgVHJhbnNmb3JtLCBUeXBlIH0gZnJvbSAnY2xhc3MtdHJhbnNmb3JtZXInO1xuaW1wb3J0IHsgVGFua1R5cGVFbnVtIH0gZnJvbSAnLi4vLi4vRW51bXMvdGFuay10eXBlLmVudW0nO1xuaW1wb3J0IHsgT2JzZXJ2YWJsZU1vZGVsIH0gZnJvbSAnLi4vb2JzZXJ2YWJsZS1tb2RlbCc7XG5cbmV4cG9ydCBjbGFzcyBUcmFuc2FjdGlvbkJhc2UgZXh0ZW5kcyBPYnNlcnZhYmxlTW9kZWwge1xuICBpZD86IG51bWJlcjtcbiAgYW1vdW50PzogbnVtYmVyO1xuICBwcm9wZXJ0eT86IFByb3BlcnR5O1xuICBidXNpbmVzcz86IFNvbGVCdXNpbmVzcztcbiAgZGF0ZT86IERhdGU7XG4gIGNoYXJ0QWNjb3VudHM/OiBDaGFydEFjY291bnRzQmFzZTtcbiAgZGVzY3JpcHRpb24/OiBzdHJpbmc7XG5cbiAgLyoqXG4gICAqIGdzdCBhcHBsaWVzIHRvIHNvbGUgdHJhZGVyIGV4cGVuc2UvaW5jb21lLCBpZiBoZSBpcyByZWdpc3RlcmVkIGFuZCBjaGFydEFjY291bnRzIGlzIGVsaWdpYmxlXG4gICAqL1xuICBpc0dTVD86IGJvb2xlYW47XG5cbiAgLyoqXG4gICAqIGNvdWxkIGJlIEZpbGUgd2hlbiBqdXN0IGFkZGVkIG5ldyBpbWFnZVxuICAgKiBAVE9ETyBBbGV4IHBsYWluVG9DbGFzcyBkb2Vzbid0IHdvcmsgd2l0aCBGaWxlIHdpdGhvdXQgdGhpcyBoYWNrIGh0dHBzOi8vZ2l0aHViLmNvbS90eXBlc3RhY2svY2xhc3MtdHJhbnNmb3JtZXIvaXNzdWVzLzExNzhcbiAgICovXG4gIEBFeGNsdWRlKHt0b1BsYWluT25seTogdHJ1ZX0pXG4gIEBUeXBlKCgpID0+IE9iamVjdClcbiAgQFRyYW5zZm9ybSgoe29ian0pID0+IHtcbiAgICByZXR1cm4gb2JqLmZpbGU7XG4gIH0pXG4gIGZpbGU6IEZpbGU7XG4gIGNsYWltUGVyY2VudD86IG51bWJlcjtcblxuICBnZXQgY2xhaW1SYXRpbygpOiBudW1iZXIge1xuICAgIHJldHVybiB0aGlzLmNsYWltUGVyY2VudCAvIDEwMDtcbiAgfVxuXG4gIGdldCB0YW5rVHlwZSgpOiBUYW5rVHlwZUVudW0ge1xuICAgIHN3aXRjaCAodHJ1ZSkge1xuICAgICAgY2FzZSB0aGlzLmlzUHJvcGVydHlUYW5rKCk6XG4gICAgICAgIHJldHVybiBUYW5rVHlwZUVudW0uUFJPUEVSVFk7XG4gICAgICBjYXNlIHRoaXMuaXNXb3JrVGFuaygpOlxuICAgICAgICByZXR1cm4gVGFua1R5cGVFbnVtLldPUks7XG4gICAgICBjYXNlIHRoaXMuaXNTb2xlVGFuaygpOlxuICAgICAgICByZXR1cm4gVGFua1R5cGVFbnVtLlNPTEU7XG4gICAgICBkZWZhdWx0OlxuICAgICAgICByZXR1cm4gVGFua1R5cGVFbnVtLk9USEVSO1xuICAgIH1cbiAgfVxuXG4gIC8qKlxuICAgKiBDaGVjayBpZiBjdXJyZW50IHRhbmsgaXMgUHJvcGVydHlcbiAgICovXG4gIGlzUHJvcGVydHlUYW5rKCk6IGJvb2xlYW4ge1xuICAgIC8vIGNoYXJ0IGFjY291bnRzIG1heSBiZSBlbXB0eSBmb3IgbmV3IGluc3RhbmNlc1xuICAgIGlmICh0aGlzLmNoYXJ0QWNjb3VudHMpIHtcbiAgICAgIHJldHVybiBDSEFSVF9BQ0NPVU5UU19DQVRFR09SSUVTLnByb3BlcnR5LmluY2x1ZGVzKHRoaXMuY2hhcnRBY2NvdW50cy5jYXRlZ29yeSk7XG4gICAgfVxuXG4gICAgcmV0dXJuICEhdGhpcy5wcm9wZXJ0eTtcbiAgfVxuXG4gIC8qKlxuICAgKiBDaGVjayBpZiBjdXJyZW50IHRhbmsgaXMgV29ya1xuICAgKi9cbiAgaXNXb3JrVGFuaygpOiBib29sZWFuIHtcbiAgICAvLyBjaGFydCBhY2NvdW50cyBtYXkgYmUgZW1wdHkgZm9yIG5ldyBpbnN0YW5jZXNcbiAgICBpZiAodGhpcy5jaGFydEFjY291bnRzKSB7XG4gICAgICByZXR1cm4gQ0hBUlRfQUNDT1VOVFNfQ0FURUdPUklFUy53b3JrLmluY2x1ZGVzKHRoaXMuY2hhcnRBY2NvdW50cz8uY2F0ZWdvcnkpO1xuICAgIH1cblxuICAgIHJldHVybiAhdGhpcy5pc1Byb3BlcnR5VGFuaygpICYmICF0aGlzLmlzU29sZVRhbmsoKTtcbiAgfVxuXG4gIC8qKlxuICAgKiBDaGVjayBpZiBjdXJyZW50IHRhbmsgaXMgU29sZVxuICAgKi9cbiAgaXNTb2xlVGFuaygpOiBib29sZWFuIHtcbiAgICAvLyBjaGFydCBhY2NvdW50cyBtYXkgYmUgZW1wdHkgZm9yIG5ldyBpbnN0YW5jZXNcbiAgICBpZiAodGhpcy5jaGFydEFjY291bnRzKSB7XG4gICAgICByZXR1cm4gQ0hBUlRfQUNDT1VOVFNfQ0FURUdPUklFUy5zb2xlLmluY2x1ZGVzKHRoaXMuY2hhcnRBY2NvdW50cz8uY2F0ZWdvcnkpO1xuICAgIH1cblxuICAgIHJldHVybiAhIXRoaXMuYnVzaW5lc3M7XG4gIH1cblxuICBARXhjbHVkZSgpXG4gIGdldCBhbW91bnRXaXRoR3N0KCk6IG51bWJlciB7XG4gICAgcmV0dXJuIHRoaXMuaXNHU1QgPyArKE1hdGgucm91bmQodGhpcy5hbW91bnQgKiBDaGFydEFjY291bnRzLkdTVENvZWZmaWNpZW50KSkudG9GaXhlZCgyKSA6IHRoaXMuYW1vdW50O1xuICB9XG5cbiAgQEV4Y2x1ZGUoKVxuICBnZXQgZ3N0QW1vdW50KCk6IG51bWJlciB7XG4gICAgcmV0dXJuICsodGhpcy5hbW91bnRXaXRoR3N0IC0gdGhpcy5hbW91bnQpLnRvRml4ZWQoMik7XG4gIH1cblxuICBARXhjbHVkZSgpXG4gIGdldCBnc3RDbGFpbUFtb3VudCgpOiBudW1iZXIge1xuICAgIHJldHVybiB0aGlzLmdzdEFtb3VudCAqIHRoaXMuY2xhaW1SYXRpbztcbiAgfVxuXG4gIC8qKlxuICAgKiBiYXNlIGdyb3NzQW1vdW50LCBleHRlbmRzIGluIGNoaWxkIGNsYXNzZXNcbiAgICovXG4gIGdldCBncm9zc0Ftb3VudCgpOiBudW1iZXIge1xuICAgIHJldHVybiB0aGlzLmFtb3VudCArIHRoaXMuZ3N0QW1vdW50O1xuICB9XG5cbiAgZ2V0IGdyb3NzQ2xhaW1BbW91bnQoKTogbnVtYmVyIHtcbiAgICByZXR1cm4gdGhpcy5ncm9zc0Ftb3VudCAqIHRoaXMuY2xhaW1SYXRpbztcbiAgfVxufVxuIl19
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { FormControl, Validators } from '@angular/forms';
|
|
2
2
|
import { TransactionBaseForm } from '../transaction';
|
|
3
|
-
import { FinancialYear } from '../../models
|
|
3
|
+
import { FinancialYear } from '../../models';
|
|
4
4
|
export class DepreciationForm extends TransactionBaseForm {
|
|
5
5
|
constructor(depreciation, registeredForGst) {
|
|
6
6
|
super(depreciation, registeredForGst);
|
|
@@ -31,5 +31,8 @@ export class DepreciationForm extends TransactionBaseForm {
|
|
|
31
31
|
}
|
|
32
32
|
});
|
|
33
33
|
}
|
|
34
|
+
submit(data = {}, includeDisabledFields = false) {
|
|
35
|
+
return super.submit(data, true);
|
|
36
|
+
}
|
|
34
37
|
}
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwcmVjaWF0aW9uLmZvcm0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvZm9ybXMvZGVwcmVjaWF0aW9uL2RlcHJlY2lhdGlvbi5mb3JtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsVUFBVSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDekQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDckQsT0FBTyxFQUFFLGFBQWEsRUFBZ0IsTUFBTSxjQUFjLENBQUM7QUFFM0QsTUFBTSxPQUFPLGdCQUFpQixTQUFRLG1CQUFpQztJQUNyRSxZQUFZLFlBQTBCLEVBQUUsZ0JBQXlCO1FBQy9ELEtBQUssQ0FBQyxZQUFZLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQztRQUV0QyxJQUFJLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsbUJBQW1CLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDakYsSUFBSSxDQUFDLFVBQVUsQ0FBQyx1QkFBdUIsRUFBRSxJQUFJLFdBQVcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO1FBQ2hFLElBQUksQ0FBQyxVQUFVLENBQUMsY0FBYyxFQUFFLElBQUksV0FBVyxDQUM3QyxFQUFFLEtBQUssRUFBRSxZQUFZLENBQUMsWUFBWSxJQUFJLENBQUMsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLEVBQ3pELFVBQVUsQ0FBQyxRQUFRLENBQ3BCLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxVQUFVLENBQUMsZUFBZSxFQUFFLElBQUksV0FBVyxDQUFDLFlBQVksQ0FBQyxhQUFhLElBQUksSUFBSSxhQUFhLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO1FBRTFHLHlFQUF5RTtRQUN6RSxJQUFJLFlBQVksQ0FBQyxFQUFFLEVBQUU7WUFDbkIsSUFBSSxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQyxPQUFPLENBQUMsRUFBQyxTQUFTLEVBQUUsS0FBSyxFQUFDLENBQUMsQ0FBQztZQUN0RCxJQUFJLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxFQUFDLFNBQVMsRUFBRSxLQUFLLEVBQUMsQ0FBQyxDQUFDO1NBQ3REO1FBRUQsMkJBQTJCO1FBQzNCLHFHQUFxRztRQUNyRyxJQUFJLFlBQVksQ0FBQywwQkFBMEIsRUFBRTtZQUMzQyxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsMEJBQTBCLENBQUMsYUFBYSxDQUFDLENBQUM7WUFDakYsSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztTQUM1QjthQUFNO1lBQ0wsSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDO1NBQzlDO1FBRUQsSUFBSSxDQUFDLEdBQUcsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDLFlBQVksQ0FBQyxTQUFTLENBQUMsQ0FBQyxVQUFtQixFQUFFLEVBQUU7WUFDL0UsSUFBSSxVQUFVLEVBQUU7Z0JBQ2QsSUFBSSxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQzthQUNwQztpQkFBTTtnQkFDTCxJQUFJLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDO2FBQ25DO1FBQ0gsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsTUFBTSxDQUFDLE9BQWUsRUFBRSxFQUFFLHdCQUFpQyxLQUFLO1FBQzlELE9BQU8sS0FBSyxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDbEMsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgRm9ybUNvbnRyb2wsIFZhbGlkYXRvcnMgfSBmcm9tICdAYW5ndWxhci9mb3Jtcyc7XG5pbXBvcnQgeyBUcmFuc2FjdGlvbkJhc2VGb3JtIH0gZnJvbSAnLi4vdHJhbnNhY3Rpb24nO1xuaW1wb3J0IHsgRmluYW5jaWFsWWVhciwgRGVwcmVjaWF0aW9uIH0gZnJvbSAnLi4vLi4vbW9kZWxzJztcblxuZXhwb3J0IGNsYXNzIERlcHJlY2lhdGlvbkZvcm0gZXh0ZW5kcyBUcmFuc2FjdGlvbkJhc2VGb3JtPERlcHJlY2lhdGlvbj4ge1xuICBjb25zdHJ1Y3RvcihkZXByZWNpYXRpb246IERlcHJlY2lhdGlvbiwgcmVnaXN0ZXJlZEZvckdzdDogYm9vbGVhbikge1xuICAgIHN1cGVyKGRlcHJlY2lhdGlvbiwgcmVnaXN0ZXJlZEZvckdzdCk7XG5cbiAgICB0aGlzLmdldCgnY2xhaW1QZXJjZW50Jykuc2V0VmFsdWUoZGVwcmVjaWF0aW9uLmN1cnJlbnRZZWFyRm9yZWNhc3QuY2xhaW1QZXJjZW50KTtcbiAgICB0aGlzLmFkZENvbnRyb2woJ2lzQ2xvc2VCYWxhbmNlQ29ycmVjdCcsIG5ldyBGb3JtQ29udHJvbCh0cnVlKSk7XG4gICAgdGhpcy5hZGRDb250cm9sKCdjbG9zZUJhbGFuY2UnLCBuZXcgRm9ybUNvbnRyb2woXG4gICAgICB7IHZhbHVlOiBkZXByZWNpYXRpb24uY2xvc2VCYWxhbmNlIHx8IDAsIGRpc2FibGVkOiB0cnVlIH0sXG4gICAgICBWYWxpZGF0b3JzLnJlcXVpcmVkXG4gICAgKSk7XG5cbiAgICB0aGlzLmFkZENvbnRyb2woJ2ZpbmFuY2lhbFllYXInLCBuZXcgRm9ybUNvbnRyb2woZGVwcmVjaWF0aW9uLmZpbmFuY2lhbFllYXIgfHwgbmV3IEZpbmFuY2lhbFllYXIoKS55ZWFyKSk7XG5cbiAgICAvLyBmb3JiaWQgdG8gY2hhbmdlIGNoYXJ0QWNjb3VudHMvY2xhaW1QZXJjZW50IGZvciBleGlzdGluZyBkZXByZWNpYXRpb25zXG4gICAgaWYgKGRlcHJlY2lhdGlvbi5pZCkge1xuICAgICAgdGhpcy5nZXQoJ2NoYXJ0QWNjb3VudHMnKS5kaXNhYmxlKHtlbWl0RXZlbnQ6IGZhbHNlfSk7XG4gICAgICB0aGlzLmdldCgnY2xhaW1QZXJjZW50JykuZGlzYWJsZSh7ZW1pdEV2ZW50OiBmYWxzZX0pO1xuICAgIH1cblxuICAgIC8vIEBUT0RPIHNob3VsZCBiZSB3YXRjaGVkP1xuICAgIC8vIGlmIGRlcHJlY2lhdGlvbiBoYXMgJ2RlcHJlY2lhdGlvbkNhcGl0YWxQcm9qZWN0JyB2YWx1ZSAtIHNldCB2YWx1ZSBhbmQgZGlzYWJsZSAnZGF0ZScgZm9ybSBjb250cm9sXG4gICAgaWYgKGRlcHJlY2lhdGlvbi5kZXByZWNpYXRpb25DYXBpdGFsUHJvamVjdCkge1xuICAgICAgdGhpcy5nZXQoJ2RhdGUnKS5zZXRWYWx1ZShkZXByZWNpYXRpb24uZGVwcmVjaWF0aW9uQ2FwaXRhbFByb2plY3QuZWZmZWN0aXZlRGF0ZSk7XG4gICAgICB0aGlzLmdldCgnZGF0ZScpLmRpc2FibGUoKTtcbiAgICB9IGVsc2Uge1xuICAgICAgdGhpcy5nZXQoJ2RhdGUnKS5zZXRWYWx1ZShkZXByZWNpYXRpb24uZGF0ZSk7XG4gICAgfVxuXG4gICAgdGhpcy5nZXQoJ2lzQ2xvc2VCYWxhbmNlQ29ycmVjdCcpLnZhbHVlQ2hhbmdlcy5zdWJzY3JpYmUoKGlzU2VsZWN0ZWQ6IGJvb2xlYW4pID0+IHtcbiAgICAgIGlmIChpc1NlbGVjdGVkKSB7XG4gICAgICAgIHRoaXMuZ2V0KCdjbG9zZUJhbGFuY2UnKS5kaXNhYmxlKCk7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICB0aGlzLmdldCgnY2xvc2VCYWxhbmNlJykuZW5hYmxlKCk7XG4gICAgICB9XG4gICAgfSk7XG4gIH1cblxuICBzdWJtaXQoZGF0YTogb2JqZWN0ID0ge30sIGluY2x1ZGVEaXNhYmxlZEZpZWxkczogYm9vbGVhbiA9IGZhbHNlKTogRGVwcmVjaWF0aW9uIHtcbiAgICByZXR1cm4gc3VwZXIuc3VibWl0KGRhdGEsIHRydWUpO1xuICB9XG59XG4iXX0=
|
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
import { AbstractForm } from '../abstract.form';
|
|
2
|
-
import { Phone } from '../../models/phone/phone';
|
|
3
|
-
import { plainToClass } from 'class-transformer';
|
|
4
2
|
import { FormControl, Validators } from '@angular/forms';
|
|
5
3
|
import { phoneNumberValidator } from '../../validators/phone-number.validator';
|
|
4
|
+
import { PhoneTypeEnum } from '../../db/Enums/phone-type.enum';
|
|
5
|
+
import { Country } from '../../models';
|
|
6
6
|
export class PhoneForm extends AbstractForm {
|
|
7
|
-
constructor(
|
|
7
|
+
constructor(
|
|
8
|
+
// no default value because this form is always built-in, so phone passed from parent form
|
|
9
|
+
phone) {
|
|
8
10
|
super({
|
|
9
|
-
type: new FormControl(phone.type, Validators.required),
|
|
10
|
-
country: new FormControl(phone.country, Validators.required),
|
|
11
|
-
number: new FormControl(phone.number, [Validators.required, phoneNumberValidator()])
|
|
11
|
+
type: new FormControl((phone === null || phone === void 0 ? void 0 : phone.type) || PhoneTypeEnum.MOBILE, Validators.required),
|
|
12
|
+
country: new FormControl((phone === null || phone === void 0 ? void 0 : phone.country) || Country.australia, Validators.required),
|
|
13
|
+
number: new FormControl((phone === null || phone === void 0 ? void 0 : phone.number) || null, [Validators.required, phoneNumberValidator()])
|
|
12
14
|
}, phone);
|
|
13
15
|
}
|
|
14
16
|
}
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGhvbmUuZm9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9mb3Jtcy9waG9uZS9waG9uZS5mb3JtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVoRCxPQUFPLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQy9FLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUMvRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRXZDLE1BQU0sT0FBTyxTQUFVLFNBQVEsWUFBbUI7SUFDaEQ7SUFDRSwwRkFBMEY7SUFDMUYsS0FBYTtRQUViLEtBQUssQ0FBQztZQUNKLElBQUksRUFBRSxJQUFJLFdBQVcsQ0FBQyxDQUFBLEtBQUssYUFBTCxLQUFLLHVCQUFMLEtBQUssQ0FBRSxJQUFJLEtBQUksYUFBYSxDQUFDLE1BQU0sRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDO1lBQy9FLE9BQU8sRUFBRSxJQUFJLFdBQVcsQ0FBQyxDQUFBLEtBQUssYUFBTCxLQUFLLHVCQUFMLEtBQUssQ0FBRSxPQUFPLEtBQUksT0FBTyxDQUFDLFNBQVMsRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDO1lBQ2xGLE1BQU0sRUFBRSxJQUFJLFdBQVcsQ0FBQyxDQUFBLEtBQUssYUFBTCxLQUFLLHVCQUFMLEtBQUssQ0FBRSxNQUFNLEtBQUksSUFBSSxFQUFFLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxvQkFBb0IsRUFBRSxDQUFDLENBQUM7U0FDOUYsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUNaLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFic3RyYWN0Rm9ybSB9IGZyb20gJy4uL2Fic3RyYWN0LmZvcm0nO1xuaW1wb3J0IHsgUGhvbmUgfSBmcm9tICcuLi8uLi9tb2RlbHMvcGhvbmUvcGhvbmUnO1xuaW1wb3J0IHsgRm9ybUNvbnRyb2wsIFZhbGlkYXRvcnMgfSBmcm9tICdAYW5ndWxhci9mb3Jtcyc7XG5pbXBvcnQgeyBwaG9uZU51bWJlclZhbGlkYXRvciB9IGZyb20gJy4uLy4uL3ZhbGlkYXRvcnMvcGhvbmUtbnVtYmVyLnZhbGlkYXRvcic7XG5pbXBvcnQgeyBQaG9uZVR5cGVFbnVtIH0gZnJvbSAnLi4vLi4vZGIvRW51bXMvcGhvbmUtdHlwZS5lbnVtJztcbmltcG9ydCB7IENvdW50cnkgfSBmcm9tICcuLi8uLi9tb2RlbHMnO1xuXG5leHBvcnQgY2xhc3MgUGhvbmVGb3JtIGV4dGVuZHMgQWJzdHJhY3RGb3JtPFBob25lPiB7XG4gIGNvbnN0cnVjdG9yKFxuICAgIC8vIG5vIGRlZmF1bHQgdmFsdWUgYmVjYXVzZSB0aGlzIGZvcm0gaXMgYWx3YXlzIGJ1aWx0LWluLCBzbyBwaG9uZSBwYXNzZWQgZnJvbSBwYXJlbnQgZm9ybVxuICAgIHBob25lPzogUGhvbmVcbiAgKSB7XG4gICAgc3VwZXIoe1xuICAgICAgdHlwZTogbmV3IEZvcm1Db250cm9sKHBob25lPy50eXBlIHx8IFBob25lVHlwZUVudW0uTU9CSUxFLCBWYWxpZGF0b3JzLnJlcXVpcmVkKSxcbiAgICAgIGNvdW50cnk6IG5ldyBGb3JtQ29udHJvbChwaG9uZT8uY291bnRyeSB8fCBDb3VudHJ5LmF1c3RyYWxpYSwgVmFsaWRhdG9ycy5yZXF1aXJlZCksXG4gICAgICBudW1iZXI6IG5ldyBGb3JtQ29udHJvbChwaG9uZT8ubnVtYmVyIHx8IG51bGwsIFtWYWxpZGF0b3JzLnJlcXVpcmVkLCBwaG9uZU51bWJlclZhbGlkYXRvcigpXSlcbiAgICB9LCBwaG9uZSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -3,8 +3,6 @@ import { SoleContact } from '../../models';
|
|
|
3
3
|
import { plainToClass } from 'class-transformer';
|
|
4
4
|
import { FormControl, Validators } from '@angular/forms';
|
|
5
5
|
import { AddressForm } from '../address';
|
|
6
|
-
import { PhoneForm } from '../phone';
|
|
7
|
-
import { Phone } from '../../models/phone/phone';
|
|
8
6
|
import { Address } from '../../models/address/address';
|
|
9
7
|
export class SoleContactForm extends AbstractForm {
|
|
10
8
|
constructor(contact = plainToClass(SoleContact, {})) {
|
|
@@ -14,9 +12,9 @@ export class SoleContactForm extends AbstractForm {
|
|
|
14
12
|
firstName: new FormControl(contact.firstName, Validators.required),
|
|
15
13
|
lastName: new FormControl(contact.lastName, Validators.required),
|
|
16
14
|
email: new FormControl(contact.email, [Validators.required, Validators.email]),
|
|
17
|
-
phone: new
|
|
15
|
+
phone: new FormControl(contact.phone),
|
|
18
16
|
address: new AddressForm(contact.address || plainToClass(Address, {}))
|
|
19
17
|
}, contact);
|
|
20
18
|
}
|
|
21
19
|
}
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29sZS1jb250YWN0LmZvcm0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvZm9ybXMvc29sZS9zb2xlLWNvbnRhY3QuZm9ybS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDaEQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUMzQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDakQsT0FBTyxFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUN6RCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUV2RCxNQUFNLE9BQU8sZUFBZ0IsU0FBUSxZQUF5QjtJQUM1RCxZQUNFLFVBQXVCLFlBQVksQ0FBQyxXQUFXLEVBQUUsRUFBRSxDQUFDO1FBRXBELEtBQUssQ0FBQztZQUNKLElBQUksRUFBRSxJQUFJLFdBQVcsQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxRQUFRLENBQUM7WUFDeEQsR0FBRyxFQUFFLElBQUksV0FBVyxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxFQUFFLFVBQVUsQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztZQUN2RixTQUFTLEVBQUUsSUFBSSxXQUFXLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDO1lBQ2xFLFFBQVEsRUFBRSxJQUFJLFdBQVcsQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLFVBQVUsQ0FBQyxRQUFRLENBQUM7WUFDaEUsS0FBSyxFQUFFLElBQUksV0FBVyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQyxVQUFVLENBQUMsUUFBUSxFQUFFLFVBQVUsQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUM5RSxLQUFLLEVBQUUsSUFBSSxXQUFXLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQztZQUNyQyxPQUFPLEVBQUUsSUFBSSxXQUFXLENBQUMsT0FBTyxDQUFDLE9BQU8sSUFBSSxZQUFZLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1NBQ3ZFLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDZCxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBYnN0cmFjdEZvcm0gfSBmcm9tICcuLi9hYnN0cmFjdC5mb3JtJztcbmltcG9ydCB7IFNvbGVDb250YWN0IH0gZnJvbSAnLi4vLi4vbW9kZWxzJztcbmltcG9ydCB7IHBsYWluVG9DbGFzcyB9IGZyb20gJ2NsYXNzLXRyYW5zZm9ybWVyJztcbmltcG9ydCB7IEZvcm1Db250cm9sLCBWYWxpZGF0b3JzIH0gZnJvbSAnQGFuZ3VsYXIvZm9ybXMnO1xuaW1wb3J0IHsgQWRkcmVzc0Zvcm0gfSBmcm9tICcuLi9hZGRyZXNzJztcbmltcG9ydCB7IEFkZHJlc3MgfSBmcm9tICcuLi8uLi9tb2RlbHMvYWRkcmVzcy9hZGRyZXNzJztcblxuZXhwb3J0IGNsYXNzIFNvbGVDb250YWN0Rm9ybSBleHRlbmRzIEFic3RyYWN0Rm9ybTxTb2xlQ29udGFjdD4ge1xuICBjb25zdHJ1Y3RvcihcbiAgICBjb250YWN0OiBTb2xlQ29udGFjdCA9IHBsYWluVG9DbGFzcyhTb2xlQ29udGFjdCwge30pXG4gICkge1xuICAgIHN1cGVyKHtcbiAgICAgIG5hbWU6IG5ldyBGb3JtQ29udHJvbChjb250YWN0Lm5hbWUsIFZhbGlkYXRvcnMucmVxdWlyZWQpLFxuICAgICAgYWJuOiBuZXcgRm9ybUNvbnRyb2woY29udGFjdC5hYm4sIFtWYWxpZGF0b3JzLm1pbkxlbmd0aCgxMSksIFZhbGlkYXRvcnMubWF4TGVuZ3RoKDExKV0pLFxuICAgICAgZmlyc3ROYW1lOiBuZXcgRm9ybUNvbnRyb2woY29udGFjdC5maXJzdE5hbWUsIFZhbGlkYXRvcnMucmVxdWlyZWQpLFxuICAgICAgbGFzdE5hbWU6IG5ldyBGb3JtQ29udHJvbChjb250YWN0Lmxhc3ROYW1lLCBWYWxpZGF0b3JzLnJlcXVpcmVkKSxcbiAgICAgIGVtYWlsOiBuZXcgRm9ybUNvbnRyb2woY29udGFjdC5lbWFpbCwgW1ZhbGlkYXRvcnMucmVxdWlyZWQsIFZhbGlkYXRvcnMuZW1haWxdKSxcbiAgICAgIHBob25lOiBuZXcgRm9ybUNvbnRyb2woY29udGFjdC5waG9uZSksXG4gICAgICBhZGRyZXNzOiBuZXcgQWRkcmVzc0Zvcm0oY29udGFjdC5hZGRyZXNzIHx8IHBsYWluVG9DbGFzcyhBZGRyZXNzLCB7fSkpXG4gICAgfSwgY29udGFjdCk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -28,10 +28,8 @@ export class TransactionBaseForm extends AbstractForm {
|
|
|
28
28
|
}, controls), transaction);
|
|
29
29
|
this.registeredForGst = registeredForGst;
|
|
30
30
|
this.watchChartAccounts();
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
this.watchIsGst();
|
|
34
|
-
}
|
|
31
|
+
this.watchAmountWithGST();
|
|
32
|
+
this.watchIsGst();
|
|
35
33
|
}
|
|
36
34
|
watchIsGst() {
|
|
37
35
|
this.get('isGST').valueChanges.subscribe((isGST) => {
|
|
@@ -99,4 +97,4 @@ export class TransactionBaseForm extends AbstractForm {
|
|
|
99
97
|
this.get('claimPercent').setValue(claimPercent);
|
|
100
98
|
}
|
|
101
99
|
}
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"transaction-base.form.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/forms/transaction/transaction-base.form.ts"],"names":[],"mappings":"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","sourcesContent":["import {AbstractControl, FormControl, Validators} from '@angular/forms';\nimport { currentFinYearValidator, FileValidator, autocompleteValidator } from '../../validators';\nimport { AbstractForm } from '../abstract.form';\nimport { TransactionBase } from '../../db/Models/transaction/transaction-base';\nimport { ChartAccountsListEnum } from '../../db/Enums';\nimport { ChartAccounts, DOCUMENT_FILE_TYPES } from '../../models';\nimport { FormValidationsEnum } from '../form-validations.enum';\n\n/**\n * @TODO refactor, move specific fields like property in separated forms\n * @TODO remove useless getters\n */\nexport class TransactionBaseForm<Model extends TransactionBase> extends AbstractForm<Model> {\n  registeredForGst: boolean;\n\n  constructor(transaction: Model, registeredForGst: boolean, controls: {[key: string]: AbstractControl} = {}) {\n    super(\n      Object.assign({\n        chartAccounts: new FormControl(transaction.chartAccounts, [Validators.required, autocompleteValidator()]),\n        claimPercent: new FormControl(\n          {value: transaction.claimPercent, disabled: true},\n          [Validators.required, Validators.min(0), Validators.max(100)]\n        ),\n        amount: new FormControl(transaction.amount, Validators.required),\n        amountWithGST: new FormControl(transaction.amountWithGst, Validators.required),\n        isGST: new FormControl({ value: transaction.isGST, disabled: !transaction.chartAccounts?.isGST || !registeredForGst }),\n        gstAmount: new FormControl({ value: transaction.gstAmount, disabled: true }, Validators.required),\n        date: new FormControl(transaction.date, [Validators.required]),\n        description: new FormControl(transaction.description, Validators.maxLength(FormValidationsEnum.TEXT_MAX_LENGTH)),\n        // @TODO Alex: refactor (TT-1996)\n        file: new FormControl(transaction['receipt'], [\n          FileValidator.fileExtensions(DOCUMENT_FILE_TYPES.all), FileValidator.fileMaxSize(+FormValidationsEnum.FILE_MAX_SIZE)\n        ]),\n        property: new FormControl({value: transaction.property, disabled: transaction.chartAccounts}),\n      }, controls),\n      transaction\n    );\n\n    this.registeredForGst = registeredForGst;\n    this.watchChartAccounts();\n    if (this.isGstApplicable()) {\n      this.watchAmountWithGST();\n      this.watchIsGst();\n    }\n  }\n\n  private watchIsGst(): void {\n    this.get('isGST').valueChanges.subscribe((isGST: boolean) => {\n      this.updateAmount();\n      this.updateGstAmount();\n    });\n  }\n\n  private watchAmountWithGST(): void {\n    this.get('amountWithGST').valueChanges.subscribe(() => {\n      this.updateAmount();\n      this.updateGstAmount();\n    });\n  }\n\n  watchChartAccounts(): void {\n    this.get('chartAccounts').valueChanges.subscribe((chartAccounts: ChartAccounts) => {\n      // recalculate claim percent for selected chart accounts\n      this.updateClaimPercent(chartAccounts);\n      if (!this.isGstApplicable()) {\n        return;\n      }\n      // update gst if applicable\n      if (chartAccounts.isGST) {\n        this.get('isGST').enable();\n        this.get('isGST').patchValue(true);\n      } else {\n        this.get('isGST').patchValue(false);\n        this.get('isGST').disable();\n      }\n    });\n  }\n\n  private updateGstAmount(): void {\n    this.get('gstAmount').patchValue(\n      (this.amountWithGST - this.amount).toFixed(2)\n    );\n  }\n\n  private updateAmount(): void {\n    this.get('amount').patchValue(\n      this.isGST ? (this.amountWithGST / ChartAccounts.GSTCoefficient).toFixed(2) : this.amountWithGST\n    );\n  }\n\n  private isGstApplicable(): boolean {\n    return !!this.registeredForGst && !!this.model.business;\n  }\n\n  private get amount(): number {\n    return this.get('amount').value;\n  }\n\n  private get amountWithGST(): number {\n    return this.get('amountWithGST').value;\n  }\n\n  private get isGST(): number {\n    return this.get('isGST').value;\n  }\n\n  /**\n   * propertyClaimPercent for propertyExpense (except platform fees, which already include claimPercent),\n   * taxablePercent for others\n   * can be adjusted only for property/sole expenses\n   */\n  private updateClaimPercent(chartAccounts: ChartAccounts): void {\n    if (chartAccounts.isClaimPercentEditable()) {\n      this.get('claimPercent').enable();\n    }\n\n    // property claim (ownership% x shared%) for property expenses, taxable percent for others\n    let claimPercent = chartAccounts.taxablePercent;\n    if (chartAccounts.isPropertyExpense() && chartAccounts.id !== ChartAccountsListEnum.PLATFORM_FEES) {\n      claimPercent *= this.value.property?.claimCoefficient;\n    }\n    this.get('claimPercent').setValue(claimPercent);\n  }\n}\n"]}
|
|
100
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"transaction-base.form.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/forms/transaction/transaction-base.form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,WAAW,EAAE,UAAU,EAAC,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAA2B,aAAa,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACjG,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;;GAGG;AACH,MAAM,OAAO,mBAAmD,SAAQ,YAAmB;IAGzF,YAAY,WAAkB,EAAE,gBAAyB,EAAE,WAA6C,EAAE;;QACxG,KAAK,CACH,MAAM,CAAC,MAAM,CAAC;YACZ,aAAa,EAAE,IAAI,WAAW,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,qBAAqB,EAAE,CAAC,CAAC;YACzG,YAAY,EAAE,IAAI,WAAW,CAC3B,EAAC,KAAK,EAAE,WAAW,CAAC,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAC,EACjD,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAC9D;YACD,MAAM,EAAE,IAAI,WAAW,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC;YAChE,aAAa,EAAE,IAAI,WAAW,CAAC,WAAW,CAAC,aAAa,EAAE,UAAU,CAAC,QAAQ,CAAC;YAC9E,KAAK,EAAE,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAA,MAAA,WAAW,CAAC,aAAa,0CAAE,KAAK,CAAA,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtH,SAAS,EAAE,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,WAAW,CAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,UAAU,CAAC,QAAQ,CAAC;YACjG,IAAI,EAAE,IAAI,WAAW,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YAC9D,WAAW,EAAE,IAAI,WAAW,CAAC,WAAW,CAAC,WAAW,EAAE,UAAU,CAAC,SAAS,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC;YAChH,iCAAiC;YACjC,IAAI,EAAE,IAAI,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE;gBAC5C,aAAa,CAAC,cAAc,CAAC,mBAAmB,CAAC,GAAG,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC,mBAAmB,CAAC,aAAa,CAAC;aACrH,CAAC;YACF,QAAQ,EAAE,IAAI,WAAW,CAAC,EAAC,KAAK,EAAE,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,aAAa,EAAC,CAAC;SAC9F,EAAE,QAAQ,CAAC,EACZ,WAAW,CACZ,CAAC;QAEF,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,IAAI,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;IAEO,UAAU;QAChB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,KAAc,EAAE,EAAE;YAC1D,IAAI,CAAC,YAAY,EAAE,CAAC;YACpB,IAAI,CAAC,eAAe,EAAE,CAAC;QACzB,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,kBAAkB;QACxB,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,GAAG,EAAE;YACpD,IAAI,CAAC,YAAY,EAAE,CAAC;YACpB,IAAI,CAAC,eAAe,EAAE,CAAC;QACzB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB;QAChB,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,aAA4B,EAAE,EAAE;YAChF,wDAAwD;YACxD,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;YACvC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE;gBAC3B,OAAO;aACR;YACD,2BAA2B;YAC3B,IAAI,aAAa,CAAC,KAAK,EAAE;gBACvB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;gBAC3B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;aACpC;iBAAM;gBACL,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;gBACpC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;aAC7B;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,eAAe;QACrB,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,UAAU,CAC9B,CAAC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAC9C,CAAC;IACJ,CAAC;IAEO,YAAY;QAClB,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,UAAU,CAC3B,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CACjG,CAAC;IACJ,CAAC;IAEO,eAAe;QACrB,OAAO,CAAC,CAAC,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;IAC1D,CAAC;IAED,IAAY,MAAM;QAChB,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC;IAClC,CAAC;IAED,IAAY,aAAa;QACvB,OAAO,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC;IACzC,CAAC;IAED,IAAY,KAAK;QACf,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC;IACjC,CAAC;IAED;;;;OAIG;IACK,kBAAkB,CAAC,aAA4B;;QACrD,IAAI,aAAa,CAAC,sBAAsB,EAAE,EAAE;YAC1C,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,MAAM,EAAE,CAAC;SACnC;QAED,0FAA0F;QAC1F,IAAI,YAAY,GAAG,aAAa,CAAC,cAAc,CAAC;QAChD,IAAI,aAAa,CAAC,iBAAiB,EAAE,IAAI,aAAa,CAAC,EAAE,KAAK,qBAAqB,CAAC,aAAa,EAAE;YACjG,YAAY,IAAI,MAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,0CAAE,gBAAgB,CAAC;SACvD;QACD,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;CACF","sourcesContent":["import {AbstractControl, FormControl, Validators} from '@angular/forms';\nimport { currentFinYearValidator, FileValidator, autocompleteValidator } from '../../validators';\nimport { AbstractForm } from '../abstract.form';\nimport { TransactionBase } from '../../db/Models/transaction/transaction-base';\nimport { ChartAccountsListEnum } from '../../db/Enums';\nimport { ChartAccounts, DOCUMENT_FILE_TYPES } from '../../models';\nimport { FormValidationsEnum } from '../form-validations.enum';\n\n/**\n * @TODO refactor, move specific fields like property in separated forms\n * @TODO remove useless getters\n */\nexport class TransactionBaseForm<Model extends TransactionBase> extends AbstractForm<Model> {\n  registeredForGst: boolean;\n\n  constructor(transaction: Model, registeredForGst: boolean, controls: {[key: string]: AbstractControl} = {}) {\n    super(\n      Object.assign({\n        chartAccounts: new FormControl(transaction.chartAccounts, [Validators.required, autocompleteValidator()]),\n        claimPercent: new FormControl(\n          {value: transaction.claimPercent, disabled: true},\n          [Validators.required, Validators.min(0), Validators.max(100)]\n        ),\n        amount: new FormControl(transaction.amount, Validators.required),\n        amountWithGST: new FormControl(transaction.amountWithGst, Validators.required),\n        isGST: new FormControl({ value: transaction.isGST, disabled: !transaction.chartAccounts?.isGST || !registeredForGst }),\n        gstAmount: new FormControl({ value: transaction.gstAmount, disabled: true }, Validators.required),\n        date: new FormControl(transaction.date, [Validators.required]),\n        description: new FormControl(transaction.description, Validators.maxLength(FormValidationsEnum.TEXT_MAX_LENGTH)),\n        // @TODO Alex: refactor (TT-1996)\n        file: new FormControl(transaction['receipt'], [\n          FileValidator.fileExtensions(DOCUMENT_FILE_TYPES.all), FileValidator.fileMaxSize(+FormValidationsEnum.FILE_MAX_SIZE)\n        ]),\n        property: new FormControl({value: transaction.property, disabled: transaction.chartAccounts}),\n      }, controls),\n      transaction\n    );\n\n    this.registeredForGst = registeredForGst;\n    this.watchChartAccounts();\n    this.watchAmountWithGST();\n    this.watchIsGst();\n  }\n\n  private watchIsGst(): void {\n    this.get('isGST').valueChanges.subscribe((isGST: boolean) => {\n      this.updateAmount();\n      this.updateGstAmount();\n    });\n  }\n\n  private watchAmountWithGST(): void {\n    this.get('amountWithGST').valueChanges.subscribe(() => {\n      this.updateAmount();\n      this.updateGstAmount();\n    });\n  }\n\n  watchChartAccounts(): void {\n    this.get('chartAccounts').valueChanges.subscribe((chartAccounts: ChartAccounts) => {\n      // recalculate claim percent for selected chart accounts\n      this.updateClaimPercent(chartAccounts);\n      if (!this.isGstApplicable()) {\n        return;\n      }\n      // update gst if applicable\n      if (chartAccounts.isGST) {\n        this.get('isGST').enable();\n        this.get('isGST').patchValue(true);\n      } else {\n        this.get('isGST').patchValue(false);\n        this.get('isGST').disable();\n      }\n    });\n  }\n\n  private updateGstAmount(): void {\n    this.get('gstAmount').patchValue(\n      (this.amountWithGST - this.amount).toFixed(2)\n    );\n  }\n\n  private updateAmount(): void {\n    this.get('amount').patchValue(\n      this.isGST ? (this.amountWithGST / ChartAccounts.GSTCoefficient).toFixed(2) : this.amountWithGST\n    );\n  }\n\n  private isGstApplicable(): boolean {\n    return !!this.registeredForGst && !!this.model.business;\n  }\n\n  private get amount(): number {\n    return this.get('amount').value;\n  }\n\n  private get amountWithGST(): number {\n    return this.get('amountWithGST').value;\n  }\n\n  private get isGST(): number {\n    return this.get('isGST').value;\n  }\n\n  /**\n   * propertyClaimPercent for propertyExpense (except platform fees, which already include claimPercent),\n   * taxablePercent for others\n   * can be adjusted only for property/sole expenses\n   */\n  private updateClaimPercent(chartAccounts: ChartAccounts): void {\n    if (chartAccounts.isClaimPercentEditable()) {\n      this.get('claimPercent').enable();\n    }\n\n    // property claim (ownership% x shared%) for property expenses, taxable percent for others\n    let claimPercent = chartAccounts.taxablePercent;\n    if (chartAccounts.isPropertyExpense() && chartAccounts.id !== ChartAccountsListEnum.PLATFORM_FEES) {\n      claimPercent *= this.value.property?.claimCoefficient;\n    }\n    this.get('claimPercent').setValue(claimPercent);\n  }\n}\n"]}
|
|
@@ -4,7 +4,7 @@ import { AssetEntityTypeEnum } from '../../interfaces/asset-entity-type.enum';
|
|
|
4
4
|
export class PropertyDocument extends PropertyDocumentBase {
|
|
5
5
|
constructor() {
|
|
6
6
|
super(...arguments);
|
|
7
|
-
this.type = AssetTypeEnum.
|
|
7
|
+
this.type = AssetTypeEnum.PROPERTY;
|
|
8
8
|
this.entityType = AssetEntityTypeEnum.PROPERTIES;
|
|
9
9
|
}
|
|
10
10
|
getApiUrlPrefix() {
|
|
@@ -14,4 +14,4 @@ export class PropertyDocument extends PropertyDocumentBase {
|
|
|
14
14
|
return this.property;
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcGVydHktZG9jdW1lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvbW9kZWxzL3Byb3BlcnR5L3Byb3BlcnR5LWRvY3VtZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsSUFBSSxvQkFBb0IsRUFBRSxNQUFNLDRDQUE0QyxDQUFDO0FBR3RHLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUNqRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUk5RSxNQUFNLE9BQU8sZ0JBQWlCLFNBQVEsb0JBQW9CO0lBQTFEOztRQUNFLFNBQUksR0FBa0IsYUFBYSxDQUFDLFFBQVEsQ0FBQztRQUM3QyxlQUFVLEdBQXdCLG1CQUFtQixDQUFDLFVBQVUsQ0FBQztJQVVuRSxDQUFDO0lBUEMsZUFBZTtRQUNiLE9BQU8sRUFBRSxDQUFDO0lBQ1osQ0FBQztJQUVELFNBQVM7UUFDUCxPQUFPLElBQUksQ0FBQyxRQUFRLENBQUM7SUFDdkIsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgUHJvcGVydHlEb2N1bWVudCBhcyBQcm9wZXJ0eURvY3VtZW50QmFzZSB9IGZyb20gJy4uLy4uL2RiL01vZGVscy9kb2N1bWVudC9wcm9wZXJ0eS1kb2N1bWVudCc7XG5pbXBvcnQgeyBJQXNzZXQgfSBmcm9tICcuLi8uLi9pbnRlcmZhY2VzL2Fzc2V0LmludGVyZmFjZSc7XG5pbXBvcnQgeyBJRG9jdW1lbnQgfSBmcm9tICcuLi8uLi9pbnRlcmZhY2VzL2RvY3VtZW50LmludGVyZmFjZSc7XG5pbXBvcnQgeyBBc3NldFR5cGVFbnVtIH0gZnJvbSAnLi4vLi4vaW50ZXJmYWNlcy9hc3NldC10eXBlLmVudW0nO1xuaW1wb3J0IHsgQXNzZXRFbnRpdHlUeXBlRW51bSB9IGZyb20gJy4uLy4uL2ludGVyZmFjZXMvYXNzZXQtZW50aXR5LXR5cGUuZW51bSc7XG5pbXBvcnQgeyBEb2N1bWVudGFibGUgfSBmcm9tICcuLi8uLi9pbnRlcmZhY2VzL2RvY3VtZW50YWJsZS5pbnRlcmZhY2UnO1xuaW1wb3J0IHsgUHJvcGVydHkgfSBmcm9tICcuL3Byb3BlcnR5JztcblxuZXhwb3J0IGNsYXNzIFByb3BlcnR5RG9jdW1lbnQgZXh0ZW5kcyBQcm9wZXJ0eURvY3VtZW50QmFzZSBpbXBsZW1lbnRzIElBc3NldCwgSURvY3VtZW50IHtcbiAgdHlwZTogQXNzZXRUeXBlRW51bSA9IEFzc2V0VHlwZUVudW0uUFJPUEVSVFk7XG4gIGVudGl0eVR5cGU6IEFzc2V0RW50aXR5VHlwZUVudW0gPSBBc3NldEVudGl0eVR5cGVFbnVtLlBST1BFUlRJRVM7XG4gIHByb3BlcnR5OiBQcm9wZXJ0eTtcblxuICBnZXRBcGlVcmxQcmVmaXgoKTogc3RyaW5nIHtcbiAgICByZXR1cm4gJyc7XG4gIH1cblxuICBnZXRFbnRpdHkoKTogRG9jdW1lbnRhYmxlIHtcbiAgICByZXR1cm4gdGhpcy5wcm9wZXJ0eTtcbiAgfVxufVxuIl19
|
|
@@ -29,6 +29,8 @@ export class PropertyTransactionReportService {
|
|
|
29
29
|
this.getDepreciations(),
|
|
30
30
|
this.chartAccountsService.get()
|
|
31
31
|
]).pipe(map(([properties, transactions, depreciations, chartAccounts]) => {
|
|
32
|
+
const r = this.create(transactions, depreciations, properties, chartAccounts);
|
|
33
|
+
debugger;
|
|
32
34
|
return new CollectionDictionary(this.create(transactions, depreciations, properties, chartAccounts), 'propertyId');
|
|
33
35
|
}));
|
|
34
36
|
}
|
|
@@ -67,4 +69,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
|
|
|
67
69
|
providedIn: 'root'
|
|
68
70
|
}]
|
|
69
71
|
}], ctorParameters: function () { return [{ type: i1.PropertyService }, { type: i1.TransactionService }, { type: i1.DepreciationService }, { type: i1.ChartAccountsService }]; } });
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"property-transaction-report.service.js","sourceRoot":"","sources":["../../../../../../../projects/tt-core/src/lib/services/report/property/property-transaction-report.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,aAAa,EAAc,MAAM,MAAM,CAAC;AAEjD,OAAO,EAAe,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAEzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAErC,OAAO,EACL,uCAAuC,EACxC,MAAM,kFAAkF,CAAC;AAC1F,OAAO,EACL,wCAAwC,EACzC,MAAM,mFAAmF,CAAC;AAC3F,OAAO,EAAE,4BAA4B,EAAE,MAAM,sEAAsE,CAAC;;;AAGpH;;GAEG;AAIH,MAAM,OAAO,gCAAgC;IAM3C,YACU,eAAgC,EAChC,kBAAsC,EACtC,mBAAwC,EACxC,oBAA0C;QAH1C,oBAAe,GAAf,eAAe,CAAiB;QAChC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,yBAAoB,GAApB,oBAAoB,CAAsB;IAEpD,CAAC;IAED;;OAEG;IACH,GAAG;QACD,OAAO,aAAa,CAAC;YACnB,IAAI,CAAC,eAAe,CAAC,GAAG,EAAoC;YAC5D,IAAI,CAAC,eAAe,EAAuC;YAC3D,IAAI,CAAC,gBAAgB,EAAwC;YAC7D,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAyC;SACvE,CAAC,CAAC,IAAI,CACL,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,aAAa,CAAC,EAAE,EAAE;YAE/D,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CACnB,YAAY,EACZ,aAAa,EACb,UAAU,EACV,aAAa,CACd,CAAC;YAEF,QAAQ,CAAC;YACT,OAAO,IAAI,oBAAoB,CAC7B,IAAI,CAAC,MAAM,CACT,YAAY,EACZ,aAAa,EACb,UAAU,EACV,aAAa,CACd,EACD,YAAY,CACb,CAAC;QACJ,CAAC,CAAC,CACH,CAAA;IACH,CAAC;IAEO,MAAM,CACZ,YAAmC,EACnC,aAAqC,EACrC,UAA8B,EAC9B,aAAsC;QAEtC,OAAO,IAAI,4BAA4B,CAAC;YACtC,GAAG,IAAI,uCAAuC,CAAC,YAAY,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,KAAK;YAC7F,GAAG,IAAI,wCAAwC,CAAC,aAAa,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,KAAK;SAChG,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACK,eAAe;QACrB,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,IAAI,CACvC,GAAG,CAAC,CAAC,YAA2B,EAAE,EAAE;YAClC,OAAO,IAAI,qBAAqB,CAAC,YAAY,CAAC;iBAC3C,4BAA4B,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QACtE,CAAC,CAAC,CACH,CAAA;IACH,CAAC;IAED;;OAEG;IACK,gBAAgB;QACtB,OAAO,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAC,IAAI,CACxC,GAAG,CAAC,CAAC,aAAqC,EAAE,EAAE;YAC5C,OAAO,aAAa;iBACjB,4BAA4B,CAAC,yBAAyB,CAAC,QAAQ,CAAC;gBACjE,mDAAmD;iBAClD,2BAA2B,EAAE,CAAC;QACnC,CAAC,CAAC,CACH,CAAA;IACH,CAAC;;8HAnFU,gCAAgC;kIAAhC,gCAAgC,cAF/B,MAAM;4FAEP,gCAAgC;kBAH5C,UAAU;mBAAC;oBACV,UAAU,EAAE,MAAM;iBACnB","sourcesContent":["import { Injectable } from '@angular/core';\nimport { PropertyService, TransactionService, DepreciationService, ChartAccountsService,  } from '../../http';\nimport { combineLatest, Observable } from 'rxjs';\nimport { Property } from '../../../models/property/property';\nimport { Transaction, CHART_ACCOUNTS_CATEGORIES } from '../../../models';\nimport { DepreciationCollection } from '../../../collections/depreciation.collection';\nimport { CollectionDictionary } from '../../../collections/collection-dictionary';\nimport { TransactionCollection } from '../../../collections';\nimport { map } from 'rxjs/operators';\nimport { PropertyCollection } from '../../../collections';\nimport {\n  PropertyReportItemTransactionCollection\n} from '../../../collections/report/property/property-report-item-transaction.collection';\nimport {\n  PropertyReportItemDepreciationCollection\n} from '../../../collections/report/property/property-report-item-depreciation.collection';\nimport { PropertyReportItemCollection } from '../../../collections/report/property/property-report-item.collection';\nimport { ChartAccountsCollection } from '../../../collections/chart-accounts.collection';\n\n/**\n * Service to handle Property transactions report items data (get income / expense report items, e.t.c.)\n */\n@Injectable({\n  providedIn: 'root'\n})\nexport class PropertyTransactionReportService {\n  properties: Property[];\n  transactions: TransactionCollection;\n  depreciations: DepreciationCollection;\n  chartAccounts: ChartAccountsCollection;\n\n  constructor(\n    private propertyService: PropertyService,\n    private transactionService: TransactionService,\n    private depreciationService: DepreciationService,\n    private chartAccountsService: ChartAccountsService\n  ) {\n  }\n\n  /**\n   * Get collection of report items based on transactions & depreciations\n   */\n  get(): Observable<CollectionDictionary<PropertyReportItemCollection>> {\n    return combineLatest([\n      this.propertyService.get() as Observable<PropertyCollection>,\n      this.getTransactions() as Observable<TransactionCollection>,\n      this.getDepreciations() as Observable<DepreciationCollection>,\n      this.chartAccountsService.get() as Observable<ChartAccountsCollection>\n    ]).pipe(\n      map(([properties, transactions, depreciations, chartAccounts]) => {\n\n        const r = this.create(\n          transactions,\n          depreciations,\n          properties,\n          chartAccounts\n        );\n\n        debugger;\n        return new CollectionDictionary(\n          this.create(\n            transactions,\n            depreciations,\n            properties,\n            chartAccounts\n          ),\n          'propertyId'\n        );\n      })\n    )\n  }\n\n  private create(\n    transactions: TransactionCollection,\n    depreciations: DepreciationCollection,\n    properties: PropertyCollection,\n    chartAccounts: ChartAccountsCollection\n  ): PropertyReportItemCollection {\n    return new PropertyReportItemCollection([\n      ...new PropertyReportItemTransactionCollection(transactions, properties, chartAccounts).items,\n      ...new PropertyReportItemDepreciationCollection(depreciations, properties, chartAccounts).items,\n    ]);\n  }\n\n  /**\n   * Get collection of property transactions\n   */\n  private getTransactions(): Observable<TransactionCollection> {\n    return this.transactionService.get().pipe(\n      map((transactions: Transaction[]) => {\n        return new TransactionCollection(transactions)\n          .getByChartAccountsCategories(CHART_ACCOUNTS_CATEGORIES.property);\n      })\n    )\n  }\n\n  /**\n   * Get list of asset & capital property depreciations\n   */\n  private getDepreciations(): Observable<DepreciationCollection> {\n    return this.depreciationService.get().pipe(\n      map((depreciations: DepreciationCollection) => {\n        return depreciations\n          .getByChartAccountsCategories(CHART_ACCOUNTS_CATEGORIES.property)\n          // we don't need borrowing expenses for this report\n          .getWithoutBorrowingExpenses();\n      })\n    )\n  }\n}\n"]}
|
package/fesm2015/taxtank-core.js
CHANGED
|
@@ -1618,7 +1618,7 @@ class TransactionBase extends ObservableModel {
|
|
|
1618
1618
|
return !!this.business;
|
|
1619
1619
|
}
|
|
1620
1620
|
get amountWithGst() {
|
|
1621
|
-
return this.isGST ? +(this.amount * ChartAccounts.GSTCoefficient).toFixed(2) : this.amount;
|
|
1621
|
+
return this.isGST ? +(Math.round(this.amount * ChartAccounts.GSTCoefficient)).toFixed(2) : this.amount;
|
|
1622
1622
|
}
|
|
1623
1623
|
get gstAmount() {
|
|
1624
1624
|
return +(this.amountWithGst - this.amount).toFixed(2);
|
|
@@ -4613,7 +4613,7 @@ class PropertyCategory extends PropertyCategory$1 {
|
|
|
4613
4613
|
class PropertyDocument extends PropertyDocument$1 {
|
|
4614
4614
|
constructor() {
|
|
4615
4615
|
super(...arguments);
|
|
4616
|
-
this.type = AssetTypeEnum.
|
|
4616
|
+
this.type = AssetTypeEnum.PROPERTY;
|
|
4617
4617
|
this.entityType = AssetEntityTypeEnum.PROPERTIES;
|
|
4618
4618
|
}
|
|
4619
4619
|
getApiUrlPrefix() {
|
|
@@ -6960,7 +6960,7 @@ class PropertyReportItemDepreciationCollection extends PropertyReportItemCollect
|
|
|
6960
6960
|
setItems(depreciations, properties, chartAccounts) {
|
|
6961
6961
|
this.items = [];
|
|
6962
6962
|
properties.items.forEach((property) => {
|
|
6963
|
-
const depreciationsByType = new CollectionDictionary(depreciations, 'type');
|
|
6963
|
+
const depreciationsByType = new CollectionDictionary(depreciations.filterBy('property.id', property.id), 'type');
|
|
6964
6964
|
depreciationsByType.keys.map((type) => {
|
|
6965
6965
|
this.items.push(new PropertyReportItemDepreciation(depreciationsByType.get(type), property, chartAccounts.findBy('id', depreciationsByType.get(type).first.chartAccounts.id)));
|
|
6966
6966
|
});
|
|
@@ -15180,6 +15180,8 @@ class PropertyTransactionReportService {
|
|
|
15180
15180
|
this.getDepreciations(),
|
|
15181
15181
|
this.chartAccountsService.get()
|
|
15182
15182
|
]).pipe(map(([properties, transactions, depreciations, chartAccounts]) => {
|
|
15183
|
+
const r = this.create(transactions, depreciations, properties, chartAccounts);
|
|
15184
|
+
debugger;
|
|
15183
15185
|
return new CollectionDictionary(this.create(transactions, depreciations, properties, chartAccounts), 'propertyId');
|
|
15184
15186
|
}));
|
|
15185
15187
|
}
|
|
@@ -16170,27 +16172,6 @@ class SoleBusinessLossForm extends AbstractForm {
|
|
|
16170
16172
|
}
|
|
16171
16173
|
}
|
|
16172
16174
|
|
|
16173
|
-
const phonePattern = /^(((\s*)?([- ()]?\d[- ()]?){0,30}(\s*)?)|)$/;
|
|
16174
|
-
/**
|
|
16175
|
-
* Validator for phone number
|
|
16176
|
-
* Allowed special symbols"-", "(", ")"
|
|
16177
|
-
*/
|
|
16178
|
-
function phoneNumberValidator() {
|
|
16179
|
-
return (control) => {
|
|
16180
|
-
return phonePattern.test(control.value) ? null : { phoneInvalid: true };
|
|
16181
|
-
};
|
|
16182
|
-
}
|
|
16183
|
-
|
|
16184
|
-
class PhoneForm extends AbstractForm {
|
|
16185
|
-
constructor(phone = plainToClass(Phone, {})) {
|
|
16186
|
-
super({
|
|
16187
|
-
type: new FormControl(phone.type, Validators.required),
|
|
16188
|
-
country: new FormControl(phone.country, Validators.required),
|
|
16189
|
-
number: new FormControl(phone.number, [Validators.required, phoneNumberValidator()])
|
|
16190
|
-
}, phone);
|
|
16191
|
-
}
|
|
16192
|
-
}
|
|
16193
|
-
|
|
16194
16175
|
class SoleContactForm extends AbstractForm {
|
|
16195
16176
|
constructor(contact = plainToClass(SoleContact, {})) {
|
|
16196
16177
|
super({
|
|
@@ -16199,7 +16180,7 @@ class SoleContactForm extends AbstractForm {
|
|
|
16199
16180
|
firstName: new FormControl(contact.firstName, Validators.required),
|
|
16200
16181
|
lastName: new FormControl(contact.lastName, Validators.required),
|
|
16201
16182
|
email: new FormControl(contact.email, [Validators.required, Validators.email]),
|
|
16202
|
-
phone: new
|
|
16183
|
+
phone: new FormControl(contact.phone),
|
|
16203
16184
|
address: new AddressForm(contact.address || plainToClass(Address, {}))
|
|
16204
16185
|
}, contact);
|
|
16205
16186
|
}
|
|
@@ -16680,6 +16661,29 @@ class LoginForm extends AbstractForm {
|
|
|
16680
16661
|
}
|
|
16681
16662
|
}
|
|
16682
16663
|
|
|
16664
|
+
const phonePattern = /^(((\s*)?([- ()]?\d[- ()]?){0,30}(\s*)?)|)$/;
|
|
16665
|
+
/**
|
|
16666
|
+
* Validator for phone number
|
|
16667
|
+
* Allowed special symbols"-", "(", ")"
|
|
16668
|
+
*/
|
|
16669
|
+
function phoneNumberValidator() {
|
|
16670
|
+
return (control) => {
|
|
16671
|
+
return phonePattern.test(control.value) ? null : { phoneInvalid: true };
|
|
16672
|
+
};
|
|
16673
|
+
}
|
|
16674
|
+
|
|
16675
|
+
class PhoneForm extends AbstractForm {
|
|
16676
|
+
constructor(
|
|
16677
|
+
// no default value because this form is always built-in, so phone passed from parent form
|
|
16678
|
+
phone) {
|
|
16679
|
+
super({
|
|
16680
|
+
type: new FormControl((phone === null || phone === void 0 ? void 0 : phone.type) || PhoneTypeEnum.MOBILE, Validators.required),
|
|
16681
|
+
country: new FormControl((phone === null || phone === void 0 ? void 0 : phone.country) || Country.australia, Validators.required),
|
|
16682
|
+
number: new FormControl((phone === null || phone === void 0 ? void 0 : phone.number) || null, [Validators.required, phoneNumberValidator()])
|
|
16683
|
+
}, phone);
|
|
16684
|
+
}
|
|
16685
|
+
}
|
|
16686
|
+
|
|
16683
16687
|
// @TODO Alex: Create a model and handle request fields via class-transformer
|
|
16684
16688
|
class PasswordForm extends AbstractForm {
|
|
16685
16689
|
constructor() {
|
|
@@ -17640,10 +17644,8 @@ class TransactionBaseForm extends AbstractForm {
|
|
|
17640
17644
|
}, controls), transaction);
|
|
17641
17645
|
this.registeredForGst = registeredForGst;
|
|
17642
17646
|
this.watchChartAccounts();
|
|
17643
|
-
|
|
17644
|
-
|
|
17645
|
-
this.watchIsGst();
|
|
17646
|
-
}
|
|
17647
|
+
this.watchAmountWithGST();
|
|
17648
|
+
this.watchIsGst();
|
|
17647
17649
|
}
|
|
17648
17650
|
watchIsGst() {
|
|
17649
17651
|
this.get('isGST').valueChanges.subscribe((isGST) => {
|
|
@@ -17899,6 +17901,9 @@ class DepreciationForm extends TransactionBaseForm {
|
|
|
17899
17901
|
}
|
|
17900
17902
|
});
|
|
17901
17903
|
}
|
|
17904
|
+
submit(data = {}, includeDisabledFields = false) {
|
|
17905
|
+
return super.submit(data, true);
|
|
17906
|
+
}
|
|
17902
17907
|
}
|
|
17903
17908
|
|
|
17904
17909
|
// @TODO Alex: Create indexes everywhere and break this file to imports from indexes
|