diff --git a/adm/admin.menu400.shop_1of2.php b/adm/admin.menu400.shop_1of2.php
index 16809e249..3bfb65086 100644
--- a/adm/admin.menu400.shop_1of2.php
+++ b/adm/admin.menu400.shop_1of2.php
@@ -7,7 +7,6 @@ $menu['menu400'] = array (
array('400400', '주문내역', G4_ADMIN_URL.'/shop_admin/orderlist.php', 'scf_order', 1),
array('400410', '주문개별내역', G4_ADMIN_URL.'/shop_admin/orderstatuslist.php', 'scf_order_by', 1),
array('400420', '주문통합내역', G4_ADMIN_URL.'/shop_admin/orderlist2.php', 'scf_order_all', 1),
- array('400430', '취소교환반품내역', G4_ADMIN_URL.'/shop_admin/orderrequestlist.php', 'scf_request', 1),
array('400440', '개인결제관리', G4_ADMIN_URL.'/shop_admin/personalpaylist.php', 'scf_personalpay', 1),
array('400200', '분류관리', G4_ADMIN_URL.'/shop_admin/categorylist.php', 'scf_cate'),
array('400300', '상품관리', G4_ADMIN_URL.'/shop_admin/itemlist.php', 'scf_item'),
diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 554436531..68310dbed 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -73,12 +73,6 @@ if ($od['mb_id'] == "") {
}
//------------------------------------------------------------------------------
-// 요청정보
-$sql = " select rq_id, ct_id, rq_type, rq_time, rq_status
- from {$g4['shop_request_table']} where od_id = '{$od['od_id']}' and rq_parent = '0' order by rq_id desc ";
-$rq_result = sql_query($sql);
-$rq_count = mysql_num_rows($rq_result);
-
$qstr = "sort1=$sort1&sort2=$sort2&sel_field=$sel_field&search=$search&page=$page";
// PG사를 KCP 사용하면서 테스트 상점아이디라면
@@ -102,10 +96,8 @@ $result = sql_query($sql);
$pg_anchor = '
- 주문상품 목록
-- 주문결제 내역
';
-if($rq_count)
- $pg_anchor .= '- 고객요청 내역
';
-$pg_anchor .='- 결제상세정보 확인
+- 주문결제 내역
+- 결제상세정보 확인
- 결제상세정보 수정
- 상점메모
- 주문하신 분
@@ -296,78 +288,6 @@ $pg_anchor .='- 결제상세정보 확인
-
-
- 고객요청내역
-
- 요청리스트
-
- 1)
- $rq_subject .= '외 '.($rq_item_count - 1).'건';
- $rq_subject .= ' '.$type.'요청';
-
- if($rq_row['rq_id'] != $rq_id) {
- $order_href = './orderform.php?od_id='.$od['od_id'].'&rq_id='.$rq_row['rq_id'].'&'.$qstr.'#anc_sodr_request';
- $rq_subject = '
'.$rq_subject.'';
- }
-
- switch($rq_row['rq_status']) {
- case 1:
- $rq_status = ' [처리완료]';
- break;
- case 99:
- $rq_status = ' [고객취소]';
- break;
- case 100:
- $rq_status = ' [처리불가]';
- break;
- default:
- $rq_status = ' [요청접수]';
- break;
- }
- ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
결제상세정보
diff --git a/adm/shop_admin/orderrequest.inc.php b/adm/shop_admin/orderrequest.inc.php
deleted file mode 100644
index f3f4776eb..000000000
--- a/adm/shop_admin/orderrequest.inc.php
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
- 요청 상품
-
-
-
- | 상품명 |
- 옵션항목 |
- 판매가 |
- 수량 |
- 소계 |
- 상태 |
-
-
-
-
-
- |
-
-
- |
- |
- |
- |
- |
- |
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/adm/shop_admin/orderrequestdelete.php b/adm/shop_admin/orderrequestdelete.php
deleted file mode 100644
index ce361c319..000000000
--- a/adm/shop_admin/orderrequestdelete.php
+++ /dev/null
@@ -1,31 +0,0 @@
-
\ No newline at end of file
diff --git a/adm/shop_admin/orderrequestform.php b/adm/shop_admin/orderrequestform.php
deleted file mode 100644
index 0a54c7e75..000000000
--- a/adm/shop_admin/orderrequestform.php
+++ /dev/null
@@ -1,315 +0,0 @@
-
-
-
-
-
- 요청 처리내역
- 처리내역을 클릭하시면 상세 내용을 확인할 수 있습니다.
-
-
-
-
-
-
-
- 처리내역이 없습니다.';
- ?>
-
-
-
-
-
-
\ No newline at end of file
diff --git a/adm/shop_admin/orderrequestformupdate.php b/adm/shop_admin/orderrequestformupdate.php
deleted file mode 100644
index b81b72d06..000000000
--- a/adm/shop_admin/orderrequestformupdate.php
+++ /dev/null
@@ -1,217 +0,0 @@
- 0 || $rq_amount3 > 0) && $rq_status == 1 && $od['od_receipt_amount'] > 0 && $od['od_tno'])
-{
- $rq_amount2 = preg_replace('/[^0-9]/', '', $rq_amount2);
- $rq_amount3 = preg_replace('/[^0-9]/', '', $rq_amount3);
-
- switch($rq['rq_type']) {
- case 0:
- $type = '취소';
- break;
- case 1:
- $type = '교환';
- break;
- case 2:
- $type = '반품';
- break;
- default:
- $type = '';
- break;
- }
-
- if($od['od_settle_case'] == '계좌이체' && substr($od['od_receipt_time'], 0, 10) >= G4_TIME_YMD)
- die('실시간 계좌이체건의 부분취소 요청은 결제일 익일에 가능합니다.');
-
- // 취소사유의 한글깨짐 방지처리
- $def_locale = setlocale(LC_CTYPE, 0);
- $cancel_memo = iconv("utf-8", "euc-kr", '고객 '.$type.'요청으로 인한 부분취소');
- $locale_change = false;
- if(preg_match("/utf[\-]?8/i", $def_locale)) {
- setlocale(LC_CTYPE, 'ko_KR.euc-kr');
- $locale_change = true;
- }
-
- // 부분취소 실행
- if ($default['de_card_test']) {
- if ($default['de_escrow_use'] == 1) {
- // 에스크로결제 테스트
- $default['de_kcp_mid'] = "T0007";
- $default['de_kcp_site_key'] = '2.mDT7R4lUIfHlHq4byhYjf__';
- }
- else {
- // 일반결제 테스트
- $default['de_kcp_mid'] = "T0000";
- $default['de_kcp_site_key'] = '3grptw1.zW0GSo4PQdaGvsF__';
- }
- }
- else {
- $default['de_kcp_mid'] = "SR".$default['de_kcp_mid'];
- }
-
- $g_conf_site_cd = $default['de_kcp_mid'];
- $g_conf_site_key = $default['de_kcp_site_key'];
- $g_conf_home_dir = G4_SHOP_PATH.'/kcp';
- $g_conf_key_dir = '';
- $g_conf_log_dir = '';
- if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')
- {
- $g_conf_key_dir = G4_SHOP_PATH.'/kcp/bin/pub.key';
- $g_conf_log_dir = G4_SHOP_PATH.'/kcp/log';
- }
-
- if (preg_match("/^T000/", $g_conf_site_cd) || $default['de_card_test']) {
- $g_conf_gw_url = "testpaygw.kcp.co.kr";
- }
- else {
- $g_conf_gw_url = "paygw.kcp.co.kr";
- if (!preg_match("/^SR/", $g_conf_site_cd)) {
- alert("SR 로 시작하지 않는 KCP SITE CODE 는 지원하지 않습니다.");
- }
- }
-
- $g_conf_log_level = "3";
- $g_conf_gw_port = "8090";
-
- include G4_SHOP_PATH.'/kcp/pp_cli_hub_lib.php';
-
- $tno = $od['od_tno'];
- $req_tx = 'mod';
- $mod_desc = $cancel_memo;
- $cust_ip = getenv('REMOTE_ADDR');
- $rem_mny = $od['od_receipt_amount'] - $od['od_cancel_card'];;
- $mod_mny = $rq_amount2;
- $tax_mny = $rq_amount2;
- $mod_free_mny = $rq_amount3;
- $mod_type = 'RN07';
- if($od['od_settle_case'] == '계좌이체')
- $mod_type = 'STPA';
-
- if($od['od_tax_flag']) {
- $mod_mny = $tax_mny + $mod_free_mny;
- }
-
- $c_PayPlus = new C_PAYPLUS_CLI;
- $c_PayPlus->mf_clear();
-
- if ( $req_tx == "mod" )
- {
- $tran_cd = "00200000";
-
- $c_PayPlus->mf_set_modx_data( "tno" , $tno ); // KCP 원거래 거래번호
- $c_PayPlus->mf_set_modx_data( "mod_type" , $mod_type ); // 원거래 변경 요청 종류
- $c_PayPlus->mf_set_modx_data( "mod_ip" , $cust_ip ); // 변경 요청자 IP
- $c_PayPlus->mf_set_modx_data( "mod_desc" , $mod_desc ); // 변경 사유
- $c_PayPlus->mf_set_modx_data( "rem_mny" , strval($rem_mny) ); // 취소 가능 잔액
- $c_PayPlus->mf_set_modx_data( "mod_mny" , strval($mod_mny) ); // 취소 요청 금액
-
- if($od['od_tax_flag'])
- {
- $mod_tax_mny = round((int)$tax_mny / 1.1);
- $mod_vat_mny = (int)$tax_mny - $mod_tax_mny;
-
- $c_PayPlus->mf_set_modx_data( "tax_flag" , "TG03" ); // 복합과세 구분
- $c_PayPlus->mf_set_modx_data( "mod_tax_mny" , strval($mod_tax_mny) ); // 공급가 부분 취소 요청 금액
- $c_PayPlus->mf_set_modx_data( "mod_vat_mny" , strval($mod_vat_mny) ); // 부과세 부분 취소 요청 금액
- $c_PayPlus->mf_set_modx_data( "mod_free_mny" , $mod_free_mny ); // 비관세 부분 취소 요청 금액
- }
- }
-
- if ( $tran_cd != "" )
- {
- $c_PayPlus->mf_do_tx( "", $g_conf_home_dir, $g_conf_site_cd,
- $g_conf_site_key, $tran_cd, "",
- $g_conf_gw_url, $g_conf_gw_port, "payplus_cli_slib",
- $ordr_idxx, $cust_ip, $g_conf_log_level,
- "", 0 );
-
- $res_cd = $c_PayPlus->m_res_cd; // 결과 코드
- $res_msg = $c_PayPlus->m_res_msg; // 결과 메시지
- /* $res_en_msg = $c_PayPlus->mf_get_res_data( "res_en_msg" ); // 결과 영문 메세지 */
- }
- else
- {
- $c_PayPlus->m_res_cd = "9562";
- $c_PayPlus->m_res_msg = "연동 오류|Payplus Plugin이 설치되지 않았거나 tran_cd값이 설정되지 않았습니다.";
- }
-
- if ($res_cd != '0000')
- {
- $res_msg = iconv("euc-kr", "utf-8", $res_msg);
-
- die("$res_cd : $res_msg");
- }
-
- /* ============================================================================== */
- /* = 취소 결과 처리 = */
- /* = -------------------------------------------------------------------------- = */
- if ( $req_tx == "mod" )
- {
- if ( $res_cd == "0000" )
- {
- $tno = $c_PayPlus->mf_get_res_data( "tno" ); // KCP 거래 고유 번호
- $amount = $c_PayPlus->mf_get_res_data( "amount" ); // 원 거래금액
- $mod_mny = $c_PayPlus->mf_get_res_data( "panc_mod_mny" ); // 취소요청된 금액
- $rem_mny = $c_PayPlus->mf_get_res_data( "panc_rem_mny" ); // 취소요청후 잔액
-
- $sql = " update {$g4['shop_order_table']}
- set od_cancel_card = od_cancel_card + '$mod_mny'
- where od_id = '{$od['od_id']}' ";
- sql_query($sql);
- } // End of [res_cd = "0000"]
-
- /* = -------------------------------------------------------------------------- = */
- /* = 취소 실패 결과 처리 = */
- /* = -------------------------------------------------------------------------- = */
- else
- {
- }
- }
-
- if($locale_change)
- setlocale(LC_CTYPE, $def_locale);
-}
-
-// 환불금액입력(입금 금액이 있을 때만)
-$rq_amount1 = preg_replace('/[^0-9]/', '', $rq_amount1);
-if($od['od_receipt_amount'] > 0 && $rq_amount1 > 0) {
- $sql = " update {$g4['shop_order_table']}
- set od_refund_amount = '$rq_amount1'
- where od_id = '{$od['od_id']}' ";
- sql_query($sql);
-}
-
-// 고객요청 자료에 상태반영
-$sql = " update {$g4['shop_request_table']}
- set rq_status = '$rq_status'
- where rq_id = '$rq_id' ";
-sql_query($sql);
-
-// 처리내용입력
-$sql = " insert into `{$g4['shop_request_table']}`
- ( rq_type, rq_parent, od_id, ct_id, mb_id, rq_content, rq_status, rq_item, dl_company, rq_invoice, rq_amount1, rq_amount2, rq_amount3, rq_account, rq_ip, rq_time )
- values
- ( '{$rq['rq_type']}', '$rq_id', '{$od['od_id']}', '{$rq['ct_id']}', '{$member['mb_id']}', '$rq_content', '$rq_status', '$rq_item', '$dl_company', '$rq_invoice', '$rq_amount1', '$rq_amount2', '$rq_amount3', '$rq_account', '$REMOTE_ADDR', '".G4_TIME_YMDHIS."' ) ";
-sql_query($sql);
-?>
\ No newline at end of file
diff --git a/adm/shop_admin/orderrequestlist.php b/adm/shop_admin/orderrequestlist.php
deleted file mode 100644
index 7b1917078..000000000
--- a/adm/shop_admin/orderrequestlist.php
+++ /dev/null
@@ -1,234 +0,0 @@
-전체목록';
-?>
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/install/shop.sql b/install/shop.sql
index f43414d66..ecfbbd742 100644
--- a/install/shop.sql
+++ b/install/shop.sql
@@ -667,34 +667,6 @@ CREATE TABLE IF NOT EXISTS `shop_personalpay` (
-- --------------------------------------------------------
---
--- Table structure for table `shop_request`
---
-
-DROP TABLE IF EXISTS `shop_request`;
-CREATE TABLE IF NOT EXISTS `shop_request` (
- `rq_id` INT(11) NOT NULL AUTO_INCREMENT,
- `rq_type` TINYINT(4) NOT NULL DEFAULT '0',
- `rq_parent` INT(11) NOT NULL DEFAULT '0',
- `od_id` BIGINT(20) unsigned NOT NULL,
- `ct_id` VARCHAR(255) NOT NULL DEFAULT '',
- `mb_id` VARCHAR(255) NOT NULL DEFAULT '',
- `rq_content` TEXT NOT NULL,
- `rq_status` TINYINT(4) NOT NULL DEFAULT '0',
- `rq_item` TEXT NOT NULL,
- `dl_company` INT(11) NOT NULL DEFAULT '0',
- `rq_invoice` VARCHAR(255) NOT NULL DEFAULT '',
- `rq_amount1` INT(11) NOT NULL DEFAULT '0',
- `rq_amount2` INT(11) NOT NULL DEFAULT '0',
- `rq_amount3` INT(11) NOT NULL DEFAULT '0',
- `rq_account` VARCHAR(255) NOT NULL DEFAULT '',
- `rq_ip` VARCHAR(255) NOT NULL DEFAULT '',
- `rq_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (`rq_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- --------------------------------------------------------
-
--
-- Table structure for table `shop_sendcost`
--
diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php
index 4a4f9b2ca..9b71eea29 100644
--- a/mobile/shop/orderinquiryview.php
+++ b/mobile/shop/orderinquiryview.php
@@ -16,13 +16,6 @@ if (!$od['od_id'] || (!$is_member && md5($od['od_id'].$od['od_time'].$od['od_ip'
alert("조회하실 주문서가 없습니다.", G4_SHOP_URL);
}
-// 처리 중인 요청이 있는지..
-$dsp_request = true;
-$sql = " select count(*) as cnt from {$g4['shop_request_table']} where od_id = '$od_id' and rq_status = '0' ";
-$rq = sql_fetch($sql);
-if($rq['cnt'])
- $dsp_request = false;
-
// 결제방법
$settle_case = $od['od_settle_case'];
@@ -35,9 +28,6 @@ include_once(G4_MSHOP_PATH.'/_head.php');
주문번호
-