Commit Graph

167 Commits

Author SHA1 Message Date
vAugagneur
16c232ed52 [-] BO : fixed bug #PSFV-751 - Carrier - Rule of free shipping does not work
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14384 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-30 09:46:29 +00:00
mDeflotte
75763f08a1 // Change commentary "the the cart" for "the cart"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14380 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-30 09:09:38 +00:00
mDeflotte
4bea006152 [-] FO : #PSFV-604 - Add commentaries
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14350 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-29 07:18:09 +00:00
mDeflotte
25f3f74ee3 [-] FO : #PSFV-660 - Fix bug with multishipping proposed whereas de multishipping is disable
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14214 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-16 10:19:21 +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
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
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
rMalie
48e9590cf4 // Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13991 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-09 09:19: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
vAugagneur
172359d6ad [-] BO : #PSFV-587 - product additional shipping cost not included in order shipping summary
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13890 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-06 14:09:25 +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
c2cef61a5a // Replace shop->addSqlRestriction() and shop->addSqlRestrictionOnLang() by static versions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13618 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 12:15:30 +00:00
rGaillard
2408b4ac5f [+] Core : products and carriers tax rules are associated to shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13586 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-24 09:26:18 +00:00
rMalie
2454cd7863 // Welcome 2012²
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13573 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 16:33:10 +00:00
rMalie
b24dcffc9c // Improve multishop API
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13566 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 15:39:44 +00:00
mDeflotte
30cdc8b277 // Don't preselect delivery options
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13488 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-21 10:02:56 +00:00
dMetzger
609a45f25b [*] BO : you can now choose the combination of the free product of a cart rule
[*] FO : the free product is now removed from the cart along with the cart rule (where applicable)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13479 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-20 17:04:41 +00:00
mDeflotte
712ce8a688 [-] FO : #PSCFI-4762 - When cart contains virtuals products and physicals products, use only physicals to calculate shipping cost
// Product virtuals added before upgrading need to have the column ps_product.is_virtual at 1

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13477 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-20 16:40:22 +00:00
mDeflotte
caf5a6afc3 // Shippping calculation on multishipping did not use package address delivery but the cart address delivery
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13442 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 15:57:37 +00:00
mDeflotte
e58ca980cd [-] Classes : #PSTEST-717 - Fix an infinite loop
// Add missing params $products

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13293 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 10:36:53 +00:00
mDeflotte
68b4b1c6bc // Improving adding address with order-opc
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13256 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 14:15:23 +00:00
dMetzger
a056a78177 // A few dozens queries less on every pages...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13197 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-09 17:15:05 +00:00
mDeflotte
8dc8455e78 // fix bug with missing $context->cart and $context->customer durring payment process
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13089 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-07 17:15:44 +00:00
mDeflotte
b36947f364 [-] BO : #PSTEST-661 - Fix bug with non-assigned context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13029 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 14:19:39 +00:00
vChabot
9ef6be204a // Part of Code Review multishipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13008 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-06 09:28:35 +00:00
mDeflotte
14c318bead [*] BO : #PSTEST-381 - Checkbox "Send available products first" must not be present if there is only product "out of stock", or to check states of virtual products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12962 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-03 09:46:34 +00:00
mDeflotte
2151238e24 [-] BO : #PSTEST-618 - Carriers price was not good on order creation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12950 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-03 08:20:06 +00:00
dMetzger
8a4b9f7afe [-] FO : free gift fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12726 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 17:17:18 +00:00
dMetzger
ff44291d38 [-] FO : uncombinable cart rules are not combinable anymore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12721 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 15:17:23 +00:00
dMetzger
b274997203 [-] BO : voucher creation in the order detail fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12718 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 14:34:58 +00:00
rMalie
2159489ad2 // Add more informations on deprecated data
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12716 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 14:10:31 +00:00
rMalie
c994c25fe1 // Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12680 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 14:40:12 +00:00
rMalie
a4d97911b1 [*] Classes : Db::autoExecute() call are now replaced by Db::insert() or Db::update()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12624 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-23 17:41:02 +00:00
mDeflotte
441f643fda // Retrocompatibility with carriers modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12614 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-23 15:50:50 +00:00
rMalie
6887541bdd [-] Classes : all classes and controllers now use their name in static calls instead of self (improve override) #PSFV-376
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12552 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-19 10:14:10 +00:00
rMalie
ec8c716292 // Fix retrocompatibility with themes 1.4 -> 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12393 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-12 14:55:50 +00:00
bMancone
c0523a2f74 // Improved Pack management
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12317 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-10 15:40:46 +00:00
tDidierjean
f9281afe9f // FO : fix multiple instances of Cart and Address
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12036 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-03 09:49:58 +00:00
rMalie
07207496d7 // Rename correctly all hooks
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12006 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 15:52:40 +00:00
mDeflotte
e7e22788e7 [-] FO : #PSFV-272 - Add translation + try to not increase global qty of product on choosing "Ship to multiple addresses"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11986 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 13:35:42 +00:00
jBreux
04b3b0ac5e // Fix adding pack to cart O_o
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11704 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 22:03:13 +00:00
jBreux
16861c4d03 // Fix adding pack to cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11701 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 21:54:38 +00:00
tDidierjean
7e8d640627 // Fix autosetProductAddress
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11695 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 21:25:18 +00:00
mDeflotte
aff7e275a6 // BugFix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11694 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 21:24:19 +00:00
mDeflotte
d0511c3211 // Improving method getAvailableCarrierList
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11648 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 17:37:27 +00:00
mDeflotte
d1f8e02485 // Fixing problems with blockcart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11642 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 16:56:10 +00:00
mDeflotte
74dab4ca50 // BugFix with shiping and warehouse
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11614 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 14:57:43 +00:00
mDeflotte
cc7584e340 // Problem with product return
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11566 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 09:39:44 +00:00
mDeflotte
93d945d403 // Fix some problems with multishipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11524 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:24:16 +00:00
mDeflotte
07c031260e // Fix some problems with multishipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11511 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 16:27:02 +00:00