Files
InvoiceShelf/app/Http/Requests/RecurringInvoiceRequest.php
Darko Gjorgjijoski e41ee8083d fix(documents): preserve edited line-item description (#658)
The per-line item description typed into the row's textarea was never
saved. BaseItemSelect's description field pushes edits out only via an
`update:description` emit, but DocumentItemRow (the single shared row used
by invoices, estimates, and recurring invoices) wired only `@search` and
`@select` — so the emit was dropped and `form.items[index].description`
never updated. On submit the field was lost; a catalog item's description
also reverted on the next re-render.

Capture the event and route it through the existing `updateItemAttribute`
store updater, mirroring how name/quantity/price/discount already sync.
One fix covers all three document types since they share the row.

Also add the missing `items.*.description` nullable rule to
RecurringInvoiceRequest for parity with the invoice/estimate requests.

The backend already persisted and returned description correctly; this was
purely a dropped frontend event.
2026-06-12 11:27:56 +02:00

147 lines
4.3 KiB
PHP

<?php
namespace App\Http\Requests;
use App\Models\CompanySetting;
use App\Models\Customer;
use App\Models\RecurringInvoice;
use App\Support\DocumentTotals;
use Illuminate\Foundation\Http\FormRequest;
class RecurringInvoiceRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return true;
}
/**
* Get the validation rules that apply to the request.
*/
public function rules(): array
{
$companyCurrency = CompanySetting::getSetting('currency', $this->header('company'));
$rules = [
'starts_at' => [
'required',
],
'send_automatically' => [
'required',
'boolean',
],
'customer_id' => [
'required',
],
'exchange_rate' => [
'nullable',
],
'discount' => [
'numeric',
'required',
],
'discount_val' => [
'integer',
'required',
],
'sub_total' => [
'integer',
'required',
],
'total' => [
'integer',
'max:999999999999',
'required',
],
'tax' => [
'required',
],
'status' => [
'required',
],
'exchange_rate' => [
'nullable',
],
'frequency' => [
'required',
],
'limit_by' => [
'required',
],
'limit_count' => [
'required_if:limit_by,COUNT',
],
'limit_date' => [
'required_if:limit_by,DATE',
],
'items' => [
'required',
],
'items.*' => [
'required',
],
'items.*.description' => [
'nullable',
],
];
$customer = Customer::find($this->customer_id);
if ($customer && $companyCurrency) {
if ((string) $customer->currency_id !== $companyCurrency) {
$rules['exchange_rate'] = [
'required',
];
}
}
return $rules;
}
public function getRecurringInvoicePayload()
{
$company_currency = CompanySetting::getSetting('currency', $this->header('company'));
$current_currency = $this->currency_id;
$exchange_rate = $company_currency != $current_currency ? $this->exchange_rate : 1;
$currency = Customer::find($this->customer_id)->currency_id;
$nextInvoiceAt = RecurringInvoice::getNextInvoiceDate($this->frequency, $this->starts_at);
$tax_per_item = CompanySetting::getSetting('tax_per_item', $this->header('company')) ?? 'NO ';
$discount_per_item = CompanySetting::getSetting('discount_per_item', $this->header('company')) ?? 'NO';
// Recompute totals server-side from the line items (GHSA-8c69). The
// recurring template totals propagate to every generated invoice.
$totals = DocumentTotals::compute(
$this->items ?? [],
$this->taxes ?? [],
$this->discount_val,
$tax_per_item,
(bool) $this->tax_included,
$discount_per_item
);
return collect($this->except('items', 'taxes'))
->merge([
'creator_id' => $this->user()->id,
'company_id' => $this->header('company'),
'next_invoice_at' => $nextInvoiceAt,
'tax_per_item' => $tax_per_item,
'discount_per_item' => $discount_per_item,
'sub_total' => $totals['sub_total'],
'total' => $totals['total'],
'tax' => $totals['tax'],
'due_amount' => $totals['total'],
'exchange_rate' => $exchange_rate,
'base_sub_total' => $totals['sub_total'] * $exchange_rate,
'base_total' => $totals['total'] * $exchange_rate,
'base_tax' => $totals['tax'] * $exchange_rate,
'currency_id' => $currency,
])
->toArray();
}
}