Commit Graph

18638 Commits

Author SHA1 Message Date
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
Rémi Gaillard
71b8e7cc33 // small fix 2013-04-26 16:07:32 +02:00
Damien Metzger
83167fee67 Merge pull request #408 from djfm/development
[*] LO : Updated it & nl localization files
2013-04-26 06:33:36 -07:00
Damien Metzger
1e6b8dd92b Merge pull request #408 from djfm/development
[*] LO : Updated it & nl localization files
2013-04-26 06:33:36 -07:00
Rémi Gaillard
41d93d1c66 Merge pull request #407 from zecrazytux/fixracecondition
[-] Fixes a race condition
2013-04-26 06:24:56 -07:00
Rémi Gaillard
60ea65d5fb Merge pull request #407 from zecrazytux/fixracecondition
[-] Fixes a race condition
2013-04-26 06:24:56 -07:00
djfm
650fef032e [*] LO : Updated it & nl localization files 2013-04-26 15:20:19 +02:00
djfm
4c180685e1 [*] LO : Updated it & nl localization files 2013-04-26 15:20:19 +02:00
Sébastien Bocahu
fd88ac76be [-] Fixes a race condition
Fixes a race condition leading to file coruption and PHP crashes when
writing the cache index file.

Handles concurrency properly by using a temporary file and an atomic
rename() instead of file_put_contents(), which is not atomic, on a
file which is potentially accessed by many processes at the same time
2013-04-26 14:28:01 +02:00
Sébastien Bocahu
2ac6e52c9f [-] Fixes a race condition
Fixes a race condition leading to file coruption and PHP crashes when
writing the cache index file.

Handles concurrency properly by using a temporary file and an atomic
rename() instead of file_put_contents(), which is not atomic, on a
file which is potentially accessed by many processes at the same time
2013-04-26 14:28:01 +02:00
Damien Metzger
9edf97ee52 // Fixed installer translation 2013-04-26 14:09:23 +02:00
Damien Metzger
ea6b4eaef8 // Fixed installer translation 2013-04-26 14:09:23 +02:00
vAugagneur
0c71bda9e6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-26 12:19:25 +02:00
vAugagneur
0f08250e92 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-26 12:19:25 +02:00
vAugagneur
231614290a [-] BO : fixed bug #PSCFV-7411 - Store location problem with some longitude values 2013-04-26 12:19:20 +02:00
vAugagneur
21aa134774 [-] BO : fixed bug #PSCFV-7411 - Store location problem with some longitude values 2013-04-26 12:19:20 +02:00
Rémi Gaillard
821c8c0f3f // small fix on php-cli installer 2013-04-26 11:54:05 +02:00
Rémi Gaillard
135689fc1f // small fix on php-cli installer 2013-04-26 11:54:05 +02:00
vAugagneur
fc14c79521 [-] MO : fixed bug #PSCFV-7703 - Images for bank wire, cheque and cash payment missing on Order Summary 2013-04-26 10:30:17 +02:00
vAugagneur
9983b1723f [-] MO : fixed bug #PSCFV-7703 - Images for bank wire, cheque and cash payment missing on Order Summary 2013-04-26 10:30:17 +02:00
vAugagneur
48ee7b417d [-] CORE : fixed PHP Notice: Undefined index: date_expiration on virtual product 2013-04-26 10:15:54 +02:00