From 548e416e8e82174c538d797cc1db94718fef4cfd Mon Sep 17 00:00:00 2001 From: Jagad R R Date: Tue, 14 Jan 2025 17:25:26 +0700 Subject: [PATCH] removed closing date and add it into env --- .env | 2 ++ .../Backend/BudgetControlController.php | 3 +-- .../Backend/DashboardController.php | 21 ++++++++++--------- ...ormEntertainmentPresentationController.php | 4 ++-- .../Forms/FormMeetingSeminarController.php | 4 ++-- .../Controllers/Forms/FormOtherController.php | 4 ++-- .../Forms/FormUpCountryController.php | 4 ++-- .../Forms/FormVehicleController.php | 4 ++-- .../pages/budget_control/create.blade.php | 4 ---- .../pages/budget_control/edit.blade.php | 0 .../pages/budget_control/index.blade.php | 2 -- .../pages/budget_control/log.blade.php | 2 -- 12 files changed, 24 insertions(+), 30 deletions(-) delete mode 100644 resources/views/backend/pages/budget_control/edit.blade.php diff --git a/.env b/.env index 753aa6b..f8b9bea 100644 --- a/.env +++ b/.env @@ -75,3 +75,5 @@ NEXT_CLOUD_PATHPREFIX="" WABLAS_HOST=https://bdg.wablas.com WABLAS_TOKEN=5iCaiP0nEgfl3lzrdsZGb9TvNYuwFZF8s4rp8AYwCx5OrYeiKXgixFMo9nDWNrJN.IF98hujz + +CLOSING_DATE='20' diff --git a/app/Http/Controllers/Backend/BudgetControlController.php b/app/Http/Controllers/Backend/BudgetControlController.php index 04a5c86..b4736e3 100644 --- a/app/Http/Controllers/Backend/BudgetControlController.php +++ b/app/Http/Controllers/Backend/BudgetControlController.php @@ -109,7 +109,6 @@ class BudgetControlController extends Controller 'periode_year' => 'required|numeric', 'amount' => 'required|numeric', 'remarks' => 'nullable|string', - 'closing_at' => 'required|date', ]); $cabang_id = Admin::find($validated['receiver_id'])->getMyCabangAndRegionId()['cabang']; @@ -121,7 +120,7 @@ class BudgetControlController extends Controller 'periode_year' => $validated['periode_year'], 'amount' => $validated['amount'], 'remarks' => $validated['remarks'], - 'closing_at' => $validated['closing_at'], + 'closing_at' => null, 'status' => 'Assigned', ]); diff --git a/app/Http/Controllers/Backend/DashboardController.php b/app/Http/Controllers/Backend/DashboardController.php index 1d353f1..7983757 100644 --- a/app/Http/Controllers/Backend/DashboardController.php +++ b/app/Http/Controllers/Backend/DashboardController.php @@ -21,35 +21,36 @@ class DashboardController extends Controller public function index() { $role = auth()->user()->getRoleNames()[0]; + $closing_date = env('CLOSING_DATE'); $forms = [ 'vehicle' => FormVehicleRunningCost::whereMonth('tanggal', date('m')) ->whereYear('tanggal', date('Y')) - ->where('tanggal', '<=', date('Y-m-20')) - ->whereRaw('DAY(CURDATE()) <= 20') + ->where('tanggal', '<=', date('Y-m-'.$closing_date)) + ->whereRaw('DAY(CURDATE()) <= '.$closing_date) ->orderBy('tanggal', 'desc') ->get(), 'upcountry' => FormUpCountry::whereMonth('tanggal', date('m')) ->whereYear('tanggal', date('Y')) - ->where('tanggal', '<=', date('Y-m-20')) - ->whereRaw('DAY(CURDATE()) <= 20') + ->where('tanggal', '<=', date('Y-m-'.$closing_date)) + ->whereRaw('DAY(CURDATE()) <= '.$closing_date) ->orderBy('tanggal', 'desc') ->get(), 'entertainment' => FormEntertaimentPresentation::whereMonth('tanggal', date('m')) ->whereYear('tanggal', date('Y')) - ->where('tanggal', '<=', date('Y-m-20')) - ->whereRaw('DAY(CURDATE()) <= 20') + ->where('tanggal', '<=', date('Y-m-'.$closing_date)) + ->whereRaw('DAY(CURDATE()) <= '.$closing_date) ->orderBy('tanggal', 'desc') ->get(), 'meeting' => FormMeetingSeminar::whereMonth('created_at', date('m')) ->whereYear('created_at', date('Y')) - ->where('created_at', '<=', date('Y-m-20')) - ->whereRaw('DAY(CURDATE()) <= 20') + ->where('created_at', '<=', date('Y-m-'.$closing_date)) + ->whereRaw('DAY(CURDATE()) <= '.$closing_date) ->orderBy('created_at', 'desc') ->get(), 'others' => FormOthers::whereMonth('tanggal', date('m')) ->whereYear('tanggal', date('Y')) - ->where('tanggal', '<=', date('Y-m-20')) - ->whereRaw('DAY(CURDATE()) <= 20') + ->where('tanggal', '<=', date('Y-m-'.$closing_date)) + ->whereRaw('DAY(CURDATE()) <= '.$closing_date) ->orderBy('tanggal', 'desc') ->get(), ]; diff --git a/app/Http/Controllers/Forms/FormEntertainmentPresentationController.php b/app/Http/Controllers/Forms/FormEntertainmentPresentationController.php index 131ea21..558183b 100644 --- a/app/Http/Controllers/Forms/FormEntertainmentPresentationController.php +++ b/app/Http/Controllers/Forms/FormEntertainmentPresentationController.php @@ -34,8 +34,8 @@ class FormEntertainmentPresentationController extends Controller $role = auth()->user()->getRoleNames()[0]; $forms = FormEntertaimentPresentation::whereMonth('tanggal', date('m')) ->whereYear('tanggal', date('Y')) - ->where('tanggal', '<=', date('Y-m-20')) - ->whereRaw('DAY(CURDATE()) <= 20') + ->where('tanggal', '<=', date('Y-m-' . env('CLOSING_DATE'))) + ->whereRaw('DAY(CURDATE()) <= ' . env('CLOSING_DATE')) ->orderBy('tanggal', 'desc') ->get(); diff --git a/app/Http/Controllers/Forms/FormMeetingSeminarController.php b/app/Http/Controllers/Forms/FormMeetingSeminarController.php index 6ab796d..363d86f 100644 --- a/app/Http/Controllers/Forms/FormMeetingSeminarController.php +++ b/app/Http/Controllers/Forms/FormMeetingSeminarController.php @@ -34,8 +34,8 @@ class FormMeetingSeminarController extends Controller $role = auth()->user()->getRoleNames()[0]; $forms = FormMeetingSeminar::whereMonth('created_at', date('m')) ->whereYear('created_at', date('Y')) - ->where('created_at', '<=', date('Y-m-20')) - ->whereRaw('DAY(CURDATE()) <= 20') + ->where('created_at', '<=', date('Y-m-' . env('CLOSING_DATE'))) + ->whereRaw('DAY(CURDATE()) <= ' . env('CLOSING_DATE')) ->orderBy('created_at', 'desc') ->get(); diff --git a/app/Http/Controllers/Forms/FormOtherController.php b/app/Http/Controllers/Forms/FormOtherController.php index 8aa9d54..0660b71 100644 --- a/app/Http/Controllers/Forms/FormOtherController.php +++ b/app/Http/Controllers/Forms/FormOtherController.php @@ -34,8 +34,8 @@ class FormOtherController extends Controller $role = auth()->user()->getRoleNames()[0]; $forms = FormOthers::whereMonth('tanggal', date('m')) ->whereYear('tanggal', date('Y')) - ->where('tanggal', '<=', date('Y-m-20')) - ->whereRaw('DAY(CURDATE()) <= 20') + ->where('tanggal', '<=', date('Y-m-' . env('CLOSING_DATE'))) + ->whereRaw('DAY(CURDATE()) <= ' . env('CLOSING_DATE')) ->orderBy('tanggal', 'desc') ->get(); diff --git a/app/Http/Controllers/Forms/FormUpCountryController.php b/app/Http/Controllers/Forms/FormUpCountryController.php index e8c1b4e..6e7caef 100644 --- a/app/Http/Controllers/Forms/FormUpCountryController.php +++ b/app/Http/Controllers/Forms/FormUpCountryController.php @@ -34,8 +34,8 @@ class FormUpCountryController extends Controller $role = auth()->user()->getRoleNames()[0]; $forms = FormUpCountry::whereMonth('tanggal', date('m')) ->whereYear('tanggal', date('Y')) - ->where('tanggal', '<=', date('Y-m-20')) - ->whereRaw('DAY(CURDATE()) <= 20') + ->where('tanggal', '<=', date('Y-m-' . env('CLOSING_DATE'))) + ->whereRaw('DAY(CURDATE()) <= ' . env('CLOSING_DATE')) ->orderBy('tanggal', 'desc') ->get(); diff --git a/app/Http/Controllers/Forms/FormVehicleController.php b/app/Http/Controllers/Forms/FormVehicleController.php index b2b62a1..69df316 100644 --- a/app/Http/Controllers/Forms/FormVehicleController.php +++ b/app/Http/Controllers/Forms/FormVehicleController.php @@ -34,8 +34,8 @@ class FormVehicleController extends Controller $role = auth()->user()->getRoleNames()[0]; $forms = FormVehicleRunningCost::whereMonth('tanggal', date('m')) ->whereYear('tanggal', date('Y')) - ->where('tanggal', '<=', date('Y-m-20')) - ->whereRaw('DAY(CURDATE()) <= 20') + ->where('tanggal', '<=', date('Y-m-' . env('CLOSING_DATE'))) + ->whereRaw('DAY(CURDATE()) <= ' . env('CLOSING_DATE')) ->orderBy('tanggal', 'desc') ->get(); diff --git a/resources/views/backend/pages/budget_control/create.blade.php b/resources/views/backend/pages/budget_control/create.blade.php index 699643c..84f3ac8 100644 --- a/resources/views/backend/pages/budget_control/create.blade.php +++ b/resources/views/backend/pages/budget_control/create.blade.php @@ -80,10 +80,6 @@
-
-
- -
diff --git a/resources/views/backend/pages/budget_control/edit.blade.php b/resources/views/backend/pages/budget_control/edit.blade.php deleted file mode 100644 index e69de29..0000000 diff --git a/resources/views/backend/pages/budget_control/index.blade.php b/resources/views/backend/pages/budget_control/index.blade.php index 901bae5..051292c 100644 --- a/resources/views/backend/pages/budget_control/index.blade.php +++ b/resources/views/backend/pages/budget_control/index.blade.php @@ -49,7 +49,6 @@ Sisa Budget Tersedia Keterangan Periode - Tanggal Closing Status Aksi @@ -68,7 +67,6 @@ {{ number_format(BudgetHelper::getAvailableBudget($item->cabang->id), 0, ',', '.') }} {{ $item->remarks }} {{ strtoupper($item->periode_month) }} {{ $item->periode_year }} - {{ \Carbon\Carbon::parse($item->closing_at)->locale('id')->isoFormat('D MMMM Y H:mm') }} @if ($item->status == 'Unassigned') {{ $item->status }} diff --git a/resources/views/backend/pages/budget_control/log.blade.php b/resources/views/backend/pages/budget_control/log.blade.php index 2e940e7..de0440b 100644 --- a/resources/views/backend/pages/budget_control/log.blade.php +++ b/resources/views/backend/pages/budget_control/log.blade.php @@ -41,7 +41,6 @@ Total Keterangan Periode - Tanggal Closing Status @@ -55,7 +54,6 @@ {{ number_format($item->amount, 0, ',', '.') }} {{ $item->remarks }} {{ strtoupper($item->periode_month) }} {{ $item->periode_year }} - {{ \Carbon\Carbon::parse($item->closing_at)->locale('id')->isoFormat('D MMMM Y H:mm') }} @if ($item->status == 'Unassigned') {{ $item->status }}