tDidierjean
|
7a6a998aab
|
// rename $toolbar_fix to $toolbar_scroll part2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13712 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-28 17:39:40 +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 |
|
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 |
|
dMetzger
|
ae8471b7d6
|
[-] BO : small fixes on AdminCartRules #PSFV-506
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13455 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-20 10:25:21 +00:00 |
|
dMetzger
|
ec0798fe8a
|
[-] FO : If a product is given for free in a cart rule and is already in the cart, the price is subtracted #PSTEST-715
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13275 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-13 17:47:40 +00:00 |
|
bMancone
|
9ef6ddb636
|
// Fixed #PSFV-510
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13258 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-13 14:55:43 +00:00 |
|
dMetzger
|
744bf28826
|
[*] BO : shop restriction added to the cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13032 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-06 14:57:39 +00:00 |
|
tDidierjean
|
96c8e763b9
|
// Replace public by protected in override methods
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13022 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-06 13:41:51 +00:00 |
|
vChabot
|
87acb76026
|
// norm fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12974 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-03 13:50:51 +00:00 |
|
dMetzger
|
b39c0061a7
|
[*] BO : new dimension added to the product filter in the cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12714 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-26 13:30:16 +00:00 |
|
rMalie
|
359b51d1ea
|
// Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12691 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-25 16:39:34 +00:00 |
|
tDidierjean
|
ad1fd29cea
|
// Refactor AdminController::_errors to errors
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12331 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-11 08:58:12 +00:00 |
|
tDidierjean
|
84035510b5
|
// Move controller templates to subfolder controllers/
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12287 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-09 17:23:42 +00:00 |
|
lLefevre
|
ff68f9b47c
|
[-] BO : #PSTEST-219 : fix small bugs and translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12057 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-03 13:05:36 +00:00 |
|
lLefevre
|
9600128885
|
[-] BO : #PSTEST-302 : update call javascript file via setMedia()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12025 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-03 08:44:15 +00:00 |
|
rMalie
|
f55a9e04b9
|
[*] Classes: Db->execute() now return always a boolean. Use Db->query() instead.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10999 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 15:41:34 +00:00 |
|
lLefevre
|
8671928caf
|
// added toolbar in cart_rules form.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10811 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-30 16:08:30 +00:00 |
|
tDidierjean
|
f9c4410e8d
|
// Rename AdminController methods initForm() initList() etc. to renderForm() renderList()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10799 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-30 11:06:38 +00:00 |
|
bMancone
|
f4ed4ce3ee
|
// AdminCartRulesController : fixed toolbar in initForm()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10614 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 21:49:48 +00:00 |
|
dMetzger
|
c604df470d
|
// Cart rules fixed in admin customers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10594 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 19:22:23 +00:00 |
|
dMetzger
|
bb7050715b
|
// bug fix for the cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10525 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-23 13:38:41 +00:00 |
|
dMetzger
|
8fdcb10f78
|
// BO : cart rules form improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10294 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 16:18:04 +00:00 |
|
dMetzger
|
db15eec68b
|
// BO : cart rules form improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10290 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-20 14:50:20 +00:00 |
|
rGaillard
|
fe7dfe0460
|
// Some improvements on BackOffice orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9810 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-02 19:19:03 +00:00 |
|
dMetzger
|
486622522c
|
[+] Project : Vouchers are now replaced by cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9771 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-01 18:50:42 +00:00 |
|