From c040cc9407cae8f39424b1288e7a978dc1d78869 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 29 Mar 2013 15:07:09 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90:=20=EB=B6=84=EB=A5=98=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=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 --- adm/board_list.php | 2 +- adm/shop_admin/categorylist.php | 212 +++++++++++++++----------------- 2 files changed, 102 insertions(+), 112 deletions(-) diff --git a/adm/board_list.php b/adm/board_list.php index 9abe90d01..77a5e4c2a 100644 --- a/adm/board_list.php +++ b/adm/board_list.php @@ -61,7 +61,7 @@ $colspan = 15; 게시판 검색 - 생성된 게시판수 개 + 생성된 게시판 수 개 - - '>처음 - - - document.flist.sfl.value = '$sfl';"; ?> +
+ + + +
+ 분류 검색 + + + 생성된 분류 수 개 + + + + +
- - - - - 건수 :   -
- -
+
+

생성된 분류 전체 목록

+

생성된 분류 확인, 추가 및 간단한 수정을 할 수 있습니다. 수정한 내용 적용은 일괄수정 버튼을 누르세요.

+ + + + + + + + + + + + + + + + + + + + + + + + '.($level+1).'단계 분류'; + if ($level > 0) { // 2단계 이상 + $style = 'style="text-align:right;"'; + } else { // 1단계 + } + + $s_add = '2단계 추가'; + $s_upd = '수정'; + $s_vie = '보기'; -
분류
코드		분류명회원아이디판매
가능		기본재고상품수관리
- - - - - - - - - - - - - - + $s_del = '삭제'; - 0) // 2단계 이상 - { - $s_level = "  ".($level+1)."단계 분류"; - for ($k=1; $k<$level; $k++) - $s_level = "     " . $s_level; - $style = " "; - } - else // 1단계 - { - $style = " style='border:1 solid; border-color:#0071BD;' "; - } + // 해당 분류에 속한 상품의 갯수 + $sql1 = " select COUNT(*) as cnt from {$g4['yc4_item_table']} + where ca_id = '{$row['ca_id']}' + or ca_id2 = '{$row['ca_id']}' + or ca_id3 = '{$row['ca_id']}' "; + $row1 = sql_fetch($sql1); - $s_add = icon("추가", "./categoryform.php?ca_id={$row['ca_id']}&$qstr"); - $s_upd = icon("수정", "./categoryform.php?w=u&ca_id={$row['ca_id']}&$qstr"); - $s_vie = icon("보기", "$g4[shop_path]/list.php?ca_id={$row['ca_id']}"); + ?> + + + - if ($is_admin == 'super') - $s_del = icon("삭제", "javascript:del('./categoryformupdate.php?w=d&ca_id={$row['ca_id']}&$qstr');"); + + + + + + + \n"; + ?> + +
분류코드분류명회원아이디판매가능기본재고상품수 - "; - else - echo " "; - ?> -
+ + + > + + + + + + >
자료가 한 건도 없습니다.
- // 해당 분류에 속한 상품의 갯수 - $sql1 = " select COUNT(*) as cnt from {$g4['yc4_item_table']} - where ca_id = '{$row['ca_id']}' - or ca_id2 = '{$row['ca_id']}' - or ca_id3 = '{$row['ca_id']}' "; - $row1 = sql_fetch($sql1); +
+ +
- $list = $i%2; - echo " - - - {$row['ca_id']} - $s_level "; + - if ($is_admin == 'super') - echo ""; - else - { - echo ""; - echo "{$row['ca_mb_id']}"; - } - - echo " - - - {$row1['cnt']} - $s_upd $s_del $s_vie $s_add - "; -} - -if ($i == 0) { - echo "자료가 한건도 없습니다.\n"; -} -?> - - - - - - - - - - - -
+ +
Date: Fri, 29 Mar 2013 17:25:29 +0900 Subject: [PATCH 2/4] =?UTF-8?q?kcp=20=EA=B2=B0=EC=A0=9C=20=ED=9B=84=20db?= =?UTF-8?q?=20=EC=98=A4=EB=A5=98=EC=8B=9C=20=EA=B2=B0=EC=A0=9C=20=EC=B7=A8?= =?UTF-8?q?=EC=86=8C=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/kcp/pp_ax_hub_cancel.php | 2 +- shop/orderformupdate.php | 27 ++++++++++++++++++++++++--- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/shop/kcp/pp_ax_hub_cancel.php b/shop/kcp/pp_ax_hub_cancel.php index c1dda792c..9f0a68eb8 100644 --- a/shop/kcp/pp_ax_hub_cancel.php +++ b/shop/kcp/pp_ax_hub_cancel.php @@ -56,7 +56,7 @@ $c_PayPlus->mf_set_modx_data( "tno", $tno ); // KCP 원거래 거래번호 $c_PayPlus->mf_set_modx_data( "mod_type", $bSucc_mod_type ); // 원거래 변경 요청 종류 $c_PayPlus->mf_set_modx_data( "mod_ip", $cust_ip ); // 변경 요청자 IP - $c_PayPlus->mf_set_modx_data( "mod_desc", "가맹점 결과 처리 오류 - 가맹점에서 취소 요청" ); // 변경 사유 + $c_PayPlus->mf_set_modx_data( "mod_desc", $cancel_msg ); // 변경 사유 $c_PayPlus->mf_do_tx( $tno, $g_conf_home_dir, $g_conf_site_cd, "", $tran_cd, "", diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php index 7b2b11dfa..fb83f3ef9 100644 --- a/shop/orderformupdate.php +++ b/shop/orderformupdate.php @@ -107,7 +107,7 @@ if ($od_temp_point) $i_amount = $i_amount + $i_send_cost - $i_temp_point; -$same_amount_check = false; +$same_amount_check = $result_check = false; if ($od_settle_case == "무통장") { $od_temp_bank = $i_amount; @@ -131,6 +131,7 @@ else if ($od_settle_case == "계좌이체") $bank_name = iconv("cp949", "utf8", $bank_name); $od_bank_account = $bank_name; $same_amount_check = true; + $result_check = true; $pg_receipt_amount = $amount; } else if ($od_settle_case == "가상계좌") @@ -147,6 +148,7 @@ else if ($od_settle_case == "가상계좌") $depositor = iconv("cp949", "utf8", $depositor); $od_bank_account = $bankname.' '.$account.' '.$depositor; $od_deposit_name = $od_name; + $result_check = true; } else if ($od_settle_case == "휴대폰") { @@ -161,6 +163,7 @@ else if ($od_settle_case == "휴대폰") $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; + $result_check = true; $pg_receipt_amount = $amount; } else if ($od_settle_case == "신용카드") @@ -177,6 +180,7 @@ else if ($od_settle_case == "신용카드") $card_name = iconv("cp949", "utf8", $card_name); $od_bank_account = $card_name; $same_amount_check = true; + $result_check = true; $pg_receipt_amount = $amount; } else @@ -187,6 +191,7 @@ else // 주문금액과 결제금액이 일치하는지 체크 if($same_amount_check) { if((int)$i_amount !== (int)$pg_receipt_amount) { + $cancel_msg = 'Receipt amount error'; include G4_SHOP_PATH.'/kcp/pp_ax_hub_cancel.php'; // 결제취소처리 die("Receipt Amount Error"); @@ -244,7 +249,15 @@ $sql = " insert {$g4['yc4_order_table']} od_ip = '$REMOTE_ADDR', od_settle_case = '$od_settle_case' "; -sql_query($sql); +$result = sql_query($sql, false); + +// 주문정보 입력 오류시 kcp 결제 취소 +if($result_check && !$result) { + $cancel_msg = 'Order update error'; + include G4_SHOP_PATH.'/kcp/pp_ax_hub_cancel.php'; // 결제취소처리 + + die("

