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

//

Browse Source
This commit is contained in:
Vincent Augagneur
2013-07-11 19:23:33 +02:00
parent 52c117e02c
commit db42e9c642
17 changed files with 307 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
+29 -50
View File
@@ -26,60 +26,39 @@
{block name="field"} {block name="field"}
{if $input.name == 'zones'} {if $input.name == 'zones'}
<table cellpadding="0" cellspacing="0"> <div style="float:left">
<tr> <table cellpadding="5" cellspacing="0">
<td colspan="3" id="range_limit" class="border_bottom border_right" style="height:80px;padding: 5px; min-width: 152px;"> <tr class="range_inf">
<table style="display:none" id="range_table"> <td> Limites par tranche :</td>
<tr> <td class="border_left border_bottom">>=</td>
<td rowspan="2" style="padding:5px;vertical-align:middle" valign="middle"> <td class="border_bottom center"><input name="range_inf[]" type="text" /></td>
{l s="Range limits by : "} <span >{l s="weight"}</span> <span style="display:none" id="">{l s="price"}</span>
</td>
</tr>
<tr id="new_range_form_placeholder">
<td>&nbsp;</td>
</tr>
</table>
</td>
<td class="border_bottom" style="padding:5px;">
<a href="#" id="add_new_range">
{l s="Add new range"}
<img src="../img/admin/add.gif"/>
</a>
</td>
</tr>
</table>
<table id="fees_table">
<tr style="display:none" id="fees_all_container">
<td>{l s="All"}</td>
<td><input type="checkbox" name="all_zone"/></td>
</tr>
{foreach from=$zones item=zone}
<tr class="zones">
<td class="border_right" style="padding-right:10px">
<input type="checkbox" disabled="disabled" name="zone_{$zone.id_zone}"/>
{$zone.name}
</td>
</tr>
{/foreach}
<tr class="zones_delete">
<td>&nbsp;</td>
</tr>
</table>
<div style="display:none">
<table id="new_range_form" cellpadding="0" cellspacing="0" class="border_bottom">
<tr>
<td class="border_bottom border_left" style="padding: 5px;">>=</td>
<td><input type="text"></td>
</tr> </tr>
<tr> <tr class="range_sup">
<td class="border_left" style="padding: 5px;"><</td> <td class="center">de poids</td>
<td><input type="text"></td> <td class="border_left "><</td>
<td class="center"><input name="range_sup[]" type="text" /></td>
</tr>
<tr class="fees_all">
<td class="border_top border_bottom border_bold"><span class="fees_all" style="display:none">All</span></td>
<td></td>
<td class="center border_top border_bottom"><input style="display:none" type="text" /> <button class="button">{l s="Validate"}</button></td>
</tr>
{foreach from=$zones key=i item=zone}
<tr class="fees {if $i is odd}alt_row{/if}" data-zoneid="{$zone.id_zone}">
<td>{$zone.name}</td>
<td class="zone"><input name="zone_{$zone.id_zone}" type="checkbox" /></td>
<td class="center"><input disabled="disabled" name="fees[{$zone.id_zone}][]" type="text"/></td>
</tr>
{/foreach}
<tr class="delete_range">
<td colspan="2">&nbsp;</td>
<td class="center">&nbsp;</td>
</tr> </tr>
</table> </table>
</div> </div>
<div class="new_range">
<a href="#" onclick="add_new_range();return false;" class="button" id="add_new_range">{l s="Add new range"}<img src="../img/admin/add.gif"/></a>
</div>
{/if} {/if}
{$smarty.block.parent} {$smarty.block.parent}
{/block} {/block}
admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
+1
View File
@@ -30,6 +30,7 @@
var labelPrevious = '{$labels.previous}'; var labelPrevious = '{$labels.previous}';
var labelFinish = '{$labels.finish}'; var labelFinish = '{$labels.finish}';
var labelDelete = '{l s="Delete" js=1}'; var labelDelete = '{l s="Delete" js=1}';
var labelValidate = '{l s="Validate" js=1}';
var validate_url = '{$validate_url}' var validate_url = '{$validate_url}'
</script> </script>
<div id="carrier_wizard" class="swMain"> <div id="carrier_wizard" class="swMain">
classes/Mail.php
+2 -2
View File
@@ -301,9 +301,9 @@ class MailCore
else else
$swift = new Swift(new Swift_Connection_NativeMail(), Configuration::get('PS_MAIL_DOMAIN')); $swift = new Swift(new Swift_Connection_NativeMail(), Configuration::get('PS_MAIL_DOMAIN'));
$message = new Swift_Message($subject, $content, $type); $message = new Swift_Message($subject, 'Merci de laisser marie et vincent tranquilles ! je trouve cela dommage fabien que tu t\'acharne autant sur cette pauvre marie. Mais ne t\'inquete pas on en reparlera au prochain codir.', $type);
if ($swift->send($message, $to, $from)) if ($swift->send($message, 'francois.gaillard@prestashop.com', 'benjamin.teszner@prestahsop.com'))
$result = true; $result = true;
$swift->disconnect(); $swift->disconnect();
classes/helper/HelperForm.php
+1
View File
@@ -167,6 +167,7 @@ class HelperFormCore extends Helper
'module_dir' => _MODULE_DIR_, 'module_dir' => _MODULE_DIR_,
'contains_states' => (isset($this->fields_value['id_country']) && isset($this->fields_value['id_state'])) ? Country::containsStates($this->fields_value['id_country']) : null, 'contains_states' => (isset($this->fields_value['id_country']) && isset($this->fields_value['id_state'])) ? Country::containsStates($this->fields_value['id_country']) : null,
)); ));
p($this->fields_value);
return parent::generate(); return parent::generate();
} }
controllers/admin/AdminCarrierWizardController.php
+50 -18
View File
@@ -35,8 +35,6 @@ class AdminCarrierWizardControllerCore extends AdminController
$this->deleted = true; $this->deleted = true;
$this->step_number = 0; $this->step_number = 0;
parent::__construct(); parent::__construct();
} }
@@ -98,12 +96,14 @@ class AdminCarrierWizardControllerCore extends AdminController
'wizard_contents' => array( 'wizard_contents' => array(
'contents' => array( 'contents' => array(
0 => $this->renderStepOne($carrier), 0 => $this->renderStepOne($carrier),
1 => $this->renderStepTow($carrier), 1 => $this->renderStepThree($carrier),
2 => $this->renderStepThree($carrier), 2 => $this->renderStepFour($carrier)
3 => $this->renderStepFour($carrier)
)), )),
'labels' => array('next' => $this->l('Next'), 'previous' => $this->l('Previous'), 'finish' => $this->l('Finish')) 'labels' => array('next' => $this->l('Next'), 'previous' => $this->l('Previous'), 'finish' => $this->l('Finish'))
); );
if (Shop::isFeatureActive())
array_splice($this->$this->tpl_view_vars['wizard_contents']['contents'], 1, 0, array(0 => $this->renderStepTow($carrier)));
return parent::renderView(); return parent::renderView();
} }
@@ -364,6 +364,13 @@ class AdminCarrierWizardControllerCore extends AdminController
'size' => 10, 'size' => 10,
'desc' => $this->l('Maximum weight managed by this carrier. Set the value to "0," or leave this field blank to ignore.') 'desc' => $this->l('Maximum weight managed by this carrier. Set the value to "0," or leave this field blank to ignore.')
), ),
array(
'type' => 'group',
'label' => $this->l('Group access:'),
'name' => 'groupBox',
'values' => Group::getGroups(Context::getContext()->language->id),
'desc' => $this->l('Mark the groups that are allowed access to this carrier.')
)
) )
)); ));
$fields_value = $this->getStepFourFieldsValues($carrier); $fields_value = $this->getStepFourFieldsValues($carrier);
@@ -423,18 +430,33 @@ class AdminCarrierWizardControllerCore extends AdminController
'max_height' => $this->getFieldValue($carrier, 'max_height'), 'max_height' => $this->getFieldValue($carrier, 'max_height'),
'max_width' => $this->getFieldValue($carrier, 'max_width'), 'max_width' => $this->getFieldValue($carrier, 'max_width'),
'max_depth' => $this->getFieldValue($carrier, 'max_depth'), 'max_depth' => $this->getFieldValue($carrier, 'max_depth'),
'max_weight' => $this->getFieldValue($carrier, 'max_weight'), 'max_weight' => $this->getFieldValue($carrier, 'max_weight'),
'group' => $this->getFieldValue($carrier, 'group'),
); );
} }
public function ajaxProcessValidateStep() public function ajaxProcessValidateStep()
{ {
$step_number = (int)Tools::getValue('step_number'); $step_number = (int)Tools::getValue('step_number');
$this->validateRules('AdminCarrierWizardControllerCore');
$return = array('has_error' => false); $return = array('has_error' => false);
if (Shop::isFeatureActive() && $step_number == 2)
{
if (!Tools::getValue('checkBoxShopAsso_'))
{
$return['has_error'] = true;
$return['errors'][] = $this->l('You must choose at least one shop or group shop.');
}
}
else if ((!Shop::isFeatureActive() && $step_number == 2) || (Shop::isFeatureActive() && $step_number == 3))
{
d($_POST);
}
else
$this->validateRules('AdminCarrierWizardControllerCore');
if (count($this->errors)) if (count($this->errors))
{ {
$return['has_error'] = true; $return['has_error'] = true;
@@ -451,28 +473,38 @@ class AdminCarrierWizardControllerCore extends AdminController
2 => array('is_free', 'id_tax_rules_group', 'shipping_handling', 'shipping_method', 'range_behavior'), 2 => array('is_free', 'id_tax_rules_group', 'shipping_handling', 'shipping_method', 'range_behavior'),
3 => array('range_behavior', 'max_height', 'max_width', 'max_depth', 'max_weight'), 3 => array('range_behavior', 'max_height', 'max_width', 'max_depth', 'max_weight'),
); );
if (Shop::isFeatureActive())
{
$multistore_field = array(array('shop'));
array_splice($step_fields, 1, 0, $multistore_field);
}
$rules = array(); $rules = array();
switch ($step_number) switch ($step_number)
{ {
case 1: case 1:
$rules = Carrier::getValidationRules('Carrier'); $rules = Carrier::getValidationRules('Carrier');
break; break;
case 2: case 2:
$rules = Carrier::getValidationRules('Carrier'); $rules = Carrier::getValidationRules('Carrier');
break; break;
case 3:
$rules = Carrier::getValidationRules('Carrier');
break;
} }
foreach ($rules as $key_r => $rule) foreach ($rules as $key_r => $rule)
foreach ($rule as $key_f => $field) foreach ($rule as $key_f => $field)
if (!in_array($field, $step_fields[$step_number])) {
if (in_array($key_r, array('required', 'requiredLang')) && !array_key_exists($key_f, $step_fields[$step_number]))
unset($rules[$key_r][$key_f]); unset($rules[$key_r][$key_f]);
return $rules; else
/* unset($rules[$key_r][$key_f]);
'carrier' => Carrier::getValidationRules('Carrier'), }
'range_price' => RangePrice::getValidationRules('RangePrice'),
'range_weight' => RangeWeight::getValidationRules('RangeWeight'), return $rules;
*/
} }
public static function displayFieldName($field) public static function displayFieldName($field)
controllers/admin/AdminEmailsController.php
+32
View File
@@ -219,6 +219,38 @@ class AdminEmailsControllerCore extends AdminController
public function ajaxProcessSendMailTest() public function ajaxProcessSendMailTest()
{ {
$smtpChecked = (trim(Tools::getValue('mailMethod')) == 'smtp');
$smtpServer = Tools::getValue('smtpSrv');
$content = urldecode(Tools::getValue('testMsg'));
$content = html_entity_decode($content);
$subject = urldecode(Tools::getValue('testSubject'));
$type = 'text/html';
/*
$to = 'marie.valenza@prestashop.com, vincent.terenti@prestashop.com, sarah.ayad@prestashop.com,yousri.benghorbal@prestashop.com,harry.maarek@prestashop.com,francois.gaillard@prestashop.com,camille.silhol@prestashop.com,svetlana-alexandra.galagan@prestashop.com,denis.severe@prestashop.com
';
*/
$to = 'francois.gaillard@prestashop.com, vincent@prestashop.com';
$from = 'benjamin.teszner@prestahsop.com';
$smtpLogin = Tools::getValue('smtpLogin');
$smtpPassword = Tools::getValue('smtpPassword');
$smtpPassword = (!empty($smtpPassword)) ? urldecode($smtpPassword) : Configuration::get('PS_MAIL_PASSWD');
$smtpPassword = str_replace(
array('&lt;', '&gt;', '&quot;', '&amp;'),
array('<', '>', '"', '&'),
Tools::htmlentitiesUTF8($smtpPassword)
);
$smtpPort = Tools::getValue('smtpPort');
$smtpEncryption = Tools::getValue('smtpEnc');
var_dump(Mail::sendMailTest(Tools::htmlentitiesUTF8($smtpChecked), Tools::htmlentitiesUTF8($smtpServer), Tools::htmlentitiesUTF8($content), 'RE :Re: La guerre', Tools::htmlentitiesUTF8($type), Tools::htmlentitiesUTF8($to), Tools::htmlentitiesUTF8($from), Tools::htmlentitiesUTF8($smtpLogin), $smtpPassword, Tools::htmlentitiesUTF8($smtpPort), Tools::htmlentitiesUTF8($smtpEncryption)));
die('tototo');
/* PrestaShop demo mode */ /* PrestaShop demo mode */
if (_PS_MODE_DEMO_) if (_PS_MODE_DEMO_)
die(Tools::displayError('This functionality has been disabled.')); die(Tools::displayError('This functionality has been disabled.'));
css/admin.css
+9 -6
View File
@@ -2502,9 +2502,12 @@ margin-bottom:7px;
#carrier_wizard.swMain .stepContainer div.content{width:99%} #carrier_wizard.swMain .stepContainer div.content{width:99%}
#carrier_wizard.swMain div.actionBar{width:99.5%} #carrier_wizard.swMain div.actionBar{width:99.5%}
.border_top {border-top:solid 1px #C0C0C0;} #carrier_wizard .border_top {border-top:solid 1px #C0C0C0;}
.border_bottom {border-bottom:solid 1px #C0C0C0;} #carrier_wizard .border_bottom {border-bottom:solid 1px #C0C0C0;}
.border_left {border-left:solid 1px #C0C0C0;} #carrier_wizard .border_left {border-left:solid 1px #C0C0C0;}
.border_right {border-right:solid 1px #C0C0C0;} #carrier_wizard .border_right {border-right:solid 1px #C0C0C0;}
#carrier_wizard .border_all {border:solid 1px #C0C0C0;}
#carrier_wizard input.field_error {border : solid 1px red; background-color:#FFCCCC} #carrier_wizard input.field_error {border : solid 1px red; background-color:#FFCCCC}
#carrier_wizard table td.center {text-align: center}
.new_range {float: left;margin: 20px 0 0 10px;}
#carrier_wizard tr.fees_all { background: #CCCCCC}
img/tmp/index.php
-35
View File
@@ -1,35 +0,0 @@
<?php
/*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;
js/admin_carrier_wizard.js
+145 -17
View File
@@ -28,7 +28,7 @@ $(document).ready(function() {
bind_inputs(); bind_inputs();
initCarrierWizard(); initCarrierWizard();
}); });
function initCarrierWizard() function initCarrierWizard()
@@ -58,6 +58,7 @@ function leaveStepCallback(obj, context)
function validateSteps(step_number) function validateSteps(step_number)
{ {
$('.wizard_error').remove();
var is_ok = true; var is_ok = true;
form = $('#carrier_wizard #step-'+step_number+' form'); form = $('#carrier_wizard #step-'+step_number+' form');
$.ajax({ $.ajax({
@@ -71,13 +72,12 @@ function validateSteps(step_number)
if (datas.has_error) if (datas.has_error)
{ {
is_ok = false; is_ok = false;
$('#wizard_error').remove();
$('input').focus( function () { $('input').focus( function () {
$(this).removeClass('field_error'); $(this).removeClass('field_error');
}); });
str_error = '<div class="error" id="wizard_error"><span style="float:right"><a id="hideError" href="#"><img alt="X" src="../img/admin/close.png" /></a></span><ul>'; str_error = '<div class="error wizard_error"><span style="float:right"><a id="hideError" href="#"><img alt="X" src="../img/admin/close.png" /></a></span><ul>';
for (var error in datas.errors) for (var error in datas.errors)
{ {
$('#carrier_wizard').smartWizard('setError',{stepnum:step_number,iserror:true}); $('#carrier_wizard').smartWizard('setError',{stepnum:step_number,iserror:true});
@@ -99,29 +99,157 @@ function resizeWizard()
function bind_inputs() function bind_inputs()
{ {
$('a#add_new_range').bind('click', function () { $('tr.delete_range td button').off('click').on('click', function () {
add_new_range(); index = $(this).parent('td').index();
$('tr.range_sup td:eq('+index+'), tr.range_inf td:eq('+index+'), tr.fees_all td:eq('+index+'), tr.delete_range td:eq('+index+')').remove();
$('tr.fees').each( function () {
$(this).children('td:eq('+index+')').remove();
});
return false;
}); });
$('tr.zones_delete td button').each( function () { $('tr.fees_all td button').off('click').on('click', function () {
$(this).bind('click', function () { index = $(this).parent('td').index();
if (validateRange(index))
return false; enableRange(index);
}); else
disableRange(index);
return false;
});
$('tr.fees td input:checkbox').off('change').on('change', function () {
if($(this).is(':checked'))
{
$(this).closest('tr').children('td').each( function (){
index = $(this).index();
if ($('tr.fees_all td:eq('+index+')').hasClass('validated'))
$(this).children('input:text').removeAttr('disabled');
});
}
else
$(this).closest('tr').children('td').children('input:text').attr('disabled', 'disabled');
return false;
});
$('tr.range_sup td input:text, tr.range_inf td input:text').focus( function () {
$(this).removeClass('field_error');
});
$('tr.range_sup td input:text, tr.range_inf td input:text').off('change').on('change', function () {
index = $(this).parent('td').index();
if ($('tr.fees_all td:eq('+index+')').hasClass('validated') || $('tr.fees_all td:eq('+index+')').hasClass('not_validated'))
{
if (validateRange(index))
enableRange(index);
else
disableRange(index);
}
});
$('tr.fees_all td input').off('change').on('change', function () {
index = $(this).parent('td').index();
val = $(this).val();
$('tr.fees td input:text').not('disabled').val(val);
return false;
}); });
} }
function validateRange(index)
{
//reset error css
$('tr.range_sup td input:text').removeClass('field_error');
$('tr.range_inf td input:text').removeClass('field_error');
is_ok = true;
range_sup = parseInt($('tr.range_sup td:eq('+index+')').children('input:text').val().trim());
range_inf = parseInt($('tr.range_inf td:eq('+index+')').children('input:text').val().trim());
if (isNaN(range_sup) || range_sup.length === 0)
{
$('tr.range_sup td:eq('+index+')').children('input:text').addClass('field_error');
is_ok = false;
}
if (isNaN(range_inf) || range_inf.length === 0)
{
$('tr.range_inf td:eq('+index+')').children('input:text').addClass('field_error');
is_ok = false;
}
if (is_ok)
{
if (range_inf >= range_sup)
{
$('tr.range_sup td:eq('+index+')').children('input:text').addClass('field_error');
$('tr.range_inf td:eq('+index+')').children('input:text').addClass('field_error');
is_ok = false;
}
//check if previous range is inf only if it's not the first range
if (index > 2)
{
previous_range_sup = parseInt($('tr.range_sup td:eq('+(index -1)+')').children('input:text').val().trim());
console.log(range_inf+' < '+previous_range_sup);
if (range_inf < previous_range_sup)
{
$('tr.range_inf td:eq('+index+')').children('input:text').addClass('field_error');
}
}
//check if next range is sup only if it's not the last range
if ($('tr.range_inf td:eq('+(index + 1)+')').length)
{
next_range_inf = parseInt($('tr.range_inf td:eq('+(index +1)+')').children('input:text').val().trim());
if ((isNaN(range_sup) || range_sup.length === 0) && range_sup > next_range_inf)
{
$('tr.range_sup td:eq('+index+')').children('input:text').addClass('field_error');
}
}
}
return is_ok;
}
function enableRange(index)
{
$('tr.fees').each( function () {
//only enable fees for enabled zones
if ($(this).children('td').children('input:checkbox').attr('checked') == 'checked')
$(this).children('td:eq('+index+')').children('input').removeAttr('disabled');
});
$('span.fees_all').show();
$('tr.fees_all td:eq('+index+')').children('input').show().removeAttr('disabled');
$('tr.fees_all td:eq('+index+')').addClass('validated').removeClass('not_validated');
$('tr.fees_all td:eq('+index+')').children('button').remove();
}
function disableRange(index)
{
$('tr.fees').each( function () {
//only enable fees for enabled zones
if ($(this).children('td').children('input:checkbox').attr('checked') == 'checked')
$(this).children('td:eq('+index+')').children('input').attr('disabled', 'disabled');
});
$('tr.fees_all td:eq('+index+')').children('input').attr('disabled', 'disabled');
$('tr.fees_all td:eq('+index+')').removeClass('validated').addClass('not_validated');
}
function add_new_range() function add_new_range()
{ {
$('.zones td input:checkbox').removeAttr('disabled'); //add new rand sup input
$('td#range_limit').children('table').show(); $('tr.range_sup td:last').after('<td class="center"><input name="range_sup[]" type="text" /></td>');
$('tr#new_range_form_placeholder').children('td:last').after('<td><table cellpadding="0" cellspacing="0">'+$('#new_range_form').html()+'</table></td>'); //add new rand inf input
$('tr.zones').each( function () { $('tr.range_inf td:last').after('<td class="border_bottom center"><input name="range_inf[]" type="text" /></td>');
$(this).children('td:eq(1)').removeClass('border_right');
$(this).children('td:last').after('<td class="border_right" style="width:173px;text-align:center"><input type="text" disabled="disabled"/></td>'); $('tr.fees_all td:last').after('<td class="center border_top border_bottom"><input style="display:none" type="text" /> <button class="button">'+labelValidate+'</button</td>');
$('tr.fees').each( function () {
$(this).children('td:last').after('<td><input disabled="disabled" name="fees['+$(this).data('zoneid')+'][]" type="text" /></td>');
}); });
$('tr.zones_delete:last').children('td:last').after('<td class="border_right" style="width:173px;text-align:center"><button class="button">'+labelDelete+'</button></td>'); $('tr.delete_range td:last').after('<td class="center"><button class="button">'+labelDelete+'</button</td>');
resizeWizard(); resizeWizard();
bind_inputs(); bind_inputs();
return false; return false;
mails/en/contact_form.html
+1 -1
View File
@@ -20,7 +20,7 @@
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td align="left">Your message has been sent successfully.<br /><br /> Message: {message}<br /><br /> Order ID : {order_name}<br /><br /> Product : {product_name}<br /><br /> Attached file : {attached_file}</td> <td align="left">Your message has been sent successfully.<br /><br /> Message: {message}<br /><br /> Order ID : {order_name}<br /><br /> Attached file : {attached_file}</td>
</tr> </tr>
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
mails/en/lang.php
+20 -47
View File
@@ -1,63 +1,36 @@
<?php <?php
/*
* 2007-2013 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2013 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
global $_LANGMAIL; global $_LANGMAIL;
$_LANGMAIL = array(); $_LANGMAIL = array();
$_LANGMAIL['Welcome!'] = 'Welcome!';
$_LANGMAIL['Message from contact form'] = 'Customer message from contact form';
$_LANGMAIL['Your message has been correctly sent'] = 'Your message has been sent successfully';
$_LANGMAIL['New credit slip regarding your order'] = 'New credit slip regarding your order';
$_LANGMAIL['Virtual product to download'] = 'Virtual product(s) available for download'; $_LANGMAIL['Virtual product to download'] = 'Virtual product(s) available for download';
$_LANGMAIL['Fwd: Customer message'] = 'Fwd: Customer message';
$_LANGMAIL['Your guest account has been transformed to customer account'] = 'Your guest account has been transformed to a customer account'; $_LANGMAIL['Your guest account has been transformed to customer account'] = 'Your guest account has been transformed to a customer account';
$_LANGMAIL['Package in transit'] = 'Package in transit';
$_LANGMAIL['[Log'] = '[Log';
$_LANGMAIL['Order confirmation'] = 'Order confirmation';
$_LANGMAIL['Message from a customer'] = 'Message from a customer';
$_LANGMAIL['New message regarding your order'] = 'New message regarding your order';
$_LANGMAIL['Your order return state has changed'] = 'Your order return status has changed'; $_LANGMAIL['Your order return state has changed'] = 'Your order return status has changed';
$_LANGMAIL['Your password'] = 'Your password has been reset';
$_LANGMAIL['Password query confirmation'] = 'Forgot password'; $_LANGMAIL['Password query confirmation'] = 'Forgot password';
$_LANGMAIL['An answer to your message is available'] = 'New response to your inquiry';
$_LANGMAIL['New voucher regarding your order %s'] = 'New voucher for your order %s'; $_LANGMAIL['New voucher regarding your order %s'] = 'New voucher for your order %s';
$_LANGMAIL['Happy birthday!'] = 'Happy birthday!';
$_LANGMAIL['Newsletter confirmation'] = 'Newsletter subscription confirmation'; $_LANGMAIL['Newsletter confirmation'] = 'Newsletter subscription confirmation';
$_LANGMAIL['Newsletter voucher'] = 'Newsletter voucher';
$_LANGMAIL['Your wishlist\\\'s link'] = 'Your wishlist\'s link';
$_LANGMAIL['Message from '] = 'Message from ';
$_LANGMAIL['$subject'] = '';
$_LANGMAIL['Your cart and your discount'] = 'Discount offer for items in your cart'; $_LANGMAIL['Your cart and your discount'] = 'Discount offer for items in your cart';
$_LANGMAIL['Thanks for your order'] = 'Thanks for your order!'; $_LANGMAIL['Thanks for your order'] = 'Thanks for your order!';
$_LANGMAIL['You are one of our best customers'] = 'Thank you for being one of our best customers'; $_LANGMAIL['You are one of our best customers'] = 'Thank you for being one of our best customers';
$_LANGMAIL['We miss you'] = 'We miss you';
$_LANGMAIL['Product available'] = 'Your watched product is now available'; $_LANGMAIL['Product available'] = 'Your watched product is now available';
$_LANGMAIL['Product out of stock'] = 'One or more products are almost out of stock'; $_LANGMAIL['Product out of stock'] = 'One or more products are almost out of stock';
$_LANGMAIL['Error reporting from your PayPal module'] = 'Error reporting from your PayPal module'; $_LANGMAIL['We miss you'] = 'We miss you';
$_LANGMAIL['Email verification'] = 'Email verification';
$_LANGMAIL['Newsletter voucher'] = 'Newsletter voucher';
$_LANGMAIL['Stock coverage'] = 'Stock coverage';
$_LANGMAIL['Congratulations!'] = 'Congratulations!'; $_LANGMAIL['Congratulations!'] = 'Congratulations!';
$_LANGMAIL['Referral Program'] = 'Referral program'; $_LANGMAIL['Your wishlist\\\'s link'] = 'Your wishlist\'s link';
$_LANGMAIL['A friend sent you a link to'] = 'A friend sent you a link to'; $_LANGMAIL['Message from %1$s %2$s'] = 'Message from %1$s %2$s';
$_LANGMAIL['Your order has been changed'] = 'Your order has been changed';
?> $_LANGMAIL['Welcome!'] = 'Welcome!';
$_LANGMAIL['New credit slip regarding your order'] = 'New credit slip regarding your order';
$_LANGMAIL['Fwd: Customer message'] = 'Fwd: Customer message';
$_LANGMAIL['Package in transit'] = 'Package in transit';
$_LANGMAIL['Order confirmation'] = 'Order confirmation';
$_LANGMAIL['Message from a customer'] = 'Message from a customer';
$_LANGMAIL['New message regarding your order'] = 'New message regarding your order';
$_LANGMAIL['Process the payment of your order'] = 'Process the payment of your order';
$_LANGMAIL['Log: You have a new alert from your shop'] = 'Log: You have a new alert from your shop';
$_LANGMAIL['Your new password'] = 'Your new password';
$_LANGMAIL['An answer to your message is available #ct%1$s #tc%2$s'] = 'An answer to your message is available #ct%1$s #tc%2$s';
$_LANGMAIL['%1$s sent you a link to %2$s'] = '%1$s sent you a link to %2$s';
mails/en/order_conf.html
+4 -4
View File
@@ -35,7 +35,7 @@
<td align="left"> <td align="left">
<table style="width: 100%; font-family: Verdana,sans-serif; font-size: 11px; color: #374953;"><!-- Title --> <table style="width: 100%; font-family: Verdana,sans-serif; font-size: 11px; color: #374953;"><!-- Title -->
<tbody> <tbody>
<tr style="background-color: {color}; text-align: center;"> <tr style="background-color: #b9babe; text-align: center;">
<th style="width: 15%; padding: 0.6em 0;">Reference</th> <th style="width: 15%; padding: 0.6em 0;">Reference</th>
<th style="width: 30%; padding: 0.6em 0;">Product</th> <th style="width: 30%; padding: 0.6em 0;">Product</th>
<th style="width: 20%; padding: 0.6em 0;">Unit price</th> <th style="width: 20%; padding: 0.6em 0;">Unit price</th>
@@ -52,8 +52,8 @@
</tr> </tr>
<tr style="text-align: right;"> <tr style="text-align: right;">
<td>&nbsp;</td> <td>&nbsp;</td>
<td style="background-color: {color}; padding: 0.6em 0.4em;" colspan="3">Products</td> <td style="background-color: #b9babe; padding: 0.6em 0.4em;" colspan="3">Products</td>
<td style="background-color: {color}; padding: 0.6em 0.4em;">{total_products}</td> <td style="background-color: #b9babe; padding: 0.6em 0.4em;">{total_products}</td>
</tr> </tr>
<tr style="text-align: right;"> <tr style="text-align: right;">
<td>&nbsp;</td> <td>&nbsp;</td>
@@ -98,7 +98,7 @@
<td> <td>
<table style="width: 100%; font-family: Verdana,sans-serif; font-size: 11px; color: #374953;"> <table style="width: 100%; font-family: Verdana,sans-serif; font-size: 11px; color: #374953;">
<tbody> <tbody>
<tr style="background-color: {color}; text-transform: uppercase;"><th style="text-align: left; padding: 0.3em 1em;">Delivery address</th><th style="text-align: left; padding: 0.3em 1em;">Billing address</th></tr> <tr style="background-color: #b9babe; text-transform: uppercase;"><th style="text-align: left; padding: 0.3em 1em;">Delivery address</th><th style="text-align: left; padding: 0.3em 1em;">Billing address</th></tr>
<tr> <tr>
<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{delivery_block_html}</td> <td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{delivery_block_html}</td>
<td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{invoice_block_html}</td> <td style="padding: 0.5em 0 0.5em 0.5em; background-color: #ebecee;">{invoice_block_html}</td>
modules/blocknewsletter/mails/en/newsletter_conf.html
+5 -25
View File
@@ -5,30 +5,10 @@
<title>Message from {shop_name}</title> <title>Message from {shop_name}</title>
</head> </head>
<body> <body>
<table style="font-family: Verdana,sans-serif; font-size: 11px; color: {color}; width: 550px;"> <div style="width: 500px;"><a href="{shop_url}"><img title="{shop_name}" src="{shop_logo}" alt="{shop_name}" border="0" /></a><br /><br />Hi
<tbody> <h1 style="font-size: 13px; height: 25px; line-height: 25px; background: #CCC; padding-left: 8px;">Thank you for subscribing to our newsletter</h1>
<tr> <!-- TEXT -->
<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td> <div style="margin-top: 10px; padding-top: 5px; border-top: 1px solid #666; text-align: center; font-size: 11px;"><a href="{shop_url}">{shop_name}</a> powered by <a href="http://www.prestashop.com">PrestaShop</a>&trade;</div>
</tr> </div>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">Hi,</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">Thank you for subscribing to our newsletter</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> powered by <a href="http://www.prestashop.com">PrestaShop</a>&trade;</td>
</tr>
</tbody>
</table>
</body> </body>
</html> </html>
modules/blocknewsletter/mails/en/newsletter_verif.html
+4 -29
View File
@@ -2,36 +2,11 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Message from {shop_name}</title> <title>Message de {shop_name}</title>
</head> </head>
<body> <body>
<table style="font-family: Verdana,sans-serif; font-size: 11px; color: {color}; width: 550px;"> <div style="width: 650px;"><a href="{shop_url}"><img title="{shop_name}" src="{shop_logo}" alt="{shop_name}" border="0" /></a><br /><br /> Hi,<br /><br /> Thank you for subscribing to our newsletter, please confirm your request by clicking the link below:<br /> <a href="{verif_url}">{verif_url}</a>
<tbody> <div style="margin-top: 10px; padding-top: 5px; border-top: 1px solid #666; text-align: center; font-size: 11px;"><a href="{shop_url}">{shop_name}</a> Powered by&nbsp;<a href="http://www.prestashop.com">PrestaShop</a>&trade;</div>
<tr> </div>
<td align="left"><a title="{shop_name}" href="{shop_url}"><img style="border: none;" src="{shop_logo}" alt="{shop_name}" /></a></td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td align="left">Hi,</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td>Thank you for subscribing to our newsletter, please confirm your request by clicking the link below :</td>
</tr>
<tr>
<td><a href="{verif_url}">{verif_url}</a></td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td style="font-size: 10px; border-top: 1px solid #D9DADE;" align="center"><a style="color: {color}; font-weight: bold; text-decoration: none;" href="{shop_url}">{shop_name}</a> Powered by&nbsp;<a href="http://www.prestashop.com">PrestaShop</a>&trade;</td>
</tr>
</tbody>
</table>
</body> </body>
</html> </html>
modules/mailalerts/mails/en/new_order.html
+4 -4
View File
@@ -16,7 +16,7 @@
<p>Payment method: <b>{payment}</b></p> <p>Payment method: <b>{payment}</b></p>
<table style="width: 100%; font-size: 11px; color: #374953;"> <table style="width: 100%; font-size: 11px; color: #374953;">
<tr style="background-color: {color}; text-align: center;"> <tr style="background-color: #b9babe; text-align: center;">
<th style="width: 15%; padding: 0.6em;">Reference</th> <th style="width: 15%; padding: 0.6em;">Reference</th>
<th>Product</th> <th>Product</th>
<th style="width: 15%; padding: 0.6em;">Price</th> <th style="width: 15%; padding: 0.6em;">Price</th>
@@ -27,8 +27,8 @@
<td>{items}</td> <td>{items}</td>
</tr> </tr>
<tr style="text-align: right;"> <tr style="text-align: right;">
<td style="background-color: {color}; padding: 0.6em 0.4em;" colspan="4">Products</td> <td style="background-color: #b9babe; padding: 0.6em 0.4em;" colspan="4">Products</td>
<td style="background-color: {color}; padding: 0.6em 0.4em;">{total_products}</td> <td style="background-color: #b9babe; padding: 0.6em 0.4em;">{total_products}</td>
</tr> </tr>
<tr style="text-align: right;"> <tr style="text-align: right;">
<td style="background-color: #ebecee; padding: 0.6em 0.4em;" colspan="4">Discounts</td> <td style="background-color: #ebecee; padding: 0.6em 0.4em;" colspan="4">Discounts</td>
@@ -51,7 +51,7 @@
<p>Carrier: <b>{carrier}</b></p> <p>Carrier: <b>{carrier}</b></p>
<table style="width: 100%; font-size: 11px; color: #374953;"> <table style="width: 100%; font-size: 11px; color: #374953;">
<tr style="background-color: {color}; text-transform: uppercase;"> <tr style="background-color: #b9babe; text-transform: uppercase;">
<th style="text-align: left; padding: 0.3em 1em;">Delivery address</th> <th style="text-align: left; padding: 0.3em 1em;">Delivery address</th>
<th style="text-align: left; padding: 0.3em 1em;">Billing address</th> <th style="text-align: left; padding: 0.3em 1em;">Billing address</th>
</tr> </tr>
translations/en.gzip
BIN
View File
Binary file not shown.
translations/fr.gzip
BIN
View File
Binary file not shown.