diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index 701188b4d..86f6f8c4f 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -157,7 +157,7 @@ $pg_anchor = ' - + diff --git a/adm/shop_admin/orderprintresult.php b/adm/shop_admin/orderprintresult.php index 245737461..d387268c0 100644 --- a/adm/shop_admin/orderprintresult.php +++ b/adm/shop_admin/orderprintresult.php @@ -294,7 +294,7 @@ if (mysql_num_rows($result) == 0) $cnt = $sub_tot_qty = $sub_tot_amount = 0; while ($row2 = sql_fetch_array($res2)) { - $row2_tot_amount = $row2['ct_amount'] * $row2['ct_qty']; + $row2_tot_amount = $row2['ct_price'] * $row2['ct_qty']; $sub_tot_qty += $row2['ct_qty']; $sub_tot_amount += $row2_tot_amount; @@ -333,7 +333,7 @@ if (mysql_num_rows($result) == 0) ?> - + diff --git a/adm/shop_admin/orderstatuslist.php b/adm/shop_admin/orderstatuslist.php index 353bd060c..080692153 100644 --- a/adm/shop_admin/orderstatuslist.php +++ b/adm/shop_admin/orderstatuslist.php @@ -55,9 +55,9 @@ $sql = " select a.od_id, b.it_opt6, b.ct_status, b.ct_qty, - b.ct_amount, + b.ct_price, b.ct_point, - (b.ct_qty * b.ct_amount) as ct_sub_amount, + (b.ct_qty * b.ct_price) as ct_sub_amount, (b.ct_qty * b.ct_point) as ct_sub_point, c.it_id, c.it_name, @@ -77,7 +77,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) { $lines[$i] = $row; - $tot_amount += $row['ct_amount']; + $tot_amount += $row['ct_price']; $tot_qty += $row['ct_qty']; $tot_sub_amount += $row['ct_sub_amount']; $tot_sub_point += $row['ct_sub_point']; @@ -144,7 +144,7 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌 ">상품명 순 정렬 ">주문자 순 정렬
입금자 ">회원ID 순 정렬 - ">판매가 순 정렬 + ">판매가 순 정렬 ">수량 순 정렬 ">소계 순 정렬 ">포인트 순 정렬 @@ -183,7 +183,7 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌 '.$lines[$i]['od_deposit_name']?> - + diff --git a/adm/shop_admin/sale1date.php b/adm/shop_admin/sale1date.php index 6bc2d048f..75a3183ef 100644 --- a/adm/shop_admin/sale1date.php +++ b/adm/shop_admin/sale1date.php @@ -53,8 +53,8 @@ for ($i=0; $row=mysql_fetch_array($result); $i++) $lines[$i] = $row; // 장바구니 상태별 금액 - $sql1 = " select (SUM(ct_amount * ct_qty)) as orderamount, /* 주문합계 */ - (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', ct_amount * ct_qty, 0))) as ordercancel /* 주문취소 */ + $sql1 = " select (SUM(ct_price * ct_qty)) as orderamount, /* 주문합계 */ + (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', ct_price * ct_qty, 0))) as ordercancel /* 주문취소 */ from {$g4['shop_cart_table']} where uq_id = '{$row['uq_id']}' "; $row1 = sql_fetch($sql1); diff --git a/adm/shop_admin/sale1month.php b/adm/shop_admin/sale1month.php index 8661e5909..eee76ed36 100644 --- a/adm/shop_admin/sale1month.php +++ b/adm/shop_admin/sale1month.php @@ -53,8 +53,8 @@ for ($i=0; $row=mysql_fetch_array($result); $i++) $lines[$i] = $row; // 장바구니 상태별 금액 - $sql1 = " select (SUM(ct_amount * ct_qty)) as orderamount, /* 주문합계 */ - (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', ct_amount * ct_qty, 0))) as ordercancel /* 주문취소 */ + $sql1 = " select (SUM(ct_price * ct_qty)) as orderamount, /* 주문합계 */ + (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', ct_price * ct_qty, 0))) as ordercancel /* 주문취소 */ from {$g4['shop_cart_table']} where uq_id = '{$row['uq_id']}' "; $row1 = sql_fetch($sql1); diff --git a/adm/shop_admin/sale1today.php b/adm/shop_admin/sale1today.php index 1cc12cc36..52a70e109 100644 --- a/adm/shop_admin/sale1today.php +++ b/adm/shop_admin/sale1today.php @@ -31,8 +31,8 @@ for ($i=0; $row=mysql_fetch_array($result); $i++) $lines[$i] = $row; // 장바구니 상태별 금액 - $sql1 = " select (SUM(ct_amount * ct_qty)) as orderamount, /* 주문합계 */ - (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', ct_amount * ct_qty, 0))) as ordercancel /* 주문취소 */ + $sql1 = " select (SUM(ct_price * ct_qty)) as orderamount, /* 주문합계 */ + (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', ct_price * ct_qty, 0))) as ordercancel /* 주문취소 */ from {$g4['shop_cart_table']} where uq_id = '{$row['uq_id']}' "; $row1 = sql_fetch($sql1); diff --git a/adm/shop_admin/sale1year.php b/adm/shop_admin/sale1year.php index d3e231c99..ac841b02e 100644 --- a/adm/shop_admin/sale1year.php +++ b/adm/shop_admin/sale1year.php @@ -48,8 +48,8 @@ for ($i=0; $row=mysql_fetch_array($result); $i++) $lines[$i] = $row; // 장바구니 상태별 금액 - $sql1 = " select (SUM(ct_amount * ct_qty)) as orderamount, /* 주문합계 */ - (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', ct_amount * ct_qty, 0))) as ordercancel /* 주문취소 */ + $sql1 = " select (SUM(ct_price * ct_qty)) as orderamount, /* 주문합계 */ + (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', ct_price * ct_qty, 0))) as ordercancel /* 주문취소 */ from {$g4['shop_cart_table']} where uq_id = '{$row['uq_id']}' "; $row1 = sql_fetch($sql1); diff --git a/extend/shop.extend.php b/extend/shop.extend.php index 1ae87a707..9fa4a3c14 100644 --- a/extend/shop.extend.php +++ b/extend/shop.extend.php @@ -85,7 +85,7 @@ if(!$result) { CHANGE `it_cust_amount` `it_cust_price` INT(11) NOT NULL DEFAULT '0' ", false); sql_query(" ALTER TABLE `{$g4['shop_cart_table']}` CHANGE `ct_amount` `ct_price` INT(11) NOT NULL DEFAULT '0', - ADD `ct_name` VARCHAR(255) NOT NULL DEFAULT '' AFTER `it_id` ", false); + ADD `it_name` VARCHAR(255) NOT NULL DEFAULT '' AFTER `it_id` ", false); } //============================================================================== diff --git a/install/shop.sql b/install/shop.sql index cbfd9d2eb..f9a6d5da8 100644 --- a/install/shop.sql +++ b/install/shop.sql @@ -57,6 +57,7 @@ CREATE TABLE IF NOT EXISTS `shop_cart` ( `ct_id` int(11) NOT NULL AUTO_INCREMENT, `uq_id` bigint(20) unsigned NOT NULL, `it_id` varchar(20) NOT NULL DEFAULT '', + `it_name` varchar(255) NOT NULL DEFAULT '', `it_opt1` varchar(255) NOT NULL DEFAULT '', `it_opt2` varchar(255) NOT NULL DEFAULT '', `it_opt3` varchar(255) NOT NULL DEFAULT '', @@ -65,7 +66,7 @@ CREATE TABLE IF NOT EXISTS `shop_cart` ( `it_opt6` varchar(255) NOT NULL DEFAULT '', `ct_status` enum('쇼핑','주문','준비','배송','완료','취소','반품','품절') NOT NULL DEFAULT '쇼핑', `ct_history` text NOT NULL, - `ct_amount` int(11) NOT NULL DEFAULT '0', + `ct_price` int(11) NOT NULL DEFAULT '0', `ct_point` int(11) NOT NULL DEFAULT '0', `ct_point_use` tinyint(4) NOT NULL DEFAULT '0', `ct_stock_use` tinyint(4) NOT NULL DEFAULT '0', @@ -392,10 +393,8 @@ CREATE TABLE IF NOT EXISTS `shop_item` ( `it_explan` mediumtext NOT NULL, `it_mobile_explan` mediumtext NOT NULL, `it_explan_html` tinyint(4) NOT NULL DEFAULT '0', - `it_cust_amount` int(11) NOT NULL DEFAULT '0', - `it_amount` int(11) NOT NULL DEFAULT '0', - `it_amount2` int(11) NOT NULL DEFAULT '0', - `it_amount3` int(11) NOT NULL DEFAULT '0', + `it_cust_price` int(11) NOT NULL DEFAULT '0', + `it_price` int(11) NOT NULL DEFAULT '0', `it_point` int(11) NOT NULL DEFAULT '0', `it_sell_email` varchar(255) NOT NULL DEFAULT '', `it_use` tinyint(4) NOT NULL DEFAULT '0', diff --git a/mobile/shop/cartsub.inc.php b/mobile/shop/cartsub.inc.php index 06826178b..141d964d6 100644 --- a/mobile/shop/cartsub.inc.php +++ b/mobile/shop/cartsub.inc.php @@ -48,7 +48,7 @@ $sql = " select a.ct_id, a.it_opt4, a.it_opt5, a.it_opt6, - a.ct_amount, + a.ct_price, a.ct_point, a.ct_qty, a.ct_status, @@ -83,7 +83,7 @@ for ($i=0; $row=mysql_fetch_array($result); $i++) $good_info .= "ordr_numb={$od_id}_".sprintf("%04d", $i).chr(31); $good_info .= "good_name=".addslashes($row['it_name']).chr(31); $good_info .= "good_cntx=".$row['ct_qty'].chr(31); - $good_info .= "good_amtx=".$row['ct_amount'].chr(31); + $good_info .= "good_amtx=".$row['ct_price'].chr(31); } if ($i==0) { // 계속쇼핑 @@ -106,7 +106,7 @@ for ($i=0; $row=mysql_fetch_array($result); $i++) } $point = $row['ct_point'] * $row['ct_qty']; - $sell_amount = $row['ct_amount'] * $row['ct_qty']; + $sell_amount = $row['ct_price'] * $row['ct_qty']; ?> @@ -130,7 +130,7 @@ for ($i=0; $row=mysql_fetch_array($result); $i++) echo ''.$row['ct_qty'].''; ?> - + - + - + - 원 + 원 - + - 원 - + 원 + @@ -600,9 +600,9 @@ else function amount_change() { - var basic_amount = parseInt(""); + var basic_amount = parseInt(""); var basic_point = parseFloat(""); - var cust_amount = parseFloat(""); + var cust_amount = parseFloat(""); var f = document.fitem; var opt1 = 0; @@ -626,14 +626,14 @@ else var amount = basic_amount + opt1 + opt2 + opt3 + opt4 + opt5 + opt6; var point = parseInt(basic_point); - if (typeof(f.it_amount) != 'undefined') - f.it_amount.value = amount; + if (typeof(f.it_price) != 'undefined') + f.it_price.value = amount; if (typeof(f.disp_sell_amount) != 'undefined') f.disp_sell_amount.value = number_format(String(amount * ct_qty)); - if (typeof(f.disp_cust_amount) != 'undefined') - f.disp_cust_amount.value = number_format(String(cust_amount * ct_qty)); + if (typeof(f.disp_cust_price) != 'undefined') + f.disp_cust_price.value = number_format(String(cust_amount * ct_qty)); if (typeof(f.it_point) != 'undefined') { f.it_point.value = point; @@ -647,7 +647,7 @@ else function fitemcheck(f, act) { // 판매가격이 0 보다 작다면 - if (f.it_amount.value < 0) + if (f.it_price.value < 0) { alert("전화로 문의해 주시면 감사하겠습니다."); return; diff --git a/mobile/shop/list.skin.10.php b/mobile/shop/list.skin.10.php index 8df05aea8..b26dcb60d 100644 --- a/mobile/shop/list.skin.10.php +++ b/mobile/shop/list.skin.10.php @@ -15,11 +15,11 @@ for ($i=1; $row=sql_fetch_array($result); $i++) - - + + - +

