From b2fab9ebd10b9d67afaf1439f5f8ca3b84434f69 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 4 Jul 2013 09:17:10 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EB=82=B4=EC=9A=A9=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20-=20=EC=82=AC=EB=85=B8=EB=9D=BC=EA=B0=80?= =?UTF-8?q?=EB=85=B8=EB=9D=BC=EB=8B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/board/basic/style.css | 2 +- skin/board/basic/view.skin.php | 2 +- skin/board/gallery/list.skin.php | 14 +++++++------- skin/board/gallery/view.skin.php | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/skin/board/basic/style.css b/skin/board/basic/style.css index 6f064dc09..7047ecb95 100644 --- a/skin/board/basic/style.css +++ b/skin/board/basic/style.css @@ -3,7 +3,7 @@ /* 게시판 목록 */ #bo_list_title {margin-bottom:20px;font-size:1.2em;letter-spacing:-0.1em} -#bo_cate h2 {position:absolute;;font-size:0;line-height:0;overflow:hidden} +#bo_cate h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} #bo_cate ul {margin-bottom:10px;padding-left:1px;width:728px;zoom:1} #bo_cate ul:after {display:block;visibility:hidden;clear:both;content:""} #bo_cate li {float:left;margin-bottom:-1px} diff --git a/skin/board/basic/view.skin.php b/skin/board/basic/view.skin.php index aedf0870b..eb78d57d7 100644 --- a/skin/board/basic/view.skin.php +++ b/skin/board/basic/view.skin.php @@ -12,7 +12,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');

diff --git a/skin/board/gallery/list.skin.php b/skin/board/gallery/list.skin.php index 56d3e5626..64adad71f 100644 --- a/skin/board/gallery/list.skin.php +++ b/skin/board/gallery/list.skin.php @@ -160,13 +160,13 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); diff --git a/skin/board/gallery/view.skin.php b/skin/board/gallery/view.skin.php index aedf0870b..eb78d57d7 100644 --- a/skin/board/gallery/view.skin.php +++ b/skin/board/gallery/view.skin.php @@ -12,7 +12,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');

