taxtank-core 0.33.6 → 0.33.7

package/fesm2022/taxtank-core.mjs

@@ -25,7 +25,6 @@ import round from 'lodash/round';
 import range from 'lodash/range';
 import { Validators, FormGroup, FormArray, UntypedFormControl, UntypedFormArray, UntypedFormGroup, FormControl } from '@angular/forms';
 import compact from 'lodash/compact';
-import concat from 'lodash/concat';
 import cloneDeep$1 from 'lodash/cloneDeep';
 import { EventSourcePolyfill } from 'event-source-polyfill/src/eventsource.min.js';
 import clone from 'lodash/clone';
@@ -465,57 +464,23 @@ class TransactionBase extends ObservableModel {
     /**
      * @TODO remove when AllocateForm is refactored and not merging with Transaction class which cause the issue
      */
-    set tankType(tankType) {
-    }
-    /**
-     * Check if current tank is Property
-     */
+    set tankType(tankType) { }
     isPropertyTank() {
-        // chart accounts may be empty for new instances
-        if (this.chartAccounts) {
-            return CHART_ACCOUNTS_CATEGORIES.property.includes(this.chartAccounts.category);
-        }
-        return !!this.property;
+        return CHART_ACCOUNTS_CATEGORIES.property.includes(this.chartAccounts?.category);
     }
-    /**
-     * Check if current tank is Work
-     */
     isWorkTank() {
-        // chart accounts may be empty for new instances
-        if (this.chartAccounts) {
-            return CHART_ACCOUNTS_CATEGORIES.work.includes(this.chartAccounts?.category);
-        }
-        return !this.isPropertyTank() && !this.isSoleTank();
+        return CHART_ACCOUNTS_CATEGORIES.work.includes(this.chartAccounts?.category);
     }
-    /**
-     * Check if current tank is Sole
-     */
     isSoleTank() {
-        // chart accounts may be empty for new instances
-        if (this.chartAccounts) {
-            return CHART_ACCOUNTS_CATEGORIES.sole.includes(this.chartAccounts?.category);
-        }
-        return !!this.business;
+        return CHART_ACCOUNTS_CATEGORIES.sole.includes(this.chartAccounts?.category);
     }
     isHoldingTank() {
-        // chart accounts may be empty for new instances
-        if (this.chartAccounts) {
-            return CHART_ACCOUNTS_CATEGORIES.holding.includes(this.chartAccounts?.category);
-        }
-        // @TODO Alex we need another way to distinguish work/holding
-        return !this.isPropertyTank() && !this.isSoleTank();
+        return CHART_ACCOUNTS_CATEGORIES.holding.includes(this.chartAccounts?.category);
     }
     isOtherTank() {
-        // chart accounts may be empty for new instances
-        if (!this.chartAccounts) {
-            return false;
-        }
         return CHART_ACCOUNTS_CATEGORIES.other.includes(this.chartAccounts?.category);
     }
     isPersonalTank() {
-        if (!this.chartAccounts) {
-            return false;
-        }
         return CHART_ACCOUNTS_CATEGORIES.personal.includes(this.chartAccounts?.category);
     }
     get amountWithGst() {
@@ -974,7 +939,7 @@ var BankAccountTypeEnum;
     BankAccountTypeEnum[BankAccountTypeEnum["SAVINGS"] = 2] = "SAVINGS";
     BankAccountTypeEnum[BankAccountTypeEnum["CREDIT_CARD"] = 3] = "CREDIT_CARD";
     // @TODO Alex: should be removed by backend (TT-2107)
-    // MORTGAGE = 4,
+    BankAccountTypeEnum[BankAccountTypeEnum["MORTGAGE"] = 4] = "MORTGAGE";
     BankAccountTypeEnum[BankAccountTypeEnum["LOAN"] = 5] = "LOAN";
     BankAccountTypeEnum[BankAccountTypeEnum["INVESTMENT"] = 6] = "INVESTMENT";
     BankAccountTypeEnum[BankAccountTypeEnum["TERM_DEPOSIT"] = 7] = "TERM_DEPOSIT";
@@ -2337,10 +2302,14 @@ class PropertyCollection extends Collection {
         return this.sumBy('growthPercent');
     }
     get marketValue() {
-        return this.sumBy('marketValue');
+        return this.sumBy('valuation.marketValue');
     }
-    get marketValueGrowth() {
-        return (this.marketValue - this.purchasePrice) / this.purchasePrice;
+    get sharedMarketValue() {
+        let sharedMarketValue = 0;
+        this.items.forEach(property => {
+            sharedMarketValue += property.shareRatio * property.marketValue;
+        });
+        return sharedMarketValue;
     }
     /**
      * Get list of unique property categories from collection
@@ -5831,9 +5800,6 @@ class Property extends Property$1 {
     get forecastedCashPosition() {
         return this.currentYearForecast?.cashPosition || 0;
     }
-    get marketValueGrowth() {
-        return (this.marketValue - this.purchasePrice) / this.marketValue;
-    }
     get myShare() {
         return this.shares.find((share) => share.user.id === +localStorage.getItem('userId'));
     }
@@ -6462,24 +6428,6 @@ class Transaction extends Transaction$1 {
     isInterest() {
         return this.chartAccounts.id === ChartAccountsListEnum.INTEREST_ON_LOAN;
     }
-    get chartAccountsCategories() {
-        switch (true) {
-            case this.isPersonal():
-                return CHART_ACCOUNTS_CATEGORIES.personal;
-            case this.isPropertyTank():
-                return CHART_ACCOUNTS_CATEGORIES.property;
-            case this.isSoleTank():
-                return CHART_ACCOUNTS_CATEGORIES.sole;
-            default:
-                return CHART_ACCOUNTS_CATEGORIES.work;
-        }
-    }
-    /**
-     * Get transaction date
-     */
-    getDate() {
-        return this.date;
-    }
     /**
      * Check if transaction type is vehicle
      */
@@ -6803,14 +6751,10 @@ class Depreciation extends Depreciation$1 {
         super(...arguments);
         this.forecasts = [];
         this.type = DepreciationTypeEnum.PLANT_EQUIPMENT;
-        /**
-         * @TODO remove after ? signs removed from db models
-         */
         this.amount = 0;
     }
-    static { this.WRITTEN_OFF_THRESHOLD = 300; }
-    static { this.LOW_VALUE_POOL_THRESHOLD = 1000; }
-    // Type checking
+    static { this.writtenOffThreshold = 300; }
+    static { this.lowValuePoolThreshold = 1000; }
     isCapital() {
         return this.type === DepreciationTypeEnum.CAPITAL_WORKS;
     }
@@ -6820,7 +6764,6 @@ class Depreciation extends Depreciation$1 {
     isAsset() {
         return this.type === DepreciationTypeEnum.PLANT_EQUIPMENT;
     }
-    // Calculation checking
     isSBPCalculation() {
         return this.calculation === DepreciationCalculationEnum.SBP;
     }
@@ -6839,7 +6782,7 @@ class Depreciation extends Depreciation$1 {
             && !this.isSBPCalculation()
             && this.isDiminishing()
             && !this.isWrittenOff()
-            && this.currentYearForecast.closeBalance <= Depreciation.LOW_VALUE_POOL_THRESHOLD;
+            && this.currentYearForecast.closeBalance <= Depreciation.lowValuePoolThreshold;
     }
     isSBP() {
         return this.isAsset() && this.isSBPCalculation() && !this.isWrittenOff();
@@ -6859,12 +6802,6 @@ class Depreciation extends Depreciation$1 {
     isVehicleDepreciation() {
         return this.chartAccounts.heading?.id === ChartAccountsHeadingVehicleListEnum.DEPRECIATION_VEHICLES;
     }
-    /**
-     * Get depreciation purchase date
-     */
-    getDate() {
-        return this.date;
-    }
     /**
      * @TODO Vik: Research a problem with depreciations without current year forecast
      */
@@ -6886,9 +6823,6 @@ class Depreciation extends Depreciation$1 {
     getCloseBalanceByYear(year) {
         return this.getForecastByYear(year)?.closeBalance || 0;
     }
-    isBuildingAtCost() {
-        return this.chartAccounts.id === ChartAccountsListEnum.BUILDING_AT_COST;
-    }
     /**
      * Create a new transaction from current depreciation
      */
@@ -6909,7 +6843,7 @@ class Depreciation extends Depreciation$1 {
     }
     get amountWithGst() {
         // gst applies only to new assets
-        if (this.isNew()) {
+        if (this.isCurrentYearBuy()) {
             return super.amountWithGst;
         }
         return this.amount;
@@ -6920,7 +6854,7 @@ class Depreciation extends Depreciation$1 {
     /**
      * assets purchased in the current financial year
      */
-    isNew() {
+    isCurrentYearBuy() {
         return new FinancialYear(this.date).year === new FinancialYear().year;
     }
 }
@@ -6954,7 +6888,7 @@ __decorate([
                 forecast.closeBalance < 1000 &&
                     obj.calculation === DepreciationCalculationEnum.DIMINISHING &&
                     obj.type === DepreciationTypeEnum.PLANT_EQUIPMENT &&
-                    !(obj.amount > Depreciation.WRITTEN_OFF_THRESHOLD && obj.amount < Depreciation.LOW_VALUE_POOL_THRESHOLD) &&
+                    !(obj.amount > Depreciation.writtenOffThreshold && obj.amount < Depreciation.lowValuePoolThreshold) &&
                     !(obj.writeOffDate && new FinancialYear(new Date(obj.writeOffDate)).year === obj.financialYear);
         });
         return value;
@@ -7092,7 +7026,7 @@ class TransactionCollection extends ExportableCollection {
      * Get new collection of property transactions
      */
     getPropertyTransactions() {
-        return new TransactionCollection(this.items.filter((transaction) => transaction.isPropertyTank()));
+        return this.filterBy('tankType', TankTypeEnum.PROPERTY);
     }
     getDebitTransactions() {
         return new TransactionCollection(this.items.filter((transaction) => transaction.isDebit()));
@@ -7125,19 +7059,7 @@ class TransactionCollection extends ExportableCollection {
      * Get new transaction collection filtered by tank type
      */
     getByTankType(tankType) {
-        return this.create(this.items.filter((transaction) => {
-            switch (tankType) {
-                case TankTypeEnum.PROPERTY:
-                    return transaction.isPropertyTank();
-                case TankTypeEnum.WORK:
-                    return transaction.isWorkTank();
-                case TankTypeEnum.SOLE:
-                    return transaction.isSoleTank();
-                // Transaction may be not related to any tank type (personal)
-                default:
-                    return false;
-            }
-        }));
+        return this.filterBy('tankType', tankType);
     }
     getExportHeader() {
         return ['Date', 'Description', 'Debit', 'Credit'];
@@ -7264,8 +7186,8 @@ class DepreciationCollection extends Collection {
     getSoleDepreciations() {
         return this.filter((depreciation) => depreciation.isSoleTank());
     }
-    getNew() {
-        return this.filter((depreciation) => depreciation.isNew());
+    getCurrentYearBuy() {
+        return this.filter(depreciation => depreciation.isCurrentYearBuy());
     }
     /**
      * Get total amount of all depreciations in the collection
@@ -7274,7 +7196,7 @@ class DepreciationCollection extends Collection {
         return this.items.reduce((sum, depreciation) => sum + depreciation.amount, 0);
     }
     get claimAmount() {
-        return this.items.reduce((sum, depreciation) => sum + depreciation.currentYearForecast.claimAmount, 0);
+        return this.sumBy('currentYearForecast.claimAmount');
     }
     getClaimedAmountByYear(year = +localStorage.getItem('financialYear')) {
         const closeBalance = this.items.reduce((sum, depreciation) => sum + depreciation.getCloseBalanceByYear(year), 0);
@@ -7287,7 +7209,7 @@ class DepreciationCollection extends Collection {
         return this.items.reduce((sum, depreciation) => sum + depreciation.getCloseBalanceByYear(year), 0);
     }
     getCurrentYearForecastAmount() {
-        return this.items.reduce((sum, depreciation) => sum + depreciation.currentYearForecast.amount, 0);
+        return this.sumBy('currentYearForecast.amount');
     }
     get closeBalance() {
         return this.sumBy('currentYearForecast.closeBalance');
@@ -7338,19 +7260,7 @@ class DepreciationCollection extends Collection {
         return this.filter((depreciation) => depreciation.isVehicleDepreciation());
     }
     getByTankType(tankType) {
-        return this.create(this.items.filter((depreciation) => {
-            switch (tankType) {
-                case TankTypeEnum.PROPERTY:
-                    return depreciation.isPropertyTank();
-                case TankTypeEnum.WORK:
-                    return depreciation.isWorkTank();
-                case TankTypeEnum.SOLE:
-                    return depreciation.isSoleTank();
-                // case for other tank or some extra
-                default:
-                    return false;
-            }
-        }));
+        return this.filterBy('tankType', tankType);
     }
     /**
      * Create TransactionCollection from depreciation items
@@ -8219,19 +8129,19 @@ class VehicleExpense extends AbstractModel {
 }
 
 const REPORTS = new Collection([
-    {
-        title: 'Income & Expense Report',
-        description: 'Income and expense report with prior year comparison and monthly view option. Filter by Tank, property, business or personal categories',
-        route: './income-expense',
-        roles: [UserRolesEnum.CLIENT],
-    },
     // @TODO TT-4385
     // {
-    //   title: 'Transactions Report',
-    //   description: 'Detailed report of the transactions allocated to each category. Filter by tank, property, business or your own search criteria',
-    //   route: './transactions',
-    //   roles: [UserRolesEnum.CLIENT]
+    //   title: 'Income & Expense Report',
+    //   description: 'Income and expense report with prior year comparison and monthly view option. Filter by Tank, property, business or personal categories',
+    //   route: './income-expense',
+    //   roles: [UserRolesEnum.CLIENT],
     // },
+    {
+        title: 'Transactions Report',
+        description: 'Detailed report of the transactions allocated to each category. Filter by tank, property, business or your own search criteria',
+        route: './transactions',
+        roles: [UserRolesEnum.CLIENT]
+    },
     {
         title: 'MyTax Report',
         description: 'Coded to the ATO\'s MyTax report, our interactive report enable you to self lodge faster, easier and more accurately online without the stress',
@@ -8239,12 +8149,12 @@ const REPORTS = new Collection([
         roles: [UserRolesEnum.CLIENT]
     },
     // @TODO TT-4386
-    // {
-    //   title: 'Net Asset',
-    //   description: 'See your current net financial position, including a breakdown of net assets and liabilities across all tanks',
-    //   route: './assets',
-    //   roles: [UserRolesEnum.CLIENT]
-    // },
+    {
+        title: 'Net Asset',
+        description: 'See your current net financial position, including a breakdown of net assets and liabilities across all tanks',
+        route: './net-assets',
+        roles: [UserRolesEnum.CLIENT]
+    },
     {
         title: 'Property Schedule',
         description: 'Compliant property schedule detailing incomes, expenses and depreciation for each property and ownership percentage',
@@ -8961,26 +8871,6 @@ class AccountSetupItemCollection extends Collection {
  * Collection of bank accounts.
  */
 class BankAccountCollection extends Collection {
-    /**
-     * get list of bank accounts with passed types
-     */
-    getByType(types, isExclude = false) {
-        // get types always as array (if only one passed)
-        const typesArray = concat(types);
-        return this.items.filter((bankAccount) => {
-            if (isExclude) {
-                return !typesArray.includes(bankAccount.type);
-            }
-            return typesArray.includes(bankAccount.type);
-        });
-    }
-    /**
-     * get amount of current loans
-     */
-    getCurrentLoanAmount() {
-        return this.getByType(TYPE_LOAN)
-            .reduce((sum, bankAccount) => sum += bankAccount.currentBalance, 0);
-    }
     /**
      * get collection filtered by property id
      */
@@ -9009,18 +8899,15 @@ class BankAccountCollection extends Collection {
     getActive() {
         return this.getOwn().filter((bankAccount) => bankAccount.isActive());
     }
-    /**
-     * Get collection of loan bank accounts
-     */
     getLoanAccounts() {
-        return new BankAccountCollection(this.getByType(TYPE_LOAN));
+        return this.filterBy('type', TYPE_LOAN);
+    }
+    getDebitAccounts() {
+        return this.filter(bankAccount => ![...TYPE_LOAN, BankAccountTypeEnum.CREDIT_CARD].includes(bankAccount.type));
     }
     get loans() {
         return new LoanCollection(this.filterBy('type', BankAccountTypeEnum.LOAN).map((bankAccount) => bankAccount.loan));
     }
-    getSavingsAccounts() {
-        return new BankAccountCollection(this.getByType(TYPE_LOAN, true));
-    }
     getOpeningBalance() {
         return this.items.reduce((sum, bankAccount) => sum + bankAccount.getOpeningBalance(), 0);
     }
@@ -9030,18 +8917,6 @@ class BankAccountCollection extends Collection {
     get bankShortNames() {
         return uniq(this.map((bankAccount) => bankAccount.bank.shortName)).join(', ');
     }
-    /**
-     * Get Collection of bank accounts with property tank type
-     */
-    getPropertyBankAccounts() {
-        return new BankAccountCollection(this.items.filter((bankAccount) => bankAccount.isPropertyTank()));
-    }
-    /**
-     * Get Collection of bank accounts with work tank type
-     */
-    getWorkBankAccounts() {
-        return new BankAccountCollection(this.items.filter((bankAccount) => bankAccount.isWorkTank()));
-    }
     /**
      * Get Collection of bank accounts by tank type
      */
@@ -9957,7 +9832,7 @@ class BankAccount extends BankAccount$1 {
      * first import (transactions) of basiq accounts
      */
     isFirstImport() {
-        return !this.lastTransactionDate && !this.isManual;
+        return !this.lastTransactionDate && !this.isManual();
     }
     /**
      * Check if passed user id is owner of bank account
@@ -9972,11 +9847,14 @@ class BankAccount extends BankAccount$1 {
         const shouldPayoutLoanAccount = this.isActive() && this.isLoan() && taxTankBalance === 0;
         // we don't check current balance for basiq accounts, because basiq doesn't provide us last transactions (can't do for closed accounts),
         // that's why balance won't be 0 (updated by basiq)
-        if (shouldPayoutLoanAccount && this.isManual) {
+        if (shouldPayoutLoanAccount && this.isManual()) {
             return this.currentBalance === 0;
         }
         return shouldPayoutLoanAccount;
     }
+    isManual() {
+        return !this.accountId;
+    }
 }
 __decorate([
     Type(() => BankAccountProperty)
@@ -10212,11 +10090,8 @@ var BankTransactionSummaryFieldsEnum;
     BankTransactionSummaryFieldsEnum["ALLOCATED_AMOUNT"] = "allocatedAmount";
 })(BankTransactionSummaryFieldsEnum || (BankTransactionSummaryFieldsEnum = {}));
 
-/**
- * @TODO credit card has nothing to do with loan
- */
 const TYPE_LOAN = [
-    BankAccountTypeEnum.CREDIT_CARD,
+    BankAccountTypeEnum.MORTGAGE,
     BankAccountTypeEnum.LOAN
 ];
 
@@ -15410,23 +15285,6 @@ class TransactionService extends RestService {
             this.transactionDeleted.emit(model);
         }));
     }
-    /**
-     * @TODO Alex wrong place for this logic, move to model
-     * calculate gross income amount based on transaction amount and taxes (fees)
-     * @param transaction Transaction instance for calculation
-     */
-    calculateGrossAmount(transaction) {
-        let amount = transaction.amount || 0;
-        // gross income amount includes amount of fees for property tank and tax for work tank
-        if (transaction.isPropertyTank()) {
-            amount += transaction.transactions.reduce((sum, item) => sum + item.amount, 0);
-        }
-        else {
-            // @TODO Alex: fix logic after TT-641 ready
-            amount += (transaction.tax || 0);
-        }
-        return amount;
-    }
     /**
      * Listen to EventDispatcherService event related to Depreciation changing
      */
@@ -22428,7 +22286,7 @@ class PropertyShareForm extends AbstractForm {
     constructor(share = plainToClass(PropertyShare, {})) {
         super({
             fromDate: new UntypedFormControl(share.fromDate || new Date()),
-            percent: new UntypedFormControl(share.percent, [Validators.required, Validators.min(0), Validators.max(100)])
+            percent: new UntypedFormControl(share.percent, [Validators.required, Validators.min(1), Validators.max(100)])
         }, share);
     }
 }