diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index 820d0cd..9670023 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -1,8 +1,4 @@ download, format = xml | pdf - namespace App\Http\Controllers; use Inertia\Inertia; @@ -192,7 +188,9 @@ public function preview($id) 'isPDF' => false, 'fontPath' => '/storage/fonts', 'giroCode' => $giroCode, - 'totalPages' => 1 + 'totalPages' => 1, + 'companyName' => Setting::get('company.name'), + 'companyAddress' => Setting::get('company.address') ]); } @@ -665,8 +663,6 @@ public function remind(Request $request, int $id) $to = $request->query('to'); $cc = $request->query('cc'); - // TODO: get from settings - $bcc = 'buchhaltung@tooloop.de'; if (empty($to) || !filter_var($to, FILTER_VALIDATE_EMAIL)) { return response()->json([ @@ -679,10 +675,9 @@ public function remind(Request $request, int $id) 'error' => 'Keine gültige E_Mail-Adresse ' . $cc ], 400); } - Mail::to($to) ->cc($cc) - ->bcc($cc) + ->bcc(Setting::get('company.email')) ->send(new Reminder($invoice)); // return new Reminder($invoice); } @@ -738,7 +733,7 @@ protected function generateInvoiceNumber() // Setze neue Nummer ins Format (bei Bedarf Padding hier ergänzen) return str_replace('{number}', (string)$newNumber, $format); } - + /** * Generate a GiroCode for the invoice diff --git a/app/Mail/OrderConfirmation.php b/app/Mail/OrderConfirmation.php index 2ae95cc..1aa425d 100644 --- a/app/Mail/OrderConfirmation.php +++ b/app/Mail/OrderConfirmation.php @@ -2,6 +2,7 @@ namespace App\Mail; +use App\Models\Setting; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; @@ -24,12 +25,16 @@ public function __construct(public array $offer) {} */ public function envelope(): Envelope { + $companyEmail = Setting::get('company.email'); + return new Envelope( - // TODO: get from settings - from: new Address('buchhaltung@tooloop.de', 'Tooloop Multimedia'), - bcc: [new Address('daniel.stock@tooloop.de', 'Daniel Stock')], + from: new Address($companyEmail, Setting::get('company.name')), + // TODO: get current user name + bcc: [new Address($companyEmail, 'Daniel Stock')], subject: 'Auftragsbestätigung', ); + + } /** diff --git a/app/Mail/Reminder.php b/app/Mail/Reminder.php index fc1cc61..ea08027 100644 --- a/app/Mail/Reminder.php +++ b/app/Mail/Reminder.php @@ -3,6 +3,7 @@ namespace App\Mail; use App\Models\Invoice; +use App\Models\Setting; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; @@ -26,8 +27,7 @@ public function __construct(public array $invoice) {} public function envelope(): Envelope { return new Envelope( - // TODO: get from settings - from: new Address('buchhaltung@tooloop.de', 'Tooloop Multimedia'), + from: new Address(Setting::get('company.email'), Setting::get('company.name')), subject: 'Zahlungserinnerung', ); } diff --git a/app/Models/Setting.php b/app/Models/Setting.php index 97b5262..0d04af9 100644 --- a/app/Models/Setting.php +++ b/app/Models/Setting.php @@ -23,4 +23,8 @@ public static function allKeyValue(): array { return self::query()->pluck('value', 'key')->toArray(); } + + public static function get(string $key): string { + return Setting::where('key', $key)->value('value'); + } } \ No newline at end of file diff --git a/resources/views/invoice.blade.php b/resources/views/invoice.blade.php index 7ddd545..49e6492 100644 --- a/resources/views/invoice.blade.php +++ b/resources/views/invoice.blade.php @@ -54,8 +54,13 @@
- - Tooloop Multimedia Daniel Stock, Rehmstraße 4, 86161 Augsburg + {{ $companyname }}, + {{ $companyAddress['lineOne'] }}, + @if($companyAddress['lineOne']) + {{ $companyAddress['lineTwo'] }} + @endif + {{ $companyAddress['postalCode'] }} + {{ $companyAddress['city'] }}
{{ $invoice['customer']['companyName'] }}