diff --git a/.idea/mivita.care.iml b/.idea/mivita.care.iml index 2f0edf4c..f1fcdb16 100644 --- a/.idea/mivita.care.iml +++ b/.idea/mivita.care.iml @@ -34,6 +34,7 @@ + @@ -82,22 +83,29 @@ - + + + + + + + + diff --git a/.idea/php.xml b/.idea/php.xml index 2c12eee7..1f869489 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -100,9 +100,17 @@ - + + + + + + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2a195ba1..2746dfc7 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,12 +2,84 @@ + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - log - same_as_billing - select - back_to_shop - secu - checkUserShopName - shop_name_description - shop_contact_help - user_shop_name_check - ok - billing_cou - mail - MailVerifyContact - Dear customer - Dear Customer you will receive - For further - reset - jackon - trans - tra - checkout_subject - transmitted_data - data_protected - data - data_prote - data_pro - birthday - datepicker-birthday - datepicker - Mail:: - - - - - - $PROJECT_DIR$/app/Http/Controllers - $PROJECT_DIR$/database/migrations - $PROJECT_DIR$/resources/views/user - $PROJECT_DIR$/resources/views/web - $PROJECT_DIR$/resources/views - $PROJECT_DIR$/resources - $PROJECT_DIR$/app - $PROJECT_DIR$/app/Http - - @@ -144,63 +126,6 @@ - - - @@ -304,199 +229,28 @@ - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +
+   + {{ __('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 00000000..c80cb625 --- /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')) }} +
+
+ +
+
+ + +
+
+ {{ __('Übersetzungen') }} +
+
+ @foreach($trans as $lang) + @if($lang != 'de') +
+
+ + {{ 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)) }} +
+
+ @endif + @endforeach +
+
+ diff --git a/resources/views/admin/category/images.blade.php b/resources/views/admin/category/images.blade.php new file mode 100755 index 00000000..c4428b42 --- /dev/null +++ b/resources/views/admin/category/images.blade.php @@ -0,0 +1,93 @@ + + + + +
+ +
+ {{ __('Headline Bild') }} + +
+ + +
+ + @if($category->id>0) + + +
+ +
+

Bild wird rechts hinter die Headline gesetzt und automatisch auf eine Höhe von 60 Pixel skaliert.

+
+
+ +
+ @if($category->headline_image_id) +
+ +
+ Bild löschen + @if($category->iq_image->active) + + @else + + @endif +
+ @endif +
+
+
+ + @if(!$category->headline_image_id) +
+
+
+ @csrf + +
+
+ +
+ +
+ +
+
+
+
+ @else +

Nur ein Bild möglich, vor neuem Upload Bild löschen

+ @endif +
+
+ @else +

Kategorie erst anlegen

+ + + @endif + + +
+
diff --git a/resources/views/admin/category/index.blade.php b/resources/views/admin/category/index.blade.php index c0edc300..d3dbd580 100755 --- a/resources/views/admin/category/index.blade.php +++ b/resources/views/admin/category/index.blade.php @@ -12,7 +12,7 @@   {{__('Pos')}} {{__('Hauptkategorie')}} - {{__('Unterkategorie')}} + {{__('Headline')}} {{__('Translate') }} {{__('Status')}} @@ -22,20 +22,15 @@ @foreach($values as $value) - + {{ $value->pos }} @if($value->parent) {{ $value->parent->name }} @else {{ $value->name }} @endif @if($value->parent) {{ $value->name }} @else - @endif - {{ $value->getTranNames() }} + {{ $value->headline }} + @if($value->active) @else@endif @@ -44,102 +39,22 @@
- + + {{__('Neue Kategorie erstellen')}} +
- - - - - diff --git a/resources/views/web/templates/_categories.blade.php b/resources/views/web/templates/_categories.blade.php index 0bed0699..b37ef418 100644 --- a/resources/views/web/templates/_categories.blade.php +++ b/resources/views/web/templates/_categories.blade.php @@ -1,14 +1,10 @@ -
- +

Kategorien

- - -
diff --git a/resources/views/web/templates/card.blade.php b/resources/views/web/templates/card.blade.php index c18cb5d8..781dab84 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'=>'']) !!}
@@ -148,7 +149,7 @@ {{ $row->name }} Lieferzeit: 1-3 Werktage - +
{{ $row->subtotal() }} €
× {{ $row->price() }} €
@@ -157,8 +158,8 @@ @endforeach
- Warenkorb löschen - + Warenkorb löschen +
@@ -199,7 +200,7 @@
Versandland:
-
+ @@ -225,7 +226,7 @@ {{ Yard::instance('shopping')->totalWithShipping() }} € Gesamtsumme: - zur Kasse + zur Kasse

Sie werden auf unseren checkout Server weitergeletet, die Verbindung ist mit SSL verschlüsselt.

diff --git a/resources/views/web/templates/produkte-item.blade.php b/resources/views/web/templates/produkte-item.blade.php index 26230a9e..6c7ea706 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') - {{ $product->getLang('name') }} - @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') - {{ $product->getLang('name') }} - @php($set = 'hover') + @if($set == 'first') + {{ $product->getLang('name') }} + @php($set = 'hover') + @endif @endif @endif @endforeach @@ -30,26 +38,30 @@ @if($user_shop)
-

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

- +

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

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

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

+ + +
+
+
+ +
+
- {{ $product->getLang('name') }} + zum Produkt
@endif diff --git a/resources/views/web/templates/produkte-show.blade.php b/resources/views/web/templates/produkte-show.blade.php index 73046e88..66d46201 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; } -
@@ -37,30 +37,31 @@
-
- -
+
+ @include('web.templates._categories') +
+ +
- @if($product->images->count()) - -
+ @if($product->imagesActive->count()) + - - -
- @include('web.templates._categories') -
- +
diff --git a/resources/views/web/templates/produkte.blade.php b/resources/views/web/templates/produkte.blade.php index 501d9e4c..25afe0a1 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 @@
- -
-

Produktwelt

+
+ @include('web.templates._categories') +
+
+

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

    @foreach($products as $product) @@ -59,18 +61,8 @@ @endforeach
-
- - - -
- @include('web.templates._categories') -
- -
-
diff --git a/resources/views/web/user/layouts/application.blade.php b/resources/views/web/user/layouts/application.blade.php index 30d6b310..cecedcb7 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 3875b21d..1b7d64d1 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 11f47be4..6268513c 100644 --- a/resources/views/web/user/start.blade.php +++ b/resources/views/web/user/start.blade.php @@ -102,14 +102,15 @@
-

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()) + + @endif
    - @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 fa737d60..66a67e75 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);