@@ -81,7 +81,7 @@ trait AdminControllerTrait | |||
$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()); | |||
} | |||
@@ -3,6 +3,7 @@ | |||
namespace Lc\CaracoleBundle\Controller\Ticket; | |||
use EasyCorp\Bundle\EasyAdminBundle\Config\Actions; | |||
use EasyCorp\Bundle\EasyAdminBundle\Config\Crud; | |||
use Lc\CaracoleBundle\Controller\AdminControllerTrait; | |||
use Lc\CaracoleBundle\Definition\ActionDefinition; | |||
use Lc\SovBundle\Controller\Ticket\TicketAdminController as SovTicketAdminController; | |||
@@ -40,4 +41,5 @@ abstract class TicketAdminController extends SovTicketAdminController | |||
return $actions; | |||
} | |||
} |
@@ -13,7 +13,7 @@ use Lc\SovBundle\Model\Ticket\TicketModel as SovTicketModel; | |||
/** | |||
* @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_ERROR = 'product-error'; |