[Svn-src-all:1445] [version-2_5-dev 20337] #1026([フロント]商品：規格あり商品をカートに投入できない)
nanasess
admin ＠ mail.ec-cube.net
2011年 2月 23日 (水) 06:43:51 JST
Subversion committed to /home/svn/open 20337
http://svn.ec-cube.net/open_trac/changeset/20337
┌────────────────────────────┐
│更新者 : nanasess │
│更新日時: 2011-02-23 06:43:50 +0900 (水, 23 2月 2011)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#1026([フロント]商品：規格あり商品をカートに投入できない)
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/Smarty/templates/admin/order/product_select.tpl
U branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl
U branches/version-2_5-dev/data/Smarty/templates/default/products/list.tpl
U branches/version-2_5-dev/data/Smarty/templates/sphone/products/detail.tpl
U branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php
U branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php
変更: branches/version-2_5-dev/data/Smarty/templates/admin/order/product_select.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/product_select.tpl 2011-02-22 19:29:41 UTC (rev 20336)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/product_select.tpl 2011-02-22 21:43:50 UTC (rev 20337)
@@ -27,7 +27,7 @@
<!--
self.moveTo(20,20);self.focus();
-function func_submit(product_id, class_name1, class_name2, product_class_id) {
+function func_submit(product_id, class_name1, class_name2) {
var err_text = '';
var fm = window.opener.document.form1;
var fm1 = window.opener.document;
@@ -36,6 +36,7 @@
var class1_id = document.getElementById(class1).value;
var class2_id = document.getElementById(class2).value;
+ var product_class_id = document.getElementById("product_class_id" + product_id).value;
<!--{if $tpl_no != ''}-->
var opner_product_id = 'edit_product_id';
@@ -106,7 +107,7 @@
product_id = form.product_id.value;
classcat_id1 = form.classcategory_id1.value;
classcat_id2 = form.classcategory_id2 ? form.classcategory_id2.value : 0;
- classcat2 = productsClassCategories[product_id][classcat_id1][classcat_id2];
+ classcat2 = productsClassCategories[product_id][classcat_id1]['#' + classcat_id2];
// 商品規格
eleDynamic = document.getElementById('product_class_id' + product_id);
if (
@@ -231,7 +232,7 @@
<input type="hidden" name="product_class_id<!--{$id|h}-->" id="product_class_id<!--{$id|h}-->" value="<!--{$tpl_product_class_id[$id]}-->" />
<input type="hidden" name="product_type" id="product_type<!--{$id|h}-->" value="<!--{$tpl_product_type[$id]}-->" />
</td>
- <td class="center"><a href="javascript:;" onclick="return func_submit('<!--{$arrProducts[cnt].product_id}-->', '<!--{$tpl_class_name1[$id]}-->', '<!--{$tpl_class_name2[$id]}-->', '<!--{$tpl_product_class_id[$id]}-->'); return false;">決定</a></td>
+ <td class="center"><a href="javascript:;" onclick="return func_submit('<!--{$arrProducts[cnt].product_id}-->', '<!--{$tpl_class_name1[$id]}-->', '<!--{$tpl_class_name2[$id]}-->'); return false;">決定</a></td>
</tr>
<!--▲商品<!--{$smarty.section.cnt.iteration}-->-->
</form>
変更: branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl 2011-02-22 19:29:41 UTC (rev 20336)
+++ branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl 2011-02-22 21:43:50 UTC (rev 20337)
@@ -53,7 +53,7 @@
function fnCheckStock(form) {
classcat_id1 = form.classcategory_id1.value;
classcat_id2 = form.classcategory_id2 ? form.classcategory_id2.value : '';
- classcat2 = classCategories[classcat_id1][classcat_id2];
+ classcat2 = classCategories[classcat_id1]['#' + classcat_id2];
// 商品コード
eleDefault = document.getElementById('product_code_default');
変更: branches/version-2_5-dev/data/Smarty/templates/default/products/list.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/products/list.tpl 2011-02-22 19:29:41 UTC (rev 20336)
+++ branches/version-2_5-dev/data/Smarty/templates/default/products/list.tpl 2011-02-22 21:43:50 UTC (rev 20337)
@@ -81,7 +81,7 @@
product_id = form.product_id.value;
classcat_id1 = form.classcategory_id1.value;
classcat_id2 = form.classcategory_id2 ? form.classcategory_id2.value : '';
- classcat2 = productsClassCategories[product_id][classcat_id1][classcat_id2];
+ classcat2 = productsClassCategories[product_id][classcat_id1]['#' + classcat_id2];
// 在庫(品切れ)
eleDefault = document.getElementById('cartbtn_default_' + product_id);
変更: branches/version-2_5-dev/data/Smarty/templates/sphone/products/detail.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/products/detail.tpl 2011-02-22 19:29:41 UTC (rev 20336)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/products/detail.tpl 2011-02-22 21:43:50 UTC (rev 20337)
@@ -51,7 +51,7 @@
function fnCheckStock(form) {
classcat_id1 = form.classcategory_id1.value;
classcat_id2 = form.classcategory_id2 ? form.classcategory_id2.value : '';
- classcat2 = classCategories[classcat_id1][classcat_id2];
+ classcat2 = classCategories[classcat_id1]['#' + classcat_id2];
// 商品コード
eleDefault = document.getElementById('product_code_default');
変更: branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php 2011-02-22 19:29:41 UTC (rev 20336)
+++ branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php 2011-02-22 21:43:50 UTC (rev 20337)
@@ -169,7 +169,7 @@
*/
function getFnOnload($arrProducts){
foreach ($arrProducts as $arrProduct) {
- $js_fnOnLoad .= "fnSetClassCategories(document.product_form{$arrProduct['product_id']});\n";
+ $js_fnOnLoad .= "fnSetClassCategories(document.product_form{$arrProduct['product_id']});";
}
}
変更: branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php 2011-02-22 19:29:41 UTC (rev 20336)
+++ branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php 2011-02-22 21:43:50 UTC (rev 20337)
@@ -233,7 +233,7 @@
break;
}
- $this->tpl_product_class_id = $objProduct->classCategories[$product_id][$this->objFormParam->getValue('classcategory_id1')][$this->objFormParam->getValue('classcategory_id2')]['product_class_id'];
+ $this->tpl_product_class_id = $objProduct->classCategories[$product_id][$this->objFormParam->getValue('classcategory_id1')]['#' . $this->objFormParam->getValue('classcategory_id2')]['product_class_id'];
// 商品数の選択を行う
$this->tpl_mainpage = "products/select_item.tpl";
Svn-src-all メーリングリストの案内