Commit Graph

225 Commits

Author SHA1 Message Date
vAugagneur
b8554dcdd4 [-] FO : fixed bug #PSCFV-4336
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17506 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-24 14:27:16 +00:00
rGaillard
4dac4d9609 [-] FO: Fix PSCFV-4078
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17458 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-21 13:06:53 +00:00
rGaillard
1c1cdab498 [*] Core: Image covers is now multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17374 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-14 14:25:44 +00:00
dMetzger
ed3ef17b00 // Fixed bug in multishop when multishipping is not activated: sometimes the multishipping was "forced" in the cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17314 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-12 17:22:43 +00:00
vAugagneur
5c6f98a696 //fixed sql bad request in Cart::lastNoneOrderedCart() and in Cart::add()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17289 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-11 15:04:38 +00:00
rGaillard
6fbaafca4c // Fix PSCFV-3840
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17136 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-31 14:52:54 +00:00
rGaillard
3054f8ead1 // Fix on product association deletion
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17083 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-29 16:42:45 +00:00
dMetzger
f455965bea // small bug fix on BO orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16842 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-14 09:15:50 +00:00
mDeflotte
34428a7dab [-] FO : #PSCFV-3268 - Fix bug with cache and cart rule discount calculation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16661 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-02 09:07:18 +00:00
rGaillard
cfb8b89481 // Fix various bugs with customized products in backoffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16489 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-19 12:26:04 +00:00
fBrignoli
248efe091c [-] BO : Bug Fixed #PSCFV-3122 - Cart rules applied 2 times on shipping fees if the order is splitted
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16416 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-13 13:42:21 +00:00
mDeflotte
b8cf0fe3e4 [-] FO : #PSCFV-3100 - With OPC shpping cost are not refreshed correctly
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16270 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-09 08:07:46 +00:00
lLefevre
5de4802237 // Fix small bug when the product are not weight
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16257 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-06 08:49:13 +00:00
mDeflotte
7a2eeea33f [-] FO : #PSCFV-3016 - Fix bug on removing quantity of a product with a customisation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16253 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-06 07:40:32 +00:00
mDeflotte
923216dfa4 [-] BO : #PSCFV-3066 - Fix bug on selecting delivery option
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16238 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-05 13:20:38 +00:00
mDeflotte
a1311dba2d [-] BO : #PSCFV-3055 - Part 1 : Improving displaying of resume cart (payment step)
[-] BO : #PSCFV-3055 - Part 1 : If there is a rules with free shipping, shipping prices are not displayed

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16234 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-05 12:40:40 +00:00
mDeflotte
4d56b1a250 [-] FO : #PSCFV-2993 #PSCFV-2811 - Default carriers and carrier sorting where ignored
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16216 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-04 14:24:56 +00:00
rGaillard
2bce691ae8 // Improve performance and bug fixes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15882 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 16:22:48 +00:00
rMalie
88f537c23d // Fix Product::sqlStock() (use restrictions in left join instead of restrictions in where)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15868 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 09:16:03 +00:00
dMetzger
564903dfdf // Fixed #PSCFV-2605
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15803 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 08:23:28 +00:00
rMalie
f6059f0a67 // Webservice getters are now multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15785 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-01 07:45:41 +00:00
dMetzger
04985181e3 // Cart rule display in cart summary
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15755 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-30 09:29:55 +00:00
rGaillard
74f5b513af // Performance optimizations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15719 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-29 08:32:13 +00:00
dMetzger
272906de5f [-] FO : Cart products cache fixed (when you remove a product from the cart)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15683 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 11:27:33 +00:00
mDeflotte
e76b4408f4 // Fix bug with cart, multishipping and gift product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15625 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 14:07:16 +00:00
dMetzger
f1b7e0b834 // Fixed warning when calculating the order total of an empty cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15575 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 18:56:19 +00:00
dMetzger
231a924e31 // Cart display for free shipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15574 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 18:53:30 +00:00
dMetzger
477bcc6b58 // Cart display improved with free shipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15560 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:33:51 +00:00
mDeflotte
4b1cce7054 // Fix bug with gift products and multishipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15558 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:31:43 +00:00
dMetzger
fc33b24f3d [-] FO : wrong calcul of the free shipping in multi-shipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15548 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:08:16 +00:00
dMetzger
8428e228e3 // typo
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15539 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 16:17:53 +00:00
dMetzger
1d3126f99d // Code cleaning and small fixes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15524 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 15:17:21 +00:00
dMetzger
d3b853a686 // variable misnamed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15519 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 14:50:13 +00:00
dMetzger
3fc24ec862 // variable misnamed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15513 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 14:29:54 +00:00
dMetzger
f5483f787d [-] FO : added the concept of product package (multi-shipping) for the cart rules in getContextualValue()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15510 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 14:19:54 +00:00
aNiassy
9cae11c7bc [-] FO : #PSCFV-2478 : Fixed a problem with payment method which displays an error when a product created in multi-shop was chosen
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15499 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 13:24:03 +00:00
dMetzger
c23203018d [-] FO : fixed a great part of the cart rules with multi-shipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15494 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 13:15:15 +00:00
mDeflotte
9763cc1d07 // Normalize php doc commentary
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15488 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 09:59:26 +00:00
dMetzger
7fdea61289 [*] FO : cart summary is adapted to cart rules with a special "friendly" display
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15442 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 13:26:21 +00:00
mDeflotte
65d2eb5ff1 // Change var name
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15225 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 13:41:16 +00:00
mDeflotte
9ae0b2a42e [*] FO : #PSCFV-1463 & #PSCFV-1258 - Gift products and standard products are now displayed on seperate lines
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15177 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 14:37:14 +00:00
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
mDeflotte
cb3850bd9f [-] FO : #PSCFV-2197 - Show which products is assigned to which carrier, when multiple carriers are proposed for the one delivery method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15077 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-04 14:21:02 +00:00
mDeflotte
f25d090958 [-] FO : #PSCFV-2147 - Fix bug with date of delivery
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15067 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-04 09:12:02 +00:00
tDidierjean
acd5be25d1 [-] Classes : fix #PSCFV-1218 - Re-ordering customized products don't duplicate the customization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15024 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 08:13:46 +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
dMetzger
216961588b [-] FO : Cart rules local cache wasn't cleaned correctly #PSCFV-91
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14992 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-02 09:35:04 +00:00
mDeflotte
2e7052d283 [-] FO : Fixed bug #PSCFV-1251 & #PSCFV-1727
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14979 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-30 13:40:46 +00:00
dMetzger
c3585da2a3 [-] FO : free products emptied when there isn't any other products in the cart #PSCFV-300
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14911 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-26 13:56:22 +00:00
dMetzger
c1d7658749 [-] FO : sometimes the cart rules total was doubled - fixed! #PSTEST-1202
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14871 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 12:58:35 +00:00