From 6589e225a13297211b274006fdfdd82c6ed8be53 Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 12 Dec 2016 13:33:44 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=82=BC?= =?UTF-8?q?=EC=84=B1=ED=8E=98=EC=9D=B4=EB=A5=BC=20=EB=8B=A4=EB=A5=B8=20PG?= =?UTF-8?q?=EC=84=9C=EB=B9=84=EC=8A=A4=EC=99=80=20=ED=95=A8=EA=BB=98=20?= =?UTF-8?q?=EC=93=B8=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/css/admin.css | 21 +- adm/shop_admin/configform.php | 91 ++++--- mobile/shop/kcp/orderform.1.php | 4 +- mobile/shop/orderform.sub.php | 256 ++++++++++-------- mobile/shop/orderformupdate.php | 5 +- mobile/shop/samsungpay/_common.php | 3 + .../shop/samsungpay/incSamsungpayCommon.php | 10 + mobile/shop/samsungpay/order.script.php | 72 +++++ mobile/shop/samsungpay/orderform.1.php | 34 +++ mobile/shop/samsungpay/orderform.2.php | 22 ++ mobile/shop/samsungpay/orderform.3.php | 3 + shop/ajax.orderdatasave.php | 8 +- 12 files changed, 376 insertions(+), 153 deletions(-) create mode 100644 mobile/shop/samsungpay/_common.php create mode 100644 mobile/shop/samsungpay/incSamsungpayCommon.php create mode 100644 mobile/shop/samsungpay/order.script.php create mode 100644 mobile/shop/samsungpay/orderform.1.php create mode 100644 mobile/shop/samsungpay/orderform.2.php create mode 100644 mobile/shop/samsungpay/orderform.3.php diff --git a/adm/css/admin.css b/adm/css/admin.css index 87748506f..41751d6e1 100644 --- a/adm/css/admin.css +++ b/adm/css/admin.css @@ -516,7 +516,12 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center} /* 쇼핑몰 설정 */ #anc_scf_payment textarea {height:50px} -.scf_pgreg {display:inline-block;margin:5px 0 0;padding:5px 10px;background:#ff4f91;color:#fff;font-weight:normal;text-decoration:none} +.scf_pgreg {display:inline-block;margin:5px 0 0;padding:5px 10px;background:#226C8B;color:#fff;font-weight:normal;text-decoration:none} +.kcp_btn {display:inline-block;margin:5px 0 0;padding:5px 10px;background:#226C8B;color:#fff;font-weight:normal;text-decoration:none} +.lg_btn{display:inline-block;margin:5px 0 0;padding:5px 10px;background:#ED008C;color:#fff;font-weight:normal;text-decoration:none} +.kg_btn{display:inline-block;margin:5px 0 0;padding:5px 10px;background:#4A2C7C;color:#fff;font-weight:normal;text-decoration:none} +.kakao_btn{display:inline-block;margin:5px 0 0;padding:5px 10px;background:#FDDC2F;color:#3B1E1E;font-weight:normal;text-decoration:none} +.naver_btn {display:inline-block;margin:5px 0 0;padding:5px 10px;background:#00C73C;color:#fff;font-weight:normal;text-decoration:none} .scf_cardtest {margin:5px 0 0} .scf_cardtest_btn {margin-left:5px;vertical-align:middle} @@ -546,6 +551,20 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center} .scf_sms_img span {display:block} .scf_sms_cnt {display:block} +ul.de_pg_tab{margin:0;padding:0;zoom:1} +ul.de_pg_tab:after{display:block;visibility:hidden;clear:both;content:"";} +ul.de_pg_tab li{position:relative;display:inline-block;float:left;text-align:center;margin:0;padding:0;width:120px} +ul.de_pg_tab li a{margin:0 2px;display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;line-height:2.5;background-color:#f7f7f7;color:#74777b;font-weight:bold;font-size:1.2em;text-decoration:none} +ul.de_pg_tab li a:hover{text-decoration:none} +ul.de_pg_tab li.tab-current a{background:#2CC185;color:#fff} + +.pg_info_fld{position:relative} +.kcp_info_fld th{background-color:#F6FCFF} +.lg_info_fld th{background-color:#FFF4FA} +.inicis_info_fld th{background-color:#F6F1FF} +.kakao_info_fld th{background-color:#FFFCED} +.naver_info_fld th{background-color:#F3FFF3} + /* 주문내역 */ #sodr_list td {text-align:center} #sodr_list .td_name {text-align:center !important} diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php index dd6579833..c5c626f45 100644 --- a/adm/shop_admin/configform.php +++ b/adm/shop_admin/configform.php @@ -671,18 +671,19 @@ if(!isset($default['de_listtype_list_skin'])) { + - + - +
- NHN KCP서비스신청하기 + NHN KCP서비스신청하기 @@ -693,13 +694,13 @@ if(!isset($default['de_listtype_list_skin'])) { - + - +
- LG유플러스 서비스신청하기 + LG유플러스 서비스신청하기 기본환경설정 > 본인확인 설정의 LG유플러스 상점아이디와 동일합니다."); ?> @@ -710,13 +711,13 @@ if(!isset($default['de_listtype_list_skin'])) { 계약정보 -> 상점정보관리에서 확인하실 수 있습니다.\n예) 95160cce09854ef44d2edb2bfb05f9f3\n기본환경설정 > 본인확인 설정의 LG유플러스 MERT KEY와 동일합니다."); ?> - + - +
- KG이니시스 서비스신청하기 + KG이니시스 서비스신청하기 @@ -738,64 +739,64 @@ if(!isset($default['de_listtype_list_skin'])) { - + + + 삼성페이 서비스신청하기 + - - + 실결제시 반드시 결제대행사 KG이니시스 항목에 상점 아이디와 키패스워드를 입력해 주세요.", 50); ?> + > - + - 카카오페이 서비스신청하기 + 카카오페이 서비스신청하기 KHSIR m - + - + - + - + - + 입력하신 비밀번호와 상점관리자에서 설정하신 비밀번호가 일치하지 않으면 취소가 되지 않습니다."); ?> - + - 네이버페이 서비스신청하기 + 네이버페이 서비스신청하기 - + @@ -804,7 +805,7 @@ if(!isset($default['de_listtype_list_skin'])) { - + @@ -813,7 +814,7 @@ if(!isset($default['de_listtype_list_skin'])) { - + 예로 설정해야 하며 최종 승인 후 아니오로 설정합니다."); ?> @@ -823,7 +824,7 @@ if(!isset($default['de_listtype_list_skin'])) { - + @@ -832,14 +833,14 @@ if(!isset($default['de_listtype_list_skin'])) { - + 네이버페이 상품정보 XML URL /naverpay/naverpay_item.php - + @@ -1558,15 +1559,33 @@ function fconfig_check(f) } $(function() { - $(".pg_info_fld").hide(); + //$(".pg_info_fld").hide(); $(".pg_vbank_url").hide(); - $("._info_fld").show(); + //$("._info_fld").show(); $("#_vbank_url").show(); $(".kcp_info_fld").show(); $("#kcp_vbank_url").show(); + $(".de_pg_tab").on("click", "a", function(e){ + + var pg = $(this).attr("data-value"), + class_name = "tab-current"; + + $("#de_pg_service").val(pg); + $(this).parent("li").addClass(class_name).siblings().removeClass(class_name); + + //$(".pg_info_fld:visible").hide(); + $(".pg_vbank_url:visible").hide(); + //$("."+pg+"_info_fld").show(); + $("#"+pg+"_vbank_url").show(); + $(".scf_cardtest").addClass("scf_cardtest_hide"); + $("."+pg+"_cardtest").removeClass("scf_cardtest_hide"); + $(".scf_cardtest_tip_adm").addClass("scf_cardtest_tip_adm_hide"); + $("#"+pg+"_cardtest_tip").removeClass("scf_cardtest_tip_adm_hide"); + }); + $("#de_pg_service").on("change", function() { var pg = $(this).val(); $(".pg_info_fld:visible").hide(); diff --git a/mobile/shop/kcp/orderform.1.php b/mobile/shop/kcp/orderform.1.php index 312629b3e..c6595ecd6 100644 --- a/mobile/shop/kcp/orderform.1.php +++ b/mobile/shop/kcp/orderform.1.php @@ -1,8 +1,8 @@ diff --git a/mobile/shop/orderform.sub.php b/mobile/shop/orderform.sub.php index c82f4279a..0dfdef66e 100644 --- a/mobile/shop/orderform.sub.php +++ b/mobile/shop/orderform.sub.php @@ -4,6 +4,10 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 require_once(G5_MSHOP_PATH.'/settle_'.$default['de_pg_service'].'.inc.php'); require_once(G5_SHOP_PATH.'/settle_kakaopay.inc.php'); +if( $default['de_samsung_pay_use'] ){ //삼성페이 사용시 + require_once(G5_MSHOP_PATH.'/samsungpay/incSamsungpayCommon.php'); +} + // 결제등록 요청시 사용할 입금마감일 $ipgm_date = date("Ymd", (G5_SERVER_TIME + 86400 * 5)); $tablet_size = "1.0"; // 화면 사이즈 조정 - 기기화면에 맞게 수정(갤럭시탭,아이패드 - 1.85, 스마트폰 - 1.0) @@ -240,6 +244,10 @@ ob_end_clean(); // 결제대행사별 코드 include (결제등록 필드) require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php'); + +if( $default['de_samsung_pay_use'] ){ //삼성페이 사용시 + require_once(G5_MSHOP_PATH.'/samsungpay/orderform.1.php'); +} ?> @@ -535,7 +543,7 @@ if($is_kakaopay_use) { $escrow_title = "에스크로 "; } - if ($is_kakaopay_use || $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'] || ('inicis' == $default['de_pg_service'] && $default['de_samsung_pay_use'])) { + if ($is_kakaopay_use || $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'] || $default['de_samsung_pay_use']) { echo '
'; } - 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'] || ('inicis' == $default['de_pg_service'] && $default['de_samsung_pay_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'] || $default['de_samsung_pay_use']) { echo ''; } @@ -672,6 +680,10 @@ if($is_kakaopay_use) { // 결제대행사별 코드 include (결제대행사 정보 필드 및 주분버튼) require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.2.php'); + if( $default['de_samsung_pay_use'] ){ //삼성페이 사용시 + require_once(G5_MSHOP_PATH.'/samsungpay/orderform.2.php'); + } + if($is_kakaopay_use) { require_once(G5_SHOP_PATH.'/kakaopay/orderform.2.php'); } @@ -693,11 +705,20 @@ if($is_kakaopay_use) { if ($default['de_escrow_use']) { // 결제대행사별 코드 include (에스크로 안내) require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.3.php'); + + if( $default['de_samsung_pay_use'] ){ //삼성페이 사용시 + require_once(G5_MSHOP_PATH.'/samsungpay/orderform.3.php'); + } } ?> + \ No newline at end of file diff --git a/mobile/shop/samsungpay/orderform.1.php b/mobile/shop/samsungpay/orderform.1.php new file mode 100644 index 000000000..90c5fef46 --- /dev/null +++ b/mobile/shop/samsungpay/orderform.1.php @@ -0,0 +1,34 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/mobile/shop/samsungpay/orderform.2.php b/mobile/shop/samsungpay/orderform.2.php new file mode 100644 index 000000000..e1da52c92 --- /dev/null +++ b/mobile/shop/samsungpay/orderform.2.php @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mobile/shop/samsungpay/orderform.3.php b/mobile/shop/samsungpay/orderform.3.php new file mode 100644 index 000000000..8f1d43f85 --- /dev/null +++ b/mobile/shop/samsungpay/orderform.3.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/shop/ajax.orderdatasave.php b/shop/ajax.orderdatasave.php index e75f728f4..e6bff6e3c 100644 --- a/shop/ajax.orderdatasave.php +++ b/shop/ajax.orderdatasave.php @@ -36,11 +36,17 @@ $row = sql_fetch($sql); if($row['cnt']) sql_query(" delete from {$g5['g5_shop_order_data_table']} where od_id = '$od_id' "); +$default_pg = $default['de_pg_service']; + +if( $od_settle_case == '삼성페이' ){ //현재 삼성페이인 경우에는 pg를 inicis로 처리 + $default_pg = 'inicis'; +} + $sql = " insert into {$g5['g5_shop_order_data_table']} set od_id = '$od_id', cart_id = '$cart_id', mb_id = '{$member['mb_id']}', - dt_pg = '{$default['de_pg_service']}', + dt_pg = '$default_pg', dt_data = '$dt_data', dt_time = '".G5_TIME_YMDHIS."' "; sql_query($sql);