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

[-] BO : Bug with genders icons

Browse Source
This commit is contained in:
gRoussac
2013-03-06 18:55:02 +01:00
parent 06da82c097
commit 5c37ee5d43
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCustomersController.php
+1 -1
View File
@@ -59,7 +59,7 @@ class AdminCustomersControllerCore extends AdminController
{ {
$gender_file = 'genders/'.$gender->id.'.jpg'; $gender_file = 'genders/'.$gender->id.'.jpg';
if (file_exists(_PS_IMG_DIR_.$gender_file)) if (file_exists(_PS_IMG_DIR_.$gender_file))
$genders_icon[$gender->id] = '../'.$gender_file; $genders_icon[$gender->id] = array('src' => '../'.$gender_file, 'alt' => $gender->name);
else else
$genders_icon[$gender->id] = $gender->name; $genders_icon[$gender->id] = $gender->name;
$genders[$gender->id] = $gender->name; $genders[$gender->id] = $gender->name;
install-dev/data/img/genders/Mr.jpg → install-dev/data/img/genders/1.jpg
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 875 B

After

Width:  |  Height:  |  Size: 875 B

install-dev/data/img/genders/Miss.jpg → install-dev/data/img/genders/2.jpg
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 866 B

After

Width:  |  Height:  |  Size: 866 B

install-dev/data/img/genders/Ms.jpg → install-dev/data/img/genders/3.jpg
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 866 B

After

Width:  |  Height:  |  Size: 866 B

install-dev/fixtures/apple/data/customer.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<field name="is_guest"/> <field name="is_guest"/>
</fields> </fields>
<entities> <entities>
<customer id="John" id_gender="4" id_default_group="3" firstname="John" lastname="DOE" passwd="75b019568bc6c84dda367661e855bdc2" last_passwd_gen="2012-02-01 09:08:06" birthday="1970-01-15" newsletter="1" ip_registration_newsletter="" newsletter_date_add="0000-00-00 00:00:00" optin="1" secure_key="b59e02456693eb0903a3645512ac9e1a" active="1" is_guest="0"> <customer id="John" id_gender="1" id_default_group="3" firstname="John" lastname="DOE" passwd="75b019568bc6c84dda367661e855bdc2" last_passwd_gen="2012-02-01 09:08:06" birthday="1970-01-15" newsletter="1" ip_registration_newsletter="" newsletter_date_add="0000-00-00 00:00:00" optin="1" secure_key="b59e02456693eb0903a3645512ac9e1a" active="1" is_guest="0">
<email>pub@prestashop.com</email> <email>pub@prestashop.com</email>
<note/> <note/>
</customer> </customer>
install-dev/upgrade/php/add_unknown_gender.php
+6 -6
View File
@@ -40,16 +40,16 @@ function add_unknown_gender()
// inserts lang values // inserts lang values
$languages = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'lang`'); $languages = Db::getInstance()->executeS('SELECT * FROM `'._DB_PREFIX_.'lang`');
$lang_names = array( $lang_names = array(
1 => 'Unknown', 'en' => 'Unknown',
2 => 'Unbekannte', 'de' => 'Unbekannte',
3 => 'Desconocido', 'es' => 'Desconocido',
4 => 'Inconnu', 'fr' => 'Inconnu',
5 => 'Sconosciuto', 'it' => 'Sconosciuto',
); );
foreach ($languages as $lang) foreach ($languages as $lang)
{ {
$name = (isset($lang_names[$lang['id_lang']]) ? $lang_names[$lang['id_lang']] : 'Unknown'); $name = (isset($lang_names[$lang['iso_code']]) ? $lang_names[$lang['iso_code']] : 'Unknown');
$res &= Db::getInstance()->execute(' $res &= Db::getInstance()->execute('
INSERT INTO `'._DB_PREFIX_.'gender_lang` (`id_gender`, `id_lang`, `name`) VALUES INSERT INTO `'._DB_PREFIX_.'gender_lang` (`id_gender`, `id_lang`, `name`) VALUES
('.(int)$id_gender.', '.(int)$lang['id_lang'].', \''.pSQL($name).'\')'); ('.(int)$id_gender.', '.(int)$lang['id_lang'].', \''.pSQL($name).'\')');