From 4588096d1ecd589a69b9c77725663d08e2bebdb5 Mon Sep 17 00:00:00 2001 From: mcunanan Date: Mon, 21 Jun 2021 12:36:43 +0900 Subject: [PATCH 1/6] =?UTF-8?q?Redmine-#5287:=E9=A1=A7=E5=AE=A2=E7=B5=B1?= =?UTF-8?q?=E5=90=88=E3=80=80=E3=82=B5=E3=83=AD=E3=83=AA=E3=82=B6=E9=80=A3?= =?UTF-8?q?=E6=90=BA=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=81=99=E3=82=8B=20-=20up?= =?UTF-8?q?date=20saloriza=5Fcustomer=20when=20merging=20customer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 eca34107c..ad75782b4 100644 --- a/app/controllers/servers_controller.php +++ b/app/controllers/servers_controller.php @@ -2644,7 +2644,8 @@ function wsCustomerMergeSave($sessionid, $strcode, $fromccode, $toccode, $transc "customer_sns", "kanzashi_customer", "yoyakuapp_user", - "cti" + "cti", + "saloriza_customer" ); if ($this->MiscFunction->IsPowerFlgOn($this)) { From 14ea5563d92fbbf523b792d09f5adbb965229c3e Mon Sep 17 00:00:00 2001 From: Jagjit Singh <62236979+think-jagjit@users.noreply.github.com> Date: Mon, 21 Jun 2021 16:47:09 +0900 Subject: [PATCH 2/6] Redmine: #5314 Linked reservation information for reservations registered from the new WEB reservation is not displayed (reservation screen / pop-up) - fetched new reservation data --- app/controllers/servers_controller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/servers_controller.php b/app/controllers/servers_controller.php index ad75782b4..8e84ae720 100644 --- a/app/controllers/servers_controller.php +++ b/app/controllers/servers_controller.php @@ -7958,7 +7958,7 @@ function wsSearchStoreTransaction($sessionid, $param) UNION ALL SELECT - 11 origination, + st.origination, '' route, '' reservation_system, date_format(st2.datetimecreated, '%Y-%m-%d %H:%i') as reserve_date, @@ -7998,7 +7998,7 @@ function wsSearchStoreTransaction($sessionid, $param) JOIN yoyakuapp_reservation yr USING(transcode) WHERE st.transdate = '" . $param['date'] . "' - AND st.origination = 11 + AND st.origination IN (11, 13) AND st.delflg IS NULL " . $transconde . " From e0ec2d8d0c1ae143f9133e9756ab40694e890a17 Mon Sep 17 00:00:00 2001 From: mcunanan Date: Tue, 22 Jun 2021 13:20:24 +0900 Subject: [PATCH 3/6] =?UTF-8?q?Redmine-#5289:=E9=80=A3=E6=90=BA=E4=BA=88?= =?UTF-8?q?=E7=B4=84=E6=83=85=E5=A0=B1=E3=80=80=E3=82=B5=E3=83=AD=E3=83=AA?= =?UTF-8?q?=E3=82=B6=E3=81=8B=E3=82=89=E7=99=BB=E9=8C=B2=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=81=9F=E4=BA=88=E7=B4=84=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=81=99?= =?UTF-8?q?=E3=82=8B=20-=20add=20Saloriza=20details=20in=20wsSearchStoreTr?= =?UTF-8?q?ansaction=20function=20result?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/servers_controller.php | 43 ++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/app/controllers/servers_controller.php b/app/controllers/servers_controller.php index 8e84ae720..ca90b9480 100644 --- a/app/controllers/servers_controller.php +++ b/app/controllers/servers_controller.php @@ -8048,6 +8048,49 @@ function wsSearchStoreTransaction($sessionid, $param) AND st.delflg IS NULL " . $transconde . " AND kr.deletedate IS NULL + + UNION ALL + + SELECT + 14 origination, + '' route, + '' reservation_system, + date_format(sr.created_date, '%Y-%m-%d %H:%i') AS reserve_date, + '' reserve_code, + date_format(sr.start_datetime, '%Y-%m-%d') AS date, + date_format(sr.start_datetime, '%H:%i') AS start, + date_format(date_add(sr.start_datetime, INTERVAL sr.minutes MINUTE), '%H:%i') AS end, + '' coupon_info, + '' comment, + '' shop_comment, + sr.customer_id AS site_customer_id, + '' demand, + '' next_coming_comment, + 0 price, + 0 nomination_fee, + 0 total_price, + 0 use_point, + 0 grant_point, + 0 visit_num, + sr.customer_name AS name_sei, + sr.customer_name_kana AS name_kn_sei, + 0 sex, + '' name_mei, + '' name_kn_mei, + sr.customer_telephone_number AS tel, + '' zipcode, + '' address, + '' mail, + '' staffname, + menu_names AS menu_info, + '' AS memo, + st.transcode transcode, + st.ccode ccode + FROM store_transaction st + JOIN saloriza_reservation sr USING(transcode) + WHERE st.transdate = '" . $param['date'] . "' + AND st.delflg IS NULL + " . $transconde . " ) as bmtble on bmtble.transcode = transaction.TRANSCODE and bmtble.origination = transaction.origination LEFT JOIN drejimarketing ON drejimarketing.TRANSCODE = `transaction`.TRANSCODE From c89eb3200d14b89bde74db648017f5b489971e0e Mon Sep 17 00:00:00 2001 From: Jagjit Singh <62236979+think-jagjit@users.noreply.github.com> Date: Wed, 23 Jun 2021 12:41:55 +0900 Subject: [PATCH 4/6] Redmine: #5314 Adding support to display notes data of new web reservation transaction - fetched new reservation data --- app/controllers/servers_controller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/servers_controller.php b/app/controllers/servers_controller.php index ad75782b4..8e84ae720 100644 --- a/app/controllers/servers_controller.php +++ b/app/controllers/servers_controller.php @@ -7958,7 +7958,7 @@ function wsSearchStoreTransaction($sessionid, $param) UNION ALL SELECT - 11 origination, + st.origination, '' route, '' reservation_system, date_format(st2.datetimecreated, '%Y-%m-%d %H:%i') as reserve_date, @@ -7998,7 +7998,7 @@ function wsSearchStoreTransaction($sessionid, $param) JOIN yoyakuapp_reservation yr USING(transcode) WHERE st.transdate = '" . $param['date'] . "' - AND st.origination = 11 + AND st.origination IN (11, 13) AND st.delflg IS NULL " . $transconde . " From 18db94f3bf5bea20818c3521ebf768b74179f931 Mon Sep 17 00:00:00 2001 From: mcunanan Date: Thu, 24 Jun 2021 10:50:25 +0900 Subject: [PATCH 5/6] =?UTF-8?q?Redmine-#5289:=E9=80=A3=E6=90=BA=E4=BA=88?= =?UTF-8?q?=E7=B4=84=E6=83=85=E5=A0=B1=E3=80=80=E3=82=B5=E3=83=AD=E3=83=AA?= =?UTF-8?q?=E3=82=B6=E3=81=8B=E3=82=89=E7=99=BB=E9=8C=B2=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=81=9F=E4=BA=88=E7=B4=84=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=81=99?= =?UTF-8?q?=E3=82=8B=20-=20set=20VIA=20as=20RESERVATION=5FSYSTEM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/servers_controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/servers_controller.php b/app/controllers/servers_controller.php index ca90b9480..6574901e3 100644 --- a/app/controllers/servers_controller.php +++ b/app/controllers/servers_controller.php @@ -8054,7 +8054,7 @@ function wsSearchStoreTransaction($sessionid, $param) SELECT 14 origination, '' route, - '' reservation_system, + sr.via AS reservation_system, date_format(sr.created_date, '%Y-%m-%d %H:%i') AS reserve_date, '' reserve_code, date_format(sr.start_datetime, '%Y-%m-%d') AS date, From 56acdd9359a206aae3dbbd382f677667a81771f5 Mon Sep 17 00:00:00 2001 From: Marvin Cunanan Date: Mon, 5 Jul 2021 11:07:21 +0900 Subject: [PATCH 6/6] =?UTF-8?q?Redmine-#5289:=E9=80=A3=E6=90=BA=E4=BA=88?= =?UTF-8?q?=E7=B4=84=E6=83=85=E5=A0=B1=E3=80=80=E3=82=B5=E3=83=AD=E3=83=AA?= =?UTF-8?q?=E3=82=B6=E3=81=8B=E3=82=89=E7=99=BB=E9=8C=B2=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=81=9F=E4=BA=88=E7=B4=84=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=81=99?= =?UTF-8?q?=E3=82=8B=20-=20use=20saloriza=5Freservation=20customer=5Fsex?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/servers_controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/servers_controller.php b/app/controllers/servers_controller.php index 6574901e3..f5a6d2e3e 100644 --- a/app/controllers/servers_controller.php +++ b/app/controllers/servers_controller.php @@ -8074,7 +8074,7 @@ function wsSearchStoreTransaction($sessionid, $param) 0 visit_num, sr.customer_name AS name_sei, sr.customer_name_kana AS name_kn_sei, - 0 sex, + sr.customer_sex AS sex, '' name_mei, '' name_kn_mei, sr.customer_telephone_number AS tel,