Skip to content

Commit

Permalink
Merge pull request smarty-php#34 from think-ahead/redmine-#5159-(kire…
Browse files Browse the repository at this point in the history 
…i)-eliminate-the-part-that-assumes-a-single-kanzashi-account

Redmine #5159 (kirei) eliminate the part that assumes a single kanzashi account
  • Loading branch information
@think-katou
think-katou committed Dec 25, 2020
2 parents 9e086ab + 37bea2a commit 2c52ecf
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 45 deletions.
3 changes: 3 additions & 0 deletions app/controllers/components/misc_function.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
94 changes: 49 additions & 45 deletions app/controllers/servers_controller.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 2c52ecf

Please sign in to comment.