Merge branch 'master' of github.com:gnuboard/yc4s

This commit is contained in:
chicpro
2013-06-13 14:18:14 +09:00
2 changed files with 27 additions and 45 deletions

View File

@ -131,32 +131,21 @@ include_once(G4_MSHOP_PATH.'/_head.php');
</table> </table>
<?php <?php
// 배송비가 0 보다 크다면 (있다면) $tot_amount = $tot_sell_amount + $send_cost; // 총계 = 주문상품금액합계 + 배송비
if ($send_cost > 0) if ($tot_amount > 0 || $send_cost > 0) {
{
?> ?>
<dl id="sod_bsk_tot">
<div id="sod_bsk_dvr" class="sod_bsk_tot"> <?php if ($send_cost > 0) { // 배송비가 0 보다 크다면 (있다면) ?>
<span>배송비</span> <dt class="sod_bsk_dvr">배송비</dt>
<strong><?php echo number_format($send_cost); ?> 원</strong> <dd class="sod_bsk_dvr"><strong><?php echo number_format($send_cost); ?> 원</strong></dd>
</div>
<?php } ?> <?php } ?>
<?php <?php if ($tot_amount > 0) { ?>
// 총계 = 주문상품금액합계 + 배송비 <dt class="sod_bsk_cnt">총계</dt>
$tot_amount = $tot_sell_amount + $send_cost; <dd class="sod_bsk_cnt"><strong><?php echo number_format($tot_amount); ?> 원 <?php echo number_format($tot_point); ?> 점</strong></dd>
?> <?php } ?>
</dl>
<div id="sod_bsk_cnt" class="sod_bsk_tot"> <?php } ?>
<span>총계</span>
<strong><?php echo number_format($tot_amount); ?> 원</strong>
</div>
<div id="sod_bsk_cnt" class="sod_bsk_tot">
<span>포인트</span>
<strong><?php echo number_format($tot_point); ?> 점</strong>
</div>
<div id="sod_bsk_act"> <div id="sod_bsk_act">
<?php if ($i == 0) { ?> <?php if ($i == 0) { ?>

View File

@ -177,32 +177,25 @@ include_once('./_head.php');
</table> </table>
<?php <?php
// 배송비가 0 보다 크다면 (있다면) $tot_amount = $tot_sell_amount + $send_cost; // 총계 = 주문상품금액합계 + 배송비
if ($send_cost > 0) if ($tot_amount > 0 || $send_cost > 0) {
{
?> ?>
<dl id="sod_bsk_tot">
<div id="sod_bsk_dvr" class="sod_bsk_tot"> <?php if ($send_cost > 0) { // 배송비가 0 보다 크다면 (있다면) ?>
<span>배송비</span> <dt class="sod_bsk_dvr">배송비</dt>
<strong><?php echo number_format($send_cost); ?> 원</strong> <dd class="sod_bsk_dvr"><strong><?php echo number_format($send_cost); ?> 원</strong></dd>
</div>
<?php } ?> <?php } ?>
<?php <?php
// 총계 = 주문상품금액합계 + 배송비 if ($tot_amount > 0) {
$tot_amount = $tot_sell_amount + $send_cost;
?> ?>
<div id="sod_bsk_cnt" class="sod_bsk_tot"> <dt class="sod_bsk_cnt">총계</dt>
<span>총계</span> <dd class="sod_bsk_cnt"><strong><?php echo number_format($tot_amount); ?> 원 <?php echo number_format($tot_point); ?> 점</strong></dd>
<strong><?php echo number_format($tot_amount); ?> 원</strong> <?php } ?>
</div>
<div id="sod_bsk_cnt" class="sod_bsk_tot"> </dl>
<span>포인트</span> <?php } ?>
<strong><?php echo number_format($tot_point); ?> 점</strong>
</div>
<div id="sod_bsk_act"> <div id="sod_bsk_act">
<?php if ($i == 0) { ?> <?php if ($i == 0) { ?>