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

2013-11-06 18:28:25 +09:00
parent 0aef005641 669492d7ae
commit ff520bb6df
12 changed files with 164 additions and 204 deletions
--- a/lib/shop.lib.php
+++ b/lib/shop.lib.php
@ -1779,7 +1779,7 @@ function is_used_coupon($mb_id, $cp_id)
 //------------------------------------------------------------------------------
 function save_order_point($ct_status="완료")
 {
-    global $default;
+    global $g5, $default;

    $beforedays = date("Y-m-d H:i:s", ( time() - (86400 * (int)$default['de_point_days']) ) ); // 86400초는 하루
    $sql = " select * from {$g5['g5_shop_cart_table']} where ct_status = '$ct_status' and ct_point_use = '0' and ct_time <= '$beforedays' ";