Free shipping for selected countries and/or shipping methods

core/lib/Thelia/Controller/Admin/CouponController.php

@@ -32,6 +32,8 @@ use Thelia\Form\CouponCreationForm;
 use Thelia\Form\Exception\FormValidationException;
 use Thelia\Log\Tlog;
 use Thelia\Model\Coupon;
+use Thelia\Model\CouponCountry;
+use Thelia\Model\CouponModule;
 use Thelia\Model\CouponQuery;
 use Thelia\Model\LangQuery;
 use Thelia\Tools\Rest\ResponseRest;
@@ -152,6 +154,21 @@ class CouponController extends BaseAdminController
                 $coupon->getSerializedConditions()
             );
 
+            $freeShippingForCountries = $freeShippingForModules = [];
+
+            /** @var CouponCountry $item */
+            foreach($coupon->getFreeShippingForCountries() as $item) {
+                $freeShippingForCountries[] = $item->getCountryId();
+            }
+
+            /** @var CouponModule $item */
+            foreach($coupon->getFreeShippingForModules() as $item) {
+                $freeShippingForModules[] = $item->getModuleId();
+            }
+
+            if (empty($freeShippingForCountries)) $freeShippingForCountries[] = 0;
+            if (empty($freeShippingForModules)) $freeShippingForModules[] = 0;
+
             $data = [
                 'code' => $coupon->getCode(),
                 'title' => $coupon->getTitle(),
@@ -167,6 +184,8 @@ class CouponController extends BaseAdminController
                 'maxUsage' => $coupon->getMaxUsage(),
                 'conditions' => $conditions,
                 'locale' => $this->getCurrentEditionLocale(),
+                'freeShippingForCountries' => $freeShippingForCountries,
+                'freeShippingForModules' => $freeShippingForModules
             ];
 
             $args['conditions'] = $this->cleanConditionForTemplate($conditions);
@@ -557,7 +576,7 @@ class CouponController extends BaseAdminController
             $condition['serviceId'] = $availableCoupon->getServiceId();
             $condition['name'] = $availableCoupon->getName();
             $condition['toolTip'] = $availableCoupon->getToolTip();
-            $condition['inputName'] = $availableCoupon->getInputName();
+            // $condition['inputName'] = $availableCoupon->getInputName();
             $cleanedCoupons[] = $condition;
         }
 
@@ -702,7 +721,7 @@ class CouponController extends BaseAdminController
         $couponManager = $this->container->get($serviceId);
         $effects = [CouponAbstract::INPUT_AMOUNT_NAME => $data[CouponAbstract::INPUT_AMOUNT_NAME]];
         $effects = $this->addExtendedLogic($effects, $couponManager->getExtendedInputs());
-
+var_dump($data);
         $couponEvent = new CouponCreateOrUpdateEvent(
             $data['code'],
             $serviceId,
@@ -716,7 +735,9 @@ class CouponController extends BaseAdminController
             $data['isCumulative'],
             $data['isRemovingPostage'],
             $data['maxUsage'],
-            $data['locale']
+            $data['locale'],
+            $data['freeShippingForCountries'],
+            $data['freeShippingForModules']
         );
 
         // If Update mode
@@ -774,7 +795,9 @@ class CouponController extends BaseAdminController
             $coupon->getIsCumulative(),
             $coupon->getIsRemovingPostage(),
             $coupon->getMaxUsage(),
-            $coupon->getLocale()
+            $coupon->getLocale(),
+            $coupon->getFreeShippingForCountries(),
+            $coupon->getFreeShippingForModules()
         );
         $couponEvent->setCouponModel($coupon);
         $couponEvent->setConditions($conditions);

core/lib/Thelia/Controller/Front/BaseFrontController.php

@@ -15,10 +15,10 @@ namespace Thelia\Controller\Front;
 use Symfony\Component\Routing\Router;
 use Thelia\Controller\BaseController;
 use Thelia\Core\HttpFoundation\Response;
+use Thelia\Core\Template\TemplateDefinition;
 use Thelia\Core\Template\TemplateHelper;
 use Thelia\Model\AddressQuery;
 use Thelia\Model\ModuleQuery;
-
 use Thelia\Tools\URL;
 
 class BaseFrontController extends BaseController
@@ -65,7 +65,15 @@ class BaseFrontController extends BaseController
     protected function checkValidDelivery()
     {
         $order = $this->getSession()->getOrder();
-        if (null === $order || null === $order->chosenDeliveryAddress || null === $order->getDeliveryModuleId() || null === AddressQuery::create()->findPk($order->chosenDeliveryAddress) || null === ModuleQuery::create()->findPk($order->getDeliveryModuleId())) {
+        if (null === $order
+            ||
+            null === $order->getChoosenDeliveryAddress()
+            ||
+            null === $order->getDeliveryModuleId()
+            ||
+            null === AddressQuery::create()->findPk($order->getChoosenDeliveryAddress())
+            ||
+            null === ModuleQuery::create()->findPk($order->getDeliveryModuleId())) {
             $this->redirectToRoute("order.delivery");
         }
     }
@@ -73,13 +81,21 @@ class BaseFrontController extends BaseController
     protected function checkValidInvoice()
     {
         $order = $this->getSession()->getOrder();
-        if (null === $order || null === $order->chosenInvoiceAddress || null === $order->getPaymentModuleId() || null === AddressQuery::create()->findPk($order->chosenInvoiceAddress) || null === ModuleQuery::create()->findPk($order->getPaymentModuleId())) {
+        if (null === $order
+            ||
+            null === $order->getChoosenInvoiceAddress()
+            ||
+            null === $order->getPaymentModuleId()
+            ||
+            null === AddressQuery::create()->findPk($order->getChoosenInvoiceAddress())
+            ||
+            null === ModuleQuery::create()->findPk($order->getPaymentModuleId())) {
             $this->redirectToRoute("order.invoice");
         }
     }
 
     /**
-     * @return ParserInterface instance parser
+     * @return TemplateDefinition the template
      */
     protected function getParser($template = null)
     {