documents

app/Http/Controllers/Admin/DocumentTemplateController.php

@@ -46,6 +46,7 @@ public function toggleActive(DocumentTemplate $template)
     public function show(DocumentTemplate $template)
     {
         $this->ensurePermission();
+
         return Inertia::render('Admin/DocumentTemplates/Show', [
             'template' => $template,
         ]);
@@ -121,6 +122,11 @@ public function updateSettings(UpdateDocumentTemplateRequest $request, DocumentT
         if ($dirty) {
             $template->formatting_options = $fmt;
         }
+        // Merge meta, including custom_defaults
+        if ($request->has('meta') && is_array($request->input('meta'))) {
+            $meta = array_filter($request->input('meta'), fn ($v) => $v !== null && $v !== '');
+            $template->meta = array_replace($template->meta ?? [], $meta);
+        }
         $template->updated_by = Auth::id();
         $template->save();
 

app/Http/Controllers/ContractDocumentGenerationController.php

@@ -23,6 +23,8 @@ public function __invoke(Request $request, Contract $contract): Response
         }
         $request->validate([
             'template_slug' => ['required', 'string', 'exists:document_templates,slug'],
+            'custom' => ['nullable', 'array'],
+            'custom.*' => ['nullable'],
         ]);
 
         $template = DocumentTemplate::where('slug', $request->template_slug)
@@ -36,6 +38,7 @@ public function __invoke(Request $request, Contract $contract): Response
 
         $renderer = app(\App\Services\Documents\DocxTemplateRenderer::class);
         try {
+            // For custom tokens: pass overrides via request bag; service already reads request()->input('custom') if present.
             $result = $renderer->render($template, $contract, Auth::user());
         } catch (\App\Services\Documents\Exceptions\UnresolvedTokensException $e) {
             return response()->json([

app/Http/Controllers/PersonController.php

@@ -26,6 +26,10 @@ public function update(Person $person, Request $request)
 
         $person->update($attributes);
 
+        if ($request->header('X-Inertia')) {
+            return back()->with('success', 'Person updated');
+        }
+
         return response()->json([
             'person' => [
                 'full_name' => $person->full_name,
@@ -41,6 +45,8 @@ public function createAddress(Person $person, Request $request)
         $attributes = $request->validate([
             'address' => 'required|string|max:150',
             'country' => 'nullable|string',
+            'post_code' => 'nullable|string|max:16',
+            'city' => 'nullable|string|max:100',
             'type_id' => 'required|integer|exists:address_types,id',
             'description' => 'nullable|string|max:125',
         ]);
@@ -49,8 +55,15 @@ public function createAddress(Person $person, Request $request)
         $address = $person->addresses()->firstOrCreate([
             'address' => $attributes['address'],
             'country' => $attributes['country'] ?? null,
+            'post_code' => $attributes['post_code'] ?? null,
+            'city' => $attributes['city'] ?? null,
         ], $attributes);
 
+        // Support Inertia form submissions (redirect back) and JSON (for API/axios)
+        if ($request->header('X-Inertia')) {
+            return back()->with('success', 'Address created');
+        }
+
         return response()->json([
             'address' => \App\Models\Person\PersonAddress::with(['type'])->findOrFail($address->id),
         ]);
@@ -61,6 +74,8 @@ public function updateAddress(Person $person, int $address_id, Request $request)
         $attributes = $request->validate([
             'address' => 'required|string|max:150',
             'country' => 'nullable|string',
+            'post_code' => 'nullable|string|max:16',
+            'city' => 'nullable|string|max:100',
             'type_id' => 'required|integer|exists:address_types,id',
             'description' => 'nullable|string|max:125',
         ]);
@@ -69,6 +84,10 @@ public function updateAddress(Person $person, int $address_id, Request $request)
 
         $address->update($attributes);
 
+        if ($request->header('X-Inertia')) {
+            return back()->with('success', 'Address updated');
+        }
+
         return response()->json([
             'address' => $address,
         ]);
@@ -79,6 +98,10 @@ public function deleteAddress(Person $person, int $address_id, Request $request)
         $address = $person->addresses()->findOrFail($address_id);
         $address->delete(); // soft delete
 
+        if ($request->header('X-Inertia')) {
+            return back()->with('success', 'Address deleted');
+        }
+
         return response()->json(['status' => 'ok']);
     }
 
@@ -97,6 +120,10 @@ public function createPhone(Person $person, Request $request)
             'country_code' => $attributes['country_code'] ?? null,
         ], $attributes);
 
+        if ($request->header('X-Inertia')) {
+            return back()->with('success', 'Phone added successfully');
+        }
+
         return response()->json([
             'phone' => \App\Models\Person\PersonPhone::with(['type'])->findOrFail($phone->id),
         ]);
@@ -115,6 +142,10 @@ public function updatePhone(Person $person, int $phone_id, Request $request)
 
         $phone->update($attributes);
 
+        if ($request->header('X-Inertia')) {
+            return back()->with('success', 'Phone updated successfully');
+        }
+
         return response()->json([
             'phone' => $phone,
         ]);
@@ -125,6 +156,10 @@ public function deletePhone(Person $person, int $phone_id, Request $request)
         $phone = $person->phones()->findOrFail($phone_id);
         $phone->delete(); // soft delete
 
+        if ($request->header('X-Inertia')) {
+            return back()->with('success', 'Phone deleted');
+        }
+
         return response()->json(['status' => 'ok']);
     }
 
@@ -176,6 +211,10 @@ public function deleteEmail(Person $person, int $email_id, Request $request)
         $email = $person->emails()->findOrFail($email_id);
         $email->delete();
 
+        if ($request->header('X-Inertia')) {
+            return back()->with('success', 'Email deleted');
+        }
+
         return response()->json(['status' => 'ok']);
     }
 
@@ -198,6 +237,10 @@ public function createTrr(Person $person, Request $request)
         // Create without dedup (IBAN may be null or vary); could dedup by IBAN if provided
         $trr = $person->bankAccounts()->create($attributes);
 
+        if ($request->header('X-Inertia')) {
+            return back()->with('success', 'TRR added successfully');
+        }
+
         return response()->json([
             'trr' => BankAccount::findOrFail($trr->id),
         ]);
@@ -222,6 +265,10 @@ public function updateTrr(Person $person, int $trr_id, Request $request)
         $trr = $person->bankAccounts()->findOrFail($trr_id);
         $trr->update($attributes);
 
+        if ($request->header('X-Inertia')) {
+            return back()->with('success', 'TRR updated successfully');
+        }
+
         return response()->json([
             'trr' => $trr,
         ]);
@@ -232,6 +279,10 @@ public function deleteTrr(Person $person, int $trr_id, Request $request)
         $trr = $person->bankAccounts()->findOrFail($trr_id);
         $trr->delete();
 
+        if ($request->header('X-Inertia')) {
+            return back()->with('success', 'TRR deleted');
+        }
+
         return response()->json(['status' => 'ok']);
     }
 }