diff --git a/adm/shop_admin/ajax.orderitem.php b/adm/shop_admin/ajax.orderitem.php index 6813955d9..a1bf428a6 100644 --- a/adm/shop_admin/ajax.orderitem.php +++ b/adm/shop_admin/ajax.orderitem.php @@ -16,7 +16,8 @@ if(!$od['od_id']) $sql = " select it_id, it_name, cp_price, - ct_notax + ct_notax, + ct_send_cost from {$g5['g5_shop_cart_table']} where od_id = '$od_id' group by it_id @@ -67,6 +68,20 @@ $result = sql_query($sql); // 소계 $ct_price['stotal'] = $opt_price * $opt['ct_qty']; $ct_point['stotal'] = $opt['ct_point'] * $opt['ct_qty']; + + // 배송비 + switch($opt['ct_send_cost']) + { + case 1: + $ct_send_cost = '착불'; + break; + case 2: + $ct_send_cost = '무료'; + break; + default: + $ct_send_cost = '선불'; + break; + } ?> @@ -84,7 +99,7 @@ $result = sql_query($sql); - + - + diff --git a/adm/shop_admin/orderprintresult.php b/adm/shop_admin/orderprintresult.php index 1d7c1a36b..cff701da5 100644 --- a/adm/shop_admin/orderprintresult.php +++ b/adm/shop_admin/orderprintresult.php @@ -66,7 +66,19 @@ if ($csv == 'csv') for ($i=0; $row=mysql_fetch_array($result); $i++) { $row = array_map('iconv_euckr', $row); - $ct_send_cost = iconv_euckr($row['ct_send_cost'] ? '착불' : '선불'); + switch($row['ct_send_cost']) + { + case 1: + $ct_send_cost = '착불'; + break; + case 2: + $ct_send_cost = '무료'; + break; + default: + $ct_send_cost = '선불'; + break; + } + $ct_send_cost = iconv_euckr($ct_send_cost); echo '"'.$row['od_b_zip1'].'-'.$row['od_b_zip2'].'"'.','; echo '"'.print_address($row['od_b_addr1'], $row['od_b_addr2'], $row['od_b_addr3']).'"'.','; @@ -134,7 +146,19 @@ if ($csv == 'xls') } for($i=1; $row=sql_fetch_array($result); $i++) { - $ct_send_cost = iconv_euckr(($row['ct_send_cost'] ? '착불' : '선불')); + switch($row['ct_send_cost']) + { + case 1: + $ct_send_cost = '착불'; + break; + case 2: + $ct_send_cost = '무료'; + break; + default: + $ct_send_cost = '선불'; + break; + } + $ct_send_cost = iconv_euckr($ct_send_cost); $row = array_map('iconv_euckr', $row); $worksheet->write($i, 0, $row['od_b_zip1'].'-'.$row['od_b_zip2']); @@ -305,7 +329,18 @@ if (mysql_num_rows($result) == 0) $price_plus = '+'; $it_name = "$it_name ({$row2['ct_option']} ".$price_plus.display_price($row2['io_price']).")"; - $ct_send_cost = ($row2['ct_send_cost'] ? '착불' : '선불'); + switch($row2['ct_send_cost']) + { + case 1: + $ct_send_cost = '착불'; + break; + case 2: + $ct_send_cost = '무료'; + break; + default: + $ct_send_cost = '선불'; + break; + } $fontqty1 = $fontqty2 = ""; if ($row2['ct_qty'] >= 2) diff --git a/mobile/shop/cart.php b/mobile/shop/cart.php index 844d1b713..5655945ac 100644 --- a/mobile/shop/cart.php +++ b/mobile/shop/cart.php @@ -75,9 +75,18 @@ $cart_count = mysql_num_rows($result); } // 배송비 - $ct_send_cost = '선불'; - if($row['ct_send_cost']) - $ct_send_cost = '착불'; + switch($row['ct_send_cost']) + { + case 1: + $ct_send_cost = '착불'; + break; + case 2: + $ct_send_cost = '무료'; + break; + default: + $ct_send_cost = '선불'; + break; + } $point = $sum['point']; $sell_price = $sum['price']; diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php index 19c12ecd0..2233f32b3 100644 --- a/mobile/shop/orderform.php +++ b/mobile/shop/orderform.php @@ -168,9 +168,18 @@ ob_start(); } // 배송비 - $ct_send_cost = '선불'; - if($ct_send_cost) - $ct_send_cost = '착불'; + switch($row['ct_send_cost']) + { + case 1: + $ct_send_cost = '착불'; + break; + case 2: + $ct_send_cost = '무료'; + break; + default: + $ct_send_cost = '선불'; + break; + } ?>
  • diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php index 5af9bcd2b..8b73c5a50 100644 --- a/mobile/shop/orderinquiryview.php +++ b/mobile/shop/orderinquiryview.php @@ -57,9 +57,18 @@ include_once(G5_MSHOP_PATH.'/_head.php'); $res = sql_query($sql); // 배송비 - $ct_send_cost = '선불'; - if($row['ct_send_cost']) - $ct_send_cost = '착불'; + switch($row['ct_send_cost']) + { + case 1: + $ct_send_cost = '착불'; + break; + case 2: + $ct_send_cost = '무료'; + break; + default: + $ct_send_cost = '선불'; + break; + } ?>
  • diff --git a/shop/cart.php b/shop/cart.php index aee20e0dc..6f24161f8 100644 --- a/shop/cart.php +++ b/shop/cart.php @@ -99,9 +99,18 @@ include_once('./_head.php'); } // 배송비 - $ct_send_cost = '선불'; - if($row['ct_send_cost']) - $ct_send_cost = '착불'; + switch($row['ct_send_cost']) + { + case 1: + $ct_send_cost = '착불'; + break; + case 2: + $ct_send_cost = '무료'; + break; + default: + $ct_send_cost = '선불'; + break; + } $point = $sum['point']; $sell_price = $sum['price']; diff --git a/shop/cartupdate.php b/shop/cartupdate.php index 351c58669..39ec11f67 100644 --- a/shop/cartupdate.php +++ b/shop/cartupdate.php @@ -218,8 +218,10 @@ else // 장바구니에 담기 } // 배송비결제 - if($it['it_sc_type'] > 1 && $it['it_sc_method'] == 1) - $ct_send_cost = 1; + if($it['it_sc_type'] == 1) + $ct_send_cost = 2; // 무료 + else if($it['it_sc_type'] > 1 && $it['it_sc_method'] == 1) + $ct_send_cost = 1; // 착불 $sql .= $comma."( '$tmp_cart_id', '{$member['mb_id']}', '{$it['it_id']}', '".addslashes($it['it_name'])."', '쇼핑', '{$it['it_price']}', '$point', '0', '0', '$io_value', '$ct_qty', '{$it['it_notax']}', '$io_id', '$io_type', '$io_price', '".G5_TIME_YMDHIS."', '$REMOTE_ADDR', '$ct_send_cost', '$sw_direct', '$ct_select' )"; $comma = ' , '; diff --git a/shop/itembuy.php b/shop/itembuy.php index bb79ac24e..e5b1e278f 100644 --- a/shop/itembuy.php +++ b/shop/itembuy.php @@ -57,8 +57,10 @@ $tot_prc = $it['it_price'] + $opt['io_price']; // 배송비결제 $ct_send_cost = 0; -if($it['it_sc_method'] == 1) - $ct_send_cost = 1; +if($it['it_sc_type'] == 1) + $ct_send_cost = 2; // 무료 +else if($it['it_sc_type'] > 1 && $it['it_sc_method'] == 1) + $ct_send_cost = 1; // 착불 $_POST['it_id'][0] = $it['it_id']; $_POST['io_id'][$it['it_id']][0] = $opt['io_id']; diff --git a/shop/orderform.php b/shop/orderform.php index 0764751bb..96630caba 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -305,9 +305,18 @@ function get_intall_file() } // 배송비 - $ct_send_cost = '선불'; - if($row['ct_send_cost']) - $ct_send_cost = '착불'; + switch($row['ct_send_cost']) + { + case 1: + $ct_send_cost = '착불'; + break; + case 2: + $ct_send_cost = '무료'; + break; + default: + $ct_send_cost = '선불'; + break; + } ?> diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php index 1670f51dd..eb8c9176f 100644 --- a/shop/orderinquiryview.php +++ b/shop/orderinquiryview.php @@ -85,9 +85,18 @@ if(openwin != null) { $rowspan = mysql_num_rows($res) + 1; // 배송비 - $ct_send_cost = '선불'; - if($row['ct_send_cost']) - $ct_send_cost = '착불'; + switch($row['ct_send_cost']) + { + case 1: + $ct_send_cost = '착불'; + break; + case 2: + $ct_send_cost = '무료'; + break; + default: + $ct_send_cost = '선불'; + break; + } for($k=0; $opt=sql_fetch_array($res); $k++) { if($opt['io_type'])