diff --git a/resources/views/tex/bill.tex b/resources/views/tex/bill.tex index 698b4837..5075a056 100644 --- a/resources/views/tex/bill.tex +++ b/resources/views/tex/bill.tex @@ -1,6 +1,14 @@ \documentclass[silvaletter,12pt]{scrlttr2} -@include('tex.letter-header') +\setkomavar{subject}{<<< $subject >>>} +\setkomavar{fromname}[<<<$settings->from>>>]{<<<$settings->from_long>>>} +\setkomavar{frommobilephone}[Mobiltelefon: ]{<<<$settings->mobile>>>} +\setkomavar{fromemail}[E-Mail: ]{<<<$settings->email>>>} +\setkomavar{fromurl}[Website: ]{<<<$settings->website>>>} +\setkomavar{fromaddress}{<<<$settings->address>>>} +\setkomavar{place}{<<<$settings->place>>>} +\setkomavar{fromzipcode}{<<<$settings->zip>>>} +\setkomavar{fromlogo}{\includegraphics[width=2cm]{logo.png}} % stammeslogo \begin{document} @foreach($pages as $page) diff --git a/resources/views/tex/letter-header.blade.php b/resources/views/tex/letter-header.blade.php deleted file mode 100644 index fa6d59d7..00000000 --- a/resources/views/tex/letter-header.blade.php +++ /dev/null @@ -1,9 +0,0 @@ -\setkomavar{subject}{{{ $subject }}} -\setkomavar{fromname}[{{ $settings->from}}]{{{ $settings->from_long}}} -\setkomavar{frommobilephone}[Mobiltelefon: ]{{{ $settings->mobile}}} -\setkomavar{fromemail}[E-Mail: ]{{{ $settings->email}}} -\setkomavar{fromurl}[Website: ]{{{ $settings->website}}} -\setkomavar{fromaddress}{{{ $settings->address}}} -\setkomavar{place}{{{ $settings->place}}} -\setkomavar{fromzipcode}{{{ $settings->zip}}} -\setkomavar{fromlogo}{\includegraphics[width=2cm]{logo.png}} % stammeslogo diff --git a/resources/views/tex/remember.tex b/resources/views/tex/remember.tex index 5d170d9f..0e9cfb43 100644 --- a/resources/views/tex/remember.tex +++ b/resources/views/tex/remember.tex @@ -1,6 +1,14 @@ \documentclass[silvaletter,12pt]{scrlttr2} -@include('tex.letter-header') +\setkomavar{subject}{<<< $subject >>>} +\setkomavar{fromname}[<<<$settings->from>>>]{<<<$settings->from_long>>>} +\setkomavar{frommobilephone}[Mobiltelefon: ]{<<<$settings->mobile>>>} +\setkomavar{fromemail}[E-Mail: ]{<<<$settings->email>>>} +\setkomavar{fromurl}[Website: ]{<<<$settings->website>>>} +\setkomavar{fromaddress}{<<<$settings->address>>>} +\setkomavar{place}{<<<$settings->place>>>} +\setkomavar{fromzipcode}{<<<$settings->zip>>>} +\setkomavar{fromlogo}{\includegraphics[width=2cm]{logo.png}} % stammeslogo \begin{document} @foreach($pages as $page) diff --git a/tests/Feature/Sendpayment/SendpaymentTest.php b/tests/Feature/Sendpayment/SendpaymentTest.php index 72586d92..030b2b62 100644 --- a/tests/Feature/Sendpayment/SendpaymentTest.php +++ b/tests/Feature/Sendpayment/SendpaymentTest.php @@ -3,10 +3,12 @@ namespace Tests\Feature\Sendpayment; use App\Letter\BillDocument; +use App\Letter\LetterSettings; use App\Member\Member; use App\Payment\Payment; use App\Payment\Status; use Illuminate\Foundation\Testing\DatabaseTransactions; +use Tests\RequestFactories\LetterSettingsFake; use Tests\TestCase; use Zoomyboy\Tex\Tex; @@ -29,6 +31,7 @@ class SendpaymentTest extends TestCase public function testItCanCreatePdfPayments(): void { + LetterSettings::fake(LetterSettingsFake::new()->create()); Tex::spy(); $this->withoutExceptionHandling(); $this->login()->loginNami(); diff --git a/tests/RequestFactories/LetterSettingsFake.php b/tests/RequestFactories/LetterSettingsFake.php new file mode 100644 index 00000000..bc504733 --- /dev/null +++ b/tests/RequestFactories/LetterSettingsFake.php @@ -0,0 +1,24 @@ + 'langer Stammesname', + 'from' => 'Stammeskurz', + 'mobile' => '+49 176 55555', + 'email' => 'max@muster.de', + 'website' => 'https://example.com', + 'address' => 'Musterstr 4', + 'place' => 'Münster', + 'zip' => '12345', + 'iban' => 'DE444', + 'bic' => 'SOLSSSSS', + ]; + } +}