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

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

Browse Source 
Conflicts:
	shop/search.php
This commit is contained in:
gnuboard
2013-11-08 18:08:24 +09:00
parent 02fc807576 f13964c6ec
commit 9ea339a648
27 changed files with 187 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
shop/kcp/pp_cli_hub.php
View File

@ -30,6 +30,7 @@ if ($row['cnt']) {
if ($default['de_card_test']) {
$default['de_kcp_mid'] = 'T0000';
$default['de_kcp_site_key'] = '3grptw1.zW0GSo4PQdaGvsF__';
}
if ($default['de_kcp_mid'] == 'T0000') {
@ -52,6 +53,7 @@ if ($row['cnt']) {
$g_conf_user_type = "PGNW"; // 변경 불가
//$g_conf_site_id = $default[de_kcp_mid]; // 리얼 반영시 KCP에 발급된 site_cd 사용 ex) T0000
$g_conf_site_id = strlen($default['de_kcp_mid']) == 3 ? "SR".$default['de_kcp_mid'] : $default['de_kcp_mid']; // 리얼 반영시 KCP에 발급된 site_cd 사용 ex) T0000
$g_conf_site_key = $default['de_kcp_site_key'];
/* ============================================================================== */
/* ============================================================================== */
@ -187,7 +189,7 @@ if ($row['cnt']) {
if ( strlen($tx_cd) > 0 )
{
$c_PayPlus->mf_do_tx( "", $g_conf_home_dir, $g_conf_site_id,
"", $tx_cd, "",
$g_conf_site_key, $tx_cd, "",
$g_conf_pa_url, $g_conf_pa_port, "payplus_cli_slib",
$ordr_idxx, $cust_ip, $g_conf_log_level,
"", $g_conf_tx_mode );
@ -227,15 +229,20 @@ if ($row['cnt']) {
/* = -------------------------------------------------------------------------- = */
$bSucc = ""; // DB 작업 실패일 경우 "false" 로 세팅
// 결과값 serialize
$cash = array();
$cash['receipt_no'] = $receipt_no;
$cash['app_time'] = $app_time;
$cash['reg_stat'] = $reg_stat;
$cash['reg_desc'] = iconv("cp949", "utf-8", $reg_desc);
$cash['tr_code'] = $tr_code;
$cash['id_info'] = $id_info;
$cash_info = serialize($cash);
$sql = " update {$g5['g5_shop_order_table']}
set od_cash_no = '$cash_no',
od_cash_receipt_no = '$receipt_no',
od_cash_app_time = '$app_time',
od_cash_reg_stat = '$reg_stat',
od_cash_reg_desc = '".iconv("cp949", "utf-8", $reg_desc)."',
od_cash_tr_code = '$tr_code',
od_cash_id_info = '$id_info',
od_cash = '1'
set od_cash = '1'
od_cash_no = '$cash_no',
od_cash_info = '$cash_info'
where od_id = '$ordr_idxx' ";
$result = sql_query($sql);
if (!$result) $bSucc = "false";
@ -255,7 +262,7 @@ if ($row['cnt']) {
$c_PayPlus->mf_set_modx_data( "trad_time", $trad_time );
$c_PayPlus->mf_do_tx( "", $g_conf_home_dir, $g_conf_site_id,
"", $tx_cd, "",
$g_conf_site_key, $tx_cd, "",
$g_conf_pa_url, $g_conf_pa_port, "payplus_cli_slib",
$ordr_idxx, $cust_ip, $g_conf_log_level,
"", $g_conf_tx_mode );

6
shop/orderinquiryview.php
View File

@ -127,9 +127,9 @@ if(openwin != null) {
?>
</ul>
<div>
<div id="sod_sts_wrap">
<span class="sound_only">상품 상태 설명</span>
<button type="button" id="sod_sts_explan_open">상태설명보기</button>
<button type="button" id="sod_sts_explan_open" class="btn_frmline">상태설명보기</button>
<div id="sod_sts_explan">
<dl id="sod_fin_legend">
<dt>주문</dt>
@ -143,7 +143,7 @@ if(openwin != null) {
<dt>완료</dt>
<dd>상품 배송이 완료 되었습니다.</dd>
</dl>
<button type="button" id="sod_sts_explan_close">상태설명닫기</button>
<button type="button" id="sod_sts_explan_close" class="btn_frmline">상태설명닫기</button>
</div>
</div>

43
shop/search.php
View File

@ -74,28 +74,51 @@ $total_count = $row['cnt'];
<!-- 검색결과 시작 { -->
<div id="ssch">
<<<<<<< HEAD
=======
>>>>>>> f13964c6ecb1d12f0b922f1ef98f6813242c39ca
<div id="ssch_frm">
<form name="frmdetailsearch" onsubmit="return detail_search_submit(this);">
상세검색 :
<input type="checkbox" name="qname" <?php echo isset($qname)?'checked="checked"':'';?>> 상품명
<input type="checkbox" name="qexplan" <?php echo isset($qexplan)?'checked="checked"':'';?>> 상품설명
<input type="checkbox" name="qid" <?php echo isset($qid)?'checked="checked"':'';?>> 상품코드<br>
상품가격 :
<input type="text" name="qfrom" value="<?php echo $qfrom; ?>" size="10">원 부터
<input type="text" name="qto" value="<?php echo $qto; ?>" size="10">원 까지<br>
검색어 : <input type="text" name="q" value="<?php echo $q; ?>" size="40" maxlength="30">
<input type="submit" value="검색">
<div>
<strong>검색범위</strong>
<input type="checkbox" name="qname" class="frm_input" <?php echo isset($qname)?'checked="checked"':'';?>> 상품명
<input type="checkbox" name="qexplan" class="frm_input" <?php echo isset($qexplan)?'checked="checked"':'';?>> 상품설명
<input type="checkbox" name="qid" class="frm_input" <?php echo isset($qid)?'checked="checked"':'';?>> 상품코드<br>
</div>
<div>
<strong>상품가격</strong>
<input type="text" name="qfrom" value="<?php echo $qfrom; ?>" class="frm_input" size="10">원 부터
<input type="text" name="qto" value="<?php echo $qto; ?>" class="frm_input" size="10">원 까지<br>
</div>
<div>
<strong>검색어</strong>
<input type="text" name="q" value="<?php echo $q; ?>" class="frm_input" size="40" maxlength="30">
<input type="submit" value="검색" class="btn_submit">
</div>
<p>상세검색을 선택하지 않거나, 상품가격을 입력하지 않으면 전체에서 검색합니다.</p>
</form>
</div>
<<<<<<< HEAD
<!-- <div id="ssch_ov">검색어 <strong><?php echo ($q ? stripslashes(get_text($q)) : '없음'); ?></strong> | 검색 결과 <strong><?php echo $total_count; ?></strong>건</div> -->
<a href="#">판매량 많은순</a>
<a href="#">선호도 높은순</a>
<a href="#">사용후기 많은순</a>
<a href="#">최근 등록순</a>
검색 결과 <strong><?php echo $total_count; ?></strong>건
=======
<ul id="ssch_sort">
<li><a href="#" class="btn01">판매량 많은순</a></li>
<li><a href="#" class="btn01">선호도 높은순</a></li>
<li><a href="#" class="btn01">사용후기 많은순</a></li>
<li><a href="#" class="btn01">최근 등록순</a></li>
</ul>
<div id="ssch_ov">
검색 결과 <b><?php echo $total_count; ?></b>건
</div>
</div>
>>>>>>> f13964c6ecb1d12f0b922f1ef98f6813242c39ca
<div>
<?php