Changeset 20021


Ignore:
Timestamp:
2011/01/20 18:37:51 (11 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php

    r19963 r20021  
    18471847     * @param integer|null $newAddPoint 加算ポイント (null=変更無し) 
    18481848     * @param integer|null $newUsePoint 使用ポイント (null=変更無し) 
     1849     * @param array $sqlval 更新後の値をリファレンスさせるためのパラメータ 
    18491850     * @return void 
    18501851     */ 
    1851     function sfUpdateOrderStatus($orderId, $newStatus = null, $newAddPoint = null, $newUsePoint = null) { 
     1852    function sfUpdateOrderStatus($orderId, $newStatus = null, $newAddPoint = null, $newUsePoint = null, &$sqlval = array()) { 
    18521853        $objQuery =& SC_Query::getSingletonInstance(); 
    18531854 
     
    19301931 
    19311932        // ▼受注テーブルの更新 
    1932         $sqlval = array(); 
     1933        if (empty($sqlval)) { 
     1934            $sqlval = array(); 
     1935        } 
     1936 
    19331937        if (USE_POINT !== false) { 
    19341938            $sqlval['add_point'] = $newAddPoint; 
     
    19471951        $sqlval['update_date'] = 'Now()'; 
    19481952 
    1949         $objQuery->update('dtb_order', $sqlval, 'order_id = ?', array($orderId)); 
     1953        $cols = $objQuery->listTableFields('dtb_order'); 
     1954        $dest = array(); 
     1955        foreach ($sqlval as $key => $val) { 
     1956            if (in_array($key, $cols)) { 
     1957                $dest[$key] = $val; 
     1958            } 
     1959        } 
     1960 
     1961        $objQuery->update('dtb_order', $dest, 'order_id = ?', array($orderId)); 
    19501962        // ▲受注テーブルの更新 
    19511963    } 
  • branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php

    r20010 r20021  
    684684 
    685685        // 受注.対応状況の更新 
    686         SC_Helper_DB_Ex::sfUpdateOrderStatus($order_id, $sqlval['status'], $sqlval['add_point'], $sqlval['use_point']); 
    687         unset($sqlval['status']); 
    688         unset($sqlval['add_point']); 
    689         unset($sqlval['use_point']); 
     686        SC_Helper_DB_Ex::sfUpdateOrderStatus($order_id, $sqlval['status'], $sqlval['add_point'], $sqlval['use_point'], $sqlval); 
    690687 
    691688        // 受注テーブルの更新 
Note: See TracChangeset for help on using the changeset viewer.