Merge pull request #3955 from turbo124/v2

Fixes for email templates
2025-07-09 03:14:30 -04:00 · 2020-08-03 17:57:10 +10:00 · 2020-08-03 17:57:10 +10:00 · c8e24a03bc
commit c8e24a03bc
parent e5ceb92213 191a31e0a5
10 changed files with 33 additions and 12 deletions
--- a/app/DataMapper/EmailTemplateDefaults.php
+++ b/app/DataMapper/EmailTemplateDefaults.php
@ -119,7 +119,9 @@ class EmailTemplateDefaults
            'allow_unsafe_links' => false,
        ]);

-        return $converter->convertToHtml(self::transformText('invoice_message'));
+        $invoice_message = '<p>' . self::transformText('invoice_message') . '</p><br><br><p>$view_link</p>';
+        return $invoice_message;
+        //return $converter->convertToHtml($invoice_message);

    }

--- a/app/Http/Controllers/TemplateController.php
+++ b/app/Http/Controllers/TemplateController.php
@ -16,6 +16,7 @@ use App\Utils\TemplateEngine;
 use App\Utils\Traits\MakesHash;
 use App\Utils\Traits\MakesInvoiceHtml;
 use App\Utils\Traits\MakesTemplateData;
+use Illuminate\Notifications\Messages\MailMessage;
 use League\CommonMark\CommonMarkConverter;

 class TemplateController extends BaseController
@ -93,6 +94,8 @@ class TemplateController extends BaseController

        $data = (new TemplateEngine($body, $subject, $entity, $entity_id, $template))->build();
        
+
        return response()->json($data, 200);
    }
+
 }
--- a/app/Notifications/BaseNotification.php
+++ b/app/Notifications/BaseNotification.php
@ -131,6 +131,12 @@ class BaseNotification extends Notification implements ShouldQueue
            case 'custom':
                return  'email.template.custom';
                break;
+            case 'light':
+                return  'email.template.light';
+                break;
+            case 'dark':
+                return  'email.template.dark';
+                break;
            default:
                return 'email.admin.generic_email';
                break;
--- a/app/Notifications/SendGenericNotification.php
+++ b/app/Notifications/SendGenericNotification.php
@ -77,8 +77,8 @@ class SendGenericNotification extends BaseNotification implements ShouldQueue
        $mail_message = (new MailMessage)
                        ->withSwiftMessage(function ($message) {
                            $message->getHeaders()->addTextHeader('Tag', $this->invitation->company->company_key);
-                        //})->markdown($this->getTemplateView(), $this->buildMailMessageData());
-                        })->markdown('email.template.plain', $this->buildMailMessageData());
+                        })->markdown($this->getTemplateView(), $this->buildMailMessageData());
+                        //})->markdown('email.template.plain', $this->buildMailMessageData());

        $mail_message = $this->buildMailMessageSettings($mail_message);

--- a/app/Utils/TemplateEngine.php
+++ b/app/Utils/TemplateEngine.php
@ -126,6 +126,7 @@ class TemplateEngine
        ]);

        $this->body = $converter->convertToHtml($this->body);
+
    }

    private function entityValues($contact)
@ -154,6 +155,7 @@ class TemplateEngine
        $data['title'] = '';
        $data['body'] = '$body';
        $data['footer'] = '';
+        $data['signature'] = $this->settings_entity->getSetting('email_signature');

        if ($email_style == 'custom') {
            $wrapper = $this->settings_entity->getSetting('email_style_custom');
@ -165,8 +167,9 @@ class TemplateEngine
                $wrapper = '';
            }
        } else {
-            $wrapper = $this->getTemplate();
            $wrapper = view($this->getTemplatePath($email_style), $data)->render();
+            $injection = '<head><link rel="stylesheet" type="text/css" property="stylesheet" href="'.config('ninja.app_url').'/css/tailwind-1.2.0.css">';
+            $wrapper = str_replace('<head>',$injection ,$wrapper);
        }

        $data = [
--- a/resources/views/email/components/header.blade.php
+++ b/resources/views/email/components/header.blade.php
@ -9,6 +9,6 @@
        {{ $slot }}
    </h1>
    @isset($p)
-        <p>{{ $p }}</p>
+        {!! $p !!}
    @endisset
 </div>
--- a/resources/views/email/template/light.blade.php
+++ b/resources/views/email/template/light.blade.php
@ -19,5 +19,12 @@

@endslot

+@slot('below_card')
+
+    @if($signature)
+        {{ $signature }}
+    @endif
+
+@endslot    

@endcomponent
--- a/resources/views/email/template/master.blade.php
+++ b/resources/views/email/template/master.blade.php
@ -26,13 +26,13 @@
        {{ $header }}
        <div id="text" class="px-10 py-6 flex flex-col">
          @isset($greeting)
-            <p>{{ $greeting }}</p>
+            {{ $greeting }}
          @endisset
-          <p>
+          
            {{ $slot }}
-          </p>
+          
          @isset($signature)
-            <p>{{ $signature }}</p>
+            {{ $signature }}
          @endisset
        </div>
      </div>
--- a/resources/views/email/template/plain.blade.php
+++ b/resources/views/email/template/plain.blade.php
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ App::getLocale() }}">
+<html lang="{{ App::getLocale() }}" class="bg-white">
 <head>
 	<meta charset="utf-8">
 </head>
--- a/tests/Feature/GroupSettingTest.php
+++ b/tests/Feature/GroupSettingTest.php
@ -88,8 +88,8 @@ class GroupSettingTest extends TestCase
        $response->assertStatus(200);

        $arr = $response->json();
-
-        $this->assertNotNull($arr['data']['archived_at']);
+        
+        $this->assertNotNull($arr['data'][0]['archived_at']);
    }

 }