Commit Graph
17965 Commits
Author SHA1 Message Date
gRoussac 27212bd126 [-] CORE : Fix bug last part #PSCFV-8636, cart rule with a reduction and free shipping 2013-04-16 18:56:00 +02:00
ldecoker 34644ee6eb Update AdminAttributesGroupsController.php 2013-04-16 19:17:51 +03:00
ldecoker 624fed3710 Update form.tpl 2013-04-16 19:15:45 +03:00
Gregory Roussac 5bae95dacc Merge pull request #391 from ldecoker/patch-5
[-] [BO] error in form.tpl for attributes controller, thanks to ldecoker
2013-04-16 08:50:45 -07:00
Gregory Roussac d6b1ae8877 Merge pull request #391 from ldecoker/patch-5
[-] [BO] error in form.tpl for attributes controller, thanks to ldecoker
2013-04-16 08:50:45 -07:00
ldecoker 4783cb17c5 ";" in wrong place
Should be after display but inside quotes
2013-04-16 18:34:20 +03:00
ldecoker a40f61e922 ";" in wrong place
Should be after display but inside quotes
2013-04-16 18:34:20 +03:00
ccauw f7ef4e0350 [*] BO : Add block "override_form_extra" in helper
[*] BO : Add block "override_form_extra" in list_header.tpl


{if !$simple_header}

<form method="post" action="{$action}" class="form">



	{block name="override_form_extra"}{/block}




In AdminXxxxController, If we display list which are filtered by "variable" like

index.php?controller=AdminXxxx&variable=val&token=...

When using pagination or columns filters, the controller is called without our variable.

There are two methods to retrieve our variable: cookie or form Post.

To use the second opportunity, we need to put hidden input "variable" in the form.

So we need à block in the form to override.
2013-04-16 16:21:23 +03:00
ccauw 205e21ba16 [*] BO : Add block "override_form_extra" in helper
[*] BO : Add block "override_form_extra" in list_header.tpl


{if !$simple_header}

<form method="post" action="{$action}" class="form">



	{block name="override_form_extra"}{/block}




In AdminXxxxController, If we display list which are filtered by "variable" like

index.php?controller=AdminXxxx&variable=val&token=...

When using pagination or columns filters, the controller is called without our variable.

There are two methods to retrieve our variable: cookie or form Post.

To use the second opportunity, we need to put hidden input "variable" in the form.

So we need à block in the form to override.
2013-04-16 16:21:23 +03:00
Vincent Augagneur 1a795cfe4a Merge pull request #366 from kluevandrew/patch-2
[FIX] Bug in Controller class
2013-04-16 06:13:48 -07:00
Vincent Augagneur dc529264e0 Merge pull request #366 from kluevandrew/patch-2
[FIX] Bug in Controller class
2013-04-16 06:13:48 -07:00
ccauw 5b13f6aa7e [*] BO : Add block "override_form_extra"
Add block "override_form_extra" in list_header.tpl


{if !$simple_header}

<form method="post" action="{$action}" class="form">



	{block name="override_form_extra"}{/block}




In AdminXxxxController, If we display list which are filtered by "variable" like

index.php?controller=AdminXxxx&variable=val&token=...

When using pagination or columns filters, the controller is called without our variable.

There are two methods to retrieve our variable: cookie or form Post.

To use the second opportunity, we need to put hidden input "variable" in the form.

So we need à block in the form to override.
2013-04-16 16:09:26 +03:00
ccauw e5508af99a [*] BO : Add block "override_form_extra"
Add block "override_form_extra" in list_header.tpl


{if !$simple_header}

<form method="post" action="{$action}" class="form">



	{block name="override_form_extra"}{/block}




In AdminXxxxController, If we display list which are filtered by "variable" like

index.php?controller=AdminXxxx&variable=val&token=...

When using pagination or columns filters, the controller is called without our variable.

There are two methods to retrieve our variable: cookie or form Post.

To use the second opportunity, we need to put hidden input "variable" in the form.

