taxtank-core 0.30.59 → 0.30.60

package/lib/collections/asset-sale.collection.d.ts

@@ -0,0 +1,15 @@
+import { Collection } from './collection';
+import { AssetSale } from '../models';
+export declare class AssetSaleCollection extends Collection<AssetSale> {
+    get grossCapitalProfit(): number;
+    get fullExemptionSales(): this;
+    get fullExemptionGrossCapitalProfit(): number;
+    get halfExemptionGrossCapitalProfit(): number;
+    get noExemptionGrossCapitalProfit(): number;
+    get taxableGrossCapitalProfit(): number;
+    get currentYearCapitalLoss(): number;
+    /**
+     * NET CAPITAL GAIN/(LOSS) AFTER CONCESSIONS & DISCOUNTS
+     */
+    calculateNetCapitalGain(priorCapitalLoss: number): number;
+}

package/lib/collections/holding/holding-sale.collection.d.ts

@@ -1,14 +1,9 @@
 import { Dictionary, Holding, HoldingSale } from '../../models';
 import { ExportableCollection } from '../exportable.collection';
 import { ExportCell } from '../../models/export/export-cell';
+import { HoldingCollection } from './holding.collection';
 export declare class HoldingSaleCollection extends ExportableCollection<HoldingSale> {
-    /**
-     * @TODO vik remove?
-     */
-    get grossCapitalGain(): number;
-    get currentYearCapitalLoss(): number;
-    get halfExemptionGrossCapitalGain(): number;
-    get noExemptionGrossCapitalGain(): number;
+    filterByTaxFree(holdings: HoldingCollection, isTaxFree?: boolean): this;
     getExportHeader(): string[];
     getExportFooter(): ExportCell[];
     getExportBody(holdingsById: Dictionary<Holding>): ExportCell[][];

package/lib/collections/index.d.ts

@@ -28,3 +28,4 @@ export * from './tax-review.collection';
 export * from './user-event-setting.collection';
 export * from './user-event-type-collection';
 export * from './holding';
+export * from './asset-sale.collection';

package/lib/collections/property/property-sale/property-sale.collection.d.ts

@@ -1,17 +1,9 @@
 import { Collection } from '../../collection';
 import { PropertySale } from '../../../models';
 export declare class PropertySaleCollection extends Collection<PropertySale> {
-    /**
-     * @TODO vik remove?
-     */
-    get grossCapitalGain(): number;
     /**
      * Property sales are CGT applicable unless it has "Principle place of residence" exemption type
      */
     getCGTApplicable(): this;
     getByPropertyShareIds(ids: number[]): this;
-    get currentYearCapitalLoss(): number;
-    get fullExemptionGrossCapitalGain(): number;
-    get halfExemptionGrossCapitalGain(): number;
-    get noExemptionGrossCapitalGain(): number;
 }

package/lib/db/Models/abstract-model.d.ts

@@ -1,4 +1,7 @@
-export declare class AbstractModel {
+/**
+ * @TODO move from db folder when refactored base models
+ */
+export declare abstract class AbstractModel {
     id?: any;
     hasValue(value: any, path?: string): boolean;
 }

package/lib/db/Models/observable-model.d.ts

@@ -1,6 +1,7 @@
-import { RestMethod } from '../../services/http/rest';
+import { RestMethod } from '../../services';
 import { AbstractModel } from './abstract-model';
 /**
+ * @TODO move from db folder when refactored base models
  * Model, which children should be listened via event dispatcher service ising automatic events
  */
 export declare class ObservableModel extends AbstractModel {

package/lib/forms/holding/holding-sale.form.d.ts

@@ -7,7 +7,7 @@ export declare class HoldingSaleForm extends AbstractForm<HoldingSale> implement
     listenEvents(): void;
     submit(): HoldingSale;
     private updateGainFields;
-    private calculateTotalCapitalGain;
+    private calculateGrossCapitalGain;
     private calculateNetCapitalGain;
     private isOneYearExemptionApplicable;
 }

package/lib/models/asset-sale.d.ts

@@ -0,0 +1,7 @@
+import { ObservableModel } from '../db/Models';
+export declare abstract class AssetSale extends ObservableModel {
+    totalCapitalGain: number;
+    grossCapitalGain: number;
+    netCapitalGain: number;
+    date: Date;
+}

package/lib/models/holding/holding-sale.d.ts

@@ -1,16 +1,12 @@
 import { Holding } from './holding';
 import { AppFile } from '../file';
-import { ObservableModel } from '../../db/Models';
-export declare class HoldingSale extends ObservableModel {
+import { AssetSale } from '../asset-sale';
+export declare class HoldingSale extends AssetSale {
     quantity: number;
     price: number;
     fee: number;
     total: number;
-    totalCapitalGain: number;
-    grossCapitalGain: number;
-    netCapitalGain: number;
     holding?: Holding;
-    date: Date;
     file: AppFile;
     /**
      * netCapitalGain is different from grossCapitalGain only when 1 year rule applied

package/lib/models/index.d.ts

@@ -20,3 +20,4 @@ export * from './user';
 export * from './holding';
 export * from './client';
 export * from './income-source';
+export * from './asset-sale';

package/lib/models/property/property-sale/property-sale.d.ts

@@ -1,7 +1,10 @@
-import { PropertySale as BasePropertySale } from '../../../db/Models/property/property-sale/property-sale';
-import { PropertySaleTaxExemptionMetaField } from '../../../db/Models';
+import { PropertySaleTaxExemptionMetaField, PropertyShare } from '../../../db/Models';
 import { TaxExemption } from './tax-exemption';
-export declare class PropertySale extends BasePropertySale {
+import { AssetSale } from '../../asset-sale';
+export declare class PropertySale extends AssetSale {
+    createdAt: Date;
+    updatedAt: Date;
+    share: PropertyShare;
     holdingCosts: number;
     structuralImprovementsWDV: number;
     buildingAtCostClaimed: number;

package/lib/models/report/my-tax/my-tax-cgt/my-tax-cgt.d.ts

@@ -1,4 +1,4 @@
-import { PropertyCollection, PropertySaleCollection } from '../../../../collections';
+import { HoldingSaleCollection, PropertyCollection, PropertySaleCollection } from '../../../../collections';
 /**
  * @TODO vik/nicole test
  * Report related to Property sales CGT details.
@@ -6,15 +6,15 @@ import { PropertyCollection, PropertySaleCollection } from '../../../../collecti
  *
  */
 export declare class MyTaxCgt {
-    hasCapitalGain: boolean;
+    hasAssetSales: boolean;
     hasExemption: boolean;
-    netCapitalGain: number;
-    grossCapitalGain: number;
+    netCapitalProfit: number;
+    taxableGrossCapitalProfit: number;
     /**
      * Loss collected over the years
      */
     netCapitalLoss: number;
-    static createFrom(propertySales: PropertySaleCollection, properties: PropertyCollection, clientCapitalLoss: number): MyTaxCgt;
+    static createFrom(propertySales: PropertySaleCollection, holdingSales: HoldingSaleCollection, clientCapitalLoss: number): MyTaxCgt;
     /**
      * Exemption is applicable for PPR sales and properties acquired before Property.preCGTAssetDate
      * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4644110466/Tax+Return+MyTax+-+Online+Form ("Capital gains or losses" section)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taxtank-core",
-  "version": "0.30.59",
+  "version": "0.30.60",
   "private": false,
   "peerDependencies": {
     "@angular/compiler": "^15.1.5",