Commit Graph
18608 Commits
Author SHA1 Message Date
Damien Metzger e56ec2f234 // BO : Changed product display on supplier page 2013-04-29 18:34:34 +02:00
Dragan Skrbic d00ccdf306 // Fixed image import 2013-04-29 18:07:42 +02:00
Dragan Skrbic 7f8a33763a // Fixed image import 2013-04-29 18:07:42 +02:00
Damien Metzger 4c259393f5 // Fixed case which caused duplicated translation #PSCFV-8936 2013-04-29 17:45:45 +02:00
Damien Metzger 7eba77ae66 // Fixed case which caused duplicated translation #PSCFV-8936 2013-04-29 17:45:45 +02:00
Damien Metzger 989b19d94a [-] BO : fixed image import with allow_url_fopen deactivated #PSCFV-8181 2013-04-29 17:45:45 +02:00
Damien Metzger 3600a31862 [-] BO : fixed image import with allow_url_fopen deactivated #PSCFV-8181 2013-04-29 17:45:45 +02:00
gRoussac 88adba8e5b // typo 2013-04-29 17:19:07 +02:00
gRoussac d2d4b68f7c // typo 2013-04-29 17:19:07 +02:00
gRoussac 78747eedc2 // rework of https://github.com/PrestaShop/PrestaShop/commit/5f6d0614df4bf7d354988dd7320d012238488401#commitcomment-3108107 2013-04-29 17:12:17 +02:00
gRoussac 140b9b2bba // rework of https://github.com/PrestaShop/PrestaShop/commit/5f6d0614df4bf7d354988dd7320d012238488401#commitcomment-3108107 2013-04-29 17:12:17 +02:00
gRoussac 9ce2249883 // revert from commit 5f6d0614df 2013-04-29 17:03:41 +02:00
gRoussac 7afdb08a56 // revert from commit 5f6d0614df 2013-04-29 17:03:41 +02:00
vAugagneur 716b79b8c6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-29 16:21:51 +02:00
vAugagneur 7b1c50b97f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-29 16:21:51 +02:00
vAugagneur acccaf5fbc Merged Pull Request #242 - thanks @andskiba 2013-04-29 16:21:33 +02:00
vAugagneur f58c8e7a93 Merged Pull Request #242 - thanks @andskiba 2013-04-29 16:21:33 +02:00
ccauw 051adc7b36 [-] BO : bug in BO translations when Windows OS
[-] BO : bug in BO translations when Windows OS

Impossible to translate the strings of the back office in the directory override/controllers/admin/...
under windows environment.

The statement " $parent_class = explode(DIRECTORY_SEPARATOR,..) " returns wrong result under windows environment. because the path name has '/' and '\' chars.

