taxtank-core 2.1.12 → 2.1.14

package/fesm2022/taxtank-core.mjs

@@ -5193,6 +5193,9 @@ class ServiceSubscription extends ServiceSubscription$1 {
     upgrade(prices) {
         const subscription = plainToClass(ServiceSubscription, this);
         subscription.items.forEach(item => {
+            if (item.price.isNew()) {
+                return;
+            }
             item.price = prices.findBy('id', ServicePrice.priceMap[item.price.id]);
         });
         return subscription;
@@ -23756,12 +23759,12 @@ const COMPARE_OPERATORS = {
 function compareWithControlValidator(controlName, operator, alias) {
     return (control) => {
         // skip validation until control is attached to a parent FormGroup
-        if (!control?.parent) {
+        if (!control?.parent || !control.value) {
             return null;
         }
         const group = control.parent;
         const fieldToCompare = group.get(controlName);
-        const isValid = control.value ? COMPARE_OPERATORS[operator](control.value, fieldToCompare.value) : true;
+        const isValid = COMPARE_OPERATORS[operator](control.value, fieldToCompare.value);
         return isValid ? null : { compareWithControl: `The value should be ${operator} than ${alias}` };
     };
 }
@@ -24208,8 +24211,10 @@ class MoneyScheduleFilterForm extends AbstractForm {
         const value = this.value;
         const monthIndex = value.month;
         // calendar year start and FinYear start are different. we need to convert FinYear to regular one
-        this.onFilter.emit(new Date(new FinancialYear().getYearByMonth(monthIndex), monthIndex, 1));
-        let filteredEvents = calendarEvents;
+        const startDate = new Date(new FinancialYear().getYearByMonth(monthIndex), monthIndex, 1);
+        const endDate = moment(startDate).add(1, 'month').toDate();
+        this.onFilter.emit(startDate);
+        let filteredEvents = calendarEvents.filterByDate(startDate, endDate);
         if (value.eventType !== CalendarEventTypeEnum.ALL) {
             filteredEvents = filteredEvents.filterBy('extendedProps.type', value.eventType);
         }