Commit Graph

8954 Commits

Author SHA1 Message Date
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
Vincent Augagneur 1a795cfe4a Merge pull request #366 from kluevandrew/patch-2
[FIX] Bug in Controller class
2013-04-16 06:13:48 -07:00
gRoussac 47c118c3ca [-] 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 96ee6386c1 [-] 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 abbdb4d165 [-] 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 efb90cb0a6 [-] 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
vAugagneur b1b71c0c07 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
gRoussac 62fd5c6195 // 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 a93cfbec07 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 661ddd7548 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 f2bdb73d39 [-] 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
gRoussac b2f5ed838d // remove additionnal /t 2013-04-16 10:53:08 +02:00
gRoussac a4d86f14da [*] FO : add steps to authentication pull request 002f468958 thanks to radovanx 2013-04-16 10:51:16 +02:00
gRoussac 6cdf8babca [-] Fo : Fix big pic alt with jqzoom 2013-04-16 10:22:46 +02:00
ccauw 7711c710d4 [*] BO : Add block "close_td" in list_content.tpl
[*] BO : Add block "close_td" in list_content.tpl

{block name="td_content"}
.....
{/block}
{block name="close_td"}

{/block}

So now we can override "td" and "/td" tags.
So we can create

"td" "a" ... content.... "/a" "/td"

when overriding the block open-td and close-td
and we can use "a" tag with "href" rather than "onclick" to create view links in the list.
And the user can choose to open the link in another tab or window.
2013-04-15 20:19:10 +03:00
gRoussac 00d7d78ba6 [-] FO : Class free order name for validateOrder 2013-04-15 18:51:41 +02:00
gRoussac eca4a87082 [-] FO : First part of fix #PSCFV-8636, cart rule on specifice carrier / all carriers 2013-04-15 18:30:41 +02:00
gRoussac 5989481859 [-] BO : Remove undefined name when module can not be installed 2013-04-15 16:21:03 +02:00
Rémi Gaillard 23b70c4906 // small changes in installer 2013-04-15 14:33:20 +02:00
gRoussac df111c0662 [-] Installer : do not select activity if not defined 2013-04-15 13:42:57 +02:00
gRoussac bf90c8cf84 // remove sql parse error 2013-04-15 12:10:27 +02:00
gRoussac 047551952e [-] FO : Fix bug #PSCFV-8623 : Cart rule without code is applied automatically 2013-04-15 11:48:27 +02:00
Rémi Gaillard 7a89d0596f [-] BO: Don't delete the directory of modules before upgrade them 2013-04-15 11:17:17 +02:00
gRoussac 0256ee7c59 [-] FO : add cart rul when cart rul has several groups 2013-04-12 18:03:38 +02:00
gRoussac cf874a832a // small css fix 2013-04-12 17:17:23 +02:00
gRoussac bd0e467c97 // small css fix 2013-04-12 16:51:05 +02:00
gRoussac 0ba0a25f3d [-] FO: Fix bug too much call of updateCartSummary when OPC and cart rule 2013-04-12 16:45:54 +02:00
gRoussac f209d5a669 [-] Fo : Fix undefined var in cart-summary when updating id_address_delivery 2013-04-12 12:34:37 +02:00
gRoussac a73c09ab4c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-12 12:04:21 +02:00
gRoussac fcce2d2737 [-] FO : Fix login cookie issues 2013-04-12 12:03:16 +02:00
vAugagneur d48d33fc43 //Merge Pull request #319 2013-04-12 11:55:57 +02:00
sLorenzini 9060661cef [-] FO: fixed bug #PSCFV-3238 - compareController typo 2013-04-12 11:51:38 +02:00
vAugagneur 37296f9c7f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-12 11:46:44 +02:00
vAugagneur f0209dd447 //small spellchecking 2013-04-12 11:46:38 +02:00
sLorenzini 1ebd625563 [-] BO: fixed bug css - #PSCFV-8737 - AdminScenes.php ~~ remove inline css forcing a border to #large_scene_image 2013-04-12 11:46:19 +02:00
Vincent Augagneur 8609f07749 Merge pull request #346 from pxls/patch-1
[-] FO : bad variable used for free product text
2013-04-12 02:42:24 -07:00
Rémi Gaillard 305cf4dd9c [-] BO: Fix #PSCFV-8730 display of selected dates on the backoffice listings header - thank to pitt phunsanit for the patch 2013-04-12 11:39:56 +02:00
Vincent Augagneur e8f3fcf581 Merge pull request #371 from PrestaEdit/patch-26
[-] Config: juste more beautifull :)
2013-04-12 01:50:54 -07:00
Rémi Gaillard a632965b0d // fix for commit 3cbd8444d6 2013-04-12 10:49:30 +02:00
gRoussac 08c53d77b2 [-] CORE : Fix bug #PSCFV-5624 set order reference to CHAR(10) 2013-04-11 18:53:10 +02:00
Rémi Gaillard 3cbd8444d6 [-] FO: Fix #PSCFV-8722 displayed specific prices on product page was sometimes wrong 2013-04-11 18:09:35 +02:00