update import + add export on salarie table - issue #7

This commit is contained in:
Alexis Gousseau 2023-07-28 07:25:36 +00:00 • committed by Vincent BRIDIER
parent 3c0fc94ddd
commit 2a1baea6c6
28 changed files with 1531 additions and 530 deletions

View file

@ -6,14 +6,14 @@ use App\Models\User;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Hash;
class CreateAdmin extends Command
class UserCreate extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'create:admin';
protected $signature = 'user:create';
/**
* The console command description.
@ -33,15 +33,15 @@ class CreateAdmin extends Command
$lastname = $this->ask('What is the lastname?', 'Web');
$email = $this->ask('What is the email?', 'equipe.web@ldc.fr');
$pwd = $this->secret('What is the password?');
$role = $this->ask('What is the role? (1 = SuperAdmin, 2 = Admin)', 2);
$user = new User();
$user->firstname = $firstname;
$user->lastname = $lastname;
$user->date_of_birth = now();
$user->email = $email;
$user->password = Hash::make($pwd);
$user->email_verified_at = now();
$user->role = 1;
$user->role = $role;
$user->save();
$this->info('User created.');

View file

@ -0,0 +1,83 @@
<?php
namespace App\Exports;
use App\Models\Salarie;
use Maatwebsite\Excel\Concerns\FromCollection;
use Maatwebsite\Excel\Concerns\WithCustomCsvSettings;
use Maatwebsite\Excel\Concerns\WithHeadings;
use Maatwebsite\Excel\Concerns\WithMapping;
class SalariesExport implements FromCollection, WithHeadings, WithMapping, WithCustomCsvSettings
{
/**
* @var array
*/
public $salariesImport = null;
/**
* Create a new instance.
*
* @param array $salariesImport
* @return void
*/
public function __construct(array $salariesImport)
{
$this->salariesImport = $salariesImport;
}
/**
* Set the header of the .csv.
*
* @return array
*/
public function headings(): array
{
return [
'Matricule',
'Code',
];
}
/**
* Set data to specific column.
*
* @param \App\Models\Salarie $salaries
* @return array
* @phpcs:disable Squiz.Commenting.FunctionComment.TypeHintMissing
*/
public function map($salaries): array
{
//phpcs:enable
return [
$salaries->matricule,
$salaries->code,
];
}
/**
* Surchage defaults config of Laravel.
*
* @return array
*/
public function getCsvSettings(): array
{
return [
'delimiter' => ';'
];
}
/**
*
* @return \Illuminate\Support\Collection
*/
public function collection()
{
$salaries = Salarie::query();
foreach ($this->salariesImport as $salarieImport) {
$salaries->orWhere('matricule', $salarieImport);
}
return $salaries->get();
}
}

View file

@ -0,0 +1,53 @@
<?php
namespace App\Http\Controllers\Bo;
use App\Http\Controllers\Controller;
use App\Http\Requests\Bo\ImportRequest;
use App\Imports\SalariesImport;
use App\Jobs\SalariesExportJob;
use Maatwebsite\Excel\Facades\Excel;
class SalariesController extends Controller
{
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Contracts\View\View
* @ignore phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass
*/
public function index(): \Illuminate\Contracts\View\View
{
return view('bo.salaries.index');
}
/**
* Mass import by CSV.
* matricule;lastname;firstname;email
* default role = user
*
* @param \App\Http\Requests\Bo\ImportRequest $request
* @return \Illuminate\Http\RedirectResponse
*/
public function import(ImportRequest $request)
{
$salariesImport = new SalariesImport();
Excel::import($salariesImport, $request->import, null, \Maatwebsite\Excel\Excel::CSV);
$this->export($salariesImport->salariesImport);
return redirect()->route('bo.salaries.index')->with('success', 'Import terminé.');
}
/**
* Exporter l'ensemble des salariés dans un fichier .csv,
* au format matricule | code.
*
* @param array $salariesImport
* @return \Illuminate\Http\Response|\Illuminate\Contracts\Routing\ResponseFactory
*/
public function export(array $salariesImport)
{
$this->dispatch(new SalariesExportJob($salariesImport));
return redirect()->route('bo.salaries.index')->with('success', 'Export terminé.');
}
}

View file

@ -2,7 +2,6 @@
namespace App\Http;
use App\Http\Middleware\IsAdmin;
use Illuminate\Foundation\Http\Kernel as HttpKernel;
class Kernel extends HttpKernel
@ -62,6 +61,7 @@ class Kernel extends HttpKernel
'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
'is-admin' => IsAdmin::class,
'is-admin' => \App\Http\Middleware\IsAdmin::class,
'is-super-admin' => \App\Http\Middleware\IsSuperAdmin::class,
];
}

View file

@ -0,0 +1,26 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class IsSuperAdmin
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle(Request $request, Closure $next)
{
$role = Auth::user()->role;
if ($role === 1) {
return $next($request);
}
abort(404, "Cette page n'existe pas.");
}
}

View file

@ -0,0 +1,46 @@
<?php
namespace App\Http\Requests\Bo;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
class ImportRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return boolean
*/
public function authorize()
{
return (Auth::user()->role === 1);
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'import' => [
'required',
'file',
'mimes:csv,txt',
// phpcs:ignore Generic.Files.LineLength.TooLong
'mimetypes:text/csv,text/plain,application/csv,text/comma-separated-values,text/anytext,application/octet-stream,application/txt',
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed
function ($attribute, $value, $fail) {
if (
$this->import->getClientMimeType() !== 'text/csv'
&& $this->import->getClientMimeType() !== 'application/vnd.ms-excel'
) {
$fail(__('Le fichier doit être d\'un mime type text/csv ou application/vnd.ms-excel'));
}
}
]
];
}
}

