taxtank-core 0.28.50 → 0.28.52

package/fesm2015/taxtank-core.js

@@ -699,6 +699,7 @@ const ENDPOINTS = {
     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'),
@@ -8975,6 +8976,7 @@ class MyTaxBusinessDetails {
         this.businessActivities = uniqBy(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;
     }
 }
@@ -9083,7 +9085,7 @@ class MyTaxBusinessIncome {
  * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4644110466/Tax+Return+MyTax+-+Online+Form (section "Business income or losses")
  */
 class MyTaxBusinessLosses {
-    constructor(transactions, depreciations, businessLosses, currentLoss) {
+    constructor(transactions, depreciations, businessLosses, currentLoss, taxSummary) {
         this.currentLoss = currentLoss;
         this.purchasesAndOtherCostsAmount = Math.abs(transactions.getExpenseTransactions()
             .filterBy('chartAccounts.id', ChartAccountsListEnum.PURCHASES_STOCK_INVENTORY)
@@ -9110,14 +9112,22 @@ class MyTaxBusinessLosses {
             .filterBy('chartAccounts.id', ChartAccountsListEnum.INTEREST_EXPENSES_OVERSEAS)
             .sumBy('claimAmount'));
         this.kmsTravelledExpensesAmount = Math.abs(transactions
-            .filterBy('chartAccounts.heading.id', [ChartAccountsHeadingListEnum.WORK_RELATED_CAR_EXPENSES, ChartAccountsHeadingListEnum.DEPRECIATION_VEHICLES])
-            .sumBy('claimAmount'));
+            .filterBy('chartAccounts.category', [ChartAccountsListEnum.KLMS_TRAVELLED])
+            .sumBy('claimAmount') +
+            depreciations
+                .filterBy('chartAccounts.category', [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', ChartAccountsHeadingListEnum.OTHER_EXPENSES)
             .sumBy('claimAmount'));
         this.totalNonPrimaryProductionExpensesAmount = Math.abs(transactions
-            .filterBy('chartAccounts.category', [ChartAccountsCategoryEnum.SOLE_EXPENSE, ChartAccountsCategoryEnum.SOLE_DEPRECIATION])
-            .sumBy('claimAmount'));
+            .filterBy('chartAccounts.category', [ChartAccountsCategoryEnum.SOLE_EXPENSE])
+            .sumBy('claimAmount')) +
+            depreciations
+                .filterBy('chartAccounts.category', [ChartAccountsCategoryEnum.SOLE_DEPRECIATION])
+                .sumBy('claimAmount');
         // depreciations
         this.depreciationExpensesAmount = depreciations
             .filterBy('chartAccounts.heading.id', ChartAccountsHeadingListEnum.DEPRECIATION_EXPENSES)
@@ -9128,20 +9138,13 @@ class MyTaxBusinessLosses {
         this.deductionsForGeneralSmallBusinessPoolAmount = depreciations
             .getSBPDepreciations()
             .sumBy('claimAmount');
-        this.currentYearNetNonPrimaryIncomeOrLossesAmount = transactions.getIncomeTransactions()
-            .filterBy('chartAccounts.category', ChartAccountsCategoryEnum.SOLE_INCOME)
-            .amount -
-            Math.abs(transactions
-                .filterBy('chartAccounts.category', [ChartAccountsCategoryEnum.SOLE_EXPENSE, ChartAccountsCategoryEnum.SOLE_DEPRECIATION])
-                .sumBy('claimAmount'));
-        this.priorYearsNonPrimaryLossesAmount = this.calculatePriorYearsOpenBalance(businessLosses);
-        this.netNonPrimaryIncomeOrLossesAmount = transactions.getIncomeTransactions()
-            .filterBy('chartAccounts.category', 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;
-    }
-    calculatePriorYearsOpenBalance(businessLosses) {
-        return businessLosses ? businessLosses.sumBy('openBalance') : 0;
+        this.deferredLossesAmount = taxSummary.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.lossCurrent, TaxSummarySectionEnum.SOLE_TANK);
     }
 }
 
@@ -10058,6 +10061,13 @@ var UserEventSettingFieldEnum;
     UserEventSettingFieldEnum["FREQUENCY"] = "frequency";
 })(UserEventSettingFieldEnum || (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 = {}));
+
 class SoleBusinessService extends RestService {
     constructor() {
         super(...arguments);
@@ -10071,6 +10081,24 @@ class SoleBusinessService extends RestService {
             return business;
         }));
     }
+    uploadLogo(business, file) {
+        const formData = new FormData();
+        formData.append('file', file);
+        return this.http.post(`${this.environment.apiV2}/${this.url}/${business.id}/logo`, formData)
+            .pipe(map((updatedBusiness) => {
+            const tempCache = cloneDeep$1(this.cache);
+            replace(tempCache, plainToClass(SoleBusiness, updatedBusiness));
+            this.cache = tempCache;
+            this.cacheSubject.next(this.cache);
+            this.toastService.success(MessagesEnum$1.LOGO_UPDATED);
+        }), catchError((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$1(error);
+        }));
+    }
 }
 SoleBusinessService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleBusinessService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
 SoleBusinessService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: SoleBusinessService, providedIn: 'root' });
@@ -16394,7 +16422,7 @@ class PropertySaleExemptionsForm extends AbstractForm {
 
 class MyTaxBusinessDetailsForm extends AbstractForm {
     constructor(businessDetails) {
-        var _a, _b;
+        var _a;
         super({
             vehicleClaimMethod: new FormControl({
                 value: (_a = businessDetails.vehicleClaimDetails) === null || _a === void 0 ? void 0 : _a.method,
@@ -16403,11 +16431,10 @@ class MyTaxBusinessDetailsForm extends AbstractForm {
             businessType: new FormControl({ value: BusinessTypeEnum.SOLE_TRADER, disabled: true }),
             // business details
             mainBusinessActivity: new FormControl(businessDetails.businessActivities[0]),
-            mainBusinessName: new FormControl({ value: (_b = businessDetails.businesses) === null || _b === void 0 ? void 0 : _b.first.name, disabled: true }),
+            mainBusinessName: new FormControl({ value: businessDetails.businesses.first.name, disabled: true }),
             mainBusinessABN: new FormControl({ value: businessDetails.businessABN, disabled: true }),
             mainBusinessAddress: new FormControl({ value: businessDetails.businessAddress, disabled: true }),
-            // By default, we show it as 1, but user can change it
-            numberOfBusinessActivities: new FormControl(1)
+            numberOfBusinessActivities: new FormControl(businessDetails.businessActivities.length)
         });
         this.businessDetails = businessDetails;
         this.listenEvents();
@@ -16541,6 +16568,10 @@ class MyTaxBusinessLossesForm extends AbstractForm {
                 value: businessLosses.kmsTravelledExpensesAmount,
                 disabled: true
             }),
+            logbookExpensesAmount: new FormControl({
+                value: businessLosses.logbookExpensesAmount,
+                disabled: true
+            }),
             otherExpensesAmount: new FormControl({
                 value: businessLosses.otherExpensesAmount,
                 disabled: true