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
|
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
|
073905200e
|
Added delivery country condition
|
2014-05-10 00:10:32 +02:00 |
|
Manuel Raynaud
|
85d80d1d77
|
fix minor bug
|
2014-05-09 10:55:50 +02:00 |
|
Manuel Raynaud
|
772aba093b
|
increment thelia version
|
2014-05-06 15:04:05 +02:00 |
|
Guillaume Barral
|
e568ed67ce
|
Allow to use configDir in module
|
2014-05-06 11:50:05 +02:00 |
|
Manuel Raynaud
|
d4ade9afc0
|
integration of Czech translation
|
2014-05-06 11:07:09 +02:00 |
|
Manuel Raynaud
|
fa71c8c4d5
|
integration of russian translation
|
2014-05-06 11:01:32 +02:00 |
|
Manuel Raynaud
|
4cd2ea6316
|
complete lang form including money format
|
2014-05-06 10:53:16 +02:00 |
|
Julien Chanséaume
|
bb43a12fba
|
Some tweaks added. We can now override module assets by redefining them in the template.
if they are not in the template, it takes them from the module.
if an asset does not exist, exception is catched and it no longer breaks the response.
|
2014-05-06 09:23:38 +02:00 |
|
Manuel Raynaud
|
d5c5e167a6
|
check shipping configuration in delivery loop. Fix #311
|
2014-05-05 14:37:44 +02:00 |
|
Manuel Raynaud
|
fcceef8ab8
|
add missing english translations
|
2014-05-05 12:42:50 +02:00 |
|
Manuel Raynaud
|
793e66af74
|
Merge pull request #371 from roadster31/coupons
Coupons
|
2014-05-05 10:58:59 +02:00 |
|
Franck Allimant
|
4673a14b76
|
Typo
|
2014-05-05 10:04:38 +02:00 |
|
Manuel Raynaud
|
ca9d9c89c5
|
fix wrong smtp config
|
2014-05-05 09:56:40 +02:00 |
|
Franck Allimant
|
f9e4c33875
|
No % or money symbol in HTML generated by CouponAbstract
|
2014-05-05 09:52:27 +02:00 |
|
Franck Allimant
|
091e7f9f64
|
Re-added the html generatrion code in drawBackOfficeInputs()
|
2014-05-04 19:31:41 +02:00 |
|
Franck Allimant
|
457f5dba7c
|
Completed french translation
|
2014-05-03 12:39:29 +02:00 |
|
Franck Allimant
|
d42e5cd557
|
drawBackOfficeInputs is no longer abstract
|
2014-05-03 12:23:48 +02:00 |
|
Julien Chanseaume
|
751fcdeb59
|
php cs fixer
|
2014-05-03 11:39:12 +02:00 |
|
Franck Allimant
|
8c044303f2
|
drawBackOfficeInputs() is now abstract
|
2014-05-02 20:54:53 +02:00 |
|
Franck Allimant
|
500a945f98
|
HTML fragments in templates instead of hardcoded
|
2014-05-02 20:52:59 +02:00 |
|
Franck Allimant
|
fe93bfacec
|
Typo
|
2014-05-02 20:22:10 +02:00 |
|
Franck Allimant
|
617f2900e0
|
Fixed test
|
2014-05-02 20:21:33 +02:00 |
|
Franck Allimant
|
621c17c97d
|
Fixed form error management
|
2014-05-02 20:08:38 +02:00 |
|
Franck Allimant
|
7781fe5f59
|
Minor syntax change.
|
2014-05-02 20:00:19 +02:00 |
|
Franck Allimant
|
98f4395a07
|
Removed unused parser reference in contructor
|
2014-05-02 19:59:33 +02:00 |
|
Franck Allimant
|
8bf94517f2
|
No longer used
|
2014-05-02 18:25:31 +02:00 |
|
Franck Allimant
|
23a74999e8
|
Fixed date manipulation²
|
2014-05-02 18:24:15 +02:00 |
|
Franck Allimant
|
5e3585766d
|
Added a localized check to the expiration date
|
2014-05-02 18:23:36 +02:00 |
|
Franck Allimant
|
3b7589ec84
|
Removed useless transactions
|
2014-05-02 18:23:04 +02:00 |
|
Franck Allimant
|
7996c866d3
|
Merge branch 'coupons' of https://github.com/roadster31/thelia into coupons
Conflicts:
core/lib/Thelia/Controller/Admin/CouponController.php
templates/backOffice/default/coupon/form.html
|
2014-05-02 17:16:39 +02:00 |
|
Franck Allimant
|
9d3dd8687a
|
Added the transformer
|
2014-05-02 17:10:28 +02:00 |
|
Franck Allimant
|
989a44591f
|
Added date translator
|
2014-05-02 17:10:27 +02:00 |
|
Franck Allimant
|
8ce6cdbae0
|
Fixed date input format and conversion
|
2014-05-02 17:10:27 +02:00 |
|
Franck Allimant
|
aa48a73343
|
Removed the useless coupon read function
|
2014-05-02 17:10:25 +02:00 |
|