taxtank-core 2.1.40 → 2.1.41

package/fesm2022/taxtank-core.mjs

@@ -25136,7 +25136,7 @@ class SoleInvoiceItemForm extends AbstractForm {
  * a common invoice data and sole invoice items.
  */
 class SoleInvoiceForm extends AbstractForm {
-    constructor(invoice, soleDetailsGST, 
+    constructor(invoice, gst, 
     // default template to be preselected
     defaultTemplate) {
         super({
@@ -25155,7 +25155,7 @@ class SoleInvoiceForm extends AbstractForm {
                 .map((item) => new SoleInvoiceItemForm(item))),
         }, invoice);
         this.invoice = invoice;
-        this.soleDetailsGST = soleDetailsGST;
+        this.gst = gst;
         this.defaultTemplate = defaultTemplate;
         // we need invoice template only for new invoices
         if (!invoice.id) {
@@ -25167,12 +25167,12 @@ class SoleInvoiceForm extends AbstractForm {
                 }
             }
             // set tax exclusive by default if user is registered for gst
-            if (this.soleDetailsGST) {
+            if (this.gst) {
                 this.commonData.get('taxType').setValue(SoleInvoiceTaxTypeEnum.TAX_EXCLUSIVE);
             }
         }
         // invoice.taxType is always NONE ('No Tax') when soleDetails.isGST === false
-        if (!this.soleDetailsGST) {
+        if (!this.gst) {
             this.commonData.get('taxType').setValue(SoleInvoiceTaxTypeEnum.NO_TAX);
             this.commonData.get('taxType').disable();
             // Items isGST is not available when invoice.taxType === NONE ('No Tax')
@@ -25188,7 +25188,7 @@ class SoleInvoiceForm extends AbstractForm {
     listenEvents() {
         // no need to listen tax type and items chart accounts changes when soleDetails.isGST === false
         // because invoice tax type always 'No Tax' in this case and not available for changing
-        if (this.soleDetailsGST) {
+        if (this.gst) {
             this.listenTaxTypeChanges();
             this.items.controls.forEach((itemForm) => {
                 this.listenItemChartAccountsChanges(itemForm);
@@ -25203,7 +25203,7 @@ class SoleInvoiceForm extends AbstractForm {
         const itemForm = new SoleInvoiceItemForm(plainToClass(SoleInvoiceItem, {}));
         // no need to listen items chart accounts changes when soleDetails.isGST === false
         // because invoice tax type always 'No Tax' in this case and not available for changing
-        if (this.soleDetailsGST) {
+        if (this.gst) {
             this.listenItemChartAccountsChanges(itemForm);
         }
         this.items.push(itemForm);
@@ -25245,7 +25245,7 @@ class SoleInvoiceForm extends AbstractForm {
             this.commonData.get('dateTo').setValue(new Date(dateFrom.getTime() + template.termTime));
         }
         // invoice.taxType is always 'No Tax' when soleDetails.isGST = false and not available for changing
-        if (this.soleDetailsGST) {
+        if (this.gst) {
             this.commonData.get('taxType').setValue(template.taxType);
         }
     }
@@ -25255,7 +25255,7 @@ class SoleInvoiceForm extends AbstractForm {
     listenItemChartAccountsChanges(itemForm) {
         itemForm.get('chartAccounts').valueChanges.subscribe((chartAccounts) => {
             // item.isGST is available only when item.chartAccounts.isGST === true, soleDetails.isGST === true and invoice.taxType !== NONE ('No Tax')
-            if (this.soleDetailsGST && chartAccounts.isGST && !this.currentValue.isNoTax()) {
+            if (this.gst && chartAccounts.isGST && !this.currentValue.isNoTax()) {
                 this.enableItemGST(itemForm);
                 return;
             }
@@ -26853,14 +26853,14 @@ class AllocationRuleTransactionMetaFieldForm extends AbstractForm {
 class AllocationRuleTransactionForm extends AbstractForm {
     constructor(transaction, 
     // Flag to enable transaction GST field
-    isGST) {
+    soleDetails) {
         super({
             amount: new UntypedFormControl(transaction.amount),
             amountPercent: new UntypedFormControl(transaction.amountPercent, Validators.required),
             tax: new UntypedFormControl(transaction.tax, Validators.required),
             claimPercent: new UntypedFormControl(transaction.claimPercent, [Validators.required, Validators.min(0), Validators.max(100)]),
             chartAccounts: new UntypedFormControl(transaction.chartAccounts, Validators.required),
-            isGST: new UntypedFormControl({ value: transaction.isGST || false, disabled: !isGST }),
+            isGST: new UntypedFormControl({ value: transaction.isGST || false, disabled: transaction.business?.getIsGST(soleDetails) }),
             loan: new UntypedFormControl(transaction.loan),
             incomeSource: new UntypedFormControl(transaction.incomeSource, conditionalValidator(() => transaction.chartAccounts?.isWorkIncome(), Validators.required)),
             metaFields: new UntypedFormArray((transaction.metaFields || []).map((metaField) => new AllocationRuleTransactionMetaFieldForm(metaField))),
@@ -26873,7 +26873,7 @@ class AllocationRuleTransactionForm extends AbstractForm {
                 amount: new UntypedFormControl(childTransaction.amount, Validators.required)
             })))
         }, transaction);
-        this.isGST = isGST;
+        this.soleDetails = soleDetails;
         this.includeDisabledFields = true;
         this.listenEvents();
     }
@@ -26910,10 +26910,16 @@ class AllocationRuleTransactionForm extends AbstractForm {
     }
     listenEvents() {
         this.listenChartAccountsChanges();
+        this.watchBusiness();
         this.listenTankTypeChanges();
         this.listenIncomeSourceChanges();
         this.listenPropertyChanges();
     }
+    watchBusiness() {
+        this.get('business').valueChanges.subscribe((business) => {
+            this.updateGst(business, this.value.chartAccounts);
+        });
+    }
     listenChartAccountsChanges() {
         this.get('chartAccounts').valueChanges.subscribe((chartAccounts) => {
             this.get('incomeSource').removeValidators(Validators.required);
@@ -26930,17 +26936,20 @@ class AllocationRuleTransactionForm extends AbstractForm {
             chartAccounts.metaFields.forEach((chartAccountsMetaField) => {
                 this.metaFieldsArray.push(new AllocationRuleTransactionMetaFieldForm(plainToClass(AllocationRuleTransactionMetaField, { chartAccountsMetaField })));
             });
-            // sole trader registered and chartAccounts is eligible for gst
-            if (this.isGST && chartAccounts.isGST) {
-                this.get('isGST').enable();
-                this.get('isGST').setValue(true);
-            }
-            else {
-                this.get('isGST').disable();
-                this.get('isGST').setValue(false);
-            }
+            this.updateGst(this.value.business, chartAccounts);
         });
     }
+    updateGst(business, chartAccounts) {
+        // update gst if applicable
+        if (business?.getIsGST(this.soleDetails) && chartAccounts.isGST) {
+            this.get('isGST').enable();
+            this.get('isGST').patchValue(true);
+        }
+        else {
+            this.get('isGST').patchValue(false);
+            this.get('isGST').disable();
+        }
+    }
     /**
      * Child transaction allowance depends on tank type.
      * Also chart accounts are different, so we just reset child transactions when tank type changed
@@ -26995,7 +27004,7 @@ class AllocationRuleTransactionForm extends AbstractForm {
  * @TODO move aux methods like isSplittable/isTaxFieldHidden/etc (used in view with ngIf) to properties to improve perf
  */
 class AllocationRuleForm extends AbstractForm {
-    constructor(rule, rules, isGST) {
+    constructor(rule, rules, soleDetails) {
         super({
             type: new FormControl(rule.type, Validators.required),
             name: new FormControl(rule.name, [
@@ -27005,11 +27014,11 @@ class AllocationRuleForm extends AbstractForm {
             conditionOperator: new FormControl(rule.conditionOperator, Validators.required),
             conditions: new FormArray((rule.conditions || [plainToClass(AllocationRuleCondition, {})])
                 .map((condition) => new AllocationRuleConditionForm(condition))),
-            transaction: new AllocationRuleTransactionForm(rule.transaction || plainToClass(AllocationRuleTransaction, {}), isGST),
+            transaction: new AllocationRuleTransactionForm(rule.transaction || plainToClass(AllocationRuleTransaction, {}), soleDetails),
             transferBankAccount: new FormControl(rule.transferBankAccount, Validators.required),
             autoAllocate: new FormControl(rule.autoAllocate || false, Validators.required),
         }, rule);
-        this.isGST = isGST;
+        this.soleDetails = soleDetails;
         this.listenEvents();
         this.setupFieldsByType(rule.type);
         this.setupFieldsByTankType(rule.transaction?.tankType);
@@ -27067,7 +27076,7 @@ class AllocationRuleForm extends AbstractForm {
             this.updateChartAccountsCategories();
             // we have different fields for different types
             // @TODO separated reinit method if we need it anywhere else
-            this.transactionFormGroup.setValue(new AllocationRuleTransactionForm(plainToClass(AllocationRuleTransaction, {}), this.isGST).getRawValue());
+            this.transactionFormGroup.setValue(new AllocationRuleTransactionForm(plainToClass(AllocationRuleTransaction, {}), this.soleDetails).getRawValue());
         });
     }
     listenTankTypeChanges() {