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

merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2014-04-04 17:58:48 +09:00
parent b291d21224 b5b90b8024
commit 48b6574ef5
17 changed files with 148 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
css/default_shop.css
View File

@ -378,6 +378,7 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
#sit_opt_added {margin:0;padding:0;border:1px solid #e9e9e9;border-bottom:0;background:#fff;list-style:none} #sit_opt_added {margin:0;padding:0;border:1px solid #e9e9e9;border-bottom:0;background:#fff;list-style:none}
#sit_opt_added li {padding:10px 20px;border-bottom:1px solid #e9e9e9} #sit_opt_added li {padding:10px 20px;border-bottom:1px solid #e9e9e9}
#sit_opt_added li div {margin:5px 0 0;text-align:right} #sit_opt_added li div {margin:5px 0 0;text-align:right}
#sit_opt_added button {margin:0 0 0 1px}
#sod_bsk_list {position:relative} #sod_bsk_list {position:relative}
#sod_bsk_list #mod_option_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:#f2f5f9;overflow-y:scroll;overflow-x:none} #sod_bsk_list #mod_option_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:#f2f5f9;overflow-y:scroll;overflow-x:none}
@ -423,10 +424,14 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
#sod_frm p#sod_frm_pt {margin:10px 0 5px} #sod_frm p#sod_frm_pt {margin:10px 0 5px}
#sod_frm #sod_frm_pt_alert {margin:0 0 10px} #sod_frm #sod_frm_pt_alert {margin:0 0 10px}
#sod_frm #display_pay_process {text-align:center}
#sod_frm #display_pay_process span {display:block;margin:5px 0 0}
#sod_frm_pay {position:relative} #sod_frm_pay {position:relative}
#sod_frm_pay h2 {margin:0 0 10px} #sod_frm_pay h2 {margin:0 0 10px}
#sod_frm_pay .tbl_wrap th {width:auto !important;font-weight:bold;text-align:center !important} #sod_frm_pay .tbl_wrap th {width:auto !important;font-weight:bold;text-align:center !important}
#sod_frm_pay .tbl_wrap 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 .tbl_wrap 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_info {margin:0 0 10px}
#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:#f2f5f9;overflow-y:scroll} #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:#f2f5f9;overflow-y:scroll}
@ -436,12 +441,15 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
#sod_frm_escrow {margin:30px 0 0} #sod_frm_escrow {margin:30px 0 0}
#display_pay_process {padding:20px;text-align:center}
/* 배송지 목록 */ /* 배송지 목록 */
#sod_addr .td_mng button {margin:0;padding:0;border:0;background:transparent} #sod_addr .td_mng button {margin:0;padding:0;border:0;background:transparent}
/* 주문내역 */ /* 주문내역 */
#sod_v {} #sod_v {}
#sod_v .basic_tbl {text-align:center} #sod_v .basic_tbl {text-align:center}
#sod_v_info {margin:0 0 10px}
/* 주문상세내역 */ /* 주문상세내역 */
#sod_fin {} #sod_fin {}
@ -511,6 +519,8 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
#sod_fin_cancelfrm {display:none;margin:10px 0 0} #sod_fin_cancelfrm {display:none;margin:10px 0 0}
#sod_fin_cancelfrm .frm_input {background:#fff} #sod_fin_cancelfrm .frm_input {background:#fff}
#sod_fin_test {padding:10px}
/* 주문상세내역 중 현금영수증 발급 */ /* 주문상세내역 중 현금영수증 발급 */
#scash {} #scash {}
#scash section {padding:10px 0} #scash section {padding:10px 0}

4
css/mobile_shop.css
View File

