taxtank-core 0.28.50 → 0.28.52

package/bundles/taxtank-core.umd.js

@@ -1074,6 +1074,7 @@
         SOLE_BUSINESS_LOSSES_POST: new Endpoint('POST', '\\/sole-business-losses'),
         SOLE_BUSINESS_LOSSES_PUT: new Endpoint('PUT', '\\/sole-business-losses\\/\\d+'),
         SOLE_BUSINESS_LOSS_OFFSET_RULES_GET: new Endpoint('GET', '\\/sole-business-loss-offset-rules'),
+        SOLE_BUSINESS_LOGO_POST: new Endpoint('POST', '\\/sole-businesses\\/\\d+\\/logo'),
         SOLE_CONTACTS_POST: new Endpoint('POST', '\\/sole-contacts'),
         SOLE_CONTACTS_PUT: new Endpoint('PUT', '\\/sole-contacts\\/\\d+'),
         BUSINESS_ACTIVITIES_GET: new Endpoint('GET', '\\/sole-business-activities'),
@@ -11190,6 +11191,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;
@@ -11300,7 +11302,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)
@@ -11327,14 +11329,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)
@@ -11345,21 +11355,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;
     }());
 
@@ -12423,6 +12426,13 @@
         UserEventSettingFieldEnum["FREQUENCY"] = "frequency";
     })(exports.UserEventSettingFieldEnum || (exports.UserEventSettingFieldEnum = {}));
 
+    var MessagesEnum$1;
+    (function (MessagesEnum) {
+        MessagesEnum["LOGO_UPDATED"] = "Logo updated successfully";
+        MessagesEnum["LOGO_ERROR_FORMAT"] = "Wrong file format. Allowed extensions: jpg, img, png";
+        MessagesEnum["LOGO_ERROR_SIZE"] = "The file is too big. Maximum size is 2mb";
+    })(MessagesEnum$1 || (MessagesEnum$1 = {}));
+
     var SoleBusinessService = /** @class */ (function (_super) {
         __extends(SoleBusinessService, _super);
         function SoleBusinessService() {
@@ -12439,6 +12449,25 @@
                 return business;
             }));
         };
+        SoleBusinessService.prototype.uploadLogo = function (business, file) {
+            var _this = this;
+            var formData = new FormData();
+            formData.append('file', file);
+            return this.http.post(this.environment.apiV2 + "/" + this.url + "/" + business.id + "/logo", formData)
+                .pipe(operators.map(function (updatedBusiness) {
+                var tempCache = cloneDeep__default["default"](_this.cache);
+                replace(tempCache, classTransformer.plainToClass(SoleBusiness, updatedBusiness));
+                _this.cache = tempCache;
+                _this.cacheSubject.next(_this.cache);
+                _this.toastService.success(MessagesEnum$1.LOGO_UPDATED);
+            }), operators.catchError(function (error) {
+                // Show error when user provided wrong image (format or size)
+                if (error.status === 422) {
+                    _this.toastService.error(error.error.violations[0].message);
+                }
+                return throwError.throwError(error);
+            }));
+        };
         return SoleBusinessService;
     }(RestService));
     SoleBusinessService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: SoleBusinessService, deps: null, target: i0__namespace.ɵɵFactoryTarget.Injectable });
@@ -19350,7 +19379,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,
@@ -19359,11 +19388,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();
@@ -19504,6 +19532,10 @@
                     value: businessLosses.kmsTravelledExpensesAmount,
                     disabled: true
                 }),
+                logbookExpensesAmount: new forms.FormControl({
+                    value: businessLosses.logbookExpensesAmount,
+                    disabled: true
+                }),
                 otherExpensesAmount: new forms.FormControl({
                     value: businessLosses.otherExpensesAmount,
                     disabled: true