View file

@ -4,7 +4,6 @@ namespace App\Http\Requests\Bo;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Str;
use Illuminate\Support\Facades\Auth;
class ProductRequest extends FormRequest
{

View file

@ -0,0 +1,46 @@
<?php
namespace App\Http\Requests\Bo;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
class SalariesImportRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return boolean
*/
public function authorize()
{
return (Auth::user()->role === 1);
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'import' => [
'required',
'file',
'mimes:csv,txt',
// phpcs:ignore Generic.Files.LineLength.TooLong
'mimetypes:text/csv,text/plain,application/csv,text/comma-separated-values,text/anytext,application/octet-stream,application/txt',
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed
function ($attribute, $value, $fail) {
if (
$this->import->getClientMimeType() !== 'text/csv'
&& $this->import->getClientMimeType() !== 'application/vnd.ms-excel'
) {
$fail(__('Le fichier doit être d\'un mime type text/csv ou application/vnd.ms-excel'));
}
}
]
];
}
}

View file

@ -0,0 +1,80 @@
<?php
namespace App\Imports;
use App\Models\Salarie;
use Carbon\Carbon;
use Maatwebsite\Excel\Concerns\ToModel;
use Maatwebsite\Excel\Concerns\WithCustomCsvSettings;
class SalariesImport implements ToModel, WithCustomCsvSettings
{
/**
* @var array $salariesImport
*/
public $salariesImport = [];
/**
* @return array
*/
public function getCsvSettings(): array
{
return [
'delimiter' => ";"
];
}
/**
* @param array $line
*
* @return \Illuminate\Database\Eloquent\Model|null
*/
public function model(array $line)
{
if (
!isset($line[0]) ||
!isset($line[1]) ||
!isset($line[2]) ||
!isset($line[6]) ||
!isset($line[7]) ||
!isset($line[7])
) {
return null;
}
return $this->processFile($line);
}
/**
* @param array $line
*
* @return \App\Models\Salarie
*/
public function processFile(array $line)
{
/** Check if the first line of the file matches to the data expected or is just a column commentary */
if (preg_match('/[0-9]{7}/', $line[0])) {
/** @var \App\Models\Salarie */
$salarie = Salarie::firstOrNew(['matricule' => $line[0]]);
$salarie->customer_id = $salarie->customer_id ?? null;
$salarie->nom = ucfirst(strtolower($line[1]));
$salarie->prenom = ucfirst(strtolower($line[2]));
if (isset($line[3])) {
$salarie->start_date = Carbon::createFromFormat('d/m/Y', $line[3])->format('Y-m-d');
}
if (isset($line[4])) {
$salarie->end_date = Carbon::createFromFormat('d/m/Y', $line[4])->format('Y-m-d');
} elseif (isset($line[5])) {
$salarie->end_date = Carbon::createFromFormat('d/m/Y', $line[5])->format('Y-m-d');
}
$salarie->etablissement = $line[6];
$salarie->site = $line[7];
$salarie->service = $line[8];
$salarie->code = $salarie->code ?? Salarie::generateRandomString(8, Salarie::query());
Salarie::setSalarieMagasin($salarie);
$salarie->saveOrFail();
$this->salariesImport = array_merge($this->salariesImport, [$line[0]]);
return $salarie;
} //end if
}
}

View file

@ -3,14 +3,11 @@
namespace App\Jobs;
use App\Enums\LogType;
use App\Enums\SalarieSite;
use App\Models\Salarie;
use ErrorException;
use TypeError;
use Illuminate\Database\QueryException;
use App\Exceptions\AbortCsvImportException;
use App\Lib\Utils;
use App\Models\Magasin;
use Carbon\Carbon;
class CsvSalariesReader extends CsvJobs
@ -28,15 +25,6 @@ class CsvSalariesReader extends CsvJobs
*/
protected $disk = 'salaries';
/**
* Create a new job instance.
*
* @return void
*/
public function __construct()
{
}
/**
* Execute the job.
*
@ -117,15 +105,8 @@ class CsvSalariesReader extends CsvJobs
// First line is header (mandatory).
$header = array_flip(array_shift($data));
foreach ($data as $line) {
$matricule = $line[$header['Matricule']];
$prenom = $line[$header['Prénom']];
$nom = $line[$header['Nom']];
$start_date = Carbon::createFromFormat('d/m/Y', $line[$header['Date début']]);
$end_date = $line[$header['Date fin']] ?
$end_date = $line[$header['Date fin']] ?
$line[$header['Date fin']] : $line[$header['Date fin prévue']];
$etablissement = $line[$header['Etablissement']];
$site = $line[$header['Site']];
$service = $line[$header['Service']];
if ($end_date != '') {
$end_date = Carbon::createFromFormat('d/m/Y', $end_date);
@ -133,19 +114,18 @@ class CsvSalariesReader extends CsvJobs
$end_date = null;
}
$salarie = Salarie::firstOrNew(['matricule' => $matricule]);
$salarie->matricule = $matricule;
$salarie->nom = $nom;
$salarie->prenom = $prenom;
$salarie->start_date = $start_date;
$salarie = Salarie::firstOrNew(['matricule' => $line[$header['Matricule']]]);
$salarie->matricule = $line[$header['Matricule']];
$salarie->nom = $line[$header['Nom']];
$salarie->prenom = $line[$header['Prénom']];
$salarie->start_date = Carbon::createFromFormat('d/m/Y', $line[$header['Date début']]);
$salarie->end_date = $end_date;
$salarie->etablissement = $etablissement;
$salarie->site = $site;
$salarie->service = $service;
$salarie->etablissement = $line[$header['Etablissement']];
$salarie->site = $line[$header['Site']];
$salarie->service = $line[$header['Service']];
$salarie->code = $salarie->code ?? $this->generateCode();
$salarie->save();
$this->setMagasin($salarie);
Salarie::setSalarieMagasin($salarie);
} //end foreach
}
@ -156,46 +136,6 @@ class CsvSalariesReader extends CsvJobs
*/
protected function generateCode()
{
return Utils::generateRandomString(8);
}
/**
* Sets the fixed collection point for a salarie.
*
* @param \App\Models\Salarie $salarie
* @return void
*/
protected function setMagasin(Salarie $salarie)
{
if ($salarie->site == SalarieSite::ldccav()) {
// CAVOL.
$magasin = Magasin::find(3);
} elseif ($salarie->site == SalarieSite::dde()) {
// Dinde.
$magasin = Magasin::find(8);
} elseif ($salarie->site == SalarieSite::dpe()) {
// DPE.
$magasin = Magasin::find(9);
} elseif ($salarie->site == SalarieSite::cepacpe()) {
if (
$salarie->service == "CEPACP060"
|| $salarie->service == "CEPACP070"
|| $salarie->service == "CEPACP072"
) {
// CPE.
$magasin = Magasin::find(6);
} elseif ($salarie->service == "CEPACP065" || $salarie->service == "CEPACP066") {
// PLB.
$magasin = Magasin::find(10);
} else {
// CEPA.
$magasin = Magasin::find(10);
}
} else {
// Saint Laurent.
$magasin = Magasin::find(1);
} //end if
$salarie->magasin()->associate($magasin);
$salarie->save();
return Salarie::generateRandomString(8, Salarie::all());
}
}

