remove status pending and complete
This commit is contained in:
@@ -52,25 +52,8 @@
|
||||
@endif
|
||||
|
||||
@if($row->status->value === 'approved')
|
||||
<!-- Complete/Receive Button -->
|
||||
@can('complete-mutation')
|
||||
<button type="button"
|
||||
class="btn btn-sm btn-primary btn-complete mr-2"
|
||||
data-id="{{ $row->id }}"
|
||||
data-bs-toggle="modal"
|
||||
data-bs-target="#completeModal{{ $row->id }}">
|
||||
Selesaikan
|
||||
</button>
|
||||
@endcan
|
||||
|
||||
<!-- Cancel Button -->
|
||||
@can('edit-mutation')
|
||||
<button type="button"
|
||||
class="btn btn-sm btn-warning btn-cancel mr-2"
|
||||
data-id="{{ $row->id }}">
|
||||
Batal
|
||||
</button>
|
||||
@endcan
|
||||
<!-- Stock has already been moved automatically after approval -->
|
||||
<span class="badge badge-success">Stock Telah Dipindahkan</span>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
@@ -86,6 +69,7 @@
|
||||
<div class="modal-body">
|
||||
<div class="alert alert-info">
|
||||
<strong>Konfirmasi!</strong> Anda akan menyetujui mutasi yang telah diterima oleh <strong>{{ $row->toDealer->name }}</strong>.
|
||||
<br><strong>Stock akan dipindahkan secara otomatis setelah disetujui.</strong>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
@@ -128,7 +112,7 @@
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<p class="text-muted">Setelah disetujui, stock akan siap untuk dipindahkan.</p>
|
||||
<p class="text-muted">Setelah disetujui, stock akan dipindahkan secara otomatis.</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Batal</button>
|
||||
@@ -223,7 +207,7 @@
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<p class="text-muted">Setelah menerima, mutasi akan menunggu persetujuan dari pengirim sebelum stock dipindahkan.</p>
|
||||
<p class="text-muted">Setelah menerima, mutasi akan menunggu persetujuan dari pengirim. Stock akan dipindahkan otomatis setelah disetujui.</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Batal</button>
|
||||
@@ -234,26 +218,4 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Modal untuk Complete -->
|
||||
<div class="modal fade" id="completeModal{{ $row->id }}" tabindex="-1" aria-labelledby="completeModalLabel{{ $row->id }}" aria-hidden="true">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title" id="completeModalLabel{{ $row->id }}">Selesaikan Mutasi</h5>
|
||||
</div>
|
||||
<form action="{{ route('mutations.complete', $row->id) }}" method="POST">
|
||||
@csrf
|
||||
<div class="modal-body">
|
||||
<div class="alert alert-info">
|
||||
<strong>Konfirmasi!</strong> Stock akan dipindahkan dari <strong>{{ $row->fromDealer->name }}</strong> ke <strong>{{ $row->toDealer->name }}</strong>.
|
||||
</div>
|
||||
<p>Apakah Anda yakin ingin menyelesaikan mutasi ini? Tindakan ini tidak dapat dibatalkan.</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Batal</button>
|
||||
<button type="submit" class="btn btn-primary">Ya, Selesaikan</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Complete Modal is no longer needed since stock moves automatically after approval -->
|
||||
@@ -158,7 +158,7 @@
|
||||
<td>{{ $detail->product->name }}</td>
|
||||
<td class="text-center">{{ number_format($detail->quantity_requested, 2) }}</td>
|
||||
<td class="text-center">
|
||||
@if($mutation->status->value === 'received' || $mutation->status->value === 'approved' || $mutation->status->value === 'completed')
|
||||
@if($mutation->status->value === 'received' || $mutation->status->value === 'approved')
|
||||
{{ number_format($detail->quantity_approved ?? 0, 2) }}
|
||||
@else
|
||||
<span class="text-muted">Belum ditentukan</span>
|
||||
@@ -187,7 +187,7 @@
|
||||
<td colspan="2" class="text-right">Total</td>
|
||||
<td class="text-center">{{ number_format($mutation->mutationDetails->sum('quantity_requested'), 2) }}</td>
|
||||
<td class="text-center">
|
||||
@if($mutation->status->value === 'received' || $mutation->status->value === 'approved' || $mutation->status->value === 'completed')
|
||||
@if($mutation->status->value === 'received' || $mutation->status->value === 'approved')
|
||||
{{ number_format($mutation->mutationDetails->sum('quantity_approved'), 2) }}
|
||||
@else
|
||||
<span class="text-muted">-</span>
|
||||
@@ -225,10 +225,8 @@
|
||||
@endif
|
||||
|
||||
@if($mutation->status->value === 'approved')
|
||||
<!-- Complete Button -->
|
||||
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#completeModal">
|
||||
Selesaikan Mutasi
|
||||
</button>
|
||||
<!-- Stock has already been moved automatically after approval -->
|
||||
<span class="badge badge-success">Stock Telah Dipindahkan</span>
|
||||
@endif
|
||||
|
||||
@if($mutation->canBeCancelled() && (auth()->user()->dealer_id == $mutation->from_dealer_id || auth()->user()->hasRole('admin')))
|
||||
@@ -308,7 +306,7 @@
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<p class="text-muted">Setelah menerima, mutasi akan menunggu persetujuan dari pengirim sebelum stock dipindahkan.</p>
|
||||
<p class="text-muted">Setelah menerima, mutasi akan menunggu persetujuan dari pengirim. Stock akan dipindahkan otomatis setelah disetujui.</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" data-dismiss="modal">Batal</button>
|
||||
@@ -378,7 +376,7 @@
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<p class="text-muted">Setelah disetujui, stock akan siap untuk dipindahkan.</p>
|
||||
<p class="text-muted">Setelah disetujui, stock akan dipindahkan secara otomatis.</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" data-dismiss="modal">Batal</button>
|
||||
@@ -420,35 +418,6 @@
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if($mutation->status->value === 'approved')
|
||||
<!-- Complete Modal -->
|
||||
<div class="modal fade" id="completeModal" tabindex="-1" role="dialog">
|
||||
<div class="modal-dialog" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">Selesaikan Mutasi</h5>
|
||||
<button type="button" class="close" data-dismiss="modal">
|
||||
<span>×</span>
|
||||
</button>
|
||||
</div>
|
||||
<form action="{{ route('mutations.complete', $mutation->id) }}" method="POST">
|
||||
@csrf
|
||||
<div class="modal-body">
|
||||
<div class="alert alert-info">
|
||||
<strong>Konfirmasi!</strong> Stock akan dipindahkan dari <strong>{{ $mutation->fromDealer->name }}</strong> ke <strong>{{ $mutation->toDealer->name }}</strong>.
|
||||
</div>
|
||||
<p>Apakah Anda yakin ingin menyelesaikan mutasi ini? Tindakan ini tidak dapat dibatalkan.</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" data-dismiss="modal">Batal</button>
|
||||
<button type="submit" class="btn btn-primary">Ya, Selesaikan</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if($mutation->canBeCancelled() && (auth()->user()->dealer_id == $mutation->from_dealer_id || auth()->user()->hasRole('admin')))
|
||||
<!-- Cancel Modal -->
|
||||
<div class="modal fade" id="cancelModal" tabindex="-1" role="dialog">
|
||||
|
||||
Reference in New Issue
Block a user