taxtank-core 2.0.105 → 2.0.106

package/fesm2022/taxtank-core.mjs

@@ -8712,7 +8712,7 @@ class BudgetRuleItem {
         this.rule = rule;
         this.tankType = TankTypeEnum[rule.chartAccounts.tankType];
         this.category = ChartAccountsCategoryEnum[rule.chartAccounts.category];
-        this.frequency = DailyFrequencyEnum[rule.frequency] ?? 'Once';
+        this.frequency = AnnualFrequencyEnum[rule.frequency] ?? 'Once';
         this.isGross = isGross;
         if (rule.business) {
             transactions = transactions.filterBy('business.id', rule.business.id);
@@ -11732,18 +11732,26 @@ function recurringDates(frequency, startDate, endDate) {
     let duration;
     let amount;
     switch (frequency) {
-        case DailyFrequencyEnum.FORTNIGHTLY:
+        case AnnualFrequencyEnum.WEEKLY:
+            duration = 'week';
+            amount = 1;
+            break;
+        case AnnualFrequencyEnum.FORTNIGHTLY:
             duration = 'week';
             amount = 2;
             break;
-        case DailyFrequencyEnum.MONTHLY:
+        case AnnualFrequencyEnum.MONTHLY:
             duration = 'month';
             amount = 1;
             break;
-        // DailyFrequencyEnum.WEEKLY as default
+        case AnnualFrequencyEnum.QUARTERLY:
+            duration = 'quarters';
+            amount = 1;
+            break;
         default:
-            duration = 'week';
+            duration = 'year';
             amount = 1;
+            break;
     }
     const dates = [];
     let current = moment$1(startDate).startOf('day');
@@ -11999,15 +12007,21 @@ class FinancialGoal extends ObservableModel {
         const end = moment(date);
         let payments = 0;
         switch (this.paymentFrequency) {
-            case DailyFrequencyEnum.WEEKLY:
+            case AnnualFrequencyEnum.WEEKLY:
                 payments = end.diff(start, 'weeks');
                 break;
-            case DailyFrequencyEnum.FORTNIGHTLY:
+            case AnnualFrequencyEnum.FORTNIGHTLY:
                 payments = Math.round(end.diff(start, 'weeks') / 2);
                 break;
-            case DailyFrequencyEnum.MONTHLY:
+            case AnnualFrequencyEnum.MONTHLY:
                 payments = end.diff(start, 'months');
                 break;
+            case AnnualFrequencyEnum.QUARTERLY:
+                payments = end.diff(start, 'quarters');
+                break;
+            case AnnualFrequencyEnum.ANNUAL:
+                payments = end.diff(start, 'years');
+                break;
         }
         return payments;
     }
@@ -24132,12 +24146,16 @@ class FinancialGoalForm extends AbstractForm {
         const start = moment(goal.startDate);
         const paymentsCount = this.calculatePaymentsByAmount();
         switch (goal.paymentFrequency) {
-            case DailyFrequencyEnum.WEEKLY:
+            case AnnualFrequencyEnum.WEEKLY:
                 return start.add(paymentsCount, 'weeks').toDate();
-            case DailyFrequencyEnum.FORTNIGHTLY:
+            case AnnualFrequencyEnum.FORTNIGHTLY:
                 return start.add(paymentsCount * 2, 'weeks').toDate();
-            case DailyFrequencyEnum.MONTHLY:
+            case AnnualFrequencyEnum.MONTHLY:
                 return start.add(paymentsCount, 'month').toDate();
+            case AnnualFrequencyEnum.QUARTERLY:
+                return start.add(paymentsCount, 'quarters').toDate();
+            case AnnualFrequencyEnum.ANNUAL:
+                return start.add(paymentsCount, 'year').toDate();
             default:
                 return new Date();
         }