feat: L9 to L11
This commit is contained in:
Vincent BRIDIER
parent
6203647673
commit
c62537a087
8 changed files with 1221 additions and 1585 deletions
|
|
@ -3,7 +3,7 @@
|
|||
namespace App\Http\Middleware;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use Fideloper\Proxy\TrustProxies as Middleware;
|
||||
use Illuminate\Http\Middleware\TrustProxies as Middleware;
|
||||
|
||||
class TrustProxies extends Middleware
|
||||
{
|
||||
|
|
|
|||
|
|
@ -7,24 +7,19 @@
|
|||
"ext-curl": "*",
|
||||
"ext-json": "*",
|
||||
"barryvdh/laravel-dompdf": "^3.1",
|
||||
"doctrine/dbal": "^2.8",
|
||||
"fideloper/proxy": "^4.0",
|
||||
"kwaadpepper/enum": "^2.0",
|
||||
"laravel/framework": "^9.0",
|
||||
"laravel/framework": "^11.0",
|
||||
"laravel/tinker": "^2.0",
|
||||
"laravel/ui": "^3.0",
|
||||
"laravelcollective/html": "6.*",
|
||||
"laravel/ui": "^4.0",
|
||||
"picqer/php-barcode-generator": "^0.3.0",
|
||||
"sentry/sentry-laravel": "^4.13",
|
||||
"ldc/ldccrmv4client": "^4.1"
|
||||
},
|
||||
"require-dev": {
|
||||
"beyondcode/laravel-dump-server": "^1.0",
|
||||
"filp/whoops": "^2.0",
|
||||
"fzaninotto/faker": "^1.4",
|
||||
"mockery/mockery": "^1.0",
|
||||
"nunomaduro/collision": "^6.1",
|
||||
"phpunit/phpunit": "^9.0",
|
||||
"nunomaduro/collision": "^8.1",
|
||||
"phpunit/phpunit": "^10.0",
|
||||
"slevomat/coding-standard": "^7.0",
|
||||
"squizlabs/php_codesniffer": "^3.3"
|
||||
},
|
||||
|
|
@ -74,8 +69,19 @@
|
|||
],
|
||||
"allow-plugins": {
|
||||
"dealerdirect/phpcodesniffer-composer-installer": true
|
||||
},
|
||||
"policy": {
|
||||
"advisories": {
|
||||
"ignore": {
|
||||
"laravel/framework": {
|
||||
"constraint": "^10.0",
|
||||
"on-audit": false,
|
||||
"reason": "Palier temporaire de migration vers une version Laravel maintenue. Ne pas deployer."
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"minimum-stability": "dev",
|
||||
"minimum-stability": "stable",
|
||||
"prefer-stable": true
|
||||
}
|
||||
|
|
|
|||
2611
composer.lock
generated
2611
composer.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -152,7 +152,6 @@ return [
|
|||
/*
|
||||
* Package Service Providers...
|
||||
*/
|
||||
Collective\Html\HtmlServiceProvider::class,
|
||||
Barryvdh\DomPDF\ServiceProvider::class,
|
||||
|
||||
/*
|
||||
|
|
@ -211,8 +210,6 @@ return [
|
|||
'URL' => Illuminate\Support\Facades\URL::class,
|
||||
'Validator' => Illuminate\Support\Facades\Validator::class,
|
||||
'View' => Illuminate\Support\Facades\View::class,
|
||||
'Form' => Collective\Html\FormFacade::class,
|
||||
'Html' => Collective\Html\HtmlFacade::class,
|
||||
'Debugbar' => Barryvdh\Debugbar\Facade::class,
|
||||
'PDF' => Barryvdh\DomPDF\Facade\Pdf::class,
|
||||
'CampaignTypes' => \App\Enums\CampaignTypes::class,
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\DBAL\TimestampType;
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
|
|
@ -124,12 +122,5 @@ return [
|
|||
'database' => env('REDIS_CACHE_DB', 1),
|
||||
],
|
||||
|
||||
],
|
||||
|
||||
'dbal' => [
|
||||
'types' => [
|
||||
'timestamp' => TimestampType::class,
|
||||
],
|
||||
],
|
||||
|
||||
]
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,57 +0,0 @@
|
|||
@extends('layouts.main')
|
||||
|
||||
@section('content')
|
||||
<h2><i class="fas fa-building"></i> Nouveau site</h2>
|
||||
@if ($errors->any())
|
||||
<div class="alert alert-danger">
|
||||
<ul>
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{{ $error }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
<div class="form-wrapper">
|
||||
{!! Form::open(['route' => 'site.store', 'enctype' => 'multipart/form-data']) !!}
|
||||
<div class="form-split">
|
||||
<div class="form-field">
|
||||
{!! Form::label('site_id', 'Ref *') !!}
|
||||
{!! Form::input('text', 'site_id', null, ['required']) !!}
|
||||
</div>
|
||||
<div class="form-field">
|
||||
{!! Form::label('site_nom', 'Nom *') !!}
|
||||
{!! Form::input('text', 'site_nom', null, ['required']) !!}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-split">
|
||||
<div class="form-field">
|
||||
<div class="title">
|
||||
{!! Form::label('site_logo', 'Logo *') !!}
|
||||
<span>150x60px</span>
|
||||
<span>Format: PNG</span>
|
||||
</div>
|
||||
{!! Form::file('site_logo', ['class' => 'input-file', 'required']) !!}
|
||||
</div>
|
||||
<div class="form-field">
|
||||
{!! Form::label('site_contact', 'Contact *') !!}
|
||||
{!! Form::email('site_contact', null, ['required']) !!}
|
||||
</div>
|
||||
</div>
|
||||
<h4>Informations pour génération des BR :</h4>
|
||||
<div class="form-split">
|
||||
<div class="form-field">
|
||||
{!! Form::label('site_libelle', 'Libellé du site *') !!}
|
||||
{!! Form::input('text', 'site_libelle', null, ['required']) !!}
|
||||
</div>
|
||||
<div class="form-field">
|
||||
{!! Form::label('site_rcs', 'RCS du site *') !!}
|
||||
{!! Form::input('text', 'site_rcs', null, ['required']) !!}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-field submit">
|
||||
<span>Les champs avec un * sont obligatoires</span>
|
||||
{!! Form::submit('Enregistrer') !!}
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
</div>
|
||||
@endsection
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
@extends('layouts.main')
|
||||
|
||||
@section('content')
|
||||
<h2><i class="fas fa-building"></i> Editer le site</h2>
|
||||
<div class="form-wrapper">
|
||||
<figure><img src="{{ asset($site->site_logo) }}" alt="{{ $site->site_nom }}"></figure>
|
||||
{!! Form::model($site, ['route' => ['site.update', $site], 'enctype' => 'multipart/form-data']) !!}
|
||||
@method('PUT')
|
||||
<div class="form-split">
|
||||
<div class="form-field">
|
||||
{!! Form::label('site_id', 'Ref') !!}
|
||||
{!! Form::input('text', 'site_id', null, ['required', 'readonly']) !!}
|
||||
</div>
|
||||
<div class="form-field">
|
||||
{!! Form::label('site_nom', 'Nom') !!}
|
||||
{!! Form::input('text', 'site_nom', null, ['required']) !!}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-split">
|
||||
<div class="form-field">
|
||||
<div class="title">
|
||||
{!! Form::label('site_logo', 'Logo') !!}
|
||||
<span>150x60px</span>
|
||||
</div>
|
||||
{!! Form::file('site_logo', null, ['required']) !!}
|
||||
{!! Form::input('hidden', 'site_logo_hidden', $site->site_logo) !!}
|
||||
</div>
|
||||
<div class="form-field">
|
||||
{!! Form::label('site_contact', 'Contact') !!}
|
||||
{!! Form::email('site_contact', null, ['required']) !!}
|
||||
</div>
|
||||
</div>
|
||||
<h4>Informations pour génération des BR :</h4>
|
||||
<div class="form-split">
|
||||
<div class="form-field">
|
||||
{!! Form::label('site_libelle', 'Libellé du site') !!}
|
||||
{!! Form::input('text', 'site_libelle', null) !!}
|
||||
</div>
|
||||
<div class="form-field">
|
||||
{!! Form::label('site_rcs', 'RCS du site') !!}
|
||||
{!! Form::input('text', 'site_rcs', null) !!}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-field submit">
|
||||
{!! Form::submit('Mettre à jour') !!}
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
</div>
|
||||
|
||||
<div class="campagne-list">
|
||||
<h2><i class="fa fa-folder"><i class="fas fa-ticket-alt"></i></i> Campagnes liées</h2>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{__('Ref') }}</th>
|
||||
<th>{{__('Création') }}</th>
|
||||
<th>{{__('Nom') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($site->campagnes as $c)
|
||||
<tr>
|
||||
<td>{{ $c->camp_id }}</td>
|
||||
<td>{{ $c->camp_name }}</td>
|
||||
<td>{{ $c->camp_createdate }}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@endsection
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
@extends('layouts.main')
|
||||
|
||||
@section('content')
|
||||
<h2><i class="fas fa-building"></i> Sites <a href="{{ route('site.create') }}" class="add-button"><i class="fas fa-plus-square"></i> Ajouter</a></h2>
|
||||
<div class="content-list">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{__('Ref') }}</th>
|
||||
<th>{{__('Nom') }}</th>
|
||||
<th>{{__('Contact') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($sites as $s)
|
||||
<tr>
|
||||
<td><a href="{{ route('site.edit', $s) }}">{{ $s->site_id }}</a></td>
|
||||
<td>{{ $s->site_nom }}</td>
|
||||
<td>{{ $s->site_contact }}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@endsection
|
||||
Loading…
Add table
Reference in a new issue