From 71457687c16298f033cae088531571ff7794f254 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 27 Mar 2013 15:32:01 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EB=AC=B4=ED=86=B5=EC=9E=A5=20=EC=A3=BC?= =?UTF-8?q?=EB=AC=B8=EC=97=90=EC=84=9C=20od=5Ftemp=5Fbank=20=EB=88=84?= =?UTF-8?q?=EB=9D=BD=EB=90=98=EB=8A=94=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/orderformupdate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php index a75c9314c..7b2b11dfa 100644 --- a/shop/orderformupdate.php +++ b/shop/orderformupdate.php @@ -225,7 +225,7 @@ $sql = " insert {$g4['yc4_order_table']} od_deposit_name = '$od_deposit_name', od_memo = '$od_memo', od_send_cost = '$od_send_cost', - od_temp_bank = '$od_receipt_bank', + od_temp_bank = '$od_temp_bank', od_temp_card = '$od_receipt_card', od_temp_hp = '$od_receipt_hp', od_temp_point = '$od_temp_point', From ee57df017aed5b723db7f20dc15492dfe06caf99 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 27 Mar 2013 15:41:07 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=20=EC=B7=A8=EC=86=8C=20?= =?UTF-8?q?=ED=9B=84=20=EC=9D=B4=EB=8F=99=20url=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/orderinquirycancel.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/shop/orderinquirycancel.php b/shop/orderinquirycancel.php index c4c131808..382b6fe78 100644 --- a/shop/orderinquirycancel.php +++ b/shop/orderinquirycancel.php @@ -15,11 +15,10 @@ if (!$od['od_id']) { alert("존재하는 주문이 아닙니다."); } -if (($od['od_temp_bank'] > 0 && $od['od_receipt_bank'] == 0) || - ($od['od_temp_card'] > 0 && $od['od_receipt_card'] == 0)) { +if ($od['od_temp_bank'] > 0 && $od['od_receipt_bank'] == 0) { ; } else { - alert("취소할 수 있는 주문이 아닙니다."); + alert("취소할 수 있는 주문이 아닙니다.", G4_SHOP_URL."/orderinquiryview.php?od_id=$od_id&uq_id=$uq_id"); } // 장바구니 자료 취소 @@ -35,5 +34,5 @@ if ($od['od_receipt_point'] > 0) { insert_point($member['mb_id'], $od['od_receipt_point'], "주문번호 $od_id 본인 취소"); } -goto_url("./orderinquiryview.php?od_id=$od_id&uq_id=$uq_id"); +goto_url(G4_SHOP_URL."/orderinquiryview.php?od_id=$od_id&uq_id=$uq_id"); ?> \ No newline at end of file From 2e749861fedd8267b0123ea2c2e8d49161a88d61 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 27 Mar 2013 15:42:03 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=EA=B2=B0=EC=A0=9C=ED=95=98=EA=B8=B0=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/orderinquiryview.php | 113 ++++++-------------------------------- 1 file changed, 16 insertions(+), 97 deletions(-) diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php index 0620c3685..b5551be12 100644 --- a/shop/orderinquiryview.php +++ b/shop/orderinquiryview.php @@ -143,73 +143,33 @@ echo ""; if ($od['od_settle_case'] == '신용카드') { - if ($od['od_receipt_card'] > 0) - { - $sql = " select * from {$g4['yc4_card_history_table']} where od_id = '{$od['od_id']}' order by cd_id desc "; - $result = sql_query($sql); - $cd = mysql_fetch_array($result); - } + $sql = " select * from {$g4['yc4_card_history_table']} where od_id = '{$od['od_id']}' order by cd_id desc "; + $result = sql_query($sql); + $cd = mysql_fetch_array($result); echo ""; echo ""; echo ""; - - if ($od['od_receipt_card']) - { - echo ""; - echo ""; - echo ""; - echo ""; - } - else if ($default['de_card_use'] && $tot_cancel_amount == 0) - { - $settle_amount = $od['od_temp_card']; - echo ""; - echo ""; - } + echo ""; + echo ""; + echo ""; + echo ""; echo "
· 결제방식: 신용카드 결제
· 결제금액: " . display_amount($cd['cd_amount']) . "
· 승인일시: {$cd['cd_trade_ymd']} {$cd['cd_trade_hms']}
· 승인번호: {$cd['cd_app_no']}
· 영수증: 영수증 출력
· 결제정보: 아직 승인되지 않았거나 승인을 확인하지 못하였습니다.
"; - if ((int)$member['mb_point'] >= $od['od_temp_point']) { - include "./settle_{$default['de_card_pg']}.inc.php"; - echo ""; - } else { - echo "· 보유포인트가 모자라서 결제할 수 없습니다. 주문후 다시 결제하시기 바랍니다."; - } - echo "
· 결제금액: " . display_amount($cd['cd_amount']) . "
· 승인일시: {$cd['cd_trade_ymd']} {$cd['cd_trade_hms']}
· 승인번호: {$cd['cd_app_no']}
· 영수증: 영수증 출력

