fix handle error and add note for shippings receive approve and reject mutations
This commit is contained in:
@@ -14,9 +14,8 @@
|
||||
<div class="kt-portlet__head-toolbar">
|
||||
<div class="kt-portlet__head-wrapper">
|
||||
<div class="kt-portlet__head-actions">
|
||||
<a href="{{ route('mutations.index') }}" class="btn btn-secondary btn-sm">
|
||||
<i class="la la-arrow-left"></i>
|
||||
Kembali
|
||||
<a href="{{ route('mutations.index') }}" class="btn btn-secondary">
|
||||
<i class="la la-arrow-left"></i> Kembali
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
@@ -74,12 +73,45 @@
|
||||
<p>{{ $mutation->approved_at->format('d/m/Y H:i:s') }}</p>
|
||||
</div>
|
||||
@endif
|
||||
@if($mutation->rejectedBy)
|
||||
<div class="form-group">
|
||||
<label><strong>Ditolak Oleh:</strong></label>
|
||||
<p>{{ $mutation->rejectedBy->name }}</p>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label><strong>Tanggal Ditolak:</strong></label>
|
||||
<p>{{ $mutation->rejected_at->format('d/m/Y H:i:s') }}</p>
|
||||
</div>
|
||||
@endif
|
||||
@if($mutation->cancelledBy)
|
||||
<div class="form-group">
|
||||
<label><strong>Dibatalkan Oleh:</strong></label>
|
||||
<p>{{ $mutation->cancelledBy->name }}</p>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label><strong>Tanggal Dibatalkan:</strong></label>
|
||||
<p>{{ $mutation->cancelled_at->format('d/m/Y H:i:s') }}</p>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
@if($mutation->notes)
|
||||
<!-- Notes Section -->
|
||||
@if($mutation->shipping_notes)
|
||||
<div class="form-group">
|
||||
<label><strong>Catatan:</strong></label>
|
||||
<p>{{ $mutation->notes }}</p>
|
||||
<label><strong>Catatan Pengiriman:</strong></label>
|
||||
<div class="alert alert-info">{{ $mutation->shipping_notes }}</div>
|
||||
</div>
|
||||
@endif
|
||||
@if($mutation->reception_notes)
|
||||
<div class="form-group">
|
||||
<label><strong>Catatan Penerimaan:</strong></label>
|
||||
<div class="alert alert-primary">{{ $mutation->reception_notes }}</div>
|
||||
</div>
|
||||
@endif
|
||||
@if($mutation->approval_notes)
|
||||
<div class="form-group">
|
||||
<label><strong>Catatan Persetujuan:</strong></label>
|
||||
<div class="alert alert-success">{{ $mutation->approval_notes }}</div>
|
||||
</div>
|
||||
@endif
|
||||
@if($mutation->rejection_reason)
|
||||
@@ -88,6 +120,12 @@
|
||||
<div class="alert alert-danger">{{ $mutation->rejection_reason }}</div>
|
||||
</div>
|
||||
@endif
|
||||
@if($mutation->cancellation_reason)
|
||||
<div class="form-group">
|
||||
<label><strong>Alasan Pembatalan:</strong></label>
|
||||
<div class="alert alert-warning">{{ $mutation->cancellation_reason }}</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -229,7 +267,7 @@
|
||||
|
||||
<div class="form-group">
|
||||
<label>Catatan Penerimaan</label>
|
||||
<textarea name="notes" class="form-control" rows="3" placeholder="Catatan kondisi barang saat diterima (opsional)"></textarea>
|
||||
<textarea name="reception_notes" class="form-control" rows="3" placeholder="Catatan kondisi barang saat diterima (opsional)"></textarea>
|
||||
</div>
|
||||
|
||||
<h6>Detail Produk yang Diterima:</h6>
|
||||
@@ -302,7 +340,7 @@
|
||||
|
||||
<div class="form-group">
|
||||
<label>Catatan Persetujuan</label>
|
||||
<textarea name="notes" class="form-control" rows="3" placeholder="Opsional: tambahkan catatan..."></textarea>
|
||||
<textarea name="approval_notes" class="form-control" rows="3" placeholder="Opsional: tambahkan catatan..."></textarea>
|
||||
</div>
|
||||
|
||||
<h6>Detail Produk yang Diterima:</h6>
|
||||
@@ -428,6 +466,10 @@
|
||||
<div class="alert alert-warning">
|
||||
<strong>Peringatan!</strong> Mutasi yang dibatalkan tidak dapat diubah lagi.
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>Alasan Pembatalan</label>
|
||||
<textarea name="cancellation_reason" class="form-control" rows="3" placeholder="Masukkan alasan pembatalan (opsional)"></textarea>
|
||||
</div>
|
||||
<p>Apakah Anda yakin ingin membatalkan mutasi ini?</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
@@ -457,8 +499,6 @@
|
||||
text-align: center !important;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* Ensure proper alignment in approval modal */
|
||||
.approve-form .form-control.text-center {
|
||||
text-align: center;
|
||||
|
||||
Reference in New Issue
Block a user