From 37bea2aa352b0cc59488bff4c7cceedf38beafd9 Mon Sep 17 00:00:00 2001 From: Jagjit Singh Date: Wed, 23 Dec 2020 17:13:42 +0900 Subject: [PATCH] added kanzashi_salon_pos_id to staffShiftInformation --- app/controllers/components/misc_function.php | 3 + app/controllers/servers_controller.php | 94 ++++++++++---------- 2 files changed, 52 insertions(+), 45 deletions(-) diff --git a/app/controllers/components/misc_function.php b/app/controllers/components/misc_function.php index be3ecab45..b6e84bcd1 100644 --- a/app/controllers/components/misc_function.php +++ b/app/controllers/components/misc_function.php @@ -186,6 +186,9 @@ function SearchStaffAssignToStore(&$controller, $param) $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']; + } //--------------------------------------------------------------------------------------- } //end for diff --git a/app/controllers/servers_controller.php b/app/controllers/servers_controller.php index faf54bdf1..8d7ca0b2a 100644 --- a/app/controllers/servers_controller.php +++ b/app/controllers/servers_controller.php @@ -1444,51 +1444,52 @@ class ServersController extends WebServicesController 'day' => 'xsd:int' )), - 'staffShiftInformation' => array('struct' => array( - 'year' => 'xsd:int', - 'month' => 'xsd:int', - 'STORECODE' => 'xsd:int', - 'STAFFCODE' => 'xsd:int', - 'STAFFNAME' => 'xsd:string', - 'HIREDATE' => 'xsd:string', - 'RETIREDATE' => 'xsd:string', - 'STARTTIME' => 'xsd:string', - 'ENDTIME' => 'xsd:string', - 'SALARYTYPE' => 'xsd:int', - 'SALARYAMOUNT' => 'xsd:int', - 'TRAVEL_ALLOWANCE' => 'xsd:int', - 'KANZASHI_ENABLED' => 'xsd:boolean', - 'day1' => 'xsd:string', - 'day2' => 'xsd:string', - 'day3' => 'xsd:string', - 'day4' => 'xsd:string', - 'day5' => 'xsd:string', - 'day6' => 'xsd:string', - 'day7' => 'xsd:string', - 'day8' => 'xsd:string', - 'day9' => 'xsd:string', - 'day10' => 'xsd:string', - 'day11' => 'xsd:string', - 'day12' => 'xsd:string', - 'day13' => 'xsd:string', - 'day14' => 'xsd:string', - 'day15' => 'xsd:string', - 'day16' => 'xsd:string', - 'day17' => 'xsd:string', - 'day18' => 'xsd:string', - 'day19' => 'xsd:string', - 'day20' => 'xsd:string', - 'day21' => 'xsd:string', - 'day22' => 'xsd:string', - 'day23' => 'xsd:string', - 'day24' => 'xsd:string', - 'day25' => 'xsd:string', - 'day26' => 'xsd:string', - 'day27' => 'xsd:string', - 'day28' => 'xsd:string', - 'day29' => 'xsd:string', - 'day30' => 'xsd:string', - 'day31' => 'xsd:string' + 'staffShiftInformation' => array('struct' => array( + 'year' => 'xsd:int', + 'month' => 'xsd:int', + 'STORECODE' => 'xsd:int', + 'STAFFCODE' => 'xsd:int', + 'STAFFNAME' => 'xsd:string', + 'HIREDATE' => 'xsd:string', + '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', + 'day1' => 'xsd:string', + 'day2' => 'xsd:string', + 'day3' => 'xsd:string', + 'day4' => 'xsd:string', + 'day5' => 'xsd:string', + 'day6' => 'xsd:string', + 'day7' => 'xsd:string', + 'day8' => 'xsd:string', + 'day9' => 'xsd:string', + 'day10' => 'xsd:string', + 'day11' => 'xsd:string', + 'day12' => 'xsd:string', + 'day13' => 'xsd:string', + 'day14' => 'xsd:string', + 'day15' => 'xsd:string', + 'day16' => 'xsd:string', + 'day17' => 'xsd:string', + 'day18' => 'xsd:string', + 'day19' => 'xsd:string', + 'day20' => 'xsd:string', + 'day21' => 'xsd:string', + 'day22' => 'xsd:string', + 'day23' => 'xsd:string', + 'day24' => 'xsd:string', + 'day25' => 'xsd:string', + 'day26' => 'xsd:string', + 'day27' => 'xsd:string', + 'day28' => 'xsd:string', + 'day29' => 'xsd:string', + 'day30' => 'xsd:string', + 'day31' => 'xsd:string' )), '_staffShiftInformation' => array( @@ -5279,6 +5280,9 @@ function wsSearchStaffShift($sessionid, $param) $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']; + } //----------------------------------------------------------------------------------- $stafftypes = ""; if (count($arr_stafftypes) > 0) {