Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Proposals

Browse Source
This commit is contained in:
Hillel Coren 2018-02-11 16:08:13 +02:00
parent a136c3c325
commit cb9c418333
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/ClientPortalController.php
View File

@ -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);

3
resources/views/invited/proposal.blade.php
View File

@ -4,6 +4,7 @@
<div class="container" style="padding: 20px;">
<div class="pull-right">
{!! 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) {