Package and individual mail sender, new report, and other changes

Co-authored-by: Copilot <copilot@github.com>

app/Http/Controllers/Admin/EmailLogController.php

@@ -6,6 +6,7 @@
 use App\Models\EmailLog;
 use App\Models\EmailTemplate;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
 use Inertia\Response;
@@ -69,4 +70,15 @@ public function show(EmailLog $emailLog): Response
             'log' => $emailLog,
         ]);
     }
+
+    public function body(EmailLog $emailLog): JsonResponse
+    {
+        $this->authorize('viewAny', EmailTemplate::class);
+
+        $emailLog->load('body');
+
+        return response()->json([
+            'html' => $emailLog->body?->body_html ?? '',
+        ]);
+    }
 }

app/Http/Controllers/Admin/EmailTemplateController.php

@@ -13,6 +13,7 @@
 use App\Models\EmailLog;
 use App\Models\EmailLogStatus;
 use App\Models\EmailTemplate;
+use App\Models\MailProfile;
 use App\Services\EmailTemplateRenderer;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Http\JsonResponse;
@@ -55,8 +56,14 @@ public function create(): Response
     {
         $this->authorize('create', EmailTemplate::class);
 
+        $actions = \App\Models\Action::query()
+            ->with(['decisions:id,name'])
+            ->orderBy('name')
+            ->get(['id', 'name']);
+
         return Inertia::render('Admin/EmailTemplates/Edit', [
             'template' => null,
+            'actions' => $actions,
         ]);
     }
 
@@ -93,7 +100,7 @@ public function preview(Request $request, EmailTemplate $emailTemplate): JsonRes
         // Context resolution (shared logic with renderFinalHtml)
         $ctx = [];
         if ($id = $request->integer('activity_id')) {
-            $activity = Activity::query()->with(['action', 'decision', 'contract.clientCase.client.person', 'clientCase.client.person'])->find($id);
+            $activity = Activity::query()->with(['action', 'decision', 'contract.clientCase.client.person', 'contract.account', 'clientCase.client.person'])->find($id);
             if ($activity) {
                 $ctx['activity'] = $activity;
                 // Derive base entities from activity when not explicitly provided
@@ -110,7 +117,7 @@ public function preview(Request $request, EmailTemplate $emailTemplate): JsonRes
             }
         }
         if ($id = $request->integer('contract_id')) {
-            $contract = Contract::query()->with(['clientCase.client.person'])->find($id);
+            $contract = Contract::query()->with(['clientCase.client.person', 'account'])->find($id);
             if ($contract) {
                 $ctx['contract'] = $contract;
                 if ($contract->clientCase) {
@@ -140,6 +147,7 @@ public function preview(Request $request, EmailTemplate $emailTemplate): JsonRes
             }
         }
         $ctx['extra'] = (array) $request->input('extra', []);
+        $ctx['mail_profile'] = MailProfile::query()->orderBy('active', 'desc')->orderBy('priority')->orderBy('id')->first();
 
         $rendered = $renderer->render([
             'subject' => $subject,
@@ -161,8 +169,14 @@ public function edit(EmailTemplate $emailTemplate): Response
             $q->select(['id', 'documentable_id', 'documentable_type', 'name', 'path', 'size', 'created_at']);
         }]);
 
+        $actions = \App\Models\Action::query()
+            ->with(['decisions:id,name'])
+            ->orderBy('name')
+            ->get(['id', 'name']);
+
         return Inertia::render('Admin/EmailTemplates/Edit', [
             'template' => $emailTemplate,
+            'actions' => $actions,
         ]);
     }
 
