From 4c7805a3b3980307155f620d9ed15077bceb6c9d Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 7 Nov 2013 09:49:39 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90:=20=EC=A3=BC=EB=AC=B8=EB=82=B4=EC=97=AD=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=9A=B4=EC=86=A1=EC=9E=A5=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=EB=84=88=EB=B9=84,=20=EC=A3=BC=EB=AC=B8=EB=82=B4?= =?UTF-8?q?=EC=97=AD=20=EC=88=98=EC=A0=95=20=ED=8C=90=EB=A7=A4=EA=B0=80=20?= =?UTF-8?q?=EB=84=88=EB=B9=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderform.php | 2 +- adm/shop_admin/orderlist.php | 2 +- css/admin.css | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index f2b44ffcc..aec8bb30a 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -163,7 +163,7 @@ $result = sql_query($sql); - + diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php index 2cac25371..95ee5f1a2 100644 --- a/adm/shop_admin/orderlist.php +++ b/adm/shop_admin/orderlist.php @@ -334,7 +334,7 @@ $listall = '전체목록]" value=""> - + diff --git a/css/admin.css b/css/admin.css index 2fe5136b9..de6193916 100644 --- a/css/admin.css +++ b/css/admin.css @@ -345,6 +345,7 @@ table .tr_bg1 td {border-color:#e4f1c6} .td_date {width:70px;text-align:center} .td_datetime {width:130px;text-align:center} .td_delicom {width:100px} +.td_delino {width:130px} .td_etc {width:80px;text-align:center} .td_extra label {display:inline-block;width:100px} .td_extra input {margin-right:5px;width:130px} From f1c098f3d65119ab556001af8cff206de74f1a37 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 7 Nov 2013 09:59:02 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90:=20=EC=84=A0=ED=83=9D=20=EB=93=B1=EB=A1=9D?= =?UTF-8?q?=20=EB=93=B1=20=EC=8A=A4=ED=83=80=EC=9D=BC=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/itemlist.php | 4 ++-- adm/shop_admin/orderform.php | 7 +++++-- css/admin.css | 6 +++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/adm/shop_admin/itemlist.php b/adm/shop_admin/itemlist.php index 7812fba68..64462751b 100644 --- a/adm/shop_admin/itemlist.php +++ b/adm/shop_admin/itemlist.php @@ -192,13 +192,13 @@ $listall = '전체목록&ca_id=&" onclick="return delete_confirm();"> 삭제 --> - + > " required class="frm_input required" size="30"> - + > " class="frm_input" size="30"> diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index aec8bb30a..e8acceddc 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -196,6 +196,9 @@ $result = sql_query($sql);

+ + +

주문, 입금, 준비, 배송, 완료는 장바구니와 주문서 상태를 모두 변경하지만, 취소, 반품, 품절은 장바구니의 상태만 변경하며, 주문서 상태는 변경하지 않습니다.

개별적인(이곳에서의) 상태 변경은 모든 작업을 수동으로 처리합니다. 예를 들어 주문에서 입금으로 상태 변경시 입금액(결제금액)을 포함한 모든 정보는 수동 입력으로 처리하셔야 합니다.

@@ -298,7 +301,7 @@ $result = sql_query($sql); - + @@ -480,7 +483,7 @@ $result = sql_query($sql);
결제상세정보
- + diff --git a/css/admin.css b/css/admin.css index de6193916..18f7a9d02 100644 --- a/css/admin.css +++ b/css/admin.css @@ -120,12 +120,12 @@ h3 {margin:0 20px} /* 공통박스 */ .compare_wrap {margin:0 20px 10px;zoom:1} .compare_wrap:after {display:block;visibility:hidden;clear:both;content:""} -.compare_wrap section {margin:10px 0;padding-top:10px} +.compare_wrap section {margin:10px 0;padding:2%;background:#f2f5f9} .compare_wrap h3 {margin:10px 0 20px;text-align:center} .compare_wrap .tbl_frm {margin:0} .compare_wrap .btn_confirm {padding:10px 0 0} -.compare_left {float:left;width:49%} -.compare_right {float:right;width:49%} +.compare_left {float:left;width:45%} +.compare_right {float:right;width:45%} /* 버튼 */ .btn_confirm {margin:0 20px 10px}
결제상세정보 수정