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-09-03 18:22:42 +09:00
parent 52aae12d6d ffc537a256
commit e05d00d2f8
17 changed files with 301 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/shop_admin/orderform.php
View File

@ -885,7 +885,7 @@ $pg_anchor .='<li><a href="#anc_sodr_chk">결제상세정보 확인</a></li>
</tr> </tr>
<tr> <tr>
<th scope="row"><label for="od_b_hp"><span class="sound_only">받으시는 분 </span>핸드폰</label></th> <th scope="row"><label for="od_b_hp"><span class="sound_only">받으시는 분 </span>핸드폰</label></th>
<td><input type="text" name="od_b_hp" value="<?php echo $od['od_b_hp']; ?>" id=-"od_b_hp" class="frm_input required"></td> <td><input type="text" name="od_b_hp" value="<?php echo $od['od_b_hp']; ?>" id="od_b_hp" class="frm_input required"></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><span class="sound_only">받으시는 분 </span>주소</th> <th scope="row"><span class="sound_only">받으시는 분 </span>주소</th>

4
adm/shop_admin/personalpaycopy.php
View File

@ -16,8 +16,8 @@ if(!$row['pp_id'])
<form name="fpersonalpaycopy" method="post" action="./personalpaycopyupdate.php" onsubmit="return form_check(this);"> <form name="fpersonalpaycopy" method="post" action="./personalpaycopyupdate.php" onsubmit="return form_check(this);">
<input type="hidden" name="pp_id" value="<?php echo $pp_id; ?>"> <input type="hidden" name="pp_id" value="<?php echo $pp_id; ?>">
<div class="cbox"> <div class="new_win">
<h1>개인결제 복사</h1> <h1 id="new_win_title">개인결제 복사</h1>
<table class="frm_tbl"> <table class="frm_tbl">
<tbody> <tbody>

16
adm/shop_admin/personalpayform.php
View File

@ -19,7 +19,9 @@ else
$pp['pp_use'] = 1; $pp['pp_use'] = 1;
} }
if($popup == 'yes') { $wrp_tag_st = '';
$wrp_tag_end = '';
if($popup == 'yes') { // 팝업창일 때
include_once(G4_PATH.'/head.sub.php'); include_once(G4_PATH.'/head.sub.php');
$pp['od_id'] = $od_id; $pp['od_id'] = $od_id;
$sql = " select od_id, od_name, (od_temp_amount - od_receipt_amount) as misu $sql = " select od_id, od_name, (od_temp_amount - od_receipt_amount) as misu
@ -34,9 +36,14 @@ if($popup == 'yes') {
if($od['misu'] > 0) if($od['misu'] > 0)
$pp['pp_amount'] = $od['misu']; $pp['pp_amount'] = $od['misu'];
$wrp_tag_st = '<div class="new_win">'.PHP_EOL.'<h1 id="new_win_title">'.$html_title.'</h1>';
$wrp_tag_end = '</div>';
} }
else else { // 현재페이지일 때
include_once (G4_ADMIN_PATH.'/admin.head.php'); include_once (G4_ADMIN_PATH.'/admin.head.php');
$wrp_tag_st = '<section class="cbox">'.PHP_EOL.'<h2>'.$html_title.'</h2>';
$wrp_tag_end = '</section>';
}
?> ?>
<form name="fpersonalpayform" action="./personalpayformupdate.php" method="post" onsubmit="return form_check(this);"> <form name="fpersonalpayform" action="./personalpayformupdate.php" method="post" onsubmit="return form_check(this);">
<input type="hidden" name="w" value="<?php echo $w; ?>"> <input type="hidden" name="w" value="<?php echo $w; ?>">
@ -48,8 +55,7 @@ else
<input type="hidden" name="page" value="<?php echo $page; ?>"> <input type="hidden" name="page" value="<?php echo $page; ?>">
<input type="hidden" name="popup" value="<?php echo $popup; ?>"> <input type="hidden" name="popup" value="<?php echo $popup; ?>">
<section class="cbox"> <?php echo $wrp_tag_st; ?>
<h2><?php echo $html_title; ?></h2>
<table class="frm_tbl"> <table class="frm_tbl">
<colgroup> <colgroup>
<col class="grid_3"> <col class="grid_3">
@ -126,7 +132,7 @@ else
<a href="./personalpayformupdate.php?w=d&amp;pp_id=<?php echo $pp['pp_id']; ?>" onclick="return del_confirm();">삭제</a> <a href="./personalpayformupdate.php?w=d&amp;pp_id=<?php echo $pp['pp_id']; ?>" onclick="return del_confirm();">삭제</a>
<?php } ?> <?php } ?>
</div> </div>
</section> <?php echo $wrp_tag_end; ?>
</form> </form>
<script> <script>

