Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 16:31:33 +02:00
Code Issues Releases Activity

Fixes for recurring number rules and assigned_user_id stickiness for Vendors

Browse Source
This commit is contained in:
David Bomba 2020-10-16 08:17:31 +11:00
parent 07cbb6a71a
commit 79e625d8f2
5 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
View File

@ -12,6 +12,7 @@
namespace App\Http\Requests\RecurringInvoice;
use App\Http\Requests\Request;
use App\Http\ValidationRules\Recurring\UniqueRecurringInvoiceNumberRule;
use App\Models\Client;
use App\Models\RecurringInvoice;
use App\Utils\Traits\CleanLineItems;
@ -52,6 +53,8 @@ class StoreRecurringInvoiceRequest extends Request
$rules['frequency_id'] = 'required|integer';
$rules['number'] = new UniqueRecurringInvoiceNumberRule($this->all());
return $rules;
}

4
app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
View File

@ -48,6 +48,10 @@ class UpdateRecurringInvoiceRequest extends Request
$rules['documents'] = 'file|mimes:png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:20000';
}
if ($this->input('number')) {
$rules['number'] = 'unique:recurring_invoices,number,'.$this->id.',id,company_id,'.$this->recurring_invoice->company_id;
}
return $rules;
}

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

@ -48,10 +48,13 @@ class StoreVendorRequest extends Request
protected function prepareForValidation()
{
// $input = $this->all();
$input = $this->all();
// $this->replace($input);
if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
$input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
}
$this->replace($input);
}
public function messages()

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

@ -69,6 +69,10 @@ class UpdateVendorRequest extends Request
{
$input = $this->all();
if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
$input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
}
$this->replace($input);
}
}

1
app/Repositories/VendorRepository.php
View File

@ -57,6 +57,7 @@ class VendorRepository extends BaseRepository
*/
public function save(array $data, Vendor $vendor) : ?Vendor
{
$vendor->fill($data);
$vendor->save();