Commit Graph

764 Commits

Author SHA1 Message Date
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
07a2944618 Merge branch 'frontend' of github.com:thelia/thelia into frontend 2013-10-18 16:51:50 +02:00
touffies
bba7b9bb76 Missing ajax-loader icon 2013-10-18 16:48:38 +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
1ee45e0cb2 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-18 16:00:14 +02:00
touffies
b21f7efc73 Remove debug bar 2013-10-18 15:59:08 +02:00
touffies
268e5355aa Add loader css 2013-10-18 15:46:32 +02:00
badsuricate
2257623c3b Change this page on public page 2013-10-18 14:49:47 +02:00
touffies
d204a32c09 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-18 12:43:27 +02:00
touffies
3fe1716bc4 Bug : Remove close tag </a> 2013-10-18 12:40:08 +02:00
badsuricate
e80b2157b1 Modification font-size of price elements 2013-10-18 11:04:42 +02:00
badsuricate
4b65675bef add page View All 2013-10-18 11:04:10 +02:00
badsuricate
cab914bb64 Add button "add product to cart" 2013-10-18 10:55:47 +02:00
badsuricate
67ca9bfeec Footer :
Static to dynamic content
2013-10-18 10:54:34 +02:00
badsuricate
85e9a26cb6 Add order on attribute_combination loop 2013-10-18 10:53:36 +02:00
badsuricate
3db29c9d1d Creation of Content page 2013-10-18 10:51:52 +02:00
touffies
19b1537cdc Change path /customer/account into /account 2013-10-18 10:00:39 +02:00
touffies
27d8646be0 Update profil page 2013-10-18 09:42:26 +02:00
touffies
4f8d43b569 Remove trailing slash 2013-10-18 09:40:31 +02:00
touffies
adc473a595 Change path to /account page 2013-10-18 09:19:47 +02:00
touffies
0375c2ec1d Add .group-newsletter 2013-10-18 09:15:45 +02:00
touffies
0875a491ce Warning message if the cart is empty 2013-10-18 09:14:11 +02:00
touffies
09f5fe8af7 Add a message if the cart is empty 2013-10-18 09:13:42 +02:00
touffies
dca2b37739 Change path. No need to add the customer Id in the path, we must use the customer id in the session. 2013-10-18 09:12:41 +02:00
touffies
2f033e1ffa Change path to /account 2013-10-18 09:08:35 +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
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
touffies
c939d14e22 Display warning message if the user has no order 2013-10-16 16:57:25 +02:00
Etienne Roudeix
60fd54d5c3 restart thelia form type 2013-10-16 16:20:21 +02:00
touffies
9d23ce87ac add nocache fot the mini-cart and login/logout 2013-10-16 15:14:23 +02:00
touffies
5fdebe4d2e Empty cart + Intl 2013-10-16 15:13:04 +02:00
touffies
fbebadaff0 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-16 12:47:52 +02:00
touffies
9469c1a0ec - Redirect to /customer/account on success
- Agreements are mandatory
2013-10-16 12:36:17 +02:00
Etienne Roudeix
dde7f15f42 Merge branch 'tax' 2013-10-16 12:03:31 +02:00
Etienne Roudeix
9365e9ee38 tax management 2013-10-16 11:46:30 +02:00
Manuel Raynaud
b3c761798b fix menu when child > 0 2013-10-16 11:45:18 +02:00
touffies
da81575a61 Remove novalidate on the form element 2013-10-16 10:57:02 +02:00
touffies
d091359299 Fix HTML5 autofocus
- Focus Email if error of if value is null (Page load)
- Otherwise Focus password
2013-10-16 10:38:29 +02:00
badsuricate
8d15d161fb Creation of "include/mini-cart.html" 2013-10-16 09:51:48 +02:00
badsuricate
04bd135c94 Static content to dynamic content 2013-10-16 09:51:08 +02:00
badsuricate
6ffeb2053c Include "include/mini-cart.html" 2013-10-16 09:45:53 +02:00
touffies
1610ffab65 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-10-16 09:33:42 +02:00
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
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