From 44ee770f9290ae697f9c341c47511ba25cb724d7 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 26 Mar 2013 09:37:48 +0900 Subject: [PATCH 1/7] =?UTF-8?q?uq=5Fid=20=ED=85=8C=EC=9D=B4=EB=B8=94=20?= =?UTF-8?q?=EC=B2=B4=ED=81=AC=20=EC=BF=BC=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/shop.extend.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extend/shop.extend.php b/extend/shop.extend.php index cfceaef76..e4a0b194a 100644 --- a/extend/shop.extend.php +++ b/extend/shop.extend.php @@ -97,7 +97,7 @@ $g4[yc4_cardpg][dacom_xpay] = "https://pgweb.dacom.net"; $default = sql_fetch(" select * from {$g4['yc4_default_table']} "); // uniqid 테이블이 없을 경우 생성 -if(!sql_query(" select 1 from {$g4['uniqid_table']} limit 1 ", false)) { +if(!sql_query(" select uq_id from {$g4['uniqid_table']} limit 1 ", false)) { sql_query(" CREATE TABLE IF NOT EXISTS `{$g4['uniqid_table']}` ( `uq_id` bigint(20) unsigned NOT NULL, PRIMARY KEY (`uq_id`) From b1a3d3ad50499a42492a840b674aa4a11cfa438e Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 26 Mar 2013 09:38:09 +0900 Subject: [PATCH 2/7] =?UTF-8?q?g4=5Fpath=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/kcp/_common.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/shop/kcp/_common.php b/shop/kcp/_common.php index 9f24ab25a..e27b34a91 100644 --- a/shop/kcp/_common.php +++ b/shop/kcp/_common.php @@ -1,4 +1,3 @@ \ No newline at end of file From 2217836eb561f9f1de429a095a735a127124d619 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 26 Mar 2013 11:16:38 +0900 Subject: [PATCH 3/7] =?UTF-8?q?order=20=ED=85=8C=EC=9D=B4=EB=B8=94?= =?UTF-8?q?=EC=9D=98=20on=5Fuid=20unique=20index=20=EC=82=AD=EC=A0=9C=20?= =?UTF-8?q?=EC=BF=BC=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/shop.extend.php | 1 + 1 file changed, 1 insertion(+) diff --git a/extend/shop.extend.php b/extend/shop.extend.php index e4a0b194a..73e8b1fcf 100644 --- a/extend/shop.extend.php +++ b/extend/shop.extend.php @@ -114,6 +114,7 @@ if(!$result) { sql_query(" ALTER TABLE `{$g4['yc4_order_table']}` MODIFY COLUMN od_id BIGINT(20) unsigned NOT NULL ", false); sql_query(" ALTER TABLE `{$g4['yc4_cart_table']}` ADD INDEX uq_id (uq_id) ", false); sql_query(" ALTER TABLE `{$g4['yc4_order_table']}` ADD UNIQUE uq_id (uq_id) ", false); + sql_query(" ALTER TABLE `{$g4['yc4_order_table']}` DROP INDEX index1", false); } //============================================================================== From 0a74a5d230a71bba1db453179aed2d219033bfc7 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 26 Mar 2013 13:23:38 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=EC=84=A4?= =?UTF-8?q?=EC=A0=95=EC=97=90=EC=84=9C=20mysql=20=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EB=B3=B4=EC=9D=B4=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/configform.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php index b874b8092..290f03f13 100644 --- a/adm/shop_admin/configform.php +++ b/adm/shop_admin/configform.php @@ -754,9 +754,9 @@ $pg_anchor ="
    MYSQL USER -
    + MYSQL DB -
    + 서버 IP @@ -847,10 +847,10 @@ function byte_check(el_cont, el_byte)
