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

208 Commits

Author SHA1 Message Date
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
59cfe8da8b CustomerUpdateForm - Extend CustomerCreation 2013-10-18 09:49:14 +02:00
Manuel Raynaud
52ed89f1aa fix cs 2013-10-18 09:28:17 +02:00
Etienne Roudeix
dad2591a57 end tax edition 2013-10-17 11:53:26 +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
touffies
3f214291d7 - Add agreements checkbox 2013-10-16 12:38:44 +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
touffies
0fd024201e Add violation to password if it's existing user 2013-10-16 10:34:07 +02:00
touffies
88ed4191ef Fix conflict 2013-10-16 09:36:19 +02:00
touffies
1610ffab65 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-16 09:33:42 +02:00
Manuel Raynaud
08776e5fc5 clean code 2013-10-15 21:52:35 +02:00
Manuel Raynaud
fb4d44545d POC : add violation to password field 2013-10-15 21:45:46 +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
9ea86be123 create shipping zone area form 2013-10-14 16:20:16 +02:00
touffies
7695c19b40 Login action : 
* Add account
* If user has checked "I'm a new customer", we must verify if it's a new email address.
 2013-10-14 12:25:12 +02:00
Manuel Raynaud
8d4fa3b29b add missinf files 2013-10-14 11:03:44 +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
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
560b80c182 refactor shipping object into area 2013-10-10 17:18:38 +02:00
Manuel Raynaud
23f9301279 create shipping create and modify forms 2013-10-10 16:26:26 +02:00
Manuel Raynaud
6bfca2c6b4 allow country update 2013-10-10 14:20:53 +02:00
GOLEO Bruno
c22e519be4 Rename text : This email does not exists exists to This email does not exists 2013-10-09 14:25:06 +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
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
touffies
fd881b23f0 Merge with master 2013-10-02 11:20:48 +02:00
Manuel Raynaud
c65ec67bdf fix cs 2013-09-30 10:35:34 +02:00
Etienne Roudeix
a647bfd016 Merge branch 'master' into tax 
Conflicts:
	local/config/schema.xml
 2013-09-27 13:35:39 +02:00
gmorel
9d02aa75a8 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By gmorel (24) and others
# Via gmorel (12) and others
* 'master' of https://github.com/thelia/thelia: (43 commits)
  Working : upload file/image : fix sanitizeFileName
  Working : images : enhance display
  Working : Fix : Unit test
  Working : Fix : Unit test
  Working : Fix : Image Management + Document Management
  Working : FileManager :Add some more unit tests
  Working : Add a link on documents
  Working : fix url document + refactor : naming conventions
  Working : refactor : naming conventions
  Working : upload : fix unit test
  WIP : upload documents : add action, ctrl, event
  Finished product combination basic function
  WIP : upload document : add forms
  Working : upload image : fix return URL to images tab
  Working : upload image : fix fallback and delete links on refresh
  Formatted combination table
  Impemented combination creation
  Working : Upload image : Fix upload validation
  - Image format allowed - manual-reverse order on image loop
  Upload allow only for images
  ...

Conflicts:
	core/lib/Thelia/Model/Base/AttributeTemplate.php
	core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
	core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
	install/faker.php
	install/thelia.sql
	local/config/schema.xml
	templates/admin/default/assets/js/coupon.js
	tests/functionnal/casperjs/exe/00_parameters.js
	tests/functionnal/casperjs/exe/31_coupons_rule.js
 2013-09-27 10:37:09 +02:00
Etienne Roudeix
622e1ca3b6 Merge branch 'master' into tax 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Model/Base/AttributeTemplate.php
	core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
	core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
	install/thelia.sql
	local/config/schema.xml
 2013-09-27 10:29:51 +02:00
Etienne Roudeix
34ef5cf524 edit order form 2013-09-26 13:07:51 +02:00
Etienne Roudeix
5e0f9cedf5 fix tests 2013-09-26 10:43:09 +02:00
gmorel
084f66589a WIP : upload documents : add action, ctrl, event 2013-09-24 10:54:52 +02:00
mespeche
1f54a288fc Setting admin profile creation (route, view, form) 2013-09-24 09:36:48 +02:00
gmorel
e4658d2fa2 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (68) and others
# Via Manuel Raynaud (12) and others
* 'master' of https://github.com/thelia/thelia: (119 commits)
  order tests
  action order tests
  cache dataccessfunctions
  order action test
  fire event on insert content in createmethod
  fix issue, default foler is set on content creation
  allow to create new content
  update default param of content model
  create content listener for crud management
  dispatch event in pre/post crud method for content model
  display content modification page
  create contentUpdateEvent
  create contentCreateEvent
  create ContentEvent
  create contentModificationForm
  create content controller
  change folder_id parm by parent in list folder view
  use placeholder in folder update route
  implement process for changing folder position
  allow possibility to change folder visibility
  ...

Conflicts:
	core/lib/Thelia/Coupon/CouponBaseAdapter.php
	templates/admin/default/coupon-list.html
	templates/admin/default/coupon-read.html
 2013-09-23 21:03:26 +02:00
gmorel
9ee8b2b75f WIP : upload document : add forms 2013-09-23 18:13:12 +02:00