Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
David Bomba 2020-11-12 07:42:20 +11:00
parent ddaba5a953
commit 42c1f8fe5f
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Requests/Expense/StoreExpenseRequest.php
View File

@ -39,7 +39,8 @@ class StoreExpenseRequest extends Request
{ {
$rules = []; $rules = [];
$rules['number'] = 'unique:expenses,number,'.$this->id.',id,company_id,'.auth()->user()->company()->id; $rules['number'] = Rule::unique('expenses')->where('company_id', auth()->user()->company()->id);
// $rules['number'] = 'unique:expenses,number,'.$this->id.',id,company_id,'.auth()->user()->company()->id;
$rules['contacts.*.email'] = 'nullable|distinct'; $rules['contacts.*.email'] = 'nullable|distinct';
//$rules['number'] = new UniqueExpenseNumberRule($this->all()); //$rules['number'] = new UniqueExpenseNumberRule($this->all());
$rules['client_id'] = 'bail|sometimes|exists:clients,id,company_id,'.auth()->user()->company()->id; $rules['client_id'] = 'bail|sometimes|exists:clients,id,company_id,'.auth()->user()->company()->id;

5
app/Http/Requests/Expense/UpdateExpenseRequest.php
View File

@ -42,9 +42,8 @@ class UpdateExpenseRequest extends Request
//$rules['id_number'] = 'unique:clients,id_number,,id,company_id,' . auth()->user()->company()->id; //$rules['id_number'] = 'unique:clients,id_number,,id,company_id,' . auth()->user()->company()->id;
$rules['contacts.*.email'] = 'nullable|distinct'; $rules['contacts.*.email'] = 'nullable|distinct';
if ($this->input('number')) { if(isset($this->number))
$rules['number'] = 'unique:expenses,number,'.$this->id.',id,company_id,'.$this->expense->company_id; $rules['number'] = Rule::unique('expenses')->where('company_id', auth()->user()->company()->id)->ignore($this->expense->id);
}
return $this->globalRules($rules); return $this->globalRules($rules);
} }

8
app/Http/Requests/Project/UpdateProjectRequest.php
View File

@ -33,9 +33,8 @@ class UpdateProjectRequest extends Request
{ {
$rules = []; $rules = [];
if ($this->input('number')) { if(isset($this->number))
$rules['number'] = 'unique:projects,number,'.$this->id.',id,company_id,'.$this->project->company_id; $rules['number'] = Rule::unique('projects')->where('company_id', auth()->user()->company()->id)->ignore($this->project->id);
}
return $this->globalRules($rules); return $this->globalRules($rules);
} }
@ -44,6 +43,9 @@ class UpdateProjectRequest extends Request
{ {
$input = $this->decodePrimaryKeys($this->all()); $input = $this->decodePrimaryKeys($this->all());
if(isset($input['client_id']))
unset($input['client_id']);
$this->replace($input); $this->replace($input);
} }
} }

3
app/Jobs/Account/CreateAccount.php
View File

@ -18,6 +18,7 @@ use App\Jobs\Company\CreateCompanyPaymentTerms;
use App\Jobs\Company\CreateCompanyTaskStatuses; use App\Jobs\Company\CreateCompanyTaskStatuses;
use App\Jobs\Company\CreateCompanyToken; use App\Jobs\Company\CreateCompanyToken;
use App\Jobs\User\CreateUser; use App\Jobs\User\CreateUser;
use App\Jobs\Util\VersionCheck;
use App\Models\Account; use App\Models\Account;
use App\Models\User; use App\Models\User;
use App\Notifications\Ninja\NewAccountCreated; use App\Notifications\Ninja\NewAccountCreated;
@ -93,6 +94,8 @@ class CreateAccount
$sp035a66->notification(new NewAccountCreated($spaa9f78, $sp035a66))->ninja(); $sp035a66->notification(new NewAccountCreated($spaa9f78, $sp035a66))->ninja();
VersionCheck::dispatchNow();
LightLogs::create(new AnalyticsAccountCreated()) LightLogs::create(new AnalyticsAccountCreated())
->increment() ->increment()
->batch(); ->batch();