taxtank-core 0.29.34 → 0.29.36

package/bundles/taxtank-core.umd.js

@@ -2166,6 +2166,27 @@
             (_b = this.items).push.apply(_b, __spreadArray([], __read(items)));
             return this.create(this.items);
         };
+        Collection.prototype.remove = function () {
+            var _this = this;
+            var items = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                items[_i] = arguments[_i];
+            }
+            items.forEach(function (item) {
+                var index = _this.findIndexBy('id', item.id);
+                if (index < 0) {
+                    return;
+                }
+                _this.items.splice(index, 1);
+            });
+            return this;
+        };
+        /**
+         * @TODO it's filter, not remove
+         */
+        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.replaceBy = function (path, value, item) {
             var index = this.findIndexBy(path, value);
             if (index >= 0) {
@@ -2173,12 +2194,9 @@
             }
             return this;
         };
-        Collection.prototype.remove = function (items) {
+        Collection.prototype.diff = function (items) {
             return this.filter(function (model) { return !items.map(function (item) { return item.id; }).includes(model.id); });
         };
-        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); });
         };
@@ -2858,7 +2876,7 @@
                 activeProperties.getBestPerformanceGrowthProperty(),
                 activeProperties.getBestPerformanceTaxProperty(transactions, depreciations)
             ]).toArray(), 'id');
-            var newItems = this.remove(bestProperties).toArray();
+            var newItems = this.diff(bestProperties).toArray();
             newItems.unshift.apply(newItems, __spreadArray([], __read(bestProperties)));
             return this.create(newItems);
         };
@@ -6206,6 +6224,13 @@
         function ServiceProductCollection() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
+        Object.defineProperty(ServiceProductCollection.prototype, "title", {
+            get: function () {
+                return this.mapBy('title').join(', ');
+            },
+            enumerable: false,
+            configurable: true
+        });
         ServiceProductCollection.prototype.getActive = function () {
             return this.filterBy('status', exports.ServiceProductStatusEnum.ACTIVE);
         };
@@ -6342,6 +6367,9 @@
             // @TODO vik remove paid products
             return this.getInactive().getTrials();
         };
+        ServiceSubscriptionCollection.prototype.getExpiredAfter = function (date) {
+            return this.filter(function (item) { return !date || item.endDate >= date; });
+        };
         ServiceSubscriptionCollection.prototype.getPaid = function () {
             return this.filter(function (subscription) { return !!subscription.stripeId; });
         };
@@ -11105,8 +11133,8 @@
             return this.http.get(this.environment.apiV2 + "/users/current")
                 .pipe(operators.map(function (userBase) {
                 var user = classTransformer.plainToClass(User, userBase);
+                // @TODO Vik remove
                 localStorage.setItem('userId', user.id.toString());
-                // @TODO remove
                 localStorage.setItem('financialYear', user.financialYear.toString());
                 _this.cache = user;
                 _this.cacheSubject.next(_this.cache);
@@ -20077,10 +20105,10 @@
         function ClientIncomeTypesForm(clientIncomeTypes) {
             if (clientIncomeTypes === void 0) { clientIncomeTypes = classTransformer.plainToClass(ClientIncomeTypes, {}); }
             var _this = _super.call(this, {
-                work: new forms.FormControl(clientIncomeTypes.work),
-                property: new forms.FormControl(clientIncomeTypes.property),
-                sole: new forms.FormControl(clientIncomeTypes.sole),
-                holdings: new forms.FormControl({ value: clientIncomeTypes.holdings, disabled: true })
+                work: new forms.FormControl(clientIncomeTypes.work || false),
+                property: new forms.FormControl(clientIncomeTypes.property || false),
+                sole: new forms.FormControl(clientIncomeTypes.sole || false),
+                holdings: new forms.FormControl({ value: clientIncomeTypes.holdings || false, disabled: true })
             }, clientIncomeTypes, atLeastOneCheckedValidator()) || this;
             _this.clientIncomeTypes = clientIncomeTypes;
             return _this;