forge-joniko/ldc-dam
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into trunk

Browse source
This commit is contained in:
Vincent BRIDIER 2025-10-24 12:25:07 +02:00
commit ac9dbc3aad
No known key found for this signature in database
GPG key ID: 8571BFA20420D512
6 changed files with 1103 additions and 1279 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
app/Console/Commands/ImportArcadiaModelFiles.php
View file

@ -127,20 +127,20 @@ class ImportArcadiaModelFiles extends Command
/** @var \SimpleXMLElement $row */
foreach ($fileContent->dam as $row) {
/** @var \App\Models\Article|null $record */
$record = Article::where('noArt', $row->noArt)->first();
$record = Article::where('noArt', (int)$row->noArt)->first();
if (!$record) {
$record = new Article();
$record->noArt = $row->noArt;
$record->noArt = (int)$row->noArt;
}
$record->libCcial = $row->libCcial;
$record->codMarq = $row->codMarq;
$record->libMarq = $row->libMarq;
$record->codFamVte = $row->codFamVte;
$record->libFamVte = $row->libFamVte;
$record->codGencodAdm = $row->codGencodAdm;
$record->codGencodSymb = $row->codGencodSymb;
$record->codGencodPds = $row->codGencodPds;
$record->utilisableGroupe = $row->utilisableGroupe;
$record->libCcial = (string)$row->libCcial;
$record->codMarq = (int)$row->codMarq;
$record->libMarq = (string)$row->libMarq;
$record->codFamVte = (int)$row->codFamVte;
$record->libFamVte = (string)$row->libFamVte;
$record->codGencodAdm = (string)$row->codGencodAdm;
$record->codGencodSymb = (string)$row->codGencodSymb;
$record->codGencodPds = (string)$row->codGencodPds;
$record->utilisableGroupe = (int)$row->utilisableGroupe;
$record->saveOrFail();
} //end foreach
}
@ -157,12 +157,12 @@ class ImportArcadiaModelFiles extends Command
/** @var \SimpleXMLElement $row */
foreach ($fileContent->dam as $row) {
/** @var \App\Models\Marque|null $record */
$record = Marque::where('codMarq', $row->codMarq)->first();
$record = Marque::where('codMarq', (int)$row->codMarq)->first();
if (!$record) {
$record = new Marque();
$record->codMarq = $row->codMarq;
$record->codMarq = (int)$row->codMarq;
}
$record->libMarq = $row->libMarq;
$record->libMarq = (string)$row->libMarq;
$record->saveOrFail();
}
}
@ -179,12 +179,12 @@ class ImportArcadiaModelFiles extends Command
/** @var \SimpleXMLElement $row */
foreach ($fileContent->mediaSujet as $row) {
/** @var \App\Models\Sujet|null $record */
$record = Sujet::where('codeSujet', $row->code)->first();
$record = Sujet::where('codeSujet', (int)$row->code)->first();
if (!$record) {
$record = new Sujet();
$record->codeSujet = $row->code;
$record->codeSujet = (int)$row->code;
}
$record->libelle = $row->libelle;
$record->libelle = (string)$row->libelle;
$record->saveOrFail();
}
}
@ -201,12 +201,12 @@ class ImportArcadiaModelFiles extends Command
/** @var \SimpleXMLElement $row */
foreach ($fileContent->mediatypemedia as $row) {
/** @var \App\Models\TypeMedia|null $record */
$record = TypeMedia::where('codeTypemedia', $row->code)->first();
$record = TypeMedia::where('codeTypemedia', (int)$row->code)->first();
if (!$record) {
$record = new TypeMedia();
$record->codeTypemedia = $row->code;
$record->codeTypemedia = (int)$row->code;
}
$record->libelle = $row->libelle;
$record->libelle = (string)$row->libelle;
$record->saveOrFail();
}
}
@ -223,13 +223,13 @@ class ImportArcadiaModelFiles extends Command
/** @var \SimpleXMLElement $row */
foreach ($fileContent->mediatypesvue as $row) {
/** @var \App\Models\TypeVue|null $record */
$record = TypeVue::where('codeTypevue', $row->code)->first();
$record = TypeVue::where('codeTypevue', (int)$row->code)->first();
if (!$record) {
$record = new TypeVue();
$record->codeTypevue = $row->code;
$record->codeTypevue = (int)$row->code;
}
$record->libelle = $row->libelle;
$record->sujet_id = $row->sujet_id->mediasujet->code;
$record->libelle = (string)$row->libelle;
$record->sujet_id = (int)$row->sujet_id->mediasujet->code;
$record->saveOrFail();
}
}
@ -246,14 +246,14 @@ class ImportArcadiaModelFiles extends Command
/** @var \SimpleXMLElement $row */
foreach ($fileContent->mediavariante as $row) {
/** @var \App\Models\TypeVue|null $record */
$record = Variante::where('codeVariante', $row->code)->first();
$record = Variante::where('codeVariante', (int)$row->code)->first();
if (!$record) {
$record = new Variante();
$record->codeVariante = $row->code;
$record->codeVariante = (int)$row->code;
}
$record->libelle = $row->libelle;
$record->sujet_id = $row->sujet_id->children()[0]->code;
$record->type_vue_id = $row->CodeTypeVue->mediatypesvue->code;
$record->libelle = (string)$row->libelle;
$record->sujet_id = (int)$row->sujet_id->children()[0]->code;
$record->type_vue_id = (int)$row->CodeTypeVue->mediatypesvue->code;
$record->saveOrFail();
}
}
@ -270,12 +270,12 @@ class ImportArcadiaModelFiles extends Command
/** @var \SimpleXMLElement $row */
foreach ($fileContent->SITE_PROD_GRP as $row) {
/** @var \App\Models\TypeVue|null $record */
$record = Site::where('id', $row->code)->first();
$record = Site::where('id', (int)$row->code)->first();
if (!$record) {
$record = new Site();
$record->id = $row->code;
$record->id = (int)$row->code;
}
$record->libelle = $row->libelle;
$record->libelle = (string)$row->libelle;
$record->saveOrFail();
}
}
@ -292,12 +292,12 @@ class ImportArcadiaModelFiles extends Command
/** @var \SimpleXMLElement $row */
foreach ($fileContent->dam as $row) {
/** @var \App\Models\TypeVue|null $record */
$record = Societe::where('id', $row->codSociete)->first();
$record = Societe::where('id', (int)$row->codSociete)->first();
if (!$record) {
$record = new Societe();
$record->id = $row->codSociete;
$record->id = (int)$row->codSociete;
}
$record->libelle = $row->nomSociete;
$record->libelle = (string)$row->nomSociete;
$record->saveOrFail();
}
}

