Changeset 18830
- Timestamp:
- 2010/09/29 18:03:38 (10 years ago)
- bzr:base-revision:
- ohkouchi@loop-az.jp-20100927103023-gxi8k3mun5ajq1th
- bzr:committer:
- Kentaro Ohkouchi <ohkouchi@loop-az.jp>
- bzr:file-ids:
data/Smarty/templates/default/cart/index.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fcart%2Findex.tpl
data/Smarty/templates/default/detail.tpl 15747@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fdetail.tpl
data/Smarty/templates/default/list.tpl 15747@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Flist.tpl
data/Smarty/templates/default/shopping/confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fconfirm.tpl
data/class/SC_CartSession.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_CartSession.php
data/class/helper/SC_Helper_DB.php 15176@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_DB.php
data/class/pages/cart/LC_Page_Cart.php 15179@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fcart%2FLC_Page_Cart.php
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
data/class/pages/shopping/LC_Page_Shopping_Confirm.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Confirm.php- bzr:mapping-version:
- v4
- bzr:repository-uuid:
- 1e3b908f-19a9-db11-a64c-001125224ba8
- bzr:revision-id:
- ohkouchi@loop-az.jp-20100929090334-re3rzc4b55n2u27e
- bzr:revno:
- 2313
- bzr:revprop:branch-nick:
- branches/version-2_5-dev
- bzr:root:
- branches/version-2_5-dev
- bzr:timestamp:
- 2010-09-29 18:03:34.467999935 +0900
- bzr:user-agent:
- bzr2.2.0+bzr-svn1.0.3
- svn:original-date:
- 2010-09-29T09:03:34.468000Z
- Location:
- branches/version-2_5-dev/data
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl
r18700 r18830 48 48 <!--{* カゴの中に商品がある場合にのみ表示 *}--> 49 49 <!--{if count($arrProductsClass) > 0 }--> 50 お買い上げ商品の合計金額は「<em><!--{$tpl_total_pretax |number_format}-->円</em>」です。50 お買い上げ商品の合計金額は「<em><!--{$tpl_total_pretax[$key]|number_format}-->円</em>」です。 51 51 <!--{if $arrInfo.free_rule > 0}--> 52 52 <!--{if $arrData.deliv_fee|number_format > 0}--> 53 あと「<em><!--{$tpl_deliv_free |number_format}-->円</em>」で送料無料です!!53 あと「<em><!--{$tpl_deliv_free[$key]|number_format}-->円</em>」で送料無料です!! 54 54 <!--{else}--> 55 55 現在、「<em>送料無料</em>」です!! … … 69 69 70 70 <!--{if count($arrProductsClass) > 0}--> 71 71 <!--{foreach from=$cartKeys item=key}--> 72 72 <form name="form1" id="form1" method="post" action="?"> 73 73 <!--{if 'sfGMOCartDisplay'|function_exists}--> … … 88 88 <!--{section name=cnt loop=$arrProductsClass}--> 89 89 <tr style="<!--{if $arrProductsClass[cnt].error}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->"> 90 <td><a href="?" onclick="fnModeSubmit('delete', 'cart_no', '<!--{$arrProductsClass[cnt] .cart_no}-->'); return false;">削除</a>90 <td><a href="?" onclick="fnModeSubmit('delete', 'cart_no', '<!--{$arrProductsClass[cnt][$key].cart_no}-->'); return false;">削除</a> 91 91 </td> 92 92 <td class="phototd"> 93 93 <a 94 <!--{if $arrProductsClass[cnt] .main_image|strlen >= 1}-->95 href="<!--{$smarty.const.IMAGE_SAVE_URL}--><!--{$arrProductsClass[cnt] .main_image|sfNoImageMainList|escape}-->"94 <!--{if $arrProductsClass[cnt][$key].main_image|strlen >= 1}--> 95 href="<!--{$smarty.const.IMAGE_SAVE_URL}--><!--{$arrProductsClass[cnt][$key].main_image|sfNoImageMainList|escape}-->" 96 96 class="expansion" 97 97 target="_blank" 98 98 <!--{/if}--> 99 99 > 100 <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrProductsClass[cnt] .main_list_image|sfNoImageMainList|escape}-->&width=65&height=65" alt="<!--{$arrProductsClass[cnt].name|escape}-->" /></a>100 <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrProductsClass[cnt][$key].main_list_image|sfNoImageMainList|escape}-->&width=65&height=65" alt="<!--{$arrProductsClass[cnt].name|escape}-->" /></a> 101 101 </td> 102 <td><!--{* 商品名 *}--><strong><!--{$arrProductsClass[cnt] .name|escape}--></strong><br />103 <!--{if $arrProductsClass[cnt] .classcategory_name1 != ""}-->104 <!--{$arrProductsClass[cnt] .class_name1}-->:<!--{$arrProductsClass[cnt].classcategory_name1}--><br />102 <td><!--{* 商品名 *}--><strong><!--{$arrProductsClass[cnt][$key].name|escape}--></strong><br /> 103 <!--{if $arrProductsClass[cnt][$key].classcategory_name1 != ""}--> 104 <!--{$arrProductsClass[cnt][$key].class_name1}-->:<!--{$arrProductsClass[cnt][$key].classcategory_name1}--><br /> 105 105 <!--{/if}--> 106 <!--{if $arrProductsClass[cnt] .classcategory_name2 != ""}-->107 <!--{$arrProductsClass[cnt] .class_name2}-->:<!--{$arrProductsClass[cnt].classcategory_name2}-->106 <!--{if $arrProductsClass[cnt][$key].classcategory_name2 != ""}--> 107 <!--{$arrProductsClass[cnt][$key].class_name2}-->:<!--{$arrProductsClass[cnt][$key].classcategory_name2}--> 108 108 <!--{/if}--> 109 109 </td> 110 110 <td class="pricetd"> 111 111 <!--{if $arrProductsClass[cnt].price02 != ""}--> 112 <!--{$arrProductsClass[cnt] .price02|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円112 <!--{$arrProductsClass[cnt][$key].price02|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円 113 113 <!--{else}--> 114 <!--{$arrProductsClass[cnt] .price01|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円114 <!--{$arrProductsClass[cnt][$key].price01|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円 115 115 <!--{/if}--> 116 116 </td> 117 <td id="quantity"><!--{$arrProductsClass[cnt] .quantity}-->117 <td id="quantity"><!--{$arrProductsClass[cnt][$key].quantity}--> 118 118 <ul id="quantity_level"> 119 <li><a href="?" onclick="fnModeSubmit('up','cart_no','<!--{$arrProductsClass[cnt] .cart_no}-->'); return false"><img src="<!--{$TPL_DIR}-->img/cart/plus.gif" width="16" height="16" alt="+" /></a></li>120 <li><a href="?" onclick="fnModeSubmit('down','cart_no','<!--{$arrProductsClass[cnt] .cart_no}-->'); return false"><img src="<!--{$TPL_DIR}-->img/cart/minus.gif" width="16" height="16" alt="-" /></a></li>119 <li><a href="?" onclick="fnModeSubmit('up','cart_no','<!--{$arrProductsClass[cnt][$key].cart_no}-->'); return false"><img src="<!--{$TPL_DIR}-->img/cart/plus.gif" width="16" height="16" alt="+" /></a></li> 120 <li><a href="?" onclick="fnModeSubmit('down','cart_no','<!--{$arrProductsClass[cnt][$key].cart_no}-->'); return false"><img src="<!--{$TPL_DIR}-->img/cart/minus.gif" width="16" height="16" alt="-" /></a></li> 121 121 </ul> 122 122 </td> 123 <td class="pricetd"><!--{$arrProductsClass[cnt].total_pretax |number_format}-->円</td>123 <td class="pricetd"><!--{$arrProductsClass[cnt].total_pretax[$key]|number_format}-->円</td> 124 124 </tr> 125 125 <!--{/section}--> 126 126 <tr> 127 127 <th colspan="5" class="resulttd">小計</th> 128 <td class="pricetd"><!--{$tpl_total_pretax |number_format}-->円</td>128 <td class="pricetd"><!--{$tpl_total_pretax[$key]|number_format}-->円</td> 129 129 </tr> 130 130 <tr> … … 156 156 <!--{/if}--> 157 157 <!--{if strlen($tpl_error) == 0}--> 158 <input type="hidden" name="cartKey" value="<!--{$key}-->" /> 158 159 <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/cart/b_buystep_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/cart/b_buystep.gif',this)" src="<!--{$TPL_DIR}-->img/cart/b_buystep.gif" class="box150" alt="購入手続きへ" name="confirm" /> 159 160 <!--{/if}--> … … 161 162 </div> 162 163 </form> 164 <!--{/foreach}--> 163 165 <!--{else}--> 164 166 <p class="empty"><em>※ 現在カート内に商品はございません。</em></p> -
branches/version-2_5-dev/data/Smarty/templates/default/detail.tpl
r18829 r18830 141 141 eleDynamic.value = '' 142 142 } 143 // 商品種別 144 eleDynamic = document.getElementById('product_type'); 145 if ( 146 classcat2 147 && typeof classcat2.product_type != 'undefined' 148 && String(classcat2.product_type).length >= 1 149 ) { 150 eleDynamic.value = classcat2.product_type; 151 } else { 152 eleDynamic.value = '' 153 } 143 154 } 144 155 $(document).ready(function() { … … 292 303 <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->" /> 293 304 <input type="hidden" name="product_class_id" value="<!--{$tpl_product_class_id}-->" id="product_class_id" /> 305 <input type="hidden" name="product_type" value="<!--{$tpl_product_type}-->" id="product_type" /> 294 306 <input type="hidden" name="favorite_product_id" value="" /> 295 307 -
branches/version-2_5-dev/data/Smarty/templates/default/list.tpl
r18829 r18830 121 121 eleDynamic.value = '' 122 122 } 123 // 商品種別 124 eleDynamic = document.getElementById('product_type' + product_id); 125 if ( 126 classcat2 127 && typeof classcat2.product_type != 'undefined' 128 && String(classcat2.product_type).length >= 1 129 ) { 130 eleDynamic.value = classcat2.product_type; 131 } else { 132 eleDynamic.value = '' 133 } 123 134 } 124 135 //]]> … … 144 155 <input type="hidden" name="classcategory_id2" value="" /> 145 156 <input type="hidden" name="product_class_id" value="" /> 157 <input type="hidden" name="product_type" value="" /> 146 158 <input type="hidden" name="quantity" value="" /> 147 159 <!--{* ▲注文関連 *}--> … … 268 280 <input type="hidden" name="product_id" value="<!--{$id|escape}-->" /> 269 281 <input type="hidden" name="product_class_id" id="product_class_id<!--{$id|escape}-->" value="<!--{$tpl_product_class_id[$id]}-->" /> 282 <input type="hidden" name="product_type" id="product_type<!--{$id|escape}-->" value="<!--{$tpl_product_type[$id]}-->" /> 270 283 <div class="in_cart"> 271 284 <!--{if $tpl_stock_find[$id]}--> -
branches/version-2_5-dev/data/Smarty/templates/default/shopping/confirm.tpl
r18700 r18830 75 75 <td class="phototd"> 76 76 <a 77 <!--{if $arrProductsClass[cnt] .main_image|strlen >= 1}-->78 href="<!--{$smarty.const.IMAGE_SAVE_URL}--><!--{$arrProductsClass[cnt] .main_image|sfNoImageMainList|escape}-->"77 <!--{if $arrProductsClass[cnt][$cartKey].main_image|strlen >= 1}--> 78 href="<!--{$smarty.const.IMAGE_SAVE_URL}--><!--{$arrProductsClass[cnt][$cartKey].main_image|sfNoImageMainList|escape}-->" 79 79 class="expansion" 80 80 target="_blank" 81 81 <!--{/if}--> 82 82 > 83 <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrProductsClass[cnt] .main_list_image|sfNoImageMainList|escape}-->&width=65&height=65" alt="<!--{$arrProductsClass[cnt].name|escape}-->" /></a>83 <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrProductsClass[cnt][$cartKey].main_list_image|sfNoImageMainList|escape}-->&width=65&height=65" alt="<!--{$arrProductsClass[cnt][$cartKey].name|escape}-->" /></a> 84 84 </td> 85 85 <td> 86 86 <ul> 87 <li><strong><!--{$arrProductsClass[cnt] .name|escape}--></strong></li>88 <!--{if $arrProductsClass[cnt] .classcategory_name1 != ""}-->89 <li><!--{$arrProductsClass[cnt] .class_name1}-->:<!--{$arrProductsClass[cnt].classcategory_name1}--></li>87 <li><strong><!--{$arrProductsClass[cnt][$cartKey].name|escape}--></strong></li> 88 <!--{if $arrProductsClass[cnt][$cartKey].classcategory_name1 != ""}--> 89 <li><!--{$arrProductsClass[cnt][$cartKey].class_name1}-->:<!--{$arrProductsClass[cnt][$cartKey].classcategory_name1}--></li> 90 90 <!--{/if}--> 91 <!--{if $arrProductsClass[cnt] .classcategory_name2 != ""}-->92 <li><!--{$arrProductsClass[cnt] .class_name2}-->:<!--{$arrProductsClass[cnt].classcategory_name2}--></li>91 <!--{if $arrProductsClass[cnt][$cartKey].classcategory_name2 != ""}--> 92 <li><!--{$arrProductsClass[cnt][$cartKey].class_name2}-->:<!--{$arrProductsClass[cnt][$cartKey].classcategory_name2}--></li> 93 93 <!--{/if}--> 94 94 </ul> 95 95 </td> 96 96 <td class="pricetd"> 97 <!--{if $arrProductsClass[cnt] .price02 != ""}-->98 <!--{$arrProductsClass[cnt] .price02|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円97 <!--{if $arrProductsClass[cnt][$cartKey].price02 != ""}--> 98 <!--{$arrProductsClass[cnt][$cartKey].price02|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円 99 99 <!--{else}--> 100 <!--{$arrProductsClass[cnt] .price01|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円100 <!--{$arrProductsClass[cnt][$cartKey].price01|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円 101 101 <!--{/if}--> 102 102 </td> 103 <td><!--{$arrProductsClass[cnt] .quantity|number_format}--></td>104 <td class="pricetd"><!--{$arrProductsClass[cnt] .total_pretax|number_format}-->円</td>103 <td><!--{$arrProductsClass[cnt][$cartKey].quantity|number_format}--></td> 104 <td class="pricetd"><!--{$arrProductsClass[cnt][$cartKey].total_pretax|number_format}-->円</td> 105 105 </tr> 106 106 <!--{/section}--> 107 107 <tr> 108 108 <th colspan="4" class="resulttd">小計</th> 109 <td class="pricetd"><!--{$tpl_total_pretax |number_format}-->円</td>109 <td class="pricetd"><!--{$tpl_total_pretax[$cartKey]|number_format}-->円</td> 110 110 </tr> 111 111 <!--{if $smarty.const.USE_POINT !== false}--> -
branches/version-2_5-dev/data/class/SC_CartSession.php
r18819 r18830 36 36 37 37 // 商品購入処理中のロック 38 function saveCurrentCart($key_tmp ) {38 function saveCurrentCart($key_tmp, $key) { 39 39 $this->key_tmp = "savecart_" . $key_tmp; 40 40 // すでに情報がなければ現状のカート情報を記録しておく 41 41 if(count($_SESSION[$this->key_tmp]) == 0) { 42 $_SESSION[$this->key_tmp] = $_SESSION[$ this->key];42 $_SESSION[$this->key_tmp] = $_SESSION[$key]; 43 43 } 44 44 // 1世代古いコピー情報は、削除しておく 45 foreach($_SESSION as $key => $val) { 46 if($key != $this->key_tmp && ereg("^savecart_", $key)) { 47 unset($_SESSION[$key]); 48 } 49 } 45 foreach($_SESSION as $k => $val) { 46 if($k != $this->key_tmp && preg_match("/^savecart_/", $k)) { 47 unset($_SESSION[$key][$k]); 48 } 49 } 50 $this->registerKey($key); 50 51 } 51 52 … … 362 363 } 363 364 } 365 366 function registerKey($key) { 367 $_SESSION['cartKey'] = $key; 368 } 369 370 function unsetKey() { 371 unset($_SESSION['cartKey']); 372 } 364 373 } 365 374 ?> -
branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php
r18829 r18830 245 245 * @return LC_Page 集計処理後のページクラスインスタンス 246 246 */ 247 function sfTotalCart(&$objPage, $objCartSess, $dummy1 = null) { 248 249 // 規格名一覧 250 $arrClassName = $this->sfGetIDValueList("dtb_class", "class_id", "name"); 251 // 規格分類名一覧 252 $arrClassCatName = $this->sfGetIDValueList("dtb_classcategory", "classcategory_id", "name"); 253 254 $objPage->tpl_total_pretax = 0; // 費用合計(税込み) 255 $objPage->tpl_total_tax = 0; // 消費税合計 256 $objPage->tpl_total_point = 0; // ポイント合計 247 function sfTotalCart(&$objPage, $objCartSess, $dummy1 = null, $key = "") { 248 249 $objPage->tpl_total_pretax[$key] = 0; // 費用合計(税込み) 250 $objPage->tpl_total_tax[$key] = 0; // 消費税合計 251 $objPage->tpl_total_point[$key] = 0; // ポイント合計 257 252 258 253 $objProduct = new SC_Product(); … … 298 293 $arrQuantityInfo_by_product[$product_id]['name'] = $arrData['name']; 299 294 300 $objPage->arrProductsClass[$cnt] = $arrData;301 $objPage->arrProductsClass[$cnt]['quantity'] = $quantity;302 $objPage->arrProductsClass[$cnt]['cart_no'] = $arrCart['cart_no'];303 $objPage->arrProductsClass[$cnt]['class_name1'] =295 $objPage->arrProductsClass[$cnt][$key] = $arrData; 296 $objPage->arrProductsClass[$cnt]['quantity'][$key] = $quantity; 297 $objPage->arrProductsClass[$cnt]['cart_no'][$key] = $arrCart['cart_no']; 298 $objPage->arrProductsClass[$cnt]['class_name1'][$key] = 304 299 isset($arrData['class_name1']) 305 300 ? $arrData['class_name1'] : ""; 306 301 307 $objPage->arrProductsClass[$cnt]['class_name2'] =302 $objPage->arrProductsClass[$cnt]['class_name2'][$key] = 308 303 isset($arrData['class_name2']) 309 304 ? $arrData['class_name2'] : ""; 310 305 311 $objPage->arrProductsClass[$cnt]['classcategory_name1'] = $arrData['name1'];312 313 $objPage->arrProductsClass[$cnt]['classcategory_name2'] = $arrData['name2'];306 $objPage->arrProductsClass[$cnt]['classcategory_name1'][$key] = $arrData['name1']; 307 308 $objPage->arrProductsClass[$cnt]['classcategory_name2'][$key] = $arrData['name2']; 314 309 // 価格の登録 315 310 $objCartSess->setProductValue($arrCart['id'], 'price', $arrData['price02']); 316 $objPage->arrProductsClass[$cnt]['uniq_price'] = $arrData['price02'];311 $objPage->arrProductsClass[$cnt]['uniq_price'][$key] = $arrData['price02']; 317 312 // ポイント付与率の登録 318 313 if (USE_POINT !== false) { … … 320 315 } 321 316 // 商品ごとの合計金額 322 $objPage->arrProductsClass[$cnt]['total_pretax'] = $objCartSess->getProductTotal($arrCart['id']);317 $objPage->arrProductsClass[$cnt]['total_pretax'][$key] = $objCartSess->getProductTotal($arrCart['id']); 323 318 // 送料の合計を計算する 324 $objPage->tpl_total_deliv_fee += ($arrData['deliv_fee'] * $arrCart['quantity']);319 $objPage->tpl_total_deliv_fee[$key] += ($arrData['deliv_fee'] * $arrCart['quantity']); 325 320 $cnt++; 326 321 } else { // DBに商品が見つからない場合、 … … 335 330 $objPage->tpl_error = "※「{$quantityInfo['name']}」は数量「{$quantityInfo['sale_limit']}」以下に販売制限しております。一度にこれ以上の購入はできません。\n"; 336 331 // 販売制限に引っかかった商品をマークする 337 foreach (array_keys($objPage->arrProductsClass) as $k ey) {338 $ProductsClass =& $objPage->arrProductsClass[$k ey];332 foreach (array_keys($objPage->arrProductsClass) as $k) { 333 $ProductsClass =& $objPage->arrProductsClass[$k]; 339 334 if ($ProductsClass['product_id'] == $product_id) { 340 335 $ProductsClass['error'] = true; … … 345 340 346 341 // 全商品合計金額(税込み) 347 $objPage->tpl_total_pretax = $objCartSess->getAllProductsTotal();342 $objPage->tpl_total_pretax[$key] = $objCartSess->getAllProductsTotal(); 348 343 // 全商品合計消費税 349 $objPage->tpl_total_tax = $objCartSess->getAllProductsTax();344 $objPage->tpl_total_tax[$key] = $objCartSess->getAllProductsTax(); 350 345 // 全商品合計ポイント 351 346 if (USE_POINT !== false) { 352 $objPage->tpl_total_point = $objCartSess->getAllProductsPoint();347 $objPage->tpl_total_point[$key] = $objCartSess->getAllProductsPoint(); 353 348 } 354 349 … … 1447 1442 * @return array 最終計算後の配列 1448 1443 */ 1449 function sfTotalConfirm($arrData, &$objPage, &$objCartSess, $dummy1 = null, $objCustomer = "" ) {1444 function sfTotalConfirm($arrData, &$objPage, &$objCartSess, $dummy1 = null, $objCustomer = "", $key = "") { 1450 1445 // 店舗基本情報を取得する 1451 1446 $arrInfo = SC_Helper_DB_Ex::sf_getBasisData(); … … 1459 1454 1460 1455 // 税金の取得 1461 $arrData['tax'] = $objPage->tpl_total_tax ;1456 $arrData['tax'] = $objPage->tpl_total_tax[$key]; 1462 1457 // 小計の取得 1463 $arrData['subtotal'] = $objPage->tpl_total_pretax ;1458 $arrData['subtotal'] = $objPage->tpl_total_pretax[$key]; 1464 1459 1465 1460 // 合計送料の取得 … … 1502 1497 1503 1498 // 合計の計算 1504 $arrData['total'] = $objPage->tpl_total_pretax ; // 商品合計1499 $arrData['total'] = $objPage->tpl_total_pretax[$key]; // 商品合計 1505 1500 $arrData['total']+= $arrData['deliv_fee']; // 送料 1506 1501 $arrData['total']+= $arrData['charge']; // 手数料 … … 1509 1504 // 加算ポイントの計算 1510 1505 if (USE_POINT !== false) { 1511 $arrData['add_point'] = SC_Helper_DB_Ex::sfGetAddPoint($objPage->tpl_total_point , $arrData['use_point']);1506 $arrData['add_point'] = SC_Helper_DB_Ex::sfGetAddPoint($objPage->tpl_total_point[$key], $arrData['use_point']); 1512 1507 1513 1508 if($objCustomer != "") { -
branches/version-2_5-dev/data/class/pages/cart/LC_Page_Cart.php
r18829 r18830 101 101 case 'confirm': 102 102 // カート内情報の取得 103 $arrRet = $objCartSess->getCartList(); 103 $cartKey = $_POST['cartKey']; // TODO 104 $arrRet = $objCartSess->getCartList($cartKey); 104 105 $max = count($arrRet); 105 106 $cnt = 0; … … 128 129 } 129 130 // カートを購入モードに設定 130 $objCartSess->saveCurrentCart($uniqid );131 $objCartSess->saveCurrentCart($uniqid, $cartKey); 131 132 // 購入ページへ 132 133 $this->sendRedirect(URL_SHOP_TOP); … … 138 139 } 139 140 140 // カート集計処理141 $objDb->sfTotalCart($this, $objCartSess);142 $this->arrData = $objDb->sfTotalConfirm($this->arrData, $this, $objCartSess, null, $objCustomer);143 144 141 // 基本情報の取得 145 142 $this->arrInfo = $objSiteInfo->data; 143 144 $this->cartKeys = $objCartSess->getKeys(); 145 foreach ($this->cartKeys as $key) { 146 // カート集計処理 147 $objDb->sfTotalCart($this, $objCartSess, $key); 148 $this->arrData = $objDb->sfTotalConfirm($this->arrData, $this, $objCartSess, null, $objCustomer, $key); 149 // 送料無料までの金額を計算 150 $this->tpl_deliv_free[$key] = $this->arrInfo['free_rule'] - $this->tpl_total_pretax[$key]; 151 152 153 } 146 154 147 155 // ログイン判定 … … 152 160 } 153 161 154 // 送料無料までの金額を計算155 $this->tpl_deliv_free = $this->arrInfo['free_rule'] - $this->tpl_total_pretax;156 162 157 163 // 前頁のURLを取得 -
branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php
r18829 r18830 170 170 $this->tpl_stock_find = $objProduct->stock_find[$product_id]; 171 171 $this->tpl_product_class_id = $objProduct->classCategories[$product_id]['']['']['product_class_id']; 172 $this->tpl_product_type = $objProduct->classCategories[$product_id]['']['']['product_type']; 172 173 173 174 require_once DATA_PATH . 'module/Services/JSON.php'; … … 193 194 $classcategory_id2 = $_POST['classcategory_id2']; 194 195 $product_class_id = $_POST['product_class_id']; 196 $product_type = $_POST['product_type']; 195 197 196 198 if (!empty($_POST['gmo_oneclick'])) { … … 207 209 $classcategory_id2 = '0'; 208 210 } 209 // 規格IDを取得 210 $objProduct = new SC_Product(); 211 $objCartSess->addProduct($product_class_id, $this->objFormParam->getValue('quantity')); 211 $objCartSess->addProduct($product_class_id, $this->objFormParam->getValue('quantity'), $product_type); 212 212 213 213 if (!empty($_POST['gmo_oneclick'])) { -
branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
r18820 r18830 84 84 85 85 // カート集計処理 86 $objDb->sfTotalCart($this, $objCartSess); 86 $this->cartKey = $_SESSION['cartKey']; 87 $objDb->sfTotalCart($this, $objCartSess, $this->cartKey); 87 88 if (strlen($this->tpl_message) >= 1) { 88 89 SC_Utils_Ex::sfDispSiteError(SOLD_OUT, '', true);
Note: See TracChangeset
for help on using the changeset viewer.