So we need à block in the form to override.
2013-04-16 16:09:26 +03:00
gRoussac 47c118c3ca [-] FO : empty cache getContextualValue_ when updating cart quantity 2013-04-16 15:00:24 +02:00
gRoussac 0f98ff12e1 [-] FO : empty cache getContextualValue_ when updating cart quantity 2013-04-16 15:00:24 +02:00
Rémi Gaillard 22694898df Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-16 14:14:36 +02:00
Rémi Gaillard 517a968db7 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-16 14:14:36 +02:00
Rémi Gaillard 96ee6386c1 [-] BO: Fix admin carts currency prices on view and listing 2013-04-16 14:14:04 +02:00
Rémi Gaillard 3d8b28ac93 [-] BO: Fix admin carts currency prices on view and listing 2013-04-16 14:14:04 +02:00
gRoussac ce02baf658 [-] FO : Disable confirm order when already clicked 2013-04-16 14:09:37 +02:00
gRoussac 0c85403f13 [-] FO : Disable confirm order when already clicked 2013-04-16 14:09:37 +02:00
gRoussac abbdb4d165 [-] FO : address alias lost 2013-04-16 14:08:51 +02:00
gRoussac f6d97ea7bb [-] FO : address alias lost 2013-04-16 14:08:51 +02:00
gRoussac 48390eed96 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-16 12:17:34 +02:00
gRoussac 05410d764c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-16 12:17:34 +02:00
gRoussac efb90cb0a6 [-] BO : Remove typo in address formating fields links 2013-04-16 12:15:31 +02:00
gRoussac b95e8e0bc9 [-] BO : Remove typo in address formating fields links 2013-04-16 12:15:31 +02:00
Rémi Gaillard 8c5143de9e [-] Installer: installer now work even if no settings.inc.php file is created with an installer session already here 2013-04-16 12:01:04 +02:00
Rémi Gaillard 7bb98b16f3 [-] Installer: installer now work even if no settings.inc.php file is created with an installer session already here 2013-04-16 12:01:04 +02:00
vAugagneur b1b71c0c07 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-16 11:48:26 +02:00
vAugagneur 6aa2490915 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-16 11:48:26 +02:00
vAugagneur 7c626218df Merged Pull request #302 - Thanks to @kpodemski 2013-04-16 11:48:17 +02:00
vAugagneur e271524cc4 Merged Pull request #302 - Thanks to @kpodemski 2013-04-16 11:48:17 +02:00
gRoussac 62fd5c6195 // small change on quantity_per_user cart rule created on ValidateOrder 2013-04-16 11:44:09 +02:00
gRoussac 3615c225b3 // small change on quantity_per_user cart rule created on ValidateOrder 2013-04-16 11:44:09 +02:00
Andrew 5ab4c18396 Remove spaces before and after dot 2013-04-16 13:43:24 +04:00
Andrew dface458a9 Remove spaces before and after dot 2013-04-16 13:43:24 +04:00
Andrew a93cfbec07 Remove spaces before and after dot 2013-04-16 13:39:42 +04:00
Andrew 03eadb3d6a Remove spaces before and after dot 2013-04-16 13:39:42 +04:00
vAugagneur 70176f07e6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-16 11:35:33 +02:00
vAugagneur 621ca4a29b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-16 11:35:33 +02:00
vAugagneur 661ddd7548 Merged Pull request #303 - Thanks to @kpodemski 2013-04-16 11:35:27 +02:00
vAugagneur 5757e56864 Merged Pull request #303 - Thanks to @kpodemski 2013-04-16 11:35:27 +02:00
gRoussac c0ae0c9b28 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-16 11:28:42 +02:00
gRoussac 3db7204f9c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-16 11:28:42 +02:00
gRoussac f2bdb73d39 [-] FO : Undefined free_shipping in POC when updateQty 2013-04-16 11:28:22 +02:00
gRoussac 50cd001d39 [-] FO : Undefined free_shipping in POC when updateQty 2013-04-16 11:28:22 +02:00
Vincent Augagneur df60120d5f Merge pull request #387 from ccauw/patch-4
[*] BO : Add block "close_td" in list_content.tpl
2013-04-16 02:23:04 -07:00
Vincent Augagneur 30c9885624 Merge pull request #387 from ccauw/patch-4
[*] BO : Add block "close_td" in list_content.tpl
2013-04-16 02:23:04 -07:00
gRoussac b2f5ed838d // remove additionnal /t 2013-04-16 10:53:08 +02:00