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

184 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
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
dMetzger
0af6a2f360 [-] FO : cart rules are now removed when the cart is empty #PSTEST-1205 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14858 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-24 17:10:32 +00:00
mDeflotte
d4274b6054 [-] FO : #PSFV-803 - Fix bugs with customization and cart summary 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14788 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-20 14:55:21 +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
rMalie
04a7580a98 // Fix join between product_attribute and product_attribute_shop on getproducts methods 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14700 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 16:10:51 +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
dMetzger
448e856c85 // nothing serious :] 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14562 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-10 17:02:33 +00:00
dMetzger
46ed8664a4 [-] FO : fixed infinite loop in free shipping cart rule #PSTEST-1138 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14561 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-10 16:57:50 +00:00
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