Manuel Raynaud
|
a10fa20340
|
create event object for module delete action
|
2013-10-21 10:26:51 +02:00 |
|
Manuel Raynaud
|
9d794e229d
|
Merge branch 'master' into module_management
Conflicts:
core/lib/Thelia/Core/Template/Loop/TaxRuleCountry.php
core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
|
2013-10-21 09:19:08 +02:00 |
|
Manuel Raynaud
|
d6e26e428e
|
Merge branch 'master' into frontend
Conflicts:
core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
templates/admin/default/tax-rule-edit.html
templates/admin/default/taxes-rules.html
|
2013-10-18 16:41:39 +02:00 |
|
touffies
|
d204a32c09
|
Merge branch 'frontend' of https://github.com/thelia/thelia into frontend
|
2013-10-18 12:43:27 +02:00 |
|
badsuricate
|
4b65675bef
|
add page View All
|
2013-10-18 11:04:10 +02:00 |
|
touffies
|
f413688dc4
|
Change path :
/customer/update into /account/update
/password into /account/password
|
2013-10-18 10:00:06 +02:00 |
|
touffies
|
871bc217a4
|
Add new form customer.update
Add new form thelia.customer.update
|
2013-10-18 09:44:01 +02:00 |
|
Manuel Raynaud
|
2ecd1caac6
|
dispatching event for clearing cache
|
2013-10-18 08:25:42 +02:00 |
|
Manuel Raynaud
|
d25ad53d5a
|
create module event and eventListener
|
2013-10-17 18:26:23 +02:00 |
|
Etienne Roudeix
|
dc2de702e8
|
tax rule set default in back office
|
2013-10-17 15:31:09 +02:00 |
|
Etienne Roudeix
|
dde7f15f42
|
Merge branch 'tax'
|
2013-10-16 12:03:31 +02:00 |
|
Manuel Raynaud
|
4f83c7f078
|
display module list
|
2013-10-15 11:07:58 +02:00 |
|
touffies
|
ca1587c6e7
|
Merge with Master
|
2013-10-15 11:05:05 +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 |
|
touffies
|
94bcf9a191
|
Merge conflict
|
2013-10-14 12:53:01 +02:00 |
|
Manuel Raynaud
|
97887f1d54
|
allow to create a new area
|
2013-10-14 12:28:30 +02:00 |
|
touffies
|
4441fc8190
|
Change path to the register page
|
2013-10-14 12:25:46 +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
|
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
|
c84e451a12
|
tax rule creation
|
2013-10-11 13:51:30 +02:00 |
|
badsuricate
|
b8ebe90e3e
|
Add route for search Page
|
2013-10-11 13:10:14 +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 |
|
Manuel Raynaud
|
560b80c182
|
refactor shipping object into area
|
2013-10-10 17:18:38 +02:00 |
|
touffies
|
a35d85a9b0
|
Use only one routing for /Login
|
2013-10-10 16:38:52 +02:00 |
|
Manuel Raynaud
|
9d6df61296
|
create form tag for shipping forms
|
2013-10-10 16:36:59 +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 |
|
Etienne Roudeix
|
a8594ef6af
|
tax rule edition admin
|
2013-10-09 15:03:07 +02:00 |
|
touffies
|
7234b2e994
|
Merge master
|
2013-10-09 12:26:10 +02:00 |
|
Etienne Roudeix
|
52a582435e
|
tax rule modification
|
2013-10-09 10:16:46 +02:00 |
|
Etienne Roudeix
|
0f6951bc21
|
tax rule update and delation
|
2013-10-08 16:02:58 +02:00 |
|
Manuel Raynaud
|
e8fd822795
|
add higher priority to module routing
|
2013-10-08 13:22:06 +02:00 |
|
Manuel Raynaud
|
43467681fd
|
enabled change default country
|
2013-10-08 10:16:18 +02:00 |
|
Etienne Roudeix
|
942638281a
|
tax edition
|
2013-10-07 17:18:38 +02:00 |
|
Manuel Raynaud
|
ae887f6a67
|
validate country removal
|
2013-10-07 13:03:28 +02:00 |
|
Manuel Raynaud
|
65d23db854
|
validate country creation
|
2013-10-07 12:46:40 +02:00 |
|
Etienne Roudeix
|
fe3aea4ab7
|
tax types
|
2013-10-07 11:57:43 +02:00 |
|
touffies
|
53f2a33764
|
Merge Master
|
2013-10-07 11:50:20 +02:00 |
|
Manuel Raynaud
|
0f1dee978c
|
implement abstract method from AbstractCrudController in Country
Controller
|
2013-10-07 11:34:29 +02:00 |
|
Manuel Raynaud
|
51a307527c
|
create coutry events
|
2013-10-07 10:50:44 +02:00 |
|
Manuel Raynaud
|
666b19a6ff
|
update address process
|
2013-10-04 17:33:48 +02:00 |
|