Changeset 18007 for branches/version-2/data/class/pages/shopping/LC_Page_Shopping_Payment.php

Timestamp:

2009/05/15 16:30:40 (15 years ago)

Author:

kajiwara

Message:

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

File:

• branches/version-2/data/class/pages/shopping/LC_Page_Shopping_Payment.php (modified) (7 diffs)

branches/version-2/data/class/pages/shopping/LC_Page_Shopping_Payment.php

@@ -114 +114 @@
             // 入力値の変換
             $this->objFormParam->convParam();
-            $this->arrErr = $this->lfCheckError($this->arrData, $arrInfo, $objCartSess );
+            $this->arrErr = $this->lfCheckError($this->arrData );
             // 入力エラーなし
             if(count($this->arrErr) == 0) {
@@ -239 +239 @@
             // 入力値の変換
             $this->objFormParam->convParam();
-            $this->arrErr = $this->lfCheckError($this->arrData, $arrInfo, $objCartSess);
+            $this->arrErr = $this->lfCheckError($this->arrData);
             if (!isset($this->arrErr['payment_id'])) {
                 // 支払い方法の入力エラーなし
@@ -255 +255 @@
             // 入力値の変換
             $this->objFormParam->convParam();
-            $this->arrErr = $this->lfCheckError($this->arrData, $arrInfo, $objCartSess);
+            $this->arrErr = $this->lfCheckError($this->arrData );
             // 入力エラーなし
             if(count($this->arrErr) == 0) {
@@ -364 +364 @@
 
     /* 入力内容のチェック */
-    function lfCheckError($arrData, $arrInfo, $objCartSess) {
+    function lfCheckError($arrData) {
         // 入力データを渡す。
         $arrRet =  $this->objFormParam->getHashArray();
@@ -370 +370 @@
         $objErr->arrErr = $this->objFormParam->checkError();
 
+        if (USE_POINT === false) {
+            $_POST['point_check'] = "";
+            $_POST['use_point'] = "0";
+        }
         if (!isset($_POST['point_check'])) $_POST['point_check'] = "";
 
@@ -387 +391 @@
             }
         }
-        
+
+        $objView = new SC_MobileView();
+        $objSiteInfo = $objView->objSiteInfo;
+        $arrInfo = $objSiteInfo->data;
+        $objCartSess = new SC_CartSession();
+        $arrInfo = $objSiteInfo->data;
         // 購入金額の取得得
         $total_pretax = $objCartSess->getAllProductsTotal($arrInfo);
@@ -399 +408 @@
             }
         }
-        if ($pay_flag && $arrRet['payment_id'] != "") {
+        if ($pay_flag) {
             SC_Utils_Ex::sfDispSiteError(CUSTOMER_ERROR);
         }
-        
+
         return $objErr->arrErr;
     }