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 |
|
bMancone
|
0d0f43f783
|
// Orders : fixed stock (available quantity & Stock)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11491 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-21 14:24:34 +00:00 |
|
fGaillard
|
b03bfc5efd
|
// Fixed warehouse shops list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11435 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-20 17:29:24 +00:00 |
|
mDeflotte
|
7776b7af6d
|
// Add id_shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11431 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-20 16:58:27 +00:00 |
|
mDeflotte
|
772147a6ee
|
// Removing some id_warehouse
// Adding some checks with advanced_stock_management product attribute
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11375 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-19 16:01:41 +00:00 |
|
rMalie
|
b7ae37f6d7
|
// Change prototype of methods from(), leftJoin(), innerJoin(), leftOuterJoin() and naturalJoin() for DbQuery class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11351 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-19 11:13:13 +00:00 |
|
fBrignoli
|
2139d3983d
|
[*] CO : Additional Shipping Cost / Purchase Price / Reduction Amount texc in OrderDetails
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11345 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-19 10:16:04 +00:00 |
|
mDeflotte
|
9688e7741f
|
// Fixing bugs in admin cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11343 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-19 09:51:59 +00:00 |
|
dMetzger
|
6c7337d2cb
|
// Fixed rounding bug on cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11245 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 10:41:00 +00:00 |
|
rMalie
|
49129f85dc
|
// Format definitions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11230 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 17:21:18 +00:00 |
|
mBertholino
|
225c8523e9
|
// improve multishop code, id_shop has an id different than 0 even if share_customer or share_order is true
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11172 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-13 13:37:59 +00:00 |
|
mBertholino
|
5f4972701c
|
// improve multishop code with id_shop = 0 when share_customer or share_order is true
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11169 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-13 11:59:41 +00:00 |
|
rMalie
|
b8f5b693b9
|
// Format definitions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11157 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-12 21:06:59 +00:00 |
|
rMalie
|
fddf4fb89b
|
[*] Classes: Remove $fieldsRequired, $fieldsSize and $fieldsValidate (and lang properties) properties, use $definition instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11155 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-12 18:10:38 +00:00 |
|
mDeflotte
|
d843b14ac6
|
// BugFix : Display errors when no carriers available
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11112 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-12 10:21:56 +00:00 |
|
mDeflotte
|
0d917153da
|
// Little BugFix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11033 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-08 09:00:29 +00:00 |
|