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

Merge branch 'backoffice' into frontend

Browse Source
This commit is contained in:
touffies
2013-11-25 10:24:29 +01:00
parent 743f894a4c 7f1c1bfdd8
commit fd0301022d
17 changed files with 455 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/lib/Thelia/Action/Order.php
View File

@@ -288,8 +288,8 @@ class Order extends BaseAction implements EventSubscriberInterface
*/
public function sendOrderEmail(OrderEvent $event)
{
$contact_email = ConfigQuery::read('contact_email');
if($contact_email) {
$store_email = ConfigQuery::read('store_email');
if($store_email) {
$order = $event->getOrder();
$customer = $order->getCustomer();
@@ -311,7 +311,7 @@ class Order extends BaseAction implements EventSubscriberInterface
$instance = \Swift_Message::newInstance($subject)
->addTo($customer->getEmail(), $customer->getFirstname()." ".$customer->getLastname())
->addFrom(ConfigQuery::read('contact_email'), ConfigQuery::read('company_name'))
->addFrom($store_email, ConfigQuery::read('store_name'))
;
$instance
->setBody($htmlMessage, 'text/html')

1
core/lib/Thelia/Config/Resources/form.xml
View File

@@ -118,6 +118,7 @@
<form name="thelia.lang.defaultBehavior" class="Thelia\Form\Lang\LangDefaultBehaviorForm"/>
<form name="thelia.lang.url" class="Thelia\Form\Lang\LangUrlForm"/>
<form name="thelia.configuration.store" class="Thelia\Form\ConfigStoreForm"/>
<form name="thelia.system-logs.configuration" class="Thelia\Form\SystemLogConfigurationForm"/>
<form name="thelia.admin.module.modification" class="Thelia\Form\ModuleModificationForm"/>

11
core/lib/Thelia/Config/Resources/routing/admin.xml
View File

@@ -512,6 +512,17 @@
<default key="_controller">Thelia\Controller\Admin\ConfigController::deleteAction</default>
</route>
<!-- Routes to the ConfigStore controller -->
<route id="admin.configuration.store.default" path="/admin/configuration/store">
<default key="_controller">Thelia\Controller\Admin\ConfigStoreController::defaultAction</default>
</route>
<route id="admin.configuration.store.save" path="/admin/configuration/store/save">
<default key="_controller">Thelia\Controller\Admin\ConfigStoreController::saveAction</default>
</route>
<!-- Routes to the SystemLog controller -->
<route id="admin.configuration.system-logs.default" path="/admin/configuration/system-logs">

105
core/lib/Thelia/Controller/Admin/ConfigStoreController.php Normal file
View File

@@ -0,0 +1,105 @@
<?php
/*************************************************************************************/
/* */
/* Thelia */
/* */
/* Copyright (c) OpenStudio */
/* email : info@thelia.net */
/* web : http://www.thelia.net */
/* */
/* This program is free software; you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
/* the Free Software Foundation; either version 3 of the License */
/* */
/* This program is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* */
/*************************************************************************************/
namespace Thelia\Controller\Admin;
use Thelia\Core\Security\Resource\AdminResources;
use Thelia\Core\Security\AccessManager;
use Thelia\Form\ConfigStoreForm;
use Thelia\Log\Tlog;
use Thelia\Model\ConfigQuery;
/**
* Class ConfigStoreController
* @package Thelia\Controller\Admin
* @author Christophe Laffont <claffont@openstudio.fr>
*/
class ConfigStoreController extends BaseAdminController
{
protected function renderTemplate()
{
return $this->render('config-store');
}
public function defaultAction()
{
if (null !== $response = $this->checkAuth(AdminResources::STORE, array(), AccessManager::VIEW)) return $response;
// Hydrate the store configuration form
$configStoreForm = new ConfigStoreForm($this->getRequest(), 'form', array(
'store_name' => ConfigQuery::read("store_name"),
'store_email' => ConfigQuery::read("store_email"),
'store_business_id' => ConfigQuery::read("store_business_id"),
'store_phone' => ConfigQuery::read("store_phone"),
'store_fax' => ConfigQuery::read("store_fax"),
'store_address1' => ConfigQuery::read("store_address1"),
'store_address2' => ConfigQuery::read("store_address2"),
'store_address3' => ConfigQuery::read("store_address3"),
'store_zipcode' => ConfigQuery::read("store_zipcode"),
'store_city' => ConfigQuery::read("store_city"),
'store_country' => ConfigQuery::read("store_country")
));
$this->getParserContext()->addForm($configStoreForm);
return $this->renderTemplate();
}
public function saveAction()
{
if (null !== $response = $this->checkAuth(AdminResources::STORE, array(), AccessManager::UPDATE)) return $response;
$error_msg = false;
$configStoreForm = new ConfigStoreForm($this->getRequest());
try {
$form = $this->validateForm($configStoreForm);
$data = $form->getData();
// Update store
foreach($data as $name => $value) {
if(! in_array($name , array('success_url', 'error_message')))
ConfigQuery::write($name, $value, false);
}
$this->adminLogAppend(AdminResources::STORE, AccessManager::UPDATE, "Store configuration changed");
$this->redirectToRoute('admin.configuration.store.default');
} catch (\Exception $ex) {
$error_msg = $ex->getMessage();
}
$this->setupFormErrorContext(
$this->getTranslator()->trans("Store configuration failed."),
$error_msg,
$configStoreForm,
$ex
);
return $this->renderTemplate();
}
}

2
core/lib/Thelia/Controller/Admin/SystemLogController.php
View File

@@ -121,7 +121,7 @@ class SystemLogController extends BaseAdminController
public function saveAction()
{
if (null !== $response = $this->checkAuth(AdminResources::LANGUAGE, array(), AccessManager::UPDATE)) return $response;
if (null !== $response = $this->checkAuth(AdminResources::SYSTEM_LOG, array(), AccessManager::UPDATE)) return $response;
$error_msg = false;

2
core/lib/Thelia/Core/Security/Resource/AdminResources.php
View File

@@ -100,5 +100,7 @@ final class AdminResources
const SYSTEM_LOG = "admin.configuration.system-log";
const STORE = "admin.configuration.store";
const TRANSLATIONS = "admin.configuration.translations";
}

121
core/lib/Thelia/Form/ConfigStoreForm.php Normal file
View File

@@ -0,0 +1,121 @@
<?php
/*************************************************************************************/
/* */
/* Thelia */
/* */
/* Copyright (c) OpenStudio */
/* email : info@thelia.net */
/* web : http://www.thelia.net */
/* */
/* This program is free software; you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
/* the Free Software Foundation; either version 3 of the License */
/* */
/* This program is distributed in the hope that it will be useful, */
/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
/* GNU General Public License for more details. */
/* */
/* You should have received a copy of the GNU General Public License */
/* along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* */
/*************************************************************************************/
namespace Thelia\Form;
use Symfony\Component\Validator\Constraints;
use Thelia\Model\ConfigQuery;
use Symfony\Component\Validator\ExecutionContextInterface;
use Thelia\Log\Tlog;
use Thelia\Core\Translation\Translator;
class ConfigStoreForm extends BaseForm
{
protected function buildForm()
{
$this->formBuilder
->add("store_name", "text", array(
"label" => Translator::getInstance()->trans('Store name'),
"label_attr" => array(
"for" => "store_name"
)
))
->add("store_email", "text", array(
"label" => Translator::getInstance()->trans('Store email address'),
"label_attr" => array(
"for" => "store_email"
)
))
->add("store_business_id", "text", array(
"label" => Translator::getInstance()->trans('Business ID'),
"label_attr" => array(
"for" => "store_business_id"
)
))
->add("store_phone", "text", array(
"label" => Translator::getInstance()->trans("Phone"),
"label_attr" => array(
"for" => "store_phone"
)
))
->add("store_fax", "text", array(
"label" => Translator::getInstance()->trans("Fax"),
"label_attr" => array(
"for" => "store_fax"
)
))
->add("store_address1", "text", array(
"constraints" => array(
new Constraints\NotBlank()
),
"label_attr" => array(
"for" => "store_address1"
),
"label" => Translator::getInstance()->trans("Street Address ")
))
->add("store_address2", "text", array(
"label" => Translator::getInstance()->trans("Address Line 2"),
"label_attr" => array(
"for" => "store_address2"
)
))
->add("store_address3", "text", array(
"label" => Translator::getInstance()->trans("Address Line 3"),
"label_attr" => array(
"for" => "store_address3"
)
))
->add("store_zipcode", "text", array(
"constraints" => array(
new Constraints\NotBlank()
),
"label" => Translator::getInstance()->trans("Zip code"),
"label_attr" => array(
"for" => "store_zipcode"
)
))
->add("store_city", "text", array(
"constraints" => array(
new Constraints\NotBlank()
),
"label" => Translator::getInstance()->trans("City"),
"label_attr" => array(
"for" => "store_city"
)
))
->add("store_country", "text", array(
"constraints" => array(
new Constraints\NotBlank()
),
"label" => Translator::getInstance()->trans("Country"),
"label_attr" => array(
"for" => "store_country"
)
))
;
}
public function getName()
{
return "thelia_configuration_store";
}
}