diff --git a/app/Repositories/Economy/EconomyRepository.php b/app/Repositories/Economy/EconomyRepository.php index 3cdbb19..bc82ed7 100644 --- a/app/Repositories/Economy/EconomyRepository.php +++ b/app/Repositories/Economy/EconomyRepository.php @@ -101,7 +101,7 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt public function getCostMWhEconomy($params) { $field = [ - DB::raw("TO_CHAR(TO_DATE(economia.mes, 'YYMM'), 'MM/YYYY') as mes"), + DB::raw("TO_DATE(economia.mes, 'YYMM') as mes"), DB::raw("SUM(economia.custo_unit) as custo_unit"), "economia.dad_estimado" ]; @@ -118,7 +118,7 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt ->orderBy('dad_estimado') ->get(); - return static::checkDate($result); + return collect(static::checkDate($result))->transform(fn($value) => Arr::set($value, 'mes', date_format(date_create($value['mes']), "M/Y")))->all();; } @@ -126,9 +126,10 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt { $year = collect($value)->transform(fn($item, $value) => collect(Str::of($item['mes']) - ->explode('/')->offsetGet(1)))->unique()->toArray(); + ->explode('-')->offsetGet(0)))->unique()->toArray(); $month = collect($value)->transform(fn($item, $value) => collect(Str::of($item['mes']) - ->explode('/')->offsetGet(0)))->unique()->toArray(); + ->explode('-')->offsetGet(1)))->unique()->toArray(); + $month_stat = end($month); $date_stat = current($year); $date_end = end($year); @@ -141,7 +142,7 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt $date = []; foreach ($daterange as $date1) { - $date[] = $date1->format('m/Y'); + $date[] = $date1->format('Y-m'.'-01'); } $arr = collect($value)->toArray(); @@ -153,8 +154,8 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt } usort($arr, function ($a, $b, $i = 'mes') { - $t1 = strtotime(str_replace('/', '-', $a[$i])); - $t2 = strtotime(str_replace('/', '-', $b[$i])); + $t1 = strtotime($a[$i]); + $t2 = strtotime($b[$i]); return $t1 - $t2; }); diff --git a/routes/api.php b/routes/api.php index 7da44ef..c2a7753 100644 --- a/routes/api.php +++ b/routes/api.php @@ -31,6 +31,8 @@ Route::middleware(['auth:sanctum', 'verified'])->group(function () { Route::post('pld', [\App\Http\Controllers\PldController::class, 'index']); Route::post('units', [\App\Http\Controllers\ClientController::class, 'index']); + + Route::get('aboutUs', [\App\Http\Controllers\AboutUsController::class, 'index']); }); Route::middleware(['auth:sanctum', 'ability:Admin'])->group(function () { @@ -73,8 +75,6 @@ Route::middleware(['auth:sanctum', 'ability:Client'])->group(function () { Route::post('notify', [\App\Http\Controllers\NotificationController::class, 'notify']); - Route::get('aboutUs', [\App\Http\Controllers\AboutUsController::class, 'index']); - Route::get('news', [\App\Http\Controllers\NewsController::class, 'send']); });