From fc0465406e2f5e2ef210114d559c5ccd2a28b887 Mon Sep 17 00:00:00 2001 From: dMetzger Date: Thu, 7 Jun 2012 08:02:33 +0000 Subject: [PATCH] // Fixed discount form display when cart rules are deactivated git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15894 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/front/ParentOrderController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php index 129b5e9f8..618719296 100644 --- a/controllers/front/ParentOrderController.php +++ b/controllers/front/ParentOrderController.php @@ -303,7 +303,7 @@ class ParentOrderControllerCore extends FrontController 'token_cart' => Tools::getToken(false), 'isVirtualCart' => $this->context->cart->isVirtualCart(), 'productNumber' => $this->context->cart->nbProducts(), - 'voucherAllowed' => Configuration::get('PS_VOUCHERS'), + 'voucherAllowed' => Configuration::get('PS_VOUCHERS') && CartRule::isFeatureActive(), 'shippingCost' => $this->context->cart->getOrderTotal(true, Cart::ONLY_SHIPPING), 'shippingCostTaxExc' => $this->context->cart->getOrderTotal(false, Cart::ONLY_SHIPPING), 'customizedDatas' => $customizedDatas,