From 1b03e331f80352abcabad622c342f244372877bc Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 7 Sep 2015 12:09:07 +0900 Subject: [PATCH] =?UTF-8?q?PG=EC=82=AC=20=EA=B0=84=ED=8E=B8=EA=B2=B0?= =?UTF-8?q?=EC=A0=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/configform.php | 16 ++++++ adm/shop_admin/configformupdate.php | 1 + css/default_shop.css | 4 ++ css/mobile_shop.css | 4 ++ img/kpay_logo.png | Bin 0 -> 1520 bytes img/payco_logo.png | Bin 0 -> 711 bytes img/paynow_logo.png | Bin 0 -> 679 bytes install/gnuboard5shop.sql | 1 + mobile/shop/inicis/settle_common.php | 37 +++++++------- mobile/shop/kcp/order_approval_form.php | 8 +++ mobile/shop/kcp/orderform.1.php | 1 + mobile/shop/lg/orderform.1.php | 1 + mobile/shop/lg/xpay_approval.php | 2 + mobile/shop/orderform.php | 43 +++++++++++++--- mobile/shop/orderformupdate.php | 26 ++++++++++ mobile/shop/orderinquiryview.php | 21 +++++++- mobile/shop/settle_kcp.inc.php | 6 +++ shop/inicis/orderform.1.php | 2 +- shop/inicis/orderform.3.php | 2 +- shop/kcp/orderform.1.php | 2 +- shop/kcp/orderform.2.php | 2 + shop/kcp/orderform.3.php | 4 +- shop/kcp/orderform.5.php | 2 +- shop/lg/orderform.1.php | 2 +- shop/lg/orderform.2.php | 1 + shop/lg/orderform.3.php | 2 +- shop/orderform.php | 63 +++++++++++++++++++++--- shop/orderformupdate.php | 26 ++++++++++ shop/orderinquiryview.php | 19 ++++++- shop/settle_kcp.inc.php | 6 +++ theme/basic/css/default_shop.css | 4 ++ theme/basic/css/mobile_shop.css | 5 ++ 32 files changed, 271 insertions(+), 42 deletions(-) create mode 100644 img/kpay_logo.png create mode 100644 img/payco_logo.png create mode 100644 img/paynow_logo.png diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php index 5a94568d7..f7fc04b03 100644 --- a/adm/shop_admin/configform.php +++ b/adm/shop_admin/configform.php @@ -96,6 +96,12 @@ if(!isset($default['de_mobile_search_list_row'])) { sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}` ADD `de_mobile_search_list_row` int(11) NOT NULL DEFAULT '0' AFTER `de_mobile_search_list_mod` ", true); } + +// PG 간펼결제 사용여부 필드 추가 +if(!isset($default['de_easy_pay_use'])) { + sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}` + ADD `de_easy_pay_use` tinyint(4) NOT NULL DEFAULT '0' AFTER `de_iche_use` ", true); +} ?>
@@ -542,6 +548,16 @@ if(!isset($default['de_mobile_search_list_row'])) { + + + + + + + diff --git a/adm/shop_admin/configformupdate.php b/adm/shop_admin/configformupdate.php index 286165603..e49547b47 100644 --- a/adm/shop_admin/configformupdate.php +++ b/adm/shop_admin/configformupdate.php @@ -127,6 +127,7 @@ $sql = " update {$g5['g5_shop_default_table']} de_bank_account = '{$_POST['de_bank_account']}', de_card_test = '{$_POST['de_card_test']}', de_card_use = '{$_POST['de_card_use']}', + de_easy_pay_use = '{$_POST['de_easy_pay_use']}', de_card_noint_use = '{$_POST['de_card_noint_use']}', de_card_point = '{$_POST['de_card_point']}', de_settle_min_point = '{$_POST['de_settle_min_point']}', diff --git a/css/default_shop.css b/css/default_shop.css index ba2f13246..2a0ae3b99 100644 --- a/css/default_shop.css +++ b/css/default_shop.css @@ -390,6 +390,10 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none} #sod_frm_paysel {margin:0 0 20px;padding:10px;border:1px solid #e9e9e9;background:#f2f5f9;text-align:center} #sod_frm_paysel legend {position:absolute;font-size:0;line-height:0;overflow:hidden} +#sod_frm_paysel .KPAY{background:url('../img/kpay_logo.png') no-repeat;padding-left:37px;display:inline-block} +#sod_frm_paysel .PAYNOW{background:url('../img/paynow_logo.png') no-repeat;padding-left:46px;display:inline-block} +#sod_frm_paysel .PAYCO{background:url('../img/payco_logo.png') no-repeat 1px;padding-left:46px;display:inline-block} + #settle_bank {margin:10px 0 0} #sod_frm_escrow {margin:30px 0 0} diff --git a/css/mobile_shop.css b/css/mobile_shop.css index b95c26821..97fdcc377 100644 --- a/css/mobile_shop.css +++ b/css/mobile_shop.css @@ -352,6 +352,10 @@ html.no-overflowscrolling #sc_coupon_frm, html.no-overflowscrolling #od_coupon_f #sod_frm_paysel ul {margin:0;padding:0;} #sod_frm_paysel ul:after {display:block;visibility:hidden;clear:both;content:""} #sod_frm_paysel li {float:left;padding:5px 2%;width:46%} +#sod_frm_paysel .KPAY{background:url('../img/kpay_logo.png') no-repeat;padding-left:37px;} +#sod_frm_paysel .PAYNOW{background:url('../img/paynow_logo.png') no-repeat;padding-left:46px;} +#sod_frm_paysel .PAYCO{background:url('../img/payco_logo.png') no-repeat 1px ;padding-left:46px;} + #sod_frm_paysel #settle_bank {padding:10px;background:#fff;line-height:2em;border:1px solid #dbdbdb} #sod_frm_paysel #settle_bank label {display:inline-block;margin:0 10px 0 0;font-weight:bold} #sod_frm_paysel #settle_bank .frm_input {background:#fff;text-align:center} diff --git a/img/kpay_logo.png b/img/kpay_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..7f7e76c753ff49368b0697f98657785aeb95ae8c GIT binary patch literal 1520 zcmV&#r28R##BI%8dRjID7M!32SZ=jlA@+ss8(s4s%fyT)wXFhQLL2KMw?Q#@ewIC zMjo{S@=|7Ymt_}sS@y}y?9A<5zV#+IGm|;@oO}QG_df)?x z=2iUpvr81FdDggw#`6S4${>m$_~| zzpLZ!N{=9b+v5S-$OueYtzbQO4(zvXfxWvM{9Z5c2!X5Z$_6$s$lB?ZueDEr3yx$ZeFcfw)`H#rx9cs zBn1r+48~5MI#DaP-(DI@)J+nl<>%1am##}g0|_WS`%lu4@l3kkzD|BJ^fonr@jqln zjw^Kkua$z;nnVkH0!mFC0+JE|=R=dO1lcpC2hNo0l2 z_}x3{iZj1l`ZpT~VJSt{5QW$@HM0NIyv2iK96z2f$5MM)V-(`@GrVl73UTQgWUX3r z$MQ~f6Sv4H`mB~rug?!$XBTis>+87ecwP~{f2=1EG4XC8Ue`M@I0y=SAByN0Ae2fF zP91NMJ8msg)-@cGmlk{tQ!ayi=0r39@qyFKY}3E|sn5QnV&lDvW8bV7H8D1(v!jx4 zYWxTY5&@D)m=0i;NCIKNATknw!esG5n#4s3&_s*yWFS-CSAAWwSW*QUZv+RD_#UOs zd!uBvFmJVYR;BOYSnT%wA>yn{Z+)DS&c1vcd`jmz5ag%9iz7`UZges6m!}HDA~#o{{5Y zV^P)&=BPEbWR1@`BoLJ*9T%3=L2FGkoVSq?#r9|h=1Itmu%w< zgv1C))SHPduUArT*IaBrH&s^NP8c#gNR)t>l`_H{KT{~*Xe&m+Kq8T1ct|ZT>Iu1A zfLbrSAz%8ThOT-4-B3sxCe@k%>g=eMers7zu)q8Y%7g?+Dk_+1Ya*Ug{R1H4rV(p0 zfp2@oW5LX+VEY~;os$bQjNo?3XcIvd6$Js08$?`0Hd}ze)FRwkncQ56&?P}=uz!KO zvZRO7>g=#-S3R=Z($J;v8_0Q!x-eWk%*?Q>!Uhk8FmxoS(hVTvrzFW3NP=b%VuLIPQNV{2k6Q9R#cpgssC%B1n0rhl+!rZkIzLLT)$>h=N?m$-K@>$R&k=`YdFIzBb{d@%zVI1s-v9RJd@8mMHUrTKul>9{=-Tn|OpSOzj@B~`nL}sJua0VX2akv8q z;3(8WFMUtLSr5Gp8sG(7gpv9b!#=nVSE17Nl~4z>p%8AvL4Vr?cca}cFcVgp%uXFb zpO>JwZ6ELYI}b2Mxr9xEZ%_fd;U(OId2YDO!_R^bP~@Hw`!PI&uh0gK@FufYL!A7F z&QYCPFvsUo=m|^IZIv&!nox^D6Q5&~MSfpyWv zH0Ettw6WSCt6`17B2W!{f+HCnr&@0IvrQeP+G@&FB4<*G@!!J(4=})kZG>SKU=u9W zKRU6wz?MaOwzLy-oNj?tI2X&*rvA3t&#fXEkdOUJXNP3L7MBIGp$S zWPw$>(Ls_o)ls}S!ifwm4mHU-2PJGS^np{EN{3xB`Hv3fby(=|9CrG{=G&=$u9xT+ zH$iodf1LllYl{?nBr>`)FY|w~bs0?+dm|)WEy-eA8xy`qI>mkoFaX;@j4%w3 $P_RMESG1, "P_RMESG2" => $P_RMESG2, "P_NOTI" => $P_NOTI, - "P_AUTH_NO" => $P_AUTH_NO + "P_AUTH_NO" => $P_AUTH_NO, + "P_SRC_CODE" => $P_SRC_CODE ); // 결과 incis log 테이블 기록 - if($P_TYPE == 'BANK') { + if($P_TYPE == 'BANK' || $P_SRC_CODE == 'A') { $sql = " insert into {$g5['g5_shop_inicis_log_table']} set oid = '$P_OID', P_TID = '$P_TID', diff --git a/mobile/shop/kcp/order_approval_form.php b/mobile/shop/kcp/order_approval_form.php index e807ae404..07ecbbbe3 100644 --- a/mobile/shop/kcp/order_approval_form.php +++ b/mobile/shop/kcp/order_approval_form.php @@ -62,6 +62,8 @@ $comm_vat_mny = $_POST[ "comm_vat_mny" ]; // 부가세 $comm_free_mny = $_POST["comm_free_mny" ]; // 비과세금액 + $payco_direct = $_POST["payco_direct" ]; // PAYCO 결제창 호출 + /* * 기타 파라메터 추가 부분 - Start - */ @@ -99,6 +101,10 @@ $pay_method = 'VCNT'; $ActionResult = 'vcnt'; break; + case '간편결제': + $pay_method = 'CARD'; + $ActionResult = 'card'; + break; default: $pay_method = ''; $ActionResult = ''; @@ -242,6 +248,8 @@ if($enc_data != '' && $enc_info != '' && $tran_cd != '') { + + diff --git a/mobile/shop/kcp/orderform.1.php b/mobile/shop/kcp/orderform.1.php index 12c582f9f..312629b3e 100644 --- a/mobile/shop/kcp/orderform.1.php +++ b/mobile/shop/kcp/orderform.1.php @@ -18,6 +18,7 @@ if(!($default['de_iche_use'] || $default['de_vbank_use'] || $default['de_hp_use' + diff --git a/mobile/shop/lg/orderform.1.php b/mobile/shop/lg/orderform.1.php index 225008a94..1fd1a22e6 100644 --- a/mobile/shop/lg/orderform.1.php +++ b/mobile/shop/lg/orderform.1.php @@ -13,6 +13,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 + \ No newline at end of file diff --git a/mobile/shop/lg/xpay_approval.php b/mobile/shop/lg/xpay_approval.php index be45cf87b..c81ce3371 100644 --- a/mobile/shop/lg/xpay_approval.php +++ b/mobile/shop/lg/xpay_approval.php @@ -17,6 +17,7 @@ $LGD_TAXFREEAMOUNT = $_POST['LGD_TAXFREEAMOUNT']; //비과세 금 $LGD_CASHRECEIPTYN = $_POST['LGD_CASHRECEIPTYN']; //현금영수증 사용설정 $LGD_BUYERID = $_POST['LGD_BUYERID']; //구매자 ID $LGD_BUYERPHONE = $_POST['LGD_BUYERPHONE']; //구매자 휴대폰번호 +$LGD_EASYPAY_ONLY = $_POST['LGD_EASYPAY_ONLY']; //페이나우결제창 호출 $LGD_RETURNURL = G5_MSHOP_URL.'/lg/returnurl.php'; $LGD_KVPMISPNOTEURL = G5_MSHOP_URL.'/lg/note_url.php'; @@ -87,6 +88,7 @@ $payReqMap['LGD_TAXFREEAMOUNT'] = $LGD_TAXFREEAMOUNT; $payReqMap['LGD_CASHRECEIPTYN'] = $LGD_CASHRECEIPTYN; $payReqMap['LGD_BUYERPHONE'] = $LGD_BUYERPHONE; $payReqMap['LGD_BUYERID'] = $LGD_BUYERID; +$payReqMap['LGD_EASYPAY_ONLY'] = $LGD_EASYPAY_ONLY; /* **************************************************** diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php index a63a03539..f71ffcd8d 100644 --- a/mobile/shop/orderform.php +++ b/mobile/shop/orderform.php @@ -554,7 +554,7 @@ require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php'); $escrow_title = "에스크로 "; } - if ($default['de_bank_use'] || $default['de_vbank_use'] || $default['de_iche_use'] || $default['de_card_use'] || $default['de_hp_use']) { + if ($default['de_bank_use'] || $default['de_vbank_use'] || $default['de_iche_use'] || $default['de_card_use'] || $default['de_hp_use'] || $default['de_easy_pay_use']) { echo '
    '; } @@ -593,6 +593,25 @@ require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php'); $checked = ''; } + // PG 간편결제 + if($default['de_easy_pay_use']) { + switch($default['de_pg_service']) { + case 'lg': + $pg_easy_pay_name = 'PAYNOW'; + break; + case 'inicis': + $pg_easy_pay_name = 'KPAY'; + break; + default: + $pg_easy_pay_name = 'PAYCO'; + break; + } + + $multi_settle++; + echo '
    • '.PHP_EOL; + $checked = ''; + } + echo '
