// Merge -> revision 8342

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8344 b9a71923-0436-4b27-9f14-aed3839534dd

install-dev/classes/LanguagesManager.php

@@ -95,9 +95,9 @@ class LanguageManager
 		*/
 	private function setLanguage()
 	{
-		if ( !empty($_GET['language']))
+		if (isset($_GET['language']))
 			$id_lang =  (int)($_GET['language'])>0 ? $_GET['language'] : 0;
-		if (empty($id_lang))
+		if (!isset($id_lang))
 			$id_lang = ($this->getIdByHAL());
 		$this->lang = $this->xml_file->lang[(int)($id_lang)];
 	}
@@ -107,3 +107,4 @@ class LanguageManager
 		return ($this->lang == NULL) ? false : dirname(__FILE__).$this->lang['trad_file'];
 	}
 }
+

install-dev/controller.js

@@ -258,7 +258,7 @@ function verifyThisStep()
 
 function setInstallerLanguage ()
 {
-	$("#formSetInstallerLanguage").submit();
+	$('#formSetInstallerLanguage').submit();
 }
 
 function verifyAndSetRequire(firsttime)
@@ -446,20 +446,36 @@ function createDB()
 				for (i = 0; countries_ret[i]; i=i+1)
 				{
 					html = html + '<option rel="'+countries_ret[i].getAttribute('iso')+'" value="'+countries_ret[i].getAttribute("value")+'" ';
-					if (countries_ret[i].getAttribute("value") == 8)
+					if (id_lang == 0)
+						$('#infosCountry').find('option[disabled=disabled]').attr('selected', 'selected');
+					else if (id_lang == 1 && countries_ret[i].getAttribute('value') == 8) /* France */
 						html = html + ' selected="selected" ';
-					html = html + ' >'+countries_ret[i].getAttribute("name")+'</option>';
+					else if (id_lang == 2 && countries_ret[i].getAttribute('value') == 6) /* Spain */
+						html = html + ' selected="selected" ';
+					else if (id_lang == 3 && countries_ret[i].getAttribute('value') == 1) /* Germany */
+						html = html + ' selected="selected" ';
+					else if (id_lang == 4 && countries_ret[i].getAttribute('value') == 10) /* Italy */
+						html = html + ' selected="selected" ';
+					html = html + ' >'+countries_ret[i].getAttribute('name')+'</option>';
 				}
-				$('#infosCountry').html(html);
+				$('#infosCountry').append(html);
 				html = '';
 				for (i = 0; timezone_ret[i]; i=i+1)
 				{
 					html = html + '<option value="'+timezone_ret[i].getAttribute("value")+'" ';
-					if (timezone_ret[i].getAttribute("value") == "Europe/Paris")
+					if (id_lang == 0)
+						$('#infosTimezone').find('option[disabled=disabled]').attr('selected', 'selected');
+					else if (id_lang == 1 && timezone_ret[i].getAttribute('value') == 'Europe/Paris') /* France */
 						html = html + ' selected="selected" ';
+					else if (id_lang == 2 && timezone_ret[i].getAttribute('value') == 'Europe/Madrid') /* Spain */
+						html = html + ' selected="selected" ';
+					else if (id_lang == 3 && timezone_ret[i].getAttribute('value') == 'Europe/Berlin') /* Germany */
+						html = html + ' selected="selected" ';
+					else if (id_lang == 4 && timezone_ret[i].getAttribute('value') == 'Europe/Rome') /* Italy */
+						html = html + ' selected="selected" ';					
 					html = html + ' >'+timezone_ret[i].getAttribute("name")+'</option>';
 				}
-				$('#infosTimezone').html(html);
+				$('#infosTimezone').append(html);
 				showStep(step+1, 'next');
 			}
 			else
@@ -628,25 +644,25 @@ function moveLanguage(direction)
 	}
 }
 
-function ajaxRefreshField(nthField, idResultField, fieldsList, inputId)
+function ajaxRefreshField(ret, idResultField, fieldMsg)
 {
-	var result = fieldsList[nthField].getAttribute("result");
-	if (result != "ok")
+	var pattern = 'field[id='+idResultField+']';
+	var result = $(ret).children().find(pattern).attr('result');
+	var error = $(ret).children().find(pattern).attr('error');
+	
+	if (error === undefined || result === undefined)
+		return true;
+		
+	if (result != 'ok')
 	{
-		$("#"+idResultField)
-			.html( txtError[parseInt(fieldsList[nthField].getAttribute("error"))] )
-			.addClass("errorBlock")
-			.show("slow");
+		$('#'+fieldMsg).html(txtError[parseInt(error)]).addClass('errorBlock').show('slow');
 		if (validShopInfos)
-			$("#"+inputId).focus();
+			$('#'+idResultField).focus();
 		return false;
 	}
 	else
 	{
-		$("#"+idResultField)
-			.html("")
-			.removeClass("errorBlock")
-			.show("slow");
+		$('#'+fieldMsg).html('').removeClass('errorBlock').show('slow');
 		return true;
 	}
 }
