소스 검색

Mis à jour import & correctif

packProduct
Fabien Normand 2 년 전
부모
커밋
36b509dfed
3개의 변경된 파일4개의 추가작업 그리고 2개의 파일을 삭제
  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 파일 보기

@@ -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());
}


+ 2
- 0
Controller/Ticket/TicketAdminController.php 파일 보기

@@ -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;
}

}

+ 1
- 1
Model/Ticket/TicketModel.php 파일 보기

@@ -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';

Loading…
취소
저장