', // Summernote's default is to use '
' + lang.cleaner.not + '
');
+ }
+ });
+ return button.render();
+ });
+ }
+ this.events = {
+ 'summernote.init': function () {
+ if ($.summernote.interface === 'lite') {
+ $("head").append('');
+ }
+ if (options.cleaner.limitChars != 0 || options.cleaner.limitDisplay != 'none') {
+ var textLength = $editor.find(".note-editable").text().replace(/(<([^>]+)>)/ig, "").replace(/( )/, " ");
+ var codeLength = $editor.find('.note-editable').html();
+ var lengthStatus = '';
+ if (textLength.length > options.cleaner.limitChars && options.cleaner.limitChars > 0)
+ lengthStatus += 'text-danger">';
+ else
+ lengthStatus += '">';
+ if (options.cleaner.limitDisplay == 'text' || options.cleaner.limitDisplay == 'both') lengthStatus += lang.cleaner.limitText + ': ' + textLength.length;
+ if (options.cleaner.limitDisplay == 'both') lengthStatus += ' / ';
+ if (options.cleaner.limitDisplay == 'html' || options.cleaner.limitDisplay == 'both') lengthStatus += lang.cleaner.limitHTML + ': ' + codeLength.length;
+ $editor.find('.note-status-output').html(']+)>)/ig, "").replace(/( )/, " ");
+ var codeLength = $editor.find('.note-editable').html();
+ var lengthStatus = '';
+ if (options.cleaner.limitStop == true && textLength.length >= options.cleaner.limitChars) {
+ var key = e.keyCode;
+ allowed_keys = [8, 37, 38, 39, 40, 46]
+ if ($.inArray(key, allowed_keys) != -1) {
+ $editor.find('.cleanerLimit').removeClass('text-danger');
+ return true;
+ } else {
+ $editor.find('.cleanerLimit').addClass('text-danger');
+ e.preventDefault();
+ e.stopPropagation();
+ }
+ } else {
+ if (textLength.length > options.cleaner.limitChars && options.cleaner.limitChars > 0)
+ lengthStatus += 'text-danger">';
+ else
+ lengthStatus += '">';
+ if (options.cleaner.limitDisplay == 'text' || options.cleaner.limitDisplay == 'both')
+ lengthStatus += lang.cleaner.limitText + ': ' + textLength.length;
+ if (options.cleaner.limitDisplay == 'both')
+ lengthStatus += ' / ';
+ if (options.cleaner.limitDisplay == 'html' || options.cleaner.limitDisplay == 'both')
+ lengthStatus += lang.cleaner.limitHTML + ': ' + codeLength.length;
+ $editor.find('.note-status-output').html(' 0 || !!navigator.userAgent.match(/Trident.*rv\:11\./);
+ var ffox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
+ if (msie)
+ var text = window.clipboardData.getData("Text");
+ else
+ var text = e.originalEvent.clipboardData.getData(options.cleaner.keepHtml ? 'text/html' : 'text/plain');
+ if (text) {
+ if (msie || ffox)
+ setTimeout(function () {
+ $note.summernote('pasteHTML', cleanText(text, options.cleaner.newline));
+ }, 1);
+ else
+ $note.summernote('pasteHTML', cleanText(text, options.cleaner.newline));
+ if ($editor.find('.note-status-output').length > 0)
+ $editor.find('.note-status-output').html('' + lang.cleaner.not + '
');
+ }
+ }
+ }
+ }
+ }
+ });
+}));
\ No newline at end of file
diff --git a/resources/lang/de/navigation.php b/resources/lang/de/navigation.php
index fb905ef..fe709cd 100755
--- a/resources/lang/de/navigation.php
+++ b/resources/lang/de/navigation.php
@@ -22,6 +22,7 @@ return [
'products'=>'Produkte',
'overview'=>'Übersicht',
'categories'=>'Kategorien',
+ 'ingredients'=>'Inhaltsstoffe',
'attribute'=>'Attribute',
'contents'=>'Inhalte',
'start_site'=>'Startseite',
diff --git a/resources/views/admin/category/images.blade.php b/resources/views/admin/category/images.blade.php
index 2f1ea29..173c90f 100755
--- a/resources/views/admin/category/images.blade.php
+++ b/resources/views/admin/category/images.blade.php
@@ -25,7 +25,7 @@
-
Bild wird rechts hinter die Headline gesetzt und automatisch auf eine Höhe von 60 Pixel skaliert.
+Bild wird hinter oder unter die Headline gesetzt und einer Breite von 100% ausgegeben.
@@ -56,7 +56,7 @@
+any())
+
+
+ @endif
+
+
+
+
+
+ -
+ @foreach ($errors->all() as $error)
+
- {{ $error }} + @endforeach +
+ {{ __('Create/Edit Inhaltsstoff') }} +
+ + {!! Form::open(['url' => route('admin_product_ingredient_store'), 'class' => 'form-horizontal', 'id'=>'']) !!} + + + + + @include('admin.ingredient.form') + +
+
+ {{ __('back') }}
+
+
+ {!! Form::close() !!}
+
+@endsection
diff --git a/resources/views/admin/ingredient/form.blade.php b/resources/views/admin/ingredient/form.blade.php
new file mode 100755
index 0000000..ca6044c
--- /dev/null
+++ b/resources/views/admin/ingredient/form.blade.php
@@ -0,0 +1,43 @@
+
+
+
+
\ No newline at end of file
diff --git a/resources/views/admin/ingredient/index.blade.php b/resources/views/admin/ingredient/index.blade.php
new file mode 100755
index 0000000..3cf00f1
--- /dev/null
+++ b/resources/views/admin/ingredient/index.blade.php
@@ -0,0 +1,72 @@
+@extends('layouts.layout-2')
+
+@section('content')
+ + {{ __('Inhaltsstoff') }} + +
+ +
+
+
+
+
+
+
+
+
+ {{ Form::text('name', $model->name, array('placeholder'=>__('Name'), 'class'=>'form-control', 'id'=>'name', 'required')) }}
+
+
+
+
+
+ {{ Form::textarea('inci', $model->inci, array('placeholder'=>__('INCI'), 'class'=>'form-control', 'id'=>'inci', 'rows'=>3)) }}
+
+
+
+
+
+
+ {{ Form::textarea('effect', $model->effect, array('placeholder'=>__('Wirkung'), 'class'=>'form-control', 'id'=>'inci', 'rows'=>3)) }}
+
+
+
+
+
+
+ {{ Form::text('pos', $model->pos, array('placeholder'=>__('pos'), 'class'=>'form-control', 'id'=>'pos')) }}
+
+
+
+
+
+@endsection
diff --git a/resources/views/admin/product/form.blade.php b/resources/views/admin/product/form.blade.php
index 236e1f0..f45df33 100755
--- a/resources/views/admin/product/form.blade.php
+++ b/resources/views/admin/product/form.blade.php
@@ -242,10 +242,51 @@
{{ Form::textarea('usage', $product->usage , array('placeholder'=>__('usage'), 'class'=>'form-control summernote', 'id'=>'usage')) }}
+ {{__('Inhaltsstoffe')}} +
+
+
+
+
+
+
+
+ | + | {{__('Pos')}} | +{{__('Name')}} | +{{__('INCI')}} | +{{__('Wirkung') }} | +{{__('Status')}} | ++ |
|---|---|---|---|---|---|---|
| + + + + | +{{ $value->pos }} | +{{ $value->name }} | +{{ $value->inci }} | +{{ $value->effect }} | +@if($value->active) @else@endif | ++ + |
-
+
{{ Form::textarea('ingredients', $product->ingredients , array('placeholder'=>__('ingredients'), 'class'=>'form-control summernote', 'id'=>'ingredients')) }}
+
+
diff --git a/resources/views/admin/site/images.blade.php b/resources/views/admin/site/images.blade.php
index c7d8dfb..b6f97c0 100755
--- a/resources/views/admin/site/images.blade.php
+++ b/resources/views/admin/site/images.blade.php
@@ -56,7 +56,7 @@
+ {{ __('Inhalte') }} +
+
+
+
+
+
+
+
+ Inhaltsstoffe anlegen
+
+
+
+
+
-
@yield('scripts')
diff --git a/resources/views/layouts/includes/layout-sidenav.blade.php b/resources/views/layouts/includes/layout-sidenav.blade.php
index 803fbf9..b58cec5 100755
--- a/resources/views/layouts/includes/layout-sidenav.blade.php
+++ b/resources/views/layouts/includes/layout-sidenav.blade.php
@@ -143,6 +143,9 @@
+
+
diff --git a/resources/views/sys/admin/customers.blade.php b/resources/views/sys/admin/customers.blade.php
index 8ea4e3e..6cacdc3 100644
--- a/resources/views/sys/admin/customers.blade.php
+++ b/resources/views/sys/admin/customers.blade.php
@@ -35,6 +35,8 @@
+
+
diff --git a/resources/views/user/homeparty/_address.blade.php b/resources/views/user/homeparty/_address.blade.php
new file mode 100644
index 0000000..b23f76c
--- /dev/null
+++ b/resources/views/user/homeparty/_address.blade.php
@@ -0,0 +1,71 @@
+@if($homeparty_user)
+ @if($homeparty_user->isAddress())
+ @if($homeparty_user->same_as_billing)
+ {{ __('navigation.categories') }}
{{ __('navigation.ingredients') }}
+ {{ __('navigation.attribute') }}
+ @if($homeparty_user->billing_company)
+ {{ $homeparty_user->billing_company }}
+
+ @endif
+ {{ \App\Services\HTMLHelper::getSalutationLang($homeparty_user->billing_salutation) }}
+ {{ $homeparty_user->billing_firstname }}
+ {{ $homeparty_user->billing_lastname }}
+
+
+ {{ $homeparty_user->billing_address }}
+
+ @if($homeparty_user->billing_address_2)
+ {{ $homeparty_user->billing_address_2 }}
+
+ @endif
+ {{ $homeparty_user->billing_zipcode }}
+ {{ $homeparty_user->billing_city }}
+
+ @if($homeparty_user->billing_country)
+ {{ $homeparty_user->billing_country->getLocated() }}
+
+ @endif
+ @if($homeparty_user->billing_email)
+ E-Mail:{{ $homeparty_user->billing_email }}
+
+ @endif
+ @if($homeparty_user->billing_phone)
+ Telefon: {{ $homeparty_user->billing_phone }}
+ @endif
+
+ @if($homeparty_user->shipping_company)
+ {{ $homeparty_user->shipping_company }}
+
+ @endif
+ {{ \App\Services\HTMLHelper::getSalutationLang($homeparty_user->shipping_salutation) }}
+ {{ $homeparty_user->shipping_firstname }}
+ {{ $homeparty_user->shipping_lastname }}
+
+
+ {{ $homeparty_user->shipping_address }}
+
+ @if($homeparty_user->shipping_address_2)
+ {{ $homeparty_user->shipping_address_2 }}
+
+ @endif
+ {{ $homeparty_user->shipping_zipcode }}
+ {{ $homeparty_user->shipping_city }}
+
+ @if($homeparty_user->shipping_country)
+ {{ $homeparty_user->shipping_country->getLocated() }}
+
+ @endif
+ @if($homeparty_user->shipping_email)
+ E-Mail:{{ $homeparty_user->shipping_email }}
+
+ @endif
+ @if($homeparty_user->shipping_phone)
+ Telefon: {{ $homeparty_user->shipping_phone }}
+ @endif
+
Keine Adresse angelegt
+ @endif +@endif \ No newline at end of file diff --git a/resources/views/user/homeparty/detail.blade.php b/resources/views/user/homeparty/detail.blade.php index e20b4c1..a6af329 100644 --- a/resources/views/user/homeparty/detail.blade.php +++ b/resources/views/user/homeparty/detail.blade.php @@ -13,7 +13,7 @@ zurück - {!! Form::open(['url' => route('user_homeparty_detail', [$homeparty->id]), 'class' => 'form-horizontal', 'id'=>'homeparty-party-form-validation']) !!} + {!! Form::open(['url' => route('user_homeparty_detail', [$homeparty->id]), 'class' => 'form-horizontal', 'id'=>'homeparty-party-form-validation']) !!}@@ -74,29 +74,31 @@
-
+
+
+ {!! Form::open(['url' => route('user_homeparty_detail', [$homeparty->id]), 'class' => 'form-horizontal', 'id'=>'homeparty-user-form-validation']) !!} +
-
-
+
+ Lass den Gastgeber seine Daten selber ausfüllen
+Lass den Gastgeber/in seine Daten selber ausfüllen
-
+
Teile diesen Link mit dem Gastgeber (z.B. WhatsApp oder SMS), damit gelangt er auf eine Zielseite wo er seine Daten selber ausfüllen kann. Nutze das „Kopier-Symbol“, um den Link gleich in Deine Zwischenablage zu kopieren.
-+
Teile diesen Link mit dem Gastgeber/in und Gästen (z.B. WhatsApp oder SMS), damit gelangt sie auf eine Zielseite wo sie ihre Daten selber ausfüllen können. Nutze das „Kopier-Symbol“, um den Link gleich in Deine Zwischenablage zu kopieren.
+ {!! Form::open(['url' => route('user_homeparty_detail', [$homeparty->id]), 'class' => 'form-horizontal', 'id'=>'homeparty-user-form-validation']) !!} +
diff --git a/resources/views/user/homeparty/guest_detail.blade.php b/resources/views/user/homeparty/guest_detail.blade.php
index b59a3b6..3a3158c 100644
--- a/resources/views/user/homeparty/guest_detail.blade.php
+++ b/resources/views/user/homeparty/guest_detail.blade.php
@@ -7,21 +7,7 @@
{!! Form::open(['url' => route('user_homeparty_guest_detail', [$homeparty->id, $homeparty_user->id]), 'class' => 'form-horizontal', 'id'=>'homeparty-user-form-validation']) !!}
-
-
- Lass den @if($homeparty_user->is_host) Gastgeber @else Gast @endif seine Daten selber ausfüllen
-
-
-
-
-
-
-
-
- Teile diesen Link mit dem Gastgeber (z.B. WhatsApp oder SMS), damit gelangt er auf eine Zielseite wo er seine Daten selber ausfüllen kann. Nutze das „Kopier-Symbol“, um den Link gleich in Deine Zwischenablage zu kopieren.
-
-
diff --git a/resources/views/user/homeparty/guests.blade.php b/resources/views/user/homeparty/guests.blade.php
index 9408ca4..6280878 100644
--- a/resources/views/user/homeparty/guests.blade.php
+++ b/resources/views/user/homeparty/guests.blade.php
@@ -25,7 +25,7 @@
{{-- offen ... --}}
-
-
-
-
-
-
-
-
-
-
-
+
@endforeach
- zurück zur Übersicht
-
@endsection
\ No newline at end of file
diff --git a/resources/views/user/homeparty/index.blade.php b/resources/views/user/homeparty/index.blade.php
index 5bd2ae5..0abaefe 100644
--- a/resources/views/user/homeparty/index.blade.php
+++ b/resources/views/user/homeparty/index.blade.php
@@ -59,6 +59,17 @@
diff --git a/resources/views/user/homeparty/guest_detail.blade.php b/resources/views/user/homeparty/guest_detail.blade.php
index b59a3b6..3a3158c 100644
--- a/resources/views/user/homeparty/guest_detail.blade.php
+++ b/resources/views/user/homeparty/guest_detail.blade.php
@@ -7,21 +7,7 @@
{!! Form::open(['url' => route('user_homeparty_guest_detail', [$homeparty->id, $homeparty_user->id]), 'class' => 'form-horizontal', 'id'=>'homeparty-user-form-validation']) !!}
-
-
@endforeach
-
-
Lass den @if($homeparty_user->is_host) Gastgeber @else Gast @endif seine Daten selber ausfüllen
-
-
-
-
-
-
-
-
- Teile diesen Link mit dem Gastgeber (z.B. WhatsApp oder SMS), damit gelangt er auf eine Zielseite wo er seine Daten selber ausfüllen kann. Nutze das „Kopier-Symbol“, um den Link gleich in Deine Zwischenablage zu kopieren.
--
diff --git a/resources/views/user/homeparty/guests.blade.php b/resources/views/user/homeparty/guests.blade.php
index 9408ca4..6280878 100644
--- a/resources/views/user/homeparty/guests.blade.php
+++ b/resources/views/user/homeparty/guests.blade.php
@@ -25,7 +25,7 @@
{{-- offen ... --}}
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/resources/views/user/homeparty/guests.blade.php b/resources/views/user/homeparty/guests.blade.php
index 9408ca4..6280878 100644
--- a/resources/views/user/homeparty/guests.blade.php
+++ b/resources/views/user/homeparty/guests.blade.php
@@ -25,7 +25,7 @@
{{-- offen ... --}}
-
-
-
-
-
-
-
- +
+
+
+
+
+
+
+
+
+
+
Verwalten
@@ -72,8 +83,19 @@
@endsection
\ No newline at end of file
diff --git a/resources/views/user/homeparty/modal_show_products.blade.php b/resources/views/user/homeparty/modal_show_products.blade.php
new file mode 100644
index 0000000..fa686e0
--- /dev/null
+++ b/resources/views/user/homeparty/modal_show_products.blade.php
@@ -0,0 +1,66 @@
+
+
\ No newline at end of file
diff --git a/resources/views/user/homeparty/order.blade.php b/resources/views/user/homeparty/order.blade.php
new file mode 100644
index 0000000..00e6c77
--- /dev/null
+++ b/resources/views/user/homeparty/order.blade.php
@@ -0,0 +1,235 @@
+@extends('layouts.layout-2')
+
+@section('content')
+
+
+
+ {{ __('navigation.my_homeparty') }} / {{ $homeparty->name }} - {{ $homeparty->date }}
+ zurück
+
+
+ {!! Form::open(['url' => route('user_homeparty_order', [$homeparty->id]), 'class' => 'form-horizontal', 'id'=>'homeparty-order-form']) !!}
+
+
+
+
+
+
+
+ @if($homeparty->homeparty_host)
+
+
+
+
+ Bestellung anlegen
+
+ Verwalten
+ Gäste anlegen
+
+
+
+
+
+
+
+
+
+
+ Bestellung anlegen
+
+ Verwalten
+ Gäste anlegen
+
+
+
+
+
+ @endif
+
+ @if($homeparty->homeparty_guests)
+ @php($g_count = 1)
+ @foreach($homeparty->homeparty_guests as $homeparty_guest)
+
+
+
+
+ Bestellung Gastgeber/in {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}}
+
+
+
+
+
+
+
+
+
+
+
+ Bestellung Gastgeber/in {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}}
+
+
+
+
+
+
+ @include('user.homeparty.show_products_order', ['homeparty_guest' => $homeparty->homeparty_host])
+
+
+
+
+
+ @endforeach
+ @endif
+
+
+
+
+ Bestellung {!! $g_count++ !!}. Gast {{$homeparty_guest->billing_firstname}} {{$homeparty_guest->billing_lastname}}
+
+
+
+
+
+
+
+
+
+
+
+ Bestellung {!! $g_count++ !!}. Gast {{$homeparty_guest->billing_firstname}} {{$homeparty_guest->billing_lastname}}
+
+
+
+
+
+
+ @include('user.homeparty.show_products_order', ['homeparty_guest' => $homeparty_guest])
+
+ + +
+
+
+
+ {{-- TODO Berechnung des WK --}}
+
+
+
+
+ {!! Form::close() !!}
+
+
+
+
+@endsection
+@section('scripts')
+
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/user/homeparty/self_guest_detail.blade.php b/resources/views/user/homeparty/self_guest_detail.blade.php
index 189e4b4..d85b834 100644
--- a/resources/views/user/homeparty/self_guest_detail.blade.php
+++ b/resources/views/user/homeparty/self_guest_detail.blade.php
@@ -1,21 +1,87 @@
@extends('layouts.layout-2-without')
@section('content')
-
+
+
+
+ Gesamtübersicht
+
+
+
+
+
+ {{-- TODO Berechnung des WK --}}
+
+
+
+
+
+ Gesamtübersicht
+
+
+ + @if($homeparty->homeparty_host && $homeparty->homeparty_host->isAddress()) +
+ Du wirst auf unseren checkout Server weitergeletet, die Verbindung ist SSL verschlüsselt. + @else + + + @endif +
+
+ @include('user.homeparty.show_total_order', ['homeparty' => $homeparty])
+
+ + + @if($homeparty->homeparty_host && $homeparty->homeparty_host->isAddress()) +
+
+
+ + Du wirst auf unseren checkout Server weitergeletet, die Verbindung ist SSL verschlüsselt. + @else + + + @endif +
- Homeparty / {{ $homeparty->name }} - {{ $homeparty->date }}
- zurück
-
- {!! Form::open(['url' => route('homeparty', [$homeparty_user->token]), 'class' => 'form-horizontal', 'id'=>'homeparty-user-form-validation']) !!}
- + + @if($homeparty_user === null) +
+ Homeparty / {{ $homeparty->name }} - {{ $homeparty->date }}
+
+ @if(Session::has('alert-save'))
+
+
+ @endif
+
+ {{__('saved')}}: {{__('The changes have been saved.')}}
+
+
+
+ Neue Gast anlegen
+
+ @else
+
+ @php($g_count = 1)
+ @foreach($homeparty->homeparty_users as $homeparty_user)
+
+
+
+ @endforeach
+
+
+
+
+ @if($homeparty_user->is_host)
+ Gastgeber/in:
+ @else
+ Gast {{$g_count++}}:
+ @endif
+ {{$homeparty_user->billing_firstname}} {{$homeparty_user->billing_lastname}}
+
+ {{-- offen ... --}}
+
+
+ bearbeiten
+
+
+
+
+
+ {{$homeparty->description}}
+
+
+
+
+
+
+
+
+ Adresse
+ {{$homeparty_user->billing_address}}
+ {{$homeparty_user->billing_zipcode}}
+ {{$homeparty_user->city}}
+ @if($homeparty_user->billing_country_id){{ $homeparty_user->billing_country->getLocated() }}@endif
+
+
+
+ E-Telefon
+ {{$homeparty_user->billing_phone}}
+
+
+ E-Mail
+ {{$homeparty_user->billing_email}}
+
+ Homeparty / {{ $homeparty->name }} - {{ $homeparty->date }}
+ zurück
+
+
+ {!! Form::open(['url' => route('homeparty', [$homeparty->token, $homeparty_user->id]), 'class' => 'form-horizontal', 'id'=>'homeparty-user-form-validation']) !!}
@if(Session::has('alert-save'))
-
{{__('saved')}}: {{__('The changes have been saved.')}}
Eingabe Deiner persönlichen Daten für die Homeparty
@@ -24,7 +90,7 @@
- @if($homeparty_user->is_host) Gastgeber, @else Gast-, @endif Rechungsadresse
+ @if($homeparty_user->is_host) Gastgeber/in, @else Gast-, @endif Rechungsadresse
* {{trans('register.required_fields')}}
@@ -34,21 +100,21 @@
@include('user.homeparty._edit')
-
-
-
-
+
+
+
+
-
+
{!! Form::close() !!}
@@ -131,4 +197,6 @@
});
+
+ @endif
@endsection
\ No newline at end of file
diff --git a/resources/views/user/homeparty/show_bonus.blade.php b/resources/views/user/homeparty/show_bonus.blade.php
new file mode 100644
index 0000000..3e51cb8
--- /dev/null
+++ b/resources/views/user/homeparty/show_bonus.blade.php
@@ -0,0 +1,43 @@
+
+
+ Zielumsatz {{\App\Services\HomepartyCart::getFormattedBonusValue()}} € Gutschein:
+ {{\App\Services\HomepartyCart::getFormattedPrice()}} € / {{\App\Services\HomepartyCart::getFormattedBonusStart()}} €
+
+
+ @if(!\App\Services\HomepartyCart::$is_bonus)
+
+ fehlen noch:
+ {{\App\Services\HomepartyCart::getFormattedBonusDiff()}} €
+
+
+ Nächster Bonus:
+ - €
+
+
+ fehlen noch:
+ - €
+
+
+ @else
+
+ fehlen noch:
+ 0 €
+
+
+ Nächster Bonus {{\App\Services\HomepartyCart::getFormattedBonusCouponNextValue()}} € ab:
+ {{\App\Services\HomepartyCart::getFormattedBonusCouponNextStep()}} €
+
+
+ fehlen noch:
+ {{\App\Services\HomepartyCart::getFormattedBonusCouponFault()}} €
+
+ @endif
+
+ Gutschein Bonus:
+ {{\App\Services\HomepartyCart::getFormattedBonusCoupon()}} €
+
+
+ Gutschein Gesamt
+ {{\App\Services\HomepartyCart::getFormattedBonusTotal()}} €
+
+
diff --git a/resources/views/user/homeparty/show_calc_bonus_host.blade.php b/resources/views/user/homeparty/show_calc_bonus_host.blade.php
new file mode 100644
index 0000000..c1d0e15
--- /dev/null
+++ b/resources/views/user/homeparty/show_calc_bonus_host.blade.php
@@ -0,0 +1,39 @@
+
+ @php($user_cart = \App\Services\HomepartyCart::getUserCartHost())
+ @if(\App\Services\HomepartyCart::$is_bonus)
+
+ Gutschrift Homeparty Gutschein
+
+
+ - {{ \App\Services\HomepartyCart::getFormattedBonusValue() }} €
+
+ @endif
+ @if(\App\Services\HomepartyCart::$is_bonus_coupon)
+
+ Gutschrift Bonus
+
+
+ - {{ \App\Services\HomepartyCart::getFormattedBonusCoupon() }} €
+
+ @endif
+ @if(\App\Services\HomepartyCart::$is_bonus)
+
+ Abzug Points durch Gutschein
+ - {{ \App\Services\HomepartyCart::getFormattedBonusPointsDiff() }}
+
+
+
+ @endif
+
+ Versandkosten:
+
+
+ 0 €
+
+
+ Gesamt:
+ {{$user_cart->getFormattedEkPrice()}} €
+ {{$user_cart->getFormattedPoints()}}
+ {{$user_cart->getFormattedIncomePrice()}} €
+ {{$user_cart->getFormattedPrice()}} €
+
diff --git a/resources/views/user/homeparty/show_products_order.blade.php b/resources/views/user/homeparty/show_products_order.blade.php
new file mode 100644
index 0000000..fc8c5eb
--- /dev/null
+++ b/resources/views/user/homeparty/show_products_order.blade.php
@@ -0,0 +1,100 @@
+@if($homeparty_guest && $homeparty_guest->homeparty_user_order_items->count())
+
+
+
+
+ {{__('Bild')}}
+ {{__('Produkt')}}
+ {{__('Anzahl')}}
+ {{__('Marge')}}
+ {{__('EK-Preis')}}
+ {{__('Points')}}
+ {{__('Verdienst')}}
+ {{__('VK-Preis')}}
+
+
+
+ @foreach($homeparty_guest->homeparty_user_order_items as $value)
+
+
+ @if(count($value->product->images))
+ ->slug]) }})
+ @endif
+
+
+ {{ $value->product->name }}
+
+ Inhalt: {{ $value->product->contents }}
+ Art.-Nr.: {{ $value->product->number }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $value->margin }}%
+
+
+ {{ $value->getFormattedTotalEKPrice() }} €
+
+
+ {{ $value->getFormattedTotalPoints() }}
+
+
+ {{ $value->getFormattedTotalIncomePrice() }} €
+
+
+ {{ $value->getFormattedTotalPrice() }} €
+
+
+ @endforeach
+
+
+
+ @php($user_cart = \App\Services\HomepartyCart::getUserCart($homeparty_guest->id))
+ @if(!$homeparty_guest->is_host)
+
+
+
+
+
+
+ {{--
+ Versandkosten
+ 12
+
+ 25,00 €
+
+ --}}
+
+ Gesamt:
+ {{$user_cart->getFormattedEkPrice()}} €
+ {{$user_cart->getFormattedPoints()}}
+ {{$user_cart->getFormattedIncomePrice()}} €
+ {{$user_cart->getFormattedPrice()}} €
+
+ @else
+
+ @include('user.homeparty.show_calc_bonus_host')
+
+ @endif
+
+
+
+@endif
\ No newline at end of file
diff --git a/resources/views/user/homeparty/show_total_order.blade.php b/resources/views/user/homeparty/show_total_order.blade.php
new file mode 100644
index 0000000..fac0e8f
--- /dev/null
+++ b/resources/views/user/homeparty/show_total_order.blade.php
@@ -0,0 +1,103 @@
+
+
+
+
+
+ {{__('EK-Preis')}}
+ {{__('Points')}}
+ {{__('Verdienst')}}
+ {{__('VK-Preis')}}
+
+
+
+ @if($homeparty->homeparty_host)
+ @php($user_cart = \App\Services\HomepartyCart::getUserCart($homeparty->homeparty_host->id))
+
+
+ Gastgeber/in {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}}
+
+
+ {{$user_cart->getFormattedEkPrice()}} €
+
+
+ {{$user_cart->getFormattedPoints()}}
+
+
+ {{$user_cart->getFormattedIncomePrice()}} €
+
+
+ {{$user_cart->getFormattedPrice()}} €
+
+
+ @endif
+
+ @if($homeparty->homeparty_guests)
+ @php($g_count = 1)
+ @foreach($homeparty->homeparty_guests as $homeparty_guest)
+ @php($user_cart = \App\Services\HomepartyCart::getUserCart($homeparty_guest->id))
+
+
+
+ {!! $g_count++ !!}. Gast {{$homeparty_guest->billing_firstname}} {{$homeparty_guest->billing_lastname}}
+
+
+ {{$user_cart->getFormattedEkPrice()}} €
+
+
+ {{$user_cart->getFormattedPoints()}}
+
+
+ {{$user_cart->getFormattedIncomePrice()}} €
+
+
+ {{$user_cart->getFormattedPrice()}} €
+
+
+ @endforeach
+ @endif
+
+
+
+
+
+ @if(\App\Services\HomepartyCart::$is_bonus)
+
+
+ zzgl. anteiliger Bonusgutschein:
+
+ {{ App\Services\HomepartyCart::getFormattedBonusPrice() }}€
+
+
+ @endif
+
+
+ Gesamtsummen:
+
+ {{\App\Services\HomepartyCart::getFormattedEkPrice()}}
+ {{\App\Services\HomepartyCart::getFormattedPoints()}}
+ {{\App\Services\HomepartyCart::getFormattedIncomePrice()}} €
+ {{\App\Services\HomepartyCart::getFormattedPrice()}} €
+
+
+
+ Summe ohne MwSt:
+
+
+
+
+
+ {{\App\Services\HomepartyCart::getFormattedPriceNet()}} €
+
+
+
+ Enthaltene MwSt:
+
+
+
+
+
+ {{\App\Services\HomepartyCart::getFormattedPriceTax()}} €
+
+
+
+
\ No newline at end of file
diff --git a/resources/views/user/order/list.blade.php b/resources/views/user/order/list.blade.php
index fe82fe3..d5b8167 100644
--- a/resources/views/user/order/list.blade.php
+++ b/resources/views/user/order/list.blade.php
@@ -187,3 +187,7 @@
});
@endsection
+
+@section('scripts')
+
+@endsection
diff --git a/resources/views/user/order/yard_view_form.blade.php b/resources/views/user/order/yard_view_form.blade.php
index f85306f..20524a4 100644
--- a/resources/views/user/order/yard_view_form.blade.php
+++ b/resources/views/user/order/yard_view_form.blade.php
@@ -82,8 +82,6 @@
min-width: 4em;
display: inline-block;
}
- }
- }
diff --git a/resources/views/web/start.blade.php b/resources/views/web/start.blade.php
index 7f7435e..9a20c4a 100644
--- a/resources/views/web/start.blade.php
+++ b/resources/views/web/start.blade.php
@@ -66,15 +66,23 @@
+
- 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.
+
+ @if($site->hasImage())
+  }})
+ @endif
+
+ 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.
+
+
diff --git a/resources/views/web/templates/kontakt.blade.php b/resources/views/web/templates/kontakt.blade.php
index 7937266..7abf000 100644
--- a/resources/views/web/templates/kontakt.blade.php
+++ b/resources/views/web/templates/kontakt.blade.php
@@ -174,9 +174,9 @@
- @if($homeparty_user->is_host) Gastgeber, @else Gast-, @endif Rechungsadresse
+ @if($homeparty_user->is_host) Gastgeber/in, @else Gast-, @endif Rechungsadresse
* {{trans('register.required_fields')}}
@@ -34,21 +100,21 @@
@include('user.homeparty._edit')
-
+
diff --git a/resources/views/user/homeparty/show_calc_bonus_host.blade.php b/resources/views/user/homeparty/show_calc_bonus_host.blade.php
new file mode 100644
index 0000000..c1d0e15
--- /dev/null
+++ b/resources/views/user/homeparty/show_calc_bonus_host.blade.php
@@ -0,0 +1,39 @@
+
+ @php($user_cart = \App\Services\HomepartyCart::getUserCartHost())
+ @if(\App\Services\HomepartyCart::$is_bonus)
+
+ Gutschrift Homeparty Gutschein
+
+
+ - {{ \App\Services\HomepartyCart::getFormattedBonusValue() }} €
+
+ @endif
+ @if(\App\Services\HomepartyCart::$is_bonus_coupon)
+
+ Gutschrift Bonus
+
+
+ - {{ \App\Services\HomepartyCart::getFormattedBonusCoupon() }} €
+
+ @endif
+ @if(\App\Services\HomepartyCart::$is_bonus)
+
+ Abzug Points durch Gutschein
+ - {{ \App\Services\HomepartyCart::getFormattedBonusPointsDiff() }}
+
+
+
+ @endif
+
+ Versandkosten:
+
+
+ 0 €
+
+
+ Gesamt:
+ {{$user_cart->getFormattedEkPrice()}} €
+ {{$user_cart->getFormattedPoints()}}
+ {{$user_cart->getFormattedIncomePrice()}} €
+ {{$user_cart->getFormattedPrice()}} €
+
diff --git a/resources/views/user/homeparty/show_products_order.blade.php b/resources/views/user/homeparty/show_products_order.blade.php
new file mode 100644
index 0000000..fc8c5eb
--- /dev/null
+++ b/resources/views/user/homeparty/show_products_order.blade.php
@@ -0,0 +1,100 @@
+@if($homeparty_guest && $homeparty_guest->homeparty_user_order_items->count())
+
-
-
-
-
+
+
+
+
-
+
{!! Form::close() !!}
@@ -131,4 +197,6 @@
});
+
+ @endif
@endsection
\ No newline at end of file
diff --git a/resources/views/user/homeparty/show_bonus.blade.php b/resources/views/user/homeparty/show_bonus.blade.php
new file mode 100644
index 0000000..3e51cb8
--- /dev/null
+++ b/resources/views/user/homeparty/show_bonus.blade.php
@@ -0,0 +1,43 @@
+| Zielumsatz {{\App\Services\HomepartyCart::getFormattedBonusValue()}} € Gutschein: | +{{\App\Services\HomepartyCart::getFormattedPrice()}} € / {{\App\Services\HomepartyCart::getFormattedBonusStart()}} € | +
| fehlen noch: | +{{\App\Services\HomepartyCart::getFormattedBonusDiff()}} € | +
| Nächster Bonus: | +- € | +
| fehlen noch: | +- € | +
| fehlen noch: | +0 € | +
| Nächster Bonus {{\App\Services\HomepartyCart::getFormattedBonusCouponNextValue()}} € ab: | +{{\App\Services\HomepartyCart::getFormattedBonusCouponNextStep()}} € | +
| fehlen noch: | +{{\App\Services\HomepartyCart::getFormattedBonusCouponFault()}} € | +
| Gutschein Bonus: | +{{\App\Services\HomepartyCart::getFormattedBonusCoupon()}} € | +
| Gutschein Gesamt | +{{\App\Services\HomepartyCart::getFormattedBonusTotal()}} € | +
+
+
+
+
+@endif
\ No newline at end of file
diff --git a/resources/views/user/homeparty/show_total_order.blade.php b/resources/views/user/homeparty/show_total_order.blade.php
new file mode 100644
index 0000000..fac0e8f
--- /dev/null
+++ b/resources/views/user/homeparty/show_total_order.blade.php
@@ -0,0 +1,103 @@
+| {{__('Bild')}} | +{{__('Produkt')}} | +{{__('Anzahl')}} | +{{__('Marge')}} | +{{__('EK-Preis')}} | +{{__('Points')}} | +{{__('Verdienst')}} | +{{__('VK-Preis')}} | +
|---|---|---|---|---|---|---|---|
|
+ @if(count($value->product->images))
+ |
+
+ {{ $value->product->name }}
+
+
+
+ Inhalt: {{ $value->product->contents }}
+ Art.-Nr.: {{ $value->product->number }}
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ + {{ $value->margin }}% + | ++ {{ $value->getFormattedTotalEKPrice() }} € + | ++ {{ $value->getFormattedTotalPoints() }} + | ++ {{ $value->getFormattedTotalIncomePrice() }} € + | ++ {{ $value->getFormattedTotalPrice() }} € + | +
| + + | ++ | ||||||
| Versandkosten | +12 | ++ | 25,00 € | +||||
| Gesamt: | +{{$user_cart->getFormattedEkPrice()}} € | +{{$user_cart->getFormattedPoints()}} | +{{$user_cart->getFormattedIncomePrice()}} € | +{{$user_cart->getFormattedPrice()}} € | +|||
+
+
+
+
\ No newline at end of file
diff --git a/resources/views/user/order/list.blade.php b/resources/views/user/order/list.blade.php
index fe82fe3..d5b8167 100644
--- a/resources/views/user/order/list.blade.php
+++ b/resources/views/user/order/list.blade.php
@@ -187,3 +187,7 @@
});
@endsection
+
+@section('scripts')
+
+@endsection
diff --git a/resources/views/user/order/yard_view_form.blade.php b/resources/views/user/order/yard_view_form.blade.php
index f85306f..20524a4 100644
--- a/resources/views/user/order/yard_view_form.blade.php
+++ b/resources/views/user/order/yard_view_form.blade.php
@@ -82,8 +82,6 @@
min-width: 4em;
display: inline-block;
}
- }
- }
| + | {{__('EK-Preis')}} | +{{__('Points')}} | +{{__('Verdienst')}} | +{{__('VK-Preis')}} | +
|---|---|---|---|---|
| + Gastgeber/in {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}} + | ++ {{$user_cart->getFormattedEkPrice()}} € + | ++ {{$user_cart->getFormattedPoints()}} + | ++ {{$user_cart->getFormattedIncomePrice()}} € + | ++ {{$user_cart->getFormattedPrice()}} € + | +
| + {!! $g_count++ !!}. Gast {{$homeparty_guest->billing_firstname}} {{$homeparty_guest->billing_lastname}} + | ++ {{$user_cart->getFormattedEkPrice()}} € + | ++ {{$user_cart->getFormattedPoints()}} + | ++ {{$user_cart->getFormattedIncomePrice()}} € + | ++ {{$user_cart->getFormattedPrice()}} € + | +
| + zzgl. anteiliger Bonusgutschein: + | +{{ App\Services\HomepartyCart::getFormattedBonusPrice() }}€ | +|||
| + Gesamtsummen: + | +{{\App\Services\HomepartyCart::getFormattedEkPrice()}} | +{{\App\Services\HomepartyCart::getFormattedPoints()}} | +{{\App\Services\HomepartyCart::getFormattedIncomePrice()}} € | +{{\App\Services\HomepartyCart::getFormattedPrice()}} € | +
| + Summe ohne MwSt: + | ++ + | + | + | {{\App\Services\HomepartyCart::getFormattedPriceNet()}} € | +
| + Enthaltene MwSt: + | ++ + | + | + | {{\App\Services\HomepartyCart::getFormattedPriceTax()}} € | +
diff --git a/resources/views/web/start.blade.php b/resources/views/web/start.blade.php
index 7f7435e..9a20c4a 100644
--- a/resources/views/web/start.blade.php
+++ b/resources/views/web/start.blade.php
@@ -66,15 +66,23 @@
+
diff --git a/resources/views/web/templates/kontakt.blade.php b/resources/views/web/templates/kontakt.blade.php
index 7937266..7abf000 100644
--- a/resources/views/web/templates/kontakt.blade.php
+++ b/resources/views/web/templates/kontakt.blade.php
@@ -174,9 +174,9 @@
-
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.
+
+ @if($site->hasImage())
+
+ @endif
+
+
+
+ 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.