@@ -664,7 +680,7 @@ function verifyShopInfos()
 	
 	$.ajax(
 	{
-	   url: "model.php",
+	   url: 'model.php',
 	   async: true,
 	   cache: false,
 	   data:
@@ -693,21 +709,22 @@ function verifyShopInfos()
 		"&isoCodeLocalLanguage="+isoCodeLocalLanguage,
 	   success: function(ret)
 	   {
-			fieldsList = ret.getElementsByTagName('shopConfig')[0].getElementsByTagName('field');
 			validShopInfos = true;
-			if (!ajaxRefreshField(0, "resultInfosShop", fieldsList, "infosShop")) validShopInfos = false;
-			else if (!ajaxRefreshField(4, "resultInfosShop", fieldsList, "validateShop")) validShopInfos = false;
-			else if (!ajaxRefreshField(1, "resultInfosFirstname", fieldsList, "infosFirstname")) validShopInfos = false;
-			else if (!ajaxRefreshField(2, "resultInfosName", fieldsList, "infosName")) validShopInfos = false;
-			else if (!ajaxRefreshField(3, "resultInfosEmail", fieldsList, "infosEmail")) validShopInfos = false;
-			else if (!ajaxRefreshField(7, "resultInfosPassword", fieldsList, "infosPassword")) validShopInfos = false;
-			else if (!ajaxRefreshField(8, "resultInfosPasswordRepeat", fieldsList, "infosPasswordRepeat")) validShopInfos = false;
-			else if (!ajaxRefreshField(9, "resultInfosLanguages", fieldsList, "infosLanguages")) validShopInfos = false;
-			else if (!ajaxRefreshField(11, "resultInfosSQL", fieldsList, "infosSQL")) validShopInfos = false;
-			else if (!ajaxRefreshField(10, "resultInfosNotification", fieldsList, "infosNotification")) validShopInfos = false;
-			else if (!ajaxRefreshField(5, "resultInfosFirstname", fieldsList, "validateFirstname")) validShopInfos = false;
-			else if (!ajaxRefreshField(6, "resultInfosName", fieldsList, "validateName")) validShopInfos = false;
-			else if (!ajaxRefreshField(12, "resultCatalogMode", fieldsList, "validateCatalogMode")) validCatalogMode = false;
+			if (!ajaxRefreshField(ret, 'infosShop', 'resultInfosShop')) validShopInfos = false;
+			else if (!ajaxRefreshField(ret, 'infosCountry', 'resultInfosCountry')) validShopInfos = false;
+			else if (!ajaxRefreshField(ret, 'infosTimezone', 'resultInfosTimezone')) validShopInfos = false;	
+			else if (!ajaxRefreshField(ret, 'validateShop', 'resultInfosShop')) validShopInfos = false;
+			else if (!ajaxRefreshField(ret, 'infosFirstname', 'resultInfosFirstname')) validShopInfos = false;
+			else if (!ajaxRefreshField(ret, 'infosName', 'resultInfosName')) validShopInfos = false;
+			else if (!ajaxRefreshField(ret, 'infosEmail', 'resultInfosEmail')) validShopInfos = false;
+			else if (!ajaxRefreshField(ret, 'infosPassword', 'resultInfosPassword')) validShopInfos = false;
+			else if (!ajaxRefreshField(ret, 'infosPasswordRepeat', 'resultInfosPasswordRepeat')) validShopInfos = false;
+			else if (!ajaxRefreshField(ret, 'infosLanguages', 'resultInfosLanguages')) validShopInfos = false;
+			else if (!ajaxRefreshField(ret, 'infosSQL', 'resultInfosSQL')) validShopInfos = false;
+			else if (!ajaxRefreshField(ret, 'infosNotification', 'resultInfosNotification')) validShopInfos = false;
+			else if (!ajaxRefreshField(ret, 'validateFirstname', 'resultInfosFirstname')) validShopInfos = false;
+			else if (!ajaxRefreshField(ret, 'validateName', 'resultInfosName')) validShopInfos = false;
+			else if (!ajaxRefreshField(ret, 'validateCatalogMode', 'resultCatalogMode')) validCatalogMode = false;
 			else
 			{
 				$('#endShopName').html($('input#infosShop').val());
@@ -721,15 +738,10 @@ function verifyShopInfos()
 	 );
 }
 
-function autoCheckField(idField, idResultSpan, typeVerif)
+function checkRequired(idResultSpan, resValue)
 {
-	switch (typeVerif)
+	if(resValue == "")
 	{
-		case "required" :
-			$(idField).blur(function()
-			{
-				if($(this).val() == "")
-				{
 					$(idResultSpan)
 						.show("slow")
 						.addClass("errorBlock")
@@ -743,7 +755,15 @@ function autoCheckField(idField, idResultSpan, typeVerif)
 						.html("");
 				}
 			}
-			);
+
+function autoCheckField(idField, idResultSpan, typeVerif)
+{
+	switch (typeVerif)
+	{
+		case "required" :
+			$(idField).blur(function() { checkRequired(idResultSpan, $(this).val()); });
+			if (idField == '#infosCountry' || idField == '#infosTimezone')
+				$(idField).change(function() { checkRequired(idResultSpan, $(this).val()); });
 		break;
 		
 		case "mailFormat" :
@@ -998,6 +1018,8 @@ $(document).ready(
 		//autocheck fields
 		autoCheckField("#infosShop", "#resultInfosShop", "required");
 		autoCheckField("#infosFirstname", "#resultInfosFirstname", "firstnameFormat");
+		autoCheckField("#infosCountry", "#resultInfosCountry", "required");
+		autoCheckField("#infosTimezone", "#resultInfosTimezone", "required");
 		autoCheckField("#infosName", "#resultInfosName", "nameFormat");
 		autoCheckField("#infosEmail", "#resultInfosEmail", "mailFormat");
 		autoCheckField("#infosPassword", "#resultInfosPassword", "required");

install-dev/index.php

@@ -124,10 +124,10 @@ if ($lm->getIncludeTradFilename())
 		//php to js vars
 		var isoCodeLocalLanguage = "<?php echo $lm->getIsoCodeSelectedLang(); ?>";
 		var ps_base_uri = "<?php echo PS_BASE_URI; ?>";
-		var id_lang = "<?php echo (isset($_GET['language']) ? (int)($_GET['language']) : 0); ?>";
+		var id_lang = <?php echo (isset($_GET['language']) ? (int)($_GET['language']) : 0); ?>;
 
 		//localWords
-		var Step1Title = "<?php echo lang('Welcome').' - '.sprintf(lang('PrestaShop %s Installer'), INSTALL_VERSION); ?>";
+		var Step1Title = "<?php echo sprintf(lang('Welcome to the PrestaShop %s Installer'), INSTALL_VERSION); ?>";
 		var step2title = "<?php echo lang('System Compatibility').' - '.sprintf(lang('PrestaShop %s Installer'), INSTALL_VERSION); ?>";
 		var step3title = "<?php echo lang('System Configuration').' - '.sprintf(lang('PrestaShop %s Installer'), INSTALL_VERSION); ?>";
 		var step4title = "<?php echo lang('Shop Configuration').' - '.sprintf(lang('PrestaShop %s Installer'), INSTALL_VERSION); ?>";
@@ -268,6 +268,11 @@ if ($lm->getIncludeTradFilename())
 			<div><?php echo '<span>'.lang('Contact us!').'</span><br />'.lang('+33 (0)1.40.18.30.04'); ?></div>
 		</li>
 		<?php endif; ?>
+		<?php if ((isset($_GET['language']) AND $_GET['language'] == 0) OR $lm->getIsoCodeSelectedLang() == 'en'): ?>
+		<li id="phone_block" class="last">
+			<div><?php echo '<span>'.lang('Contact us!').'</span><br />'.lang('+1 (888) 947-6543'); ?></div>
+		</li>
+		<?php endif; ?>
 	</ul>
 
 	<div id="PrestaShopLogo">PrestaShop</div>
@@ -311,7 +316,8 @@ if ($lm->getIncludeTradFilename())
 			</ul>
 		</div>
 		
-		<h2><?php echo lang('Welcome to the PrestaShop '.INSTALL_VERSION.' Installer.')?></h2>
+		<h2 id="welcome-title"><?php echo lang('Welcome to the PrestaShop '.INSTALL_VERSION.' Installer.'); ?></h2>
+		<script type="text/javascript">$('#welcome-title').html(Step1Title);</script>
 		<p><?php echo lang('Please allow 5-15 minutes to complete the installation process.')?></p>
 		<p><?php echo lang('The PrestaShop Installer will do most of the work in just a few clicks.')?><br /><?php echo lang('However, you must know how to do the following manually:')?></p>
 		<ul>
@@ -326,9 +332,9 @@ if ($lm->getIncludeTradFilename())
 		<h2><?php echo lang('Choose the installer language:')?></h2>
 		<form id="formSetInstallerLanguage" action="<?php $_SERVER['REQUEST_URI']; ?>" method="get">
 			<ul id="langList" style="line-height: 20px;">
-			<?php foreach ($lm->getAvailableLangs() as $lang): ?>
+			<?php foreach ($lm->getAvailableLangs() AS $lang): ?>
 				<li><input onclick="setInstallerLanguage()" type="radio" value="<?php echo $lang['id'] ?>" <?php echo ( $lang['id'] == $lm->getIdSelectedLang() ) ? "checked=\"checked\"" : '' ?> id="lang_<?php echo $lang['id'] ?>" name="language" style="vertical-align: middle; margin-right: 0;" /><label for="lang_<?php echo $lang['id'] ?>">
-				<?php foreach ($lang->flags->url as $url_flag): ?>
+				<?php foreach ($lang->flags->url AS $url_flag): ?>
 					<img src="<?php echo $url_flag ?>" alt="<?php echo $lang['label'] ?>" style="vertical-align: middle;" />
 				<?php endforeach;  ?>
 				<?php echo $lang['label'] ?></label></li>
@@ -639,16 +645,20 @@ if ($lm->getIncludeTradFilename())
 				<div class="field">
 					<label for="infosCountry" class="aligned"><?php echo lang('Default country:'); ?></label>
 						<span class="contentinput">
-							<select id="infosCountry">
-					</select>
+							<select name="infosCountry" id="infosCountry">
+								<option disabled="disabled"><?php echo lang('-- Select your country --'); ?></option>
+							</select> <sup class="required">*</sup>
 						</span>
+						<span id="resultInfosCountry" class="result aligned"></span>
 				</div>
 				<div class="field">
 					<label for="infosTimezone" class="aligned"><?php echo lang('Shop\'s timezone:'); ?></label>
 						<span class="contentinput">
-							<select id="infosTimezone">
-					</select>
+							<select name="infosTimezone" id="infosTimezone">
+								<option disabled="disabled"><?php echo lang('-- Select your timezone --'); ?></option>
+							</select> <sup class="required">*</sup>
 						</span>
+						<span id="resultInfosTimezone" class="result aligned"></span>
 				</div>
 				<div class="field">
 					<label for="infosLogo" class="aligned logo"><?php echo lang('Shop logo'); ?> : </label>
@@ -737,6 +747,11 @@ if ($lm->getIncludeTradFilename())
 							$(".installModuleList.selected").removeClass("selected");
 							if ($("#modulesList" + $('select#infosCountry option:selected').attr('rel')))
 								$("#modulesList" + $('select#infosCountry option:selected').attr('rel')).addClass("selected");
+								$('#benefitsBlock').show();
+								if ($('div .installModuleList:visible').length == 0)
+									$('#benefitsBlock').hide();
+								else
+									$('#benefitsBlock').show();
 							$.ajax({
 								type: "GET",
 								url: "./php?controller=country_to_timezone.php?country="+$("select#infosCountry option:selected").attr('rel'),
@@ -744,6 +759,9 @@ if ($lm->getIncludeTradFilename())
 									$("select#infosTimezone").val(timezone);
 								}
 							});
+								
+								autoCheckField("#infosCountry", "#resultInfosCountry", "required");
+								autoCheckField("#infosTimezone", "#resultInfosTimezone", "required");
 						});
 					});
 				</script>
@@ -769,35 +787,36 @@ if ($lm->getIncludeTradFilename())
 						$result = simplexml_load_string($content);
 						if ($result->partner)
 						{
-							echo '
-							<h2>'.lang('Additional Benefits').'</h2>
-							<h3>'.lang('Exclusive offers dedicated to PrestaShop merchants').'</h3>';
-				
 							$modulesHelpInstall = array();
 							$modulesDescription = array();
 							$modulesPrechecked = array();
-							foreach ($result->partner as $p)
+								foreach ($result->partner AS $p)
 							{
 								$modulesDescription[trim($p->key)] = array('name' => trim($p->label), 'logo' => trim($p->logo_medium), 'label' => getPreinstallXmlLang($p, 'label'), 'description' => getPreinstallXmlLang($p, 'description'), 'more' => getPreinstallXmlLang($p, 'more'));
-								foreach ($p->country as $country_iso_code)
+									foreach ($p->country AS $country_iso_code)
 									$modulesHelpInstall[trim($country_iso_code)][] = trim($p->key);
 								if ($p->prechecked)
-									foreach ($p->prechecked as $country_iso_code)
+										foreach ($p->prechecked AS $country_iso_code)
 										$modulesPrechecked[trim($p->key)][trim($country_iso_code)] = 1;
 							}
-								echo '<table cellpadding="0" callspacing="0" border="0" class="moduleTable">
+								
+								if (sizeof($modulesHelpInstall))
+								{
+									echo '
+									<h2>'.lang('Additional Benefits').'</h2>
+									<h3>'.lang('Exclusive offers dedicated to PrestaShop merchants').'</h3>
+									<table cellpadding="0" callspacing="0" border="0" class="moduleTable">
 									<tr>
 										<th style="width: 30px;"></th>
-										<th style="width: 100px;">Modules</th>
-										<th style="padding: 12px; width: 430px;">Avantages</th>
+											<th style="width: 100px;">'.lang('Modules').'</th>
+											<th style="padding: 12px; width: 430px;">'.lang('Benefits').'</th>
 										</tr>
-									</table>
-								';
+									</table>';
 
-							foreach ($modulesHelpInstall as $country_iso_code => $modulesList)
+									foreach ($modulesHelpInstall AS $country_iso_code => $modulesList)
 							{
 								echo '<div class="installModuleList'.($country_iso_code == 'FR' ? ' selected' : '').'" id="modulesList'.$country_iso_code.'">';
-								foreach ($modulesList as $module)
+										foreach ($modulesList AS $module)
 								{
 									echo '
 										<table cellpadding="0" callspacing="0" border="0" class="moduleTable">
@@ -881,6 +900,7 @@ if ($lm->getIncludeTradFilename())
 							}
 						}
 					}
+						}
 
 				?>
 				<!-- Partner Modules -->
@@ -891,7 +911,7 @@ if ($lm->getIncludeTradFilename())
 
 					<?php echo lang('Optional languages'); ?><br/>
 					<select style="width:300px;" id="aLList" multiple="multiple" size="4">
-					<?php foreach ($lm->getAvailableLangs() as $lang){
+						<?php foreach ($lm->getAvailableLangs() AS $lang){
 						if ( $lang['id'] != $lm->getIdSelectedLang() AND $lang['id']  != "0" ){ ?>
 							<option value="<?php echo $lang->idLangPS ?>"><?php echo $lang['label'] ?></option>
 					<?php }} ?>
@@ -907,7 +927,7 @@ if ($lm->getIncludeTradFilename())
 					<?php echo lang('Available shop languages'); ?><br/>
 					<select style="width:240px;" id="wLList" size="4">
 						<option value="en">English (English)</option>
-						<?php foreach ($lm->getAvailableLangs() as $lang){
+							<?php foreach ($lm->getAvailableLangs() AS $lang){
 							if ( $lang['id'] == $lm->getIdSelectedLang() AND $lang['id']  != "0" ){ ?>
 								<option value="<?php echo $lang->idLangPS ?>"><?php echo $lang['label'] ?></option>
 						<?php }} ?>
@@ -916,7 +936,7 @@ if ($lm->getIncludeTradFilename())
 					<label for="dLList"><?php echo lang('Shop\'s default language'); ?></label><br/>
 					<select style="width:180px;" id="dLList">
 						<option selected="selected" value="en">English (English)</option>
-						<?php foreach ($lm->getAvailableLangs() as $lang){
+							<?php foreach ($lm->getAvailableLangs() AS $lang){
 							if ( $lang['id'] == $lm->getIdSelectedLang() AND $lang['id']  != "0" ){ ?>
 								<option selected="selected" value="<?php echo $lang->idLangPS ?>"><?php echo $lang['label'] ?></option>
 						<?php }} ?>

install-dev/langs/de.php

@@ -143,7 +143,7 @@ $_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\' und die readme-Dateien (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
 $_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.'] = 'Bienvenue dans l\'installation de PrestaShop %s';
+$_LANG['Welcome to the PrestaShop %s Installer'] = 'Bienvenue dans l\'installation de PrestaShop %s';
 $_LANG['When your files and database are saving in an other support, please certify that your shop is really backed up.'] = 'Sobald die Anwendungsdateien und Ihre Datenbank gesichert sind, werden wir Sie um Bestätigung bitten. Damit übernehmen Sie die gesamte Haftung eines möglichen Datenverlusts durch die Aktualisierung der PrestaShop-Anwendung.';
 $_LANG['Write permissions on folders (and subfolders):'] = 'Schreibberechtigung für die Ordner (und deren Unterordner):';
 $_LANG['Write permissions on files and folders:'] = 'Schreibberechtigung für die Dateien und Ordner:';
@@ -284,3 +284,5 @@ $_LANG['Additional Benefits'] = 'Exklusiv Angebot';
 $_LANG['Exclusive offers dedicated to PrestaShop merchants'] = 'Exklusiv Angebot für die Verkäufer PrestaShop';
 $_LANG['PHP magic quotes option is off (recommended)'] = 'Die PHP-Option "magic quotes" ist deaktiviert (empfohlen)';
 $_LANG['Other activity...'] = 'Andere activiteit...';
+$_LANG['Modules'] = 'Módulos';
+$_LANG['Benefits'] = 'Vorteile';

install-dev/langs/es.php

@@ -141,7 +141,7 @@ $_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\' y los archivos readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG)..';
 $_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';
+$_LANG['Welcome to the PrestaShop %s Installer'] = 'Bienvenido a la instalación de PrestaShop %s';
 $_LANG['When your files and database are saving in an other support, please certify that your shop is really backed up.'] = 'Una vez que los archivos de aplicación y su base de datos se hayan guardado, le pediremos que los certifique. Por lo tanto, usted asume plenamente su responsabilidad por cualquier pérdida de datos debido a la actualización de la aplicación PrestaShop.';
 $_LANG['Write permissions on folders (and subfolders):'] = 'en escritura en las carpetas (y sus subcarpetas) :';
 $_LANG['Write permissions on files and folders:'] = 'Derechos en escritura en los archivos y carpetas :';
@@ -284,3 +284,5 @@ $_LANG['Additional Benefits'] = 'Otros beneficios';
 $_LANG['Exclusive offers dedicated to PrestaShop merchants'] = 'Ofertas exclusivas dedicadas a los comerciantes PrestaShop';
 $_LANG['PHP magic quotes option is off (recommended)'] = 'La opción PHP "magic quotes" está desactivada (aconsejable)';
 $_LANG['Other activity...'] = 'Otra actividad...';
+$_LANG['Modules'] = 'Módulos';
+$_LANG['Benefits'] = 'Beneficios';

install-dev/langs/fr.php

@@ -63,7 +63,7 @@ $_LANG['Installation : complete install of the PrestaShop Solution'] = 'Installa
 $_LANG['Installation is complete!'] = 'Installation terminée !';
 $_LANG['Installation method'] = 'Méthode d\'installation';
 $_LANG['Last name:'] = 'Nom :';
-$_LANG['Licenses Agreement'] = 'Contrat de Licences';
+$_LANG['Licenses Agreement'] = 'Contrat de licences';
 $_LANG['PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.'] = 'Le coeur de PrestaShop est publié sous licence OSL 3.0 tandis que les modules et thèmes sont publiés sous licence AFL 3.0.';
 $_LANG['Login:'] = 'Identifiant :';
 $_LANG['Merchant info'] = 'Informations à propos du vendeur';
@@ -144,7 +144,7 @@ $_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\' et les fichiers readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
 $_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';
+$_LANG['Welcome to the PrestaShop %s Installer'] = 'Bienvenue dans l\'installation de PrestaShop %s';
 $_LANG['When your files and database are saving in an other support, please certify that your shop is really backed up.'] = 'Une fois que les fichiers de l\'application et votre base de données seront sauvegardés, nous vous demanderons de le certifier. De ce fait, vous assumerez l\'entière responsabilité d\'une éventuelle perte de données liée à la mise à jour de l\'application PrestaShop.';
 $_LANG['Write permissions on folders (and subfolders):'] = 'Droits en écriture sur les dossiers (et leurs sous-dossiers) :';
 $_LANG['Write permissions on files and folders:'] = 'Droits en écriture sur les fichiers et dossiers:';
@@ -290,3 +290,5 @@ $_LANG['Exclusive offers dedicated to PrestaShop merchants'] = 'Offres réservé
 $_LANG['PHP magic quotes option is off (recommended)'] = 'L\'option PHP "magic quotes" est désactivée (recommandé)';
 $_LANG['Dom extension loaded'] = 'L\'extension Dom est activée';
 $_LANG['Other activity...'] = 'Autre activité..';
+$_LANG['Modules'] = 'Modules';
+$_LANG['Benefits'] = 'Avantages';

install-dev/langs/it.php

@@ -143,7 +143,7 @@ $_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\'  e i file readme (readme_fr.txt, readme_en.txt, readme_es.txt, readme_de.txt, readme_it.txt, CHANGELOG).';
 $_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';
+$_LANG['Welcome to the PrestaShop %s Installer'] = 'Benvenuto nell\'installazione di PrestaShop %s';
 $_LANG['When your files and database are saving in an other support, please certify that your shop is really backed up.'] = 'Una volta salvati i tuoi file applicazione e il database, ti chiederemo di certificarlo.  Così facendo, ti assumerai tutte le responsabilità per qualsiasi perdita di dati dovuti ad un aggiornamento del software PrestaShop.';
 $_LANG['Write permissions on folders (and subfolders):'] = 'Scrivi i permessi sulle cartelle (e le loro sottocartelle):';
 $_LANG['Write permissions on files and folders:'] = 'Permessi di scrittura su file e cartelle:';
@@ -271,3 +271,5 @@ $_LANG['Additional Benefits'] = 'Ulteriori vantaggi';
 $_LANG['Exclusive offers dedicated to PrestaShop merchants'] = 'Offerte esclusivo dedicato ai venditori PrestaShop';
 $_LANG['PHP magic quotes option is off (recommended)'] = 'Opzione magic quotes PHP è disattivata (consigliato)';
 $_LANG['Other activity...'] = 'Altre attività ...';
+$_LANG['Modules'] = 'Moduli';
+$_LANG['Benefits'] = 'Vantaggi';

install-dev/preactivation.php

@@ -1,4 +1,5 @@
 <?php
+
 	require_once('../classes/Tools.php');
 	if (!isset($_GET['language']))
 		$_GET['language'] = 0;
@@ -26,7 +27,7 @@
 			{
 				$varList = "";
 				echo '<br clear="left" /><hr /><br clear="left" />';
-				foreach ($result->field as $field)
+				foreach ($result->field AS $field)
 				{
 					echo '<div><label class="aligned" style="float:left;width:200px;padding-left:10px;">'.getPreinstallXmlLang($field, 'label').' :</label>';
 					if ($field->type == 'text' || $field->type == 'password')
@@ -96,7 +97,6 @@
 
 	}
 
-
 	if ($_GET['request'] == 'send')
 	{
 		$stream_context = stream_context_create(array('http' => array('method'=>"GET", 'timeout' => 5)));

install-dev/sql/db_settings_lite.sql

@@ -232,7 +232,7 @@ INSERT INTO `PREFIX_category_lang` (`id_category`, `id_lang`, `name`, `descripti
 
 INSERT INTO `PREFIX_order_state` (`id_order_state`, `invoice`, `send_email`, `color`, `unremovable`, `logable`, `delivery`) VALUES
 (1, 0, 1, 'lightblue', 1, 0, 0),(2, 1, 1, '#DDEEFF', 1, 1, 0),(3, 1, 1, '#FFDD99', 1, 1, 1),(4, 1, 1, '#EEDDFF', 1, 1, 1),(5, 1, 0, '#DDFFAA', 1, 1, 1),
-(6, 0, 1, '#DADADA', 1, 0, 0),(7, 1, 1, '#FFFFBB', 1, 0, 0),(8, 0, 1, '#FFDFDF', 1, 0, 0),(9, 1, 1, '#FFD3D3', 1, 0, 0),(10, 0, 1, 'lightblue', 1, 0, 0),(11, 0, 0, 'lightblue', 1, 0, 0),(12, 0, 0, 'lightblue', 1, 0, 0);
+(6, 0, 1, '#DADADA', 1, 0, 0),(7, 1, 1, '#FFFFBB', 1, 0, 0),(8, 0, 1, '#FFDFDF', 1, 0, 0),(9, 1, 1, '#FFD3D3', 1, 0, 0),(10, 0, 1, 'lightblue', 1, 0, 0),(11, 0, 0, 'lightblue', 1, 0, 0),(12, 1, 0, '#DDEEFF', 1, 1, 0);
 
 INSERT INTO `PREFIX_order_state_lang` (`id_order_state`, `id_lang`, `name`, `template`) VALUES
 (1, 1, 'Awaiting cheque payment', 'cheque'),
@@ -307,7 +307,7 @@ INSERT INTO `PREFIX_country` (`id_country`, `id_zone`, `iso_code`, `call_prefix`
 (6, 1, 'ES', 34, 1, 0, 1, 1, 'NNNNN', 1),(7, 1, 'FI', 358, 1, 0, 0, 1, 'NNNNN', 1),(8, 1, 'FR', 33, 1, 0, 0, 1, 'NNNNN', 1),(9, 1, 'GR', 30, 1, 0, 0, 1, 'NNNNN', 1),(10, 1, 'IT', 39, 1, 1, 0, 1, 'NNNNN', 1),
 (11, 3, 'JP', 81, 1, 1, 0, 1, 'NNN-NNNN', 1),(12, 1, 'LU', 352, 1, 0, 0, 1, 'NNNN', 1),(13, 1, 'NL', 31, 1, 0, 0, 1, 'NNNN LL', 1),(14, 1, 'PL', 48, 1, 0, 0, 1, 'NN-NNN', 1),
 (15, 1, 'PT', 351, 1, 0, 0, 1, 'NNNN NNN', 1),(16, 1, 'CZ', 420, 1, 0, 0, 1, 'NNN NN', 1),(17, 1, 'GB', 44, 1, 0, 0, 1, '', 1),(18, 1, 'SE', 46, 1, 0, 0, 1, 'NNN NN', 1),
-(19, 7, 'CH', 41, 1, 0, 0, 1, 'NNNN', 1),(20, 1, 'DK', 45, 1, 0, 0, 1, 'NNNN', 1),(21, 2, 'US', 1, 1, 1, 0, 1, 'NNNNN', 1),(22, 3, 'HK', 852, 1, 0, 0, 0, '', 1),(23, 1, 'NO', 47, 1, 0, 0, 1, 'NNNN', 1),
+(19, 7, 'CH', 41, 1, 0, 0, 1, 'NNNN', 1),(20, 1, 'DK', 45, 1, 0, 0, 1, 'NNNN', 1),(21, 2, 'US', 1, 1, 1, 0, 1, 'NNNNN', 0),(22, 3, 'HK', 852, 1, 0, 0, 0, '', 1),(23, 1, 'NO', 47, 1, 0, 0, 1, 'NNNN', 1),
 (24, 5, 'AU', 61, 1, 0, 0, 1, 'NNNN', 1),(25, 3, 'SG', 65, 1, 0, 0, 1, 'NNNNNN', 1),(26, 1, 'IE', 353, 1, 0, 0, 1, '', 1),(27, 5, 'NZ', 64, 1, 0, 0, 1, 'NNNN', 1),(28, 3, 'KR', 82, 1, 0, 0, 1, 'NNN-NNN', 1),
 (29, 3, 'IL', 972, 1, 0, 0, 1, 'NNNNN', 1),(30, 4, 'ZA', 27, 1, 0, 0, 1, 'NNNN', 1),(31, 4, 'NG', 234, 1, 0, 0, 1, '', 1),(32, 4, 'CI', 225, 1, 0, 0, 1, '', 1),(33, 4, 'TG', 228, 1, 0, 0, 1, '', 1),
 (34, 6, 'BO', 591, 1, 0, 0, 1, '', 1),(35, 4, 'MU', 230, 1, 0, 0, 1, '', 1),(36, 1, 'RO', 40, 1, 0, 0, 1, 'NNNNNN', 1),(37, 1, 'SK', 421, 1, 0, 0, 1, 'NNN NN', 1),(38, 4, 'DZ', 213, 1, 0, 0, 1, 'NNNNN', 1),

install-dev/sql/upgrade/1.4.2.0.sql

@@ -12,7 +12,7 @@ ALTER TABLE `PREFIX_orders` ADD INDEX `date_add`(`date_add`);
 INSERT IGNORE INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VALUES
 ('PS_STOCK_MVT_REASON_DEFAULT', 3, NOW(), NOW());
 
-/* PHP:add_order_state(PS_OS_WS_PAYMENT, en:Payment remotely accepted|fr:Paiement à distance accepté, 0, 0, lightblue, 1, 0, 0); */;
+/* PHP:add_order_state(PS_OS_WS_PAYMENT, en:Payment remotely accepted|fr:Paiement à distance accepté, 1, 0, #DDEEFF, 1, 1, 0); */;
 /* PHP:alter_blocklink(); */;
 /* PHP:update_module_loyalty(); */;
 /* PHP:remove_module_from_hook(blockcategories, afterCreateHtaccess); */;

install-dev/xml/checkShopInfos.php

@@ -43,11 +43,11 @@ define('__PS_BASE_URI__', Context::getContext()->shop->getBaseURI());
 function isFormValid()
 {
 	global $error;
-	$validInfos = true;
+
 	foreach ($error as $anError)
 		if ($anError != '')
-			$validInfos = false;
-	return $validInfos;
+			return false;
+	return true;
 }
 
 $error = array();
@@ -85,6 +85,16 @@ if (isset($_GET['infosShop']) AND !Validate::isGenericName($_GET['infosShop']))
 else
 	$error['validateShop'] = '';
 
+if (!isset($_GET['infosCountry']) OR empty($_GET['infosCountry']))
+	$error['infosCountry'] = '0';
+else
+	$error['infosCountry'] = '';
+	
+if (!isset($_GET['infosTimezone']) OR empty($_GET['infosTimezone']))
+	$error['infosTimezone'] = '0';
+else
+	$error['infosTimezone'] = '';
+
 if (isset($_GET['infosFirstname']) AND !Validate::isName($_GET['infosFirstname']))
 	$error['validateFirstname'] = '47';
 else