From f38c3f93c69f6e15fa15cb3dbc7292d9586740ed Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 17 Feb 2023 09:54:26 +1100
Subject: [PATCH] Fixes for admin email tempaltes

---
 app/Jobs/Company/CompanyExport.php                           | 1 -
 resources/views/email/admin/download_credits.blade.php       | 2 +-
 resources/views/email/admin/download_documents.blade.php     | 2 +-
 resources/views/email/admin/download_files.blade.php         | 5 +++--
 resources/views/email/admin/download_invoices.blade.php      | 2 +-
 .../views/email/admin/download_purchase_orders.blade.php     | 2 +-
 resources/views/email/admin/download_quotes.blade.php        | 2 +-
 resources/views/email/admin/generic_email.blade.php          | 2 +-
 resources/views/email/template/admin.blade.php               | 4 ++--
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/Jobs/Company/CompanyExport.php b/app/Jobs/Company/CompanyExport.php
index 574a6b3257..1eef769f89 100644
--- a/app/Jobs/Company/CompanyExport.php
+++ b/app/Jobs/Company/CompanyExport.php
@@ -471,7 +471,6 @@ class CompanyExport implements ShouldQueue
         $t->replace(Ninja::transformTranslations($this->company->settings));
 
         $company_reference = Company::find($this->company->id);
-        ;
 
         $nmo = new NinjaMailerObject;
         $nmo->mailable = new DownloadBackup($storage_file_path, $company_reference);
diff --git a/resources/views/email/admin/download_credits.blade.php b/resources/views/email/admin/download_credits.blade.php
index a715ab6df3..e5432328fb 100644
--- a/resources/views/email/admin/download_credits.blade.php
+++ b/resources/views/email/admin/download_credits.blade.php
@@ -11,7 +11,7 @@
                 <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" >
                 <tbody><tr>
                 <td align="center" class="new_button" style="border-radius: 2px; background-color: {{ $settings->primary_color }}">
-                    <a href="{{ $url }}" target="_blank" class="new_button" style="text-decoration: none; border: 1px solid {{ settings->primary_color }}; display: inline-block; border-radius: 2px; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; font-size: 20px; color: #fff">
+                    <a href="{{ $url }}" target="_blank" class="new_button" style="text-decoration: none; border: 1px solid {{ $settings->primary_color }}; display: inline-block; border-radius: 2px; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; font-size: 20px; color: #fff">
                     <singleline label="cta button"> {{ ctrans('texts.download') }}</singleline>
                     </a>
                 </td>
diff --git a/resources/views/email/admin/download_documents.blade.php b/resources/views/email/admin/download_documents.blade.php
index f3fc42cc9d..3fcb530eae 100644
--- a/resources/views/email/admin/download_documents.blade.php
+++ b/resources/views/email/admin/download_documents.blade.php
@@ -11,7 +11,7 @@
                 <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" >
                 <tbody><tr>
                 <td align="center" class="new_button" style="border-radius: 2px; background-color: {{ $settings->primary_color }}">
-                    <a href="{{ $url }}" target="_blank" class="new_button" style="text-decoration: none; border: 1px solid {{ settings->primary_color }}; display: inline-block; border-radius: 2px; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; font-size: 20px; color: #fff">
+                    <a href="{{ $url }}" target="_blank" class="new_button" style="text-decoration: none; border: 1px solid {{ $settings->primary_color }}; display: inline-block; border-radius: 2px; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; font-size: 20px; color: #fff">
                     <singleline label="cta button"> {{ ctrans('texts.download') }}</singleline>
                     </a>
                 </td>
diff --git a/resources/views/email/admin/download_files.blade.php b/resources/views/email/admin/download_files.blade.php
index 08e0e6359b..e0c385825a 100644
--- a/resources/views/email/admin/download_files.blade.php
+++ b/resources/views/email/admin/download_files.blade.php
@@ -1,4 +1,5 @@
 @component('email.template.admin', ['logo' => $logo, 'settings' => $settings])
+
     <div class="center">
         <h1>{{ ctrans('texts.download_backup_subject') }}</h1>
         <p>{{ ctrans('texts.download_timeframe') }}</p>
@@ -10,8 +11,8 @@
                 <![endif]-->        
                 <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" >
                 <tbody><tr>
-                <td align="center" class="new_button" style="border-radius: 2px; background-color: {{ $settings->primary_color }}">
-                    <a href="{{ $url }}" target="_blank" class="new_button" style="text-decoration: none; border: 1px solid {{ settings->primary_color }}; display: inline-block; border-radius: 2px; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; font-size: 20px; color: #fff">
+                <td align="center" class="new_button" style="border-radius: 2px; background-color: {{ $settings->primary_color }} ">
+                    <a href="{{ $url }}" target="_blank" class="new_button" style="text-decoration: none; border: 1px solid {{ $settings->primary_color }}; display: inline-block; border-radius: 2px; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; font-size: 20px; color: #fff">
                     <singleline label="cta button"> {{ ctrans('texts.download') }}</singleline>
                     </a>
                 </td>