@ -288,6 +288,7 @@ html.no-overflowscrolling #cp_frm {height:auto;max-height:10000px !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:90%;height:auto !important;height:480px;max-height:480px;border:1px solid #000;background:#f2f5f9;overflow-y:scroll} #sod_frm_pay #sc_coupon_frm, #sod_frm_pay #od_coupon_frm {z-index:10000;position:absolute;top:0;left:0;padding:20px;width:90%;height:auto !important;height:480px;max-height:480px;border:1px solid #000;background:#f2f5f9;overflow-y:scroll}
#sod_frm_pay #od_coupon_frm th {width:auto} #sod_frm_pay #od_coupon_frm th {width:auto}
html.no-overflowscrolling #sc_coupon_frm, html.no-overflowscrolling #od_coupon_frm {height:auto;max-height:10000px !important} /* overflow 미지원 기기 대응 */ html.no-overflowscrolling #sc_coupon_frm, html.no-overflowscrolling #od_coupon_frm {height:auto;max-height:10000px !important} /* overflow 미지원 기기 대응 */
#sod_frm_pay_info {margin:0 0 10px}
#sod_frm_paysel {margin:0 0 15px} #sod_frm_paysel {margin:0 0 15px}
#sod_frm_paysel ul {margin:0;padding:0;border:1px solid #e9e9e9;background:#f2f5f9;list-style:none} #sod_frm_paysel ul {margin:0;padding:0;border:1px solid #e9e9e9;background:#f2f5f9;list-style:none}
@ -325,6 +326,7 @@ html.no-overflowscrolling #sc_coupon_frm, html.no-overflowscrolling #od_coupon_f
/* 주문내역 */ /* 주문내역 */
#sod_v {} #sod_v {}
#sod_v .td_stat {width:100px} #sod_v .td_stat {width:100px}
#sod_v_info {margin:0 0 10px}
/* 주문상세내역 */ /* 주문상세내역 */
#sod_fin {} #sod_fin {}
@ -390,6 +392,8 @@ html.no-overflowscrolling #sc_coupon_frm, html.no-overflowscrolling #od_coupon_f
#sod_fin_cancelfrm {display:none;margin:10px 0 0} #sod_fin_cancelfrm {display:none;margin:10px 0 0}
#sod_fin_cancelfrm .frm_input {background:#fff} #sod_fin_cancelfrm .frm_input {background:#fff}
#sod_fin_test {padding:10px}
/* 주문내역 include */ /* 주문내역 include */
#sod_inquiry {} #sod_inquiry {}
#sod_inquiry ul {margin:0;padding:0;list-style:none} #sod_inquiry ul {margin:0;padding:0;list-style:none}

12
mobile/shop/orderform.php
View File

@ -276,13 +276,13 @@ require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php');
<table> <table>
<tbody> <tbody>
<tr> <tr>
<th scope="row"><label for="od_name">이름</label></th> <th scope="row"><label for="od_name">이름<strong class="sound_only"> 필수</strong></label></th>
<td><input type="text" name="od_name" value="<?php echo $member['mb_name']; ?>" id="od_name" required class="frm_input required" maxlength="20"></td> <td><input type="text" name="od_name" value="<?php echo $member['mb_name']; ?>" id="od_name" required class="frm_input required" maxlength="20"></td>
</tr> </tr>
<?php if (!$is_member) { // 비회원이면 ?> <?php if (!$is_member) { // 비회원이면 ?>
<tr> <tr>
<th scope="row"><label for="od_pwd">비밀번호</label></th> <th scope="row"><label for="od_pwd">비밀번호<strong class="sound_only"> 필수</strong></label></th>
<td> <td>
<input type="password" name="od_pwd" id="od_pwd" required class="frm_input required" maxlength="20"> <input type="password" name="od_pwd" id="od_pwd" required class="frm_input required" maxlength="20">
영,숫자 3~20자 (주문서 조회시 필요) 영,숫자 3~20자 (주문서 조회시 필요)
@ -291,7 +291,7 @@ require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php');
<?php } ?> <?php } ?>
<tr> <tr>
<th scope="row"><label for="od_tel">전화번호</label></th> <th scope="row"><label for="od_tel">전화번호<strong class="sound_only"> 필수</strong></label></th>
<td><input type="text" name="od_tel" value="<?php echo $member['mb_tel']; ?>" id="od_tel" required class="frm_input required" maxlength="20"></td> <td><input type="text" name="od_tel" value="<?php echo $member['mb_tel']; ?>" id="od_tel" required class="frm_input required" maxlength="20"></td>
</tr> </tr>
<tr> <tr>
@ -319,7 +319,7 @@ require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php');
</td> </td>
</tr> </tr>
<tr> <tr>
<th scope="row"><label for="od_email">E-mail</label></th> <th scope="row"><label for="od_email">E-mail<strong class="sound_only"> 필수</strong></label></th>
<td><input type="email" name="od_email" value="<?php echo $member['mb_email']; ?>" id="od_email" required class="frm_input required" maxlength="100"></td> <td><input type="email" name="od_email" value="<?php echo $member['mb_email']; ?>" id="od_email" required class="frm_input required" maxlength="100"></td>
</tr> </tr>
@ -416,11 +416,11 @@ require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php');
} }
?> ?>
<tr> <tr>
<th scope="row"><label for="od_b_name">이름</label></th> <th scope="row"><label for="od_b_name">이름<strong class="sound_only"> 필수</strong></label></th>
<td><input type="text" name="od_b_name" id="od_b_name" required class="frm_input required" maxlength="20"></td> <td><input type="text" name="od_b_name" id="od_b_name" required class="frm_input required" maxlength="20"></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><label for="od_b_tel">전화번호</label></th> <th scope="row"><label for="od_b_tel">전화번호<strong class="sound_only"> 필수</strong></label></th>
<td><input type="text" name="od_b_tel" id="od_b_tel" required class="frm_input required" maxlength="20"></td> <td><input type="text" name="od_b_tel" id="od_b_tel" required class="frm_input required" maxlength="20"></td>
</tr> </tr>
<tr> <tr>

