Changeset 18432 for branches/version-2/data/class/pages/admin/order

Timestamp:

2009/12/07 15:08:06 (17 years ago)

Author:

kajiwara

Message:

EC-CUBE Ver2.4.2 分コミット。詳細はこちら（ http://www.ec-cube.net/release/detail.php?release_id=207）

Location:

branches/version-2/data/class/pages/admin/order

Files:

• LC_Page_Admin_Order_Edit.php (modified) (4 diffs)
• LC_Page_Admin_Order_Pdf.php (modified) (1 diff)

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

@@ -175 +175 @@
             }
             break;
-            // 再計算
+        // 再計算
         case 'cheek':
+        //支払い方法の選択
+        case 'payment':
             // POST情報で上書き
             $this->objFormParam->setParam($_POST);
@@ -208 +210 @@
             // 入力値の変換
             $this->objFormParam->convParam();
-            $this->arrErr = $this->lfCheckError();
-            if(count($this->arrErr) == 0) {
-                $this->arrErr = $this->lfCheek($arrInfo, $_POST['mode']);
-            }
             break;
         /* 商品追加ポップアップより商品選択後、商品情報取得*/
@@ -234 +232 @@
             // 入力値の変換
             $this->objFormParam->convParam();
-            $this->arrErr = $this->lfCheckError();
-            if(count($this->arrErr) == 0) {
-                $this->arrErr = $this->lfCheek($arrInfo, $_POST['mode']);
-            }
             break;
         /* 顧客検索ポップアップより顧客指定後、顧客情報取得*/
@@ -383 +377 @@
         $this->objFormParam->addParam("配送時間ID", "deliv_time_id", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
         $this->objFormParam->addParam("対応状況", "status", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
-        $this->objFormParam->addParam("配達日", "deliv_date", STEXT_LEN, "KVa", array("MAX_LENGTH_CHECK"));
+        $this->objFormParam->addParam("配達日", "deliv_date", STEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));
         $this->objFormParam->addParam("お支払方法名称", "payment_method");
         $this->objFormParam->addParam("配送時間", "deliv_time");

branches/version-2/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php

@@ -111 +111 @@
                 }
                 $objFpdf->createPdf();
+                exit;
             }
             break;