taxtank-core 0.21.8 → 0.21.9

package/bundles/taxtank-core.umd.js

@@ -2867,6 +2867,12 @@
         Collection.prototype.removeBy = function (path, values) {
             return this.filter(function (item) { return !(Array.isArray(values) ? values : [values]).includes(get__default["default"](item, path)); });
         };
+        Collection.prototype.minBy = function (path) {
+            return this.items.reduce(function (prev, current) { return (get__default["default"](prev, path) < get__default["default"](current, path) ? prev : current); });
+        };
+        Collection.prototype.maxBy = function (path) {
+            return this.items.reduce(function (prev, current) { return (get__default["default"](prev, path) > get__default["default"](current, path) ? prev : current); });
+        };
         return Collection;
     }());
 
@@ -3370,34 +3376,20 @@
          * check if bank account related to work tank
          */
         BankAccount.prototype.isWorkTank = function () {
-            return !this.isPropertyTank() && !this.isSoleTank();
+            return this.tankType === exports.TankTypeEnum.WORK;
         };
         /**
          * check if bank account related to work tank
          */
         BankAccount.prototype.isPropertyTank = function () {
-            return !!this.bankAccountProperties.length;
+            return this.tankType === exports.TankTypeEnum.PROPERTY;
         };
         /**
          * check if bank account related to sole tank
          */
         BankAccount.prototype.isSoleTank = function () {
-            return !!this.businessAllocations.length;
+            return this.tankType === exports.TankTypeEnum.SOLE;
         };
