taxtank-core 0.29.1 → 0.29.3

package/lib/collections/collection.d.ts

@@ -44,4 +44,5 @@ export declare class Collection<Model extends AbstractModel> implements Iterable
     removeBy(path: string, values: any): this;
     minBy(path: string): Model;
     maxBy(path: string): Model;
+    reduce(callback: (sum: number, item: Model) => number, init?: number): number;
 }

package/lib/collections/depreciation.collection.d.ts

@@ -5,9 +5,6 @@ import { DepreciationCapitalProject } from '../models/depreciation/depreciation-
 import { TransactionCollection } from './transaction';
 import { ChartAccountsCategoryEnum } from '../db/Enums';
 import { VehicleClaim } from '../models';
-/**
- * @TODO extend from TransactionBaseCollection
- */
 export declare class DepreciationCollection extends Collection<Depreciation> {
     getSoleDepreciations(): this;
     getNew(): this;

package/lib/collections/sole/sole-business-losses.collection.d.ts

@@ -1,11 +1,11 @@
 import { Collection } from '../collection';
 import { SoleBusinessLoss } from '../../models';
-import { TransactionBaseCollection } from '../transaction';
+import { TransactionAllocationCollection, TransactionCollection } from '../transaction';
 export declare class SoleBusinessLossesCollection extends Collection<SoleBusinessLoss> {
     /**
      * Business loss applied in current year, includes previous year losses and current year losses for businesses matching offset rule
      */
-    calculateBusinessLossApplied(transactions: TransactionBaseCollection): number;
+    calculateBusinessLossApplied(transactions: TransactionCollection, allocations: TransactionAllocationCollection): number;
     /**
      * Get business claim amounts that can be applied to be reduced by prior year business losses:
      * businesses with income or businesses with a loss, but which met the non-commercial loss rules

package/lib/collections/transaction/index.d.ts

@@ -1,3 +1,2 @@
 export * from './transaction.collection';
 export * from './transaction-allocation.collection';
-export * from './transaction-base.collection';

package/lib/collections/transaction/transaction.collection.d.ts

@@ -8,12 +8,10 @@ import { Collection } from '../collection';
 import { ChartData } from '../../models/chart/chart-data';
 import { Depreciation } from '../../models/depreciation/depreciation';
 /**
- * @TODO extend from TransactionBaseCollection
  * Collection of transactions
  */
 export declare class TransactionCollection extends ExportableCollection<Transaction> {
     /**
-     * @TODO use TransactionBaseCollection instead
      * we use depreciations as expense transactions a lot
      */
     constructor(transactions?: Transaction[], depreciations?: Depreciation[]);
@@ -97,4 +95,8 @@ export declare class TransactionCollection extends ExportableCollection<Transact
     calculateAllocatedClaimAmount(allocations: TransactionAllocationCollection): number;
     calculateAllocatedGST(allocations: TransactionAllocationCollection): number;
     getAllocatedAmount(allocations: TransactionAllocationCollection): number;
+    /**
+     * @TODO vik business transactions calculated differently, separated collection?
+     */
+    getBusinessClaimAmount(businessId: number, allocations: TransactionAllocationCollection): number;
 }

package/lib/forms/sole/bas-report.form.d.ts

@@ -8,9 +8,6 @@ import { DepreciationCollection } from '../../collections/depreciation.collectio
  */
 export declare class BasReportForm extends AbstractForm<BasReport> {
     private report;
-    /**
-     * @TODO vik TransactionBaseCollection here and everywhere
-     */
     constructor(report: BasReport, transactions: TransactionCollection, allocations: TransactionAllocationCollection, depreciations: DepreciationCollection);
     submit(data?: object): BasReport;
 }

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

@@ -1,11 +1,12 @@
-import { TransactionBaseCollection, SoleBusinessLossesCollection } from '../../../../collections';
+import { SoleBusinessLossesCollection, TransactionAllocationCollection, TransactionCollection } from '../../../../collections';
 /**
  * Sole business losses report
  * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4644110466/Tax+Return+MyTax+-+Online+Form ("Losses" section)
  */
 export declare class MyTaxLosses {
-    private transactions;
     private businessLosses;
+    private transactions;
+    private allocations;
     /**
      * Losses carried forward from earlier income years
      */
@@ -14,5 +15,5 @@ export declare class MyTaxLosses {
      * Losses applied to the current year (until profit gets to $0)
      */
     businessLossApplied: number;
-    constructor(transactions: TransactionBaseCollection, businessLosses: SoleBusinessLossesCollection);
+    constructor(businessLosses: SoleBusinessLossesCollection, transactions: TransactionCollection, allocations: TransactionAllocationCollection);
 }

package/lib/models/report/sole/sole-business/sole-business-loss-report.d.ts

@@ -1,7 +1,8 @@
 import { SoleBusinessLoss } from '../../../sole';
-import { TransactionCollection } from '../../../../collections/transaction/transaction.collection';
+import { TransactionCollection } from '../../../../collections';
 import { DepreciationCollection } from '../../../../collections/depreciation.collection';
 import { AbstractModel } from '../../../../db/Models/abstract-model';
+import { TransactionAllocation } from '../../../transaction';
 /**
  * Class with business loss details
  * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/4641357930/Rules+when+a+business+makes+a+loss+Tax+Summary
@@ -16,5 +17,5 @@ export declare class SoleBusinessLossReport extends AbstractModel {
      */
     closeBalance: number;
     netIncome: number;
-    constructor(loss: SoleBusinessLoss, transactions: TransactionCollection, depreciations: DepreciationCollection);
+    constructor(loss: SoleBusinessLoss, transactions: TransactionCollection, depreciations: DepreciationCollection, allocations: TransactionAllocation[]);
 }

package/lib/models/tax-summary/tax-summary.d.ts

@@ -1,4 +1,5 @@
 import { TaxSummarySection } from './tax-summary-section';
+import { SoleBusiness } from '../sole';
 /**
  * @Todo refactor with base model when it will be provided
  * Tax summary report structure
@@ -52,4 +53,6 @@ export declare class TaxSummary {
      * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
      */
     get soleNetTotal(): number;
+    getDeferredBusinessLoss(business: SoleBusiness): number;
+    getBusinessCloseBalance(business: SoleBusiness): number;
 }

package/lib/models/transaction/transaction.d.ts

@@ -43,10 +43,6 @@ export declare class Transaction extends TransactionBase implements Expense, IRe
     isPersonal(): boolean;
     isInterest(): boolean;
     get chartAccountsCategories(): ChartAccountsCategoryEnum[];
-    /**
-     * Check if transaction has 'Kms travelled for work' chart accounts category
-     */
-    get isKmsChartAccountsCategory(): boolean;
     /**
      * Get transaction date
      */
@@ -91,6 +87,7 @@ export declare class Transaction extends TransactionBase implements Expense, IRe
      */
     get grossAmount(): number;
     /**
+     * @TODO vik confusing logic demanded by Nicole, we need a better ux to fix it
      * netAmount matches received payment (bankTransaction amount), includes gst and salary included adjustments
      * ie user received 1000$ salary including 100$ tips. NetAmount=1000$, amount=900$, tips=100$
      */

package/lib/services/transaction/transaction-calculation.service.d.ts

@@ -1,8 +1,6 @@
-import { TransactionAllocationCollection } from '../../collections/transaction/transaction-allocation.collection';
-import { TransactionCollection } from '../../collections/transaction/transaction.collection';
-import { Transaction } from '../../models/transaction/transaction';
+import { TransactionAllocationCollection, TransactionCollection, SoleInvoiceCollection } from '../../collections';
 import { Dictionary } from '../../models/dictionary/dictionary';
-import { SoleInvoiceCollection } from '../../collections';
+import { Transaction } from '../../models';
 import { CollectionDictionary } from '../../collections/collection-dictionary';
 import { BankTransactionCollection } from '../../collections/bank-transaction.collection';
 import * as i0 from "@angular/core";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taxtank-core",
-  "version": "0.29.1",
+  "version": "0.29.3",
   "private": false,
   "peerDependencies": {
     "@angular/common": "^12.2.3 || ~13.0.0",

package/esm2015/lib/collections/transaction/transaction-base.collection.js

@@ -1,14 +0,0 @@
-import { Collection } from '../collection';
-import { Depreciation } from '../../models/depreciation/depreciation';
-/**
- * used to combine transactions/depreciations
- */
-export class TransactionBaseCollection extends Collection {
-    getClaimAmountByBusinessId(businessId) {
-        return +this.filterBy('business.id', businessId).items.map((transaction) => transaction instanceof Depreciation ? -transaction.claimAmount : transaction['claimAmount']).reduce((sum, claimAmount) => sum + claimAmount, 0).toFixed(2);
-    }
-    getSoleTransactions() {
-        return this.filter((transaction) => transaction.isSoleTank());
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tYmFzZS5jb2xsZWN0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL2NvbGxlY3Rpb25zL3RyYW5zYWN0aW9uL3RyYW5zYWN0aW9uLWJhc2UuY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzNDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx3Q0FBd0MsQ0FBQztBQUV0RTs7R0FFRztBQUNILE1BQU0sT0FBTyx5QkFBMEIsU0FBUSxVQUEyQjtJQUN4RSwwQkFBMEIsQ0FBQyxVQUFrQjtRQUMzQyxPQUFPLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxhQUFhLEVBQUUsVUFBVSxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FDeEQsQ0FBQyxXQUE0QixFQUFFLEVBQUUsQ0FBQyxXQUFXLFlBQVksWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxhQUFhLENBQUMsQ0FDOUgsQ0FBQyxNQUFNLENBQUMsQ0FBQyxHQUFHLEVBQUUsV0FBbUIsRUFBRSxFQUFFLENBQUMsR0FBRyxHQUFHLFdBQVcsRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDMUUsQ0FBQztJQUVELG1CQUFtQjtRQUNqQixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxXQUE0QixFQUFFLEVBQUUsQ0FBQyxXQUFXLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FBQztJQUNqRixDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBUcmFuc2FjdGlvbkJhc2UgfSBmcm9tICcuLi8uLi9kYi9Nb2RlbHMvdHJhbnNhY3Rpb24vdHJhbnNhY3Rpb24tYmFzZSc7XG5pbXBvcnQgeyBDb2xsZWN0aW9uIH0gZnJvbSAnLi4vY29sbGVjdGlvbic7XG5pbXBvcnQgeyBEZXByZWNpYXRpb24gfSBmcm9tICcuLi8uLi9tb2RlbHMvZGVwcmVjaWF0aW9uL2RlcHJlY2lhdGlvbic7XG5cbi8qKlxuICogdXNlZCB0byBjb21iaW5lIHRyYW5zYWN0aW9ucy9kZXByZWNpYXRpb25zXG4gKi9cbmV4cG9ydCBjbGFzcyBUcmFuc2FjdGlvbkJhc2VDb2xsZWN0aW9uIGV4dGVuZHMgQ29sbGVjdGlvbjxUcmFuc2FjdGlvbkJhc2U+IHtcbiAgZ2V0Q2xhaW1BbW91bnRCeUJ1c2luZXNzSWQoYnVzaW5lc3NJZDogbnVtYmVyKTogbnVtYmVyIHtcbiAgICByZXR1cm4gK3RoaXMuZmlsdGVyQnkoJ2J1c2luZXNzLmlkJywgYnVzaW5lc3NJZCkuaXRlbXMubWFwKFxuICAgICAgKHRyYW5zYWN0aW9uOiBUcmFuc2FjdGlvbkJhc2UpID0+IHRyYW5zYWN0aW9uIGluc3RhbmNlb2YgRGVwcmVjaWF0aW9uID8gLXRyYW5zYWN0aW9uLmNsYWltQW1vdW50IDogdHJhbnNhY3Rpb25bJ2NsYWltQW1vdW50J11cbiAgICApLnJlZHVjZSgoc3VtLCBjbGFpbUFtb3VudDogbnVtYmVyKSA9PiBzdW0gKyBjbGFpbUFtb3VudCwgMCkudG9GaXhlZCgyKTtcbiAgfVxuXG4gIGdldFNvbGVUcmFuc2FjdGlvbnMoKTogdGhpcyB7XG4gICAgcmV0dXJuIHRoaXMuZmlsdGVyKCh0cmFuc2FjdGlvbjogVHJhbnNhY3Rpb25CYXNlKSA9PiB0cmFuc2FjdGlvbi5pc1NvbGVUYW5rKCkpO1xuICB9XG59XG4iXX0=

package/lib/collections/transaction/transaction-base.collection.d.ts

@@ -1,9 +0,0 @@
-import { TransactionBase } from '../../db/Models/transaction/transaction-base';
-import { Collection } from '../collection';
-/**
- * used to combine transactions/depreciations
- */
-export declare class TransactionBaseCollection extends Collection<TransactionBase> {
-    getClaimAmountByBusinessId(businessId: number): number;
-    getSoleTransactions(): this;
-}