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

shop/orderform.php

@@ -1131,6 +1131,9 @@ $(function() {
                 return false;
             } else {
                 coupon_cancel($cp_dup_el);
+                $("#cp_frm").remove();
+                $cp_dup_el.find(".cp_btn").text("적용").focus();
+                $cp_dup_el.find(".cp_cancel").remove();
             }
         }
 

shop/orderinquiryview.php

@@ -146,7 +146,9 @@ if(openwin != null) {
 
         <?php
         // 총계 = 주문상품금액합계 + 배송비 - 상품할인 - 결제할인 - 배송비할인
-        $tot_price = $od['od_cart_price'] + $od['od_send_cost'] + $od['od_send_cost2'] - $od['od_cart_coupon'] - $od['od_coupon'] - $od['od_send_coupon'];
+        $tot_price = $od['od_cart_price'] + $od['od_send_cost'] + $od['od_send_cost2']
+                        - $od['od_cart_coupon'] - $od['od_coupon'] - $od['od_send_coupon']
+                        - $od['od_cancel_price'];
         ?>
 
         <dl id="sod_bsk_tot">
@@ -178,6 +180,11 @@ if(openwin != null) {
             <dd class="sod_bsk_dvr"><strong><?php echo number_format($od['od_send_cost2']); ?> 원</strong></dd>
             <?php } ?>
 
+            <?php if ($od['od_cancel_price'] > 0) { ?>
+            <dt class="sod_bsk_dvr">취소금액</dt>
+            <dd class="sod_bsk_dvr"><strong><?php echo number_format($od['od_cancel_price']); ?> 원</strong></dd>
+            <?php } ?>
+
             <dt class="sod_bsk_cnt">총계</dt>
             <dd class="sod_bsk_cnt"><strong><?php echo number_format($tot_price); ?> 원</strong></dd>
 
@@ -330,16 +337,6 @@ if(openwin != null) {
                 <?php
                 }
 
-                if ($od['od_cancel_price'] > 0)
-                {
-                ?>
-                <tr>
-                    <th scope="row">취소 금액</th>
-                    <td><?php echo display_price($od['od_cancel_price']); ?></td>
-                </tr>
-                <?php
-                }
-
                 if ($od['od_refund_price'] > 0)
                 {
                 ?>