Franck Allimant 7996c866d3 Merge branch 'coupons' of https://github.com/roadster31/thelia into coupons ...

Conflicts:
	core/lib/Thelia/Controller/Admin/CouponController.php
	templates/backOffice/default/coupon/form.html

2014-05-02 17:16:39 +02:00

..

Action

change price if needed when customer log in or log out

2014-04-29 11:35:10 +02:00

Cart

change price if needed when customer log in or log out

2014-04-29 11:35:10 +02:00

Command

Uses new helper functions

2014-04-26 16:02:23 +02:00

Condition

Fixed labels, using templates for HTML fragments

2014-05-02 17:10:22 +02:00

Config

Removed the useless coupon read function

2014-05-02 17:10:25 +02:00

Controller

Merge branch 'coupons' of https://github.com/roadster31/thelia into coupons

2014-05-02 17:16:39 +02:00

Core

Added order parameter, improved request

2014-05-02 17:10:19 +02:00

Coupon

Added the transformer

2014-05-02 17:10:28 +02:00

Exception

change license header

2014-04-18 09:36:41 +02:00

Form

Added date translator

2014-05-02 17:10:27 +02:00

Install

remove RC1 references

2014-04-22 14:30:44 +02:00

Log

change license header

2014-04-18 09:36:41 +02:00

Mailer

change license header

2014-04-18 09:36:41 +02:00

Model

implement addCriteriaToPositionQuery method in content model. #360

2014-04-30 10:44:34 +02:00

Module

add route parameters to redirectToRoute method in BaseFrontController

2014-04-23 20:48:17 +02:00

Rewriting

change license header

2014-04-18 09:36:41 +02:00

TaxEngine

change license header

2014-04-18 09:36:41 +02:00

Tests

Added translator to the mockup container

2014-04-18 20:09:44 +02:00

Tools

php cs fixer

2014-04-28 12:30:31 +02:00

Type

change license header

2014-04-18 09:36:41 +02:00