-        Object.defineProperty(BankAccount.prototype, "tankType", {
-            get: function () {
-                switch (true) {
-                    case this.isPropertyTank():
-                        return exports.TankTypeEnum.PROPERTY;
-                    case this.isSoleTank():
-                        return exports.TankTypeEnum.SOLE;
-                    default:
-                        return exports.TankTypeEnum.WORK;
-                }
-            },
-            enumerable: false,
-            configurable: true
-        });
         /**
          * Get Bank account property by id
          * @param id Id of property
@@ -5702,10 +5694,16 @@
     (function (IncomeSourceTypeListOtherEnum) {
         IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["PSI"] = 6] = "PSI";
         IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["SOLE_TRADER"] = 7] = "SOLE_TRADER";
-        IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["PARTNERSHIPS_AND_TRUSTS"] = 9] = "PARTNERSHIPS_AND_TRUSTS";
+        IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["TRUSTS"] = 9] = "TRUSTS";
         IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["OTHER_INCOME"] = 10] = "OTHER_INCOME";
+        IncomeSourceTypeListOtherEnum[IncomeSourceTypeListOtherEnum["PARTNERSHIPS"] = 12] = "PARTNERSHIPS";
     })(exports.IncomeSourceTypeListOtherEnum || (exports.IncomeSourceTypeListOtherEnum = {}));
 
+    exports.IncomeSourceTypeListSoleEnum = void 0;
+    (function (IncomeSourceTypeListSoleEnum) {
+        IncomeSourceTypeListSoleEnum[IncomeSourceTypeListSoleEnum["SOLE_TRADER"] = 7] = "SOLE_TRADER";
+    })(exports.IncomeSourceTypeListSoleEnum || (exports.IncomeSourceTypeListSoleEnum = {}));
+
     var IncomeSourceType = /** @class */ (function (_super) {
         __extends(IncomeSourceType, _super);
         function IncomeSourceType() {
@@ -5721,8 +5719,7 @@
             return !!exports.IncomeSourceTypeListOtherEnum[this.id];
         };
         IncomeSourceType.prototype.isSole = function () {
-            // @TODO use IncomeSourceTypeListSoleEnum when sole tank ready
-            return !!exports.IncomeSourceTypeListOtherEnum[this.id];
+            return !!exports.IncomeSourceTypeListSoleEnum[this.id];
         };
         Object.defineProperty(IncomeSourceType.prototype, "type", {
             get: function () {
@@ -7238,10 +7235,20 @@
         DepreciationWriteOffAmountEnum[DepreciationWriteOffAmountEnum["BORROWING_EXPENSES"] = 100] = "BORROWING_EXPENSES";
     })(exports.DepreciationWriteOffAmountEnum || (exports.DepreciationWriteOffAmountEnum = {}));
 
-    exports.IncomeSourceTypeListSoleEnum = void 0;
-    (function (IncomeSourceTypeListSoleEnum) {
-        IncomeSourceTypeListSoleEnum[IncomeSourceTypeListSoleEnum["SOLE_TRADER"] = 7] = "SOLE_TRADER";
-    })(exports.IncomeSourceTypeListSoleEnum || (exports.IncomeSourceTypeListSoleEnum = {}));
+    exports.IncomeSourceForecastTrustTypeEnum = void 0;
+    (function (IncomeSourceForecastTrustTypeEnum) {
+        IncomeSourceForecastTrustTypeEnum[IncomeSourceForecastTrustTypeEnum["SPECIAL_DISABILITY_TRUST"] = 1] = "SPECIAL_DISABILITY_TRUST";
+        IncomeSourceForecastTrustTypeEnum[IncomeSourceForecastTrustTypeEnum["DECEASED_ESTATE"] = 2] = "DECEASED_ESTATE";
+        IncomeSourceForecastTrustTypeEnum[IncomeSourceForecastTrustTypeEnum["FIXED_TRUST"] = 3] = "FIXED_TRUST";
+        IncomeSourceForecastTrustTypeEnum[IncomeSourceForecastTrustTypeEnum["HYBRID_TRUST"] = 4] = "HYBRID_TRUST";
+        IncomeSourceForecastTrustTypeEnum[IncomeSourceForecastTrustTypeEnum["DISCRETIONARY_SERVICE_TRUST"] = 5] = "DISCRETIONARY_SERVICE_TRUST";
+        IncomeSourceForecastTrustTypeEnum[IncomeSourceForecastTrustTypeEnum["DISCRETIONARY_TRADING_TRUST"] = 6] = "DISCRETIONARY_TRADING_TRUST";
+        IncomeSourceForecastTrustTypeEnum[IncomeSourceForecastTrustTypeEnum["DISCRETIONARY_INVESTMENT_TRUST"] = 7] = "DISCRETIONARY_INVESTMENT_TRUST";
+        IncomeSourceForecastTrustTypeEnum[IncomeSourceForecastTrustTypeEnum["CASH_MANAGEMENT_UNIT_TRUST"] = 8] = "CASH_MANAGEMENT_UNIT_TRUST";
+        IncomeSourceForecastTrustTypeEnum[IncomeSourceForecastTrustTypeEnum["PUBLIC_UNIT_TRUST_LISTED"] = 9] = "PUBLIC_UNIT_TRUST_LISTED";
+        IncomeSourceForecastTrustTypeEnum[IncomeSourceForecastTrustTypeEnum["PUBLIC_UNIT_TRUST_UNLISTED"] = 10] = "PUBLIC_UNIT_TRUST_UNLISTED";
+        IncomeSourceForecastTrustTypeEnum[IncomeSourceForecastTrustTypeEnum["TESTAMENTARY_TRUST"] = 11] = "TESTAMENTARY_TRUST";
+    })(exports.IncomeSourceForecastTrustTypeEnum || (exports.IncomeSourceForecastTrustTypeEnum = {}));
 
     exports.InviteStatusEnum = void 0;
     (function (InviteStatusEnum) {
@@ -8735,18 +8742,11 @@
             return this.method === exports.VehicleClaimMethodEnum.KMS;
         };
         VehicleClaim.prototype.isWorkTank = function () {
-            return !this.business;
+            return this.tankType === exports.TankTypeEnum.WORK;
         };
         VehicleClaim.prototype.isSoleTank = function () {
-            return !!this.business;
+            return this.tankType === exports.TankTypeEnum.SOLE;
         };
-        Object.defineProperty(VehicleClaim.prototype, "tankType", {
-            get: function () {
-                return this.isSoleTank() ? exports.TankTypeEnum.SOLE : exports.TankTypeEnum.WORK;
-            },
-            enumerable: false,
-            configurable: true
-        });
         /**
          * Claim amount for KLMs method. Exists only for KLMs method.
          */
@@ -9697,12 +9697,14 @@
     }());
 
     var MyTaxPartnershipsAndTrusts = /** @class */ (function () {
-        function MyTaxPartnershipsAndTrusts(transactions) {
+        function MyTaxPartnershipsAndTrusts(transactions, incomeSources) {
             this.transactions = transactions;
+            this.incomeSources = incomeSources;
             this.partnershipIncomes = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PARTNERSHIP_INCOME);
             this.partnershipExpenses = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PARTNERSHIP_EXPENSES);
             this.trustsIncomes = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.TRUST_INCOME);
             this.trustsExpenses = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.TRUST_EXPENSES);
+            this.trustType = this.getTrustType();
             this.netNonPrimaryProductionAmount = (this.partnershipIncomes.sumBy('amount') - this.partnershipExpenses.sumBy('amount')) +
                 (this.trustsIncomes.sumBy('amount') - this.trustsExpenses.sumBy('amount'));
             this.partnershipsNetIncome = this.partnershipIncomes.sumBy('amount') -
@@ -9722,6 +9724,22 @@
                 .sumBy('value');
             this.taxOffsetNRASTotalAmount = this.transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.TAX_OFFSETS_N_R_A_S).sumBy('amount');
         }
