taxtank-core 0.28.69 → 0.28.70

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

@@ -9,13 +9,7 @@ import { VehicleClaim } from '../models';
  * @TODO extend from TransactionBaseCollection
  */
 export declare class DepreciationCollection extends Collection<Depreciation> {
-    /**
-     * Get business related transactions
-     */
-    getWithBusiness(): this;
-    /**
-     * assets purchased in the current financial year
-     */
+    getSoleTransactions(): this;
     getNew(): this;
     /**
      * Get total amount of all depreciations in the collection

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

@@ -1,16 +1,9 @@
 import { TransactionBase } from '../../db/Models/transaction/transaction-base';
 import { Collection } from '../collection';
-import { SoleBusiness } from '../../models';
 /**
  * used to combine transactions/depreciations
  */
 export declare class TransactionBaseCollection extends Collection<TransactionBase> {
-    filterByBusiness(business: SoleBusiness): this;
     getClaimAmountByBusinessId(businessId: number): number;
-    /**
-     * Get business related transactions
-     */
-    getWithBusiness(): this;
-    getIncomeTransactions(): this;
-    getExpenseTransactions(): this;
+    getSoleTransactions(): this;
 }

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

@@ -19,13 +19,7 @@ export declare class TransactionCollection extends ExportableCollection<Transact
      * we use depreciations as expense transactions a lot
      */
     constructor(transactions?: Transaction[], depreciations?: Depreciation[]);
-    /**
-     * Get business related transactions
-     */
-    getWithBusiness(): this;
-    /**
-     * Get total amount of all transactions in the collection
-     */
+    getSoleTransactions(): this;
     get amount(): number;
     /**
      * Difference between allocated amount and total amount
@@ -109,10 +103,9 @@ export declare class TransactionCollection extends ExportableCollection<Transact
      */
     getCashPositionChartData(): ChartData[];
     /**
-     * user pays GST only from allocated part of income (the rest user didn't get, so don't have to pay)
-     *
-     * @param allocations
+     * user pays GST only from allocated part (or paid) of income
      */
+    calculateAllocatedClaimAmount(allocations: TransactionAllocationCollection): number;
     calculateAllocatedGST(allocations: TransactionAllocationCollection): number;
     getAllocatedAmount(allocations: TransactionAllocationCollection): number;
 }

package/lib/db/Models/transaction/transaction-base.d.ts

@@ -38,6 +38,9 @@ export declare class TransactionBase extends AbstractModel {
     get amountWithGst(): number;
     get gstAmount(): number;
     get gstClaimAmount(): number;
+    /**
+     * base grossAmount, extends in child classes
+     */
     get grossAmount(): number;
     get grossClaimAmount(): number;
 }

package/lib/models/depreciation/depreciation.d.ts

@@ -66,7 +66,7 @@ export declare class Depreciation extends DepreciationBase implements Expense, I
     get claimAmount(): number;
     get amountWithGst(): number;
     /**
-     * @TODO temporary hack, in future backend should return negative numbers
+     * assets purchased in the current financial year
      */
-    get grossAmount(): number;
+    isNew(): boolean;
 }

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

@@ -84,10 +84,8 @@ export declare class Transaction extends TransactionBase implements Expense, IRe
      * Check if transaction is completely allocated
      */
     isAllocated(allocations: TransactionAllocationCollection): boolean;
-    /**
-     * Get transaction allocated amount
-     */
     getAllocatedAmount(allocations: TransactionAllocationCollection): number;
+    getAllocatedClaimAmount(allocations: TransactionAllocationCollection): number;
     /**
      * Get transaction unallocated amount
      */

package/package.json

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