Changeset 20018 for branches/version-2_5-dev/data

Timestamp:

2011/01/20 17:00:10 (13 years ago)

Author:

nanasess

bzr:base-revision:

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

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/sphone/shopping/payment.tpl payment.tpl-20101209134550-lsv02w9wikfx9cj3-40
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
data/class/session/sessionfactory/SC_SessionFactory_UseRequest.php 17137@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2Fsession%2Fsessionfactory%2FSC_SessionFactory_UseRequest.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110120075846-81ysatqhpxamen61

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110120080007-mb1bg0jqyiuni57t

bzr:revno:

2747

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/sphone/shopping/payment.tpl ohkouchi@loop-az.jp-20110120075846-81ysatqhpxamen61
data/class/pages/shopping/LC_Page_Shopping_Payment.php ohkouchi@loop-az.jp-20110120075846-81ysatqhpxamen61
data/class/session/sessionfactory/SC_SessionFactory_UseRequest.php ohkouchi@loop-az.jp-20110120075846-81ysatqhpxamen61

bzr:timestamp:

2011-01-20 17:00:07.509999990 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-01-20T08:00:07.510000Z

Message:

#515(PHP 5.3.0対応)

• モバイルで, セッションの引き継ぎが正常にできないのを修正

#628(未使用処理・定義などの削除)

• fnSetDelivTime()関数を削除

Location:

branches/version-2_5-dev/data

Files:

• Smarty/templates/sphone/shopping/payment.tpl (modified) (1 diff)
• class/pages/shopping/LC_Page_Shopping_Payment.php (modified) (1 diff)
• class/session/sessionfactory/SC_SessionFactory_UseRequest.php (modified) (1 diff)

branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/payment.tpl

@@ -43 +43 @@
                     <!--{section name=cnt loop=$arrPayment}-->
                     <tr>
-                        <td class="centertd"><input type="radio" id="pay_<!--{$smarty.section.cnt.iteration}-->" name="<!--{$key}-->" onclick="fnSetDelivTime('payment','<!--{$key}-->','deliv_time_id');" value="<!--{$arrPayment[cnt].payment_id}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" <!--{$arrPayment[cnt].payment_id|sfGetChecked:$arrForm[$key].value}--> />
+                        <td class="centertd"><input type="radio" id="pay_<!--{$smarty.section.cnt.iteration}-->" name="<!--{$key}-->" value="<!--{$arrPayment[cnt].payment_id}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" <!--{$arrPayment[cnt].payment_id|sfGetChecked:$arrForm[$key].value}--> />
                         </td>
                         <td>

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

@@ -52 +52 @@
     function init() {
         parent::init();
-        $this->tpl_onload = "fnCheckInputPoint(); fnSetDelivTime('payment','payment_id','deliv_time_id');";
+        $this->tpl_onload = "fnCheckInputPoint();";
         $this->tpl_title = "お支払方法・お届け時間等の指定";
         $masterData = new SC_DB_MasterData();

branches/version-2_5-dev/data/class/session/sessionfactory/SC_SessionFactory_UseRequest.php

@@ -184 +184 @@
         ini_set('session.use_cookies', '0');
         ini_set('session.use_trans_sid', '1');
+        ini_set('session.use_only_cookies', '0');
 
         // パラメーターから有効なセッションIDを取得する。