1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00

Merge pull request #7026 from turbo124/v5-develop

Do not redirect approved quotes back to quote list
This commit is contained in:
David Bomba 2021-12-11 21:29:49 +11:00 committed by GitHub
commit 4120faec0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions

View File

@ -154,6 +154,10 @@ class QuoteController extends Controller
}
}
if(count($ids) == 1){
return redirect()->route('client.quote.show', $quotes->first()->hashed_id);
}
return redirect()
->route('client.quotes.index')
->withSuccess('Quote(s) approved successfully.');

View File

@ -25,6 +25,8 @@
<div class="mb-4">
@include('portal.ninja2020.quotes.includes.actions', ['quote' => $quote])
</div>
@elseif($quote->status_id === \App\Models\Quote::STATUS_APPROVED)
<p class="text-right text-gray-900 text-sm mb-4">{{ ctrans('texts.approved') }}</p>
@else
<p class="text-right text-gray-900 text-sm mb-4">{{ ctrans('texts.quotes_with_status_sent_can_be_approved') }}</p>
@endif