taxtank-core 0.28.51 → 0.28.53

package/bundles/taxtank-core.umd.js

@@ -11200,6 +11200,7 @@
             this.businessActivities = uniqBy__default["default"](businesses.mapBy('activity'), 'id');
             this.businessABN = soleDetails === null || soleDetails === void 0 ? void 0 : soleDetails.abn;
             this.businessAddress = (_a = user.address) === null || _a === void 0 ? void 0 : _a.name;
+            this.businesses = businesses;
             this.vehicleClaimDetails = vehicleClaimDetails;
         }
         return MyTaxBusinessDetails;
@@ -11310,7 +11311,7 @@
      * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4644110466/Tax+Return+MyTax+-+Online+Form (section "Business income or losses")
      */
     var MyTaxBusinessLosses = /** @class */ (function () {
-        function MyTaxBusinessLosses(transactions, depreciations, businessLosses, currentLoss) {
+        function MyTaxBusinessLosses(transactions, depreciations, businessLosses, currentLoss, taxSummary) {
             this.currentLoss = currentLoss;
             this.purchasesAndOtherCostsAmount = Math.abs(transactions.getExpenseTransactions()
                 .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.PURCHASES_STOCK_INVENTORY)
@@ -11337,14 +11338,22 @@
                 .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.INTEREST_EXPENSES_OVERSEAS)
                 .sumBy('claimAmount'));
             this.kmsTravelledExpensesAmount = Math.abs(transactions
-                .filterBy('chartAccounts.heading.id', [exports.ChartAccountsHeadingListEnum.WORK_RELATED_CAR_EXPENSES, exports.ChartAccountsHeadingListEnum.DEPRECIATION_VEHICLES])
-                .sumBy('claimAmount'));
+                .filterBy('chartAccounts.category', [exports.ChartAccountsListEnum.KLMS_TRAVELLED])
+                .sumBy('claimAmount') +
+                depreciations
+                    .filterBy('chartAccounts.category', [exports.ChartAccountsListEnum.KLMS_TRAVELLED])
+                    .sumBy('claimAmount'));
+            this.logbookExpensesAmount = Math.abs(transactions.getVehicleTransactions().sumBy('claimAmount')) +
+                depreciations.getVehicleDepreciations().sumBy('claimAmount');
             this.otherExpensesAmount = Math.abs(transactions
                 .filterBy('chartAccounts.heading.id', exports.ChartAccountsHeadingListEnum.OTHER_EXPENSES)
                 .sumBy('claimAmount'));
             this.totalNonPrimaryProductionExpensesAmount = Math.abs(transactions
-                .filterBy('chartAccounts.category', [exports.ChartAccountsCategoryEnum.SOLE_EXPENSE, exports.ChartAccountsCategoryEnum.SOLE_DEPRECIATION])
-                .sumBy('claimAmount'));
+                .filterBy('chartAccounts.category', [exports.ChartAccountsCategoryEnum.SOLE_EXPENSE])
+                .sumBy('claimAmount')) +
+                depreciations
+                    .filterBy('chartAccounts.category', [exports.ChartAccountsCategoryEnum.SOLE_DEPRECIATION])
+                    .sumBy('claimAmount');
             // depreciations
             this.depreciationExpensesAmount = depreciations
                 .filterBy('chartAccounts.heading.id', exports.ChartAccountsHeadingListEnum.DEPRECIATION_EXPENSES)
@@ -11355,21 +11364,14 @@
             this.deductionsForGeneralSmallBusinessPoolAmount = depreciations
                 .getSBPDepreciations()
                 .sumBy('claimAmount');
-            this.currentYearNetNonPrimaryIncomeOrLossesAmount = transactions.getIncomeTransactions()
-                .filterBy('chartAccounts.category', exports.ChartAccountsCategoryEnum.SOLE_INCOME)
-                .amount -
-                Math.abs(transactions
-                    .filterBy('chartAccounts.category', [exports.ChartAccountsCategoryEnum.SOLE_EXPENSE, exports.ChartAccountsCategoryEnum.SOLE_DEPRECIATION])
-                    .sumBy('claimAmount'));
-            this.priorYearsNonPrimaryLossesAmount = this.calculatePriorYearsOpenBalance(businessLosses);
-            this.netNonPrimaryIncomeOrLossesAmount = transactions.getIncomeTransactions()
-                .filterBy('chartAccounts.category', exports.ChartAccountsCategoryEnum.SOLE_INCOME)
-                .amount -
+            this.currentYearNetNonPrimaryIncomeOrLossesAmount = +(transactions.sumBy('claimAmount') -
+                depreciations.sumBy('claimAmount'))
+                .toFixed(2);
+            this.priorYearsNonPrimaryLossesAmount = businessLosses.sumBy('openBalance');
+            this.netNonPrimaryIncomeOrLossesAmount = this.currentYearNetNonPrimaryIncomeOrLossesAmount -
                 this.priorYearsNonPrimaryLossesAmount;
+            this.deferredLossesAmount = taxSummary.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.lossCurrent, exports.TaxSummarySectionEnum.SOLE_TANK);
         }
-        MyTaxBusinessLosses.prototype.calculatePriorYearsOpenBalance = function (businessLosses) {
-            return businessLosses ? businessLosses.sumBy('openBalance') : 0;
-        };
         return MyTaxBusinessLosses;
     }());
 
@@ -19386,7 +19388,7 @@
         __extends(MyTaxBusinessDetailsForm, _super);
         function MyTaxBusinessDetailsForm(businessDetails) {
             var _this = this;
-            var _a, _b;
+            var _a;
             _this = _super.call(this, {
                 vehicleClaimMethod: new forms.FormControl({
                     value: (_a = businessDetails.vehicleClaimDetails) === null || _a === void 0 ? void 0 : _a.method,
@@ -19395,11 +19397,10 @@
                 businessType: new forms.FormControl({ value: exports.BusinessTypeEnum.SOLE_TRADER, disabled: true }),
                 // business details
                 mainBusinessActivity: new forms.FormControl(businessDetails.businessActivities[0]),
-                mainBusinessName: new forms.FormControl({ value: (_b = businessDetails.businesses) === null || _b === void 0 ? void 0 : _b.first.name, disabled: true }),
+                mainBusinessName: new forms.FormControl({ value: businessDetails.businesses.first.name, disabled: true }),
                 mainBusinessABN: new forms.FormControl({ value: businessDetails.businessABN, disabled: true }),
                 mainBusinessAddress: new forms.FormControl({ value: businessDetails.businessAddress, disabled: true }),
-                // By default, we show it as 1, but user can change it
-                numberOfBusinessActivities: new forms.FormControl(1)
+                numberOfBusinessActivities: new forms.FormControl(businessDetails.businessActivities.length)
             }) || this;
             _this.businessDetails = businessDetails;
             _this.listenEvents();
@@ -19540,6 +19541,10 @@
                     value: businessLosses.kmsTravelledExpensesAmount,
                     disabled: true
                 }),
+                logbookExpensesAmount: new forms.FormControl({
+                    value: businessLosses.logbookExpensesAmount,
+                    disabled: true
+                }),
                 otherExpensesAmount: new forms.FormControl({
                     value: businessLosses.otherExpensesAmount,
                     disabled: true