fix cart item prices when not on default currency

This commit is contained in:
Julien Chanséaume
2014-04-25 16:52:05 +02:00
parent cb42c17d25
commit b86ac88ce4
13 changed files with 193 additions and 24 deletions

View File

@@ -15,7 +15,6 @@ namespace Thelia\Controller\Admin;
use Thelia\Core\Security\AccessManager;
use Thelia\Core\Security\Resource\AdminResources;
/**
* Class ConfigurationController
* @package Thelia\Controller\Admin
@@ -31,4 +30,4 @@ class ConfigurationController extends BaseAdminController
return $this->render('configuration');
}
}
}

View File

@@ -15,7 +15,6 @@ namespace Thelia\Controller\Admin;
use Thelia\Core\HttpFoundation\Response;
use Thelia\Core\Security\AccessManager;
use Thelia\Core\Security\Resource\AdminResources;
use Thelia\Model\CustomerQuery;
use Thelia\Model\NewsletterQuery;
/**
@@ -64,4 +63,4 @@ class CustomerExportController extends BaseAdminController
}
}
}

View File

@@ -15,7 +15,6 @@ namespace Thelia\Controller\Admin;
use Thelia\Core\Security\AccessManager;
use Thelia\Core\Security\Resource\AdminResources;
/**
* Class ExportController
* @package Thelia\Controller\Admin
@@ -32,4 +31,4 @@ class ExportController extends BaseAdminController
return $this->render('export');
}
}
}

View File

@@ -15,7 +15,6 @@ namespace Thelia\Controller\Admin;
use Thelia\Core\Security\AccessManager;
use Thelia\Core\Security\Resource\AdminResources;
/**
* Class ToolsController
* @package Thelia\Controller\Admin
@@ -31,4 +30,4 @@ class ToolsController extends BaseAdminController
return $this->render('tools');
}
}
}

View File

@@ -16,7 +16,6 @@ use Symfony\Component\Finder\Finder;
use Thelia\Core\Security\Resource\AdminResources;
use Thelia\Core\Security\AccessManager;
use Thelia\Core\Translation\Translator;
use Thelia\Log\Tlog;
use Thelia\Model\Module;
use Thelia\Model\ModuleQuery;
use Thelia\Core\Template\TemplateHelper;
@@ -147,8 +146,7 @@ class TranslationsController extends BaseAdminController
;
$hasAdminIncludes = $finder->count() > 0;
}
catch (\InvalidArgumentException $ex) {
} catch (\InvalidArgumentException $ex) {
$hasAdminIncludes = false;
}