From 94a162deb7f793ce94848b94cd5f92436b19227e Mon Sep 17 00:00:00 2001 From: Ludovic CANDELLIER Date: Sun, 23 Jan 2022 09:02:43 +0100 Subject: [PATCH] fix --- .../Admin/Shop/TarifUnityController.php | 55 ------------------- app/Models/Shop/SaleChannel.php | 10 ++++ .../Shop/Offers/partials/article.blade.php | 5 +- 3 files changed, 14 insertions(+), 56 deletions(-) delete mode 100644 app/Http/Controllers/Admin/Shop/TarifUnityController.php diff --git a/app/Http/Controllers/Admin/Shop/TarifUnityController.php b/app/Http/Controllers/Admin/Shop/TarifUnityController.php deleted file mode 100644 index bdcf1289..00000000 --- a/app/Http/Controllers/Admin/Shop/TarifUnityController.php +++ /dev/null @@ -1,55 +0,0 @@ -render('Admin.Shop.TariffUnities.list', $data); - } - - public function create() - { - $data['packages'] = Packages::getOptions(); - return view('Admin.Shop.TariffUnities.create'); - } - - public function store(Request $request) - { - $ret = TariffUnities::store($request->all()); - return redirect()->route('Admin.Shop.TariffUnities.index'); - } - - public function show($id) - { - $data = TariffUnities::get($id); - return view('Admin.Shop.TariffUnities.view', $data); - } - - public function edit($id) - { - $data['packages'] = Packages::getOptions(); - $data['unity'] = TariffUnities::get($id)->toArray(); - return view('Admin.Shop.TariffUnities.edit', $data); - } - - public function destroy($id) - { - return TariffUnities::destroy($id); - } - - public function update($id) - { - } -} diff --git a/app/Models/Shop/SaleChannel.php b/app/Models/Shop/SaleChannel.php index 54a20950..50139fe3 100644 --- a/app/Models/Shop/SaleChannel.php +++ b/app/Models/Shop/SaleChannel.php @@ -13,4 +13,14 @@ class SaleChannel extends Model { return $this->hasMany(Delivery::class); } + + public function price_lists() + { + return $this->hasMany(PriceList::class); + } + + public function tariffs() + { + return $this->hasManyThrough(Tariff::class, PriceList::class, 'id1', 'tariff_id', 'id2', 'id3') + } } diff --git a/resources/views/Admin/Shop/Offers/partials/article.blade.php b/resources/views/Admin/Shop/Offers/partials/article.blade.php index aef11586..5331f083 100644 --- a/resources/views/Admin/Shop/Offers/partials/article.blade.php +++ b/resources/views/Admin/Shop/Offers/partials/article.blade.php @@ -42,7 +42,7 @@
{{ Form::label('description', 'Description') }} - {{ $article['description'] ?? null }} + {!! $article['description'] ?? null !!}
@@ -55,3 +55,6 @@ + \ No newline at end of file