This commit is contained in:
Manuel Raynaud
2013-10-18 09:28:17 +02:00
parent 12b5a81364
commit 52ed89f1aa
70 changed files with 136 additions and 244 deletions

View File

@@ -34,7 +34,6 @@ use Thelia\Model\CountryQuery;
use Thelia\Action\BaseAction; use Thelia\Action\BaseAction;
use Thelia\Model\Area as AreaModel; use Thelia\Model\Area as AreaModel;
/** /**
* Class Area * Class Area
* @package Thelia\Action * @package Thelia\Action
@@ -97,7 +96,6 @@ class Area extends BaseAction implements EventSubscriberInterface
$event->setArea($area); $event->setArea($area);
} }
/** /**
* Returns an array of event names this subscriber wants to listen to. * Returns an array of event names this subscriber wants to listen to.
* *
@@ -128,4 +126,4 @@ class Area extends BaseAction implements EventSubscriberInterface
TheliaEvents::AREA_CREATE => array('create', 128) TheliaEvents::AREA_CREATE => array('create', 128)
); );
} }
} }

View File

@@ -27,7 +27,6 @@ use Symfony\Component\Filesystem\Filesystem;
use Thelia\Core\Event\Cache\CacheEvent; use Thelia\Core\Event\Cache\CacheEvent;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;
/** /**
* Class Cache * Class Cache
* @package Thelia\Action * @package Thelia\Action
@@ -42,7 +41,6 @@ class Cache extends BaseAction implements EventSubscriberInterface
$directoryBrowser = new \DirectoryIterator($dir); $directoryBrowser = new \DirectoryIterator($dir);
$fs = new Filesystem(); $fs = new Filesystem();
$fs->remove($dir); $fs->remove($dir);
@@ -74,4 +72,4 @@ class Cache extends BaseAction implements EventSubscriberInterface
TheliaEvents::CACHE_CLEAR => array('cacheClear', 128) TheliaEvents::CACHE_CLEAR => array('cacheClear', 128)
); );
} }
} }

View File

@@ -160,7 +160,7 @@ class Content extends BaseAction implements EventSubscriberInterface
->filterByFolderId($event->getFolderId()) ->filterByFolderId($event->getFolderId())
->findOne(); ->findOne();
if(null !== $contentFolder) { if (null !== $contentFolder) {
$contentFolder->delete(); $contentFolder->delete();
} }
} }

View File

@@ -32,7 +32,6 @@ use Thelia\Core\Event\TheliaEvents;
use Thelia\Model\Country as CountryModel; use Thelia\Model\Country as CountryModel;
use Thelia\Model\CountryQuery; use Thelia\Model\CountryQuery;
/** /**
* Class Country * Class Country
* @package Thelia\Action * @package Thelia\Action
@@ -85,15 +84,13 @@ class Country extends BaseAction implements EventSubscriberInterface
public function toggleDefault(CountryToggleDefaultEvent $event) public function toggleDefault(CountryToggleDefaultEvent $event)
{ {
if( null !== $country = CountryQuery::create()->findPk($event->getCountryId())) if ( null !== $country = CountryQuery::create()->findPk($event->getCountryId())) {
{
$country->toggleDefault(); $country->toggleDefault();
$event->setCountry($country); $event->setCountry($country);
} }
} }
/** /**
* Returns an array of event names this subscriber wants to listen to. * Returns an array of event names this subscriber wants to listen to.
* *
@@ -123,4 +120,4 @@ class Country extends BaseAction implements EventSubscriberInterface
TheliaEvents::COUNTRY_TOGGLE_DEFAULT => array('toggleDefault', 128) TheliaEvents::COUNTRY_TOGGLE_DEFAULT => array('toggleDefault', 128)
); );
} }
} }

View File

@@ -25,7 +25,6 @@ namespace Thelia\Action;
use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Thelia\Core\Event\ActionEvent; use Thelia\Core\Event\ActionEvent;
use Thelia\Core\Event\Customer\CustomerAddressEvent;
use Thelia\Core\Event\Customer\CustomerCreateOrUpdateEvent; use Thelia\Core\Event\Customer\CustomerCreateOrUpdateEvent;
use Thelia\Core\Event\Customer\CustomerEvent; use Thelia\Core\Event\Customer\CustomerEvent;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;

View File

@@ -29,7 +29,6 @@ use Thelia\Core\Event\TheliaEvents;
use Thelia\Model\ModuleQuery; use Thelia\Model\ModuleQuery;
use Thelia\Module\BaseModule; use Thelia\Module\BaseModule;
/** /**
* Class Module * Class Module
* @package Thelia\Action * @package Thelia\Action
@@ -45,16 +44,16 @@ class Module extends BaseAction implements EventSubscriberInterface
$moduleInstance = $moduleClass->newInstance(); $moduleInstance = $moduleClass->newInstance();
if( method_exists($moduleInstance, 'setContainer')) { if ( method_exists($moduleInstance, 'setContainer')) {
$moduleInstance->setContainer($this->container); $moduleInstance->setContainer($this->container);
if($module->getActivate() == BaseModule::IS_ACTIVATED) { if ($module->getActivate() == BaseModule::IS_ACTIVATED) {
$moduleInstance->deActivate($module); $moduleInstance->deActivate($module);
} else { } else {
$moduleInstance->activate($module); $moduleInstance->activate($module);
} }
} }
if($module->isModified()) { if ($module->isModified()) {
$event->setModule($module); $event->setModule($module);
} }
@@ -95,4 +94,4 @@ class Module extends BaseAction implements EventSubscriberInterface
TheliaEvents::MODULE_TOGGLE_ACTIVATION => array('toggleActivation', 128) TheliaEvents::MODULE_TOGGLE_ACTIVATION => array('toggleActivation', 128)
); );
} }
} }

View File

@@ -26,7 +26,6 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Thelia\Core\Event\PdfEvent; use Thelia\Core\Event\PdfEvent;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;
/** /**
* Class Pdf * Class Pdf
* @package Thelia\Action * @package Thelia\Action
@@ -72,4 +71,4 @@ class Pdf extends BaseAction implements EventSubscriberInterface
TheliaEvents::GENERATE_PDF => array("generatePdf", 128) TheliaEvents::GENERATE_PDF => array("generatePdf", 128)
); );
} }
} }

View File

@@ -29,7 +29,6 @@ use Thelia\Core\Event\TheliaEvents;
use Thelia\Model\AreaDeliveryModule; use Thelia\Model\AreaDeliveryModule;
use Thelia\Model\AreaDeliveryModuleQuery; use Thelia\Model\AreaDeliveryModuleQuery;
/** /**
* Class ShippingZone * Class ShippingZone
* @package Thelia\Action * @package Thelia\Action
@@ -55,7 +54,7 @@ class ShippingZone extends BaseAction implements EventSubscriberInterface
->filterByDeliveryModuleId($event->getShoppingZoneId()) ->filterByDeliveryModuleId($event->getShoppingZoneId())
->findOne(); ->findOne();
if($areaDelivery) { if ($areaDelivery) {
$areaDelivery->delete(); $areaDelivery->delete();
} else { } else {
throw new \RuntimeException(sprintf('areaDeliveryModule not found with area_id = %d and delivery_module_id = %d', $event->getAreaId(), $event->getShoppingZoneId())); throw new \RuntimeException(sprintf('areaDeliveryModule not found with area_id = %d and delivery_module_id = %d', $event->getAreaId(), $event->getShoppingZoneId()));
@@ -89,4 +88,4 @@ class ShippingZone extends BaseAction implements EventSubscriberInterface
TheliaEvents::SHIPPING_ZONE_REMOVE_AREA => array('removeArea', 128), TheliaEvents::SHIPPING_ZONE_REMOVE_AREA => array('removeArea', 128),
); );
} }
} }

View File

@@ -68,8 +68,6 @@ class TaxRule extends BaseAction implements EventSubscriberInterface
->save() ->save()
; ;
$event->setTaxRule($taxRule); $event->setTaxRule($taxRule);
} }
} }
@@ -90,12 +88,12 @@ class TaxRule extends BaseAction implements EventSubscriberInterface
->delete(); ->delete();
/* for each country */ /* for each country */
foreach($event->getCountryList() as $country) { foreach ($event->getCountryList() as $country) {
$position = 1; $position = 1;
/* on applique les nouvelles regles */ /* on applique les nouvelles regles */
foreach($taxList as $tax) { foreach ($taxList as $tax) {
if(is_array($tax)) { if (is_array($tax)) {
foreach($tax as $samePositionTax) { foreach ($tax as $samePositionTax) {
$taxModel = new TaxRuleCountry(); $taxModel = new TaxRuleCountry();
$taxModel->setTaxRule($taxRule) $taxModel->setTaxRule($taxRule)
->setCountryId($country) ->setCountryId($country)

View File

@@ -143,8 +143,8 @@ class Install extends ContainerAwareCommand
$permissions = new CheckPermission(false, $this->getContainer()->get('thelia.translator')); $permissions = new CheckPermission(false, $this->getContainer()->get('thelia.translator'));
$isValid = $permissions->exec(); $isValid = $permissions->exec();
foreach($permissions->getValidationMessages() as $item => $data) { foreach ($permissions->getValidationMessages() as $item => $data) {
if($data['status']) { if ($data['status']) {
$output->writeln(array( $output->writeln(array(
sprintf("<info>%s ...</info> %s", sprintf("<info>%s ...</info> %s",
$data['text'], $data['text'],
@@ -162,7 +162,7 @@ class Install extends ContainerAwareCommand
} }
if(false === $isValid) { if (false === $isValid) {
$output->writeln(array( $output->writeln(array(
"", "",
"<error>Please put correct permissions and reload install process</error>" "<error>Please put correct permissions and reload install process</error>"

View File

@@ -26,7 +26,6 @@ namespace Thelia\Command;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Filesystem\Filesystem;
use Thelia\Model\ModuleQuery; use Thelia\Model\ModuleQuery;

View File

@@ -25,7 +25,7 @@ namespace %%NAMESPACE%%;
use Thelia\Module\BaseModule; use Thelia\Module\BaseModule;
class %%CLASSNAME%% extends BaseModule class Class extends BaseModule
{ {
/** /**
* YOU HAVE TO IMPLEMENT HERE ABSTRACT METHODD FROM BaseModule Class * YOU HAVE TO IMPLEMENT HERE ABSTRACT METHODD FROM BaseModule Class

View File

@@ -24,14 +24,12 @@
namespace Thelia\Controller\Admin; namespace Thelia\Controller\Admin;
use Thelia\Core\Event\Address\AddressCreateOrUpdateEvent; use Thelia\Core\Event\Address\AddressCreateOrUpdateEvent;
use Thelia\Core\Event\Address\AddressEvent; use Thelia\Core\Event\Address\AddressEvent;
use Thelia\Core\Event\Customer\CustomerCreateOrUpdateEvent;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;
use Thelia\Form\AddressCreateForm; use Thelia\Form\AddressCreateForm;
use Thelia\Form\AddressUpdateForm; use Thelia\Form\AddressUpdateForm;
use Thelia\Model\AddressQuery; use Thelia\Model\AddressQuery;
use Thelia\Model\CustomerQuery; use Thelia\Model\CustomerQuery;
/** /**
* Class AddressController * Class AddressController
* @package Thelia\Controller\Admin * @package Thelia\Controller\Admin
@@ -78,7 +76,7 @@ class AddressController extends AbstractCrudController
$this->dispatch(TheliaEvents::ADDRESS_DEFAULT, $addressEvent); $this->dispatch(TheliaEvents::ADDRESS_DEFAULT, $addressEvent);
$this->adminLogAppend(sprintf("address %d for customer %d removal", $address_id, $address->getCustomerId())); $this->adminLogAppend(sprintf("address %d for customer %d removal", $address_id, $address->getCustomerId()));
} catch(\Exception $e) { } catch (\Exception $e) {
\Thelia\Log\Tlog::getInstance()->error(sprintf("error during address removal with message %s", $e->getMessage())); \Thelia\Log\Tlog::getInstance()->error(sprintf("error during address removal with message %s", $e->getMessage()));
} }
@@ -176,8 +174,6 @@ class AddressController extends AbstractCrudController
$formData["is_default"] $formData["is_default"]
); );
return $event; return $event;
} }
@@ -279,8 +275,8 @@ class AddressController extends AbstractCrudController
/** /**
* Put in this method post object delete processing if required. * Put in this method post object delete processing if required.
* *
* @param \Thelia\Core\Event\AddressEvent $deleteEvent the delete event * @param \Thelia\Core\Event\AddressEvent $deleteEvent the delete event
* @return Response a response, or null to continue normal processing * @return Response a response, or null to continue normal processing
*/ */
protected function performAdditionalDeleteAction($deleteEvent) protected function performAdditionalDeleteAction($deleteEvent)
{ {
@@ -291,8 +287,8 @@ class AddressController extends AbstractCrudController
/** /**
* Put in this method post object creation processing if required. * Put in this method post object creation processing if required.
* *
* @param AddressCreateOrUpdateEvent $createEvent the create event * @param AddressCreateOrUpdateEvent $createEvent the create event
* @return Response a response, or null to continue normal processing * @return Response a response, or null to continue normal processing
*/ */
protected function performAdditionalCreateAction($createEvent) protected function performAdditionalCreateAction($createEvent)
{ {
@@ -303,4 +299,4 @@ class AddressController extends AbstractCrudController
{ {
$this->redirectToEditionTemplate(); $this->redirectToEditionTemplate();
} }
} }

View File

@@ -378,8 +378,8 @@ class BaseAdminController extends BaseController
* Render the given template, and returns the result as a string. * Render the given template, and returns the result as a string.
* *
* @param $templateName the complete template name, with extension * @param $templateName the complete template name, with extension
* @param array $args the template arguments * @param array $args the template arguments
* @param null $templateDir * @param null $templateDir
* *
* @return \Symfony\Component\HttpFoundation\Response * @return \Symfony\Component\HttpFoundation\Response
*/ */

View File

@@ -243,7 +243,7 @@ class CountryController extends AbstractCrudController
try { try {
$this->dispatch(TheliaEvents::COUNTRY_TOGGLE_DEFAULT, $toogleDefaultEvent); $this->dispatch(TheliaEvents::COUNTRY_TOGGLE_DEFAULT, $toogleDefaultEvent);
if($toogleDefaultEvent->hasCountry()) { if ($toogleDefaultEvent->hasCountry()) {
return $this->nullResponse(); return $this->nullResponse();
} }
} catch (\Exception $ex) { } catch (\Exception $ex) {

View File

@@ -25,14 +25,11 @@ namespace Thelia\Controller\Admin;
use Propel\Runtime\Exception\PropelException; use Propel\Runtime\Exception\PropelException;
use Symfony\Component\Form\Form; use Symfony\Component\Form\Form;
use Thelia\Core\Event\Address\AddressEvent;
use Thelia\Core\Event\Customer\CustomerAddressEvent;
use Thelia\Core\Event\Customer\CustomerCreateOrUpdateEvent; use Thelia\Core\Event\Customer\CustomerCreateOrUpdateEvent;
use Thelia\Core\Event\Customer\CustomerEvent; use Thelia\Core\Event\Customer\CustomerEvent;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;
use Thelia\Form\CustomerModification; use Thelia\Form\CustomerModification;
use Thelia\Form\Exception\FormValidationException; use Thelia\Form\Exception\FormValidationException;
use Thelia\Model\AddressQuery;
use Thelia\Model\CustomerQuery; use Thelia\Model\CustomerQuery;
use Thelia\Core\Translation\Translator; use Thelia\Core\Translation\Translator;
@@ -57,8 +54,6 @@ class CustomerController extends BaseAdminController
)); ));
} }
/** /**
* update customer action * update customer action
* *

View File

@@ -59,7 +59,7 @@ class ModuleController extends BaseAdminController
$event = new ModuleToggleActivationEvent($module_id); $event = new ModuleToggleActivationEvent($module_id);
$this->dispatch(TheliaEvents::MODULE_TOGGLE_ACTIVATION, $event); $this->dispatch(TheliaEvents::MODULE_TOGGLE_ACTIVATION, $event);
if(null === $event->getModule()) { if (null === $event->getModule()) {
throw new \LogicException( throw new \LogicException(
$this->getTranslator()->trans("No %obj was updated.", array('%obj' => 'Module'))); $this->getTranslator()->trans("No %obj was updated.", array('%obj' => 'Module')));
} }
@@ -67,9 +67,8 @@ class ModuleController extends BaseAdminController
$message = $e->getMessage(); $message = $e->getMessage();
} }
if ($this->getRequest()->isXmlHttpRequest()) {
if($this->getRequest()->isXmlHttpRequest()) { if ($message) {
if($message) {
$response = $this->jsonResponse(json_encode(array( $response = $this->jsonResponse(json_encode(array(
"error" => $message "error" => $message
)), 500); )), 500);

View File

@@ -211,7 +211,6 @@ class OrderController extends BaseAdminController
{ {
if (null !== $response = $this->checkAuth("admin.order.update")) return $response; if (null !== $response = $this->checkAuth("admin.order.update")) return $response;
$html = $this->renderRaw( $html = $this->renderRaw(
$fileName, $fileName,
array( array(
@@ -227,7 +226,7 @@ class OrderController extends BaseAdminController
$this->dispatch(TheliaEvents::GENERATE_PDF, $pdfEvent); $this->dispatch(TheliaEvents::GENERATE_PDF, $pdfEvent);
if($pdfEvent->hasPdf()) { if ($pdfEvent->hasPdf()) {
return Response::create($pdfEvent->getPdf(), 200, return Response::create($pdfEvent->getPdf(), 200,
array( array(
'Content-type' => "application/pdf", 'Content-type' => "application/pdf",

View File

@@ -140,5 +140,4 @@ class ShippingZoneController extends BaseAdminController
return $this->getRequest()->get('shipping_zone_id', 0); return $this->getRequest()->get('shipping_zone_id', 0);
} }
} }

View File

@@ -199,8 +199,8 @@ class TaxRuleController extends AbstractCrudController
/** /**
* Put in this method post object creation processing if required. * Put in this method post object creation processing if required.
* *
* @param TaxRuleEvent $createEvent the create event * @param TaxRuleEvent $createEvent the create event
* @return Response a response, or null to continue normal processing * @return Response a response, or null to continue normal processing
*/ */
protected function performAdditionalCreateAction($createEvent) protected function performAdditionalCreateAction($createEvent)
{ {
@@ -284,4 +284,4 @@ class TaxRuleController extends AbstractCrudController
// At this point, the form has errors, and should be redisplayed. // At this point, the form has errors, and should be redisplayed.
return $this->renderEditionTemplate(); return $this->renderEditionTemplate();
} }
} }

View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Area; namespace Thelia\Core\Event\Area;
/** /**
* Class AreaAddCountryEvent * Class AreaAddCountryEvent
* @package Thelia\Core\Event\Area * @package Thelia\Core\Event\Area
@@ -34,7 +33,7 @@ class AreaAddCountryEvent extends AreaEvent
protected $area_id; protected $area_id;
protected $country_id; protected $country_id;
function __construct($area_id, $country_id) public function __construct($area_id, $country_id)
{ {
$this->area_id = $area_id; $this->area_id = $area_id;
$this->country_id = $country_id; $this->country_id = $country_id;
@@ -80,7 +79,4 @@ class AreaAddCountryEvent extends AreaEvent
return $this->country_id; return $this->country_id;
} }
}
}

View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Area; namespace Thelia\Core\Event\Area;
/** /**
* Class AreaCreateEvent * Class AreaCreateEvent
* @package Thelia\Core\Event\Area * @package Thelia\Core\Event\Area
@@ -49,5 +48,4 @@ class AreaCreateEvent extends AreaEvent
return $this->name; return $this->name;
} }
}
}

View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Area; namespace Thelia\Core\Event\Area;
/** /**
* Class AreaDeleteEvent * Class AreaDeleteEvent
* @package Thelia\Core\Event\Area * @package Thelia\Core\Event\Area
@@ -61,5 +60,4 @@ class AreaDeleteEvent extends AreaEvent
return $this->area_id; return $this->area_id;
} }
}
}

View File

@@ -24,7 +24,6 @@
namespace Thelia\Core\Event\Area; namespace Thelia\Core\Event\Area;
use Thelia\Core\Event\ActionEvent; use Thelia\Core\Event\ActionEvent;
/** /**
* Class AreaEvent * Class AreaEvent
* @package Thelia\Core\Event\Shipping * @package Thelia\Core\Event\Shipping
@@ -63,4 +62,4 @@ class AreaEvent extends ActionEvent
{ {
return null !== $this->area; return null !== $this->area;
} }
} }

View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Area; namespace Thelia\Core\Event\Area;
/** /**
* Class AreaRemoveCountryEvent * Class AreaRemoveCountryEvent
* @package Thelia\Core\Event\Area * @package Thelia\Core\Event\Area
@@ -32,4 +31,4 @@ namespace Thelia\Core\Event\Area;
class AreaRemoveCountryEvent extends AreaAddCountryEvent class AreaRemoveCountryEvent extends AreaAddCountryEvent
{ {
} }

View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Area; namespace Thelia\Core\Event\Area;
/** /**
* Class AreaUpdateEvent * Class AreaUpdateEvent
* @package Thelia\Core\Event\Area * @package Thelia\Core\Event\Area
@@ -32,4 +31,4 @@ namespace Thelia\Core\Event\Area;
class AreaUpdateEvent extends AreaCreateEvent class AreaUpdateEvent extends AreaCreateEvent
{ {
} }

View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Area; namespace Thelia\Core\Event\Area;
/** /**
* Class AreaUpdatePostageEvent * Class AreaUpdatePostageEvent
* @package Thelia\Core\Event\Area * @package Thelia\Core\Event\Area
@@ -34,7 +33,7 @@ class AreaUpdatePostageEvent extends AreaEvent
protected $area_id; protected $area_id;
protected $postage; protected $postage;
function __construct($area_id) public function __construct($area_id)
{ {
$this->area_id = $area_id; $this->area_id = $area_id;
} }
@@ -79,7 +78,4 @@ class AreaUpdatePostageEvent extends AreaEvent
return $this->postage; return $this->postage;
} }
}
}

View File

@@ -25,7 +25,6 @@ namespace Thelia\Core\Event\Cache;
use Thelia\Core\Event\ActionEvent; use Thelia\Core\Event\ActionEvent;
/** /**
* Class CacheEvent * Class CacheEvent
* @package Thelia\Core\Event\Cache * @package Thelia\Core\Event\Cache
@@ -63,5 +62,4 @@ class CacheEvent extends ActionEvent
return $this->dir; return $this->dir;
} }
}
}

View File

@@ -24,7 +24,6 @@
namespace Thelia\Core\Event\Content; namespace Thelia\Core\Event\Content;
use Thelia\Model\Content; use Thelia\Model\Content;
/** /**
* Class ContentAddFolderEvent * Class ContentAddFolderEvent
* @package Thelia\Core\Event\Content * @package Thelia\Core\Event\Content
@@ -61,6 +60,4 @@ class ContentAddFolderEvent extends ContentEvent
return $this->folderId; return $this->folderId;
} }
}
}

View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Content; namespace Thelia\Core\Event\Content;
/** /**
* Class ContentRemoveFolderEvent * Class ContentRemoveFolderEvent
* @package Thelia\Core\Event\Content * @package Thelia\Core\Event\Content
@@ -31,4 +30,4 @@ namespace Thelia\Core\Event\Content;
*/ */
class ContentRemoveFolderEvent extends ContentAddFolderEvent class ContentRemoveFolderEvent extends ContentAddFolderEvent
{ {
} }

View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Country; namespace Thelia\Core\Event\Country;
/** /**
* Class CountryCreateEvent * Class CountryCreateEvent
* @package Thelia\Core\Event\Country * @package Thelia\Core\Event\Country
@@ -150,5 +149,4 @@ class CountryCreateEvent extends CountryEvent
return $this->area; return $this->area;
} }
}
}

View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Country; namespace Thelia\Core\Event\Country;
/** /**
* Class CountryDeleteEvent * Class CountryDeleteEvent
* @package Thelia\Core\Event\Country * @package Thelia\Core\Event\Country
@@ -36,7 +35,7 @@ class CountryDeleteEvent extends CountryEvent
*/ */
protected $country_id; protected $country_id;
function __construct($country_id) public function __construct($country_id)
{ {
$this->country_id = $country_id; $this->country_id = $country_id;
} }
@@ -57,4 +56,4 @@ class CountryDeleteEvent extends CountryEvent
return $this->country_id; return $this->country_id;
} }
} }

View File

@@ -25,7 +25,6 @@ namespace Thelia\Core\Event\Country;
use Thelia\Core\Event\ActionEvent; use Thelia\Core\Event\ActionEvent;
use Thelia\Model\Country; use Thelia\Model\Country;
/** /**
* Class CountryEvent * Class CountryEvent
* @package Thelia\Core\Event\Country * @package Thelia\Core\Event\Country
@@ -38,7 +37,7 @@ class CountryEvent extends ActionEvent
*/ */
protected $country; protected $country;
function __construct(Country $country = null) public function __construct(Country $country = null)
{ {
$this->country = $country; $this->country = $country;
} }
@@ -69,5 +68,4 @@ class CountryEvent extends ActionEvent
return null !== $this->country; return null !== $this->country;
} }
}
}

View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Country; namespace Thelia\Core\Event\Country;
/** /**
* Class CountryToggleDefaultEvent * Class CountryToggleDefaultEvent
* @package Thelia\Core\Event\Country * @package Thelia\Core\Event\Country
@@ -33,7 +32,7 @@ class CountryToggleDefaultEvent extends CountryEvent
{ {
protected $country_id; protected $country_id;
function __construct($country_id) public function __construct($country_id)
{ {
$this->country_id = $country_id; $this->country_id = $country_id;
} }
@@ -45,4 +44,4 @@ class CountryToggleDefaultEvent extends CountryEvent
{ {
return $this->country_id; return $this->country_id;
} }
} }

View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Country; namespace Thelia\Core\Event\Country;
/** /**
* Class CountryUpdateEvent * Class CountryUpdateEvent
* @package Thelia\Core\Event\Country * @package Thelia\Core\Event\Country
@@ -37,7 +36,7 @@ class CountryUpdateEvent extends CountryCreateEvent
protected $description; protected $description;
protected $postscriptum; protected $postscriptum;
function __construct($country_id) public function __construct($country_id)
{ {
$this->country_id = $country_id; $this->country_id = $country_id;
} }
@@ -114,7 +113,4 @@ class CountryUpdateEvent extends CountryCreateEvent
return $this->country_id; return $this->country_id;
} }
}
}

View File

@@ -25,7 +25,6 @@ namespace Thelia\Core\Event\Module;
use Thelia\Core\Event\ActionEvent; use Thelia\Core\Event\ActionEvent;
use Thelia\Model\Module; use Thelia\Model\Module;
/** /**
* Class ModuleEvent * Class ModuleEvent
* @package Thelia\Core\Event\Module * @package Thelia\Core\Event\Module
@@ -38,7 +37,7 @@ class ModuleEvent extends ActionEvent
*/ */
protected $module; protected $module;
function __construct(Module $module = null) public function __construct(Module $module = null)
{ {
$this->module = $module; $this->module = $module;
} }
@@ -63,7 +62,4 @@ class ModuleEvent extends ActionEvent
return $this->module; return $this->module;
} }
}
}

View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Module; namespace Thelia\Core\Event\Module;
/** /**
* Class ModuleToggleActivationEvent * Class ModuleToggleActivationEvent
* @package Thelia\Core\Event\Module * @package Thelia\Core\Event\Module
@@ -36,7 +35,7 @@ class ModuleToggleActivationEvent extends ModuleEvent
*/ */
protected $module_id; protected $module_id;
function __construct($module_id) public function __construct($module_id)
{ {
$this->module_id = $module_id; $this->module_id = $module_id;
} }
@@ -61,7 +60,4 @@ class ModuleToggleActivationEvent extends ModuleEvent
return $this->module_id; return $this->module_id;
} }
}
}

View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event; namespace Thelia\Core\Event;
/** /**
* Class PdfEvent * Class PdfEvent
* @package Thelia\Core\Event * @package Thelia\Core\Event
@@ -44,12 +43,12 @@ class PdfEvent extends ActionEvent
/** /**
* @param $content html content to transform into pdf * @param $content html content to transform into pdf
* @param string $orientation page orientation, same as TCPDF * @param string $orientation page orientation, same as TCPDF
* @param string $format The format used for pages, same as TCPDF * @param string $format The format used for pages, same as TCPDF
* @param string $lang Lang : fr, en, it... * @param string $lang Lang : fr, en, it...
* @param bool $unicode TRUE means that the input text is unicode (default = true) * @param bool $unicode TRUE means that the input text is unicode (default = true)
* @param string $encoding charset encoding; default is UTF-8 * @param string $encoding charset encoding; default is UTF-8
* @param array $marges Default marges (left, top, right, bottom) * @param array $marges Default marges (left, top, right, bottom)
*/ */
public function __construct($content, $orientation = 'P', $format = 'A4', $lang='fr', $unicode=true, $encoding='UTF-8',array $marges = array(0, 0, 0, 0)) public function __construct($content, $orientation = 'P', $format = 'A4', $lang='fr', $unicode=true, $encoding='UTF-8',array $marges = array(0, 0, 0, 0))
{ {
@@ -189,5 +188,4 @@ class PdfEvent extends ActionEvent
return $this->unicode; return $this->unicode;
} }
}
}

View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Product; namespace Thelia\Core\Event\Product;
class ProductCreateEvent extends ProductEvent class ProductCreateEvent extends ProductEvent
{ {
protected $ref; protected $ref;

View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Product; namespace Thelia\Core\Event\Product;
class ProductDeleteEvent extends ProductEvent class ProductDeleteEvent extends ProductEvent
{ {
public function __construct($product_id) public function __construct($product_id)

View File

@@ -24,7 +24,6 @@
namespace Thelia\Core\Event\ShippingZone; namespace Thelia\Core\Event\ShippingZone;
use Thelia\Core\Event\ActionEvent; use Thelia\Core\Event\ActionEvent;
/** /**
* Class ShippingZoneAddAreaEvent * Class ShippingZoneAddAreaEvent
* @package Thelia\Core\Event\ShippingZone * @package Thelia\Core\Event\ShippingZone
@@ -35,7 +34,7 @@ class ShippingZoneAddAreaEvent extends ActionEvent
protected $area_id; protected $area_id;
protected $shopping_zone_id; protected $shopping_zone_id;
function __construct($area_id, $shopping_zone_id) public function __construct($area_id, $shopping_zone_id)
{ {
$this->area_id = $area_id; $this->area_id = $area_id;
$this->shopping_zone_id = $shopping_zone_id; $this->shopping_zone_id = $shopping_zone_id;
@@ -81,7 +80,4 @@ class ShippingZoneAddAreaEvent extends ActionEvent
return $this->shopping_zone_id; return $this->shopping_zone_id;
} }
}
}

View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\ShippingZone; namespace Thelia\Core\Event\ShippingZone;
/** /**
* Class ShippingZoneRemoveAreaEvent * Class ShippingZoneRemoveAreaEvent
* @package Thelia\Core\Event\ShippingZone * @package Thelia\Core\Event\ShippingZone
@@ -32,4 +31,4 @@ namespace Thelia\Core\Event\ShippingZone;
class ShippingZoneRemoveAreaEvent extends ShippingZoneAddAreaEvent class ShippingZoneRemoveAreaEvent extends ShippingZoneAddAreaEvent
{ {
} }

View File

@@ -118,5 +118,4 @@ class TaxRuleEvent extends ActionEvent
return $this->taxList; return $this->taxList;
} }
} }

View File

@@ -183,7 +183,6 @@ final class TheliaEvents
const FOLDER_TOGGLE_VISIBILITY = "action.toggleFolderVisibility"; const FOLDER_TOGGLE_VISIBILITY = "action.toggleFolderVisibility";
const FOLDER_UPDATE_POSITION = "action.updateFolderPosition"; const FOLDER_UPDATE_POSITION = "action.updateFolderPosition";
const BEFORE_CREATEFOLDER = "action.before_createFolder"; const BEFORE_CREATEFOLDER = "action.before_createFolder";
const AFTER_CREATEFOLDER = "action.after_createFolder"; const AFTER_CREATEFOLDER = "action.after_createFolder";
@@ -204,7 +203,6 @@ final class TheliaEvents
const CONTENT_ADD_FOLDER = "action.contentAddFolder"; const CONTENT_ADD_FOLDER = "action.contentAddFolder";
const CONTENT_REMOVE_FOLDER = "action.contentRemoveFolder"; const CONTENT_REMOVE_FOLDER = "action.contentRemoveFolder";
const BEFORE_CREATECONTENT = "action.before_createContent"; const BEFORE_CREATECONTENT = "action.before_createContent";
const AFTER_CREATECONTENT = "action.after_createContent"; const AFTER_CREATECONTENT = "action.after_createContent";
@@ -222,7 +220,6 @@ final class TheliaEvents
const COUNTRY_TOGGLE_DEFAULT = "action.toggleCountryDefault"; const COUNTRY_TOGGLE_DEFAULT = "action.toggleCountryDefault";
//const COUNTRY_UPDATE_POSITION = "action.updateFolderPosition"; //const COUNTRY_UPDATE_POSITION = "action.updateFolderPosition";
const BEFORE_CREATECOUNTRY = "action.before_createCountry"; const BEFORE_CREATECOUNTRY = "action.before_createCountry";
const AFTER_CREATECOUNTRY = "action.after_createCountry"; const AFTER_CREATECOUNTRY = "action.after_createCountry";

View File

@@ -30,7 +30,6 @@ use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Model\AreaQuery; use Thelia\Model\AreaQuery;
/** /**
* Class Area * Class Area
* @package Thelia\Core\Template\Loop * @package Thelia\Core\Template\Loop
@@ -112,8 +111,7 @@ class Area extends BaseLoop
$withoutZone = $this->getWithout_zone(); $withoutZone = $this->getWithout_zone();
if($withoutZone) if ($withoutZone) {
{
$search->joinAreaDeliveryModule('without_zone', Criteria::LEFT_JOIN) $search->joinAreaDeliveryModule('without_zone', Criteria::LEFT_JOIN)
->addJoinCondition('without_zone', 'delivery_module_id '.Criteria::EQUAL.' ?', $withoutZone, null, \PDO::PARAM_INT) ->addJoinCondition('without_zone', 'delivery_module_id '.Criteria::EQUAL.' ?', $withoutZone, null, \PDO::PARAM_INT)
->where('`without_zone`.delivery_module_id '.Criteria::ISNULL); ->where('`without_zone`.delivery_module_id '.Criteria::ISNULL);
@@ -140,5 +138,4 @@ class Area extends BaseLoop
return $loopResult; return $loopResult;
} }
}
}

View File

@@ -114,7 +114,7 @@ class Folder extends BaseI18nLoop
if (null !== $content) { if (null !== $content) {
$obj = ContentQuery::create()->findPk($content); $obj = ContentQuery::create()->findPk($content);
if($obj) { if ($obj) {
$search->filterByContent($obj, Criteria::IN); $search->filterByContent($obj, Criteria::IN);
} }
} }

View File

@@ -30,7 +30,6 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Model\FolderQuery; use Thelia\Model\FolderQuery;
use Thelia\Type\BooleanOrBothType; use Thelia\Type\BooleanOrBothType;
/** /**
* Class FolderPath * Class FolderPath
* @package Thelia\Core\Template\Loop * @package Thelia\Core\Template\Loop
@@ -156,5 +155,4 @@ class FolderPath extends BaseI18nLoop
return $loopResult; return $loopResult;
} }
}
}

View File

@@ -97,7 +97,7 @@ class Tax extends BaseI18nLoop
$country = $this->getCountry(); $country = $this->getCountry();
$taxRule = $this->getTax_rule(); $taxRule = $this->getTax_rule();
if(null !== $taxRule && null !== $country) { if (null !== $taxRule && null !== $country) {
$search->filterByTaxRuleCountry( $search->filterByTaxRuleCountry(
TaxRuleCountryQuery::create() TaxRuleCountryQuery::create()
->filterByCountryId($country, Criteria::EQUAL) ->filterByCountryId($country, Criteria::EQUAL)
@@ -108,7 +108,7 @@ class Tax extends BaseI18nLoop
} }
$excludeTaxRule = $this->getExclude_tax_rule(); $excludeTaxRule = $this->getExclude_tax_rule();
if(null !== $excludeTaxRule && null !== $country) { if (null !== $excludeTaxRule && null !== $country) {
$excludedTaxes = TaxRuleCountryQuery::create() $excludedTaxes = TaxRuleCountryQuery::create()
->filterByCountryId($country, Criteria::EQUAL) ->filterByCountryId($country, Criteria::EQUAL)
->filterByTaxRuleId($excludeTaxRule, Criteria::IN) ->filterByTaxRuleId($excludeTaxRule, Criteria::IN)
@@ -118,7 +118,7 @@ class Tax extends BaseI18nLoop
$excludedTaxes, $excludedTaxes,
Criteria::NOT_IN Criteria::NOT_IN
);*/ );*/
foreach($excludedTaxes as $excludedTax) { foreach ($excludedTaxes as $excludedTax) {
$search->filterByTaxRuleCountry($excludedTax, Criteria::NOT_EQUAL); $search->filterByTaxRuleCountry($excludedTax, Criteria::NOT_EQUAL);
} }
} }

View File

@@ -35,8 +35,6 @@ use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Model\Map\CountryTableMap; use Thelia\Model\Map\CountryTableMap;
use Thelia\Model\Map\TaxRuleCountryTableMap; use Thelia\Model\Map\TaxRuleCountryTableMap;
use Thelia\Model\Map\TaxTableMap; use Thelia\Model\Map\TaxTableMap;
use Thelia\Type\TypeCollection;
use Thelia\Type;
use Thelia\Model\TaxRuleCountryQuery; use Thelia\Model\TaxRuleCountryQuery;
/** /**
@@ -76,15 +74,15 @@ class TaxRuleCountry extends BaseI18nLoop
$country = $this->getCountry(); $country = $this->getCountry();
$taxes = $this->getTaxes(); $taxes = $this->getTaxes();
if((null === $country && null === $taxes)) { if ((null === $country && null === $taxes)) {
throw new \InvalidArgumentException('You must provide either `country` or `taxes` parameter in tax-rule-country loop'); throw new \InvalidArgumentException('You must provide either `country` or `taxes` parameter in tax-rule-country loop');
} }
if((null === $country && null !== $taxes)) { if ((null === $country && null !== $taxes)) {
throw new \InvalidArgumentException('You must provide `country` parameter with `taxes` parameter in tax-rule-country loop'); throw new \InvalidArgumentException('You must provide `country` parameter with `taxes` parameter in tax-rule-country loop');
} }
if(null !== $taxes) { if (null !== $taxes) {
$search->groupByCountryId(); $search->groupByCountryId();
$originalCountryJoin = new Join(); $originalCountryJoin = new Join();
@@ -106,7 +104,7 @@ class TaxRuleCountry extends BaseI18nLoop
CountryTableMap::TABLE_NAME, CountryTableMap::TABLE_NAME,
'COUNTRY_ID' 'COUNTRY_ID'
); );
} elseif(null !== $country) { } elseif (null !== $country) {
$search->filterByCountryId($country); $search->filterByCountryId($country);
/* manage tax translation */ /* manage tax translation */
@@ -132,7 +130,7 @@ class TaxRuleCountry extends BaseI18nLoop
$loopResultRow = new LoopResultRow($loopResult, $taxRuleCountry, $this->versionable, $this->timestampable, $this->countable); $loopResultRow = new LoopResultRow($loopResult, $taxRuleCountry, $this->versionable, $this->timestampable, $this->countable);
if(null !== $taxes) { if (null !== $taxes) {
$loopResultRow $loopResultRow
->set("TAX_RULE" , $taxRuleCountry->getTaxRuleId()) ->set("TAX_RULE" , $taxRuleCountry->getTaxRuleId())
->set("COUNTRY" , $taxRuleCountry->getCountryId()) ->set("COUNTRY" , $taxRuleCountry->getCountryId())
@@ -141,7 +139,7 @@ class TaxRuleCountry extends BaseI18nLoop
->set("COUNTRY_DESCRIPTION" , $taxRuleCountry->getVirtualColumn(CountryTableMap::TABLE_NAME . '_i18n_DESCRIPTION')) ->set("COUNTRY_DESCRIPTION" , $taxRuleCountry->getVirtualColumn(CountryTableMap::TABLE_NAME . '_i18n_DESCRIPTION'))
->set("COUNTRY_POSTSCRIPTUM" , $taxRuleCountry->getVirtualColumn(CountryTableMap::TABLE_NAME . '_i18n_POSTSCRIPTUM')) ->set("COUNTRY_POSTSCRIPTUM" , $taxRuleCountry->getVirtualColumn(CountryTableMap::TABLE_NAME . '_i18n_POSTSCRIPTUM'))
; ;
}elseif(null !== $country) { } elseif (null !== $country) {
$loopResultRow $loopResultRow
->set("TAX_RULE" , $taxRuleCountry->getTaxRuleId()) ->set("TAX_RULE" , $taxRuleCountry->getTaxRuleId())
->set("COUNTRY" , $taxRuleCountry->getCountryId()) ->set("COUNTRY" , $taxRuleCountry->getCountryId())
@@ -152,8 +150,6 @@ class TaxRuleCountry extends BaseI18nLoop
; ;
} }
$loopResult->addRow($loopResultRow); $loopResult->addRow($loopResultRow);
} }

View File

@@ -32,7 +32,6 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Core\Template\Loop\Argument\Argument; use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Model\Base\TemplateQuery; use Thelia\Model\Base\TemplateQuery;
use Thelia\Type;
/** /**
* *

View File

@@ -172,6 +172,7 @@ class DataAccessFunctions extends AbstractSmartyPlugin
self::$dataAccessCache['defaultCountry'] = $defaultCountry; self::$dataAccessCache['defaultCountry'] = $defaultCountry;
}*/ }*/
$defaultCountry = CountryQuery::create()->filterByByDefault(1)->limit(1); $defaultCountry = CountryQuery::create()->filterByByDefault(1)->limit(1);
return $this->dataAccessWithI18n("defaultCountry", $params, $defaultCountry); return $this->dataAccessWithI18n("defaultCountry", $params, $defaultCountry);
} }
} }
@@ -237,7 +238,7 @@ class DataAccessFunctions extends AbstractSmartyPlugin
public function ConfigDataAccess($params, $smarty) public function ConfigDataAccess($params, $smarty)
{ {
if(false === array_key_exists("key", $params)) { if (false === array_key_exists("key", $params)) {
return null; return null;
} }

View File

@@ -152,7 +152,7 @@ class Form extends AbstractSmartyPlugin
$template->assign("options", $formFieldView->vars); $template->assign("options", $formFieldView->vars);
/* access to choices */ /* access to choices */
if(isset($formFieldView->vars['choices'])) { if (isset($formFieldView->vars['choices'])) {
$template->assign("choices", $formFieldView->vars['choices']); $template->assign("choices", $formFieldView->vars['choices']);
} }
@@ -199,8 +199,8 @@ $this->assignFieldValues($template, $formFieldView->vars["full_name"], $fieldVar
foreach ($formView->getIterator() as $row) { foreach ($formView->getIterator() as $row) {
if ($this->isHidden($row) && $row->isRendered() === false) { if ($this->isHidden($row) && $row->isRendered() === false) {
$attributeList = array(); $attributeList = array();
if(isset($row->vars["attr"])) { if (isset($row->vars["attr"])) {
foreach($row->vars["attr"] as $attrKey => $attrValue) { foreach ($row->vars["attr"] as $attrKey => $attrValue) {
$attributeList[] = sprintf($attrFormat, $attrKey, $attrValue); $attributeList[] = sprintf($attrFormat, $attrKey, $attrValue);
} }
} }

View File

@@ -28,7 +28,6 @@ use Symfony\Component\Validator\Constraints\GreaterThan;
use Symfony\Component\Validator\Constraints\NotBlank; use Symfony\Component\Validator\Constraints\NotBlank;
use Thelia\Form\BaseForm; use Thelia\Form\BaseForm;
/** /**
* Class AreaCountryForm * Class AreaCountryForm
* @package Thelia\Form\Area * @package Thelia\Form\Area
@@ -86,4 +85,4 @@ class AreaCountryForm extends BaseForm
{ {
return 'thelia_area_country'; return 'thelia_area_country';
} }
} }

View File

@@ -26,7 +26,6 @@ use Thelia\Core\Translation\Translator;
use Symfony\Component\Validator\Constraints\NotBlank; use Symfony\Component\Validator\Constraints\NotBlank;
use Thelia\Form\BaseForm; use Thelia\Form\BaseForm;
/** /**
* Class AreaCreateForm * Class AreaCreateForm
* @package Thelia\Form\Shipping * @package Thelia\Form\Shipping
@@ -76,4 +75,4 @@ class AreaCreateForm extends BaseForm
{ {
return 'thelia_area_creation'; return 'thelia_area_creation';
} }
} }

View File

@@ -25,7 +25,6 @@ namespace Thelia\Form\Area;
use Symfony\Component\Validator\Constraints\GreaterThan; use Symfony\Component\Validator\Constraints\GreaterThan;
use Thelia\Form\Area\AreaCreateForm; use Thelia\Form\Area\AreaCreateForm;
/** /**
* Class AreaModificationForm * Class AreaModificationForm
* @package Thelia\Form\Shipping * @package Thelia\Form\Shipping
@@ -46,4 +45,4 @@ class AreaModificationForm extends AreaCreateForm
{ {
return 'thelia_area_modification'; return 'thelia_area_modification';
} }
} }

View File

@@ -29,7 +29,6 @@ use Symfony\Component\Validator\Constraints\NotBlank;
use Thelia\Form\BaseForm; use Thelia\Form\BaseForm;
use Thelia\Core\Translation\Translator; use Thelia\Core\Translation\Translator;
/** /**
* Class AreaPostageForm * Class AreaPostageForm
* @package Thelia\Form\Area * @package Thelia\Form\Area
@@ -85,4 +84,4 @@ class AreaPostageForm extends BaseForm
{ {
return 'thelia_area_postage'; return 'thelia_area_postage';
} }
} }

View File

@@ -23,8 +23,6 @@
namespace Thelia\Form; namespace Thelia\Form;
use Symfony\Component\Validator\Constraints\GreaterThan; use Symfony\Component\Validator\Constraints\GreaterThan;
use Symfony\Component\Validator\Constraints\NotBlank;
use Thelia\Core\Translation\Translator;
class CountryModificationForm extends CountryCreationForm class CountryModificationForm extends CountryCreationForm
{ {

View File

@@ -28,7 +28,6 @@ use Symfony\Component\Validator\Constraints\GreaterThan;
use Symfony\Component\Validator\Constraints\NotBlank; use Symfony\Component\Validator\Constraints\NotBlank;
use Thelia\Form\BaseForm; use Thelia\Form\BaseForm;
/** /**
* Class ShippingZoneAddArea * Class ShippingZoneAddArea
* @package Thelia\Form\ShippingZone * @package Thelia\Form\ShippingZone
@@ -84,4 +83,4 @@ class ShippingZoneAddArea extends BaseForm
{ {
return 'thelia_shippingzone_area'; return 'thelia_shippingzone_area';
} }
} }

View File

@@ -23,7 +23,6 @@
namespace Thelia\Form\ShippingZone; namespace Thelia\Form\ShippingZone;
/** /**
* Class ShippingZoneRemoveArea * Class ShippingZoneRemoveArea
* @package Thelia\Form\ShippingZone * @package Thelia\Form\ShippingZone
@@ -39,4 +38,4 @@ class ShippingZoneRemoveArea extends ShippingZoneAddArea
{ {
return 'thelia_shippingzone_remove_area'; return 'thelia_shippingzone_remove_area';
} }
} }

View File

@@ -24,8 +24,6 @@ namespace Thelia\Form;
use Symfony\Component\Validator\Constraints; use Symfony\Component\Validator\Constraints;
use Symfony\Component\Validator\Constraints\NotBlank; use Symfony\Component\Validator\Constraints\NotBlank;
use Thelia\Core\Translation\Translator;
use Thelia\Model\CountryQuery;
class TaxRuleCreationForm extends BaseForm class TaxRuleCreationForm extends BaseForm
{ {

View File

@@ -34,7 +34,7 @@ class TaxRuleTaxListUpdateForm extends BaseForm
protected function buildForm() protected function buildForm()
{ {
$countryList = array(); $countryList = array();
foreach(CountryQuery::create()->find() as $country) { foreach (CountryQuery::create()->find() as $country) {
$countryList[$country->getId()] = $country->getId(); $countryList[$country->getId()] = $country->getId();
} }
@@ -96,7 +96,7 @@ class TaxRuleTaxListUpdateForm extends BaseForm
public function verifyTaxList($value, ExecutionContextInterface $context) public function verifyTaxList($value, ExecutionContextInterface $context)
{ {
$jsonType = new JsonType(); $jsonType = new JsonType();
if(!$jsonType->isValid($value)) { if (!$jsonType->isValid($value)) {
$context->addViolation("Tax list is not valid JSON"); $context->addViolation("Tax list is not valid JSON");
} }
@@ -104,10 +104,10 @@ class TaxRuleTaxListUpdateForm extends BaseForm
/* check we have 2 level max */ /* check we have 2 level max */
foreach($taxList as $taxLevel1) { foreach ($taxList as $taxLevel1) {
if(is_array($taxLevel1)) { if (is_array($taxLevel1)) {
foreach($taxLevel1 as $taxLevel2) { foreach ($taxLevel1 as $taxLevel2) {
if(is_array($taxLevel2)) { if (is_array($taxLevel2)) {
$context->addViolation("Bad tax list JSON"); $context->addViolation("Bad tax list JSON");
} else { } else {
$taxModel = TaxQuery::create()->findPk($taxLevel2); $taxModel = TaxQuery::create()->findPk($taxLevel2);

View File

@@ -53,10 +53,9 @@ abstract class BaseModule extends ContainerAware
} }
public function activate($moduleModel = null) public function activate($moduleModel = null)
{ {
if(null === $moduleModel) { if (null === $moduleModel) {
$moduleModel = $this->getModuleModel(); $moduleModel = $this->getModuleModel();
} }
@@ -64,7 +63,7 @@ abstract class BaseModule extends ContainerAware
$con = Propel::getWriteConnection(ModuleTableMap::DATABASE_NAME); $con = Propel::getWriteConnection(ModuleTableMap::DATABASE_NAME);
$con->beginTransaction(); $con->beginTransaction();
try { try {
if($this->preActivation($con)) { if ($this->preActivation($con)) {
$moduleModel->setActivate(self::IS_ACTIVATED); $moduleModel->setActivate(self::IS_ACTIVATED);
$moduleModel->save($con); $moduleModel->save($con);
$this->postActivation($con); $this->postActivation($con);
@@ -79,14 +78,14 @@ abstract class BaseModule extends ContainerAware
public function deActivate($moduleModel = null) public function deActivate($moduleModel = null)
{ {
if(null === $moduleModel) { if (null === $moduleModel) {
$moduleModel = $this->getModuleModel(); $moduleModel = $this->getModuleModel();
} }
if ($moduleModel->getActivate() == self::IS_ACTIVATED) { if ($moduleModel->getActivate() == self::IS_ACTIVATED) {
$con = Propel::getWriteConnection(ModuleTableMap::DATABASE_NAME); $con = Propel::getWriteConnection(ModuleTableMap::DATABASE_NAME);
$con->beginTransaction(); $con->beginTransaction();
try { try {
if($this->preDeactivation($con)) { if ($this->preDeactivation($con)) {
$moduleModel->setActivate(self::IS_NOT_ACTIVATED); $moduleModel->setActivate(self::IS_NOT_ACTIVATED);
$moduleModel->save($con); $moduleModel->save($con);
$this->postDeactivation($con); $this->postDeactivation($con);
@@ -215,7 +214,6 @@ abstract class BaseModule extends ContainerAware
return $moduleModel; return $moduleModel;
} }
public function getCode() public function getCode()
{ {
if (null === $this->reflected) { if (null === $this->reflected) {
@@ -225,8 +223,8 @@ abstract class BaseModule extends ContainerAware
return basename(dirname($this->reflected->getFileName())); return basename(dirname($this->reflected->getFileName()));
} }
public function install(){ public function install()
{
} }
public function preActivation(ConnectionInterface $con = null) public function preActivation(ConnectionInterface $con = null)

View File

@@ -23,7 +23,6 @@
namespace Thelia\Module\Exception; namespace Thelia\Module\Exception;
/** /**
* Class InvalidXmlDocumentException * Class InvalidXmlDocumentException
* @package Thelia\Module\Exception * @package Thelia\Module\Exception
@@ -32,4 +31,4 @@ namespace Thelia\Module\Exception;
class InvalidXmlDocumentException extends \RuntimeException class InvalidXmlDocumentException extends \RuntimeException
{ {
} }

View File

@@ -24,13 +24,12 @@
namespace Thelia\Module; namespace Thelia\Module;
use Thelia\Module\Exception\InvalidXmlDocumentException; use Thelia\Module\Exception\InvalidXmlDocumentException;
/** /**
* Class ModuleDescriptorValidator * Class ModuleDescriptorValidator
* @package Thelia\Module * @package Thelia\Module
* @author Manuel Raynaud <mraynaud@openstudio.fr> * @author Manuel Raynaud <mraynaud@openstudio.fr>
*/ */
class ModuleDescriptorValidator class ModuleDescriptorValidator
{ {
private $xsd_file; private $xsd_file;
@@ -44,7 +43,7 @@ class ModuleDescriptorValidator
$dom = new \DOMDocument(); $dom = new \DOMDocument();
if ($dom->load($xml_file)) { if ($dom->load($xml_file)) {
if($dom->schemaValidate($this->xsd_file)) { if ($dom->schemaValidate($this->xsd_file)) {
return true; return true;
} }
} }
@@ -52,9 +51,10 @@ class ModuleDescriptorValidator
throw new InvalidXmlDocumentException(sprintf("%s file is not a valid file", $xml_file)); throw new InvalidXmlDocumentException(sprintf("%s file is not a valid file", $xml_file));
} }
public function getDescriptor($xml_file) { public function getDescriptor($xml_file)
{
$this->validate($xml_file); $this->validate($xml_file);
return @simplexml_load_file($xml_file); return @simplexml_load_file($xml_file);
} }
} }

View File

@@ -32,13 +32,12 @@ use Thelia\Model\Module;
use Thelia\Model\ModuleI18n; use Thelia\Model\ModuleI18n;
use Thelia\Model\ModuleQuery; use Thelia\Model\ModuleQuery;
/** /**
* Class ModuleManagement * Class ModuleManagement
* @package Thelia\Module * @package Thelia\Module
* @author Manuel Raynaud <mraynaud@openstudio.fr> * @author Manuel Raynaud <mraynaud@openstudio.fr>
*/ */
class ModuleManagement class ModuleManagement
{ {
protected $baseModuleDir; protected $baseModuleDir;
protected $reflected; protected $reflected;
@@ -59,16 +58,16 @@ class ModuleManagement
$descriptorValidator = new ModuleDescriptorValidator(); $descriptorValidator = new ModuleDescriptorValidator();
foreach ($finder as $file) { foreach ($finder as $file) {
$content = $descriptorValidator->getDescriptor($file->getRealPath()); $content = $descriptorValidator->getDescriptor($file->getRealPath());
$reflected = new \ReflectionClass((string)$content->fullnamespace); $reflected = new \ReflectionClass((string) $content->fullnamespace);
$code = basename(dirname($reflected->getFileName())); $code = basename(dirname($reflected->getFileName()));
if(null === ModuleQuery::create()->filterByCode($code)->findOne()) { if (null === ModuleQuery::create()->filterByCode($code)->findOne()) {
$module = new Module(); $module = new Module();
$con = Propel::getWriteConnection(ModuleTableMap::DATABASE_NAME); $con = Propel::getWriteConnection(ModuleTableMap::DATABASE_NAME);
$con->beginTransaction(); $con->beginTransaction();
try { try {
$module $module
->setCode($code) ->setCode($code)
->setFullNamespace((string)$content->fullnamespace) ->setFullNamespace((string) $content->fullnamespace)
->setType($this->getModuleType($reflected)) ->setType($this->getModuleType($reflected))
->setActivate(0) ->setActivate(0)
->save($con); ->save($con);
@@ -76,7 +75,7 @@ class ModuleManagement
$this->saveDescription($module, $content, $con); $this->saveDescription($module, $content, $con);
$con->commit(); $con->commit();
} catch(PropelException $e) { } catch (PropelException $e) {
$con->rollBack(); $con->rollBack();
throw $e; throw $e;
} }
@@ -88,8 +87,7 @@ class ModuleManagement
private function saveDescription(Module $module,\SimpleXMLElement $content, ConnectionInterface $con) private function saveDescription(Module $module,\SimpleXMLElement $content, ConnectionInterface $con)
{ {
foreach($content->descriptive as $description) foreach ($content->descriptive as $description) {
{
$locale = $description->attributes()->locale; $locale = $description->attributes()->locale;
$moduleI18n = new ModuleI18n(); $moduleI18n = new ModuleI18n();
@@ -107,15 +105,14 @@ class ModuleManagement
private function getModuleType(\ReflectionClass $reflected) private function getModuleType(\ReflectionClass $reflected)
{ {
if($reflected->implementsInterface('Thelia\Module\DeliveryModuleInterface')) { if ($reflected->implementsInterface('Thelia\Module\DeliveryModuleInterface')) {
return BaseModule::DELIVERY_MODULE_TYPE; return BaseModule::DELIVERY_MODULE_TYPE;
} else if($reflected->implementsInterface('Thelia\Module\PaymentModuleInterface')) { } elseif ($reflected->implementsInterface('Thelia\Module\PaymentModuleInterface')) {
return BaseModule::PAYMENT_MODULE_TYPE; return BaseModule::PAYMENT_MODULE_TYPE;
} else { } else {
return BaseModule::CLASSIC_MODULE_TYPE; return BaseModule::CLASSIC_MODULE_TYPE;
} }
} }
} }

View File

@@ -23,7 +23,6 @@
namespace Thelia\Tests\Action; namespace Thelia\Tests\Action;
/** /**
* Class BaseAction * Class BaseAction
* @package Thelia\Tests\Action\ImageTest * @package Thelia\Tests\Action\ImageTest
@@ -41,4 +40,4 @@ class BaseAction extends \PHPUnit_Framework_TestCase
return $container; return $container;
} }
} }

View File

@@ -36,7 +36,6 @@ use Thelia\Model\ContentFolderQuery;
use Thelia\Model\ContentQuery; use Thelia\Model\ContentQuery;
use Thelia\Model\FolderQuery; use Thelia\Model\FolderQuery;
/** /**
* Class ContentTest * Class ContentTest
* @package Thelia\Tests\Action * @package Thelia\Tests\Action
@@ -205,7 +204,7 @@ class ContentTest extends BaseAction
$test = ContentFolderQuery::create() $test = ContentFolderQuery::create()
->filterByContent($content) ->filterByContent($content)
->filterByFolder($folder); ->filterByFolder($folder);
} while($test->count() > 0); } while ($test->count() > 0);
$event = new ContentAddFolderEvent($content, $folder->getId()); $event = new ContentAddFolderEvent($content, $folder->getId());
@@ -267,10 +266,10 @@ class ContentTest extends BaseAction
->addAscendingOrderByColumn('RAND()') ->addAscendingOrderByColumn('RAND()')
->findOne(); ->findOne();
if(null === $folder) { if (null === $folder) {
$this->fail('use fixtures before launching test, there is no folder in database'); $this->fail('use fixtures before launching test, there is no folder in database');
} }
return $folder; return $folder;
} }
} }

View File

@@ -31,7 +31,6 @@ use Thelia\Core\Event\Folder\FolderUpdateEvent;
use Thelia\Core\Event\UpdatePositionEvent; use Thelia\Core\Event\UpdatePositionEvent;
use Thelia\Model\FolderQuery; use Thelia\Model\FolderQuery;
/** /**
* Class FolderTest * Class FolderTest
* @package Thelia\Tests\Action\ImageTest * @package Thelia\Tests\Action\ImageTest
@@ -73,8 +72,6 @@ class FolderTest extends BaseAction
{ {
$folder = $this->getRandomFolder(); $folder = $this->getRandomFolder();
$visible = !$folder->getVisible(); $visible = !$folder->getVisible();
$event = new FolderUpdateEvent($folder->getId()); $event = new FolderUpdateEvent($folder->getId());
@@ -147,7 +144,7 @@ class FolderTest extends BaseAction
->filterByPosition(1, Criteria::GREATER_THAN) ->filterByPosition(1, Criteria::GREATER_THAN)
->findOne(); ->findOne();
if(null === $folder) { if (null === $folder) {
$this->fail('use fixtures before launching test, there is no folder in database'); $this->fail('use fixtures before launching test, there is no folder in database');
} }
@@ -169,7 +166,7 @@ class FolderTest extends BaseAction
->filterByPosition(1) ->filterByPosition(1)
->findOne(); ->findOne();
if(null === $folder) { if (null === $folder) {
$this->fail('use fixtures before launching test, there is no folder in database'); $this->fail('use fixtures before launching test, there is no folder in database');
} }
@@ -191,7 +188,7 @@ class FolderTest extends BaseAction
->filterByPosition(1, Criteria::GREATER_THAN) ->filterByPosition(1, Criteria::GREATER_THAN)
->findOne(); ->findOne();
if(null === $folder) { if (null === $folder) {
$this->fail('use fixtures before launching test, there is no folder in database'); $this->fail('use fixtures before launching test, there is no folder in database');
} }
@@ -215,10 +212,10 @@ class FolderTest extends BaseAction
->addAscendingOrderByColumn('RAND()') ->addAscendingOrderByColumn('RAND()')
->findOne(); ->findOne();
if(null === $folder) { if (null === $folder) {
$this->fail('use fixtures before launching test, there is no folder in database'); $this->fail('use fixtures before launching test, there is no folder in database');
} }
return $folder; return $folder;
} }
} }

View File

@@ -127,7 +127,7 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
$taxRulesCollection = new ObjectCollection(); $taxRulesCollection = new ObjectCollection();
$aProduct = ProductQuery::create()->findOne(); $aProduct = ProductQuery::create()->findOne();
if(null === $aProduct) { if (null === $aProduct) {
return; return;
} }
@@ -169,7 +169,7 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
$taxRulesCollection->setModel('\Thelia\Model\Tax'); $taxRulesCollection->setModel('\Thelia\Model\Tax');
$aProduct = ProductQuery::create()->findOne(); $aProduct = ProductQuery::create()->findOne();
if(null === $aProduct) { if (null === $aProduct) {
return; return;
} }
@@ -214,7 +214,7 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
$taxRulesCollection->append($tax); $taxRulesCollection->append($tax);
$aProduct = ProductQuery::create()->findOne(); $aProduct = ProductQuery::create()->findOne();
if(null === $aProduct) { if (null === $aProduct) {
return; return;
} }
@@ -270,7 +270,7 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
$taxRulesCollection->append($tax); $taxRulesCollection->append($tax);
$aProduct = ProductQuery::create()->findOne(); $aProduct = ProductQuery::create()->findOne();
if(null === $aProduct) { if (null === $aProduct) {
return; return;
} }

View File

@@ -88,7 +88,7 @@
}).done(function(){ }).done(function(){
$("#loading-event").remove(); $("#loading-event").remove();
}) })
.fail(function(jqXHR, textStatus, errorThrown){ .fail(function(jqXHR, textStatus, errorThrown){
$("#loading-event").remove(); $("#loading-event").remove();
$('#module-failed-body').html(jqXHR.responseJSON.error); $('#module-failed-body').html(jqXHR.responseJSON.error);
$("#module-failed").modal("show"); $("#module-failed").modal("show");