diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php
index 3849e9385..609f6a99c 100644
--- a/extend/shop.extend2.php
+++ b/extend/shop.extend2.php
@@ -296,12 +296,10 @@ if(!$result) {
}
// 장바구니 배송비필드 추가
-$sql = " select ct_send_cost2 from {$g4['shop_cart_table']} limit 1 ";
+$sql = " select ct_send_cost from {$g4['shop_cart_table']} limit 1 ";
$result = sql_query($sql, false);
if(!$result) {
sql_query(" ALTER TABLE `{$g4['shop_cart_table']}`
- DROP `ct_send_cost`,
- ADD `ct_send_cost` INT(11) NOT NULL DEFAULT '0' AFTER `io_price`,
- ADD `ct_send_cost2` TINYINT(4) NOT NULL DEFAULT '0' AFTER `ct_send_cost` ", false);
+ ADD `ct_send_cost` TINYINT(11) NOT NULL DEFAULT '0' AFTER `io_price` ", false);
}
?>
\ No newline at end of file
diff --git a/install/shop.sql b/install/shop.sql
index 93599c27e..a68bfd2ef 100644
--- a/install/shop.sql
+++ b/install/shop.sql
@@ -74,8 +74,7 @@ CREATE TABLE IF NOT EXISTS `shop_cart` (
`io_price` int(11) NOT NULL DEFAULT '0',
`ct_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`ct_ip` varchar(25) NOT NULL DEFAULT '',
- `ct_send_cost` int(11) NOT NULL DEFAULT '0',
- `ct_send_cost2` tinyint(4) NOT NULL DEFAULT '0',
+ `ct_send_cost` tinyint(4) NOT NULL DEFAULT '0',
`ct_direct` tinyint(4) NOT NULL DEFAULT '0',
`ct_select` tinyint(4) NOT NULL DEFAULT '0',
PRIMARY KEY (`ct_id`),
diff --git a/mobile/shop/cart.php b/mobile/shop/cart.php
index f0b77eb1a..c50cdbb8d 100644
--- a/mobile/shop/cart.php
+++ b/mobile/shop/cart.php
@@ -35,6 +35,7 @@ include_once(G4_MSHOP_PATH.'/_head.php');
a.ct_point,
a.ct_qty,
a.ct_status,
+ a.ct_send_cost,
b.ca_id
from {$g4['shop_cart_table']} a left join {$g4['shop_item_table']} b on ( a.it_id = b.it_id )
where a.uq_id = '$s_uq_id'
@@ -75,7 +76,7 @@ include_once(G4_MSHOP_PATH.'/_head.php');
}
// 개별배송비 계산
- if($default['de_send_cost_case'] == '개별') {
+ if($default['de_send_cost_case'] == '개별' && !$row['ct_send_cost']) {
$it_send_cost += get_item_sendcost($row['it_id'], $sum['price'], $sum['qty']);
}
diff --git a/mobile/shop/item.php b/mobile/shop/item.php
index 3b04f2c1a..53722582c 100644
--- a/mobile/shop/item.php
+++ b/mobile/shop/item.php
@@ -343,24 +343,16 @@ else
- |
+ |
- |
@@ -578,10 +570,12 @@ else
사용후기
-
+
+
diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php
index 890b001a9..a8e0fc118 100644
--- a/mobile/shop/orderform.php
+++ b/mobile/shop/orderform.php
@@ -65,6 +65,7 @@ ob_start();
a.ct_point,
a.ct_qty,
a.ct_status,
+ a.ct_send_cost,
b.ca_id
from {$g4['shop_cart_table']} a left join {$g4['shop_item_table']} b on ( a.it_id = b.it_id )
where a.uq_id = '$s_uq_id'
@@ -78,6 +79,7 @@ ob_start();
$result = sql_query($sql);
$good_info = '';
+ $it_send_cost = 0;
for ($i=0; $row=mysql_fetch_array($result); $i++)
{
@@ -120,6 +122,11 @@ ob_start();
$it_name .= ''.$it_options.'
';
}
+ // 개별배송비 계산
+ if($default['de_send_cost_case'] == '개별' && !$row['ct_send_cost']) {
+ $it_send_cost += get_item_sendcost($row['it_id'], $sum['price'], $sum['qty']);
+ }
+
$point = $sum['point'];
$sell_amount = $sum['price'];
@@ -175,18 +182,20 @@ ob_start();
// 배송비 계산
if ($default['de_send_cost_case'] == '없음')
$send_cost = 0;
- else {
+ else if($default['de_send_cost_case'] == '상한') {
// 배송비 상한 : 여러단계의 배송비 적용 가능
$send_cost_limit = explode(";", $default['de_send_cost_limit']);
$send_cost_list = explode(";", $default['de_send_cost_list']);
$send_cost = 0;
for ($k=0; $k
diff --git a/shop/cart.php b/shop/cart.php
index dac1e3c64..cc0a09557 100644
--- a/shop/cart.php
+++ b/shop/cart.php
@@ -72,6 +72,7 @@ include_once('./_head.php');
a.ct_point,
a.ct_qty,
a.ct_status,
+ a.ct_send_cost,
b.ca_id,
b.ca_id2,
b.ca_id3
@@ -114,7 +115,7 @@ include_once('./_head.php');
}
// 개별배송비 계산
- if($default['de_send_cost_case'] == '개별') {
+ if($default['de_send_cost_case'] == '개별' && !$row['ct_send_cost']) {
$it_send_cost += get_item_sendcost($row['it_id'], $sum['price'], $sum['qty']);
}
diff --git a/shop/cartoption.php b/shop/cartoption.php
index 8dbb1d8a8..0a69974a6 100644
--- a/shop/cartoption.php
+++ b/shop/cartoption.php
@@ -19,7 +19,7 @@ $sql = " select * from {$g4['shop_cart_table']} where uq_id = '$uq_id' and it_id
$result = sql_query($sql);
// 판매가격
-$sql2 = " select ct_price, it_name, ct_send_cost, ct_send_cost2
+$sql2 = " select ct_price, it_name, ct_send_cost
from {$g4['shop_cart_table']} where uq_id = '$uq_id' and it_id = '$it_id' and ct_num = '0' ";
$row2 = sql_fetch($sql2);
@@ -34,7 +34,6 @@ if(!mysql_num_rows($result))
-
- |
+ |
-
+
';
- echo '수령후 지불';
- } else {
- echo '';
- echo '주문시 결제';
- }
}
?>
|
@@ -585,7 +577,7 @@ else
diff --git a/shop/orderform.php b/shop/orderform.php
index 40b9c8f85..793849493 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -140,6 +140,7 @@ setTimeout("init_pay_button();",300);
a.ct_point,
a.ct_qty,
a.ct_status,
+ a.ct_send_cost,
b.ca_id,
b.ca_id2,
b.ca_id3
@@ -155,6 +156,7 @@ setTimeout("init_pay_button();",300);
$result = sql_query($sql);
$good_info = '';
+ $it_send_cost = 0;
for ($i=0; $row=mysql_fetch_array($result); $i++)
{
@@ -195,6 +197,11 @@ setTimeout("init_pay_button();",300);
$it_name .= ''.$it_options.'
';
}
+ // 개별배송비 계산
+ if($default['de_send_cost_case'] == '개별' && !$row['ct_send_cost']) {
+ $it_send_cost += get_item_sendcost($row['it_id'], $sum['price'], $sum['qty']);
+ }
+
$point = $sum['point'];
$sell_amount = $sum['price'];
@@ -250,18 +257,20 @@ setTimeout("init_pay_button();",300);
// 배송비 계산
if ($default['de_send_cost_case'] == '없음')
$send_cost = 0;
- else {
+ else if($default['de_send_cost_case'] == '상한') {
// 배송비 상한 : 여러단계의 배송비 적용 가능
$send_cost_limit = explode(";", $default['de_send_cost_limit']);
$send_cost_list = explode(";", $default['de_send_cost_list']);
$send_cost = 0;
for ($k=0; $k
diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php
index e77021ca9..57c397316 100644
--- a/shop/orderformupdate.php
+++ b/shop/orderformupdate.php
@@ -172,20 +172,40 @@ if ((int)($row['od_amount'] - $tot_cp_amount) !== $i_amount) {
// 배송비가 상이함
$tot_sell_amount = $row['od_amount'];
// 배송비 계산
-if ($default['de_send_cost_case'] == "없음") {
+if ($default['de_send_cost_case'] == '없음') {
$send_cost = 0;
-} else {
+} else if($default['de_send_cost_case'] == '상한') {
// 배송비 상한 : 여러단계의 배송비 적용 가능
$send_cost_limit = explode(";", $default['de_send_cost_limit']);
$send_cost_list = explode(";", $default['de_send_cost_list']);
$send_cost = 0;
for ($k=0; $k