Changeset 18023

Timestamp:

2009/05/23 11:23:24 (15 years ago)

Author:

Seasoft

Message:

#472「管理機能の配送業者の追加でエラー」を修正。

Location:

branches/comu-ver2

Files:

• data/class/helper/SC_Helper_DB.php (modified) (2 diffs)
• data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php (modified) (3 diffs)
• data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php (modified) (2 diffs)
• data/class/pages/shopping/LC_Page_Shopping_Payment.php (modified) (3 diffs)
• html/install/sql/create_table_mysql.sql (modified) (1 diff)
• html/install/sql/create_table_pgsql.sql (modified) (1 diff)
• html/install/sql/insert_data.sql (modified) (1 diff)

branches/comu-ver2/data/class/helper/SC_Helper_DB.php

@@ -425 +425 @@
                 $objQuery->update("dtb_order_temp", $sqlval, $where, array($uniqid));
             }
+            
+            // 受注_Tempテーブルの名称列を更新
+            $this->sfUpdateOrderNameCol($uniqid, true);
         }
     }
@@ -1712 +1715 @@
     }
 
+    /**
+     * 受注の名称列を更新する
+     *
+     * @param integer $order_id 更新対象の注文番号
+     * @param boolean $temp_table 更新対象は「受注_Temp」か
+     */
+    function sfUpdateOrderNameCol($order_id, $temp_table = false) {
+        $objQuery = new SC_Query();
+        
+        if ($temp_table) {
+            $table = 'dtb_order_temp';
+            $sql_where = 'WHERE order_temp_id = ?';
+        } else {
+            $table = 'dtb_order';
+            $sql_where = 'WHERE order_id = ?';
+        }
+        
+        $sql = <<< __EOS__
+            UPDATE
+                $table tgt
+            SET
+                 payment_method = (SELECT payment_method FROM dtb_payment WHERE payment_id = tgt.payment_id)
+                ,deliv_time = (SELECT deliv_time FROM dtb_delivtime WHERE time_id = tgt.deliv_time_id AND deliv_id = tgt.deliv_id)
+            $sql_where
+__EOS__;
+        
+        $objQuery->query($sql, array($order_id));
+    }
 }
 ?>

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

@@ -163 +163 @@
                 $sqlval = array();
                 $keyname = "deliv_time".$cnt;
-                $arrval = array($deliv_id, ($cnt * $deliv_id));
+                $arrval = array($deliv_id, $cnt);
                 // 既存データの有無を確認
                 $curData = $objQuery->select("*", $table, $where, $arrval);
@@ -177 +177 @@
                     else {
                         $sqlval['deliv_id'] = $deliv_id;
-                        $sqlval['time_id'] = ($cnt * $deliv_id);
+                        $sqlval['time_id'] = $cnt;
                         $objQuery->insert($table, $sqlval);
                     }
