Commit Graph

428 Commits

Author SHA1 Message Date
Manuel Raynaud
c15431a468 create languages pages 2013-10-23 12:38:32 +02:00
Etienne Roudeix
3c69e38a3b Merge branch 'tax' 2013-10-23 08:49:24 +02:00
gmorel
52e471ab1b Working adding decrementation when coupon is consumed 2013-10-22 23:04:08 +02:00
gmorel
b45fbef2ad Merge branch 'master' of https://github.com/thelia/thelia into coupon
* 'master' of https://github.com/thelia/thelia: (33 commits)
  permissions
  finish contact process
  create contact form
  create example for mail usage
  permission cleanup
  change place where absolute url is create when rewritten url is enabled
  fix issue #43
  fix typo in product breadcrumb
  update countries list
  fix issue #35
  fix cartItem updateQuantity method
  add some verification on country default trigger
  not allowed to delete default country
  WIP : admin profiles
  fiw test suite
  clear cache when a module is removed
  end module removal
  create event object for module delete action
  update insert script
  new model
  ...

Conflicts:
	core/lib/Thelia/Controller/Admin/CouponController.php
2013-10-22 23:01:04 +02:00
Etienne Roudeix
29d4ecbe35 Merge branch 'master' into tax 2013-10-22 20:20:40 +02:00
Etienne Roudeix
dba4a129ff module access management 2013-10-22 20:20:15 +02:00
Etienne Roudeix
44a5909c81 permission resource 2013-10-22 19:51:01 +02:00
Manuel Raynaud
2d987473b4 Merge branch 'master' of github.com:thelia/thelia 2013-10-22 17:20:18 +02:00
Manuel Raynaud
0580539ed8 fix cart quantity for issue #46 2013-10-22 17:19:16 +02:00
Etienne Roudeix
c94fa9bc24 permission management 2013-10-22 15:04:06 +02:00
Etienne Roudeix
cb0619a7b3 Merge branch 'master' of github.com:thelia/thelia 2013-10-22 11:33:24 +02:00
Etienne Roudeix
7e32957d12 Merge branch 'master' into tax 2013-10-22 11:10:06 +02:00
Etienne Roudeix
b00f70fa24 permission management 2013-10-22 11:09:24 +02:00
Manuel Raynaud
cc4f4f0bbe create newsletter template 2013-10-22 10:49:30 +02:00
Manuel Raynaud
c9074892b2 complete controller and newsletter listener 2013-10-22 10:01:02 +02:00
Manuel Raynaud
30f0973481 complete newsletter controller 2013-10-22 09:51:42 +02:00
Manuel Raynaud
aabd05f17f create form and controller for newsletter 2013-10-22 09:42:57 +02:00
Manuel Raynaud
f70c5362e9 fix typo 2013-10-22 09:13:21 +02:00
Manuel Raynaud
af51086fcb Merge branch 'master' of github.com:thelia/thelia 2013-10-22 09:12:23 +02:00
Manuel Raynaud
4630007bc2 fix typo in error message 2013-10-22 09:11:33 +02:00
gmorel
9c7c4e851e Working cleaning 2013-10-21 23:09:04 +02:00
gmorel
42aa46905b Merge branch 'master' of https://github.com/thelia/thelia into coupon
* 'master' of https://github.com/thelia/thelia: (33 commits)
  permissions
  finish contact process
  create contact form
  create example for mail usage
  permission cleanup
  change place where absolute url is create when rewritten url is enabled
  fix issue #43
  fix typo in product breadcrumb
  update countries list
  fix issue #35
  fix cartItem updateQuantity method
  add some verification on country default trigger
  not allowed to delete default country
  WIP : admin profiles
  fiw test suite
  clear cache when a module is removed
  end module removal
  create event object for module delete action
  update insert script
  new model
  ...

Conflicts:
	core/lib/Thelia/Controller/Admin/CouponController.php
2013-10-21 22:49:32 +02:00
Etienne Roudeix
cdeda0123e Merge branch 'master' into tax 2013-10-21 19:12:07 +02:00
Manuel Raynaud
9ce90abdf5 finish contact process 2013-10-21 19:07:59 +02:00
Manuel Raynaud
c0781455cb create contact form 2013-10-21 18:33:03 +02:00
Manuel Raynaud
4236a16e49 create example for mail usage 2013-10-21 18:04:48 +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
gmorel
f276ccfa37 WIP : Implement coupon check on ordering tunnel
@todo CSS
@todo List coupon used and detailed effects
2013-10-20 23:01:12 +02:00
gmorel
ad69c45e4f Merge branch 'master' of https://github.com/thelia/thelia into coupon
* 'master' of https://github.com/thelia/thelia: (87 commits)
  Missing ajax-loader icon
  don't use alternative Logger in debugbar if debug is disabled
  Remove debug bar
  Move temporarily fontawesome's font into the web folder
  Add loader css
  fix product visibility comparaison parameter
  Change this page on public page
  Bug : Remove close tag </a>
  decode url before searching if it's a rewritten url
  Modification font-size of price elements
  add page View All
  Add button "add product to cart"
  Footer : Static to dynamic content
  Add order on attribute_combination loop
  Fix bug in Content Loop with "current_folder" params
  Creation of Content page
  Change path /customer/account into /account
  Change path :  /customer/update into /account/update  /password into /account/password
  CustomerUpdateForm - Extend CustomerCreation
  Update profile - new method [Not finished yet]
  ...
2013-10-20 21:11:58 +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
9b617755ca Update profile - new method [Not finished yet] 2013-10-18 09:47:11 +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
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
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
touffies
1a8dfa46f4 Redirect new customer with valid email to the registration page. 2013-10-16 10:55:23 +02:00