taxtank-core 0.31.55 → 0.31.59

package/fesm2020/taxtank-core.mjs

@@ -1558,11 +1558,14 @@ class FinancialYear {
             this.year = date instanceof Date ? FinancialYear.toFinYear(date) : date;
         }
         else {
-            this.year = +localStorage.getItem('financialYear') || FinancialYear.toFinYear(new Date());
+            this.year = FinancialYear.year || FinancialYear.toFinYear(new Date());
         }
         this.setStartDate(this.year);
         this.setEndDate(this.year);
     }
+    static isCurrent(year = FinancialYear.year) {
+        return FinancialYear.toFinYear(new Date()) === year;
+    }
     includes(date) {
         return this.year === new FinancialYear(date).year;
     }
@@ -1600,6 +1603,7 @@ class FinancialYear {
 FinancialYear.weeksInYear = 52;
 FinancialYear.monthsInYear = 12;
 FinancialYear.startMonthIndex = 6;
+FinancialYear.year = +localStorage.getItem('financialYear');
 
 /**
  * @TODO move to pipe/translation
@@ -9525,18 +9529,20 @@ class BankAccount extends BankAccount$1 {
     get partialAccountNumber() {
         return `xxxx${this.accountNumber.slice(-4)}`;
     }
+    get balance() {
+        return FinancialYear.isCurrent() ? this.currentBalance : this.getOpeningBalance(FinancialYear.year + 1);
+    }
     /**
      * Get current opening balance amount
      */
-    getOpeningBalance() {
-        return this.getCurrentYearBalance()?.openingBalance || 0;
+    getOpeningBalance(year = FinancialYear.year) {
+        return this.getBalanceByYear(year)?.openingBalance || 0;
     }
     /**
      * Get bank account balance for current financial year
      */
-    getCurrentYearBalance() {
-        const currentFinYear = new FinancialYear().year;
-        return this.balances.find((balance) => balance.financialYear === currentFinYear);
+    getBalanceByYear(year) {
+        return this.balances.find((balance) => balance.financialYear === year);
     }
     /**
      * check if bank account type is one of savings accounts
@@ -13001,7 +13007,8 @@ class SoleForecastService extends RestService {
             .subscribe((incomeSources) => {
             const soleForecasts = this.assignSoleForecasts(incomeSources);
             if (soleForecasts.length) {
-                this.updateBatch(soleForecasts).subscribe((updatedSoleForecasts) => {
+                const method = soleForecasts[0].id ? 'updateBatch' : 'addBatch';
+                this[method](soleForecasts).subscribe((updatedSoleForecasts) => {
                     this.eventDispatcherService
                         .dispatch(new AppEvent(AppEventTypeEnum.INCOME_SOURCES_FORECASTS_UPDATED, updatedSoleForecasts));
                 });