TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into tax

Browse Source
This commit is contained in:
Etienne Roudeix
2013-09-10 12:29:08 +02:00
parent 1971240fca 9ef1b17ea5
commit affc6805c5
171 changed files with 17862 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/lib/Thelia/Config/Resources/routing/front.xml
View File

@@ -15,17 +15,29 @@
<default key="_view">connexion</default>
</route>
<route id="customer.create.view" path="/register">
<default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
<default key="_view">register</default>
</route>
<route id="customer.update.process" path="/customer/update" methods="post">
<default key="_controller">Thelia\Controller\Front\CustomerController::updateAction</default>
</route>
<route id="customer.login.process" path="/customer/login" methods="post">
<default key="_controller">Thelia\Controller\Front\CustomerController::loginAction</default>
<default key="_view">login</default>
</route>
<route id="customer.login.view" path="/login">
<default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
<default key="_view">login</default>
</route>
<route id="customer.logout.process" path="/customer/logout">
<default key="_controller">Thelia\Controller\Front\CustomerController::logoutAction</default>
</route>
<!-- end customer routes -->
<!-- customer address routes -->

9
core/lib/Thelia/Controller/BaseController.php
View File

@@ -179,7 +179,14 @@ class BaseController extends ContainerAware
return $form;
}
else {
throw new FormValidationException(sprintf("Missing or invalid data: %s", $this->getErrorMessages($form)));
$errorMessage = null;
if ($form->get("error_message")->getData() != null) {
$errorMessage = $form->get("error_message")->getData();
} else {
$errorMessage = sprintf("Missing or invalid data: %s", $this->getErrorMessages($form));
}
throw new FormValidationException($errorMessage);
}
}
else {

9
core/lib/Thelia/Controller/Front/BaseFrontController.php
View File

@@ -22,6 +22,7 @@
/*************************************************************************************/
namespace Thelia\Controller\Front;
use Symfony\Component\Routing\Router;
use Thelia\Controller\BaseController;
use Thelia\Tools\URL;
@@ -34,8 +35,8 @@ class BaseFrontController extends BaseController
*
* @see \Thelia\Controller\BaseController::getRouteFromRouter()
*/
protected function getRoute($routeId) {
return $this->getRouteFromRouter('router.front', $routeId);
protected function getRoute($routeId, $parameters = array(), $referenceType = Router::ABSOLUTE_PATH) {
return $this->getRouteFromRouter('router.front', $routeId, $parameters, $referenceType);
}
/**
@@ -44,7 +45,7 @@ class BaseFrontController extends BaseController
* @param unknown $routeId the route ID, as found in Config/Resources/routing/admin.xml
* @param unknown $urlParameters the URL parametrs, as a var/value pair array
*/
public function redirectToRoute($routeId, $urlParameters = array()) {
$this->redirect(URL::getInstance()->absoluteUrl($this->getRoute($routeId), $urlParameters));
public function redirectToRoute($routeId, $urlParameters = array(), $referenceType = Router::ABSOLUTE_PATH) {
$this->redirect(URL::getInstance()->absoluteUrl($this->getRoute($routeId, array(), $referenceType), $urlParameters));
}
}

16
core/lib/Thelia/Controller/Front/CustomerController.php
View File

@@ -39,6 +39,7 @@ use Thelia\Core\Factory\ActionEventFactory;
use Thelia\Tools\URL;
use Thelia\Log\Tlog;
use Thelia\Core\Security\Exception\WrongPasswordException;
use Symfony\Component\Routing\Router;
/**
* Class CustomerController
@@ -167,16 +168,25 @@ class CustomerController extends BaseFrontController
}
catch (FormValidationException $e) {
if ($request->request->has("account")) {
$account = $request->request->get("account");
$form = $customerLoginForm->getForm();
if($account == 0 && $form->get("email")->getData() !== null) {
$this->redirectToRoute("customer.create.view", array("email" => $form->get("email")->getData()));
}
}
$message = sprintf("Please check your input: %s", $e->getMessage());
}
catch(UsernameNotFoundException $e) {
$message = "This customer email was not found.";
$message = "Wrong email or password. Please try again";
}
catch (WrongPasswordException $e) {
$message = "Wrong password. Please try again.";
$message = "Wrong email or password. Please try again";
}
catch(AuthenticationException $e) {
$message = "Sorry, we failed to authentify you. Please try again.";
$message = "Wrong email or password. Please try again";
}
catch (\Exception $e) {
$message = sprintf("Sorry, an error occured: %s", $e->getMessage());

15
core/lib/Thelia/Core/HttpFoundation/Session/Session.php
View File

@@ -28,6 +28,7 @@ use Thelia\Core\Security\User\UserInterface;
use Thelia\Exception\InvalidCartException;
use Thelia\Model\CartQuery;
use Thelia\Model\Cart;
use Thelia\Model\Currency;
use Thelia\Tools\URL;
use Thelia\Model\Lang;
@@ -44,9 +45,9 @@ class Session extends BaseSession
/**
* @return \Thelia\Model\Lang|null
*/
public function getLang()
public function getLang($forceDefault = true)
{
return $this->get("thelia.current.lang", Lang::getDefaultLanguage());
return $this->get("thelia.current.lang", $forceDefault ? Lang::getDefaultLanguage():null);
}
public function setLang(Lang $lang)
@@ -68,6 +69,16 @@ class Session extends BaseSession
return $this;
}
public function setCurrency(Currency $currency)
{
$this->set("thelia.current.currency", $currency);
}
public function getCurrency($forceDefault = true)
{
return $this->get("thelia.current.currency", $forceDefault ? Currency::getDefaultCurrency():null);
}
// -- Customer user --------------------------------------------------------
public function setCustomerUser(UserInterface $user)

32
core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php
View File

@@ -31,6 +31,7 @@ use Thelia\Core\Template\ParserContext;
use Thelia\Core\Template\Smarty\SmartyPluginDescriptor;
use Thelia\Model\CategoryQuery;
use Thelia\Model\ContentQuery;
use Thelia\Model\CurrencyQuery;
use Thelia\Model\FolderQuery;
use Thelia\Model\Product;
use Thelia\Model\ProductQuery;
@@ -132,6 +133,35 @@ class DataAccessFunctions extends AbstractSmartyPlugin
}
}
/**
* currency global data
*
* @param $params
* @param $smarty
*/
public function currencyDataAccess($params, $smarty)
{
$currency = $this->request->getSession()->getCurrency();
if ($currency) {
$currencyQuery = CurrencyQuery::create()
->filterById($currency->getId());
return $this->dataAccessWithI18n("Currency", $params, $currencyQuery, array("NAME"));
}
}
/**
* Lang global data
*
* @param $params
* @param $smarty
*/
public function langDataAccess($params, $smarty)
{
return $this->dataAccess("Lang", $params, $this->request->getSession()->getLang());
}
/**
* @param $objectLabel
* @param $params
@@ -231,6 +261,8 @@ class DataAccessFunctions extends AbstractSmartyPlugin
new SmartyPluginDescriptor('function', 'category', $this, 'categoryDataAccess'),
new SmartyPluginDescriptor('function', 'content', $this, 'contentDataAccess'),
new SmartyPluginDescriptor('function', 'folder', $this, 'folderDataAccess'),
new SmartyPluginDescriptor('function', 'currency', $this, 'currencyDataAccess'),
new SmartyPluginDescriptor('function', 'lang', $this, 'langDataAccess'),
);
}
}

25
core/lib/Thelia/Core/TheliaHttpKernel.php
View File

@@ -135,9 +135,26 @@ class TheliaHttpKernel extends HttpKernel
if ($lang) {
$request->getSession()
->setLang($lang)
->setLocale($lang->getLocale())
;
}
$request->getSession()->setCurrency($this->defineCurrency($request));
}
protected function defineCurrency(Request $request)
{
$currency = null;
if ($request->query->has("currency")) {
$currency = Model\CurrencyQuery::create()->findOneByCode($request->query->get("currency"));
} else {
$currency = $request->getSession()->getCurrency(false);
}
if(null === $currency) {
$currency = Model\Currency::getDefaultCurrency();
}
return $currency;
}
/**
@@ -153,7 +170,7 @@ class TheliaHttpKernel extends HttpKernel
$lang = Model\LangQuery::create()->findOneByCode($request->query->get("lang"));
if (is_null($lang)) {
return;
return Model\Lang::getDefaultLanguage();
}
//if each lang had is own domain, we redirect the user to the good one.
@@ -175,7 +192,7 @@ class TheliaHttpKernel extends HttpKernel
}
//check if lang is not defined. If not we have to search the good one.
if (null === $request->getSession()->getLang()) {
if (null === $request->getSession()->getLang(false)) {
if (Model\ConfigQuery::read("one_domain_foreach_lang", false) == 1) {
//find lang with domain
@@ -183,7 +200,7 @@ class TheliaHttpKernel extends HttpKernel
}
//find default lang
return Model\LangQuery::create()->findOneByByDefault(1);
return Model\Lang::getDefaultLanguage();
}
}

2
core/lib/Thelia/Core/Translation/Translator.php
View File

@@ -20,7 +20,7 @@ class Translator extends BaseTranslator
* Return this class instance, only once instanciated.
*
* @throws \RuntimeException if the class has not been instanciated.
* @return Thelia\Core\Translation\Translator the instance.
* @return \Thelia\Core\Translation\Translator the instance.
*/
public static function getInstance() {
if (self::$instance == null) throw new \RuntimeException("Translator instance is not initialized.");

4
core/lib/Thelia/Form/BaseForm.php
View File

@@ -102,6 +102,10 @@ abstract class BaseForm
$this->formBuilder->add("success_url", "text");
}
if (! $this->formBuilder->has('error_message')) {
$this->formBuilder->add("error_message", "text");
}
$this->form = $this->formBuilder->getForm();
}