$parent_class contains bad values and the string "override" is not found.
2013-04-29 16:00:55 +03:00
Rémi Gaillard dc7f1ceddf [-] BO: Fix #PSCFV-8957 order creation when id_cart=0 is present in database but should normally not happen 2013-04-29 13:47:46 +02:00
Rémi Gaillard bfc8a0ad02 [-] BO: Fix #PSCFV-8957 order creation when id_cart=0 is present in database but should normally not happen 2013-04-29 13:47:46 +02:00
Vincent Augagneur d0f6f2b6c7 Merge pull request #389 from ccauw/patch-5
[*] BO : Add block "override_form_extra"
2013-04-29 03:11:40 -07:00
Vincent Augagneur e036d47d13 Merge pull request #389 from ccauw/patch-5
[*] BO : Add block "override_form_extra"
2013-04-29 03:11:40 -07:00
Damien Metzger 527f87a691 // Fixed directory creation in translation #PSCFV-8212 2013-04-29 12:08:45 +02:00
Damien Metzger 94090e2a39 // Fixed directory creation in translation #PSCFV-8212 2013-04-29 12:08:45 +02:00
Damien Metzger 3b5591dc55 [-] FO : removed misleading label on the shipping total #PSCFV-8556 2013-04-29 11:35:47 +02:00
Damien Metzger 71c3f2e71f [-] FO : removed misleading label on the shipping total #PSCFV-8556 2013-04-29 11:35:47 +02:00
Damien Metzger c587934e25 [-] BO : fixed automatic creation of email overrides in the template #PSCFV-8785 2013-04-29 11:16:26 +02:00
Damien Metzger 43a897436a [-] BO : fixed automatic creation of email overrides in the template #PSCFV-8785 2013-04-29 11:16:26 +02:00
Damien Metzger a06b42704e [-] FO : fixed truncate and entities in the cart block #PSCFV-8870 2013-04-29 10:52:44 +02:00
Damien Metzger 49b5d3ab02 [-] FO : fixed truncate and entities in the cart block #PSCFV-8870 2013-04-29 10:52:44 +02:00
Damien Metzger 903b17979c [-] BO : fixed error message in language form #PSCFV-8890 2013-04-29 10:47:59 +02:00
Damien Metzger 459768d1ac [-] BO : fixed error message in language form #PSCFV-8890 2013-04-29 10:47:59 +02:00
Vincent Augagneur 795d7aa952 Merge pull request #259 from ldecoker/patch-3
[*] [MO] blocksupplier - missing uninstall method
2013-04-29 01:38:17 -07:00
Vincent Augagneur 626009d157 Merge pull request #259 from ldecoker/patch-3
[*] [MO] blocksupplier - missing uninstall method
2013-04-29 01:38:17 -07:00
Vincent Augagneur ad3ba5342d Merge pull request #291 from minicstudio/development
[*] MO : blocksearch - override buttons for ajax cart
2013-04-29 01:35:38 -07:00
Vincent Augagneur bb59365004 Merge pull request #291 from minicstudio/development
[*] MO : blocksearch - override buttons for ajax cart
2013-04-29 01:35:38 -07:00
Vincent Augagneur ad17dbc700 Merge pull request #310 from Patanock/patch-5
[*] BO: Customer and carrier need to be send to the hook
2013-04-29 01:31:16 -07:00
Vincent Augagneur 218a76c443 Merge pull request #310 from Patanock/patch-5
[*] BO: Customer and carrier need to be send to the hook
2013-04-29 01:31:16 -07:00
Vincent Augagneur 83bc226508 Merge pull request #411 from MyBB-Services/dev/gb/mailcolor
[*] Mails : delete a hard-coded pink background
2013-04-29 01:28:19 -07:00
Vincent Augagneur e4323f18f4 Merge pull request #411 from MyBB-Services/dev/gb/mailcolor
[*] Mails : delete a hard-coded pink background
2013-04-29 01:28:19 -07:00
Vincent Augagneur 5438a131b4 Merge pull request #330 from DrySs/patch-5
[-] FO: CMS link to conditions should not be in SSL
2013-04-29 01:22:21 -07:00
Vincent Augagneur fe05e1cc39 Merge pull request #330 from DrySs/patch-5
[-] FO: CMS link to conditions should not be in SSL
2013-04-29 01:22:21 -07:00
Grégoire Bélorgey 0fed37eecd [*] Mails : delete a hard-coded pink background 2013-04-29 10:21:53 +02:00
Grégoire Bélorgey 83088a1905 [*] Mails : delete a hard-coded pink background 2013-04-29 10:21:53 +02:00
ccauw 8331ab0c1a [-]BO : bug color parameter in List
[-]BO : bug color parameter in List

In field list, if there is another field with 'color' => 'color_field', (and color_field column in the select), the background color is always the value of field list column 'color', never 'color_field'

the lines:
			{block name="td_content"}
				...
				{if isset($params.color) && isset($tr[$params.color])}
					<span class="color_field" style="background-color:{$tr.color};...
				{/if}

must be:
			{block name="td_content"}
				...
				{if isset($params.color) && isset($tr[$params.color])}
					<span class="color_field" style="background-color:{$tr[$params.color])};...
				{/if}

In the fields list, for display list, there is :
'osname' => array(
	'title' => $this->l('Status'),
	'color' => 'color',
	...
),
'color parameter gives the name of column in _List to be used as color background.
Currently, it is the same 'color' parameter which is used for one field and the row: (ex:osname)
		<span class="color_field" style="background-color:{$tr.color};...

But if there is another field with 'color' => 'color_field', (and color_field in the select), the background color is always 'color', never 'color_field'
That can be fixed with :
		<span class="color_field" style="background-color:{$tr[$params.color])};...

So the background color of the row (if colorOnBackground = true) and one row's field will be the value of the column given by 'color'=>'color', and The background color of others fields will be the value of the column given by their parameter 'color'=>'<color_field>'

$this->_select = '..color ..., ... color_field2 ...';

$this->fields_list = array(
		'field1' => array(
			'title' => $this->l('Status'),
			'color' => 'color',			// will also be the bg color of the row
			...
		),
		'field2' => array(
			'title' => $this->l('Status'),
			'color' => 'color_field2',
			...
		),
		'field2' => array(
			'title' => $this->l('Status'),
			'color' => 'color_field3',
			...
		),
2013-04-28 16:01:55 +03:00
Grégoire Bélorgey f21ddef3cc Wrong link in CONTRIBUTING.md 2013-04-28 11:51:50 +02:00
Grégoire Bélorgey 25b42744c8 Wrong link in CONTRIBUTING.md 2013-04-28 11:51:50 +02:00
Grégoire Bélorgey 1a81461965 Replacing the default pinkish background with a grey one, and put the text in {color} 2013-04-28 11:13:46 +02:00
Grégoire Bélorgey 4b52f6da2e Replacing the default pinkish background with a grey one, and put the text in {color} 2013-04-28 11:13:46 +02:00
Rémi Gaillard 9ec979cd29 // small fix 2013-04-26 16:07:32 +02:00