taxtank-core 0.30.46 → 0.30.48

package/fesm2020/taxtank-core.mjs

@@ -1948,8 +1948,8 @@ var ChartAccountsCategoryEnum;
     ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["SOLE_INCOME"] = 12] = "SOLE_INCOME";
     ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["SOLE_EXPENSE"] = 13] = "SOLE_EXPENSE";
     ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["SOLE_DEPRECIATION"] = 14] = "SOLE_DEPRECIATION";
-    ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["HOLDING_EXPENSE"] = 15] = "HOLDING_EXPENSE";
-    ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["HOLDING_INCOME"] = 16] = "HOLDING_INCOME";
+    ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["HOLDING_INCOME"] = 15] = "HOLDING_INCOME";
+    ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["HOLDING_EXPENSE"] = 16] = "HOLDING_EXPENSE";
 })(ChartAccountsCategoryEnum || (ChartAccountsCategoryEnum = {}));
 
 var ChartAccountsEtpEnum;
@@ -7037,7 +7037,7 @@ class UserEventTypeCollection extends Collection {
 
 class HoldingCollection extends ExportableCollection {
     getExportHeader() {
-        return ['Date', 'Ticker', 'Asset type', 'Qty bought', 'Qty current', 'Buy price/Unit', 'Current price/Unit', 'Total MV', 'Profit/Loss'];
+        return ['Date', 'Ticker', 'Name', 'Asset type', 'Qty bought', 'Qty current', 'Buy price/Unit', 'Current price/Unit', 'Total MV', 'Profit/Loss'];
     }
     getExportFooter() {
         return [
@@ -7048,6 +7048,10 @@ class HoldingCollection extends ExportableCollection {
         return this.items.map((holding) => {
             return [
                 plainToClass(ExportCell, { value: holding.date, type: ExportCellTypeEnum.DATE }),
+                plainToClass(ExportCell, {
+                    value: this.holdingTypesById.get(holding.type.id).ticker,
+                    type: ExportCellTypeEnum.STRING
+                }),
                 plainToClass(ExportCell, {
                     value: this.holdingTypesById.get(holding.type.id).name,
                     type: ExportCellTypeEnum.STRING
@@ -7099,7 +7103,7 @@ class HoldingCollection extends ExportableCollection {
     }
 }
 
-class HoldingSaleCollection extends Collection {
+class HoldingSaleCollection extends ExportableCollection {
     /**
      * @TODO vik remove?
      */
@@ -7116,6 +7120,35 @@ class HoldingSaleCollection extends Collection {
     get noExemptionGrossCapitalGain() {
         return this.filter((sale) => sale.netCapitalGain > 0 && sale.netCapitalGain === sale.grossCapitalGain).grossCapitalGain;
     }
+    getExportHeader() {
+        return ['Ticker', 'Asset type', 'Date of buy', 'Date of sale', 'My Capital Gain/(Loss)', 'Exempt or Concession'];
+    }
+    getExportFooter() {
+        return [
+            plainToClass(ExportCell, { value: '', type: ExportCellTypeEnum.STRING }),
+        ];
+    }
+    getExportBody() {
+        return this.items.map((sale) => {
+            return [
+                plainToClass(ExportCell, {
+                    value: this.holdingTypesById.get(this.holdingsById.get(sale.holding.id).type.id).ticker,
+                    type: ExportCellTypeEnum.STRING
+                }),
+                plainToClass(ExportCell, {
+                    value: this.holdingsById.get(sale.holding.id).type.categoryLabel,
+                    type: ExportCellTypeEnum.STRING
+                }),
+                plainToClass(ExportCell, { value: this.holdingsById.get(sale.holding.id)?.date, type: ExportCellTypeEnum.DATE }),
+                plainToClass(ExportCell, { value: sale.date, type: ExportCellTypeEnum.DATE }),
+                plainToClass(ExportCell, { value: sale.grossCapitalGain, type: ExportCellTypeEnum.CURRENCY }),
+                plainToClass(ExportCell, {
+                    value: sale.isOneYearExemptionApplicable() ? '50% (1 year rule)' : 'None',
+                    type: ExportCellTypeEnum.STRING
+                }),
+            ];
+        });
+    }
 }
 
 class HoldingTypeCollection extends Collection {
@@ -16153,7 +16186,7 @@ const ACCOUNT_SETUP_ITEMS = {
  * Checks required steps and their completion
  */
 class AccountSetupService {
-    constructor(clientIncomeTypesService, propertyService, incomeSourceService, bankAccountsService, transactionAllocationService, vehicleClaimService, transactionService, soleBusinessService, holdingService) {
+    constructor(clientIncomeTypesService, propertyService, incomeSourceService, bankAccountsService, transactionAllocationService, vehicleClaimService, transactionService, soleBusinessService, holdingService, userService) {
         this.clientIncomeTypesService = clientIncomeTypesService;
         this.propertyService = propertyService;
         this.incomeSourceService = incomeSourceService;
@@ -16163,6 +16196,7 @@ class AccountSetupService {
         this.transactionService = transactionService;
         this.soleBusinessService = soleBusinessService;
         this.holdingService = holdingService;
+        this.userService = userService;
         this.cacheSubject = new ReplaySubject(1);
     }
     /**
@@ -16215,25 +16249,26 @@ class AccountSetupService {
      */
     createBatch(incomeTypes) {
         const batch = [];
+        const user = this.userService.getCache();
         // Salary item is completed when user added salary income source
-        if (incomeTypes.work) {
+        if (incomeTypes.work && user.hasRoles(UserRolesEnum.WORK_TANK)) {
             batch.push(this.create(AccountSetupItemsEnum.SALARY, this.getIncomeSources(true)), 
             // Other income is a part of work tank, completed when user added at least one other income source
             this.create(AccountSetupItemsEnum.OTHER_INCOME, this.getIncomeSources()));
         }
         // Rental income item is completed when user added at least one property
-        if (incomeTypes.property) {
+        if (incomeTypes.property && user.hasRoles(UserRolesEnum.PROPERTY_TANK)) {
             batch.push(this.create(AccountSetupItemsEnum.PROPERTY, this.propertyService.getArray()));
         }
         // Sole business item is completed when user added at least one business
-        if (incomeTypes.sole) {
+        if (incomeTypes.sole && user.hasRoles(UserRolesEnum.SOLE_TANK)) {
             batch.push(this.create(AccountSetupItemsEnum.SOLE_BUSINESS, this.soleBusinessService.get()));
         }
         // holdings item is completed when user added at least one holding
-        if (incomeTypes.holdings) {
+        if (incomeTypes.holdings && user.hasRoles(UserRolesEnum.HOLDING_TANK)) {
             batch.push(this.create(AccountSetupItemsEnum.HOLDINGS, this.holdingService.getArray()));
         }
-        if (incomeTypes.sole || incomeTypes.property || incomeTypes.work) {
+        if (incomeTypes.sole || incomeTypes.property || incomeTypes.work || incomeTypes.holdings) {
             // 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.getArray()));
             // Logbook item is completed when user has at least one vehicle claim with any method (kms or logbook)
@@ -16271,14 +16306,14 @@ class AccountSetupService {
         }));
     }
 }
-AccountSetupService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AccountSetupService, deps: [{ token: ClientIncomeTypesService }, { token: PropertyService }, { token: IncomeSourceService }, { token: BankAccountService }, { token: TransactionAllocationService }, { token: VehicleClaimService }, { token: TransactionService }, { token: SoleBusinessService }, { token: HoldingService }], target: i0.ɵɵFactoryTarget.Injectable });
+AccountSetupService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AccountSetupService, deps: [{ token: ClientIncomeTypesService }, { token: PropertyService }, { token: IncomeSourceService }, { token: BankAccountService }, { token: TransactionAllocationService }, { token: VehicleClaimService }, { token: TransactionService }, { token: SoleBusinessService }, { token: HoldingService }, { token: UserService }], target: i0.ɵɵFactoryTarget.Injectable });
 AccountSetupService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AccountSetupService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AccountSetupService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: ClientIncomeTypesService }, { type: PropertyService }, { type: IncomeSourceService }, { type: BankAccountService }, { type: TransactionAllocationService }, { type: VehicleClaimService }, { type: TransactionService }, { type: SoleBusinessService }, { type: HoldingService }]; } });
+        }], ctorParameters: function () { return [{ type: ClientIncomeTypesService }, { type: PropertyService }, { type: IncomeSourceService }, { type: BankAccountService }, { type: TransactionAllocationService }, { type: VehicleClaimService }, { type: TransactionService }, { type: SoleBusinessService }, { type: HoldingService }, { type: UserService }]; } });
 
 /**
  * Service to work with Rewardful (affiliate program) API
@@ -17179,6 +17214,10 @@ class XlsxService {
         xlsx.utils.book_append_sheet(workbook, worksheet);
         return xlsx.write(workbook, { bookType: 'xlsx', type: 'array' });
     }
+    /**
+     * @TODO vik/artem work with ExportDataTable instead of ExportableCollection
+     * @TODO vik/artem why so much code? here is 6 rows solution https://stackoverflow.com/questions/64939994/how-to-export-array-of-objects-to-an-excel-in-angular-8
+     */
     exportArrayToExcel(exportableCollection, name) {
         const workbook = xlsx.utils.book_new();
         // create empty worksheet
@@ -20192,7 +20231,8 @@ class HoldingSaleForm extends AbstractForm {
         this.get('netCapitalGain').setValue(this.calculateNetCapitalGain(totalCapitalGain, date));
     }
     calculateTotalCapitalGain(price, quantity, fee) {
-        return round((price - this.holding.price) * quantity - this.holding.fee - fee, 2);
+        const fees = quantity * this.holding.fee / this.holding.quantity + fee;
+        return round((price - this.holding.price) * quantity - fees, 2);
     }
     calculateNetCapitalGain(totalCapitalGain, date) {
         let netCapitalGain = (totalCapitalGain * this.holding.ownershipPercent) / 100;