Browse Source

Mis à jour import & correctif

packProduct
Fabien Normand 2 years ago
parent
commit
36b509dfed
3 changed files with 4 additions and 2 deletions
  1. +1
    -1
      Controller/AdminControllerTrait.php
  2. +2
    -0
      Controller/Ticket/TicketAdminController.php
  3. +1
    -1
      Model/Ticket/TicketModel.php

+ 1
- 1
Controller/AdminControllerTrait.php View File

$repositoryQuery->filterBySection($sectionCurrent); $repositoryQuery->filterBySection($sectionCurrent);
} }


if ($this->isOutOfSection() && $this->isInstanceOf(FilterSectionInterface::class)) {
if ($this->isOutOfSection() && $this->isInstanceOf(FilterSectionInterface::class) && !$this->isInstanceOf(FilterMerchantInterface::class)) {
$repositoryQuery->filterByMerchantViaSection($this->getMerchantCurrent()); $repositoryQuery->filterByMerchantViaSection($this->getMerchantCurrent());
} }



+ 2
- 0
Controller/Ticket/TicketAdminController.php View File

namespace Lc\CaracoleBundle\Controller\Ticket; namespace Lc\CaracoleBundle\Controller\Ticket;


use EasyCorp\Bundle\EasyAdminBundle\Config\Actions; use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
use Lc\CaracoleBundle\Controller\AdminControllerTrait; use Lc\CaracoleBundle\Controller\AdminControllerTrait;
use Lc\CaracoleBundle\Definition\ActionDefinition; use Lc\CaracoleBundle\Definition\ActionDefinition;
use Lc\SovBundle\Controller\Ticket\TicketAdminController as SovTicketAdminController; use Lc\SovBundle\Controller\Ticket\TicketAdminController as SovTicketAdminController;


return $actions; return $actions;
} }

} }

+ 1
- 1
Model/Ticket/TicketModel.php View File

/** /**
* @ORM\MappedSuperclass() * @ORM\MappedSuperclass()
*/ */
abstract class TicketModel extends SovTicketModel implements FilterSectionInterface
abstract class TicketModel extends SovTicketModel implements FilterSectionInterface, FilterMerchantInterface
{ {
const TYPE_PRODUCT_UNAVAILABLE = 'product-unavailable'; const TYPE_PRODUCT_UNAVAILABLE = 'product-unavailable';
const TYPE_PRODUCT_ERROR = 'product-error'; const TYPE_PRODUCT_ERROR = 'product-error';

Loading…
Cancel
Save