firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

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

Browse Source
This commit is contained in:
chicpro
2013-06-13 13:48:46 +09:00
parent 79adb5d9b4 84a987fa2e
commit b016d4cb5c
26 changed files with 165 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
shop/orderform.php
View File

@ -279,35 +279,21 @@ setTimeout("init_pay_button();",300);
<?php if ($goods_count) $goods .= ' 외 '.$goods_count.'건'; ?>
<div id="sod_bsk_sell" class="sod_bsk_tot">
<span>주문</span>
<strong><?php echo number_format($tot_sell_amount); ?> 원</strong>
</div>
<div id="sod_bsk_coupon" class="sod_bsk_tot">
<span>쿠폰</span>
<strong id="ct_tot_coupon">0 원</strong>
</div>
<div id="sod_bsk_dvr" class="sod_bsk_tot">
<span>배송비</span>
<strong><?php echo number_format($send_cost); ?> 원</strong>
</div>
<?php
// 총계 = 주문상품금액합계 + 배송비
$tot_amount = $tot_sell_amount + $send_cost;
?>
<div id="sod_bsk_cnt" class="sod_bsk_tot">
<span>총계</span>
<strong id="ct_tot_amount"><?php echo number_format($tot_amount); ?> 원</strong>
</div>
<div id="sod_bsk_point" class="sod_bsk_tot">
<span><?php echo $default['de_mileage_use'] ? '마일리지' : '포인트'; ?></span>
<strong><?php echo number_format($tot_point); ?> 점</strong>
</div>
<dl id="sod_bsk_tot">
<dt class="sod_bsk_sell">주문</dt>
<dd class="sod_bsk_sell"><strong><?php echo number_format($tot_sell_amount); ?> 원</strong></dd>
<dt class="sod_bsk_coupon">쿠폰할인</dt>
<dd class="sod_bsk_coupon"><strong id="ct_tot_coupon">0 원</strong></dd>
<dt class="sod_bsk_dvr">배송비</dt>
<dd class="sod_bsk_dvr"><strong><?php echo number_format($send_cost); ?> 원</strong></dd>
<dt class="sod_bsk_cnt">총계</dt>
<dd class="sod_bsk_cnt">
<?php $tot_amount = $tot_sell_amount + $send_cost; // 총계 = 주문상품금액합계 + 배송비 ?>
<strong id="ct_tot_amount"><?php echo number_format($tot_amount); ?> 원</strong>
</dd>
<dt class="sod_bsk_point"><?php echo $default['de_mileage_use'] ? '마일리지' : '포인트'; ?></dt>
<dd class="sod_bsk_point"><strong><?php echo number_format($tot_point); ?> 점</strong></dd>
</dl>
<input type="hidden" name="od_amount" value="<?php echo $tot_sell_amount; ?>">
<input type="hidden" name="org_od_amount" value="<?php echo $tot_sell_amount; ?>">

2
shop/orderinquiry.sub.php
View File

@ -39,7 +39,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
<a href="<?php echo G4_SHOP_URL; ?>/orderinquiryview.php?od_id=<?php echo $row['od_id']; ?>&amp;uq_id=<?php echo $row['uq_id']; ?>"><?php echo $row['od_id']; ?></a>
</td>
<td><?php echo substr($row['od_time'],0,16); ?> (<?php echo get_yoil($row['od_time']); ?>)</td>
<td class="td_bignum"><?php echo $row['itemcount']; ?></td>
<td class="td_num"><?php echo $row['itemcount']; ?></td>
<td class="td_bignum"><?php echo display_price($row['orderamount']); ?></td>
<td class="td_bignum"><?php echo display_price($row['couponamount']); ?></td>
<td class="td_bignum"><?php echo display_price($row['receiptamount']); ?></td>

63
shop/orderinquiryview.php
View File

@ -45,7 +45,7 @@ if(openwin != null) {
<section id="sod_fin_list">
<h2>주문하신 상품</h2>
<span class="sound_only">상품 상태 설명</span>
<dl>
<dl id="sod_fin_legend">
<dt>주문</dt>
<dd>주문이 접수되었습니다.</dd>
<dt>준비</dt>
@ -139,48 +139,37 @@ if(openwin != null) {
$tot_amount = $tot_sell_amount + $send_cost - $tot_cp_amount - $od_coupon;
?>
<div id="sod_bsk_dvr" class="sod_bsk_tot">
<span>주문총액</span>
<strong><?php echo number_format($tot_sell_amount); ?> 원</strong>
</div>
<dl id="sod_bsk_tot">
<dt class="sod_bsk_dvr">주문총액</dt>
<dd class="sod_bsk_dvr"><strong><?php echo number_format($tot_sell_amount); ?> 원</strong></dd>
<?php if($tot_cp_amount > 0) { ?>
<div id="sod_bsk_dvr" class="sod_bsk_tot">
<span>상품할인</span>
<strong><?php echo number_format($tot_cp_amount); ?> 원</strong>
</div>
<?php } ?>
<?php if($tot_cp_amount > 0) { ?>
<dt class="sod_bsk_dvr">상품할인</dt>
<dd class="sod_bsk_dvr"><strong><?php echo number_format($tot_cp_amount); ?> 원</strong></dd>
<?php } ?>
<?php if($od_coupon > 0) { ?>
<div id="sod_bsk_dvr" class="sod_bsk_tot">
<span>결제할인</span>
<strong><?php echo number_format($od_coupon); ?> 원</strong>
</div>
<?php } ?>
<?php if($od_coupon > 0) { ?>
<dt class="sod_bsk_dvr">결제할인</dt>
<dd class="sod_bsk_dvr"><strong><?php echo number_format($od_coupon); ?> 원</strong></dd>
<?php } ?>
<?php if ($org_send_cost > 0) { ?>
<div id="sod_bsk_dvr" class="sod_bsk_tot">
<span>배송비</span>
<strong><?php echo number_format($org_send_cost); ?> 원</strong>
</div>
<?php } ?>
<?php if ($org_send_cost > 0) { ?>
<dt class="sod_bsk_dvr">배송비</dt>
<dd class="sod_bsk_dvr"><strong><?php echo number_format($org_send_cost); ?> 원</strong></dd>
<?php } ?>
<?php if($send_coupon > 0) { ?>
<div id="sod_bsk_dvr" class="sod_bsk_tot">
<span>배송비할인</span>
<strong><?php echo number_format($send_coupon); ?> 원</strong>
</div>
<?php } ?>
<?php if($send_coupon > 0) { ?>
<dt class="sod_bsk_dvr">배송비할인</dt>
<dd class="sod_bsk_dvr"><strong><?php echo number_format($send_coupon); ?> 원</strong></dd>
<?php } ?>
<div id="sod_bsk_cnt" class="sod_bsk_tot">
<span>총계</span>
<strong><?php echo number_format($tot_amount); ?> 원</strong>
</div>
<dt class="sod_bsk_cnt">총계</dt>
<dd class="sod_bsk_cnt"><strong><?php echo number_format($tot_amount); ?> 원</strong></dd>
<dt class="sod_bsk_point">포인트</dt>
<dd class="sod_bsk_point"><strong><?php echo number_format($tot_point); ?> 점</strong></dd>
</dl>
<div id="sod_bsk_cnt" class="sod_bsk_tot">
<span>포인트</span>
<strong><?php echo number_format($tot_point); ?> 점</strong>
</div>
</section>
<div id="sod_fin_view">