Changeset 22122 for branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php

Timestamp:

2012/12/04 20:09:02 (11 years ago)

Author:

h_yoshimoto

Message:

#1955 r22111 ～ r22120 間のコミットをmerge

File:

• branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php (modified) (4 diffs)

branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php

@@ -83 +83 @@
 
         $this->arrForm = $objFormParam->getHashArray();
-        //        $this->arrForm = $_POST;
 
         //支払方法の取得
@@ -91 +90 @@
             case 'update':
                 switch ($objFormParam->getValue('change_status')) {
-                    case '':
-                        break;
-                        // 削除
+                    // 削除
                     case 'delete':
                         $this->lfDelete($objFormParam->getValue('move'));
                         break;
-                        // 更新
+                    // 更新
                     default:
                         $this->lfStatusMove($objFormParam->getValue('change_status'), $objFormParam->getValue('move'));
                         break;
                 }
-
-                // 対応状況
-                $status = !is_null($objFormParam->getValue('status')) ? $objFormParam->getValue('status') : '';
                 break;
 
             case 'search':
-                // 対応状況
-                $status = !is_null($_POST['status']) ? $objFormParam->getValue('status') : '';
+            default:
                 break;
-
-            default:
-                // 対応状況
+        }
+
+        // 対応状況
+        $status = $objFormParam->getValue('status');
+        if (strlen($status) === 0) {
                 //デフォルトで新規受付一覧表示
                 $status = ORDER_NEW;
-                break;
-        }
-
-        // 対応状況
+        }
         $this->SelectedStatus = $status;
         //検索結果の表示
@@ -133 +125 @@
         $objFormParam->addParam(t('PARAM_LABEL_ORDER_NUMBER'), 'order_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam(t('PARAM_LABEL_BEFORE_ORDER_STATUS'), 'status', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_AFTER_ORDER_STATUS'), 'change_status', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam(t('PARAM_LABEL_PAGE_NO'), 'search_pageno', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
-        $objFormParam->addParam(t('PARAM_LABEL_MOVE_ORDER_NUMBER'), 'move', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        if ($this->getMode() == 'update') {
+            $objFormParam->addParam(t('PARAM_LABEL_AFTER_ORDER_STATUS'), 'change_status', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+            $objFormParam->addParam(t('PARAM_LABEL_MOVE_ORDER_NUMBER'), 'move', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+        }
     }
 
@@ -149 +143 @@
             $objFormParam->setValue('search_pageno', 1);
         }
-
-        if ($this->getMode() == 'change') {
-            if (is_null($objFormParam->getValue('change_status'))) {
-                $objFormParam->setValue('change_status','');
-            }
-        }
-
     }