14
adm/shop_admin/personalpaylist.php
View File

@ -95,7 +95,7 @@ $colspan = 8;
<input type="hidden" name="page" value="<?php echo $page; ?>"> <input type="hidden" name="page" value="<?php echo $page; ?>">
<input type="hidden" name="token" value="<?php echo $token; ?>"> <input type="hidden" name="token" value="<?php echo $token; ?>">
<table class="tbl_pt_list"> <table>
<thead> <thead>
<tr> <tr>
<th scope="col"> <th scope="col">
@ -128,12 +128,12 @@ $colspan = 8;
<input type="checkbox" id="chk_<?php echo $i; ?>" name="chk[]" value="<?php echo $i; ?>" title="내역선택"> <input type="checkbox" id="chk_<?php echo $i; ?>" name="chk[]" value="<?php echo $i; ?>" title="내역선택">
</td> </td>
<td class="spp_list_name"><?php echo $row['pp_name']; ?></td> <td class="spp_list_name"><?php echo $row['pp_name']; ?></td>
<td class="spp_list_id"><?php echo $od_id; ?></td> <td class="td_odrnum3 spp_list_id"><?php echo $od_id; ?></td>
<td><?php echo number_format($row['pp_amount']); ?></td> <td class="td_bignum"><?php echo number_format($row['pp_amount']); ?></td>
<td class="td_name"><?php echo number_format($row['pp_receipt_amount']); ?></td> <td class="td_bignum"><?php echo number_format($row['pp_receipt_amount']); ?></td>
<td class="td_name"><?php echo number_format($row['pp_amount'] - $row['pp_receipt_amount']); ?></td> <td class="td_bignum"><?php echo number_format($row['pp_amount'] - $row['pp_receipt_amount']); ?></td>
<td class="td_time"><?php echo $row['pp_settle_case']; ?></td> <td class="td_payby"><?php echo $row['pp_settle_case']; ?></td>
<td><?php echo is_null_time($row['pp_receipt_time']) ? '' : substr($row['pp_receipt_time'], 2, 8); ?></td> <td class="td_date"><?php echo is_null_time($row['pp_receipt_time']) ? '' : substr($row['pp_receipt_time'], 2, 8); ?></td>
<td class="td_boolean"><?php echo $row['pp_use'] ? '예' : '아니오'; ?></td> <td class="td_boolean"><?php echo $row['pp_use'] ? '예' : '아니오'; ?></td>
<td class="td_smallmng"> <td class="td_smallmng">
<a href="./personalpayform.php?w=u&amp;pp_id=<?php echo $row['pp_id']; ?>&amp;<?php echo $qstr; ?>"><span class="sound_only"><?php echo $row['pp_id']; ?> </span>수정</a> <a href="./personalpayform.php?w=u&amp;pp_id=<?php echo $row['pp_id']; ?>&amp;<?php echo $qstr; ?>"><span class="sound_only"><?php echo $row['pp_id']; ?> </span>수정</a>

6
css/admin.css
View File

