Changeset 22940

Timestamp:

2013/07/07 12:32:48 (11 years ago)

Author:

kimoto

Message:

#2043 typo修正・ソース整形・ソースコメントの改善 for 2.13.0
不要な引数の削除
定義されていない変数の修正

File:

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

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

@@ -139 +139 @@
                 if (SC_Utils_Ex::isBlank($this->arrErr)) {
                     $deliv_id = $objFormParam->getValue('deliv_id');
-                    $arrSelectedDeliv = $this->getSelectedDeliv($objPurchase, $objCartSess, $deliv_id);
+                    $arrSelectedDeliv = $this->getSelectedDeliv($objCartSess, $deliv_id);
                     $arrSelectedDeliv['error'] = false;
                 } else {
@@ -161 +161 @@
 
                 $deliv_id = $objFormParam->getValue('deliv_id');
-                $arrSelectedDeliv = $this->getSelectedDeliv($objPurchase, $objCartSess, $deliv_id);
+                $arrSelectedDeliv = $this->getSelectedDeliv($objCartSess, $deliv_id);
                 $this->arrPayment = $arrSelectedDeliv['arrPayment'];
                 $this->arrDelivTime = $arrSelectedDeliv['arrDelivTime'];
@@ -192 +192 @@
                     $url = MULTIPLE_URLPATH . '?from=multiple';
                 } elseif ($objCustomer->isLoginSuccess(true)) {
-                    if ($product_type_id == PRODUCT_TYPE_DOWNLOAD) {
+                    if ($this->cartKey == PRODUCT_TYPE_DOWNLOAD) {
                         $url = CART_URLPATH;
                     } else {
@@ -217 +217 @@
                 if (!SC_Utils_Ex::isBlank($deliv_id)) {
                     $objFormParam->setValue('deliv_id', $deliv_id);
-                    $arrSelectedDeliv = $this->getSelectedDeliv($objPurchase, $objCartSess, $deliv_id);
+                    $arrSelectedDeliv = $this->getSelectedDeliv($objCartSess, $deliv_id);
                     $this->arrPayment = $arrSelectedDeliv['arrPayment'];
                     $this->arrDelivTime = $arrSelectedDeliv['arrDelivTime'];
@@ -275 +275 @@
         }
 
-        $objFormParam->setParam($arrParam);
+        $objFormParam->setParam($arrShipping);
         $objFormParam->convParam();
     }
@@ -289 +289 @@
     function lfCheckError(&$objFormParam, $subtotal, $max_point)
     {
-        $objPurchase = new SC_Helper_Purchase_Ex();
         // 入力データを渡す。
         $arrForm =  $objFormParam->getHashArray();
@@ -337 +336 @@
          * リファレンスで代入すると, セッションに添字を追加できない？
          */
-        foreach ($_SESSION['shipping'] as $key => $value) {
+        foreach (array_keys($_SESSION['shipping']) as $key) {
             $shipping_id = $_SESSION['shipping'][$key]['shipping_id'];
             $time_id = $objFormParam->getValue('deliv_time_id' . $shipping_id);
@@ -383 +382 @@
      * - 'img_show' - 支払い方法の画像の有無
      *
-     * @param SC_Helper_Purchase $objPurchase SC_Helper_Purchase インスタンス
      * @param SC_CartSession $objCartSess SC_CartSession インスタンス
      * @param integer $deliv_id 配送業者ID
      * @return array 支払い方法, お届け時間を格納した配列
      */
-    function getSelectedDeliv(&$objPurchase, &$objCartSess, $deliv_id)
+    function getSelectedDeliv(&$objCartSess, $deliv_id)
     {
         $arrResults = array();