@@ -221 +221 @@
                 if($arrRet[$keyname] != "") {
                     $sqlval['deliv_id'] = $deliv_id;
-                    $sqlval['time_id'] = ($cnt * $deliv_id);
+                    $sqlval['time_id'] = $cnt;
                     $sqlval['deliv_time'] = $arrRet[$keyname];
                     // INSERTの実行

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

@@ -552 +552 @@
         // 受注テーブルの更新
         $objQuery->update("dtb_order", $sqlval, $where, array($order_id), $addcol);
-
-        $sql = "";
-        $sql .= " UPDATE";
-        $sql .= "     dtb_order";
-        $sql .= " SET";
-        $sql .= "     payment_method = (SELECT payment_method FROM dtb_payment WHERE payment_id = ?)";
-        $sql .= "     ,deliv_time = (SELECT deliv_time FROM dtb_delivtime WHERE time_id = ? AND deliv_id = (SELECT deliv_id FROM dtb_payment WHERE payment_id = ? ))";
-        $sql .= " WHERE order_id = ?";
-
-        if ($arrRet['deliv_time_id'] == "") {
-            $deliv_time_id = 0;
-        }else{
-            $deliv_time_id = $arrRet['deliv_time_id'];
-        }
-        $arrUpdData = array($arrRet['payment_id'], $deliv_time_id, $arrRet['payment_id'], $order_id);
-        $objQuery->query($sql, $arrUpdData);
-
+        
+        // 受注テーブルの名称列を更新
+        $objDb = new SC_Helper_DB_Ex();
+        $objDb->sfUpdateOrderNameCol($order_id);
+        
         // 受注詳細データの更新
         $arrDetail = $this->objFormParam->getSwapArray(array("product_id", "product_code", "product_name", "price", "quantity", "point_rate", "classcategory_id1", "classcategory_id2", "classcategory_name1", "classcategory_name2"));
@@ -660 +648 @@
         $order_id = $objQuery->currval('dtb_order', 'order_id'); 
         
-        $sql = "";
-        $sql .= " UPDATE";
-        $sql .= "     dtb_order";
-        $sql .= " SET";
-        $sql .= "     payment_method = (SELECT payment_method FROM dtb_payment WHERE payment_id = ?)";
-        $sql .= "     ,deliv_time = (SELECT deliv_time FROM dtb_delivtime WHERE time_id = ? AND deliv_id = (SELECT deliv_id FROM dtb_payment WHERE payment_id = ? ))";
-        $sql .= " WHERE order_id = ?";
-
-        if ($arrRet['deliv_time_id'] == "") {
-            $deliv_time_id = 0;
-        }else{
-            $deliv_time_id = $arrRet['deliv_time_id'];
-        }
-        $arrUpdData = array($arrRet['payment_id'], $deliv_time_id, $arrRet['payment_id'], $order_id);
-        $objQuery->query($sql, $arrUpdData);
-
+        // 受注テーブルの名称列を更新
+        $objDb = new SC_Helper_DB_Ex();
+        $objDb->sfUpdateOrderNameCol($order_id);
+        
         // 受注詳細データの更新
         $arrDetail = $this->objFormParam->getSwapArray(array("product_id", "product_code", "product_name", "price", "quantity", "point_rate", "classcategory_id1", "classcategory_id2", "classcategory_name1", "classcategory_name2"));

branches/comu-ver2/data/class/pages/shopping/LC_Page_Shopping_Payment.php

@@ -420 +420 @@
         $objQuery = new SC_Query();
         $where = "payment_id = ?";
-        $arrRet = $objQuery->select("payment_method, charge", "dtb_payment", $where, array($payment_id));
-        return (array($arrRet[0]['payment_method'], $arrRet[0]['charge']));
-    }
-
-    /* 配送時間文字列の取得 */
-    function lfGetDelivTimeInfo($time_id) {
-        $objQuery = new SC_Query();
-        $where = "time_id = ?";
-        $arrRet = $objQuery->select("deliv_id, deliv_time", "dtb_delivtime", $where, array($time_id));
-        return (array($arrRet[0]['deliv_id'], $arrRet[0]['deliv_time']));
+        $arrRet = $objQuery->select("charge, deliv_id", "dtb_payment", $where, array($payment_id));
+        return (array($arrRet[0]['charge'], $arrRet[0]['deliv_id']));
     }
 
     /* DBへデータの登録 */
     function lfRegistData($uniqid) {
-        $arrRet = $this->objFormParam->getHashArray();
+        $objDb = new SC_Helper_DB_Ex();
+        
         $sqlval = $this->objFormParam->getDbArray();
         // 登録データの作成
@@ -440 +433 @@
         $sqlval['update_date'] = 'Now()';
 
-        if($sqlval['payment_id'] != "") {
-            list($sqlval['payment_method'], $sqlval['charge']) = $this->lfGetPaymentInfo($sqlval['payment_id']);
-        } else {
-            $sqlval['payment_id'] = '0';
-            $sqlval['payment_method'] = "";
-        }
-
-        if($sqlval['deliv_time_id'] != "") {
-            list($sqlval['deliv_id'], $sqlval['deliv_time']) = $this->lfGetDelivTimeInfo($sqlval['deliv_time_id']);
-        } else {
-            $sqlval['deliv_time_id'] = '0';
-            $sqlval['deliv_id'] = '0';
-            $sqlval['deliv_time'] = "";
+        if (strlen($sqlval['payment_id']) >= 1) {
+            list($sqlval['charge'], $sqlval['deliv_id']) = $this->lfGetPaymentInfo($sqlval['payment_id']);
         }
 
@@ -460 +442 @@
         }
 
-        $objDb = new SC_Helper_DB_Ex();
+        // 受注_Tempテーブルに登録
         $objDb->sfRegistTempOrder($uniqid, $sqlval);
     }

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

@@ -161 +161 @@
 CREATE TABLE dtb_delivtime (
     deliv_id int NOT NULL,
-    time_id int auto_increment primary key NOT NULL,
-    deliv_time text NOT NULL
+    time_id int NOT NULL,
+    deliv_time text NOT NULL,
+    PRIMARY KEY (deliv_id, time_id)
 ) TYPE=InnoDB ;
 

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

@@ -165 +165 @@
 CREATE TABLE dtb_delivtime (
     deliv_id int4 NOT NULL,
-    time_id serial NOT NULL,
+    time_id int4 NOT NULL,
     deliv_time text NOT NULL,
-    PRIMARY KEY (time_id)
+    PRIMARY KEY (deliv_id, time_id)
 );
 

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

@@ -310 +310 @@
 INSERT INTO dtb_delivfee (deliv_id,fee,pref) VALUES (1, '1000', 47);
 
-INSERT INTO dtb_delivtime (deliv_id, deliv_time) VALUES (1, '午前');
-INSERT INTO dtb_delivtime (deliv_id, deliv_time) VALUES (1, '午後');
+INSERT INTO dtb_delivtime (deliv_id, time_id, deliv_time) VALUES (1, 1, '午前');
+INSERT INTO dtb_delivtime (deliv_id, time_id, deliv_time) VALUES (1, 2, '午後');
 
 INSERT INTO dtb_payment (payment_method,charge,rule,deliv_id,rank,note,fix,status,del_flg,creator_id,create_date,update_date,payment_image,upper_rule) VALUES ('郵便振替', 0, NULL, 1, 4, NULL, 2, 1, 0, 1, now(), now(), NULL, NULL);