Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 07:24:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for validation on vendors

Browse Source
This commit is contained in:
David Bomba 2022-03-10 20:48:14 +11:00
parent 7f2887afd9
commit 3f0176d698
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Requests/Vendor/StoreVendorRequest.php vendored
View File

@ -36,14 +36,19 @@ class StoreVendorRequest extends Request
/* Ensure we have a client name, and that all emails are unique*/ /* Ensure we have a client name, and that all emails are unique*/
//$rules['name'] = 'required|min:1'; //$rules['name'] = 'required|min:1';
$rules['id_number'] = 'unique:vendors,id_number,'.$this->id.',id,company_id,'.$this->company_id; // $rules['id_number'] = 'unique:vendors,id_number,'.$this->id.',id,company_id,'.auth()->user()->company()->id;
//$rules['settings'] = new ValidVendorGroupSettingsRule(); //$rules['settings'] = new ValidVendorGroupSettingsRule();
$rules['contacts.*.email'] = 'nullable|distinct';
$rules['contacts.*.email'] = 'bail|nullable|distinct|sometimes|email';
if (isset($this->number)) { if (isset($this->number)) {
$rules['number'] = Rule::unique('vendors')->where('company_id', auth()->user()->company()->id); $rules['number'] = Rule::unique('vendors')->where('company_id', auth()->user()->company()->id);
} }
// if (isset($this->id_number)) {
// $rules['id_number'] = Rule::unique('vendors')->where('company_id', auth()->user()->company()->id);
// }
return $rules; return $rules;
} }
@ -59,7 +64,7 @@ class StoreVendorRequest extends Request
public function messages() public function messages()
{ {
return [ return [
'unique' => ctrans('validation.unique', ['attribute' => 'email']), // 'unique' => ctrans('validation.unique', ['attribute' => 'email']),
//'required' => trans('validation.required', ['attribute' => 'email']), //'required' => trans('validation.required', ['attribute' => 'email']),
'contacts.*.email.required' => ctrans('validation.email', ['attribute' => 'email']), 'contacts.*.email.required' => ctrans('validation.email', ['attribute' => 'email']),
]; ];

6
app/Http/Requests/Vendor/UpdateVendorRequest.php vendored
View File

@ -40,11 +40,11 @@ class UpdateVendorRequest extends Request
if($this->number) if($this->number)
$rules['number'] = Rule::unique('vendors')->where('company_id', auth()->user()->company()->id)->ignore($this->vendor->id); $rules['number'] = Rule::unique('vendors')->where('company_id', auth()->user()->company()->id)->ignore($this->vendor->id);
if($this->id_number) // if($this->id_number)
$rules['id_number'] = Rule::unique('vendors')->where('company_id', auth()->user()->company()->id)->ignore($this->vendor->id); // $rules['id_number'] = Rule::unique('vendors')->where('company_id', auth()->user()->company()->id)->ignore($this->vendor->id);
$rules['contacts.*.email'] = 'nullable|distinct'; $rules['contacts.*.email'] = 'nullable|distinct';
// $rules['id_number'] = 'unique:vendors,id_number,'.$this->id.',id,company_id,'.auth()->user()->company()->id;
return $rules; return $rules;
} }