Etienne Roudeix
e998717c9b
remove not working datepicker in coupons
2013-10-30 12:02:50 +01:00
gmorel
b45fbef2ad
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
* 'master' of https://github.com/thelia/thelia : (33 commits)
permissions
finish contact process
create contact form
create example for mail usage
permission cleanup
change place where absolute url is create when rewritten url is enabled
fix issue #43
fix typo in product breadcrumb
update countries list
fix issue #35
fix cartItem updateQuantity method
add some verification on country default trigger
not allowed to delete default country
WIP : admin profiles
fiw test suite
clear cache when a module is removed
end module removal
create event object for module delete action
update insert script
new model
...
Conflicts:
core/lib/Thelia/Controller/Admin/CouponController.php
2013-10-22 23:01:04 +02:00
Etienne Roudeix
b00f70fa24
permission management
2013-10-22 11:09:24 +02:00
gmorel
55c60ed89e
Working : Coupon : add WYSIWYG
2013-10-10 23:00:36 +02:00
gmorel
5abe350b65
WIP : Coupon : Fix condition selection JS + Dependency Injection register
2013-09-27 14:52:38 +02:00
gmorel
73fde64f5b
WIP : coupon refactor + fix
2013-09-26 17:47:41 +02:00
gmorel
d6172f23cf
WIP : Refactor contraint/rule becomes conditions (more generic)
2013-09-25 14:51:42 +02:00
gmorel
d0f20cca1d
Working : coupon creation : add default rule (thelia.constraint.rule.available_for_everyone)
2013-09-23 23:04:00 +02:00
gmorel
ed4809bac4
Working : Coupon : fix links and errors display
2013-09-13 12:42:33 +02:00
gmorel
964355e60d
Working : Coupon - update loop
2013-09-12 21:34:50 +02:00
gmorel
173d0ad743
Working
...
- Coupon Add/Edit/Delete rule AJAX
2013-09-12 14:12:43 +02:00
gmorel
8668bf93bd
Working
...
- Coupon Add/Edit/Delete rule AJAX
2013-09-12 14:10:36 +02:00
gmorel
936d0dbe37
WIP
...
- Coupon Add/Edit/Delete rule AJAX
2013-09-12 09:32:16 +02:00
gmorel
41cf74ccac
Working
...
- add ajax loader
2013-09-11 17:22:31 +02:00
gmorel
a9dae509c7
WIP
...
- Coupon Add/Edit/Delete rule AJAX
- add tests casper JS
2013-09-11 14:40:55 +02:00
gmorel
7e2f57e618
Working
...
- Coupon Add/Edit/Delete rule AJAX
2013-09-11 09:48:33 +02:00
gmorel
8be785e9b3
WIP
...
- Coupon Add/Edit/Delete rule AJAX
2013-09-10 20:00:43 +02:00
gmorel
f481da7a2f
WIP
...
- Coupon Add/Edit/Delete rule AJAX
2013-09-10 15:41:23 +02:00
gmorel
0fe443f53d
WIP
...
- Coupon Add/Edit/Delete rule AJAX
2013-09-09 21:43:58 +02:00
gmorel
413e77fa97
WIP
...
- Coupon : ajax add
2013-09-09 17:46:01 +02:00
gmorel
b778898d92
WIP
...
- Coupon - add rule AJAX
2013-09-09 16:40:53 +02:00
gmorel
23a4ff26c8
Working
...
- Base create/update coupon in backoffice
2013-09-04 19:22:20 +02:00