2
mobile/shop/orderinquiry.php
View File

@ -57,7 +57,7 @@ include_once(G5_MSHOP_PATH.'/_head.php');
?> ?>
<div id="sod_v"> <div id="sod_v">
<p>주문서번호 링크를 누르시면 주문상세내역을 조회하실 수 있습니다.</p> <p id="sod_v_info">주문서번호 링크를 누르시면 주문상세내역을 조회하실 수 있습니다.</p>
<?php <?php
$limit = " limit $from_record, $rows "; $limit = " limit $from_record, $rows ";

44
mobile/shop/personalpayresult.php
View File

@ -16,7 +16,7 @@ include_once(G5_MSHOP_PATH.'/_head.php');
<div id="sod_fin"> <div id="sod_fin">
<p>개인결제번호 <strong><?php echo $pp_id; ?></strong></p> <p id="sod_fin_no">개인결제번호 <strong><?php echo $pp_id; ?></strong></p>
<section id="sod_fin_view"> <section id="sod_fin_view">
<h2>결제 정보</h2> <h2>결제 정보</h2>
@ -178,21 +178,39 @@ include_once(G5_MSHOP_PATH.'/_head.php');
preg_match("/(\s[^\s]+\s)/", $pp['pp_bank_account'], $matchs); preg_match("/(\s[^\s]+\s)/", $pp['pp_bank_account'], $matchs);
$deposit_no = trim($matchs[1]); $deposit_no = trim($matchs[1]);
?> ?>
<fieldset>
<legend>모의입금처리</legend>
<p>관리자가 가상계좌 테스트를 한 경우에만 보입니다.</p> <p>관리자가 가상계좌 테스트를 한 경우에만 보입니다.</p>
<div class="tbl_frm01 tbl_wrap">
<form method="post" action="http://devadmin.kcp.co.kr/Modules/Noti/TEST_Vcnt_Noti_Proc.jsp" target="_blank"> <form method="post" action="http://devadmin.kcp.co.kr/Modules/Noti/TEST_Vcnt_Noti_Proc.jsp" target="_blank">
<label for="e_trade_no">KCP 거래번호</label> <table>
<input type="text" name="e_trade_no" value="<?php echo $pp['pp_tno']; ?>"><br /> <caption>모의입금처리</caption>
<label for="deposit_no">입금계좌</label> <colgroup>
<input type="text" name="deposit_no" value="<?php echo $deposit_no; ?>"><br /> <col class="grid_3">
<label for="req_name">입금자명</label> <col>
<input type="text" name="req_name" value="<?php echo $pp['pp_deposit_name']; ?>"><br /> </colgroup>
<label for="noti_url">입금통보 URL</label> <tbody>
<input type="text" name="noti_url" value="<?php echo G5_SHOP_URL; ?>/settle_kcp_common.php"><br /><br /> <tr>
<input type="submit" value="입금통보 테스트"> <th scope="col"><label for="e_trade_no">KCP 거래번호</label></th>
<td><input type="text" name="e_trade_no" value="<?php echo $pp['pp_tno']; ?>"></td>
</tr>
<tr>
<th scope="col"><label for="deposit_no">입금계좌</label></th>
<td><input type="text" name="deposit_no" value="<?php echo $deposit_no; ?>"></td>
</tr>
<tr>
<th scope="col"><label for="req_name">입금자명</label></th>
<td><input type="text" name="req_name" value="<?php echo $pp['pp_deposit_name']; ?>"></td>
</tr>
<tr>
<th scope="col"><label for="noti_url">입금통보 URL</label></th>
<td><input type="text" name="noti_url" value="<?php echo G5_SHOP_URL; ?>/settle_kcp_common.php"></td>
</tr>
</tbody>
</table>
<div id="sod_fin_test" class="btn_confirm">
<input type="submit" value="입금통보 테스트" class="btn_submit">
</div>
</form> </form>
</fieldset> </div>
<?php } ?> <?php } ?>
</div> </div>

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

