Changeset 16527 for branches

Timestamp:

2007/10/19 23:07:18 (16 years ago)

Author:

nanasess

Message:

モバイルメールアドレスが未登録の場合に, 登録先住所への配送が空白になるデグレ修正

Location:

branches/feature-module-update/data/class

Files:

• SC_Customer.php (modified) (1 diff)
• helper/SC_Helper_DB.php (modified) (2 diffs)
• pages/shopping/LC_Page_Shopping_Deliv.php (modified) (2 diffs)
• pages/shopping/LC_Page_Shopping_Payment.php (modified) (1 diff)

branches/feature-module-update/data/class/SC_Customer.php

@@ -171 +171 @@
     function setLogin($email) {
         // 本登録された会員のみ
-        $sql = "SELECT * FROM dtb_customer WHERE email = ? AND del_flg = 0 AND status = 2";
-        $result = $this->conn->getAll($sql, array($email));
+        $sql = "SELECT * FROM dtb_customer WHERE (email = ? OR email_mobile = ?) AND del_flg = 0 AND status = 2";
+        $result = $this->conn->getAll($sql, array($email, $email));
         $data = isset($result[0]) ? $result[0] : "";
         $this->customer_data = $data;

branches/feature-module-update/data/class/helper/SC_Helper_DB.php

@@ -411 +411 @@
         $objCustomer = new SC_Customer();
         // 会員情報登録処理
-        if ($objCustomer->isLoginSuccess()) {
+        if ($objCustomer->isLoginSuccess(true)) {
             // 登録データの作成
             $sqlval['order_temp_id'] = $uniqid;
@@ -430 +430 @@
             $sqlval['order_tel03'] = $objCustomer->getValue('tel03');
             if (defined('MOBILE_SITE')) {
-                $sqlval['order_email'] = $objCustomer->getValue('email_mobile');
+                $email_mobile = $objCustomer->getValue('email_mobile');
+                if (empty($email_mobile)) {
+                    $sqlval['order_email'] = $objCustomer->getValue('email');
+                } else {
+                    $sqlval['order_email'] = $email_mobile;
+                }
             } else {
                 $sqlval['order_email'] = $objCustomer->getValue('email');

branches/feature-module-update/data/class/pages/shopping/LC_Page_Shopping_Deliv.php

@@ -258 +258 @@
                     // 仮登録の判定
                     $objQuery = new SC_Query;
-                    $where = "email = ? AND status = 1 AND del_flg = 0";
-                    $ret = $objQuery->count("dtb_customer", $where, array($arrForm['login_email']));
+                    $where = "(email = ? OR email_mobile = ?) AND status = 1 AND del_flg = 0";
+                    $ret = $objQuery->count("dtb_customer", $where, array($arrForm['login_email'], $arrForm['login_email']));
 
                     if($ret > 0) {
@@ -277 +277 @@
 
             /*
-             * email がモバイルドメインでは無く,
-             * 携帯メールアドレスが登録されていない場合
-             *
-             * XXX 携帯メールアドレスの登録が無いと, 
-             *     配送先が空欄になってしまう場合がある
+             * 携帯メールアドレスが登録されていない場合は,
+             * 携帯メールアドレス登録画面へ遷移
              */
             $objMobile = new SC_Helper_Mobile_Ex();

branches/feature-module-update/data/class/pages/shopping/LC_Page_Shopping_Payment.php

@@ -199 +199 @@
         $this->arrData = $objDb->sfTotalConfirm($arrData, $this, $objCartSess, $arrInfo);
 
-        // カー都内の商品の売り切れチェック
+        // カート内の商品の売り切れチェック
         $objCartSess->chkSoldOut($objCartSess->getCartList(), true);