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

Replace company_name and contact_email by store_name & store_email

Browse Source
This commit is contained in:
touffies
2013-11-22 17:40:04 +01:00
parent 29ae2d26fe
commit 85d9c112d3
8 changed files with 25 additions and 25 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')

8
install/insert.sql
View File

File diff suppressed because one or more lines are too long

2
local/modules/Front/Controller/ContactController.php
View File

@@ -47,7 +47,7 @@ class ContactController extends BaseFrontController
$message = \Swift_Message::newInstance($form->get('subject')->getData())
->addFrom($form->get('email')->getData(), $form->get('name')->getData())
->addTo(ConfigQuery::read('contact_email'), ConfigQuery::read('company_name'))
->addTo(ConfigQuery::read('store_email'), ConfigQuery::read('store_name'))
->setBody($form->get('message')->getData())
;

18
templates/frontOffice/default/layout.tpl
View File

@@ -1,9 +1,9 @@
{* Declare assets directory, relative to template base directory *}
{declare_assets directory='assets'}
{block name="no-return-functions"}{/block}
{assign var="company_name" value="{config key="company_name"}"}
{if not $company_name}
{assign var="company_name" value="{intl l='Thelia V2'}"}
{assign var="store_name" value="{config key="store_name"}"}
{if not $store_name}
{assign var="store_name" value="{intl l='Thelia V2'}"}
{/if}
<!doctype html>
<!--
@@ -37,14 +37,14 @@ GNU General Public License : http://www.gnu.org/licenses/
<meta charset="utf-8">
{* Page Title *}
<title>{block name="page-title"}{strip}{if $breadcrumbs}{foreach from=$breadcrumbs|array_reverse item=breadcrumb}{$breadcrumb.title} - {/foreach}{/if}{$company_name}{/strip}{/block}</title>
<title>{block name="page-title"}{strip}{if $breadcrumbs}{foreach from=$breadcrumbs|array_reverse item=breadcrumb}{$breadcrumb.title} - {/foreach}{/if}{$store_name}{/strip}{/block}</title>
{* Meta Tags *}
<meta name="generator" content="{intl l='Thelia V2'}">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
{block name="meta"}
<meta name="description" content="{$company_name}">
<meta name="description" content="{$store_name}">
<meta name="robots" content="noindex,nofollow">
{/block}
@@ -86,7 +86,7 @@ GNU General Public License : http://www.gnu.org/licenses/
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{navigate to="index"}">{$company_name}</a>
<a class="navbar-brand" href="{navigate to="index"}">{$store_name}</a>
</div>
<!-- Place everything within .nav-collapse to hide it until above 768px -->
@@ -146,8 +146,8 @@ GNU General Public License : http://www.gnu.org/licenses/
<header class="container" role="banner">
<div class="header">
<h1 class="logo">
<a href="{navigate to="index"}" title="{$company_name}">
{images file='assets/img/logo.gif'}<img src="{$asset_url}" alt="{$company_name}">{/images}
<a href="{navigate to="index"}" title="{$store_name}">
{images file='assets/img/logo.gif'}<img src="{$asset_url}" alt="{$store_name}">{/images}
</a>
</h1>
@@ -356,7 +356,7 @@ GNU General Public License : http://www.gnu.org/licenses/
<section class="block block-contact" itemscope itemtype="http://schema.org/Organization">
<div class="block-heading"><h3 class="block-title">{intl l="Contact Us"}</h3></div>
<div class="block-content">
<meta itemprop="name" content="{$company_name}">
<meta itemprop="name" content="{$store_name}">
<ul>
<li class="contact-address">
<address class="adr" itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">

2
templates/pdf/default/delivery.html
View File

@@ -68,7 +68,7 @@
<div style="text-align: center; padding-bottom: 5mm;">
<h1 style="font-size: 5mm;">
{config key="company_name"}
{config key="store_name"}
<!-- Vous pouvez remplacer #VARIABLE(nomsite) par le nom de votre entreprise -->
</h1>

2
templates/pdf/default/invoice.html
View File

@@ -59,7 +59,7 @@
<td style="width:50%; padding: 0; border: none;" valign="bottom">
<div style="text-align: center; padding-bottom: 10mm;">
<h1>{config key="company_name"}</h1>
<h1>{config key="store_name"}</h1>
<p><!-- Insérer ici l'adresse de votre entreprise --></p>
<h2>{intl l="invoice"} {$INVOICE_REF}</h2>
</div>

4
web/install/config.php
View File

@@ -90,11 +90,11 @@ $_SESSION['install']['step'] = $step;
</div>
<div class="form-group">
<label for="email_contact">Contact email :</label>
<input id="email_contact" class="form-control" type="text" name="email_contact" placeholder="foo@bar.com" value="" required>
<input id="email_contact" class="form-control" type="text" name="store_email" placeholder="foo@bar.com" value="" required>
</div>
<div class="form-group">
<label for="site_name">Company name :</label>
<input id="site_name" class="form-control" type="text" name="company_name" placeholder="" value="" required>
<input id="site_name" class="form-control" type="text" name="store_name" placeholder="" value="" required>
</div>
<div class="form-group">
<label for="site_name">website url :</label>

8
web/install/end.php
View File

@@ -37,12 +37,12 @@ if($_SESSION['install']['step'] == 5) {
\Thelia\Model\ConfigQuery::create()
->filterByName('contact_email')
->update(array('Value' => $_POST['email_contact']));
->filterByName('store_email')
->update(array('Value' => $_POST['store_email']));
\Thelia\Model\ConfigQuery::create()
->filterByName('company_name')
->update(array('Value' => $_POST['company_name']));
->filterByName('store_name')
->update(array('Value' => $_POST['store_name']));
\Thelia\Model\ConfigQuery::create()
->filterByName('url_site')