From 5f95adddd5e6f21c89e913e980f3e2737e896786 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Fri, 9 Aug 2024 15:02:27 +0700
Subject: [PATCH] Fix Master Province

---
 app/Exports/ProvincesExport.php              | 2 +-
 app/Http/Controllers/ProvincesController.php | 7 ++++---
 routes/web.php                               | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/Exports/ProvincesExport.php b/app/Exports/ProvincesExport.php
index 1fd5970..94b60c2 100644
--- a/app/Exports/ProvincesExport.php
+++ b/app/Exports/ProvincesExport.php
@@ -35,7 +35,7 @@ class ProvincesExport implements WithColumnFormatting, WithHeadings, FromCollect
     public function columnFormats(): array{
         return [
             'A' => \PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_NUMBER,
-            'C' => \PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_DATETIME
+            'D' => \PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_DATETIME
         ];
     }
 }
diff --git a/app/Http/Controllers/ProvincesController.php b/app/Http/Controllers/ProvincesController.php
index 745d6ed..7cc2a17 100644
--- a/app/Http/Controllers/ProvincesController.php
+++ b/app/Http/Controllers/ProvincesController.php
@@ -79,7 +79,8 @@ class ProvincesController extends Controller
         if ($request->has('search') && !empty($request->get('search'))) {
             $search = $request->get('search');
             $query->where(function ($q) use ($search) {
-                $q->where('name', 'LIKE', "%$search%");
+                $q->where('code', 'LIKE', "%$search%");
+                $q->orWhere('name', 'LIKE', "%$search%");
             });
         }
 
@@ -106,7 +107,7 @@ class ProvincesController extends Controller
         $filteredRecords = $query->count();
 
         // Get the data for the current page
-        $roles = $query->get();
+        $provinces = $query->get();
 
         // Calculate the page count
         $pageCount = ceil($totalRecords/$request->get('size'));
@@ -122,7 +123,7 @@ class ProvincesController extends Controller
             'pageCount'       => $pageCount,
             'page'            => $currentPage,
             'totalCount'      => $totalRecords,
-            'data'            => $roles,
+            'data'            => $provinces,
         ]);
     }
 
diff --git a/routes/web.php b/routes/web.php
index bd22cb7..7c1be59 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -17,7 +17,7 @@ use Modules\Location\Http\Controllers\LocationController;
 
     Route::middleware(['auth'])->group(function () {
         Route::name('locations.')->prefix('locations')->group(function () {
-            Route::name('provinces.')->prefix('roles')->group(function () {
+            Route::name('provinces.')->prefix('provinces')->group(function () {
                 Route::get('restore/{id}', [ProvincesController::class, 'restore'])->name('restore');
                 Route::get('datatables', [ProvincesController::class, 'dataForDatatables'])->name('datatables');
                 Route::get('export', [ProvincesController   ::class, 'export'])->name('export');