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

Bump to Laravel 6

Browse Source
This commit is contained in:
David Bomba 2019-09-26 20:49:52 +10:00
parent 49b97038f7
commit 515b32fd87
7 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Kernel.php
View File

@ -27,7 +27,7 @@ class Kernel extends HttpKernel
\App\Http\Middleware\CheckForMaintenanceMode::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class,
// \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
\App\Http\Middleware\TrustProxies::class,
];

2
app/Http/Middleware/StartupCheck.php
View File

@ -13,7 +13,7 @@ namespace App\Http\Middleware;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Request as Input;
use Illuminate\Support\Facades\Schema;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Session;

2
app/Http/Requests/Client/UpdateClientRequest.php
View File

@ -44,7 +44,7 @@ class UpdateClientRequest extends Request
if(is_array($contacts))
{
for ($i = 0; $i < count($contacts); $i++) {
$rules['contacts.' . $i . '.email'] = 'required|email|unique:client_contacts,email,' . $contacts[$i]['id'];
$rules['contacts.' . $i . '.email'] = 'nullable|email|unique:client_contacts,email,' . $contacts[$i]['id'];
}
}
return $rules;

8
composer.json
View File

@ -26,13 +26,13 @@
"hashids/hashids": "^3.0",
"intervention/image": "^2.4",
"laracasts/presenter": "^0.2.1",
"laravel/framework": "5.8.*",
"laravel/socialite": "^3.1",
"laravel/framework": "6.0.*",
"laravel/socialite": "^4.0",
"laravel/tinker": "^1.0",
"laravelcollective/html": "5.8.*",
"laravelcollective/html": "6.0.*",
"league/fractal": "^0.17.0",
"league/omnipay": "^3.0",
"nwidart/laravel-modules": "^4.0",
"nwidart/laravel-modules": "^6.0",
"omnipay/paypal": "^3.0",
"omnipay/stripe": "^3.0",
"predis/predis": "^1.1",

4
config/cache.php
View File

@ -1,5 +1,7 @@
<?php
use Illuminate\Support\Str;
return [
/*
@ -88,7 +90,7 @@ return [
'prefix' => env(
'CACHE_PREFIX',
str_slug(env('APP_NAME', 'laravel'), '_').'_cache'
Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'
),
];

8
resources/views/portal/default/auth/login.blade.php
View File

@ -29,7 +29,7 @@
@endif
<form method="POST" action="{{ route('client.login') }}">
@csrf
<h1>@lang('texts.account_login')</h1>
<h1>{{ ('texts.account_login') }}</h1>
@if (Session::has('error'))
<div class="alert alert-danger">
<li>{!! Session::get('error') !!}</li>
@ -42,7 +42,7 @@
<i class="icon-user"></i>
</span>
</div>
<input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" placeholder="@lang('texts.email')" required autofocus>
<input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" placeholder="{{ ('texts.email') }}" required autofocus>
@if ($errors->has('email'))
<span class="invalid-feedback" role="alert">
@ -57,7 +57,7 @@
<i class="icon-lock"></i>
</span>
</div>
<input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="@lang('texts.password')" required>
<input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="{{ ('texts.password') }}" required>
@if ($errors->has('password'))
<span class="invalid-feedback" role="alert">
@ -68,7 +68,7 @@
<div class="row">
<div class="col-6">
<button class="btn btn-primary px-4" type="submit">@lang('texts.login')</button>
<button class="btn btn-primary px-4" type="submit">{{ trans('texts.login') }}</button>
</div>
<div class="col-6 text-right">
<a class="btn btn-link" href="{{ route('client.password.request') }}">

10
resources/views/portal/default/header.blade.php
View File

@ -19,7 +19,7 @@
</a>
<div class="dropdown-menu dropdown-menu-right dropdown-menu-lg">
<div class="dropdown-header text-center">
<strong>@lang('texts.notifications')</strong>
<strong>{{ ('texts.notifications')}}</strong>
</div>
<a class="dropdown-item" href="#">
<div class="small mb-1">Mr Miyagi todos
@ -32,7 +32,7 @@
</span>
</a>
<a class="dropdown-item text-center" href="#">
<strong>@lang('texts.more')</strong>
<strong>{{ ('texts.more')}}</strong>
</a>
</div>
</li>
@ -47,14 +47,14 @@
</a>
<div class="dropdown-menu dropdown-menu-sm">
<div class="dropdown-header text-center">
<strong>@lang('texts.settings')</strong>
<strong>{{ ('texts.settings')}} </strong>
</div>
<a class="dropdown-item" href="{{ route('client.profile.edit', ['id' => auth()->user()->hashed_id])}}">
<i class="fa fa-user"></i> @lang('texts.profile')</a>
<i class="fa fa-user"></i> @lang::get('texts.profile')</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="{{ route('client.logout') }}">
<i class="fa fa-lock"></i> @lang('texts.logout')</a>
<i class="fa fa-lock"></i> @lang::get('texts.logout')</a>
</div>
</li>
</ul>