From bbc827db6011e92c4a72aa2c35a2b9e464b4db6c Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 18 Apr 2013 21:47:47 +0900 Subject: [PATCH] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=EC=9E=90:=20#40=20#79=20=EC=87=BC=ED=95=91=EB=AA=B0=ED=98=84?= =?UTF-8?q?=ED=99=A9=20=EC=A3=BC=EB=AC=B8=EB=82=B4=EC=97=AD=EC=B6=9C?= =?UTF-8?q?=EB=A0=A5=20=EC=83=88=EC=B0=BD=20=ED=91=9C=EC=A4=80=ED=99=94=20?= =?UTF-8?q?=EB=B0=8F=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderprintresult.php | 219 ++++++++++++++-------------- css/admin.css | 15 ++ 2 files changed, 123 insertions(+), 111 deletions(-) diff --git a/adm/shop_admin/orderprintresult.php b/adm/shop_admin/orderprintresult.php index 850eb41dd..72ff12812 100644 --- a/adm/shop_admin/orderprintresult.php +++ b/adm/shop_admin/orderprintresult.php @@ -66,24 +66,24 @@ if ($csv == 'csv') echo "우편번호,주소,이름,전화1,전화2,상품명,수량,상품코드,주문번호,운송장번호,전하실말씀\n"; for ($i=0; $row=mysql_fetch_array($result); $i++) { - echo '"' . $row['od_b_zip1'] . '-' . $row['od_b_zip2'] . '"' . ','; - echo '"' . $row['od_b_addr1'] . ' ' . $row['od_b_addr2'] . '"' . ','; - echo '"' . $row['od_b_name'] . '"' . ','; - //echo '"' . multibyte_digit((string)$row[od_b_tel]) . '"' . ','; - //echo '"' . multibyte_digit((string)$row[od_b_hp]) . '"' . ','; - echo '"' . conv_telno($row['od_b_tel']) . '"' . ','; - echo '"' . conv_telno($row['od_b_hp']) . '"' . ','; - echo '"' . preg_replace("/\"/", """, $row['it_name']) . '"' . ','; - echo '"' . $row['ct_qty'] . '"' . ','; - echo '"\'' . $row['it_id'] . '\'"' . ','; - echo '"\'' . $row['od_id'] . '\'"' . ','; - echo '"' . $row['od_invoice'] . '"' . ','; - //echo '"' . preg_replace("/\"/", """, preg_replace("/\n/", "", $row[od_memo])) . '"'; - echo '"' . preg_replace("/\"/", """, $row['od_memo']) . '"'; + echo '"'.$row['od_b_zip1'].'-'.$row['od_b_zip2'].'"'.','; + echo '"'.$row['od_b_addr1'].' '.$row['od_b_addr2'].'"'.','; + echo '"'.$row['od_b_name'].'"'.','; + //echo '"'.multibyte_digit((string)$row[od_b_tel]).'"'.','; + //echo '"'.multibyte_digit((string)$row[od_b_hp]).'"'.','; + echo '"'.conv_telno($row['od_b_tel']) . '"'.','; + echo '"'.conv_telno($row['od_b_hp']) . '"'.','; + echo '"'.preg_replace("/\"/", """, $row['it_name']) . '"'.','; + echo '"'.$row['ct_qty'].'"'.','; + echo '"\''.$row['it_id'].'\'"'.','; + echo '"\''.$row['od_id'].'\'"'.','; + echo '"'.$row['od_invoice'].'"'.','; + //echo '"'.preg_replace("/\"/", """, preg_replace("/\n/", "", $row[od_memo])).'"'; + echo '"'.preg_replace("/\"/", """, $row['od_memo']).'"'; echo "\n"; } if ($i == 0) - echo "자료가 없습니다.\n"; + echo '자료가 없습니다.'.PHP_EOL; exit; } @@ -201,39 +201,16 @@ if (mysql_num_rows($result) == 0) } ?> -
-

+
+

-

+