- - + From 1f9c362292eb08c8c827abe68bc9bfe0cf364812 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 26 Mar 2013 14:30:33 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=EA=B2=B0=EC=A0=9C=20=EB=AA=A8=EB=93=88=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EC=9E=91=EC=97=85=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + extend/shop.extend.php | 1 + shop/kcp/log/201303/26_pp_cli.log | 25 ++++++++++++++++ shop/orderform.php | 29 +++++++++++++------ shop/orderformupdate.php | 48 ++++++++++++++++++++----------- shop/orderinquiryview.php | 30 ++++++++++++++++++- shop/settle_kcp_common.php | 36 ++++++++++++----------- 7 files changed, 127 insertions(+), 43 deletions(-) create mode 100644 shop/kcp/log/201303/26_pp_cli.log diff --git a/.gitignore b/.gitignore index 64293a626..eeac49274 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ data dbconfig.php +log diff --git a/extend/shop.extend.php b/extend/shop.extend.php index 73e8b1fcf..e8bce80b2 100644 --- a/extend/shop.extend.php +++ b/extend/shop.extend.php @@ -112,6 +112,7 @@ if(!$result) { sql_query(" ALTER TABLE `{$g4['yc4_order_table']}` ADD `uq_id` BIGINT(20) unsigned NOT NULL AFTER `od_id` ", false); sql_query(" ALTER TABLE `{$g4['yc4_card_history_table']}` ADD `uq_id` BIGINT(20) unsigned NOT NULL AFTER `od_id` ", false); sql_query(" ALTER TABLE `{$g4['yc4_order_table']}` MODIFY COLUMN od_id BIGINT(20) unsigned NOT NULL ", false); + sql_query(" ALTER TABLE `{$g4['yc4_card_history_table']}` MODIFY COLUMN od_id BIGINT(20) unsigned NOT NULL ", false); sql_query(" ALTER TABLE `{$g4['yc4_cart_table']}` ADD INDEX uq_id (uq_id) ", false); sql_query(" ALTER TABLE `{$g4['yc4_order_table']}` ADD UNIQUE uq_id (uq_id) ", false); sql_query(" ALTER TABLE `{$g4['yc4_order_table']}` DROP INDEX index1", false); diff --git a/shop/kcp/log/201303/26_pp_cli.log b/shop/kcp/log/201303/26_pp_cli.log new file mode 100644 index 000000000..1064fc7f8 --- /dev/null +++ b/shop/kcp/log/201303/26_pp_cli.log @@ -0,0 +1,25 @@ +0326-110750 - 7296 - T00003QB32AibeOk - MSG : TX_START - site_cd=[T0000]+tx_cd=[00100000]+ordr_idxx=[13032609441253]+log_level=[3] +0326-110750 - 7296 - T00003QB32AibeOk - MSG : PG____ +0326-110750 - 7296 - T00003QB32AibeOk - MSG : PG__û____ +0326-110751 - 7296 - T00003QB32AibeOk - MSG : PG______ +0326-110751 - 7296 - T00003QB32AibeOk - MSG : TX_ENDED - res=[res_cd=0000res_msg=ópay_method=PACAorder_no=13032609441253res_en_msg=processing completedcard_cd=CCSScard_name=Ｚīacqu_cd=CCSSacqu_name=Ｚīcard_no=5310708000009287mcht_taxno=1138521083mall_taxno=1138521083ca_order_id=13032609441253tno=20130326962625amount=5000card_mny=5000coupon_mny=0escw_yn=Nvan_cd=VNKCapp_time=20130326110751van_apptime=20130326110751app_no=31756924bizx_numb=24450105quota=00noinf=Npg_txid=0326110751MP01AB7TL1WT0000000050000031756924partcanc_yn=Ycard_bin_type_01=0card_bin_type_02=0join_cd=0000] +0326-111822 - 7346 - T00003QBHKAibeOk - MSG : TX_START - site_cd=[T0000]+tx_cd=[00100000]+ordr_idxx=[13032609441253]+log_level=[3] +0326-111822 - 7346 - T00003QBHKAibeOk - MSG : PG____ +0326-111822 - 7346 - T00003QBHKAibeOk - MSG : PG__û____ +0326-111822 - 7346 - T00003QBHKAibeOk - MSG : PG______ +0326-111822 - 7346 - T00003QBHKAibeOk - MSG : TX_ENDED - res=[res_cd=0000res_msg=ópay_method=PACAorder_no=13032609441253res_en_msg=processing completedcard_cd=CCSScard_name=Ｚīacqu_cd=CCSSacqu_name=Ｚīcard_no=5310708000009287mcht_taxno=1138521083mall_taxno=1138521083ca_order_id=13032609441253tno=20130326962648amount=5000card_mny=5000coupon_mny=0escw_yn=Nvan_cd=VNKCapp_time=20130326111822van_apptime=20130326111822app_no=41661223bizx_numb=24450105quota=00noinf=Npg_txid=0326111822MP01AF7TYLB60000000050000041661223partcanc_yn=Ycard_bin_type_01=0card_bin_type_02=0join_cd=0000] +0326-113357 - 7394 - T00003QBXBAibeOk - MSG : TX_START - site_cd=[T0000]+tx_cd=[00100000]+ordr_idxx=[13032609441253]+log_level=[3] +0326-113357 - 7394 - T00003QBXBAibeOk - MSG : PG____ +0326-113357 - 7394 - T00003QBXBAibeOk - MSG : PG__û____ +0326-113357 - 7394 - T00003QBXBAibeOk - MSG : PG______ +0326-113357 - 7394 - T00003QBXBAibeOk - MSG : TX_ENDED - res=[res_cd=0000res_msg=ópay_method=PACAorder_no=13032609441253res_en_msg=processing completedcard_cd=CCSScard_name=Ｚīacqu_cd=CCSSacqu_name=Ｚīcard_no=5310708000009287mcht_taxno=1138521083mall_taxno=1138521083ca_order_id=13032609441253tno=20130326962663amount=5000card_mny=5000coupon_mny=0escw_yn=Nvan_cd=VNKCapp_time=20130326113357van_apptime=20130326113357app_no=62333915bizx_numb=24450105quota=00noinf=Npg_txid=0326113357MP01AF7UIMMY0000000050000062333915partcanc_yn=Ycard_bin_type_01=0card_bin_type_02=0join_cd=0000] +0326-115452 - 7493 - T00003QBs6AibeOk - MSG : TX_START - site_cd=[T0000]+tx_cd=[00100000]+ordr_idxx=[13032609441253]+log_level=[3] +0326-115452 - 7493 - T00003QBs6AibeOk - MSG : PG____ +0326-115452 - 7493 - T00003QBs6AibeOk - MSG : PG__û____ +0326-115452 - 7493 - T00003QBs6AibeOk - MSG : PG______ +0326-115452 - 7493 - T00003QBs6AibeOk - MSG : TX_ENDED - res=[res_cd=0000res_msg=ópay_method=PACAorder_no=13032609441253res_en_msg=processing completedcard_cd=CCSScard_name=Ｚīacqu_cd=CCSSacqu_name=Ｚīcard_no=5310708000009287mcht_taxno=1138521083mall_taxno=1138521083ca_order_id=13032609441253tno=20130326962692amount=5000card_mny=5000coupon_mny=0escw_yn=Nvan_cd=VNKCapp_time=20130326115453van_apptime=20130326115453app_no=56365335bizx_numb=24450105quota=00noinf=Npg_txid=0326115453MP01AD7V9J8B0000000050000056365335partcanc_yn=Ycard_bin_type_01=0card_bin_type_02=0join_cd=0000] +0326-134833 - 8007 - T00003QDmNAibeOk - MSG : TX_START - site_cd=[T0000]+tx_cd=[00100000]+ordr_idxx=[13032613480042]+log_level=[3] +0326-134833 - 8007 - T00003QDmNAibeOk - MSG : PG____ +0326-134833 - 8007 - T00003QDmNAibeOk - MSG : PG__û____ +0326-134835 - 8007 - T00003QDmNAibeOk - MSG : PG______ +0326-134835 - 8007 - T00003QDmNAibeOk - MSG : TX_ENDED - res=[res_cd=0000res_msg=ópay_method=PAVCorder_no=13032613480042tno=20130326962727van_txid=DP002013032600147047amount=5000escw_yn=Nvan_cd=SCWRbankcode=BK04bankname=depositor=KCP ׽Ʈaccount=T0400000040774app_time=20130326134836van_apptime=20130326134834mall_taxno=1138521083va_date=20130402235959va_name=ְ] diff --git a/shop/orderform.php b/shop/orderform.php index 53e494c47..4f32a1f79 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -29,10 +29,8 @@ $s_uq_id = $tmp_uq_id; include_once('./cartsub.inc.php'); // 새로운 주문번호 생성 -if(!get_session('ss_order_uniqid')) { - set_session('ss_order_uniqid', get_uniqid()); -} -$od_uq_id = get_session('ss_order_uniqid'); +$od_id = get_uniqid(); +set_session('ss_order_uniqid', $od_id); if (file_exists("./settle_{$default['de_card_pg']}.inc.php")) { include "./settle_{$default['de_card_pg']}.inc.php"; @@ -168,7 +166,7 @@ $order_action_url = G4_HTTPS_SHOP_URL.'/orderformupdate.php'; */ ?> - + @@ -619,9 +617,16 @@ $order_action_url = G4_HTTPS_SHOP_URL.'/orderformupdate.php';
-

-   +

+ + @@ -844,7 +849,15 @@ function forderform_check(f) f.rcvr_add1.value = f.od_b_addr1.value; f.rcvr_add2.value = f.od_b_addr2.value; - return true; + if(f.pay_method.value != "무통장") { + if(jsf__pay( f )) { + return true; + } else { + return false; + } + } else { + return true; + } } // 구매자 정보와 동일합니다. diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php index 4066de718..a75c9314c 100644 --- a/shop/orderformupdate.php +++ b/shop/orderformupdate.php @@ -117,14 +117,15 @@ if ($od_settle_case == "무통장") } else if ($od_settle_case == "계좌이체") { - include "./kcp/pp_ax_hub.php"; + include G4_SHOP_PATH.'/kcp/pp_ax_hub.php'; $od_temp_bank = $i_amount; $od_temp_point = $i_temp_point; + $od_escrow1 = $tno; $od_receipt_bank = $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_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 = $od_settle_case; $od_deposit_name = $od_name; $bank_name = iconv("cp949", "utf8", $bank_name); @@ -134,12 +135,13 @@ else if ($od_settle_case == "계좌이체") } else if ($od_settle_case == "가상계좌") { - include "./kcp/pp_ax_hub.php"; + include G4_SHOP_PATH.'/kcp/pp_ax_hub.php'; $od_temp_bank = $i_amount; $od_temp_point = $i_temp_point; $od_receipt_point = 0; + $od_escrow1 = $tno; $od_receipt_amount = 0; $bankname = iconv("cp949", "utf8", $bankname); $depositor = iconv("cp949", "utf8", $depositor); @@ -148,28 +150,30 @@ else if ($od_settle_case == "가상계좌") } else if ($od_settle_case == "휴대폰") { - include "./kcp/pp_ax_hub.php"; + include G4_SHOP_PATH.'/kcp/pp_ax_hub.php'; $od_temp_bank = $i_amount; $od_temp_point = $i_temp_point; + $od_escrow1 = $tno; $od_receipt_hp = $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_hp_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 = $commid.' '.$mobile_no; $same_amount_check = true; $pg_receipt_amount = $amount; } else if ($od_settle_case == "신용카드") { - include "./kcp/pp_ax_hub.php"; + include G4_SHOP_PATH.'/kcp/pp_ax_hub.php'; $od_temp_card = $i_amount; $od_temp_point = $i_temp_point; + $od_escrow1 = $tno; $od_receipt_card = $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_card_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); $card_name = iconv("cp949", "utf8", $card_name); $od_bank_account = $card_name; $same_amount_check = true; @@ -183,7 +187,7 @@ else // 주문금액과 결제금액이 일치하는지 체크 if($same_amount_check) { if((int)$i_amount !== (int)$pg_receipt_amount) { - include "./kcp/pp_ax_hub_cancel.php"; // 결제취소처리 + include G4_SHOP_PATH.'/kcp/pp_ax_hub_cancel.php'; // 결제취소처리 die("Receipt Amount Error"); } @@ -230,6 +234,10 @@ $sql = " insert {$g4['yc4_order_table']} od_receipt_hp = '$od_receipt_hp', od_receipt_point = '$od_receipt_point', od_bank_account = '$od_bank_account', + od_bank_time = '$od_bank_time', + od_card_time = '$od_card_time', + od_hp_time = '$od_hp_time', + od_escrow1 = '$od_escrow1', od_shop_memo = '', od_hope_date = '$od_hope_date', od_time = '".G4_TIME_YMDHIS."', @@ -256,11 +264,14 @@ 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))) . " "; -include_once('./ordermail1.inc.php'); -include_once('./ordermail2.inc.php'); +include_once(G4_SHOP_PATH.'/ordermail1.inc.php'); +include_once(G4_SHOP_PATH.'/ordermail2.inc.php'); // SMS BEGIN -------------------------------------------------------- // 쇼핑몰 운영자가 수신자가 됨 @@ -287,14 +298,17 @@ if ($default['de_sms_use2'] && $receive_number) // SMS END -------------------------------------------------------- -// order_confirm 에서 사용하기 위해 tmp에 넣고 +// orderview 에서 사용하기 위해 tmp에 넣고 set_session('ss_temp_uq_id', $tmp_uq_id); -// ss_uq_id 기존자료 세션에서 제거 -if (get_session("ss_direct")) - set_session("ss_uq_direct", ""); -else - set_session("ss_uq_id", ""); +// 주문번호제거 +set_session('ss_order_uniqid', ''); -goto_url(G4_SHOP_URL.'./orderinquiryview.php?od_id='.$od_id.'&uq_id='.$tmp_uq_id); +// ss_uq_id 기존자료 세션에서 제거 +if (get_session('ss_direct')) + set_session('ss_uq_direct', ''); +else + set_session('ss_uq_id', ''); + +goto_url(G4_SHOP_URL.'/orderinquiryview.php?od_id='.$od_id.'&uq_id='.$tmp_uq_id); ?> diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php index 301506f6c..0620c3685 100644 --- a/shop/orderinquiryview.php +++ b/shop/orderinquiryview.php @@ -6,7 +6,7 @@ $token = md5(uniqid(rand(), true)); set_session("ss_token", $token); if (!$is_member) { - if (get_session("ss_uq_id_inquiry") != $_GET['uq_id']) + if (get_session("ss_temp_uq_id") != $_GET['uq_id']) alert("직접 링크로는 주문서 조회가 불가합니다.\\n\\n주문조회 화면을 통하여 조회하시기 바랍니다."); } @@ -34,6 +34,13 @@ $s_page = 'orderinquiryview.php'; include './cartsub.inc.php'; ?> + +
: 주문대기, : 상품준비중, : 배송중, : 배송완료
@@ -357,6 +364,27 @@ if ($default['de_taxsave_use']) {

+ +
+
+
+모의입금처리 +

관리자가 가상계좌 테스트를 한 경우에만 보입니다.

+
+
+
+
+

+ +
+
+
+
+ + \ No newline at end of file diff --git a/shop/settle_kcp_common.php b/shop/settle_kcp_common.php index d33c9d122..488e2d5be 100644 --- a/shop/settle_kcp_common.php +++ b/shop/settle_kcp_common.php @@ -1,7 +1,7 @@ Date: Tue, 26 Mar 2013 14:35:06 +0900 Subject: [PATCH 6/7] =?UTF-8?q?kcp=20=EB=A1=9C=EA=B7=B8=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/kcp/log/201303/26_pp_cli.log | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 shop/kcp/log/201303/26_pp_cli.log diff --git a/shop/kcp/log/201303/26_pp_cli.log b/shop/kcp/log/201303/26_pp_cli.log deleted file mode 100644 index 1064fc7f8..000000000 --- a/shop/kcp/log/201303/26_pp_cli.log +++ /dev/null @@ -1,25 +0,0 @@ -0326-110750 - 7296 - T00003QB32AibeOk - MSG : TX_START - site_cd=[T0000]+tx_cd=[00100000]+ordr_idxx=[13032609441253]+log_level=[3] -0326-110750 - 7296 - T00003QB32AibeOk - MSG : PG____ -0326-110750 - 7296 - T00003QB32AibeOk - MSG : PG__û____ -0326-110751 - 7296 - T00003QB32AibeOk - MSG : PG______ -0326-110751 - 7296 - T00003QB32AibeOk - MSG : TX_ENDED - res=[res_cd=0000res_msg=ópay_method=PACAorder_no=13032609441253res_en_msg=processing completedcard_cd=CCSScard_name=Ｚīacqu_cd=CCSSacqu_name=Ｚīcard_no=5310708000009287mcht_taxno=1138521083mall_taxno=1138521083ca_order_id=13032609441253tno=20130326962625amount=5000card_mny=5000coupon_mny=0escw_yn=Nvan_cd=VNKCapp_time=20130326110751van_apptime=20130326110751app_no=31756924bizx_numb=24450105quota=00noinf=Npg_txid=0326110751MP01AB7TL1WT0000000050000031756924partcanc_yn=Ycard_bin_type_01=0card_bin_type_02=0join_cd=0000] -0326-111822 - 7346 - T00003QBHKAibeOk - MSG : TX_START - site_cd=[T0000]+tx_cd=[00100000]+ordr_idxx=[13032609441253]+log_level=[3] -0326-111822 - 7346 - T00003QBHKAibeOk - MSG : PG____ -0326-111822 - 7346 - T00003QBHKAibeOk - MSG : PG__û____ -0326-111822 - 7346 - T00003QBHKAibeOk - MSG : PG______ -0326-111822 - 7346 - T00003QBHKAibeOk - MSG : TX_ENDED - res=[res_cd=0000res_msg=ópay_method=PACAorder_no=13032609441253res_en_msg=processing completedcard_cd=CCSScard_name=Ｚīacqu_cd=CCSSacqu_name=Ｚīcard_no=5310708000009287mcht_taxno=1138521083mall_taxno=1138521083ca_order_id=13032609441253tno=20130326962648amount=5000card_mny=5000coupon_mny=0escw_yn=Nvan_cd=VNKCapp_time=20130326111822van_apptime=20130326111822app_no=41661223bizx_numb=24450105quota=00noinf=Npg_txid=0326111822MP01AF7TYLB60000000050000041661223partcanc_yn=Ycard_bin_type_01=0card_bin_type_02=0join_cd=0000] -0326-113357 - 7394 - T00003QBXBAibeOk - MSG : TX_START - site_cd=[T0000]+tx_cd=[00100000]+ordr_idxx=[13032609441253]+log_level=[3] -0326-113357 - 7394 - T00003QBXBAibeOk - MSG : PG____ -0326-113357 - 7394 - T00003QBXBAibeOk - MSG : PG__û____ -0326-113357 - 7394 - T00003QBXBAibeOk - MSG : PG______ -0326-113357 - 7394 - T00003QBXBAibeOk - MSG : TX_ENDED - res=[res_cd=0000res_msg=ópay_method=PACAorder_no=13032609441253res_en_msg=processing completedcard_cd=CCSScard_name=Ｚīacqu_cd=CCSSacqu_name=Ｚīcard_no=5310708000009287mcht_taxno=1138521083mall_taxno=1138521083ca_order_id=13032609441253tno=20130326962663amount=5000card_mny=5000coupon_mny=0escw_yn=Nvan_cd=VNKCapp_time=20130326113357van_apptime=20130326113357app_no=62333915bizx_numb=24450105quota=00noinf=Npg_txid=0326113357MP01AF7UIMMY0000000050000062333915partcanc_yn=Ycard_bin_type_01=0card_bin_type_02=0join_cd=0000] -0326-115452 - 7493 - T00003QBs6AibeOk - MSG : TX_START - site_cd=[T0000]+tx_cd=[00100000]+ordr_idxx=[13032609441253]+log_level=[3] -0326-115452 - 7493 - T00003QBs6AibeOk - MSG : PG____ -0326-115452 - 7493 - T00003QBs6AibeOk - MSG : PG__û____ -0326-115452 - 7493 - T00003QBs6AibeOk - MSG : PG______ -0326-115452 - 7493 - T00003QBs6AibeOk - MSG : TX_ENDED - res=[res_cd=0000res_msg=ópay_method=PACAorder_no=13032609441253res_en_msg=processing completedcard_cd=CCSScard_name=Ｚīacqu_cd=CCSSacqu_name=Ｚīcard_no=5310708000009287mcht_taxno=1138521083mall_taxno=1138521083ca_order_id=13032609441253tno=20130326962692amount=5000card_mny=5000coupon_mny=0escw_yn=Nvan_cd=VNKCapp_time=20130326115453van_apptime=20130326115453app_no=56365335bizx_numb=24450105quota=00noinf=Npg_txid=0326115453MP01AD7V9J8B0000000050000056365335partcanc_yn=Ycard_bin_type_01=0card_bin_type_02=0join_cd=0000] -0326-134833 - 8007 - T00003QDmNAibeOk - MSG : TX_START - site_cd=[T0000]+tx_cd=[00100000]+ordr_idxx=[13032613480042]+log_level=[3] -0326-134833 - 8007 - T00003QDmNAibeOk - MSG : PG____ -0326-134833 - 8007 - T00003QDmNAibeOk - MSG : PG__û____ -0326-134835 - 8007 - T00003QDmNAibeOk - MSG : PG______ -0326-134835 - 8007 - T00003QDmNAibeOk - MSG : TX_ENDED - res=[res_cd=0000res_msg=ópay_method=PAVCorder_no=13032613480042tno=20130326962727van_txid=DP002013032600147047amount=5000escw_yn=Nvan_cd=SCWRbankcode=BK04bankname=depositor=KCP ׽Ʈaccount=T0400000040774app_time=20130326134836van_apptime=20130326134834mall_taxno=1138521083va_date=20130402235959va_name=ְ] From 0bc7658b473b01d9a5d233bb8eaf64f313a2954c Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 26 Mar 2013 14:58:48 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20on=5Fuid?= =?UTF-8?q?=EB=A5=BC=20uq=5Fid=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/deliverylist.php | 4 ++-- adm/shop_admin/deliverylistupdate.php | 8 ++++---- adm/shop_admin/index.php | 4 ++-- adm/shop_admin/invoicebundleupdate.php | 4 ++-- adm/shop_admin/itemformupdate.php | 2 +- adm/shop_admin/ordercartupdate.php | 6 +++--- adm/shop_admin/orderdelete.php | 8 ++++---- adm/shop_admin/orderform.php | 14 +++++++------- adm/shop_admin/orderlist.php | 6 +++--- adm/shop_admin/orderlist2.php | 8 ++++---- adm/shop_admin/ordermail.inc.php | 2 +- adm/shop_admin/orderprintresult.php | 20 ++++++++++---------- adm/shop_admin/orderstatuslist.php | 2 +- adm/shop_admin/sale1date.php | 4 ++-- adm/shop_admin/sale1month.php | 4 ++-- adm/shop_admin/sale1today.php | 4 ++-- adm/shop_admin/sale1year.php | 4 ++-- 17 files changed, 52 insertions(+), 52 deletions(-) diff --git a/adm/shop_admin/deliverylist.php b/adm/shop_admin/deliverylist.php index 4413c60cd..6a27f135b 100644 --- a/adm/shop_admin/deliverylist.php +++ b/adm/shop_admin/deliverylist.php @@ -34,7 +34,7 @@ if ($sel_ca_id != "") { if ($sel_field == "") $sel_field = "od_id"; $sql_common = " from {$g4['yc4_order_table']} a - left join {$g4['yc4_cart_table']} b on (a.on_uid=b.on_uid) + left join {$g4['yc4_cart_table']} b on (a.uq_id=b.uq_id) $sql_search "; // 테이블의 전체 레코드수만 얻음 @@ -154,7 +154,7 @@ for ($i=0; $row=mysql_fetch_array($result); $i++) $list = $i%2; echo " - + {$row['od_id']} $row[od_name] diff --git a/adm/shop_admin/deliverylistupdate.php b/adm/shop_admin/deliverylistupdate.php index 56ef5b331..3b23a43b8 100644 --- a/adm/shop_admin/deliverylistupdate.php +++ b/adm/shop_admin/deliverylistupdate.php @@ -36,18 +36,18 @@ for ($m=0; $m 0 diff --git a/adm/shop_admin/invoicebundleupdate.php b/adm/shop_admin/invoicebundleupdate.php index 549e69992..980317c75 100644 --- a/adm/shop_admin/invoicebundleupdate.php +++ b/adm/shop_admin/invoicebundleupdate.php @@ -23,7 +23,7 @@ while (($item = fgetcsv($handle, 1000, ",")) !== FALSE) if ($od_id && $od_invoice) { - $sql = " select od_id, on_uid, dl_id, od_invoice from {$g4['yc4_order_table']} where od_id = '$od_id' "; + $sql = " select od_id, uq_id, dl_id, od_invoice from {$g4['yc4_order_table']} where od_id = '$od_id' "; $row = sql_fetch($sql); //echo $sql; echo "
"; //print_r2($row); @@ -44,7 +44,7 @@ while (($item = fgetcsv($handle, 1000, ",")) !== FALSE) { $sql = " update {$g4['yc4_cart_table']} set ct_status = '$ct_status' - where on_uid = '{$row['on_uid']}' + where uq_id = '{$row['uq_id']}' and ct_status in ('주문', '준비', '배송', '완료') "; sql_query($sql); } diff --git a/adm/shop_admin/itemformupdate.php b/adm/shop_admin/itemformupdate.php index 399b7db0c..a9643e59a 100644 --- a/adm/shop_admin/itemformupdate.php +++ b/adm/shop_admin/itemformupdate.php @@ -20,7 +20,7 @@ function itemdelete($it_id) $sql = " select b.od_id from {$g4['yc4_cart_table']} a, {$g4['yc4_order_table']} b - where a.on_uid = b.on_uid + where a.uq_id = b.uq_id and a.it_id = '$it_id' and a.ct_status != '쇼핑' "; $result = sql_query($sql); diff --git a/adm/shop_admin/ordercartupdate.php b/adm/shop_admin/ordercartupdate.php index c1f7e7503..496c37f35 100644 --- a/adm/shop_admin/ordercartupdate.php +++ b/adm/shop_admin/ordercartupdate.php @@ -12,7 +12,7 @@ for ($i=0; $i<$cnt; $i++) $ct_id = $_POST['ct_id'][$i]; $sql = " select * from {$g4['yc4_cart_table']} - where on_uid = '$on_uid' + where uq_id = '$uq_id' and ct_id = '$ct_id' "; $ct = sql_fetch($sql); @@ -55,7 +55,7 @@ for ($i=0; $i<$cnt; $i++) { $point_use = 0; //insert_point($mb_id, (-1) * ($ct[ct_point] * $ct[ct_qty]), "주문번호 $od_id ($ct_id) 취소"); - delete_point($mb_id, "@delivery", $mb_id, "$od_id,$on_uid,$ct_id"); + delete_point($mb_id, "@delivery", $mb_id, "$od_id,$uq_id,$ct_id"); } // 히스토리에 남김 @@ -67,7 +67,7 @@ for ($i=0; $i<$cnt; $i++) ct_stock_use = '$stock_use', ct_status = '$ct_status', ct_history = CONCAT(ct_history,'$ct_history') - where on_uid = '$on_uid' + where uq_id = '$uq_id' and ct_id = '$ct_id' "; sql_query($sql); } diff --git a/adm/shop_admin/orderdelete.php b/adm/shop_admin/orderdelete.php index 454cee80b..cb09918b6 100644 --- a/adm/shop_admin/orderdelete.php +++ b/adm/shop_admin/orderdelete.php @@ -6,16 +6,16 @@ check_demo(); auth_check($auth[$sub_menu], "d"); -if ($od_id && $on_uid) +if ($od_id && $uq_id) { // 장바구니 삭제 - sql_query(" delete from {$g4['yc4_cart_table']} where on_uid = '$on_uid' "); + sql_query(" delete from {$g4['yc4_cart_table']} where uq_id = '$uq_id' "); // 카드결제내역 삭제 - sql_query(" delete from {$g4['yc4_card_history_table']} where od_id = '$od_id' and on_uid = '$on_uid' "); + sql_query(" delete from {$g4['yc4_card_history_table']} where od_id = '$od_id' and uq_id = '$uq_id' "); // 주문서 삭제 - sql_query(" delete from {$g4['yc4_order_table']} where od_id = '$od_id' and on_uid = '$on_uid' "); + sql_query(" delete from {$g4['yc4_order_table']} where od_id = '$od_id' and uq_id = '$uq_id' "); } if ($return_url) diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index 7729b9d87..307c6a622 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -45,14 +45,14 @@ if (!isset($order_not_point)) { for ($i=0; $row=sql_fetch_array($result); $i++) { // 회원 ID 를 얻는다. - $tmp_row = sql_fetch("select od_id, mb_id from {$g4['yc4_order_table']} where on_uid = '{$row['on_uid']}' "); + $tmp_row = sql_fetch("select od_id, mb_id from {$g4['yc4_order_table']} where uq_id = '{$row['uq_id']}' "); // 회원이면서 포인트가 0보다 크다면 if ($tmp_row['mb_id'] && $row['ct_point'] > 0) { $po_point = $row['ct_point'] * $row['ct_qty']; $po_content = "$cart_title3 {$tmp_row['od_id']} ({$row['ct_id']}) $cart_title4"; - insert_point($tmp_row['mb_id'], $po_point, $po_content, "@delivery", $tmp_row['mb_id'], "{$tmp_row['od_id']},{$row['on_uid']},{$row['ct_id']}"); + insert_point($tmp_row['mb_id'], $po_point, $po_content, "@delivery", $tmp_row['mb_id'], "{$tmp_row['od_id']},{$row['uq_id']},{$row['ct_id']}"); } sql_query("update {$g4['yc4_cart_table']} set ct_point_use = '1' where ct_id = '{$row['ct_id']}' "); @@ -103,7 +103,7 @@ $sql = " select a.ct_id, a.it_opt6, b.it_name from {$g4['yc4_cart_table']} a, {$g4['yc4_item_table']} b - where a.on_uid = '{$od['on_uid']}' + where a.uq_id = '{$od['uq_id']}' and a.it_id = b.it_id order by a.ct_id "; $result = sql_query($sql); @@ -125,7 +125,7 @@ $result = sql_query($sql);
-'> +'> '> '> @@ -236,7 +236,7 @@ if ($od['od_receipt_point'] > 0) - + @@ -425,7 +425,7 @@ if ($od['od_receipt_point'] > 0) if ($od["od_cash"]) echo "현금영수증 확인하기"; else - echo "현금영수증을 발급하시려면 클릭하십시오."; + echo "현금영수증을 발급하시려면 클릭하십시오."; echo ""; } } @@ -765,7 +765,7 @@ if ($od['od_receipt_point'] > 0)

    - ');"> + ');">

주문번호