TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,978 Commits 1 Branch 0 Tags
77959afefa6eaf2d99ee0050743feaf63e2da0fa
Commit Graph

272 Commits

Author SHA1 Message Date
Etienne Roudeix
b00f70fa24 permission management 2013-10-22 11:09:24 +02:00
Etienne Roudeix
abe45c5798 Merge branch 'master' into tax 
Conflicts:
	core/lib/Thelia/Config/Resources/action.xml
	core/lib/Thelia/Controller/Admin/AddressController.php
	core/lib/Thelia/Controller/Admin/CustomerController.php
	core/lib/Thelia/Controller/Admin/ModuleController.php
 2013-10-21 17:48:13 +02:00
Etienne Roudeix
9a7708451a permission cleanup 2013-10-21 17:44:17 +02:00
Etienne Roudeix
f564db2a8b WIP : admin profiles 2013-10-21 11:44:33 +02:00
Manuel Raynaud
28b7423443 end module removal 2013-10-21 11:30:19 +02:00
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
Etienne Roudeix
c63c509f2f Merge branch 'master' into tax 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	templates/admin/default/configuration.html
 2013-10-21 08:13:18 +02:00
Etienne Roudeix
0300470f7d new model 2013-10-21 08:10:55 +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
Manuel Raynaud
52ed89f1aa fix cs 2013-10-18 09:28:17 +02:00
Manuel Raynaud
12b5a81364 display error on ajax module activation 2013-10-18 09:17:08 +02:00
Manuel Raynaud
6d791f5bf7 process module toggle activation 2013-10-17 18:50:00 +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
dad2591a57 end tax edition 2013-10-17 11:53:26 +02:00
Manuel Raynaud
84ad1e6f95 start creating xsd module management 2013-10-16 17:39:32 +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
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
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
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
touffies
7234b2e994 Merge master 2013-10-09 12:26:10 +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
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
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