dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,152 Commits 9 Branches 19 Tags
7b26967df0ad12c181c3f4e9d20ea2576e7b9fbb
Commit Graph
9152 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Damien Metzger c4ae13af75 // Changed link to documentation in the installer 2013-04-18 16:57:05 -03:00
Damien Metzger bfbc46cf51 // Removed useless message 2013-04-18 16:53:27 -03:00
Damien Metzger 550ee435e8 // Fixed truncate / escape order 2013-04-18 16:39:33 -03:00
gRoussac b840b6bd2b [-] Fo : Remove additionnal space in phone field value 2013-04-18 19:43:04 +02:00
gRoussac 65a73c7d4b [-] FO : fix bug #PSCFV-8684, phone not required in guest checkout when not set in BO 2013-04-18 19:12:07 +02:00
Francois Gaillard 8251e98323 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 18:23:18 +02:00
gRoussac dcb46e7867 [-] BO : Can not set PS_ORDER_OUT_OF_STOCK in one shop 2013-04-18 17:28:16 +02:00
Rémi Gaillard 103513bf28 // performance improve for ObjectModel::displayFieldName #PSCFV-8713 2013-04-18 17:12:05 +02:00
vAugagneur ea0203f43f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 17:02:51 +02:00
vAugagneur 75d395c84a [-] FO - fixed bug #PSCFV-8826 sort now work fine on bestsale controller 2013-04-18 17:02:45 +02:00
gRoussac 2a3789d48b [-] CORE : Fix bug #PSCFV-8636 again, cart rule with a reduction and free shipping 2013-04-18 16:44:55 +02:00
vAugagneur b52c71c7ad [-] BO - fixed bug #PSCFV-8614 2013-04-18 15:14:37 +02:00
Rémi Gaillard 45fdb3f79d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 14:59:02 +02:00
Rémi Gaillard a7be6b14e8 //AdminModulesController::extractArchive() now return something 2013-04-18 14:58:43 +02:00
gRoussac 0a8eddf7d6 [-] BO : Bad gender image when no gender 2013-04-18 14:54:12 +02:00
Rémi Gaillard f24022311e [-] FO: send current product to some hook like displayProductTabContent on product page #PSCFV-8825 2013-04-18 14:24:50 +02:00
Rémi Gaillard f7a1fdb9e0 [-] BO: Fix #PSCFV-8827 fixed price of specific price rules should be a float 2013-04-18 14:21:44 +02:00
Rémi Gaillard e7b344adab // don't try to clear smarty cache if smarty is not defined 2013-04-18 14:06:49 +02:00
Francois Gaillard c9a53bf491 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 12:09:47 +02:00
Rémi Gaillard be250c9ecc // Revert a93cfbec07 2013-04-18 11:36:55 +02:00
gRoussac 5a815e7b19 [-] FO : Fix bug #PSCFV-8728 context country not updated after changing delivery address in OPC 2013-04-18 11:26:50 +02:00
sLorenzini 859175dde1 [-] FO: fixed some css bug for ie7 2013-04-18 11:22:40 +02:00
Rémi Gaillard 39e3b079dd [-] FO: Add the protocol content to the cache id of modules #PSCFV-8810 2013-04-17 18:14:58 +02:00
Rémi Gaillard a172632600 // Fix smarty cache after modules translation update 2013-04-17 14:44:20 +02:00
Rémi Gaillard 76f584a70d // pscleaner clean address inversion between customers and manufacturers/suppliers 2013-04-17 11:39:11 +02:00
Vincent Augagneur 95500d708d Merge pull request #179 from nturato/patch-1 
[-] WS: images are only shown as jpg or gif
 2013-04-17 01:56:57 -07:00
vAugagneur 6bf1d0c036 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-17 10:02:37 +02:00
vAugagneur 9f9562f92b Merge Pull request #98 - Thanks to @phproberto 2013-04-17 10:02:32 +02:00
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
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 a40f61e922 ";" in wrong place 
Should be after display but inside quotes
 2013-04-16 18:34:20 +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 dc529264e0 Merge pull request #366 from kluevandrew/patch-2 
[FIX] Bug in Controller class
 2013-04-16 06:13:48 -07: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 0f98ff12e1 [-] FO : empty cache getContextualValue_ when updating cart quantity 2013-04-16 15:00:24 +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 3d8b28ac93 [-] BO: Fix admin carts currency prices on view and listing 2013-04-16 14:14:04 +02:00
gRoussac 0c85403f13 [-] FO : Disable confirm order when already clicked 2013-04-16 14:09:37 +02:00
gRoussac f6d97ea7bb [-] FO : address alias lost 2013-04-16 14:08:51 +02:00
gRoussac 05410d764c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-16 12:17:34 +02:00
gRoussac b95e8e0bc9 [-] BO : Remove typo in address formating fields links 2013-04-16 12:15:31 +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 6aa2490915 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-16 11:48:26 +02:00
vAugagneur e271524cc4 Merged Pull request #302 - Thanks to @kpodemski 2013-04-16 11:48:17 +02:00
gRoussac 3615c225b3 // small change on quantity_per_user cart rule created on ValidateOrder 2013-04-16 11:44:09 +02:00
Andrew dface458a9 Remove spaces before and after dot 2013-04-16 13:43:24 +04:00
Andrew 03eadb3d6a Remove spaces before and after dot 2013-04-16 13:39:42 +04:00
vAugagneur 621ca4a29b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-16 11:35:33 +02:00
vAugagneur 5757e56864 Merged Pull request #303 - Thanks to @kpodemski 2013-04-16 11:35:27 +02:00
gRoussac 3db7204f9c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-16 11:28:42 +02:00