Merge branch 'master' of github.com:gnuboard/yc4s

2013-06-12 10:31:24 +09:00
parent f957c2842e 993fe2b396
commit fdeca4afa9
6 changed files with 11 additions and 9 deletions
--- 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