Parcourir la source

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

packProduct
Guillaume il y a 3 ans
Parent
révision
e735db9887
2 fichiers modifiés avec 2 ajouts et 18 suppressions
  1. +1
    -1
      Controller/AdminControllerTrait.php
  2. +1
    -17
      Twig/ToolsTwigExtension.php

+ 1
- 1
Controller/AdminControllerTrait.php Voir le fichier

@@ -62,7 +62,7 @@ use Symfony\Component\HttpFoundation\Response;

trait AdminControllerTrait
{
//TODO doit implementer ControllerTrait
public static function getSubscribedServices()
{
return array_merge(

+ 1
- 17
Twig/ToolsTwigExtension.php Voir le fichier

@@ -2,26 +2,10 @@

namespace Lc\CaracoleBundle\Twig;

use Lc\CaracoleBundle\Builder\Order\OrderShopBuilder;
use Lc\CaracoleBundle\Model\Merchant\MerchantInterface;
use Lc\CaracoleBundle\Model\Order\OrderShopInterface;
use Lc\CaracoleBundle\Model\Section\SectionInterface;
use Lc\CaracoleBundle\Model\User\UserMerchantInterface;
use Lc\CaracoleBundle\Repository\Config\TaxRateStore;
use Lc\CaracoleBundle\Repository\Config\UnitStore;
use Lc\CaracoleBundle\Repository\Merchant\MerchantStore;
use Lc\CaracoleBundle\Repository\Order\OrderShopStore;
use Lc\CaracoleBundle\Repository\Product\ProductCategoryStore;
use Lc\CaracoleBundle\Repository\Reminder\ReminderStore;
use Lc\CaracoleBundle\Repository\Section\SectionStore;
use Lc\CaracoleBundle\Resolver\MerchantResolver;
use Lc\CaracoleBundle\Resolver\SectionResolver;
use Lc\CaracoleBundle\Resolver\VisitorResolver;
use Lc\SovBundle\Solver\Setting\SettingSolver;
use Symfony\Component\Security\Core\Security;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;


class ToolsTwigExtension extends AbstractExtension
{


Chargement…
Annuler
Enregistrer