Changeset 18007 for branches/version-2/data/class/pages/admin/basis/LC_Page_Admin_Basis.php

Timestamp:

2009/05/15 16:30:40 (15 years ago)

Author:

kajiwara

Message:

2.4.0 正式版のコミット。コミット内容の詳細はこちら（http://svn.ec-cube.net/open_trac/query?status=closed&milestone=EC-CUBE2.4.0）

File:

• branches/version-2/data/class/pages/admin/basis/LC_Page_Admin_Basis.php (modified) (6 diffs)

branches/version-2/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];
+            //$sqlval[$val] = $array[$val];
+            //配列の場合は、パイプ区切りの文字列に変換
+            if(is_array($array[$val])) {
+                $sqlval[$val] = implode("|", $array[$val]);
+            } else {
+                $sqlval[$val] = $array[$val];
+            }
         }
         $sqlval['update_date'] = 'Now()';