$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()); | ||||
} | } | ||||
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; | ||||
} | } | ||||
} | } |
/** | /** | ||||
* @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'; |