Franck Allimant
|
cae0db00eb
|
Applied Windows version of php-cs script
|
2014-05-17 12:00:08 +02:00 |
|
Franck Allimant
|
f772a49dcc
|
Added Windows version of php-cs script
|
2014-05-17 11:59:53 +02:00 |
|
Franck Allimant
|
a3e1ece3dc
|
Merge branch 'coupon-types' of https://github.com/roadster31/thelia into coupon-types
|
2014-05-17 10:58:00 +02:00 |
|
Franck Allimant
|
2c7337d8e0
|
Applied php-cs-fixer with level psr2
|
2014-05-17 10:56:29 +02:00 |
|
Franck Allimant
|
ef142ca077
|
Applied php-cs-fixer
|
2014-05-17 10:56:28 +02:00 |
|
Franck Allimant
|
f8ccea1899
|
Added per-user coupon maximum usage count
|
2014-05-17 10:56:19 +02:00 |
|
Franck Allimant
|
8a6e3b854a
|
Applied php-cs-fixer with level psr2
|
2014-05-17 10:49:34 +02:00 |
|
Franck Allimant
|
1bd1977ee7
|
Applied php-cs-fixer
|
2014-05-17 10:24:22 +02:00 |
|
Franck Allimant
|
b5cc1b47a3
|
dded per-user coupon maximum usage
|
2014-05-17 10:20:26 +02:00 |
|
Franck Allimant
|
9cdac6d50e
|
Fixes french translation.
|
2014-05-16 11:12:24 +02:00 |
|
Franck Allimant
|
90947bcda9
|
Free shipping restricitions based on Countries and Shipping module
|
2014-05-16 10:30:15 +02:00 |
|
Franck Allimant
|
ffd842cbf6
|
Added FREE_SHIPPING_FOR_COUNTRIES_LIST and FREE_SHIPPING_FOR_MODULES_LIST
|
2014-05-16 10:07:25 +02:00 |
|
Franck Allimant
|
f2b93334eb
|
Free shipping for selected countries and/or shipping methods
|
2014-05-15 20:27:39 +02:00 |
|
Franck Allimant
|
392abff271
|
Free shipping for selected countries and/or shipping methods
|
2014-05-15 20:25:22 +02:00 |
|
Franck Allimant
|
32542efe28
|
$chosenDeliveryAddress and $chosenInvoiceAddress are now protected
|
2014-05-15 19:30:30 +02:00 |
|
Franck Allimant
|
268d5a997d
|
Typo !
|
2014-05-15 18:59:48 +02:00 |
|
Franck Allimant
|
683664cb07
|
Added Model\Module::getModuleInstance() method
|
2014-05-15 16:50:34 +02:00 |
|
Franck Allimant
|
9c0cc178b4
|
Added coupon_country and coupon_module tables
|
2014-05-14 16:35:16 +02:00 |
|
Franck Allimant
|
c0456e1c07
|
Additional fix for issue #408
|
2014-05-14 15:45:20 +02:00 |
|
Franck Allimant
|
ae5e88f90c
|
Created file. Removes some ununsed indexes
|
2014-05-14 15:33:32 +02:00 |
|
Manuel Raynaud
|
ed7e07e740
|
Merge pull request #400 from roadster31/coupons-return
Coupons return
|
2014-05-13 08:54:39 +02:00 |
|
Franck Allimant
|
39c9ca1b2b
|
Updated changelog with coupon conditions
|
2014-05-12 23:38:51 +02:00 |
|
Franck Allimant
|
112cb8eeb0
|
Added ForSomeCustomer condition
|
2014-05-12 23:37:43 +02:00 |
|
Manuel Raynaud
|
33249f0a75
|
Merge pull request #395 from Yochima/yochima-branch
put the module_include "customer_list_header" in the correct place
|
2014-05-10 23:15:37 +02:00 |
|
Franck Allimant
|
eb0054d21e
|
Typo
|
2014-05-10 22:52:19 +02:00 |
|
Franck Allimant
|
ad0aafeb31
|
Fixex #399
|
2014-05-10 22:51:20 +02:00 |
|
Franck Allimant
|
07411b95a1
|
Added more conditions
|
2014-05-10 12:13:02 +02:00 |
|
Franck Allimant
|
0a4003ae1c
|
Fixed condition names
|
2014-05-10 12:12:48 +02:00 |
|
Franck Allimant
|
59ca9760a3
|
Added cart contains products condition
|
2014-05-10 12:12:19 +02:00 |
|
Franck Allimant
|
c4af0a9aef
|
Added cart contains categories condition
|
2014-05-10 12:11:48 +02:00 |
|
Franck Allimant
|
862d8ec913
|
Prevent Fatal error if current order coupon is deleted
|
2014-05-10 12:10:45 +02:00 |
|
Franck Allimant
|
df9b19cb91
|
Typo
|
2014-05-10 02:57:02 +02:00 |
|
Franck Allimant
|
de9547fc8e
|
Updated translations
|
2014-05-10 02:55:17 +02:00 |
|
Franck Allimant
|
a581a6ca0f
|
Fixed criteria lablels
|
2014-05-10 02:47:23 +02:00 |
|
Franck Allimant
|
6632eba9f4
|
Added countries and start date conditions
|
2014-05-10 02:39:24 +02:00 |
|
Franck Allimant
|
f76e5d7aaa
|
Added start date condition
|
2014-05-10 02:38:03 +02:00 |
|
Franck Allimant
|
c39de8bf87
|
Improved condition code structure (still backward compatible)
|
2014-05-10 01:37:09 +02:00 |
|
Franck Allimant
|
38e16f0502
|
Changed name
|
2014-05-10 01:36:49 +02:00 |
|
Franck Allimant
|
2aa8d804b0
|
Changed condition parameter name
|
2014-05-10 01:36:11 +02:00 |
|
Franck Allimant
|
861e6b0513
|
Changed condition parameter name
|
2014-05-10 01:35:28 +02:00 |
|
Franck Allimant
|
5bcb08846f
|
Changed condition parameter name
|
2014-05-10 01:32:46 +02:00 |
|
Franck Allimant
|
612613fd71
|
Changed condition parameter names
|
2014-05-10 01:32:14 +02:00 |
|
Franck Allimant
|
d14321ffd8
|
Improved error message
|
2014-05-10 01:31:32 +02:00 |
|
Franck Allimant
|
c671a1ff5e
|
Changed coupon condition parameter variables name
|
2014-05-10 01:30:22 +02:00 |
|
Franck Allimant
|
06d7eb4fc1
|
Implemented getDeliveryAddress()
|
2014-05-10 01:29:54 +02:00 |
|
Franck Allimant
|
f83c9f05fd
|
Fixed Equals and No Equals labels
|
2014-05-10 01:29:12 +02:00 |
|
Franck Allimant
|
45c32271b7
|
Removed duplicate condition
|
2014-05-10 01:28:42 +02:00 |
|
Franck Allimant
|
7bb0368d7f
|
Very minor improvement on conditions evaluation
|
2014-05-10 01:28:03 +02:00 |
|
Franck Allimant
|
8054149dbd
|
Added country condition
|
2014-05-10 01:12:06 +02:00 |
|
Franck Allimant
|
a536eb5de7
|
Fix: save condition button should be hidden after adding condition
|
2014-05-10 01:09:43 +02:00 |
|