Changeset 20442
- Timestamp:
- 2011/02/28 18:36:28 (13 years ago)
- 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
- Location:
- branches/version-2_5-dev/data
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl
r20407 r20442 221 221 <td> 222 222 <!--{if $arrForm.customer_id > 0}--> 223 <!--{$arrForm. point.value|number_format}-->223 <!--{$arrForm.customer_point.value|number_format}--> 224 224 pt 225 225 <!--{else}--> -
branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php
r20435 r20442 636 636 } 637 637 638 // ポイントは別登録639 $addPoint = $orderParams['add_point'];640 $usePoint = $orderParams['use_point'];641 $orderParams['add_point'] = 0;642 $orderParams['use_point'] = 0;643 644 638 // 注文ステータスの指定が無い場合は新規受付 645 639 if(SC_Utils_Ex::isBlank($orderParams['status'])) { -
branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
r20430 r20442 279 279 $objFormParam->addParam("顧客ID", "customer_id", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"), '0'); 280 280 $objFormParam->addParam("顧客ID", "edit_customer_id", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"), '0'); 281 $objFormParam->addParam("現在のポイント", "point"); 281 $objFormParam->addParam("現在のポイント", "customer_point"); 282 $objFormParam->addParam("受注前ポイント", "point"); 282 283 $objFormParam->addParam("注文番号", "order_id"); 283 284 $objFormParam->addParam("受注日", "create_date"); … … 473 474 $objFormParam->setValue('total_point', $db_point); 474 475 $objFormParam->setValue('point', $rollback_point); 476 477 if (!SC_Utils_Ex::isBlank($objFormParam->getValue('customer_id'))) { 478 $this->setCustomerTo($objFormParam->getValue('customer_id'), 479 $objFormParam); 480 } 475 481 } 476 482 … … 780 786 } 781 787 $objFormParam->setValue('customer_id', $customer_id); 788 $objFormParam->setValue('customer_point', $arrCustomer['point']); 782 789 } 783 790
Note: See TracChangeset
for help on using the changeset viewer.