mirror of
https://github.com/crater-invoice/crater.git
synced 2025-10-27 19:51:09 -04:00
fix invoice number validation
This commit is contained in:
@ -25,7 +25,6 @@ class EstimatesRequest extends FormRequest
|
|||||||
$rules = [
|
$rules = [
|
||||||
'estimate_date' => 'required',
|
'estimate_date' => 'required',
|
||||||
'expiry_date' => 'required',
|
'expiry_date' => 'required',
|
||||||
'estimate_number' => 'required|unique:estimates,estimate_number',
|
|
||||||
'user_id' => 'required',
|
'user_id' => 'required',
|
||||||
'discount' => 'required',
|
'discount' => 'required',
|
||||||
'discount_val' => 'required',
|
'discount_val' => 'required',
|
||||||
@ -41,10 +40,6 @@ class EstimatesRequest extends FormRequest
|
|||||||
'items.*.price' => 'required'
|
'items.*.price' => 'required'
|
||||||
];
|
];
|
||||||
|
|
||||||
if ($this->getMethod() == 'PUT') {
|
|
||||||
$rules['estimate_number'] = $rules['estimate_number'].','.$this->get('id');
|
|
||||||
}
|
|
||||||
|
|
||||||
return $rules;
|
return $rules;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -25,7 +25,6 @@ class InvoicesRequest extends FormRequest
|
|||||||
$rules = [
|
$rules = [
|
||||||
'invoice_date' => 'required',
|
'invoice_date' => 'required',
|
||||||
'due_date' => 'required',
|
'due_date' => 'required',
|
||||||
'invoice_number' => 'required|unique:invoices,invoice_number',
|
|
||||||
'user_id' => 'required',
|
'user_id' => 'required',
|
||||||
'discount' => 'required',
|
'discount' => 'required',
|
||||||
'discount_val' => 'required',
|
'discount_val' => 'required',
|
||||||
@ -41,10 +40,6 @@ class InvoicesRequest extends FormRequest
|
|||||||
'items.*.price' => 'required'
|
'items.*.price' => 'required'
|
||||||
];
|
];
|
||||||
|
|
||||||
if ($this->getMethod() == 'PUT') {
|
|
||||||
$rules['invoice_number'] = $rules['invoice_number'].','.$this->get('id');
|
|
||||||
}
|
|
||||||
|
|
||||||
return $rules;
|
return $rules;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -24,15 +24,10 @@ class PaymentRequest extends FormRequest
|
|||||||
{
|
{
|
||||||
$rules = [
|
$rules = [
|
||||||
'payment_date' => 'required',
|
'payment_date' => 'required',
|
||||||
'payment_number' => 'required|unique:payments,payment_number',
|
|
||||||
'user_id' => 'required',
|
'user_id' => 'required',
|
||||||
'amount' => 'required',
|
'amount' => 'required',
|
||||||
];
|
];
|
||||||
|
|
||||||
if ($this->getMethod() == 'PUT') {
|
|
||||||
$rules['payment_number'] = $rules['payment_number'].','.$this->route('payment');
|
|
||||||
}
|
|
||||||
|
|
||||||
return $rules;
|
return $rules;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,7 +6,6 @@ use Illuminate\Contracts\Queue\ShouldQueue;
|
|||||||
use Illuminate\Queue\InteractsWithQueue;
|
use Illuminate\Queue\InteractsWithQueue;
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
use Crater\Listeners\Updates\Listener;
|
use Crater\Listeners\Updates\Listener;
|
||||||
use Crater\Listeners\Updates\v2\Version200;
|
|
||||||
use Crater\Events\UpdateFinished;
|
use Crater\Events\UpdateFinished;
|
||||||
use Crater\Setting;
|
use Crater\Setting;
|
||||||
use Crater\Address;
|
use Crater\Address;
|
||||||
|
|||||||
Reference in New Issue
Block a user