From a127911a7f1a9c108ac05cd6b2ff0b368f17ca7c Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Fri, 23 Sep 2011 09:58:19 +0000
Subject: [PATCH] [-] Install : Add gender durring install [*] FO : Add
 gender_type "neutral" // Normalization

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8733 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/tabs/AdminGenders.php      | 26 ++++++++++++++------------
 classes/Gender.php                   |  8 ++++----
 install-dev/sql/db_settings_lite.sql | 22 ++++++++++++++++++++++
 3 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/admin-dev/tabs/AdminGenders.php b/admin-dev/tabs/AdminGenders.php
index fbcd334e4..c1faeca23 100644
--- a/admin-dev/tabs/AdminGenders.php
+++ b/admin-dev/tabs/AdminGenders.php
@@ -29,14 +29,14 @@ class AdminGenders extends AdminTab
 {
 	public function __construct()
 	{
-	 	$this->table = 'gender';
-	 	$this->className = 'Gender';
+		$this->table = 'gender';
+		$this->className = 'Gender';
 		$this->lang = true;
-	 	$this->edit = true;
-	 	$this->delete = true;
+		$this->edit = true;
+		$this->delete = true;
 
-	 	$this->fieldImageSettings = array('name' => 'image', 'dir' => 'genders');
- 		$this->fieldsDisplay = array(
+		$this->fieldImageSettings = array('name' => 'image', 'dir' => 'genders');
+		$this->fieldsDisplay = array(
 			'id_gender' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
 			'name' => array('title' => $this->l('Name'), 'width' => 150, 'filter_key' => 'b!name'),
 			'type' => array(
@@ -44,13 +44,13 @@ class AdminGenders extends AdminTab
 				'width' => 100,
 				'orderby' => false,
 				'type' => 'select',
-				'select' => array(0 => $this->l('Male'), 1 => $this->l('Female')),
+				'select' => array(0 => $this->l('Male'), 1 => $this->l('Female'), 2 => $this->l('Neutral')),
 				'filter_key' => 'a!type',
- 				'callback' => 'displayGenderType',
- 				'callback_object' => $this,
- 			),
- 			'image' => array('title' => $this->l('Image'), 'align' => 'center', 'image' => 'genders', 'orderby' => false, 'search' => false),
- 		);
+				'callback' => 'displayGenderType',
+				'callback_object' => $this,
+			),
+			'image' => array('title' => $this->l('Image'), 'align' => 'center', 'image' => 'genders', 'orderby' => false, 'search' => false),
+		);
 
 		parent::__construct();
 	}
@@ -88,6 +88,8 @@ class AdminGenders extends AdminTab
 					<label class="t" for="type_male"> '.$this->l('Male').'</label>
 					<input type="radio" name="type" id="type_female" value="1" '.($this->getFieldValue($obj, 'type') == 1 ? 'checked="checked" ' : '').'/>
 					<label class="t" for="type_female"> '.$this->l('Female').'</label>
+					<input type="radio" name="type" id="type_neutral" value="2" '.($this->getFieldValue($obj, 'type') == 2 ? 'checked="checked" ' : '').'/>
+					<label class="t" for="type_neutral"> '.$this->l('Neutral').'</label>
 				</div>
 				<div class="clear"></div>';
 
diff --git a/classes/Gender.php b/classes/Gender.php
index 215d46b63..06fff9f16 100644
--- a/classes/Gender.php
+++ b/classes/Gender.php
@@ -35,11 +35,11 @@ class GenderCore extends ObjectModel
 	public $type;
 
 	protected $fieldsRequired = array('type');
- 	protected $fieldsSize = array();
- 	protected $fieldsValidate = array();
+	protected $fieldsSize = array();
+	protected $fieldsValidate = array();
 	protected $fieldsRequiredLang = array('name');
- 	protected $fieldsSizeLang = array('name' => 20);
- 	protected $fieldsValidateLang = array('name' => 'isString');
+	protected $fieldsSizeLang = array('name' => 20);
+	protected $fieldsValidateLang = array('name' => 'isString');
 
 	protected $table = 'gender';
 	protected $identifier = 'id_gender';
diff --git a/install-dev/sql/db_settings_lite.sql b/install-dev/sql/db_settings_lite.sql
index 523d0e7e7..b163564b2 100644
--- a/install-dev/sql/db_settings_lite.sql
+++ b/install-dev/sql/db_settings_lite.sql
@@ -1307,3 +1307,25 @@ State:name
 Country:name
 phone' where `id_country`=10;
 
+
+INSERT INTO `PREFIX_gender` (`id_gender`, `type`) VALUES
+(1, 0),
+(2, 1),
+(3, 1);
+
+INSERT INTO `PREFIX_gender_lang` (`id_gender`, `id_lang`, `name`) VALUES
+(1, 1, 'Mr.'),
+(1, 2, 'M.'),
+(1, 3, 'Sr.'),
+(1, 4, 'Herr'),
+(1, 5, 'Sig.'),
+(2, 1, 'Ms.'),
+(2, 2, 'Mme'),
+(2, 3, 'Sra.'),
+(2, 4, 'Frau'),
+(2, 5, 'Sig.ra'),
+(3, 1, 'Miss'),
+(3, 2, 'Melle'),
+(3, 3, 'Miss'),
+(3, 4, 'Miss'),
+(3, 5, 'Miss');