diff --git a/app/Http/Controllers/Forms/FormVehicleController.php b/app/Http/Controllers/Forms/FormVehicleController.php index 549f577..53fc52a 100644 --- a/app/Http/Controllers/Forms/FormVehicleController.php +++ b/app/Http/Controllers/Forms/FormVehicleController.php @@ -50,7 +50,7 @@ class FormVehicleController extends Controller $request->validate([ 'tanggal' => 'required', 'liter' => 'required', - 'harga' => 'required', + 'total' => 'required', 'jarak' => 'required', 'tipe_bensin' => 'required|in:pertalite,pertamax', 'nopol' => 'required', @@ -116,7 +116,7 @@ class FormVehicleController extends Controller 'user_id' => auth()->user()->id, 'tanggal' => $request->tanggal, 'liter' => $request->liter, - 'harga' => $request->harga, + 'total' => $request->total, 'jarak' => $request->jarak, 'tipe_bensin' => $request->tipe_bensin, 'nopol' => $request->nopol, @@ -125,6 +125,7 @@ class FormVehicleController extends Controller 'bukti2' => $filePaths['bukti2'] ?? null, 'bukti3' => $filePaths['bukti3'] ?? null, 'account_number' => $kategori->account_number, + 'status' => 'On Progress', ]); session()->flash('success', 'Form has been created.'); @@ -153,7 +154,7 @@ class FormVehicleController extends Controller $request->validate([ 'tanggal' => 'required', 'liter' => 'required', - 'harga' => 'required', + 'total' => 'required', 'jarak' => 'required', 'tipe_bensin' => 'required|in:pertalite,pertamax', 'nopol' => 'required', @@ -218,7 +219,7 @@ class FormVehicleController extends Controller $form->update([ 'tanggal' => $request->tanggal, 'liter' => $request->liter, - 'harga' => $request->harga, + 'total' => $request->total, 'jarak' => $request->jarak, 'tipe_bensin' => $request->tipe_bensin, 'nopol' => $request->nopol, diff --git a/app/Models/FormVehicleRunningCost.php b/app/Models/FormVehicleRunningCost.php index e0f4606..620bc55 100644 --- a/app/Models/FormVehicleRunningCost.php +++ b/app/Models/FormVehicleRunningCost.php @@ -15,7 +15,7 @@ class FormVehicleRunningCost extends Model 'user_id', 'tanggal', 'liter', - 'harga', + 'total', 'jarak', 'tipe_bensin', 'nopol', diff --git a/database/migrations/2024_12_11_033929_create_form_vehicle_running_cost.php b/database/migrations/2024_12_11_033929_create_form_vehicle_running_cost.php index b8b3502..7900dab 100644 --- a/database/migrations/2024_12_11_033929_create_form_vehicle_running_cost.php +++ b/database/migrations/2024_12_11_033929_create_form_vehicle_running_cost.php @@ -17,7 +17,7 @@ return new class extends Migration $table->foreignId('user_id')->constrained('admins')->cascadeOnDelete(); $table->dateTime('tanggal'); $table->integer('liter'); - $table->integer('harga'); + $table->integer('total'); $table->integer('jarak'); $table->string('tipe_bensin'); $table->string('nopol'); diff --git a/resources/views/backend/pages/forms/entertainment/index.blade.php b/resources/views/backend/pages/forms/entertainment/index.blade.php index 0c9b57e..7e54237 100644 --- a/resources/views/backend/pages/forms/entertainment/index.blade.php +++ b/resources/views/backend/pages/forms/entertainment/index.blade.php @@ -20,6 +20,48 @@ +
+
+
+ +
+
+
+

Rp {{ number_format($forms->sum('total'), 0, ',', '.') }}

+

Total Expense

+
+
+ +
+
+
+ +
+
+
+

Rp {{ number_format($forms->where('status', 'Approved')->sum('total'), 0, ',', '.') }}

+

Approved Expenses

+
+
+ +
+
+
+ +
+
+
+

Rp {{ number_format($forms->where('status', 'On Progress')->sum('total'), 0, ',', '.') }}

+

Pending Expenses

+
+
+ +
+
+
+
+
+
@@ -190,3 +232,11 @@
@endsection + +@section('scripts') + +@endsection diff --git a/resources/views/backend/pages/forms/meeting/index.blade.php b/resources/views/backend/pages/forms/meeting/index.blade.php index 2dd6fac..3f5ccc7 100644 --- a/resources/views/backend/pages/forms/meeting/index.blade.php +++ b/resources/views/backend/pages/forms/meeting/index.blade.php @@ -20,6 +20,48 @@ +
+
+
+ +
+
+
+

Rp {{ number_format($forms->sum('total'), 0, ',', '.') }}

+

Total Expense

+
+
+ +
+
+
+ +
+
+
+

Rp {{ number_format($forms->where('status', 'Approved')->sum('total'), 0, ',', '.') }}

+

Approved Expenses

+
+
+ +
+
+
+ +
+
+
+

Rp {{ number_format($forms->where('status', 'On Progress')->sum('total'), 0, ',', '.') }}

+

Pending Expenses

+
+
+ +
+
+
+
+
+
@@ -190,3 +232,11 @@
@endsection + +@section('scripts') + +@endsection diff --git a/resources/views/backend/pages/forms/other/index.blade.php b/resources/views/backend/pages/forms/other/index.blade.php index 620a88c..b83f338 100644 --- a/resources/views/backend/pages/forms/other/index.blade.php +++ b/resources/views/backend/pages/forms/other/index.blade.php @@ -20,6 +20,48 @@ +
+
+
+ +
+
+
+

Rp {{ number_format($forms->sum('total'), 0, ',', '.') }}

+

Total Expense

+
+
+ +
+
+
+ +
+
+
+

Rp {{ number_format($forms->where('status', 'Approved')->sum('total'), 0, ',', '.') }}

+

Approved Expenses

+
+
+ +
+
+
+ +
+
+
+

Rp {{ number_format($forms->where('status', 'On Progress')->sum('total'), 0, ',', '.') }}

+

Pending Expenses

+
+
+ +
+
+
+
+
+
@@ -188,3 +230,11 @@
@endsection + +@section('scripts') + +@endsection diff --git a/resources/views/backend/pages/forms/upcountry/index.blade.php b/resources/views/backend/pages/forms/upcountry/index.blade.php index b588e2b..3d395d0 100644 --- a/resources/views/backend/pages/forms/upcountry/index.blade.php +++ b/resources/views/backend/pages/forms/upcountry/index.blade.php @@ -20,6 +20,48 @@ +
+
+
+ +
+
+
+

Rp {{ number_format($forms->sum('total'), 0, ',', '.') }}

+

Total Expense

+
+
+ +
+
+
+ +
+
+
+

Rp {{ number_format($forms->where('status', 'Approved')->sum('total'), 0, ',', '.') }}

+

Approved Expenses

+
+
+ +
+
+
+ +
+
+
+

Rp {{ number_format($forms->where('status', 'On Progress')->sum('total'), 0, ',', '.') }}

+

Pending Expenses

+
+
+ +
+
+
+
+
+
@@ -190,3 +232,11 @@
@endsection + +@section('scripts') + +@endsection diff --git a/resources/views/backend/pages/forms/vehicle/create.blade.php b/resources/views/backend/pages/forms/vehicle/create.blade.php index d6bc6c4..bb16674 100644 --- a/resources/views/backend/pages/forms/vehicle/create.blade.php +++ b/resources/views/backend/pages/forms/vehicle/create.blade.php @@ -40,8 +40,8 @@
- - + +
@@ -90,7 +90,7 @@ +@endsection