21
core/lib/Thelia/Form/CustomerLogin.php
View File

@@ -22,24 +22,38 @@
/*************************************************************************************/
namespace Thelia\Form;
use Symfony\Component\Validator\Constraints\Callback;
use Symfony\Component\Validator\Constraints\NotBlank;
use Symfony\Component\Validator\Constraints\Email;
use Symfony\Component\Validator\ExecutionContextInterface;
use Thelia\Core\Translation\Translator;
use Thelia\Model\CustomerQuery;
class CustomerLogin extends BaseForm
{
protected function buildForm()
{
$this->formBuilder
->add("email", "text", array(
->add("email", "email", array(
"constraints" => array(
new NotBlank(),
new Email()
)
),
"label" => Translator::getInstance()->trans("Please enter your email address"),
"label_attr" => array(
"for" => "email"
),
"required" => true
))
->add("password", "password", array(
"constraints" => array(
new NotBlank()
)
),
"label" => Translator::getInstance()->trans("Please enter your password"),
"label_attr" => array(
"for" => "password"
),
"required" => true
))
->add("remember_me", "checkbox")
;
@@ -49,4 +63,5 @@ class CustomerLogin extends BaseForm
{
return "thelia_customer_login";
}
}

11
core/lib/Thelia/Model/Currency.php
View File

@@ -13,6 +13,17 @@ class Currency extends BaseCurrency {
use \Thelia\Model\Tools\PositionManagementTrait;
public static function getDefaultCurrency()
{
$currency = CurrencyQuery::create()->findOneByByDefault(1);
if (null === $currency) {
throw new \RuntimeException("No default currency is defined. Please define one.");
}
return $currency;
}
/**
* {@inheritDoc}
*/

5
core/lib/Thelia/Tools/URL.php
View File

@@ -121,6 +121,11 @@ class URL
$base_url = $this->getBaseUrl();
// TODO fix this ugly patch
if(strpos($path, "index_dev.php")) {
$path = str_replace('index_dev.php', '', $path);
}
// If only a path is requested, be sure to remove the script name (index.php or index_dev.php), if any.
if ($path_only == self::PATH_TO_FILE) {
// As the base_url always ends with '/', if we don't find / at the end, we have a script.