[Svn-src-all:1546] [version-2_5-dev 20442] #1033([管理画面]受注管理（登録編集）：「現在ポイント」が正しくない)

[nanasess]

Subversion committed to /home/svn/open 20442
http://svn.ec-cube.net/open_trac/changeset/20442
┌────────────────────────────┐
│更新者　:  nanasess                                     │
│更新日時:  2011-02-28 18:36:28 +0900 (月, 28  2月 2011)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#1033([管理画面]受注管理（登録編集）：「現在ポイント」が正しくない)
 * 現在ポイントは, 会員の保持ポイントをリアルタイムに表示するよう修正
 * 受注完了直後, 加算ポイントが表示されないのを修正


Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl
U   branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php
U   branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php

変更: branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl	2011-02-28 07:00:33 UTC (rev 20441)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl	2011-02-28 09:36:28 UTC (rev 20442)
@@ -220,7 +220,7 @@
             <th>現在ポイント</th>
             <td>
                 <!--{if $arrForm.customer_id > 0}-->
-                    <!--{$arrForm.point.value|number_format}-->
+                    <!--{$arrForm.customer_point.value|number_format}-->
                      pt
                 <!--{else}-->
                     (非会員)

変更: branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php	2011-02-28 07:00:33 UTC (rev 20441)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php	2011-02-28 09:36:28 UTC (rev 20442)
@@ -635,12 +635,6 @@
             unset($orderParams[$unset]);
         }
 
-        // ポイントは別登録
-        $addPoint = $orderParams['add_point'];
-        $usePoint = $orderParams['use_point'];
-        $orderParams['add_point'] = 0;
-        $orderParams['use_point'] = 0;
-
         // 注文ステータスの指定が無い場合は新規受付
         if(SC_Utils_Ex::isBlank($orderParams['status'])) {
             $orderParams['status'] = ORDER_NEW;

変更: branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	2011-02-28 07:00:33 UTC (rev 20441)
+++ branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	2011-02-28 09:36:28 UTC (rev 20442)
@@ -278,7 +278,8 @@
         $objFormParam->addParam("最終保持ポイント", "total_point");
         $objFormParam->addParam("顧客ID", "customer_id", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"), '0');
         $objFormParam->addParam("顧客ID", "edit_customer_id", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"), '0');
-        $objFormParam->addParam("現在のポイント", "point");
+        $objFormParam->addParam("現在のポイント", "customer_point");
+        $objFormParam->addParam("受注前ポイント", "point");
         $objFormParam->addParam("注文番号", "order_id");
         $objFormParam->addParam("受注日", "create_date");
         $objFormParam->addParam("発送日", "commit_date");
@@ -472,6 +473,11 @@
         list($db_point, $rollback_point) = SC_Helper_DB_Ex::sfGetRollbackPoint($order_id, $arrOrder['use_point'], $arrOrder['add_point']);
         $objFormParam->setValue('total_point', $db_point);
         $objFormParam->setValue('point', $rollback_point);
+
+        if (!SC_Utils_Ex::isBlank($objFormParam->getValue('customer_id'))) {
+            $this->setCustomerTo($objFormParam->getValue('customer_id'),
+                                 $objFormParam);
+        }
     }
 
     /**
@@ -779,6 +785,7 @@
             $objFormParam->setValue('order_' . $key, $val);
         }
         $objFormParam->setValue('customer_id', $customer_id);
+        $objFormParam->setValue('customer_point', $arrCustomer['point']);
     }
 
     /**