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:
whitedot
2013-12-03 14:52:19 +09:00
parent 995f648a91 ee8fd4ede4
commit 3c1a5b5d84
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
adm/shop_admin/orderform.php
View File

@ -412,6 +412,10 @@ $result = sql_query($sql);
<td><?php echo display_price($od['od_free_mny']); ?></td> <td><?php echo display_price($od['od_free_mny']); ?></td>
</tr> </tr>
<?php } ?> <?php } ?>
<tr>
<th scope="row">결제할인금액</th>
<td><?php echo display_price($od['od_coupon']); ?></td>
</tr>
<tr> <tr>
<th scope="row">포인트</th> <th scope="row">포인트</th>
<td><?php echo display_point($od['od_receipt_point']); ?></td> <td><?php echo display_point($od['od_receipt_point']); ?></td>
@ -429,15 +433,14 @@ $result = sql_query($sql);
<th scope="row">운송장번호</th> <th scope="row">운송장번호</th>
<td><?php echo $od['od_invoice']; ?></td> <td><?php echo $od['od_invoice']; ?></td>
</tr> </tr>
<?php } ?>
<tr> <tr>
<th scope="row">배송일시</th> <th scope="row">배송일시</th>
<td><?php echo is_null_time($od['od_invoice_time']) ? "" : $od['od_invoice_time']; ?></td> <td><?php echo is_null_time($od['od_invoice_time']) ? "" : $od['od_invoice_time']; ?></td>
</tr> </tr>
<?php } ?>
<tr> <tr>
<th scope="row"><label for="od_send_cost">배송비</label></th> <th scope="row"><label for="od_send_cost">배송비</label></th>
<td> <td>
<?php echo help("주문취소시 배송비는 취소되지 않으므로 이 배송비를 0으로 설정하여 미수금을 맞추십시오."); ?>
<input type="text" name="od_send_cost" value="<?php echo $od['od_send_cost']; ?>" id="od_send_cost" class="frm_input" size="10"> 원 <input type="text" name="od_send_cost" value="<?php echo $od['od_send_cost']; ?>" id="od_send_cost" class="frm_input" size="10"> 원
</td> </td>
</tr> </tr>

6
mobile/shop/orderform.php
View File

@ -869,7 +869,7 @@ $(function() {
} else { } else {
coupon_cancel($cp_dup_el); coupon_cancel($cp_dup_el);
$("#cp_frm").remove(); $("#cp_frm").remove();
$cp_dup_el.find(".cp_btn").text("쿠폰적용").focus(); $cp_dup_el.find(".cp_btn").text("쿠폰적용").removeClass("cp_mod").focus();
$cp_dup_el.find(".cp_cancel").remove(); $cp_dup_el.find(".cp_cancel").remove();
} }
} }
@ -887,7 +887,7 @@ $(function() {
calculate_total_price(); calculate_total_price();
$("#cp_frm").remove(); $("#cp_frm").remove();
$cp_btn_el.text("쿠폰변경").focus(); $cp_btn_el.text("쿠폰변경").addClass("cp_mod").focus();
if(!$cp_row_el.find(".cp_cancel").size()) if(!$cp_row_el.find(".cp_cancel").size())
$cp_btn_el.after("<button type=\"button\" class=\"cp_cancel\">쿠폰취소</button>"); $cp_btn_el.after("<button type=\"button\" class=\"cp_cancel\">쿠폰취소</button>");
}); });
@ -901,7 +901,7 @@ $(function() {
coupon_cancel($(this).closest("li")); coupon_cancel($(this).closest("li"));
calculate_total_price(); calculate_total_price();
$("#cp_frm").remove(); $("#cp_frm").remove();
$(this).closest("li").find(".cp_btn").text("쿠폰적용").focus(); $(this).closest("li").find(".cp_btn").text("쿠폰적용").removeClass("cp_mod").focus();
$(this).remove(); $(this).remove();
}); });