diff --git a/adm/admin.menu500.shop_2of2.php b/adm/admin.menu500.shop_2of2.php index a13911650..1b5faef9a 100644 --- a/adm/admin.menu500.shop_2of2.php +++ b/adm/admin.menu500.shop_2of2.php @@ -6,7 +6,6 @@ $menu['menu500'] = array ( array('500110', '매출현황', G4_ADMIN_URL.'/shop_admin/sale1.php', 'sst_order_stats'), array('500100', '상품판매순위', G4_ADMIN_URL.'/shop_admin/itemsellrank.php', 'sst_rank'), array('500120', '주문내역출력', G4_ADMIN_URL.'/shop_admin/orderprint.php', 'sst_print_order', 1), - array('500130', '전자결제내역', G4_ADMIN_URL.'/shop_admin/ordercardhistory.php', 'sst_pg', 1), array('500300', '이벤트관리', G4_ADMIN_URL.'/shop_admin/itemevent.php', 'scf_event'), array('500310', '이벤트일괄처리', G4_ADMIN_URL.'/shop_admin/itemeventlist.php', 'scf_event_mng'), array('500400', '내용관리', G4_ADMIN_URL.'/shop_admin/contentlist.php', 'scf_contents', 1), diff --git a/adm/shop_admin/ordercardhistory.php b/adm/shop_admin/ordercardhistory.php deleted file mode 100644 index f58cfe2ea..000000000 --- a/adm/shop_admin/ordercardhistory.php +++ /dev/null @@ -1,135 +0,0 @@ -전체목록'; -?> - -
- - - -
- 전자결제내역 검색 - - - - 전체 전자결제내역 건 - - - - - - - -
- -
- -
-

전자결제내역

-

신용카드 혹은 실시간 계좌이체로 결제(승인) 된 내역이며, 주문번호를 클릭하시면 주문상세 페이지로 이동합니다.

- -
- 주문내역 - 주문개별내역 - 주문통합내역 -
- - - - - - - - - - - - - - - - - - - - - - - - - ' - ?> - -
주문번호승인금액승인번호승인결과승인일시결제자
자료가 없습니다.
- -
- - - - diff --git a/adm/shop_admin/orderdelete.php b/adm/shop_admin/orderdelete.php index 540324719..f816eb32d 100644 --- a/adm/shop_admin/orderdelete.php +++ b/adm/shop_admin/orderdelete.php @@ -11,9 +11,6 @@ if ($od_id) // 장바구니 삭제 sql_query(" delete from {$g4['shop_cart_table']} where od_id = '$od_id' "); - // 카드결제내역 삭제 - sql_query(" delete from {$g4['shop_card_history_table']} where od_id = '$od_id' "); - // 주문서 삭제 sql_query(" delete from {$g4['shop_order_table']} where od_id = '$od_id' "); } diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php index 3fdc5faf9..d33f12600 100644 --- a/extend/shop.extend2.php +++ b/extend/shop.extend2.php @@ -38,9 +38,7 @@ $result = sql_query($sql, false); if(!$result) { sql_query(" ALTER TABLE `{$g4['shop_cart_table']}` ADD `uq_id` BIGINT(20) unsigned NOT NULL AFTER `ct_id` ", false); sql_query(" ALTER TABLE `{$g4['shop_order_table']}` ADD `uq_id` BIGINT(20) unsigned NOT NULL AFTER `od_id` ", false); - sql_query(" ALTER TABLE `{$g4['shop_card_history_table']}` ADD `uq_id` BIGINT(20) unsigned NOT NULL AFTER `od_id` ", false); sql_query(" ALTER TABLE `{$g4['shop_order_table']}` MODIFY COLUMN od_id BIGINT(20) unsigned NOT NULL ", false); - sql_query(" ALTER TABLE `{$g4['shop_card_history_table']}` MODIFY COLUMN od_id BIGINT(20) unsigned NOT NULL ", false); sql_query(" ALTER TABLE `{$g4['shop_cart_table']}` ADD INDEX uq_id (uq_id) ", false); sql_query(" ALTER TABLE `{$g4['shop_order_table']}` ADD UNIQUE uq_id (uq_id) ", false); sql_query(" ALTER TABLE `{$g4['shop_order_table']}` DROP INDEX index1", false); @@ -417,4 +415,10 @@ if(!sql_query(" select it_mobile_name from {$g4['shop_item_table']} limit 1 ", f sql_query( " ALTER TABLE `{$g4['shop_item_table']}` ADD `it_mobile_name` VARCHAR(255) NOT NULL DEFAULT '' AFTER `it_name` ", true); } + +// od_app_no 필드 추가 +if(!sql_query(" select od_app_no from {$g4['shop_order_table']} limit 1 ", false)) { + sql_query(" ALTER TABLE `{$g4['shop_order_table']}` + ADD `od_app_no` varchar(20) NOT NULL DEFAULT '' AFTER `od_tno` ", true); +} ?> diff --git a/install/install_db.php b/install/install_db.php index 0c414c645..b8970e064 100644 --- a/install/install_db.php +++ b/install/install_db.php @@ -472,7 +472,6 @@ if($shop_install) { fwrite($f, "define('SHOP_TABLE_PREFIX', '{$shop_prefix}');\n\n"); fwrite($f, "\$g4['shop_default_table'] = SHOP_TABLE_PREFIX.'default'; // 쇼핑몰설정 테이블\n"); fwrite($f, "\$g4['shop_banner_table'] = SHOP_TABLE_PREFIX.'banner'; // 배너 테이블\n"); - fwrite($f, "\$g4['shop_card_history_table'] = SHOP_TABLE_PREFIX.'card_history'; // 전자결제이력 테이블\n"); fwrite($f, "\$g4['shop_cart_table'] = SHOP_TABLE_PREFIX.'cart'; // 장바구니 테이블\n"); fwrite($f, "\$g4['shop_category_table'] = SHOP_TABLE_PREFIX.'category'; // 상품분류 테이블\n"); fwrite($f, "\$g4['shop_content_table'] = SHOP_TABLE_PREFIX.'content'; // 내용(컨텐츠)정보 테이블\n"); diff --git a/install/shop.sql b/install/shop.sql index 2e15429f6..0d13708a5 100644 --- a/install/shop.sql +++ b/install/shop.sql @@ -22,31 +22,6 @@ CREATE TABLE IF NOT EXISTS `shop_banner` ( -- -------------------------------------------------------- --- --- Table structure for table `shop_card_history` --- - -DROP TABLE IF EXISTS `shop_card_history`; -CREATE TABLE IF NOT EXISTS `shop_card_history` ( - `cd_id` int(11) NOT NULL AUTO_INCREMENT, - `od_id` bigint(20) unsigned NOT NULL, - `cd_mall_id` varchar(20) NOT NULL DEFAULT '', - `cd_amount` int(11) NOT NULL DEFAULT '0', - `cd_app_no` varchar(20) NOT NULL DEFAULT '', - `cd_app_rt` varchar(8) NOT NULL DEFAULT '', - `cd_trade_ymd` date NOT NULL DEFAULT '0000-00-00', - `cd_trade_hms` time NOT NULL DEFAULT '00:00:00', - `cd_quota` char(2) NOT NULL DEFAULT '', - `cd_opt01` varchar(255) NOT NULL DEFAULT '', - `cd_opt02` varchar(255) NOT NULL DEFAULT '', - `cd_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `cd_ip` varchar(25) NOT NULL DEFAULT '', - PRIMARY KEY (`cd_id`), - KEY `od_id` (`od_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - --- -------------------------------------------------------- - -- -- Table structure for table `shop_cart` -- @@ -617,6 +592,7 @@ CREATE TABLE IF NOT EXISTS `shop_order` ( `od_hope_date` date NOT NULL DEFAULT '0000-00-00', `od_settle_case` varchar(255) NOT NULL DEFAULT '', `od_tno` varchar(255) NOT NULL DEFAULT '', + `od_app_no` varchar(20) NOT NULL DEFAULT '', `od_escrow` tinyint(4) NOT NULL DEFAULT '0', `od_tax_flag` tinyint(4) NOT NULL DEFAULT '0', `od_tax_mny` int(11) NOT NULL DEFAULT '0', diff --git a/mobile/shop/kcp/pp_ax_hub_result.php b/mobile/shop/kcp/pp_ax_hub_result.php deleted file mode 100644 index caf423521..000000000 --- a/mobile/shop/kcp/pp_ax_hub_result.php +++ /dev/null @@ -1,113 +0,0 @@ - \ No newline at end of file diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php index a412358f7..c2dbc8d35 100644 --- a/mobile/shop/orderformupdate.php +++ b/mobile/shop/orderformupdate.php @@ -355,6 +355,7 @@ else if ($od_settle_case == "신용카드") $od_temp_amount = $i_amount; $od_tno = $tno; + $od_app_no = $app_no; $od_receipt_amount = $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); @@ -431,6 +432,7 @@ $sql = " insert {$g4['shop_order_table']} od_bank_account = '$od_bank_account', od_receipt_time = '$od_receipt_time', od_tno = '$od_tno', + od_app_no = '$od_app_no', od_escrow = '$od_escrow', od_tax_flag = '{$default['de_tax_flag_use']}', od_tax_mny = '$od_tax_mny', @@ -487,9 +489,6 @@ if(!$result) { if ($is_member && $od_receipt_point) insert_point($member['mb_id'], (-1) * $od_receipt_point, "주문번호 $od_id 결제"); -// PG 결제내역기록 -include_once(G4_MSHOP_PATH.'/kcp/pp_ax_hub_result.php'); - $od_memo = nl2br(htmlspecialchars2(stripslashes($od_memo))) . " "; // 쿠폰사용내역기록 diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php index cf5bf01f7..051ffeeae 100644 --- a/mobile/shop/orderinquiryview.php +++ b/mobile/shop/orderinquiryview.php @@ -359,11 +359,8 @@ include_once(G4_MSHOP_PATH.'/_head.php'); $disp_bank = true; $disp_receipt = false; if($od['od_settle_case'] == '신용카드') { - $sql = " select * from {$g4['shop_card_history_table']} where od_id = '{$od['od_id']}' "; - $cd = sql_fetch($sql); - $app_no_subj = '승인번호'; - $app_no = $cd['cd_app_no']; + $app_no = $od['od_app_no']; $disp_bank = false; $disp_receipt = true; } else if($od['od_settle_case'] == '휴대폰') { diff --git a/shop/kcp/pp_ax_hub_result.php b/shop/kcp/pp_ax_hub_result.php deleted file mode 100644 index 353d15e4c..000000000 --- a/shop/kcp/pp_ax_hub_result.php +++ /dev/null @@ -1,129 +0,0 @@ - \ No newline at end of file diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php index 4aa93547d..1124ddc90 100644 --- a/shop/orderformupdate.php +++ b/shop/orderformupdate.php @@ -349,6 +349,7 @@ else if ($od_settle_case == "신용카드") $od_temp_amount = $i_amount; $od_tno = $tno; + $od_app_no = $app_no; $od_receipt_amount = $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); @@ -425,6 +426,7 @@ $sql = " insert {$g4['shop_order_table']} od_bank_account = '$od_bank_account', od_receipt_time = '$od_receipt_time', od_tno = '$od_tno', + od_app_no = '$od_app_no', od_escrow = '$od_escrow', od_tax_flag = '{$default['de_tax_flag_use']}', od_tax_mny = '$od_tax_mny', @@ -480,9 +482,6 @@ if(!$result) { if ($is_member && $od_receipt_point) insert_point($member['mb_id'], (-1) * $od_receipt_point, "주문번호 $od_id 결제"); -// PG 결제내역기록 -include_once(G4_SHOP_PATH.'/kcp/pp_ax_hub_result.php'); - $od_memo = nl2br(htmlspecialchars2(stripslashes($od_memo))) . " "; diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php index b93267046..24a869ff1 100644 --- a/shop/orderinquiryview.php +++ b/shop/orderinquiryview.php @@ -372,11 +372,8 @@ if(openwin != null) { $disp_bank = true; $disp_receipt = false; if($od['od_settle_case'] == '신용카드') { - $sql = " select * from {$g4['shop_card_history_table']} where od_id = '{$od['od_id']}' "; - $cd = sql_fetch($sql); - $app_no_subj = '승인번호'; - $app_no = $cd['cd_app_no']; + $app_no = $od['od_app_no']; $disp_bank = false; $disp_receipt = true; } else if($od['od_settle_case'] == '휴대폰') {