From 97cf079a0f8575b5b30070774f806837266f3074 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 11 Sep 2013 15:52:33 +0900 Subject: [PATCH] =?UTF-8?q?amount=20=ED=95=84=EB=93=9C=EB=AA=85=20price=20?= =?UTF-8?q?=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/couponform.php | 20 +- adm/shop_admin/couponformupdate.php | 10 +- adm/shop_admin/deliverylist.php | 24 +-- adm/shop_admin/index.php | 10 +- adm/shop_admin/itemform.php | 6 +- adm/shop_admin/itemformupdate.php | 6 +- adm/shop_admin/itemlist.php | 2 +- adm/shop_admin/orderform.php | 44 ++--- adm/shop_admin/orderlist.php | 32 +-- adm/shop_admin/orderlist2.php | 28 +-- adm/shop_admin/ordermail.inc.php | 8 +- adm/shop_admin/orderprintresult.php | 18 +- adm/shop_admin/orderreceiptupdate.php | 4 +- adm/shop_admin/ordersms.inc.php | 4 +- adm/shop_admin/orderstatuslist.php | 71 +++---- adm/shop_admin/personalpaycopy.php | 6 +- adm/shop_admin/personalpaycopyupdate.php | 6 +- adm/shop_admin/personalpayform.php | 16 +- adm/shop_admin/personalpayformupdate.php | 8 +- adm/shop_admin/personalpaylist.php | 6 +- adm/shop_admin/sale1date.php | 32 +-- adm/shop_admin/sale1month.php | 34 ++-- adm/shop_admin/sale1today.php | 32 ++- adm/shop_admin/sale1year.php | 34 ++-- adm/shop_admin/sendcostlist.php | 6 +- adm/shop_admin/sendcostupdate.php | 8 +- extend/shop.extend2.php | 37 +++- install/install_db.php | 1 - install/shop.sql | 19 +- lib/shop.lib.php | 28 ++- mobile/shop/cart.php | 22 +-- mobile/shop/orderform.php | 206 ++++++++++---------- mobile/shop/orderformupdate.php | 122 ++++++------ mobile/shop/orderinquiry.sub.php | 13 +- mobile/shop/orderinquiryview.php | 59 +++--- mobile/shop/personalpayform.php | 18 +- mobile/shop/personalpayformupdate.php | 26 +-- mobile/shop/personalpayresult.php | 22 +-- mobile/skin/shop/basic/personalpay.skin.php | 2 +- shop/cart.php | 28 ++- shop/coupon.php | 8 +- shop/mail/ordermail.mail.php | 4 +- shop/mail/orderupdate1.mail.php | 14 +- shop/mail/orderupdate2.mail.php | 14 +- shop/ordercoupon.php | 10 +- shop/orderform.php | 202 +++++++++---------- shop/orderformupdate.php | 118 +++++------ shop/orderinquiry.sub.php | 23 ++- shop/orderinquirycancel.php | 6 +- shop/orderinquiryview.php | 57 +++--- shop/orderitemcoupon.php | 6 +- shop/ordermail1.inc.php | 10 +- shop/ordersendcost.php | 4 +- shop/ordersendcostcoupon.php | 10 +- shop/personalpayform.php | 18 +- shop/personalpayformupdate.php | 26 +-- shop/personalpayresult.php | 24 +-- shop/settle_kcp_common.php | 6 +- shop/taxsave_kcp.php | 2 +- skin/shop/basic/personalpay.skin.php | 2 +- 60 files changed, 837 insertions(+), 805 deletions(-) diff --git a/adm/shop_admin/couponform.php b/adm/shop_admin/couponform.php index d268f3f7f..5c60f09e4 100644 --- a/adm/shop_admin/couponform.php +++ b/adm/shop_admin/couponform.php @@ -107,9 +107,9 @@ include_once (G4_ADMIN_PATH.'/admin.head.php'); - + - + @@ -212,13 +212,13 @@ function change_method(cp_method) function change_type(cp_type) { if(cp_type == "0") { - $("#cp_amount_unit").text("원"); - $("#cp_amount_unit").closest("tr").find("label").text("할인금액"); + $("#cp_price_unit").text("원"); + $("#cp_price_unit").closest("tr").find("label").text("할인금액"); $("#tr_cp_maximum").hide(); $("#tr_cp_trunc").hide(); } else { - $("#cp_amount_unit").text("%"); - $("#cp_amount_unit").closest("tr").find("label").text("할인비율"); + $("#cp_price_unit").text("%"); + $("#cp_price_unit").closest("tr").find("label").text("할인비율"); $("#tr_cp_maximum").show(); $("#tr_cp_trunc").show(); } @@ -228,14 +228,14 @@ function form_check(f) { var sel_type = f.cp_type; var cp_type = sel_type.options[sel_type.selectedIndex].value; - var cp_amount = f.cp_amount.value; + var cp_price = f.cp_price.value; if(!f.chk_all_mb.checked && f.mb_id.value == "") { alert("회원아이디를 입력해 주십시오."); return false; } - if(isNaN(cp_amount)) { + if(isNaN(cp_price)) { if(cp_type == "1") alert("할인비율을 숫자로 입력해 주십시오."); else @@ -244,9 +244,9 @@ function form_check(f) return false; } - cp_amount = parseInt(cp_amount); + cp_price = parseInt(cp_price); - if(cp_type == "1" && (cp_amount < 1 || cp_amount > 99)) { + if(cp_type == "1" && (cp_price < 1 || cp_price > 99)) { alert("할인비율을 1과 99 사이의 숫자로 입력해 주십시오."); return false; } diff --git a/adm/shop_admin/couponformupdate.php b/adm/shop_admin/couponformupdate.php index 2c4d1f2d6..0b7043f72 100644 --- a/adm/shop_admin/couponformupdate.php +++ b/adm/shop_admin/couponformupdate.php @@ -27,14 +27,14 @@ if($_POST['cp_start'] > $_POST['cp_end']) if($_POST['cp_end'] < G4_TIME_YMD) alert('종료일은 오늘('.G4_TIME_YMD.')이후로 입력해 주십시오.'); -if(!$_POST['cp_amount']) { +if(!$_POST['cp_price']) { if($_POST['cp_type']) alert('할인비율을 입력해 주십시오.'); else alert('할인금액을 입력해 주십시오.'); } -if($_POST['cp_type'] && ($_POST['cp_amount'] < 1 || $_POST['cp_amount'] > 99)) +if($_POST['cp_type'] && ($_POST['cp_price'] < 1 || $_POST['cp_price'] > 99)) alert('할인비율을은 1과 99사이 값으로 입력해 주십시오.'); if($_POST['cp_method'] == 0) { @@ -94,9 +94,9 @@ if($w == '') { } while(1); $sql = " INSERT INTO {$g4['shop_coupon_table']} - ( cp_id, cp_subject, cp_method, cp_target, mb_id, cp_start, cp_end, cp_type, cp_amount, cp_trunc, cp_minimum, cp_maximum, cp_used, cp_datetime ) + ( cp_id, cp_subject, cp_method, cp_target, mb_id, cp_start, cp_end, cp_type, cp_price, cp_trunc, cp_minimum, cp_maximum, cp_used, cp_datetime ) VALUES - ( '$cp_id', '$cp_subject', '$cp_method', '$cp_target', '$mb_id', '$cp_start', '$cp_end', '$cp_type', '$cp_amount', '$cp_trunc', '$cp_minimum', '$cp_maximum', '$cp_used', '".G4_TIME_YMDHIS."' ) "; + ( '$cp_id', '$cp_subject', '$cp_method', '$cp_target', '$mb_id', '$cp_start', '$cp_end', '$cp_type', '$cp_price', '$cp_trunc', '$cp_minimum', '$cp_maximum', '$cp_used', '".G4_TIME_YMDHIS."' ) "; sql_query($sql); } @@ -115,7 +115,7 @@ if($w == '') { cp_start = '$cp_start', cp_end = '$cp_end', cp_type = '$cp_type', - cp_amount = '$cp_amount', + cp_price = '$cp_price', cp_trunc = '$cp_trunc', cp_maximum = '$cp_maximum', cp_minimum = '$cp_minimum' diff --git a/adm/shop_admin/deliverylist.php b/adm/shop_admin/deliverylist.php index f971a237d..c74f834d7 100644 --- a/adm/shop_admin/deliverylist.php +++ b/adm/shop_admin/deliverylist.php @@ -38,7 +38,7 @@ $sql_common = " from {$g4['shop_order_table']} // 테이블의 전체 레코드수만 얻음 if ($chk_misu) { - $sql = " select *, "._MISU_QUERY_." $sql_common having misu <= 0 "; + $sql = " select * $sql_common where od_misu <= 0 "; $result = sql_query($sql); $total_count = mysql_num_rows($result); } @@ -85,7 +85,7 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌 - /> + /> diff --git a/adm/shop_admin/index.php b/adm/shop_admin/index.php index e7abad381..018192c31 100644 --- a/adm/shop_admin/index.php +++ b/adm/shop_admin/index.php @@ -32,9 +32,9 @@ $pg_anchor = '