fix merge request conflict for improve address

This commit is contained in:
nobohan
2021-10-20 15:52:22 +02:00
4 changed files with 21 additions and 42 deletions

View File

@@ -3,6 +3,7 @@
namespace Chill\MainBundle\Controller;
use Chill\MainBundle\CRUD\Controller\ApiController;
use Chill\MainBundle\Pagination\PaginatorInterface;
use Symfony\Component\HttpFoundation\Request;
/**
@@ -20,8 +21,17 @@ class AddressReferenceAPIController extends ApiController
$qb->where('e.postcode = :postal_code')
->setParameter('postal_code', $request->query->get('postal_code'));
}
}
protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format)
{
$query->addOrderBy('e.street', 'ASC');
$query->addOrderBy('e.streetNumber', 'ASC');
return $query;
}
}