taxtank-core 2.1.31 → 2.1.32

package/fesm2022/taxtank-core.mjs

@@ -5970,6 +5970,9 @@ __decorate([
 __decorate([
     Type(() => Date)
 ], BasReport.prototype, "dateTo", void 0);
+__decorate([
+    Type(() => SoleBusiness)
+], BasReport.prototype, "businesses", void 0);
 
 class SoleContactItem {
 }
@@ -16768,11 +16771,14 @@ var BasReportMessagesEnum;
     BasReportMessagesEnum["CONFIRM_DELETE"] = "Are you sure you want to delete this BAS report?";
 })(BasReportMessagesEnum || (BasReportMessagesEnum = {}));
 
-class BasReportService extends RestService {
+class BasReportService extends RestService$1 {
     constructor() {
         super(...arguments);
         this.modelClass = BasReport;
-        this.url = 'bas-reports';
+        this.collectionClass = Collection;
+        this.endpointUri = 'bas-reports';
+        this.roles = [UserRolesEnum.SOLE_TANK];
+        this.useBackendError = true;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: BasReportService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: BasReportService, providedIn: 'root' }); }
@@ -25198,25 +25204,31 @@ class SoleInvoiceTemplateForm extends AbstractForm {
 class BasReportForm extends AbstractForm {
     constructor(report, transactions, depreciations) {
         super({
-            dateFrom: new UntypedFormControl(report.dateFrom, Validators.required),
-            dateTo: new UntypedFormControl(report.dateTo, Validators.required),
-            income: new UntypedFormControl({ value: report.income, disabled: true }),
-            incomeGST: new UntypedFormControl({ value: report.incomeGST, disabled: true }, Validators.required),
-            expenseGST: new UntypedFormControl({ value: report.expenseGST, disabled: true }, Validators.required),
-            salary: new UntypedFormControl(report.salary, Validators.required),
-            taxWithheldSalary: new UntypedFormControl(report.taxWithheldSalary, Validators.required),
-            taxWithheldNoABN: new UntypedFormControl(report.taxWithheldNoABN, Validators.required),
-            taxWithheldTotal: new UntypedFormControl({ value: report.taxWithheldTotal, disabled: true }),
-            paygTaxInstalment: new UntypedFormControl(report.paygTaxInstalment, Validators.required),
-            fuelTaxCredit: new UntypedFormControl(report.fuelTaxCredit, Validators.required),
-            gst: new UntypedFormControl({ value: report.gst, disabled: true }),
+            businesses: new FormControl(report.businesses, Validators.required),
+            dateFrom: new FormControl(report.dateFrom, Validators.required),
+            dateTo: new FormControl(report.dateTo, Validators.required),
+            income: new FormControl({ value: report.income, disabled: true }),
+            incomeGST: new FormControl({ value: report.incomeGST, disabled: true }, Validators.required),
+            expenseGST: new FormControl({ value: report.expenseGST, disabled: true }, Validators.required),
+            salary: new FormControl(report.salary, Validators.required),
+            taxWithheldSalary: new FormControl(report.taxWithheldSalary, Validators.required),
+            taxWithheldNoABN: new FormControl(report.taxWithheldNoABN, Validators.required),
+            taxWithheldTotal: new FormControl({ value: report.taxWithheldTotal, disabled: true }),
+            paygTaxInstalment: new FormControl(report.paygTaxInstalment, Validators.required),
+            fuelTaxCredit: new FormControl(report.fuelTaxCredit, Validators.required),
+            gst: new FormControl({ value: report.gst, disabled: true }),
         }, report);
         this.includeDisabledFields = true;
         // prefill income/expense data based on transactions/depreciations filtered by specified date
-        combineLatest([this.get('dateFrom').valueChanges, this.get('dateTo').valueChanges])
-            .subscribe(([dateFrom, dateTo]) => {
-            const filteredTransactions = transactions.filterByRange('date', dateFrom, dateTo);
-            const filteredDepreciations = depreciations.filterByRange('date', dateFrom, dateTo);
+        combineLatest([this.get('businesses').valueChanges, this.get('dateFrom').valueChanges, this.get('dateTo').valueChanges])
+            .subscribe(([businesses, dateFrom, dateTo]) => {
+            const businessIds = businesses.map(business => business.id);
+            const filteredTransactions = transactions
+                .filterByRange('date', dateFrom, dateTo)
+                .filterBy('business.id', businessIds);
+            const filteredDepreciations = depreciations
+                .filterByRange('date', dateFrom, dateTo)
+                .filterBy('business.id', businessIds);
             const incomeTransactions = filteredTransactions.getIncomeTransactions();
             const depreciationTransactions = filteredDepreciations.map(depreciation => depreciation.toTransaction({ amount: -depreciation.amount }));
             const expenseTransactions = new TransactionCollection(filteredTransactions.getExpenseTransactions().toArray());