Fix to not include deleted holiday per Kanzashi Salon

think-mcunanan · Feb 2, 2021 · 1505f60 · 1505f60
1 parent 4e96a5d
commit 1505f60
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/controllers/servers_controller.php b/app/controllers/servers_controller.php
@@ -9604,7 +9604,8 @@ function wsGetTransactionCalendarView($sessionid, $param)
                 FROM store_holiday_per_salon StoreHoliday
                 WHERE 
                     kanzashi_salon_pos_id = :kanzashi_salon_pos_id AND
-                    ymd BETWEEN :date AND LAST_DAY(DATE_ADD(:date, INTERVAL 1 MONTH))
+                    ymd BETWEEN :date AND LAST_DAY(DATE_ADD(:date, INTERVAL 1 MONTH)) AND
+                    delflg IS NULL
             ";
 
             $sql_params = array(