Changeset 21138 for branches/version-2_11-dev/data/class/pages/shopping/LC_Page_Shopping.php

Timestamp:

2011/08/05 23:14:32 (13 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:21137

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/sphone/shopping/index.tpl index.tpl-20101209134550-lsv02w9wikfx9cj3-38
data/class/pages/shopping/LC_Page_Shopping.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110805141016-3y3e7515aj07h3li

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20110805141429-q4uvtjkhv4f7km3u

bzr:revno:

3841

bzr:revprop:branch-nick:

branches/version-2_11-dev

bzr:root:

branches/version-2_11-dev

bzr:testament:

bazaar-ng testament short form 2.1
revision-id: ohkouchi@loop-az.jp-20110805141429-q4uvtjkhv4f7km3u
sha1: 61681cc48b8e8a64c49987149056042bcc8f479e

bzr:text-parents:

data/Smarty/templates/sphone/shopping/index.tpl ohkouchi@loop-az.jp-20110805070326-8029rknyqmbbewny
data/class/pages/shopping/LC_Page_Shopping.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:20970

bzr:timestamp:

2011-08-05 23:14:29.957000017 +0900

bzr:user-agent:

bzr2.3.1+bzr-svn1.1.0dev0

Message:

#1413 ログインエラーを alert に

• TODO リファクタリングしたい...

File:

• branches/version-2_11-dev/data/class/pages/shopping/LC_Page_Shopping.php (modified) (3 diffs)

branches/version-2_11-dev/data/class/pages/shopping/LC_Page_Shopping.php

@@ -132 +132 @@
                     }
                 }
-
-                SC_Response_Ex::sendRedirect(
-                        $this->getNextLocation($this->cartKey, $this->tpl_uniqid,
-                                               $objCustomer, $objPurchase,
-                                               $objSiteSess));
+                // スマートフォンの場合はログイン成功を返す
+                elseif (SC_Display_Ex::detectDevice() === DEVICE_TYPE_SMARTPHONE) {
+                    echo SC_Utils_Ex::jsonEncode(array('success' => 
+                                                $this->getNextLocation($this->cartKey, $this->tpl_uniqid,
+                                                                       $objCustomer, $objPurchase,
+                                                                       $objSiteSess)));
+                    exit;
+                } else {
+                    SC_Response_Ex::sendRedirect(
+                            $this->getNextLocation($this->cartKey, $this->tpl_uniqid,
+                                                   $objCustomer, $objPurchase,
+                                                   $objSiteSess));
+                }
                 exit;
             }
@@ -143 +151 @@
                 // 仮登録の場合
                 if($this->checkTempCustomer($objFormParam->getValue('login_email'))) {
-                    SC_Utils_Ex::sfDispSiteError(TEMP_LOGIN_ERROR);
-                    exit;
+                    if (SC_Display_Ex::detectDevice() === DEVICE_TYPE_SMARTPHONE) {
+                        echo $this->lfGetErrorMessage(TEMP_LOGIN_ERROR);
+                        exit;
+                    } else {
+                        SC_Utils_Ex::sfDispSiteError(TEMP_LOGIN_ERROR);
+                        exit;
+                    }
                 } else {
-                    SC_Utils_Ex::sfDispSiteError(SITE_LOGIN_ERROR);
-                    exit;
+                    if (SC_Display_Ex::detectDevice() === DEVICE_TYPE_SMARTPHONE) {
+                        echo $this->lfGetErrorMessage(SITE_LOGIN_ERROR);
+                        exit;
+                    } else {
+                        SC_Utils_Ex::sfDispSiteError(SITE_LOGIN_ERROR);
+                        exit;
+                    }
                 }
             }
@@ -522 +540 @@
         return $count > 0;
     }
+
+    /**
+     * エラーメッセージを JSON 形式で返す.
+     *
+     * TODO リファクタリング
+     * この関数は主にスマートフォンで使用します.
+     *
+     * @param integer エラーコード
+     * @return string JSON 形式のエラーメッセージ
+     * @see LC_PageError
+     */
+    function lfGetErrorMessage($error) {
+        switch ($error) {
+            case TEMP_LOGIN_ERROR:
+                $msg = "メールアドレスもしくはパスワードが正しくありません。\n本登録がお済みでない場合は、仮登録メールに記載されているURLより本登録を行ってください。";
+                break;
+            case SITE_LOGIN_ERROR:
+            default:
+                $msg = "メールアドレスもしくはパスワードが正しくありません。";
+        }
+        return SC_Utils_Ex::jsonEncode(array('login_error' => $msg));
+    }
 }
 ?>