taxtank-core 0.28.42 → 0.28.44

package/bundles/taxtank-core.umd.js

@@ -7341,6 +7341,73 @@
         return VehicleLogbookCollection;
     }(Collection));
 
+    /**
+     * List of objects grouped by passed property
+     */
+    var Dictionary = /** @class */ (function () {
+        function Dictionary(items, path) {
+            if (path === void 0) { path = 'id'; }
+            this.items = {};
+            if (!items.length) {
+                return;
+            }
+            // Do nothing if provided path was not found in the 1st item
+            if (!hasIn__default["default"](items[0], path.split('.')[0])) {
+                return;
+            }
+            this.groupItems(items, path);
+        }
+        Dictionary.prototype.add = function (key, value) {
+            this.items[key] = value;
+        };
+        Dictionary.prototype.get = function (key) {
+            return this.items[key] !== undefined ? this.items[key] : null;
+        };
+        Dictionary.prototype.groupItems = function (items, path) {
+            var _this = this;
+            items.forEach(function (item) {
+                var key = get__default["default"](item, path);
+                // if object does not have property for grouping it will be grouped as 'other'
+                if (key === undefined) {
+                    key = 'other';
+                }
+                _this.items[key] = item;
+            });
+        };
+        return Dictionary;
+    }());
+
+    var SoleBusinessLossesCollection = /** @class */ (function (_super) {
+        __extends(SoleBusinessLossesCollection, _super);
+        function SoleBusinessLossesCollection() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        /**
+         * Calculate business losses applied to the current year
+         */
+        SoleBusinessLossesCollection.prototype.calculateBusinessLossApplied = function (transactions) {
+            var _this = this;
+            var transactionsByBusinessIds = new CollectionDictionary(transactions, 'business.id');
+            // Dictionary with pairs key = business id, value = business claim amount
+            var claimAmountsByBusinessId = new Dictionary([]);
+            transactionsByBusinessIds.keys.forEach(function (businessId) {
+                var businessClaimAmount = transactionsByBusinessIds
+                    .get(businessId)
+                    .getClaimAmountByBusinessId(+businessId);
+                // only businesses with positive income are included in the calculation
+                if (businessClaimAmount > 0) {
+                    claimAmountsByBusinessId.add(businessId, businessClaimAmount);
+                }
+            });
+            return Object.keys(claimAmountsByBusinessId.items).reduce(function (sum, businessId) {
+                var _a;
+                var lossOpenBalance = ((_a = _this.findBy('business.id', +businessId)) === null || _a === void 0 ? void 0 : _a.openBalance) || 0;
+                return sum + Math.min(lossOpenBalance, claimAmountsByBusinessId.get(businessId));
+            }, 0);
+        };
+        return SoleBusinessLossesCollection;
+    }(Collection));
+
     var SoleInvoiceCollection = /** @class */ (function (_super) {
         __extends(SoleInvoiceCollection, _super);
         function SoleInvoiceCollection() {
@@ -7864,8 +7931,14 @@
         function TransactionBaseCollection() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        TransactionBaseCollection.prototype.getClaimAmountByBusiness = function (business) {
-            return +this.filterBy('business.id', business.id).items.map(function (transaction) { return transaction instanceof Depreciation ? -transaction.claimAmount : transaction['claimAmount']; }).reduce(function (sum, claimAmount) { return sum + claimAmount; }, 0).toFixed(2);
+        TransactionBaseCollection.prototype.getClaimAmountByBusinessId = function (businessId) {
+            return +this.filterBy('business.id', businessId).items.map(function (transaction) { return transaction instanceof Depreciation ? -transaction.claimAmount : transaction['claimAmount']; }).reduce(function (sum, claimAmount) { return sum + claimAmount; }, 0).toFixed(2);
+        };
+        /**
+         * Get business related transactions
+         */
+        TransactionBaseCollection.prototype.getWithBusiness = function () {
+            return this.filter(function (transaction) { return !!transaction.business; });
         };
         return TransactionBaseCollection;
     }(Collection));
@@ -8071,42 +8144,6 @@
         return MessageCollection;
     }(Collection));
 
-    /**
-     * List of objects grouped by passed property
-     */
-    var Dictionary = /** @class */ (function () {
-        function Dictionary(items, path) {
-            if (path === void 0) { path = 'id'; }
-            this.items = {};
-            if (!items.length) {
-                return;
-            }
-            // Do nothing if provided path was not found in the 1st item
-            if (!hasIn__default["default"](items[0], path.split('.')[0])) {
-                return;
-            }
-            this.groupItems(items, path);
-        }
-        Dictionary.prototype.add = function (key, value) {
-            this.items[key] = value;
-        };
-        Dictionary.prototype.get = function (key) {
-            return this.items[key] !== undefined ? this.items[key] : null;
-        };
-        Dictionary.prototype.groupItems = function (items, path) {
-            var _this = this;
-            items.forEach(function (item) {
-                var key = get__default["default"](item, path);
-                // if object does not have property for grouping it will be grouped as 'other'
-                if (key === undefined) {
-                    key = 'other';
-                }
-                _this.items[key] = item;
-            });
-        };
-        return Dictionary;
-    }());
-
     exports.ChatStatusEnum = void 0;
     (function (ChatStatusEnum) {
         ChatStatusEnum[ChatStatusEnum["ACTIVE"] = 1] = "ACTIVE";
@@ -8893,11 +8930,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 +8973,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 +9033,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 +9106,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 +9194,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
             ],
@@ -11361,11 +11448,15 @@
     }());
 
     /**
-     * @Todo waiting for Sole tank implementation
+     * Sole business losses report
+     * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4644110466/Tax+Return+MyTax+-+Online+Form ("Losses" section)
      */
     var MyTaxLosses = /** @class */ (function () {
-        function MyTaxLosses(transactions) {
-            this.transactions = transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.DIVIDENDS);
+        function MyTaxLosses(transactions, businessLosses) {
+            this.transactions = transactions;
+            this.businessLosses = businessLosses;
+            this.businessLossDeferred = businessLosses.sumBy('openBalance');
+            this.businessLossApplied = businessLosses.calculateBusinessLossApplied(transactions);
         }
         return MyTaxLosses;
     }());
@@ -11855,7 +11946,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 +11957,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 +12390,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
@@ -19201,13 +19295,13 @@
         return MyTaxInterestForm;
     }(AbstractForm));
 
-    /**
-     * @Todo waiting for Sole tank implementation
-     */
     var MyTaxLossesForm = /** @class */ (function (_super) {
         __extends(MyTaxLossesForm, _super);
         function MyTaxLossesForm(losses) {
-            return _super.call(this, {}) || this;
+            return _super.call(this, {
+                businessLossDeferred: new forms.FormControl(losses.businessLossDeferred),
+                businessLossApplied: new forms.FormControl(losses.businessLossApplied)
+            }) || this;
         }
         return MyTaxLossesForm;
     }(AbstractForm));
@@ -19736,6 +19830,7 @@
     exports.SoleBusinessLossOffsetRuleService = SoleBusinessLossOffsetRuleService;
     exports.SoleBusinessLossReport = SoleBusinessLossReport;
     exports.SoleBusinessLossService = SoleBusinessLossService;
+    exports.SoleBusinessLossesCollection = SoleBusinessLossesCollection;
     exports.SoleBusinessService = SoleBusinessService;
     exports.SoleContact = SoleContact;
     exports.SoleContactForm = SoleContactForm;