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
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
Manuel Raynaud
3c94c9c513
add an area to a delivery module
2013-10-14 17:23:20 +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
52b68df4bc
update area postage
2013-10-14 11:12:17 +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
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
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
gmorel
5a6f6483b1
Working : Refactor adapter into facade
2013-10-10 22:29:53 +02:00
Manuel Raynaud
560b80c182
refactor shipping object into area
2013-10-10 17:18:38 +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
Kahn
5aa6ce12a9
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
* 'master' of https://github.com/thelia/thelia: (102 commits)
add higher priority to module routing
update smarty version
select default country in front register form
add modal error id changing default country failed
enabled change default country
fiw module generator class name issue
complete javascript for changing default country
validate country removal
validate country creation
implement abstract method from AbstractCrudController in Country Controller
create country action class
add pre/post CRUD method in Country model
create coutry events
finish customer address update
complete readme
update .gitignore file
add specifig php.ini file for travis
try to fix travis conf
remove unused directory
check session directory permission in install process
...
2013-10-08 23:22:53 +02:00
Etienne Roudeix
0f6951bc21
tax rule update and delation
2013-10-08 16:02:58 +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
65d23db854
validate country creation
2013-10-07 12:46:40 +02:00
Manuel Raynaud
0f1dee978c
implement abstract method from AbstractCrudController in Country
...
Controller
2013-10-07 11:34:29 +02:00
Etienne Roudeix
0efb01220c
add tax admin css
2013-10-07 11:06:54 +02:00
Manuel Raynaud
51a307527c
create coutry events
2013-10-07 10:50:44 +02:00
Manuel Raynaud
f408ad5d1f
finish customer address update
2013-10-07 09:53:25 +02:00
Manuel Raynaud
666b19a6ff
update address process
2013-10-04 17:33:48 +02:00
Manuel Raynaud
4ec9c54fbe
start creating ajax loader for address update event
2013-10-03 18:02:03 +02:00
Manuel Raynaud
860a96cef5
put dedicated controller for address mangamenent
2013-10-03 16:31:15 +02:00
Manuel Raynaud
eeab96bde6
redirect to customer update template after removing address
2013-10-03 16:10:28 +02:00
Manuel Raynaud
fa45df3275
allow to delete customer address
2013-10-03 15:53:30 +02:00
Manuel Raynaud
6e29325d19
create purchase order pdf
2013-10-03 10:45:21 +02:00
Manuel Raynaud
9fcbeab69c
complete invoice pdf template
2013-10-02 18:03:25 +02:00
Manuel Raynaud
df08809a48
implement pdf invoice generation workflow
2013-10-02 16:33:43 +02:00
Manuel Raynaud
02322f8f11
create removeAdditionalFolder controller, event and listener
2013-10-01 10:08:48 +02:00
Manuel Raynaud
dfda04ddd2
create contentAddFolder process
2013-10-01 09:51:07 +02:00
Manuel Raynaud
e6e95b2516
fix some use statement
2013-09-30 16:31:28 +02:00
Manuel Raynaud
f25922c60a
fix breadcrumb for content/folder part
2013-09-30 15:13:04 +02:00
Manuel Raynaud
c65ec67bdf
fix cs
2013-09-30 10:35:34 +02:00
Manuel Raynaud
43b5a129f7
refactor order and image events
2013-09-30 10:34:08 +02:00
Manuel Raynaud
6d5f34767d
refactor document events
2013-09-30 10:32:48 +02:00
Manuel Raynaud
7bf5ee31c9
Merge branch 'refactor_action'
...
Conflicts:
core/lib/Thelia/Action/Product.php
core/lib/Thelia/Controller/Admin/CategoryController.php
core/lib/Thelia/Controller/Admin/ProductController.php
core/lib/Thelia/Controller/Admin/TemplateController.php
2013-09-30 10:26:59 +02:00
Manuel Raynaud
01dbe9f5d2
refactor feature events
2013-09-30 10:16:57 +02:00
Manuel Raynaud
1c2532fe6a
refactor cart events
2013-09-30 10:15:22 +02:00
Manuel Raynaud
10022e5a4a
refactor currency events
2013-09-30 10:11:55 +02:00
Manuel Raynaud
3ed76d237a
refactor config events
2013-09-30 10:10:44 +02:00
Manuel Raynaud
cf4d3b87fd
refactor category events
2013-09-30 10:09:43 +02:00
Manuel Raynaud
0ce4b25e72
refactor customer events
2013-09-30 10:07:01 +02:00