@@ -181,7 +195,7 @@ public function sendTest(Request $request, EmailTemplate $emailTemplate)
         // Context resolution
         $ctx = [];
         if ($id = $request->integer('activity_id')) {
-            $activity = Activity::query()->with(['action', 'decision', 'contract.clientCase.client.person', 'clientCase.client.person'])->find($id);
+            $activity = Activity::query()->with(['action', 'decision', 'contract.clientCase.client.person', 'contract.account', 'clientCase.client.person'])->find($id);
             if ($activity) {
                 $ctx['activity'] = $activity;
                 if ($activity->contract && ! isset($ctx['contract'])) {
@@ -197,7 +211,7 @@ public function sendTest(Request $request, EmailTemplate $emailTemplate)
             }
         }
         if ($id = $request->integer('contract_id')) {
-            $contract = Contract::query()->with(['clientCase.client.person'])->find($id);
+            $contract = Contract::query()->with(['clientCase.client.person', 'account'])->find($id);
             if ($contract) {
                 $ctx['contract'] = $contract;
                 if ($contract->clientCase) {
@@ -227,6 +241,7 @@ public function sendTest(Request $request, EmailTemplate $emailTemplate)
             }
         }
         $ctx['extra'] = (array) $request->input('extra', []);
+        $ctx['mail_profile'] = MailProfile::query()->orderBy('active', 'desc')->orderBy('priority')->orderBy('id')->first();
 
         // Render preview values; we store a minimal snapshot on the log
         $rendered = $renderer->render([
@@ -293,7 +308,7 @@ public function renderFinalHtml(Request $request, EmailTemplate $emailTemplate)
         // Context resolution (same as sendTest)
         $ctx = [];
         if ($id = $request->integer('activity_id')) {
-            $activity = Activity::query()->with(['action', 'decision', 'contract.clientCase.client.person', 'clientCase.client.person'])->find($id);
+            $activity = Activity::query()->with(['action', 'decision', 'contract.clientCase.client.person', 'contract.account', 'clientCase.client.person'])->find($id);
             if ($activity) {
                 $ctx['activity'] = $activity;
                 if ($activity->contract && ! isset($ctx['contract'])) {
@@ -309,7 +324,7 @@ public function renderFinalHtml(Request $request, EmailTemplate $emailTemplate)
             }
         }
         if ($id = $request->integer('contract_id')) {
-            $contract = Contract::query()->with(['clientCase.client.person'])->find($id);
+            $contract = Contract::query()->with(['clientCase.client.person', 'account'])->find($id);
             if ($contract) {
                 $ctx['contract'] = $contract;
                 if ($contract->clientCase) {
@@ -339,6 +354,7 @@ public function renderFinalHtml(Request $request, EmailTemplate $emailTemplate)
             }
         }
         $ctx['extra'] = (array) $request->input('extra', []);
+        $ctx['mail_profile'] = MailProfile::query()->orderBy('active', 'desc')->orderBy('priority')->orderBy('id')->first();
 
         $rendered = $renderer->render([
             'subject' => $subject,

app/Http/Controllers/Admin/MailProfileController.php

@@ -26,7 +26,7 @@ public function index(): Response
             ->orderBy('priority')
             ->orderBy('id')
             ->get([
-                'id', 'name', 'active', 'host', 'port', 'encryption', 'from_address', 'priority', 'last_success_at', 'last_error_at', 'last_error_message', 'test_status', 'test_checked_at',
+                'id', 'name', 'active', 'host', 'port', 'username', 'from_name', 'encryption', 'from_address', 'priority', 'signature', 'last_success_at', 'last_error_at', 'last_error_message', 'test_status', 'test_checked_at',
             ]);
 
         return Inertia::render('Admin/MailProfiles/Index', [

app/Http/Controllers/Admin/PackageController.php

@@ -3,13 +3,16 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
+use App\Http\Requests\StoreEmailPackageFromContractsRequest;
 use App\Http\Requests\StorePackageFromContractsRequest;
 use App\Http\Requests\StorePackageRequest;
+use App\Jobs\PackageItemEmailJob;
 use App\Jobs\PackageItemSmsJob;
 use App\Models\Contract;
 use App\Models\Package;
 use App\Models\PackageItem;
 use App\Models\SmsTemplate;
+use App\Services\Contact\EmailSelector;
 use App\Services\Contact\PhoneSelector;
 use App\Services\Sms\SmsService;
 use Illuminate\Http\RedirectResponse;
@@ -21,20 +24,40 @@
 
 class PackageController extends Controller
 {
-    public function index(Request $request): Response
+    public function landing(): Response
+    {
+        return Inertia::render('Packages/Index');
+    }
+
+    public function smsIndex(Request $request): Response
     {
         $perPage = $request->input('per_page') ?? 25;
 
         $packages = Package::query()
+            ->where('type', Package::TYPE_SMS)
             ->latest('id')
             ->paginate($perPage);
 
-        return Inertia::render('Packages/Index', [
+        return Inertia::render('Packages/Sms/Index', [
             'packages' => $packages,
         ]);
     }
 
-    public function create(Request $request): Response
+    public function emailIndex(Request $request): Response
+    {
+        $perPage = $request->input('per_page') ?? 25;
+
+        $packages = Package::query()
+            ->where('type', Package::TYPE_EMAIL)
+            ->latest('id')
+            ->paginate($perPage);
+
+        return Inertia::render('Packages/Mail/Index', [
+            'packages' => $packages,
+        ]);
+    }
+
+    public function smsCreate(Request $request): Response
     {
         // Minimal lookups for create form (active only)
         $profiles = \App\Models\SmsProfile::query()
@@ -69,7 +92,7 @@ public function create(Request $request): Response
             })
             ->values();
 
-        return Inertia::render('Packages/Create', [
+        return Inertia::render('Packages/Sms/Create', [
             'profiles' => $profiles,
             'senders' => $senders,
             'templates' => $templates,
@@ -78,7 +101,53 @@ public function create(Request $request): Response
         ]);
     }
 
-    public function show(Package $package, SmsService $sms): Response
+    public function emailCreate(): Response
+    {
+        $emailTemplates = \App\Models\EmailTemplate::query()
+            ->where('active', true)
+            ->where('client', false)
+            ->orderBy('name')
+            ->get(['id', 'name', 'subject_template', 'text_template', 'html_template'])
+            ->map(fn ($t) => [
+                'id' => $t->id,
+                'name' => $t->name,
+                'subject_template' => $t->subject_template,
+                'text_template' => $t->text_template,
+                'has_body_text' => (bool) preg_match('/{{\s*body_text\s*}}/', (string) $t->html_template),
+            ])->values();
+        $mailProfiles = \App\Models\MailProfile::query()
+            ->where('active', true)
+            ->orderBy('priority')
+            ->get(['id', 'name']);
+        $segments = \App\Models\Segment::query()
+            ->where('active', true)
+            ->where('exclude', false)
+            ->orderBy('name')
+            ->get(['id', 'name']);
+        $clients = \App\Models\Client::query()
+            ->with(['person' => function ($q) {
+                $q->select('id', 'uuid', 'full_name');
+            }])
+            ->latest('id')
+            ->get(['id', 'uuid', 'person_id'])
+            ->map(function ($c) {
+                return [
+                    'id' => $c->id,
+                    'uuid' => $c->uuid,
+                    'name' => $c->person?->full_name ?? ('Client #'.$c->id),
+                ];
+            })
+            ->values();
+
+        return Inertia::render('Packages/Mail/Create', [
+            'emailTemplates' => $emailTemplates,
+            'mailProfiles' => $mailProfiles,
+            'segments' => $segments,
+            'clients' => $clients,
+        ]);
+    }
+
+    public function smsShow(Package $package, SmsService $sms): Response
     {
         $items = $package->items()->latest('id')->paginate(25);
 
@@ -212,13 +281,23 @@ public function show(Package $package, SmsService $sms): Response
             }
         }
 
-        return Inertia::render('Packages/Show', [
+        return Inertia::render('Packages/Sms/Show', [
             'package' => $package,
             'items' => $items,
             'preview' => $preview,
         ]);
     }
 
+    public function emailShow(Package $package): Response
+    {
+        $items = $package->items()->latest('id')->paginate(25);
+
+        return Inertia::render('Packages/Mail/Show', [
+            'package' => $package,
+            'items' => $items,
+        ]);
+    }
+
     public function store(StorePackageRequest $request): RedirectResponse
     {
         $data = $request->validated();
@@ -260,7 +339,11 @@ public function dispatch(Package $package): RedirectResponse
             return back()->with('error', 'Package not in a dispatchable state.');
         }
 
-        $jobs = $package->items()->whereIn('status', ['queued', 'failed'])->get()->map(function (PackageItem $item) {
+        $jobs = $package->items()->whereIn('status', ['queued', 'failed'])->get()->map(function (PackageItem $item) use ($package) {
+            if ($package->type === Package::TYPE_EMAIL) {
+                return new PackageItemEmailJob($item->id);
+            }
+
             return new PackageItemSmsJob($item->id);
         })->all();
 
@@ -286,7 +369,7 @@ public function dispatch(Package $package): RedirectResponse
                     $package->save();
                 }
             })
-            ->onQueue('sms')
+            ->onQueue($package->type === Package::TYPE_EMAIL ? 'email' : 'sms')
             ->dispatch();
 
         return back()->with('success', 'Package dispatched');
@@ -445,6 +528,7 @@ public function contracts(Request $request, PhoneSelector $selector): \Illuminat
                     'number' => $phone->nu,
                     'validated' => $phone->validated,
                     'type' => $phone->phone_type?->value,
+                    'description' => $phone->description,
                 ] : null,
                 'no_phone_reason' => $phone ? null : ($selected['reason'] ?? 'unknown'),
             ];
@@ -541,6 +625,213 @@ public function storeFromContracts(StorePackageFromContractsRequest $request, Ph
         return back()->with('success', 'Package created from contracts');
     }
 
+    /**
+     * List contracts with selected email per person (for email packages).
+     */
+    public function contractsForEmail(Request $request, EmailSelector $selector): \Illuminate\Http\JsonResponse
+    {
+        $request->validate([
+            'segment_id' => ['nullable', 'integer', 'exists:segments,id'],
+            'q' => ['nullable', 'string'],
+            'client_id' => ['nullable', 'integer', 'exists:clients,id'],
+            'only_verified' => ['nullable', 'boolean'],
+            'only_with_email' => ['nullable', 'boolean'],
+            'start_date_from' => ['nullable', 'date'],
+            'start_date_to' => ['nullable', 'date'],
+            'promise_date_from' => ['nullable', 'date'],
+            'promise_date_to' => ['nullable', 'date'],
+        ]);
+
+        $segmentId = $request->input('segment_id') ? (int) $request->input('segment_id') : null;
+
+        $query = Contract::query()
+            ->with([
+                'clientCase.person.emails',
+                'clientCase.client.person',
+                'account',
+                'segments:id,name',
+            ])
+            ->select('contracts.*')
+            ->latest('contracts.id');
+
+        if ($segmentId) {
+            $query->join('contract_segment', function ($j) use ($segmentId) {
+                $j->on('contract_segment.contract_id', '=', 'contracts.id')
+                    ->where('contract_segment.segment_id', '=', $segmentId)
+                    ->where('contract_segment.active', true);
+            });
+        } else {
+            $query->whereExists(fn ($exist) => $exist->select(\DB::raw(1))
+                ->from('contract_segment')
+                ->join('segments', 'segments.id', '=', 'contract_segment.segment_id')
+                ->where('contract_segment.active', true)
+                ->where('segments.exclude', false)
+                ->whereColumn('contract_segment.contract_id', 'contracts.id')
+            );
+        }
+
+        if ($q = trim((string) $request->input('q'))) {
+            $query->where('contracts.reference', 'ILIKE', "%{$q}%");
+        }
+
+        if ($clientId = $request->integer('client_id')) {
+            $query->join('client_cases', 'client_cases.id', '=', 'contracts.client_case_id')
+                ->where('client_cases.client_id', $clientId);
+        }
+
+        if ($startDateFrom = $request->input('start_date_from')) {
+            $query->where('contracts.start_date', '>=', $startDateFrom);
+        }
+
+        if ($startDateTo = $request->input('start_date_to')) {
+            $query->where('contracts.start_date', '<=', $startDateTo);
+        }
+
+        $promiseDateFrom = $request->input('promise_date_from');
+        $promiseDateTo = $request->input('promise_date_to');
+
+        if ($promiseDateFrom || $promiseDateTo) {
+            $query->whereHas('account', function ($q) use ($promiseDateFrom, $promiseDateTo) {
+                if ($promiseDateFrom) {
+                    $q->where('promise_date', '>=', $promiseDateFrom);
+                }
+                if ($promiseDateTo) {
+                    $q->where('promise_date', '<=', $promiseDateTo);
+                }
+            });
+        }
+
+        if ($request->boolean('only_verified')) {
+            $query->whereHas('clientCase.person.emails', function ($q) {
+                $q->where('is_active', true)->whereNotNull('verified_at');
+            });
+        }
+
+        if ($request->boolean('only_with_email')) {
+            $query->whereHas('clientCase.person.emails', function ($q) {
+                $q->where('is_active', true);
+            });
+        }
+
+        $contracts = $query->limit(500)->get();
+
+        $data = collect($contracts)->map(function (Contract $contract) use ($selector) {
+            $person = $contract->clientCase?->person;
+            $selected = $person ? $selector->selectForPerson($person) : ['email' => null, 'reason' => 'no_person'];
+            $email = $selected['email'];
+            $clientPerson = $contract->clientCase?->client?->person;
+            $segment = collect($contract->segments)->last();
+
+            return [
+                'id' => $contract->id,
+                'uuid' => $contract->uuid,
+                'reference' => $contract->reference,
+                'start_date' => $contract->start_date,
+                'promise_date' => $contract->account?->promise_date,
+                'case' => [
+                    'id' => $contract->clientCase?->id,
+                    'uuid' => $contract->clientCase?->uuid,
+                ],
+                'person' => [
+                    'id' => $person?->id,
+                    'uuid' => $person?->uuid,
+                    'full_name' => $person?->full_name,
+                ],
+                'segment' => $segment,
+                'client' => $clientPerson ? [
+                    'id' => $contract->clientCase?->client?->id,
+                    'uuid' => $contract->clientCase?->client?->uuid,
+                    'name' => $clientPerson->full_name,
+                ] : null,
+                'selected_email' => $email ? [
+                    'id' => $email->id,
+                    'value' => $email->value,
+                    'is_primary' => $email->is_primary,
+                    'verified' => $email->verified_at !== null,
+                    'label' => $email->label,
+                ] : null,
+                'no_email_reason' => $email ? null : ($selected['reason'] ?? 'unknown'),
+            ];
+        });
+
+        return response()->json(['data' => $data]);
+    }
+
+    /**
+     * Create an email package from a list of contracts by selecting recipient emails.
+     */
+    public function storeEmailFromContracts(StoreEmailPackageFromContractsRequest $request, EmailSelector $selector): RedirectResponse
+    {
+        $data = $request->validated();
+
+        $contracts = Contract::query()
+            ->with(['clientCase.person', 'account.type'])
+            ->whereIn('id', $data['contract_ids'])
+            ->get();
+
+        $items = [];
+        $skipped = 0;
+        foreach ($contracts as $contract) {
+            $person = $contract->clientCase?->person;
+            if (! $person) {
+                $skipped++;
+
+                continue;
+            }
+            $selected = $selector->selectForPerson($person);
+            /** @var ?\App\Models\Email $email */
+            $email = $selected['email'];
+            if (! $email) {
+                $skipped++;
+
+                continue;
+            }
+            $items[] = [
+                'email' => $email->value,
+                'email_id' => $email->id,
+                'payload' => $data['payload'] ?? [],
+                'contract_id' => $contract->id,
+                'account_id' => $contract->account?->id,
+            ];
+        }
+
+        if (empty($items)) {
+            return back()->with('error', 'No recipients found for selected contracts.');
+        }
+
+        $package = Package::query()->create([
+            'uuid' => (string) Str::uuid(),
+            'type' => Package::TYPE_EMAIL,
+            'status' => Package::STATUS_DRAFT,
+            'name' => $data['name'] ?? null,
+            'description' => $data['description'] ?? null,
+            'meta' => array_merge($data['meta'] ?? [], [
+                'source' => 'contracts',
+                'skipped' => $skipped,
+            ]),
+            'created_by' => optional($request->user())->id,
+        ]);
+
+        $packageItems = collect($items)->map(function (array $row) {
+            return new PackageItem([
+                'status' => 'queued',
+                'target_json' => [
+                    'email' => $row['email'],
+                    'email_id' => $row['email_id'],
+                    'contract_id' => $row['contract_id'] ?? null,
+                    'account_id' => $row['account_id'] ?? null,
+                ],
+                'payload_json' => $row['payload'] ?? [],
+            ]);
+        });
+
+        $package->items()->saveMany($packageItems);
+        $package->total_items = $packageItems->count();
+        $package->save();
+
+        return back()->with('success', 'Email package created from contracts');
+    }
+
     /**
      * Flatten nested meta structure into dot-notation key-value pairs.
      * Extracts 'value' from objects with {title, value, type} structure.

app/Http/Controllers/ClientCaseContoller.php

@@ -921,6 +921,18 @@ public function show(ClientCase $clientCase)
                 ->select(['id', 'name', 'content', 'allow_custom_body'])
                 ->orderBy('name')
                 ->get(),
+            'email_templates' => \App\Models\EmailTemplate::query()
+                ->select(['id', 'name', 'subject_template', 'text_template', 'action_id', 'decision_id'])
+                ->where('active', true)
+                ->where('client', false)
+                ->orderBy('name')
+                ->get(),
+            'mail_profiles' => \App\Models\MailProfile::query()
+                ->select(['id', 'name'])
+                ->where('active', true)
+                ->orderBy('priority')
+                ->orderBy('name')
+                ->get(),
             'auto_mail_decisions' => \App\Models\Decision::query()->where('auto_mail', true)->orderBy('name')->get(['id', 'name']),
         ]);
     }
@@ -1575,6 +1587,161 @@ public function previewSms(ClientCase $clientCase, Request $request, SmsService
      * Extracts 'value' from objects with {title, value, type} structure.
      * Also creates direct access aliases for nested fields (skipping numeric keys).
      */
+    /**
+     * Render an email template preview with context from the client case.
+     */
+    public function previewEmailForEmail(ClientCase $clientCase, Request $request, int $email_id): \Illuminate\Http\JsonResponse
+    {
+        $validated = $request->validate([
+            'template_id' => ['required', 'integer', 'exists:email_templates,id'],
+            'contract_uuid' => ['sometimes', 'nullable', 'uuid'],
+            'body_text' => ['sometimes', 'nullable', 'string', 'max:10000'],
+        ]);
+
+        $email = \App\Models\Email::query()
+            ->where('id', $email_id)
+            ->where('person_id', $clientCase->person_id)
+            ->firstOrFail();
+
+        $template = \App\Models\EmailTemplate::findOrFail((int) $validated['template_id']);
+
+        $contract = null;
+        if (! empty($validated['contract_uuid'])) {
+            $contract = $clientCase->contracts()
+                ->where('uuid', $validated['contract_uuid'])
+                ->first();
+        }
+
+        $ctx = $this->buildCaseEmailContext($clientCase, $contract);
+        $ctx['body_text'] = (string) ($validated['body_text'] ?? '');
+
+        $renderer = app(\App\Services\EmailTemplateRenderer::class);
+        $rendered = $renderer->render([
+            'subject' => (string) $template->subject_template,
+            'html' => (string) $template->html_template,
+            'text' => (string) $template->text_template,
+        ], $ctx);
+
+        return response()->json([
+            'subject' => $rendered['subject'] ?? '',
+            'html' => (string) ($rendered['html'] ?? ''),
+            'has_body_text' => (bool) preg_match('/{{\s*body_text\s*}}/', (string) $template->html_template),
+        ]);
+    }
+
+    /**
+     * Send a (possibly templated) email to a person email address belonging to this case.
+     */
+    public function sendEmailToEmail(ClientCase $clientCase, Request $request, int $email_id)
+    {
+        $validated = $request->validate([
+            'subject' => ['required', 'string', 'max:255'],
+            'html_body' => ['nullable', 'string'],
+            'body_text' => ['nullable', 'string', 'max:10000'],
+            'template_id' => ['sometimes', 'nullable', 'integer', 'exists:email_templates,id'],
+            'mail_profile_id' => ['sometimes', 'nullable', 'integer', 'exists:mail_profiles,id'],
+            'contract_uuid' => ['sometimes', 'nullable', 'uuid'],
+        ]);
+
+        // Ensure the email belongs to the person of this case
+        $email = \App\Models\Email::query()
+            ->where('id', $email_id)
+            ->where('person_id', $clientCase->person_id)
+            ->firstOrFail();
+
+        $to = (string) $email->value;
+
+        /** @var \App\Models\MailProfile|null $mailProfile */
+        $mailProfile = ! empty($validated['mail_profile_id'])
+            ? \App\Models\MailProfile::query()->where('id', $validated['mail_profile_id'])->where('active', true)->first()
+            : \App\Models\MailProfile::query()->where('active', true)->orderBy('priority')->orderBy('id')->first();
+
+        if (! $mailProfile) {
+            return back()->with('error', 'Ni aktivnega e-poštnega profila.');
+        }
+
+        $contract = null;
+        if (! empty($validated['contract_uuid'])) {
+            $contract = $clientCase->contracts()->where('uuid', $validated['contract_uuid'])->first();
+        }
+
+        $htmlBody = (string) ($validated['html_body'] ?? '');
+        $bodyText = (string) ($validated['body_text'] ?? '');
+
+        // Apply {{body_text}} substitution if the html body contains the placeholder
+        if ($bodyText !== '' && preg_match('/{{\s*body_text\s*}}/', $htmlBody)) {
+            $renderer = app(\App\Services\EmailTemplateRenderer::class);
+            $htmlBody = $renderer->applyBodyText($htmlBody, $bodyText, html: true) ?? $htmlBody;
+        }
+
+        $subject = (string) $validated['subject'];
+
+        $log = new \App\Models\EmailLog;
+        $log->fill([
+            'uuid' => (string) \Illuminate\Support\Str::uuid(),
+            'template_id' => $validated['template_id'] ?? null,
+            'mail_profile_id' => $mailProfile->id,
+            'to_email' => $to,
+            'to_recipients' => [$to],
+            'subject' => $subject,
+            'body_html_hash' => $htmlBody !== '' ? hash('sha256', $htmlBody) : null,
+            'body_text_preview' => null,
+            'embed_mode' => 'base64',
+            'status' => \App\Models\EmailLogStatus::Queued,
+            'queued_at' => now(),
+            'client_id' => $clientCase->client_id,
+            'client_case_id' => $clientCase->id,
+            'contract_id' => $contract?->id,
+            'ip' => $request->ip(),
+        ]);
+        $log->save();
+
+        $log->body()->create([
+            'body_html' => $htmlBody,
+            'body_text' => $bodyText,
+            'inline_css' => false,
+        ]);
+
+        dispatch(new \App\Jobs\SendEmailTemplateJob($log->id));
+
+        // Create activity if template has action/decision
+        if (! empty($validated['template_id'])) {
+            $template = \App\Models\EmailTemplate::find((int) $validated['template_id']);
+            if ($template && ($template->action_id || $template->decision_id)) {
+                $activity = $clientCase->activities()->create(array_filter([
+                    'contract_id' => $contract?->id,
+                    'action_id' => $template->action_id,
+                    'decision_id' => $template->decision_id,
+                    'note' => 'Poslano: '.$to.($bodyText !== '' ? ' | Vsebina: '.mb_strimwidth($bodyText, 0, 500, '…') : ''),
+                    'user_id' => optional($request->user())->id,
+                ], fn ($v) => ! is_null($v)));
+                $activity->emailLogs()->attach($log->id);
+            }
+        }
+
+        return back()->with('success', "E-pošta poslana na {$to}.");
+    }
+
+    /**
+     * Build a template rendering context from the given client case and optional contract.
+     */
+    private function buildCaseEmailContext(ClientCase $clientCase, ?\App\Models\Contract $contract = null): array
+    {
+        $clientCase->loadMissing('client.person');
+        $ctx = [
+            'client_case' => $clientCase,
+            'client' => $clientCase->client,
+            'person' => optional($clientCase->client)->person,
+            'mail_profile' => \App\Models\MailProfile::query()->where('active', true)->orderBy('priority')->orderBy('id')->first(),
+        ];
+        if ($contract) {
+            $contract->loadMissing(['clientCase.client.person', 'account.type']);
+            $ctx['contract'] = $contract;
+        }
+
+        return $ctx;
+    }
+
     private function flattenMeta(array $meta, string $prefix = ''): array
     {
         $result = [];

app/Http/Controllers/PersonController.php

@@ -136,6 +136,7 @@ public function createEmail(Person $person, Request $request)
             'is_primary' => 'boolean',
             'is_active' => 'boolean',
             'valid' => 'boolean',
+            'failed' => 'boolean',
             'receive_auto_mails' => 'sometimes|boolean',
             'verified_at' => 'nullable|date',
             'preferences' => 'nullable|array',
@@ -164,6 +165,7 @@ public function updateEmail(Person $person, int $email_id, Request $request)
             'is_primary' => 'boolean',
             'is_active' => 'boolean',
             'valid' => 'boolean',
+            'failed' => 'boolean',
             'receive_auto_mails' => 'sometimes|boolean',
             'verified_at' => 'nullable|date',
             'preferences' => 'nullable|array',

app/Http/Controllers/ReportController.php

@@ -43,7 +43,7 @@ public function show(string $slug, Request $request)
         $inputs = $this->buildInputsArray($report);
         $filters = $this->validateFilters($inputs, $request);
         \Log::info('Report filters', ['filters' => $filters, 'request' => $request->all()]);
-        
+
         $perPage = (int) ($request->integer('per_page') ?: 25);
         $query = $this->queryBuilder->build($report, $filters);
         $paginator = $query->paginate($perPage);
@@ -279,16 +279,51 @@ public function clients(Request $request)
         $clients = \App\Models\Client::query()
             ->with('person:id,full_name')
             ->get()
-            ->map(fn($c) => [
+            ->map(fn ($c) => [
                 'id' => $c->uuid,
-                'name' => $c->person->full_name ?? 'Unknown'
+                'name' => $c->person->full_name ?? 'Unknown',
             ])
             ->sortBy('name')
             ->values();
-        
+
         return response()->json($clients);
     }
 
+    /**
+     * Lightweight actions lookup for select:action filters.
+     */
+    public function actions(Request $request)
+    {
+        $actions = \App\Models\Action::query()
+            ->orderBy('name')
+            ->get(['id', 'name'])
+            ->map(fn ($a) => ['id' => $a->id, 'name' => $a->name])
+            ->values();
+
+        return response()->json($actions);
+    }
+
+    /**
+     * Lightweight decisions lookup for select:decision filters.
+     * Optionally filtered by action_id (for dependent filter UI).
+     */
+    public function decisions(Request $request)
+    {
+        $actionId = $request->integer('action_id', 0) ?: null;
+
+        $q = \App\Models\Decision::query()->orderBy('name');
+
+        if ($actionId !== null) {
+            $q->whereHas('actions', fn ($qq) => $qq->where('actions.id', $actionId));
+        }
+
+        $decisions = $q->get(['id', 'name'])
+            ->map(fn ($d) => ['id' => $d->id, 'name' => $d->name])
+            ->values();
+
+        return response()->json($decisions);
+    }
+
     /**
      * Build validation rules based on inputs descriptor and validate.
      *
@@ -307,6 +342,8 @@ protected function validateFilters(array $inputs, Request $request): array
                 'integer' => [$nullable, 'integer'],
                 'select:user' => [$nullable, 'integer', 'exists:users,id'],
                 'select:client' => [$nullable, 'string', 'exists:clients,uuid'],
+                'select:action' => [$nullable, 'integer', 'exists:actions,id'],
+                'select:decision' => [$nullable, 'integer', 'exists:decisions,id'],
                 default => [$nullable, 'string'],
             };
         }
@@ -319,7 +356,7 @@ protected function validateFilters(array $inputs, Request $request): array
      */
     protected function buildInputsArray(Report $report): array
     {
-        return $report->filters->map(fn($filter) => [
+        return $report->filters->map(fn ($filter) => [
             'key' => $filter->key,
             'type' => $filter->type,
             'label' => $filter->label,
@@ -336,7 +373,7 @@ protected function buildColumnsArray(Report $report): array
     {
         return $report->columns
             ->where('visible', true)
-            ->map(fn($col) => [
+            ->map(fn ($col) => [
                 'key' => $col->key,
                 'label' => $col->label,
             ])

app/Http/Requests/StoreEmailPackageFromContractsRequest.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class StoreEmailPackageFromContractsRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return $this->user()?->can('manage-settings') ?? false;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'type' => ['required', 'in:email'],
+            'name' => ['nullable', 'string', 'max:255'],
+            'description' => ['nullable', 'string'],
+            'meta' => ['nullable', 'array'],
+
+            // Common payload for all items
+            'payload' => ['required', 'array'],
+            'payload.mail_profile_id' => ['nullable', 'integer', 'exists:mail_profiles,id'],
+            'payload.template_id' => ['nullable', 'integer', 'exists:email_templates,id'],
+            'payload.subject' => ['nullable', 'string', 'max:255'],
+            'payload.body_text' => ['nullable', 'string', 'max:10000'],
+            'payload.variables' => ['nullable', 'array'],
+
+            // Source contracts to derive items from
+            'contract_ids' => ['required', 'array', 'min:1'],
+            'contract_ids.*' => ['integer', 'exists:contracts,id'],
+        ];
+    }
+}

app/Http/Requests/StoreEmailTemplateRequest.php

@@ -23,6 +23,9 @@ public function rules(): array
             'entity_types.*' => ['string', 'in:client,client_case,contract,person'],
             'allow_attachments' => ['sometimes', 'boolean'],
             'active' => ['boolean'],
+            'client' => ['sometimes', 'boolean'],
+            'action_id' => ['nullable', 'integer', 'exists:actions,id'],
+            'decision_id' => ['nullable', 'integer', 'exists:decisions,id'],
         ];
     }
 }

app/Http/Requests/StoreMailProfileRequest.php

@@ -26,6 +26,8 @@ public function rules(): array
             'reply_to_name' => ['nullable', 'string', 'max:190'],
             'priority' => ['nullable', 'integer', 'between:0,65535'],
             'max_daily_quota' => ['nullable', 'integer', 'min:0'],
+            'signature' => ['nullable', 'array'],
+            'signature.*' => ['nullable', 'string', 'max:1000'],
         ];
     }
 }

app/Http/Requests/UpdateEmailTemplateRequest.php

@@ -25,6 +25,9 @@ public function rules(): array
             'entity_types.*' => ['string', 'in:client,client_case,contract,person'],
             'allow_attachments' => ['sometimes', 'boolean'],
             'active' => ['boolean'],
+            'client' => ['sometimes', 'boolean'],
+            'action_id' => ['nullable', 'integer', 'exists:actions,id'],
+            'decision_id' => ['nullable', 'integer', 'exists:decisions,id'],
         ];
     }
 }

app/Http/Requests/UpdateMailProfileRequest.php

@@ -27,6 +27,8 @@ public function rules(): array
             'priority' => ['nullable', 'integer', 'between:0,65535'],
             'max_daily_quota' => ['nullable', 'integer', 'min:0'],
             'active' => ['nullable', 'boolean'],
+            'signature' => ['nullable', 'array'],
+            'signature.*' => ['nullable', 'string', 'max:1000'],
         ];
     }
 }