From f736d0610004e621b7d1baf335612e1ac04e2e3e Mon Sep 17 00:00:00 2001 From: Djonathan Date: Fri, 8 Jul 2022 17:08:01 -0300 Subject: [PATCH] Bring date only from the current year + previous year in the pld filter. --- app/Helpers/Helpers.php | 2 +- app/Http/Controllers/PldController.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Helpers/Helpers.php b/app/Helpers/Helpers.php index 1634699..e3793eb 100644 --- a/app/Helpers/Helpers.php +++ b/app/Helpers/Helpers.php @@ -27,7 +27,7 @@ class Helpers ->transform(fn($value) => Arr::set( $value, $field, - Carbon::createFromFormat('ym', $value['mes'])->locale('pt-BR') + Carbon::createFromFormat('ym', $value[$field])->locale('pt-BR') ->translatedFormat($format))) ->all(); } diff --git a/app/Http/Controllers/PldController.php b/app/Http/Controllers/PldController.php index c134152..de9af4a 100644 --- a/app/Http/Controllers/PldController.php +++ b/app/Http/Controllers/PldController.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace App\Http\Controllers; +use App\Helpers\Helpers; use App\Http\Resources\PldResource; use App\Repositories\Pld\PldContractInterface; use App\Traits\ApiResponse; @@ -23,6 +24,7 @@ class PldController extends Controller { try { $response = $this->pldContract->search($request->all()); + $response = Helpers::orderByDate($response, 'm/Y', 'mes_ref'); return (new PldResource($response)) ->response() ->setStatusCode(Response::HTTP_OK);