- - - - - - - - - - - - - - - - - - - - - - - ".$row1['od_addr1']."
".$row1['od_addr2']; - $row1['od_b_addr'] = "(".$row1['od_b_zip1']."-".$row1['od_b_zip2'].")
".$row1['od_b_addr1']."
".$row1['od_b_addr2']; + $row1['od_addr'] = '('.$row1['od_zip1'].'-'.$row1['od_zip2'].') '.$row1['od_addr1'].' '.$row1['od_addr2']; + $row1['od_b_addr'] = '('.$row1['od_b_zip1'].'-'.$row1['od_b_zip2'].') '.$row1['od_b_addr1'].' '.$row1['od_b_addr2']; - $row1['od_addr'] = ($row1['od_addr']) ? $row1['od_addr'] : " "; - $row1['od_tel'] = ($row1['od_tel']) ? $row1['od_tel'] : " "; - $row1['od_hp'] = ($row1['od_hp']) ? $row1['od_hp'] : " "; - $row1['od_b_tel'] = ($row1['od_b_tel']) ? $row1['od_b_tel'] : " "; - $row1['od_b_hp'] = ($row1['od_b_hp']) ? $row1['od_b_hp'] : " "; + $row1['od_addr'] = ($row1['od_addr']) ? $row1['od_addr'] : '입력안함'; + $row1['od_tel'] = ($row1['od_tel']) ? $row1['od_tel'] : '입력안함'; + $row1['od_hp'] = ($row1['od_hp']) ? $row1['od_hp'] : '입력안함'; + $row1['od_b_tel'] = ($row1['od_b_tel']) ? $row1['od_b_tel'] : '입력안함'; + $row1['od_b_hp'] = ($row1['od_b_hp']) ? $row1['od_b_hp'] : '입력안함'; - if ($row1['od_name'] == $row1['od_b_name']) $row1['od_b_name'] = '"'; - if ($row1['od_addr'] == $row1['od_b_addr']) $row1['od_b_addr'] = '"'; - if ($row1['od_tel'] == $row1['od_b_tel']) $row1['od_b_tel'] = '"'; - if ($row1['od_hp'] == $row1['od_b_hp'] && $row1['od_hp'] != " ") $row1['od_b_hp'] = '"'; - - $od_memo = ($row1['od_memo']) ? stripslashes($row1['od_memo']) : ""; - $od_shop_memo = ($row1['od_shop_memo']) ? stripslashes($row1['od_shop_memo']) : ""; + // 보내는 사람과 받는 사람이 완전 일치하면 간단하게 출력 + // 보내는 사람과 받는 사람이 부분 일치하더라도 원래 내용을 모두 출력 + // 지운아빠 2013-04-18 + if ($row1['od_name'] == $row1['od_b_name'] && $row1['od_addr'] == $row1['od_b_addr'] && $row1['od_tel'] == $row1['od_b_tel'] && $row1['od_hp'] == $row1['od_b_hp'] && $row1['od_hp'] != " ") $samesamesame = 1; + else $samesamesame = ''; + $od_memo = ($row1['od_memo']) ? stripslashes($row1['od_memo']) : ''; + $od_shop_memo = ($row1['od_shop_memo']) ? stripslashes($row1['od_shop_memo']) : ''; ?> - - - - - - - - - - - - - +
+

주문번호

+

보내는 사람 :

+
+
주소
+
+
휴대폰
+
+
전화번호
+
+
+ +

보내는 사람과 받는 사람이 동일합니다.

+ +

받는 사람 :

+
+
주소
+
+
휴대폰
+
+
전화번호
+
+
+ +

주문목록

+
주문번호보낸분주소전화번호핸드폰
받는분주소전화번호핸드폰
-
+ + + + + + + + + + = 2) { - $fontqty1 = ""; - $fontqty2 = ""; + $fontqty1 = ""; + $fontqty2 = ""; } - ?> - - - - - - - = 2) - { - ?> - - - - - - + + + + + + + + + + + + + + + +
상품명(주문번호)판매가수량소계
합 계
합계
+ 상점메모 : $od_shop_memo"; + if ($od_memo) $od_memo = "

비고 $od_memo

"; + if ($od_shop_memo) $od_shop_memo = "

상점메모 $od_shop_memo

"; echo " $od_memo $od_shop_memo -"; - } - ?> - - + "; + ?> + + + -
- 전체합계 - - +
+ + 전체 + 개 + 원 + + <출력 끝>
- <출력 끝> -
+ diff --git a/css/admin.css b/css/admin.css index 9cd7e4fc3..e7e54644f 100644 --- a/css/admin.css +++ b/css/admin.css @@ -395,6 +395,21 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right} /* 팝업레이어 관리 */ #spop_list {text-align:center} +/* 주문내역출력 (새창) */ +#sodr_print_pop h2 {padding:15px 0;color:#ff3600;text-align:right} +#sodr_print_pop h3 {margin:0 0 10px} + +.sodr_print_pop_list {margin:0 0 10px;padding:0 0 10px;border-bottom:1px dotted #ddd} +.sodr_print_pop_list .sodr_print_pop_same {margin:0 0 10px;border:1px solid #e9e9e9;background:#f7f7f7;text-align:center} +.sodr_print_pop_list dl {margin:0 0 15px;padding:0;zoom:1} +.sodr_print_pop_list dl:after {display:block;visibility:hidden;clear:both;content:""} +.sodr_print_pop_list dt {float:left;padding:7px 0 6px;width:100px;border-bottom:1px solid #ddd} +.sodr_print_pop_list dd {padding:7px 0 6px;border-bottom:1px solid #ddd;overflow:hidden} + +#sodr_print_pop_total {padding:20px 0;text-align:center} +#sodr_print_pop_total span {display:block;margin:0 0 10px;font-size:1.5em} +#sodr_print_pop_total strong {color:#ff3600} + /* SMS문자전송 */ #sms_send {padding-bottom:100px;zoom:1} #sms_send:after {display:block;visibility:hidden;clear:both;content:""}