From 886d7f6e1234185f866b2b7ac5c46d892bd0762c Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 17 Aug 2016 13:17:24 +0300
Subject: [PATCH] Show 'Valid until' for quotes in HTML emails

---
 resources/views/emails/design2_html.blade.php | 10 +++++++---
 resources/views/emails/design3_html.blade.php | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/resources/views/emails/design2_html.blade.php b/resources/views/emails/design2_html.blade.php
index e76e4514bb70..7cb29e87652d 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="600" 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">
@@ -22,7 +22,11 @@
                         <p class="left" style="line-height: 22px; margin: 0; padding: 2px 0 0;">
                             @if ($invoice->due_date)
                                 <span style="font-size: 11px; color: #8f8d8e;">
-                                    {{ strtoupper(trans('texts.due_by', ['date' => $account->formatDate($invoice->due_date)])) }}
+                                    @if ($invoice->isQuote())
+                                        {{ strtoupper(trans('texts.valid_until')) }} {{ $account->formatDate($invoice->due_date) }}
+                                    @else
+                                        {{ strtoupper(trans('texts.due_by', ['date' => $account->formatDate($invoice->due_date)])) }}
+                                    @endif
                                 </span><br />
                             @endif
                             <span style="font-size: 18px;">
@@ -66,4 +70,4 @@
             <strong><a href="{{ $account->present()->website }}" style="color: #A7A6A6; text-decoration: none; font-weight: bold; font-size: 10px;">{{ $account->website }}</a></strong>
         @endif
     </p>
-@stop
\ No newline at end of file
+@stop
diff --git a/resources/views/emails/design3_html.blade.php b/resources/views/emails/design3_html.blade.php
index 96125e5dcb15..c1880b7f29eb 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="600" 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">
@@ -22,7 +22,11 @@
                         <p class="left" style="line-height: 22px; margin: 3px 0 0; padding: 0;">
                             @if ($invoice->due_date)
                                 <span style="font-size: 11px; color: #8f8d8e;">
-                                    {{ strtoupper(trans('texts.due_by', ['date' => $account->formatDate($invoice->due_date)])) }}
+                                    @if ($invoice->isQuote())
+                                        {{ strtoupper(trans('texts.valid_until')) }} {{ $account->formatDate($invoice->due_date) }}
+                                    @else
+                                        {{ strtoupper(trans('texts.due_by', ['date' => $account->formatDate($invoice->due_date)])) }}
+                                    @endif
                                 </span><br />
                             @endif
                             <span style="font-size: 19px; color: #FFFFFF;">
@@ -66,4 +70,4 @@
             <strong><a href="{{ $account->present()->website }}" style="color: #A7A6A6; text-decoration: none; font-weight: bold; font-size: 10px;">{{ $account->website }}</a></strong>
         @endif
     </p>
-@stop
\ No newline at end of file
+@stop