View file

@ -0,0 +1,53 @@
<?php
namespace App\Jobs;
use App\Exports\SalariesExport;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Support\Facades\Auth;
use Maatwebsite\Excel\Facades\Excel;
use App\Mail\SendSalariesCSVMail;
use Carbon\Carbon;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Storage;
class SalariesExportJob implements ShouldQueue
{
/**
*
* @var array|null
*/
public $salariesImport = null;
/**
* Create a new job instance.
*
* @param array $salariesImport
* @return void
*/
public function __construct(array $salariesImport)
{
$this->salariesImport = $salariesImport;
}
/**
* Create the export salaries file in the salarie disk.
*
* @return void
*/
public function handle()
{
/** @var \App\Models\User */
$user = Auth::user();
$disk = Storage::disk('salaries');
$csv_file = Carbon::now()->format('d_m_Y-H_i_s') . '-' . $user->id . '-export_salaries.csv';
Excel::store(new SalariesExport($this->salariesImport), $csv_file, 'salaries');
Mail::to($user->email)->send(new SendSalariesCSVMail($user, $csv_file));
if ($disk->exists($csv_file)) {
$disk->delete($csv_file);
}
}
}

View file

@ -8,25 +8,6 @@ use Throwable;
class Utils
{
/**
* Simple Custom Random string generator
*
* @param integer $length
* @param string $characters
* @return string
*/
public static function generateRandomString(
int $length = 10,
string $characters = 'abcdefghjkmnpqrstuwxyzABCDEFGHJKMNPQRSTUWXYZ123456789'
) {
$charactersLength = strlen($characters);
$randomString = '';
for ($i = 0; $i < $length; $i++) {
$randomString .= $characters[rand(0, $charactersLength - 1)];
}
return $randomString;
}
/**
* Manually send an exception to team instead of going trough the error handler
* (requires package kwaadpepper/exception-handler)

View file

@ -0,0 +1,53 @@
<?php
namespace App\Mail;
use App\Models\User;
use Illuminate\Bus\Queueable;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
class SendSalariesCSVMail extends Mailable
{
use Queueable;
use SerializesModels;
/**
* The model.
*
* @var \App\Models\Salarie
*/
protected $model;
/**
* The file.
*
* @var \App\Models\Salarie
*/
protected $file;
/**
* Create a new message instance.
*
* @param \App\Models\User $model
* @param string $file
* @return void
*/
public function __construct(User $model, string $file)
{
$this->model = $model;
$this->file = $file;
}
/**
* Build the message.
*
* @return $this
*/
public function build()
{
return $this->subject("Export salariés - " . config('theme.site_name', 'Boutique'))
->attach(storage_path('salaries') . "/" . $this->file)
->markdown('mails.send-csv', ['model' => $this->model]);
}
}

View file

