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

137 Commits

Author SHA1 Message Date
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Gregory Roussac
3e9e765a5a [-] FO : Fix html entities in order messages and threads 2012-12-27 12:23:10 +01:00
sLorenzini
0727da6aeb [-] FO: CLONE - order_conf still not fixed propertly #2 - #PSCFV-5817 2012-12-11 17:43:30 +01:00
vAugagneur
4dbb321836 [-] CORE : fixed sql bug in PaymentModuleCore::getInstalledPaymentModules() - now get only active payment modules 2012-12-06 17:05:19 +01:00
Rémi Gaillard
a1e91bcfa9 [-] 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
1504c07fea Merge pull request #17 from axome/ColorEmail 
[+] CORE : Remove color for email in *.php
 2012-11-23 00:18:29 -08:00
vAugagneur
992897e785 //fix sarah bug :p part 2 2012-11-22 17:57:19 +01:00
vAugagneur
c11b283fca //fix sarah bug :p 2012-11-22 17:52:10 +01:00
Sarah Lorenzini
110965a338 [-] FO : fixed bug #PSCFV-5779 - order_conf still not fixed propertly 2012-11-22 17:12:58 +01:00
cmouleyre
da1ae4906e Remove color for email in *.php 2012-11-22 14:58:52 +01:00
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
Rémi Gaillard
38825d6551 [-] 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
538823aa72 [-] Core : fix id_warehouse used for orders 2012-11-09 16:41:40 +00:00
lLefevre
779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
046b51ab99 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
rGaillard
61dbf06cf4 // Fix #PSCFV-4916 2012-10-12 13:25:12 +00:00
vAugagneur
03cf36aab2 [+] CORE : added transaction_id in PaymentModule::validateOrder() in $extra_vars['transaction_id'] 2012-10-10 15:20:34 +00:00
dMetzger
cc6055e065 // Fixed bad use of context 2012-10-02 08:55:20 +00:00
vAugagneur
2b917ed3c3 //add payment module restriction when enable country 2012-10-01 15:40:11 +00:00
dMetzger
75d85d5c87 // Fixed variable conflict $message in validateorder 2012-09-27 14:24:19 +00:00
rGaillard
ae5acf0be9 [-] Core: Fix PSCFV-3092 2012-08-03 14:40:31 +00:00
mDeflotte
b3d1dbbadc [-] FO : #PSCFV-3268 - Fix bug with cache and cart rule discount calculation 2012-08-02 09:07:18 +00:00
lLefevre
84f95dd80b [-] Bo : replace constant _PS_THEME_DIR_ by _PS_MAIL_DIR_ when send a email 2012-07-25 08:34:17 +00:00
lLefevre
d931296828 [-] BO : fix #PSCFV-3278 : add a parameter id_shop in a method Mail::send() && normalize 2012-07-24 14:13:11 +00:00
mDeflotte
03de94f5c6 [-] 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
674d8b71f0 // Fix bad variable name on PaymentModule.php 2012-07-11 15:30:18 +00:00
dMetzger
732f18e2ac // Payment module now fully use the context #PSCFV-2845 2012-07-10 12:54:33 +00:00
mDeflotte
fffc7b9f8f [-] BO : #PSCFV-3112 - Fix bug with payment by cheque and multishipping 2012-07-09 16:30:12 +00:00
lLefevre
4d6d3367c8 [-] BO : #PSCFV-3039 : Add customer thread when i have a order message 2012-07-09 08:46:11 +00:00
mDeflotte
100b210d22 [-] FO : #PSCFV-2920 - Hidding order number, use order reference instead 2012-06-26 15:19:35 +00:00
mDeflotte
7ffa63ab9b [-] 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
ba19c164ca [-] Project : #PSCFV-2633 #PSCFV-2622 - Fix problems with multishipping and order payment & invoice 2012-06-01 15:40:32 +00:00
mDeflotte
ca1c161075 // Fix bug with || instead of a && 2012-05-30 07:14:21 +00:00
lLefevre
1d7aa551f5 [-] BO : #PSCFV-2553 : fix bug html for email order_conf.html 2012-05-29 16:37:28 +00:00
François Gaillard
48ef7f7d3c // Bug fix payment module (with previous commit) 2012-05-24 13:04:14 +00:00
François Gaillard
2b9410c426 // Bug fix for payment modules (shops informations on validate order) 2012-05-24 13:01:35 +00:00
lLefevre
9cc03b3436 // 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
c9b987d9b1 // Code review for the change paymentModule 2012-05-22 12:12:50 +00:00
fSerny
5ef796e1ff [-] BO : Fixing module restrictions in multishop context 2012-05-22 10:08:21 +00:00
mDeflotte
21ed1ef008 // Fix bug with gift products and multishipping 2012-05-21 17:31:43 +00:00
rGaillard
44ca1199f6 [*] BO: Add free shipping to BackOffice Order 2012-05-21 17:11:00 +00:00
dMetzger
1a420b5b4e [-] FO : wrong calcul of the free shipping in multi-shipping 2012-05-21 17:08:16 +00:00
dMetzger
c75f93d63e [-] FO : added the concept of product package (multi-shipping) for the cart rules in getContextualValue() 2012-05-21 14:19:54 +00:00
mDeflotte
51ebf87dbf // Fix bug with undefined $carrier durring payment process 2012-05-21 13:22:26 +00:00
dMetzger
442c27830d [-] FO : fixed a great part of the cart rules with multi-shipping 2012-05-21 13:15:15 +00:00
mDeflotte
2bd4137b28 // Remove unusefull assignation 2012-05-21 09:58:45 +00:00
mDeflotte
4197ac54f3 // Fix bug with multishipping shipping cost 2012-05-21 09:38:29 +00:00
fBrignoli
1600ea9081 [-] Classes : Bug Fixed #PSCFV-1271 - Order confirmation email + tax excl group 2012-05-18 08:40:54 +00:00
lLefevre
d5a5f3f7ea [-] FO : #PSCFV-2151 : Translations of errors are connected width sprintf() 2012-05-14 11:45:41 +00:00
fBrignoli
a325f585a5 // previous fix fix 2012-05-10 15:51:05 +00:00