diff --git a/resources/views/email/admin/download_invoices.blade.php b/resources/views/email/admin/download_invoices.blade.php
index dbae16a9f4..5e0d2a1399 100644
--- a/resources/views/email/admin/download_invoices.blade.php
+++ b/resources/views/email/admin/download_invoices.blade.php
@@ -11,7 +11,7 @@
                 <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" >
                 <tbody><tr>
                 <td align="center" class="new_button" style="border-radius: 2px; background-color: {{ $settings->primary_color }}">
-                    <a href="{{ $url }}" target="_blank" class="new_button" style="text-decoration: none; border: 1px solid {{ settings->primary_color }}; display: inline-block; border-radius: 2px; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; font-size: 20px; color: #fff">
+                    <a href="{{ $url }}" target="_blank" class="new_button" style="text-decoration: none; border: 1px solid {{ $settings->primary_color }}; display: inline-block; border-radius: 2px; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; font-size: 20px; color: #fff">
                     <singleline label="cta button"> {{ ctrans('texts.download') }}</singleline>
                     </a>
                 </td>
diff --git a/resources/views/email/admin/download_purchase_orders.blade.php b/resources/views/email/admin/download_purchase_orders.blade.php
index 114ddf666d..772f02e498 100644
--- a/resources/views/email/admin/download_purchase_orders.blade.php
+++ b/resources/views/email/admin/download_purchase_orders.blade.php
@@ -11,7 +11,7 @@
                 <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" >
                 <tbody><tr>
                 <td align="center" class="new_button" style="border-radius: 2px; background-color: {{ $settings->primary_color }}">
-                    <a href="{{ $url }}" target="_blank" class="new_button" style="text-decoration: none; border: 1px solid {{ settings->primary_color }}; display: inline-block; border-radius: 2px; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; font-size: 20px; color: #fff">
+                    <a href="{{ $url }}" target="_blank" class="new_button" style="text-decoration: none; border: 1px solid {{ $settings->primary_color }}; display: inline-block; border-radius: 2px; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; font-size: 20px; color: #fff">
                     <singleline label="cta button"> {{ ctrans('texts.download') }}</singleline>
                     </a>
                 </td>
diff --git a/resources/views/email/admin/download_quotes.blade.php b/resources/views/email/admin/download_quotes.blade.php
index 3517e4ddba..8b1acb586e 100644
--- a/resources/views/email/admin/download_quotes.blade.php
+++ b/resources/views/email/admin/download_quotes.blade.php
@@ -11,7 +11,7 @@
                 <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" >
                 <tbody><tr>
                 <td align="center" class="new_button" style="border-radius: 2px; background-color: {{ $settings->primary_color }}">
-                    <a href="{{ $url }}" target="_blank" class="new_button" style="text-decoration: none; border: 1px solid {{ settings->primary_color }}; display: inline-block; border-radius: 2px; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; font-size: 20px; color: #fff">
+                    <a href="{{ $url }}" target="_blank" class="new_button" style="text-decoration: none; border: 1px solid {{ $settings->primary_color }}; display: inline-block; border-radius: 2px; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; font-size: 20px; color: #fff">
                     <singleline label="cta button"> {{ ctrans('texts.download') }}</singleline>
                     </a>
                 </td>
diff --git a/resources/views/email/admin/generic_email.blade.php b/resources/views/email/admin/generic_email.blade.php
index 7b0d776f87..f55411056e 100644
--- a/resources/views/email/admin/generic_email.blade.php
+++ b/resources/views/email/admin/generic_email.blade.php
@@ -14,7 +14,7 @@
                 <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" >
                 <tbody><tr>
                 <td align="center" class="new_button" style="border-radius: 2px; background-color: {{ $settings->primary_color }}">
-                    <a href="{{ $view_link }}" target="_blank" class="new_button" style="text-decoration: none; border: 1px solid {{ settings->primary_color }}; display: inline-block; border-radius: 2px; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; font-size: 20px; color: #fff">
+                    <a href="{{ $view_link }}" target="_blank" class="new_button" style="text-decoration: none; border: 1px solid {{ $settings->primary_color }}; display: inline-block; border-radius: 2px; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; font-size: 20px; color: #fff">
                     <singleline label="cta button">{{ $view_text }}</singleline>
                     </a>
                 </td>
diff --git a/resources/views/email/template/admin.blade.php b/resources/views/email/template/admin.blade.php
index c1398cabcf..fb5372cf00 100644
--- a/resources/views/email/template/admin.blade.php
+++ b/resources/views/email/template/admin.blade.php
@@ -151,9 +151,9 @@
                     <td align="center">
                         <div class="dark-bg"
                              style="background-color:#f9f9f9; padding-bottom: 20px; margin-top:20px;">
-    
+                            @if($logo)
                             <img class="" src="{{ $logo ?? '' }}" width="50%" height="" alt="alt_text" border="0" style="width: 50%; max-width: 570px; height: auto; display: block;" class="g-img">
-
+                            @endif
                         </div>
                     </td>
                 </tr>