From 9e7b36520cdc06c1a1b39f81c42126b779c00d20 Mon Sep 17 00:00:00 2001 From: arieeefajar Date: Sat, 15 Feb 2025 20:00:00 +0700 Subject: [PATCH] fix(master-land): fix master-land page --- database/seeders/LandSeeder.php | 4 ++-- .../js/pages/customJs/master-data/lahan/index.js | 2 +- resources/views/master-data/lahan/index.blade.php | 14 +++++++++++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/database/seeders/LandSeeder.php b/database/seeders/LandSeeder.php index 3c488b3..6e22fd5 100644 --- a/database/seeders/LandSeeder.php +++ b/database/seeders/LandSeeder.php @@ -14,8 +14,8 @@ class LandSeeder extends Seeder public function run(): void { $lands = [ - ['land_name' => 'Lahan 1', 'owner' => 'Pak Lahan 1', 'no_hp' => '08123456789', 'rental_price' => '2000000', 'rental_start' => '2023-05-01', 'rental_until' => '2023-06-30', 'province_code' => '11', 'regency_code' => '1101', 'district_code' => '110101', 'latitude' => '0.0', 'longitude' => '0.0'], - ['land_name' => 'Lahan 2', 'owner' => 'Pak Lahan 2', 'no_hp' => '08123456789', 'rental_price' => '1500000', 'rental_start' => '2023-05-01', 'rental_until' => '2023-06-30', 'province_code' => '11', 'regency_code' => '1101', 'district_code' => '110101', 'latitude' => '0.0', 'longitude' => '0.0'], + ['land_name' => 'Lahan 1', 'owner' => 'Pak Lahan 1', 'no_hp' => '08123456789', 'rental_price' => '2000000', 'rental_start' => '2025-01-01', 'rental_until' => '2025-06-30', 'province_code' => '11', 'regency_code' => '1101', 'district_code' => '110101', 'latitude' => '0.0', 'longitude' => '0.0'], + ['land_name' => 'Lahan 2', 'owner' => 'Pak Lahan 2', 'no_hp' => '08123456789', 'rental_price' => '1500000', 'rental_start' => '2025-01-01', 'rental_until' => '2025-06-30', 'province_code' => '11', 'regency_code' => '1101', 'district_code' => '110101', 'latitude' => '0.0', 'longitude' => '0.0'], ]; foreach ($lands as $land) { diff --git a/public/assets/js/pages/customJs/master-data/lahan/index.js b/public/assets/js/pages/customJs/master-data/lahan/index.js index bddd6c4..fe47ee1 100644 --- a/public/assets/js/pages/customJs/master-data/lahan/index.js +++ b/public/assets/js/pages/customJs/master-data/lahan/index.js @@ -273,7 +273,7 @@ function deleteData(id) { var perPage = 10, options = { - valueNames: ["id", "land_name", "status"], + valueNames: ["id", "land_name", "owner", "rental_price", "status"], page: perPage, pagination: !0, plugins: [ListPagination({ left: 2, right: 2 })], diff --git a/resources/views/master-data/lahan/index.blade.php b/resources/views/master-data/lahan/index.blade.php index 1161e69..a1b3c70 100644 --- a/resources/views/master-data/lahan/index.blade.php +++ b/resources/views/master-data/lahan/index.blade.php @@ -68,7 +68,9 @@ class="ri-add-line align-bottom me-1"> Tambah No Nama Lahan - Deskripsi + Pemilik + Harga Sewa + Lama Sewa Action @@ -78,8 +80,14 @@ class="ri-add-line align-bottom me-1"> Tambah {{ $loop->iteration }} #VZ2101 - {{ $land->name }} - {{ $land->description }} + {{ $land->land_name }} + {{ $land->owner }} + Rp.{{ number_format($land->rental_price) }} + + + {{ \Carbon\Carbon::parse($land->length_of_ease)->diffInDays(\Carbon\Carbon::parse($land->rental_until)) }} + Hari +