4
app/Models/Media.php
View file

@ -241,8 +241,8 @@ class Media extends Model
/** @var \App\Models\User */
$user = auth()->user();
// * Prevent soft delete trigerring update event
if (!\array_key_exists('deleted_at', $model->getChanges())) {
// * If update is not running from console, we prevent soft delete before trigerring update event
if ($user and !\array_key_exists('deleted_at', $model->getChanges())) {
MediaUpdated::dispatch($user, $model);
}

16
app/Providers/AppServiceProvider.php
View file

@ -4,6 +4,7 @@ namespace App\Providers;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\URL;
use Illuminate\Support\ServiceProvider;
@ -16,6 +17,12 @@ class AppServiceProvider extends ServiceProvider
*/
public function boot()
{
if (
in_array(config('app.env'), ['local', 'testing']) && config('app.bypassldap') && !app()->runningInConsole()
) {
Auth::loginUsingId(1);
}
// !!! Fuc**** Lab LDC exception OMG !!!
if (!in_array(config('app.env'), ['local', 'testing'])) {
URL::forceRootUrl(config('app.url'));
@ -25,13 +32,10 @@ class AppServiceProvider extends ServiceProvider
return $url->current();
});
}
// * Force HTTPS
URL::forceScheme('https');
// * LOCAL HTTPS FIX
if (!in_array(config('app.env'), ['local', 'testing'])) {
URL::forceScheme('https');
}
// * HA PROXY FIX
// * REVERSE PROXY FIX
App::singleton('clientIp', function () {
if (config('app.env') == 'local') {
return request()->getClientIp();

9
composer.json
View file

@ -23,7 +23,6 @@
"laravel/tinker": "^2.7",
"laravel/ui": "^3.0",
"laravelcollective/html": "^6.3",
"ldc/web-status-checker-laravel": "^1.0",
"mews/purifier": "^3.3",
"pion/laravel-chunk-upload": "^1.5",
"rennokki/laravel-eloquent-query-cache": "^3.3"
@ -97,11 +96,5 @@
}
},
"minimum-stability": "dev",
"prefer-stable": true,
"repositories": [
{
"type": "composer",
"url": "https://lab.s-web.fr/api/v4/group/23/-/packages/composer/packages.json"
}
]
"prefer-stable": true
}

2281
composer.lock generated
View file

File diff suppressed because it is too large Load diff

2
config/app.php
View file

@ -4,6 +4,8 @@ use Illuminate\Support\Facades\Facade;
return [
'bypassldap' => env('BYPASS_LDAP', false),
/*
|--------------------------------------------------------------------------
| Application Name