Changeset 18840 for branches

Timestamp:

2010/10/02 01:08:18 (16 years ago)

Author:

Ringo

Message:

#634(new バグ指摘)　mypageからの退会後の左メニューでTopページへ遷移。(残：ポップアップ)

Location:

branches/version-2_5-dev/data

Files:

• Smarty/templates/default/mypage/navi.tpl (modified) (2 diffs)
• class/pages/mypage/LC_Page_Mypage.php (modified) (1 diff)
• class/pages/mypage/LC_Page_Mypage_Change.php (modified) (1 diff)
• class/pages/mypage/LC_Page_Mypage_Delivery.php (modified) (1 diff)
• class/pages/mypage/LC_Page_Mypage_Favorite.php (modified) (2 diffs)
• class/pages/mypage/LC_Page_Mypage_Refusal.php (modified) (1 diff)

branches/version-2_5-dev/data/Smarty/templates/default/mypage/navi.tpl

@@ -25 +25 @@
     <!--{strip}-->
         <ul class="button_like">
+        
+          <!--{if $tpl_login}-->
+            <!--{* 会員状態 *}-->
             <li><a href="./<!--{$smarty.const.DIR_INDEX_URL}-->" class="<!--{if $tpl_mypageno == 'index'}--> selected<!--{/if}-->">
                 購入履歴一覧</a></li>
             <!--{if $smarty.const.OPTION_FAVOFITE_PRODUCT == 1}-->
-                <!--{if $tpl_login}-->
-                    <li><a href="favorite.php" class="<!--{if $tpl_mypageno == 'favorite'}--> selected<!--{/if}-->">
-                           お気に入り一覧</a></li>
-                <!--{else}-->
-                       <!--{* 退会時、TOPページへ *}-->
-                    <li><a href="/index.php" class="<!--{if $tpl_mypageno == 'favorite'}--> selected<!--{/if}-->">
-                           お気に入り一覧</a></li>
-                <!--{/if}-->
+                <li><a href="favorite.php" class="<!--{if $tpl_mypageno == 'favorite'}--> selected<!--{/if}-->">
+                    お気に入り一覧</a></li>
             <!--{/if}-->
             <li><a href="change.php" class="<!--{if $tpl_mypageno == 'change'}--> selected<!--{/if}-->">
@@ -43 +40 @@
             <li><a href="refusal.php" class="<!--{if $tpl_mypageno == 'refusal'}--> selected<!--{/if}-->">
                 退会手続き</a></li>
+          <!--{else}-->
+
+          <!--{* 退会状態 *}-->
+            <li><a href="/index.php" class="<!--{if $tpl_mypageno == 'index'}--> selected<!--{/if}-->">
+                購入履歴一覧</a></li>
+            <!--{if $smarty.const.OPTION_FAVOFITE_PRODUCT == 1}-->
+                <li><a href="/index.php" class="<!--{if $tpl_mypageno == 'favorite'}--> selected<!--{/if}-->">
+                    お気に入り一覧</a></li>
+            <!--{/if}-->
+            <li><a href="/index.php" class="<!--{if $tpl_mypageno == 'change'}--> selected<!--{/if}-->">
+                会員登録内容変更</a></li>
+            <li><a href="/index.php" class="<!--{if $tpl_mypageno == 'delivery'}--> selected<!--{/if}-->">
+                お届け先追加・変更</a></li>
+            <li><a href="/index.php" class="<!--{if $tpl_mypageno == 'refusal'}--> selected<!--{/if}-->">
+                退会手続き</a></li>
+          <!--{/if}-->
+
         </ul>
         

branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage.php

@@ -69 +69 @@
         $objQuery = new SC_Query();
         $objCustomer = new SC_Customer();
+        
+        // 退会判定用情報の取得
+        $this->tpl_login = $objCustomer->isLoginSuccess();
 
         // レイアウトデザインを取得

branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php

@@ -77 +77 @@
         $this->objCustomer = new SC_Customer();
         $this->objFormParam = new SC_FormParam();
+        
+        // 退会判定用情報の取得
+        $objCustomer = new SC_Customer();
+        $this->tpl_login = $objCustomer->isLoginSuccess();
 
         // レイアウトデザインを取得

branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php

@@ -65 +65 @@
         $objView = new SC_SiteView();
         $objCustomer = new SC_Customer();
+        
+        // 退会判定用情報の取得
+        $this->tpl_login = $objCustomer->isLoginSuccess();
 
         //ログイン判定

branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php

@@ -48 +48 @@
      */
     function init() {
-    
         parent::init();
         $this->tpl_mainpage = TEMPLATE_DIR .'mypage/favorite.tpl';
@@ -70 +69 @@
         $objCustomer = new SC_Customer();
         
-         // 退会判定用情報の取得
+        // 退会判定用情報の取得
         $this->tpl_login = $objCustomer->isLoginSuccess();
-        
+
         // レイアウトデザインを取得
         $objLayout = new SC_Helper_PageLayout_Ex();

branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Refusal.php

@@ -63 +63 @@
         $objQuery = new SC_Query();
         $objSiteSess = new SC_SiteSession();
+        
+        // 退会判定用情報の取得
+        $this->tpl_login = $objCustomer->isLoginSuccess();
 
         //ログイン判定