taxtank-core 0.28.69 → 0.28.70

package/fesm2015/taxtank-core.js

@@ -2908,19 +2908,22 @@ class TransactionBase extends AbstractModel {
         return !!this.business;
     }
     get amountWithGst() {
-        return this.isGST ? +(this.amount * ChartAccounts.GSTCoefficient).toFixed(2) : this.amount;
+        return this.isGST ? this.amount * ChartAccounts.GSTCoefficient : this.amount;
     }
     get gstAmount() {
-        return +(this.amountWithGst - this.amount).toFixed(2);
+        return this.amountWithGst - this.amount;
     }
     get gstClaimAmount() {
         return this.gstAmount * this.claimRatio;
     }
+    /**
+     * base grossAmount, extends in child classes
+     */
     get grossAmount() {
         return this.amount + this.gstAmount;
     }
     get grossClaimAmount() {
-        return +(this.grossAmount * (this.claimPercent / 100)).toFixed(2);
+        return this.grossAmount * this.claimRatio;
     }
 }
 __decorate([
@@ -3447,8 +3450,7 @@ class Depreciation extends Depreciation$1 {
         var _a, _b;
         return plainToClass(Transaction, Object.assign(params, this, {
             amount: -((_a = this.currentYearForecast) === null || _a === void 0 ? void 0 : _a.amount) || 0,
-            claimAmount: ((_b = this.currentYearForecast) === null || _b === void 0 ? void 0 : _b.claimAmount) || 0,
-            date: this.purchaseDate
+            claimAmount: -((_b = this.currentYearForecast) === null || _b === void 0 ? void 0 : _b.claimAmount) || 0,
         }));
     }
     /**
@@ -3459,18 +3461,17 @@ class Depreciation extends Depreciation$1 {
         return ((_a = this.currentYearForecast) === null || _a === void 0 ? void 0 : _a.claimAmount) || 0;
     }
     get amountWithGst() {
-        // only new assets
-        if (new FinancialYear(this.purchaseDate).year !== new FinancialYear().year) {
-            return this.amount;
+        // gst applies only to new assets
+        if (this.isNew()) {
+            return super.amountWithGst;
         }
-        return super.amountWithGst;
+        return this.amount;
     }
     /**
-     * @TODO temporary hack, in future backend should return negative numbers
+     * assets purchased in the current financial year
      */
-    get grossAmount() {
-        var _a;
-        return -((_a = this.currentYearForecast) === null || _a === void 0 ? void 0 : _a.amount) - this.gstAmount;
+    isNew() {
+        return new FinancialYear(this.purchaseDate).year === new FinancialYear().year;
     }
 }
 Depreciation.WRITTEN_OFF_THRESHOLD = 300;
@@ -3662,12 +3663,12 @@ class Transaction extends Transaction$1 {
     isAllocated(allocations) {
         return this.grossAmount === this.getAllocatedAmount(allocations);
     }
-    /**
-     * Get transaction allocated amount
-     */
     getAllocatedAmount(allocations) {
         return allocations.filterBy('transaction.id', this.id).sumBy('amount');
     }
+    getAllocatedClaimAmount(allocations) {
+        return this.getAllocatedAmount(allocations) * this.claimRatio;
+    }
     /**
      * Get transaction unallocated amount
      */
@@ -6205,17 +6206,11 @@ class TransactionCollection extends ExportableCollection {
     constructor(transactions = [], depreciations = []) {
         super([...transactions, ...depreciations.map((depreciation) => depreciation.toTransaction())]);
     }
-    /**
-     * Get business related transactions
-     */
-    getWithBusiness() {
-        return this.filter((transaction) => !!transaction.business);
+    getSoleTransactions() {
+        return this.filter((transaction) => transaction.isSoleTank());
     }
-    /**
-     * Get total amount of all transactions in the collection
-     */
     get amount() {
-        return +this.items.reduce((sum, transaction) => sum + transaction.amount, 0).toFixed(2);
+        return this.sumBy('amount');
     }
     /**
      * Difference between allocated amount and total amount
@@ -6413,17 +6408,17 @@ class TransactionCollection extends ExportableCollection {
         return 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
      */
-    calculateAllocatedGST(allocations) {
-        const allocationsByTransaction = allocations.groupBy('transaction.id');
-        let allocatedGST = 0;
+    calculateAllocatedClaimAmount(allocations) {
+        let allocatedClaimAmount = 0;
         this.filterBy('isGST', true).toArray().forEach((transaction) => {
-            allocatedGST += allocationsByTransaction.get(transaction.id).sumBy('amount') * transaction.claimRatio * ChartAccounts.GSTRatio;
+            allocatedClaimAmount += transaction.getAllocatedClaimAmount(allocations);
         });
-        return allocatedGST;
+        return allocatedClaimAmount;
+    }
+    calculateAllocatedGST(allocations) {
+        return this.calculateAllocatedClaimAmount(allocations) * ChartAccounts.GSTRatio;
     }
     getAllocatedAmount(allocations) {
         return allocations.getByTransactionsIds(this.getIds()).sumBy('amount');
@@ -6472,23 +6467,11 @@ class TransactionAllocationCollection extends Collection {
  * used to combine transactions/depreciations
  */
 class TransactionBaseCollection extends Collection {
-    filterByBusiness(business) {
-        return this.filterBy('business.id', business.id);
-    }
     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);
     }
-    /**
-     * Get business related transactions
-     */
-    getWithBusiness() {
-        return this.filter((transaction) => !!transaction.business);
-    }
-    getIncomeTransactions() {
-        return this.create(this.items.filter((transaction) => transaction.isIncome()));
-    }
-    getExpenseTransactions() {
-        return this.create(this.items.filter((transaction) => transaction.isExpense() && !transaction.isInterest()));
+    getSoleTransactions() {
+        return this.filter((transaction) => transaction.isSoleTank());
     }
 }
 
@@ -6776,17 +6759,11 @@ class ClientPortfolioReportCollection extends Collection {
  * @TODO extend from TransactionBaseCollection
  */
 class DepreciationCollection extends Collection {
-    /**
-     * Get business related transactions
-     */
-    getWithBusiness() {
-        return this.filter((depreciation) => !!depreciation.business);
+    getSoleTransactions() {
+        return this.filter((depreciation) => depreciation.isSoleTank());
     }
-    /**
-     * assets purchased in the current financial year
-     */
     getNew() {
-        return this.filter((depreciation) => new FinancialYear(depreciation.purchaseDate).year === new FinancialYear().year);
+        return this.filter((depreciation) => depreciation.isNew());
     }
     /**
      * Get total amount of all depreciations in the collection