diff --git a/app/Helpers/Helpers.php b/app/Helpers/Helpers.php index 516d48e..1634699 100644 --- a/app/Helpers/Helpers.php +++ b/app/Helpers/Helpers.php @@ -21,14 +21,14 @@ class Helpers return $result; } - public static function orderByDate($result, $field = 'mes'): array + public static function orderByDate($result, $format ='M/Y', $field = 'mes'): array { return collect($result) ->transform(fn($value) => Arr::set( $value, $field, Carbon::createFromFormat('ym', $value['mes'])->locale('pt-BR') - ->translatedFormat('M/Y'))) + ->translatedFormat($format))) ->all(); } diff --git a/app/Http/Controllers/OperationSummaryController.php b/app/Http/Controllers/OperationSummaryController.php index 5570526..20a6206 100644 --- a/app/Http/Controllers/OperationSummaryController.php +++ b/app/Http/Controllers/OperationSummaryController.php @@ -26,7 +26,7 @@ class OperationSummaryController extends Controller { try { $response = $this->dadosTeContract->search($request->all(), true); - $response = Helpers::orderByDate($response); + $response = Helpers::orderByDate($response, 'm/Y'); return (new OperationSummaryResource($response)) ->response() ->setStatusCode(Response::HTTP_OK); diff --git a/app/Repositories/DadosTe/DadosTeRepository.php b/app/Repositories/DadosTe/DadosTeRepository.php index 53d26df..acdaf66 100644 --- a/app/Repositories/DadosTe/DadosTeRepository.php +++ b/app/Repositories/DadosTe/DadosTeRepository.php @@ -45,6 +45,8 @@ class DadosTeRepository extends AbstractRepository implements DadosTeContractInt 'dados_te.nf_c_icms' ]; + $params = static::filterRow($params); + $result = $this->execute($fields, $params) ->whereRaw("TO_DATE(dados_te.mes, 'YYMM') >= TO_DATE(TO_CHAR(current_date , 'YYYY-01-01'), 'YYYY-MM-DD') - INTERVAL '1' year") ->orderBy('mes', 'DESC')