Commit Graph

13 Commits

Author SHA1 Message Date
Franck Allimant
749487e967 Added getDeliveryCountry() method 2014-06-17 00:37:53 +02:00
Franck Allimant
a1ba63d5d5 Order total may be calculated with or without discounted items 2014-06-11 09:43:24 +02:00
Franck Allimant
bbe7634ad4 Using templates for conditions HTML fragments 2014-05-02 17:10:22 +02:00
Manuel Raynaud
5e65bf0b8a change license header 2014-04-18 09:36:41 +02:00
Manuel Raynaud
3ab022e99d fix test suite 2014-02-20 11:44:09 +01:00
Manuel Raynaud
9d0121f321 fix cs 2014-01-10 11:41:55 +01:00
gmorel
cfbc579022 Coupon : Fix mistake with chmod, file mode set as 644 as it originally was
Remove submodule
2013-12-30 21:37:26 +01:00
gmorel
3e12ace045 Coupon : Fix mistake with chmod, file mode set as 644 as it originally was 2013-12-30 00:50:04 +01:00
gmorel
e18298bbba Refactor : Coupon effect inputs are now more customisable (input text, select, ajax, etc.. are usable) and unlimited amount of input for coupon effect are now possible too (Event are used for custom inputs) 2013-12-26 23:47:07 +01:00
gmorel
69d255f782 new branch coupon 2013-12-25 14:12:54 +01: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
gmorel
5a6f6483b1 Working : Refactor adapter into facade 2013-10-10 22:29:53 +02:00