Changeset 17580 for branches/comu-ver2/data/class/pages

Timestamp:

2008/08/29 08:15:31 (18 years ago)

Author:

Seasoft

Message:

merge r17506,r17512,r17513,r17515,r17517,r17520,r17524,r17526,r17530

Location:

branches/comu-ver2/data/class/pages

Files:

• admin/basis/LC_Page_Admin_Basis_Delivery_Input.php (modified) (4 diffs)
• admin/mail/LC_Page_Admin_Mail.php (modified) (1 diff)
• admin/order/LC_Page_Admin_Order.php (modified) (1 diff)
• products/LC_Page_Products_List.php (modified) (1 diff)

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

@@ -132 +132 @@
     }
 
-    /* DBに登録する */
+    
+    /**
+     * 配送情報を登録する
+     *
+     * @return $deliv_id 
+     */
     function lfRegistData() {
         $arrRet = $this->objFormParam->getHashArray();
@@ -145 +150 @@
         $sqlval['update_date'] = 'Now()';
 
+
+        // deliv_id が決まっていた場合
         if($_POST['deliv_id'] != "") {
             $deliv_id = $_POST['deliv_id'];
             $where = "deliv_id = ?";
             $objQuery->update("dtb_deliv", $sqlval, $where, array($deliv_id));
-            $objQuery->delete("dtb_delivfee", $where, array($deliv_id));
-            $objQuery->delete("dtb_delivtime", $where, array($deliv_id));
-        } else {
+
+            // 配送時間の登録
+            $table = "dtb_delivtime";
+            $where = "deliv_id = ? AND time_id = ?";
+            for($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) {
+                $sqlval = array();
+                $keyname = "deliv_time".$cnt;
+                $arrval = array($deliv_id, ($cnt * $deliv_id));
+                // 既存データの有無を確認
+                $curData = $objQuery->select("*", $table, $where, $arrval);
+
+                if(strcmp($arrRet[$keyname], "") != 0) {
+                    $sqlval['deliv_time'] = $arrRet[$keyname];
+
+                    // 入力が空ではなく、DBに情報があれば更新
+                    if(count($curData)) {
+                        $objQuery->update($table, $sqlval, $where, $arrval);
+                    }
+                    // DBに情報がなければ登録
+                    else {
+                        $sqlval['deliv_id'] = $deliv_id;
+                        $sqlval['time_id'] = ($cnt * $deliv_id);
+                        $objQuery->insert($table, $sqlval);
+                    }
+                }
+                // 入力が空で、DBに情報がある場合は削除
+                else if(count($curData)) {
+                    $objQuery->delete($table, $where, $arrval);
+                }
+            }
+
+            // 配送料の登録
+            if(INPUT_DELIV_FEE) {
+                for($cnt = 1; $cnt <= DELIVFEE_MAX; $cnt++) {
+                    $keyname = "fee".$cnt;
+                    if(strcmp($arrRet[$keyname], "") != 0) {
+                        $sqlval = array('fee' => $arrRet[$keyname]);
+                        $objQuery->update("dtb_delivfee", $sqlval, "deliv_id = ? AND pref = ?", array($deliv_id, $cnt));
+                    }
+                }
+            }
+        }
+        else {
             // 登録する配送業者IDの取得
 
@@ -167 +214 @@
                 $deliv_id = $objQuery->nextval('dtb_deliv', 'deliv_id');
             }
-        }
-
-        $sqlval = array();
-        // 配送時間の設定
-        for($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) {
-            $keyname = "deliv_time$cnt";
-            if($arrRet[$keyname] != "") {
-                $sqlval['deliv_id'] = $deliv_id;
-                $sqlval['deliv_time'] = $arrRet[$keyname];
-                // INSERTの実行
-                $objQuery->insert("dtb_delivtime", $sqlval);
-            }
-        }
-
-        if(INPUT_DELIV_FEE) {
+
             $sqlval = array();
-            // 配送料金の設定
-            for($cnt = 1; $cnt <= DELIVFEE_MAX; $cnt++) {
-                $keyname = "fee$cnt";
+            // 配送時間の設定
+            for($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) {
+                $keyname = "deliv_time$cnt";
                 if($arrRet[$keyname] != "") {
                     $sqlval['deliv_id'] = $deliv_id;
-                    $sqlval['fee'] = $arrRet[$keyname];
-                    $sqlval['pref'] = $cnt;
+                    $sqlval['time_id'] = ($cnt * $deliv_id);
+                    $sqlval['deliv_time'] = $arrRet[$keyname];
                     // INSERTの実行
-                    $objQuery->insert("dtb_delivfee", $sqlval);
+                    $objQuery->insert("dtb_delivtime", $sqlval);
+                }
+            }
+
+            if(INPUT_DELIV_FEE) {
+                $sqlval = array();
+                // 配送料金の設定
+                for($cnt = 1; $cnt <= DELIVFEE_MAX; $cnt++) {
+                    $keyname = "fee$cnt";
+                    if($arrRet[$keyname] != "") {
+                        $sqlval['deliv_id'] = $deliv_id;
+                        $sqlval['fee'] = $arrRet[$keyname];
+                        $sqlval['pref'] = $cnt;
+                        // INSERTの実行
+                        $objQuery->insert("dtb_delivfee", $sqlval);
+                    }
                 }
             }
@@ -198 +246 @@
         return $deliv_id;
     }
+    
 
     /* 配送業者情報の取得 */

branches/comu-ver2/data/class/pages/admin/mail/LC_Page_Admin_Mail.php

@@ -201 +201 @@
 
             $this->list_data = $list_data;
-
+            $this->arrCampaignList = $this->lfGetCampaignList($objQuery);
+            
             $objView->assignobj($this);
             $objView->display($tpl_path);

branches/comu-ver2/data/class/pages/admin/order/LC_Page_Admin_Order.php

@@ -200 +200 @@
                             case 'search_order_tel':
                                 if(DB_TYPE == "pgsql"){
-                                    $where .= " AND (order_tel01 || order_tel02 || order_tel03 LIKE ?)";
+                                    $where .= " AND (order_tel01 || order_tel02 || order_tel03 ILIKE ?)";
                                 }elseif(DB_TYPE == "mysql"){
-                                    $where .= " AND concat(order_tel01,order_tel02,order_tel03) LIKE ?";
+                                    $where .= " AND concat(order_tel01,order_tel02,order_tel03) ILIKE ?";
                                 }
                                 $nonmark_val = ereg_replace("[()-]+","",$val);

branches/comu-ver2/data/class/pages/products/LC_Page_Products_List.php

@@ -459 +459 @@
 
         // 商品名をwhere文に
-        $name = ereg_replace(",", "", $name);
-        if ( strlen($name) > 0 ){
-            $name = trim(mb_convert_kana($name, 's')); // 半角/全角スペースを削除
-            $where .= " AND ( name ILIKE ? OR comment3 ILIKE ?) ";
-            $ret = SC_Utils_Ex::sfManualEscape($name);
-            $arrval[] = "%$ret%";
-            $arrval[] = "%$ret%";
+        $name = ereg_replace(",", "", $name);// XXX
+        // 全角スペースを半角スペースに変換
+        $name = str_replace('　', ' ', $name);
+        // スペースでキーワードを分割
+        $names = preg_split("/ +/", $name);
+        // 分割したキーワードを一つずつwhere文に追加
+        foreach ($names as $val) {
+            if ( strlen($val) > 0 ){
+                $where .= " AND ( name ILIKE ? OR comment3 ILIKE ?) ";
+                $ret = SC_Utils_Ex::sfManualEscape($val);
+                $arrval[] = "%$ret%";
+                $arrval[] = "%$ret%";
+            }
         }