@ -17,17 +17,15 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
} }
if ($i == 1) { if ($i == 1) {
echo "<ul class=\"sct sct_10\">\n"; echo "<ul class=\"sct sct_pv\">\n";
} }
$href = G5_SHOP_URL.'/personalpayform.php?pp_id='.$row['pp_id'].'&amp;page='.$page; $href = G5_SHOP_URL.'/personalpayform.php?pp_id='.$row['pp_id'].'&amp;page='.$page;
?> ?>
<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"> <div class="sct_img"><a href="<?php echo $href; ?>" class="sct_a"><img src="<?php echo G5_MSHOP_SKIN_URL; ?>/img/personal.jpg" alt=""></a></div>
<span class="sct_img"><img src="<?php echo G5_MSHOP_SKIN_URL; ?>/img/personal.jpg" alt=""></span> <div class="sct_txt"><a href="<?php echo $href; ?>" class="sct_a"><?php echo get_text($row['pp_name']).'님 개인결제'; ?></a></div>
<b><?php echo get_text($row['pp_name']).'님 개인결제'; ?></b> <div class="sct_cost"><?php echo display_price($row['pp_price']); ?></div>
<span class="sct_cost"><?php echo display_price($row['pp_price']); ?></span>
</a>
</li> </li>
<?php <?php
} }

12
mobile/skin/shop/basic/style.css
View File

