Index: /branches/version-2_4/data/class/pages/admin/basis/LC_Page_Admin_Basis.php =================================================================== --- /branches/version-2_4/data/class/pages/admin/basis/LC_Page_Admin_Basis.php (revision 16741) +++ /branches/version-2_4/data/class/pages/admin/basis/LC_Page_Admin_Basis.php (revision 17775) @@ -52,4 +52,13 @@ $this->arrTAXRULE = $masterData->getMasterData("mtb_taxrule"); $this->tpl_subtitle = 'SHOPマスタ'; + + //定休日用配列 + $this->arrRegularHoliday[0] = '日'; + $this->arrRegularHoliday[1] = '月'; + $this->arrRegularHoliday[2] = '火'; + $this->arrRegularHoliday[3] = '水'; + $this->arrRegularHoliday[4] = '木'; + $this->arrRegularHoliday[5] = '金'; + $this->arrRegularHoliday[6] = '土'; } @@ -82,4 +91,5 @@ // 入力データの変換 $this->arrForm = $this->lfConvertParam($this->arrForm); + $this->arrForm['regular_holiday_ids'] = $_POST['regular_holiday_ids']; // 定休日情報を付加 // 入力データのエラーチェック $this->arrErr = $this->lfErrorCheck($this->arrForm); @@ -98,4 +108,9 @@ $this->tpl_onload = "window.alert('SHOPマスタの登録が完了しました。');"; } + if( empty($this->arrForm['regular_holiday_ids']) ) { + $this->arrSel = array(); + } else { + $this->arrSel = $this->arrForm['regular_holiday_ids']; + } } else { $arrCol = $this->lfGetCol(); @@ -103,4 +118,7 @@ $arrRet = $objQuery->select($col, "dtb_baseinfo"); $this->arrForm = $arrRet[0]; + + $regular_holiday_ids = explode('|', $this->arrForm['regular_holiday_ids']); + $this->arrForm['regular_holiday_ids'] = $regular_holiday_ids; } @@ -145,5 +163,6 @@ "free_rule", "good_traded", - "message" + "message", + "regular_holiday_ids" ); @@ -155,5 +174,11 @@ $arrCol = $this->lfGetCol(); foreach($arrCol as $val) { - $sqlval[$val] = $array[$val]; + //$sqlval[$val] = $array[$val]; + //配列の場合は、パイプ区切りの文字列に変換 + if(is_array($array[$val])) { + $sqlval[$val] = implode("|", $array[$val]); + } else { + $sqlval[$val] = $array[$val]; + } } $sqlval['update_date'] = 'Now()'; Index: /branches/version-2_4/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php =================================================================== --- /branches/version-2_4/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php (revision 17143) +++ /branches/version-2_4/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php (revision 17775) @@ -63,6 +63,9 @@ } + // 休日取得取得 + $this->arrHoliday = $this->lfGetHoliday(); + // 定休日取得取得 - $this->arrHoliday = $this->lfGetHoliday(); + $this->arrRegularHoliday = $this->lfGetRegularHoliday(); // カレンダーデータ取得 @@ -127,5 +130,5 @@ $arrCalendar[$j][$i]['month'] = $month; $arrCalendar[$j][$i]['day'] = $Day->day; - if ($this->lfCheckHoliday($month, $Day->day) || $Day->first || $Day->last) { + if ($this->lfCheckHoliday($month, $Day->day)) { $arrCalendar[$j][$i]['holiday'] = true; } else { @@ -152,8 +155,20 @@ } + // 定休日取得 + function lfGetRegularHoliday() { + $objSIteInfo = new SC_SiteInfo(); + $arrRegularHoliday = explode('|', $objSIteInfo->data['regular_holiday_ids']); + return $arrRegularHoliday; + } // 休日チェック function lfCheckHoliday($month, $day) { if (!empty($this->arrHoliday[$month])) { if (in_array($day, $this->arrHoliday[$month])) { + return true; + } + } + if (!empty($this->arrRegularHoliday)) { + $w = date('w', mktime(0,0,0 ,$month, $day, date('Y'))); + if (in_array($w, $this->arrRegularHoliday)) { return true; } Index: /branches/version-2_4/data/Smarty/templates/default/admin/basis/index.tpl =================================================================== --- /branches/version-2_4/data/Smarty/templates/default/admin/basis/index.tpl (revision 16582) +++ /branches/version-2_4/data/Smarty/templates/default/admin/basis/index.tpl (revision 17775) @@ -26,228 +26,241 @@