diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index 6d4637e80..44c890d3e 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -36,7 +36,7 @@ save_order_point("완료"); //------------------------------------------------------------------------------ $sql = " select * from {$g5['g5_shop_order_table']} where od_id = '$od_id' "; $od = sql_fetch($sql); -if (!$od['od_id']) { +if (! (isset($od['od_id']) && $od['od_id'])) { alert("해당 주문번호로 주문서가 존재하지 않습니다."); } @@ -101,9 +101,9 @@ if(!sql_query(" select od_pg from {$g5['g5_shop_order_table']} limit 1 ", false) // LG 현금영수증 JS if($od['od_pg'] == 'lg') { if($default['de_card_test']) { - echo ''.PHP_EOL; + echo ''.PHP_EOL; } else { - echo ''.PHP_EOL; + echo ''.PHP_EOL; } } diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php index ba7a78e8c..2ac0cab53 100644 --- a/mobile/shop/orderinquiryview.php +++ b/mobile/shop/orderinquiryview.php @@ -17,9 +17,9 @@ include_once(G5_MSHOP_PATH.'/_head.php'); // LG 현금영수증 JS if($od['od_pg'] == 'lg') { if($default['de_card_test']) { - echo ''.PHP_EOL; + echo ''.PHP_EOL; } else { - echo ''.PHP_EOL; + echo ''.PHP_EOL; } } ?> diff --git a/mobile/shop/personalpayresult.php b/mobile/shop/personalpayresult.php index 579b3b5b9..4655814e2 100644 --- a/mobile/shop/personalpayresult.php +++ b/mobile/shop/personalpayresult.php @@ -3,7 +3,7 @@ include_once('./_common.php'); $sql = "select * from {$g5['g5_shop_personalpay_table']} where pp_id = '$pp_id' "; $pp = sql_fetch($sql); -if (!$pp['pp_id'] || (md5($pp['pp_id'].$pp['pp_time'].$_SERVER['REMOTE_ADDR']) != get_session('ss_personalpay_uid'))) { +if (! (isset($pp['pp_id']) && $pp['pp_id']) || (md5($pp['pp_id'].$pp['pp_time'].$_SERVER['REMOTE_ADDR']) != get_session('ss_personalpay_uid'))) { if( isset($_GET['ini_noti']) && $pp['pp_tno'] ){ alert("해당 개인결제는 정상적으로 결제되었습니다.", G5_SHOP_URL."/personalpay.php"); } else { @@ -20,9 +20,9 @@ include_once(G5_MSHOP_PATH.'/_head.php'); // LG 현금영수증 JS if($pp['pp_pg'] == 'lg') { if($default['de_card_test']) { - echo ''.PHP_EOL; + echo ''.PHP_EOL; } else { - echo ''.PHP_EOL; + echo ''.PHP_EOL; } } ?> diff --git a/shop.config.php b/shop.config.php index f1b5c24fa..bd219cdec 100644 --- a/shop.config.php +++ b/shop.config.php @@ -82,6 +82,18 @@ if( !isset($g5['g5_shop_post_log_table']) || !$g5['g5_shop_post_log_table'] ){ // 옵션 ID 특수문자 필터링 패턴 define('G5_OPTION_ID_FILTER', '/[\'\"\\\'\\\"]/'); +if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') { + // 토스페이먼츠 현금영수증 실결제 URL 상수 + define('SHOP_TOSSPAYMENTS_CASHRECEIPT_REAL_JS', 'https://pgweb.tosspayments.com/WEB_SERVER/js/receipt_link.js'); + // 토스페이먼츠 현금영수증 테스트 URL 상수 + define('SHOP_TOSSPAYMENTS_CASHRECEIPT_TEST_JS', 'https://pgweb.tosspayments.com:7085/WEB_SERVER/js/receipt_link.js'); +} else { + // 토스페이먼츠 현금영수증 실결제 URL 상수 + define('SHOP_TOSSPAYMENTS_CASHRECEIPT_REAL_JS', 'http://pgweb.tosspayments.com/WEB_SERVER/js/receipt_link.js'); + // 토스페이먼츠 현금영수증 테스트 URL 상수 + define('SHOP_TOSSPAYMENTS_CASHRECEIPT_TEST_JS', 'http://pgweb.tosspayments.com:7085/WEB_SERVER/js/receipt_link.js'); +} + /* // 주문상태 상수 define('G5_OD_STATUS_ORDER' , '입금확인중'); diff --git a/shop/lg/taxsave_result.php b/shop/lg/taxsave_result.php index 41ded6cae..3f3b6581d 100644 --- a/shop/lg/taxsave_result.php +++ b/shop/lg/taxsave_result.php @@ -189,9 +189,9 @@ $g5['title'] = ''; include_once(G5_PATH.'/head.sub.php'); if($default['de_card_test']) { - echo ''.PHP_EOL; + echo ''.PHP_EOL; } else { - echo ''.PHP_EOL; + echo ''.PHP_EOL; } switch($LGD_PAYTYPE) { diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php index 9437c1b3d..2eaf9317d 100644 --- a/shop/orderinquiryview.php +++ b/shop/orderinquiryview.php @@ -51,9 +51,9 @@ include_once('./_head.php'); // LG 현금영수증 JS if($od['od_pg'] == 'lg') { if($default['de_card_test']) { - echo ''.PHP_EOL; + echo ''.PHP_EOL; } else { - echo ''.PHP_EOL; + echo ''.PHP_EOL; } } ?> diff --git a/shop/personalpayresult.php b/shop/personalpayresult.php index b01625b7b..6ff820ead 100644 --- a/shop/personalpayresult.php +++ b/shop/personalpayresult.php @@ -23,9 +23,9 @@ include_once('./_head.php'); // LG 현금영수증 JS if($pp['pp_pg'] == 'lg') { if($default['de_card_test']) { - echo ''.PHP_EOL; + echo ''.PHP_EOL; } else { - echo ''.PHP_EOL; + echo ''.PHP_EOL; } } ?> diff --git a/theme/basic/shop/orderinquiryview.php b/theme/basic/shop/orderinquiryview.php index 7f36520e4..48f9823a6 100644 --- a/theme/basic/shop/orderinquiryview.php +++ b/theme/basic/shop/orderinquiryview.php @@ -7,9 +7,9 @@ include_once('./_head.php'); // LG 현금영수증 JS if($od['od_pg'] == 'lg') { if($default['de_card_test']) { - echo ''.PHP_EOL; + echo ''.PHP_EOL; } else { - echo ''.PHP_EOL; + echo ''.PHP_EOL; } } ?>