[+] Project : Vouchers are now replaced by cart rules

2011-11-01 18:50:42 +00:00
parent eac8accb4f
commit 554783594e
46 changed files with 2183 additions and 994 deletions
@@ -276,6 +276,10 @@ class AuthControllerCore extends FrontController
 				$this->context->cart->id_address_invoice = Address::getFirstCustomerAddressId((int)($customer->id));
 				$this->context->cart->update();
 				Module::hookExec('authentication');
+				
+				// Login information have changed, so we check if the cart rules still apply
+				CartRule::autoRemoveFromCart();
+			
 				if (!$this->ajax)
 				{
 					if ($back = Tools::getValue('back'))
@@ -565,15 +569,15 @@ class AuthControllerCore extends FrontController
 	protected function sendConfirmationMail(Customer $customer)
 	{
 		return Mail::Send(
-			$this->context->language->id,
-			'account',
+			$this->context->language->id, 
+			'account', 
 			Mail::l('Welcome!'),
 			array(
-				'{firstname}' => $customer->firstname,
-				'{lastname}' => $customer->lastname,
-				'{email}' => $customer->email,
-				'{passwd}' => Tools::getValue('passwd')),
-			$customer->email,
+				'{firstname}' => $customer->firstname, 
+				'{lastname}' => $customer->lastname, 
+				'{email}' => $customer->email, 
+				'{passwd}' => Tools::getValue('passwd')), 
+			$customer->email, 
 			$customer->firstname.' '.$customer->lastname
 		);
 	}