dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #69 from PrestaEdit/mails

Browse Source 
[+] Project: add the possibility to change the default color (#db3484)
This commit is contained in:
Vincent Augagneur
2012-12-12 06:59:04 -08:00
parent 4cbf8d380f a88b23b16f
commit 6445fea198
151 changed files with 1052 additions and 1028 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Mail.php
+1
View File
@@ -245,6 +245,7 @@ class MailCore
$template_vars['{my_account_url}'] = Context::getContext()->link->getPageLink('my-account', true, Context::getContext()->language->id);
$template_vars['{guest_tracking_url}'] = Context::getContext()->link->getPageLink('guest-tracking', true, Context::getContext()->language->id);
$template_vars['{history_url}'] = Context::getContext()->link->getPageLink('history', true, Context::getContext()->language->id);
$template_vars['{color}'] = Tools::safeOutput(Configuration::get('PS_MAIL_COLOR'));
$swift->attachPlugin(new Swift_Plugin_Decorator(array($to_plugin => $template_vars)), 'decorator');
if ($configuration['PS_MAIL_TYPE'] == Mail::TYPE_BOTH || $configuration['PS_MAIL_TYPE'] == Mail::TYPE_TEXT)
$message->attach(new Swift_Message_Part($template_txt, 'text/plain', '8bit', 'utf-8'));
classes/helper/HelperOptions.php
+3
View File
@@ -90,6 +90,9 @@ class HelperOptionsCore extends Helper
$field['required'] = isset($field['required']) ? $field['required'] : $this->required;
if ($field['type'] == 'color')
$this->context->controller->addJS(_PS_JS_DIR_.'jquery/plugins/jquery.colorpicker.js');
// Cast options values if specified
if ($field['type'] == 'select' && isset($field['cast']))
foreach ($field['list'] as $option_key => $option)