Merge branch 'branch-jagad' into 'main'
removed closing date and add it into env See merge request fiqhpratama1/xpendify!29
This commit is contained in:
Jagad Raya
@@ -75,3 +75,5 @@ NEXT_CLOUD_PATHPREFIX=""
|
||||
|
||||
WABLAS_HOST=https://bdg.wablas.com
|
||||
WABLAS_TOKEN=5iCaiP0nEgfl3lzrdsZGb9TvNYuwFZF8s4rp8AYwCx5OrYeiKXgixFMo9nDWNrJN.IF98hujz
|
||||
|
||||
CLOSING_DATE='20'
|
||||
|
||||
@@ -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',
|
||||
]);
|
||||
|
||||
|
||||
@@ -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(),
|
||||
];
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -80,10 +80,6 @@
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Remarks <span class="font-italic font-weight-normal">(optional)</span></label>
|
||||
<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>
|
||||
|
||||
|
||||
@@ -49,7 +49,6 @@
|
||||
<th>Sisa Budget Tersedia</th>
|
||||
<th>Keterangan</th>
|
||||
<th>Periode</th>
|
||||
<th>Tanggal Closing</th>
|
||||
<th>Status</th>
|
||||
<th>Aksi</th>
|
||||
</tr>
|
||||
@@ -68,7 +67,6 @@
|
||||
<td>{{ number_format(BudgetHelper::getAvailableBudget($item->cabang->id), 0, ',', '.') }}</td>
|
||||
<td>{{ $item->remarks }}</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>
|
||||
@if ($item->status == 'Unassigned')
|
||||
<span class="badge badge-warning text-white">{{ $item->status }}</span>
|
||||
|
||||
@@ -41,7 +41,6 @@
|
||||
<th>Total</th>
|
||||
<th>Keterangan</th>
|
||||
<th>Periode</th>
|
||||
<th>Tanggal Closing</th>
|
||||
<th>Status</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@@ -55,7 +54,6 @@
|
||||
<td>{{ number_format($item->amount, 0, ',', '.') }}</td>
|
||||
<td>{{ $item->remarks }}</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>
|
||||
@if ($item->status == 'Unassigned')
|
||||
<span class="badge badge-warning text-white">{{ $item->status }}</span>
|
||||
|
||||
Reference in New Issue
Block a user