fram
|
77efe4c04e
|
// changed English strings, especially focusing on colons harmonization
|
2013-03-12 19:39:30 +01:00 |
|
djfm
|
714a5e08cc
|
//Changed English strings using the translationsenglish module.
|
2013-01-04 16:58:58 +01:00 |
|
Francois Gaillard
|
8baf87eef5
|
// Welcome 2013
|
2013-01-04 11:19:03 +01:00 |
|
Damien Metzger
|
eb423f1a09
|
[-] BO : fixed duplicate code management on cart rules #PSCFV-6119
|
2012-12-14 09:48:16 +01:00 |
|
vAugagneur
|
0e0ca2a473
|
[-] CORE : fixed some bad include of jquery plugin
|
2012-11-23 16:35:57 +01:00 |
|
vAugagneur
|
be946319be
|
//remove svn keyword @version Release: $
|
2012-11-22 11:57:40 +01:00 |
|
DamienMetzger
|
ee23354325
|
[-] BO : forbid the creation of 2 cart rules with the same code #PSCFV-5737
|
2012-11-21 10:59:37 +01:00 |
|
vAugagneur
|
8c669ebee4
|
//translation
|
2012-10-29 16:41:01 +00:00 |
|
lLefevre
|
6588f9514c
|
// Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files
|
2012-10-17 09:29:43 +00:00 |
|
lLefevre
|
398d345362
|
// #PSCFV-5017 : update bad licenses in all files
|
2012-10-17 06:18:59 +00:00 |
|
rGaillard
|
93df9c2014
|
// fix php notice on cart rule addition without conditions
|
2012-10-11 09:35:45 +00:00 |
|
dMetzger
|
81828e46a0
|
[-] BO : fixed combination of cart rules when saving the rule #PSCFV-4147
|
2012-09-20 11:52:06 +00:00 |
|
dMetzger
|
69d5329cb7
|
// Renamed defaultLanguage in id_lang_default in order to avoid conflict with an object #PSCFV-3780
|
2012-08-29 09:55:39 +00:00 |
|
dMetzger
|
1b6177ab62
|
[-] BO : you could not remove a gift once it had been set #PSCFV-3420
|
2012-07-30 14:35:59 +00:00 |
|
dMetzger
|
fafaaf783e
|
// Cart rule display in cart summary
|
2012-05-30 09:29:55 +00:00 |
|
dMetzger
|
3049c59422
|
[-] BO : Product filter initialization fixed in cart rules #PSCFV-2524
|
2012-05-22 11:54:54 +00:00 |
|
dMetzger
|
5735b5564a
|
[-] BO : there was some row doubled in the cart rules because of the multi-shop
|
2012-05-09 12:50:24 +00:00 |
|
dMetzger
|
e7b6e05756
|
[-] BO : in the cart rules, when a reduction is associated to a specific product, the product is automatically added to the restrictions #PSCFV-2195
|
2012-05-04 11:05:07 +00:00 |
|
mDeflotte
|
0cb73f9e13
|
[-] Project : #PSFV-820 - Cartrules are now reapplied each time we add/remove a product on/from the cart
|
2012-04-19 09:39:14 +00:00 |
|
dMetzger
|
572807f7c3
|
[-] BO : fixed double in the product list of the cart rules when multi-shop is activated #PSTEST-1154
|
2012-04-17 08:09:16 +00:00 |
|
dMetzger
|
6abbb7e25b
|
[-] BO : array_unique added in the cart rules in order to prevent sql error #PSTEST-1094
|
2012-04-12 13:00:11 +00:00 |
|
tDidierjean
|
9c46e828b5
|
[*] BO : #PI-123 - toolbar and page title refactoring
|
2012-04-12 08:34:38 +00:00 |
|
tDidierjean
|
215ca93f95
|
// Rename fieldsDisplay to fields_list part1 (timeout)
|
2012-03-29 16:26:54 +00:00 |
|
tDidierjean
|
365248d632
|
// Refactoring: remove $token arg from process functions
|
2012-03-26 15:25:36 +00:00 |
|
rGaillard
|
9d758694d4
|
// Fix backOffice order cart rules management
|
2012-03-15 14:42:57 +00:00 |
|
lLefevre
|
c21bef2acf
|
// Fix update english key of translations in all files
|
2012-03-14 12:25:51 +00:00 |
|
rMalie
|
50a44277db
|
// Normalize
|
2012-03-09 09:19:30 +00:00 |
|
tDidierjean
|
e462d968f0
|
// rename $toolbar_fix to $toolbar_scroll part2
|
2012-02-28 17:39:40 +00:00 |
|
rMalie
|
1dc629a949
|
// Welcome 2012²
|
2012-02-23 16:33:10 +00:00 |
|
mMarinetti
|
677a4e485c
|
// Welcome 2012
|
2012-02-22 09:28:22 +00:00 |
|
dMetzger
|
f01657a576
|
[*] 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)
|
2012-02-20 17:04:41 +00:00 |
|
dMetzger
|
81821ecbe4
|
[-] BO : small fixes on AdminCartRules #PSFV-506
|
2012-02-20 10:25:21 +00:00 |
|
dMetzger
|
7279f68e9c
|
[-] FO : If a product is given for free in a cart rule and is already in the cart, the price is subtracted #PSTEST-715
|
2012-02-13 17:47:40 +00:00 |
|
bMancone
|
e7d89d3ad4
|
// Fixed #PSFV-510
|
2012-02-13 14:55:43 +00:00 |
|
dMetzger
|
dcdc546c93
|
[*] BO : shop restriction added to the cart rules
|
2012-02-06 14:57:39 +00:00 |
|
tDidierjean
|
fccb65f6d3
|
// Replace public by protected in override methods
|
2012-02-06 13:41:51 +00:00 |
|
vChabot
|
8b22cb2f33
|
// norm fix
|
2012-02-03 13:50:51 +00:00 |
|
dMetzger
|
817a4e6a6c
|
[*] BO : new dimension added to the product filter in the cart rules
|
2012-01-26 13:30:16 +00:00 |
|
rMalie
|
22b0bd937d
|
// Normalize
|
2012-01-25 16:39:34 +00:00 |
|
tDidierjean
|
88b3c8f9e7
|
// Refactor AdminController::_errors to errors
|
2012-01-11 08:58:12 +00:00 |
|
tDidierjean
|
b1e9cedf42
|
// Move controller templates to subfolder controllers/
|
2012-01-09 17:23:42 +00:00 |
|
lLefevre
|
5e19280ac5
|
[-] BO : #PSTEST-219 : fix small bugs and translations
|
2012-01-03 13:05:36 +00:00 |
|
lLefevre
|
18ef7aa336
|
[-] BO : #PSTEST-302 : update call javascript file via setMedia()
|
2012-01-03 08:44:15 +00:00 |
|
rMalie
|
27b198dcd6
|
[*] Classes: Db->execute() now return always a boolean. Use Db->query() instead.
|
2011-12-06 15:41:34 +00:00 |
|
lLefevre
|
5d67e32c8b
|
// added toolbar in cart_rules form.tpl
|
2011-11-30 16:08:30 +00:00 |
|
tDidierjean
|
885701b27a
|
// Rename AdminController methods initForm() initList() etc. to renderForm() renderList()
|
2011-11-30 11:06:38 +00:00 |
|
bMancone
|
a9960d24ba
|
// AdminCartRulesController : fixed toolbar in initForm()
|
2011-11-23 21:49:48 +00:00 |
|
dMetzger
|
d35d751c88
|
// Cart rules fixed in admin customers
|
2011-11-23 19:22:23 +00:00 |
|
dMetzger
|
5cada57f78
|
// bug fix for the cart rules
|
2011-11-23 13:38:41 +00:00 |
|
dMetzger
|
e405bf7571
|
// BO : cart rules form improved
|
2011-11-20 16:18:04 +00:00 |
|