diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php index 949f3da5c..dd6579833 100644 --- a/adm/shop_admin/configform.php +++ b/adm/shop_admin/configform.php @@ -102,6 +102,12 @@ if(!isset($default['de_easy_pay_use'])) { ADD `de_easy_pay_use` tinyint(4) NOT NULL DEFAULT '0' AFTER `de_iche_use` ", true); } +// 이니시스 삼성페이 사용여부 필드 추가 +if(!isset($default['de_samsung_pay_use'])) { + sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}` + ADD `de_samsung_pay_use` tinyint(4) NOT NULL DEFAULT '0' AFTER `de_easy_pay_use` ", true); +} + // 카카오페이 필드 추가 if(!isset($default['de_kakaopay_mid'])) { sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}` @@ -731,6 +737,16 @@ if(!isset($default['de_listtype_list_skin'])) { + + + + + + + diff --git a/adm/shop_admin/configformupdate.php b/adm/shop_admin/configformupdate.php index fd09db806..b8ce6790f 100644 --- a/adm/shop_admin/configformupdate.php +++ b/adm/shop_admin/configformupdate.php @@ -144,6 +144,7 @@ $sql = " update {$g5['g5_shop_default_table']} de_card_test = '{$_POST['de_card_test']}', de_card_use = '{$_POST['de_card_use']}', de_easy_pay_use = '{$_POST['de_easy_pay_use']}', + de_samsung_pay_use = '{$_POST['de_samsung_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/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index 8ff00072a..366dc35c5 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -468,7 +468,7 @@ add_javascript(G5_POSTCODE_JS, 0); //다음 주소 js - + 결제금액 @@ -759,7 +759,7 @@ add_javascript(G5_POSTCODE_JS, 0); //다음 주소 js - + @@ -1066,7 +1066,7 @@ function form_submit(f) var msg = ""; - + if(status == "취소" || status == "반품" || status == "품절") { var $ct_chk = $("input[name^=ct_chk]"); var chk_cnt = $ct_chk.size(); diff --git a/adm/shop_admin/orderformcartupdate.php b/adm/shop_admin/orderformcartupdate.php index 746439d68..2cdf0c235 100644 --- a/adm/shop_admin/orderformcartupdate.php +++ b/adm/shop_admin/orderformcartupdate.php @@ -183,7 +183,7 @@ if (in_array($_POST['ct_status'], $status_cancel)) { $sql = " select * from {$g5['g5_shop_order_table']} where od_id = '$od_id' "; $od = sql_fetch($sql); - if($od['od_tno'] && ($od['od_settle_case'] == '신용카드' || $od['od_settle_case'] == '간편결제' || $od['od_settle_case'] == 'KAKAOPAY')) { + if($od['od_tno'] && ($od['od_settle_case'] == '신용카드' || $od['od_settle_case'] == '간편결제' || $od['od_settle_case'] == 'KAKAOPAY') || ($od['od_pg'] == 'inicis' && $od['od_settle_case'] == '삼성페이')) { switch($od['od_pg']) { case 'lg': include_once(G5_SHOP_PATH.'/settle_lg.inc.php'); diff --git a/css/mobile_shop.css b/css/mobile_shop.css index b5a7aa9b2..f71869af7 100644 --- a/css/mobile_shop.css +++ b/css/mobile_shop.css @@ -356,6 +356,7 @@ x#sod_frm_paysel .KPAY{background:url('../img/kpay_logo.png') no-repeat;width:37 #sod_frm_paysel .PAYNOW{background:url('../img/paynow_logo.png') no-repeat;width:46px;height:15px;overflow:hidden;text-indent:-999px;display:inline-block;} #sod_frm_paysel .PAYCO{background:url('../img/payco_logo.png') no-repeat 1px;width:46px;height:15px;overflow:hidden;text-indent:-999px;display:inline-block;} .kakaopay_icon{background:url('../img/kakao.png') no-repeat ;height:21px;width:74px;display:inline-block;overflow:hidden;text-indent:-999px} +.samsung_pay{background:url('../img/samsungpay.png') no-repeat ;height:12px;width:83px;display:inline-block;overflow:hidden;text-indent:-999px} #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} diff --git a/img/samsungpay.png b/img/samsungpay.png new file mode 100644 index 000000000..fb23fa934 Binary files /dev/null and b/img/samsungpay.png differ diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql index fca6ee792..0d16b602b 100644 --- a/install/gnuboard5shop.sql +++ b/install/gnuboard5shop.sql @@ -353,6 +353,7 @@ CREATE TABLE IF NOT EXISTS `g5_shop_default` ( `de_inicis_sign_key` varchar(255) NOT NULL DEFAULT '', `de_iche_use` tinyint(4) NOT NULL DEFAULT '0', `de_easy_pay_use` tinyint(4) NOT NULL DEFAULT '0', + `de_samsung_pay_use` tinyint(4) NOT NULL DEFAULT '0', `de_item_use_use` tinyint(4) NOT NULL DEFAULT '0', `de_item_use_write` tinyint(4) NOT NULL DEFAULT '0', `de_code_dup_use` tinyint(4) NOT NULL DEFAULT '0', diff --git a/mobile/shop/inicis/orderform.1.php b/mobile/shop/inicis/orderform.1.php index 75da51643..d05a8e6d3 100644 --- a/mobile/shop/inicis/orderform.1.php +++ b/mobile/shop/inicis/orderform.1.php @@ -18,6 +18,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 + diff --git a/mobile/shop/orderform.sub.php b/mobile/shop/orderform.sub.php index 5d82ee162..c82f4279a 100644 --- a/mobile/shop/orderform.sub.php +++ b/mobile/shop/orderform.sub.php @@ -535,7 +535,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']) { + 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'])) { echo '
'; $temp_point = 0; @@ -653,7 +659,7 @@ if($is_kakaopay_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']) { + 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'])) { echo ''; } @@ -1254,6 +1260,11 @@ function pay_approval() paymethod = "wcard"; f.P_RESERVED.value = p_reserved+"&d_kpay=Y&d_kpay_app=Y"; break; + case "삼성페이": + paymethod = "wcard"; + f.P_RESERVED.value = p_reserved+"&d_samsungpay=Y"; + f.P_SKIP_TERMS.value = "Y"; //약관을 skip 해야 제대로 실행됨 + break; } f.P_AMT.value = f.good_mny.value; f.P_UNAME.value = pf.od_name.value; diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php index 74a54d905..f28470fde 100644 --- a/mobile/shop/orderformupdate.php +++ b/mobile/shop/orderformupdate.php @@ -419,6 +419,22 @@ else if ($od_settle_case == "간편결제") if($od_misu == 0) $od_status = '입금'; } +else if ($od_settle_case == "삼성페이") +{ + // 이니시스에서만 지원 + include G5_MSHOP_PATH.'/inicis/pay_result.php'; + + $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 if ($od_settle_case == "KAKAOPAY") { include G5_SHOP_PATH.'/kakaopay/kakaopay_result.php';