From b13d34a38c8e61328168e655d9607014221f5e01 Mon Sep 17 00:00:00 2001 From: Djonathan Date: Wed, 20 Jul 2022 09:06:11 -0300 Subject: [PATCH] Function implementation does not work correctly at cost R$/MWh. --- app/Helpers/Helpers.php | 4 ++-- app/Repositories/Economy/EconomyRepository.php | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/Helpers/Helpers.php b/app/Helpers/Helpers.php index 8eb200e..e3793eb 100644 --- a/app/Helpers/Helpers.php +++ b/app/Helpers/Helpers.php @@ -21,13 +21,13 @@ class Helpers return $result; } - public static function orderByDate($result, $old_format = 'Y-m-d', $format ='M/Y', $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($old_format, $value[$field])->locale('pt-BR') + Carbon::createFromFormat('ym', $value[$field])->locale('pt-BR') ->translatedFormat($format))) ->all(); } diff --git a/app/Repositories/Economy/EconomyRepository.php b/app/Repositories/Economy/EconomyRepository.php index 201142f..288f45b 100644 --- a/app/Repositories/Economy/EconomyRepository.php +++ b/app/Repositories/Economy/EconomyRepository.php @@ -153,9 +153,7 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt ->orderBy(DB::raw("mes, dad_estimado")) ->get(); - $result = Helpers::checkDate($value); - - return Helpers::orderByDate($result); + return Helpers::checkDate($value); } }