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

Timestamp:

2011/02/28 18:36:28 (13 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20110228063632-zwilkj3syj4mqr5x

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/admin/order/edit.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Fedit.tpl
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
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-20110228093536-e68d6wi1b6c0h01y

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110228093612-axarfuybzmr2owgf

bzr:revno:

3169

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/admin/order/edit.tpl ohkouchi@loop-az.jp-20110228093536-e68d6wi1b6c0h01y
data/class/helper/SC_Helper_Purchase.php ohkouchi@loop-az.jp-20110228093536-e68d6wi1b6c0h01y
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php ohkouchi@loop-az.jp-20110228093536-e68d6wi1b6c0h01y

bzr:timestamp:

2011-02-28 18:36:12.844000101 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-02-28T09:36:12.844000Z

Message:

#1033([管理画面]受注管理（登録編集）：「現在ポイント」が正しくない)

• 現在ポイントは, 会員の保持ポイントをリアルタイムに表示するよう修正
• 受注完了直後, 加算ポイントが表示されないのを修正

Location:

branches/version-2_5-dev/data

Files:

• Smarty/templates/admin/order/edit.tpl (modified) (1 diff)
• class/helper/SC_Helper_Purchase.php (modified) (1 diff)
• class/pages/admin/order/LC_Page_Admin_Order_Edit.php (modified) (3 diffs)

branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl

@@ -221 +221 @@
             <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

@@ -636 +636 @@
         }
 
-        // ポイントは別登録
-        $addPoint = $orderParams['add_point'];
-        $usePoint = $orderParams['use_point'];
-        $orderParams['add_point'] = 0;
-        $orderParams['use_point'] = 0;
-
         // 注文ステータスの指定が無い場合は新規受付
         if(SC_Utils_Ex::isBlank($orderParams['status'])) {

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

@@ -279 +279 @@
         $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");
@@ -473 +474 @@
         $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);
+        }
     }
 
@@ -780 +786 @@
         }
         $objFormParam->setValue('customer_id', $customer_id);
+        $objFormParam->setValue('customer_point', $arrCustomer['point']);
     }