@ -45,6 +45,18 @@
.scr_10 .sct_cost strike {display:block;margin:0 0 5px;color:#999;font-weight:normal} .scr_10 .sct_cost strike {display:block;margin:0 0 5px;color:#999;font-weight:normal}
.scr_10 .sct_icon {margin:0 0 10px} .scr_10 .sct_icon {margin:0 0 10px}
.scr_10 .sct_sns {margin:15px 0 0} .scr_10 .sct_sns {margin:15px 0 0}
/* 개인결제 목록 */
.sct_pv .sct_li {position:relative;float:left;padding:0 25px 15px 0}
.sct_pv .sct_last {margin:0 0 15px !important}
.sct_pv .sct_clear {clear:both}
.sct_pv .sct_a {display:inline-block;position:relative;margin:0 0 5px;text-decoration:none}
.sct_pv .sct_id {display:block;margin:0 0 5px}
.sct_pv .sct_basic {margin:0 0 10px}
.sct_pv .sct_cost {display:block;margin:0 0 10px;font-weight:bold}
.sct_pv .sct_cost strike {display:block;margin:0 0 5px;color:#999;font-weight:normal}
.sct_pv .sct_icon {margin:0 0 10px}
.sct_pv .sct_sns {margin:15px 0 0}
/* ##### maint.(nn).skin.php, list.(nn).skin.php 공통 적용 끝 ##### */ /* ##### maint.(nn).skin.php, list.(nn).skin.php 공통 적용 끝 ##### */
/* 상품 목록 */ /* 상품 목록 */

BIN
shop/img/loading.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

3
shop/kcp/orderform.3.php
View File

@ -16,5 +16,6 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<a href="javascript:history.go(-1);" class="btn01">취소</a> <a href="javascript:history.go(-1);" class="btn01">취소</a>
</div> </div>
<div id="display_pay_process" style="display:none"> <div id="display_pay_process" style="display:none">
<p>결제 진행 중입니다. 잠시만 기다려 주세요.</p> <img src="<?php echo G5_URL; ?>/shop/img/loading.gif" alt="">
<span>주문완료 중입니다. 잠시만 기다려 주십시오.</span>
</div> </div>

16
shop/kcp/orderform.4.php
View File

@ -7,22 +7,22 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<h2>에스크로 안내</h2> <h2>에스크로 안내</h2>
<form name="escrow_foot" method="post" action="http://admin.kcp.co.kr/Modules/escrow/kcp_pop.jsp"> <form name="escrow_foot" method="post" action="http://admin.kcp.co.kr/Modules/escrow/kcp_pop.jsp">
<input type="hidden" name="site_cd" value="SR<?php echo $default['de_kcp_mid']; ?>"> <input type="hidden" name="site_cd" value="SR<?php echo $default['de_kcp_mid']; ?>">
<table border="0" cellspacing="0" cellpadding="0"> <table>
<tr> <tr>
<td align='center'><img src="<?php echo G5_SHOP_URL; ?>/img/marks_escrow/escrow_foot.gif" width="290" height="92" border="0" usemap="#Map"></td> <td><img src="<?php echo G5_SHOP_URL; ?>/img/marks_escrow/escrow_foot.gif" width="290" height="92" border="0" usemap="#Map"></td>
</tr> </tr>
<tr> <tr>
<td style='line-height:150%;'> <td>
<br>
<strong>에스크로(escrow) 제도란?</strong> <strong>에스크로(escrow) 제도란?</strong>
<br>상거래 시에, 판매자와 구매자의 사이에 신뢰할 수 있는 중립적인 제삼자(여기서는 <a href='http://kcp.co.kr' target='_blank'>KCP</a>)가 중개하여 <p>
상거래 시에, 판매자와 구매자의 사이에 신뢰할 수 있는 중립적인 제삼자(여기서는 <a href='http://kcp.co.kr' target='_blank'>KCP</a>)가 중개하여
금전 또는 물품을 거래를 하도록 하는 것, 또는 그러한 서비스를 말한다. 거래의 안전성을 확보하기 위해 이용된다. 금전 또는 물품을 거래를 하도록 하는 것, 또는 그러한 서비스를 말한다. 거래의 안전성을 확보하기 위해 이용된다.
(2006.4.1 전자상거래 소비자보호법에 따른 의무 시행) (2006.4.1 전자상거래 소비자보호법에 따른 의무 시행)
<br><br> </p>
<p>
현금 거래에만 해당(에스크로 결제를 선택했을 경우에만 해당)되며, 현금 거래에만 해당(에스크로 결제를 선택했을 경우에만 해당)되며,
신용카드로 구매하는 거래, 배송이 필요하지 않은 재화 등을 구매하는 거래(컨텐츠 등)에는 해당되지 않는다. 신용카드로 구매하는 거래, 배송이 필요하지 않은 재화 등을 구매하는 거래(컨텐츠 등)에는 해당되지 않는다.
<br> </p>
<br>
</td> </td>
</tr> </tr>
</table> </table>

3
shop/lg/orderform.3.php
View File

@ -7,5 +7,6 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<a href="javascript:history.go(-1);" class="btn01">취소</a> <a href="javascript:history.go(-1);" class="btn01">취소</a>
</div> </div>
<div id="display_pay_process" style="display:none"> <div id="display_pay_process" style="display:none">
<p>결제 진행 중입니다. 잠시만 기다려 주세요.</p> <img src="<?php echo G5_URL; ?>/shop/img/loading.gif" alt="">
<span>주문완료 중입니다. 잠시만 기다려 주십시오.</span>
</div> </div>

10
shop/orderform.php
View File

@ -286,7 +286,7 @@ require_once('./'.$default['de_pg_service'].'/orderform.1.php');
<table> <table>
<tbody> <tbody>
<tr> <tr>
<th scope="row"><label for="od_name">이름</label></th> <th scope="row"><label for="od_name">이름<strong class="sound_only"> 필수</strong></label></th>
<td><input type="text" name="od_name" value="<?php echo $member['mb_name']; ?>" id="od_name" required class="frm_input required" maxlength="20"></td> <td><input type="text" name="od_name" value="<?php echo $member['mb_name']; ?>" id="od_name" required class="frm_input required" maxlength="20"></td>
</tr> </tr>
@ -301,7 +301,7 @@ require_once('./'.$default['de_pg_service'].'/orderform.1.php');
<?php } ?> <?php } ?>
<tr> <tr>
<th scope="row"><label for="od_tel">전화번호</label></th> <th scope="row"><label for="od_tel">전화번호<strong class="sound_only"> 필수</strong></label></th>
<td><input type="text" name="od_tel" value="<?php echo $member['mb_tel']; ?>" id="od_tel" required class="frm_input required" maxlength="20"></td> <td><input type="text" name="od_tel" value="<?php echo $member['mb_tel']; ?>" id="od_tel" required class="frm_input required" maxlength="20"></td>
</tr> </tr>
<tr> <tr>
@ -329,7 +329,7 @@ require_once('./'.$default['de_pg_service'].'/orderform.1.php');
</td> </td>
</tr> </tr>
<tr> <tr>
<th scope="row"><label for="od_email">E-mail</label></th> <th scope="row"><label for="od_email">E-mail<strong class="sound_only"> 필수</strong></label></th>
<td><input type="text" name="od_email" value="<?php echo $member['mb_email']; ?>" id="od_email" required class="frm_input required" size="35" maxlength="100"></td> <td><input type="text" name="od_email" value="<?php echo $member['mb_email']; ?>" id="od_email" required class="frm_input required" size="35" maxlength="100"></td>
</tr> </tr>
@ -426,11 +426,11 @@ require_once('./'.$default['de_pg_service'].'/orderform.1.php');
</tr> </tr>
<?php } ?> <?php } ?>
<tr> <tr>
<th scope="row"><label for="od_b_name">이름</label></th> <th scope="row"><label for="od_b_name">이름<strong class="sound_only"> 필수</strong></label></th>
<td><input type="text" name="od_b_name" id="od_b_name" required class="frm_input required" maxlength="20"></td> <td><input type="text" name="od_b_name" id="od_b_name" required class="frm_input required" maxlength="20"></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><label for="od_b_tel">전화번호</label></th> <th scope="row"><label for="od_b_tel">전화번호<strong class="sound_only"> 필수</strong></label></th>
<td><input type="text" name="od_b_tel" id="od_b_tel" required class="frm_input required" maxlength="20"></td> <td><input type="text" name="od_b_tel" id="od_b_tel" required class="frm_input required" maxlength="20"></td>
</tr> </tr>
<tr> <tr>