@ -382,12 +382,12 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
/* 버튼 */ /* 버튼 */
.btn_confirm {clear:both;margin-bottom:20px;text-align:center} .btn_confirm {clear:both;margin-bottom:20px;text-align:center}
.btn_confirm button {padding:0 15px;height:30px;border:0;background:#617d46;color:#fff;line-height:2.2em;vertical-align:middle} .btn_confirm button {padding:0 15px;height:30px;border:0;background:#617d46;color:#fff;line-height:2.2em;vertical-align:middle;cursor:pointer}
.btn_confirm button:focus {padding:0 15px;height:30px;background:#555;color:#fff;line-height:2.2em;vertical-align:middle} .btn_confirm button:focus {padding:0 15px;height:30px;background:#555;color:#fff;line-height:2.2em;vertical-align:middle}
.btn_confirm .btn_submit {background:#ff3061} .btn_confirm .btn_submit {background:#ff3061}
.btn_confirm a {display:inline-block;padding:0 15px;height:30px;background:#617d46;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle} .btn_confirm a {display:inline-block;padding:0 15px;height:30px;background:#617d46;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle}
.btn_confirm a:focus {background:#555} .btn_confirm a:focus {background:#555}
.btn_submit {padding:0 15px;height:30px;border:0;background:#ff3061;color:#fff;line-height:2.5em;vertical-align:middle} .btn_submit {padding:0 15px;height:30px;border:0;background:#ff3061;color:#fff;line-height:2.5em;vertical-align:middle;cursor:pointer}
.btn_submit:focus {padding:0 15px;height:30px;border:0;background:#555;color:#fff;line-height:2.5em;vertical-align:middle} .btn_submit:focus {padding:0 15px;height:30px;border:0;background:#555;color:#fff;line-height:2.5em;vertical-align:middle}
.btn_cancel {display:inline-block;padding:0 15px;height:30px;border:0;background:#617d46;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle} .btn_cancel {display:inline-block;padding:0 15px;height:30px;border:0;background:#617d46;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle}
fieldset .btn_submit {height:21px;background:#383a3f;line-height:1.7em} fieldset .btn_submit {height:21px;background:#383a3f;line-height:1.7em}
@ -607,6 +607,8 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
.new_win {} .new_win {}
.new_win h1 {margin-bottom:20px;padding:0 20px;height:60px;border-top:2px solid #484848;border-bottom:1px solid #e9e9e9;background:#fff;font-size:1.2em;line-height:5em} .new_win h1 {margin-bottom:20px;padding:0 20px;height:60px;border-top:2px solid #484848;border-bottom:1px solid #e9e9e9;background:#fff;font-size:1.2em;line-height:5em}
.new_win table {margin:0 auto 20px;width:93%;background:#fff} .new_win table {margin:0 auto 20px;width:93%;background:#fff}
.new_win th {padding:7px 13px;border:1px solid #e9e9e9;border-left:0;background:#efefef;text-align:left}
.new_win td {border-top:1px solid #e9e9e9}
.new_win_ul {margin:-20px 0 20px 0;padding:0 0 0 20px;border-bottom:1px solid #515151;background:#484848;list-style:none;zoom:1} .new_win_ul {margin:-20px 0 20px 0;padding:0 0 0 20px;border-bottom:1px solid #515151;background:#484848;list-style:none;zoom:1}
.new_win_ul:after {display:block;visibility:hidden;clear:both;content:""} .new_win_ul:after {display:block;visibility:hidden;clear:both;content:""}
.new_win_ul li {float:left;margin-left:-1px} .new_win_ul li {float:left;margin-left:-1px}

1
css/default_shop.css
View File

@ -674,6 +674,7 @@ td.empty_table {padding:85px 0;text-align:center}
#sod_frm #od_memo {height:50px} #sod_frm #od_memo {height:50px}
#sod_frm_pay {position:relative} #sod_frm_pay {position:relative}
#sod_frm_pay h2 {margin:0 0 10px}
#sod_frm_pay .basic_tbl th {width:auto !important;font-weight:bold;text-align:center !important} #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 .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}

3
css/mobile_shop.css
View File

@ -54,7 +54,7 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none}
/* ########## 쇼핑몰 컨텐츠 ########## */ /* ########## 쇼핑몰 컨텐츠 ########## */
/* 인덱스 이미지 출력 */ /* 인덱스 이미지 출력 */
#sidx {padding:1em} #sidx {padding:0}
/* 상품 목록 */ /* 상품 목록 */
#sct {} #sct {}
@ -114,6 +114,7 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none}
.sct:after {display:block;visibility:hidden;clear:both;content:""} .sct:after {display:block;visibility:hidden;clear:both;content:""}
.sct_li {position:relative} .sct_li {position:relative}
.sct_noitem {padding:100px 0;text-align:center} .sct_noitem {padding:100px 0;text-align:center}
.sct_nofile {padding:100px 0;text-align:center}
/* 상품 목록 스킨 10 */ /* 상품 목록 스킨 10 */
.sct_10 {padding:1em 0 0} .sct_10 {padding:1em 0 0}

2
mobile/shop/personalpay.php
View File

@ -51,7 +51,7 @@ include_once(G4_MSHOP_PATH.'/_head.php');
if ($i==0) if ($i==0)
{ {
echo '<div><p class="sct_noitem">등록된 개인결제가 없습니다.</p></div>'; echo '<p class="sct_noitem">등록된 개인결제가 없습니다.</p>';
} }
?> ?>

4
mobile/shop/personalpayresult.php
View File

@ -18,7 +18,7 @@ include_once(G4_MSHOP_PATH.'/_head.php');
<p>개인결제번호 <strong><?php echo $pp_id; ?></strong></p> <p>개인결제번호 <strong><?php echo $pp_id; ?></strong></p>
<div id="sod_fin_view"> <section id="sod_fin_view">
<h2>결제 정보</h2> <h2>결제 정보</h2>
<?php <?php
$misu = true; $misu = true;
@ -145,7 +145,7 @@ include_once(G4_MSHOP_PATH.'/_head.php');
</tbody> </tbody>
</table> </table>
</section> </section>
</div> </section>
<section id="sod_fin_tot"> <section id="sod_fin_tot">
<h2>결제합계</h2> <h2>결제합계</h2>

2
mobile/skin/shop/basic/personalpay.skin.php
View File

@ -23,7 +23,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
?> ?>
<li class="sct_li<?php echo $sct_last; ?>" style="width:<?php echo $img_width; ?>px"> <li class="sct_li<?php echo $sct_last; ?>" style="width:<?php echo $img_width; ?>px">
<a href="<?php echo $href; ?>" class="sct_a"> <a href="<?php echo $href; ?>" class="sct_a">
<span class="sct_img">개인결제 이미지</span> <span class="sct_img"><img src="<?php echo G4_MSHOP_SKIN_URL; ?>/img/personal.jpg" alt=""></span>
<b><?php echo get_text($row['pp_name']).'님 개인결제'; ?></b> <b><?php echo get_text($row['pp_name']).'님 개인결제'; ?></b>
<span class="sct_cost"><?php echo display_price($row['pp_amount']); ?></span> <span class="sct_cost"><?php echo display_price($row['pp_amount']); ?></span>
</a> </a>

2
shop/personalpay.php
View File

@ -57,7 +57,7 @@ include_once('./_head.php');
if ($i==0) if ($i==0)
{ {
echo '<div><p class="sct_noitem">등록된 개인결제가 없습니다.</p></div>'; echo '<p class="sct_noitem">등록된 개인결제가 없습니다.</p>';
} }
?> ?>

2
shop/personalpayform.php
View File

@ -436,7 +436,7 @@ function get_intall_file()
<div id="display_pay_button" class="btn_confirm" style="display:none"> <div id="display_pay_button" class="btn_confirm" style="display:none">
<input type="submit" value="결제하기" class="btn_submit"> <input type="submit" value="결제하기" class="btn_submit">
<a href="javascript:history.go(-1);" class="btn01">취소</a> <a href="javascript:history.go(-1);" class="btn_cancel">취소</a>
</div> </div>
</form> </form>

4
shop/personalpayresult.php
View File

@ -31,7 +31,7 @@ if(openwin != null) {
<p>개인결제번호 <strong><?php echo $pp_id; ?></strong></p> <p>개인결제번호 <strong><?php echo $pp_id; ?></strong></p>
<div id="sod_fin_view"> <section id="sod_fin_view">
<h2>결제 정보</h2> <h2>결제 정보</h2>
<?php <?php
$misu = true; $misu = true;
@ -158,7 +158,7 @@ if(openwin != null) {
</tbody> </tbody>
</table> </table>
</section> </section>
</div> </section>
<section id="sod_fin_tot"> <section id="sod_fin_tot">
<h2>결제합계</h2> <h2>결제합계</h2>

2
skin/shop/basic/personalpay.skin.php
View File

@ -22,7 +22,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
?> ?>
<li class="sct_li<?php echo $sct_last; ?>" style="width:<?php echo $img_width; ?>px"> <li class="sct_li<?php echo $sct_last; ?>" style="width:<?php echo $img_width; ?>px">
<a href="<?php echo $href; ?>" class="sct_a"> <a href="<?php echo $href; ?>" class="sct_a">
<span class="sct_img">개인결제 이미지</span> <span class="sct_img"><img src="<?php echo G4_SHOP_SKIN_URL; ?>/img/personal.jpg" alt=""></span>
<b><?php echo get_text($row['pp_name']).'님 개인결제'; ?></b> <b><?php echo get_text($row['pp_name']).'님 개인결제'; ?></b>
<span class="sct_cost"><?php echo display_price($row['pp_amount']); ?></span> <span class="sct_cost"><?php echo display_price($row['pp_amount']); ?></span>
</a> </a>