From 59ec838b889a8a9c23f55b7df2886c021f76e85d Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 13 Feb 2018 09:15:14 +0200
Subject: [PATCH] Proposals

---
 app/Http/Controllers/ClientPortalController.php | 11 +++++++++++
 app/Http/Controllers/ProposalController.php     |  4 ++++
 resources/views/proposals/edit.blade.php        |  8 +++++---
 resources/views/proposals/grapesjs.blade.php    |  1 -
 routes/web.php                                  |  1 +
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/ClientPortalController.php b/app/Http/Controllers/ClientPortalController.php
index c5dd229a09..6b3896a84a 100644
--- a/app/Http/Controllers/ClientPortalController.php
+++ b/app/Http/Controllers/ClientPortalController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Events\InvoiceInvitationWasViewed;
 use App\Events\QuoteInvitationWasViewed;
+use App\Models\Account;
 use App\Models\Contact;
 use App\Models\Document;
 use App\Models\Gateway;
@@ -835,6 +836,16 @@ class ClientPortalController extends BaseController
         }, 200);
     }
 
+    /*
+    public function getProposalDocument($accountKey, $publicId)
+    {
+        $account = Account::whereAccountKey($accountKey)->firstOrFail();
+        $document = Document::whereAccountId($account->id)->wherePublicId($publicId)->firstOrFail();
+
+        return DocumentController::getDownloadResponse($document);
+    }
+    */
+    
     public function getDocument($invitationKey, $publicId)
     {
         if (! $invitation = $this->invoiceRepo->findInvoiceByInvitation($invitationKey)) {
diff --git a/app/Http/Controllers/ProposalController.php b/app/Http/Controllers/ProposalController.php
index 5a8a931257..9b5fa1a841 100644
--- a/app/Http/Controllers/ProposalController.php
+++ b/app/Http/Controllers/ProposalController.php
@@ -168,7 +168,11 @@ class ProposalController extends BaseController
         $proposal = $request->entity();
 
         $mpdf = new mPDF();
+        $mpdf->showImageErrors = true;
         $mpdf->WriteHTML($proposal->present()->htmlDocument);
+
+        //$mpdf->Output();
+
         $mpdf->Output($proposal->present()->filename, 'D');
     }
 }
diff --git a/resources/views/proposals/edit.blade.php b/resources/views/proposals/edit.blade.php
index 6201711f4a..276222d348 100644
--- a/resources/views/proposals/edit.blade.php
+++ b/resources/views/proposals/edit.blade.php
@@ -239,9 +239,11 @@
     <script type="text/javascript">
 
     $(function() {
-        grapesjsEditor.on('canvas:drop', function() {
-            var html = mergeTemplate(grapesjsEditor.getHtml());
-            grapesjsEditor.setComponents(html);
+        grapesjsEditor.on('canvas:drop', function(event, block) {
+            if (! block.attributes || block.attributes.type != 'image') {
+                var html = mergeTemplate(grapesjsEditor.getHtml());
+                grapesjsEditor.setComponents(html);
+            }
         });
 
         @if (! $proposal && $templatePublicId)
diff --git a/resources/views/proposals/grapesjs.blade.php b/resources/views/proposals/grapesjs.blade.php
index 89fdb7a95a..6c6804e96f 100644
--- a/resources/views/proposals/grapesjs.blade.php
+++ b/resources/views/proposals/grapesjs.blade.php
@@ -7,7 +7,6 @@ $(function() {
         components: '{!! $entity ? $entity->html : '' !!}',
         style: '{!! $entity ? $entity->css : '' !!}',
         showDevices: false,
-        categoryLabel: 'tes',
         plugins: ['gjs-preset-newsletter'],
         pluginsOpts: {
             'gjs-preset-newsletter': {
diff --git a/routes/web.php b/routes/web.php
index 9eae17b72e..ef6de62652 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -18,6 +18,7 @@ Route::group(['middleware' => ['lookup:contact', 'auth:client']], function () {
     Route::get('view/{invitation_key}', 'ClientPortalController@viewInvoice');
     Route::get('proposal/{proposal_invitation_key}/download', 'ClientPortalController@downloadProposal');
     Route::get('proposal/{proposal_invitation_key}', 'ClientPortalController@viewProposal');
+    //Route::get('proposal/document/{account_key}/{public_id}/{filename?}', 'ClientPortalController@getProposalDocument');
     Route::get('download/{invitation_key}', 'ClientPortalController@download');
     Route::put('sign/{invitation_key}', 'ClientPortalController@sign');
     Route::get('view', 'HomeController@viewLogo');