+        /**
+         * Get Income source forecast trust type, related to trust income with max amount
+         */
+        MyTaxPartnershipsAndTrusts.prototype.getTrustType = function () {
+            var filteredTrustIncomes = this.trustsIncomes
+                .filterBy('incomeSource.id', this.incomeSources
+                .removeBy('actualForecast.trustType', null)
+                .getIds());
+            if (!filteredTrustIncomes.length) {
+                return null;
+            }
+            return this.incomeSources
+                .findBy('id', filteredTrustIncomes.maxBy('amount').incomeSource.id)
+                .actualForecast
+                .trustType;
+        };
         return MyTaxPartnershipsAndTrusts;
     }());
 
@@ -11757,7 +11775,6 @@
 
     /**
      * server sent events service
-     * https://symfony.com/doc/current/mercure.html
      */
     var SseService = /** @class */ (function () {
         function SseService(zone, jwtService, environment) {
@@ -15287,6 +15304,31 @@
         };
     }
 
+    function conditionalValidator(condition, validator) {
+        return function (control) {
+            revalidateOnChanges(control);
+            if (control && control.parent) {
+                if (condition(control.parent)) {
+                    return validator(control);
+                }
+            }
+            return null;
+        };
+    }
+    /**
+     * Conditional validator depends on other fields and should be updated on each form value change
+     */
+    function revalidateOnChanges(control) {
+        if (control && control.parent && !control['_revalidateOnChanges']) {
+            control['_revalidateOnChanges'] = true;
+            control.parent.valueChanges.pipe(operators.distinctUntilChanged(function (a, b) { return JSON.stringify(a) === JSON.stringify(b); }))
+                .subscribe(function () {
+                control.updateValueAndValidity({ emitEvent: false });
+            });
+        }
+        return;
+    }
+
     /**
      * Regular expressions that are used to check password strength and valid values
      */
@@ -15895,7 +15937,9 @@
                     value: partnershipsAndTrusts.trustsNetIncome,
                     disabled: true
                 }),
-                trustType: new forms.FormControl(1),
+                trustType: new forms.FormControl(partnershipsAndTrusts.trustType, conditionalValidator(function (control) {
+                    return !!partnershipsAndTrusts.trustsIncomes.length;
+                }, forms.Validators.required)),
                 partnershipsSmallBusinessNetIncome: new forms.FormControl(partnershipsAndTrusts.partnershipsSmallBusinessNetIncome, forms.Validators.required),
                 trustsSmallBusinessNetIncome: new forms.FormControl(partnershipsAndTrusts.trustsSmallBusinessNetIncome, forms.Validators.required),
                 taxPaidTotal: new forms.FormControl({
@@ -16222,6 +16266,7 @@
     exports.cloneDeep = cloneDeep;
     exports.compare = compare;
     exports.compareMatOptions = compareMatOptions;
+    exports.conditionalValidator = conditionalValidator;
     exports.createDate = createDate;
     exports.displayMatOptions = displayMatOptions;
     exports.enumToList = enumToList;