From 0d61ed4183fdb8ada5276d4f85e994be3235f1d8 Mon Sep 17 00:00:00 2001 From: Jagjit Singh <62236979+think-jagjit@users.noreply.github.com> Date: Tue, 18 May 2021 17:27:13 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Redmine=205294:=20=E3=82=B7=E3=83=95?= =?UTF-8?q?=E3=83=88=E3=82=B7=E3=83=9F=E3=83=A5=E3=83=AC=E3=83=BC=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E6=A9=9F=E8=83=BD=E3=81=AE=E5=89=8A=E9=99=A4?= =?UTF-8?q?=E3=81=A7=E4=B8=8D=E8=A6=81=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=9F?= =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92=E5=89=8A=E9=99=A4=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Removed unused code --- app/controllers/components/misc_function.php | 31 -------------------- app/controllers/servers_controller.php | 4 --- 2 files changed, 35 deletions(-) diff --git a/app/controllers/components/misc_function.php b/app/controllers/components/misc_function.php index c4af13800..622f66558 100644 --- a/app/controllers/components/misc_function.php +++ b/app/controllers/components/misc_function.php @@ -113,36 +113,9 @@ function CheckStoreServiceInUse(&$controller, $gscode) function SearchStaffAssignToStore(&$controller, $param) { - //$criteria['StaffAssignToStore.ASSIGN_YOYAKU'] = 1; - //$criteria['StaffAssignToStore.STORECODE'] = $param['storecode']; - $startdate = $param['year'] . "-" . $param['month'] . "-" . "1"; $enddate = $controller->enddate; - //$level2aa['OR'] = array('Staff.HIREDATE IS NULL', - // 'Staff.HIREDATE <= ?' => array($enddate)); - //$level2ab['OR'] = array('Staff.RETIREDATE IS NULL', - // 'Staff.RETIREDATE >= ?' => array($enddate)); - - //$level2a['AND'] = array($level2aa, $level2ab); - //$level2b = array('Staff.HIREDATE BETWEEN ? AND ?' => array($startdate, $enddate)); - //$level2c = array('Staff.RETIREDATE BETWEEN ? AND ?' => array($startdate, $enddate)); - - //$level['OR'] = array($level2a, $level2b, $level2c); - - //$and_condition = array($level); - - //$criteria_top = array($criteria, - // $and_condition, - // 'StaffAssignToStore.STAFFCODE <> ?' => array(0), - // 'Staff.DELFLG IS NULL'); - - // //$orderby = array('StaffAssignToStore.STAFFCODE'); - // //$orderby = array('IF(Staff.STAFFCODE = 0, 0, IFNULL(StaffAssignToStore.DISPLAY_ORDER, 9999999)), - // // Staff.STAFFCODE'); - - //$orderby = array('Staff.DISPLAY_ORDER, Staff.STAFFCODE'); - $Sql = "SELECT StaffAssignToStore.STORECODE, StaffAssignToStore.STAFFCODE, StaffAssignToStore.KEYNO, @@ -153,8 +126,6 @@ function SearchStaffAssignToStore(&$controller, $param) Staff.STAFFNAME, Staff.HIREDATE, Staff.RETIREDATE, - Staff.SALARYTYPE, - Staff.SALARYAMOUNT, Staff.TRAVEL_ALLOWANCE, Staff.DISPLAY_ORDER FROM staff_assign_to_store StaffAssignToStore @@ -181,8 +152,6 @@ function SearchStaffAssignToStore(&$controller, $param) $arrStaff[$i]['StaffAssignToStore']['HIREDATE'] = $arrStaff[$i]['Staff']['HIREDATE']; $arrStaff[$i]['StaffAssignToStore']['RETIREDATE'] = $arrStaff[$i]['Staff']['RETIREDATE']; //--------------------------------------------------------------------------------------- - $arrStaff[$i]['StaffAssignToStore']['SALARYTYPE'] = $arrStaff[$i]['Staff']['SALARYTYPE']; - $arrStaff[$i]['StaffAssignToStore']['SALARYAMOUNT'] = $arrStaff[$i]['Staff']['SALARYAMOUNT']; $arrStaff[$i]['StaffAssignToStore']['TRAVEL_ALLOWANCE'] = $arrStaff[$i]['Staff']['TRAVEL_ALLOWANCE']; //--------------------------------------------------------------------------------------- $arrStaff[$i]['StaffAssignToStore']['KANZASHI_ENABLED'] = !is_null($arrStaff[$i]['StaffAssignToStore']['KANZASHI_SALON_POS_ID']); diff --git a/app/controllers/servers_controller.php b/app/controllers/servers_controller.php index c83dd565d..1daadb6ac 100644 --- a/app/controllers/servers_controller.php +++ b/app/controllers/servers_controller.php @@ -1444,8 +1444,6 @@ class ServersController extends WebServicesController 'RETIREDATE' => 'xsd:string', 'STARTTIME' => 'xsd:string', 'ENDTIME' => 'xsd:string', - 'SALARYTYPE' => 'xsd:int', - 'SALARYAMOUNT' => 'xsd:int', 'TRAVEL_ALLOWANCE' => 'xsd:int', 'KANZASHI_ENABLED' => 'xsd:boolean', 'KANZASHI_SALON_POS_ID' => 'xsd:int', @@ -5281,8 +5279,6 @@ function wsSearchStaffShift($sessionid, $param) $arrStaffShift[$i]['HIREDATE'] = $arrStaff[$i]['StaffAssignToStore']['HIREDATE']; $arrStaffShift[$i]['RETIREDATE'] = $arrStaff[$i]['StaffAssignToStore']['RETIREDATE']; //----------------------------------------------------------------------------------- - $arrStaffShift[$i]['SALARYTYPE'] = $arrStaff[$i]['StaffAssignToStore']['SALARYTYPE']; - $arrStaffShift[$i]['SALARYAMOUNT'] = $arrStaff[$i]['StaffAssignToStore']['SALARYAMOUNT']; $arrStaffShift[$i]['TRAVEL_ALLOWANCE'] = $arrStaff[$i]['StaffAssignToStore']['TRAVEL_ALLOWANCE']; //----------------------------------------------------------------------------------- $arrStaffShift[$i]['KANZASHI_ENABLED'] = $arrStaff[$i]['StaffAssignToStore']['KANZASHI_ENABLED']; From 350c7f9fa0009a2d605935f8e5ca17d48fc26495 Mon Sep 17 00:00:00 2001 From: Jagjit Singh <62236979+think-jagjit@users.noreply.github.com> Date: Tue, 18 May 2021 20:35:20 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Redmine=205294:=20=E3=82=B7=E3=83=95?= =?UTF-8?q?=E3=83=88=E3=82=B7=E3=83=9F=E3=83=A5=E3=83=AC=E3=83=BC=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E6=A9=9F=E8=83=BD=E3=81=AE=E5=89=8A=E9=99=A4?= =?UTF-8?q?=E3=81=A7=E4=B8=8D=E8=A6=81=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=9F?= =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92=E5=89=8A=E9=99=A4=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Removed unused code (travel allowance of staff) --- app/controllers/components/misc_function.php | 3 --- app/controllers/servers_controller.php | 3 --- 2 files changed, 6 deletions(-) diff --git a/app/controllers/components/misc_function.php b/app/controllers/components/misc_function.php index 622f66558..3bd3216d5 100644 --- a/app/controllers/components/misc_function.php +++ b/app/controllers/components/misc_function.php @@ -126,7 +126,6 @@ function SearchStaffAssignToStore(&$controller, $param) Staff.STAFFNAME, Staff.HIREDATE, Staff.RETIREDATE, - Staff.TRAVEL_ALLOWANCE, Staff.DISPLAY_ORDER FROM staff_assign_to_store StaffAssignToStore JOIN staff Staff @@ -152,8 +151,6 @@ function SearchStaffAssignToStore(&$controller, $param) $arrStaff[$i]['StaffAssignToStore']['HIREDATE'] = $arrStaff[$i]['Staff']['HIREDATE']; $arrStaff[$i]['StaffAssignToStore']['RETIREDATE'] = $arrStaff[$i]['Staff']['RETIREDATE']; //--------------------------------------------------------------------------------------- - $arrStaff[$i]['StaffAssignToStore']['TRAVEL_ALLOWANCE'] = $arrStaff[$i]['Staff']['TRAVEL_ALLOWANCE']; - //--------------------------------------------------------------------------------------- $arrStaff[$i]['StaffAssignToStore']['KANZASHI_ENABLED'] = !is_null($arrStaff[$i]['StaffAssignToStore']['KANZASHI_SALON_POS_ID']); if ($arrStaff[$i]['StaffAssignToStore']['KANZASHI_ENABLED']){ $arrStaff[$i]['StaffAssignToStore']['KANZASHI_SALON_POS_ID'] = (int)$arrStaff[$i]['StaffAssignToStore']['KANZASHI_SALON_POS_ID']; diff --git a/app/controllers/servers_controller.php b/app/controllers/servers_controller.php index 1daadb6ac..eca34107c 100644 --- a/app/controllers/servers_controller.php +++ b/app/controllers/servers_controller.php @@ -1444,7 +1444,6 @@ class ServersController extends WebServicesController 'RETIREDATE' => 'xsd:string', 'STARTTIME' => 'xsd:string', 'ENDTIME' => 'xsd:string', - 'TRAVEL_ALLOWANCE' => 'xsd:int', 'KANZASHI_ENABLED' => 'xsd:boolean', 'KANZASHI_SALON_POS_ID' => 'xsd:int', 'day1' => 'xsd:string', @@ -5279,8 +5278,6 @@ function wsSearchStaffShift($sessionid, $param) $arrStaffShift[$i]['HIREDATE'] = $arrStaff[$i]['StaffAssignToStore']['HIREDATE']; $arrStaffShift[$i]['RETIREDATE'] = $arrStaff[$i]['StaffAssignToStore']['RETIREDATE']; //----------------------------------------------------------------------------------- - $arrStaffShift[$i]['TRAVEL_ALLOWANCE'] = $arrStaff[$i]['StaffAssignToStore']['TRAVEL_ALLOWANCE']; - //----------------------------------------------------------------------------------- $arrStaffShift[$i]['KANZASHI_ENABLED'] = $arrStaff[$i]['StaffAssignToStore']['KANZASHI_ENABLED']; if ($arrStaffShift[$i]['KANZASHI_ENABLED']){ $arrStaffShift[$i]['KANZASHI_SALON_POS_ID'] = $arrStaff[$i]['StaffAssignToStore']['KANZASHI_SALON_POS_ID'];