diff --git a/mobile/shop/maintype10.inc.php b/mobile/shop/maintype10.inc.php index a11cbc2cc..0d04e9054 100644 --- a/mobile/shop/maintype10.inc.php +++ b/mobile/shop/maintype10.inc.php @@ -14,7 +14,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) { - + diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php index 47974f7a7..03288f2a6 100644 --- a/mobile/shop/orderformupdate.php +++ b/mobile/shop/orderformupdate.php @@ -54,7 +54,7 @@ $i_temp_point = (int)$_POST['od_temp_point']; // 주문금액이 상이함 -$sql = " select SUM(ct_amount * ct_qty) as od_amount from {$g4['shop_cart_table']} where uq_id = '$tmp_uq_id' "; +$sql = " select SUM(ct_price * ct_qty) as od_amount from {$g4['shop_cart_table']} where uq_id = '$tmp_uq_id' "; $row = sql_fetch($sql); if ((int)$row['od_amount'] !== $i_amount) { die("Error."); diff --git a/mobile/shop/orderinquiry.sub.php b/mobile/shop/orderinquiry.sub.php index cdaa2fbc8..1c0a000ad 100644 --- a/mobile/shop/orderinquiry.sub.php +++ b/mobile/shop/orderinquiry.sub.php @@ -36,7 +36,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) () - + 배송상태 diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php index 5c2f1b2aa..0077bbda0 100644 --- a/mobile/shop/orderinquiryview.php +++ b/mobile/shop/orderinquiryview.php @@ -67,7 +67,7 @@ $s_page = 'orderinquiryview.php'; } else { - $wanbul = display_amount($receipt_amount); + $wanbul = display_price($receipt_amount); } // 120615 : 취소된 값을 두번 빼주는 결과가 되어 코드 수정 (군포돼지님) @@ -107,7 +107,7 @@ $s_page = 'orderinquiryview.php'; 결제금액 - + 승인일시 @@ -137,7 +137,7 @@ $s_page = 'orderinquiryview.php'; 결제금액 - + 승인일시 @@ -169,7 +169,7 @@ $s_page = 'orderinquiryview.php'; ?> 입금액 - + 입금확인일시 @@ -226,7 +226,7 @@ $s_page = 'orderinquiryview.php'; ?> 승인취소 금액 - + 환불 금액 - +
  • 총 구매액 - +
    • 0) { echo '
  • '; echo '할인액'.PHP_EOL; - echo ''.display_amount($od['od_dc_amount']).''; + echo ''.display_price($od['od_dc_amount']).''; echo '
    • '; } if ($misu_amount > 0) { echo '
  • '; echo '미결제액'.PHP_EOL; - echo ''.display_amount($misu_amount).''; + echo ''.display_price($misu_amount).''; echo '
    • '; } ?> diff --git a/mobile/shop/search.php b/mobile/shop/search.php index 9fde9b3c2..6d1221c28 100644 --- a/mobile/shop/search.php +++ b/mobile/shop/search.php @@ -104,9 +104,7 @@ $total_count = $row['cnt']; for ($i=0; $i<$save['cnt']; $i++) { $sql = " select it_id, it_name, - it_amount, - it_amount2, - it_amount3, + it_price, it_basic, it_tel_inq, it_point, @@ -125,7 +123,7 @@ $total_count = $row['cnt']; - +

    diff --git a/mobile/shop/wishlist.php b/mobile/shop/wishlist.php index dbbfd2034..7dede73ed 100644 --- a/mobile/shop/wishlist.php +++ b/mobile/shop/wishlist.php @@ -44,7 +44,7 @@ include_once(G4_MSHOP_PATH.'/_head.php'); } } - $it_amount = get_amount($row); + $it_price = get_price($row); if ($row['it_tel_inq']) $out_cd = 'tel_inq'; @@ -72,7 +72,7 @@ include_once(G4_MSHOP_PATH.'/_head.php'); - + diff --git a/shop/event.php b/shop/event.php index 3f70bcf96..a3416ee92 100644 --- a/shop/event.php +++ b/shop/event.php @@ -36,12 +36,9 @@ $sql_list1 = " select a.ca_id, a.it_name, a.it_maker, a.it_point, - a.it_amount, + a.it_price, a.it_stock_qty, - a.it_cust_amount, - a.it_amount, - a.it_amount2, - a.it_amount3, + a.it_cust_price, it_basic, it_opt1, it_opt2, diff --git a/shop/list.sort.php b/shop/list.sort.php index 75ae24e32..fcb0099ff 100644 --- a/shop/list.sort.php +++ b/shop/list.sort.php @@ -14,8 +14,8 @@ $sct_sort_href .= '&ev_id='.$ev_id.'&sort=';