From 0b5046514295f419a2a5145295b70cc07d6ebce0 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 16 May 2013 14:03:40 +0900
Subject: [PATCH] =?UTF-8?q?#188=20=EB=AA=A8=EB=B0=94=EC=9D=BC=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=EC=9D=98=20=EC=A3=BC=EB=AC=B8=EC=9D=80=20=EB=B3=84?=
 =?UTF-8?q?=EB=8F=84=20=ED=91=9C=EC=8B=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/orderform.php       |  3 +++
 adm/shop_admin/orderlist.php       |  6 ++++++
 adm/shop_admin/orderlist2.php      | 15 ++++++++++-----
 adm/shop_admin/orderstatuslist.php |  6 ++++++
 extend/shop.extend.php             |  8 ++++++++
 install/shop.sql                   |  1 +
 6 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 1ec7aff1f..350bd306e 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -130,6 +130,9 @@ $pg_anchor = '<ul class="anchor">
     <?php echo $pg_anchor; ?>
     <p>주문일시 <?php echo substr($od['od_time'],0,16); ?> (<?php echo get_yoil($od['od_time']); ?>) / 주문총액 <strong><?php echo number_format($total_order); ?></strong>원</p>
     <?php if ($default['de_hope_date_use']) { ?><p>희망배송일은 <?php echo $od['od_hope_date']; ?> (<?php echo get_yoil($od['od_hope_date']); ?>) 입니다.</p><?php } ?>
+    <?php if($od['od_mobile']) { ?>
+    <p>모바일 쇼핑몰의 주문입니다.</p>
+    <?php } ?>
 
     <form name="frmorderform" method="post" action="./ordercartupdate.php" onsubmit="return form_submit(this);">
     <input type="hidden" name="uq_id" value="<?php echo $od['uq_id']; ?>">
diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php
index 0b78d4985..5404da255 100644
--- a/adm/shop_admin/orderlist.php
+++ b/adm/shop_admin/orderlist.php
@@ -206,9 +206,15 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
             $row2 = sql_fetch($sql2);
             $od_cnt = $row2['cnt'];
         }
+
+        // 주문device
+        $od_mobile = '';
+        if($lines[$i]['od_mobile'])
+            $od_mobile = '(M)';
         ?>
         <tr class="orderlist">
             <td class="td_odrnum2">
+                <?php echo $od_mobile; ?>
                 <a href="<?php echo G4_SHOP_URL; ?>/orderinquiryview.php?od_id=<?php echo $lines[$i]['od_id']; ?>&amp;uq_id=<?php echo $lines[$i]['uq_id']; ?>">
                     <?php echo $lines[$i]['od_id']; ?><br>
                     <span class="sound_only">주문일시 </span><?php echo $lines[$i]['od_time']; ?>
