Changeset 21153 for branches/version-2_11-dev

Timestamp:

2011/08/08 21:41:28 (13 years ago)

Author:

nanasess

bzr:base-revision:

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

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/sphone/products/detail.tpl 19775@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fsphone%2Fproducts%2Fdetail.tpl
data/class/pages/products/LC_Page_Products_Detail.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_Detail.php
html/user_data/packages/sphone/js/favorite.js 21059@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_11-dev%2Fhtml%2Fuser_data%2Fpackages%2Fsphone%2Fjs%2Ffavorite.js

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110808124027-wrsaksgu3nqadjpz

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110808124125-3zdxo4u95f1fh41f

bzr:revno:

3856

bzr:revprop:branch-nick:

branches/version-2_11-dev

bzr:root:

branches/version-2_11-dev

bzr:testament:

bazaar-ng testament short form 2.1
revision-id: ohkouchi@loop-az.jp-20110808124125-3zdxo4u95f1fh41f
sha1: f4a8a76af236dddcd6021421486dad2cd6f376a4

bzr:text-parents:

data/Smarty/templates/sphone/products/detail.tpl ohkouchi@loop-az.jp-20110808064831-8ei27uup21ar43t0
data/class/pages/products/LC_Page_Products_Detail.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:21139
html/user_data/packages/sphone/js/favorite.js svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:21059

bzr:timestamp:

2011-08-08 21:41:25.522000074 +0900

bzr:user-agent:

bzr2.3.1+bzr-svn1.1.0dev0

Message:

#1413 商品詳細修正

• 規格表示の不具合修正
• お気に入り登録時の不具合修正

Location:

branches/version-2_11-dev

Files:

• data/Smarty/templates/sphone/products/detail.tpl (modified) (5 diffs)
• data/class/pages/products/LC_Page_Products_Detail.php (modified) (1 diff)
• html/user_data/packages/sphone/js/favorite.js (modified) (1 diff)

branches/version-2_11-dev/data/Smarty/templates/sphone/products/detail.tpl

@@ -108 +108 @@
 <p class="main_comment"><!--{$arrProduct.main_comment|nl2br_html}--></p>
 
+<form name="form1" id="form1" method="post" action="<!--{$smarty.const.ROOT_URLPATH}-->products/detail.php">
 <div id="detailrightblock">
     <!--▼商品ステータス-->
@@ -159 +160 @@
                  <!--{else}-->
                    <!--{$arrProduct.price01_min|sfCalcIncTax:$arrSiteInfo.tax:$arrSiteInfo.tax_rule|number_format}-->～<!--{$arrProduct.price01_max|sfCalcIncTax:$arrSiteInfo.tax:$arrSiteInfo.tax_rule|number_format}-->
-                    <!--{/if}-->
-        <span id="price01_dynamic"></span>円</span></p>
+                    <!--{/if}--></span>
+        <span id="price01_dynamic"></span>円</p>
         <!--{/if}-->
 
@@ -199 +200 @@
      </div>
 
-    <form name="form1" id="form1" method="post" action="<!--{$smarty.const.ROOT_URLPATH}-->products/detail.php">
         <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
         <input type="hidden" name="mode" value="cart" />
@@ -217 +217 @@
                         <select name="classcategory_id1"
                             style="<!--{$arrErr.classcategory_id1|sfGetErrorColor}-->" 
-                            onchange="fnSetClassCategories(this.form);"
                             class="data-role-none">
                             <!--{html_options options=$arrClassCat1 selected=$arrForm.classcategory_id1.value}-->
@@ -234 +233 @@
                         <select name="classcategory_id2"
                             style="<!--{$arrErr.classcategory_id2|sfGetErrorColor}-->"
-                            onchange="fnCheckStock(this.form);"
                             class="data-role-none">
                         </select>

branches/version-2_11-dev/data/class/pages/products/LC_Page_Products_Detail.php

@@ -456 +456 @@
 
         switch ($mode) {
+        case 'add_favorite_sphone':
         case 'add_favorite':
             $objCustomer = new SC_Customer_Ex();

branches/version-2_11-dev/html/user_data/packages/sphone/js/favorite.js

@@ -25 +25 @@
               if (result == "true") {
                   alert("お気に入りに登録しました");
-                  $(".btn_favorite").html("<p>お気に入り登録済</p>");
+                  $(".btn_favorite").html("<p>お気に入り登録済み</p>");
               } else {
                   alert("お気に入りの登録に失敗しました");