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

insyaallah revisi done

Browse Source
This commit is contained in:
Jagad R R
2025-01-23 17:46:38 +07:00
parent 6034c331c5
commit 3a01df56e9
32 changed files with 825 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/backend/pages/admins/create.blade.php
+70 -6
View File
@@ -91,16 +91,28 @@
</div>
<div class="form-group col-md-6 col-sm-6">
<label for="cabang_id">Cabang</label>
<select name="cabang_id" id="cabang_id" class="form-control">
<option value="">Select Cabang</option>
@foreach ($cabangs as $cabang)
<option value="{{ $cabang->id }}" {{ old('cabang') == $cabang->id ? 'selected' : '' }}>
{{ $cabang->name }}
<label for="region_id">Region</label>
<select name="region_id" id="region_id" class="form-control">
<option value="">Select Region</option>
@foreach ($regions as $item)
<option value="{{ $item->id }}" {{ old('region_id') == $item->id ? 'selected' : '' }}>
{{ $item->name }}
</option>
@endforeach
</select>
</div>
<div class="form-group col-md-6 col-sm-6">
<label for="cabang_id">Cabang</label>
<select name="cabang_id" id="cabang_id" class="form-control"></select>
</select>
</div>
<div class="form-group col-md-6 col-sm-6">
<label for="rayon_id">Rayon</label>
<select name="rayon_id" id="rayon_id" class="form-control">
</select>
</div>
</div>
<button type="submit" class="btn btn-primary mt-4 pr-4 pl-4">Save</button>
@@ -122,4 +134,56 @@
})
</script>
<script>
$(document).ready(function() {
$('#region_id').on('change', function() {
var region_id = $(this).val();
if (region_id) {
$.ajax({
url: '/api/cabang-by-regionId/' + region_id,
type: 'GET',
dataType: 'json',
success: function(data) {
console.log(data);
$('#cabang_id').empty();
$('#cabang_id').append(
'<option value="">Select Cabang</option>');
$.each(data, function(key, value) {
$('#cabang_id').append('<option value="' + value.id + '">' +
value.name + '</option>');
});
}
});
} else {
$('#cabang_id').empty();
}
});
// cabang_id on change call /api/rayon-by-cabang/
$('#cabang_id').on('change', function() {
var cabang_id = $(this).val();
if (cabang_id) {
$.ajax({
url: '/api/rayon-by-cabangId/' + cabang_id,
type: 'GET',
dataType: 'json',
success: function(data) {
console.log(data);
$('#rayon_id').empty();
$('#rayon_id').append(
'<option value="">Select Rayon</option>');
$.each(data, function(key, value) {
$('#rayon_id').append('<option value="' + value.id + '">' +
value.name + '</option>');
});
}
});
} else {
$('#rayon_id').empty();
}
});
});
</script>
@endsection
resources/views/backend/pages/admins/edit.blade.php
+70 -6
View File
@@ -94,16 +94,28 @@
</div>
<div class="form-group col-md-6 col-sm-6">
<label for="cabang_id">Cabang</label>
<select name="cabang_id" id="cabang_id" class="form-control">
<option value="">Select Cabang</option>
@foreach ($cabangs as $cabang)
<option value="{{ $cabang->id }}" {{ $admin->getMyCabangAndRegion()['cabang'] == $cabang->name ? 'selected' : '' }}>
{{ $cabang->name }}
<label for="region_id">Region</label>
<select name="region_id" id="region_id" class="form-control">
<option value="">Select Region</option>
@foreach ($regions as $item)
<option value="{{ $item->id }}" {{ old('region_id') == $item->id ? 'selected' : '' }}>
{{ $item->name }}
</option>
@endforeach
</select>
</div>
<div class="form-group col-md-6 col-sm-6">
<label for="cabang_id">Cabang</label>
<select name="cabang_id" id="cabang_id" class="form-control"></select>
</select>
</div>
<div class="form-group col-md-6 col-sm-6">
<label for="rayon_id">Rayon</label>
<select name="rayon_id" id="rayon_id" class="form-control">
</select>
</div>
</div>
<button type="submit" class="btn btn-primary mt-4 pr-4 pl-4">Save</button>
@@ -125,4 +137,56 @@
})
</script>
<script>
$(document).ready(function() {
$('#region_id').on('change', function() {
var region_id = $(this).val();
if (region_id) {
$.ajax({
url: '/api/cabang-by-regionId/' + region_id,
type: 'GET',
dataType: 'json',
success: function(data) {
console.log(data);
$('#cabang_id').empty();
$('#cabang_id').append(
'<option value="">Select Cabang</option>');
$.each(data, function(key, value) {
$('#cabang_id').append('<option value="' + value.id + '">' +
value.name + '</option>');
});
}
});
} else {
$('#cabang_id').empty();
}
});
// cabang_id on change call /api/rayon-by-cabang/
$('#cabang_id').on('change', function() {
var cabang_id = $(this).val();
if (cabang_id) {
$.ajax({
url: '/api/rayon-by-cabangId/' + cabang_id,
type: 'GET',
dataType: 'json',
success: function(data) {
console.log(data);
$('#rayon_id').empty();
$('#rayon_id').append(
'<option value="">Select Rayon</option>');
$.each(data, function(key, value) {
$('#rayon_id').append('<option value="' + value.id + '">' +
value.name + '</option>');
});
}
});
} else {
$('#rayon_id').empty();
}
});
});
</script>
@endsection
resources/views/backend/pages/admins/index.blade.php
+4 -2
View File
@@ -50,6 +50,7 @@
<th width="20%">{{ __('Roles') }}</th>
<th width="5%">Region</th>
<th width="5%">Cabang</th>
<th width="5%">Rayon</th>
<th width="15%">{{ __('Action') }}</th>
</tr>
</thead>
@@ -66,8 +67,9 @@
</span>
@endforeach
</td>
<td>{{ $admin->region->cabang->region->name ?? '' }}</td>
<td>{{ $admin->cabang->cabang->name ?? '' }}</td>
<td>{{ $admin->getRegion->name ?? '-' }}</td>
<td>{{ $admin->cabang->cabang->name ?? '-' }}</td>
<td>{{ $admin->getRayon->name ?? '-' }}</td>
<td>
<a class="btn btn-success text-white" href="{{ route('admin.admins.expense', $admin->id) }}">View Expense</a>
@if (auth()->user()->can('admin.edit'))
resources/views/backend/pages/budget_control/index.blade.php
+26 -2
View File
@@ -105,8 +105,32 @@
if ($('#dataTable').length) {
$('#dataTable').DataTable({
responsive: false,
dom: 'Bfrtip',
buttons: ['excel', 'pdf', 'print']
dom: 'Blfrtip',
lengthMenu: [ [10, 50, 100, -1], [10, 50, 100, "All"] ], // Control the entries dropdown
buttons: [
{
extend: 'excel',
text: 'Excel'
},
{
extend: 'pdf',
text: 'PDF',
orientation: 'landscape',
pageSize: 'A4',
exportOptions: {
columns: ':visible'
}
},
{
extend: 'print',
text: 'Print',
orientation: 'landscape',
exportOptions: {
columns: ':visible'
}
},
'colvis'
]
});
}
});
resources/views/backend/pages/forms/entertainment/index.blade.php
+7 -7
View File
@@ -164,7 +164,7 @@
@if ($item->status == 'On Progress')
<form action="javascript:void(0);" class="d-inline">
<button type="button"
class="btn btn-success btn-sm open-approve-modal"
class="btn btn-success btn-sm final-approve-modal"
data-id="{{ route('forms.entertainment.approve', $item->id) }}">
Approve 1
</button>
@@ -180,7 +180,7 @@
@endif
@endif
@if ($item->approved_at)
{{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
{{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y HH:mm') }}
@endif
</td>
@endif
@@ -207,7 +207,7 @@
@endif
@endif
@if ($item->approved2_at)
{{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
{{ \Carbon\Carbon::parse($item->approved2_at)->locale('id')->isoFormat('D MMMM Y HH:mm') }}
@endif
</td>
@endif
@@ -218,7 +218,7 @@
@if ($item->status == 'Approved 2' && $item->approved2_at && !$item->final_approved_at)
<form action="javascript:void(0);" class="d-inline">
<button type="button"
class="btn btn-success btn-sm final-approve-modal"
class="btn btn-success btn-sm open-approve-modal"
data-id="{{ route('forms.entertainment.final-approve', $item->id) }}">
Final Approve
</button>
@@ -236,7 +236,7 @@
@endif
@endif
@if ($item->final_approved_at)
{{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
{{ \Carbon\Carbon::parse($item->final_approved_at)->locale('id')->isoFormat('D MMMM Y HH:mm') }}
@endif
</td>
@endif
@@ -464,7 +464,7 @@
$('#approveModal').modal('show'); // Show the modal
// Get detail from /forms/entertainment/detail/{id}
$.get(approveUrl.replace(/approve(2)?/, 'detail'), function (data) {
$.get(approveUrl.replace(/approve2|final-approve/g, 'detail'), function (data) {
const formatter = new Intl.NumberFormat('id-ID', {
style: 'currency',
currency: 'IDR',
@@ -513,7 +513,7 @@
$('#finalApproveModal').modal('show'); // Show the modal
// Get detail from /forms/entertainment/detail/{id}
$.get(approveUrl.replace('final-approve', 'detail'), function (data) {
$.get(approveUrl.replace('approve', 'detail'), function (data) {
console.log(data);
const formatter = new Intl.NumberFormat('id-ID', {
style: 'currency',
resources/views/backend/pages/forms/meeting/index.blade.php
+7 -7
View File
@@ -154,7 +154,7 @@
@if ($item->status == 'On Progress')
<form action="javascript:void(0);" class="d-inline">
<button type="button"
class="btn btn-success btn-sm open-approve-modal"
class="btn btn-success btn-sm final-approve-modal"
data-id="{{ route('forms.meeting.approve', $item->id) }}">
Approve 1
</button>
@@ -170,7 +170,7 @@
@endif
@endif
@if ($item->approved_at)
{{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
{{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y HH:mm') }}
@endif
</td>
@endif
@@ -197,7 +197,7 @@
@endif
@endif
@if ($item->approved2_at)
{{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
{{ \Carbon\Carbon::parse($item->approved2_at)->locale('id')->isoFormat('D MMMM Y HH:mm') }}
@endif
</td>
@endif
@@ -208,7 +208,7 @@
@if ($item->status == 'Approved 2' && $item->approved2_at && !$item->final_approved_at)
<form action="javascript:void(0);" class="d-inline">
<button type="button"
class="btn btn-success btn-sm final-approve-modal"
class="btn btn-success btn-sm open-approve-modal"
data-id="{{ route('forms.meeting.final-approve', $item->id) }}">
Final Approve
</button>
@@ -226,7 +226,7 @@
@endif
@endif
@if ($item->final_approved_at)
{{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
{{ \Carbon\Carbon::parse($item->final_approved_at)->locale('id')->isoFormat('D MMMM Y HH:mm') }}
@endif
</td>
@endif
@@ -476,7 +476,7 @@
$('#approveModal').modal('show'); // Show the modal
// Get detail from /forms/meeting/detail/{id}
$.get(approveUrl.replace(/approve(2)?/, 'detail'), function (data) {
$.get(approveUrl.replace(/approve2|final-approve/g, 'detail'), function (data) {
const formatter = new Intl.NumberFormat('id-ID', {
style: 'currency',
currency: 'IDR',
@@ -524,7 +524,7 @@
$('#finalApproveModal').modal('show'); // Show the modal
// Get detail from /forms/meeting/detail/{id}
$.get(approveUrl.replace('final-approve', 'detail'), function (data) {
$.get(approveUrl.replace('approve', 'detail'), function (data) {
console.log(data);
const formatter = new Intl.NumberFormat('id-ID', {
style: 'currency',
resources/views/backend/pages/forms/other/index.blade.php
+7 -7
View File
@@ -162,7 +162,7 @@
@if ($item->status == 'On Progress')
<form action="javascript:void(0);" class="d-inline">
<button type="button"
class="btn btn-success btn-sm open-approve-modal"
class="btn btn-success btn-sm final-approve-modal"
data-id="{{ route('forms.other.approve', $item->id) }}">
Approve 1
</button>
@@ -178,7 +178,7 @@
@endif
@endif
@if ($item->approved_at)
{{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
{{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y HH:mm') }}
@endif
</td>
@endif
@@ -205,7 +205,7 @@
@endif
@endif
@if ($item->approved2_at)
{{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
{{ \Carbon\Carbon::parse($item->approved2_at)->locale('id')->isoFormat('D MMMM Y HH:mm') }}
@endif
</td>
@endif
@@ -216,7 +216,7 @@
@if ($item->status == 'Approved 2' && $item->approved2_at && !$item->final_approved_at)
<form action="javascript:void(0);" class="d-inline">
<button type="button"
class="btn btn-success btn-sm final-approve-modal"
class="btn btn-success btn-sm open-approve-modal"
data-id="{{ route('forms.other.final-approve', $item->id) }}">
Final Approve
</button>
@@ -234,7 +234,7 @@
@endif
@endif
@if ($item->final_approved_at)
{{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
{{ \Carbon\Carbon::parse($item->final_approved_at)->locale('id')->isoFormat('D MMMM Y HH:mm') }}
@endif
</td>
@endif
@@ -450,7 +450,7 @@
$('#approveModal').modal('show'); // Show the modal
// Get detail from /forms/vehicle/detail/{id}
$.get(approveUrl.replace(/approve(2)?/, 'detail'), function (data) {
$.get(approveUrl.replace(/approve2|final-approve/g, 'detail'), function (data) {
const formatter = new Intl.NumberFormat('id-ID', {
style: 'currency',
currency: 'IDR',
@@ -497,7 +497,7 @@
$('#finalApproveModal').modal('show'); // Show the modal
// Get detail from /forms/vehicle/detail/{id}
$.get(approveUrl.replace('final-approve', 'detail'), function (data) {
$.get(approveUrl.replace('approve', 'detail'), function (data) {
console.log(data);
const formatter = new Intl.NumberFormat('id-ID', {
style: 'currency',
resources/views/backend/pages/forms/upcountry/index.blade.php
+9 -7
View File
@@ -160,7 +160,7 @@
@if ($item->status == 'On Progress')
<form action="javascript:void(0);" class="d-inline">
<button type="button"
class="btn btn-success btn-sm open-approve-modal"
class="btn btn-success btn-sm final-approve-modal"
data-id="{{ route('forms.up-country.approve', $item->id) }}">
Approve 1
</button>
@@ -176,7 +176,7 @@
@endif
@endif
@if ($item->approved_at)
{{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
{{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y HH:mm') }}
@endif
</td>
@endif
@@ -203,7 +203,7 @@
@endif
@endif
@if ($item->approved2_at)
{{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
{{ \Carbon\Carbon::parse($item->approved2_at)->locale('id')->isoFormat('D MMMM Y HH:mm') }}
@endif
</td>
@endif
@@ -214,7 +214,7 @@
@if ($item->status == 'Approved 2' && $item->approved2_at && !$item->final_approved_at)
<form action="javascript:void(0);" class="d-inline">
<button type="button"
class="btn btn-success btn-sm final-approve-modal"
class="btn btn-success btn-sm open-approve-modal"
data-id="{{ route('forms.up-country.final-approve', $item->id) }}">
Final Approve
</button>
@@ -232,7 +232,7 @@
@endif
@endif
@if ($item->final_approved_at)
{{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
{{ \Carbon\Carbon::parse($item->final_approved_at)->locale('id')->isoFormat('D MMMM Y HH:mm') }}
@endif
</td>
@endif
@@ -517,7 +517,9 @@
$('#approveModal').modal('show'); // Show the modal
// Get detail from /forms/up-country/detail/{id}
$.get(approveUrl.replace(/approve(2)?/, 'detail'), function (data) {
// replace '/approve2' or '/final-approve' with '/detail'
$.get(approveUrl.replace(/approve2|final-approve/g, 'detail'), function (data) {
const formatter = new Intl.NumberFormat('id-ID', {
style: 'currency',
currency: 'IDR',
@@ -570,7 +572,7 @@
$('#finalApproveModal').modal('show'); // Show the modal
// Get detail from /forms/up-country/detail/{id}
$.get(approveUrl.replace('final-approve', 'detail'), function (data) {
$.get(approveUrl.replace('approve', 'detail'), function (data) {
console.log(data);
const formatter = new Intl.NumberFormat('id-ID', {
style: 'currency',
resources/views/backend/pages/forms/vehicle/index.blade.php
+7 -7
View File
@@ -166,7 +166,7 @@
@if ($item->status == 'On Progress')
<form action="javascript:void(0);" class="d-inline">
<button type="button"
class="btn btn-success btn-sm open-approve-modal"
class="btn btn-success btn-sm final-approve-modal"
data-id="{{ route('forms.vehicle.approve', $item->id) }}">
Approve 1
</button>
@@ -182,7 +182,7 @@
@endif
@endif
@if ($item->approved_at)
{{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
{{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y HH:mm') }}
@endif
</td>
@endif
@@ -209,7 +209,7 @@
@endif
@endif
@if ($item->approved2_at)
{{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
{{ \Carbon\Carbon::parse($item->approved2_at)->locale('id')->isoFormat('D MMMM Y HH:mm') }}
@endif
</td>
@endif
@@ -220,7 +220,7 @@
@if ($item->status == 'Approved 2' && $item->approved2_at && !$item->final_approved_at)
<form action="javascript:void(0);" class="d-inline">
<button type="button"
class="btn btn-success btn-sm final-approve-modal"
class="btn btn-success btn-sm open-approve-modal"
data-id="{{ route('forms.vehicle.final-approve', $item->id) }}">
Final Approve
</button>
@@ -238,7 +238,7 @@
@endif
@endif
@if ($item->final_approved_at)
{{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
{{ \Carbon\Carbon::parse($item->final_approved_at)->locale('id')->isoFormat('D MMMM Y HH:mm') }}
@endif
</td>
@endif
@@ -472,7 +472,7 @@
$('#approveModal').modal('show'); // Show the modal
// Get detail from /forms/vehicle/detail/{id}
$.get(approveUrl.replace(/approve(2)?/, 'detail'), function (data) {
$.get(approveUrl.replace(/approve2|final-approve/g, 'detail'), function (data) {
const formatter = new Intl.NumberFormat('id-ID', {
style: 'currency',
currency: 'IDR',
@@ -521,7 +521,7 @@
$('#finalApproveModal').modal('show'); // Show the modal
// Get detail from /forms/vehicle/detail/{id}
$.get(approveUrl.replace('final-approve', 'detail'), function (data) {
$.get(approveUrl.replace('approve', 'detail'), function (data) {
console.log(data);
const formatter = new Intl.NumberFormat('id-ID', {
style: 'currency',
resources/views/backend/pages/report/all.blade.php
+3 -2
View File
@@ -141,7 +141,8 @@
<select name="status" id="status" class="form-control">
<option value="">Semua Status</option>
<option value="On Progress" {{ request()->status == 'On Progress' ? 'selected' : '' }}>On Progress</option>
<option value="Approved" {{ request()->status == 'Approved' ? 'selected' : '' }}>Approved</option>
<option value="Approved 1" {{ request()->status == 'Approved 1' ? 'selected' : '' }}>Approved 1</option>
<option value="Approved 2" {{ request()->status == 'Approved 2' ? 'selected' : '' }}>Approved 2</option>
<option value="Closed" {{ request()->status == 'Closed' ? 'selected' : '' }}>Closed</option>
<option value="Rejected" {{ request()->status == 'Rejected' ? 'selected' : '' }}>Rejected</option>
</select>
@@ -209,7 +210,7 @@
<td>
@if ($item->status == 'On Progress')
<span class="badge badge-warning text-white">{{ $item->status }}</span>
@elseif ($item->status == 'Approved' || $item->status == 'Final Approved')
@elseif ($item->status == 'Approved 1' || $item->status == 'Approved 2' || $item->status == 'Final Approved')
<span class="badge badge-success text-white">{{ $item->status }}</span>
@else
<span class="badge badge-danger text-white">{{ $item->status }}</span>
resources/views/backend/pages/report/entertainment.blade.php
+3 -2
View File
@@ -64,7 +64,8 @@
<select name="status" id="status" class="form-control">
<option value="">Semua Status</option>
<option value="On Progress" {{ request()->status == 'On Progress' ? 'selected' : '' }}>On Progress</option>
<option value="Approved" {{ request()->status == 'Approved' ? 'selected' : '' }}>Approved</option>
<option value="Approved 1" {{ request()->status == 'Approved 1' ? 'selected' : '' }}>Approved 1</option>
<option value="Approved 2" {{ request()->status == 'Approved 2' ? 'selected' : '' }}>Approved 2</option>
<option value="Closed" {{ request()->status == 'Closed' ? 'selected' : '' }}>Closed</option>
<option value="Rejected" {{ request()->status == 'Rejected' ? 'selected' : '' }}>Rejected</option>
</select>
@@ -147,7 +148,7 @@
<td>
@if ($item->status == 'On Progress')
<span class="badge badge-warning text-white">{{ $item->status }}</span>
@elseif ($item->status == 'Approved' || $item->status == 'Final Approved')
@elseif ($item->status == 'Approved 1' || $item->status == 'Approved 2' || $item->status == 'Final Approved')
<span class="badge badge-success text-white">{{ $item->status }}</span>
@else
<span class="badge badge-danger text-white">{{ $item->status }}</span>
resources/views/backend/pages/report/meeting.blade.php
+3 -2
View File
@@ -64,7 +64,8 @@
<select name="status" id="status" class="form-control">
<option value="">Semua Status</option>
<option value="On Progress" {{ request()->status == 'On Progress' ? 'selected' : '' }}>On Progress</option>
<option value="Approved" {{ request()->status == 'Approved' ? 'selected' : '' }}>Approved</option>
<option value="Approved 1" {{ request()->status == 'Approved 1' ? 'selected' : '' }}>Approved 1</option>
<option value="Approved 2" {{ request()->status == 'Approved 2' ? 'selected' : '' }}>Approved 2</option>
<option value="Closed" {{ request()->status == 'Closed' ? 'selected' : '' }}>Closed</option>
<option value="Rejected" {{ request()->status == 'Rejected' ? 'selected' : '' }}>Rejected</option>
</select>
@@ -137,7 +138,7 @@
<td>
@if ($item->status == 'On Progress')
<span class="badge badge-warning text-white">{{ $item->status }}</span>
@elseif ($item->status == 'Approved' || $item->status == 'Final Approved')
@elseif ($item->status == 'Approved 1' || $item->status == 'Approved 2' || $item->status == 'Final Approved')
<span class="badge badge-success text-white">{{ $item->status }}</span>
@else
<span class="badge badge-danger text-white">{{ $item->status }}</span>
resources/views/backend/pages/report/others.blade.php
+3 -2
View File
@@ -64,7 +64,8 @@
<select name="status" id="status" class="form-control">
<option value="">Semua Status</option>
<option value="On Progress" {{ request()->status == 'On Progress' ? 'selected' : '' }}>On Progress</option>
<option value="Approved" {{ request()->status == 'Approved' ? 'selected' : '' }}>Approved</option>
<option value="Approved 1" {{ request()->status == 'Approved 1' ? 'selected' : '' }}>Approved 1</option>
<option value="Approved 2" {{ request()->status == 'Approved 2' ? 'selected' : '' }}>Approved 2</option>
<option value="Closed" {{ request()->status == 'Closed' ? 'selected' : '' }}>Closed</option>
<option value="Rejected" {{ request()->status == 'Rejected' ? 'selected' : '' }}>Rejected</option>
</select>
@@ -145,7 +146,7 @@
<td>
@if ($item->status == 'On Progress')
<span class="badge badge-warning text-white">{{ $item->status }}</span>
@elseif ($item->status == 'Approved' || $item->status == 'Final Approved')
@elseif ($item->status == 'Approved 1' || $item->status == 'Approved 2' || $item->status == 'Final Approved')
<span class="badge badge-success text-white">{{ $item->status }}</span>
@else
<span class="badge badge-danger text-white">{{ $item->status }}</span>
resources/views/backend/pages/report/upcountry.blade.php
+3 -3
View File
@@ -42,7 +42,6 @@
<label for="cabang">Pilih Cabang</label>
<select name="cabang" id="cabang" class="form-control">
<option value="">Semua Cabang</option>
<!-- Cabang options will be dynamically populated -->
</select>
</div>
</div>
@@ -64,7 +63,8 @@
<select name="status" id="status" class="form-control">
<option value="">Semua Status</option>
<option value="On Progress" {{ request()->status == 'On Progress' ? 'selected' : '' }}>On Progress</option>
<option value="Approved" {{ request()->status == 'Approved' ? 'selected' : '' }}>Approved</option>
<option value="Approved 1" {{ request()->status == 'Approved 1' ? 'selected' : '' }}>Approved 1</option>
<option value="Approved 2" {{ request()->status == 'Approved 2' ? 'selected' : '' }}>Approved 2</option>
<option value="Closed" {{ request()->status == 'Closed' ? 'selected' : '' }}>Closed</option>
<option value="Rejected" {{ request()->status == 'Rejected' ? 'selected' : '' }}>Rejected</option>
</select>
@@ -143,7 +143,7 @@
<td>
@if ($item->status == 'On Progress')
<span class="badge badge-warning text-white">{{ $item->status }}</span>
@elseif ($item->status == 'Approved' || $item->status == 'Final Approved')
@elseif ($item->status == 'Approved 1' || $item->status == 'Approved 2' || $item->status == 'Final Approved')
<span class="badge badge-success text-white">{{ $item->status }}</span>
@else
<span class="badge badge-danger text-white">{{ $item->status }}</span>
resources/views/backend/pages/report/vehicle.blade.php
+3 -2
View File
@@ -64,7 +64,8 @@
<select name="status" id="status" class="form-control">
<option value="">Semua Status</option>
<option value="On Progress" {{ request()->status == 'On Progress' ? 'selected' : '' }}>On Progress</option>
<option value="Approved" {{ request()->status == 'Approved' ? 'selected' : '' }}>Approved</option>
<option value="Approved 1" {{ request()->status == 'Approved 1' ? 'selected' : '' }}>Approved 1</option>
<option value="Approved 2" {{ request()->status == 'Approved 2' ? 'selected' : '' }}>Approved 2</option>
<option value="Closed" {{ request()->status == 'Closed' ? 'selected' : '' }}>Closed</option>
<option value="Rejected" {{ request()->status == 'Rejected' ? 'selected' : '' }}>Rejected</option>
</select>
@@ -149,7 +150,7 @@
<td>
@if ($item->status == 'On Progress')
<span class="badge badge-warning text-white">{{ $item->status }}</span>
@elseif ($item->status == 'Approved' || $item->status == 'Final Approved')
@elseif ($item->status == 'Approved 1' || $item->status == 'Approved 2' || $item->status == 'Final Approved')
<span class="badge badge-success text-white">{{ $item->status }}</span>
@else
<span class="badge badge-danger text-white">{{ $item->status }}</span>