taxtank-core 0.29.31 → 0.29.33

package/bundles/taxtank-core.umd.js

@@ -3681,6 +3681,9 @@
         ChartAccounts.prototype.isSalaryIncluded = function () {
             return this.id in exports.ChartAccountsSalaryIncludedListEnum;
         };
+        ChartAccounts.prototype.isPropertyCapitalWorks = function () {
+            return this.category === exports.ChartAccountsCategoryEnum.PROPERTY_CAPITAL_WORKS;
+        };
         return ChartAccounts;
     }(ChartAccounts$1));
     /**
@@ -5010,7 +5013,7 @@
                 amount: this.amount,
                 chartAccounts: this.chartAccounts,
                 description: this.description,
-                type: exports.DepreciationTypeEnum.PLANT_EQUIPMENT,
+                type: this.chartAccounts.isPropertyCapitalWorks() ? exports.DepreciationTypeEnum.CAPITAL_WORKS : exports.DepreciationTypeEnum.PLANT_EQUIPMENT,
                 claimPercent: this.claimPercent,
                 property: this.property,
                 calculation: this.property ? this.property.depreciationCalculation : exports.DepreciationCalculationEnum.PRIME_COST
@@ -6198,6 +6201,17 @@
         return SoleInvoiceCollection;
     }(Collection));
 
+    var ServiceProductCollection = /** @class */ (function (_super) {
+        __extends(ServiceProductCollection, _super);
+        function ServiceProductCollection() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        ServiceProductCollection.prototype.getActive = function () {
+            return this.filterBy('status', exports.ServiceProductStatusEnum.ACTIVE);
+        };
+        return ServiceProductCollection;
+    }(Collection));
+
     /**
      * @TODO vik refactor
      */
@@ -6265,20 +6279,16 @@
             }
             return this.filterBy('type', type).findBy('product.id', exports.ServiceProductIdEnum.PROPERTIES);
         };
+        Object.defineProperty(ServicePriceCollection.prototype, "products", {
+            get: function () {
+                return new ServiceProductCollection(this.mapBy('product'));
+            },
+            enumerable: false,
+            configurable: true
+        });
         return ServicePriceCollection;
     }(Collection));
 