2
shop/orderinquiry.php
View File

@ -63,7 +63,7 @@ include_once('./_head.php');
<!-- 주문 내역 시작 { --> <!-- 주문 내역 시작 { -->
<div id="sod_v"> <div id="sod_v">
<p>주문서번호 링크를 누르시면 주문상세내역을 조회하실 수 있습니다.</p> <p id="sod_v_info">주문서번호 링크를 누르시면 주문상세내역을 조회하실 수 있습니다.</p>
<?php <?php
$limit = " limit $from_record, $rows "; $limit = " limit $from_record, $rows ";

2
shop/personalpayform.php
View File

@ -84,7 +84,7 @@ require_once('./'.$default['de_pg_service'].'/orderform.1.php');
<?php <?php
if (!$default['de_card_point']) if (!$default['de_card_point'])
echo '<p><strong>무통장입금</strong> 이외의 결제 수단으로 결제하시는 경우 포인트를 적립해드리지 않습니다.</p>'; echo '<p id="sod_frm_pay_info"><strong>무통장입금</strong> 이외의 결제 수단으로 결제하시는 경우 포인트를 적립해드리지 않습니다.</p>';
$multi_settle == 0; $multi_settle == 0;
$checked = ''; $checked = '';

46
shop/personalpayresult.php
View File

@ -22,7 +22,7 @@ include_once('./_head.php');
<!-- 주문상세내역 시작 { --> <!-- 주문상세내역 시작 { -->
<div id="sod_fin"> <div id="sod_fin">
<p>개인결제번호 <strong><?php echo $pp_id; ?></strong></p> <p id="sod_fin_no">개인결제번호 <strong><?php echo $pp_id; ?></strong></p>
<section id="sod_fin_view"> <section id="sod_fin_view">
<h2>결제 정보</h2> <h2>결제 정보</h2>
@ -184,21 +184,39 @@ include_once('./_head.php');
preg_match("/(\s[^\s]+\s)/", $pp['pp_bank_account'], $matchs); preg_match("/(\s[^\s]+\s)/", $pp['pp_bank_account'], $matchs);
$deposit_no = trim($matchs[1]); $deposit_no = trim($matchs[1]);
?> ?>
<fieldset> <div class="tbl_frm01 tbl_wrap">
<legend>모의입금처리</legend>
<p>관리자가 가상계좌 테스트를 한 경우에만 보입니다.</p>
<form method="post" action="http://devadmin.kcp.co.kr/Modules/Noti/TEST_Vcnt_Noti_Proc.jsp" target="_blank"> <form method="post" action="http://devadmin.kcp.co.kr/Modules/Noti/TEST_Vcnt_Noti_Proc.jsp" target="_blank">
<label for="e_trade_no">KCP 거래번호</label> <p>관리자가 가상계좌 테스트를 한 경우에만 보입니다.</p>
<input type="text" name="e_trade_no" value="<?php echo $pp['pp_tno']; ?>" size="80"><br /> <table>
<label for="deposit_no">입금계좌</label> <caption>모의입금처리</caption>
<input type="text" name="deposit_no" value="<?php echo $deposit_no; ?>" size="80"><br /> <colgroup>
<label for="req_name">입금자명</label> <col class="grid_3">
<input type="text" name="req_name" value="<?php echo $pp['pp_deposit_name']; ?>" size="80"><br /> <col>
<label for="noti_url">입금통보 URL</label> </colgroup>
<input type="text" name="noti_url" value="<?php echo G5_SHOP_URL; ?>/settle_kcp_common.php" size="80"><br /><br /> <tbody>
<input type="submit" value="입금통보 테스트"> <tr>
<th scope="col"><label for="e_trade_no">KCP 거래번호</label></th>
<td><input type="text" name="e_trade_no" value="<?php echo $pp['pp_tno']; ?>" size="80"></td>
</tr>
<tr>
<th scope="col"><label for="deposit_no">입금계좌</label></th>
<td><input type="text" name="deposit_no" value="<?php echo $deposit_no; ?>" size="80"></td>
</tr>
<tr>
<th scope="col"><label for="req_name">입금자명</label></th>
<td><input type="text" name="req_name" value="<?php echo $pp['pp_deposit_name']; ?>" size="80"></td>
</tr>
<tr>
<th scope="col"><label for="noti_url">입금통보 URL</label></th>
<td><input type="text" name="noti_url" value="<?php echo G5_SHOP_URL; ?>/settle_kcp_common.php" size="80"></td>
</tr>
</tbody>
</table>
<div id="sod_fin_test" class="btn_confirm">
<input type="submit" value="입금통보 테스트" class="btn_submit">
</div>
</form> </form>
</fieldset> </div>
<?php } ?> <?php } ?>
</div> </div>

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

@ -16,17 +16,15 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
} }
if ($i == 1) { if ($i == 1) {
echo "<ul class=\"sct sct_10\">\n"; echo "<ul class=\"sct sct_pv\">\n";
} }
$href = G5_SHOP_URL.'/personalpayform.php?pp_id='.$row['pp_id'].'&amp;page='.$page; $href = G5_SHOP_URL.'/personalpayform.php?pp_id='.$row['pp_id'].'&amp;page='.$page;
?> ?>
<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"> <div class="sct_img"><a href="<?php echo $href; ?>" class="sct_a"><img src="<?php echo G5_SHOP_SKIN_URL; ?>/img/personal.jpg" alt=""></a></div>
<span class="sct_img"><img src="<?php echo G5_SHOP_SKIN_URL; ?>/img/personal.jpg" alt=""></span> <div class="sct_txt"><a href="<?php echo $href; ?>" class="sct_a"><?php echo get_text($row['pp_name']).'님 개인결제'; ?></a></div>
<b><?php echo get_text($row['pp_name']).'님 개인결제'; ?></b> <div class="sct_cost"><?php echo display_price($row['pp_price']); ?></div>
<span class="sct_cost"><?php echo display_price($row['pp_price']); ?></span>
</a>
</li> </li>
<?php <?php
} }

