Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

This commit is contained in:
gRoussac committed 2013-06-21 10:40:17 +02:00
commit 0974a9fde9
1 file changed
+1
@@ -514,6 +514,7 @@ class AdminOrdersControllerCore extends AdminController
$now = time(); $now = time();
$cart_rule->date_from = date('Y-m-d H:i:s', $now); $cart_rule->date_from = date('Y-m-d H:i:s', $now);
$cart_rule->date_to = date('Y-m-d H:i:s', $now + (3600 * 24 * 365.25)); /* 1 year */ $cart_rule->date_to = date('Y-m-d H:i:s', $now + (3600 * 24 * 365.25)); /* 1 year */
$cart_rule->partial_use = 1;
$cart_rule->active = 1; $cart_rule->active = 1;
$cart_rule->reduction_amount = $amount; $cart_rule->reduction_amount = $amount;