Skip to content

Commit

Permalink
Merge pull request smarty-php#40 from think-ahead/ticket-#5183-the-ma…
Browse files Browse the repository at this point in the history 
…in-kanzashi-account-settings-are-always-used-in-the-reservation-table-holiday-display

Ticket #5183 the main kanzashi account settings are always used in the reservation table holiday display
  • Loading branch information
@think-katou
think-katou authored Feb 4, 2021
2 parents f0906c6 + 1505f60 commit 19965be
Showing 1 changed file with 62 additions and 32 deletions.
94 changes: 62 additions & 32 deletions app/controllers/servers_controller.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1134,6 +1134,15 @@ class ServersController extends WebServicesController
'facilityProgram' => 'tns:_facilityProgramInformation',
),
'output' => array('return' => 'tns:_facilityProgramInformation')
),

'wsGetKanzashiSalons' => array(
'doc' => 'かんざしサロンをゲット',
'input' => array(
'sessionid' => 'xsd:string',
'storecode' => 'xsd:int',
),
'output' => array('return' => 'tns:KanzashiSalons')
)

//- ############################################################
Expand Down Expand Up @@ -2124,7 +2133,8 @@ class ServersController extends WebServicesController
'useYoyakuMessage' => 'xsd:int',
'date' => 'xsd:string',
'PRIORITYTYPE' => 'xsd:int',
'kanzashiEnabled' => 'xsd:boolean'
'kanzashisalonposid' => 'xsd:int',
'kanzashienabled' => 'xsd:boolean'
)),

'return_dataOfTheDayInformation' => array('struct' => array(
Expand All @@ -2142,6 +2152,8 @@ class ServersController extends WebServicesController
// TRANSACTION CALENDAR VIEW ---------------------------
'transactionCalendarViewSearchCriteria' => array('struct' => array(
'STORECODE' => 'xsd:int',
'kanzashisalonposid' => 'xsd:int',
'kanzashienabled' => 'xsd:boolean',
'year' => 'xsd:int',
'month' => 'xsd:int'
)),
Expand Down Expand Up @@ -4464,7 +4476,7 @@ function wsSearchAvailableStaff($sessionid, $param)
$extra = " AND StaffAssignToStore.STAFFCODE = " . $param['STAFFCODE'];
}

if (!$param['kanzashiEnabled']) {
if (!$param['kanzashienabled']) {
$staff_rows_history_extra = " AND StaffRowsHistory.DATECHANGE <= '{$param['date']}'";
}
//----------------------------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -9486,7 +9498,7 @@ function wsGetDataOfTheDay($sessionid, $param)
$ret['store'] = $arrReturn;
}

$holiday = $this->wsSearchStoreHoliday($sessionid, $param);
$holiday = $this->wsSearchStoreHoliday($sessionid, $param, $param['kanzashienabled']);
if ($holiday['record_count'] > 0) {
$ret['holiday'] = $holiday['records']['day' . $param['day']];
} else {
Expand Down Expand Up @@ -9581,30 +9593,37 @@ function wsGetTransactionCalendarView($sessionid, $param)
}

//-- 会社データベースを設定する (Set the Company Database)
//$this->StoreTransaction->set_company_database($storeinfo['dbname'], $this->StoreTransaction);
$this->StoreHoliday->set_company_database($storeinfo['dbname'], $this->StoreHoliday);

$date = $param['year'] . "-" . $param['month'] . "-1";

/*$criteria['STORECODE'] = $param['STORECODE'];
$criteria['DELFLG'] = null;
$criteria['YOYAKU'] = 1;
$criteria['TRANSDATE BETWEEN ? AND
LAST_DAY(DATE_ADD(?, INTERVAL 1 MONTH))'] = array($date, $date);
$date = "{$param['year']}-{$param['month']}-01";
$holidays = array();

$v = $this->StoreTransaction->find('all', array('conditions' => $criteria,
'fields' => array('TRANSDATE'),
'group' => 'TRANSDATE',
'order' => 'TRANSDATE'));*/

$hcriteria = array(
'StoreHoliday.STORECODE' => $param['STORECODE'],
'StoreHoliday.YMD BETWEEN ? AND
LAST_DAY(DATE_ADD(?, INTERVAL 1 MONTH))' => array($date, $date)
);
if($param['kanzashienabled']) {
$sql = "
SELECT *
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)) AND
delflg IS NULL
";

$h = $this->StoreHoliday->find('all', array('conditions' => $hcriteria));
$sql_params = array(
'date' => $date,
'kanzashi_salon_pos_id' => $param['kanzashisalonposid']
);

$holidays = $this->StoreHoliday->query($sql, $sql_params, false);

} else {
$criteria = array(
'StoreHoliday.STORECODE' => $param['STORECODE'],
'StoreHoliday.YMD BETWEEN ? AND LAST_DAY(DATE_ADD(?, INTERVAL 1 MONTH))' => array($date, $date)
);

$holidays = $this->StoreHoliday->find('all', array('conditions' => $criteria));
}

$arrDays = $this->arrDays;

for ($m = 0; $m < 2; $m++) {
Expand Down Expand Up @@ -9636,23 +9655,15 @@ function wsGetTransactionCalendarView($sessionid, $param)
}
$date = $param['year'] . "-" . $month . "-" . $zday;
if (checkdate($param['month'], $day, $param['year'])) {
//- トランザクションの配列をループ処理　(Loops through the array of Transaction)
/*for ($i = 0; $i < count($v); $i++) {
if ($date == $v[$i]['StoreTransaction']['TRANSDATE']) {
$arrData[$m][$arrDays[$j]] = "1";
break;
}
}*/

//- 休日の配列をループ処理　(Loops through the array of Holidays)
for ($i = 0; $i < count($h); $i++) {
if ($date == $h[$i]['StoreHoliday']['YMD']) {
for ($i = 0; $i < count($holidays); $i++) {
if ($date == $holidays[$i]['StoreHoliday']['YMD']) {
$arrData[$m][$arrDays[$j]] .= "h";
break;
}
}

// 1 => transaction; h => holiday;
}
}
}
Expand Down Expand Up @@ -11643,4 +11654,23 @@ public function wsSaveFacilityPrograms($sessionid, $facility_programs)
}
}

/**
* Summary of wsGetKanzashiSalons
* @param string $sessionid
* @param integer $storecode
* @return KanzashiSalons
*/
public function wsGetKanzashiSalons($sessionid, $storecode)
{
$storeinfo = $this->YoyakuSession->Check($this);

if ($storeinfo == false) {
$this->_soap_server->fault(1, '', INVALID_SESSION);
return;
}

return $this->MiscFunction
->GetKanzashiSalons($this, $storeinfo['companyid'], $storecode);
}

}//end class ServersController

0 comments on commit 19965be

Please sign in to comment.