From c69714dface7852302e50a09df569f93bbecde08 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 21 Nov 2013 13:54:41 +0900 Subject: [PATCH 1/3] =?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#330=20=EC=A3=BC=EB=AC=B8=EB=82=B4?= =?UTF-8?q?=EC=97=AD=20=EC=B7=A8=EC=86=8C=20=EC=A3=BC=EB=AC=B8=20=EB=B0=B1?= =?UTF-8?q?=EA=B7=B8=EB=9D=BC=EC=9A=B4=EB=93=9C=EC=83=89=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/img/escrow_bg.png | Bin 120 -> 0 bytes adm/shop_admin/img/escrow_bg2.png | Bin 120 -> 0 bytes adm/shop_admin/orderlist.php | 18 ++++++++++++------ css/admin.css | 13 ++++++++----- 4 files changed, 20 insertions(+), 11 deletions(-) delete mode 100644 adm/shop_admin/img/escrow_bg.png delete mode 100644 adm/shop_admin/img/escrow_bg2.png diff --git a/adm/shop_admin/img/escrow_bg.png b/adm/shop_admin/img/escrow_bg.png deleted file mode 100644 index 1941edfd852fc75d6a77d6c48167657f97b865be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4u8B>#36YXd3C64!{5;QX|b^2DN42FH~Aq*MjZ z+{E#36YXd3C64!{5;QX|b^2DN42FH~Aq*MjZ z+{EFHGSj^cMcSu< Psu(<7{an^LB{Ts52kRoR diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php index 16e716752..f595c7e75 100644 --- a/adm/shop_admin/orderlist.php +++ b/adm/shop_admin/orderlist.php @@ -288,21 +288,27 @@ $listall = '전체목록에스크로'; + $uid = md5($row['od_id'].$row['od_time'].$row['od_ip']); $invoice_time = is_null_time($row['od_invoice_time']) ? G5_TIME_YMDHIS : $row['od_invoice_time']; $delivery_company = $row['od_delivery_company'] ? $row['od_delivery_company'] : $default['de_delivery_company']; $tr_bg = 'tr_bg'.($i%2); - if($default['de_escrow_use'] && $row['od_escrow']) - $tr_bg .= 'escrow'; - if($od['od_cancel_price'] > 0) + $td_color = 0; + if($row['od_cancel_price'] > 0) { $tr_bg .= 'cancel'; + $td_color = 1; + } ?> @@ -317,13 +323,14 @@ $listall = '전체목록 + - + @@ -442,7 +449,6 @@ $listall = '전체목록

- <에스크로>주문의 경우 리스트의 배경색이 다르게 표시됩니다. or
<무통장>인 경우에만 <주문>에서 <입금>으로 변경됩니다. 가상계좌는 입금시 자동으로 <입금>처리됩니다.
<준비>에서 <배송>으로 변경시 <에스크로배송등록>을 체크하시면 에스크로 주문에 한해 KCP에 배송정보가 자동 등록됩니다.
주의! 주문번호를 클릭하여 나오는 주문상세내역의 주소를 외부에서 조회가 가능한곳에 올리지 마십시오. diff --git a/css/admin.css b/css/admin.css index 935954fed..384b8c9cd 100644 --- a/css/admin.css +++ b/css/admin.css @@ -256,10 +256,10 @@ tfoot th {} tfoot td {font-weight:bold;text-align:center} table .tr_bg0 {background:#fff} table .tr_bg1 {background:#f0f3f7} -table .tr_bg0escrow {background:#f3f7e7} -table .tr_bg0escrow td {border-color:#e4efbb} -table .tr_bg1escrow {background:#edf1e3} -table .tr_bg1escrow td {border-color:#dce9ad} +table .tr_bg0cancel {background:#fdebf3} +table .tr_bg0cancel td {border-color:#f9d8e6} +table .tr_bg1cancel {background:#fdebf3} +table .tr_bg1cancel td {border-color:#f9d8e6} .tbl_wrap {margin:0 0 10px;padding:0 20px} .tbl_wrap td.empty_table {padding:100px 0;text-align:center} @@ -371,7 +371,8 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center} .td_mng .mng_del, .td_mngsmall .mng_del {} .td_num {width:60px;text-align:center} .td_numbig {width:100px;text-align:center} -.td_numcancel {color:#999;text-align:center;} +.td_numcancel0 {color:#999;text-align:center} +.td_numcancel1 {color:#ff3061;font-weight:bold;text-align:center} .td_numcoupon {color:#86b325;text-align:center} .td_numincome {color:#357dbb;text-align:center} .td_numsmall {width:30px;text-align:center} @@ -470,6 +471,8 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center} #orderitemlist td {background:#fff} #orderitemlist #orderitemlist_close {padding:0 20px 10px;text-align:right} +#sodr_list .list_escrow {display:block;color:#80bc0d;text-align:center} + /* 주문내역 수정 */ .sodr_nonpay {color:#ff6600} strong.sodr_nonpay {display:block;padding:5px 0;text-align:right} From 553305991da61bd48a6e62673a03b67910afe0b2 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 21 Nov 2013 14:47:16 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0:=20#332=20?= =?UTF-8?q?=EB=B9=84=ED=9A=8C=EC=9B=90=20=EC=A3=BC=EB=AC=B8=20=ED=99=95?= =?UTF-8?q?=EC=9D=B8=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EB=B0=95=EC=8A=A4=20?= =?UTF-8?q?=EB=9D=BC=EC=9D=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 2 +- css/default_shop.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/css/default.css b/css/default.css index 7a24bdc82..2ddbadf8f 100644 --- a/css/default.css +++ b/css/default.css @@ -9,7 +9,7 @@ h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:dotum} article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block} #hd ul, nav ul, #ft ul {margin:0;padding:0;list-style:none} -legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden} +legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden} label, input, select, img {vertical-align:middle} input, button {margin:0;padding:0;font-family:dotum;font-size:1em} button {cursor:pointer} diff --git a/css/default_shop.css b/css/default_shop.css index a67bc36a2..6ed373437 100644 --- a/css/default_shop.css +++ b/css/default_shop.css @@ -8,7 +8,7 @@ html, h1, h2, h3, h4, h5, h6, form, fieldset, img {margin:0;padding:0;border:0} h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:dotum} article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block} #hd ul, nav ul, #ft ul {margin:0;padding:0;list-style:none} -legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden} +legend {position:absolute;margin:0;padding:0;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden} label, input, select, img {vertical-align:middle} input, button {margin:0;padding:0;font-family:dotum;font-size:1em} button {cursor:pointer} From ef2a22d9463795f93d4665346150599a0b8da834 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 21 Nov 2013 15:00:59 +0900 Subject: [PATCH 3/3] =?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#331=20=EC=83=81=ED=92=88=EC=9E=AC?= =?UTF-8?q?=EA=B3=A0=EA=B4=80=EB=A6=AC=20=EC=83=81=ED=92=88=EC=BD=94?= =?UTF-8?q?=EB=93=9C=ED=8F=AD=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/itemstocklist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/shop_admin/itemstocklist.php b/adm/shop_admin/itemstocklist.php index a00d7f274..e7dbe78b7 100644 --- a/adm/shop_admin/itemstocklist.php +++ b/adm/shop_admin/itemstocklist.php @@ -156,7 +156,7 @@ $listall = '전체목록 - +