Changeset 22796 for branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php

Timestamp:

2013/05/02 18:11:36 (11 years ago)

Author:

h_yoshimoto

Message:

#2236 2.12.3リリース以降の2.12-devへのコミット差し戻し

File:

• branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php (modified) (10 diffs)

branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php

@@ -32 +32 @@
  * @version $Id: LC_Page_Admin_Order_Disp.php 20767 2011-03-22 10:07:32Z nanasess $
  */
-class LC_Page_Admin_Order_Disp extends LC_Page_Admin_Order_Ex 
-{
+class LC_Page_Admin_Order_Disp extends LC_Page_Admin_Order_Ex {
 
     var $arrShippingKeys = array(
@@ -76 +75 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'order/disp.tpl';
@@ -91 +89 @@
 
         // 支払い方法の取得
-        $this->arrPayment = SC_Helper_Payment_Ex::getIDValueList();
+        $this->arrPayment = SC_Helper_DB_Ex::sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
 
         // 配送業者の取得
-        $this->arrDeliv = SC_Helper_Delivery_Ex::getIDValueList();
+        $this->arrDeliv = SC_Helper_DB_Ex::sfGetIDValueList('dtb_deliv', 'deliv_id', 'name');
     }
 
@@ -102 +100 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -113 +110 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objPurchase = new SC_Helper_Purchase_Ex();
@@ -130 +126 @@
         $this->arrForm = $objFormParam->getFormParamList();
         $this->arrAllShipping = $objFormParam->getSwapArray(array_merge($this->arrShippingKeys, $this->arrShipmentItemKeys));
-        $this->arrDelivTime = SC_Helper_Delivery_Ex::getDelivTime($objFormParam->getValue('deliv_id'));
+        $this->arrDelivTime = $objPurchase->getDelivTime($objFormParam->getValue('deliv_id'));
         $this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
 
@@ -141 +137 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -152 +147 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         // 検索条件のパラメータを初期化
         parent::lfInitParam($objFormParam);
@@ -200 +194 @@
         $objFormParam->addParam('メモ', 'note', MTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
         $objFormParam->addParam('削除用項番', 'delete_no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-        $objFormParam->addParam('消費税率', 'tax_rate');
-        $objFormParam->addParam('課税規則', 'tax_rule');
 
         // DB読込用
@@ -265 +257 @@
      * @return void
      */
-    function setOrderToFormParam(&$objFormParam, $order_id)
-    {
+    function setOrderToFormParam(&$objFormParam, $order_id) {
         $objPurchase = new SC_Helper_Purchase_Ex();