dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,095 Commits 9 Branches 19 Tags
ad3ba5342dfd0b6fe5c7a79ff07221c7156bbd96
Commit Graph
9095 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Damien Metzger b1000d63b9 // Fixed truncate / escape order 2013-04-18 16:39:33 -03:00
gRoussac 62836d65ab [-] Fo : Remove additionnal space in phone field value 2013-04-18 19:43:04 +02:00
gRoussac e2905ca845 [-] FO : fix bug #PSCFV-8684, phone not required in guest checkout when not set in BO 2013-04-18 19:12:07 +02:00
François Gaillard b6d9c89b99 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 18:23:18 +02:00
gRoussac 1a8ab7f68c [-] BO : Can not set PS_ORDER_OUT_OF_STOCK in one shop 2013-04-18 17:28:16 +02:00
Rémi Gaillard 38bdd421f7 // performance improve for ObjectModel::displayFieldName #PSCFV-8713 2013-04-18 17:12:05 +02:00
vAugagneur 803447b88d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 17:02:51 +02:00
vAugagneur 828ffb74ad [-] FO - fixed bug #PSCFV-8826 sort now work fine on bestsale controller 2013-04-18 17:02:45 +02:00
gRoussac e22fe455b3 [-] CORE : Fix bug #PSCFV-8636 again, cart rule with a reduction and free shipping 2013-04-18 16:44:55 +02:00
vAugagneur e9b8af0e97 [-] BO - fixed bug #PSCFV-8614 2013-04-18 15:14:37 +02:00
Rémi Gaillard 53cc380a6a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 14:59:02 +02:00
Rémi Gaillard 986d57148f //AdminModulesController::extractArchive() now return something 2013-04-18 14:58:43 +02:00
gRoussac ccfa343b0d [-] BO : Bad gender image when no gender 2013-04-18 14:54:12 +02:00
Rémi Gaillard ab700a6285 [-] 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 158ab771b6 [-] 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 5edfd03068 // don't try to clear smarty cache if smarty is not defined 2013-04-18 14:06:49 +02:00
François Gaillard 768eb473e4 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 12:09:47 +02:00
Rémi Gaillard f0c5407aa6 // Revert a93cfbec07 2013-04-18 11:36:55 +02:00
gRoussac ee3e2ac6dc [-] FO : Fix bug #PSCFV-8728 context country not updated after changing delivery address in OPC 2013-04-18 11:26:50 +02:00
sLorenzini b633b44ac7 [-] FO: fixed some css bug for ie7 2013-04-18 11:22:40 +02:00
Rémi Gaillard 5ba3fda95f [-] FO: Add the protocol content to the cache id of modules #PSCFV-8810 2013-04-17 18:14:58 +02:00
Rémi Gaillard f83b91ae51 // Fix smarty cache after modules translation update 2013-04-17 14:44:20 +02:00
Rémi Gaillard 49ff8ae4a1 // pscleaner clean address inversion between customers and manufacturers/suppliers 2013-04-17 11:39:11 +02:00
Vincent Augagneur 34f2ff36a3 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 de0ef82f74 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-17 10:02:37 +02:00
vAugagneur de887cc078 Merge Pull request #98 - Thanks to @phproberto 2013-04-17 10:02:32 +02:00
gRoussac 701d9e50af [-] 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 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
ldecoker 4783cb17c5 ";" 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
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