From bb92196cb7e3d872b86a8a18a79b1e55bbae68bd Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 25 Sep 2014 10:19:54 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=20=EB=B0=B0=EC=86=A1=20?=
 =?UTF-8?q?=EC=BF=A0=ED=8F=B0=20=EC=B2=B4=ED=81=AC=20=EC=BD=94=EB=93=9C?=
 =?UTF-8?q?=EC=9D=98=20=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/shop/orderform.php | 7 ++++---
 shop/orderform.php        | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php
index b78b250c6..23bf667b4 100644
--- a/mobile/shop/orderform.php
+++ b/mobile/shop/orderform.php
@@ -469,8 +469,9 @@ require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php');
                     from {$g5['g5_shop_coupon_table']}
                     where mb_id IN ( '{$member['mb_id']}', '전체회원' )
                       and cp_method = '2'
-                      and cp_start <= '".G5_TIM_YMD."'
-                      and cp_end >= '".G5_TIME_YMD."' ";
+                      and cp_start <= '".G5_TIME_YMD."'
+                      and cp_end >= '".G5_TIME_YMD."'
+                      and cp_minimum <= '$tot_sell_price' ";
         $res = sql_query($sql);
 
         for($k=0; $cp=sql_fetch_array($res); $k++) {
@@ -486,7 +487,7 @@ require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php');
                         from {$g5['g5_shop_coupon_table']}
                         where mb_id IN ( '{$member['mb_id']}', '전체회원' )
                           and cp_method = '3'
-                          and cp_start <= '".G5_TIM_YMD."'
+                          and cp_start <= '".G5_TIME_YMD."'
                           and cp_end >= '".G5_TIME_YMD."' ";
             $res = sql_query($sql);
 
diff --git a/shop/orderform.php b/shop/orderform.php
index 918c9dfd7..6dbda2e78 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -494,8 +494,9 @@ require_once('./'.$default['de_pg_service'].'/orderform.1.php');
                     from {$g5['g5_shop_coupon_table']}
                     where mb_id IN ( '{$member['mb_id']}', '전체회원' )
                       and cp_method = '2'
-                      and cp_start <= '".G5_TIM_YMD."'
-                      and cp_end >= '".G5_TIME_YMD."' ";
+                      and cp_start <= '".G5_TIME_YMD."'
+                      and cp_end >= '".G5_TIME_YMD."'
+                      and cp_minimum <= '$tot_sell_price' ";
         $res = sql_query($sql);
 
         for($k=0; $cp=sql_fetch_array($res); $k++) {
@@ -511,7 +512,7 @@ require_once('./'.$default['de_pg_service'].'/orderform.1.php');
                         from {$g5['g5_shop_coupon_table']}
                         where mb_id IN ( '{$member['mb_id']}', '전체회원' )
                           and cp_method = '3'
-                          and cp_start <= '".G5_TIM_YMD."'
+                          and cp_start <= '".G5_TIME_YMD."'
                           and cp_end >= '".G5_TIME_YMD."' ";
             $res = sql_query($sql);