Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 11:44:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add company_id, status_id in the query for approving

Browse Source
This commit is contained in:
Benjamin Beganović 2021-07-05 14:00:27 +02:00
parent 3a0dca4cf4
commit 13aec602e6
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/ClientPortal/QuoteController.php
View File

@ -24,6 +24,7 @@ use App\Utils\TempFile;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\Factory;
use Illuminate\View\View; use Illuminate\View\View;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
use ZipStream\Option\Archive; use ZipStream\Option\Archive;
use ZipStream\ZipStream; use ZipStream\ZipStream;
@ -46,7 +47,7 @@ class QuoteController extends Controller
* *
* @param ShowQuoteRequest $request * @param ShowQuoteRequest $request
* @param Quote $quote * @param Quote $quote
* @return Factory|View|\Symfony\Component\HttpFoundation\BinaryFileResponse * @return Factory|View|BinaryFileResponse
*/ */
public function show(ShowQuoteRequest $request, Quote $quote) public function show(ShowQuoteRequest $request, Quote $quote)
{ {
@ -110,7 +111,9 @@ class QuoteController extends Controller
protected function approve(array $ids, $process = false) protected function approve(array $ids, $process = false)
{ {
$quotes = Quote::whereIn('id', $ids) $quotes = Quote::whereIn('id', $ids)
->whereClientId(auth()->user()->client->id) ->where('client_id', auth('contact')->user()->client->id)
->where('company_id', auth('contact')->user()->client->company_id)
->where('status_id', Quote::STATUS_SENT)
->get(); ->get();
if (!$quotes || $quotes->count() == 0) { if (!$quotes || $quotes->count() == 0) {
@ -119,7 +122,7 @@ class QuoteController extends Controller
if ($process) { if ($process) {
foreach ($quotes as $quote) { foreach ($quotes as $quote) {
$quote->service()->approve(auth('contact')->user())->save(); $quote->service()->approve(auth()->user())->save();
event(new QuoteWasApproved(auth('contact')->user(), $quote, $quote->company, Ninja::eventVars())); event(new QuoteWasApproved(auth('contact')->user(), $quote, $quote->company, Ninja::eventVars()));
if (request()->has('signature') && !is_null(request()->signature) && !empty(request()->signature)) { if (request()->has('signature') && !is_null(request()->signature) && !empty(request()->signature)) {