"; } else if ($od['od_settle_case'] == '휴대폰') { - if ($od['od_receipt_hp'] > 0) - { - $sql = " select * from {$g4['yc4_card_history_table']} where od_id = '{$od['od_id']}' order by cd_id desc "; - $result = sql_query($sql); - $cd = mysql_fetch_array($result); - } + $sql = " select * from {$g4['yc4_card_history_table']} where od_id = '{$od['od_id']}' order by cd_id desc "; + $result = sql_query($sql); + $cd = mysql_fetch_array($result); echo ""; echo ""; echo ""; - - if ($od['od_receipt_hp']) - { - echo ""; - echo ""; - echo ""; - //echo ""; - echo ""; - } - else if ($default['de_hp_use']) - { - $settle_amount = $od['od_temp_card']; - echo ""; - echo ""; - } + echo ""; + echo ""; + echo ""; + //echo ""; + echo ""; echo "
· 결제방식: 휴대폰 결제
· 결제금액: " . display_amount($cd['cd_amount']) . "
· 승인일시: {$cd['cd_trade_ymd']} {$cd['cd_trade_hms']}
· 휴대폰번호: {$cd['cd_opt02']}
· 영수증: 영수증 출력
· 영수증: 영수증 출력
· 결제정보: 아직 승인되지 않았거나 승인을 확인하지 못하였습니다.
"; - if ((int)$member['mb_point'] >= $od['od_temp_point']) { - include "./settle_{$default['de_card_pg']}.inc.php"; - echo ""; - } else { - echo "· 보유포인트가 모자라서 결제할 수 없습니다. 주문후 다시 결제하시기 바랍니다."; - } - echo "
· 결제금액: " . display_amount($cd['cd_amount']) . "
· 승인일시: {$cd['cd_trade_ymd']} {$cd['cd_trade_hms']}
· 휴대폰번호: {$cd['cd_opt02']}
· 영수증: 영수증 출력
· 영수증: 영수증 출력

