From 1b38551ee0641f29d6db7d46e93b5e7d1afe1ed9 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 9 May 2013 09:22:08 +0900
Subject: [PATCH 1/3] =?UTF-8?q?=EA=B2=B0=EC=A0=9C=EB=93=B1=EB=A1=9D=20?=
 =?UTF-8?q?=EC=99=84=EB=A3=8C=20=EC=B2=B4=ED=81=AC=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/shop/orderformupdate.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php
index 9be95dc53..c1a4b052b 100644
--- a/mobile/shop/orderformupdate.php
+++ b/mobile/shop/orderformupdate.php
@@ -9,6 +9,10 @@ if(get_magic_quotes_gpc())
 $_GET  = array_map("mysql_real_escape_string", $_GET);
 $_POST = array_map("mysql_real_escape_string", $_POST);
 
+// 결제등록 완료 체크
+if($_POST['tran_cd'] == '' || $_POST['enc_info'] == '' || $_POST['enc_data'] == '')
+    alert('결제등록 요청 후 주문해 주십시오.');
+
 // 장바구니가 비어있는가?
 if (get_session("ss_direct"))
     $tmp_uq_id = get_session('ss_uq_direct');

From 82ec50008326c861a2f82d0b7cf3f409bddb32ef Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 9 May 2013 09:48:06 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=EB=B9=84=ED=9A=8C=EC=9B=90=20=EC=A3=BC?=
 =?UTF-8?q?=EB=AC=B8=EC=97=90=EC=84=9C=20=EB=88=84=EC=A0=81=20=EC=A3=BC?=
 =?UTF-8?q?=EB=AC=B8=EA=B1=B4=EC=88=98=20=EC=B6=9C=EB=A0=A5=EB=90=98?=
 =?UTF-8?q?=EB=8A=94=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/orderlist.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php
index 98c386486..0b78d4985 100644
--- a/adm/shop_admin/orderlist.php
+++ b/adm/shop_admin/orderlist.php
@@ -199,10 +199,12 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
 
         $mb_nick = get_sideview($lines[$i]['mb_id'], $lines[$i]['od_name'], $lines[$i]['od_email'], '');
 
+        $od_cnt = 0;
         if ($lines[$i]['mb_id'])
         {
             $sql2 = " select count(*) as cnt from {$g4['shop_order_table']} where mb_id = '{$lines[$i]['mb_id']}' ";
             $row2 = sql_fetch($sql2);
+            $od_cnt = $row2['cnt'];
         }
         ?>
         <tr class="orderlist">
@@ -219,7 +221,7 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
                     <?php echo $lines[$i]['mb_id']; ?>
                 </a>
             </td>
-            <td class="td_sodr_cnt"><b><?php echo $lines[$i]['itemcount']; ?></b>건<br>누적 <?php echo $row2['cnt']; ?>건</td>
+            <td class="td_sodr_cnt"><b><?php echo $lines[$i]['itemcount']; ?></b>건<?php if($od_cnt) { ?><br>누적 <?php echo $od_cnt; ?>건<?php } ?></td>
             <td class="td_sodr_sum"><?php echo number_format($lines[$i]['orderamount']); ?></td>
             <td><?php echo number_format($lines[$i]['ordercancel']); ?></td>
             <td><?php echo number_format($lines[$i]['od_dc_amount']); ?></td>

From e770a748494544ed3099a859929782a87f5c942e Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 9 May 2013 10:13:06 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EC=83=81=ED=92=88?=
 =?UTF-8?q?=EC=9D=B4=202=EA=B0=9C=20=EC=9D=B4=EC=83=81=EC=9D=BC=20?=
 =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20=EA=B2=B0=EC=A0=9C=20=EC=83=81=ED=92=88?=
 =?UTF-8?q?=EB=AA=85=EC=97=90=20div=20=EC=B6=94=EA=B0=80=EB=90=98=EB=8A=94?=
 =?UTF-8?q?=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/shop/cartsub.inc.php | 2 +-
 shop/cartsub.inc.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/shop/cartsub.inc.php b/mobile/shop/cartsub.inc.php
index 9ff78d73b..044aa2669 100644
--- a/mobile/shop/cartsub.inc.php
+++ b/mobile/shop/cartsub.inc.php
@@ -189,7 +189,7 @@ if ($i == 0) echo '<tr><td colspan="'.$colspan.'" class="empty_table">장바구
 </tbody>
 </table>
 
-<?php if ($goods_count) $goods .= '<div> 외 '.$goods_count.'건</div>'; ?>
+<?php if ($goods_count) $goods .= ' 외 '.$goods_count.'건'; ?>
 
 <?php
 // 배송비가 0 보다 크다면 (있다면)
diff --git a/shop/cartsub.inc.php b/shop/cartsub.inc.php
index 207c9067a..0f3d892b9 100644
--- a/shop/cartsub.inc.php
+++ b/shop/cartsub.inc.php
@@ -189,7 +189,7 @@ if ($i == 0) echo '<tr><td colspan="'.$colspan.'" class="empty_table">장바구
 </tbody>
 </table>
 
-<?php if ($goods_count) $goods .= '<div> 외 '.$goods_count.'건</div>'; ?>
+<?php if ($goods_count) $goods .= ' 외 '.$goods_count.'건'; ?>
 
 <?php
 // 배송비가 0 보다 크다면 (있다면)