From 0aae98108b9112cec12e5e025d6eafb03cd4cdcd Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 28 Nov 2013 14:08:53 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20local=5Fsch0?= =?UTF-8?q?2=20button=20margin=20=EC=B4=88=EA=B8=B0=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/admin.css b/css/admin.css index 83725d236..ee7c37b7d 100644 --- a/css/admin.css +++ b/css/admin.css @@ -210,7 +210,7 @@ legend {position:absolute;width:0;height:0;font-size:0;line-height:0;text-indent .local_sch02 strong {display:inline-block;width:80px} .local_sch02 strong.sch_long {width:160px} .local_sch02 label {display:inline-block;margin:0 5px 0 0} -.local_sch02 button {padding:3px 5px;border:1px solid #ced9de;background:#f6f9fa;font-size:0.95em;cursor:pointer} +.local_sch02 button {margin:0;padding:3px 5px;border:1px solid #ced9de;background:#f6f9fa;font-size:0.95em;cursor:pointer} /* 페이지 내 실행 */ .local_cmd {min-width:960px} From eaa305eb8b958f8fe913036c94ec54d5b6259ef1 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 28 Nov 2013 14:49:57 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EB=82=B4=EC=97=AD?= =?UTF-8?q?=EC=B6=9C=EB=A0=A5=EC=97=90=EC=84=9C=20csv=20=ED=95=9C=EA=B8=80?= =?UTF-8?q?=EA=B9=A8=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'); - + @@ -64,10 +64,10 @@ include_once (G5_ADMIN_PATH.'/admin.head.php'); - + ~ - + 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'].'"'.','; From a7478e2329e3ce626710a992ab31c6357aba8720 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 28 Nov 2013 14:52:50 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=EA=B0=80=EA=B2=A9=EB=B9=84=EA=B5=90=20?= =?UTF-8?q?=EC=82=AC=EC=9D=B4=ED=8A=B8=20=EB=84=A4=EC=9D=B4=EB=B2=84=20?= =?UTF-8?q?=EB=8B=A4=EC=9D=8C=20=EC=96=B4=EB=B0=94=EC=9B=83=EC=9D=84=20?= =?UTF-8?q?=EC=A0=9C=EC=99=B8=ED=95=9C=20=EB=82=98=EB=A8=B8=EC=A7=80=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/price.php | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/adm/shop_admin/price.php b/adm/shop_admin/price.php index 8349aa35c..5159aaa2a 100644 --- a/adm/shop_admin/price.php +++ b/adm/shop_admin/price.php @@ -58,34 +58,6 @@ $pg_anchor = ' -
다나와
-
- -
-
비비
-
- -
-
에누리
-
- -
-
마이마진
-
- -
From 346cbaf6f30f75183c451329725229e14375a33b Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 28 Nov 2013 14:53:24 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=EA=B0=80=EA=B2=A9=EB=B9=84=EA=B5=90=20?= =?UTF-8?q?=EC=82=AC=EC=9D=B4=ED=8A=B8=20=EB=84=A4=EC=9D=B4=EB=B2=84=20?= =?UTF-8?q?=EB=8B=A4=EC=9D=8C=20=EC=96=B4=EB=B0=94=EC=9B=83=EC=9D=84=20?= =?UTF-8?q?=EC=A0=9C=EC=99=B8=ED=95=9C=20=EB=82=98=EB=A8=B8=EC=A7=80=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/price.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/shop_admin/price.php b/adm/shop_admin/price.php index 5159aaa2a..ad5345122 100644 --- a/adm/shop_admin/price.php +++ b/adm/shop_admin/price.php @@ -18,7 +18,7 @@ $pg_anchor = '
      -
    1. 가격비교사이트는 네이버 지식쇼핑, 다음 쇼핑하우, 어바웃, 다나와, 비비, 에누리, 마이마진 등이 있습니다.
      2. +
    2. 가격비교사이트는 네이버 지식쇼핑, 다음 쇼핑하우, 어바웃 등이 있습니다.
    3. 앞서 나열한 가격비교사이트 중 희망하시는 사이트에 입점합니다.
    4. 사이트별 엔진페이지 URL을 참고하여 해당 엔진페이지 URL 을 입점하신 사이트에 알려주시면 됩니다.
    From 397fffcf6d2307ef8751b23fe29d97f1200c0144 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 28 Nov 2013 15:41:03 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=EC=84=A4=EC=B9=98=20=EC=8B=9C=20=EA=B8=B0?= =?UTF-8?q?=EB=B3=B8=20=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EC=83=9D=EC=84=B1?= =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/install_db.php | 1 - 1 file changed, 1 deletion(-) diff --git a/install/install_db.php b/install/install_db.php index 3cebe0f7b..ac63769dc 100644 --- a/install/install_db.php +++ b/install/install_db.php @@ -363,7 +363,6 @@ if($g5_shop_install) { bo_gallery_cols = '4', bo_gallery_width = '174', bo_gallery_height = '124', - bo_mobile_gallery_cols = '3', bo_mobile_gallery_width = '125', bo_mobile_gallery_height= '100', bo_upload_count = '2',