gmorel
cf78c7c5d5
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
* 'master' of https://github.com/thelia/thelia :
theliatype in form : types now extends bastype which implement typeinterface basetype provides verifiyForm method wich can be call in Callback constraint
restart thelia form type
thelia type constraints
tax management
fix menu when child > 0
taxes management
tax rule edition
2013-10-17 01:38:35 +02:00
gmorel
d2851b1c93
WIP : Coupon implementation in front : Coupon : Fixing unit tests
2013-10-17 01:38:13 +02:00
Etienne Roudeix
a2048bec24
theliatype in form : types now extends bastype which implement typeinterface
...
basetype provides verifiyForm method wich can be call in Callback constraint
2013-10-16 17:10:53 +02:00
Etienne Roudeix
60fd54d5c3
restart thelia form type
2013-10-16 16:20:21 +02:00
Etienne Roudeix
dde7f15f42
Merge branch 'tax'
2013-10-16 12:03:31 +02:00
Etienne Roudeix
c6dbb76ebb
thelia type constraints
2013-10-16 12:02:59 +02:00
Etienne Roudeix
9365e9ee38
tax management
2013-10-16 11:46:30 +02:00
Manuel Raynaud
b3c761798b
fix menu when child > 0
2013-10-16 11:45:18 +02:00
gmorel
36dd7add79
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
* 'master' of https://github.com/thelia/thelia: (38 commits)
add propel connection in transactions
remove area to area_delivery_module
add an area to a delivery module
create shipping zone area form
update readme
start shipping zone management
complete admin log message
allow to create a new area
delete area
add pre/post methods in Area model
display error message
update area postage
add missinf files
remove country from area and start creating postage management
add country to as area
start area configuration tempalte
choices access through smarty
tax rule creation
downgrade smarty version
create all area events
...
2013-10-15 22:51:27 +02:00
gmorel
0d8f6b483f
Working : Coupon : Fixing unit tests
2013-10-15 22:51:09 +02:00
Manuel Raynaud
b7c0e040b3
add propel connection in transactions
2013-10-15 10:39:50 +02:00
gmorel
c5cd35f85e
Working : Coupon : Fixing unit tests
2013-10-14 22:42:12 +02:00
Manuel Raynaud
b94de977a1
Merge branch 'country'
2013-10-14 17:47:29 +02:00
Manuel Raynaud
1aea868785
remove area to area_delivery_module
2013-10-14 17:45:23 +02:00
Etienne Roudeix
085c2fa75c
taxes management
2013-10-14 17:28:31 +02:00
Manuel Raynaud
3c94c9c513
add an area to a delivery module
2013-10-14 17:23:20 +02:00
Manuel Raynaud
9ea86be123
create shipping zone area form
2013-10-14 16:20:16 +02:00
Manuel Raynaud
47520ca7b6
update readme
2013-10-14 15:54:13 +02:00
Etienne Roudeix
0ae9c562e4
tax rule edition
2013-10-14 14:58:08 +02:00
Manuel Raynaud
9c4c63a564
start shipping zone management
2013-10-14 14:08:50 +02:00
Manuel Raynaud
75bc86d43e
complete admin log message
2013-10-14 12:40:09 +02:00
Manuel Raynaud
97887f1d54
allow to create a new area
2013-10-14 12:28:30 +02:00
Manuel Raynaud
4671132964
delete area
2013-10-14 11:40:37 +02:00
Manuel Raynaud
820a92c9c1
add pre/post methods in Area model
2013-10-14 11:26:13 +02:00
Manuel Raynaud
998e1369a5
display error message
2013-10-14 11:15:08 +02:00
Manuel Raynaud
52b68df4bc
update area postage
2013-10-14 11:12:17 +02:00
Manuel Raynaud
8d4fa3b29b
add missinf files
2013-10-14 11:03:44 +02:00
Manuel Raynaud
b371f5c54c
remove country from area and start creating postage management
2013-10-14 11:03:13 +02:00
Manuel Raynaud
dfee7e87a6
add country to as area
2013-10-14 10:04:08 +02:00
Manuel Raynaud
97ce036cbe
start area configuration tempalte
2013-10-11 17:23:40 +02:00
Manuel Raynaud
4aed59693a
complete AreaController
2013-10-11 16:48:15 +02:00
Etienne Roudeix
669be89896
choices access through smarty
2013-10-11 16:09:36 +02:00
Etienne Roudeix
0f8ee68def
Merge branch 'master' into tax
2013-10-11 13:52:46 +02:00
Etienne Roudeix
c84e451a12
tax rule creation
2013-10-11 13:51:30 +02:00
Manuel Raynaud
2a23ea3e72
Merge branch 'master' of github.com:thelia/thelia
2013-10-11 12:31:56 +02:00
Manuel Raynaud
3e3a11210c
downgrade smarty version
2013-10-11 12:11:35 +02:00
Manuel Raynaud
319bb2f0b8
create all area events
2013-10-11 12:06:17 +02:00
Etienne Roudeix
2c88471ef3
Merge branch 'master' into tax
2013-10-11 11:13:41 +02:00
Etienne Roudeix
763026700d
tax rule edition
2013-10-11 11:09:23 +02:00
Etienne Roudeix
c1a8c27dee
tax rule edition
2013-10-11 11:09:11 +02:00
Manuel Raynaud
275262c7dc
Merge branch 'master' into country
2013-10-11 11:07:02 +02:00
Manuel Raynaud
159441a1a9
normalize url generator cache class
2013-10-11 10:57:31 +02:00
gmorel
55c60ed89e
Working : Coupon : add WYSIWYG
2013-10-10 23:00:36 +02:00
gmorel
5a6f6483b1
Working : Refactor adapter into facade
2013-10-10 22:29:53 +02:00
Kahn
7f59c8a954
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
* 'master' of https://github.com/thelia/thelia :
fix issue concerning absoluteUrl
do not display some information about template file
escape view parameter
2013-10-10 22:12:42 +02:00
Manuel Raynaud
560b80c182
refactor shipping object into area
2013-10-10 17:18:38 +02:00
Manuel Raynaud
9d6df61296
create form tag for shipping forms
2013-10-10 16:36:59 +02:00
Manuel Raynaud
23f9301279
create shipping create and modify forms
2013-10-10 16:26:26 +02:00
Manuel Raynaud
8856cec55c
create area loop and shipping conf events name
2013-10-10 16:18:51 +02:00
Manuel Raynaud
6bfca2c6b4
allow country update
2013-10-10 14:20:53 +02:00