Merge branch 'master' of github.com:gnuboard/yc4s

shop/cartsub.inc.php

@@ -123,7 +123,7 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
     echo "<td align=right>" . number_format($point) . "&nbsp;</td>";
 
     if ($s_page == "cart.php")
-        echo "<td align=center><a href='./cartupdate.php?w=d&ct_id={$row['ct_id']}'><img src='".G4_SHOP_URL."/img/btn_del.gif' border='0' align=absmiddle alt='삭제'></a></td>";
+        echo "<td align=center><a href='./cartupdate.php?act=d&ct_id={$row['ct_id']}'><img src='".G4_SHOP_URL."/img/btn_del.gif' border='0' align=absmiddle alt='삭제'></a></td>";
     else if ($s_page == "orderinquiryview.php")
     {
         switch($row['ct_status'])
@@ -182,7 +182,7 @@ if ($i == 0) {
         }
 
         // 이미 주문된 내역을 보여주는것이므로 배송비를 주문서에서 얻는다.
-        $sql = "select od_send_cost from $g4[yc4_order_table] where od_id = '$od_id' ";
+        $sql = "select od_send_cost from {$g4['yc4_order_table']} where od_id = '$od_id' ";
         $row = sql_fetch($sql);
         if ($row['od_send_cost'] > 0)
             $send_cost = $row['od_send_cost'];
@@ -212,7 +212,7 @@ if ($i == 0) {
     if ($s_page == "cart.php" || $s_page == "orderinquiryview.php")
         echo "<td> &nbsp;</td>";
     echo "</tr>";
-    echo "<input type=hidden name=w value=''>";
+    echo "<input type=hidden name=act value=''>";
     echo "<input type=hidden name=records value='$i'>";
 }
 ?>
@@ -249,7 +249,7 @@ if ($i == 0) {
 
             if (act == "buy")
             {
-                f.w.value = act;
+                f.act.value = act;
 
                 <?
                 if (get_session('ss_mb_id')) // 회원인 겨우
@@ -263,7 +263,7 @@ if ($i == 0) {
             }
             else if (act == "alldelete")
             {
-                f.w.value = act;
+                f.act.value = act;
                 f.action = "<?="./cartupdate.php"?>";
                 f.submit();
             }
@@ -296,7 +296,7 @@ if ($i == 0) {
                         return;
                     }
                 }
-                f.w.value = act;
+                f.act.value = act;
                 f.action = "./cartupdate.php";
                 f.submit();
             }

shop/cartupdate.php

@@ -40,20 +40,20 @@ if ($member['mb_level'] < $default['de_level_sell'])
 }
 
 
-if ($w == "d") // 삭제이면
+if ($act == "d") // 삭제이면
 {
     $sql = " delete from {$g4['yc4_cart_table']}
               where ct_id = '$ct_id'
                 and uq_id = '$tmp_uq_id' ";
     sql_query($sql);
 }
-else if ($w == "alldelete") // 모두 삭제이면
+else if ($act == "alldelete") // 모두 삭제이면
 {
     $sql = " delete from {$g4['yc4_cart_table']}
               where uq_id = '$tmp_uq_id' ";
     sql_query($sql);
 }
-else if ($w == "allupdate") // 수량 변경이면 : 모두 수정이면
+else if ($act == "allupdate") // 수량 변경이면 : 모두 수정이면
 {
     $fldcnt = count($_POST['ct_id']);
 
@@ -81,7 +81,7 @@ else if ($w == "allupdate") // 수량 변경이면 : 모두 수정이면
         sql_query($sql);
     }
 }
-else if ($w == "multi") // 온라인견적(등)에서 여러개의 상품이 한꺼번에 들어옴.
+else if ($act == "multi") // 온라인견적(등)에서 여러개의 상품이 한꺼번에 들어옴.
 {
     // 보관함에서 금액이 제대로 반영되지 않던 오류를 수정
     $fldcnt = count($_POST['it_name']);

shop/orderform.php

@@ -64,13 +64,16 @@ include_once('./cartsub.inc.php');
             <td>핸드폰</td>
             <td><input type=text name=od_hp value='<?=$member['mb_hp']?>' maxlength=20 class=ed></td>
         </tr>
+        <?
+        $zip_href = G4_BBS_URL.'/zip.php?frm_name=forderform&amp;frm_zip1=od_zip1&amp;frm_zip2=od_zip2&amp;frm_addr1=od_addr1&amp;frm_addr2=od_addr2';
+        ?>
         <tr>
             <td rowspan=2>주 소</td>
             <td>
                 <input type=text name=od_zip1 size=3 maxlength=3 value='<?=$member['mb_zip1']?>' class=ed readonly>
                 -
                 <input type=text name=od_zip2 size=3 maxlength=3 value='<?=$member['mb_zip2']?>' class=ed readonly>
-                <a href="javascript:;" onclick="win_zip('forderform', 'od_zip1', 'od_zip2', 'od_addr1', 'od_addr2');"><img
+                <a href="<? echo $zip_href;?>" class="win_zip_find" target="_blank"><img
                     src="<?=G4_SHOP_URL?>/img/btn_zip_find.gif" border="0" align=absmiddle></a>
             </td>
         </tr>
@@ -133,13 +136,16 @@ include_once('./cartsub.inc.php');
             <td><input type=text name=od_b_hp class=ed
                 maxlength=20></td>
         </tr>
+        <?
+        $zip_href = G4_BBS_URL.'/zip.php?frm_name=forderform&amp;frm_zip1=od_b_zip1&amp;frm_zip2=od_b_zip2&amp;frm_addr1=od_b_addr1&amp;frm_addr2=od_b_addr2';
+        ?>
         <tr>
             <td rowspan=2>주 소</td>
             <td>
                 <input type=text name=od_b_zip1 size=3 maxlength=3 class=ed readonly>
                 -
                 <input type=text name=od_b_zip2 size=3 maxlength=3 class=ed readonly>
-                <a href="javascript:;" onclick="win_zip('forderform', 'od_b_zip1', 'od_b_zip2', 'od_b_addr1', 'od_b_addr2');"><img
+                <a href="<? echo $zip_href; ?>" class="win_zip_find" target="_blank"><img
                     src="<?=G4_SHOP_URL?>/img/btn_zip_find.gif" border="0" align=absmiddle></a>
                 </a>
             </td>

shop/orderinquiryview.php

@@ -128,10 +128,10 @@ if ($tot_amount - $tot_cancel_amount == $receipt_amount) {
 
 // 120615 : 취소된 값을 두번 빼주는 결과가 되어 코드 수정 (군포돼지님)
 //$misu_amount = $tot_amount - $tot_cancel_amount - $receipt_amount - $od[od_dc_amount];
-$misu_amount = $tot_amount - $receipt_amount - $od[od_dc_amount];
+$misu_amount = $tot_amount - $receipt_amount - $od['od_dc_amount'];
 
 echo "<tr>";
-echo "<td align=center bgcolor=#FFEFFD height=60><img src=\"".G4_SHOP_URL."/t_data04.gif\"></td>";
+echo "<td align=center bgcolor=#FFEFFD height=60><img src=\"".G4_SHOP_URL."/img/t_data04.gif\"></td>";
 echo "<td style='padding:20px'>";
 
 if ($od['od_settle_case'] == '신용카드')