Franck Allimant
0683d20d2c
Improved and simplified coupon form management
2014-06-11 09:43:09 +02:00
Franck Allimant
d576e62082
Removed uses of Base in core/lib/Thelia/Model
2014-05-19 09:50:18 +02:00
Franck Allimant
cae0db00eb
Applied Windows version of php-cs script
2014-05-17 12:00:08 +02:00
Franck Allimant
2c7337d8e0
Applied php-cs-fixer with level psr2
2014-05-17 10:56:29 +02:00
Franck Allimant
f8ccea1899
Added per-user coupon maximum usage count
2014-05-17 10:56:19 +02:00
Franck Allimant
392abff271
Free shipping for selected countries and/or shipping methods
2014-05-15 20:25:22 +02:00
Franck Allimant
9c0cc178b4
Added coupon_country and coupon_module tables
2014-05-14 16:35:16 +02:00
Manuel Raynaud
85d80d1d77
fix minor bug
2014-05-09 10:55:50 +02:00
Franck Allimant
3b7589ec84
Removed useless transactions
2014-05-02 18:23:04 +02:00
Manuel Raynaud
a5cfcf91ca
update changelog and fix cs
2014-02-22 19:01:37 +01:00
Manuel Raynaud
1974d3e3c3
fix psr
2014-01-22 12:52:36 +01:00
gmorel
cfbc579022
Coupon : Fix mistake with chmod, file mode set as 644 as it originally was
...
Remove submodule
2013-12-30 21:37:26 +01:00
gmorel
9a22bdafa1
Coupon : Fix unit test
2013-12-29 14:47:51 +01:00
gmorel
f8ac32a4a0
Refactor : Coupon effect inputs are now more customisable
...
Adding effect to be stored as serialised in JSON
2013-12-29 01:23:50 +01:00
gmorel
dde8501790
WIP : coupon refactor + fix
2013-09-26 18:18:45 +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
8e308d21e9
Working : Coupon : fix update effect (becomes type), update max usage
2013-09-19 23:25:01 +02:00
gmorel
6118a68370
WIP : Coupon fix coupon creation issue
2013-09-13 18:03:08 +02:00
gmorel
8be785e9b3
WIP
...
- Coupon Add/Edit/Delete rule AJAX
2013-09-10 20:00:43 +02:00
gmorel
8a5e12f814
WIP
...
- Add Coupon, Rules, CouponManager, Adapter as Services
- Refactor Coupon to use these services
2013-09-06 11:47:00 +02:00
gmorel
23a4ff26c8
Working
...
- Base create/update coupon in backoffice
2013-09-04 19:22:20 +02:00
gmorel
6cba95f4ee
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
# By Manuel Raynaud (22) and others
# Via Manuel Raynaud (7) and others
* 'master' of https://github.com/thelia/thelia : (32 commits)
refactor name for updating actions
choose UPDATE word for name actions
add update address action and create tests
404 not found management
Working Fix unset namespace
modify travis script
test rewriting exception
Fixed minor bug in Currencies
Finished currency edition
Added route methods
address action implementation
hot fix
rewriting
add address create controller and event
Added AdminUtilities Smarty plugin, optimized templates
update customer model createOrUpdate method
update address model
fix redirect process in viewListener
refactor reset_install script
refactor install process, database management in dedicated class
...
Conflicts:
local/config/schema.xml
reset_install.sh
2013-09-04 15:42:38 +02:00
gmorel
eef57ba30a
WIP
...
- Coupon controller
2013-09-02 09:17:47 +02:00
gmorel
71fa04a193
WIP
...
- Update Coupon Controller/Form/Event - create()
- Rule serialization/unserialization managed in Model/Coupon now
2013-08-30 11:06:33 +02:00
Etienne Roudeix
a02ac99360
set x right to 7
2013-07-09 11:59:37 +02:00
Manuel Raynaud
5fda702b8d
migrte propel to propel 2
2013-07-04 19:31:09 +02:00
Etienne Roudeix
ad47ab7cac
set execution right // no more troubles
...
change composer required PHP version from 5.4 to 5.3
2013-06-20 15:21:16 +02:00
Manuel Raynaud
c72c13551c
add Propel generated files
2013-01-16 10:58:36 +01:00
Manuel Raynaud
8279cc37b4
remove notnorm gen model
2013-01-15 10:39:16 +01:00
Manuel Raynaud
c3c7102f7b
move Base model to Base directory
2012-12-27 11:37:32 +01:00
Manuel Raynaud
6ba59276e1
delete propel auto generated files
2012-12-20 17:59:30 +01:00
Manuel Raynaud
481ac07994
integrate propel generate model
2012-12-17 16:40:47 +01:00
