Changeset 20021 for branches/version-2_5-dev/data

Timestamp:

2011/01/20 18:37:51 (13 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:20020

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/helper/SC_Helper_DB.php 15176@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_DB.php
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 15594@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order_Edit.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110120093618-zkr0ln7d3wa608i4

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20110120093740-lm0482d2vyn5i7lu

bzr:revno:

2750

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/helper/SC_Helper_DB.php ohkouchi@loop-az.jp-20110120093618-zkr0ln7d3wa608i4
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php ohkouchi@loop-az.jp-20110120093618-zkr0ln7d3wa608i4

bzr:timestamp:

2011-01-20 18:37:40.619999886 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-01-20T09:37:40.620000Z

Message:

#792(ダウンロード販売機能)

• 受注管理画面で受注ステータスを更新した場合に, 入金日が反映されなかったのを修正

Location:

branches/version-2_5-dev/data/class

Files:

• helper/SC_Helper_DB.php (modified) (3 diffs)
• pages/admin/order/LC_Page_Admin_Order_Edit.php (modified) (1 diff)

branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php

@@ -1847 +1847 @@
      * @param integer|null $newAddPoint 加算ポイント (null=変更無し)
      * @param integer|null $newUsePoint 使用ポイント (null=変更無し)
+     * @param array $sqlval 更新後の値をリファレンスさせるためのパラメータ
      * @return void
      */
-    function sfUpdateOrderStatus($orderId, $newStatus = null, $newAddPoint = null, $newUsePoint = null) {
+    function sfUpdateOrderStatus($orderId, $newStatus = null, $newAddPoint = null, $newUsePoint = null, &$sqlval = array()) {
         $objQuery =& SC_Query::getSingletonInstance();
 
@@ -1930 +1931 @@
 
         // ▼受注テーブルの更新
-        $sqlval = array();
+        if (empty($sqlval)) {
+            $sqlval = array();
+        }
+
         if (USE_POINT !== false) {
             $sqlval['add_point'] = $newAddPoint;
@@ -1947 +1951 @@
         $sqlval['update_date'] = 'Now()';
 
-        $objQuery->update('dtb_order', $sqlval, 'order_id = ?', array($orderId));
+        $cols = $objQuery->listTableFields('dtb_order');
+        $dest = array();
+        foreach ($sqlval as $key => $val) {
+            if (in_array($key, $cols)) {
+                $dest[$key] = $val;
+            }
+        }
+
+        $objQuery->update('dtb_order', $dest, 'order_id = ?', array($orderId));
         // ▲受注テーブルの更新
     }

branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php

@@ -684 +684 @@
 
         // 受注.対応状況の更新
-        SC_Helper_DB_Ex::sfUpdateOrderStatus($order_id, $sqlval['status'], $sqlval['add_point'], $sqlval['use_point']);
-        unset($sqlval['status']);
-        unset($sqlval['add_point']);
-        unset($sqlval['use_point']);
+        SC_Helper_DB_Ex::sfUpdateOrderStatus($order_id, $sqlval['status'], $sqlval['add_point'], $sqlval['use_point'], $sqlval);
 
         // 受注テーブルの更新