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

115 Commits

Author SHA1 Message Date
lLefevre
ff0bdb5532 [-] Bo : replace constant _PS_THEME_DIR_ by _PS_MAIL_DIR_ when send a email 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16562 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-25 08:34:17 +00:00
lLefevre
f2233e08d0 [-] BO : fix #PSCFV-3278 : add a parameter id_shop in a method Mail::send() && normalize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16549 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-24 14:13:11 +00:00
mDeflotte
412cae1d51 [-] 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

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16547 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-24 13:08:44 +00:00
rGaillard
d6937e9d94 // Fix bad variable name on PaymentModule.php 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16350 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-11 15:30:18 +00:00
dMetzger
b284210026 // Payment module now fully use the context #PSCFV-2845 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16306 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-10 12:54:33 +00:00
mDeflotte
e8b686d928 [-] BO : #PSCFV-3112 - Fix bug with payment by cheque and multishipping 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16294 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-09 16:30:12 +00:00
lLefevre
a5f5a7fad7 [-] BO : #PSCFV-3039 : Add customer thread when i have a order message 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16271 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-09 08:46:11 +00:00
mDeflotte
3c1c6fb7e0 [-] FO : #PSCFV-2920 - Hidding order number, use order reference instead 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16136 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-26 15:19:35 +00:00
mDeflotte
ea601eb639 [-] BO : #PSCFV-2542 - Fix bug : Unable to translate PaymentModule : some email terms are still in english 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15808 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-04 09:07:30 +00:00
mDeflotte
d02787dc97 [-] Project : #PSCFV-2633 #PSCFV-2622 - Fix problems with multishipping and order payment & invoice 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15797 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-01 15:40:32 +00:00
mDeflotte
ed228a12b4 // Fix bug with || instead of a && 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15745 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-30 07:14:21 +00:00
lLefevre
77c458b6a9 [-] BO : #PSCFV-2553 : fix bug html for email order_conf.html 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15744 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-29 16:37:28 +00:00
fGaillard
49965e89fe // Bug fix payment module (with previous commit) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15661 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-24 13:04:14 +00:00
fGaillard
989f3b46c1 // Bug fix for payment modules (shops informations on validate order) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15660 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-24 13:01:35 +00:00
lLefevre
0517f5438d // Fix translations mails errors for each languages 
// Now, Subject for reply_msg.html is translated
// Now use sprintf() in subject mails

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15658 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-24 09:57:48 +00:00
rMalie
7d9ca8d486 // Code review for the change paymentModule 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15612 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-22 12:12:50 +00:00
fSerny
534b4facb2 [-] BO : Fixing module restrictions in multishop context 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15606 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-22 10:08:21 +00:00
mDeflotte
4b1cce7054 // Fix bug with gift products and multishipping 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15558 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 17:31:43 +00:00
rGaillard
8b589b02c0 [*] BO: Add free shipping to BackOffice Order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15551 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 17:11:00 +00:00
dMetzger
fc33b24f3d [-] FO : wrong calcul of the free shipping in multi-shipping 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15548 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 17:08:16 +00:00
dMetzger
f5483f787d [-] FO : added the concept of product package (multi-shipping) for the cart rules in getContextualValue() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15510 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 14:19:54 +00:00
mDeflotte
da1a21fd2d // Fix bug with undefined $carrier durring payment process 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15496 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 13:22:26 +00:00
dMetzger
c23203018d [-] FO : fixed a great part of the cart rules with multi-shipping 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15494 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 13:15:15 +00:00
mDeflotte
b1451fed85 // Remove unusefull assignation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15486 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 09:58:45 +00:00
mDeflotte
1cd6735093 // Fix bug with multishipping shipping cost 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15480 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 09:38:29 +00:00
fBrignoli
36582b7023 [-] Classes : Bug Fixed #PSCFV-1271 - Order confirmation email + tax excl group 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15362 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-18 08:40:54 +00:00
lLefevre
897c6acb82 [-] FO : #PSCFV-2151 : Translations of errors are connected width sprintf() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15265 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-14 11:45:41 +00:00
fBrignoli
783fcb5fa0 // previous fix fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15188 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 15:51:05 +00:00
fBrignoli
74f7841fae [-] BO : Multiple cart rules should be save in order total discount 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15181 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 14:57:33 +00:00
mDeflotte
2169016b87 // If an order contain only virtual products, don't set a carrier to the order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15029 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 08:58:35 +00:00
mDeflotte
f999822533 // Revert class payment module 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15026 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 08:21:59 +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
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
mDeflotte
cda859ab30 [-] FO : #PSFV-813 - Fix bug with cart rule discount rounding price and price validator 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14875 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-25 13:41:41 +00:00
mDeflotte
f73397db89 [-] FO : #PSFV-813 - Fix bug with partial cartrules and free order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14863 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-25 08:51:13 +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
bMancone
285becae29 // Fixed stock_available when ordering products 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14656 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-16 13:39:15 +00:00
lLefevre
d5040ebe5d [-] BO : #PSTEST-1105 : fix bug mail virtual product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14456 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-04 13:55:35 +00:00
mDeflotte
a606f14f76 [-] FO : #PSFV-755 - Fix bug with bad total paid real 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14400 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-02 09:37:48 +00:00
mDeflotte
0cff673e5e [-] FO : #PSFV-755 - Fix bug with bad total paid real 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14398 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-02 08:26:37 +00:00
mDeflotte
d1c3815f42 [-] FO : #PSTEST-993 - price validation do not allow prixe with 10 or more decimals 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14148 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-14 13:36:05 +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
fBrignoli
e33f6a9d91 // debug removed 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13904 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-06 16:29:29 +00:00
dMetzger
d5c2094706 // Temp fix for cart rule and multi-shipping - not fully functionnal yet but still better than before 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13771 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-01 09:45:39 +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
rGaillard
91c932f9f9 // Improve BackOffice Order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13122 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 13:34:53 +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
fGaillard
1c6357c1d9 [*] TR : #PSTEST-553 : Replaced can't with cannot 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12796 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-30 12:54:32 +00:00
dMetzger
f1dece04f2 [-] BO : partial use fixed for cart rules 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12762 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-27 15:56:57 +00:00