diff --git a/app/Modules/Contracts/Http/Livewire/ContractsTableLivewire.php b/app/Modules/Contracts/Http/Livewire/ContractsTableLivewire.php index ffd97d1..e173c44 100644 --- a/app/Modules/Contracts/Http/Livewire/ContractsTableLivewire.php +++ b/app/Modules/Contracts/Http/Livewire/ContractsTableLivewire.php @@ -62,13 +62,19 @@ private function appendMode(&$query) ContractStatus::SUCCESS, ]); } - if ($this->mode == 'finished') + if ($this->mode == 'successed') { $query->whereIn('status', [ - ContractStatus::DECLINE, + ContractStatus::SUCCESS, ContractStatus::TREATY ]); } + if ($this->mode == 'declined') + { + $query->whereIn('status', [ + ContractStatus::DECLINE + ]); + } } private function appendFilter(&$query) { diff --git a/app/Modules/Contracts/Views/index.blade.php b/app/Modules/Contracts/Views/index.blade.php index b923445..de0e955 100644 --- a/app/Modules/Contracts/Views/index.blade.php +++ b/app/Modules/Contracts/Views/index.blade.php @@ -11,9 +11,13 @@ onclick="this.form.submit()" {{ $mode == 'active' ? 'checked' : '' }}> - - + + + + +
+ + + + + -->
@@ -107,11 +107,23 @@ class="bi bi-pen" viewBox="0 0 16 16">
-
+
@if ($contract->base64_image) - +
+
+ + + + + +
+
@endif
@@ -144,4 +156,48 @@ class="bi bi-record-circle-fill align-middle" viewBox="0 0 16 16"> @endif
+ + + @endsection