$sql

" . mysql_errno() . " : " . mysql_error() . "

error file : {$_SERVER['PHP_SELF']}"); +} // 장바구니 쇼핑에서 주문으로 // 신용카드로 주문하면서 신용카드 포인트 사용하지 않는다면 포인트 부여하지 않음 @@ -257,7 +270,15 @@ $sql = "update {$g4['yc4_cart_table']} set ct_status = '주문' $sql_card_point where uq_id = '$tmp_uq_id' "; -sql_query($sql); +$result = sql_query($sql, false); + +// 주문정보 입력 오류시 kcp 결제 취소 +if($result_check && !$result) { + $cancel_msg = 'Order status update error'; + include G4_SHOP_PATH.'/kcp/pp_ax_hub_cancel.php'; // 결제취소처리 + + die("

$sql

" . mysql_errno() . " : " . mysql_error() . "

error file : {$_SERVER['PHP_SELF']}"); +} // 회원이면서 포인트를 사용했다면 포인트 테이블에 사용을 추가 if ($is_member && $od_receipt_point) { From f586ecd24ad5e4c68228f6af58b0f7ef5d6c1f00 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 29 Mar 2013 17:31:19 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EC=83=81=ED=83=9C=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=EC=8B=9C=20=EC=A3=BC=EB=AC=B8=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/orderformupdate.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php index fb83f3ef9..b8411e38e 100644 --- a/shop/orderformupdate.php +++ b/shop/orderformupdate.php @@ -277,6 +277,9 @@ if($result_check && !$result) { $cancel_msg = 'Order status update error'; include G4_SHOP_PATH.'/kcp/pp_ax_hub_cancel.php'; // 결제취소처리 + // 주문삭제 + sql_query(" delete from {$g4['yc4_order_table']} where od_id = '$od_id' and uq_id = '$tmp_uq_id' "); + die("

$sql

" . mysql_errno() . " : " . mysql_error() . "

error file : {$_SERVER['PHP_SELF']}"); } From fd04665ec8dbd67007ccf797e6465b0fcca9c825 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 29 Mar 2013 17:36:28 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EC=83=81=ED=83=9C=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=EC=8B=9C=20=EC=A3=BC=EB=AC=B8=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/orderformupdate.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php index b8411e38e..2df782191 100644 --- a/shop/orderformupdate.php +++ b/shop/orderformupdate.php @@ -277,10 +277,11 @@ if($result_check && !$result) { $cancel_msg = 'Order status update error'; include G4_SHOP_PATH.'/kcp/pp_ax_hub_cancel.php'; // 결제취소처리 + echo "

$sql

" . mysql_errno() . " : " . mysql_error() . "

error file : {$_SERVER['PHP_SELF']}"; + // 주문삭제 sql_query(" delete from {$g4['yc4_order_table']} where od_id = '$od_id' and uq_id = '$tmp_uq_id' "); - - die("

$sql

" . mysql_errno() . " : " . mysql_error() . "

error file : {$_SERVER['PHP_SELF']}"); + exit; } // 회원이면서 포인트를 사용했다면 포인트 테이블에 사용을 추가