From cb9c4183333189b83dc8028378d4a1ab1c701529 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 11 Feb 2018 16:08:13 +0200 Subject: [PATCH] Proposals --- app/Http/Controllers/ClientPortalController.php | 6 +++--- resources/views/invited/proposal.blade.php | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/ClientPortalController.php b/app/Http/Controllers/ClientPortalController.php index 62a963de7f77..c5dd229a090d 100644 --- a/app/Http/Controllers/ClientPortalController.php +++ b/app/Http/Controllers/ClientPortalController.php @@ -67,15 +67,15 @@ class ClientPortalController extends BaseController $account = $invitation->account; $proposal = $invitation->proposal; - $invitation = Invitation::whereContactId($invitation->contact_id) + $invoiceInvitation = Invitation::whereContactId($invitation->contact_id) ->whereInvoiceId($proposal->invoice_id) ->firstOrFail(); $data = [ - 'proposalInvitation' => $invitation, 'proposal' => $proposal, 'account' => $account, - 'invitation' => $invitation, + 'invoiceInvitation' => $invoiceInvitation, + 'proposalInvitation' => $invitation, ]; return view('invited.proposal', $data); diff --git a/resources/views/invited/proposal.blade.php b/resources/views/invited/proposal.blade.php index 4d7dacbc3f52..88a19f9de6c6 100644 --- a/resources/views/invited/proposal.blade.php +++ b/resources/views/invited/proposal.blade.php @@ -4,6 +4,7 @@
+ {!! Button::normal(trans('texts.download'))->asLinkTo(url("/proposal/{$proposalInvitation->invitation_key}/download"))->large() !!} @if (! $proposal->invoice->isApproved()) {!! Button::success(trans('texts.approve'))->withAttributes(['id' => 'approveButton', 'onclick' => 'onApproveClick()'])->large() !!} @endif @@ -17,7 +18,7 @@ function onApproveClick() { $('#approveButton').prop('disabled', true); - location.href = "{{ url('/approve/' . $invitation->invitation_key) }}"; + location.href = "{{ url('/approve/' . $invoiceInvitation->invitation_key) }}"; } function resizeIframe(obj) {