From 4f5063f451e7403c3e1a960d0d62b80e66e39798 Mon Sep 17 00:00:00 2001
From: whitedot
Date: Tue, 3 Dec 2013 17:03:50 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=EC=87=BC?=
=?UTF-8?q?=ED=95=91=EB=AA=B0:=20table=20->=20ul=20=EB=B3=80=EA=B2=BD=20:?=
=?UTF-8?q?=20=EC=A3=BC=EB=AC=B8=EB=82=B4=EC=97=AD=20=EC=83=81=EC=84=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
css/default_shop.css | 8 ---
css/mobile_shop.css | 64 ++++++++---------
mobile/shop/cart.php | 2 +-
mobile/shop/orderform.php | 2 +-
mobile/shop/orderinquiryview.php | 118 ++++++++++++++-----------------
shop/taxsave_kcp.php | 2 +-
6 files changed, 87 insertions(+), 109 deletions(-)
diff --git a/css/default_shop.css b/css/default_shop.css
index 985269593..3a23892f5 100644
--- a/css/default_shop.css
+++ b/css/default_shop.css
@@ -575,14 +575,6 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7
#sod_fin #sod_bsk_tot {border-bottom:0 !important}
-#sod_ul {margin:10px 0;padding:0;border-top:1px solid #565e60;list-style:none}
-#sod_ul li {border-bottom:1px solid #565e60}
-#sod_ul table {margin:0}
-#sod_ul th {text-align:center}
-#sod_ul td {background:#fff;color:#000}
-#sod_ul p {padding:5px 14px}
-#sod_ul p a {font-weight:bold;text-decoration:none}
-
#request_form {position:relative}
#request_form div {display:none;z-index:10000;position:absolute;top:23px;left:0;padding:20px 0;width:520px;border:1px solid #000;background:#f2f5f9;text-align:center}
#request_form .frm_input {width:300px;background:#fff !important}
diff --git a/css/mobile_shop.css b/css/mobile_shop.css
index 3f0a4ff93..03e1cfe93 100644
--- a/css/mobile_shop.css
+++ b/css/mobile_shop.css
@@ -194,32 +194,36 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none}
/* 장바구니 주문서 공통 */
#sod_chk {padding:0 0 10px;text-align:right}
-#sod_list {position:relative;margin:0;padding:0;list-style:none}
-#sod_list .sod_li {position:relative;padding:5px 0}
-#sod_list .sod_li:nth-of-type(1) {border-top:1px solid #e9e9e9}
-#sod_list .sod_li:after {display:block;visibility:hidden;clear:both;content:""}
-#sod_list .li_chk {position:absolute;top:12px;right:0}
-#sod_list .li_name {margin:0 0 15px}
-#sod_list .li_name a {display:block;width:90%}
-#sod_list .li_name strong {display:inline-block;padding:8px 0 10px;font-size:1.167em}
-#sod_list .li_prqty {margin:0 0 5px;padding:0 0 15px;border-bottom:1px solid #e9e9e9}
-#sod_list .li_prqty:after {display:block;visibility:hidden;clear:both;content:""}
-#sod_list .li_prqty span {font-weight:bold}
-#sod_list .li_prqty span span {font-weight:normal}
-#sod_list .prqty_price {float:left;padding:0 2% 0 0;width:48%;border-right:1px solid #e9e9e9;text-align:right}
-#sod_list .prqty_qty {float:right;width:48%;text-align:left}
-#sod_list .li_cp, #sod_list .li_mod {margin:5px 0 0}
-#sod_list .li_cp:after {display:block;visibility:hidden;clear:both;content:""}
-#sod_list .li_cp .cp_btn, #sod_list .li_cp .cp_cancel, #sod_list .li_mod .mod_btn {margin:0;padding:10px 0;width:100%;border:0;background:#ff882a;color:#fff;font-weight:bold}
-#sod_list .li_cp button.cp_mod {float:left;width:69%}
-#sod_list .li_cp .cp_cancel {float:right;width:30%;background:#626870}
-#sod_list .li_total {position:relative}
-#sod_list .total_img {position:absolute;top:0;left:0}
-#sod_list .total_span {display:block;position:relative;padding:5px 0;text-align:right}
-#sod_list .total_span span {position:absolute;top:5px;left:0}
-#sod_list .total_price {border-bottom:1px solid #e9e9e9}
+.sod_list {position:relative;margin:0;padding:0;list-style:none}
+.sod_list .sod_li {position:relative;padding:5px 0;border-top:1px solid #e9e9e9}
+.sod_list .sod_li:after {display:block;visibility:hidden;clear:both;content:""}
+.sod_list .li_chk {position:absolute;top:12px;right:0}
+.sod_list .li_name {margin:0 0 15px}
+.sod_list .li_name a {display:block;width:90%}
+.sod_list .li_name strong {display:inline-block;padding:8px 0 10px;font-size:1.167em}
+.sod_list .li_prqty {margin:0 0 5px;padding:0 0 15px;border-bottom:1px solid #e9e9e9}
+.sod_list .li_prqty:after {display:block;visibility:hidden;clear:both;content:""}
+.sod_list .li_prqty span {font-weight:bold}
+.sod_list .li_prqty span span {font-weight:normal}
+.sod_list .prqty_price {float:left;padding:0 2% 0 0;width:48%;border-right:1px solid #e9e9e9;text-align:right}
+.sod_list .prqty_qty {float:right;width:48%;text-align:left}
+.sod_list .li_cp, .sod_list .li_mod {margin:5px 0 0}
+.sod_list .li_cp:after {display:block;visibility:hidden;clear:both;content:""}
+.sod_list .li_cp .cp_btn, .sod_list .li_cp .cp_cancel, .sod_list .li_mod .mod_btn {margin:0;padding:10px 0;width:100%;border:0;background:#ff882a;color:#fff;font-weight:bold}
+.sod_list .li_cp button.cp_mod {float:left;width:69%}
+.sod_list .li_cp .cp_cancel {float:right;width:30%;background:#626870}
+.sod_list .li_total {position:relative}
+.sod_list .total_img {position:absolute;top:0;left:0}
+.sod_list .total_span {display:block;position:relative;padding:5px 0;text-align:right}
+.sod_list .total_span span {position:absolute;top:5px;left:0}
+.sod_list .total_price {border-bottom:1px solid #e9e9e9}
-.sod_opt {border-top:1px dashed #e9e9e9;background:#f2f5f9}
+#sod_list_inq {margin:0 0 10px}
+#sod_list_inq li.sod_li {border-bottom:1px solid #e9e9e9}
+#sod_list_inq div.li_name {margin:0}
+#sod_list_inq div.li_opt {margin:0 0 15px;border:1px dashed #e9e9e9;background:#f2f5f9;padding:8px;line-height:2em}
+
+.sod_opt {border:1px dashed #e9e9e9;background:#f2f5f9}
.sod_opt ul {margin:0;padding:0;list-style:none}
.sod_opt li {padding:8px}
@@ -323,19 +327,11 @@ html.no-overflowscrolling #sc_coupon_frm, html.no-overflowscrolling #od_coupon_f
#sod_sts_wrap {margin:0 0 10px;text-align:right}
#sod_sts_explan {display:none}
-#sod_fin_legend {margin:10px;padding:5px 5px 0;border:1px solid #e9e9e9;text-align:left}
+#sod_fin_legend {margin:10px 0;padding:10px 10px 0;border:1px solid #e9e9e9;text-align:left}
#sod_fin_legend:after {display:block;visibility:hidden;clear:both;content:''}
#sod_fin_legend dt {clear:both;float:left;margin:0 0 5px;width:50px;font-weight:bold}
#sod_fin_legend dd {float:left;margin:0}
-#sod_ul {margin:0 0 5px;padding:0;border-top:1px solid #565e60;list-style:none}
-#sod_ul li {padding:0;border-bottom:1px solid #565e60}
-#sod_ul table {margin:0}
-#sod_ul th {text-align:center}
-#sod_ul td {background:#fff;color:#000}
-#sod_ul p {padding:5px 10px}
-#sod_ul p a {font-weight:bold;text-decoration:none}
-
#request_form {position:relative}
#request_form div {display:none;z-index:10000;position:absolute;top:31px;left:0;padding:10px 0;width:290px;border:1px solid #000;background:#f2f5f9;text-align:center}
#request_form label {letter-spacing:-0.1em}
diff --git a/mobile/shop/cart.php b/mobile/shop/cart.php
index 34baf7c7f..e6db576de 100644
--- a/mobile/shop/cart.php
+++ b/mobile/shop/cart.php
@@ -16,7 +16,7 @@ include_once(G5_MSHOP_PATH.'/_head.php');
-
-
+
주문하신 상품
-
-
-
- | 상품이미지 |
- 상품명 |
-
- 옵션항목 |
-
- | 수량 |
- 판매가 |
- 소계 |
- 포인트 |
- 상태 |
-
-
-
-
+
-
- |
- |
-
-
+
+
+
-
- |
-
-
- |
- |
- |
- |
- |
-
-
+
+
+ 판매가
+ 수량
+
+
+
+
+
+
+ 0 && $st_count1 == $st_count2)
- $custom_cancel = true;
- ?>
-
-
+ // 주문 상품의 상태가 모두 주문이면 고객 취소 가능
+ if($st_count1 > 0 && $st_count1 == $st_count2)
+ $custom_cancel = true;
+ ?>
+
상품 상태 설명
diff --git a/shop/taxsave_kcp.php b/shop/taxsave_kcp.php
index 4c9648bf5..4678e510d 100644
--- a/shop/taxsave_kcp.php
+++ b/shop/taxsave_kcp.php
@@ -132,7 +132,7 @@ $amt_tax = (int)($amt_tot - $amt_sup);
-
+
주문정보
From 4880f63ef3d1031d45032cd0f761a5ab96c08c7d Mon Sep 17 00:00:00 2001
From: whitedot
Date: Tue, 3 Dec 2013 17:18:59 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=EC=87=BC?=
=?UTF-8?q?=ED=95=91=EB=AA=B0:=20=EC=A3=BC=EB=AC=B8=EC=83=81=EC=84=B8?=
=?UTF-8?q?=EB=82=B4=EC=97=AD=20h2=20margin=20=EC=A1=B0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
css/mobile_shop.css | 2 ++
1 file changed, 2 insertions(+)
diff --git a/css/mobile_shop.css b/css/mobile_shop.css
index 03e1cfe93..f2cfde875 100644
--- a/css/mobile_shop.css
+++ b/css/mobile_shop.css
@@ -324,6 +324,8 @@ html.no-overflowscrolling #sc_coupon_frm, html.no-overflowscrolling #od_coupon_f
/* 주문상세내역 */
#sod_fin {}
+#sod_fin_list h2 {margin:0 0 10px}
+
#sod_sts_wrap {margin:0 0 10px;text-align:right}
#sod_sts_explan {display:none}