Changeset 19815
- Timestamp:
- 2011/01/04 15:49:20 (13 years ago)
- bzr:base-revision:
- svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19814
- 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/class/SC_CartSession.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_CartSession.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/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php 15367@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ffrontparts%2Fbloc%2FLC_Page_FrontParts_Bloc_Cart.php
data/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.php
docs/eccube-diagram.jude eccubediagram.jude-20101102081620-jpq1fqmox6ocmuj3-2
html/user_data/packages/default/css/under02.css 16708@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Fuser_data%2Fpackages%2Fdefault%2Fcss%2Funder02.css- bzr:mapping-version:
- v4
- bzr:merge:
ohkouchi@loop-az.jp-20110104064625-lgxy51jghrl1lbz5- bzr:repository-uuid:
- 1e3b908f-19a9-db11-a64c-001125224ba8
- bzr:revision-id:
- ohkouchi@loop-az.jp-20110104064912-wnz0wgxonjpv17lu
- bzr:revno:
- 2544
- bzr:revprop:branch-nick:
- branches/version-2_5-dev
- bzr:root:
- branches/version-2_5-dev
- bzr:text-revisions:
data/Smarty/templates/default/cart/index.tpl ohkouchi@loop-az.jp-20110104064625-lgxy51jghrl1lbz5
data/class/SC_CartSession.php ohkouchi@loop-az.jp-20110104064625-lgxy51jghrl1lbz5
data/class/pages/cart/LC_Page_Cart.php ohkouchi@loop-az.jp-20110104064625-lgxy51jghrl1lbz5
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php ohkouchi@loop-az.jp-20110104064625-lgxy51jghrl1lbz5
html/user_data/packages/default/css/under02.css ohkouchi@loop-az.jp-20110104064625-lgxy51jghrl1lbz5- bzr:timestamp:
- 2011-01-04 15:49:12.770999908 +0900
- bzr:user-agent:
- bzr2.2.1+bzr-svn1.0.4
- svn:original-date:
- 2011-01-04T06:49:12.771000Z
- Location:
- branches/version-2_5-dev
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl
r19802 r19815 47 47 48 48 <!--{* カゴの中に商品がある場合にのみ表示 *}--> 49 <!--{if count($arrProductsClass) > 0 }--> 50 <!--{* FIXME $key は未定義 *}--> 51 お買い上げ商品の合計金額は「<em><!--{$tpl_total_inctax[$key]|number_format}-->円</em>」です。 52 <!--{if $arrInfo.free_rule > 0}--> 53 <!--{if $arrData.deliv_fee > 0}--> 54 <!--{* FIXME $key は未定義 *}--> 55 あと「<em><!--{$tpl_deliv_free[$key]|number_format}-->円</em>」で送料無料です!! 56 <!--{else}--> 57 現在、「<em>送料無料</em>」です!! 58 <!--{/if}--> 59 <!--{/if}--> 49 <!--{if count($cartKeys) > 1}--> 50 <em><!--{foreach from=$cartKeys item=key name=cartKey}--><!--{$arrProductType[$key]}--><!--{if !$smarty.foreach.cartKey.last}-->、<!--{/if}--><!--{/foreach}-->は同時購入できません。お手数ですが、個別に購入手続きをお願い致します。</em> 60 51 <!--{/if}--> 61 52 </p> … … 73 64 74 65 <!--{foreach from=$cartKeys item=key}--> 75 <form name="form1" id="form1" method="post" action="?"> 76 <!--{if 'sfGMOCartDisplay'|function_exists}--> 77 <!--{'sfGMOCartDisplay'|call_user_func}--> 78 <!--{/if}--> 66 <form name="form<!--{$key}-->" id="form<!--{$key}-->" method="post" action="?"> 79 67 80 68 <input type="hidden" name="mode" value="confirm" /> 81 69 <input type="hidden" name="cart_no" value="" /> 82 70 <input type="hidden" name="cartKey" value="<!--{$key}-->" /> 71 <!--{if count($cartKeys) > 1 }--> 72 <h3><!--{$arrProductType[$key]}--></h3> 73 <p> 74 <!--{$arrProductType[$key]}-->の合計金額は「<em><!--{$tpl_total_inctax[$key]|number_format}-->円</em>」です。 75 <!--{if $arrInfo.free_rule > 0}--> 76 <!--{if $arrData[$key].deliv_fee > 0}--> 77 あと「<em><!--{$tpl_deliv_free[$key]|number_format}-->円</em>」で送料無料です!! 78 <!--{else}--> 79 現在、「<em>送料無料</em>」です!! 80 <!--{/if}--> 81 <!--{/if}--> 82 </p> 83 <!--{else}--> 84 <p> 85 お買い上げ商品の合計金額は「<em><!--{$tpl_total_inctax[$key]|number_format}-->円</em>」です。 86 <!--{if $arrInfo.free_rule > 0}--> 87 <!--{if $arrData[$key].deliv_fee > 0}--> 88 あと「<em><!--{$tpl_deliv_free[$key]|number_format}-->円</em>」で送料無料です!! 89 <!--{else}--> 90 現在、「<em>送料無料</em>」です!! 91 <!--{/if}--> 92 <!--{/if}--> 93 </p> 94 <!--{/if}--> 95 83 96 <table summary="商品情報"> 84 97 <tr> … … 92 105 <!--{foreach from=$cartItems[$key] item=item}--> 93 106 <tr style="<!--{if $item.error}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->"> 94 <td><a href="?" onclick="fn ModeSubmit('delete', 'cart_no', '<!--{$item.cart_no}-->'); return false;">削除</a>107 <td><a href="?" onclick="fnFormModeSubmit('form<!--{$key}-->', 'delete', 'cart_no', '<!--{$item.cart_no}-->'); return false;">削除</a> 95 108 </td> 96 109 <td class="phototd"> … … 117 130 <td id="quantity"><!--{$item.quantity}--> 118 131 <ul id="quantity_level"> 119 <li><a href="?" onclick="fn ModeSubmit('up','cart_no','<!--{$item.cart_no}-->'); return false"><img src="<!--{$TPL_DIR}-->img/button/btn_plus.gif" width="16" height="16" alt="+" /></a></li>120 <li><a href="?" onclick="fn ModeSubmit('down','cart_no','<!--{$item.cart_no}-->'); return false"><img src="<!--{$TPL_DIR}-->img/button/btn_minus.gif" width="16" height="16" alt="-" /></a></li>132 <li><a href="?" onclick="fnFormModeSubmit('form<!--{$key}-->','up','cart_no','<!--{$item.cart_no}-->'); return false"><img src="<!--{$TPL_DIR}-->img/button/btn_plus.gif" width="16" height="16" alt="+" /></a></li> 133 <li><a href="?" onclick="fnFormModeSubmit('form<!--{$key}-->','down','cart_no','<!--{$item.cart_no}-->'); return false"><img src="<!--{$TPL_DIR}-->img/button/btn_minus.gif" width="16" height="16" alt="-" /></a></li> 121 134 </ul> 122 135 </td> … … 130 143 <tr> 131 144 <th colspan="5" class="resulttd">合計</th> 132 <td class="pricetd"><em><!--{$arrData .total-$arrData.deliv_fee|number_format}-->円</em></td>145 <td class="pricetd"><em><!--{$arrData[$key].total-$arrData[$key].deliv_fee|number_format}-->円</em></td> 133 146 </tr> 134 147 <!--{if $smarty.const.USE_POINT !== false}--> 135 <!--{if $arrData .birth_point > 0}-->148 <!--{if $arrData[$key].birth_point > 0}--> 136 149 <tr> 137 150 <th colspan="5" class="resulttd">お誕生月ポイント</th> 138 <td class="pricetd"><!--{$arrData .birth_point|number_format}-->pt</td>151 <td class="pricetd"><!--{$arrData[$key].birth_point|number_format}-->pt</td> 139 152 </tr> 140 153 <!--{/if}--> 141 154 <tr> 142 155 <th colspan="5" class="resulttd">今回加算ポイント</th> 143 <td class="pricetd"><!--{$arrData .add_point|number_format}-->pt</td>156 <td class="pricetd"><!--{$arrData[$key].add_point|number_format}-->pt</td> 144 157 </tr> 145 158 <!--{/if}--> … … 153 166 <!--{if $tpl_prev_url != ""}--> 154 167 <a href="<!--{$tpl_prev_url}-->" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_back_on.gif','back');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_back.gif','back');"> 155 <img src="<!--{$TPL_DIR}-->img/button/btn_back.gif" width="150" height="30" alt="買い物を続ける" name="back" id="back"/></a> 168 <img src="<!--{$TPL_DIR}-->img/button/btn_back.gif" width="150" height="30" alt="買い物を続ける" name="back" /></a> 156 169 <!--{/if}--> 157 170 <!--{if strlen($tpl_error) == 0}--> -
branches/version-2_5-dev/data/class/SC_CartSession.php
r19711 r19815 565 565 566 566 function getKeys() { 567 $keys = array_keys($this->cartSession); 568 // 数量が 0 の商品種別は削除する 569 foreach ($keys as $key) { 570 $quantity = $this->getTotalQuantity($key); 571 if ($quantity < 1) { 572 unset($this->cartSession[$key]); 573 } 574 } 567 575 return array_keys($this->cartSession); 568 576 } -
branches/version-2_5-dev/data/class/pages/cart/LC_Page_Cart.php
r19805 r19815 59 59 parent::init(); 60 60 $this->tpl_title = "現在のカゴの中"; 61 $masterData = new SC_DB_MasterData_Ex(); 62 $this->arrProductType = $masterData->getMasterData("mtb_product_type"); 63 61 64 } 62 65 … … 150 153 // ポイント合計 151 154 $this->tpl_total_point[$key] = $objCartSess->getAllProductsPoint($key); 152 $this->arrData = $objCartSess->calculate($key, $objCustomer); 153 155 156 $this->arrData[$key] = $objCartSess->calculate($key, $objCustomer); 154 157 // 送料無料までの金額を計算 155 158 $this->tpl_deliv_free[$key] = $this->arrInfo['free_rule'] - $this->tpl_total_inctax[$key]; -
branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Cart.php
r19805 r19815 81 81 } 82 82 } 83 // 店舗情報の取得84 $arrInfo = $objSiteInfo->data;85 83 // 購入金額合計 86 $ProductsTotal = $objCart->getAllProductsTotal($cartKey); 84 $ProductsTotal += $objCart->getAllProductsTotal($cartKey); 85 // 合計数量 86 $TotalQuantity += $objCart->getTotalQuantity($cartKey); 87 87 88 // 合計数量 89 $TotalQuantity = $objCart->getTotalQuantity($cartKey); 88 } 90 89 91 // 送料無料までの金額 92 $arrCartList[0]['ProductsTotal'] = $ProductsTotal; 93 $arrCartList[0]['TotalQuantity'] = $TotalQuantity; 94 $deliv_free = $arrInfo['free_rule'] - $ProductsTotal; 95 $arrCartList[0]['free_rule'] = $arrInfo['free_rule']; 96 $arrCartList[0]['deliv_free'] = $deliv_free; 90 // 店舗情報の取得 91 $arrInfo = $objSiteInfo->data; 97 92 98 $this->arrCartList = $arrCartList; 99 } 93 // 送料無料までの金額 94 $arrCartList[0]['ProductsTotal'] = $ProductsTotal; 95 $arrCartList[0]['TotalQuantity'] = $TotalQuantity; 96 /* 97 * FIXME 98 * 商品種別ごとに送料無料までの金額を計算するよう要修正 99 */ 100 $deliv_free = $arrInfo['free_rule'] - $ProductsTotal; 101 $arrCartList[0]['free_rule'] = $arrInfo['free_rule']; 102 $arrCartList[0]['deliv_free'] = $deliv_free; 103 104 $this->arrCartList = $arrCartList; 100 105 } 101 106 -
branches/version-2_5-dev/html/user_data/packages/default/css/under02.css
r17498 r19815 25 25 border: 1px solid #ccc; 26 26 text-align: center; 27 } 28 29 div#under02column_cart h3 { 30 margin: 10px 5px; 31 font-size: 120%; 32 border-bottom: 1px solid #999; 33 text-align: left; 34 } 35 36 div#under02column_cart p { 37 margin: 10px 5px; 27 38 } 28 39
Note: See TracChangeset
for help on using the changeset viewer.