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

44 Commits

Author SHA1 Message Date
mDeflotte
fd36dd7130 // Fix bug: undefined variable 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16237 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-05 12:59:57 +00:00
mDeflotte
a1311dba2d [-] BO : #PSCFV-3055 - Part 1 : Improving displaying of resume cart (payment step) 
[-] BO : #PSCFV-3055 - Part 1 : If there is a rules with free shipping, shipping prices are not displayed

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16234 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-05 12:40:40 +00:00
aNiassy
785232d450 [-] FO : Added a simple space in order to be more readable 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16003 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-13 08:16:18 +00:00
aNiassy
7447131226 [-] FO : #PSCFI-5795 : fixed a bug where the opc freeze when an Order is to 0 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16002 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-13 08:12:16 +00:00
mDeflotte
aed3c8c6f3 // Fix bug with multishipping and gift products 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15476 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 08:52:45 +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
mDeflotte
51d58ad3be // Revert a line removed by error 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15025 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 08:15:03 +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
dc3a20251f [-] FO : Fixed bug #PSCFV-1251 & #PSCFV-1727 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14977 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-30 12:51:20 +00:00
mDeflotte
6120874516 [-] BO : #PSFV-874 - Carriers asked with guest checkout and virtual cart 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14701 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 16:27:39 +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
9db2c449bb [-] BO : #PSTEST-996 - Fix bug with multishipping and wrapping cost 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14034 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-12 14:00:52 +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
rMalie
2eed902a74 // Retro-compatibility fix of front controllers 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13847 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-05 15:32:06 +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
mMarinetti
10b3e3d8d3 // Welcome 2012 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13520 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-22 09:28:22 +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
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
mDeflotte
11566e2577 [-] BO : #PSTEST-590 - Fix bug with undefined smarty variable "HOOK_EXTRACARRIER_ADDR" + By default use the default country of the shop to calculate shipping cost 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12775 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-30 08:07:49 +00:00
dMetzger
113d3a5174 // Small fixes for cart rules 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12756 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-27 14:38:04 +00:00
rMalie
7a30d151e6 // Normalize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12689 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-25 16:13:36 +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
494205d52e // Fix PrestaShopException typo 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12128 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-04 13:53:19 +00:00
tDidierjean
5ae13861be [*] Classes : fix bug #PSFV-162 - Remove unused variables 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12125 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-04 13:41:03 +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
mMarinetti
abc215a343 // Add missing call of parent::initContent() in all front class (when initContent exists) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11215 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-14 16:22:50 +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
31e90d9031 // Retrocompatibility : Now old 1.4 template works with new chechout process. Multishipping cannot be enabled. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10948 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-05 17:11:26 +00:00
mDeflotte
b08563276b // BugFix : message "Please chose a carrier" but a delivery option is setted. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10807 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-30 14:56:33 +00:00
mDeflotte
3989b708c8 // Delivery option are now auto-selected in the checkout 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10572 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 17:21:30 +00:00
mDeflotte
73e4b5fe56 // BugFix : With Guest Checkout, an alert is displaying each time we increase/decrease the quantity of a product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10530 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 13:59:14 +00:00
mDeflotte
4261dbc0df // Multishipping : Refresh carrier list 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10502 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 09:57:21 +00:00
mDeflotte
5532f12d80 // Multishipping : on opc, on putting multi-shipping to off, the cart is set to one address delivery 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10458 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 17:18:30 +00:00
mDeflotte
eab460df2d // BugFix id_carrier in cart not defined + choosing address delivery for multishiping on opc 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10389 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 09:28:22 +00:00
mDeflotte
0ce1e22813 // BugFix with opc and multishipping 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10330 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 10:42:14 +00:00
fSerny
0ba4fe9c7e [*] PROJECT : New Module API (part 1) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9790 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-02 10:49:01 +00:00
rMalie
2068aaaf2a // Norm on controllers 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8930 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 13:50:55 +00:00
vAugagneur
2fbc132933 [+] Classes : added new class Media => It contains all the method related to media like CSS, JS 
[+] Classes : added new method Media::addJquery(), Media::addJqueryUI(), Media::addJqueryPlugin()
[~] Deprecated : All method related to CCC has been moved in class Media

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8926 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 13:01:10 +00:00
vChabot
355bad0fba // fix undefined var $customer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8889 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 15:45:09 +00:00
mDeflotte
f9c565699b //OrderDetailController : Refacto done + modify some comments 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8869 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 11:53:00 +00:00
mDeflotte
50bdd80431 //OrderOpcController+OrderSlipController+PageNotFoundController : Refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8867 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 09:03:41 +00:00
mDeflotte
6a96dd1371 //Use protected instead of private function 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8863 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 07:07:06 +00:00
rMalie
d8b6693264 // Fix strict standard on controllers + modules header / footer include 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8727 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-23 08:05:31 +00:00
rMalie
69db63f26c [*] Front: move front controllers in controllers/front/ directory 
// Refactoring of front controllers part 1

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8721 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-22 15:19:42 +00:00