@ -215,7 +215,7 @@ class Product extends Model implements Buyable
$this->priceHt = $this->attributes['price'];
return $this->priceHt;
}
}//end if
} //end if
}
/**
@ -315,7 +315,7 @@ class Product extends Model implements Buyable
if (isset($this->priceTtc)) {
return $this->priceTtc;
} else {
$priceTtc = $this->priceHt * ( 1 + ( $this->tax->rate / 100));
$priceTtc = $this->priceHt * (1 + ($this->tax->rate / 100));
/**
* On travaille avec des centimes puis on redivise par 100 pour avoir des unités monetaires
* on augmente la précision à 3 digits, l'affichage formate les prix sur 2 décimales
@ -347,7 +347,7 @@ class Product extends Model implements Buyable
if (isset($this->discountedPriceTtc)) {
$showPrice = $this->discountedPriceTtc;
} else {
$discountedPriceTtc = $this->discountedPriceHt * ( 1 + ( $this->tax->rate / 100));
$discountedPriceTtc = $this->discountedPriceHt * (1 + ($this->tax->rate / 100));
// On travaille avec des centimes puis on redivise par 100 pour avoir des unités monetaires.
$roundingDiscountedPriceTTC = round($discountedPriceTtc * 1000) / 1000;
$this->discountedPriceTtc = $roundingDiscountedPriceTTC;
@ -500,7 +500,7 @@ class Product extends Model implements Buyable
public function orders()
{
return $this->belongsToMany('App\Models\Order', 'orders_products', 'product_id', 'order_id')
->withPivot('quantity');
->withPivot('quantity');
}
/**
@ -575,8 +575,8 @@ class Product extends Model implements Buyable
{
$now = Carbon::now();
return $this->belongsToMany(Promotion::class)
->whereDate('date_start', '<=', $now)
->whereDate('date_end', '>=', $now);
->whereDate('date_start', '<=', $now)
->whereDate('date_end', '>=', $now);
}
/**

View file

@ -2,6 +2,7 @@
namespace App\Models;
use App\Enums\SalarieSite;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use App\Models\Customers;
@ -22,6 +23,83 @@ class Salarie extends Model
'start_date', 'end_date', 'etablissement', 'site', 'service'
];
/**
* Setter magasin for a salarie.
*
* @param \App\Models\Salarie $salarie
* @return void
*/
public static function setSalarieMagasin(Salarie $salarie)
{
Salarie::setMagasin($salarie);
}
/**
* Sets the fixed collection point for a salarie.
*
* @param \App\Models\Salarie $salarie
* @return void
*/
private function setMagasin(Salarie $salarie)
{
if ($salarie->site == SalarieSite::ldccav()) {
// CAVOL.
$magasin = Magasin::find(3);
} elseif ($salarie->site == SalarieSite::dde()) {
// Dinde.
$magasin = Magasin::find(8);
} elseif ($salarie->site == SalarieSite::dpe()) {
// DPE.
$magasin = Magasin::find(9);
} elseif ($salarie->site == SalarieSite::cepacpe()) {
if (
$salarie->service == "CEPACP060"
|| $salarie->service == "CEPACP070"
|| $salarie->service == "CEPACP072"
) {
// CPE.
$magasin = Magasin::find(6);
} elseif ($salarie->service == "CEPACP065" || $salarie->service == "CEPACP066") {
// PLB.
$magasin = Magasin::find(10);
} else {
// CEPA.
$magasin = Magasin::find(10);
}
} else {
// Saint Laurent.
$magasin = Magasin::find(1);
} //end if
$salarie->magasin()->associate($magasin);
$salarie->save();
}
/**
* Simple Custom Random string generator
*
* @param integer $length
* @param object|null $model
* @param string $characters
* @return string
*/
public static function generateRandomString(
int $length = 10,
object $model = null,
string $characters = 'abcdefghjkmnpqrstuwxyzABCDEFGHJKMNPQRSTUWXYZ123456789'
) {
$charactersLength = strlen($characters);
$randomString = '';
for ($i = 0; $i < $length; $i++) {
$randomString .= $characters[rand(0, $charactersLength - 1)];
}
if (isset($model) && $model->where('code', $randomString)->exists()) {
self::generateRandomString();
}
return $randomString;
}
// * RELATIONSHIPS
/**
* BelongsTo customer relation
*

View file

@ -20,6 +20,7 @@
"laravel/framework": "^8.12",
"laravel/tinker": "^2.5",
"ldc/ldccrmv2client": "^3.0",
"maatwebsite/excel": "^3.1",
"mews/purifier": "^3.3",
"spatie/laravel-sitemap": "^5.8"
},

923
composer.lock generated

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,7 @@
<?php
use Illuminate\Support\Str;
use Illuminate\Database\DBAL\TimestampType;
return [
@ -144,4 +145,10 @@ return [
],
'dbal' => [
'types' => [
'timestamp' => TimestampType::class,
],
],
];

View file

@ -0,0 +1,34 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
class AlterCodeSalariesTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('salaries', function (Blueprint $table) {
$table->string('code', 50)->unique()->change();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('salaries', function (Blueprint $table) {
$table->dropUnique('salaries_code_unique');
});
DB::statement('ALTER TABLE `salaries` MODIFY `code` VARBINARY(50) AFTER `prenom`');
}
}

View file

@ -0,0 +1,32 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AlterBirthUsersTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('users', function (Blueprint $table) {
$table->dropColumn('date_of_birth');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('users', function (Blueprint $table) {
$table->date('date_of_birth')->nullable()->after('lastname');
});
}
}

View file

@ -0,0 +1,33 @@
<?php
use Illuminate\Database\Migrations\Migration;
use App\Models\User;
class AlterRoleUsersTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
foreach (User::where('email', '<>', 'equipe.web@ldc.fr')->get() as $user) {
$user->role = 2;
$user->saveOrFail();
}
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
foreach (User::all() as $user) {
$user->role = 1;
$user->saveOrFail();
}
}
}

View file

@ -0,0 +1,49 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use Illuminate\Support\Facades\DB;
class AlterCleanSalariesTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('salaries', function (Blueprint $table) {
$table->date('start_date')->nullable()->change();
$table->date('end_date')->nullable()->change();
$table->string('nom')->nullable(false)->change();
$table->string('prenom')->nullable(false)->change();
$table->string('code', 10)->nullable(false)->change();
// FIXME : Pourquoi ca passe pas avec eloquent ????
DB::statement(
'ALTER TABLE `salaries` CHANGE COLUMN `magasin_id` `magasin_id` BIGINT(20) UNSIGNED NOT NULL AFTER `service`;'
);
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('salaries', function (Blueprint $table) {
$table->timestamp('start_date')->nullable()->change();
$table->timestamp('end_date')->nullable()->change();
$table->string('nom')->nullable()->change();
$table->string('prenom')->nullable()->change();
$table->string('code', 50)->nullable()->change();
// FIXME : Pourquoi ca passe pas avec eloquent ????
DB::statement(
'ALTER TABLE `salaries` CHANGE COLUMN `magasin_id` `magasin_id` BIGINT(20) UNSIGNED NULL AFTER `service`;'
);
});
}
}

View file

@ -0,0 +1,29 @@
@extends('layouts.bo-layout')
@section('content')
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
<h1 class="h2">{{ __('Paramètres Site Public') }}</h1>
@if (session('success'))
<span class="float-center text-success">{{ session('success') }}</span>
@endif
</div>
<form
action="{{ route('bo.salaries.file') }}"
method="POST"
enctype="multipart/form-data">
<fieldset>
<legend>{{ __('Importer des salariés') }}</legend>
<div class="input-group my-2">
<input class="form-control" type="file" name="import" accept="text/csv,.csv"
title="{{ __('Sélectionner un fichier .csv') }}"
data-bs-toggle="tooltip" required>
@csrf
<button type="submit" class="btn btn-primary"
title="{{ __('Importer le fichier .csv') }}"
data-bs-toggle="tooltip">
{{ __('Importer') }}
</button>
</div>
</fieldset>
</form>
@endsection

View file

@ -1,7 +1,7 @@
@extends('layouts.bo-layout')
@section('content')
<form method="POST" action="{{route('bo.settings')}}">
<form method="POST" action="{{ route('bo.settings') }}">
@method('PUT')
@csrf
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
@ -22,30 +22,6 @@
</ul>
</div>
@endif
{{--<div class="form-group">
<label class="col-form-label">
<input type="checkbox" name="has_costs" value="1" @if ($settingsToPrint['has_costs'] == "1") checked @endif>
Frais de commande
</label>
</div>
<div class="form-group">
<label class="col-form-label">
Montant des frais de commande
<input type="number" name="costs" step=".01" class="form-control" value="{{$settingsToPrint['costs']}}">
</label>
</div>
<div class="form-group">
<label class="col-form-label">
<input type="checkbox" name="has_payment" value="1" @if ($settingsToPrint['has_payment'] == "1") checked @endif>
Prise en charge du paiement
</label>
</div>
<div class="form-group">
<label class="col-form-label">
<input type="checkbox" name="qr_code" value="1" @if ($settingsToPrint['qr_code'] == "1") checked @endif>
Gestion des QR codes
</label>
</div>--}}
<div class="form-group">
<label class="col-form-label">
Délai de retrait de la commande
@ -196,45 +172,3 @@
</div>
</div>
@endsection
{{-- devenu inutile puisque le swicth envoi de commande active en fait le champs order_unit, et rend oligatoire le champ reference
mais le champs sell unit reste un champs d'uvc qui peut prendre d'autres formes.
@section('scripts')
<script type="text/javascript">
$(document).ready(function(){
$("INPUT[name=regate_orders]").change(function(){
if($(this).prop("checked") == true){
//console.log("Checkbox is checked.");
//check strict sell units
$("INPUT[name=sell_unit_management]").prop("checked",true);
}
else if($(this).prop("checked") == false){
//console.log("Checkbox is unchecked.");
}
});
$("INPUT[name=sell_unit_management]").change(function(){
if($(this).prop("checked") == true){
//console.log("Checkbox is checked.");
}
else if($(this).prop("checked") == false){
//console.log("Checkbox is unchecked.");
if($("INPUT[name=regate_orders]").prop("checked") == true){
//recheck
$(this).prop("checked",true);
$.fancybox.open({
src : '#hidden-content',
type : 'inline',
opts : {
afterShow : function( instance, current ) {
console.info( 'done!' );
}
}
});
}
}
});
});
</script>
@endsection
--}}

View file

@ -5,7 +5,7 @@
<ul class="d-flex flex-column flex-xl-row justify-content-evenly align-items-center p-3 p-xl-0 m-0">
<li class="list-group-item">
<a class="nav-link" href="/">
<img class="p-1" src="{{ asset(config('app.theme') . "/img/logo.png")}}" alt="Logo" />
<img class="p-1" src="{{ asset(config('app.theme') . "/img/logo.png") }}" alt="Logo" />
</a>
</li>
<li class="list-group-item">

View file

@ -0,0 +1,15 @@
@component('mail::message')
<div style="display:flex;justify-content:center;">
![{{ config('app.name') }}]({{ asset(config('app.theme') . "/img/logo.png") }})
</div>
# {{ __('Bonjour :lastname :firstname', ['lastname' => $model->lastname, 'firstname' => $model->firstname]) }}
{{ __("Vous venez de générer un fichier .csv suite à l'import de salariés, disponible en pièce jointe de cet email.") }}
{{ config('app.name') }}.
@endcomponent

View file

@ -6,7 +6,7 @@
<!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}">
<title>Tableau de bord</title>
<title>{{ __('Tableau de bord') }}</title>
<script src="https://cdn.ckeditor.com/ckeditor5/23.0.0/classic/ckeditor.js"></script>
@ -21,7 +21,7 @@
</button>
<ul class="navbar-nav px-3">
<li class="nav-item text-nowrap">
<a class="nav-link" href="{{ route('auth.logout') }}">Déconnexion</a>
<a class="nav-link" href="{{ route('auth.logout') }}">{{ __('Déconnexion') }}</a>
</li>
</ul>
</nav>
@ -32,40 +32,40 @@
<div class="position-sticky pt-3">
<ul class="nav flex-column mb-2">
<li class="nav-item">
<a class="nav-link" href="{{route('home')}}" target="_front">Voir le site</a>
<a class="nav-link" href="{{route('home')}}" target="_front">{{ __('Voir le site') }}</a>
</li>
</ul>
<div class="accordion" id="accordionMenu">
<div class="accordion-item">
<h2 class="accordion-header" id="headingSliders">
<button class="accordion-button {{ ( request()->routeIs('bo.sliders*') || request()->routeIs('bo.slides*') ) ? '' : 'collapsed' }}" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSliders" aria-expanded="true" aria-controls="collapseSliders">
<i class="fas fa-tv"></i>&nbsp;Sliders
</button>
<button class="accordion-button {{ ( request()->routeIs('bo.sliders*') || request()->routeIs('bo.slides*') ) ? '' : 'collapsed' }}" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSliders" aria-expanded="true" aria-controls="collapseSliders">
<i class="fas fa-tv"></i>&nbsp;{{ __('Sliders') }}
</button>
</h2>
<div id="collapseSliders" class="accordion-collapse collapse {{ ( request()->routeIs('bo.sliders*') || request()->routeIs('bo.slides*') ) ? 'show' : '' }}" aria-labelledby="headingSliders" data-bs-parent="#accordionMenu">
<div class="accordion-body">
<div class="accordion-body">
<ul class="nav flex-column mb-2">
<li class="nav-item"><a class="nav-link" href="{{route('bo.sliders.index')}}">Sliders</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.slides.index')}}">Slides</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.sliders.index')}}">{{ __('Sliders') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.slides.index')}}">{{ __('Slides') }}</a></li>
</ul>
</div>
</div>
</div>
</div>
<div class="accordion-item">
<h2 class="accordion-header" id="headingPages">
<button class="accordion-button {{ ( request()->routeIs('bo.content') || request()->routeIs('bo.faq') ) ? '' : 'collapsed' }}" type="button" data-bs-toggle="collapse" data-bs-target="#collapsePages" aria-expanded="true" aria-controls="collapsePages">
<i class="far fa-file-word"></i>&nbsp;Pages
</button>
<i class="far fa-file-word"></i>&nbsp;{{ __('Pages') }}
</button>
</h2>
<div id="collapsePages" class="accordion-collapse collapse {{ ( request()->routeIs('bo.content') || request()->routeIs('bo.faq') ) ? 'show' : '' }}" aria-labelledby="headingPages" data-bs-parent="#accordionMenu">
<div class="accordion-body">
<ul class="nav flex-column mb-2">
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'accueil')}}">Accueil</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'contact')}}">Contact</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'legals')}}">Mentions Légales</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'cgv')}}">CGV</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'confidentialite')}}">Politique de confidentialité</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.faq')}}">FAQ</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'accueil')}}">{{ __('Accueil') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'contact')}}">{{ __('Contact') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'legals')}}">{{ __('Mentions Légales') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'cgv')}}">{{ __('CGV') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'confidentialite')}}">{{ __('Politique de confidentialité') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.faq')}}">{{ __('FAQ') }}</a></li>
</ul>
</div>
</div>
@ -73,7 +73,7 @@
<div class="accordion-item">
<h2 class="accordion-header" id="headingProduits">
<button class="accordion-button {{ ( request()->routeIs('bo.products*') || request()->routeIs('bo.ranges*') || request()->routeIs('bo.tags*') ) ? '' : 'collapsed' }}" type="button" data-bs-toggle="collapse" data-bs-target="#collapseProduits" aria-expanded="true" aria-controls="collapseProduits">
<i class="fas fa-warehouse"></i>&nbsp;Catalogue
<i class="fas fa-warehouse"></i>&nbsp;{{ __('Catalogue') }}
</button>
</h2>
@ -81,9 +81,9 @@
<div class="accordion-body">
<ul class="nav flex-column mb-2">
<li class="nav-item">
<a class="nav-link" href="{{route('bo.products.index')}}">Produits</a>
<a class="nav-link" href="{{route('bo.ranges.index')}}">Gammes de produits</a>
<a class="nav-link" href="{{route('bo.tags.index')}}">Mots Clés</a>
<a class="nav-link" href="{{route('bo.products.index')}}">{{ __('Produits') }}</a>
<a class="nav-link" href="{{route('bo.ranges.index')}}">{{ __('Gammes de produits') }}</a>
<a class="nav-link" href="{{route('bo.tags.index')}}">{{ __('Mots Clés') }}</a>
</li>
</ul>
</div>
@ -92,7 +92,7 @@
<div class="accordion-item">
<h2 class="accordion-header" id="headingMerchandising">
<button class="accordion-button {{ ( request()->routeIs('bo.promotions*') || request()->routeIs('bo.products.starred') ) ? '' : 'collapsed' }}" type="button" data-bs-toggle="collapse" data-bs-target="#collapseMerchandising" aria-expanded="true" aria-controls="collapseMerchandising">
<i class="fas fa-cart-arrow-down"></i>&nbsp;Merchandising
<i class="fas fa-cart-arrow-down"></i>&nbsp;{{ __('Merchandising') }}
</button>
</h2>
@ -100,9 +100,8 @@
<div class="accordion-body">
<ul class="nav flex-column mb-2">
<li class="nav-item">
<a class="nav-link" href="{{route('bo.promotions.index')}}">Promotions</a>
<a class="nav-link" href="{{route('bo.products.starred')}}">Mise en avant</a>
{{--<a class="nav-link" href="#">Associations de produits</a>--}}
<a class="nav-link" href="{{route('bo.promotions.index')}}">{{ __('Promotions') }}</a>
<a class="nav-link" href="{{route('bo.products.starred')}}">{{ __('Mise en avant') }}</a>
</li>
</ul>
</div>
@ -112,7 +111,7 @@
<div class="accordion-item">
<h2 class="accordion-header" id="headingOrders">
<button class="accordion-button {{ ( request()->routeIs('bo.orders*') ) ? '' : 'collapsed' }}" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOrders" aria-expanded="true" aria-controls="collapseOrders">
<i class="fas fa-cash-register"></i>&nbsp;Commandes
<i class="fas fa-cash-register"></i>&nbsp;{{ __('Commandes') }}
</button>
</h2>
@ -120,8 +119,8 @@
<div class="accordion-body">
<ul class="nav flex-column mb-2">
<li class="nav-item">
<a class="nav-link" href="{{route('bo.orders')}}">Commandes</a>
<a class="nav-link" href="{{route('bo.orders.today')}}">Commandes à retirer aujourd'hui</a>
<a class="nav-link" href="{{route('bo.orders')}}">{{ __('Commandes') }}</a>
<a class="nav-link" href="{{route('bo.orders.today')}}">{{ __('Commandes à retirer aujourd\'hui') }}</a>
</li>
</ul>
</div>
@ -131,19 +130,19 @@
<div class="accordion-item">
<h2 class="accordion-header" id="headingCollecte">
<button class="accordion-button {{ ( request()->routeIs('bo.magasins*') || request()->routeIs('bo.creneaux*') ) ? '' : 'collapsed' }}" type="button" data-bs-toggle="collapse" data-bs-target="#collapseCollecte" aria-expanded="true" aria-controls="collapseCollecte">
<i class="fas fa-store"></i>&nbsp;Points de retrait
<i class="fas fa-store"></i>&nbsp;{{ __('Points de retrait') }}
</button>
</h2>
<div id="collapseCollecte" class="accordion-collapse collapse {{ ( request()->routeIs('bo.magasins*') || request()->routeIs('bo.creneaux*') ) ? 'show' : '' }}" aria-labelledby="headingCollecte" data-bs-parent="#accordionMenu">
<div class="accordion-body">
<ul class="nav flex-column mb-2">
<li class="nav-item">
<a class="nav-link" href="{{route('bo.magasins.index')}}">Magasins</a>
<a class="nav-link" href="{{route('bo.magasins.index')}}">{{ __('Magasins') }}</a>
</li>
</ul>
</div>
</div>
</div>
</div>
<div class="accordion-item">
<h2 class="accordion-header" id="headingSettings">
<button class="accordion-button {{ ( request()->routeIs('bo.settings*') ) ? '' : 'collapsed' }}" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSettings" aria-expanded="true" aria-controls="collapseSettings">
@ -155,160 +154,18 @@
<div class="accordion-body">
<ul class="nav flex-column mb-2">
<li class="nav-item">
<a class="nav-link" href="{{route('bo.settings')}}">Paramètres généraux</a>
<a class="nav-link" href="{{route('bo.settings')}}">{{ __('Paramètres généraux') }}</a>
@if(Auth::user()->role === 1)
<a class="nav-link" href="{{route('bo.salaries.index')}}">{{ __('Import/Export des salariés') }}</a>
@endif
@if(!empty(Config::get('theme.bo_theme_settings')))
<a class="nav-link" href="{{route('bo.themesettings')}}">Paramètres site public</a>
<a class="nav-link" href="{{route('bo.themesettings')}}">{{ __('Paramètres site public') }}</a>
@endif
</li>
</ul>
</div>
</div>
</div>
{{-- <div class="card">
<div class="card-header" id="headingSliders">
<h2 class="mb-0">
<button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseSliders" aria-expanded="true" aria-controls="collapseOne">
<i class="fas fa-tv"></i> Sliders
</button>
</h2>
</div>
<div id="collapseSliders" class="collapse {{ ( request()->routeIs('bo.sliders*') || request()->routeIs('bo.slides*') ) ? 'show' : '' }}" aria-labelledby="headingSliders" tata-parent="#accordionMenu">
<div class="card-body">
<ul class="nav flex-column mb-2">
<li class="nav-item"><a class="nav-link" href="{{route('bo.sliders.index')}}">Sliders</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.slides.index')}}">Slides</a></li>
</ul>
</div>
</div>
</div>
<div class="card">
<div class="card-header" id="headingPages">
<h2 class="mb-0">
<button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapsePages" aria-expanded="true" aria-controls="collapseOne">
<i class="far fa-file-word"></i> Pages
</button>
</h2>
</div>
<div id="collapsePages" class="collapse {{ ( request()->routeIs('bo.content') || request()->routeIs('bo.faq') ) ? 'show' : '' }}" aria-labelledby="headingPages" tata-parent="#accordionMenu">
<div class="card-body">
<ul class="nav flex-column mb-2">
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'accueil')}}">Accueil</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'contact')}}">Contact</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'legals')}}">Mentions Légales</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'cgv')}}">CGV</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.content', 'confidentialite')}}">Politique de confidentialité</a></li>
<li class="nav-item"><a class="nav-link" href="{{route('bo.faq')}}">FAQ</a></li>
</ul>
</div>
</div>
</div>
<div class="card">
<div class="card-header" id="headingProduits">
<h2 class="mb-0">
<button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseProduits" aria-expanded="true" aria-controls="collapseOne">
<i class="fas fa-warehouse"></i> Catalogue
</button>
</h2>
</div>
<div id="collapseProduits" class="collapse {{ ( request()->routeIs('bo.products*') || request()->routeIs('bo.ranges*') || request()->routeIs('bo.tags*') ) ? 'show' : '' }}" aria-labelledby="headingProduits" tata-parent="#accordionMenu">
<div class="card-body">
<ul class="nav flex-column mb-2">
<li class="nav-item">
<a class="nav-link" href="{{route('bo.products.index')}}">Produits</a>
<a class="nav-link" href="{{route('bo.ranges.index')}}">Gammes de produits</a>
<a class="nav-link" href="{{route('bo.tags.index')}}">Mots Clés</a>
</li>
</ul>
</div>
</div>
</div>
<div class="card">
<div class="card-header" id="headingMerchandising">
<h2 class="mb-0">
<button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseMerchandising" aria-expanded="true" aria-controls="collapseOne">
<i class="fas fa-cart-arrow-down"></i> Merchandising
</button>
</h2>
</div>
<div id="collapseMerchandising" class="collapse {{ ( request()->routeIs('bo.promotions*') || request()->routeIs('bo.products.starred') ) ? 'show' : '' }}" aria-labelledby="headingMerchandising" tata-parent="#accordionMenu">
<div class="card-body">
<ul class="nav flex-column mb-2">
<li class="nav-item">
<a class="nav-link" href="{{route('bo.promotions.index')}}">Promotions</a>
<a class="nav-link" href="{{route('bo.products.starred')}}">Mise en avant</a>
{{--<a class="nav-link" href="#">Associations de produits</a>
</li>
</ul>
</div>
</div>
</div>
<!-- Commandes -->
<div class="card">
<div class="card-header" id="headingOrders">
<h2 class="mb-0">
<button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseOrders" aria-expanded="true" aria-controls="collapseOne">
<i class="fas fa-cash-register"></i> Commandes
</button>
</h2>
</div>
<div id="collapseOrders" class="collapse {{ ( request()->routeIs('bo.orders*') ) ? 'show' : '' }}" aria-labelledby="headingOrders" tata-parent="#accordionMenu">
<div class="card-body">
<ul class="nav flex-column mb-2">
<li class="nav-item">
<a class="nav-link" href="{{route('bo.orders')}}">Commandes</a>
<a class="nav-link" href="{{route('bo.orders.today')}}">Commandes à retirer aujourd'hui</a>
</li>
</ul>
</div>
</div>
</div>
<!-- Points de Collecte -->
<div class="card">
<div class="card-header" id="headingCollecte">
<h2 class="mb-0">
<button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseCollecte" aria-expanded="true" aria-controls="collapseOne">
<i class="fas fa-store"></i> Points de retrait
</button>
</h2>
</div>
<div id="collapseCollecte" class="collapse {{ ( request()->routeIs('bo.magasins*') || request()->routeIs('bo.creneaux*') ) ? 'show' : '' }}" aria-labelledby="headingCollecte" tata-parent="#accordionMenu">
<div class="card-body">
<ul class="nav flex-column mb-2">
<li class="nav-item">
<a class="nav-link" href="{{route('bo.magasins.index')}}">Magasins</a>
</li>
</ul>
</div>
</div>
</div>
<div class="card">
<div class="card-header" id="headingSettings">
<h2 class="mb-0">
<button class="btn btn-link btn-block text-left" type="button" data-toggle="collapse" data-target="#collapseSettings" aria-expanded="true" aria-controls="collapseOne">
<i class="fas fa-cog"></i> Règlages
</button>
</h2>
</div>
<div id="collapseSettings" class="collapse {{ ( request()->routeIs('bo.settings*') ) ? 'show' : '' }}" aria-labelledby="headingSettings" tata-parent="#accordionMenu">
<div class="card-body">
<ul class="nav flex-column mb-2">
<li class="nav-item">
<a class="nav-link" href="{{route('bo.settings')}}">Paramètres généraux</a>
@if(!empty(Config::get('theme.bo_theme_settings')))
<a class="nav-link" href="{{route('bo.themesettings')}}">Paramètres site public</a>
@endif
</li>
</ul>
</div>
</div>
</div> --}}
</div>
</div>
</nav>

View file

@ -14,6 +14,7 @@ use App\Http\Controllers\Bo\MagasinsController;
use App\Http\Controllers\Bo\ProductsController;
use App\Http\Controllers\Bo\SlidesController;
use App\Http\Controllers\Bo\TagsController;
use App\Http\Controllers\Bo\SalariesController;
/*
* --------------------------------------------------------------------------
@ -42,6 +43,14 @@ Route::namespace('App\Http\Controllers\Bo')
->middleware(['auth', 'is-admin'])
->group(
function () {
Route::middleware(['is-super-admin'])
->group(
function () {
// Salaries.
Route::get('/salaries', [SalariesController::class, 'index'])->name('salaries.index');
Route::post('/salaries/file', [SalariesController::class, 'import'])->name('salaries.file');
}
);
Route::get('/', [DashboardController::class, 'index'])->name('dashboard');
Route::match(['get', 'put'], '/content/{key}', [ContentController::class, 'manage'])->name('content');
Route::match(['get', 'put'], '/settings', [SettingsController::class, 'manage'])->name('settings');