Revert "Revert "Merge branch 'cleanmaster' into modules""

This reverts commit b3ac365b45.

Conflicts:
	Readme.md
	core/lib/Thelia/Controller/Admin/AbstractCrudController.php
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Model/Base/Coupon.php
	core/lib/Thelia/Model/Base/CouponQuery.php
	core/lib/Thelia/Model/Base/CouponVersion.php
	core/lib/Thelia/Model/Base/CouponVersionQuery.php
	core/lib/Thelia/Model/Base/OrderCouponQuery.php

core/lib/Thelia/Coupon/CouponManager.php

@@ -78,15 +78,8 @@ class CouponManager
         if (count($this->coupons) > 0) {
             $couponsKept = $this->sortCoupons($this->coupons);
 
-            $isRemovingPostage = $this->isCouponRemovingPostage($couponsKept);
-
             $discount = $this->getEffect($couponsKept);
 
-            if ($isRemovingPostage) {
-                $postage = $this->facade->getCheckoutPostagePrice();
-                $discount += $postage;
-            }
-
             // Just In Case test
             $checkoutTotalPrice = $this->facade->getCartTotalPrice();
             if ($discount >= $checkoutTotalPrice) {
@@ -99,23 +92,24 @@ class CouponManager
 
     /**
      * Check if there is a Coupon removing Postage
-     *
-     * @param array $couponsKept Array of CouponInterface sorted
-     *
      * @return bool
      */
-    protected function isCouponRemovingPostage(array $couponsKept)
+    public function isCouponRemovingPostage()
     {
-        $isRemovingPostage = false;
+        if (count($this->coupons) == 0) {
+            return false;
+        }
+
+        $couponsKept = $this->sortCoupons($this->coupons);
 
         /** @var CouponInterface $coupon */
         foreach ($couponsKept as $coupon) {
             if ($coupon->isRemovingPostage()) {
-                $isRemovingPostage = true;
+                return true;
             }
         }
 
-        return $isRemovingPostage;
+        return false;
     }
 
     /**