+
+ @endif
+
+
+
+
+
+ -
+ @foreach ($errors->all() as $error)
+
- {{ $error }} + @endforeach +
+ {{ __('Create/Edit Kategorien') }} +
+ + {!! Form::open(['url' => route('admin_product_category_store'), 'class' => 'form-horizontal', 'id'=>'']) !!} + + + +
+
+ {{ __('back') }}
+
+
+ @include('admin.category.form')
+
+
+
+ {{ __('back') }}
+
+
+ {!! Form::close() !!}
+
+
+ @include('admin.category.images')
+
+
+@endsection
diff --git a/resources/views/admin/category/form.blade.php b/resources/views/admin/category/form.blade.php
new file mode 100755
index 0000000..c80cb62
--- /dev/null
+++ b/resources/views/admin/category/form.blade.php
@@ -0,0 +1,67 @@
+
+
+
+
+
+
++ {{ __('Kategorie') }} + +
+ +
+
+
+
+
+
+
+
+
+ {{ Form::text('name', $category->name, array('placeholder'=>__('Name'), 'class'=>'form-control', 'id'=>'name', 'required')) }}
+
+
+
+
+
+
+ {{ Form::text('headline', $category->headline, array('placeholder'=>__('Produktwelt'), 'class'=>'form-control', 'id'=>'name', 'required')) }}
+
+
+
+
+
+
+
+
+
+
+ {{ Form::text('pos', $category->pos, array('placeholder'=>__('pos'), 'class'=>'form-control', 'id'=>'pos')) }}
+
+
+
+
diff --git a/resources/views/admin/category/images.blade.php b/resources/views/admin/category/images.blade.php
new file mode 100755
index 0000000..c4428b4
--- /dev/null
+++ b/resources/views/admin/category/images.blade.php
@@ -0,0 +1,93 @@
+
+
+
+
++ {{ __('Übersetzungen') }} +
+
+ @foreach($trans as $lang)
+ @if($lang != 'de')
+
+
+
+ @endif
+ @endforeach
+
+
+ {{ Form::text('trans_name['.$lang.']', $category->getTrans('name', $lang), array('class'=>'form-control', 'id'=>'trans_name_'.$lang)) }}
+
+
+
+ {{ Form::text('trans_headline['.$lang.']', $category->getTrans('headline', $lang), array('class'=>'form-control', 'id'=>'trans_headline_'.$lang)) }}
+
+
+
+
diff --git a/resources/views/admin/category/index.blade.php b/resources/views/admin/category/index.blade.php
index c0edc30..d3dbd58 100755
--- a/resources/views/admin/category/index.blade.php
+++ b/resources/views/admin/category/index.blade.php
@@ -12,7 +12,7 @@
+ {{ __('Headline Bild') }} + +
+ + +
+
+ @if($category->id>0)
+
+
+
+
+
+
+ @else
+
+
+ Bild wird rechts hinter die Headline gesetzt und automatisch auf eine Höhe von 60 Pixel skaliert.
+
+
+
+
+ @if($category->headline_image_id)
+
+ @endif
+
+
+
+ @if(!$category->headline_image_id)
+
+
+
+ @else
+
+
+
+ Nur ein Bild möglich, vor neuem Upload Bild löschen
+ @endif +Kategorie erst anlegen
+ + + @endif + + +
-
-
diff --git a/resources/views/web/templates/_categories.blade.php b/resources/views/web/templates/_categories.blade.php
index 0bed069..b37ef41 100644
--- a/resources/views/web/templates/_categories.blade.php
+++ b/resources/views/web/templates/_categories.blade.php
@@ -1,14 +1,10 @@
-
-
-
-
-
+
-
-
diff --git a/resources/views/web/templates/card.blade.php b/resources/views/web/templates/card.blade.php
index c18cb5d..781dab8 100644
--- a/resources/views/web/templates/card.blade.php
+++ b/resources/views/web/templates/card.blade.php
@@ -77,6 +77,7 @@
.cartContent .yard .total_price {
padding-top: 10px;
}
+
}
@media only screen and (min-width: 992px) {
.cartContent .yard .total_price {
@@ -119,7 +120,7 @@
@if(Yard::instance('shopping')->content()->count())
- {!! Form::open(['url' => route(Util::getPostRoute().'card_update', Util::addRoute()), 'class' => 'cartContent clearfix', 'id'=>'']) !!}
+ {!! Form::open(['url' => url(Util::getPostRoute().'card/update'), 'class' => 'cartContent clearfix', 'id'=>'']) !!}
@@ -199,7 +200,7 @@
Kategorien
-
-
@foreach($categories as $category)
- @@ -17,9 +13,6 @@ @endforeach - -
@@ -148,7 +149,7 @@
{{ $row->name }}
Lieferzeit: 1-3 Werktage
-
+
- Warenkorb löschen
-
+ Warenkorb löschen
+
{{ $row->subtotal() }} €
× {{ $row->price() }} €
@@ -157,8 +158,8 @@
@endforeach
Versandland:
-
diff --git a/resources/views/web/templates/produkte-item.blade.php b/resources/views/web/templates/produkte-item.blade.php
index 26230a9..6c7ea70 100644
--- a/resources/views/web/templates/produkte-item.blade.php
+++ b/resources/views/web/templates/produkte-item.blade.php
@@ -1,5 +1,11 @@
-
+
@@ -7,20 +13,22 @@
@php ($set = 'first')
- @foreach($product->images as $image)
- @if($image->slug)
- @if($set == 'hover')
-  }})
- @php($set = 'done')
- @endif
+ @foreach($product->imagesActive as $image)
+ @if($image->active)
+ @if($image->slug)
+ @if($set == 'hover')
+
+ @php($set = 'done')
+ @endif
- @if($set == 'first')
-
- @php($set = 'hover')
+ @if($set == 'first')
+
+ @php($set = 'hover')
+ @endif
@endif
@endif
@endforeach
@@ -30,26 +38,30 @@
@if($user_shop)
-
@else
+ {{ $product->getLang('name') }}
- +{{ $product->getLang('name') }}
- + @if($product->price_old > 0) +
+ {{ $product->getFormattedPriceOld() }} €
+ {{ $product->getFormattedPrice() }} €
+
+ @else
+
+ {{ $product->getFormattedPrice() }} €
+
+ @endif
-
- {{ $product->getFormattedPrice() }} €
-
+
+
+
@endif
diff --git a/resources/views/web/templates/produkte-show.blade.php b/resources/views/web/templates/produkte-show.blade.php
index 73046e8..66d4620 100644
--- a/resources/views/web/templates/produkte-show.blade.php
+++ b/resources/views/web/templates/produkte-show.blade.php
@@ -26,7 +26,7 @@
font-size: 16px;
}
- {{ $product->getLang('name') }}
+ + + + +
@@ -37,30 +37,31 @@
-
-
-
+
diff --git a/resources/views/web/templates/produkte.blade.php b/resources/views/web/templates/produkte.blade.php
index 501d9e4..25afe0a 100644
--- a/resources/views/web/templates/produkte.blade.php
+++ b/resources/views/web/templates/produkte.blade.php
@@ -3,7 +3,7 @@
@section('content')
-
@@ -46,10 +46,12 @@
diff --git a/resources/views/web/user/layouts/application.blade.php b/resources/views/web/user/layouts/application.blade.php
index 30d6b31..cecedcb 100644
--- a/resources/views/web/user/layouts/application.blade.php
+++ b/resources/views/web/user/layouts/application.blade.php
@@ -19,7 +19,7 @@
-
+
diff --git a/resources/views/web/user/layouts/includes/header.blade.php b/resources/views/web/user/layouts/includes/header.blade.php
index 3875b21..1b7d64d 100644
--- a/resources/views/web/user/layouts/includes/header.blade.php
+++ b/resources/views/web/user/layouts/includes/header.blade.php
@@ -127,7 +127,7 @@
inkl. MwSt. zzgl. Versandkosten
- zum Warenkorb
+ zum Warenkorb
schließen
diff --git a/resources/views/web/user/start.blade.php b/resources/views/web/user/start.blade.php
index 11f47be..6268513 100644
--- a/resources/views/web/user/start.blade.php
+++ b/resources/views/web/user/start.blade.php
@@ -102,14 +102,15 @@
+ @include('web.templates._categories')
+
+
+
- @if($product->images->count())
-
-
+ @if($product->imagesActive->count())
+
-
-
-
- @include('web.templates._categories')
-
-
+
-
-
-
-
Produktwelt
+
+ @include('web.templates._categories')
+
+
+ {{$headline}} @if($headline_image)
-
-
-
- {{$headline}} @if($headline_image)  }})
@endif
-
@foreach($products as $product)
@@ -59,18 +61,8 @@
@endforeach
- @include('web.templates._categories')
-
-
-
inkl. MwSt. zzgl. Versandkosten
-  }})
+ @endif
Produktwelt
-MIVITA ist ein Unternehmen mit Standort in Deutschland, das innovative und umweltfreundliche - sowie hochwertige Produkte vertreibt. Seit seinem Markteintritt bekennt sich das MIVITA Unternehmen zu einem - Werteverständnis, bei dem die Zufriedenheit der Kunden, wie auch die Verantwortung für die Umwelt im Fokus - stehen.
+{{$site->headline}}
+{{$site->copy}}
+ + @if($site->hasImage()) +-
- @foreach($products as $product)
+ @foreach($site->getProductModels() as $product)
-
@include('web.templates.produkte-item', ['subsite' => 'alle-produkte'])
@@ -126,7 +127,7 @@
Sparen Sie mit Sets
-
- @foreach($set_products as $product)
+ @foreach($site->getProductSetModels() as $product)
-
@include('web.templates.produkte-item', ['subsite' => 'alle-produkte'])
@@ -194,8 +195,6 @@
Wir waren für Dich vor Ort auf der Aloe Vera Farm auf Mallorca, denn Transparenz ist uns wichtig. So weißt Du genau, wo Deine Produkte herkommen und wie sie produziert werden. Echte Qualität eben.
- - @foreach($user_shop->on_sites as $image)diff --git a/routes/web.php b/routes/web.php index fa737d6..66a67e7 100755 --- a/routes/web.php +++ b/routes/web.php @@ -16,45 +16,63 @@ Route::get('storage/images/{from}/{slug}', function($from = null, $slug = null) if ($from == 'shop'){ $image = \App\Models\UserShop::where('filename', $slug)->first(); $path = storage_path('app/public').'/images/shop'.'/'.$image->filename; + if (file_exists($path)) { + return Response::file($path); + } + } - } - if (file_exists($path)) { - return Response::file($path); - } })->name('storage_images'); Route::get('/product/image/{slug}', function($slug = null) { - $image = \App\Models\ProductImage::where('slug', $slug)->first(); - $path = storage_path('app/public').'/images/product'.'/'.$image->product_id.'/'.$image->filename; - if (file_exists($path)) { - return Response::file($path); + if($image = \App\Models\ProductImage::where('slug', $slug)->first()){ + $path = storage_path('app/public').'/images/product'.'/'.$image->product_id.'/'.$image->filename; + if (file_exists($path)) { + return Response::file($path); + } } + })->name('product_image'); + +Route::get('/iq/image/{slug}', function($slug = null) +{ + if($image = \App\Models\IqImage::where('slug', $slug)->first()){ + $path = storage_path('app/public').'/images/iq_images/'.$image->filename; + if (file_exists($path)) { + return Response::file($path); + } + } + +})->name('iq_image'); + Route::get('/user_shop/image/{slug}', function($slug = null) { - $image = \App\Models\UserShopOnSite::where('slug', $slug)->first(); - $path = storage_path('app/public').'/images/user_shop'.'/'.$image->user_shop_id.'/'.$image->filename; - if (file_exists($path)) { - return Response::file($path); + if($image = \App\Models\UserShopOnSite::where('slug', $slug)->first()){ + $path = storage_path('app/public').'/images/user_shop'.'/'.$image->user_shop_id.'/'.$image->filename; + if (file_exists($path)) { + return Response::file($path); + } } + })->name('user_shop_image'); Route::get('/shop/product/image/{slug}', function($slug = null) { - $image = \App\Models\ProductImage::where('slug', $slug)->first(); - $path = storage_path('app/public').'/images/product'.'/'.$image->product_id.'/'.$image->filename; - if (file_exists($path)) { - return Response::file($path); + if($image = \App\Models\ProductImage::where('slug', $slug)->first()){ + $path = storage_path('app/public').'/images/product'.'/'.$image->product_id.'/'.$image->filename; + if (file_exists($path)) { + return Response::file($path); + } } + })->name('shop_product_image'); //main site mivita -Route::domain(config('app.pre_url_main').config('app.domain'))->group(function () { +Route::domain(config('app.pre_url_main').config('app.domain').config('app.tld_care'))->group(function () { Route::get('/datenschutz', 'HomeController@legalDataProtected')->name('datenschutz'); Route::get('/impressum', 'HomeController@legalImprint')->name('impressum'); @@ -81,7 +99,7 @@ Route::domain(config('app.pre_url_main').config('app.domain'))->group(function ( /* ROUTING FOR CRM my.mivita / CMS*/ -Route::domain(config('app.pre_url_crm').config('app.domain'))->group(function () { +Route::domain(config('app.pre_url_crm').config('app.domain').config('app.tld_care'))->group(function () { Auth::routes(); Route::get('/logout', function(){ @@ -198,18 +216,35 @@ Route::domain(config('app.pre_url_crm').config('app.domain'))->group(function () Route::get('/admin/translation/file/{file}/{language?}/{langsource?}/{show?}', 'TranslationFileController@edit')->name('admin_translate_file_edit'); Route::post('/admin/translation/file/{file}/{language?}/{langsource?}/{show?}', 'TranslationFileController@update')->name('admin_translate_file_update'); + //site + Route::get('/admin/sites/{site}', 'SitesController@show')->name('admin_sites'); + Route::post('/admin/sites/store/{site}', 'SitesController@store')->name('admin_sites_store'); + Route::post('/admin/sites/image/upload/{site}', 'SitesController@imageUpload')->name('admin_sites_image_upload'); + Route::get('/admin/sites/image/delete/{site}/{image_id}', 'SitesController@imageDelete')->name('admin_sites_image_delete'); + Route::get('/admin/sites/image/attribute/{site}/{image_id}/{attr}/{val}', 'SitesController@imageAttribute')->name('admin_sites_image_attribute'); + + //products Route::get('/admin/product/show', 'ProductController@index')->name('admin_product_show'); Route::post('/admin/product/store', 'ProductController@store')->name('admin_product_store'); Route::get('/admin/product/edit/{id}', 'ProductController@edit')->name('admin_product_edit'); Route::get('/admin/product/delete/{id}', 'ProductController@delete')->name('admin_product_delete'); //products images - Route::post('/admin/product/upload/image', 'ProductController@uploadImage')->name('admin_product_upload_image'); - Route::get('/admin/product/upload/delete/{image_id}/{product_id}', 'ProductController@deleteImage')->name('admin_product_delete_image'); + Route::post('/admin/product/image/upload', 'ProductController@imageUpload')->name('admin_product_image_upload'); + Route::get('/admin/product/image/delete/{image_id}/{product_id}', 'ProductController@imageDelete')->name('admin_product_image_delete'); + Route::get('/admin/product/image/attribute/{image_id}/{attr}/{val}', 'ProductController@imageAttribute')->name('admin_product_image_attribute'); + //products categories 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'); + //products images + Route::post('/admin/product/category/image/upload', 'CategoryController@imageUpload')->name('admin_product_category_image_upload'); + Route::get('/admin/product/category/image/delete{image_id}/{category_id}', 'CategoryController@imageDelete')->name('admin_product_category_image_delete'); + Route::get('/admin/product/category/image/attribute/{image_id}/{attr}/{val}', 'CategoryController@imageAttribute')->name('admin_product_category_image_attribute'); + + //products attributes Route::get('/admin/product/attributes', 'AttributeController@index')->name('admin_product_attributes'); Route::post('/admin/product/attribute/store', 'AttributeController@store')->name('admin_product_attribute_store'); @@ -254,11 +289,22 @@ Route::domain(config('app.pre_url_crm').config('app.domain'))->group(function () }); + + //login pages for sysadmin + Route::group(['middleware' => ['sysadmin']], function() { + Route::get('/sysadmin/tools/domainssl', 'SyS\AdminToolsController@domainSSL')->name('sysadmin_tools_domainssl'); + Route::post('/sysadmin/tools/domainssl', 'SyS\AdminToolsController@domainSSLStore')->name('sysadmin_tools_domainssl'); + }); + + + + + }); /* ROUTING the checkout.mivita ... */ -Route::domain(config('app.checkout_url').config('app.domain'))->group(function () { +Route::domain(config('app.checkout_url').config('app.domain').config('app.tld_care'))->group(function () { Route::group(['middleware' => ['checkout']], function() { @@ -280,34 +326,32 @@ Route::domain(config('app.checkout_url').config('app.domain'))->group(function ( }); }); -/* ROUTING the SUBDOMAINS user.mivita ... */ -Route::domain('{subdomain}.'.config('app.domain'))->group(function () { - - Route::group(['middleware' => ['subdomain']], function() { - - Route::get('/datenschutz', 'HomeController@legalDataProtected')->name('datenschutz'); - Route::get('/impressum', 'HomeController@legalImprint')->name('impressum'); - Route::get('/datenschutz', 'HomeController@legalDataProtected')->name('data_protected'); - Route::get('/impressum', 'HomeController@legalImprint')->name('imprint'); - Route::get('/agb', 'HomeController@legalAGB')->name('agb'); - - - - Route::get('/kontakt', 'Web\ContactController@create')->name('contact_create'); +$subDomainRouting = function (){ + Route::group(['middleware' => ['subdomain']], function() { + Route::get('/datenschutz', 'HomeController@legalDataProtected')->name('datenschutz'); + Route::get('/impressum', 'HomeController@legalImprint')->name('impressum'); + Route::get('/datenschutz', 'HomeController@legalDataProtected')->name('data_protected'); + Route::get('/impressum', 'HomeController@legalImprint')->name('imprint'); + Route::get('/agb', 'HomeController@legalAGB')->name('agb'); + Route::get('/kontakt', 'Web\ContactController@create')->name('contact_create'); Route::post('/kontakt', 'Web\ContactController@store')->name('contact_store'); Route::get('/', 'Web\SiteController@index')->name(''); - Route::get('/card/add/{id}/{quantity?}/{product_slug?}', 'Web\CardController@addToCardGet')->name('user.card_add_get'); - Route::post('/card/add/{id}', 'Web\CardController@addToCardPost')->name('user.card_add_post'); - Route::get('/card/show', 'Web\CardController@showCard')->name('user.card_show'); - Route::get('/card/checkout/server', 'Web\CardController@checkoutServer')->name('user.card_checkout_server'); - Route::post('/card/update', 'Web\CardController@updateCard')->name('user.card_update'); - Route::get('/card/remove/{rowId}', 'Web\CardController@removeCard')->name('user.card_remove'); - Route::get('/card/delete', 'Web\CardController@deleteCard')->name('user.card_delete'); - Route::get('/back/to/shop/{reference?}', 'Web\CardController@backToShop')->name('user.back_to_shop'); + Route::get('/user/card/add/{id}/{quantity?}/{product_slug?}', 'Web\CardController@addToCardGet')->name('user.card_add_get'); + Route::post('/user/card/add/{id}', 'Web\CardController@addToCardPost')->name('user.card_add_post'); + Route::get('/user/card/show', 'Web\CardController@showCard')->name('user.card_show'); + Route::get('/user/card/checkout/server', 'Web\CardController@checkoutServer')->name('user.card_checkout_server'); + Route::post('/user/card/update', 'Web\CardController@updateCard')->name('user.card_update'); + Route::get('/user/card/remove/{rowId}', 'Web\CardController@removeCard')->name('user.card_remove'); + Route::get('/user/card/delete', 'Web\CardController@deleteCard')->name('user.card_delete'); + Route::get('/user/back/to/shop/{reference?}', 'Web\CardController@backToShop')->name('user.back_to_shop'); + Route::get('/domain/check', 'Web\SiteController@domainCheck')->name('user.domain_check'); Route::get('/{site}/{subsite?}/{product_slug?}', 'Web\SiteController@site')->name('user.site'); + }); +}; +/* ROUTING the SUBDOMAINS user.mivita.care ... */ +Route::domain('{subdomain}.'.config('app.domain').config('app.tld_care'))->group($subDomainRouting); - - }); -}); \ No newline at end of file +/* ROUTING the mivita.shop ... */ +Route::domain(config('app.domain').config('app.tld_shop'))->group($subDomainRouting); diff --git a/vendor.zip b/vendor.zip new file mode 100644 index 0000000..d378a0c Binary files /dev/null and b/vendor.zip differ
-
@include('web.templates.produkte-item', ['subsite' => 'alle-produkte'])
@@ -194,8 +195,6 @@