Changeset 20122 for branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php

Timestamp:

2011/02/09 16:59:25 (13 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20110209054704-w9inyl5j79vady69

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/default/shopping/confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fconfirm.tpl
data/Smarty/templates/mobile/shopping/confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fshopping%2Fconfirm.tpl
data/Smarty/templates/sphone/shopping/confirm.tpl confirm.tpl-20101209134550-lsv02w9wikfx9cj3-35
data/class/SC_Customer.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Customer.php
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
data/class/pages/shopping/LC_Page_Shopping_Confirm.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Confirm.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110209075616-w6oj8pxw5211fi84

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110209075921-fqrnsifl8w00n1tb

bzr:revno:

2850

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/default/shopping/confirm.tpl ohkouchi@loop-az.jp-20110209075616-w6oj8pxw5211fi84
data/Smarty/templates/mobile/shopping/confirm.tpl ohkouchi@loop-az.jp-20110209075616-w6oj8pxw5211fi84
data/Smarty/templates/sphone/shopping/confirm.tpl ohkouchi@loop-az.jp-20110209075616-w6oj8pxw5211fi84
data/class/SC_Customer.php ohkouchi@loop-az.jp-20110209075616-w6oj8pxw5211fi84
data/class/pages/shopping/LC_Page_Shopping.php ohkouchi@loop-az.jp-20110209075616-w6oj8pxw5211fi84
data/class/pages/shopping/LC_Page_Shopping_Confirm.php ohkouchi@loop-az.jp-20110209075616-w6oj8pxw5211fi84

bzr:timestamp:

2011-02-09 16:59:21.723000050 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-02-09T07:59:21.723000Z

Message:

#984([フロント]商品購入 リファクタリング)

• /shopping/complete.php

#1002(携帯アドレスが登録されていないユーザーが携帯アドレス登録画面に遷移しない)

• typo 修正

File:

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

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

@@ -129 +129 @@
 
                 // モバイルサイトで携帯アドレスの登録が無い場合
-                if($this->hasEmailMobile($objCustomer)) {
-                    SC_Response_Ex::sendRedirect('../entry/email_mobile.php');
+                if(!$this->hasEmailMobile($objCustomer)) {
+                    SC_Response_Ex::sendRedirectFromUrlPath('entry/email_mobile.php');
                     exit;
                 }
@@ -470 +470 @@
      */
     function doLogin(&$objCustomer, $login_email, $login_pass) {
-
         switch (SC_Display::detectDevice()) {
-        case DEVICE_TYPE_MOBILLE:
+        case DEVICE_TYPE_MOBILE:
             if(!$objCustomer->getCustomerDataFromMobilePhoneIdPass($login_pass) &&
                !$objCustomer->getCustomerDataFromEmailPass($login_pass, $login_email, true)) {
@@ -503 +502 @@
     function hasEmailMobile(&$objCustomer) {
         switch (SC_Display::detectDevice()) {
-        case DEVICE_TYPE_MOBILLE:
+        case DEVICE_TYPE_MOBILE:
             $objMobile = new SC_Helper_Mobile_Ex();
             if (!$objMobile->gfIsMobileMailAddress($objCustomer->getValue('email'))) {
-                if (!$objCustomer->hasValue('email_mobile')) {
+                if ($objCustomer->hasValue('email_mobile')) {
                     return true;
                 }