Changeset 20881

Timestamp:

2011/04/21 17:52:07 (13 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20110421072703-fdp0p5zbbs75ms3d

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

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/mobile/shopping/payment.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fshopping%2Fpayment.tpl
data/Smarty/templates/mobile/shopping/select_deliv.tpl select_deliv.tpl-20110207152600-lm5bjhtot5ipow7j-1
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:

ohkouchi@loop-az.jp-20110421085050-8oqi6xh1u9clhiir

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110421085204-d1s0yzc1ig9mlh2p

bzr:revno:

3592

bzr:revprop:branch-nick:

branches/version-2_11-dev

bzr:root:

branches/version-2_11-dev

bzr:text-revisions:

data/Smarty/templates/mobile/shopping/confirm.tpl ohkouchi@loop-az.jp-20110421085050-8oqi6xh1u9clhiir
data/Smarty/templates/mobile/shopping/payment.tpl ohkouchi@loop-az.jp-20110421085050-8oqi6xh1u9clhiir
data/Smarty/templates/mobile/shopping/select_deliv.tpl ohkouchi@loop-az.jp-20110421085050-8oqi6xh1u9clhiir
data/class/pages/shopping/LC_Page_Shopping_Payment.php ohkouchi@loop-az.jp-20110421085050-8oqi6xh1u9clhiir

bzr:timestamp:

2011-04-21 17:52:04.549999952 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-04-21T08:52:04.550000Z

Message:

#1225 (モバイル>「ご入力内容のご確認」画面の「戻る」ボタンの戻り先がおかしい)

• 併わせて, POST 先の URL は, できるだけ定数を使用するよう修正

Location:

branches/version-2_11-dev/data

Files:

• Smarty/templates/mobile/shopping/confirm.tpl (modified) (2 diffs)
• Smarty/templates/mobile/shopping/payment.tpl (modified) (2 diffs)
• Smarty/templates/mobile/shopping/select_deliv.tpl (modified) (1 diff)
• class/pages/shopping/LC_Page_Shopping_Payment.php (modified) (3 diffs)

branches/version-2_11-dev/data/Smarty/templates/mobile/shopping/confirm.tpl

@@ -22 +22 @@
  */
 *}-->
-<form method="post" action="<!--{$smarty.const.ROOT_URLPATH}-->shopping/confirm.php">
+<form method="post" action="<!--{$smarty.const.MOBILE_SHOPPING_CONFIRM_URLPATH}-->">
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 <input type="hidden" name="mode" value="confirm">
@@ -117 +117 @@
 <form action="<!--{$smarty.const.MOBILE_SHOPPING_PAYMENT_URLPATH}-->" method="post">
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-<input type="hidden" name="mode" value="">
+<input type="hidden" name="mode" value="select_deliv">
+<input type="hidden" name="deliv_id" value="<!--{$arrForm.deliv_id|h}-->">
 <input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->">
 <center><input type="submit" value="戻る"></center>

branches/version-2_11-dev/data/Smarty/templates/mobile/shopping/payment.tpl

@@ -22 +22 @@
  */
 *}-->
-<form method="post" action="<!--{$smarty.const.ROOT_URLPATH}-->shopping/payment.php">
+<form method="post" action="<!--{$smarty.const.MOBILE_SHOPPING_PAYMENT_URLPATH}-->">
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 <input type="hidden" name="mode" value="confirm">
@@ -108 +108 @@
 </form>
 
+<!--{if $is_single_deliv}-->
 <form action="<!--{$tpl_back_url|h}-->" method="get">
+<!--{else}-->
+<form action="<!--{$smarty.const.MOBILE_SHOPPING_PAYMENT_URLPATH}-->" method="post">
+<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+<input type="hidden" name="mode" value="">
+<input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->">
+<!--{/if}-->
 <center><input type="submit" name="return" value="戻る"></center>
 </form>
+

branches/version-2_11-dev/data/Smarty/templates/mobile/shopping/select_deliv.tpl

@@ -22 +22 @@
  */
 *}-->
-<form method="post" action="<!--{$smarty.const.ROOT_URLPATH}-->shopping/payment.php">
+<form method="post" action="<!--{$smarty.const.MOBILE_SHOPPING_PAYMENT_URLPATH}-->">
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 <input type="hidden" name="mode" value="select_deliv">

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

@@ -134 +134 @@
          */
         case 'select_deliv':
-            $this->setFormParams($objFormParam, $_POST, true, $this->arrShipping);
+            $this->setFormParams($objFormParam, array_merge($_POST, $arrOrderTemp), true, $this->arrShipping);
 
             $this->arrErr = $objFormParam->checkError();
@@ -248 +248 @@
      *
      * @param SC_FormParam $objFormParam SC_FormParam インスタンス
-     * @param boolean $deliv_only deliv_id チェックのみの場合 true
+     * @param boolean $deliv_only 必須チェックは deliv_id のみの場合 true
      * @param array $arrShipping 配送先情報の配列
      * @return void
@@ -254 +254 @@
     function lfInitParam(&$objFormParam, $deliv_only, &$arrShipping) {
         $objFormParam->addParam("配送業者", "deliv_id", INT_LEN, 'n', array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
-
-        if (!$deliv_only) {
+        $objFormParam->addParam("ポイント", "use_point", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK", "ZERO_START"));
+        $objFormParam->addParam("その他お問い合わせ", 'message', LTEXT_LEN, 'KVa', array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));
+        $objFormParam->addParam("ポイントを使用する", "point_check", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"), '2');
+
+        if ($deliv_only) {
+            $objFormParam->addParam("お支払い方法", "payment_id", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"));
+        } else {
             $objFormParam->addParam("お支払い方法", "payment_id", INT_LEN, 'n', array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
-            $objFormParam->addParam("ポイント", "use_point", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK", "ZERO_START"));
-            $objFormParam->addParam("その他お問い合わせ", 'message', LTEXT_LEN, 'KVa', array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));
-            $objFormParam->addParam("ポイントを使用する", "point_check", INT_LEN, 'n', array("MAX_LENGTH_CHECK", "NUM_CHECK"), '2');
 
             foreach ($arrShipping as $val) {