Commit Graph

6194 Commits

Author SHA1 Message Date
Rémi Gaillard c0cf92cbdf [+] BO: Add a wizard to create and edit your carriers 2013-07-26 18:27:21 +02:00
gRoussac 42c5335f27 [*] WS : order history add(POST) send customer email if sendemail=1 url parameter, thanks @gerdus 2013-07-26 17:55:53 +02:00
gRoussac 076b6d11a2 [-] CORE: Copy live_edit bool when register alias hook 2013-07-26 17:15:36 +02:00
Jérôme Nadaud 23e0467993 [-] MO dateofdelivery : FixBug #PNM-1478 Now take care of product available date 2013-07-26 11:48:18 +02:00
Gregory Roussac 5015f88a46 Merge pull request #595 from codl/fix/too-many-packs
[-] WS: Sanity check before creating packs
2013-07-26 00:51:08 -07:00
Captain FLAM a35011e9a5 Update Module.php 2013-07-25 19:16:46 +01:00
Damien Metzger eff81dfe05 // Moved a condition/function from SQL to PHP. 2013-07-25 17:07:28 +02:00
ChristopheBoucaut a9e233b209 Update Cart.php
If magic_quotes_gpc is enabled, there is no need to escape the characters from $ _POST as they already are.
2013-07-25 15:46:08 +02:00
Gregory Roussac a54ac39632 Merge pull request #356 from arnolem/dev-wsSetProductTags
[*] WS : Allow to set the tags list of product
2013-07-25 06:17:15 -07:00
Corentin Delcourt 53526304a5 [-] WS: Sanity check before creating packs
As it is before this commit, every product that is created from the
schema without removing the empty bundle item in the schema will become
a pack containing one broken item.

Sorry, this bug was introduced by my previous pull request.
2013-07-25 14:45:17 +02:00
gRoussac 2e7f3c296b [-] FO : Force browser language detection in Tools::setCookieLanguage 2013-07-25 11:44:45 +02:00
Gregory Roussac ef22b9d5d4 Merge pull request #162 from bumbu/patch-2
[-] CORE : updateMultishopTable() where argument is not mandatory anymore
2013-07-24 10:07:56 -07:00
gRoussac aaaa5cb086 [-] WS: Enable feature request #PSCFV-5581, thanks @codl for pull request #593 2013-07-24 18:22:04 +02:00
gRoussac a406778e17 // norm 2013-07-24 17:32:58 +02:00
Damien Metzger 71c0a483e1 // Small fix 2013-07-24 16:16:40 +02:00
Damien Metzger 056ced75b5 // Fixed double module call 2013-07-24 15:55:40 +02:00
Gregory Roussac 26247a18c3 Merge pull request #564 from sylwit/patch-1
[*] CORE : Translations shouldn't be cached if they contain dynamic vars (sprintf) in Translate.php
2013-07-23 10:22:54 -07:00
Gregory Roussac 9b9e5a122a Merge pull request #586 from Captain-FLAM/patch-7
[-] BO : Hook.php : Missing _DB_PREFIX_, thanks @Captain-FLAM
2013-07-23 09:52:15 -07:00
Jérôme Nadaud 71271ded7f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-23 18:38:33 +02:00
Jérôme Nadaud d241013692 [-] BO : FixBug #PSCFV-9894 undefined quantity_all_version variable in product.tpl 2013-07-23 18:36:51 +02:00
Gregory Roussac abf6f0d626 Merge pull request #587 from ChristopheBoucaut/patch-2
[-] CORE : Search terms can now have dashes in Search.php
2013-07-23 09:18:16 -07:00
Damien Metzger c829ac5b7d // Fixed fix 2013-07-23 14:19:13 +02:00
Rémi Gaillard 6ed713e847 [-] Fix #PSCFV-9038 carrier warehouse association after carrier edition 2013-07-23 11:57:44 +02:00
Damien Metzger 0ddf5d1025 // Fixed getMainShopDomain 2013-07-23 11:33:07 +02:00
gRoussac a805941c1f // typo in EN string 2013-07-23 10:34:05 +02:00
Damien Metzger 209615d4f4 // Missing } 2013-07-23 09:52:41 +02:00
Damien Metzger 07e3354d0e // Code cleaning 2013-07-23 09:50:26 +02:00
Damien Metzger 9169995adc // Small fixes and code cleaning 2013-07-23 09:50:26 +02:00
Damien Metzger 91c5d184b6 // Small backend optimization 2013-07-23 09:50:26 +02:00
Damien Metzger 4b6642d76c // Small optimization 2013-07-23 09:50:25 +02:00
ChristopheBoucaut 3503670478 Update Search.php
$string = preg_replace('/[._-]+/', '', $string);

Ex :
Product's name : Saint-leon
Search : leon => 0 result

------------------------------------------------------

$string = preg_replace('/[._-]+/', ' ', $string);
Ex :
Product's name : Saint-leon
Search : leon => 1 result

-------------------------------------------------------

I think that thus the search is more relevant
2013-07-23 09:36:08 +02:00
Captain FLAM 928181bd1f Update Hook.php 2013-07-22 21:35:20 +01:00
Jérôme Nadaud b87e934a66 [-] BO : FixBug #PSCFV-8060 Error getting last quantity and price in stock mouvement 2013-07-22 14:58:55 +02:00
Jérôme Nadaud ca9f2c9459 [-] BO : FixBug #PSCFV-9138 Error duplicate product group reduction 2013-07-22 11:25:13 +02:00
Damien Metzger 3556e75ce3 // Moved useless code into the block where it is useful 2013-07-22 10:49:41 +02:00
Damien Metzger 84d9caca81 // Blind fix 2013-07-19 16:29:17 +02:00
Damien Metzger 3389cf8acb [-] FO : fixed pagination for p = 0 #PSCFV-9746 2013-07-19 14:08:24 +02:00
Damien Metzger 989dafce21 [*] FO : a few more SQL improvements 2013-07-19 11:29:18 +02:00
Damien Metzger bd4ece095b [*] FO : lots of performance improvements (removed or merged useless SQL queries) 2013-07-19 10:58:51 +02:00
Damien Metzger 219ec6e8be [-] FO : Removed useless live edit query #PSCFV-9845 2013-07-19 09:50:30 +02:00
Damien Metzger 78ddec3ac7 [-] BO : translation copy is now easier #PSCFV-8886 2013-07-18 18:51:37 +02:00
Jérôme Nadaud 54fe5dfe96 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-18 18:34:18 +02:00
Rémi Gaillard ac02e5191a // ups 2013-07-18 18:34:10 +02:00
Jérôme Nadaud c90ba4c406 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-18 18:33:51 +02:00
Jérôme Nadaud 066b791cf7 [-] FO : FixBug of total products from supliers and manufacturer 2013-07-18 18:33:35 +02:00
Rémi Gaillard 354622857f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-18 18:31:35 +02:00
Rémi Gaillard 958d92c9fa [*] BO: Add an option to allow iframes on descriptions 2013-07-18 18:31:31 +02:00
Damien Metzger c70fe92dac // Validate::isGenericName now allow "#" #PSCFV-6530 2013-07-18 18:22:50 +02:00
Jérôme Nadaud caf321e691 [-] FO : FixBug #PSCFV-8018 All products was counted in manufacturer lsit even if products was set as hidden 2013-07-18 18:16:57 +02:00
Jérôme Nadaud d879fb15a9 [-] FO : FixBug #PSCFV-8018 All products was counted in manufacturer list even hidden products 2013-07-18 18:10:29 +02:00