feat(webstatement): update print statement functionalities
- Menambahkan kolom `remarks` pada tabel print_statement_logs untuk menyimpan catatan tambahan. - Mengubah validasi periode pada `PrintStatementRequest` untuk mencegah request duplikasi periode. - Memperbaiki tampilan di `statements.index` dan `statements.show` agar lebih responsif dan informatif. - Mengubah logika download statement untuk mendukung file range periode dalam format zip. - Menambahkan logika cek file statement berdasarkan ketersediaan file di storage SFTP. - Menghapus file legacy `create.blade.php` yang tidak lagi digunakan. - Menyesuaikan ikon menu dari `calendar` ke `printer` agar lebih relevan. Signed-off-by: Daeng Deni Mardaeni <ddeni05@gmail.com>
This commit is contained in:
Daeng Deni Mardaeni
@@ -1,38 +0,0 @@
|
||||
@extends('layouts.main')
|
||||
|
||||
@section('breadcrumbs')
|
||||
|
||||
@endsection
|
||||
|
||||
@section('content')
|
||||
|
||||
@endsection
|
||||
|
||||
@push('scripts')
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
// Validate that end date is after start date
|
||||
const startDateInput = document.getElementById('start_date');
|
||||
const endDateInput = document.getElementById('end_date');
|
||||
|
||||
function validateDates() {
|
||||
const startDate = new Date(startDateInput.value);
|
||||
const endDate = new Date(endDateInput.value);
|
||||
|
||||
if (startDate > endDate) {
|
||||
endDateInput.setCustomValidity('End date must be after start date');
|
||||
} else {
|
||||
endDateInput.setCustomValidity('');
|
||||
}
|
||||
}
|
||||
|
||||
startDateInput.addEventListener('change', validateDates);
|
||||
endDateInput.addEventListener('change', validateDates);
|
||||
|
||||
// Set max date for date inputs to today
|
||||
const today = new Date().toISOString().split('T')[0];
|
||||
startDateInput.setAttribute('max', today);
|
||||
endDateInput.setAttribute('max', today);
|
||||
});
|
||||
</script>
|
||||
@endpush
|
||||
@@ -5,15 +5,10 @@
|
||||
@endsection
|
||||
|
||||
@section('content')
|
||||
<div class="grid">
|
||||
<div class="card">
|
||||
<div class="grid grid-cols-8 gap-5">
|
||||
<div class="col-span-2 card">
|
||||
<div class="card-header">
|
||||
<h3 class="card-title">Request Print Stetement</h3>
|
||||
<div class="card-toolbar">
|
||||
<a href="{{ route('statements.index') }}" class="btn btn-sm btn-light">
|
||||
<i class="ki-outline ki-arrow-left fs-2"></i> Back
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<form action="{{ isset($statement) ? route('statements.update', $statement->id) : route('statements.store') }}" method="POST">
|
||||
@@ -22,7 +17,7 @@
|
||||
@method('PUT')
|
||||
@endif
|
||||
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-5">
|
||||
<div class="grid grid-cols-1 gap-5">
|
||||
<div class="form-group">
|
||||
<label class="form-label required" for="branch_code">Branch</label>
|
||||
<select class="select tomselect @error('branch_code') is-invalid @enderror" id="branch_code" name="branch_code" required>
|
||||
@@ -81,75 +76,74 @@
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="grid mt-5">
|
||||
<div class="card card-grid min-w-full" data-datatable="false" data-datatable-page-size="10" data-datatable-state-save="false" id="statement-table" data-api-url="{{ route('statements.datatables') }}">
|
||||
<div class="card-header py-5 flex-wrap">
|
||||
<h3 class="card-title">
|
||||
Daftar Statement Request
|
||||
</h3>
|
||||
<div class="flex flex-wrap gap-2 lg:gap-5">
|
||||
<div class="flex">
|
||||
<label class="input input-sm"> <i class="ki-filled ki-magnifier"> </i>
|
||||
<input placeholder="Search Statement" id="search" type="text" value="">
|
||||
</label>
|
||||
<div class="col-span-6">
|
||||
<div class="card card-grid min-w-full" data-datatable="false" data-datatable-page-size="10" data-datatable-state-save="false" id="statement-table" data-api-url="{{ route('statements.datatables') }}">
|
||||
<div class="card-header py-5 flex-wrap">
|
||||
<h3 class="card-title">
|
||||
Daftar Statement Request
|
||||
</h3>
|
||||
<div class="flex flex-wrap gap-2 lg:gap-5">
|
||||
<div class="flex">
|
||||
<label class="input input-sm"> <i class="ki-filled ki-magnifier"> </i>
|
||||
<input placeholder="Search Statement" id="search" type="text" value="">
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="scrollable-x-auto">
|
||||
<table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm" data-datatable-table="true">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="w-14">
|
||||
<input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox"/>
|
||||
</th>
|
||||
<th class="min-w-[100px]" data-datatable-column="id">
|
||||
<div class="card-body">
|
||||
<div class="scrollable-x-auto">
|
||||
<table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm" data-datatable-table="true">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="w-14">
|
||||
<input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox"/>
|
||||
</th>
|
||||
<th class="min-w-[100px]" data-datatable-column="id">
|
||||
<span class="sort"> <span class="sort-label"> ID </span>
|
||||
<span class="sort-icon"> </span> </span>
|
||||
</th>
|
||||
<th class="min-w-[150px]" data-datatable-column="branch_name">
|
||||
</th>
|
||||
<th class="min-w-[150px]" data-datatable-column="branch_name">
|
||||
<span class="sort"> <span class="sort-label"> Branch </span>
|
||||
<span class="sort-icon"> </span> </span>
|
||||
</th>
|
||||
<th class="min-w-[150px]" data-datatable-column="account_number">
|
||||
</th>
|
||||
<th class="min-w-[150px]" data-datatable-column="account_number">
|
||||
<span class="sort"> <span class="sort-label"> Account Number </span>
|
||||
<span class="sort-icon"> </span> </span>
|
||||
</th>
|
||||
<th class="min-w-[150px]" data-datatable-column="period">
|
||||
</th>
|
||||
<th class="min-w-[150px]" data-datatable-column="period">
|
||||
<span class="sort"> <span class="sort-label"> Period </span>
|
||||
<span class="sort-icon"> </span> </span>
|
||||
</th>
|
||||
<th class="min-w-[150px]" data-datatable-column="authorization_status">
|
||||
</th>
|
||||
<th class="min-w-[150px]" data-datatable-column="authorization_status">
|
||||
<span class="sort"> <span class="sort-label"> Status </span>
|
||||
<span class="sort-icon"> </span> </span>
|
||||
</th>
|
||||
<th class="min-w-[150px]" data-datatable-column="is_available">
|
||||
</th>
|
||||
<th class="min-w-[150px]" data-datatable-column="is_available">
|
||||
<span class="sort"> <span class="sort-label"> Available </span>
|
||||
<span class="sort-icon"> </span> </span>
|
||||
</th>
|
||||
<th class="min-w-[150px]" data-datatable-column="is_downloaded">
|
||||
<span class="sort"> <span class="sort-label"> Downloaded </span>
|
||||
</th>
|
||||
<th class="min-w-[150px]" data-datatable-column="remarks">
|
||||
<span class="sort"> <span class="sort-label"> Notes </span>
|
||||
<span class="sort-icon"> </span> </span>
|
||||
</th>
|
||||
<th class="min-w-[180px]" data-datatable-column="created_at">
|
||||
</th>
|
||||
<th class="min-w-[180px]" data-datatable-column="created_at">
|
||||
<span class="sort"> <span class="sort-label"> Created At </span>
|
||||
<span class="sort-icon"> </span> </span>
|
||||
</th>
|
||||
<th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
</div>
|
||||
<div class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
|
||||
<div class="flex items-center gap-2">
|
||||
Show
|
||||
<select class="select select-sm w-16" data-datatable-size="true" name="perpage"> </select> per page
|
||||
</th>
|
||||
<th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
</div>
|
||||
<div class="flex items-center gap-4">
|
||||
<span data-datatable-info="true"> </span>
|
||||
<div class="pagination" data-datatable-pagination="true">
|
||||
<div class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
|
||||
<div class="flex items-center gap-2">
|
||||
Show
|
||||
<select class="select select-sm w-16" data-datatable-size="true" name="perpage"> </select> per page
|
||||
</div>
|
||||
<div class="flex items-center gap-4">
|
||||
<span data-datatable-info="true"> </span>
|
||||
<div class="pagination" data-datatable-pagination="true">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -177,7 +171,7 @@
|
||||
}
|
||||
});
|
||||
|
||||
$.ajax(`webstatement/statements/${data}`, {
|
||||
$.ajax(`statements/${data}`, {
|
||||
type: 'DELETE'
|
||||
}).then((response) => {
|
||||
swal.fire('Deleted!', 'Statement request has been deleted.', 'success').then(() => {
|
||||
@@ -222,6 +216,24 @@
|
||||
},
|
||||
period: {
|
||||
title: 'Period',
|
||||
render: (item, data) => {
|
||||
const monthNames = [
|
||||
'January', 'February', 'March', 'April', 'May', 'June',
|
||||
'July', 'August', 'September', 'October', 'November', 'December'
|
||||
];
|
||||
|
||||
const formatPeriod = (period) => {
|
||||
if (!period) return '';
|
||||
const year = period.substring(0, 4);
|
||||
const month = parseInt(period.substring(4, 6));
|
||||
return `${monthNames[month - 1]} ${year}`;
|
||||
};
|
||||
|
||||
const fromPeriod = formatPeriod(data.period_from);
|
||||
const toPeriod = data.period_to ? ` - ${formatPeriod(data.period_to)}` : '';
|
||||
|
||||
return fromPeriod + toPeriod;
|
||||
},
|
||||
},
|
||||
authorization_status: {
|
||||
title: 'Status',
|
||||
@@ -247,20 +259,13 @@
|
||||
return `<span class="${statusClass}">${statusText}</span>`;
|
||||
},
|
||||
},
|
||||
is_downloaded: {
|
||||
title: 'Downloaded',
|
||||
render: (item, data) => {
|
||||
let statusClass = data.is_downloaded ? 'badge badge-light-success' : 'badge badge-light-danger';
|
||||
let statusText = data.is_downloaded ? 'Yes' : 'No';
|
||||
let downloadInfo = data.is_downloaded && data.downloaded_at ?
|
||||
`<div class="text-muted text-xs mt-1">${new Date(data.downloaded_at).toLocaleString()}</div>` : '';
|
||||
return `<span class="${statusClass}">${statusText}</span>${downloadInfo}`;
|
||||
},
|
||||
remarks : {
|
||||
title: 'Notes',
|
||||
},
|
||||
created_at: {
|
||||
title: 'Created At',
|
||||
render: (item, data) => {
|
||||
return data.created_at ? new Date(data.created_at).toLocaleString() : '';
|
||||
return data.created_at ?? '';
|
||||
},
|
||||
},
|
||||
actions: {
|
||||
@@ -271,17 +276,11 @@
|
||||
<i class="ki-outline ki-eye"></i>
|
||||
</a>`;
|
||||
|
||||
// Only show edit button if status is pending
|
||||
if (data.authorization_status === 'pending') {
|
||||
buttons += `<a class="btn btn-sm btn-icon btn-clear btn-primary" href="statements/${data.id}/edit">
|
||||
<i class="ki-outline ki-notepad-edit"></i>
|
||||
</a>`;
|
||||
}
|
||||
|
||||
// Show download button if statement is approved and available but not downloaded
|
||||
if (data.authorization_status === 'approved' && data.is_available && !data.is_downloaded) {
|
||||
//if (data.authorization_status === 'approved' && data.is_available && !data.is_downloaded) {
|
||||
if (data.is_available) {
|
||||
buttons += `<a class="btn btn-sm btn-icon btn-clear btn-success" href="statements/${data.id}/download">
|
||||
<i class="ki-outline ki-document-download"></i>
|
||||
<i class="ki-outline ki-cloud-download"></i>
|
||||
</a>`;
|
||||
}
|
||||
|
||||
|
||||
219
resources/views/statements/show.blade.php
Normal file
219
resources/views/statements/show.blade.php
Normal file
@@ -0,0 +1,219 @@
|
||||
@extends('layouts.main')
|
||||
|
||||
@section('content')
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<h3 class="card-title">Statement Request Details</h3>
|
||||
<div class="card-toolbar">
|
||||
<a href="{{ route('statements.index') }}" class="btn btn-sm btn-info me-2">
|
||||
<i class="ki-duotone ki-arrow-left fs-2"></i>Back to List
|
||||
</a>
|
||||
|
||||
@if($statement->is_available && $statement->authorization_status === 'approved')
|
||||
<a href="{{ route('statements.download', $statement->id) }}" class="btn btn-sm btn-primary">
|
||||
<i class="ki-duotone ki-document fs-2"></i>Download Statement
|
||||
</a>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
@if(session('success'))
|
||||
<div class="alert alert-success">
|
||||
{{ session('success') }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if(session('error'))
|
||||
<div class="alert alert-danger">
|
||||
{{ session('error') }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="grid grid-cols-2 gap-5 g-5">
|
||||
<!-- Left Column - Statement Information -->
|
||||
<div class="card card-flush h-xl-100 shadow-sm">
|
||||
<div class="card-header">
|
||||
<div class="card-title">
|
||||
<h2>Statement Information</h2>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body py-5">
|
||||
<div class="d-flex flex-column gap-5">
|
||||
<div class="d-flex flex-column">
|
||||
<div class="text-gray-500 fw-semibold">Branch</div>
|
||||
<div class="fw-bold fs-5">{{ $statement->branch->name ?? 'N/A' }} ({{ $statement->branch_code }})</div>
|
||||
</div>
|
||||
|
||||
<div class="d-flex flex-column">
|
||||
<div class="text-gray-500 fw-semibold">Account Number</div>
|
||||
<div class="fw-bold fs-5">{{ $statement->account_number }}</div>
|
||||
</div>
|
||||
|
||||
<div class="d-flex flex-column">
|
||||
<div class="text-gray-500 fw-semibold">Period</div>
|
||||
<div class="fw-bold fs-5">
|
||||
@php
|
||||
// Convert format YYYYMM to Month Year
|
||||
$fromYear = substr($statement->period_from, 0, 4);
|
||||
$fromMonth = substr($statement->period_from, 4, 2);
|
||||
$fromMonthName = date('F', mktime(0, 0, 0, $fromMonth, 1));
|
||||
|
||||
$periodText = $fromMonthName . ' ' . $fromYear;
|
||||
|
||||
if($statement->is_period_range && $statement->period_to) {
|
||||
$toYear = substr($statement->period_to, 0, 4);
|
||||
$toMonth = substr($statement->period_to, 4, 2);
|
||||
$toMonthName = date('F', mktime(0, 0, 0, $toMonth, 1));
|
||||
|
||||
$periodText .= ' - ' . $toMonthName . ' ' . $toYear;
|
||||
}
|
||||
@endphp
|
||||
{{ $periodText }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="d-flex flex-column">
|
||||
<div class="text-gray-500 fw-semibold">Status</div>
|
||||
<div>
|
||||
@if($statement->authorization_status === 'pending')
|
||||
<span class="badge badge-warning">Pending Authorization</span>
|
||||
@elseif($statement->authorization_status === 'approved')
|
||||
<span class="badge badge-success">Approved</span>
|
||||
@elseif($statement->authorization_status === 'rejected')
|
||||
<span class="badge badge-danger">Rejected</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="d-flex flex-column">
|
||||
<div class="text-gray-500 fw-semibold">Availability</div>
|
||||
<div>
|
||||
@if($statement->is_available)
|
||||
<span class="badge badge-success">Available</span>
|
||||
@else
|
||||
<span class="badge badge-danger">Not Available</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="d-flex flex-column">
|
||||
<div class="text-gray-500 fw-semibold">Downloaded</div>
|
||||
<div>
|
||||
@if($statement->is_downloaded)
|
||||
<span class="badge badge-success">Yes</span>
|
||||
<div class="text-muted mt-1">
|
||||
Downloaded at: {{ $statement->downloaded_at ? $statement->downloaded_at->format('d M Y H:i:s') : 'N/A' }}
|
||||
</div>
|
||||
@else
|
||||
<span class="badge badge-light-primary">No</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Right Column - Request Information -->
|
||||
<div class="card card-flush h-xl-100 shadow-sm">
|
||||
<div class="card-header">
|
||||
<div class="card-title">
|
||||
<h2>Request Information</h2>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body py-5">
|
||||
<div class="d-flex flex-column gap-5">
|
||||
<div class="d-flex flex-column">
|
||||
<div class="text-gray-500 fw-semibold">Requested By</div>
|
||||
<div class="fw-bold fs-5">{{ $statement->user->name ?? 'N/A' }}</div>
|
||||
</div>
|
||||
|
||||
<div class="d-flex flex-column">
|
||||
<div class="text-gray-500 fw-semibold">Requested At</div>
|
||||
<div class="fw-bold fs-5">{{ dateFormat($statement->created_at,1,1) }}</div>
|
||||
</div>
|
||||
|
||||
<div class="d-flex flex-column">
|
||||
<div class="text-gray-500 fw-semibold">IP Address</div>
|
||||
<div class="fw-bold fs-5">{{ $statement->ip_address }}</div>
|
||||
</div>
|
||||
|
||||
<div class="d-flex flex-column">
|
||||
<div class="text-gray-500 fw-semibold">User Agent</div>
|
||||
<div class="text-muted small">{{ $statement->user_agent }}</div>
|
||||
</div>
|
||||
|
||||
@if($statement->authorization_status !== 'pending')
|
||||
<div class="d-flex flex-column">
|
||||
<div class="text-gray-500 fw-semibold">Authorized By</div>
|
||||
<div class="fw-bold fs-5">{{ $statement->authorizer->name ?? 'N/A' }}</div>
|
||||
</div>
|
||||
|
||||
<div class="d-flex flex-column">
|
||||
<div class="text-gray-500 fw-semibold">Authorized At</div>
|
||||
<div class="fw-bold fs-5">{{ $statement->authorized_at ? $statement->authorized_at->format('d M Y H:i:s') : 'N/A' }}</div>
|
||||
</div>
|
||||
|
||||
@if($statement->remarks)
|
||||
<div class="d-flex flex-column">
|
||||
<div class="text-gray-500 fw-semibold">Remarks</div>
|
||||
<div class="fw-bold fs-5">{{ $statement->remarks }}</div>
|
||||
</div>
|
||||
@endif
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@if($statement->authorization_status === 'pending' && auth()->user()->can('authorize_statements'))
|
||||
<div class="card shadow-sm mt-7">
|
||||
<div class="card-header">
|
||||
<h3 class="card-title">Authorization</h3>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<form action="{{ route('webstatement.statements.authorize', $statement->id) }}" method="POST">
|
||||
@csrf
|
||||
|
||||
<div class="mb-5">
|
||||
<label class="form-label required">Authorization Decision</label>
|
||||
<div class="d-flex">
|
||||
<div class="form-check form-check-custom form-check-solid me-5">
|
||||
<input class="form-check-input" type="radio" name="authorization_status" value="approved" id="status_approved" required/>
|
||||
<label class="form-check-label" for="status_approved">
|
||||
Approve
|
||||
</label>
|
||||
</div>
|
||||
<div class="form-check form-check-custom form-check-solid">
|
||||
<input class="form-check-input" type="radio" name="authorization_status" value="rejected" id="status_rejected" required/>
|
||||
<label class="form-check-label" for="status_rejected">
|
||||
Reject
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-5">
|
||||
<label class="form-label">Remarks</label>
|
||||
<textarea class="form-control" name="remarks" rows="3" placeholder="Enter any remarks or reasons for your decision"></textarea>
|
||||
</div>
|
||||
|
||||
<div class="text-end">
|
||||
<button type="submit" class="btn btn-primary">Submit Authorization</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@push('scripts')
|
||||
<script>
|
||||
// Any additional JavaScript for this page
|
||||
document.addEventListener('DOMContentLoaded', function () {
|
||||
// Initialize any components if needed
|
||||
});
|
||||
</script>
|
||||
@endpush
|
||||
Reference in New Issue
Block a user