shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed token requirement in wizard

Browse Source
This commit is contained in:
denisdulici 2018-12-24 15:00:22 +03:00
parent 40a7afe14d
commit 268fa78394
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Requests/Wizard/Company.php
View File

@ -42,8 +42,8 @@ class Company extends Request
'company_logo' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024, 'company_logo' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024,
]; ];
if (!setting('general.api_token', false)) { if (!setting('general.api_token', false) && !empty($this->request->get('api_token'))) {
$rules['api_token'] = 'required|string|check'; $rules['api_token'] = 'string|check';
} }
return $rules; return $rules;

4
resources/views/wizard/companies/edit.blade.php
View File

@ -41,11 +41,11 @@
<div class="box-body"> <div class="box-body">
<div class="col-md-12 {!! (!setting('general.api_token', null)) ?: 'hidden' !!}"> <div class="col-md-12 {!! (!setting('general.api_token', null)) ?: 'hidden' !!}">
<div class="form-group required {{ $errors->has('api_token') ? 'has-error' : ''}}"> <div class="form-group {{ $errors->has('api_token') ? 'has-error' : ''}}">
{!! Form::label('sale_price', trans('modules.api_token'), ['class' => 'control-label']) !!} {!! Form::label('sale_price', trans('modules.api_token'), ['class' => 'control-label']) !!}
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-key"></i></span> <span class="input-group-addon"><i class="fa fa-key"></i></span>
{!! Form::text('api_token', setting('general.api_token', null), ['class' => 'form-control', 'required' => 'required', 'placeholder' => trans('general.form.enter', ['field' => trans('modules.api_token')])]) !!} {!! Form::text('api_token', setting('general.api_token', null), ['class' => 'form-control', 'placeholder' => trans('general.form.enter', ['field' => trans('modules.api_token')])]) !!}
</div> </div>
{!! $errors->first('api_token', '<p class="help-block">:message</p>') !!} {!! $errors->first('api_token', '<p class="help-block">:message</p>') !!}
</div> </div>