diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b2b3b339..1dd95e33 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,24 +2,38 @@ + + + + + + + + - - - - - - - + + + + - + + + - - - - - - + + + + + + + + + + + + + @@ -37,41 +51,42 @@ - - - + + + - - + + + - + - + - + - + - - + + - + - + @@ -80,22 +95,22 @@ - + - - + + - - + + - + - + @@ -115,12 +130,29 @@ - + + + + + + + + + + + + + + + + + + + + - ?> - exca tax instance priceTax @@ -149,6 +181,8 @@ route $(this).find(".modal-body select[name='factor']").val(button.data('factor')); dele + getRoles + admin @@ -186,57 +220,57 @@ @@ -371,10 +405,10 @@ - @@ -382,6 +416,7 @@ + @@ -413,29 +448,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -448,12 +460,6 @@ - - - - - - @@ -466,6 +472,11 @@ + + + + + @@ -477,90 +488,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -576,65 +514,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -644,7 +523,6 @@ +
+
+ +
+ +
+ +
+ + + + @else +
+
+ @foreach($user->shop->on_sites as $image) +
+ +
+ Bild löschen +
+ @endforeach +
+
+ @endif + + + diff --git a/resources/views/web/layouts/includes/footer.blade.php b/resources/views/web/layouts/includes/footer.blade.php index a0117545..c68d1cbb 100644 --- a/resources/views/web/layouts/includes/footer.blade.php +++ b/resources/views/web/layouts/includes/footer.blade.php @@ -85,11 +85,11 @@
© All Rights Reserved, mivita.care
diff --git a/resources/views/web/layouts/includes/header.blade.php b/resources/views/web/layouts/includes/header.blade.php index 9d64b5b1..1da07632 100644 --- a/resources/views/web/layouts/includes/header.blade.php +++ b/resources/views/web/layouts/includes/header.blade.php @@ -117,7 +117,6 @@ Start -
  • Aloe Vera @@ -134,12 +133,11 @@
  • - + Kontakt
    • -
    diff --git a/resources/views/web/templates/contact-final.blade.php b/resources/views/web/templates/contact-final.blade.php new file mode 100644 index 00000000..b652d4a6 --- /dev/null +++ b/resources/views/web/templates/contact-final.blade.php @@ -0,0 +1,119 @@ +@extends($user_shop ?'web.user.layouts.layout' : 'web.layouts.layout') + +@section('content') + +
    +
    + +
    +
    +
    + + + + + + +
    +
    + + +
    +
    +

    Vielen Dank für Deine Anfrage

    + +

    + Wir werden uns umgehend bei Dir melden. +

    + +
    + +

    + Beste Grüße +
    + Dein mivita.care Team +

    +
    +
    + + +
    +
    + + + + + +@endsection \ No newline at end of file diff --git a/resources/views/web/templates/kontakt.blade.php b/resources/views/web/templates/kontakt.blade.php index bf580343..c9e5581d 100644 --- a/resources/views/web/templates/kontakt.blade.php +++ b/resources/views/web/templates/kontakt.blade.php @@ -12,24 +12,50 @@ + + +
    @@ -40,109 +66,137 @@
    -

    Schreibe uns!

    +

    Schreibe uns!

    Du interessierst Dich für unser Geschäft oder hast Fragen zu den Produkten? Dann freuen wir uns auf eine Nachricht von Dir. Wir werden uns im Anschluss sobald wie möglich bei Dir zurückmelden.

    - -
    - + {!! Form::open(['url' => '/kontakt']) !!}
    - -
    - - -
    -
    -
    -
    - -
    - - +
    +
    + {!! Form::label('phone', __('Phone')) !!} + {!! Form::text('phone', null, ['class' => 'form-control', 'placeholder'=>__('Phone')]) !!}
    - -
    -
    - - -
    -
    - - - - + {!! Form::close() !!}
    -
    +
    + + + @if($user_shop) +

    Kontakt

    +

    Ich freue mich über Deinen Besuch in meinem MIVITA Onlineshop. Ich bin Deine persönliche Beratung rund um die Produkte und ihrer Anwendung.

    +
    + @if($user_shop->isImage()) + + @else + + @endif +
    + +

    + @if($user_shop->title) + {{ $user_shop->title }}
    + @endif + @if($user_shop->contact) + {!! nl2br($user_shop->contact) !!} + @endif +
    + {{ $user_shop->getSubdomain() }} +

    + + @if($user_shop->accessibility) +

    + Meine Erreichbarkeit:
    + {!! nl2br($user_shop->accessibility) !!} +

    + @endif + + @else

    Kontakt

    - Adresse:
     mivita e.K.
    + Adresse:
     mivita e.K.
    Leinfeld 2
    87755 Kirchhaslach     Telefon: Mo. - Fr.: 9-12 Uhr u. 13-16 Uhr

    -
    - + @endif +
    + +
    diff --git a/resources/views/web/templates/produkte-item.blade.php b/resources/views/web/templates/produkte-item.blade.php new file mode 100644 index 00000000..e953618b --- /dev/null +++ b/resources/views/web/templates/produkte-item.blade.php @@ -0,0 +1,79 @@ + + +
    + +
    + + + @php ($set = 'first') + @foreach($product->images as $image) + @if($image->slug) + @if($set == 'hover') + {{ $product->getLang('name') }} + @php($set = 'done') + @endif + + @if($set == 'first') + {{ $product->getLang('name') }} + @php($set = 'hover') + @endif + @endif + @endforeach + + + + + {{-- +
    + +
    + --}} + + + + {{--
    + NEW +
    --}} + +
    + + +
    +

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

    + + +
    +
    +
    + + + +
    + {{ $product->getFormattedPrice() }} € +
    + +
    + + +
    + + In den Warenkorb + + + Details + + +
    + +
    \ 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 d63d41a9..de46d6b4 100644 --- a/resources/views/web/templates/produkte-show.blade.php +++ b/resources/views/web/templates/produkte-show.blade.php @@ -6,22 +6,25 @@ div.shop-item-price > span { padding: 0; } + hr { margin-top: 10px; margin-bottom: 10px; } + p { margin-bottom: 15px; } - .qty input { - padding: 3px; - margin: 0; - border: #ccc 1px solid; - width: 60px; - margin-right: 3px; - text-align: center; - font-size: 16px; - } + + .qty input { + padding: 3px; + margin: 0; + border: #ccc 1px solid; + width: 60px; + margin-right: 3px; + text-align: center; + font-size: 16px; + }
    @@ -31,7 +34,6 @@
    -
    @@ -47,53 +49,38 @@
    @if($product->images->count()) -
    - +
    + + - data-mode="mouseover|grab|click|toggle" - --> -
    - + {{ $product->getLang('name') }} +
    - positions available: - .bottom-right - .bottom-left - .top-right - .top-left - --> - +
    - +
    + @php ($activ = 'active') + @foreach($product->images as $image) + + + + @php ($activ = '') + @endforeach - Extra: add .image-bw class to force black and white! - --> - {{ $product->getLang('name') }} - - -
    - - -
    - @php ($activ = 'active') - @foreach($product->images as $image) - - - - @php ($activ = '') - @endforeach - -
    - +
    + @endif @@ -102,9 +89,11 @@
    - +
    + --}}

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

    {!! $product->getLang('copy') !!} @@ -121,7 +110,8 @@

    -
    + +
    Lieferzeit: 1-3 Werktage {!! Form::close() !!}
    @@ -143,7 +133,7 @@
    - +
    @@ -151,7 +141,8 @@
    -
    +
    diff --git a/resources/views/web/templates/produkte.blade.php b/resources/views/web/templates/produkte.blade.php index 372e9175..501d9e4c 100644 --- a/resources/views/web/templates/produkte.blade.php +++ b/resources/views/web/templates/produkte.blade.php @@ -1,4 +1,3 @@ - @extends($user_shop ?'web.user.layouts.layout' : 'web.layouts.layout') @@ -15,24 +14,29 @@ @@ -46,78 +50,13 @@

    Produktwelt

    - diff --git a/resources/views/web/user/layouts/includes/footer.blade.php b/resources/views/web/user/layouts/includes/footer.blade.php index 7ed87118..5ce002b4 100644 --- a/resources/views/web/user/layouts/includes/footer.blade.php +++ b/resources/views/web/user/layouts/includes/footer.blade.php @@ -4,42 +4,86 @@
    -
    +
    -

    - Du möchtest Kontakt aufnehmen? +

    + Du möchtest Vertriebspartner werden oder hast Fragen zu unseren Produkten?

    - {!! $user_shop->info !!} +

    Jetzt Kontakt aufnehmen: zum Kontakt +

    + +
    - +