taxtank-core 0.28.61 → 0.28.63

package/bundles/taxtank-core.umd.js

@@ -13325,8 +13325,8 @@
         AccountSetupItemsEnum[AccountSetupItemsEnum["PROPERTY"] = 2] = "PROPERTY";
         AccountSetupItemsEnum[AccountSetupItemsEnum["BANK_FEEDS"] = 3] = "BANK_FEEDS";
         AccountSetupItemsEnum[AccountSetupItemsEnum["WORK_LOGBOOK"] = 4] = "WORK_LOGBOOK";
-        AccountSetupItemsEnum[AccountSetupItemsEnum["SOLE_INCOME"] = 5] = "SOLE_INCOME";
-        AccountSetupItemsEnum[AccountSetupItemsEnum["TRANSACTION"] = 6] = "TRANSACTION";
+        AccountSetupItemsEnum[AccountSetupItemsEnum["TRANSACTION"] = 5] = "TRANSACTION";
+        AccountSetupItemsEnum[AccountSetupItemsEnum["SOLE_BUSINESS"] = 6] = "SOLE_BUSINESS";
     })(AccountSetupItemsEnum || (AccountSetupItemsEnum = {}));
 
     var _a;
@@ -13367,19 +13367,19 @@
             url: '/client/work-tank/logbook',
             urlFragment: 'productTour'
         }),
-        _a[AccountSetupItemsEnum.SOLE_INCOME] = classTransformer.plainToClass(AccountSetupItem, {
-            title: 'Add your business details',
-            description: 'Add your business details, logo and payment terms to create invoice templates in minutes.',
-            url: '/client/sole-tank/forecasting',
-            urlFragment: 'productTour',
-            clientIncomeTypes: ['sole']
-        }),
         _a[AccountSetupItemsEnum.TRANSACTION] = classTransformer.plainToClass(AccountSetupItem, {
             title: 'Allocate transactions',
             description: 'Select one or multiple transactions, the category from the dropdown and attach your receipt. It’s that simple to capture every possible deduction, and keep organised all throughout the year.',
             url: '/client/bank-feeds',
             urlFragment: 'allocationProductTour',
         }),
+        _a[AccountSetupItemsEnum.SOLE_BUSINESS] = classTransformer.plainToClass(AccountSetupItem, {
+            title: 'Add your Sole Trader business',
+            description: 'Add up to 6 sole trader businesses to seamlessly manage invoicing, payments, BAS and prior even losses for every hustle without the hassle!',
+            url: '/client/sole-tank',
+            urlFragment: 'productTour',
+            clientIncomeTypes: ['sole']
+        }),
         _a);
 
     /**
@@ -14375,7 +14375,7 @@
      * Checks required steps and their completion
      */
     var AccountSetupService = /** @class */ (function () {
-        function AccountSetupService(clientIncomeTypesService, propertyService, incomeSourceService, bankAccountsService, transactionAllocationService, vehicleClaimService, transactionService) {
+        function AccountSetupService(clientIncomeTypesService, propertyService, incomeSourceService, bankAccountsService, transactionAllocationService, vehicleClaimService, transactionService, soleBusinessService) {
             this.clientIncomeTypesService = clientIncomeTypesService;
             this.propertyService = propertyService;
             this.incomeSourceService = incomeSourceService;
@@ -14383,6 +14383,7 @@
             this.transactionAllocationService = transactionAllocationService;
             this.vehicleClaimService = vehicleClaimService;
             this.transactionService = transactionService;
+            this.soleBusinessService = soleBusinessService;
             this.cacheSubject = new rxjs.ReplaySubject(1);
         }
         /**
@@ -14450,20 +14451,14 @@
             if (incomeTypes.property) {
                 batch.push(this.create(AccountSetupItemsEnum.PROPERTY, this.propertyService.get()));
             }
+            // Sole business item is completed when user added at least one business
+            if (incomeTypes.sole) {
+                batch.push(this.create(AccountSetupItemsEnum.SOLE_BUSINESS, this.soleBusinessService.get()));
+            }
             // Bank feeds item is completed when user added at least one bank account (basiq or manual)
             batch.push(this.create(AccountSetupItemsEnum.BANK_FEEDS, this.bankAccountsService.get()));
             // Logbook item is completed when user has at least one vehicle claim with any method (kms or logbook)
             batch.push(this.getLogbookItem());
-            // @TODO waiting for sole tank forecast page
-            // Sole item is completed when user added at least one sole income source
-            // if (incomeTypes.soleTrader) {
-            //   batch.push(
-            //     this.prepareItem(
-            //       AccountSetupItemsEnum.SOLE_INCOME,
-            //       this.getIncomeSourcesByType(IncomeSourceTypeEnum.SOLE)
-            //     )
-            //   );
-            // }
             // Allocation item is completed when user added at least one transaction allocation
             batch.push(this.create(AccountSetupItemsEnum.TRANSACTION, this.transactionAllocationService.get()));
             return rxjs.combineLatest(batch).pipe(operators.map(function (items) { return new AccountSetupItemCollection(items); }));
@@ -14499,14 +14494,14 @@
         };
         return AccountSetupService;
     }());
-    AccountSetupService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AccountSetupService, deps: [{ token: ClientIncomeTypesService }, { token: PropertyService }, { token: IncomeSourceService }, { token: BankAccountService }, { token: TransactionAllocationService }, { token: VehicleClaimService }, { token: TransactionService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    AccountSetupService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AccountSetupService, deps: [{ token: ClientIncomeTypesService }, { token: PropertyService }, { token: IncomeSourceService }, { token: BankAccountService }, { token: TransactionAllocationService }, { token: VehicleClaimService }, { token: TransactionService }, { token: SoleBusinessService }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
     AccountSetupService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AccountSetupService, providedIn: 'root' });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.16", ngImport: i0__namespace, type: AccountSetupService, decorators: [{
                 type: i0.Injectable,
                 args: [{
                         providedIn: 'root'
                     }]
-            }], ctorParameters: function () { return [{ type: ClientIncomeTypesService }, { type: PropertyService }, { type: IncomeSourceService }, { type: BankAccountService }, { type: TransactionAllocationService }, { type: VehicleClaimService }, { type: TransactionService }]; } });
+            }], ctorParameters: function () { return [{ type: ClientIncomeTypesService }, { type: PropertyService }, { type: IncomeSourceService }, { type: BankAccountService }, { type: TransactionAllocationService }, { type: VehicleClaimService }, { type: TransactionService }, { type: SoleBusinessService }]; } });
 
     var AddressService = /** @class */ (function () {
         function AddressService(http, environment) {
@@ -18797,10 +18792,6 @@
                     _this.disableItemGST(itemForm);
                 });
             }
-            else {
-                // set tax type as 'Tax Exclusive' by default for new invoice if soleDetails.isGST === true
-                _this.get('taxType').setValue(_this.invoice.id ? _this.invoice.taxType : exports.SoleInvoiceTaxTypeEnum.TAX_EXCLUSIVE);
-            }
             _this.listenEvents();
             return _this;
         }