-    var ServiceProductCollection = /** @class */ (function (_super) {
-        __extends(ServiceProductCollection, _super);
-        function ServiceProductCollection() {
-            return _super !== null && _super.apply(this, arguments) || this;
-        }
-        ServiceProductCollection.prototype.getActive = function () {
-            return this.filterBy('status', exports.ServiceProductStatusEnum.ACTIVE);
-        };
-        return ServiceProductCollection;
-    }(Collection));
-
     var SubscriptionItemCollection = /** @class */ (function (_super) {
         __extends(SubscriptionItemCollection, _super);
         function SubscriptionItemCollection() {
@@ -6301,9 +6311,13 @@
         SubscriptionItemCollection.prototype.hasProduct = function (product) {
             return !!this.findBy('price.product.id', product.id);
         };
-        SubscriptionItemCollection.prototype.getPrices = function () {
-            return new ServicePriceCollection(this.mapBy('price'));
-        };
+        Object.defineProperty(SubscriptionItemCollection.prototype, "prices", {
+            get: function () {
+                return new ServicePriceCollection(this.mapBy('price'));
+            },
+            enumerable: false,
+            configurable: true
+        });
         return SubscriptionItemCollection;
     }(Collection));
 
@@ -6315,14 +6329,18 @@
         ServiceSubscriptionCollection.prototype.getActive = function () {
             return this.filter(function (subscription) { return subscription.isActive; });
         };
+        ServiceSubscriptionCollection.prototype.getInactive = function () {
+            return this.filter(function (subscription) { return !subscription.isActive; });
+        };
         ServiceSubscriptionCollection.prototype.getTrials = function () {
             return this.filterBy('stripeId', null);
         };
         ServiceSubscriptionCollection.prototype.getActiveTrials = function () {
             return this.getActive().getTrials();
         };
-        ServiceSubscriptionCollection.prototype.getExpiringTrials = function () {
-            return this.getActiveTrials().filter(function (subscription) { return subscription.isTrialExpiring(); });
+        ServiceSubscriptionCollection.prototype.getExpiredTrials = function () {
+            // @TODO vik remove paid products
+            return this.getInactive().getTrials();
         };
         ServiceSubscriptionCollection.prototype.getPaid = function () {
             return this.filter(function (subscription) { return !!subscription.stripeId; });
@@ -7462,10 +7480,7 @@
     var ServiceSubscription = /** @class */ (function (_super) {
         __extends(ServiceSubscription, _super);
         function ServiceSubscription() {
-            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
-            // Number of days after which the trial time will be expired
-            _this.lastTrialDays = 4;
-            return _this;
+            return _super !== null && _super.apply(this, arguments) || this;
         }
         Object.defineProperty(ServiceSubscription.prototype, "frequency", {
             get: function () {
@@ -7517,23 +7532,6 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(ServiceSubscription.prototype, "daysRemain", {
-            get: function () {
-                var daysRemains = Math.round((new Date(this.endDate).getTime() - new Date().getTime()) / (1000 * 3600 * 24));
-                return daysRemains > 0 ? daysRemains : 0;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        /**
-         * Check if trial expired
-         */
-        ServiceSubscription.prototype.isTrialExpired = function () {
-            return this.daysRemain && this.daysRemain <= 0;
-        };
-        ServiceSubscription.prototype.isTrialExpiring = function () {
-            return this.daysRemain > 0 && this.daysRemain <= this.lastTrialDays;
-        };
         ServiceSubscription.prototype.isRenewable = function () {
             return !this.isTrial && this.isActive;
         };
@@ -7601,7 +7599,7 @@
             return this.items.length === ServiceProduct.quantity;
         };
         ServiceSubscription.prototype.isAnnual = function () {
-            return !!(this.getItems().getPrices().annual.length || this.getItems().getPrices().annualPackage.length);
+            return !!(this.getItems().prices.annual.length || this.getItems().prices.annualPackage.length);
         };
         /**
          * Recommended number of properties to buy,
@@ -17661,12 +17659,10 @@
         AccountSetupService.prototype.createBatch = function (incomeTypes) {
             var batch = [];
             // Salary item is completed when user added salary income source
-            if (incomeTypes.salary) {
-                batch.push(this.create(AccountSetupItemsEnum.SALARY, this.getIncomeSources(true)));
-            }
-            // Other income item is completed when user added at least one other income source
-            if (incomeTypes.dividends || incomeTypes.other) {
-                batch.push(this.create(AccountSetupItemsEnum.OTHER_INCOME, this.getIncomeSources()));
+            if (incomeTypes.work) {
+                batch.push(this.create(AccountSetupItemsEnum.SALARY, this.getIncomeSources(true)), 
+                // Other income is a part of work tank, completed when user added at least one other income source
+                this.create(AccountSetupItemsEnum.OTHER_INCOME, this.getIncomeSources()));
             }
             // Rental income item is completed when user added at least one property
             if (incomeTypes.property) {
@@ -20079,11 +20075,10 @@
         function ClientIncomeTypesForm(clientIncomeTypes) {
             if (clientIncomeTypes === void 0) { clientIncomeTypes = classTransformer.plainToClass(ClientIncomeTypes, {}); }
             var _this = _super.call(this, {
-                salary: new forms.FormControl(clientIncomeTypes.salary),
+                work: new forms.FormControl(clientIncomeTypes.work),
                 property: new forms.FormControl(clientIncomeTypes.property),
                 sole: new forms.FormControl(clientIncomeTypes.sole),
-                dividends: new forms.FormControl(clientIncomeTypes.dividends),
-                other: new forms.FormControl(clientIncomeTypes.other)
+                holdings: new forms.FormControl({ value: clientIncomeTypes.holdings, disabled: true })
             }, clientIncomeTypes, atLeastOneCheckedValidator()) || this;
             _this.clientIncomeTypes = clientIncomeTypes;
             return _this;