From 1505f6016c5f84cc1867086ef7cd4409405fc987 Mon Sep 17 00:00:00 2001 From: Marvin Cunanan Date: Tue, 2 Feb 2021 17:42:24 +0900 Subject: [PATCH] Fix to not include deleted holiday per Kanzashi Salon --- app/controllers/servers_controller.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/servers_controller.php b/app/controllers/servers_controller.php index 99a45885e..436c29baf 100644 --- 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(