Changeset 17623

Timestamp:

2008/09/22 23:41:51 (16 years ago)

Author:

Yammy

Message:

http://svn.ec-cube.net/open_trac/ticket/362
カレンダーブロックの定休日設定

Location:

branches/comu-ver2

Files:

• data/Smarty/templates/default/admin/basis/index.tpl (modified) (1 diff)
• data/class/pages/admin/basis/LC_Page_Admin_Basis.php (modified) (6 diffs)
• data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php (modified) (3 diffs)
• html/install/sql/create_table_mysql.sql (modified) (1 diff)
• html/install/sql/create_table_pgsql.sql (modified) (1 diff)

branches/comu-ver2/data/Smarty/templates/default/admin/basis/index.tpl

@@ -170 +170 @@
   </table>
 
+  <h2>定休日設定</h2>
+  <table id="basis-index-func">
+    <tr>
+      <th>定休日</th>
+      <td>
+        <span class="attention"><!--{$arrErr.regular_holiday_ids}--></span>
+        <!--{html_checkboxes name="regular_holiday_ids" options=$arrRegularHoliday selected=$arrForm.regular_holiday_ids}-->
+      </td>
+    </tr>
+  </table>
+
   <h2>SHOP機能</h2>
   <table id="basis-index-func">

branches/comu-ver2/data/class/pages/admin/basis/LC_Page_Admin_Basis.php

@@ -52 +52 @@
         $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 +91 @@
             // 入力データの変換
             $this->arrForm = $this->lfConvertParam($this->arrForm);
+            $this->arrForm['regular_holiday_ids'] = $_POST['regular_holiday_ids'];  // 定休日情報を付加
             // 入力データのエラーチェック
             $this->arrErr = $this->lfErrorCheck($this->arrForm);
@@ -98 +108 @@
                 $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 +118 @@
             $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 +163 @@
             "free_rule",
             "good_traded",
-            "message"
+            "message",
+            "regular_holiday_ids"
 
         );
@@ -155 +174 @@
         $arrCol = $this->lfGetCol();
         foreach($arrCol as $val) {
-            $sqlval[$val] = $array[$val];
+            //配列の場合は、パイプ区切りの文字列に変換
+            if(is_array($array[$val])) {
+                $sqlval[$val] = implode("|", $array[$val]);
+            } else {
+                $sqlval[$val] = $array[$val];
+            }
         }
         $sqlval['update_date'] = 'Now()';

branches/comu-ver2/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php

@@ -63 +63 @@
         }
 
+        // 休日取得取得
+        $this->arrHoliday = $this->lfGetHoliday();
+
         // 定休日取得取得
-        $this->arrHoliday = $this->lfGetHoliday();
+        $this->arrRegularHoliday = $this->lfGetRegularHoliday();
 
         // カレンダーデータ取得
@@ -127 +130 @@
                 $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 +155 @@
     }
 
+    // 定休日取得
+    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;
             }

branches/comu-ver2/html/install/sql/create_table_mysql.sql

@@ -142 +142 @@
     mypage_tpl text,
     good_traded text,
-    message text
+    message text,
+    regular_holiday_ids text
 ) TYPE=InnoDB ;
 

branches/comu-ver2/html/install/sql/create_table_pgsql.sql

@@ -145 +145 @@
     mypage_tpl text,
     good_traded text,
-    message text
+    message text,
+    regular_holiday_ids text
 );