From d7263e0b482655f1362b8c97b3928cf504c6e3a4 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 4 Jul 2013 13:43:23 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=88=98=EB=9F=89=EB=B3=84=20=EB=B6=80?= =?UTF-8?q?=EA=B3=BC=EC=8B=9C=20=EC=88=98=EB=9F=89=20=EB=82=98=EC=98=A4?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=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 --- adm/shop_admin/itemform.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adm/shop_admin/itemform.php b/adm/shop_admin/itemform.php index 7afc59ec2..2847e8cc9 100644 --- a/adm/shop_admin/itemform.php +++ b/adm/shop_admin/itemform.php @@ -920,8 +920,8 @@ $(function(){ echo '$("#sc_con_minimum").show();'.PHP_EOL; echo '$("#sc_con_qty").hide();'.PHP_EOL; } else if($it['it_sc_type'] == 3) { - echo '$("#sc_con_minimum").show();'.PHP_EOL; - echo '$("#sc_con_qty").hide();'.PHP_EOL; + echo '$("#sc_con_minimum").hide();'.PHP_EOL; + echo '$("#sc_con_qty").show();'.PHP_EOL; } else { echo '$("#sc_con_minimum").hide();'.PHP_EOL; echo '$("#sc_con_qty").hide();'.PHP_EOL; From 3786a2b4685dd868778df338f8de09f05fd536b4 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 4 Jul 2013 18:08:07 +0900 Subject: [PATCH 3/3] =?UTF-8?q?#250=20=EB=B6=80=EB=B6=84=EC=B7=A8=EC=86=8C?= =?UTF-8?q?=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderform.php | 45 ++++++-- adm/shop_admin/partcancel.php | 61 +++++++++++ adm/shop_admin/partcancelupdate.php | 164 ++++++++++++++++++++++++++++ shop/orderinquiryview.php | 2 +- 4 files changed, 262 insertions(+), 10 deletions(-) create mode 100644 adm/shop_admin/partcancel.php create mode 100644 adm/shop_admin/partcancelupdate.php diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index 8fc5b373f..1e6395d9f 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -99,13 +99,14 @@ $row = sql_fetch($sql); $total_order = $row['sum_order']; // 상품목록 -$sql = " select it_id, - it_name, - cp_amount - from {$g4['shop_cart_table']} - where uq_id = '{$od['uq_id']}' - and ct_num = '0' - order by ct_id "; +$sql = " select a.it_id, + a.it_name, + a.cp_amount, + b.it_notax + from {$g4['shop_cart_table']} a left join {$g4['shop_item_table']} b on ( a.it_id = b.it_id ) + where a.uq_id = '{$od['uq_id']}' + and a.ct_num = '0' + order by a.ct_id "; $result = sql_query($sql); $pg_anchor = '
    @@ -152,6 +153,7 @@ $pg_anchor = '

    • +

      @@ -255,7 +257,7 @@ $pg_anchor = '
        // 쿠폰금액 $amount['쿠폰'] = $t_cp_amount + $od['od_coupon']; - // 미수금 = (주문금액 - DC + 환불액) - (입금액 - 신용카드승인취소) - 쿠폰금액 + // 미수금 = (주문금액 - DC + 환불액) - (입금액 - 결제승인취소) - 쿠폰금액 $amount['미수'] = ($amount['정상'] - $od['od_dc_amount'] + $od['od_refund_amount']) - ($amount['입금'] - $od['od_cancel_card']) - $amount['쿠폰']; // 결제방법 @@ -334,6 +336,12 @@ $pg_anchor = '
      + + + + + + @@ -515,6 +523,15 @@ $pg_anchor = '
      + + + + + + - + @@ -846,6 +866,13 @@ $(function() { else $chk.attr("checked", false); }); + + // 부분취소 + $("#win_partcancel").click(function() { + var new_win = window.open($(this).attr("href"), "win_partcancel", "left=100,top=100,width=500, height=300"); + new_win.focus(); + return false; + }); }); function form_submit(f) diff --git a/adm/shop_admin/partcancel.php b/adm/shop_admin/partcancel.php new file mode 100644 index 000000000..135f79ff6 --- /dev/null +++ b/adm/shop_admin/partcancel.php @@ -0,0 +1,61 @@ + + +
      +
      + + + + + +

      + +

      +

      + 취소가능금액 : 원 +

      +

      + + 원 +

      +

      + + +

      +

      + + 창닫기 +

      + +
      + + \ No newline at end of file diff --git a/adm/shop_admin/partcancelupdate.php b/adm/shop_admin/partcancelupdate.php new file mode 100644 index 000000000..d60cfdf6f --- /dev/null +++ b/adm/shop_admin/partcancelupdate.php @@ -0,0 +1,164 @@ +mf_clear(); + +if ( $req_tx == "mod" ) +{ + $tran_cd = "00200000"; + + $c_PayPlus->mf_set_modx_data( "tno", $tno ); // KCP 원거래 거래번호 + $c_PayPlus->mf_set_modx_data( "mod_type", $mod_type ); // 원거래 변경 요청 종류 + $c_PayPlus->mf_set_modx_data( "mod_ip", $cust_ip ); // 변경 요청자 IP + $c_PayPlus->mf_set_modx_data( "mod_desc", $mod_desc ); // 변경 사유 + + if ( $mod_type == "RN07" || $mod_type == "STPA" ) // 부분취소의 경우 + { + $c_PayPlus->mf_set_modx_data( "mod_mny", $_POST[ "mod_mny" ] ); // 취소요청금액 + $c_PayPlus->mf_set_modx_data( "rem_mny", $_POST[ "rem_mny" ] ); // 취소가능잔액 + } +} + +if ( $tran_cd != "" ) +{ + $c_PayPlus->mf_do_tx( $trace_no, $g_conf_home_dir, $g_conf_site_cd, "", $tran_cd, "", + $g_conf_gw_url, $g_conf_gw_port, "payplus_cli_slib", $ordr_idxx, + $cust_ip, "3" , 0, 0, $g_conf_key_dir, $g_conf_log_dir); // 응답 전문 처리 + + $res_cd = $c_PayPlus->m_res_cd; // 결과 코드 + $res_msg = $c_PayPlus->m_res_msg; // 결과 메시지 + /* $res_en_msg = $c_PayPlus->mf_get_res_data( "res_en_msg" ); // 결과 영문 메세지 */ +} +else +{ + $c_PayPlus->m_res_cd = "9562"; + $c_PayPlus->m_res_msg = "연동 오류|Payplus Plugin이 설치되지 않았거나 tran_cd값이 설정되지 않았습니다."; +} + +if ($res_cd != '0000') +{ + $res_msg = iconv("euc-kr", "utf-8", $res_msg); + + alert("$res_cd : $res_msg"); +} + +/* ============================================================================== */ +/* = 취소 결과 처리 = */ +/* = -------------------------------------------------------------------------- = */ +if ( $req_tx == "mod" ) +{ + if ( $res_cd == "0000" ) + { + $tno = $c_PayPlus->mf_get_res_data( "tno" ); // KCP 거래 고유 번호 + +/* = -------------------------------------------------------------------------- = */ +/* = 부분취소 결과 처리 = */ +/* = -------------------------------------------------------------------------- = */ + if ( $mod_type == "RN07" || $mod_type == "STPA" ) // 부분취소의 경우 + { + $amount = $c_PayPlus->mf_get_res_data( "amount" ); // 원 거래금액 + $mod_mny = $c_PayPlus->mf_get_res_data( "panc_mod_mny" ); // 취소요청된 금액 + $rem_mny = $c_PayPlus->mf_get_res_data( "panc_rem_mny" ); // 취소요청후 잔액 + + $sql = " update {$g4['shop_order_table']} + set od_cancel_card = od_cancel_card + '$mod_mny' + where od_id = '{$od['od_id']}' "; + sql_query($sql); + } + } // End of [res_cd = "0000"] + +/* = -------------------------------------------------------------------------- = */ +/* = 취소 실패 결과 처리 = */ +/* = -------------------------------------------------------------------------- = */ + else + { + } +} + +if($locale_change) + setlocale(LC_CTYPE, $def_locale); +?> + + \ No newline at end of file diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php index 8ea96b61b..bf59646c4 100644 --- a/shop/orderinquiryview.php +++ b/shop/orderinquiryview.php @@ -331,7 +331,7 @@ if(openwin != null) { { ?> - +
      입금액
      결제 취소금액
      입금자
      + 원 + 결제부분취소 +
      @@ -579,7 +596,10 @@ $pg_anchor = '
      원 + 원 + 결제부분취소 +
      승인취소 금액결제취소 금액