// Fix bug when fixtures are disabled + move install type (fixtures or not) to configure step

install-dev/controllers/http/configure.php

@@ -38,6 +38,7 @@ class InstallControllerHttpConfigure extends InstallControllerHttp
 		// Save shop configuration
 		$this->session->shop_name = trim(Tools::getValue('shop_name'));
 		$this->session->shop_activity = Tools::getValue('shop_activity');
+		$this->session->install_type = Tools::getValue('db_mode');
 		$this->session->shop_country = Tools::getValue('shop_country');
 		$this->session->shop_timezone = Tools::getValue('shop_timezone');
 
@@ -420,6 +421,9 @@ class InstallControllerHttpConfigure extends InstallControllerHttp
 		sort($list_activities);
 		$this->list_activities = $list_activities;
 
+		// Install type
+		$this->install_type = ($this->session->install_type) ? $this->session->install_type : 'full';
+
 		$this->displayTemplate('configure');
 	}
 

install-dev/controllers/http/database.php

@@ -54,8 +54,6 @@ class InstallControllerHttpDatabase extends InstallControllerHttp
 	 */
 	public function processNextStep()
 	{
-		$this->session->install_type = Tools::getValue('db_mode');
-
 		// Save database config
 		$this->session->database_server = trim(Tools::getValue('dbServer'));
 		$this->session->database_name = trim(Tools::getValue('dbName'));
@@ -151,7 +149,7 @@ class InstallControllerHttpDatabase extends InstallControllerHttp
 	 */
 	public function display()
 	{
-		if (!$this->session->install_type)
+		if (!$this->session->database_server)
 		{
 			if (file_exists(_PS_ROOT_DIR_.'/config/settings.inc.php'))
 			{
@@ -174,7 +172,6 @@ class InstallControllerHttpDatabase extends InstallControllerHttp
 			}
 
 			$this->database_clear = true;
-			$this->install_type = 'full';
 			$this->use_smtp = false;
 			$this->smtp_server = 'smtp.';
 			$this->smtp_encryption = 'off';
@@ -192,7 +189,6 @@ class InstallControllerHttpDatabase extends InstallControllerHttp
 			$this->database_prefix = $this->session->database_prefix;
 			$this->database_clear = $this->session->database_clear;
 
-			$this->install_type = $this->session->install_type;
 			$this->use_smtp = $this->session->use_smtp;
 			$this->smtp_server = $this->session->smtp_server;
 			$this->smtp_encryption = $this->session->smtp_encryption;

install-dev/controllers/http/process.php

@@ -91,7 +91,7 @@ class InstallControllerHttpProcess extends InstallControllerHttp
 			$this->processInstallModules();
 		else if (Tools::getValue('installFixtures') && !empty($this->session->process_validated['installModules']))
 			$this->processInstallFixtures();
-		else if (Tools::getValue('installTheme') && !empty($this->session->process_validated['installFixtures']))
+		else if (Tools::getValue('installTheme') && !empty($this->session->process_validated['installModules']))
 			$this->processInstallTheme();
 		else
 		{
@@ -220,7 +220,6 @@ class InstallControllerHttpProcess extends InstallControllerHttp
 		$this->model_install->xml_loader_ids = $this->session->xml_loader_ids;
 		if (!$this->model_install->installFixtures() || $this->model_install->getErrors())
 			$this->ajaxJsonAnswer(false, $this->model_install->getErrors());
-		$this->session->process_validated['installFixtures'] = true;
 		$this->ajaxJsonAnswer(true);
 	}
 

install-dev/theme/js/process.js

@@ -12,7 +12,7 @@ function start_install()
 	if (is_installing)
 		return;
 	is_installing = true;
-	
+
 	$('.process_step').removeClass('fail').removeClass('success').hide();
 	$('.error_log').hide();
 	$('#progress_bar').show();
@@ -88,7 +88,7 @@ function install_error(step, errors)
 		var list_errors = errors;
 		if ($.type(list_errors) == 'string')
 			list_errors = [list_errors];
-		
+
 		var display = '<ol>';
 		$.each(list_errors, function(k, v)
 		{

install-dev/theme/view.css

@@ -215,9 +215,13 @@ div.field {
 		width:245px;
 		vertical-align: top;
 }
+        div.field div.contentinput label {
+            display:inline;
+            margin-right: 10px;
+        }
 	div.field .userInfos {
 		display:inline-block;
-		width:200px;
+		width:210px;
 		font-size:11px;
 		font-family:Georgia;
 		font-style:italic;

install-dev/theme/views/configure.phtml

@@ -34,6 +34,22 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 		<p class="userInfos aligned"><?php echo $this->l('This information is not required, it will only be used for statistical purposes. This information does not change anything in your store.') ?></p>
 	</div>
 
+	<!-- Install type (with fixtures or not) -->
+	<div class="field clearfix">
+		<label class="aligned"><?php echo $this->l('Install demo products:') ?></label>
+		<div class="contentinput">
+			<label>
+				<input value="full" type="radio" name="db_mode" style="vertical-align: middle;" <?php if ($this->install_type == 'full'): ?>checked="checked"<?php endif; ?> />
+				<?php echo $this->l('Yes') ?>
+			</label>
+			<label>
+				<input value="lite" type="radio" name="db_mode" style="vertical-align: middle;" <?php if ($this->install_type == 'lite'): ?>checked="checked"<?php endif; ?> />
+				<?php echo $this->l('No'); ?>
+			</label>
+		</div>
+		<p class="userInfos aligned"><?php echo $this->l('Demo products are a good way to learn how to use PrestaShop. You should install them if you are not familiar with it.') ?></p>
+	</div>
+
 	<!-- Country list -->
 	<div class="field clearfix">
 		<label for="infosCountry" class="aligned"><?php echo $this->l('Default country:') ?></label>

install-dev/theme/views/database.phtml

@@ -57,20 +57,6 @@
 	</div>
 </div>
 
-<!-- Install type (with fixtures or not) -->
-<div id="dbTableParam">
-	<div>
-		<h2><?php echo $this->l('Installation type') ?></h2>
-		<p id="dbModeSetter" style="line-height: 20px;">
-			<input value="lite" type="radio" name="db_mode" id="db_mode_simple" style="vertical-align: middle;" <?php if ($this->install_type == 'lite'): ?>checked="checked"<?php endif; ?> />
-			<label for="db_mode_simple"><?php echo $this->l('Simple mode: Basic installation (FREE)'); ?></label><br />
-
-			<input value="full" type="radio" name="db_mode" id="db_mode_complet" style="vertical-align: middle;" <?php if ($this->install_type == 'full'): ?>checked="checked"<?php endif; ?> />
-			<label for="db_mode_complet"><?php echo $this->l('Sandbox mode: includes demo products (FREE)') ?></label>
-		</p>
-	</div>
-</div>
-
 <!-- Email configuration -->
 <div id="mailPart">
 	<h2><?php echo $this->l('E-mail delivery set-up') ?></h2>