wip

binaryk · binaryk · commit 372d0b40d5b7 · 2020-09-02T19:24:49.000+03:00
diff --git a/config/mailator.php b/config/mailator.php
@@ -44,7 +44,7 @@
         /**
          > The email layout, used to wrap the template.
          */
-        'template_layout' => 'laravel-mailator::mails.laravel',
+        'template_layout' => 'laravel-mailator::laravel',
 
         /**
         > The default list with replacers for the template.
diff --git a/resources/views/publish/laravel.blade.php b/resources/views/publish/laravel.blade.php
diff --git a/src/LaravelMailatorServiceProvider.php b/src/LaravelMailatorServiceProvider.php
@@ -51,7 +51,7 @@ public function boot()
             }
             // Publishing the views.
             $this->publishes([
-                __DIR__.'/../resources/views' => resource_path('views/vendor/laravel-mailator'),
+                __DIR__.'/../resources/views/publish' => resource_path('views/vendor/laravel-mailator'),
             ], 'mailator-views');
 
             // Publishing assets.
diff --git a/src/Support/WithMailTemplate.php b/src/Support/WithMailTemplate.php
@@ -62,7 +62,7 @@ public function useLayout(string $layout)
 
     public function getLayout()
     {
-        return $this->layout ?? config('mailator.templates.layout', 'laravel-mailator::mails.laravel');
+        return $this->layout ?? config('mailator.templates.template_layout', 'laravel-mailator::laravel');
     }
 
     public function getTemplate(): ?MailTemplateable

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function boot()`
`51`	`51`	`}`
`52`	`52`	`// Publishing the views.`
`53`	`53`	`$this->publishes([`
`54`		`- __DIR__.'/../resources/views' => resource_path('views/vendor/laravel-mailator'),`
	`54`	`+ __DIR__.'/../resources/views/publish' => resource_path('views/vendor/laravel-mailator'),`
`55`	`55`	`], 'mailator-views');`
`56`	`56`
`57`	`57`	`// Publishing assets.`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function useLayout(string $layout)`
`62`	`62`
`63`	`63`	`public function getLayout()`
`64`	`64`	`{`
`65`		`- return $this->layout ?? config('mailator.templates.layout', 'laravel-mailator::mails.laravel');`
	`65`	`+ return $this->layout ?? config('mailator.templates.template_layout', 'laravel-mailator::laravel');`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public function getTemplate(): ?MailTemplateable`