dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,203 Commits 9 Branches 19 Tags
e472fd98d6fb88f647701dff47efaa00a07e05eb
Commit Graph

226 Commits

Author SHA1 Message Date
aFolletete
47cfd2b9f9 [-] BO : fixed bug #PSCFV-1296 - Can't add a product in order (BO) 
// Fix backward compatibility issue with updateQty method

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15152 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 09:29:46 +00:00
dMetzger
8f6c9671f5 // Replaced array_uintersect by a custom function 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15150 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 09:09:03 +00:00
vAugagneur
4f3e19ed5f //remove mobile theme 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15138 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 20:57:15 +00:00
dMetzger
7cb052a52b [-] FO : improvements with OPC, Cart Rules and refresh #PSCFV-377 #PSCFV-2196 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15118 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 14:36:53 +00:00
vChabot
605b69f8c1 [-] FO : BugFix : #PSCFV-2221 : Column 'price' in order clause is ambiguous by filtering search result 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15092 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 09:32:43 +00:00
vChabot
534bbd4d99 [-] FO : BugFix : #PSCFV-2198 : Unable to edit customer account in front 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15090 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 09:21:19 +00:00
fBrignoli
5776e365de [-] FO : Invalid voucher name 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15087 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 08:41:26 +00:00
tDidierjean
e64b14b292 [-] BO : fix #PSCFV-2120 - no product listed in product return form 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15037 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 12:26:21 +00:00
mDeflotte
e35c56241f // Fix little bug 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15031 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 09:04:51 +00:00
mDeflotte
2169016b87 // If an order contain only virtual products, don't set a carrier to the order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15029 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 08:58:35 +00:00
mDeflotte
51d58ad3be // Revert a line removed by error 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15025 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 08:15:03 +00:00
mDeflotte
513c9be298 [-] FO : #PSCFV-2158 - Add warning message when a product cannot be delivered to an address 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15021 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 08:10:09 +00:00
vAugagneur
0c66c60f1d [-] FO : fixed bug #PSCFV-1368 - Password is restricted to 32 characters. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15020 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 08:08:50 +00:00
vChabot
3db31ece5a [-] FO : BugFix #PSCFV-1450 The Alias "My Address" is already used, please chose another one. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14983 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-30 15:06:07 +00:00
mDeflotte
dc3a20251f [-] FO : Fixed bug #PSCFV-1251 & #PSCFV-1727 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14977 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-30 12:51:20 +00:00
aFolletete
272eb3db22 [-] FO : fixed bug #PSCFI-5454 - Guest tracking should be SSL encrypted 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14901 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-26 09:45:38 +00:00
lLefevre
336fd07a4e [-] BO : Fix #PSFV-549 : Now two customer with the same mail, isn't possible 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14845 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-24 13:42:43 +00:00
mDeflotte
1cb4c8a6bb [-] FO : #PSFV-815 - Moving an SQL request on the controller to the model 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14762 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-19 09:55:13 +00:00
mDeflotte
19961a5438 [-] Project : #PSFV-820 - Cartrules are now reapplied each time we add/remove a product on/from the cart 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14760 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-19 09:39:14 +00:00
mDeflotte
6120874516 [-] BO : #PSFV-874 - Carriers asked with guest checkout and virtual cart 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14701 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 16:27:39 +00:00
rMalie
0c2dd0cd2f // MERGE product_multistore branch : product fields are now editable per shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 13:32:12 +00:00
lLefevre
2b807940ae [-] BO : #PSFV-855 : Fix bug in BlockCMS AND set submit_action to NULL 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14633 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-13 14:15:45 +00:00
mDeflotte
886ab283de [-] FO : #PSFV-815 - Fix bug on the cart with carrier on updating the country of the address 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14624 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-13 08:22:27 +00:00
bMancone
e2907117f0 // Fixed #PSCFI-5259 #PSCFI-3869 on PS 1.5 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14425 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-03 13:43:17 +00:00
bMancone
50ed231470 // Fixed #PSCFI-5259 #PSCFI-3869 on PS 1.5 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14423 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-03 13:20:45 +00:00
bMancone
42385b2cbc // Updated isTokenValid(). Thanks Olea. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14296 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-27 13:05:51 +00:00
lLefevre
a7a05b7637 // Fix replace \\" by " in english keys and change french keys for errors files 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14180 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-15 08:31:12 +00:00
dMetzger
800a95b583 [-] FO : customer discounts page fixed with cart rules 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14162 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-14 14:59:08 +00:00
mDeflotte
72917cad5c [-] FO : #PSTEST-990 - Fix bug with bad ajax return on adding product to the cart with a new cart reduction applyed 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14150 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-14 13:40:39 +00:00
lLefevre
0e9e23aaae // Fix update english key of translations in all files 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14143 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-14 12:25:51 +00:00
nPellicari
ed21b38e8a [*] MO : updated controllers for mobile theme 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14114 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-13 17:34:18 +00:00
vChabot
63dbd490ed // saving customization improved 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14112 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-13 17:10:35 +00:00
fGaillard
7a6339d50f [-] Classes : #PSFV-634 : BugFix Currency was not set for loyalty discounts 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14110 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-13 17:06:42 +00:00
bMancone
87ce36d6e4 // Added mobile device management in stores controller 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14092 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-13 14:59:21 +00:00
mDeflotte
9db2c449bb [-] BO : #PSTEST-996 - Fix bug with multishipping and wrapping cost 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14034 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-12 14:00:52 +00:00
mDeflotte
eb9795fc37 [-] FO : #PSFV-604 - Fix bug with undefined address on the cart (when the address is removed) 
// Fix bug with multishipping when tax calculation use delivery address and not billing

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13992 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-09 09:43:55 +00:00
fGaillard
209c5e53d9 [-] FO : #PSTEST-969 : BugFix Store icon in GMap 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13934 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-07 16:09:01 +00:00
mDeflotte
8faf31d00d [-] FO : #PSTEST-981 - Minimal quantity not setted correctly on combibination 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13931 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-07 15:13:30 +00:00
mDeflotte
43d0a4dee2 // Fix bug with address changing and multi-address on opc 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13892 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-06 14:29:00 +00:00
nPellicari
b3f030f81e [*] FO : Add mobile detection and mobile theme dispatcher 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13866 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-06 09:00:25 +00:00
vChabot
3d882ad13c [-] FO : Bugfix : Assigning subcategories to the template 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13864 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-06 08:52:55 +00:00
rMalie
2eed902a74 // Retro-compatibility fix of front controllers 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13847 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-05 15:32:06 +00:00
rMalie
472215d425 // Fix stores with multishop + hide blockstore if no store 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13698 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 15:35:15 +00:00
bMancone
cece625999 // Fixed revision 13573 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13680 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 13:26:55 +00:00
vAugagneur
bad7d8c586 [-] BO : fixed bug in contact message with html 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13673 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 11:05:21 +00:00
mDeflotte
1882cbcf14 // Fix bug with supplier ordered 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13633 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 15:41:01 +00:00
mDeflotte
71a96c09ed // Fix bug with a bad smarty var assignation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13632 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 15:40:38 +00:00
vChabot
02d98b237e // id_category_default is now for multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13624 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 13:53:52 +00:00
rMalie
4ee2698992 // Replace shop->addSqlAssociation() by static call 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13620 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 13:07:51 +00:00
mDeflotte
7e5c73c277 [-] FO : #PSFV-569 - Fix bug with instant search 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13593 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-24 09:52:37 +00:00