diff --git a/adm/shop_admin/orderlist2.php b/adm/shop_admin/orderlist2.php
index 9871fc60c..21d63d20b 100644
--- a/adm/shop_admin/orderlist2.php
+++ b/adm/shop_admin/orderlist2.php
@@ -38,8 +38,7 @@ $total_page  = ceil($total_count / $rows);  // 전체 페이지 계산
 if ($page == "") { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
 $from_record = ($page - 1) * $rows; // 시작 열을 구함
 
-$sql  = " select a.od_id,
-                 a.*, "._MISU_QUERY_."
+$sql  = " select a.*, "._MISU_QUERY_."
            $sql_common
            group by a.od_id
            order by $sort1 $sort2
@@ -191,10 +190,17 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
 
         if ($lines[$i]['od_receipt_point'] > 0)
             $s_receipt_way .= $s_br.'포인트';
+
+        $od_mobile = '';
+        if($lines[$i]['od_mobile'])
+            $od_mobile = '(M)';
         ?>
 
         <tr>
-            <td headers="sodr_all_num"><a href="<?php echo G4_SHOP_URL; ?>/orderinquiryview.php?od_id=<?php echo $lines[$i]['od_id']; ?>&amp;uq_id=<?php echo $lines[$i]['uq_id']; ?>"><?php echo $lines[$i]['od_id']; ?><br><?php echo $lines[$i]['od_time']; ?></a></td>
+            <td headers="sodr_all_num">
+                <?php echo $od_mobile; ?>
+                <a href="<?php echo G4_SHOP_URL; ?>/orderinquiryview.php?od_id=<?php echo $lines[$i]['od_id']; ?>&amp;uq_id=<?php echo $lines[$i]['uq_id']; ?>"><?php echo $lines[$i]['od_id']; ?><br><?php echo $lines[$i]['od_time']; ?></a>
+            </td>
             <td headers="sodr_all_id" class="td_name">
                 <a href="<?php echo $_SERVER['PHP_SELF']; ?>?sort1=<?php echo $sort1;?>&amp;sort2=<?php echo $sort2; ?>&amp;sel_field=od_name&amp;search=<?php echo $lines[$i]['od_name']; ?>">
                     <?php echo cut_str($lines[$i]['od_name'],30,""); ?>/<?php echo $od_deposit_name; ?>
@@ -210,7 +216,7 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
             <td headers="sodr_all_nonpay" class="td_sodr_nonpay"><?php echo number_format($lines[$i]['misu']); ?></td>
             <td headers="sodr_all_payby"><?php echo $s_receipt_way; ?></td>
             <td headers="sodr_all_mng">
-                <a href="./orderform.php?od_id=<?php echo $lines[$i]['od_id']; ?>&amp;$qstr?>"><img src="./img/icon_mod.jpg" alt="주문 수정"></a>
+                <a href="./orderform.php?od_id=<?php echo $lines[$i]['od_id']; ?>&amp;<?php echo $qstr; ?>"><img src="./img/icon_mod.jpg" alt="주문 수정"></a>
                 <a href="./orderdelete.php?od_id=<?php echo $lines[$i]['od_id']; ?>&amp;uq_id=<?php echo $lines[$i]['uq_id']; ?>&amp;mb_id=<?php echo $lines[$i]['mb_id']; ?>&amp;<?php echo $qstr; ?>&amp;list=2" onclick="return delete_confirm();"><img src="./img/icon_del.jpg" alt="주문 삭제"></a>
             </td>
         </tr>
@@ -220,7 +226,6 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
         $sql2 = " select b.*
                     from {$g4['shop_order_table']} a
                     left join {$g4['shop_cart_table']} b on (a.uq_id = b.uq_id)
-                    left join {$g4['shop_item_table']} c on (b.it_id = c.it_id)
                    where od_id = '{$lines[$i]['od_id']}' ";
         $result2 = sql_query($sql2);
         for ($k=0;$row2=sql_fetch_array($result2);$k++) {
diff --git a/adm/shop_admin/orderstatuslist.php b/adm/shop_admin/orderstatuslist.php
index fee3bbc82..15e09236f 100644
--- a/adm/shop_admin/orderstatuslist.php
+++ b/adm/shop_admin/orderstatuslist.php
@@ -47,6 +47,7 @@ $sql  = " select a.od_id,
                  a.od_name,
                  a.od_deposit_name,
                  a.od_time,
+                 a.od_mobile,
                  b.it_opt1,
                  b.it_opt2,
                  b.it_opt3,
@@ -171,9 +172,14 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
         $it_name .= print_item_options($lines[$i]['it_id'], $lines[$i]['it_opt1'], $lines[$i]['it_opt2'], $lines[$i]['it_opt3'], $lines[$i]['it_opt4'], $lines[$i]['it_opt5'], $lines[$i]['it_opt6']);
 
         $s_mod = icon("수정", "");
+
+        $od_mobile = '';
+        if($lines[$i]['od_mobile'])
+            $od_mobile = '(M)';
     ?>
     <tr>
         <td class="td_odrnum2">
+            <?php echo $od_mobile; ?>
             <a href="<?php echo $_SERVER['PHP_SELF']; ?>?sort1=<?php echo $sort1; ?>&amp;sort2=<?php echo $sort2; ?>&amp;sel_field=od_id&amp;search=<?php echo $lines[$i]['od_id']; ?>"><?php echo $lines[$i]['od_id']; ?></a><br>
             <?php echo $lines[$i]['od_time']; ?>
         </td>
diff --git a/extend/shop.extend.php b/extend/shop.extend.php
index 9fa4a3c14..49aee9fa7 100644
--- a/extend/shop.extend.php
+++ b/extend/shop.extend.php
@@ -88,6 +88,14 @@ if(!$result) {
                     ADD `it_name` VARCHAR(255) NOT NULL DEFAULT '' AFTER `it_id` ", false);
 }
 
+// od_mobile 추가
+$sql = " select od_mobile from {$g4['shop_order_table']} limit 1 ";
+$result = sql_query($sql, false);
+if(!$result) {
+    sql_query(" ALTER TABLE `{$g4['shop_order_table']}`
+                    ADD `od_mobile` TINYINT(4) NOT NULL DEFAULT '0' AFTER `od_time` ", false);
+}
+
 //==============================================================================
 // 쇼핑몰 필수 실행코드 모음 끝
 //==============================================================================
diff --git a/install/shop.sql b/install/shop.sql
index 846fa001d..cab6790b5 100644
--- a/install/shop.sql
+++ b/install/shop.sql
@@ -582,6 +582,7 @@ CREATE TABLE IF NOT EXISTS `shop_order` (
   `od_cash_id_info` varchar(255) NOT NULL,
   `od_cash` tinyint(4) NOT NULL,
   `od_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `od_mobile` tinyint(4) NOT NULL DEFAULT '0',
   `od_ip` varchar(25) NOT NULL DEFAULT '',
   PRIMARY KEY (`od_id`),
   UNIQUE KEY `uq_id` (`uq_id`),