diff --git a/app/Http/Controllers/Bo/MagasinsController.php b/app/Http/Controllers/Bo/MagasinsController.php index 85c8b282..3b1f3e3d 100644 --- a/app/Http/Controllers/Bo/MagasinsController.php +++ b/app/Http/Controllers/Bo/MagasinsController.php @@ -3,9 +3,113 @@ namespace App\Http\Controllers\Bo; use App\Http\Controllers\Controller; +use App\Models\Magasin; use Illuminate\Http\Request; class MagasinsController extends Controller { - // + /** + * Display a listing of the resource. + * + * @return \Illuminate\Http\Response + */ + public function index() + { + $magasins = Magasin::all(); + return view('bo.magasins.index', compact('magasins')); + } + + /** + * Show the form for creating a new resource. + * + * @return \Illuminate\Http\Response + */ + public function create() + { + return view('bo.magasins.create'); + } + + /** + * Store a newly created resource in storage. + * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\Response + */ + public function store(Request $request) + { + $request->validate([ + 'name' => 'required|string|max:255', + 'address' => 'required|string|max:255', + 'postcode' => 'required', + 'city' => 'required|string|max:255', + ]); + + $shop = Magasin::create($request->except('_token')); + return redirect()->route('bo.magasins.edit', $shop->id)->with('success', 'Nouveau Magasin enregistré !'); + } + + /** + * Display the specified resource. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function show($id) + { + // + } + + /** + * Show the form for editing the specified resource. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function edit($id) + { + $magasin = Magasin::findOrFail($id); + return view('bo.magasins.edit', compact('magasin')); + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @return \Illuminate\Http\Response + */ + public function update(Request $request, $id) + { + $request->validate([ + 'name' => 'required|string|max:255', + 'address' => 'required|string|max:255', + 'postcode' => 'required', + 'city' => 'required|string|max:255', + ]); + + $shop = Magasin::findOrFail($id); + $shop->fill($request->except('_token'))->save(); + return redirect()->route('bo.magasins.edit', $shop->id)->with('success', 'Modifications enregistrés !'); + } + + /** + * Remove the specified resource from storage. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function destroy($id) + { + $shop = Magasin::findOrFail($id); + + $count = Magasin::count(); + + if ($count === 1) { + return redirect()->back()->withErrors("Suppression impossible : Vous devez conserver au moins 1 point de retrait."); + } + // @todo : controller les crenaux settings liés + + $shop->delete(); + return redirect()->route('bo.magasins.index'); + } } diff --git a/app/Http/Controllers/Bo/RangesController.php b/app/Http/Controllers/Bo/RangesController.php index 7680fa2b..8212222a 100644 --- a/app/Http/Controllers/Bo/RangesController.php +++ b/app/Http/Controllers/Bo/RangesController.php @@ -113,12 +113,14 @@ class RangesController extends Controller $range = Range::findOrFail($id); $product = Product::where('range_id', $range->id)->count(); - if ($product !== 0) + if ($product !== 0) { return redirect()->back()->withErrors("Suppression impossible : \"" . $range->name . "\" contient encore des produits."); + } - if($range->picture !== null) { - if (file_exists(public_path('images/gammes/') . $range->picture)) + if ($range->picture !== null) { + if (file_exists(public_path('images/gammes/') . $range->picture)) { unlink(public_path('images/gammes/') . $range->picture); + } } OldSlug::where('range_id', $range->id)->delete(); diff --git a/app/Http/Controllers/ContactController.php b/app/Http/Controllers/ContactController.php index a17f06c6..65fc4e58 100644 --- a/app/Http/Controllers/ContactController.php +++ b/app/Http/Controllers/ContactController.php @@ -6,6 +6,7 @@ use App\Http\Requests\ContactFormRequest; use App\Mail\SendContactMail; use App\Models\Magasin; use App\Models\Setting; +use App\Models\Content; use Illuminate\Support\Facades\Mail; use Illuminate\Http\Request; @@ -17,8 +18,9 @@ class ContactController extends Controller //1 seul magasin en base pour le moment $magasin = Magasin::first(); + $content = Content::where('key', 'contact')->first(); - return view('contact', compact('status', 'magasin')); + return view('contact', compact('status', 'magasin', 'content')); } public function contactSubmit(ContactFormRequest $request) diff --git a/app/Models/Magasin.php b/app/Models/Magasin.php index f62ab69d..df5f70e1 100644 --- a/app/Models/Magasin.php +++ b/app/Models/Magasin.php @@ -8,4 +8,10 @@ use Illuminate\Database\Eloquent\Model; class Magasin extends Model { use HasFactory; + + protected $fillable = [ + 'name', 'address', 'postcode', 'city', 'phone', + 'latitude', 'longitude', + 'gmaps_placeid', 'gmaps_embed_href', 'gmaps_link_href', + ]; } diff --git a/resources/views/bo/magasins/create.blade.php b/resources/views/bo/magasins/create.blade.php new file mode 100644 index 00000000..0a2be418 --- /dev/null +++ b/resources/views/bo/magasins/create.blade.php @@ -0,0 +1,95 @@ +@extends('layouts.bo-layout') + +@section('content') +
+ @csrf +
+

< Magasin Création

+
+
+
+ @if ($errors->any()) +
+ +
+ @endif +
+ + +
+
+ + +
+
+
+ + +
+
+ + +
+
+
+ + +
+
+
+ + +
+
+ + +
+
+
+

Google Maps

+
+
+ + +
+
+ + +
+
+ + +
+
+@endsection + +@section('scripts') + +@endsection diff --git a/resources/views/bo/magasins/edit.blade.php b/resources/views/bo/magasins/edit.blade.php new file mode 100644 index 00000000..eae7691b --- /dev/null +++ b/resources/views/bo/magasins/edit.blade.php @@ -0,0 +1,77 @@ +@extends('layouts.bo-layout') + +@section('content') +
+ @method('PUT') + @csrf +
+

< Magasin Modification

+ @if (session('success')) + {{ session('success') }} + @endif +
+
+
+ @if ($errors->any()) +
+ +
+ @endif +
+ + +
+
+ + +
+
+
+ + +
+
+ + +
+
+
+ + +
+
+
+ + +
+
+ + +
+
+
+

Google Maps

+
+
+ + +
+
+ + +
+
+ + +
+
+@endsection + +@section('scripts') + +@endsection diff --git a/resources/views/bo/magasins/index.blade.php b/resources/views/bo/magasins/index.blade.php new file mode 100644 index 00000000..a4825e8a --- /dev/null +++ b/resources/views/bo/magasins/index.blade.php @@ -0,0 +1,44 @@ +@extends('layouts.bo-layout') + +@section('content') +
+

Points de retrait Liste

+ + @if ($errors->any()) + @foreach($errors->all() as $error) + {{ $error }} + @endforeach + @endif + Ajouter +
+ + + + + + + + + @foreach ($magasins as $magasin) + + + + + + + + @endforeach + +
NomAdresseTéléphone
{{$magasin->name}}{{$magasin->address}}, {{$magasin->postcode}} {{$magasin->city}}{{$magasin->phone}} + Éditer +
+ @method('DELETE') + @csrf + +
+ +
+@endsection + + diff --git a/resources/views/layouts/bo-layout.blade.php b/resources/views/layouts/bo-layout.blade.php index 56cd8812..0d201459 100644 --- a/resources/views/layouts/bo-layout.blade.php +++ b/resources/views/layouts/bo-layout.blade.php @@ -110,7 +110,7 @@

@@ -167,6 +167,26 @@ + +
+
+

+ +

+
+ +
+
+ +
+
+

diff --git a/routes/web.php b/routes/web.php index 0641a7a5..6bee3618 100644 --- a/routes/web.php +++ b/routes/web.php @@ -16,9 +16,11 @@ use App\Http\Controllers\Bo\SettingsController; use App\Http\Controllers\Bo\OrdersController; use App\Http\Controllers\Bo\CreneauxController; //use App\Http\Controllers\Bo\RangesController; +//use App\Http\Controllers\Bo\MagasinsController; // AUTH use App\Http\Controllers\Auth\LoginController; + /* |-------------------------------------------------------------------------- | Web Routes @@ -98,6 +100,7 @@ Route::namespace('App\Http\Controllers\Bo') 'promotions' => PromotionsController::class, 'sliders' => SlidersController::class, 'slides' => SlidesController::class, + 'magasins' => MagasinsController::class, ]); Route::get('/slide/change-order/{id}/{action}', [App\Http\Controllers\Bo\SlidesController::class,'changeOrder'])->name('slides.change-order');