From eaa305eb8b958f8fe913036c94ec54d5b6259ef1 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 28 Nov 2013 14:49:57 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EB=82=B4=EC=97=AD=EC=B6=9C?=
 =?UTF-8?q?=EB=A0=A5=EC=97=90=EC=84=9C=20csv=20=ED=95=9C=EA=B8=80=EA=B9=A8?=
 =?UTF-8?q?=EC=A7=90=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/orderprint.php       | 8 ++++----
 adm/shop_admin/orderprintresult.php | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/adm/shop_admin/orderprint.php b/adm/shop_admin/orderprint.php
index 815ae1ebf..7dcd5244b 100644
--- a/adm/shop_admin/orderprint.php
+++ b/adm/shop_admin/orderprint.php
@@ -22,7 +22,7 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
         <label for="ct_status_p" class="sound_only">출력대상</label>
         <select name="ct_status" id="ct_status_p">
             <option value="주문">주문</option>
-            <option value="주문">입금</option>
+            <option value="입금">입금</option>
             <option value="준비">준비</option>
             <option value="배송">배송</option>
             <option value="완료">완료</option>
@@ -54,7 +54,7 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
         <label for="ct_status_n" class="sound_only">출력대상</label>
         <select name="ct_status" id="ct_status_n">
             <option value="주문">주문</option>
-            <option value="주문">입금</option>
+            <option value="입금">입금</option>
             <option value="준비">준비</option>
             <option value="배송">배송</option>
             <option value="완료">완료</option>
@@ -64,10 +64,10 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
             <option value="">전체</option>
         </select>
         <label for="fr_od_id" class="sound_only">주문번호 구간 시작</label>
-        <input type="text" name="fr_od_id" id="fr_od_id" class="frm_input" size="10" maxlength="10">
+        <input type="text" name="fr_od_id" id="fr_od_id" class="frm_input" size="10" maxlength="20">
         ~
         <label for="fr_od_id" class="sound_only">주문번호 구간 종료</label>
-        <input type="text" name="to_od_id" id="to_od_id" class="frm_input" size="10" maxlength="10">
+        <input type="text" name="to_od_id" id="to_od_id" class="frm_input" size="10" maxlength="20">
         <input type="submit" value="출력 (새창)" class="btn_submit">
 
         </form>
diff --git a/adm/shop_admin/orderprintresult.php b/adm/shop_admin/orderprintresult.php
index 9051a0385..a6583f734 100644
--- a/adm/shop_admin/orderprintresult.php
+++ b/adm/shop_admin/orderprintresult.php
@@ -58,14 +58,15 @@ if ($csv == 'csv')
     header("Content-charset=utf-8");
     header('Content-Type: doesn/matter');
     header('Expires: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-    header('Content-Disposition: attachment; filename="' . date("ymd", time()) . '.csv"');
+    header('Content-Disposition: attachment; filename="orderlist-' . date("ymd", time()) . '.csv"');
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
     header('Pragma: public');
     //echo "우편번호,주소,이름,전화1,전화2,상품명,수량,비고,전하실말씀\n";
-    echo "우편번호,주소,이름,전화1,전화2,상품명,수량,선택사항,배송비,상품코드,주문번호,운송장번호,전하실말씀\n";
+    echo iconv('utf-8', 'euc-kr', "우편번호,주소,이름,전화1,전화2,상품명,수량,선택사항,배송비,상품코드,주문번호,운송장번호,전하실말씀\n");
     for ($i=0; $row=mysql_fetch_array($result); $i++)
     {
-        $ct_send_cost = ($row['ct_send_cost'] ? '착불' : '선불');
+        $row = array_map('iconv_euckr', $row);
+        $ct_send_cost = iconv_euckr($row['ct_send_cost'] ? '착불' : '선불');
 
         echo '"'.$row['od_b_zip1'].'-'.$row['od_b_zip2'].'"'.',';
         echo '"'.$row['od_b_addr1'].' '.$row['od_b_addr2'].'"'.',';