'; $temp_point = 0; @@ -646,7 +665,7 @@ require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php'); echo '
'; } - if ($default['de_bank_use'] || $default['de_vbank_use'] || $default['de_iche_use'] || $default['de_card_use'] || $default['de_hp_use']) { + if ($default['de_bank_use'] || $default['de_vbank_use'] || $default['de_iche_use'] || $default['de_card_use'] || $default['de_hp_use'] || $default['de_easy_pay_use']) { echo ''; } @@ -916,7 +935,7 @@ $(function() { $("#show_pay_btn").css("display", "inline"); }); - $("#od_settle_iche,#od_settle_card,#od_settle_vbank,#od_settle_hp").bind("click", function() { + $("#od_settle_iche,#od_settle_card,#od_settle_vbank,#od_settle_hp,#od_settle_easy_pay").bind("click", function() { $("#settle_bank").hide(); $("#show_req_btn").css("display", "inline"); $("#show_pay_btn").css("display", "none"); @@ -1168,8 +1187,13 @@ function pay_approval() f.rcvr_add1.value = pf.od_b_addr1.value; f.rcvr_add2.value = pf.od_b_addr2.value; f.settle_method.value = settle_method; + if(settle_method == "간편결제") + f.payco_direct.value = "Y"; + else + f.payco_direct.value = ""; var pay_method = ""; + var easy_pay = ""; switch(settle_method) { case "계좌이체": pay_method = "SC0030"; @@ -1183,12 +1207,16 @@ function pay_approval() case "신용카드": pay_method = "SC0010"; break; + case "간편결제": + easy_pay = "PAYNOW"; + break; } f.LGD_CUSTOM_FIRSTPAY.value = pay_method; f.LGD_BUYER.value = pf.od_name.value; f.LGD_BUYEREMAIL.value = pf.od_email.value; f.LGD_BUYERPHONE.value = pf.od_hp.value; f.LGD_AMOUNT.value = f.good_mny.value; + f.LGD_EASYPAY_ONLY.value = easy_pay; f.LGD_TAXFREEAMOUNT.value = pf.comm_free_mny.value; @@ -1200,6 +1228,8 @@ function pay_approval() var ypos = (screen.width - height) / 2; var position = "top=" + ypos + ",left=" + xpos; var features = position + ", width=320, height=440"; + var p_reserved = f.P_RESERVED.value; + f.P_RESERVED.value = p_reserved; switch(settle_method) { case "계좌이체": paymethod = "bank"; @@ -1213,6 +1243,10 @@ function pay_approval() case "신용카드": paymethod = "wcard"; break; + case "간편결제": + paymethod = "wcard"; + f.P_RESERVED.value = p_reserved+"&d_kpay=Y&d_kpay_app=Y"; + break; } f.P_AMT.value = f.good_mny.value; f.P_UNAME.value = pf.od_name.value; @@ -1226,9 +1260,6 @@ function pay_approval() f.action = "https://mobile.inicis.com/smart/" + paymethod + "/"; - //var new_win = window.open("about:blank", "tar_opener", "scrollbars=yes,resizable=yes"); - //f.target = "tar_opener"; - // 주문 정보 임시저장 var order_data = $(pf).serialize(); var save_result = ""; diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php index ddb95c9fc..9c337949f 100644 --- a/mobile/shop/orderformupdate.php +++ b/mobile/shop/orderformupdate.php @@ -392,6 +392,32 @@ else if ($od_settle_case == "신용카드") if($od_misu == 0) $od_status = '입금'; } +else if ($od_settle_case == "간편결제") +{ + switch($default['de_pg_service']) { + case 'lg': + include G5_SHOP_PATH.'/lg/xpay_result.php'; + break; + case 'inicis': + include G5_MSHOP_PATH.'/inicis/pay_result.php'; + break; + default: + include G5_MSHOP_PATH.'/kcp/pp_ax_hub.php'; + $card_name = iconv("cp949", "utf-8", $card_name); + break; + } + + $od_tno = $tno; + $od_app_no = $app_no; + $od_receipt_price = $amount; + $od_receipt_point = $i_temp_point; + $od_receipt_time = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/", "\\1-\\2-\\3 \\4:\\5:\\6", $app_time); + $od_bank_account = $card_name; + $pg_price = $amount; + $od_misu = $i_price - $od_receipt_price; + if($od_misu == 0) + $od_status = '입금'; +} else { die("od_settle_case Error!!!"); diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php index b50a813fb..26c885469 100644 --- a/mobile/shop/orderinquiryview.php +++ b/mobile/shop/orderinquiryview.php @@ -239,11 +239,29 @@ if($od['od_pg'] == 'lg') { $app_no_subj = ''; $disp_bank = true; $disp_receipt = false; + $easy_pay_name = ''; if($od['od_settle_case'] == '신용카드') { $app_no_subj = '승인번호'; $app_no = $od['od_app_no']; $disp_bank = false; $disp_receipt = true; + } else if($od['od_settle_case'] == '간편결제') { + $app_no_subj = '승인번호'; + $app_no = $od['od_app_no']; + $disp_bank = false; + switch($od['od_pg']) { + case 'lg': + $easy_pay_name = 'PAYNOW'; + break; + case 'inicis': + $easy_pay_name = 'KPAY'; + break; + case 'kcp': + $easy_pay_name = 'PAYCO'; + break; + default: + break; + } } else if($od['od_settle_case'] == '휴대폰') { $app_no_subj = '휴대폰번호'; $app_no = $od['od_bank_account']; @@ -273,10 +291,9 @@ if($od['od_pg'] == 'lg') { 주문일시 - 결제방식 - + 결제금액 diff --git a/mobile/shop/settle_kcp.inc.php b/mobile/shop/settle_kcp.inc.php index 148eb229e..9db76f2d3 100644 --- a/mobile/shop/settle_kcp.inc.php +++ b/mobile/shop/settle_kcp.inc.php @@ -37,6 +37,12 @@ else { $g_conf_site_cd = $default['de_kcp_mid']; $g_conf_site_key = $default['de_kcp_site_key']; +// 테스트 결제 때 PAYCO site_cd, site_key 재설정 +if($default['de_card_test'] && ($_POST['settle_method'] == '간편결제' || $_POST['od_settle_case'] == '간편결제')) { + $g_conf_site_cd = 'S6729'; + $g_conf_site_key = ''; +} + if(!(preg_match("/^T000/", $g_conf_site_cd) || $default['de_card_test'])) { if (!preg_match("/^SR/", $g_conf_site_cd)) { alert("SR 로 시작하지 않는 KCP SITE CODE 는 지원하지 않습니다."); diff --git a/shop/inicis/orderform.1.php b/shop/inicis/orderform.1.php index d55e1f64c..859b3d343 100644 --- a/shop/inicis/orderform.1.php +++ b/shop/inicis/orderform.1.php @@ -2,7 +2,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 // 전자결제를 사용할 때만 실행 -if($default['de_iche_use'] || $default['de_vbank_use'] || $default['de_hp_use'] || $default['de_card_use']) { +if($default['de_iche_use'] || $default['de_vbank_use'] || $default['de_hp_use'] || $default['de_card_use'] || $default['de_easy_pay_use']) { ?> diff --git a/shop/inicis/orderform.3.php b/shop/inicis/orderform.3.php index e0dca41bb..8d46ff60c 100644 --- a/shop/inicis/orderform.3.php +++ b/shop/inicis/orderform.3.php @@ -2,7 +2,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 // 전자결제를 사용할 때만 실행 -if($default['de_iche_use'] || $default['de_vbank_use'] || $default['de_hp_use'] || $default['de_card_use']) { +if($default['de_iche_use'] || $default['de_vbank_use'] || $default['de_hp_use'] || $default['de_card_use'] || $default['de_easy_pay_use']) { ?>