Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into tender

2024-12-18 09:01:36 +07:00
parent 510df4ea4c 562f1fb846
commit c5d31c7d56
25 changed files with 2547 additions and 1174 deletions
--- a/app/Http/Controllers/KJPPController.php
+++ b/app/Http/Controllers/KJPPController.php
@@ -498,7 +498,7 @@ class KJPPController extends Controller
        $filteredRecords = $query->count();

        // Get the data for the current page
-        $data = $query->get();
+        $data = $query->with('city')->get();

        // Calculate the page count
        $pageCount = ceil($totalRecords / $request->get('size'));