diff --git a/app/Http/Controllers/ProposalController.php b/app/Http/Controllers/ProposalController.php
index 4812a5dd7c3e..103a5d1cfdcc 100644
--- a/app/Http/Controllers/ProposalController.php
+++ b/app/Http/Controllers/ProposalController.php
@@ -142,6 +142,8 @@ class ProposalController extends BaseController
$mpdf = new mPDF();
$mpdf->WriteHTML($proposal->present()->htmlDocument);
+
+ $mpdf->Output();
$mpdf->Output($proposal->present()->filename, 'D');
}
}
diff --git a/app/Ninja/Presenters/ProposalPresenter.php b/app/Ninja/Presenters/ProposalPresenter.php
index 9fc896147c3f..eca4e906df81 100644
--- a/app/Ninja/Presenters/ProposalPresenter.php
+++ b/app/Ninja/Presenters/ProposalPresenter.php
@@ -34,7 +34,21 @@ class ProposalPresenter extends EntityPresenter
{
$proposal = $this->entity;
- return "{$proposal->html}";
+ $html = "
+
+
+
+
+ {$proposal->html}
+
+ ";
+
+ return $html;
}
public function filename()
diff --git a/resources/views/invited/proposal.blade.php b/resources/views/invited/proposal.blade.php
index 88a19f9de6c6..df3dd16dd3ed 100644
--- a/resources/views/invited/proposal.blade.php
+++ b/resources/views/invited/proposal.blade.php
@@ -26,10 +26,7 @@
}
$(function() {
- var html = {!! json_encode($proposal->html) !!};
- var css = {!! json_encode($proposal->css) !!};
-
- var content = '' + html + '';
+ var content = {!! json_encode($proposal->present()->htmlDocument) !!};
var iFrame = document.getElementById('proposalIframe').contentWindow.document;
iFrame.write(content);
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index ba0f368b08ca..b77d4becedb8 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -525,7 +525,7 @@
@endif
@if ( $invoice->id && ! $invoice->is_recurring)
- {!! Button::primary(trans('texts.download_pdf'))
+ {!! Button::primary(trans('texts.download'))
->withAttributes(['onclick' => 'onDownloadClick()', 'id' => 'downloadPdfButton'])
->appendIcon(Icon::create('download-alt')) !!}
@endif
diff --git a/resources/views/proposals/edit.blade.php b/resources/views/proposals/edit.blade.php
index 5376136b77a8..0880b2b02035 100644
--- a/resources/views/proposals/edit.blade.php
+++ b/resources/views/proposals/edit.blade.php
@@ -57,7 +57,7 @@
->appendIcon(Icon::create('remove-circle'))
->asLinkTo(HTMLUtils::previousUrl('/proposals')) !!}
- {!! Button::primary(trans('texts.download_pdf'))
+ {!! Button::primary(trans('texts.download'))
->withAttributes(['onclick' => 'onDownloadClick()'])
->appendIcon(Icon::create('download-alt')) !!}
@@ -90,9 +90,11 @@
return true;
}
- function onDownloadClick() {
- location.href = "{{ url("/proposals/{$proposal->public_id}/download") }}";
- }
+ @if ($proposal)
+ function onDownloadClick() {
+ location.href = "{{ url("/proposals/{$proposal->public_id}/download") }}";
+ }
+ @endif
function loadTemplate() {
var templateId = $('select#proposal_template_id').val();