diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 81cacd9..20e93da 100755 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -5,7 +5,7 @@ namespace App\Http\Controllers; use App\Models\Category; use App\Models\IqImage; use App\Models\ProductCategory; -use\Request; +use Request; class CategoryController extends Controller @@ -21,7 +21,7 @@ class CategoryController extends Controller { $data = [ - 'values' => Category::all(), + 'values' => Category::orderBy('pos', 'DESC')->get(), ]; return view('admin.category.index', $data); } @@ -46,59 +46,93 @@ class CategoryController extends Controller { $data = Request::all(); - $data['active'] = isset($data['active']) ? true : false; - $data['parent_id'] = isset($data['parent_id']) ? $data['parent_id'] : null; - if($data['id'] == "new"){ - $model = Category::create($data); - }else{ - $model = Category::find($data['id']); - $model->fill($data)->save(); + if($data['action'] === 'save-product_category'){ + + if($data['id'] === 'new'){ + $ProductCategory = ProductCategory::create([ + 'pos' => $data['pos'], + 'product_id' => $data['product_id'], + 'category_id' => $data['category_id'], + ]); + \Session()->flash('alert-save', '1'); + return redirect(route('admin_product_category_edit', [$ProductCategory->category_id])); + }else{ + $ProductCategory = ProductCategory::findOrFail($data['id']); + if($ProductCategory->category_id != $data['category_id']){ + abort(404); + } + $ProductCategory->pos = $data['pos']; + $ProductCategory->product_id = $data['product_id']; + $ProductCategory->save(); + \Session()->flash('alert-save', '1'); + return redirect(route('admin_product_category_edit', [$ProductCategory->category_id])); + } + } - $trans = []; - if(!empty($data['trans_name'])){ - - foreach ($data['trans_name'] as $lang => $value){ - if($value && $value != null){ - $trans[$lang] = $value; + if($data['action'] === 'save-form'){ + $data['active'] = isset($data['active']) ? true : false; + $data['parent_id'] = isset($data['parent_id']) ? $data['parent_id'] : null; + if($data['id'] == "new"){ + $model = Category::create($data); + }else{ + $model = Category::find($data['id']); + $model->fill($data)->save(); + } + + $trans = []; + if(!empty($data['trans_name'])){ + + foreach ($data['trans_name'] as $lang => $value){ + if($value && $value != null){ + $trans[$lang] = $value; + } } } - } - $model->trans_name = $trans; - $model->save(); - - $trans = []; - if(!empty($data['trans_headline'])){ - foreach ($data['trans_headline'] as $lang => $value){ - if($value && $value != null){ - $trans[$lang] = $value; + $model->trans_name = $trans; + $model->save(); + + $trans = []; + if(!empty($data['trans_headline'])){ + foreach ($data['trans_headline'] as $lang => $value){ + if($value && $value != null){ + $trans[$lang] = $value; + } } } + $model->trans_headline = $trans; + $model->save(); + + \Session()->flash('alert-save', '1'); + return redirect(route('admin_product_categories')); } - $model->trans_headline = $trans; - $model->save(); - - \Session()->flash('alert-save', '1'); - return redirect(route('admin_product_categories')); - - } - public function delete($id){ + public function delete($do, $id){ - if(ProductCategory::where('category_id', $id)->count()){ - \Session()->flash('alert-error', 'Eintrag wird als Produkt-Kategorie verwendet'); + if($do === 'product_category'){ + $model = ProductCategory::findOrFail($id); + $category = $model->category; + $model->delete(); + \Session()->flash('alert-success', 'Eintrag gelöscht'); + return redirect(route('admin_product_category_edit', [$category->id])); + } + if($do === 'category'){ + if(ProductCategory::where('category_id', $id)->count()){ + \Session()->flash('alert-error', 'Eintrag hat noch Produkte, erst löschen'); + return redirect(route('admin_product_categories')); + } + if(Category::where('parent_id', $id)->count()){ + \Session()->flash('alert-error', 'Eintrag wird als Haup-Kategorie verwendet'); + return redirect(route('admin_product_categories')); + } + $model = Category::findOrFail($id); + $model->delete(); + \Session()->flash('alert-success', 'Eintrag gelöscht'); return redirect(route('admin_product_categories')); } - if(Category::where('parent_id', $id)->count()){ - \Session()->flash('alert-error', 'Eintrag wird als Haup-Kategorie verwendet'); - return redirect(route('admin_product_categories')); - } - $model = Category::findOrFail($id); - $model->delete(); - \Session()->flash('alert-success', 'Eintrag gelöscht'); - return redirect(route('admin_product_categories')); + } // Upload FILE ----------------------------------------------------------------------------------------------------------------------- diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 7c4b84a..de73f45 100755 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -37,6 +37,7 @@ class HomeController extends Controller if(!Auth::check()){ return redirect('login'); } + $data = [ 'user' => Auth::user(), 'now' => Carbon::now(), @@ -49,12 +50,12 @@ class HomeController extends Controller $data = Request::get('data'); $target = Request::get('target'); - $response = ""; if($data === "data_protection"){ $data = [ 'modal' => true, - 'user_shop' => Util::getUserShop(), + 'user_shop' => true, + 'isMivitaShop' => false, ]; $response = view('legal.data_protect_de', $data)->render(); } @@ -133,6 +134,7 @@ class HomeController extends Controller $data = [ 'modal' => false, 'user_shop' => Util::getUserShop(), + 'isMivitaShop' => Util::isMivitaShop(), ]; return view('legal.data_protected', $data); } diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php index 6979237..0e7ab15 100755 --- a/app/Http/Controllers/ProductController.php +++ b/app/Http/Controllers/ProductController.php @@ -48,7 +48,6 @@ class ProductController extends Controller }else{ $model = Product::findOrFail($id); } - $country_for_prices = Country::where('own_eur', '=', true)->orWhere('currency', '=', true)->get(); $data = [ 'product' => $model, @@ -59,7 +58,6 @@ class ProductController extends Controller public function store() { - $data = Request::all(); $rules = array( diff --git a/app/Http/Controllers/Web/SiteController.php b/app/Http/Controllers/Web/SiteController.php index 0b9a2f1..4aaa89f 100755 --- a/app/Http/Controllers/Web/SiteController.php +++ b/app/Http/Controllers/Web/SiteController.php @@ -7,6 +7,7 @@ use App\Http\Controllers\Controller; use App\Models\Category; use App\Models\IqSite; use App\Models\Product; +use App\Models\ProductCategory; use App\Services\Util; class SiteController extends Controller @@ -41,7 +42,6 @@ class SiteController extends Controller } public function site($site, $subsite = false, $product_slug = false) { - $subsite = trim($subsite, '/'); $product_slug = trim($product_slug, '/'); if($product_slug){ @@ -71,13 +71,18 @@ class SiteController extends Controller $headline_image = $category->iq_image; } + + + $product_categories = ProductCategory::where('category_id', $category->id)->whereHas('product', function ($query) use ($category) { + $query->where('active', true)->where('show_at', '<=', 1); + })->orderBy('pos', 'DESC')->get(); + $data = [ 'user_shop' => Util::getUserShop(), 'subsite' => $subsite, - 'categories' => Category::where('active', true)->orderBy('pos', 'ASC')->get(), - 'products' => Product::whereHas('categories', function ($query) use ($category) { - $query->where('category_id', '=', $category->id); - })->where('active', true)->where('show_at', '<=', 1)->orderBy('pos', 'DESC')->get(), + 'categories' => Category::where('active', true)->orderBy('pos', 'DESC')->get(), + 'products' => false, + 'product_categories' => $product_categories, 'p_count' => Product::where('active', true)->where('show_at', '<=', 1)->count(), 'headline' => $category->getLang('headline'), 'headline_image' => $headline_image, @@ -89,8 +94,9 @@ class SiteController extends Controller $data = [ 'user_shop' => Util::getUserShop(), 'subsite' => 'alle-produkte', - 'categories' => Category::where('active', true)->orderBy('pos', 'ASC')->get(), - 'products' => Product::where('active', true)->where('show_at', '<=', 1)->orderBy('pos', 'ASC')->get(), + 'categories' => Category::where('active', true)->orderBy('pos', 'DESC')->get(), + 'products' => Product::where('active', true)->where('show_at', '<=', 1)->orderBy('pos', 'DESC')->get(), + 'product_categories' => false, 'p_count' => Product::where('active', true)->where('show_at', '<=', 1)->count(), 'headline' => 'Produktwelt', 'headline_image' => false, diff --git a/app/Http/Middleware/Subdomain.php b/app/Http/Middleware/Subdomain.php index e2ce1e1..9a0f163 100755 --- a/app/Http/Middleware/Subdomain.php +++ b/app/Http/Middleware/Subdomain.php @@ -36,7 +36,6 @@ class Subdomain } \Session::put('user_shop', $user_shop); \Session::put('user_shop_domain', config('app.protocol').$user_shop->slug.".".config('app.domain').config('app.tld_care')); - Config::set('app.url', $user_shop->slug.".".config('app.domain').config('app.tld_care')); return $next($request); } diff --git a/app/Models/Category.php b/app/Models/Category.php index 8f8415d..3db2cf1 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -79,7 +79,7 @@ class Category extends Model public function product_categories() { - return $this->hasMany('App\Models\ProductCategory', 'category_id', 'id'); + return $this->hasMany('App\Models\ProductCategory', 'category_id', 'id')->orderBy('pos', 'DESC'); } diff --git a/app/Models/Product.php b/app/Models/Product.php index 035b1c0..aefbad9 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -220,7 +220,7 @@ class Product extends Model } public function categories(){ - return $this->hasMany('App\Models\ProductCategory', 'product_id', 'id'); + return $this->hasMany('App\Models\ProductCategory', 'product_id', 'id')->orderBy('pos', 'DESC'); } public function images(){ diff --git a/app/Models/ProductCategory.php b/app/Models/ProductCategory.php index edeebeb..6e67744 100644 --- a/app/Models/ProductCategory.php +++ b/app/Models/ProductCategory.php @@ -29,7 +29,7 @@ class ProductCategory extends Model protected $table = 'product_categories'; protected $fillable = [ - 'product_id', 'category_id', + 'product_id', 'category_id', 'pos' ]; public function product() diff --git a/app/Services/HTMLHelper.php b/app/Services/HTMLHelper.php index 09602fe..3883a32 100644 --- a/app/Services/HTMLHelper.php +++ b/app/Services/HTMLHelper.php @@ -135,7 +135,7 @@ class HTMLHelper } public static function getCategoriesOptions($ids = array(), $all = true){ - $values = Category::where('active', 1)->get(); + $values = Category::where('active', 1)->orderBy('pos', 'DESC')->get(); $ret = ""; if($all){ $ret .= '\n'; diff --git a/app/Services/Util.php b/app/Services/Util.php index 9a6d48d..0094d7f 100644 --- a/app/Services/Util.php +++ b/app/Services/Util.php @@ -228,6 +228,12 @@ class Util } return url($uri); } + + public static function isMivitaShop(){ + return \Config::get('app.url') === config('app.domain').config('app.tld_shop'); + } + + public static function sanitize($string, $force_lowercase = true, $anal = false, $substr = false) { $strip = array("~", "`", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "_", "=", "+", "[", "{", "]", diff --git a/database/migrations/2018_10_21_164005_create_product_categories_table.php b/database/migrations/2018_10_21_164005_create_product_categories_table.php index 439cc6a..05e0e8b 100644 --- a/database/migrations/2018_10_21_164005_create_product_categories_table.php +++ b/database/migrations/2018_10_21_164005_create_product_categories_table.php @@ -16,6 +16,7 @@ class CreateProductCategoriesTable extends Migration Schema::create('product_categories', function (Blueprint $table) { $table->increments('id'); + $table->unsignedTinyInteger('pos')->nullable()->default(0); $table->unsignedInteger('product_id')->index(); $table->unsignedInteger('category_id')->index(); diff --git a/resources/views/admin/category/edit.blade.php b/resources/views/admin/category/edit.blade.php index 7288499..13b5780 100755 --- a/resources/views/admin/category/edit.blade.php +++ b/resources/views/admin/category/edit.blade.php @@ -23,6 +23,8 @@ {!! Form::open(['url' => route('admin_product_category_store'), 'class' => 'form-horizontal', 'id'=>'']) !!} + +
  @@ -38,8 +40,10 @@ {!! Form::close() !!} + @include('admin.category.products') @include('admin.category.images') + @endsection diff --git a/resources/views/admin/category/form.blade.php b/resources/views/admin/category/form.blade.php index c80cb62..83b8986 100755 --- a/resources/views/admin/category/form.blade.php +++ b/resources/views/admin/category/form.blade.php @@ -27,12 +27,13 @@
-
+ {{--
+ --}}
{{ Form::text('pos', $category->pos, array('placeholder'=>__('pos'), 'class'=>'form-control', 'id'=>'pos')) }} diff --git a/resources/views/admin/category/index.blade.php b/resources/views/admin/category/index.blade.php index c0580a6..790dca3 100755 --- a/resources/views/admin/category/index.blade.php +++ b/resources/views/admin/category/index.blade.php @@ -11,9 +11,11 @@   {{__('Pos')}} - {{__('Hauptkategorie')}} + {{__('Kategorie')}} + {{--{{__('Kategorie')}}--}} {{__('Headline')}} - {{__('Translate') }} + {{__('Produkte')}} + {{-- __('Translate') --}} {{__('Status')}} @@ -28,11 +30,13 @@ {{ $value->pos }} @if($value->parent) {{ $value->parent->name }} @else {{ $value->name }} @endif - @if($value->parent) {{ $value->name }} @else - @endif + {{-- @if($value->parent) {{ $value->name }} @else - @endif--}} {{ $value->headline }} - + {{ $value->product_categories->count() }} + + {{-- {{ $value->getTranNames() }} --}} @if($value->active) @else@endif - + @endforeach @@ -54,16 +58,8 @@ $('.datatables-style').dataTable({ "bLengthChange": false, "iDisplayLength": 50, - "order": [[ 1, "asc" ]], - "aoColumns": [ - { "sWidth": "8%" }, - { "sWidth": "8%" }, - { "sWidth": "19%" }, - { "sWidth": "19%" }, - { "sWidth": "30%" }, - { "sWidth": "10%" }, - { "sWidth": "8%" }, - ], + "order": [[ 1, "desc" ]], + "language": { "url": "/js/German.json" } diff --git a/resources/views/admin/category/products.blade.php b/resources/views/admin/category/products.blade.php new file mode 100644 index 0000000..b8219c8 --- /dev/null +++ b/resources/views/admin/category/products.blade.php @@ -0,0 +1,123 @@ +
+
+ {{__('Produktliste')}} / {{ $category->name }} +
+
+ +
+
+ + + + + + + + + + + @foreach($category->product_categories as $product_category) + + + + + + + @endforeach + +
IDPosProdukt#
+ + + {{ $product_category->pos }} + + @if($product_category->product) + {{ $product_category->product->name }} + @if($product_category->product->active) +   |   + @else +   |   + @endif + +   |  {{ $product_category->product->getShowAtType() }} + + +   |   + + @else + - + @endif + + +
+
+ + +
+
+
+ + + + + + + \ No newline at end of file diff --git a/resources/views/admin/product/edit.blade.php b/resources/views/admin/product/edit.blade.php index 934341a..4f24042 100755 --- a/resources/views/admin/product/edit.blade.php +++ b/resources/views/admin/product/edit.blade.php @@ -37,9 +37,6 @@ {!! Form::close() !!} - @include('admin.product.images') - - @endsection diff --git a/resources/views/legal/data_protect_de.blade.php b/resources/views/legal/data_protect_de.blade.php index 1a55ad3..7ff0114 100644 --- a/resources/views/legal/data_protect_de.blade.php +++ b/resources/views/legal/data_protect_de.blade.php @@ -50,6 +50,10 @@ Mail: info@mivita.care


III. Cookies + + @if(!$user_shop || $isMivitaShop) + + @endif
Unsere Website verwendet Cookies. Cookies sind kleine Textdateien, die über einen Internetbrowser auf einem Computersystem abgelegt und gespeichert werden.
@@ -214,10 +218,21 @@ Externe Schriftarten von Google, LLC., https://www.google.com/fonts („Google Fonts“). Die Einbindung der Google Fonts erfolgt durch einen Serveraufruf bei Google (in der Regel in den USA). Die Datenschutzerklärung finden Sie hier: https://policies.google.com/privacy, Opt-Out: https://adssettings.google.com/authenticated

Videos der Plattform “YouTube” des Drittanbieters Google LLC, 1600 Amphitheatre Parkway, Mountain View, CA 94043, USA. Die Datenschutzerklärung finden Sie hier: https://policies.google.com/privacy, Opt-Out: https://adssettings.google.com/authenticated +

+ @if(!$user_shop || $isMivitaShop) + XIII. Analyse-Tools und WerbungFacebook Pixel

+ Diese Website nutzt zur Konversionsmessung der Besucheraktions-Pixel von Facebook. Anbieter diesesDienstes ist die Facebook Ireland Limited, 4 Grand Canal Square, Dublin 2, Irland. Die erfassten Datenwerden nach Aussage von Facebook jedoch auch in die USA und in andere Drittländer übertragen.So kann das Verhalten der Seitenbesucher nachverfolgt werden, nachdem diese durch Klick auf eineFacebook-Werbeanzeige auf die Website des Anbieters weitergeleitet wurden. Dadurch können dieWirksamkeit der Facebook-Werbeanzeigen für statistische und Marktforschungszwecke ausgewertetwerden und zukünftige Werbemaßnahmen optimiert werden.Die erhobenen Daten sind für uns als Betreiber dieser Website anonym, wir können keine Rückschlüsse aufdie Identität der Nutzer ziehen. Die Daten werden aber von Facebook gespeichert und verarbeitet, sodasseine Verbindung zum jeweiligen Nutzerprofil möglich ist und Facebook die Daten für eigene Werbezwecke,entsprechend derFacebook-Datenverwendungsrichtlinie verwenden kann. Dadurch kann Facebook das Schalten vonWerbeanzeigen auf Seiten von Facebook sowie außerhalb von Facebook ermöglichen. Diese Verwendungder Daten kann von uns als Seitenbetreiber nicht beeinflusst werden.Die Nutzung von Facebook-Pixel erfolgt auf Grundlage von Art. 6 Abs. 1 lit. f DSGVO. Der Websitebetreiberhat ein berechtigtes Interesse an effektiven Werbemaßnahmen unter Einschluss der sozialen Medien.Sofern eine entsprechende Einwilligung abgefragt wurde (z. B. eine Einwilligung zur Speicherung vonCookies), erfolgt die Verarbeitung ausschließlich auf Grundlage von Art. 6 Abs. 1 lit. a DSGVO; dieEinwilligung ist jederzeit widerrufbar.Die Datenübertragung in die USA wird auf die Standardvertragsklauseln der EU-Kommission gestützt.Details finden Sie hier:https://www.facebook.com/legal/EU_data_transfer_addendum undhttps://de-de.facebook.com/help/566994660333381 +

+ Soweit mit Hilfe des hier beschriebenen Tools personenbezogene Daten auf unserer Website erfasst und anFacebook weitergeleitet werden, sind wir und die Facebook Ireland Limited, 4 Grand Canal Square, GrandCanal Harbour, Dublin 2, Irland gemeinsam für diese Datenverarbeitung verantwortlich (Art. 26 DSGVO).Die gemeinsame Verantwortlichkeit beschränkt sich dabei ausschließlich auf die Erfassung der Daten undderen Weitergabe an Facebook. Die nach der Weiterleitung erfolgende Verarbeitung durch Facebook istnicht Teil der gemeinsamen Verantwortung. Die uns gemeinsam obliegenden Verpflichtungen wurden ineiner Vereinbarung über gemeinsame Verarbeitung festgehalten. Den Wortlaut der Vereinbarung finden Sieunter:https://www.facebook.com/legal/controller_addendum. Laut dieser Vereinbarung sind wir für die Erteilungder Datenschutzinformationen beim Einsatz des Facebook-Tools und für die datenschutzrechtlich sichereImplementierung des Tools auf unserer Website verantwortlich. Für die Datensicherheit der Facebook-Produkte ist Facebook verantwortlich. Betroffenenrechte (z.B. Auskunftsersuchen) hinsichtlich der beiFacebook verarbeiteten Daten können Sie direkt bei Facebook geltend machen. Wenn Sie dieBetroffenenrechte bei uns geltend machen, sind wir verpflichtet, diese an Facebook weiterzuleiten.In den Datenschutzhinweisen von Facebook finden Sie weitere Hinweise zum Schutz Ihrer Privatsphäre:https://de-de.facebook.com/about/privacy/.Sie können außerdem die Remarketing-Funktion „Custom Audiences“ im Bereich Einstellungen fürWerbeanzeigen unterhttps://www.facebook.com/ads/preferences/?entry_product=ad_settings_screen deaktivieren. Dazumüssen Sie bei Facebook angemeldet sein.Wenn Sie kein Facebook Konto besitzen, können Sie nutzungsbasierte Werbung von Facebook auf derWebsite der European Interactive Digital Advertising Alliance deaktivieren:http://www.youronlinechoices.com/de/praferenzmanagement/. +

Stand: 05.04.2021 + @else + Stand: 05.10.2018 - Stand: 05.10.2018 + @endif + +

@if(isset($modal) && $modal == true) diff --git a/resources/views/user/homeparty/modal_show_products.blade.php b/resources/views/user/homeparty/modal_show_products.blade.php index fa686e0..3550158 100644 --- a/resources/views/user/homeparty/modal_show_products.blade.php +++ b/resources/views/user/homeparty/modal_show_products.blade.php @@ -38,7 +38,7 @@ "processing": true, "serverSide": true, "ajax": '{!! route('user_homeparty_datatable') !!}', - "order": [[4, "asc" ]], + "order": [[3, "asc" ]], "columns": [ { data: 'add_card', name: 'add_card', searchable: false, orderable: false }, diff --git a/resources/views/user/order/list.blade.php b/resources/views/user/order/list.blade.php index d5b8167..576edc8 100644 --- a/resources/views/user/order/list.blade.php +++ b/resources/views/user/order/list.blade.php @@ -144,7 +144,7 @@ // d.filter_customer_member = $('select[name=filter_customer_member]').val(); } }, - "order": [[4, "asc" ]], + "order": [[7, "asc" ]], "columns": [ { data: 'picture', name: 'picture', searchable: false, width: 35 }, { data: 'product', name: 'product' }, diff --git a/resources/views/web/layouts/application.blade.php b/resources/views/web/layouts/application.blade.php index 05f4403..2e7d97f 100644 --- a/resources/views/web/layouts/application.blade.php +++ b/resources/views/web/layouts/application.blade.php @@ -10,52 +10,68 @@ - - - - - - - - - - diff --git a/resources/views/web/layouts/layout.blade.php b/resources/views/web/layouts/layout.blade.php index 38ac15a..8e8a870 100644 --- a/resources/views/web/layouts/layout.blade.php +++ b/resources/views/web/layouts/layout.blade.php @@ -1,5 +1,4 @@ @extends('web.layouts.application') - @section('layout-content') @include('web.layouts.includes.header') diff --git a/resources/views/web/templates/datenschutz.blade.php b/resources/views/web/templates/datenschutz.blade.php index ea7e2b0..2e03c4f 100644 --- a/resources/views/web/templates/datenschutz.blade.php +++ b/resources/views/web/templates/datenschutz.blade.php @@ -220,7 +220,8 @@ Videos der Plattform “YouTube” des Drittanbieters Google LLC, 1600 Amphithea

-Stand: 05.10.2018 + +Stand: 01.10.2018

diff --git a/resources/views/web/templates/produkte-item.blade.php b/resources/views/web/templates/produkte-item.blade.php index 041aa86..bfdcb40 100644 --- a/resources/views/web/templates/produkte-item.blade.php +++ b/resources/views/web/templates/produkte-item.blade.php @@ -6,102 +6,102 @@ text-overflow: ellipsis; } -
+
-
- - - @php ($set = 'first') - @foreach($product->imagesActive as $image) - @if($image->active) - @if($image->slug) - @if($set == 'hover') - - @php($set = 'done') - @endif +
+ + + @php ($set = 'first') + @foreach($product->imagesActive as $image) + @if($image->active) + @if($image->slug) + @if($set == 'hover') + + @php($set = 'done') + @endif - @if($set == 'first') - {{ $product->getLang('name') }} - @php($set = 'hover') - @endif - @endif - @endif - @endforeach - + @if($set == 'first') + {{ $product->getLang('name') }} + @php($set = 'hover') + @endif + @endif + @endif + @endforeach + -
+
- @if($user_shop) -
-

{{ $product->getLang('name') }}

- -
-
-
- - @if($product->price_old > 0) -
- {{ $product->getFormattedPriceOld() }} € - {{ $product->getFormattedPrice() }} € -
{{$product->getBasePriceFormattedFull()}}
+ @if($user_shop) +
+

{{ $product->getLang('name') }}

+ +
+
+
+ + @if($product->price_old > 0) +
+ {{ $product->getFormattedPriceOld() }} € + {{ $product->getFormattedPrice() }} € +
{{$product->getBasePriceFormattedFull()}}
-
- @else -
- {{ $product->getFormattedPrice() }} € -
{{$product->getBasePriceFormattedFull()}}
-
- @endif - +
+ @else +
+ {{ $product->getFormattedPrice() }} € +
{{$product->getBasePriceFormattedFull()}}
+
+ @endif + - -
- -
- - -
- @else -
-

{{ $product->getLang('name') }}

+ +
+ +
+ + +
+ @else +
+

{{ $product->getLang('name') }}

- -
-
-
- -
+ +
+
+
+ +
-
- zum Produkt -
- @endif - -
\ No newline at end of file +
+ zum Produkt +
+ @endif + +
\ No newline at end of file diff --git a/resources/views/web/templates/produkte-show.blade.php b/resources/views/web/templates/produkte-show.blade.php index bed4109..0621f49 100644 --- a/resources/views/web/templates/produkte-show.blade.php +++ b/resources/views/web/templates/produkte-show.blade.php @@ -67,7 +67,6 @@ src="{{ route('product_image', [$product->imagesActive->first()->slug]) }}" width="1000" height="1500" alt="{{ $product->getLang('name') }}"> -

{{$headline}} @if($headline_image) @endif

- @endsection \ No newline at end of file diff --git a/resources/views/web/user/layouts/application.blade.php b/resources/views/web/user/layouts/application.blade.php index a33723a..a5eab9f 100644 --- a/resources/views/web/user/layouts/application.blade.php +++ b/resources/views/web/user/layouts/application.blade.php @@ -10,46 +10,60 @@ - - - - - + + @if(Util::isMivitaShop()) + - - - + + + @else + + + - - + })}); + + @endif - diff --git a/resources/views/web/user/layouts/layout.blade.php b/resources/views/web/user/layouts/layout.blade.php index ff5ad2a..9ecc57f 100644 --- a/resources/views/web/user/layouts/layout.blade.php +++ b/resources/views/web/user/layouts/layout.blade.php @@ -1,5 +1,4 @@ @extends('web.user.layouts.application') - @section('layout-content') @include('web.user.layouts.includes.header') diff --git a/routes/web.php b/routes/web.php index 693cf2a..316be3a 100755 --- a/routes/web.php +++ b/routes/web.php @@ -319,7 +319,7 @@ Route::domain(config('app.pre_url_crm').config('app.domain').config('app.tld_car Route::get('/admin/product/categories', 'CategoryController@index')->name('admin_product_categories'); Route::get('/admin/product/category/edit/{id}', 'CategoryController@edit')->name('admin_product_category_edit'); Route::post('/admin/product/category/store', 'CategoryController@store')->name('admin_product_category_store'); - Route::get('/admin/product/category/delete/{id}', 'CategoryController@delete')->name('admin_product_category_delete'); + Route::get('/admin/product/category/delete/{del}/{id}', 'CategoryController@delete')->name('admin_product_category_delete'); //products categories Route::get('/admin/product/ingredients', 'IngredientController@index')->name('admin_product_ingredients');