// Merge -> revision 9288

This commit is contained in:
rMalie
2011-10-12 16:04:28 +00:00
parent a6f2eb5639
commit a07c14fafd
32 changed files with 1529 additions and 633 deletions
+1 -1
View File
@@ -463,7 +463,7 @@ class AdminImages extends AdminTab
'<br /><br /><div class="hint clear" style="display: block;">&nbsp;'.
$this->l('After moving all of your product images, for best performance go to the ').
'<a style="text-decoration:underline" href="index.php?tab=AdminPPreferences&token='.Tools::getAdminTokenLite('AdminPPreferences').'#PS_LEGACY_IMAGES_on">'.$this->l('product preferences tab').'</a>'.
$this->l(' and set "Activate legacy images compatibility" to NO.').'
$this->l(' and set "Use the legacy image filesystem" to NO.').'
</div>
<center><input type="Submit" name="submitMoveImages'.$this->table.'" value="'.$this->l('Move images').'" class="button space" onclick="return confirm(\''.$this->l('Are you sure?', __CLASS__, true, false).'\');" /></center>
</fieldset>
+7 -6
View File
@@ -618,13 +618,14 @@ class FrontControllerCore extends Controller
$stop = (int)($pages_nb);
$this->context->smarty->assign('nb_products', $nbProducts);
$pagination_infos = array(
'pages_nb' => (int)($pages_nb),
'p' => (int)($this->p),
'n' => (int)($this->n),
'products_per_page' => (int)Configuration::get('PS_PRODUCTS_PER_PAGE'),
'pages_nb' => $pages_nb,
'p' => $this->p,
'n' => $this->n,
'nArray' => $nArray,
'range' => (int)($range),
'start' => (int)($start),
'stop' => (int)($stop),
'range' => $range,
'start' => $start,
'stop' => $stop,
'current_url' => $current_url
);
$this->context->smarty->assign($pagination_infos);
+3 -3
View File
@@ -377,7 +377,7 @@ class OrderCore extends ObjectModel
if (!$id_order_state)
$id_order_state = 0;
if (!isset(self::$_historyCache[$id_order_state]) OR $no_hidden)
if (!isset(self::$_historyCache[$this->id.'_'.$id_order_state]) OR $no_hidden)
{
$id_lang = $id_lang ? (int)($id_lang) : 'o.`id_lang`';
$result = Db::getInstance()->executeS('
@@ -393,9 +393,9 @@ class OrderCore extends ObjectModel
ORDER BY oh.date_add DESC, oh.id_order_history DESC');
if ($no_hidden)
return $result;
self::$_historyCache[$id_order_state] = $result;
self::$_historyCache[$this->id.'_'.$id_order_state] = $result;
}
return self::$_historyCache[$id_order_state];
return self::$_historyCache[$this->id.'_'.$id_order_state];
}
public function getProductsDetail()
+8
View File
@@ -992,6 +992,9 @@ if ($lm->getIncludeTradFilename())
<td id="endEmail" class="resultEnd">&nbsp;</td>
</tr>
</table>
<h3 class="infosBlock"><?php echo lang('WARNING: For more security, you must delete the \'install\' folder.'); ?></h3>
<div id="boBlock" class="blockInfoEnd clearfix">
<img src="img/visu_boBlock.png" />
<h3><?php echo lang('Back Office'); ?></h3>
@@ -1323,6 +1326,11 @@ if ($lm->getIncludeTradFilename())
}
?>
<div class="infosBlock">
<?php echo lang('WARNING: For more security, you must delete the \'install\' folder.'); ?>
</div>
<div id="foBlock" class="blockInfoEnd clearfix">
<img src="img/visu_foBlock.png" />
<h3><?php echo lang('Front Office'); ?></h3>
+1
View File
@@ -140,6 +140,7 @@ $_LANG['Update is complete!'] = 'Aktualisierung beendet!';
$_LANG['Upgrade: get the latest stable version!'] = 'Aktualisierung: Installieren Sie die neueste Version von PrestaShop';
$_LANG['Verify now!'] = 'Testen der SQL-Verbindung';
$_LANG['Verify system compatibility'] = 'Systemkompatibilit√§t';
$_LANG['WARNING: For more security, you must delete the \'install\' folder.'] = 'VORSICHT: Aus Sicherheitsgründen löschen Sie bitte den Ordner \'/install\'.';
$_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Vorsicht: eine manuelle Sicherung ist UNERLÄSSLICH, bevor mit der Aktualisierung der PrestaShop-Anwendung begonnen wird, um jeglichen versehentlichen Datenverlust zu verhindern';
$_LANG['Welcome'] = 'Willkommen';
$_LANG['Welcome to the PrestaShop %s Installer'] = 'Willkommen bei der Installation von PrestaShop %s';
+1
View File
@@ -138,6 +138,7 @@ $_LANG['Update is complete!'] = '¬°Actualización completa!';
$_LANG['Upgrade: get the latest stable version!'] = 'Actualización: instale la última versión de PrestaShop';
$_LANG['Verify now!'] = '¬°Pruebe ahora!';
$_LANG['Verify system compatibility'] = 'Compatibilidad sistema';
$_LANG['WARNING: For more security, you must delete the \'install\' folder.'] = 'ATENCION : para más seguridad, por favor suprima la carpeta \'/install\'.';
$_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = '¬°Atención: se recomienda hacer una copia de seguridad manual antes de continuar!';
$_LANG['Welcome'] = 'Bienvenido';
$_LANG['Welcome to the PrestaShop %s Installer'] = 'Bienvenido a la instalación de PrestaShop %s';
+1
View File
@@ -141,6 +141,7 @@ $_LANG['Update is complete!'] = 'Mise à jour terminée !';
$_LANG['Upgrade: get the latest stable version!'] = 'Mise à jour : installez la dernière version de PrestaShop';
$_LANG['Verify now!'] = 'Tester la connexion';
$_LANG['Verify system compatibility'] = 'Compatibilité système';
$_LANG['WARNING: For more security, you must delete the \'install\' folder.'] = 'ATTENTION : pour plus de sécurité, merci de supprimer le dossier \'/install\'.';
$_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Attention : une sauvegarde manuelle est INDISPENSABLE avant de procéder à la mise à jour de l\'application PrestaShop, cela afin de prévenir toute perte de données accidentelle';
$_LANG['Welcome'] = 'Bienvenue';
$_LANG['Welcome to the PrestaShop %s Installer'] = 'Bienvenue dans l\'installation de PrestaShop %s';
+1
View File
@@ -140,6 +140,7 @@ $_LANG['Update is complete!'] = 'Aggiornamento terminato!';
$_LANG['Upgrade: get the latest stable version!'] = 'Aggiornamento installa l\'ultima versione di PrestaShop';
$_LANG['Verify now!'] = 'Prova la connessione SQL';
$_LANG['Verify system compatibility'] = 'Compatibilità sistema';
$_LANG['WARNING: For more security, you must delete the \'install\' folder.'] = 'ATTENZIONE: per motivi di sicurezza, adesso devi cancellare la cartella \'install\'.';
$_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'Attenzione: E\' FONDAMENTALE un backup manuale prima di continuare l\'aggiornamento dell\'applicazione Prestashop, al fine di evitare la perdita accidentale di dati.';
$_LANG['Welcome'] = 'Benvenuto';
$_LANG['Welcome to the PrestaShop %s Installer'] = 'Benvenuto nell\'installazione di PrestaShop %s';
+1
View File
@@ -64,6 +64,7 @@ $_LANG['This is not a valid image file.'] = 'Invalid image file';
$_LANG['Too long!'] = 'Too long';
$_LANG['Upgrade: get the latest stable version!'] = 'Update: Get the latest stable version';
$_LANG['Verify system compatibility'] = 'System Compatibility';
$_LANG['WARNING: For more security, you must delete the \'install\' folder.'] = 'WARNING: For more security, you must delete the \'install\'.';
$_LANG['Warning: a manual backup is HIGHLY recommended before continuing!'] = 'WARNING! A manual backup is HIGHLY recommended before continuing.';
$_LANG['Welcome'] = 'Welcome!';
$_LANG['Welcome to the PrestaShop '.INSTALL_VERSION.' Installer.'] = 'Welcome to the PrestaShop™ v'.INSTALL_VERSION.' Installer wizard.';
+4 -4
View File
@@ -48,8 +48,8 @@ if (file_exists(INSTALL_PATH.'/../config/settings.inc.php'))
// setting the memory limit to 128M only if current is lower
$memory_limit = ini_get('memory_limit');
if ( substr($memory_limit,-1) != 'G'
AND ((substr($memory_limit,-1) == 'M' AND substr($memory_limit,0,-1) < 128)
if ( substr($memory_limit,-1) != 'G'
AND ((substr($memory_limit,-1) == 'M' AND substr($memory_limit,0,-1) < 128)
OR is_numeric($memory_limit) AND (intval($memory_limit) < 131072))
){
@ini_set('memory_limit','128M');
@@ -108,9 +108,9 @@ if (isset($_GET['method']))
case 'doUpgrade' :
require_once('xml/doUpgrade.php');
break;
case 'getVersionFromDb' :
require_once('xml/getVersionFromDb.php');
break;
}
}
}
+3 -3
View File
@@ -243,12 +243,12 @@ class AdminSelfUpgrade extends AdminSelfTab
$this->_fieldsAutoUpgrade['PS_AUTOUP_KEEP_TRAD'] = array(
'title' => $this->l('Keep translations'), 'cast' => 'intval', 'validation' => 'isBool',
'type' => 'bool', 'desc'=>$this->l('If set too yes, you will keep all your translations'),
'type' => 'bool', 'desc'=>$this->l('If set to yes, you will keep all your translations'),
);
$this->_fieldsAutoUpgrade['PS_AUTOUP_CUSTOM_MOD_DESACT'] = array(
'title' => $this->l('Desactivate custom modules'), 'cast' => 'intval', 'validation' => 'isBool',
'type' => 'bool', 'desc'=>$this->l('If you don\'t desactivate your modules, you can have some compatibility problem and the Modules page might not load correctly.'),
'title' => $this->l('Deactivate custom modules'), 'cast' => 'intval', 'validation' => 'isBool',
'type' => 'bool', 'desc'=>$this->l('If you don\'t deactivate your modules, you can have some compatibility problems and the Modules page might not load correctly.'),
);
// allow manual mode only for dev
if (defined('_PS_MODE_DEV_') AND _PS_MODE_DEV_)
+88 -338
View File
@@ -1,6 +1,4 @@
<?php
if(!defined('_PS_DISPLAY_COMPATIBILITY_WARNING_'))
define('_PS_DISPLAY_COMPATIBILITY_WARNING_',false);
/*
* 2007-2011 PrestaShop
*
@@ -26,9 +24,14 @@ if(!defined('_PS_DISPLAY_COMPATIBILITY_WARNING_'))
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
if (!defined('_PS_DISPLAY_COMPATIBILITY_WARNING_'))
define('_PS_DISPLAY_COMPATIBILITY_WARNING_', false);
if(!class_exists('Tools14',false))
{
class Tools14Core
class Tools14
{
protected static $file_exists_cache = array();
protected static $_forceCompile;
@@ -62,7 +65,10 @@ class Tools14Core
if (strpos($url, $baseUri) !== FALSE && strpos($url, $baseUri) == 0)
$url = substr($url, strlen($baseUri));
$explode = explode('?', $url, 2);
$url = $link->getPageLink($explode[0], true);
// don't use ssl if url is home page
// used when logout for example
$useSSL = !empty($url);
$url = $link->getPageLink($explode[0], $useSSL);
if (isset($explode[1]))
$url .= '?'.$explode[1];
$baseUri = '';
@@ -213,7 +219,13 @@ class Tools14Core
*/
public static function usingSecureMode()
{
return !(empty($_SERVER['HTTPS']) OR strtolower($_SERVER['HTTPS']) == 'off');
if (isset($_SERVER['HTTPS']))
return ($_SERVER['HTTPS'] == 1 || strtolower($_SERVER['HTTPS']) == 'on');
// $_SERVER['SSL'] exists only in some specific configuration
if (isset($_SERVER['SSL']))
return ($_SERVER['SSL'] == 1 || strtolower($_SERVER['SSL']) == 'on');
return false;
}
/**
@@ -466,18 +478,13 @@ class Tools14Core
*/
public static function displayDate($date, $id_lang, $full = false, $separator = '-')
{
if (!$date OR !strtotime($date))
if (!$date OR !($time = strtotime($date)))
return $date;
if (!Validate::isDate($date) OR !Validate::isBool($full))
die (self::displayError('Invalid date'));
$tmpTab = explode($separator, substr($date, 0, 10));
$hour = ' '.substr($date, -8);
$language = Language::getLanguage((int)($id_lang));
if ($language AND strtolower($language['iso_code']) == 'fr')
return ($tmpTab[2].'-'.$tmpTab[1].'-'.$tmpTab[0].($full ? $hour : ''));
else
return ($tmpTab[0].'-'.$tmpTab[1].'-'.$tmpTab[2].($full ? $hour : ''));
$language = Language::getLanguage((int)$id_lang);
return date($full ? $language['date_format_full'] : $language['date_format_lite'], $time);
}
/**
@@ -490,8 +497,8 @@ class Tools14Core
public static function safeOutput($string, $html = false)
{
if (!$html)
$string = @htmlentities(strip_tags($string), ENT_QUOTES, 'utf-8');
return $string;
$string = strip_tags($string);
return @Tools::htmlentitiesUTF8($string, ENT_QUOTES);;
}
public static function htmlentitiesUTF8($string, $type = ENT_QUOTES)
@@ -537,7 +544,8 @@ class Tools14Core
/**
* Display an error according to an error code
*
* @param integer $code Error code
* @param string $string Error message
* @param boolean $htmlentities By default at true for parsing error message with htmlentities
*/
public static function displayError($string = 'Fatal error', $htmlentities = true)
{
@@ -636,6 +644,7 @@ class Tools14Core
/* Categories specifics meta tags */
elseif ($id_category = self::getValue('id_category'))
{
$page_number = (int)self::getValue('p');
$row = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
SELECT `name`, `meta_title`, `meta_description`, `meta_keywords`, `description`
FROM `'._DB_PREFIX_.'category_lang`
@@ -644,6 +653,13 @@ class Tools14Core
{
if (empty($row['meta_description']))
$row['meta_description'] = strip_tags($row['description']);
// Paginate title
if (!empty($row['meta_title']))
$row['meta_title'] = $row['meta_title'].(!empty($page_number) ? ' ('.$page_number.')' : '').' - '.Configuration::get('PS_SHOP_NAME');
else
$row['meta_title'] = $row['name'].(!empty($page_number) ? ' ('.$page_number.')' : '').' - '.Configuration::get('PS_SHOP_NAME');
return self::completeMetaTags($row, $row['name']);
}
}
@@ -651,6 +667,7 @@ class Tools14Core
/* Manufacturers specifics meta tags */
elseif ($id_manufacturer = self::getValue('id_manufacturer'))
{
$page_number = (int)self::getValue('p');
$row = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
SELECT `name`, `meta_title`, `meta_description`, `meta_keywords`
FROM `'._DB_PREFIX_.'manufacturer_lang` ml
@@ -660,9 +677,9 @@ class Tools14Core
{
if (empty($row['meta_description']))
$row['meta_description'] = strip_tags($row['meta_description']);
if (!empty($row['meta_title']))
$row['meta_title'] = $row['meta_title'].' - '.Configuration::get('PS_SHOP_NAME');
return self::completeMetaTags($row, $row['name']);
$row['meta_title'] .= $row['name'] . (!empty($page_number) ? ' ('.$page_number.')' : '');
$row['meta_title'] .= ' - '.Configuration::get('PS_SHOP_NAME');
return self::completeMetaTags($row, $row['meta_title']);
}
}
@@ -739,11 +756,11 @@ class Tools14Core
{
global $cookie;
if ($metaTags['meta_title'] == NULL)
if (empty($metaTags['meta_title']))
$metaTags['meta_title'] = $defaultValue.' - '.Configuration::get('PS_SHOP_NAME');
if ($metaTags['meta_description'] == NULL)
if (empty($metaTags['meta_description']))
$metaTags['meta_description'] = Configuration::get('PS_META_DESCRIPTION', (int)($cookie->id_lang)) ? Configuration::get('PS_META_DESCRIPTION', (int)($cookie->id_lang)) : '';
if ($metaTags['meta_keywords'] == NULL)
if (empty($metaTags['meta_keywords']))
$metaTags['meta_keywords'] = Configuration::get('PS_META_KEYWORDS', (int)($cookie->id_lang)) ? Configuration::get('PS_META_KEYWORDS', (int)($cookie->id_lang)) : '';
return $metaTags;
}
@@ -957,6 +974,29 @@ class Tools14Core
$str = mb_strtolower($str, 'utf-8');
$str = trim($str);
$str = self::replaceAccentedChars($str);
// Remove all non-whitelist chars.
$str = preg_replace('/[^a-zA-Z0-9\s\'\:\/\[\]-]/','', $str);
$str = preg_replace('/[\s\'\:\/\[\]-]+/',' ', $str);
$str = preg_replace('/[ ]/','-', $str);
$str = preg_replace('/[\/]/','-', $str);
// If it was not possible to lowercase the string with mb_strtolower, we do it after the transformations.
// This way we lose fewer special chars.
$str = strtolower($str);
return $str;
}
/**
* Replace all accented chars by their equivalent non accented chars.
*
* @param string $str
* @return string
*/
public static function replaceAccentedChars($str)
{
$str = preg_replace('/[\x{0105}\x{0104}\x{00E0}\x{00E1}\x{00E2}\x{00E3}\x{00E4}\x{00E5}]/u','a', $str);
$str = preg_replace('/[\x{00E7}\x{010D}\x{0107}\x{0106}]/u','c', $str);
$str = preg_replace('/[\x{010F}]/u','d', $str);
@@ -974,17 +1014,6 @@ class Tools14Core
$str = preg_replace('/[\x{017C}\x{017A}\x{017B}\x{0179}\x{017E}]/u','z', $str);
$str = preg_replace('/[\x{00E6}]/u','ae', $str);
$str = preg_replace('/[\x{0153}]/u','oe', $str);
// Remove all non-whitelist chars.
$str = preg_replace('/[^a-zA-Z0-9\s\'\:\/\[\]-]/','', $str);
$str = preg_replace('/[\s\'\:\/\[\]-]+/',' ', $str);
$str = preg_replace('/[ ]/','-', $str);
$str = preg_replace('/[\/]/','-', $str);
// If it was not possible to lowercase the string with mb_strtolower, we do it after the transformations.
// This way we lose fewer special chars.
$str = strtolower($str);
return $str;
}
@@ -1228,15 +1257,20 @@ class Tools14Core
return self::$file_exists_cache[$filename];
}
public static function file_get_contents($url, $useIncludePath = false, $streamContext = NULL)
public static function file_get_contents($url, $useIncludePath = false, $streamContext = NULL, $curlTimeOut = 5)
{
if ($streamContext == NULL)
$streamContext = @stream_context_create(array('http' => array('timeout' => 5)));
if (in_array(ini_get('allow_url_fopen'), array('On', 'on', '1')))
return file_get_contents($url, $useIncludePath, $streamContext);
elseif (function_exists('curl_init'))
return @file_get_contents($url, $useIncludePath, $streamContext);
elseif (function_exists('curl_init') && in_array(ini_get('allow_url_fopen'), array('On', 'on', '1')))
{
$curl = curl_init();
curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($curl, CURLOPT_URL, $url);
curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, $curlTimeOut);
curl_setopt($curl, CURLOPT_TIMEOUT, $curlTimeOut);
$content = curl_exec($curl);
curl_close($curl);
return $content;
@@ -1248,11 +1282,7 @@ class Tools14Core
public static function simplexml_load_file($url, $class_name = null)
{
if (in_array(ini_get('allow_url_fopen'), array('On', 'on', '1')))
return simplexml_load_file($url, $class_name);
elseif (function_exists('curl_init'))
{
return simplexml_load_string(Tools::file_get_contents($url), $class_name);
}
else
return false;
}
@@ -1721,18 +1751,12 @@ class Tools14Core
$tab['RewriteRule']['content']['^c/([0-9]+)(\-[_a-zA-Z0-9-]*)/[_a-zA-Z0-9-]*\.jpg$'] = 'img/c/$1$2.jpg [L]';
$tab['RewriteRule']['content']['^c/([a-zA-Z-]+)/[a-zA-Z0-9-]+\.jpg$'] = 'img/c/$1.jpg [L]';
$tab['RewriteRule']['content']['^([0-9]+)\-[a-zA-Z0-9-]*\.html'] = 'product.php?id_product=$1 [QSA,L]';
$tab['RewriteRule']['content']['^([0-9]+)\-[a-zA-Z0-9-]*'] = 'category.php?id_category=$1 [QSA,L]';
$tab['RewriteRule']['content']['^[a-zA-Z0-9-]*/([0-9]+)\-[a-zA-Z0-9-]*\.html'] = 'product.php?id_product=$1 [QSA,L]';
$tab['RewriteRule']['content']['^([0-9]+)__([a-zA-Z0-9-]*)'] = 'supplier.php?id_supplier=$1 [QSA,L]';
$tab['RewriteRule']['content']['^([0-9]+)_([a-zA-Z0-9-]*)'] = 'manufacturer.php?id_manufacturer=$1 [QSA,L]';
$tab['RewriteRule']['content']['^content/([0-9]+)\-([a-zA-Z0-9-]*)'] = 'cms.php?id_cms=$1 [QSA,L]';
$tab['RewriteRule']['content']['^content/category/([0-9]+)\-([a-zA-Z0-9-]*)'] = 'cms.php?id_cms_category=$1 [QSA,L]';
if ($multilang)
{
$tab['RewriteRule']['content']['^([a-z]{2})/[a-zA-Z0-9-]*/([0-9]+)\-[a-zA-Z0-9-]*\.html'] = 'product.php?id_product=$2&isolang=$1 [QSA,L]';
$tab['RewriteRule']['content']['^([a-z]{2})/([0-9]+)\-[a-zA-Z0-9-]*\.html'] = 'product.php?id_product=$2&isolang=$1 [QSA,L]';
$tab['RewriteRule']['content']['^([a-z]{2})/([0-9]+)\-[a-zA-Z0-9-]*(/[a-zA-Z0-9-]*)+'] = 'category.php?id_category=$2&isolang=$1&noredirect=1 [QSA,L]';
$tab['RewriteRule']['content']['^([a-z]{2})/([0-9]+)\-[a-zA-Z0-9-]*'] = 'category.php?id_category=$2&isolang=$1 [QSA,L]';
$tab['RewriteRule']['content']['^([a-z]{2})/content/([0-9]+)\-[a-zA-Z0-9-]*'] = 'cms.php?isolang=$1&id_cms=$2 [QSA,L]';
$tab['RewriteRule']['content']['^([a-z]{2})/content/category/([0-9]+)\-[a-zA-Z0-9-]*'] = 'cms.php?isolang=$1&id_cms_category=$2 [QSA,L]';
@@ -1745,6 +1769,9 @@ class Tools14Core
$tab['RewriteRule']['content']['^([0-9]+)\-[a-zA-Z0-9-]*\.html'] = 'product.php?id_product=$1 [QSA,L]';
$tab['RewriteRule']['content']['^[a-zA-Z0-9-]*/([0-9]+)\-[a-zA-Z0-9-]*\.html'] = 'product.php?id_product=$1 [QSA,L]';
// Notice : the id_category rule has to be after product rules.
// If not, category with number in their name will result a bug
$tab['RewriteRule']['content']['^([0-9]+)\-[a-zA-Z0-9-]*(/[a-zA-Z0-9-]*)+'] = 'category.php?id_category=$1&noredirect=1 [QSA,L]';
$tab['RewriteRule']['content']['^([0-9]+)\-[a-zA-Z0-9-]*'] = 'category.php?id_category=$1 [QSA,L]';
$tab['RewriteRule']['content']['^([0-9]+)__([a-zA-Z0-9-]*)'] = 'supplier.php?id_supplier=$1 [QSA,L]';
$tab['RewriteRule']['content']['^([0-9]+)_([a-zA-Z0-9-]*)'] = 'manufacturer.php?id_manufacturer=$1 [QSA,L]';
@@ -2058,14 +2085,26 @@ FileETag INode MTime Size
* @param string $type by|way
* @param string $value If no index given, use default order from admin -> pref -> products
*/
public static function getProductsOrder($type, $value = null)
public static function getProductsOrder($type, $value = null, $prefix = false)
{
switch ($type)
{
case 'by' :
$orderByPrefix = '';
if($prefix) {
if ($value == 'id_product' || $value == 'date_add' || $value == 'price')
$orderByPrefix = 'p.';
elseif ($value == 'name')
$orderByPrefix = 'pl.';
elseif ($value == 'manufacturer')
$orderByPrefix = 'm.';
elseif ($value == 'position' || empty($value))
$orderByPrefix = 'cp.';
}
$value = (is_null($value) || $value === false || $value === '') ? (int)Configuration::get('PS_PRODUCTS_ORDER_BY') : $value;
$list = array(0 => 'name', 1 => 'price', 2 => 'date_add', 3 => 'date_upd', 4 => 'position', 5 => 'manufacturer_name', 6 => 'quantity');
return ((isset($list[$value])) ? $list[$value] : ((in_array($value, $list)) ? $value : 'position'));
return $orderByPrefix.((isset($list[$value])) ? $list[$value] : ((in_array($value, $list)) ? $value : 'position'));
break;
case 'way' :
@@ -2208,292 +2247,3 @@ FileETag INode MTime Size
}
}
// if FB class is already loaded, just enable it. else, enable it only if fb.php exists and is loaded
if (!defined('PS_USE_FIREPHP') AND class_exists('FB',false))
define('PS_USE_FIREPHP',true);
elseif (file_exists(dirname(__FILE__).DIRECTORY_SEPARATOR.'fb.php'))
{
if (!defined('PS_USE_FIREPHP'))
{
require_once(dirname(__FILE__).DIRECTORY_SEPARATOR.'fb.php');
define('PS_USE_FIREPHP',true);
}
else
define('PS_USE_FIREPHP',false);
}
else
if(!defined('PS_USE_FIREPHP'))
define('PS_USE_FIREPHP',class_exists('FB',false));
class Tools14 extends Tools14Core
{
/**
* Redirect user to another page after 5 sec
*
* @param string $url Desired URL
* @param string $baseUri Base URI (optional)
*/
public static function redirect($url, $baseUri = __PS_BASE_URI__)
{
if (strpos($url, 'http://') === FALSE && strpos($url, 'https://') === FALSE)
{
global $link;
if (strpos($url, $baseUri) !== FALSE && strpos($url, $baseUri) == 0)
$url = substr($url, strlen($baseUri));
$explode = explode('?', $url);
$url = $link->getPageLink($explode[0], true);
if (isset($explode[1]))
$url .= '?'.$explode[1];
$baseUri = '';
}
if (isset($_SERVER['HTTP_REFERER']) AND ($url == $_SERVER['HTTP_REFERER']))
header('Refresh: 5; url='.$_SERVER['HTTP_REFERER']);
else
header('Refresh: 5; url='.$baseUri.$url);
echo '<h1>Redirection automatique dans 5 secondes</h1><a href='.$url.'>'.$url.'</a>';
exit;
}
/**
* Redirect url wich allready PS_BASE_URI after 5 sec
*
* @param string $url Desired URL
*/
public static function redirectLink($url)
{
if (!preg_match('@^https?://@i', $url))
{
global $link;
if (strpos($url, __PS_BASE_URI__) !== FALSE && strpos($url, __PS_BASE_URI__) == 0)
$url = substr($url, strlen(__PS_BASE_URI__));
$explode = explode('?', $url);
$url = $link->getPageLink($explode[0]);
if (isset($explode[1]))
$url .= '?'.$explode[1];
}
header('Refresh: 5; url='.$url);
echo '<h1>Redirection automatique dans 5 secondes</h1><a href='.$url.'>'.$url.'</a>';
exit;
}
/**
* Redirect user to another admin page after 5 sec
*
* @param string $url Desired URL
*/
public static function redirectAdmin($url)
{
header('Refresh: 5; url='.$url);
echo '<h1>Redirection automatique dans 5 secondes</h1><a href='.$url.'>'.$url.'</a>';
exit;
}
/**
* Display an error with detailed object
* (display in firefox console if Firephp is enabled)
*
* @param mixed $object
* @param boolean $kill
* @return $object if $kill = false;
*/
public static function dieObject($object, $kill = true)
{
if (PS_USE_FIREPHP)
FB::error($object);
else
return parent::dieObject($object,$kill);
if ($kill)
die('END');
return $object;
}
/**
* ALIAS OF dieObject() - Display an error with detailed object
* (display in firefox console if Firephp is enabled)
*
* @param object $object Object to display
*/
public static function d($obj, $kill = true)
{
if (PS_USE_FIREPHP)
FB::error($obj);
else
parent::d($obj,$kill);
if ($kill)
die('END');
return $object;
}
/**
* ALIAS OF dieObject() - Display an error with detailed object but don't stop the execution
* (display in firefox console if Firephp is enabled)
*
* @param object $object Object to display
*/
public static function p($object)
{
if (PS_USE_FIREPHP)
FB::info($object);
else
return parent::p($object);
return $object;
}
/**
* Display a warning message indicating that the method is deprecated
* (display in firefox console if Firephp is enabled)
*/
public static function displayAsDeprecated()
{
if (_PS_DISPLAY_COMPATIBILITY_WARNING_)
{
$backtrace = debug_backtrace();
$callee = next($backtrace);
if (PS_USE_FIREPHP)
FB::warn('Function <strong>'.$callee['function'].'()</strong> is deprecated in <strong>'.$callee['file'].'</strong> on line <strong>'.$callee['line'].'</strong><br />', 'Deprecated method');
else
trigger_error('Function <strong>'.$callee['function'].'()</strong> is deprecated in <strong>'.$callee['file'].'</strong> on line <strong>'.$callee['line'].'</strong><br />', E_USER_WARNING);
$message = Tools::displayError('The function').' '.$callee['function'].' ('.Tools::displayError('Line').' '.$callee['line'].') '.Tools::displayError('is deprecated and will be removed in the next major version.');
Logger::addLog($message, 3, $callee['class']);
}
}
/**
* Display a warning message indicating that the parameter is deprecated
* (display in firefox console if Firephp is enabled)
*/
public static function displayParameterAsDeprecated($parameter)
{
if (_PS_DISPLAY_COMPATIBILITY_WARNING_)
{
$backtrace = debug_backtrace();
$callee = next($backtrace);
trigger_error('Parameter <strong>'.$parameter.'</strong> in function <strong>'.$callee['function'].'()</strong> is deprecated in <strong>'.$callee['file'].'</strong> on line <strong>'.$callee['Line'].'</strong><br />', E_USER_WARNING);
if (PS_USE_FIREPHP)
FB::trace('Parameter <strong>'.$parameter.'</strong> in function <strong>'.$callee['function'].'()</strong> is deprecated in <strong>'.$callee['file'].'</strong> on line <strong>'.$callee['Line'].'</strong><br />', 'deprecated parameter');
else
$message = Tools::displayError('The parameter').' '.$parameter.' '.Tools::displayError(' in function ').' '.$callee['function'].' ('.Tools::displayError('Line').' '.$callee['Line'].') '.Tools::displayError('is deprecated and will be removed in the next major version.');
Logger::addLog($message, 3, $callee['class']);
}
}
/**
* use of FirePHP::error() if allowed
*
* @param mixed $obj
* @param string $label
* @return void
*/
public static function error($obj, $label = '')
{
if (PS_USE_FIREPHP)
FB::error($obj, $label);
}
/**
* use of FirePHP::warn() if allowed
*
* @param mixed $obj
* @param string $label
* @return void
*/
public static function warn($obj, $label = '')
{
if (PS_USE_FIREPHP)
FB::warn($obj, $label);
}
/**
* use of FirePHP::info() if allowed
*
* @param mixed $obj
* @param string $label
* @return void
*/
public static function info($obj, $label = '')
{
if (PS_USE_FIREPHP)
FB::info($obj, $label);
}
/**
* use of FirePHP::log() if allowed
*
* @param mixed $obj
* @param string $label
* @return void
*/
public static function log($obj, $label = '')
{
if (PS_USE_FIREPHP)
FB::log($obj,$label);
}
/**
* display debug_backtrace()
* (display in firefox console if Firephp is enabled)
*
* @param mixed $obj
* @return void
*/
public static function trace($obj = NULL, $label = '')
{
if (PS_USE_FIREPHP)
FB::trace($obj, $label);
else{
Tools::p($obj);
echo'<pre><h1>'.$label.'</h1><br/>';
debug_print_backtrace();
echo '</pre>';
}
}
}
// Add some convenient shortcut
if (!function_exists('error'))
{
function error($obj, $label = ''){
return Tools::error($obj, $label);
}
}
if (!function_exists('warn'))
{
function warn($obj, $label = ''){
return Tools::warn($obj,$label);
}
}
if (!function_exists('info'))
{
function info($obj, $label = ''){
return Tools::info($obj, $label);
}
}
if (!function_exists('log'))
{
function log($obj, $label = ''){
return Tools::log($obj, $label);
}
}
if (!function_exists('trace'))
{
function trace($obj, $label = ''){
return Tools::trace($obj, $label);
}
}
@@ -0,0 +1,28 @@
{*
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License (AFL 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/afl-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-2011 PrestaShop SA
* @version Release: $Revision$
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registred Trademark & Property of PrestaShop SA
*}
<div id="product_list" class="clear">
<p class="warning">{l s='There are no products.'}</p>
</div>
@@ -18,7 +18,7 @@ if (!Tools::getValue('ajax'))
}
// Return a content without waiting the end of index execution
header('Location: '.Tools::getProtocol().Tools::getHttpHost().'/modules/blocklayered/blocklayered-price-indexer.php?token='.Tools::getValue('token') .'&return_message='.(int)Tools::getValue('cursor'));
header('Location: '.Tools::getProtocol().Tools::getHttpHost().__PS_BASE_URI__.'modules/blocklayered/blocklayered-price-indexer.php?token='.Tools::getValue('token') .'&return_message='.(int)Tools::getValue('cursor'));
flush();
}
if(Tools::getValue('full'))
+3
View File
@@ -73,3 +73,6 @@
#layered_block_left ul li .disabled {
color: #666;
}
#product_list .warning {
margin-top: 13px;
}
+7
View File
@@ -242,8 +242,12 @@ function reloadContent(params_plus)
data += '&orderby='+splitData[0]+'&orderway='+splitData[1];
}
var slideUp = true;
if(params_plus == undefined)
{
params_plus = '';
slideUp = false;
}
// Get nb items per page
var n = '';
@@ -311,6 +315,9 @@ function reloadContent(params_plus)
current_friendly_url = '#/';
window.location = current_friendly_url;
lockLocationChecking = true;
if(slideUp)
$.scrollTo('#product_list', 400);
}
});
ajaxQueries.push(ajaxQuery);
+45 -10
View File
@@ -858,7 +858,7 @@ class BlockLayered extends Module
if (($nbProducts > 0 && !$full || $cursor < $nbProducts && $full) && !$ajax)
{
$token = substr(Tools::encrypt('blocklayered/index'), 0, 10);
if (!Tools::file_get_contents(Tools::getProtocol().Tools::getHttpHost().'/modules/blocklayered/blocklayered-price-indexer.php?token='.$token.'&cursor='.(int)$cursor.'&full='.(int)$full))
if (!Tools::file_get_contents(Tools::getProtocol().Tools::getHttpHost().__PS_BASE_URI__.'modules/blocklayered/blocklayered-price-indexer.php?token='.$token.'&cursor='.(int)$cursor.'&full='.(int)$full))
self::indexPrices((int)$cursor, (int)$full);
return $cursor;
}
@@ -1025,6 +1025,11 @@ class BlockLayered extends Module
{
global $smarty, $cookie;
// No filters => module disable
if ($filterBlock = $this->getFilterBlock($this->getSelectedFilters()))
if ($filterBlock['nbr_filterBlocks'] == 0)
return false;
if (Tools::getValue('id_category', Tools::getValue('id_category_layered', 1)) == 1)
return;
@@ -1034,7 +1039,6 @@ class BlockLayered extends Module
$categoryTitle = (empty($category->meta_title[$idLang])?$category->name[$idLang]:$category->meta_title[$idLang]);
// Generate meta title and meta description
$filterBlock = self::getFilterBlock($this->getSelectedFilters());
$title = '';
if (is_array($filterBlock['title_values']))
foreach ($filterBlock['title_values'] as $key => $val)
@@ -1056,6 +1060,7 @@ class BlockLayered extends Module
$this->context->controller->addJs($this->_path.'blocklayered.js');
$this->context->controller->addJqueryUI('ui.slider');
$this->context->controller->addCSS($this->_path.'blocklayered.css', 'all');
Tools::addJS(_PS_JS_DIR_.'jquery/jquery.scrollTo-1.4.2-min.js');
}
public function hookFooter($params)
@@ -2090,13 +2095,15 @@ class BlockLayered extends Module
INNER JOIN '._DB_PREFIX_.'attribute_group_lang agl
ON agl.id_attribute_group = lpa.id_attribute_group
AND agl.id_lang = '.(int)$cookie->id_lang.'
LEFT JOIN '._DB_PREFIX_.'category_product cp ON (cp.id_product = p.id_product)
INNER JOIN '._DB_PREFIX_.'category c ON (c.id_category = cp.id_category AND c.nleft >= '.(int)$parent->nleft.' AND c.nright <= '.(int)$parent->nright.')
LEFT JOIN '._DB_PREFIX_.'layered_indexable_attribute_group_lang_value liagl
ON (liagl.id_attribute_group = lpa.id_attribute_group AND liagl.id_lang = '.(int)$cookie->id_lang.')
LEFT JOIN '._DB_PREFIX_.'layered_indexable_attribute_lang_value lial
ON (lial.id_attribute = lpa.id_attribute AND lial.id_lang = '.(int)$cookie->id_lang.') ';
$sqlQuery['where'] = 'WHERE a.id_attribute_group = '.(int)$filter['id_value'].' ';
$sqlQuery['where'] = 'WHERE a.id_attribute_group = '.(int)$filter['id_value'].'
AND p.id_product IN (
SELECT id_product
FROM '._DB_PREFIX_.'category_product cp
INNER JOIN '._DB_PREFIX_.'category c ON (c.id_category = cp.id_category AND c.nleft >= '.(int)$parent->nleft.' AND c.nright <= '.(int)$parent->nright.')) ';
$sqlQuery['group'] = '
GROUP BY lpa.id_attribute
ORDER BY id_attribute_group, id_attribute';
@@ -2143,10 +2150,16 @@ class BlockLayered extends Module
if (method_exists('BlockLayered', $methodName) &&
(!in_array($filter['type'], array('price', 'weight')) && $filter['type'] != $filterTmp['type'] || $filter['type'] == $filterTmp['type']))
{
if ($filter['type'] == $filterTmp['type'])
$subQueryFilter = self::$methodName(array(), $filter['type'] == $filterTmp['type']);
if ($filter['type'] == $filterTmp['type'] && $filter['id_value'] == $filterTmp['id_value'])
$subQueryFilter = self::$methodName(array(), true);
else
$subQueryFilter = self::$methodName(@$selectedFilters[$filterTmp['type']], $filter['type'] == $filterTmp['type']);
{
if (!is_null($filterTmp['id_value']))
$selected_filters_cleaned = $this->cleanFilterByIdValue(@$selectedFilters[$filterTmp['type']], $filterTmp['id_value']);
else
$selected_filters_cleaned = @$selectedFilters[$filterTmp['type']];
$subQueryFilter = self::$methodName($selected_filters_cleaned, $filter['type'] == $filterTmp['type']);
}
foreach ($subQueryFilter as $key => $value)
$sqlQuery[$key] .= $value;
}
@@ -2471,12 +2484,29 @@ class BlockLayered extends Module
return $cache;
}
public function cleanFilterByIdValue($attributes, $id_value)
{
$selected_filters = array();
if (is_array($attributes))
foreach ($attributes as $attribute)
{
$attribute_data = explode('_', $attribute);
if ($attribute_data[0] == $id_value)
$selected_filters[] = $attribute_data[1];
}
return $selected_filters;
}
public function generateFiltersBlock($selectedFilters)
{
global $smarty;
if($filterBlock = $this->getFilterBlock($selectedFilters))
{
$smarty->assign($this->getFilterBlock($selectedFilters));
if ($filterBlock['nbr_filterBlocks'] == 0)
return false;
$smarty->assign($filterBlock);
return $this->display(__FILE__, 'blocklayered.tpl');
}
else
@@ -2795,10 +2825,15 @@ class BlockLayered extends Module
else
$categoryCount = '';
if ($nbProducts == 0)
$product_list_tpl = 'blocklayered-no-products.tpl';
else
$product_list_tpl = _PS_THEME_DIR_.'product-list.tpl';
/* We are sending an array in jSon to the .js controller, it will update both the filters and the products zones */
return Tools::jsonEncode(array(
'filtersBlock' => $this->generateFiltersBlock($selectedFilters),
'productList' => $smarty->fetch(_PS_THEME_DIR_.'product-list.tpl'),
'productList' => $smarty->fetch($product_list_tpl),
'pagination' => $smarty->fetch(_PS_THEME_DIR_.'pagination.tpl'),
'categoryCount' => $categoryCount));
}
+1
View File
@@ -2,6 +2,7 @@
global $_MODULE;
$_MODULE = array();
$_MODULE['<{blocklayered}prestashop>blocklayered-no-products_5c9838becf9bbce28ba90a7426daf171'] = 'Il n\'y a pas de produits.';
$_MODULE['<{blocklayered}prestashop>blocklayered_84241e458cdd5162745500a59a3680f3'] = 'Bloc navigation à facettes';
$_MODULE['<{blocklayered}prestashop>blocklayered_2d08fa8e157fe3f1875402cbd98aee1b'] = 'Affiche un bloc avec les filtres de la navigation à facettes';
$_MODULE['<{blocklayered}prestashop>blocklayered_af1b98adf7f686b84cd0b443e022b7a0'] = 'Catégories';
+1 -1
View File
@@ -2,7 +2,7 @@
<module>
<name>ebay</name>
<displayName><![CDATA[eBay]]></displayName>
<version><![CDATA[1.3]]></version>
<version><![CDATA[1.3.1]]></version>
<description><![CDATA[Open your shop on the eBay market place !]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[market_place]]></tab>
+11 -8
View File
@@ -59,7 +59,7 @@ class Ebay extends Module
{
$this->name = 'ebay';
$this->tab = 'market_place';
$this->version = '1.3';
$this->version = '1.3.1';
$this->author = 'PrestaShop';
parent::__construct ();
$this->displayName = $this->l('eBay');
@@ -913,7 +913,7 @@ class Ebay extends Module
return '<p><b>'.$this->l('You have to configure "General Settings" tab before using this tab.').'</b></p><br />';
// Load categories only if necessary
if (Db::getInstance()->getValue('SELECT COUNT(`id_ebay_category_configuration`) FROM `'._DB_PREFIX_.'ebay_category_configuration`') > 4 && Tools::getValue('section') != 'category')
if (Db::getInstance()->getValue('SELECT COUNT(`id_ebay_category_configuration`) FROM `'._DB_PREFIX_.'ebay_category_configuration`') >= 1 && Tools::getValue('section') != 'category')
return '<p align="center"><b>'.$this->l('Your categories have already been configured.').'</b></p>
<form action="index.php?tab='.Tools::safeOutput($_GET['tab']).'&configure='.Tools::safeOutput($_GET['configure']).'&token='.Tools::safeOutput($_GET['token']).'&tab_module='.Tools::safeOutput($_GET['tab_module']).'&module_name='.Tools::safeOutput($_GET['module_name']).'&id_tab=2&section=category" method="post" class="form">
<p align="center"><input class="button" name="submitSave" type="submit" value="'.$this->l('See Categories').'" /></p></form>';
@@ -1281,10 +1281,12 @@ class Ebay extends Module
eBaySyncProduct(option);
}
var counter = 0;
function eBaySyncProduct(option)
{
counter++;
$.ajax({
url: \''._MODULE_DIR_.'ebay/ajax/eBaySyncProduct.php?token='.Configuration::get('EBAY_SECURITY_TOKEN').'&option=\'+option+\'&time='.pSQL(date('Ymdhis').rand()).'\',
url: \''._MODULE_DIR_.'ebay/ajax/eBaySyncProduct.php?token='.Configuration::get('EBAY_SECURITY_TOKEN').'&option=\'+option+\'&time='.pSQL(date('Ymdhis')).'\'+counter,
success: function(data)
{
tab = data.split("|");
@@ -1554,9 +1556,9 @@ class Ebay extends Module
$images = $product->getImages($this->id_lang);
foreach ($images as $image)
{
$pictures[] = str_replace('https://', 'http://', $prefix.$this->context->link->getImageLink('', $product->id.'-'.$image['id_image'], null));
$picturesMedium[] = str_replace('https://', 'http://', $prefix.$this->context->link->getImageLink('', $product->id.'-'.$image['id_image'], 'medium'));
$picturesLarge[] = str_replace('https://', 'http://', $prefix.$this->context->link->getImageLink('', $product->id.'-'.$image['id_image'], 'large'));
$pictures[] = str_replace('https://', 'http://', $prefix.$this->context->link->getImageLink('ebay', $product->id.'-'.$image['id_image'], 'large'));
$picturesMedium[] = str_replace('https://', 'http://', $prefix.$this->context->link->getImageLink('ebay', $product->id.'-'.$image['id_image'], 'medium'));
$picturesLarge[] = str_replace('https://', 'http://', $prefix.$this->context->link->getImageLink('ebay', $product->id.'-'.$image['id_image'], 'large'));
}
// Load Variations
@@ -1618,6 +1620,7 @@ class Ebay extends Module
'name' => str_replace('&', '&amp;', $product->name),
'brand' => $product->manufacturer_name,
'description' => $product->description,
'description_short' => $product->description_short,
'price' => $price,
'quantity' => $product->quantity,
'categoryId' => $categoryDefaultCache[$product->id_category_default]['id_category_ref'],
@@ -1644,8 +1647,8 @@ class Ebay extends Module
// Load eBay Description
$datas['description'] = str_replace(
array('{DESCRIPTION}', '{EBAY_IDENTIFIER}', '{EBAY_SHOP}', '{SLOGAN}', '{PRODUCT_NAME}'),
array($datas['description'], Configuration::get('EBAY_IDENTIFIER'), Configuration::get('EBAY_SHOP'), '', $product->name),
array('{DESCRIPTION_SHORT}', '{DESCRIPTION}', '{EBAY_IDENTIFIER}', '{EBAY_SHOP}', '{SLOGAN}', '{PRODUCT_NAME}'),
array($datas['description_short'], $datas['description'], Configuration::get('EBAY_IDENTIFIER'), Configuration::get('EBAY_SHOP'), '', $product->name),
Configuration::get('EBAY_PRODUCT_TEMPLATE')
);
+1 -1
View File
@@ -303,7 +303,7 @@ class importerosc extends ImportModule
foreach($combinations as& $combination)
{
$combination['association'] = array('product_attribute_combination' => array($combination['options_values_id'] => $combination['id_product_attribute']));
unset($combination['options_values_price']);
unset($combination['options_values_id']);
}
return $this->autoFormat($combinations, $identifier);
}
+1 -1
View File
@@ -64,7 +64,7 @@ class AdminMondialRelay extends AdminTab
$html .= '<div class="error">'.
$this->l('Thanks to kindly correct the following errors on ').
' <a href="index.php?tab=AdminContact&token='.Tools::getAdminToken('AdminContact'.
(int)(Tab::getIdFromClassName('AdminContact')).(int)$this->context->id_employee).'" style="color:#f00;">'.
(int)Tab::getIdFromClassName('AdminContact').(int)$this->context->id_employee).'" style="color:#f00;">&nbsp;'.
$this->l('the contact page').'</a>:<ul>';
foreach($errorListTicket as $type => $error)
$html .= '<li>'.$type.': '.$error.'</li>';
+1
View File
@@ -46,6 +46,7 @@ $_MODULE['<{mondialrelay}prestashop>mondialrelay_c888438d14855d7d96a2724ee9c306b
$_MODULE['<{mondialrelay}prestashop>mondialrelay_07213a0161f52846ab198be103b5ab43'] = 'erreurs';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_cb5e100e5a9a3e7f6d1fd97512215282'] = 'erreur';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_350c1cc4343826a89f08a33bb49c6d98'] = 'Configuration du Module Mondial Relay';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_192a5439bcfb850e8885cd4b5e01ced4'] = 'Essayez de désactiver le cache et de forcer la compilation smarty si vous rencontrez le moindre problème après une mise à jour du module';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_d21a9f93917604d5490ad529a7cf1ff9'] = 'Pour créer un transporteur Mondial Relay';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_c6a2e6af5fff47adb3afd780b97d9b4b'] = 'Remplissez et sauvegarder vos paramètres Mondial Relay';
$_MODULE['<{mondialrelay}prestashop>mondialrelay_94fbe32464fcfa902feed9f256439833'] = 'Créez un transporteur via le formulaire ‘’ajouter un transporteur’’ ci-dessous';
+14 -25
View File
@@ -540,37 +540,26 @@ class MondialRelay extends Module
{
}
/*
** Update the carrier id to use the new one if changed
*/
public function hookupdateCarrier($params)
{
// TODO : History shipping
/*if ((int)($params['id_carrier']) != (int)($params['carrier']->id))
if ((int)($params['id_carrier']) != (int)($params['carrier']->id))
{
$serviceSelected = Db::getInstance()->getRow('SELECT * FROM `'._DB_PREFIX_.'mr_method` WHERE `id_carrier` = '.(int)$params['id_carrier']);
$update = array('id_carrier' => (int)($params['carrier']->id), 'id_carrier_history' => pSQL($serviceSelected['id_carrier_history'].'|'.(int)($params['carrier']->id)));
Db::getInstance()->autoExecute(_DB_PREFIX_.'mr_method', $update, 'UPDATE', '`id_carrier` = '.(int)$params['id_carrier']);
}*/
// TODO : Delete for shipping history
$new_carrier = $params['carrier'];
// Depends of the Prestashop version, the matches key isn't the same
if ((_PS_VERSION_ >= '1.4' && $new_carrier->external_module_name == 'mondialrelay') ||
$new_carrier->name = 'mondialrelay')
{
$mr_data = Db::getInstance()->getRow('
SELECT *
FROM `'._DB_PREFIX_.'mr_method`
WHERE `id_carrier` = '.(int)($params['id_carrier']));
Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'mr_method`
(mr_Name, mr_Pays_list, mr_ModeCol, mr_ModeLiv, mr_ModeAss, id_carrier)
VALUES (
"'.pSQL($mr_data['mr_Name']).'",
"'.pSQL($mr_data['mr_Pays_list']).'",
"'.pSQL($mr_data['mr_ModeCol']).'",
"'.pSQL($mr_data['mr_ModeLiv']).'",
"'.pSQL($mr_data['mr_ModeAss']).'",
'.(int)($new_carrier->id).')');
(
SELECT
mr_Name,
mr_Pays_list,
mr_ModeCol,
mr_ModeLiv,
mr_ModeAss,
"'.(int)$params['carrier']->id.'"
FROM `'._DB_PREFIX_.'mr_method`
WHERE id_carrier ='.(int)$params['id_carrier'].')');
}
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 164 KiB

+1 -1
View File
@@ -36,7 +36,7 @@ class Ogone extends PaymentModule
{
$this->name = 'ogone';
$this->tab = 'payments_gateways';
$this->version = '2.1';
$this->version = '2.2';
parent::__construct();
+1 -1
View File
@@ -401,7 +401,7 @@ class PrestaFraud extends Module
$order->addChild('payment_name', $paymentModule->displayName);
$order->addChild('payment_type', (int)$configured_payments[$paymentModule->id]);
$order->addChild('order_date', $params['order']->date_add);
$order->addChild('order_ip_address', $this->_getIpByCart($id_cart));
$order->addChild('order_ip_address', $this->_getIpByCart((int)$params['order']->id_cart));
$carrier = new Carrier((int)$params['order']->id_carrier);
$carrier_infos = $order->addChild('carrier_infos');
+2 -2
View File
@@ -3,7 +3,7 @@
include_once('../../config/config.inc.php');
include_once('../../init.php');
include_once('../../modules/shopimporter/shopimporter.php');
ini_set('display_errors', 'off');
$moduleName = Tools::getValue('moduleName');
@@ -210,4 +210,4 @@ if (Tools::isSubmit('displayConfigConnector'))
die($importModule->displayConfigConnector());
}
}
?>
?>
+732 -1
View File
@@ -2,5 +2,736 @@
global $_LANG;
$_LANG = array();
$_LANG['404_1d3ac0a5826e47e3c2761085e97877f6'] = 'Page not available';
$_LANG['404_902b0d55fddef6f8d651fe1035b7d4bd'] = 'Error';
$_LANG['404_4f4816c6984e3c832882b39d8fecbd2c'] = 'We\'re sorry, but the Web address you entered is no longer available';
$_LANG['404_21dfea356c48679a5ce6671ee307d2a4'] = 'To find a product, please type its name in the field below';
$_LANG['404_a68ba7d969d1294a35138fa501dfb078'] = 'Search our product catalog:';
$_LANG['404_13348442cc6a27032d2b4aa28b75a5d3'] = 'Search';
$_LANG['404_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
$_LANG['address_3908e1afa0ff22fbf112aff3c5ba55c1'] = 'Your addresses';
$_LANG['address_e9b6b3aa3cab28048d3879710882e1de'] = 'Modify address';
$_LANG['address_d7f172af352aa5232de5295afeaa68e5'] = 'To add a new address, please fill out the form below.';
$_LANG['address_455175f3f5be6306247babb349c0515a'] = 'Your address';
$_LANG['address_393d8c6bc7a04264bd9523dc8c92b818'] = 'New address';
$_LANG['address_b60bb13a87fe3ae5463aeb0980a5a8a1'] = 'Identification number';
$_LANG['address_ea318a4ad37f0c2d2c368e6c958ed551'] = 'DNI / NIF / NIE';
$_LANG['address_7cb32e708d6b961d476baced73d362bb'] = 'VAT number';
$_LANG['address_1c76cbfe21c6f44c1d1e59d54f3e4420'] = 'Company';
$_LANG['address_20db0bfeecd8fe60533206a2b5e9891a'] = 'First name';
$_LANG['address_8d3f5eff9c40ee315d452392bed5309b'] = 'Last name';
$_LANG['address_dd7bf230fde8d4836917806aff6a6b27'] = 'Address';
$_LANG['address_846a54955f32846032981f8fe48c35ff'] = 'Address (Line 2)';
$_LANG['address_d30f507473129e70c4b962ceccf175cf'] = 'Zip / Postal Code';
$_LANG['address_57d056ed0984166336b7879c2af3657f'] = 'City';
$_LANG['address_59716c97497eb9694541f7c3d37b1a4d'] = 'Country';
$_LANG['address_46a2a41cc6e552044816a2d04634545d'] = 'State';
$_LANG['address_0f68b904e33d9ac04605aecc958bcf52'] = 'Additional information';
$_LANG['address_39916f579f264041641c122e68e545d5'] = 'You must register at least one phone number';
$_LANG['address_fe66abce284ec8589e7d791185b5c442'] = 'Home phone';
$_LANG['address_41c2fff4867cc204120f001e7af20f7a'] = 'Mobile phone';
$_LANG['address_6c1c4d5a22e3d6ed8385e7287233396f'] = 'Assign an address title for future reference';
$_LANG['address_ae7bdef7fe2bbbbf02c11e92c5fceb40'] = 'My address';
$_LANG['address_dd1f775e443ff3b9a89270713580a51b'] = 'Previous';
$_LANG['address_c9cc8cce247e49bae79f15173ce97354'] = 'Save';
$_LANG['address_19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
$_LANG['addresses_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'My account';
$_LANG['addresses_e45be0a0d4a0b62b15694c1a631e6e62'] = 'My addresses';
$_LANG['addresses_f8fe2f1fff8cf1e32b1891fd7b4a65fe'] = 'Please configure the desired billing and delivery addresses to be preselected when placing an order. You may also add additional addresses, which can be useful for sending gifts or receiving an order at your office.';
$_LANG['addresses_aa5e970d64eb228f31669d3411171f92'] = 'Your addresses are listed below.';
$_LANG['addresses_cf8f33fb835a556eb3aa8e71a88e7b34'] = 'Be sure to update them if they have changed.';
$_LANG['addresses_06933067aafd48425d67bcb01bba5cb6'] = 'Update';
$_LANG['addresses_729a51874fe901b092899e9e8b31c97a'] = 'Are you sure?';
$_LANG['addresses_f2a6c498fb90ee345d997f888fce3b18'] = 'Delete';
$_LANG['addresses_b32dd33df738183cb85ab8ea714f8026'] = 'No addresses available.';
$_LANG['addresses_bed08e8af70a98c1a8361f13ec477be0'] = 'Add new address';
$_LANG['addresses_3c7d34ae915c6664189dab2aebb02307'] = 'Add an address';
$_LANG['addresses_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account';
$_LANG['addresses_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
$_LANG['authentication_99dea78007133396a7b8ed70578ac6ae'] = 'Login';
$_LANG['authentication_bffe9a3c9a7e00ba00a11749e022d911'] = 'Log in';
$_LANG['authentication_5bef23eb7efff2736c5583bda59e5eb7'] = 'Create your account';
$_LANG['authentication_d726bc5637e9f053917227ec02f6c9d7'] = 'Enter your e-mail address to create an account';
$_LANG['authentication_8b5dd64ab8d0b8158906796b53a200e2'] = 'E-mail address';
$_LANG['authentication_5f0258bf719ab828e20edf91e4fb24a7'] = 'Already registered?';
$_LANG['authentication_dc647eb65e6711e155375218212b3964'] = 'Password';
$_LANG['authentication_01a569ddc6cf67ddec2a683f0a5f5956'] = 'Forgot your password?';
$_LANG['authentication_766d4aaf3e045538be23f9a9e17a1593'] = 'Instant Checkout';
$_LANG['authentication_b78a3223503896721cca1303f776159b'] = 'Title';
$_LANG['authentication_127469a6b4253ebb77adccc0dd48461e'] = 'Mr.';
$_LANG['authentication_29e32764941c30d1bb41c601014fbdbd'] = 'Ms.';
$_LANG['authentication_20db0bfeecd8fe60533206a2b5e9891a'] = 'First name';
$_LANG['authentication_8d3f5eff9c40ee315d452392bed5309b'] = 'Last name';
$_LANG['authentication_10803b83a68db8f7e7a33e3b41e184d0'] = 'Date of Birth';
$_LANG['authentication_86f5978d9b80124f509bdb71786e929e'] = 'January';
$_LANG['authentication_659e59f062c75f81259d22786d6c44aa'] = 'February';
$_LANG['authentication_fa3e5edac607a88d8fd7ecb9d6d67424'] = 'March';
$_LANG['authentication_3fcf026bbfffb63fb24b8de9d0446949'] = 'April';
$_LANG['authentication_195fbb57ffe7449796d23466085ce6d8'] = 'May';
$_LANG['authentication_688937ccaf2a2b0c45a1c9bbba09698d'] = 'June';
$_LANG['authentication_1b539f6f34e8503c97f6d3421346b63c'] = 'July';
$_LANG['authentication_41ba70891fb6f39327d8ccb9b1dafb84'] = 'August';
$_LANG['authentication_cc5d90569e1c8313c2b1c2aab1401174'] = 'September';
$_LANG['authentication_eca60ae8611369fe28a02e2ab8c5d12e'] = 'October';
$_LANG['authentication_7e823b37564da492ca1629b4732289a8'] = 'November';
$_LANG['authentication_82331503174acbae012b2004f6431fa5'] = 'December';
$_LANG['authentication_6f6162d3a052bb330e9c60285c74c6c9'] = 'Sign up for our newsletter';
$_LANG['authentication_ac135c86084a47630c9eadb4edd5ef75'] = 'Receive special offers from our partners';
$_LANG['authentication_af0f5bdc5be121b9307687aeeae38c17'] = 'Delivery address';
$_LANG['authentication_1c76cbfe21c6f44c1d1e59d54f3e4420'] = 'Company';
$_LANG['authentication_7cb32e708d6b961d476baced73d362bb'] = 'VAT number';
$_LANG['authentication_dd7bf230fde8d4836917806aff6a6b27'] = 'Address';
$_LANG['authentication_d30f507473129e70c4b962ceccf175cf'] = 'Zip / Postal Code';
$_LANG['authentication_57d056ed0984166336b7879c2af3657f'] = 'City';
$_LANG['authentication_59716c97497eb9694541f7c3d37b1a4d'] = 'Country';
$_LANG['authentication_46a2a41cc6e552044816a2d04634545d'] = 'State';
$_LANG['authentication_bcc254b55c4a1babdf1dcb82c207506b'] = 'Phone';
$_LANG['authentication_ae7bdef7fe2bbbbf02c11e92c5fceb40'] = 'My address';
$_LANG['authentication_c773457e85b990c10f8823eacb21346c'] = 'Tax identification';
$_LANG['authentication_b60bb13a87fe3ae5463aeb0980a5a8a1'] = 'Identification number';
$_LANG['authentication_ea318a4ad37f0c2d2c368e6c958ed551'] = 'DNI / NIF / NIE';
$_LANG['authentication_19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
$_LANG['authentication_a0bfb8e59e6c13fc8d990781f77694fe'] = 'Continue';
$_LANG['authentication_6335a00a08fde0fbb8f6d6630cdadd92'] = 'Your personal information';
$_LANG['authentication_1e884e3078d9978e216a027ecd57fb34'] = 'E-mail';
$_LANG['authentication_bf2957630c4209f61a388a08c2154915'] = '(5 characters min.)';
$_LANG['authentication_455175f3f5be6306247babb349c0515a'] = 'Your address';
$_LANG['authentication_ae47812e00631626815f5f75ad1abbbd'] = 'Street address, P.O. box, company name, c/o';
$_LANG['authentication_846a54955f32846032981f8fe48c35ff'] = 'Address (Line 2)';
$_LANG['authentication_092daa39d2b825e4a7fe9b31c2080ecb'] = 'Apartment, suite, unit, building, floor, etc.';
$_LANG['authentication_0f68b904e33d9ac04605aecc958bcf52'] = 'Additional information';
$_LANG['authentication_39916f579f264041641c122e68e545d5'] = 'You must register at least one phone number';
$_LANG['authentication_fe66abce284ec8589e7d791185b5c442'] = 'Home phone';
$_LANG['authentication_41c2fff4867cc204120f001e7af20f7a'] = 'Mobile phone';
$_LANG['authentication_6c1c4d5a22e3d6ed8385e7287233396f'] = 'Assign an address alias for future reference';
$_LANG['authentication_0ba7583639a274c434bbe6ef797115a4'] = 'Register';
$_LANG['best-sales_3cb29f0ccc5fd220a97df89dafe46290'] = 'Top sellers';
$_LANG['best-sales_32af07c9205de16855c50c3d20a51698'] = 'No top sellers.';
$_LANG['breadcrumb_157f518779095e8206908ff1268f10a7'] = 'return to';
$_LANG['breadcrumb_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
$_LANG['category-count_5c9838becf9bbce28ba90a7426daf171'] = 'There are no products.';
$_LANG['category-count_4ce81305b7edb043d0a7a5c75cab17d0'] = 'There is';
$_LANG['category-count_6357d3551190ec7e79371a8570121d3a'] = 'There are';
$_LANG['category-count_b30e141e947fd1b73ad9a02c2c37e7a2'] = 'product.';
$_LANG['category-count_aac098b07937926af675e5b248734d50'] = 'products.';
$_LANG['category_f73cc399b5ce12735a57f03414f09ef9'] = 'Subcategories';
$_LANG['category_ff32f7dba36bcd6d0a4214cd80253c3a'] = 'There are no products in this category.';
$_LANG['category_2f4e54ec9bebe1122b5c23217e764828'] = 'This category is currently unavailable.';
$_LANG['cms_24a26cffdfea04302a5bc20b9bce6626'] = 'This CMS page is not visible to your customers.';
$_LANG['cms_110a4b01beabd53b661a47d4b44bd7a8'] = 'Publish';
$_LANG['cms_0557fa923dcee4d0f86b1409f5c2167f'] = 'Back';
$_LANG['cms_e0ca0b16f77072932795a4b2f35b9615'] = 'List of sub categories in';
$_LANG['cms_853ae90f0351324bd73ea615e6487517'] = ':';
$_LANG['cms_94f2ffbd057be87ffd94b487f490ab53'] = 'List of pages in';
$_LANG['cms_eecc2cef7e0fa128ecb0557b66486539'] = 'This page does not exist.';
$_LANG['contact-form_bbaff12800505b22a853e8b7f4eb6a22'] = 'Contact';
$_LANG['contact-form_d5552e0564007d93ff5937a9cb3bc491'] = 'Customer Service';
$_LANG['contact-form_d754a9e8cb640da12849a040f3ca8176'] = 'Your reply';
$_LANG['contact-form_02d4482d332e1aef3437cd61c9bcc624'] = 'Contact us';
$_LANG['contact-form_4ec1c39345fe8820d68463eea8803b0f'] = 'Your message has been successfully sent to our team.';
$_LANG['contact-form_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
$_LANG['contact-form_7c9d4636fc5ed97bb78bc2aac486beab'] = 'Your message has already been sent.';
$_LANG['contact-form_0880266daff3ed4c441adb888658c47c'] = 'For questions about an order or for more information about our products';
$_LANG['contact-form_cc5fd9b9f1cad59fcff97a1f21f34304'] = 'Send a message';
$_LANG['contact-form_6c27c08f40e1b0d9901deb9ff5f722f7'] = 'Subject Heading';
$_LANG['contact-form_7bc873cba11f035df692c3549366c722'] = '-- Choose --';
$_LANG['contact-form_8b5dd64ab8d0b8158906796b53a200e2'] = 'E-mail address';
$_LANG['contact-form_d79cf3f429596f77db95c65074663a54'] = 'Order ID';
$_LANG['contact-form_deb10517653c255364175796ace3553f'] = 'Product';
$_LANG['contact-form_13d6078da2e6592822ede083931d6826'] = 'Attach File';
$_LANG['contact-form_4c2a8fe7eaf24721cc7a9f0175115bd4'] = 'Message';
$_LANG['contact-form_94966d90747b97d1f0f206c98a8b1ac3'] = 'Send';
$_LANG['discount_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'My account';
$_LANG['discount_f030b242608a016c5e80d53d2faf555b'] = 'My vouchers';
$_LANG['discount_ca0dbad92a874b2f69b549293387925e'] = 'Code';
$_LANG['discount_b5a7adde1af5c87d7fd797b6245c2a39'] = 'Description';
$_LANG['discount_694e8d1f2ee056f98ee488bdc4982d73'] = 'Quantity';
$_LANG['discount_689202409e48743b914713f96d93947c'] = 'Value';
$_LANG['discount_a1d0ec6d56f8833a078b5a7ac4caf2d4'] = 'Minimum';
$_LANG['discount_eb2527806a7e1ef48009eaaa785368fe'] = 'Cumulative';
$_LANG['discount_8c1279db4db86553e4b9682f78cf500e'] = 'Expiration date';
$_LANG['discount_29aa46cc3d2677c7e0f216910df600ff'] = 'Free shipping';
$_LANG['discount_334c4a4c42fdb79d7ebc3e73b517e6f8'] = 'None';
$_LANG['discount_93cba07454f06a4a960172bbd6e2a435'] = 'Yes';
$_LANG['discount_bafd7322c6e97d25b6299b5d6fe8920b'] = 'No';
$_LANG['discount_f4a0d7cb0cd45214c8ca5912c970de13'] = 'Tax included';
$_LANG['discount_5b54dccf3cb10410cee693309f409324'] = 'You do not have any vouchers.';
$_LANG['discount_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account';
$_LANG['discount_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
$_LANG['errors_6357d3551190ec7e79371a8570121d3a'] = 'There are';
$_LANG['errors_4ce81305b7edb043d0a7a5c75cab17d0'] = 'There is';
$_LANG['errors_07213a0161f52846ab198be103b5ab43'] = 'errors';
$_LANG['errors_cb5e100e5a9a3e7f6d1fd97512215282'] = 'error';
$_LANG['errors_0557fa923dcee4d0f86b1409f5c2167f'] = 'Back';
$_LANG['guest-tracking_77cd9fa27c50288413e2ead667fdda84'] = 'Track your order';
$_LANG['guest-tracking_b5a4f215d9c7e8fbc20532f1e7e03e9e'] = 'Create your customer account';
$_LANG['guest-tracking_943a199b38fa52e39a1ee77b46aed98f'] = 'Your guest account has been successfully transformed into a customer account. You can now log-in on this';
$_LANG['guest-tracking_71860c77c6745379b0d44304d66b6a13'] = 'page';
$_LANG['guest-tracking_109636f722b8fccc95d072b2760a6282'] = 'Transform your guest account into a customer account and enjoy:';
$_LANG['guest-tracking_7661b3dd0ed101708b4c5ba8948ef03d'] = 'Personal and secure access';
$_LANG['guest-tracking_d019547a449e74a964252e9f0077ba3d'] = 'Quick and easy check out';
$_LANG['guest-tracking_1f1015bbef5f42d858e8486397ad8f3e'] = 'Easier merchandise return';
$_LANG['guest-tracking_6f789eb510f8b335b306e05ac7b17bec'] = 'Define your password:';
$_LANG['guest-tracking_a4d3b161ce1309df1c4e25df28694b7b'] = 'Submit';
$_LANG['guest-tracking_a82be0f551b8708bc08eb33cd9ded0cf'] = 'Information';
$_LANG['guest-tracking_4d0e5e8b1d1499804f5b525e9b553f5d'] = 'Click here to log-in to your customer account';
$_LANG['guest-tracking_d2948a89e47a4ad7eb8412c1c260ea88'] = 'To track your order, please enter the following information:';
$_LANG['guest-tracking_83fa39a28a4d159061c408fbd6a249e7'] = 'Order ID:';
$_LANG['guest-tracking_d51b1df43394fe14cd03d5bcb3a7216b'] = 'For example: 010123';
$_LANG['guest-tracking_df1555fe48479f594280a2e03f9a8186'] = 'E-mail:';
$_LANG['guest-tracking_f0d1e86ef00ea0cae0b5a1d3adc8b0c1'] = 'View my order';
$_LANG['header_0fcd4065ff78fceb3083316ddb958bc1'] = 'You cannot place a new order from your country.';
$_LANG['history_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'My account';
$_LANG['history_782c8b38bce4f2f6975ca7f33ac8189b'] = 'Order history';
$_LANG['history_26aa02964b3c2f82231e4c064150e29e'] = 'Here are the orders you have placed since the creation of your account';
$_LANG['history_3e6efdbf10e06032e7f0ff19aa43bb79'] = 'If you have just placed an order, it may take a few minutes for it to be validated. Please refresh this page if your order is missing.';
$_LANG['history_a240fa27925a635b08dc28c9e4f9216d'] = 'Order';
$_LANG['history_44749712dbec183e983dcd78a7736c41'] = 'Date';
$_LANG['history_0eede552438475bdfe820c13f24c9399'] = 'Total price';
$_LANG['history_c453a4b8e8d98e82f35b67f433e3b4da'] = 'Payment';
$_LANG['history_ec53a8c4f07baed5d8825072c89799be'] = 'Status';
$_LANG['history_466eadd40b3c10580e3ab4e8061161ce'] = 'Invoice';
$_LANG['history_1b6324ace95b17a01323052fda855989'] = 'Products to download';
$_LANG['history_01abfc750a0c942167651c40d088531d'] = '#';
$_LANG['history_bcd1b68617759b1dfcff0403a6b5a8d1'] = 'PDF';
$_LANG['history_27792947ed5d5da7c0d1f43327ed9dab'] = 'details';
$_LANG['history_332c80b1838dc515f5031e09da3b7f3f'] = 'Reorder';
$_LANG['history_5acc2ceeb883ba07cef2d02ea382f242'] = 'You have not placed any orders.';
$_LANG['history_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to Your Account';
$_LANG['history_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
$_LANG['identity_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'My account';
$_LANG['identity_6335a00a08fde0fbb8f6d6630cdadd92'] = 'Your personal information';
$_LANG['identity_94d33283c51fdd4a296157461259aee0'] = 'Your personal information has been successfully updated.';
$_LANG['identity_8514d6418c5a503c4accac47e764ce11'] = 'Your password has been sent to your e-mail:';
$_LANG['identity_91724108825d34f1636cda352524df67'] = 'Please be sure to update your personal information if it has changed.';
$_LANG['identity_19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
$_LANG['identity_b78a3223503896721cca1303f776159b'] = 'Title';
$_LANG['identity_127469a6b4253ebb77adccc0dd48461e'] = 'Mr.';
$_LANG['identity_29e32764941c30d1bb41c601014fbdbd'] = 'Ms.';
$_LANG['identity_20db0bfeecd8fe60533206a2b5e9891a'] = 'First name';
$_LANG['identity_8d3f5eff9c40ee315d452392bed5309b'] = 'Last name';
$_LANG['identity_1e884e3078d9978e216a027ecd57fb34'] = 'E-mail';
$_LANG['identity_4bc28f132d571b160ba407e143915de2'] = 'Current Password';
$_LANG['identity_ae3bb2a1ac61750150b606298091d38a'] = 'New Password';
$_LANG['identity_f4d1ea475eaa85102e2b4e6d95da84bd'] = 'Confirmation';
$_LANG['identity_10803b83a68db8f7e7a33e3b41e184d0'] = 'Date of Birth';
$_LANG['identity_86f5978d9b80124f509bdb71786e929e'] = 'January';
$_LANG['identity_659e59f062c75f81259d22786d6c44aa'] = 'February';
$_LANG['identity_fa3e5edac607a88d8fd7ecb9d6d67424'] = 'March';
$_LANG['identity_3fcf026bbfffb63fb24b8de9d0446949'] = 'April';
$_LANG['identity_195fbb57ffe7449796d23466085ce6d8'] = 'May';
$_LANG['identity_688937ccaf2a2b0c45a1c9bbba09698d'] = 'June';
$_LANG['identity_1b539f6f34e8503c97f6d3421346b63c'] = 'July';
$_LANG['identity_41ba70891fb6f39327d8ccb9b1dafb84'] = 'August';
$_LANG['identity_cc5d90569e1c8313c2b1c2aab1401174'] = 'September';
$_LANG['identity_eca60ae8611369fe28a02e2ab8c5d12e'] = 'October';
$_LANG['identity_7e823b37564da492ca1629b4732289a8'] = 'November';
$_LANG['identity_82331503174acbae012b2004f6431fa5'] = 'December';
$_LANG['identity_6f6162d3a052bb330e9c60285c74c6c9'] = 'Sign up for our newsletter';
$_LANG['identity_ac135c86084a47630c9eadb4edd5ef75'] = 'Receive special offers from our partners';
$_LANG['identity_c9cc8cce247e49bae79f15173ce97354'] = 'Save';
$_LANG['identity_b340f66ef028af40a01d073966d593a9'] = '[Insert customer data privacy clause or law here, if applicable]';
$_LANG['identity_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account';
$_LANG['identity_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
$_LANG['maintenance_e1d4f332b928d40fa3f9df3b7795da4f'] = 'In order to perform site maintenance, our online shop is closed temporarily. We apologize for the inconvenience and ask that you please try again later.';
$_LANG['manufacturer-list_2377be3c2ad9b435ba277a73f0f1ca76'] = 'Manufacturers';
$_LANG['manufacturer-list_ce7bdbaa2a5998973271d85172456ee6'] = 'There are no manufacturers.';
$_LANG['manufacturer-list_4ce81305b7edb043d0a7a5c75cab17d0'] = 'There is';
$_LANG['manufacturer-list_6357d3551190ec7e79371a8570121d3a'] = 'There are';
$_LANG['manufacturer-list_17fc949d3618e4e954ad9c3b6005378d'] = 'manufacturer.';
$_LANG['manufacturer-list_3fa2b11f3f485404874b0e209b5be196'] = 'manufacturers.';
$_LANG['manufacturer-list_f5bf48aa40cad7891eb709fcf1fde128'] = 'product';
$_LANG['manufacturer-list_86024cad1e83101d97359d7351051156'] = 'products';
$_LANG['manufacturer-list_3426bf3cca12b1f6550fd8bd36171e2f'] = 'view products';
$_LANG['manufacturer_2f09fc3dc3fc1518375e48a05ccabe2d'] = 'List of products by manufacturer';
$_LANG['manufacturer_a65ed5e8df4b1c2bb34844f81cc9b451'] = 'No products for this manufacturer.';
$_LANG['my-account_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'My account';
$_LANG['my-account_c75db6799ed40b04a5f0fe865cb75020'] = 'Welcome to your account. Here, you can manage your addresses and orders.';
$_LANG['my-account_7442e29d7d53e549b78d93c46b8cdcfc'] = 'Orders';
$_LANG['my-account_d1c55b03aa566f1dbe40569fe957c496'] = 'History and details of my orders';
$_LANG['my-account_e06d7593c1cd6dabef450be6c3da7091'] = 'Merchandise returns';
$_LANG['my-account_89080f0eedbd5491a93157930f1e45fc'] = 'My merchandise returns';
$_LANG['my-account_d1a365ea7809ae5831c6d9f86886630c'] = 'Credit slips';
$_LANG['my-account_9132bc7bac91dd4e1c453d4e96edf219'] = 'My credit slips';
$_LANG['my-account_284b47b0bb63ae2df3b29f0e691d6fcf'] = 'Addresses';
$_LANG['my-account_e45be0a0d4a0b62b15694c1a631e6e62'] = 'My addresses';
$_LANG['my-account_a82be0f551b8708bc08eb33cd9ded0cf'] = 'Information';
$_LANG['my-account_4c8a50af0ebcf49be0cf4e0f67f37595'] = 'My personal information';
$_LANG['my-account_a82868319826fb092b73968e661b5b38'] = 'Vouchers';
$_LANG['my-account_95d2137c196c7f84df5753ed78f18332'] = 'My vouchers';
$_LANG['my-account_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
$_LANG['new-products_9ff0635f5737513b1a6f559ac2bff745'] = 'New products';
$_LANG['new-products_d58424783355b6da2dedc302f2bf4065'] = 'No new products.';
$_LANG['order-address_f5bf48aa40cad7891eb709fcf1fde128'] = 'product';
$_LANG['order-address_86024cad1e83101d97359d7351051156'] = 'products';
$_LANG['order-address_da9d6ec2998a07c31ec9eb93c9f254ed'] = 'Your billing address';
$_LANG['order-address_8a8c9edb5531fa2f822295d1830d090f'] = 'Your delivery address';
$_LANG['order-address_06933067aafd48425d67bcb01bba5cb6'] = 'Update';
$_LANG['order-address_284b47b0bb63ae2df3b29f0e691d6fcf'] = 'Addresses';
$_LANG['order-address_d0748d2df4aed77bd7591b3ac6c52c83'] = 'Choose a delivery address:';
$_LANG['order-address_d40f5cb3e1fbb5760a8d2a44a1241d4d'] = 'Use the delivery address as the billing address.';
$_LANG['order-address_82a7d396bbd6f6fef648578b4ae2ea81'] = 'Choose a billing address:';
$_LANG['order-address_ec211f7c20af43e742bf2570c3cb84f9'] = 'Add';
$_LANG['order-address_b15e1100a6196acba01ef7aaa5b2a9e5'] = 'Add a new address';
$_LANG['order-address_617096c86d35478132502be00e12e016'] = 'If you would like to add a comment about your order, please write it below.';
$_LANG['order-address_dd1f775e443ff3b9a89270713580a51b'] = 'Previous';
$_LANG['order-address_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Next';
$_LANG['order-carrier_f5bf48aa40cad7891eb709fcf1fde128'] = 'product';
$_LANG['order-carrier_86024cad1e83101d97359d7351051156'] = 'products';
$_LANG['order-carrier_5508a53851720a210e50f7b8a6f66f46'] = 'You must agree to the terms of service before continuing.';
$_LANG['order-carrier_e7a6ca4e744870d455a57b644f696457'] = 'Free!';
$_LANG['order-carrier_ea9cf7e47ff33b2be14e6dd07cbcefc6'] = 'Shipping';
$_LANG['order-carrier_6f05787682585c32498e88bcd2ea88fc'] = 'Delivery methods';
$_LANG['order-carrier_e4045598261988d9988c594243a9434d'] = 'Terms of service';
$_LANG['order-carrier_605eef3cad421619ce034ab48415190f'] = 'I agree to the terms of service and will adhere to them unconditionally.';
$_LANG['order-carrier_674bb1e64d73fb88b873caf79ba06128'] = '(read)';
$_LANG['order-carrier_e085dcd05d73bdd5afe338e5b6e42a18'] = 'Choose your delivery method';
$_LANG['order-carrier_c8c4080207cd4f02548c8cb6285bd16b'] = 'No carrier needed for this order';
$_LANG['order-carrier_0fce1189b263c211a8239fb0e9df004d'] = 'I agree to receive my order in recycled packaging';
$_LANG['order-carrier_8f90815af11493295587f91f571c2f95'] = 'There are no carriers available that deliver to this address.';
$_LANG['order-carrier_914419aa32f04011357d3b604a86d7eb'] = 'Carrier';
$_LANG['order-carrier_a82be0f551b8708bc08eb33cd9ded0cf'] = 'Information';
$_LANG['order-carrier_3601146c4e948c32b6424d2c0a7f0118'] = 'Price';
$_LANG['order-carrier_21034ae6d01a83e702839a72ba8a77b0'] = '(tax excl.)';
$_LANG['order-carrier_1f87346a16cf80c372065de3c54c86d9'] = '(tax incl.)';
$_LANG['order-carrier_0d9175fe89fb80d815e7d03698b6e83a'] = 'Gift';
$_LANG['order-carrier_ea3bd794dfeb4537c194ee43899516ed'] = 'I would like my order to be gift-wrapped.';
$_LANG['order-carrier_5c2dfd55fea1f5c6adef500fcb6403b4'] = 'Additional cost of';
$_LANG['order-carrier_b4e59f3a4554655a099738382ebedbff'] = 'If you wish, you can add a note to the gift:';
$_LANG['order-carrier_dd1f775e443ff3b9a89270713580a51b'] = 'Previous';
$_LANG['order-carrier_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Next';
$_LANG['order-carrier_bd5b551d1757a856d9f2d01dc7850080'] = 'Leave a message';
$_LANG['order-carrier_617096c86d35478132502be00e12e016'] = 'If you would like to add a comment about your order, please write it below.';
$_LANG['order-confirmation_fb077ecba55e5552916bde26d8b9e794'] = 'Order confirmation';
$_LANG['order-confirmation_e19e31ddb54b493059808ec4f2dab4cb'] = 'Your order ID is:';
$_LANG['order-confirmation_c3b59dc92773203d09404d887676376f'] = 'Your order ID has been sent to you via e-mail.';
$_LANG['order-confirmation_4082ea29b4f196c4f60533500139725a'] = 'Follow my order';
$_LANG['order-confirmation_9390390581f54c65d6acfc8da4e17362'] = 'Back to orders';
$_LANG['order-detail_d0b7240c8f04f7c73fb5c063042ab86b'] = 'Order placed on';
$_LANG['order-detail_332c80b1838dc515f5031e09da3b7f3f'] = 'Reorder';
$_LANG['order-detail_9aa2b51093a63aec1983d31dac4dc0f0'] = 'Follow your order step-by-step';
$_LANG['order-detail_44749712dbec183e983dcd78a7736c41'] = 'Date';
$_LANG['order-detail_ec53a8c4f07baed5d8825072c89799be'] = 'Status';
$_LANG['order-detail_ced55d097872ab13bf177e8d31db396f'] = 'Click the following link to track the delivery of your order';
$_LANG['order-detail_2ca3deb5cd68fa9119b285804fab572f'] = 'Order:';
$_LANG['order-detail_01abfc750a0c942167651c40d088531d'] = '#';
$_LANG['order-detail_f8617a92ba0a0a4eabee724eab7c9f48'] = 'Carrier:';
$_LANG['order-detail_c1f6368d15f7c13c4e5e8f70c68c747f'] = 'Payment method:';
$_LANG['order-detail_0e27a6c47d2529f58f60d0e28dcbafd7'] = 'Download your invoice as a PDF file';
$_LANG['order-detail_755bb0834a77079fd1330b555b69e6bf'] = 'You have given permission to receive your order in recycled packaging.';
$_LANG['order-detail_8efd9e9597e94fe3397c831f2ed1b7bd'] = 'You requested gift-wrapping for your order.';
$_LANG['order-detail_940663fd4428d2c86f9a4780b6574028'] = 'Message:';
$_LANG['order-detail_466eadd40b3c10580e3ab4e8061161ce'] = 'Invoice';
$_LANG['order-detail_065ab3a28ca4f16f55f103adc7d0226f'] = 'Delivery';
$_LANG['order-detail_63d5049791d9d79d86e9a108b0a999ca'] = 'Reference';
$_LANG['order-detail_deb10517653c255364175796ace3553f'] = 'Product';
$_LANG['order-detail_694e8d1f2ee056f98ee488bdc4982d73'] = 'Quantity';
$_LANG['order-detail_6c957f72dc8cdacc75762f2cbdcdfaf2'] = 'Unit price';
$_LANG['order-detail_0eede552438475bdfe820c13f24c9399'] = 'Total price';
$_LANG['order-detail_3a5199ec2407f4b2f90496072ea8f006'] = 'Total products (tax excl.):';
$_LANG['order-detail_db205f01b4fd580fb5daa9072d96849d'] = 'Total products';
$_LANG['order-detail_1f87346a16cf80c372065de3c54c86d9'] = '(tax incl.)';
$_LANG['order-detail_2633d6725607d13e80f5e30514b91fbe'] = 'Total vouchers:';
$_LANG['order-detail_a12925b3d2beb085f9a024d8098b41dd'] = 'Total gift-wrapping:';
$_LANG['order-detail_f4e8b53a114e5a17d051ab84d326cae5'] = 'Total shipping';
$_LANG['order-detail_66c4c5112f455a19afde47829df363fa'] = 'Total:';
$_LANG['order-detail_853ae90f0351324bd73ea615e6487517'] = ':';
$_LANG['order-detail_d8ea8f57bff2e29a27f3821ae74968bd'] = 'download this product';
$_LANG['order-detail_aec9b5b1c2f91ccdef8e25f5f1dac86a'] = 'Download product';
$_LANG['order-detail_f8f5730f2ee46b88120ff192190fb7cd'] = 'Voucher:';
$_LANG['order-detail_336d5ebc5436534e61d16e63ddfca327'] = '-';
$_LANG['order-detail_3956298bcfc047e15b0e0d218492ce09'] = 'Merchandise return';
$_LANG['order-detail_ac8f8f0de7595f3e4e813e3a1065a061'] = 'If you wish to return one or more products, please mark the corresponding boxes and provide an explanation for the return. Then click the button below.';
$_LANG['order-detail_f70389e39824fbcf34c2382a1ba9a458'] = 'Make a RMA slip';
$_LANG['order-detail_41de6d6cfb8953c021bbe4ba0701c8a1'] = 'Messages';
$_LANG['order-detail_5da618e8e4b89c66fe86e32cdafde142'] = 'From';
$_LANG['order-detail_4c2a8fe7eaf24721cc7a9f0175115bd4'] = 'Message';
$_LANG['order-detail_6357d3551190ec7e79371a8570121d3a'] = 'There are';
$_LANG['order-detail_4ce81305b7edb043d0a7a5c75cab17d0'] = 'There is';
$_LANG['order-detail_07213a0161f52846ab198be103b5ab43'] = 'errors';
$_LANG['order-detail_cb5e100e5a9a3e7f6d1fd97512215282'] = 'error';
$_LANG['order-detail_37c06f5486d3068a0a9604552c7e081f'] = 'Add a message:';
$_LANG['order-detail_617096c86d35478132502be00e12e016'] = 'f you would like to add a comment about your order, please write it below.';
$_LANG['order-detail_94966d90747b97d1f0f206c98a8b1ac3'] = 'Send';
$_LANG['order-detail_a9979df9e349275e2d86f7af03e24d14'] = 'You cannot make a merchandise return with a guest account';
$_LANG['order-follow_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'My account';
$_LANG['order-follow_bfc23574a242be4531bcb29877ac1d8a'] = 'Return Merchandise Authorization (RMA)';
$_LANG['order-follow_2e99578f8bd14385bc5bcc2608e7b938'] = 'You do not have enough products to request another merchandise return.';
$_LANG['order-follow_229ca46a5d762e19a428f59449c916ad'] = 'Please provide an explanation for your RMA.';
$_LANG['order-follow_e6f6a5e58ee6d010f22e4b3dbd756213'] = 'Please check at least one product you would like to return.';
$_LANG['order-follow_93d4be62cede66eb788f5ca8046bac7f'] = 'Please provide a quantity for the product you checked.';
$_LANG['order-follow_9bb4b32641712af2309584a5e97c0f73'] = 'This order cannot be returned.';
$_LANG['order-follow_e1b6d8e31d5a3dee879dddc77c492b81'] = 'Here are the merchandise returns you have made';
$_LANG['order-follow_988fd738de9c6d177440c5dcf69e73ce'] = 'Return';
$_LANG['order-follow_a240fa27925a635b08dc28c9e4f9216d'] = 'Order';
$_LANG['order-follow_d442cb92c3b031eceacbfe87605b9356'] = 'Package status';
$_LANG['order-follow_446faa7da2d42ba4ffeda73cb119dd91'] = 'Date issued';
$_LANG['order-follow_0d3cfc2fe56119651ee7848f3e32d84d'] = 'Return slip';
$_LANG['order-follow_01abfc750a0c942167651c40d088531d'] = '#';
$_LANG['order-follow_cc894fffb019b528d12951b74d6d2b6e'] = 'Order return';
$_LANG['order-follow_daf51d7d9e10e6a469434ae548d9a173'] = 'Print out';
$_LANG['order-follow_3976e0f730b236b1cf619dc80f78488e'] = 'You have no return merchandise authorizations.';
$_LANG['order-follow_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account';
$_LANG['order-follow_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
$_LANG['order-opc-new-account_08bd40c7543007ad06e4fce31618f6ec'] = 'Account';
$_LANG['order-opc-new-account_db879b00e657fc85f7873343f11df21c'] = 'Already registered?';
$_LANG['order-opc-new-account_936ccdb97115e9f35a11d35e3d5b5cad'] = 'Click here';
$_LANG['order-opc-new-account_8b5dd64ab8d0b8158906796b53a200e2'] = 'E-mail address';
$_LANG['order-opc-new-account_dc647eb65e6711e155375218212b3964'] = 'Password';
$_LANG['order-opc-new-account_bffe9a3c9a7e00ba00a11749e022d911'] = 'Log in';
$_LANG['order-opc-new-account_01a569ddc6cf67ddec2a683f0a5f5956'] = 'Forgot your password?';
$_LANG['order-opc-new-account_c28639657b4e3352241f83d8b6021e4e'] = 'New Customer';
$_LANG['order-opc-new-account_766d4aaf3e045538be23f9a9e17a1593'] = 'Instant Checkout';
$_LANG['order-opc-new-account_357e8e55cf47b6f04c354179b303105a'] = 'Checkout as guest';
$_LANG['order-opc-new-account_d50965b89f4bf0dfbc5b1f13052421a4'] = 'Create your account today and enjoy:';
$_LANG['order-opc-new-account_7a8fe8aaa64e691d82f429d39e0df3a5'] = 'Personalized and secure access';
$_LANG['order-opc-new-account_dec9cc6702179299ae451c11633915c6'] = 'Fast and easy check out';
$_LANG['order-opc-new-account_4efcd04126e90b74c744bab6c66b6e63'] = 'Separate billing and shipping addresses';
$_LANG['order-opc-new-account_2fdfd506efea08144c0794c32ca8250a'] = 'Create an account';
$_LANG['order-opc-new-account_1e884e3078d9978e216a027ecd57fb34'] = 'E-mail';
$_LANG['order-opc-new-account_bf2957630c4209f61a388a08c2154915'] = '(5 characters min.)';
$_LANG['order-opc-new-account_b78a3223503896721cca1303f776159b'] = 'Title';
$_LANG['order-opc-new-account_127469a6b4253ebb77adccc0dd48461e'] = 'Mr.';
$_LANG['order-opc-new-account_29e32764941c30d1bb41c601014fbdbd'] = 'Ms.';
$_LANG['order-opc-new-account_20db0bfeecd8fe60533206a2b5e9891a'] = 'First name';
$_LANG['order-opc-new-account_8d3f5eff9c40ee315d452392bed5309b'] = 'Last name';
$_LANG['order-opc-new-account_10803b83a68db8f7e7a33e3b41e184d0'] = 'Date of Birth';
$_LANG['order-opc-new-account_86f5978d9b80124f509bdb71786e929e'] = 'January';
$_LANG['order-opc-new-account_659e59f062c75f81259d22786d6c44aa'] = 'February';
$_LANG['order-opc-new-account_fa3e5edac607a88d8fd7ecb9d6d67424'] = 'March';
$_LANG['order-opc-new-account_3fcf026bbfffb63fb24b8de9d0446949'] = 'April';
$_LANG['order-opc-new-account_195fbb57ffe7449796d23466085ce6d8'] = 'May';
$_LANG['order-opc-new-account_688937ccaf2a2b0c45a1c9bbba09698d'] = 'June';
$_LANG['order-opc-new-account_1b539f6f34e8503c97f6d3421346b63c'] = 'July';
$_LANG['order-opc-new-account_41ba70891fb6f39327d8ccb9b1dafb84'] = 'August';
$_LANG['order-opc-new-account_cc5d90569e1c8313c2b1c2aab1401174'] = 'September';
$_LANG['order-opc-new-account_eca60ae8611369fe28a02e2ab8c5d12e'] = 'October';
$_LANG['order-opc-new-account_7e823b37564da492ca1629b4732289a8'] = 'November';
$_LANG['order-opc-new-account_82331503174acbae012b2004f6431fa5'] = 'December';
$_LANG['order-opc-new-account_6f6162d3a052bb330e9c60285c74c6c9'] = 'Sign up for our newsletter';
$_LANG['order-opc-new-account_ac135c86084a47630c9eadb4edd5ef75'] = 'Receive special offers from our partners';
$_LANG['order-opc-new-account_af0f5bdc5be121b9307687aeeae38c17'] = 'Delivery address';
$_LANG['order-opc-new-account_1c76cbfe21c6f44c1d1e59d54f3e4420'] = 'Company';
$_LANG['order-opc-new-account_dd7bf230fde8d4836917806aff6a6b27'] = 'Address';
$_LANG['order-opc-new-account_846a54955f32846032981f8fe48c35ff'] = 'Address (Line 2)';
$_LANG['order-opc-new-account_bd9014fe70f4f8bb1beed74e3b708483'] = 'Zip / Postal code';
$_LANG['order-opc-new-account_57d056ed0984166336b7879c2af3657f'] = 'City';
$_LANG['order-opc-new-account_59716c97497eb9694541f7c3d37b1a4d'] = 'Country';
$_LANG['order-opc-new-account_7cb32e708d6b961d476baced73d362bb'] = 'VAT number';
$_LANG['order-opc-new-account_46a2a41cc6e552044816a2d04634545d'] = 'State';
$_LANG['order-opc-new-account_b60bb13a87fe3ae5463aeb0980a5a8a1'] = 'Identification number';
$_LANG['order-opc-new-account_ea318a4ad37f0c2d2c368e6c958ed551'] = 'DNI / NIF / NIE';
$_LANG['order-opc-new-account_0f68b904e33d9ac04605aecc958bcf52'] = 'Additional information';
$_LANG['order-opc-new-account_fe66abce284ec8589e7d791185b5c442'] = 'Home phone';
$_LANG['order-opc-new-account_41c2fff4867cc204120f001e7af20f7a'] = 'Mobile phone';
$_LANG['order-opc-new-account_ae7bdef7fe2bbbbf02c11e92c5fceb40'] = 'My address';
$_LANG['order-opc-new-account_aee0c5ed0554d46465080ed36d1d93ab'] = 'Please use another address for invoice';
$_LANG['order-opc-new-account_601d8c4b9f72fc1862013c19b677a499'] = 'Invoice address';
$_LANG['order-opc-new-account_d30f507473129e70c4b962ceccf175cf'] = 'Zip / Postal Code';
$_LANG['order-opc-new-account_2eac22e71eedb5bdb8f94a1354964017'] = 'My Invoice address';
$_LANG['order-opc-new-account_c9cc8cce247e49bae79f15173ce97354'] = 'Save';
$_LANG['order-opc-new-account_6a35e1439d14f62e7177f59c175c886f'] = 'Account information saved successfully';
$_LANG['order-opc-new-account_19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
$_LANG['order-opc_a40cab5994f36d4c48103a22ca082e8f'] = 'Your shopping cart';
$_LANG['order-opc_5af5f631f774a71445e3028253874394'] = 'Your new order was not accepted.';
$_LANG['order-opc_1f87346a16cf80c372065de3c54c86d9'] = '(tax incl.)';
$_LANG['order-opc_21034ae6d01a83e702839a72ba8a77b0'] = '(tax excl.)';
$_LANG['order-opc_ea295188b69aa5e04810abcc38b2b2be'] = 'has been selected';
$_LANG['order-opc_9504d494016e17a6de7e7b51da637bc4'] = 'No carrier has been selected';
$_LANG['order-opc_238a062a6a2543fd85d6616a8506fbe8'] = 'No carrier is needed for this order';
$_LANG['order-opc_88b99d999766e043c9367b813b66cf58'] = 'No terms of service must be accepted';
$_LANG['order-opc_889fd2ddcd304e00d3b35d94a06c74af'] = 'Terms of service have been accepted';
$_LANG['order-opc_acd1d53aa434518183134b5459faf18b'] = 'Terms of service have not been accepted';
$_LANG['order-opc_4ce81305b7edb043d0a7a5c75cab17d0'] = 'There is';
$_LANG['order-opc_466ec9f29b485204ef53818459da48af'] = 'error(s)';
$_LANG['order-opc_af0f5bdc5be121b9307687aeeae38c17'] = 'Delivery address';
$_LANG['order-opc_601d8c4b9f72fc1862013c19b677a499'] = 'Invoice address';
$_LANG['order-opc_449374f661344e843453c4e189ddeed8'] = 'Modify my address';
$_LANG['order-opc_d87f73e8ff8d933ed2ba5ddf25040827'] = 'Instant checkout';
$_LANG['order-opc_879f6b8877752685a966564d072f498f'] = 'Your shopping cart is empty.';
$_LANG['order-payment_f5bf48aa40cad7891eb709fcf1fde128'] = 'product';
$_LANG['order-payment_86024cad1e83101d97359d7351051156'] = 'products';
$_LANG['order-payment_59319ac504f7ad04ae16126cf49e7f7e'] = 'Your payment method';
$_LANG['order-payment_9e6d9b3daa15e41d36806a289c42674d'] = 'Choose your payment method';
$_LANG['order-payment_df33aeec3bf8aa7e8c63b2c4b04898c5'] = 'Please select your preferred payment method to pay the amount of';
$_LANG['order-payment_1f87346a16cf80c372065de3c54c86d9'] = '(tax incl.)';
$_LANG['order-payment_8e1263b23607508e7ba8ff39aec8031d'] = 'No payment modules have been installed.';
$_LANG['order-payment_dd1f775e443ff3b9a89270713580a51b'] = 'Previous';
$_LANG['order-return_dfd57af0760925d5574fda1794d14de5'] = 'RE#';
$_LANG['order-return_ed2b5c0139cec8ad2873829dc1117d50'] = 'on';
$_LANG['order-return_88be9ea838e21273267409d76af3b284'] = 'We have logged your return request.';
$_LANG['order-return_dd0b8feb4eb6c389c284518f5683017c'] = 'Your package must be returned to us within';
$_LANG['order-return_ea62a2e28a800c367509773730120a67'] = 'days of receiving your order.';
$_LANG['order-return_c412711583768a1e9c2deafe9243eee9'] = 'Current status of your merchandise return:';
$_LANG['order-return_17806a71d233a243594b1210af57c245'] = 'List of items marked as returned:';
$_LANG['order-return_63d5049791d9d79d86e9a108b0a999ca'] = 'Reference';
$_LANG['order-return_deb10517653c255364175796ace3553f'] = 'Product';
$_LANG['order-return_694e8d1f2ee056f98ee488bdc4982d73'] = 'Quantity';
$_LANG['order-return_853ae90f0351324bd73ea615e6487517'] = ':';
$_LANG['order-return_fbbd47b7e45c0ad3fe0bf70539b5a2d4'] = 'REMINDER:';
$_LANG['order-return_1ca819fd1ccd9dfc3a091c66b778271f'] = 'All products must be returned in their original packaging without damage or wear.';
$_LANG['order-return_f3ba7c2fb2c65ad6fa1b1efd30573a8d'] = 'Please print out the';
$_LANG['order-return_28128d7dd99113d5978358aa2f4ab5f4'] = 'PDF return slip';
$_LANG['order-return_3ae26d5af95a7494d0101d3e129d91af'] = 'and include it with your package.';
$_LANG['order-return_66ee99389edd5e92826b6b9556a7eab8'] = 'Please see PDF return slip';
$_LANG['order-return_b1dceda8ca0eeb9fd9a4457bb613b67b'] = 'for the correct address';
$_LANG['order-return_c65ff655c5fd1d03cf7b39496929a507'] = 'Upon receiving your package, we will notify you by e-mail. We will then begin processing the reimbursement of your order total.';
$_LANG['order-return_2d0620950a4d96ae301ba7a98e528714'] = 'Please let us know if you have any questions.';
$_LANG['order-return_f637120d9f24c366b382ede6c21cddf0'] = 'If the conditions of return listed above are not respected, we reserve the right to refuse your package and/or reimbursement.';
$_LANG['order-return_2a161a7d653aa950ebe6e3637e036048'] = 'You must wait for our confirmation before returning any merchandise.';
$_LANG['order-slip_d95cf4ab2cbf1dfb63f066b50558b07d'] = 'My account';
$_LANG['order-slip_d1a365ea7809ae5831c6d9f86886630c'] = 'Credit slips';
$_LANG['order-slip_77346fbddedb12894e80d8a9132b6b87'] = 'Credit slips you have received after cancelled orders';
$_LANG['order-slip_cf3bae95c5f6023d5a10fe415b205a45'] = 'Credit slip';
$_LANG['order-slip_a240fa27925a635b08dc28c9e4f9216d'] = 'Order';
$_LANG['order-slip_446faa7da2d42ba4ffeda73cb119dd91'] = 'Date issued';
$_LANG['order-slip_3cb6ea48a427bf3a1687302e3b764c27'] = 'View credit slip';
$_LANG['order-slip_01abfc750a0c942167651c40d088531d'] = '#';
$_LANG['order-slip_591286c3b4f075453e55532838ce0044'] = 'Order slip';
$_LANG['order-slip_bcd1b68617759b1dfcff0403a6b5a8d1'] = 'PDF';
$_LANG['order-slip_0ba830b7ca1513a4882ce5aac84030b8'] = 'You have not received any credit slips.';
$_LANG['order-slip_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account';
$_LANG['order-slip_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
$_LANG['order-steps_290612199861c31d1036b185b4e69b75'] = 'Summary';
$_LANG['order-steps_99dea78007133396a7b8ed70578ac6ae'] = 'Login';
$_LANG['order-steps_dd7bf230fde8d4836917806aff6a6b27'] = 'Address';
$_LANG['order-steps_ea9cf7e47ff33b2be14e6dd07cbcefc6'] = 'Shipping';
$_LANG['order-steps_c453a4b8e8d98e82f35b67f433e3b4da'] = 'Payment';
$_LANG['pagination_dd1f775e443ff3b9a89270713580a51b'] = 'Previous';
$_LANG['pagination_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Next';
$_LANG['pagination_e0aa021e21dddbd6d8cecec71e9cf564'] = 'OK';
$_LANG['pagination_6c583afb157e33bfb5b7c3d4114c4dd5'] = 'items:';
$_LANG['password_0fb655f37529ad006eb0d503e23e10f1'] = 'Forgot your password?';
$_LANG['password_031887b627de11e30c85fef623422df2'] = 'Your password has been successfully reset and a confirmation has been sent to your e-mail address:';
$_LANG['password_10911a0ad07a041ea43230e25faad2d7'] = 'A confirmation e-mail has been sent to your address:';
$_LANG['password_55ad28443587997ac4fa56386ec2fc1d'] = 'Please enter the e-mail address used to register. We will send your new password to that address.';
$_LANG['password_df1555fe48479f594280a2e03f9a8186'] = 'E-mail:';
$_LANG['password_0d0e2934af7d3bc4e7263fcb1f9bc51c'] = 'Retrieve Password';
$_LANG['password_d28f8b8bba7b45bc5103b23b4f21b4fd'] = 'Return to Login';
$_LANG['password_95e6faaba5e8b016e5f9bcf5ea6c8270'] = 'Back to Login';
$_LANG['prices-drop_c8f312df214e2295809027c6ca79d232'] = 'Price drop';
$_LANG['prices-drop_62e15ca272c14c03aa52b64c8caf2334'] = 'No price drop.';
$_LANG['product-compare_97f014aa339f5b37951f100fb1a086d8'] = 'Please select at least one product';
$_LANG['product-compare_fe22c6b5957bca5380f9cf6529fea8c5'] = 'You cannot add more than';
$_LANG['product-compare_1a3addc6c8dccf79752c39ca4a3b6423'] = 'product(s) to the product comparison';
$_LANG['product-compare_7eece51cf3938103677db7a5051ef8f5'] = 'Compare';
$_LANG['product-list_03c2e7e41ffc181a4e84080b4710e81e'] = 'New';
$_LANG['product-list_800e90e940e7f1fb938b0fda5137f38c'] = 'On sale!';
$_LANG['product-list_ca2bf12169883f4982d8fe34b7e3c618'] = 'Reduced price!';
$_LANG['product-list_d0fcb89c94b29d6ab2db749ff688dc7c'] = 'Online only!';
$_LANG['product-list_78945de8de090e90045d299651a68a9b'] = 'Available';
$_LANG['product-list_cb3c718c905f00adbb6735f55bfb38ef'] = 'Product available with different options';
$_LANG['product-list_b55197a49e8c4cd8c314bc2aa39d6feb'] = 'Out of stock';
$_LANG['product-list_2d0f6b8300be19cf35e89e66f0677f95'] = 'Add to cart';
$_LANG['product-list_4351cfebe4b61d8aa5efa1d020710005'] = 'View';
$_LANG['product-list_77798ad342555ffa834758a2aaa6fc11'] = 'Select to compare';
$_LANG['product-sort_cfab1ba8c67c7c838db98d666f02a132'] = '--';
$_LANG['product-sort_b3c4afbd8ec3b1e28710fcbdc8cc0549'] = 'Price: lowest first';
$_LANG['product-sort_29ca2c66ccf5f39e95890f08204b3e85'] = 'Price: highest first';
$_LANG['product-sort_5820b5a5298779a25d98c41173b931bd'] = 'Product Name: A to Z';
$_LANG['product-sort_4f4f552919d5a7ad3435b5fdb7fcae61'] = 'Product Name: Z to A';
$_LANG['product-sort_baf800c24fcb4b5721f22a5a88f1f41a'] = 'In-stock first';
$_LANG['product-sort_33d8042bd735c559cc3206f4bc99aedc'] = 'Sort by';
$_LANG['product_e4aae275fc6b4d57daab4431b8bf736c'] = 'The combination does not exist for this product. Please choose another.';
$_LANG['product_bc0f7082192ef02e934a036cf4991789'] = 'This product is no longer in stock';
$_LANG['product_9173701581f0213f0104e064479e4ca3'] = 'with those attributes but is available with others';
$_LANG['product_78a2d6a3d6741d9d2cbff658d5df7cd8'] = 'Uploading in progress, please wait...';
$_LANG['product_c1f25211403ec7459f265788cdbee403'] = 'Please fill in all required fields, then save the customization.';
$_LANG['product_f9ddd507fdf437437efdcb333a0f4ff0'] = 'This product is not visible to your customers.';
$_LANG['product_110a4b01beabd53b661a47d4b44bd7a8'] = 'Publish';
$_LANG['product_0557fa923dcee4d0f86b1409f5c2167f'] = 'Back';
$_LANG['product_9981d2af851e4b4a4ea612d59f08ab9c'] = 'Other views';
$_LANG['product_dd1f775e443ff3b9a89270713580a51b'] = 'Previous';
$_LANG['product_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Next';
$_LANG['product_ea4788705e6873b424c65e91c2846b19'] = 'Cancel';
$_LANG['product_02ea084dc2ef3e9965dbba4ec87d2f9b'] = 'Display all pictures';
$_LANG['product_13dba24862cf9128167a59100e154c8d'] = 'Print';
$_LANG['product_c6beb9157a0e29e604ad5ec484488608'] = 'View full size';
$_LANG['product_2b56b60f878922093facd42284848a0c'] = 'More details';
$_LANG['product_e54a973d0c3342dac6ee7d9e145c6f83'] = 'Pack content';
$_LANG['product_98b0a68a7e4c7b265a5ca9a0b733d96e'] = 'Pick a color:';
$_LANG['product_588907ab2d492aca0b07b5bf9c931eea'] = 'On sale';
$_LANG['product_800e90e940e7f1fb938b0fda5137f38c'] = 'On sale!';
$_LANG['product_ca2bf12169883f4982d8fe34b7e3c618'] = 'Reduced price!';
$_LANG['product_887ee91702c962a70b87cbef07bbcaec'] = 'tax excl.';
$_LANG['product_e2e79605fc9450ec17957cf0e910f5c6'] = 'tax incl.';
$_LANG['product_ae0f500600029a1a5426495e82204ba6'] = '(price reduced by';
$_LANG['product_9371d7a2e3ae86a00aab4771e39d255d'] = ')';
$_LANG['product_7bb63c7de5a5ee79356083a12f21e1e8'] = 'instead of';
$_LANG['product_d436eb0fd9de10b54a828ce6435f7e81'] = 'include';
$_LANG['product_f85524c253c150e88136df3999ac3fd4'] = 'for green tax';
$_LANG['product_a134618182b99ff9151d7e0b6b92410a'] = '(not impacted by the discount)';
$_LANG['product_fe3838c7c11aa406dd956566e17360d5'] = 'per';
$_LANG['product_ea23e12cae068315b351f8d36d432d76'] = 'Reference:';
$_LANG['product_2c59ffd0a6631127450d729861975719'] = 'Quantity:';
$_LANG['product_07d814a3df5cfd2d637e77b215519034'] = 'You must add';
$_LANG['product_f3bbad73b35f19730399b3da21c3ef32'] = 'as a minimum quantity to buy this product.';
$_LANG['product_8c751c4aab0db0b811cdfbddf0b4ea56'] = 'Availability:';
$_LANG['product_4b98be16b76b0941840140f2043432a9'] = 'item in stock';
$_LANG['product_e16d56df08bbd47e53e153fc6dfc8ad8'] = 'items in stock';
$_LANG['product_0d83f0026f6d2923b2aa3a208156918c'] = 'Warning: Last items in stock!';
$_LANG['product_03de921a8ea82897e13d33d66c28b4db'] = 'Online only';
$_LANG['product_2d0f6b8300be19cf35e89e66f0677f95'] = 'Add to cart';
$_LANG['product_47f1a471a7f6a74053869cdb9cbf05bb'] = 'Quantity discount';
$_LANG['product_8beee69f53dcd358f9e333de43a3f506'] = 'quantities';
$_LANG['product_221d2a4bfdae13dbd5aeff3b02adb8c1'] = 'quantity';
$_LANG['product_71948aa4f6e12cdaa5e2e63a5eb8f142'] = 'More info';
$_LANG['product_7dcd185f890fd28f69d1ed210292d77f'] = 'Data sheet';
$_LANG['product_801ab24683a4a8c433c6eb40c48bcd9d'] = 'Download';
$_LANG['product_98edb85b00d9527ad5acebe451b3fae6'] = 'Accessories';
$_LANG['product_d3da97e2d9aee5c8fbe03156ad051c99'] = 'More';
$_LANG['product_4351cfebe4b61d8aa5efa1d020710005'] = 'View';
$_LANG['product_cb3c718c905f00adbb6735f55bfb38ef'] = 'Product available with different options';
$_LANG['product_b55197a49e8c4cd8c314bc2aa39d6feb'] = 'Out of stock';
$_LANG['product_54c02ba7929b1fda4847991a45b58a48'] = 'Product customization';
$_LANG['product_d5a90effea572da2df11559161c0930b'] = 'After saving your customized product, remember to add it to your cart.';
$_LANG['product_e5a75e83f9fd2f5fdff337a46227b3c3'] = 'Allowed file formats are: GIF, JPG, PNG';
$_LANG['product_b11ddc7e1671c0bd22dc89dd757508d4'] = 'Pictures';
$_LANG['product_f2a6c498fb90ee345d997f888fce3b18'] = 'Delete';
$_LANG['product_bb87e047206ecce912eec2afb5c29d6a'] = 'Please select an image file from your hard drive';
$_LANG['product_8957b8a4d2d2d8f7e4c5f7a4c365255f'] = 'Texts';
$_LANG['product_c9cc8cce247e49bae79f15173ce97354'] = 'Save';
$_LANG['product_7f8c1eb3bfb1d0f94b20515f3cc5a211'] = 'required fields';
$_LANG['products-comparison_4dbce7d8fae730e09fce9e83433c77ff'] = 'Product Comparison';
$_LANG['products-comparison_d3da97e2d9aee5c8fbe03156ad051c99'] = 'More';
$_LANG['products-comparison_800e90e940e7f1fb938b0fda5137f38c'] = 'On sale!';
$_LANG['products-comparison_ca2bf12169883f4982d8fe34b7e3c618'] = 'Reduced price!';
$_LANG['products-comparison_fe3838c7c11aa406dd956566e17360d5'] = 'per';
$_LANG['products-comparison_8c751c4aab0db0b811cdfbddf0b4ea56'] = 'Availability:';
$_LANG['products-comparison_bc0f7082192ef02e934a036cf4991789'] = 'This product is no longer in stock';
$_LANG['products-comparison_1063e38cb53d94d386f21227fcd84717'] = 'Remove';
$_LANG['products-comparison_4351cfebe4b61d8aa5efa1d020710005'] = 'View';
$_LANG['products-comparison_2d0f6b8300be19cf35e89e66f0677f95'] = 'Add to cart';
$_LANG['products-comparison_98f770b0af18ca763421bac22b4b6805'] = 'Features';
$_LANG['products-comparison_f5e15309ff0396474b8421ef48871d0b'] = 'No features to compare';
$_LANG['products-comparison_25257586d1e6d1404a80d2bc6505236f'] = 'There are no products in the comparison';
$_LANG['restricted-country_4ea06a9e8f9054fff852b1421f9f474b'] = 'You cannot access our store from your country. We apologize for the inconvenience.';
$_LANG['scenes_d3d2e617335f08df83599665eef8a418'] = 'Close';
$_LANG['scenes_03c2e7e41ffc181a4e84080b4710e81e'] = 'New';
$_LANG['scenes_800e90e940e7f1fb938b0fda5137f38c'] = 'On sale!';
$_LANG['scenes_ca2bf12169883f4982d8fe34b7e3c618'] = 'Reduced price!';
$_LANG['search_13348442cc6a27032d2b4aa28b75a5d3'] = 'Search';
$_LANG['search_e9cbf16b6f16ee339f45a841b915c47c'] = 'Return to previous page';
$_LANG['search_974056479706646f1e092ada9e3cfc2b'] = 'No results found for your search';
$_LANG['search_e59894bdfd0b523f5036ff21fa905474'] = 'Please type a search keyword';
$_LANG['search_374a2615c744dd856979150a5fcc285e'] = 'result has been found.';
$_LANG['search_e214e4077f303dd6547d22217ae84cc9'] = 'results have been found.';
$_LANG['shopping-cart-product-line_78945de8de090e90045d299651a68a9b'] = 'Available';
$_LANG['shopping-cart-product-line_b55197a49e8c4cd8c314bc2aa39d6feb'] = 'Out of stock';
$_LANG['shopping-cart-product-line_f2a6c498fb90ee345d997f888fce3b18'] = 'Delete';
$_LANG['shopping-cart-product-line_ec211f7c20af43e742bf2570c3cb84f9'] = 'Add';
$_LANG['shopping-cart-product-line_1d9baf077ee87921f57a8fe42d510b65'] = 'Subtract';
$_LANG['shopping-cart-product-line_07c5e982fa212f517539c266b7d5a166'] = 'You must purchase a minimum of';
$_LANG['shopping-cart-product-line_a2c97afedb345264c3c8fb81011bd010'] = 'of this product.';
$_LANG['shopping-cart_a40cab5994f36d4c48103a22ca082e8f'] = 'Your shopping cart';
$_LANG['shopping-cart_5f6b9be870bc784ecc15ddb5dcf7f22e'] = 'Shopping cart summary';
$_LANG['shopping-cart_879f6b8877752685a966564d072f498f'] = 'Your shopping cart is empty.';
$_LANG['shopping-cart_5af5f631f774a71445e3028253874394'] = 'This store has not accepted your new order.';
$_LANG['shopping-cart_f5bf48aa40cad7891eb709fcf1fde128'] = 'product';
$_LANG['shopping-cart_86024cad1e83101d97359d7351051156'] = 'products';
$_LANG['shopping-cart_80501a4e00716f2b94f22a465db82b51'] = 'Last product added';
$_LANG['shopping-cart_ab88d481b4332548cd3ca2aa26fd6edc'] = 'Your shopping cart contents';
$_LANG['shopping-cart_deb10517653c255364175796ace3553f'] = 'Product';
$_LANG['shopping-cart_b5a7adde1af5c87d7fd797b6245c2a39'] = 'Description';
$_LANG['shopping-cart_12d3c7a4296542c62474856ec452c045'] = 'Ref.';
$_LANG['shopping-cart_9ff9c46512c186ebae182519a55dc6a9'] = 'Avail.';
$_LANG['shopping-cart_6c957f72dc8cdacc75762f2cbdcdfaf2'] = 'Unit price';
$_LANG['shopping-cart_03ab340b3f99e03cff9e84314ead38c0'] = 'Qty';
$_LANG['shopping-cart_96b0141273eabab320119c467cdcaf17'] = 'Total';
$_LANG['shopping-cart_db205f01b4fd580fb5daa9072d96849d'] = 'Total products';
$_LANG['shopping-cart_21034ae6d01a83e702839a72ba8a77b0'] = '(tax excl.)';
$_LANG['shopping-cart_853ae90f0351324bd73ea615e6487517'] = ':';
$_LANG['shopping-cart_1f87346a16cf80c372065de3c54c86d9'] = '(tax incl.)';
$_LANG['shopping-cart_543ae6adeb524f98cc7d3c816a1ec1e3'] = 'Total products:';
$_LANG['shopping-cart_ada0f55ef37f4928c5cd970f378c15e8'] = 'Total vouchers';
$_LANG['shopping-cart_2633d6725607d13e80f5e30514b91fbe'] = 'Total vouchers:';
$_LANG['shopping-cart_9cc000efe3e783af5bf114f2e6573156'] = 'Total gift-wrapping';
$_LANG['shopping-cart_a12925b3d2beb085f9a024d8098b41dd'] = 'Total gift-wrapping:';
$_LANG['shopping-cart_f4e8b53a114e5a17d051ab84d326cae5'] = 'Total shipping';
$_LANG['shopping-cart_691b338fa68b3c177c6ebbc745624c6a'] = 'Total shipping:';
$_LANG['shopping-cart_1ad9dce3d19b51de499eeaa71418435b'] = 'Total (tax excl.):';
$_LANG['shopping-cart_856ab109229e8acfcddd5c6766a8d956'] = 'Subtotal:';
$_LANG['shopping-cart_598a4c4d56197cc1f6bca50b20aa484a'] = 'Total tax:';
$_LANG['shopping-cart_7ca91e615742b38bf7c41101b246fe95'] = 'Estimated Sales Tax:';
$_LANG['shopping-cart_d4262a684450da4efdd912182c32f4d1'] = 'Total (tax incl.):';
$_LANG['shopping-cart_66c4c5112f455a19afde47829df363fa'] = 'Total:';
$_LANG['shopping-cart_67db993438213ca5b77a394bce7d7b41'] = 'Remaining amount to be added to your cart to get free shipping:';
$_LANG['shopping-cart_2fb3b950fd7711136f7f251ae5fbdbdc'] = 'Text #';
$_LANG['shopping-cart_f2a6c498fb90ee345d997f888fce3b18'] = 'Delete';
$_LANG['shopping-cart_c8cd21bd2e33378f10611bc4498cf96f'] = 'Delete this customization';
$_LANG['shopping-cart_ec211f7c20af43e742bf2570c3cb84f9'] = 'Add';
$_LANG['shopping-cart_1d9baf077ee87921f57a8fe42d510b65'] = 'Subtract';
$_LANG['shopping-cart_a82868319826fb092b73968e661b5b38'] = 'Vouchers';
$_LANG['shopping-cart_bcc7582c9a66be8187578997794a9c1f'] = 'Code:';
$_LANG['shopping-cart_f7b96335c6a33477579e43f3da368507'] = 'Take advantage of our offers:';
$_LANG['shopping-cart_af0f5bdc5be121b9307687aeeae38c17'] = 'Delivery address';
$_LANG['shopping-cart_601d8c4b9f72fc1862013c19b677a499'] = 'Invoice address';
$_LANG['shopping-cart_f8617a92ba0a0a4eabee724eab7c9f48'] = 'Carrier:';
$_LANG['shopping-cart_914419aa32f04011357d3b604a86d7eb'] = 'Carrier';
$_LANG['shopping-cart_10ac3d04253ef7e1ddc73e6091c0cd55'] = 'Next';
$_LANG['shopping-cart_300225ee958b6350abc51805dab83c24'] = 'Continue shopping';
$_LANG['sitemap_5813ce0ec7196c492c97596718f71969'] = 'Sitemap';
$_LANG['sitemap_24cc85476cb8ec1a03192f09231e742b'] = 'Our offers';
$_LANG['sitemap_9ff0635f5737513b1a6f559ac2bff745'] = 'New products';
$_LANG['sitemap_3cb29f0ccc5fd220a97df89dafe46290'] = 'Top sellers';
$_LANG['sitemap_c8f312df214e2295809027c6ca79d232'] = 'Price drop';
$_LANG['sitemap_2377be3c2ad9b435ba277a73f0f1ca76'] = 'Manufacturers';
$_LANG['sitemap_1814d65a76028fdfbadab64a5a8076df'] = 'Suppliers';
$_LANG['sitemap_a0623b78a5f2cfe415d9dbbd4428ea40'] = 'Your Account';
$_LANG['sitemap_2433db5a329ea473271a3cd8c013362e'] = 'Personal information';
$_LANG['sitemap_284b47b0bb63ae2df3b29f0e691d6fcf'] = 'Addresses';
$_LANG['sitemap_9d5bf15117441a1b52eb1f0808e4aad3'] = 'Discounts';
$_LANG['sitemap_782c8b38bce4f2f6975ca7f33ac8189b'] = 'Order history';
$_LANG['sitemap_af1b98adf7f686b84cd0b443e022b7a0'] = 'Categories';
$_LANG['sitemap_453aceb005ceaf54a47da15fee8b2a26'] = 'Pages';
$_LANG['sitemap_bbaff12800505b22a853e8b7f4eb6a22'] = 'Contact';
$_LANG['sitemap_34c869c542dee932ef8cd96d2f91cae6'] = 'Our stores';
$_LANG['store_infos_6f8522e0610541f1ef215a22ffa66ff6'] = 'Monday';
$_LANG['store_infos_5792315f09a5d54fb7e3d066672b507f'] = 'Tuesday';
$_LANG['store_infos_796c163589f295373e171842f37265d5'] = 'Wednesday';
$_LANG['store_infos_78ae6f0cd191d25147e252dc54768238'] = 'Thursday';
$_LANG['store_infos_c33b138a163847cdb6caeeb7c9a126b4'] = 'Friday';
$_LANG['store_infos_8b7051187b9191cdcdae6ed5a10e5adc'] = 'Saturday';
$_LANG['store_infos_9d1a0949c39e66a0cd65240bc0ac9177'] = 'Sunday';
$_LANG['store_infos_ad179a1071ebd8b00e0ff4718301dcea'] = 'Hours:';
$_LANG['stores_34c869c542dee932ef8cd96d2f91cae6'] = 'Our stores';
$_LANG['stores_518c79bc64c2d9e528c1d56f7f2df9ac'] = 'Here are the details of our stores, feel free to contact us:';
$_LANG['stores_bea91105dec892251f9a0ec77ccdb182'] = 'No store found, try to select a wider radius';
$_LANG['stores_6cbcb5b200332cd223fd4f35f2f1a659'] = 'store found - see details:';
$_LANG['stores_6f7d0fc651c0564078d1f2f004e9c9de'] = 'stores found - see all results:';
$_LANG['stores_673ae02fffb72f0fe68a66f096a01347'] = 'Phone:';
$_LANG['stores_c556562cb1ccde3e1013ad55b47ce9ae'] = 'Get Directions';
$_LANG['stores_9e076f5885f5cc16a4b5aeb8de4adff5'] = 'Not found';
$_LANG['stores_b0bd4576e0f72c464860f7e52a6f48ca'] = 'Enter a location (e.g. zip / postal code, address, city or country) in order to find the nearest stores.';
$_LANG['stores_12e8c7785484eb1547a9793a6b8603f9'] = 'Your location:';
$_LANG['stores_74c037d72a34d5aa5fe1440ec7426f36'] = 'Address, zip / postal code, city, state or country';
$_LANG['stores_326684a8cb097db086be681022d9ae46'] = 'Radius:';
$_LANG['stores_13348442cc6a27032d2b4aa28b75a5d3'] = 'Search';
$_LANG['stores_01abfc750a0c942167651c40d088531d'] = '#';
$_LANG['stores_fdb0c388de01d545017cdf9ccf00eb72'] = 'Store';
$_LANG['stores_dd7bf230fde8d4836917806aff6a6b27'] = 'Address';
$_LANG['stores_0aa6f4210bf373c95eda00232e93cd98'] = 'Distance';
$_LANG['supplier-list_1814d65a76028fdfbadab64a5a8076df'] = 'Suppliers';
$_LANG['supplier-list_44cc6cf69e752cd267e29e71ac4175ff'] = 'There are no suppliers.';
$_LANG['supplier-list_4ce81305b7edb043d0a7a5c75cab17d0'] = 'There is';
$_LANG['supplier-list_6357d3551190ec7e79371a8570121d3a'] = 'There are';
$_LANG['supplier-list_13c6f6474ae3e11e2c2da11c07c05174'] = 'supplier.';
$_LANG['supplier-list_285e963189303f5819e77ec7450673af'] = 'suppliers.';
$_LANG['supplier-list_f5bf48aa40cad7891eb709fcf1fde128'] = 'product';
$_LANG['supplier-list_86024cad1e83101d97359d7351051156'] = 'products';
$_LANG['supplier-list_3426bf3cca12b1f6550fd8bd36171e2f'] = 'view products';
$_LANG['supplier_4bbacadd33aff22ab7468fa4f9efd717'] = 'List of products by supplier:';
$_LANG['supplier_71a863ca23a2b5d1dc82e60b908576b5'] = 'No products for this supplier.';
$_LANG['live_edit_282f96c7d1ed98d24606d209dcad9842'] = 'Module position saved';
$_LANG['live_edit_b5a7416281b1e9483305b7cdeb9db954'] = 'Are you sure? If you close this window, its position won\'t be saved.';
$_LANG['live_edit_d3d2e617335f08df83599665eef8a418'] = 'Close';
$_LANG['live_edit_ea4788705e6873b424c65e91c2846b19'] = 'Cancel';
$_LANG['live_edit_70d9be9b139893aa6c69b5e77e614311'] = 'Confirm';
$_LANG['live_edit_1b7c6a7f9b72974ede874b8fba9547a0'] = 'Add this module';
$_LANG['live_edit_da87eac3848a0d55560bdd129a0e134b'] = 'Unable to unregister hook';
$_LANG['live_edit_79030d996976f29a5e986a42d8f026e5'] = 'Unable to save module position';
$_LANG['live_edit_3c5b87f318f203adbfcc5d6a68959359'] = 'Failed to load module list';
$_LANG['live_edit_c9cc8cce247e49bae79f15173ce97354'] = 'Save';
$_LANG['live_edit_d8dcfab18b3a6eba56d617dd1dcb1ba7'] = 'Close LiveEdit';
?>
?>
+2 -2
View File
@@ -81,7 +81,7 @@
{/if}
</ul>
{/if}
{if $nb_products > 10}
{if $nb_products > $products_per_page}
<form action="{if !is_array($requestNb)}{$requestNb}{else}{$requestNb.requestUrl}{/if}" method="get" class="pagination">
<p>
{if isset($search_query) AND $search_query}<input type="hidden" name="search_query" value="{$search_query|escape:'htmlall':'UTF-8'}" />{/if}
@@ -109,4 +109,4 @@
{/if}
</div>
<!-- /Pagination -->
{/if}
{/if}
+552 -222
View File
File diff suppressed because it is too large Load Diff
+6 -2
View File
@@ -1067,11 +1067,14 @@ $_LANGADM['AdminImagesed13a29f9258d2b988ea7ba9d11de98b'] = 'Ne décochez cette c
$_LANGADM['AdminImages729a51874fe901b092899e9e8b31c97a'] = 'Êtes-vous sûr ?';
$_LANGADM['AdminImages874d3deed67e503cac1d8bc00417794a'] = 'Déplacer les images';
$_LANGADM['AdminImages0be9bdbde253c5d649e8667c0bae6754'] = 'PrestaShop utilise un nouveau système de stockage des images produits. Ce système offre de meilleures performances si votre boutique a un très grand nombre de produits.';
$_LANGADM['AdminImages5e869c034d4bd6df7f278053e786e4fb'] = 'Des images dupliquées ont été trouvées pendant le déplacement des images. Ceci est probablement causé par les images de démonstration de PrestaShop. Veuillez vérifier que le dossier';
$_LANGADM['AdminImages6ab89e213e3557e2ab248510d89051d1'] = 'ne contient que des images de démonstration, puis supprimez ce dossier.';
$_LANGADM['AdminImages6713e1295572974656e3e04d18e77ca9'] = 'PrestaShop a détecté que votre configuration serveur n\'est pas compatible avec le nouveau système de stockage d\'images (la directive \"safe_mode\" est activée). Vous devriez continuer à utiliser le système actuel.';
$_LANGADM['AdminImages0fb0d96026cc27f8a45d6cb909289903'] = 'Vous pouvez décider de garder vos images stockées dans l\'ancien système, cela ne pose aucun problème.';
$_LANGADM['AdminImages6e9b08be274aa15f116c641e4c9b8599'] = 'Vous pouvez aussi décider de déplacer vos images vers le nouveau système de stockage : dans ce cas, cliquez sur le bouton \"Déplacer les images\" ci-dessous. Merci d\'être patient, le processus peut prendre quelques minutes.';
$_LANGADM['AdminImages1bd266b7c30df50f9b77b0e0f55f2878'] = 'Après avoir déplacé toutes vos images produit, pour des performances optimales allez aux ';
$_LANGADM['AdminImagese686877843ac3c9f4c45aaea265fe59c'] = 'préférences produit';
$_LANGADM['AdminImages8b82bc51644c14c234bb3b635b2e2d1c'] = ' et changez \"Activer la compatibilité avec les anciennes images\" à NON.';
$_LANGADM['AdminImagesfb3164a4f7305b347948b8aca17c1735'] = ' et changez \"Utiliser l\'ancien système de stockage d\'images\" à NON.';
$_LANGADM['AdminImagesff17d73fa2731689640e8afa0f591b0f'] = 'Les images JPEG ont une taille de fichier petite et une qualité standard. Les images PNG ont une taille de fichier plus importante, une meilleure qualité, et gèrent la transparence. Notez que dans tous les cas les fichiers image auront l\'extension .jpg.';
$_LANGADM['AdminImagesff167676b1516b34e7f9be0fea5349d6'] = 'ATTENTION : Cette fonctionnalité peut ne pas être compatible avec votre thème ou avec certains modules. En particulier, le mode PNG n\'est pas compatible avec le module Filigrane. En cas de problème, désactivez cette fonctionnalité en sélectionnant \"Utiliser le JPEG\".';
$_LANGADM['AdminImages42ceb344b0aaf896b362b0db70b46f98'] = 'Qualité d\'image';
@@ -1142,6 +1145,7 @@ $_LANGADM['AdminImporte1a5e653bc356ed6745d6814d50213eb'] = 'Afficher le prix';
$_LANGADM['AdminImport4d2589e1bcd4263cb99927b59f0f88d2'] = 'URLs des images (x,y,z...)';
$_LANGADM['AdminImportecde3e896afb64e9a48781b8363b9a03'] = 'Caractéristique(Nom:Valeur:Position)';
$_LANGADM['AdminImport93b145201f52e9210402f4281ff8c188'] = 'Position de la caractéristique';
$_LANGADM['AdminImport21021ea0e52be8e9c599f4dff41e5be0'] = 'Caractéristique';
$_LANGADM['AdminImport71d0ceacdf562024f2d4c3a76d3b63e4'] = 'Uniquement disponible en ligne';
$_LANGADM['AdminImport9e2941b3c81256fac10392aaca4ccfde'] = 'Etat';
$_LANGADM['AdminImportf8a0fa3674c3336359b77bbe8e942a2c'] = 'ID ou nom de la boutique';
@@ -1772,7 +1776,7 @@ $_LANGADM['AdminPPreferences048a517fd1781ed314402df592f2ea68'] = 'Largeur :';
$_LANGADM['AdminPPreferencesc9c4e9c1a92d9b15e0cdefc7ddb1bbd5'] = 'La largeur maximum des images envoyées par les clients';
$_LANGADM['AdminPPreferences9a61f5ce3180789a8455f536681cabc1'] = 'Hauteur :';
$_LANGADM['AdminPPreferencesdde6c96bcb0af50f18f37572267d904a'] = 'La hauteur maximum des images envoyées par les clients';
$_LANGADM['AdminPPreferences044a77653804fe33652d68098d98121e'] = 'Activer la compatibilité avec les anciennes images';
$_LANGADM['AdminPPreferences044a77653804fe33652d68098d98121e'] = 'Utiliser l\'ancien système de stockage d\'images';
$_LANGADM['AdminPPreferencese7ed00268dc16aecaac5a60aeb6f4c73'] = 'Ce réglage doit rester sur \"Oui\" à moins que vous nayez déplacé avec succès les images dans l\'onglet Préférences > Image';
$_LANGADM['AdminPaymenta75b01d1ff66cd0a327bda1effa71dec'] = 'Liste de modules de paiement';
$_LANGADM['AdminPayment1f3a05f7b45df8e5c5cafaf0485eedd5'] = 'Cliquez pour voir la liste des modules de paiement.';