17
skin/shop/basic/style.css
View File

@ -13,7 +13,7 @@
.gnb_2dul {display:none;z-index:1000;position:absolute;border:1px solid #787f89} .gnb_2dul {display:none;z-index:1000;position:absolute;border:1px solid #787f89}
.gnb_1dli_over .gnb_2dul, .gnb_1dli_over2 .gnb_2dul {display:block;top:0;left:127px;width:130px;background:#fff} .gnb_1dli_over .gnb_2dul, .gnb_1dli_over2 .gnb_2dul {display:block;top:0;left:127px;width:130px;background:#fff}
.gnb_2da {display:none} .gnb_2da {display:none}
.gnb_1dli_over .gnb_2da {display:block;padding:0 10px;height:33px;border-bottom:1px solid #e9e9e9;line-height:2.9em !important;line-height:2.6em} .gnb_1dli_over .gnb_2da {display:block;padding:10px;border-bottom:1px solid #e9e9e9}
.gnb_2da:focus, .gnb_2da:hover {background:#f2f5f9;text-decoration:none} .gnb_2da:focus, .gnb_2da:hover {background:#f2f5f9;text-decoration:none}
/* 오늘 본 상품 */ /* 오늘 본 상품 */
@ -184,6 +184,21 @@
.sct_40 .sct_rel_li {float:left;margin:0 0 0 10px} .sct_40 .sct_rel_li {float:left;margin:0 0 0 10px}
.sct_40 .sct_sns {padding:10px 0 0} .sct_40 .sct_sns {padding:10px 0 0}
/* 개인결제 목록 */
.sct_pv .sct_li {position:relative;float:left;margin:0 25px 15px 0}
.sct_pv .sct_last {margin:0 0 15px !important}
.sct_pv .sct_clear {clear:both}
.sct_pv .sct_a {display:inline-block;position:relative;text-decoration:none}
.sct_pv .sct_a:focus, .sct_pv .sct_a:hover {text-decoration:none}
.sct_pv .sct_img {margin:0 0 10px}
.sct_pv .sct_txt {margin:0 0 5px}
.sct_pv .sct_icon {margin:0 0 10px}
.sct_pv .sct_id {display:block;margin:0 0 5px}
.sct_pv .sct_basic {margin:0 0 10px}
.sct_pv .sct_cost {display:block;margin:0 0 10px;font-weight:bold}
.sct_pv .sct_cost strike {display:block;margin:0 0 5px;color:#999;font-weight:normal}
.sct_pv .sct_sns {}
/* 메인 상품 목록 스킨 20 */ /* 메인 상품 목록 스킨 20 */
.smt_20 {position:relative;overflow-y:hidden} .smt_20 {position:relative;overflow-y:hidden}
.smt_20 .sct_ul {position:absolute;top:0;left:0;margin:0;padding:0;list-style:none} .smt_20 .sct_ul {position:absolute;top:0;left:0;margin:0;padding:0;list-style:none}