merge 충돌 처리

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']);
         }
 

mobile/shop/item.php

@@ -343,24 +343,16 @@ else
             <?php } ?>
             <?php if($default['de_send_cost_case'] == '개별' && $it['it_sc_type'] != 0) { ?>
             <tr>
-                <th><label for="ct_send_cost2">배송비결제</label></th>
+                <th><label for="ct_send_cost">배송비결제</label></th>
                 <td>
                     <?php
                     if($it['it_sc_method'] == 2) {
                     ?>
-                    <select name="ct_send_cost2" id="ct_send_cost2">
+                    <select name="ct_send_cost" id="ct_send_cost">
                         <option value="0">주문시 결제</option>
                         <option value="1">수령후 지불</option>
                     </select>
                     <?php
-                    } else {
-                        if($it['it_sc_method']) {
-                            echo '<input type="hidden" name="ct_send_cost2" value="1">';
-                            echo '수령후 지불';
-                        } else {
-                            echo '<input type="hidden" name="ct_send_cost2" value="0">';
-                            echo '주문시 결제';
-                        }
                     }
                     ?>
                 </td>
@@ -578,10 +570,12 @@ else
         <h2>사용후기</h2>
         <?php echo pg_anchor_m('use'); ?>
 
-        <?php
-        $use_page_rows = 10; // 페이지당 목록수
-        include_once(G4_MSHOP_PATH.'/itemuse.inc.php');
-        ?>
+        <div id="itemuse"></div>
+        <script>
+        $(function(){
+            $("#itemuse").load("./itemuse.php", {it_id:"<?php echo $it_id; ?>"});
+        });
+        </script>
     </section>
 
     <section id="sit_qa">

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 .= '<div class="sod_bsk_itopt">'.$it_options.'</div>';
         }
 
+        // 개별배송비 계산
+        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<count($send_cost_limit); $k++) {
                 // 총판매금액이 배송비 상한가 보다 작다면
-                if ($tot_sell_amount < $send_cost_limit[$k]) {
-                    $send_cost = $send_cost_list[$k];
+                if ($tot_sell_amount < preg_replace('/[^0-9]/', '', $send_cost_limit[$k])) {
+                    $send_cost = preg_replace('/[^0-9]/', '', $send_cost_list[$k]);
                     break;
                 }
             }
+        } else {
+            $send_cost = $it_send_cost;
         }
     }
     ?>