From 697106004942a794d4c86e2f9328584efc8aaa0b Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 5 May 2016 19:25:26 +0300
Subject: [PATCH] Added preview for email templates

---
 app/Http/Controllers/AccountController.php             | 10 +++++++++-
 app/Models/Invoice.php                                 |  6 ++++++
 .../views/accounts/templates_and_reminders.blade.php   |  2 +-
 resources/views/emails/design2_html.blade.php          |  2 +-
 resources/views/emails/design3_html.blade.php          |  2 +-
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 29d56e2db7f2..db2a65e6eca1 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -1305,7 +1305,15 @@ class AccountController extends BaseController
     public function previewEmail(\App\Services\TemplateService $templateService)
     {
         $template = Input::get('template');
-        $invoice = Invoice::scope()->first();
+        $invoice = Invoice::scope()
+                    ->invoices()
+                    ->withTrashed()
+                    ->first();
+        
+        if ( ! $invoice) {
+            return trans('texts.create_invoice_for_sample');
+        }
+        
         $account = Auth::user()->account;
         
         // replace the variables with sample data
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index deb65b75ab30..cd08e33a855d 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -228,6 +228,12 @@ class Invoice extends EntityModel implements BalanceAffecting
         return $this->hasMany('App\Models\Expense','invoice_id','id')->withTrashed();
     }
 
+    public function scopeInvoices($query)
+    {
+        return $query->where('is_quote', '=', false)
+                     ->where('is_recurring', '=', false);
+    }
+
     public function markInvitationsSent($notify = false)
     {
         foreach ($this->invitations as $invitation) {
diff --git a/resources/views/accounts/templates_and_reminders.blade.php b/resources/views/accounts/templates_and_reminders.blade.php
index d8032f352a92..c5eebd78d658 100644
--- a/resources/views/accounts/templates_and_reminders.blade.php
+++ b/resources/views/accounts/templates_and_reminders.blade.php
@@ -81,7 +81,7 @@
 
 
     <div class="modal fade" id="templatePreviewModal" tabindex="-1" role="dialog" aria-labelledby="templatePreviewModalLabel" aria-hidden="true">
-        <div class="modal-dialog" style="min-width:700px">
+        <div class="modal-dialog" style="width:800px">
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
diff --git a/resources/views/emails/design2_html.blade.php b/resources/views/emails/design2_html.blade.php
index 62b621545479..e76e4514bb70 100644
--- a/resources/views/emails/design2_html.blade.php
+++ b/resources/views/emails/design2_html.blade.php
@@ -12,7 +12,7 @@
     </tr>
     <tr>
         <td style="border-collapse: collapse;">
-            <table cellpadding="10" cellspacing="0" border="0" bgcolor="#F4F5F5" width="580" align="center" 
+            <table cellpadding="10" cellspacing="0" border="0" bgcolor="#F4F5F5" width="600" align="center" 
                 class="header" style="border-top-width: 6px; border-top-color: {{ $account->primary_color ?: '#2E2B2B' }}; border-top-style: solid;">
                 <tr>
                     <td class="logo" width="208" style="border-collapse: collapse; vertical-align: middle;" valign="middle">
diff --git a/resources/views/emails/design3_html.blade.php b/resources/views/emails/design3_html.blade.php
index 550b5fed472a..96125e5dcb15 100644
--- a/resources/views/emails/design3_html.blade.php
+++ b/resources/views/emails/design3_html.blade.php
@@ -12,7 +12,7 @@
     </tr>
     <tr>
         <td style="border-collapse: collapse;">
-            <table cellpadding="10" cellspacing="0" border="0" bgcolor="{{ $account->primary_color ?: '#2E2B2B' }}" width="580" align="center" class="header" 
+            <table cellpadding="10" cellspacing="0" border="0" bgcolor="{{ $account->primary_color ?: '#2E2B2B' }}" width="600" align="center" class="header" 
                 style="border-bottom-width: 6px; border-bottom-color: {{ $account->primary_color ?: '#2E2B2B' }}; border-bottom-style: solid;">
                 <tr>
                     <td class="logo" width="205" style="border-collapse: collapse; vertical-align: middle; line-height: 16px;" valign="middle">