taxtank-core 0.28.41 → 0.28.43

package/bundles/taxtank-core.umd.js

@@ -3046,7 +3046,7 @@
             var min = propertyItem.price.product.minQty;
             // if user has property subscription and number of properties doesn't exceed the maximum in the service product - return one more
             if (this.hasItem(propertyItem)) {
-                propertiesQty = propertiesQty < max ? propertiesQty + 1 : max;
+                propertiesQty = this.propertyQuantity < max ? this.propertyQuantity + 1 : max;
             }
             return Math.max(min, propertiesQty);
         };
@@ -8893,11 +8893,34 @@
             }
             return this.create(result);
         };
+        ReportItemCollection.prototype.getByCategory = function (categoryId) {
+            var e_2, _a;
+            var result = [];
+            try {
+                for (var _b = __values(this.items), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var reportItem = _c.value;
+                    if (reportItem.taxReturnCategory.id === categoryId) {
+                        result.push(reportItem);
+                    }
+                    else if (reportItem.items && reportItem.items.getByCategory(categoryId).length) {
+                        result.push.apply(result, __spreadArray([], __read(reportItem.items.getByCategory(categoryId))));
+                    }
+                }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+            return result;
+        };
         /**
          * Recursively find report item by Tax Return Category ID
          */
         ReportItemCollection.prototype.findByCategory = function (categoryId) {
-            var e_2, _a;
+            var e_3, _a;
             var result;
             try {
                 for (var _b = __values(this.items), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -8913,35 +8936,54 @@
                     }
                 }
             }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_2) throw e_2.error; }
+                finally { if (e_3) throw e_3.error; }
             }
             return result;
         };
         /**
-         * Get Collection of report items by Tax Return Categories IDs
+         * get Collection of report items by Tax Return Categories IDs (one item per category)
          */
-        ReportItemCollection.prototype.getByCategories = function (categories) {
+        ReportItemCollection.prototype.findByCategories = function (categories) {
             var _this = this;
             return this.create(compact__default["default"](categories.map(function (category) { return _this.findByCategory(category); })));
         };
+        /**
+         * Get Collection of report items by Tax Return Categories IDs (all items per category)
+         */
+        ReportItemCollection.prototype.getByCategories = function (categories) {
+            var _this = this;
+            var reportItems = [];
+            categories.forEach(function (category) {
+                reportItems.push.apply(reportItems, __spreadArray([], __read(_this.getByCategory(category))));
+            });
+            return this.create(reportItems);
+        };
         /**
          * A short call to a chain of methods that we often use.
          * Get total amount of report items by Tax Return categories and Tax Summary Section.
          */
         ReportItemCollection.prototype.sumByCategoriesAndSection = function (categories, section) {
-            return this.getByCategories(categories).getBySection(section).sumBy('amount');
+            return this.findByCategories(categories).getBySection(section).sumBy('amount');
+        };
+        /**
+         * @TODO vik refactor once Nicole approved
+         * unlike sumByCategoriesAndSection, which find just one reportItem per category,
+         * this method will search for recursively for all matches
+         */
+        ReportItemCollection.prototype.sumByCategories = function (categories) {
+            return this.getByCategories(categories).sumBy('amount');
         };
         /**
          * Get collection of all report item details related to passed income source
          * @TODO Alex: consider to create and move to ReportItemDetailsCollection
          */
         ReportItemCollection.prototype.getDetailsByIncomeSource = function (incomeSource) {
-            var e_3, _a;
+            var e_4, _a;
             var result = [];
             try {
                 for (var _b = __values(this.items), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -8954,12 +8996,12 @@
                     }
                 }
             }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            catch (e_4_1) { e_4 = { error: e_4_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_3) throw e_3.error; }
+                finally { if (e_4) throw e_4.error; }
             }
             return new Collection(result);
         };
@@ -9027,6 +9069,9 @@
         TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_OFFSETS_MIDDLE"] = 62] = "TAX_OFFSETS_MIDDLE";
         TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_OFFSETS_SOLE"] = 63] = "TAX_OFFSETS_SOLE";
         TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_PAYABLE"] = 28] = "TAX_PAYABLE";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["BUSINESS_INCOME_OR_LOSS"] = 59] = "BUSINESS_INCOME_OR_LOSS";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["DEFERRED_BUSINESS_LOSSES_FROM_PRIOR_YEAR"] = 64] = "DEFERRED_BUSINESS_LOSSES_FROM_PRIOR_YEAR";
+        TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["DEFERRED_BUSINESS_LOSSES"] = 60] = "DEFERRED_BUSINESS_LOSSES";
     })(exports.TaxReturnCategoryListEnum || (exports.TaxReturnCategoryListEnum = {}));
 
     var TAX_RETURN_CATEGORIES = {
@@ -9112,10 +9157,15 @@
                 exports.TaxReturnCategoryListEnum.RENT_EXPENSES,
                 exports.TaxReturnCategoryListEnum.INTEREST_EXPENSES_WITHIN_AUSTRALIA,
                 exports.TaxReturnCategoryListEnum.INTEREST_EXPENSES_OVERSEAS,
-                exports.TaxReturnCategoryListEnum.DEPRECIATION_EXPENSES,
                 exports.TaxReturnCategoryListEnum.MOTOR_VEHICLE_EXPENSES,
                 exports.TaxReturnCategoryListEnum.ALL_OTHER_EXPENSES
             ],
+            depreciation: [
+                exports.TaxReturnCategoryListEnum.DEPRECIATION_EXPENSES,
+            ],
+            loss: [
+                exports.TaxReturnCategoryListEnum.DEFERRED_BUSINESS_LOSSES_FROM_PRIOR_YEAR,
+            ],
             taxOffsets: [
                 exports.TaxReturnCategoryListEnum.TAX_OFFSETS_SOLE
             ],
@@ -11855,7 +11905,7 @@
             get: function () {
                 var income = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.income, exports.TaxSummarySectionEnum.SOLE_TANK);
                 var expenses = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.expenses, exports.TaxSummarySectionEnum.SOLE_TANK);
-                return income - Math.abs(expenses);
+                return income + expenses;
             },
             enumerable: false,
             configurable: true
@@ -11866,9 +11916,11 @@
              * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
              */
             get: function () {
-                var income = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.income, exports.TaxSummarySectionEnum.SOLE_TANK);
-                var expenses = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.expenses, exports.TaxSummarySectionEnum.SOLE_TANK);
-                return income - Math.abs(expenses);
+                var income = this.sole.items.sumByCategories(TAX_RETURN_CATEGORIES.sole.income);
+                var expenses = this.sole.items.sumByCategories(TAX_RETURN_CATEGORIES.sole.expenses);
+                var depreciation = this.sole.items.sumByCategories(TAX_RETURN_CATEGORIES.sole.expenses);
+                var loss = this.sole.items.sumByCategories(TAX_RETURN_CATEGORIES.sole.loss);
+                return income + expenses + depreciation - loss;
             },
             enumerable: false,
             configurable: true
@@ -12297,8 +12349,9 @@
             return _this;
         }
         SoleInvoiceService.prototype.updateStatus = function (invoice, status) {
+            var updatedInvoice = Object.assign({}, invoice, { status: status });
             // use id only to avoid unexpected changes
-            return this.update(classTransformer.plainToClass(SoleInvoice, merge__default["default"]({}, { id: invoice.id }, { status: status })));
+            return this.update(updatedInvoice);
         };
         SoleInvoiceService.prototype.publish = function (invoice, document) {
             // use id only to avoid unexpected changes