"; } else @@ -236,35 +196,6 @@ else if ($od['od_escrow1']) echo "· KCP 거래번호: {$od['od_escrow1']}"; - if ($od['od_receipt_bank'] == 0 && $tot_cancel_amount == 0) - { - if ($od['od_settle_case'] == '계좌이체' && $default['de_iche_use']) - { - $settle_amount = $od['od_temp_bank']; - echo ""; - if ((int)$member['mb_point'] >= $od['od_temp_point']) { - include "./settle_{$default['de_card_pg']}.inc.php"; - echo ""; - } else { - echo "· 보유포인트가 모자라서 결제할 수 없습니다. 주문후 다시 결제하시기 바랍니다."; - } - echo ""; - } - - if ($od['od_settle_case'] == '가상계좌' && $od['od_bank_account'] == '가상계좌' && $default['de_vbank_use']) - { - $settle_amount = $od['od_temp_bank']; - echo ""; - if ((int)$member['mb_point'] >= $od['od_temp_point']) { - include "./settle_{$default['de_card_pg']}.inc.php"; - echo ""; - } else { - echo "· 보유포인트가 모자라서 결제할 수 없습니다. 주문후 다시 결제하시기 바랍니다."; - } - echo ""; - } - } - echo "
"; } @@ -274,12 +205,6 @@ if ($od['od_receipt_point'] > 0) echo ""; echo "· 포인트사용: " . display_point($od['od_receipt_point']) . ""; echo ""; -//} else if ($od[od_temp_point] > 0) { -} else if ($od['od_temp_point'] > 0 && $member['mb_point'] >= $od['od_temp_point']) { - echo ""; - echo ""; - echo ""; - echo "
· 포인트사용: " . display_point($od['od_temp_point']) . "
"; } if ($od['od_cancel_card'] > 0) @@ -300,8 +225,7 @@ if ($od['od_refund_amount'] > 0) // 취소한 내역이 없다면 if ($tot_cancel_amount == 0) { - if (($od['od_temp_bank'] > 0 && $od['od_receipt_bank'] == 0) || - ($od['od_temp_card'] > 0 && $od['od_receipt_card'] == 0)) { + if ($od['od_temp_bank'] > 0 && $od['od_receipt_bank'] == 0) { echo "
"; echo ""; echo ""; @@ -311,11 +235,6 @@ if ($tot_cancel_amount == 0) { echo "· 주문취소: 위의 주문을 취소합니다."; echo "· 취소사유: "; echo "
"; - } else if ($od['od_invoice'] == "") { - echo "
"; - echo ""; - echo ""; - echo "
· 이 주문은 직접 취소가 불가하므로 상점에 전화 연락 후 취소해 주십시오.
"; } } else { $misu_amount = $misu_amount - $send_cost; From 385204bba2902b4bfd6eaf93139cb922cdc76568 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 27 Mar 2013 15:42:58 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=20=ED=8C=8C=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/orderconfirm.php | 224 ------------------------------------------ 1 file changed, 224 deletions(-) delete mode 100644 shop/orderconfirm.php diff --git a/shop/orderconfirm.php b/shop/orderconfirm.php deleted file mode 100644 index 8650e0460..000000000 --- a/shop/orderconfirm.php +++ /dev/null @@ -1,224 +0,0 @@ - - -

- - - -
- - - - -
주문번호 :
- - - --- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
이름
전화번호
핸드폰
주소
E-mail
희망배송일 ()
-
- - - - --- - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
이름
전화번호
핸드폰 
주소
전하실말씀 
-
- - - --- - - - -
- - - - - 0) { ?> - - - - - - - 0) { ?> - - - - - - - - - - - - - - - - - 0) { ?> - - - - - - - 0) { ?> - - - - - - -
포인트사용
(결제하실 금액)
계좌번호
입금자 이름
신용카드 (결제하실 금액)
휴대폰결제 (결제하실 금액)
-
- -"; - } - else - { - if ($settle_case == '신용카드') - $settle_amount = $od['od_temp_card']; - else if ($settle_case == '휴대폰') - $settle_amount = $od['od_temp_hp']; - else - $settle_amount = $od['od_temp_bank']; - - include "./settle_{$default['de_card_pg']}.inc.php"; - //echo "

"; - echo "

  · 결제가 제대로 되지 않은 경우 [주문상세조회 페이지] 에서 다시 결제하실 수 있습니다.

"; - } -} -else -{ - if ($od['od_temp_card']) { - include "./ordercard{$default['de_card_pg']}.inc.php"; - echo "

"; - echo "

  · 결제가 제대로 되지 않은 경우 주문상세조회 페이지에서 다시 결제하실 수 있습니다.

"; - } else if ($od['od_temp_bank'] && $od['od_bank_account'] == "계좌이체") { - include "./orderiche{$default['de_card_pg']}.inc.php"; - echo "

"; - echo "

  · 결제가 제대로 되지 않은 경우 [주문상세조회 페이지] 에서 다시 결제하실 수 있습니다.

"; - } else { - echo "

"; - } -} -?> -

- - \ No newline at end of file From 93d083c8f7a30c512b837e5ec7d5bd26a63be642 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 27 Mar 2013 15:45:43 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=20=ED=8C=8C=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/settleresult.php | 98 ------------------------------------------- 1 file changed, 98 deletions(-) delete mode 100644 shop/settleresult.php diff --git a/shop/settleresult.php b/shop/settleresult.php deleted file mode 100644 index 3df3c43a9..000000000 --- a/shop/settleresult.php +++ /dev/null @@ -1,98 +0,0 @@ - - -

- - - - - - - - -
결제 내역
- - - - - - - -
· 주문번호:
· 승인번호:
· :
· 계좌번호:
· 휴대폰번호:
· :
-


- - -

-
-
-모의입금처리 -

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

-
-
-" size="80">
-
-

- -
-
-
-
- - -

- '> - - - \ No newline at end of file