itdept/expense
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed closing date and add it into env

Browse Source
This commit is contained in:
Jagad R R
2025-01-14 17:25:26 +07:00
parent cf51fa3341
commit 548e416e8e
12 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env
+2
View File
@@ -75,3 +75,5 @@ NEXT_CLOUD_PATHPREFIX=""
WABLAS_HOST=https://bdg.wablas.com WABLAS_HOST=https://bdg.wablas.com
WABLAS_TOKEN=5iCaiP0nEgfl3lzrdsZGb9TvNYuwFZF8s4rp8AYwCx5OrYeiKXgixFMo9nDWNrJN.IF98hujz WABLAS_TOKEN=5iCaiP0nEgfl3lzrdsZGb9TvNYuwFZF8s4rp8AYwCx5OrYeiKXgixFMo9nDWNrJN.IF98hujz
CLOSING_DATE='20'
app/Http/Controllers/Backend/BudgetControlController.php
+1 -2
View File
@@ -109,7 +109,6 @@ class BudgetControlController extends Controller
'periode_year' => 'required|numeric', 'periode_year' => 'required|numeric',
'amount' => 'required|numeric', 'amount' => 'required|numeric',
'remarks' => 'nullable|string', 'remarks' => 'nullable|string',
'closing_at' => 'required|date',
]); ]);
$cabang_id = Admin::find($validated['receiver_id'])->getMyCabangAndRegionId()['cabang']; $cabang_id = Admin::find($validated['receiver_id'])->getMyCabangAndRegionId()['cabang'];
@@ -121,7 +120,7 @@ class BudgetControlController extends Controller
'periode_year' => $validated['periode_year'], 'periode_year' => $validated['periode_year'],
'amount' => $validated['amount'], 'amount' => $validated['amount'],
'remarks' => $validated['remarks'], 'remarks' => $validated['remarks'],
'closing_at' => $validated['closing_at'], 'closing_at' => null,
'status' => 'Assigned', 'status' => 'Assigned',
]); ]);
app/Http/Controllers/Backend/DashboardController.php
+11 -10
View File
@@ -21,35 +21,36 @@ class DashboardController extends Controller
public function index() public function index()
{ {
$role = auth()->user()->getRoleNames()[0]; $role = auth()->user()->getRoleNames()[0];
$closing_date = env('CLOSING_DATE');
$forms = [ $forms = [
'vehicle' => FormVehicleRunningCost::whereMonth('tanggal', date('m')) 'vehicle' => FormVehicleRunningCost::whereMonth('tanggal', date('m'))
->whereYear('tanggal', date('Y')) ->whereYear('tanggal', date('Y'))
->where('tanggal', '<=', date('Y-m-20')) ->where('tanggal', '<=', date('Y-m-'.$closing_date))
->whereRaw('DAY(CURDATE()) <= 20') ->whereRaw('DAY(CURDATE()) <= '.$closing_date)
->orderBy('tanggal', 'desc') ->orderBy('tanggal', 'desc')
->get(), ->get(),
'upcountry' => FormUpCountry::whereMonth('tanggal', date('m')) 'upcountry' => FormUpCountry::whereMonth('tanggal', date('m'))
->whereYear('tanggal', date('Y')) ->whereYear('tanggal', date('Y'))
->where('tanggal', '<=', date('Y-m-20')) ->where('tanggal', '<=', date('Y-m-'.$closing_date))
->whereRaw('DAY(CURDATE()) <= 20') ->whereRaw('DAY(CURDATE()) <= '.$closing_date)
->orderBy('tanggal', 'desc') ->orderBy('tanggal', 'desc')
->get(), ->get(),
'entertainment' => FormEntertaimentPresentation::whereMonth('tanggal', date('m')) 'entertainment' => FormEntertaimentPresentation::whereMonth('tanggal', date('m'))
->whereYear('tanggal', date('Y')) ->whereYear('tanggal', date('Y'))
->where('tanggal', '<=', date('Y-m-20')) ->where('tanggal', '<=', date('Y-m-'.$closing_date))
->whereRaw('DAY(CURDATE()) <= 20') ->whereRaw('DAY(CURDATE()) <= '.$closing_date)
->orderBy('tanggal', 'desc') ->orderBy('tanggal', 'desc')
->get(), ->get(),
'meeting' => FormMeetingSeminar::whereMonth('created_at', date('m')) 'meeting' => FormMeetingSeminar::whereMonth('created_at', date('m'))
->whereYear('created_at', date('Y')) ->whereYear('created_at', date('Y'))
->where('created_at', '<=', date('Y-m-20')) ->where('created_at', '<=', date('Y-m-'.$closing_date))
->whereRaw('DAY(CURDATE()) <= 20') ->whereRaw('DAY(CURDATE()) <= '.$closing_date)
->orderBy('created_at', 'desc') ->orderBy('created_at', 'desc')
->get(), ->get(),
'others' => FormOthers::whereMonth('tanggal', date('m')) 'others' => FormOthers::whereMonth('tanggal', date('m'))
->whereYear('tanggal', date('Y')) ->whereYear('tanggal', date('Y'))
->where('tanggal', '<=', date('Y-m-20')) ->where('tanggal', '<=', date('Y-m-'.$closing_date))
->whereRaw('DAY(CURDATE()) <= 20') ->whereRaw('DAY(CURDATE()) <= '.$closing_date)
->orderBy('tanggal', 'desc') ->orderBy('tanggal', 'desc')
->get(), ->get(),
]; ];
app/Http/Controllers/Forms/FormEntertainmentPresentationController.php
+2 -2
View File
@@ -34,8 +34,8 @@ class FormEntertainmentPresentationController extends Controller
$role = auth()->user()->getRoleNames()[0]; $role = auth()->user()->getRoleNames()[0];
$forms = FormEntertaimentPresentation::whereMonth('tanggal', date('m')) $forms = FormEntertaimentPresentation::whereMonth('tanggal', date('m'))
->whereYear('tanggal', date('Y')) ->whereYear('tanggal', date('Y'))
->where('tanggal', '<=', date('Y-m-20')) ->where('tanggal', '<=', date('Y-m-' . env('CLOSING_DATE')))
->whereRaw('DAY(CURDATE()) <= 20') ->whereRaw('DAY(CURDATE()) <= ' . env('CLOSING_DATE'))
->orderBy('tanggal', 'desc') ->orderBy('tanggal', 'desc')
->get(); ->get();
app/Http/Controllers/Forms/FormMeetingSeminarController.php
+2 -2
View File
@@ -34,8 +34,8 @@ class FormMeetingSeminarController extends Controller
$role = auth()->user()->getRoleNames()[0]; $role = auth()->user()->getRoleNames()[0];
$forms = FormMeetingSeminar::whereMonth('created_at', date('m')) $forms = FormMeetingSeminar::whereMonth('created_at', date('m'))
->whereYear('created_at', date('Y')) ->whereYear('created_at', date('Y'))
->where('created_at', '<=', date('Y-m-20')) ->where('created_at', '<=', date('Y-m-' . env('CLOSING_DATE')))
->whereRaw('DAY(CURDATE()) <= 20') ->whereRaw('DAY(CURDATE()) <= ' . env('CLOSING_DATE'))
->orderBy('created_at', 'desc') ->orderBy('created_at', 'desc')
->get(); ->get();
app/Http/Controllers/Forms/FormOtherController.php
+2 -2
View File
@@ -34,8 +34,8 @@ class FormOtherController extends Controller
$role = auth()->user()->getRoleNames()[0]; $role = auth()->user()->getRoleNames()[0];
$forms = FormOthers::whereMonth('tanggal', date('m')) $forms = FormOthers::whereMonth('tanggal', date('m'))
->whereYear('tanggal', date('Y')) ->whereYear('tanggal', date('Y'))
->where('tanggal', '<=', date('Y-m-20')) ->where('tanggal', '<=', date('Y-m-' . env('CLOSING_DATE')))
->whereRaw('DAY(CURDATE()) <= 20') ->whereRaw('DAY(CURDATE()) <= ' . env('CLOSING_DATE'))
->orderBy('tanggal', 'desc') ->orderBy('tanggal', 'desc')
->get(); ->get();
app/Http/Controllers/Forms/FormUpCountryController.php
+2 -2
View File
@@ -34,8 +34,8 @@ class FormUpCountryController extends Controller
$role = auth()->user()->getRoleNames()[0]; $role = auth()->user()->getRoleNames()[0];
$forms = FormUpCountry::whereMonth('tanggal', date('m')) $forms = FormUpCountry::whereMonth('tanggal', date('m'))
->whereYear('tanggal', date('Y')) ->whereYear('tanggal', date('Y'))
->where('tanggal', '<=', date('Y-m-20')) ->where('tanggal', '<=', date('Y-m-' . env('CLOSING_DATE')))
->whereRaw('DAY(CURDATE()) <= 20') ->whereRaw('DAY(CURDATE()) <= ' . env('CLOSING_DATE'))
->orderBy('tanggal', 'desc') ->orderBy('tanggal', 'desc')
->get(); ->get();
app/Http/Controllers/Forms/FormVehicleController.php
+2 -2
View File
@@ -34,8 +34,8 @@ class FormVehicleController extends Controller
$role = auth()->user()->getRoleNames()[0]; $role = auth()->user()->getRoleNames()[0];
$forms = FormVehicleRunningCost::whereMonth('tanggal', date('m')) $forms = FormVehicleRunningCost::whereMonth('tanggal', date('m'))
->whereYear('tanggal', date('Y')) ->whereYear('tanggal', date('Y'))
->where('tanggal', '<=', date('Y-m-20')) ->where('tanggal', '<=', date('Y-m-' . env('CLOSING_DATE')))
->whereRaw('DAY(CURDATE()) <= 20') ->whereRaw('DAY(CURDATE()) <= ' . env('CLOSING_DATE'))
->orderBy('tanggal', 'desc') ->orderBy('tanggal', 'desc')
->get(); ->get();
resources/views/backend/pages/budget_control/create.blade.php
-4
View File
@@ -80,10 +80,6 @@
<div class="mb-3"> <div class="mb-3">
<label class="form-label">Remarks <span class="font-italic font-weight-normal">(optional)</span></label> <label class="form-label">Remarks <span class="font-italic font-weight-normal">(optional)</span></label>
<textarea class="form-control" name="remarks">{{ old('remarks') }}</textarea> <textarea class="form-control" name="remarks">{{ old('remarks') }}</textarea>
</div>
<div class="mb-3">
<label class="form-label">Tanggal Closing <span class="font-italic font-weight-normal">(required)</span></label>
<input type="datetime-local" class="form-control" name="closing_at" id="closing_at" required value="{{ old('closing_at') }}">
</div> </div>
</div> </div>
resources/views/backend/pages/budget_control/edit.blade.php
View File
resources/views/backend/pages/budget_control/index.blade.php
-2
View File
@@ -49,7 +49,6 @@
<th>Sisa Budget Tersedia</th> <th>Sisa Budget Tersedia</th>
<th>Keterangan</th> <th>Keterangan</th>
<th>Periode</th> <th>Periode</th>
<th>Tanggal Closing</th>
<th>Status</th> <th>Status</th>
<th>Aksi</th> <th>Aksi</th>
</tr> </tr>
@@ -68,7 +67,6 @@
<td>{{ number_format(BudgetHelper::getAvailableBudget($item->cabang->id), 0, ',', '.') }}</td> <td>{{ number_format(BudgetHelper::getAvailableBudget($item->cabang->id), 0, ',', '.') }}</td>
<td>{{ $item->remarks }}</td> <td>{{ $item->remarks }}</td>
<td>{{ strtoupper($item->periode_month) }} {{ $item->periode_year }}</td> <td>{{ strtoupper($item->periode_month) }} {{ $item->periode_year }}</td>
<td>{{ \Carbon\Carbon::parse($item->closing_at)->locale('id')->isoFormat('D MMMM Y H:mm') }}</td>
<td> <td>
@if ($item->status == 'Unassigned') @if ($item->status == 'Unassigned')
<span class="badge badge-warning text-white">{{ $item->status }}</span> <span class="badge badge-warning text-white">{{ $item->status }}</span>
resources/views/backend/pages/budget_control/log.blade.php
-2
View File
@@ -41,7 +41,6 @@
<th>Total</th> <th>Total</th>
<th>Keterangan</th> <th>Keterangan</th>
<th>Periode</th> <th>Periode</th>
<th>Tanggal Closing</th>
<th>Status</th> <th>Status</th>
</tr> </tr>
</thead> </thead>
@@ -55,7 +54,6 @@
<td>{{ number_format($item->amount, 0, ',', '.') }}</td> <td>{{ number_format($item->amount, 0, ',', '.') }}</td>
<td>{{ $item->remarks }}</td> <td>{{ $item->remarks }}</td>
<td>{{ strtoupper($item->periode_month) }} {{ $item->periode_year }}</td> <td>{{ strtoupper($item->periode_month) }} {{ $item->periode_year }}</td>
<td>{{ \Carbon\Carbon::parse($item->closing_at)->locale('id')->isoFormat('D MMMM Y H:mm') }}</td>
<td> <td>
@if ($item->status == 'Unassigned') @if ($item->status == 'Unassigned')
<span class="badge badge-warning text-white">{{ $item->status }}</span> <span class="badge badge-warning text-white">{{ $item->status }}</span>