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-12 17:36:05 +09:00
parent 7953c8f984 4c16b7b428
commit c11548e461
8 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/shop_admin/coupontarget.php
View File

@ -85,7 +85,7 @@ $qstr1 = 'sch_target='.$_GET['sch_target'].'&sch_word='.$_GET['sch_word'];
<tr>
<td><?php echo $row['t_name']; ?></td>
<td class="scp_target_code"><?php echo $row['t_id']; ?></td>
<td class="scp_target_select"><button type="button" onclick="sel_target_id('<?php echo $row['t_id']; ?>');">선택</button>
<td class="scp_target_select"><button type="button" class="btn_frmline" onclick="sel_target_id('<?php echo $row['t_id']; ?>');">선택</button>
</tr>
<?php
}

12
css/admin.css
View File

@ -187,12 +187,10 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
/* 상품관리 */
.sit_odrby {text-align:center}
.sit_amt {text-align:right;background-color:#e8fbff}
.sit_amt2 {text-align:right;border-color:#c3e189;background-color:#f6ffe6}
.sit_amt3 {text-align:right;border-color:#f6c8c4;background-color:#ffedeb}
.sit_camt,
.sit_pt,
.sit_qty {text-align:right}
.sit_amt {text-align:right;background-color:#e8fbff !important}
.sit_amt2 {text-align:right;border-color:#c3e189 !important;background-color:#f6ffe6 !important}
.sit_amt3 {text-align:right;border-color:#f6c8c4 !important;background-color:#ffedeb !important}
.sit_camt, .sit_pt, .sit_qty {text-align:right}
.frm_sit_title {margin:5px 0 0}
/* 상품입력/수정 */
@ -261,6 +259,8 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
.scp_find_code {width:110px;text-align:center}
.scp_find_select {width:50px;text-align:center}
.scp_target_select {width:50px;text-align:center}
/* 배너관리 */
#tbl_bn_list {text-align:center}

5
css/default_shop.css
View File

@ -661,9 +661,14 @@ input.required:focus {border:1px solid #b8c9c2;background:#21272e !important;col
#sod_frm #od_memo {height:50px}
#sod_frm_pay {position:relative}
#sod_frm_pay .basic_tbl th {width:auto !important;font-weight:bold;text-align:center !important}
#sod_frm_pay .basic_tbl td {padding:8px 5px 6px !important;border-top:1px solid #e9e9e9 !important;border-bottom:1px solid #e9e9e9 !important;line-height:1.5em !important;word-break:break-all !important}
#sod_frm_pay .frm_input {background:#fff !important}
#sod_frm_pay .frm_input:focus {color:#000}
#sod_frm_pay #sc_coupon_frm, #sod_frm_pay #od_coupon_frm {z-index:10000;position:absolute;top:0;left:99px;padding:20px;width:500px;height:auto !important;height:500px;max-height:500px;border:1px solid #000;background:#f5f6fa;overflow-y:scroll}
#sod_frm_paysel {margin:0 0 20px;padding:10px;border:1px solid #e9e9e9;background:#f5f6fa;text-align:center}
#sod_frm_paysel legend {position:absolute;font-size:0;line-height:0;overflow:hidden}
#settle_bank {margin:10px 0 0}

10
css/mobile_shop.css
View File

@ -331,12 +331,22 @@ html.no-overflowscrolling #mod_option_frm {height:auto;max-height:10000px !impor
#sod_frm {}
#sod_frm h2 {margin:0 0 1em}
#sod_list {position:relative}
#sod_list #it_coupon_frm {z-index:10000;position:absolute;top:0;left:0;padding:20px;width:320px;height:auto !important;height:480px;max-height:480px;border:1px solid #000;background:#f5f6fa;overflow-y:scroll}
html.no-overflowscrolling #it_coupon_frm {height:auto;max-height:10000px !important}
#sod_frm_orderer {margin:1.8em 0 3.6em}
#sod_frm_same {margin:0 0 1em}
#sod_frm #od_memo {height:7em}
#sod_frm_pay {position:relative}
#sod_frm_pay .basic_tbl caption {font-size:0;line-height:0;overflow:hidden}
#sod_frm_pay .basic_tbl th {width:auto !important;font-weight:bold;text-align:center !important}
#sod_frm_pay .basic_tbl td {border-top:1px solid #e9e9e9 !important;border-bottom:1px solid #e9e9e9 !important;line-height:1.5em !important;word-break:break-all !important}
#sod_frm_pay #sc_coupon_frm, #sod_frm_pay #od_coupon_frm {z-index:10000;position:absolute;top:0;left:0;padding:20px;width:320px;height:auto !important;height:480px;max-height:480px;border:1px solid #000;background:#f5f6fa;overflow-y:scroll}
html.no-overflowscrolling #sc_coupon_frm, html.no-overflowscrolling #od_coupon_frm {height:auto;max-height:10000px !important}
#sod_frm_pay .frm_input {background:#fff !important}
#sod_frm_pay .frm_input:focus {color:#000}

10
mobile/shop/orderform.php
View File

@ -37,7 +37,7 @@ $tablet_size = "1.0"; // 화면 사이즈 조정 - 기기화면에 맞게 수정
ob_start();
?>
<p>주문하실 상품을 확인하세요.</p>
<table class="basic_tbl">
<table id="sod_list" class="basic_tbl">
<thead>
<tr>
<th scope="col">상품이미지</th>
@ -142,7 +142,7 @@ ob_start();
$cp = sql_fetch($sql);
if($cp['cnt'])
$cp_button = '<button type="button" class="it_coupon_btn">적용</button>';
$cp_button = '<button type="button" class="it_coupon_btn btn_frmline">적용</button>';
}
?>
@ -158,7 +158,7 @@ ob_start();
</td>
<td class="td_num"><?php echo number_format($sum['qty']); ?></td>
<td class="td_bignum"><?php echo number_format($row['ct_price']); ?></td>
<td><?php echo $cp_button; ?></td>
<td class="td_smallmng"><?php echo $cp_button; ?></td>
<td class="td_bignum"><span class="ct_sell_amount"><?php echo number_format($sell_amount); ?></span></td>
<td class="td_num"><?php echo number_format($sum['point']); ?></td>
</tr>
@ -462,7 +462,7 @@ ob_end_clean();
<th scope="row">결제할인쿠폰</th>
<td>
<input type="hidden" name="od_cp_id" value="">
<button type="button" id="od_coupon_btn">쿠폰적용</button>
<button type="button" id="od_coupon_btn" class="btn_frmline">쿠폰적용</button>
</td>
</tr>
<?php } ?>
@ -471,7 +471,7 @@ ob_end_clean();
<th scope="row">배송비할인쿠폰</th>
<td>
<input type="hidden" name="sc_cp_id" value="">
<button type="button" id="sc_coupon_btn">쿠폰적용</button>
<button type="button" id="sc_coupon_btn" class="btn_frmline">쿠폰적용</button>
</td>
</tr>
<?php } ?>

4
shop/ordercoupon.php
View File

@ -50,8 +50,8 @@ $count = mysql_num_rows($result);
<input type="hidden" name="o_cp_subj[]" value="<?php echo $row['cp_subject']; ?>">
<?php echo get_text($row['cp_subject']); ?>
</td>
<td><?php echo number_format($dc); ?></td>
<td><button type="button" class="od_cp_apply" class="btn_frmline">적용</button></td>
<td class="td_bignum"><?php echo number_format($dc); ?></td>
<td class="td_smallmng"><button type="button" class="od_cp_apply btn_frmline">적용</button></td>
</tr>
<?php
}

4
shop/orderform.php
View File

@ -683,7 +683,7 @@ setTimeout("init_pay_button();",300);
<th scope="row">결제할인쿠폰</th>
<td>
<input type="hidden" name="od_cp_id" value="">
<button type="button" id="od_coupon_btn">쿠폰적용</button>
<button type="button" id="od_coupon_btn" class="btn_frmline">쿠폰적용</button>
</td>
</tr>
<?php } ?>
@ -692,7 +692,7 @@ setTimeout("init_pay_button();",300);
<th scope="row">배송비할인쿠폰</th>
<td>
<input type="hidden" name="sc_cp_id" value="">
<button type="button" id="sc_coupon_btn">쿠폰적용</button>
<button type="button" id="sc_coupon_btn" class="btn_frmline">쿠폰적용</button>
</td>
</tr>
<?php } ?>

8
shop/ordersendcostcoupon.php
View File

@ -27,8 +27,8 @@ $count = mysql_num_rows($result);
<thead>
<tr>
<th scope="col">쿠폰명</th>
<th>할인금액</th>
<th>적용</th>
<th scope="col">할인금액</th>
<th scope="col">적용</th>
</tr>
</thead>
<tbody>
@ -54,8 +54,8 @@ $count = mysql_num_rows($result);
<input type="hidden" name="s_cp_subj[]" value="<?php echo $row['cp_subject']; ?>">
<?php echo get_text($row['cp_subject']); ?>
</td>
<td><?php echo number_format($dc); ?></td>
<td><button type="button" class="sc_cp_apply">적용</button></td>
<td class="td_bignum"><?php echo number_format($dc); ?></td>
<td class="td_smallmng"><button type="button" class="sc_cp_apply btn_frmline">적용</button></td>
</tr>
<?php
}