From 3d7f0e6888d31f5086b3c47a11ef34edcef1ed92 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 12 Jun 2013 10:15:13 +0900 Subject: [PATCH 1/7] =?UTF-8?q?#209=20=EC=A3=BC=EB=AC=B8=ED=8F=BC=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EC=BF=A0=ED=8F=B0=20=EC=A0=81=EC=9A=A9=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EA=B4=80=EB=A0=A8=20=EC=BF=BC=EB=A6=AC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/shop/orderform.php | 1 + shop/orderform.php | 1 + 2 files changed, 2 insertions(+) diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php index 7df602f2d..3daf4fcfd 100644 --- a/mobile/shop/orderform.php +++ b/mobile/shop/orderform.php @@ -133,6 +133,7 @@ ob_start(); and cp_used = '0' and cp_start <= '".G4_TIME_YMD."' and cp_end >= '".G4_TIME_YMD."' + and cp_minimum <= '$sell_amount' and ( ( cp_method = '0' and cp_target = '{$row['it_id']}' ) OR diff --git a/shop/orderform.php b/shop/orderform.php index a633b81ee..06f739b04 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -208,6 +208,7 @@ setTimeout("init_pay_button();",300); and cp_used = '0' and cp_start <= '".G4_TIME_YMD."' and cp_end >= '".G4_TIME_YMD."' + and cp_minimum <= '$sell_amount' and ( ( cp_method = '0' and cp_target = '{$row['it_id']}' ) OR From 993fe2b39681baf04c067957599d4c6468cb5624 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 12 Jun 2013 10:25:45 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=EB=A7=A4=EC=B6=9C=ED=98=84=ED=99=A9?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EA=B8=88=EC=95=A1=EA=B3=84=EC=82=B0=20?= =?UTF-8?q?=EC=BF=BC=EB=A6=AC=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/sale1date.php | 4 ++-- adm/shop_admin/sale1month.php | 4 ++-- adm/shop_admin/sale1today.php | 6 +++--- adm/shop_admin/sale1year.php | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/adm/shop_admin/sale1date.php b/adm/shop_admin/sale1date.php index 75a3183ef..427f1bbc0 100644 --- a/adm/shop_admin/sale1date.php +++ b/adm/shop_admin/sale1date.php @@ -53,8 +53,8 @@ for ($i=0; $row=mysql_fetch_array($result); $i++) $lines[$i] = $row; // 장바구니 상태별 금액 - $sql1 = " select (SUM(ct_price * ct_qty)) as orderamount, /* 주문합계 */ - (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', ct_price * ct_qty, 0))) as ordercancel /* 주문취소 */ + $sql1 = " select (SUM(IF(io_type = 1, io_price * ct_qty, (ct_price + io_price) * ct_qty))) as orderamount, /* 주문합계 */ + (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', IF(io_type = 1, io_price * ct_qty, (ct_price + io_price) * ct_qty), 0))) as ordercancel /* 주문취소 */ from {$g4['shop_cart_table']} where uq_id = '{$row['uq_id']}' "; $row1 = sql_fetch($sql1); diff --git a/adm/shop_admin/sale1month.php b/adm/shop_admin/sale1month.php index eee76ed36..4f27d249c 100644 --- a/adm/shop_admin/sale1month.php +++ b/adm/shop_admin/sale1month.php @@ -53,8 +53,8 @@ for ($i=0; $row=mysql_fetch_array($result); $i++) $lines[$i] = $row; // 장바구니 상태별 금액 - $sql1 = " select (SUM(ct_price * ct_qty)) as orderamount, /* 주문합계 */ - (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', ct_price * ct_qty, 0))) as ordercancel /* 주문취소 */ + $sql1 = " select (SUM(IF(io_type = 1, io_price * ct_qty, (ct_price + io_price) * ct_qty))) as orderamount, /* 주문합계 */ + (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', IF(io_type = 1, io_price * ct_qty, (ct_price + io_price) * ct_qty), 0))) as ordercancel /* 주문취소 */ from {$g4['shop_cart_table']} where uq_id = '{$row['uq_id']}' "; $row1 = sql_fetch($sql1); diff --git a/adm/shop_admin/sale1today.php b/adm/shop_admin/sale1today.php index 52a70e109..6a8dffeda 100644 --- a/adm/shop_admin/sale1today.php +++ b/adm/shop_admin/sale1today.php @@ -6,7 +6,7 @@ auth_check($auth[$sub_menu], "r"); $date = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})/", "\\1-\\2-\\3", $date); -$g4['title'] = "$date 일일 매출현황"; +$g4['title'] = "$date 일 매출현황"; include_once (G4_ADMIN_PATH.'/admin.head.php'); unset($tot); @@ -31,8 +31,8 @@ for ($i=0; $row=mysql_fetch_array($result); $i++) $lines[$i] = $row; // 장바구니 상태별 금액 - $sql1 = " select (SUM(ct_price * ct_qty)) as orderamount, /* 주문합계 */ - (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', ct_price * ct_qty, 0))) as ordercancel /* 주문취소 */ + $sql1 = " select (SUM(IF(io_type = 1, io_price * ct_qty, (ct_price + io_price) * ct_qty))) as orderamount, /* 주문합계 */ + (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', IF(io_type = 1, io_price * ct_qty, (ct_price + io_price) * ct_qty), 0))) as ordercancel /* 주문취소 */ from {$g4['shop_cart_table']} where uq_id = '{$row['uq_id']}' "; $row1 = sql_fetch($sql1); diff --git a/adm/shop_admin/sale1year.php b/adm/shop_admin/sale1year.php index ac841b02e..e9ee44307 100644 --- a/adm/shop_admin/sale1year.php +++ b/adm/shop_admin/sale1year.php @@ -48,8 +48,8 @@ for ($i=0; $row=mysql_fetch_array($result); $i++) $lines[$i] = $row; // 장바구니 상태별 금액 - $sql1 = " select (SUM(ct_price * ct_qty)) as orderamount, /* 주문합계 */ - (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', ct_price * ct_qty, 0))) as ordercancel /* 주문취소 */ + $sql1 = " select (SUM(IF(io_type = 1, io_price * ct_qty, (ct_price + io_price) * ct_qty))) as orderamount, /* 주문합계 */ + (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', IF(io_type = 1, io_price * ct_qty, (ct_price + io_price) * ct_qty), 0))) as ordercancel /* 주문취소 */ from {$g4['shop_cart_table']} where uq_id = '{$row['uq_id']}' "; $row1 = sql_fetch($sql1); From f957c2842e0e987b676278dded297e97fea572c5 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 12 Jun 2013 10:31:01 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=EC=8B=9C=EB=A7=A8=ED=8B=B1=EB=A7=88?= =?UTF-8?q?=ED=81=AC=EC=97=85=20#189=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default_shop.css | 8 +--- shop/boxcommunity.inc.php | 4 +- shop/boxevent.inc.php | 4 +- shop/boxtodayview.inc.php | 13 +++--- shop/faq.php | 86 ++++++++++++++++++--------------------- shop/largeimage.php | 2 +- shop/shop.head.php | 4 +- 7 files changed, 54 insertions(+), 67 deletions(-) diff --git a/css/default_shop.css b/css/default_shop.css index 8acb61225..a0721e682 100644 --- a/css/default_shop.css +++ b/css/default_shop.css @@ -104,9 +104,7 @@ a:active {color:#000;text-decoration:underline} .stv_item {display:none;text-align:center} .stv_item img {margin:5px 0} -#stv_nb {border-top:1px solid #e9e9e9;background:#f5f6fa} -#stv_nb h3 {position:absolute;font-size:0;line-height:0;overflow:hidden} -#stv_nb ul {margin:0;padding:0;list-style:none} +#stv_nb {margin:0;padding:0;border-top:1px solid #e9e9e9;background:#f5f6fa;list-style:none} #stv_nb li {text-align:center} #stv_nb a {display:block} @@ -754,11 +752,9 @@ input.required:focus {border:1px solid #b8c9c2;background:#21272e !important;col .socc_img {text-align:center} /* FAQ 관리 */ -#sfaq {} -.sfaq_admin {text-align:right} -#sfaq header h1 {position:absolute;font-size:0;line-height:0;overflow:hidden} #sfaq_wrap {margin:10px 0} #sfaq_wrap h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} +.sfaq_admin {text-align:right} #sfaq_wrap ol {margin:0;padding:0;list-style:none} #sfaq_list {margin:0 0 10px;border:1px solid #ccc} #sfaq_list li {border-bottom:1px solid #fff;background:#f5f6fa} diff --git a/shop/boxcommunity.inc.php b/shop/boxcommunity.inc.php index 098345d03..c20f8263f 100644 --- a/shop/boxcommunity.inc.php +++ b/shop/boxcommunity.inc.php @@ -2,7 +2,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 ?> -
+
\ No newline at end of file + \ No newline at end of file diff --git a/shop/boxevent.inc.php b/shop/boxevent.inc.php index 221486e30..a9c3d7ddd 100644 --- a/shop/boxevent.inc.php +++ b/shop/boxevent.inc.php @@ -2,7 +2,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 ?> -
+
\ No newline at end of file + \ No newline at end of file diff --git a/shop/boxtodayview.inc.php b/shop/boxtodayview.inc.php index 4e6aeccb1..4a6a6e98f 100644 --- a/shop/boxtodayview.inc.php +++ b/shop/boxtodayview.inc.php @@ -84,14 +84,11 @@ $tv_div['img_length'] = 3; // 한번에 보여줄 이미지 수 - +
    +
  • 장바구니
    • +
  • 위시리스트
    • +
  • 주문/배송조회
    • +