Merge branch 'develop' of https://forge.laclic.fr/Laclic/CaracoleBundle into develop

Controller/Reduction/ReductionCartAdminController.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Lc\CaracoleBundle\Controller\Reduction;
+
+
+use EasyCorp\Bundle\EasyAdminBundle\Field\ChoiceField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\NumberField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
+use Lc\CaracoleBundle\Controller\AdminControllerTrait;
+use Lc\CaracoleBundle\Model\Config\TaxRateModel;
+use Lc\CaracoleBundle\Model\Config\UnitModel;
+use Lc\SovBundle\Controller\AbstractAdminController;
+use Lc\SovBundle\Translation\TranslatorAdmin;
+
+abstract class ReductionCartAdminController extends AbstractAdminController
+{
+    use AdminControllerTrait;
+
+
+
+}

Controller/Reduction/ReductionCatalogAdminController.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Lc\CaracoleBundle\Controller\Reduction;
+
+
+use EasyCorp\Bundle\EasyAdminBundle\Field\ChoiceField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\NumberField;
+use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
+use Lc\CaracoleBundle\Controller\AdminControllerTrait;
+use Lc\CaracoleBundle\Model\Config\TaxRateModel;
+use Lc\CaracoleBundle\Model\Config\UnitModel;
+use Lc\SovBundle\Controller\AbstractAdminController;
+use Lc\SovBundle\Translation\TranslatorAdmin;
+
+abstract class ReductionCatalogAdminController extends AbstractAdminController
+{
+    use AdminControllerTrait;
+
+
+
+}

Model/Reduction/ReductionCartModel.php

@@ -31,10 +31,6 @@ abstract class ReductionCartModel extends AbstractLightEntity implements Reducti
                                                                          FilterSectionInterface,
                                                                          OrderAmountMinInterface, StatusInterface
 {
-
-    const APPLIED_TO_DELIVERY = 'delivery';
-    const APPLIED_TO_ORDER_PRODUCTS = 'order-products';
-
     use StatusTrait;
     use OrderAmountMinTrait;
     use ReductionTrait;
@@ -43,6 +39,19 @@ abstract class ReductionCartModel extends AbstractLightEntity implements Reducti
         ReductionPropertyTrait::__construct as private __reductionPropertyConstruct;
     }
 
+    const APPLIED_TO_DELIVERY = 'delivery';
+    const APPLIED_TO_ORDER_PRODUCTS = 'order-products';
+
+
+    public function getAppliedToChoices()
+    {
+        return [
+                self::APPLIED_TO_DELIVERY,
+                self::APPLIED_TO_ORDER_PRODUCTS,
+        ];
+    }
+
+
     /**
      * @ORM\Column(type="string", length=255)
      */

Twig/StoreTwigExtension.php

@@ -53,6 +53,7 @@ class StoreTwigExtension extends AbstractExtension
                 new TwigFunction('carac_reminders', [$this, 'getReminders']),
                 new TwigFunction('carac_units', [$this, 'getUnits']),
                 new TwigFunction('carac_tax_rates', [$this, 'getTaxRates']),
+                new TwigFunction('carac_reduction_cart_codes', [$this, 'getTaxRates']),
         );
     }
 
@@ -84,4 +85,11 @@ class StoreTwigExtension extends AbstractExtension
         return $this->taxRateStore->setMerchant($this->merchantResolver->getCurrent())->getAsArray();
     }
 
+    public function getReductionCartCodes()
+    {
+       //TODO mettre à jour une fois les repo fait
+        return array();
+    }
+
+
 }