Cannot see cart page #552
Fix
Merge branch 'master' of https://github.com/thelia/thelia
Updated order discount when clearing order coupons
Using taxed cart total instead of untaxed price
Merge pull request #558 from jodeq/master

Fixes : cannot see cart page #552
Merge pull request #560 from roadster31/coupon-fix

Coupon fix