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

Timestamp:

2009/07/08 16:39:57 (17 years ago)

Author:

kajiwara

Message:

2.4.1 正式版をコミット。コミット内容詳細はこちら（http://svn.ec-cube.net/open_trac/query?status=closed&milestone=EC-CUBE2.4.1）

Location:

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

Files:

• LC_Page_Admin_Order.php (modified) (3 diffs)
• LC_Page_Admin_Order_Edit.php (modified) (6 diffs)
• LC_Page_Admin_Order_Mail.php (modified) (1 diff)
• LC_Page_Admin_Order_Pdf.php (modified) (2 diffs)

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

@@ -230 +230 @@
                         break;
                     case 'search_eorderyear':
-                        $date = SC_Utils_Ex::sfGetTimestamp($_POST['search_eorderyear'], $_POST['search_eordermonth'], $_POST['search_eorderday']);
+                        $date = SC_Utils_Ex::sfGetTimestamp($_POST['search_eorderyear'], $_POST['search_eordermonth'], $_POST['search_eorderday'], true);
                         $where.= " AND create_date <= ?";
                         $arrval[] = $date;
@@ -371 +371 @@
     /* パラメータ情報の初期化 */
     function lfInitParam() {
-        $this->objFormParam->addParam("受注番号1", "search_order_id1", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
-        $this->objFormParam->addParam("受注番号2", "search_order_id2", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
+        $this->objFormParam->addParam("注文番号1", "search_order_id1", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
+        $this->objFormParam->addParam("注文番号2", "search_order_id2", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
         $this->objFormParam->addParam("対応状況", "search_order_status", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
         $this->objFormParam->addParam("顧客名", "search_order_name", STEXT_LEN, "KVa", array("MAX_LENGTH_CHECK"));
@@ -413 +413 @@
 
         // 特殊項目チェック
-        $objErr->doFunc(array("受注番号1", "受注番号2", "search_order_id1", "search_order_id2"), array("GREATER_CHECK"));
+        $objErr->doFunc(array("注文番号1", "注文番号2", "search_order_id1", "search_order_id2"), array("GREATER_CHECK"));
         $objErr->doFunc(array("年齢1", "年齢2", "search_age1", "search_age2"), array("GREATER_CHECK"));
         $objErr->doFunc(array("購入金額1", "購入金額2", "search_total1", "search_total2"), array("GREATER_CHECK"));

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

@@ -88 +88 @@
         /* ペイジェント決済モジュール連携用 */
         if(function_exists("sfPaygentOrderPage")) {
-            $this->arrFormKind = sfPaygentOrderPage();
+            $this->arrDispKind = sfPaygentOrderPage();
         }
 
@@ -372 +372 @@
         // 受注商品情報
         $this->objFormParam->addParam("値引き", "discount", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"), '0');
-        $this->objFormParam->addParam("送料", "deliv_fee", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
+        $this->objFormParam->addParam("送料", "deliv_fee", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"), '0');
         $this->objFormParam->addParam("手数料", "charge", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
 
@@ -409 +409 @@
         $this->objFormParam->addParam("顧客ID", "customer_id");
         $this->objFormParam->addParam("現在のポイント", "point");
-        $this->objFormParam->addParam("受注番号", "order_id");
+        $this->objFormParam->addParam("注文番号", "order_id");
         $this->objFormParam->addParam("受注日", "create_date");
         $this->objFormParam->addParam("発送日", "commit_date");
@@ -441 +441 @@
                 $this->arrForm["payment_type"] = "お支払い";
             }
+            //受注データを表示用配列に代入（各EC-CUBEバージョンと決済モジュールとのデータ連携保全のため）
+            $this->arrDisp = $this->arrForm;
         }
     }
@@ -566 +568 @@
         if ($sqlval['status'] == ODERSTATUS_COMMIT) {
             // 受注テーブルの発送済み日を更新する
-            $sql .= "     ,commit_date = 'NOW()'";
+            $sql .= "     ,commit_date = NOW()";
         }
         $sql .= " WHERE order_id = ?";
@@ -697 +699 @@
         $arrProduct = $this->lfGetProductsClass($product_id, $classcategory_id1, $classcategory_id2);
         $this->arrForm = $this->objFormParam->getFormParamList();
-        $this->lfSetProductData($arrProduct);
+        $existes = false;
+        $existes_key = NULL;
+        // 既に同じ商品がないか、確認する
+        if (!empty($this->arrForm['product_id']['value'])) {
+            foreach ($this->arrForm['product_id']['value'] AS $key=>$val) {
+                if ($val == $product_id && $this->arrForm['product_id']['classcategory_id1'][$key] == $classcategory_id1 && $this->arrForm['product_id']['classcategory_id2'][$key] == $classcategory_id2) {
+                    // 既に同じ商品がある
+                    $existes = true;
+                    $existes_key = $key;
+                }
+            }
+        }
+
+        if ($existes) {
+            // 既に同じ商品がある場合
+            ++$this->arrForm['quantity']['value'][$existes_key];
+        } else {
+            // 既に同じ商品がない場合
+            $this->lfSetProductData($arrProduct);
+        }
     }
 

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

@@ -168 +168 @@
         $objFormParam->addParam("テンプレート", "template_id", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
         $objFormParam->addParam("メールタイトル", "subject", STEXT_LEN, "KVa",  array("EXIST_CHECK", "MAX_LENGTH_CHECK", "SPTAB_CHECK"));
-        $objFormParam->addParam("ヘッダー", "header", LTEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "SPTAB_CHECK"));
-        $objFormParam->addParam("フッター", "footer", LTEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "SPTAB_CHECK"));
+        $objFormParam->addParam("ヘッダー", "header", LTEXT_LEN, "KVa", array("MAX_LENGTH_CHECK", "SPTAB_CHECK"));
+        $objFormParam->addParam("フッター", "footer", LTEXT_LEN, "KVa", array("MAX_LENGTH_CHECK", "SPTAB_CHECK"));
     }
 }

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

@@ -127 +127 @@
             $arrForm['msg3'] = 'ご確認いただきますよう、お願いいたします。';
 
-            // 受注番号があったら、セットする
+            // 注文番号があったら、セットする
             if(SC_Utils_Ex::sfIsInt($_GET['order_id'])) {
                   $arrForm['order_id'][0] = $_GET['order_id'];
@@ -156 +156 @@
     /* パラメータ情報の初期化 */
     function lfInitParam() {
-        $this->objFormParam->addParam("受注番号", "order_id", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
+        $this->objFormParam->addParam("注文番号", "order_id", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
         $this->objFormParam->addParam("発行日", "year", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
         $this->objFormParam->addParam("発行日", "month", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));