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

45 Commits

Author SHA1 Message Date
lLefevre
f0f658df52 // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17889 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-10-17 09:29:43 +00:00
lLefevre
e924469a70 // #PSCFV-5017 : update bad licenses in all files 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17884 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-10-17 06:18:59 +00:00
rGaillard
a800886fa4 // fix php notice on cart rule addition without conditions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17834 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-10-11 09:35:45 +00:00
dMetzger
e8cef6aea0 [-] BO : fixed combination of cart rules when saving the rule #PSCFV-4147 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17433 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-09-20 11:52:06 +00:00
dMetzger
6fed7f3683 // Renamed defaultLanguage in id_lang_default in order to avoid conflict with an object #PSCFV-3780 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17065 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-08-29 09:55:39 +00:00
dMetzger
121d9abc2c [-] BO : you could not remove a gift once it had been set #PSCFV-3420 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16606 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-30 14:35:59 +00:00
dMetzger
04985181e3 // Cart rule display in cart summary 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15755 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-30 09:29:55 +00:00
dMetzger
7f6d1a17d0 [-] BO : Product filter initialization fixed in cart rules #PSCFV-2524 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15611 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-22 11:54:54 +00:00
dMetzger
2bd2416cc0 [-] BO : there was some row doubled in the cart rules because of the multi-shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15099 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 12:50:24 +00:00
dMetzger
1fee05edca [-] BO : in the cart rules, when a reduction is associated to a specific product, the product is automatically added to the restrictions #PSCFV-2195 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15071 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-04 11:05:07 +00:00
mDeflotte
19961a5438 [-] Project : #PSFV-820 - Cartrules are now reapplied each time we add/remove a product on/from the cart 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14760 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-19 09:39:14 +00:00
dMetzger
04797eb90b [-] BO : fixed double in the product list of the cart rules when multi-shop is activated #PSTEST-1154 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14669 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 08:09:16 +00:00
dMetzger
713b9323c6 [-] BO : array_unique added in the cart rules in order to prevent sql error #PSTEST-1094 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14606 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-12 13:00:11 +00:00
tDidierjean
244a2f9102 [*] BO : #PI-123 - toolbar and page title refactoring 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14594 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-12 08:34:38 +00:00
tDidierjean
758e8d07a2 // Rename fieldsDisplay to fields_list part1 (timeout) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14376 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-29 16:26:54 +00:00
tDidierjean
d752b192f5 // Refactoring: remove $token arg from process functions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14269 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-26 15:25:36 +00:00
rGaillard
82e0beb63d // Fix backOffice order cart rules management 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14201 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-15 14:42:57 +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
rMalie
48e9590cf4 // Normalize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13991 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-09 09:19:30 +00:00
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