Changeset 20880

Timestamp:

2011/04/21 16:27:06 (15 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/class/pages/shopping/LC_Page_Shopping_Payment.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Payment.php

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

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

bzr:revision-id:

[email protected]

bzr:revno:

3591

bzr:revprop:branch-nick:

branches/version-2_11-dev

bzr:root:

branches/version-2_11-dev

bzr:text-revisions:

data/class/pages/shopping/LC_Page_Shopping_Payment.php [email protected]

bzr:timestamp:

2011-04-21 16:27:03.971999884 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-04-21T07:27:03.972000Z

Message:

#1222 (モバイル>配送方法を選択しなかった場合にエラーにならない)

File:

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

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

@@ -136 +136 @@
             $this->setFormParams($objFormParam, $_POST, true, $this->arrShipping);
 
-            $arrErr = $objFormParam->checkError();
-            if (SC_Utils_Ex::isBlank($arrErr)) {
+            $this->arrErr = $objFormParam->checkError();
+            if (SC_Utils_Ex::isBlank($this->arrErr)) {
                 $deliv_id = $objFormParam->getValue('deliv_id');
                 $arrSelectedDeliv = $this->getSelectedDeliv($objPurchase, $objCartSess, $deliv_id);
@@ -143 +143 @@
             } else {
                 $arrSelectedDeliv = array('error' => true);
+                $this->tpl_mainpage = 'shopping/select_deliv.tpl'; // モバイル用
             }
 
@@ -212 +213 @@
 
         // モバイル用 ポストバック処理
-        if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) {
+        if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE
+            && SC_Utils_Ex::isBlank($this->arrErr)) {
             $this->tpl_mainpage = $this->getMobileMainpage($this->is_single_deliv, $this->getMode());
         }