dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,839 Commits 9 Branches 19 Tags
321eaa191b5e736b259379141b312dba83883516
Commit Graph

135 Commits

Author SHA1 Message Date
sLorenzini
05a6f856da [-] FO: CLONE - order_conf still not fixed propertly #2 - #PSCFV-5817 2012-12-11 17:43:30 +01:00
vAugagneur
f40369ef6a [-] CORE : fixed sql bug in PaymentModuleCore::getInstalledPaymentModules() - now get only active payment modules 2012-12-06 17:05:19 +01:00
Rémi Gaillard
2d93064fb9 [-] Core: Fix #PSCFV-5948 id_warehouse was sometime set to null on validateorder with stock management disabled 2012-12-04 15:32:06 +01:00
Vincent Augagneur
191b6ca526 Merge pull request #17 from axome/ColorEmail 
[+] CORE : Remove color for email in *.php
 2012-11-23 00:18:29 -08:00
vAugagneur
18c464f8e9 //fix sarah bug :p part 2 2012-11-22 17:57:19 +01:00
vAugagneur
f3e18165d1 //fix sarah bug :p 2012-11-22 17:52:10 +01:00
Sarah Lorenzini
d2023a5105 [-] FO : fixed bug #PSCFV-5779 - order_conf still not fixed propertly 2012-11-22 17:12:58 +01:00
cmouleyre
0d545d0a53 Remove color for email in *.php 2012-11-22 14:58:52 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
Rémi Gaillard
2244b6e4cf [-] Core: Fix #PSCFV-5561 many payment informations are added when product is out of stock on order validation 2012-11-22 10:49:50 +01:00
rGaillard
e01fe4c6dd [-] Core : fix id_warehouse used for orders 2012-11-09 16:41:40 +00:00
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
rGaillard
d1959d1d5b // Fix #PSCFV-4916 2012-10-12 13:25:12 +00:00
vAugagneur
00d8200b28 [+] CORE : added transaction_id in PaymentModule::validateOrder() in $extra_vars['transaction_id'] 2012-10-10 15:20:34 +00:00
dMetzger
754d18bf87 // Fixed bad use of context 2012-10-02 08:55:20 +00:00
vAugagneur
9f1b834d20 //add payment module restriction when enable country 2012-10-01 15:40:11 +00:00
dMetzger
03d39e2814 // Fixed variable conflict $message in validateorder 2012-09-27 14:24:19 +00:00
rGaillard
844b97318e [-] Core: Fix PSCFV-3092 2012-08-03 14:40:31 +00:00
mDeflotte
ce886cbde6 [-] FO : #PSCFV-3268 - Fix bug with cache and cart rule discount calculation 2012-08-02 09:07:18 +00:00
lLefevre
5cd384336e [-] Bo : replace constant _PS_THEME_DIR_ by _PS_MAIL_DIR_ when send a email 2012-07-25 08:34:17 +00:00
lLefevre
ed19ef4b67 [-] BO : fix #PSCFV-3278 : add a parameter id_shop in a method Mail::send() && normalize 2012-07-24 14:13:11 +00:00
mDeflotte
f4fa8bd1b1 [-] FO : #PSCFV-3268 - Fix bug with cache cartrule badly fill 
// This fix is not "clean". It would be intersting to take more time to found a better solution
 2012-07-24 13:08:44 +00:00
rGaillard
7a5ae61052 // Fix bad variable name on PaymentModule.php 2012-07-11 15:30:18 +00:00
dMetzger
eff1575e19 // Payment module now fully use the context #PSCFV-2845 2012-07-10 12:54:33 +00:00
mDeflotte
330b85cfe2 [-] BO : #PSCFV-3112 - Fix bug with payment by cheque and multishipping 2012-07-09 16:30:12 +00:00
lLefevre
144711a623 [-] BO : #PSCFV-3039 : Add customer thread when i have a order message 2012-07-09 08:46:11 +00:00
mDeflotte
f981d8f37b [-] FO : #PSCFV-2920 - Hidding order number, use order reference instead 2012-06-26 15:19:35 +00:00
mDeflotte
193fc01c17 [-] BO : #PSCFV-2542 - Fix bug : Unable to translate PaymentModule : some email terms are still in english 2012-06-04 09:07:30 +00:00
mDeflotte
c060909bd1 [-] Project : #PSCFV-2633 #PSCFV-2622 - Fix problems with multishipping and order payment & invoice 2012-06-01 15:40:32 +00:00
mDeflotte
ebf06fde2f // Fix bug with || instead of a && 2012-05-30 07:14:21 +00:00
lLefevre
91a8a392c7 [-] BO : #PSCFV-2553 : fix bug html for email order_conf.html 2012-05-29 16:37:28 +00:00
Francois Gaillard
4d6cee24e2 // Bug fix payment module (with previous commit) 2012-05-24 13:04:14 +00:00
Francois Gaillard
be650eb1dd // Bug fix for payment modules (shops informations on validate order) 2012-05-24 13:01:35 +00:00
lLefevre
3ccc4c5013 // Fix translations mails errors for each languages 
// Now, Subject for reply_msg.html is translated
// Now use sprintf() in subject mails
 2012-05-24 09:57:48 +00:00
rMalie
baba8faa01 // Code review for the change paymentModule 2012-05-22 12:12:50 +00:00
fSerny
889ad6d356 [-] BO : Fixing module restrictions in multishop context 2012-05-22 10:08:21 +00:00
mDeflotte
6d94e08afc // Fix bug with gift products and multishipping 2012-05-21 17:31:43 +00:00
rGaillard
5aeb25b804 [*] BO: Add free shipping to BackOffice Order 2012-05-21 17:11:00 +00:00
dMetzger
21dfaf816b [-] FO : wrong calcul of the free shipping in multi-shipping 2012-05-21 17:08:16 +00:00
dMetzger
aaf437a3e0 [-] FO : added the concept of product package (multi-shipping) for the cart rules in getContextualValue() 2012-05-21 14:19:54 +00:00
mDeflotte
298b880156 // Fix bug with undefined $carrier durring payment process 2012-05-21 13:22:26 +00:00
dMetzger
a28d21c046 [-] FO : fixed a great part of the cart rules with multi-shipping 2012-05-21 13:15:15 +00:00
mDeflotte
7f21555fa6 // Remove unusefull assignation 2012-05-21 09:58:45 +00:00
mDeflotte
4a51ef08f1 // Fix bug with multishipping shipping cost 2012-05-21 09:38:29 +00:00
fBrignoli
9f2a8bc26a [-] Classes : Bug Fixed #PSCFV-1271 - Order confirmation email + tax excl group 2012-05-18 08:40:54 +00:00
lLefevre
83703dc4ee [-] FO : #PSCFV-2151 : Translations of errors are connected width sprintf() 2012-05-14 11:45:41 +00:00
fBrignoli
ddc49dcba0 // previous fix fix 2012-05-10 15:51:05 +00:00
fBrignoli
b08e6d09e1 [-] BO : Multiple cart rules should be save in order total discount 2012-05-10 14:57:33 +00:00
mDeflotte
9a8756ca96 // If an order contain only virtual products, don't set a carrier to the order 2012-05-03 08:58:35 +00:00