diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index 1815dbfd1..165b429c0 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -491,8 +491,13 @@ if(!sql_query(" select ad_addr3 from {$g5['g5_shop_order_address_table']} limit 현금영수증 - - 현금영수증 확인 + + 현금영수증 확인 현금영수증 발급 diff --git a/extend/shop.extend.php b/extend/shop.extend.php index 9a0759018..82f1d7d4c 100644 --- a/extend/shop.extend.php +++ b/extend/shop.extend.php @@ -121,4 +121,13 @@ $info['od_misu'] // 미수금액 //============================================================================== // 쇼핑몰 미수금 등의 주문정보 //============================================================================== + +// 매출전표 url 설정 +if($default['de_card_test']) { + define('G5_BILL_RECEIPT_URL', 'https://testadmin8.kcp.co.kr/assist/bill.BillAction.do?cmd='); + define('G5_CASH_RECEIPT_URL', 'https://testadmin8.kcp.co.kr/Modules/Service/Cash/Cash_Bill_Common_View.jsp?term_id=PGNW'); +} else { + define('G5_BILL_RECEIPT_URL', 'https://admin8.kcp.co.kr/assist/bill.BillAction.do?cmd='); + define('G5_CASH_RECEIPT_URL', 'https://admin8.kcp.co.kr/Modules/Service/Cash/Cash_Bill_Common_View.jsp?term_id=PGNW'); +} ?> \ No newline at end of file diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php index 1cebec519..bb70aeca7 100644 --- a/mobile/shop/orderinquiryview.php +++ b/mobile/shop/orderinquiryview.php @@ -21,6 +21,8 @@ $settle_case = $od['od_settle_case']; $g5['title'] = '주문상세내역'; include_once(G5_MSHOP_PATH.'/_head.php'); + +require './settle_kcp.inc.php'; ?>
@@ -300,15 +302,17 @@ include_once(G5_MSHOP_PATH.'/_head.php'); - 영수증 출력 + 영수증 출력 - 영수증 출력 + 영수증 출력 @@ -350,8 +354,9 @@ include_once(G5_MSHOP_PATH.'/_head.php'); - 현금영수증 확인하기 + 현금영수증 확인하기
@@ -125,15 +127,17 @@ include_once(G5_MSHOP_PATH.'/_head.php'); - 영수증 출력 + 영수증 출력 - 영수증 출력 + 영수증 출력 diff --git a/mobile/shop/settle_kcp.inc.php b/mobile/shop/settle_kcp.inc.php index db436231c..96f5e1319 100644 --- a/mobile/shop/settle_kcp.inc.php +++ b/mobile/shop/settle_kcp.inc.php @@ -7,11 +7,10 @@ $g_conf_log_level = '3'; // 변경불가 $g_conf_gw_port = '8090'; // 포트번호(변경불가) $g_conf_key_dir = ''; -$g_conf_log_dir = ''; +$g_conf_log_dir = G5_SHOP_PATH.'/kcp/log'; if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { $g_conf_key_dir = G5_SHOP_PATH.'/kcp/bin/pub.key'; - $g_conf_log_dir = G5_SHOP_PATH.'/kcp/log'; } if ($default['de_card_test']) { diff --git a/shop/kcp/pp_ax_hub.php b/shop/kcp/pp_ax_hub.php index 83ea20c9f..2ffbbf0d7 100644 --- a/shop/kcp/pp_ax_hub.php +++ b/shop/kcp/pp_ax_hub.php @@ -17,11 +17,10 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 $g_conf_home_dir = G5_SHOP_PATH.'/kcp'; $g_conf_key_dir = ''; - $g_conf_log_dir = ''; + $g_conf_log_dir = G5_SHOP_PATH.'/kcp/log'; if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { $g_conf_key_dir = G5_SHOP_PATH.'/kcp/bin/pub.key'; - $g_conf_log_dir = G5_SHOP_PATH.'/kcp/log'; } $g_conf_site_cd = $_POST['site_cd']; diff --git a/shop/kcp/pp_cli_result.php b/shop/kcp/pp_cli_result.php index 2eb2219af..e571ab925 100644 --- a/shop/kcp/pp_cli_result.php +++ b/shop/kcp/pp_cli_result.php @@ -1,5 +1,7 @@ diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php index 34d270572..2734aa784 100644 --- a/shop/orderinquiryview.php +++ b/shop/orderinquiryview.php @@ -26,6 +26,8 @@ $settle_case = $od['od_settle_case']; $g5['title'] = '주문상세내역'; include_once('./_head.php'); + +require './settle_kcp.inc.php'; ?> @@ -324,15 +326,17 @@ if(openwin != null) { - 영수증 출력 + 영수증 출력 - 영수증 출력 + 영수증 출력 @@ -374,8 +378,10 @@ if(openwin != null) { - 현금영수증 확인하기 + 현금영수증 확인하기 @@ -138,15 +140,17 @@ if(openwin != null) { - 영수증 출력 + 영수증 출력 - 영수증 출력 + 영수증 출력