gitmedia/mivita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Custom Price / Land / User Order Homeparty

Browse source
This commit is contained in:
Kevin Adametz 2021-08-20 18:22:21 +02:00
parent d46824a4ac
commit 51d81d8ec6
55 changed files with 1951 additions and 681 deletions
Download patch file Download diff file Expand all files Collapse all files

28
resources/views/user/homeparty/_edit.blade.php
View file

@ -81,16 +81,10 @@
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('billing_country_id') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Country') }}*</label>
<select class="selectpicker" name="billing_country_id" id="billing_country_id" data-style="btn-light" data-live-search="true" required tabindex="9">
{!! HTMLHelper::getContriesWithMore($homeparty_user->billing_country_id) !!}
</select>
@if ($errors->has('billing_country_id'))
<span class="help-block">
<strong>{{ $errors->first('billing_country_id') }}</strong>
</span>
@endif
<div class="form-group col-md-12">
{{ Form::hidden('billing_country_id', $homeparty_user->billing_country_id) }}
<label class="form-label">{{ __('Country') }}</label>
<div class="">@if($homeparty_user->billing_country) {{ $homeparty_user->billing_country->getLocated() }} @endif <i>(Das Land kann nicht mehr geändert werden.)</i></div>
</div>
</div>
<div class="form-row">
@ -196,16 +190,10 @@
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_country_id') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Country') }}*</label>
<select class="selectpicker" name="shipping_country_id" id="shipping_country_id" data-style="btn-light" data-live-search="true" required tabindex="24">
{!! HTMLHelper::getContriesWithMore($homeparty_user->shipping_country_id) !!}
</select>
@if ($errors->has('shipping_country_id'))
<span class="help-block">
<strong>{{ $errors->first('shipping_country_id') }}</strong>
</span>
@endif
<div class="form-group col-md-12">
{{ Form::hidden('shipping_country_id', $homeparty_user->shipping_country_id) }}
<label class="form-label">{{ __('Country') }}</label>
<div class="">@if($homeparty_user->shipping_country) {{ $homeparty_user->shipping_country->getLocated() }} @endif <i>(Das Land kann nicht mehr geändert werden.)</i></div>
</div>
</div>
<div class="form-row">

485
resources/views/user/homeparty/detail.blade.php
View file

@ -12,116 +12,411 @@
</div>
<a href="{{route('user_homepartys')}}" class="btn btn-sm btn-default float-right">zurück</a>
</h4>
{!! Form::open(['url' => route('user_homeparty_detail', [$homeparty->id]), 'class' => 'form-horizontal', 'id'=>'homeparty-party-form-validation']) !!}
<div class="card mb-4">
<h5 class="card-header">
<div class="row">
@if(!$homeparty->id)
<div class="col-12">
<span class="text-tiny float-right">* {{trans('register.required_fields')}}</span>
Neue Auszeitparty anlegen
</div>
@else
<div class="col-12">
<div class="d-flex justify-content-between align-items-center w-100">
<div>Homeparty verwalten</div>
<div class="float-right">
<a href="{{route('user_homeparty_guests', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-md-person-add"></i> Gäste anlegen</a>
<a href="{{route('user_homeparty_order', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-md-basket"></i> Bestellung</a>
</div>
</div>
</div>
@endif
</div>
</h5>
<div class="card-body">
<div class="form-row">
<div class="form-group col-md-4 {{ $errors->has('name') ? 'has-error' : '' }}">
<label for="name" class="form-label">{{ __('Gastgeber / Veranstalter') }}*</label>
{{ Form::text('name', $homeparty->name, array('placeholder'=>__('Gastgeber / Veranstalter'), 'class'=>'form-control', 'required')) }}
@if ($errors->has('name'))
<span class="help-block">
<strong>{{ $errors->first('name') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-4 {{ $errors->has('date') ? 'has-error' : '' }}">
<label for="date" class="form-label">{{ __('Veranstaltungsdatum') }}*</label>
{{ Form::text('date', $homeparty->date, array('placeholder'=>Util::formatDate(), 'data-date-format'=>Util::formatDate(), 'data-start_view'=>2, 'class'=>'form-control datepicker-base', 'required')) }}
@if ($errors->has('date'))
<span class="help-block">
<strong>{{ $errors->first('date') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-4 {{ $errors->has('place') ? 'has-error' : '' }}">
<label for="place" class="form-label">{{ __('Veranstaltungsort') }}*</label>
{{ Form::text('place', $homeparty->place, array('placeholder'=>__('Veranstaltungsort'), 'class'=>'form-control', 'required')) }}
@if ($errors->has('place'))
<span class="help-block">
<strong>{{ $errors->first('place') }}</strong>
</span>
@endif
</div>
<div class="nav-tabs-top mb-4">
<ul class="nav nav-tabs nav-responsive-xl">
@if(!$step || $step >= 1)
<li class="nav-item">
<a class="nav-link @if(!$step || $step == 10) active @endif" data-toggle="tab" href="#navs-top-homeparty">Auszeitparty</a>
</li>
@endif
@if($homeparty->id)
@if($step && $step >= 2)
<li class="nav-item">
<a class="nav-link @if($step == 2 || $step == 12) active @endif" data-toggle="tab" href="#navs-top-address">Lieferadresse</a>
</li>
@endif
@if($step && $step >= 3)
<li class="nav-item">
<a class="nav-link @if($step == 3 || $step == 13) active @endif" data-toggle="tab" href="#navs-top-host">Gastgeber:in</a>
</li>
@endif
@endif
</ul>
<div class="tab-content">
</div>
<div class="form-group">
<label class="form-label" for="description">{{ __('Beschreibung / Willkommenstext') }}</label>
{{ Form::textarea('description', $homeparty->description , array('placeholder'=>__('Beschreibung'), 'class'=>'form-control', 'rows'=>5)) }}
</div>
</div>
</div>
<div class="text-left mt-3 mb-3">
<button type="submit" class="btn btn-secondary mr-2 mb-2" name="action" value="homeparty-party-store">
@if($homeparty->id) {{ __('Änderungen speichern') }} @else {{ __('speichern') }} @endif</button>&nbsp;
<a href="{{route('user_homepartys')}}" class="btn btn-default mb-2">zurück zur Übersicht</a>
</div>
{!! Form::close() !!}
@if($homeparty->id)
{!! Form::open(['url' => route('user_homeparty_detail', [$homeparty->id]), 'class' => 'form-horizontal', 'id'=>'homeparty-user-form-validation']) !!}
<div class="card mb-4">
<div class="tab-pane fade @if(!$step || $step == 10) active show @endif" id="navs-top-homeparty">
{!! Form::open(['url' => route('user_homeparty_detail', [$homeparty->id, 10]), 'class' => 'form-horizontal', 'id'=>'homeparty-party-form-validation']) !!}
<h5 class="card-header">
<div class="row">
<div class="col-xs-12 col-sm-6">
Gastgeber-, Rechungsadresse
</div>
<div class="col-xs-12 col-sm-6">
@if($homeparty->step < 10)
<div class="col-12">
<span class="text-tiny float-right">* {{trans('register.required_fields')}}</span>
<span class="d-none d-lg-inline">Lieferadresse</span>
Auszeitparty verwalten
</div>
@else
<div class="col-12">
<div class="d-flex justify-content-between align-items-center w-100">
<div>Auszeitparty verwalten</div>
<div class="float-right">
<a href="{{route('user_homeparty_guests', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-md-person-add"></i> Gäste anlegen</a>
<a href="{{route('user_homeparty_order', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-md-basket"></i> Bestellung</a>
</div>
</div>
</div>
@endif
</div>
</h5>
@include('user.homeparty._edit')
</div>
<div class="text-left mt-3">
<button type="submit" class="btn btn-secondary mr-2 mb-2" name="action" value="homeparty-user-store">{{ __('save') }}</button>&nbsp;
<a href="{{route('user_homepartys')}}" class="btn btn-default mb-2">zurück zur Übersicht</a>
</div>
{!! Form::close() !!}
<hr>
<div class="card mb-3 mt-2">
<div class="col-md-12 px-4 pt-4">
<label class="form-label">Einladungslink für Gäste <span class="text-muted"> (lass Deine Gäste ihre Daten selber ausfüllen)</span></label>
<div class="card-body">
<div class="form-row">
<div class="form-group col-md-3 {{ $errors->has('name') ? 'has-error' : '' }}">
<label for="name" class="form-label">{{ __('Gastgeber / Veranstalter') }}*</label>
{{ Form::text('name', $homeparty->name, array('placeholder'=>__('Gastgeber / Veranstalter'), 'class'=>'form-control', 'required')) }}
@if ($errors->has('name'))
<span class="help-block">
<strong>{{ $errors->first('name') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-3 {{ $errors->has('date') ? 'has-error' : '' }}">
<label for="date" class="form-label">{{ __('Veranstaltungsdatum') }}*</label>
{{ Form::text('date', $homeparty->date, array('placeholder'=>Util::formatDate(), 'data-date-format'=>Util::formatDate(), 'data-start_view'=>2, 'class'=>'form-control datepicker-base', 'required')) }}
@if ($errors->has('date'))
<span class="help-block">
<strong>{{ $errors->first('date') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-3 {{ $errors->has('place') ? 'has-error' : '' }}">
<label for="place" class="form-label">{{ __('Veranstaltungsort') }}*</label>
{{ Form::text('place', $homeparty->place, array('placeholder'=>__('Veranstaltungsort'), 'class'=>'form-control', 'required')) }}
@if ($errors->has('place'))
<span class="help-block">
<strong>{{ $errors->first('place') }}</strong>
</span>
@endif
</div>
@if($homeparty->id)
<div class="form-group col-md-3 {{ $errors->has('country_id') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Lieferland') }}*</label>
<div class="mt-2">@if($homeparty->country) {{ $homeparty->country->getLocated() }} @endif</div>
</div>
@else
<div class="form-group col-md-3 {{ $errors->has('country_id') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Lieferland') }}*</label>
{{ Form::select('country_id', \App\Models\ShippingCountry::getActiveShippingCountries(), $homeparty->country_id, array('data-live-search'=>'false', 'class'=>'selectpicker', 'id'=>'country_id') ) }}
@if ($errors->has('country_id'))
<span class="help-block">
<strong>{{ $errors->first('country_id') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-12 text-right">
<i> Das Lieferland kann nach dem Anlegen nicht mehr geändert werden. Alle Lieferadressen müssen in diesem Land sein.</i>
</div>
@endif
</div>
<div class="form-group">
<div class="input-group">
<span class="input-group-prepend">
<button class="btn btn-secondary" type="button" title="Kopiert!" data-clipboard-demo data-clipboard-target="#homeparty_link"><i class="ion ion-ios-copy"></i> Link kopieren</button>
</span>
<input type="text" class="form-control" name="homeparty_link" value="{{ $homeparty->getTokenLink() }}" id="homeparty_link" placeholder="">
<label class="form-label" for="description">{{ __('Beschreibung / Willkommenstext') }}</label>
{{ Form::textarea('description', $homeparty->description , array('placeholder'=>__('Beschreibung'), 'class'=>'form-control', 'rows'=>5)) }}
</div>
<div class="form-group">
<button type="submit" class="btn btn-secondary mr-2 mb-2" name="action" value="homeparty-party-store-detail">
@if($homeparty->id) {{ __('Änderungen speichern') }} @else {{ __('Neue Auszeitparty anlegen') }} @endif</button>&nbsp;
<a href="{{route('user_homepartys')}}" class="btn btn-default mb-2">zurück zur Übersicht</a>
</div>
@if($homeparty->id && $homeparty->step >= 10)
<hr>
<div class="pt-2">
<label class="form-label">Einladungslink für Gäste <span class="text-muted"> (lass Deine Gäste ihre Daten selber ausfüllen)</span></label>
<div class="form-group">
<div class="input-group">
<span class="input-group-prepend">
<button class="btn btn-secondary" type="button" title="Kopiert!" data-clipboard-demo data-clipboard-target="#homeparty_link"><i class="ion ion-ios-copy"></i> Link kopieren</button>
</span>
<input type="text" class="form-control" name="homeparty_link" value="{{ $homeparty->getTokenLink() }}" id="homeparty_link" placeholder="">
</div>
</div>
<p>Teile diesen Link mit den 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.</p>
</div>
@endif
</div>
{!! Form::close() !!}
</div>
@if($homeparty->id)
<div class="tab-pane fade @if($step == 2 || $step == 12) active show @endif" id="navs-top-address">
{!! Form::open(['url' => route('user_homeparty_detail', [$homeparty->id, 12]), 'class' => 'form-horizontal', 'id'=>'']) !!}
<h5 class="card-header">
<div class="row">
@if($homeparty->step < 10)
<div class="col-12">
<span class="text-tiny float-right">* {{trans('register.required_fields')}}</span>
Lieferadresse Auszeitparty {{ $homeparty->name }}
</div>
@else
<div class="col-12">
<div class="d-flex justify-content-between align-items-center w-100">
<div>Lieferadresse Auszeitparty {{ $homeparty->name }}</div>
<div class="float-right">
<a href="{{route('user_homeparty_guests', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-md-person-add"></i> Gäste anlegen</a>
<a href="{{route('user_homeparty_order', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-md-basket"></i> Bestellung</a>
</div>
</div>
</div>
<p>Teile diesen Link mit den 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.</p>
@endif
</div>
</h5>
<div class="card-body">
<p>Trage hier bitte die zentrale Lieferadresse für die getätigten Bestellungen dieser Auszeitparty. Das kann Deine eigene Adresse aber auch die des Gastgebers sein. Je nachdem, wie Du die Verteilung der Produkte mit Deinen Gästen organisieren möchtest.</p>
<p>Wenn ein Gast seine Bestellung direkt an seine persönliche Adresse geschickt haben möchte, kannst Du das im Bestellprozess gesondert angeben.</p>
<hr>
<div class="form-row">
<div class="form-group col-md-12">
<label for="shipping_company" class="form-label">{{ __('Company name') }} (optional)</label>
{{ Form::text('shipping_company', $homeparty_user->shipping_company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'shipping_company',)) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6 {{ $errors->has('shipping_salutation') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Salutation') }}*</label>
<select class="selectpicker" data-style="btn-light" name="shipping_salutation" id="shipping_salutation" required tabindex="17">
{!! HTMLHelper::getSalutation($homeparty_user->shipping_salutation) !!}
</select>
@if ($errors->has('shipping_salutation'))
<span class="help-block">
<strong>{{ $errors->first('shipping_salutation') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6 {{ $errors->has('shipping_firstname') ? 'has-error' : '' }}">
<label class="form-label" for="shipping_firstname">{{ __('First name') }}*</label>
{{ Form::text('shipping_firstname', $homeparty_user->shipping_firstname, array('placeholder'=>__('First name'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_firstname')) }}
@if ($errors->has('shipping_firstname'))
<span class="help-block">
<strong>{{ $errors->first('shipping_firstname') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-6 {{ $errors->has('shipping_lastname') ? 'has-error' : '' }}">
<label class="form-label" for="shipping_lastname">{{ __('Last name') }}*</label>
{{ Form::text('shipping_lastname', $homeparty_user->shipping_lastname, array('placeholder'=>__('Last name'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_lastname')) }}
@if ($errors->has('shipping_lastname'))
<span class="help-block">
<strong>{{ $errors->first('shipping_lastname') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_address') ? 'has-error' : '' }}">
<label class="form-label" for="shipping_address">{{ __('Street') }} / {{ __('House number') }}*</label>
{{ Form::text('shipping_address', $homeparty_user->shipping_address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_address')) }}
@if ($errors->has('shipping_address'))
<span class="help-block">
<strong>{{ $errors->first('shipping_address') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_address_2') ? 'has-error' : '' }}">
<label class="form-label" for="shipping_address_2">{{ __('Wohnung / Gebäude (optional)') }}</label>
{{ Form::text('shipping_address_2', $homeparty_user->shipping_address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'shipping_address_2')) }}
@if ($errors->has('shipping_address_2'))
<span class="help-block">
<strong>{{ $errors->first('shipping_address_2') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6 {{ $errors->has('shipping_zipcode') ? 'has-error' : '' }}">
<label class="form-label" for="shipping_zipcode">{{ __('Postcode') }}*</label>
{{ Form::text('shipping_zipcode', $homeparty_user->shipping_zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_zipcode')) }}
@if ($errors->has('shipping_zipcode'))
<span class="help-block">
<strong>{{ $errors->first('shipping_zipcode') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-6 {{ $errors->has('shipping_city') ? 'has-error' : '' }}">
<label class="form-label" for="shipping_city">{{ __('City') }}*</label>
{{ Form::text('shipping_city', $homeparty_user->shipping_city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true, 'id'=>'shipping_city')) }}
@if ($errors->has('shipping_city'))
<span class="help-block">
<strong>{{ $errors->first('shipping_city') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12">
{{ Form::hidden('shipping_country_id', $homeparty_user->shipping_country_id) }}
<label class="form-label">{{ __('Country') }}</label>
<div class="">@if($homeparty_user->shipping_country) {{ $homeparty_user->shipping_country->getLocated() }} @endif <i>(Das Land kann nicht mehr geändert werden.)</i></div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12">
<label class="form-label" for="shipping_phone">{{ __('Phone') }}</label>
{{ Form::text('shipping_phone', $homeparty_user->shipping_phone, array('placeholder'=>__('Phone'), 'class'=>'form-control', 'id'=>'shipping_phone')) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12">
<label class="form-label" for="shipping_email">{{ __('E-Mail Address') }}</label>
{{ Form::text('shipping_email', $homeparty_user->shipping_email, array('placeholder'=>'E-Mail', 'class'=>'form-control', 'id'=>'shipping_email')) }}
</div>
</div>
<div class="form-group">
<button type="submit" class="btn btn-secondary mr-2 mb-2" name="action" value="homeparty-party-store-address">
Lieferadresse speichern
</button>&nbsp;
<a href="{{route('user_homepartys')}}" class="btn btn-default mb-2">zurück zur Übersicht</a>
</div>
</div>
@endif
{!! Form::close() !!}
</div>
<div class="tab-pane fade @if($step == 3 || $step == 13) active show @endif" id="navs-top-host">
{!! Form::open(['url' => route('user_homeparty_detail', [$homeparty->id, 13]), 'class' => 'form-horizontal', 'id'=>'']) !!}
<h5 class="card-header">
<div class="row">
@if($homeparty->step < 10)
<div class="col-12">
<span class="text-tiny float-right">* {{trans('register.required_fields')}}</span>
Gastgeber:in Auszeitparty {{ $homeparty->name }}
</div>
@else
<div class="col-12">
<div class="d-flex justify-content-between align-items-center w-100">
<div>Gastgeber:in Auszeitparty {{ $homeparty->name }}</div>
<div class="float-right">
<a href="{{route('user_homeparty_guests', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-md-person-add"></i> Gäste anlegen</a>
<a href="{{route('user_homeparty_order', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-md-basket"></i> Bestellung</a>
</div>
</div>
</div>
@endif
</div>
</h5>
<div class="card-body">
<p>Trage hier bitte die Adresse des Gastgeber:in wo die Auszeitparty organisiert wird.</p>
<p>Die Rechnung von mivita wird an deine Adresse (Berater:in) gestellt. Die Abrechnung mit dem Gastgeber:in und den Gästern übernimmst du selbst.</p>
<hr>
<div class="form-row">
<div class="form-group col-md-12">
<label for="billing_company" class="form-label">{{ __('Company name') }} (optional)</label>
{{ Form::text('billing_company', $homeparty_user->billing_company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'billing_company', 'tabindex' => 1)) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6 {{ $errors->has('billing_salutation') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Salutation') }}*</label>
<select class="selectpicker" data-style="btn-light" name="billing_salutation" id="billing_salutation" required tabindex="2">
{!! HTMLHelper::getSalutation($homeparty_user->billing_salutation) !!}
</select>
@if ($errors->has('billing_salutation'))
<span class="help-block">
<strong>{{ $errors->first('billing_salutation') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6 {{ $errors->has('billing_firstname') ? 'has-error' : '' }}">
<label class="form-label" for="billing_firstname">{{ __('First name') }}*</label>
{{ Form::text('billing_firstname', $homeparty_user->billing_firstname, array('placeholder'=>__('First name'), 'class'=>'form-control', 'id'=>'billing_firstname', 'required'=>true, 'tabindex' => 4)) }}
@if ($errors->has('billing_firstname'))
<span class="help-block">
<strong>{{ $errors->first('billing_firstname') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-6 {{ $errors->has('billing_lastname') ? 'has-error' : '' }}">
<label class="form-label" for="billing_lastname">{{ __('Last name') }}*</label>
{{ Form::text('billing_lastname', $homeparty_user->billing_lastname, array('placeholder'=>__('Last name'), 'class'=>'form-control', 'id'=>'billing_lastname', 'required'=>true, 'tabindex' => 5)) }}
@if ($errors->has('billing_lastname'))
<span class="help-block">
<strong>{{ $errors->first('billing_lastname') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('billing_address') ? 'has-error' : '' }}">
<label class="form-label" for="billing_address">{{ __('Street') }} / {{ __('House number') }}*</label>
{{ Form::text('billing_address', $homeparty_user->billing_address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true, 'id'=>'billing_address', 'tabindex' => 6)) }}
@if ($errors->has('billing_address'))
<span class="help-block">
<strong>{{ $errors->first('billing_address') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('billing_address_2') ? 'has-error' : '' }}">
<label class="form-label" for="billing_address_2">{{ __('Wohnung / Gebäude (optional)') }}</label>
{{ Form::text('billing_address_2', $homeparty_user->billing_address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'billing_address_2', 'tabindex' => 6)) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6 {{ $errors->has('billing_zipcode') ? 'has-error' : '' }}">
<label class="form-label" for="billing_zipcode">{{ __('Postcode') }}*</label>
{{ Form::text('billing_zipcode', $homeparty_user->billing_zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true, 'id'=>'billing_zipcode', 'tabindex' => 7)) }}
@if ($errors->has('billing_zipcode'))
<span class="help-block">
<strong>{{ $errors->first('billing_zipcode') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-6 {{ $errors->has('billing_city') ? 'has-error' : '' }}">
<label class="form-label" for="billing_city">{{ __('City') }}*</label>
{{ Form::text('billing_city', $homeparty_user->billing_city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true, 'id'=>'billing_city', 'tabindex' => 8)) }}
@if ($errors->has('billing_city'))
<span class="help-block">
<strong>{{ $errors->first('billing_city') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12">
{{ Form::hidden('billing_country_id', $homeparty_user->billing_country_id) }}
<label class="form-label">{{ __('Country') }}</label>
<div class="">@if($homeparty_user->billing_country) {{ $homeparty_user->billing_country->getLocated() }} @endif <i>(Das Land kann nicht mehr geändert werden.)</i></div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('billing_phone') ? 'has-error' : '' }}">
<label class="form-label" for="billing_phone">{{ __('Phone') }}</label>
{{ Form::text('billing_phone', $homeparty_user->billing_phone, array('placeholder'=>__('Phone'), 'class'=>'form-control', 'id'=>'billing_phone', 'tabindex' => 11)) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12">
<label class="form-label" for="billing_email">{{ __('E-Mail Address') }}</label>
{{ Form::text('billing_email', $homeparty_user->billing_email, array('placeholder'=>'E-Mail', 'class'=>'form-control', 'id'=>'billing_email', 'tabindex' => 12)) }}
</div>
</div>
<div class="form-group">
<button type="submit" class="btn btn-secondary mr-2 mb-2" name="action" value="homeparty-party-store-host">
Gastgeber:in Adresse speichern
</button>&nbsp;
<a href="{{route('user_homepartys')}}" class="btn btn-default mb-2">zurück zur Übersicht</a>
</div>
</div>
{!! Form::close() !!}
</div>
</div>
</div>
@endif
<script type="application/javascript">
$( document ).ready(function() {

26
resources/views/user/homeparty/guests.blade.php
View file

@ -19,22 +19,28 @@
@if(!$homeparty->completed)
<div>
<a href="{{route('user_homeparty_guest_detail', [$homeparty->id, $homeparty_user->id])}}" class="text-body text-big font-weight-semibold">
@if($homeparty_user->is_host)
<span class="text-muted">Gastgeber/in: </span>
<a href="{{route('user_homeparty_detail', [$homeparty->id, 13])}}" class="text-body text-big font-weight-semibold">
<span class="text-muted">Gastgeber:in </span>
@else
<span class="text-muted">Gast {{$g_count++}}: </span>
<a href="{{route('user_homeparty_guest_detail', [$homeparty->id, $homeparty_user->id])}}" class="text-body text-big font-weight-semibold">
<span class="text-muted">Gast {{$g_count++}} </span>
@endif
{{$homeparty_user->billing_firstname}} {{$homeparty_user->billing_lastname}}
</a>
{{$homeparty_user->billing_firstname}} {{$homeparty_user->billing_lastname}}</a>
{{-- <span class="badge badge-success align-text-bottom ml-1">offen ...</span> --}}
</div>
<div>
<a href="{{route('user_homeparty_guest_detail', [$homeparty->id, $homeparty_user->id])}}" class="btn btn-sm btn-secondary mr-2"><i class="fa fa-edit"></i> bearbeiten</a>
@if($homeparty_user->is_host)
<a href="{{route('user_homeparty_detail', [$homeparty->id, 13])}}" class="btn btn-sm btn-secondary mr-2"><i class="fa fa-edit"></i> bearbeiten</a>
@else
<a href="{{route('user_homeparty_guest_detail', [$homeparty->id, $homeparty_user->id])}}" class="text-body text-big font-weight-semibold">
@endif
<div class="btn-group project-actions">
@if($homeparty_user->is_host)
<span class="ion ion-md-trash text-muted" data-toggle="tooltip" title="Gastgeber kann nicht gelsöcht werden"></span>
<span class="ion ion-md-trash text-muted" data-toggle="tooltip" title="Gastgeber:in kann nicht gelsöcht werden"></span>
@else
<a href="{{ route('user_homeparty_delete', ['hpu', $homeparty->id, $homeparty_user->id]) }}"
class="" onclick="return confirm('Homeparty Gast wirklich löschen?');">
@ -48,9 +54,9 @@
<div class="text-body text-big font-weight-semibold">
@if($homeparty_user->is_host)
<span class="text-muted">Gastgeber/in: </span>
<span class="text-muted">Gastgeber:in </span>
@else
<span class="text-muted">Gast {{$g_count++}}: </span>
<span class="text-muted">Gast {{$g_count++}} </span>
@endif
{{$homeparty_user->billing_firstname}} {{$homeparty_user->billing_lastname}}
</div>

9
resources/views/user/homeparty/index.blade.php
View file

@ -41,7 +41,7 @@
</div>
<div class="col">
<div class="text-muted small">Veranstaltungsort</div>
<div class="font-weight-bold">{{$homeparty->place}}</div>
<div class="font-weight-bold">{{$homeparty->place}} / @if($homeparty->country) {{ $homeparty->country->getLocated() }} @endif</div>
</div>
<div class="col">
<div class="text-muted small">Gäste</div>
@ -57,7 +57,7 @@
</div>
</div>
</div>
@if(!$homeparty->completed)
@if(!$homeparty->completed && $homeparty->step >= 10)
<hr class="m-0">
<div class="card-body py-3">
<div class="form-group mb-0">
@ -75,10 +75,15 @@
<div class="card-body py-3">
<div class="d-flex flex-wrap">
@if(!$homeparty->completed)
<a href="{{route('user_homeparty_detail', [$homeparty->id])}}" class="btn btn-secondary mr-2 mb-2"><i class="ion ion-ios-cog"></i> Verwalten</a>
@if($homeparty->step < 10)
<div class="alert alert-danger py-1">Lieferadresse und Gastgeber:in sind noch nicht angelegt. <a href="{{route('user_homeparty_detail', [$homeparty->id])}}"><i class="ion ion-ios-cog"></i> Verwalten</a> Danach können Gäste angelegt und Bestellung aufgegeben werden.</div>
@else
<a href="{{route('user_homeparty_guests', [$homeparty->id])}}" class="btn btn-secondary mr-2 mb-2"><i class="ion ion-md-contacts"></i> Gästeliste</a>
<a href="{{ route('user_homeparty_guest_detail', [$homeparty->id, 'new']) }}" class="btn btn-secondary mr-2 mb-2"><i class="ion ion-md-person-add"></i> Gast anlegen</a>
<a href="{{route('user_homeparty_order', [$homeparty->id])}}" class="btn btn-secondary mr-2 mb-2"><i class="ion ion-md-basket"></i> Bestellung</a>
@endif
@else
<a href="{{route('user_homeparty_guests', [$homeparty->id])}}" class="btn btn-secondary mr-2 mb-2"><i class="ion ion-md-contacts"></i> Gästeliste</a>
<a href="{{route('user_homeparty_order', [$homeparty->id])}}" class="btn btn-secondary mr-2 mb-2"><i class="ion ion-md-basket"></i> Bestellung ansehen</a>

15
resources/views/user/homeparty/modal_show_products.blade.php
View file

@ -11,7 +11,7 @@
</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<div class="modal-body">
<div class="modal-body px-0">
<div class="card-datatable pt-0 table-responsive">
<table id="datatable-homeparty" class="table table-striped table-bordered" data-homeparty-id="{{$homeparty->id}}" data-homeparty-user-id="{{$homeparty_user->id}}">
<thead>
@ -19,9 +19,14 @@
<th></th>
<th>{{__('Bild')}}</th>
<th>{{__('Produkt')}}</th>
<th>{{__('Artikelnummer')}}</th>
<th>{{__('EK-Preis brutto')}}</th>
<th>{{__('VK-Preis brutto')}}</th>
<th>{{__('Artikelnr.')}}</th>
@if($homeparty->getCardInfo('user_tax_free'))
<th><span class="no-line-break">EK-Preis</span> netto</th>
<th><span class="no-line-break">VK-Preis</span> netto</th>
@else
<th><span class="no-line-break">EK-Preis</span> brutto</th>
<th><span class="no-line-break">VK-Preis</span> brutto</th>
@endif
<th>{{__('Points')}}</th>
</tr>
</thead>
@ -37,7 +42,7 @@
var oTable = $('#datatable-homeparty').DataTable({
"processing": true,
"serverSide": true,
"ajax": '{!! route('user_homeparty_datatable') !!}',
"ajax": '{!! route('user_homeparty_datatable', [$homeparty->id]) !!}',
"order": [[3, "asc" ]],
"columns": [

40
resources/views/user/homeparty/order.blade.php
View file

@ -84,12 +84,43 @@
<a href="{{route('user_homepartys')}}" class="btn btn-sm btn-default float-right">zurück</a>
</h4>
@if(Session::has('custom-error'))
<div class="alert alert-dark-warning alert-dismissible fade show">
<button type="button" class="close" data-dismiss="alert">×</button>
<strong>{{ Session::get('custom-error') }}</strong>
</div>
@endif
@if($userHistoryPaymentOrder && $userHistoryPaymentOrder->status > 2)
<h6 class="alert badge-{{$userHistoryPaymentOrder->getStatusColor()}}">Eine Zahlung wurde ausgeführt. Status: {{ trans('payment.status.'.$userHistoryPaymentOrder->getStatusType())}}</h6>
@endif
<div class="card mb-4">
<div class="card-body">
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Bestellland</div>
{{ App\Services\UserService::getOrderInfo('billing_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Lieferland</div>
{{ App\Services\UserService::getOrderInfo('shipping_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">MwSt</div>
{{ App\Services\UserService::getOrderInfo('tax_free') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Reverse Charge Verfahren</div>
{{ App\Services\UserService::getOrderInfo('user_reverse_charge') }}
</div>
</div>
<i>Das Lieferland kann nicht mehr geändert werden.</i>
</div>
</div>
{!! Form::open(['url' => route('user_homeparty_order', [$homeparty->id]), 'class' => 'form-horizontal', 'id'=>'homeparty-order-form']) !!}
<div class="card mb-4">
<h5 class="card-header">
<div class="row">
@ -109,9 +140,9 @@
<div class="card-body">
<div class="row">
<div class="col-md-6">
<h6>Lieferadresse Gastgeber/in
<h6>Lieferadresse
@if(!$homeparty->completed)
<a href="{{route('user_homeparty_guest_detail', [$homeparty->id, $homeparty->homeparty_host->id])}}"><i class="fa fa-edit"></i> </a>
<a href="{{route('user_homeparty_detail', [$homeparty->id, 13])}}"><i class="fa fa-edit"></i> </a>
@endif
</h6>
@include('user.homeparty._address', ['homeparty_user' => $homeparty->homeparty_host])
@ -120,7 +151,6 @@
{{-- TODO Berechnung Bonus --}}
<div class="col-md-6">
<h6>Aktuelle Bonusansicht</h6>
<div id="insert_show_bonus">
@include('user.homeparty.show_bonus', ['homeparty' => $homeparty])
</div>
@ -135,7 +165,7 @@
<div class="row">
<div class="col-12">
<div class="d-flex justify-content-between align-items-center w-100">
<div>Bestellung Gastgeber/in {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}}</div>
<div>Bestellung Gastgeber:in {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}}</div>
</div>
</div>
@if(!$homeparty->completed)

2
resources/views/user/homeparty/self_guest_detail.blade.php
View file

@ -94,7 +94,7 @@
</div>
<div class="col">
<div class="text-muted small">Veranstaltungsort</div>
<div class="font-weight-bold">{{$homeparty->place}}</div>
<div class="font-weight-bold">{{$homeparty->place}} / @if($homeparty->country) {{ $homeparty->country->getLocated() }} @endif</div>
</div>
<div class="col">
<div class="text-muted small">Straße / Hausnummer</div>

69
resources/views/user/homeparty/show_calc_bonus_host.blade.php
View file

@ -1,19 +1,41 @@
@php($user_cart = \App\Services\HomepartyCart::getUserCartHost())
@php($homeparty = \App\Services\HomepartyCart::$homeparty)
@if(\App\Services\HomepartyCart::$is_bonus)
<tr class="foot-small">
<td colspan="5" class="text-left">Gutschrift Homeparty Gutschein</td>
<td>&nbsp;</td>
<td class="text-right">- {{ \App\Services\HomepartyCart::getFormattedBonusValue() }} &euro;</td>
<td class="text-right">- {{ \App\Services\HomepartyCart::getFormattedBonusValue() }} &euro;</td>
<td class="text-right">
<div class="no-line-break">- {{ \App\Services\HomepartyCart::getFormattedBonusValue() }} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ \App\Services\HomepartyCart::getCurrencyByKey('BonusValue') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="text-right">
<div class="no-line-break">- {{ \App\Services\HomepartyCart::getFormattedBonusValue() }} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ \App\Services\HomepartyCart::getCurrencyByKey('BonusValue') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@endif
@if(\App\Services\HomepartyCart::$is_bonus_coupon)
<tr class="foot-small">
<td colspan="5" class="text-left">Gutschrift Bonus</td>
<td>&nbsp;</td>
<td class="text-right">- {{ \App\Services\HomepartyCart::getFormattedBonusCoupon() }} &euro;</td>
<td class="text-right">- {{ \App\Services\HomepartyCart::getFormattedBonusCoupon() }} &euro;</td>
<td class="text-right">
<div class="no-line-break">- {{ \App\Services\HomepartyCart::getFormattedBonusCoupon() }} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ \App\Services\HomepartyCart::getCurrencyByKey('BonusCoupon') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="text-right">
<div class="no-line-break">- {{ \App\Services\HomepartyCart::getFormattedBonusCoupon() }} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ \App\Services\HomepartyCart::getCurrencyByKey('BonusCoupon') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@endif
@if(\App\Services\HomepartyCart::$is_bonus)
@ -26,16 +48,37 @@
</tr>
@endif
<tr class="foot-small">
<td colspan="5" class="text-left">Versandkosten:</td>
<td>&nbsp;</td>
<td class="text-right">&nbsp;</td>
<td class="text-right">{{$user_cart->getFormattedShippingPrice()}} &euro;</td>
<td colspan="5" class="text-left bg-warning">Versandkosten:</td>
<td class="bg-warning">&nbsp;</td>
<td class="text-right bg-warning">&nbsp;</td>
<td class="text-right bg-warning">
<div class="no-line-break">{{$user_cart->getFormattedShippingPrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('ShippingPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
<tr>
<td colspan="4" class="border-top"><strong>Gesamt:</strong></td>
<td class="border-top text-right"><strong>{{$user_cart->getFormattedPoints()}}</strong></td>
<td class="border-top text-right"><strong>{{$user_cart->getFormattedIncomePrice()}} &euro;</strong></td>
<td class="border-top text-right"><strong>{{$user_cart->getFormattedPrice()}} &euro;</strong></td>
<td class="border-top text-right"><strong>{{$user_cart->getFormattedEkPrice()}} &euro;</strong></td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{$user_cart->getFormattedPoints()}}</strong></div>
</td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{$user_cart->getFormattedIncomePrice()}} &euro;</strong></div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('IncomePrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{$user_cart->getFormattedPrice()}} &euro;</strong></div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('Price') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{$user_cart->getFormattedEkPrice()}} &euro;</strong></div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('EkPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>

64
resources/views/user/homeparty/show_products_order.blade.php
View file

@ -56,17 +56,26 @@
</td>
<td class="text-right">
{{ $value->getFormattedTotalPoints() }}
<div class="no-line-break">{{ $value->getFormattedTotalPoints() }}</div>
</td>
<td class="text-right">
{{ $value->getFormattedTotalIncomePrice() }} &euro;
<div class="no-line-break">{{ $value->getFormattedTotalIncomePrice() }} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $value->getCurrencyByKey('TotalIncomePrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="text-right">
{{ $value->getFormattedTotalPrice() }} &euro;
<div class="no-line-break">{{ $value->getFormattedTotalPrice() }} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $value->getCurrencyByKey('TotalPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="text-right">
{{ $value->getFormattedTotalEKPrice() }} &euro;
</td>
<div class="no-line-break">{{ $value->getFormattedTotalEKPrice() }} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $value->getCurrencyByKey('TotalEKPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@endforeach
@ -98,20 +107,45 @@
</tr>
@if($homeparty_guest->getDelivery() === 'direct')
<tr>
<td colspan="5" class="text-left">Versandkosten</td>
<td>&nbsp;</td>
<td class="text-right">{{$user_cart->getFormattedShippingPrice()}} &euro;</td>
<td class="text-right">{{$user_cart->getFormattedShippingPrice()}} &euro;</td>
<td colspan="5" class="text-left bg-warning">Versandkosten</td>
<td class="bg-warning">&nbsp;</td>
<td class="text-right bg-warning">
<div class="no-line-break">{{$user_cart->getFormattedShippingPrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('ShippingPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="text-right bg-warning">
<div class="no-line-break">{{$user_cart->getFormattedShippingPrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('ShippingPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@endif
<tr>
<td colspan="4" class="border-top"><strong>Gesamt:</strong></td>
<td class="border-top text-right"><strong>{{$user_cart->getFormattedPoints()}}</strong></td>
<td class="border-top text-right"><strong>{{$user_cart->getFormattedIncomePrice()}} &euro;</strong></td>
<td class="border-top text-right"><strong>{{$user_cart->getFormattedPrice()}} &euro;</strong></td>
<td class="border-top text-right"><strong>{{$user_cart->getFormattedEkPrice()}} &euro;</strong></td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{$user_cart->getFormattedPoints()}}</strong></div>
</td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{$user_cart->getFormattedIncomePrice()}} &euro;</strong></div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('IncomePrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{$user_cart->getFormattedPrice()}} &euro;</strong></div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('Price') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{$user_cart->getFormattedEkPrice()}} &euro;</strong></div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('EkPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@else

106
resources/views/user/homeparty/show_total_order.blade.php
View file

@ -20,13 +20,31 @@
{{$user_cart->getFormattedPoints()}}
</td>
<td class="text-right">
{{$user_cart->getFormattedIncomePrice()}} &euro;
<div class="no-line-break">{{$user_cart->getFormattedIncomePrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('IncomePrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="text-right">
{{$user_cart->getFormattedPrice()}} &euro;
<div class="no-line-break">{{$user_cart->getFormattedPrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('Price') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="text-right">
{{$user_cart->getFormattedEkPrice()}} &euro;
<div class="no-line-break">{{$user_cart->getFormattedEkPrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('EkPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
<tr>
<td class="text-left bg-warning" colspan="4">Enthaltende Versandkosten:</td>
<td class="text-right bg-warning">
<div class="no-line-break">{{$user_cart->getFormattedShippingPrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('ShippingPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@endif
@ -35,7 +53,6 @@
@php($g_count = 1)
@foreach($homeparty->homeparty_guests as $homeparty_guest)
@php($user_cart = \App\Services\HomepartyCart::getUserCart($homeparty_guest->id))
<tr>
<td>
<strong> {!! $g_count++ !!}. Gast {{$homeparty_guest->billing_firstname}} {{$homeparty_guest->billing_lastname}}</strong>
@ -44,13 +61,22 @@
{{$user_cart->getFormattedPoints()}}
</td>
<td class="text-right">
{{$user_cart->getFormattedIncomePrice()}} &euro;
<div class="no-line-break">{{$user_cart->getFormattedIncomePrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('IncomePrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="text-right">
{{$user_cart->getFormattedPrice()}} &euro;
<div class="no-line-break">{{$user_cart->getFormattedPrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('Price') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="text-right">
{{$user_cart->getFormattedEkPrice()}} &euro;
<div class="no-line-break">{{$user_cart->getFormattedEkPrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('EkPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@endforeach
@ -72,11 +98,40 @@
<td colspan="1" class="border-top">
<strong>Gesamtsummen:</strong>
</td>
<td class="border-top text-right"><strong>{{\App\Services\HomepartyCart::getFormattedPoints()}}</strong></td>
<td class="border-top text-right"><strong>{{\App\Services\HomepartyCart::getFormattedIncomePrice()}} &euro;</strong></td>
<td class="border-top text-right"><strong>{{\App\Services\HomepartyCart::getFormattedPrice()}} &euro;</strong></td>
<td class="border-top text-right"><strong>{{\App\Services\HomepartyCart::getFormattedEkPrice()}} &euro;</strong></td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{\App\Services\HomepartyCart::getFormattedPointsTotal()}}</strong></div>
</td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{\App\Services\HomepartyCart::getFormattedIncomePrice()}} &euro;</strong></div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ \App\Services\HomepartyCart::getCurrencyByKey('IncomePrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{\App\Services\HomepartyCart::getFormattedPrice()}} &euro;</strong></div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ \App\Services\HomepartyCart::getCurrencyByKey('Price') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{\App\Services\HomepartyCart::getFormattedEkPrice()}} &euro;</strong></div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ \App\Services\HomepartyCart::getCurrencyByKey('EkPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@if($homeparty->getCardInfo('user_tax_free'))
<tr class="foot-small">
<td colspan="1" class="text-muted">
Enthaltene MwSt:
</td>
<td class="">&nbsp;</td>
<td class="">&nbsp;</td>
<td class="text-muted text-right">0 &euro;</td>
<td class="text-muted text-right">0 &euro;</td>
</tr>
@else
<tr class="foot-small">
<td colspan="1" class="text-muted">
Summe ohne MwSt:
@ -84,8 +139,18 @@
<td class="">&nbsp;</td>
<td class="">&nbsp;</td>
<td class="text-muted text-right">{{\App\Services\HomepartyCart::getFormattedPriceNet()}} &euro;</td>
<td class="text-muted text-right">{{\App\Services\HomepartyCart::getFormattedEkPriceNet()}} &euro;</td>
<td class="text-muted text-right">
<div class="no-line-break">{{\App\Services\HomepartyCart::getFormattedPriceNet()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ \App\Services\HomepartyCart::getCurrencyByKey('PriceNet') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="text-muted text-right">
<div class="no-line-break">{{\App\Services\HomepartyCart::getFormattedEkPriceNet()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ \App\Services\HomepartyCart::getCurrencyByKey('EkPriceNet') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
<tr class="foot-small">
<td colspan="1" class="text-muted">
@ -94,9 +159,20 @@
<td class="">&nbsp;</td>
<td class="">&nbsp;</td>
<td class="text-muted text-right">{{\App\Services\HomepartyCart::getFormattedPriceTax()}} &euro;</td>
<td class="text-muted text-right">{{\App\Services\HomepartyCart::getFormattedEkPriceTax()}} &euro;</td>
<td class="text-muted text-right">
<div class="no-line-break">{{\App\Services\HomepartyCart::getFormattedPriceTax()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ \App\Services\HomepartyCart::getCurrencyByKey('PriceTax') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="text-muted text-right">
<div class="no-line-break">{{\App\Services\HomepartyCart::getFormattedEkPriceTax()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ \App\Services\HomepartyCart::getCurrencyByKey('EkPriceTax') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@endif
</tfoot>
</table>
</div>

14
resources/views/user/order/delivery.blade.php
View file

@ -33,7 +33,12 @@
</label>
</div>
<hr>
@if(Session::has('custom-error'))
<div class="alert alert-dark-warning alert-dismissible fade show">
<button type="button" class="close" data-dismiss="alert">×</button>
<strong>{{ Session::get('custom-error') }}</strong>
</div>
@endif
<div id="show-is-for-customer" @if(!$shopping_user) style="display: none" @endif >
<div class="form-row">
<div class="form-group col-sm-6">
@ -49,13 +54,8 @@
</div>
</div>
<hr>
@if($shopping_user)
@if(Session::has('custom-error'))
<div class="alert alert-dark-warning alert-dismissible fade show">
<button type="button" class="close" data-dismiss="alert">×</button>
<strong>{{ Session::get('custom-error') }}</strong>
</div>
@endif
<div class="show-is-for-customer">
<h4>An diesen Kunde versenden</h4>
<p>Sollten unten stehende Angaben nicht korrekt sein oder aktualisiert werden müssen, ändere diese bitte vorerst unter:

81
resources/views/user/order/list.blade.php
View file

@ -48,12 +48,6 @@
</style>
@if($user->user_level)
<p>Die Produktpreise werden entsprechend Deinem Karriere-Level <strong>{{$user->user_level->name}}</strong> abzüglich <strong>{{$user->user_level->getFormattedMargin()}} %</strong> Marge angezeigt. Hinweis: Wenn Du den Warenkorb verlässt, gehen alle Einstellungen verloren.</p>
@else
<p>Hinweis: Dir wurde noch kein Karriere-Level zugewisen. Bitte wende dich an info@mivita.care</p>
@endif
@if($errors->has('switchers-comp-product'))
<div class="row">
<div class="col-sm-12">
@ -67,6 +61,61 @@
</div>
</div>
@endif
<input type="hidden" name="shipping_is_for" value="{{$for}}">
<div class="card mt-2 mb-2">
<div class="card-body">
@if($for === 'ot')
<h4>Lieferung an den Kunden</h4>
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Bestellland</div>
{{ App\Services\UserService::getOrderInfo('billing_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Lieferland</div>
{{ App\Services\UserService::getOrderInfo('shipping_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">MwSt</div>
{{ App\Services\UserService::getOrderInfo('tax_free') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Reverse Charge Verfahren</div>
{{ App\Services\UserService::getOrderInfo('user_reverse_charge') }}
</div>
</div>
<p>Das Lieferland kann nur beim Kunden unter <a href="{{ route('user_customers') }}">Meine Kunden</a> geändert werden.</i>
@endif
@if($for === 'me')
<h4>Lieferung an mich</h4>
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Bestellland</div>
{{ App\Services\UserService::getOrderInfo('billing_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Lieferland</div>
{{ App\Services\UserService::getOrderInfo('shipping_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">MwSt</div>
{{ App\Services\UserService::getOrderInfo('tax_free') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Reverse Charge Verfahren</div>
{{ App\Services\UserService::getOrderInfo('user_reverse_charge') }}
</div>
</div>
<i>Das Lieferland kann nur unter <a href="{{ route('user_edit') }}">Meine Daten</a> geändert werden.</i>
@endif
@if($user->user_level)
<p>Die Produktpreise werden entsprechend Deinem Karriere-Level <strong>{{$user->user_level->name}}</strong> abzüglich <strong>{{$user->user_level->getFormattedMargin()}} %</strong> Marge angezeigt.<br>Hinweis: Wenn Du den die Seite verlässt, wird der Warenkorb zurückgesetzt.</p>
@else
<p>Hinweis: Dir wurde noch kein Karriere-Level zugewisen. Bitte wende dich an info@mivita.care</p>
@endif
</div>
</div>
<div class="card">
@ -93,20 +142,12 @@
{!! Form::open(['url' => route('user_order_my_payment', [$for, $delivery_id]), 'class' => 'form-horizontal']) !!}
<input type="hidden" name="shipping_is_for" value="{{$for}}">
<div class="card mt-4">
<div class="card-body">
@if($for === 'ot')
<h4>Lieferland des Kunden</h4>
@include('user.order.shipping_ot')
@endif
@if($for === 'me')
<h4>Mein Lieferland</h4>
@include('user.order.shipping_me')
<i>Kann bei der Zahlung/Checkout nicht mehr geändert werden.</i>
@endif
</div>
</div>
@if($for === 'ot')
@include('user.order.shipping_ot')
@endif
@if($for === 'me')
@include('user.order.shipping_me')
@endif
@if($for === 'me')
<div id="holder_html_view_comp_product">

23
resources/views/user/order/shipping_me.blade.php
View file

@ -12,11 +12,13 @@
{{ Form::hidden('shipping_zipcode', $user->account->zipcode) }}
{{ Form::hidden('shipping_city', $user->account->city) }}
{{ Form::hidden('shipping_phone', $user->account->phone) }}
{{ Form::hidden('shipping_state', Yard::instance('shopping')->getShippingCountryId()) }}
<div class="">
{{-- <div class="">
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_state') ? 'has-error' : '' }}">
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="me">
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="me" disabled="true">
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!}
</select>
@if ($errors->has('shipping_state'))
@ -26,7 +28,7 @@
@endif
</div>
</div>
</div>
</div>--}}
<!-- / Billing -->
@else
{{ Form::hidden('shipping_company', $user->account->shipping_company) }}
@ -38,11 +40,13 @@
{{ Form::hidden('shipping_zipcode', $user->account->shipping_zipcode) }}
{{ Form::hidden('shipping_city', $user->account->shipping_city) }}
{{ Form::hidden('shipping_phone', $user->account->shipping_phone) }}
{{ Form::hidden('shipping_state', Yard::instance('shopping')->getShippingCountryId()) }}
<div class="">
{{-- <div class="">
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_state') ? 'has-error' : '' }}">
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="me">
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="me" disabled="true">
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!}
</select>
@if ($errors->has('shipping_state'))
@ -52,14 +56,7 @@
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12">
<label class="form-label" for="shipping_phone">{{ __('Phone') }}</label>
{{ Form::text('shipping_phone', $user->account->shipping_phone, array('placeholder'=>__('Phone'), 'class'=>'form-control')) }}
</div>
</div>
</div>
</div>--}}
@endif
@else
<h4>Fehler: Keine Adressdaten gefunden!</h4>

15
resources/views/user/order/shipping_ot.blade.php
View file

@ -11,12 +11,14 @@
{{ Form::hidden('shipping_zipcode', $shopping_user->billing_zipcode) }}
{{ Form::hidden('shipping_city', $shopping_user->billing_city) }}
{{ Form::hidden('shipping_phone', $shopping_user->billing_phone) }}
{{ Form::hidden('shipping_state', Yard::instance('shopping')->getShippingCountryId()) }}
<div class="">
{{-- <div class="">
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_state') ? 'has-error' : '' }}">
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="ot">
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="ot" disabled="true">
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!}
</select>
@if ($errors->has('shipping_state'))
@ -26,7 +28,7 @@
@endif
</div>
</div>
</div>
</div>--}}
<!-- / Billing -->
@else
@ -39,10 +41,11 @@
{{ Form::hidden('shipping_zipcode', $shopping_user->shipping_zipcode) }}
{{ Form::hidden('shipping_city', $shopping_user->shipping_city) }}
{{ Form::hidden('shipping_phone', $shopping_user->shipping_phone) }}
<div class="">
{{ Form::hidden('shipping_state', Yard::instance('shopping')->getShippingCountryId()) }}
{{-- <div class="">
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_state') ? 'has-error' : '' }}">
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="ot">
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="ot" disabled="true">
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!}
</select>
@if ($errors->has('shipping_state'))
@ -52,5 +55,5 @@
@endif
</div>
</div>
</div>
</div>--}}
@endif

55
resources/views/user/order/yard_view_form.blade.php
View file

@ -82,6 +82,10 @@
min-width: 4em;
display: inline-block;
}
.xsmall {
font-size: 85%;
font-weight: 400;
}
</style>
<div id="cartContent">
@ -143,6 +147,9 @@
<div class="col-6 col-sm-3 col-md-2 text-left font-semi-bold price-single">
<div class="no-line-break">{{ Yard::instance('shopping')->rowPriceNet($row, 3) }} &euro;</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="xsmall">~{{ Yard::instance('shopping')->getCurrencyByKey('rowPriceNetCurrency', $row, 3) }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</div>
<div class="col-6 col-sm-3 col-md-3 quantity">
@ -155,6 +162,10 @@
</div>
<div class="price-total text-right">
<div class="no-line-break">{{ Yard::instance('shopping')->rowSubtotalNet($row) }} &euro;</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('rowSubtotalCurrency', $row, 3) }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</div>
</div>
@ -179,7 +190,12 @@
<tbody>
<tr>
<td class="text-left" style="border-top:none;">Zwischensumme:</td>
<td style="border-top:none;">{{ Yard::instance('shopping')->subtotal() }} €</td>
<td style="border-top:none;">
<div class="no-line-break">{{ Yard::instance('shopping')->subtotal() }} €</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('subtotal') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
<tr>
<td class="text-left">Lieferland:</td>
@ -188,23 +204,52 @@
<tr>
<td class="text-left">Versandkosten:</td>
<td>
{{ Yard::instance('shopping')->shippingNet() }} €
<div class="no-line-break">{{ Yard::instance('shopping')->shippingNet() }} €</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('shippingNet') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
<tr>
<td class="text-left">Summe ohne MwSt:</td>
<td>
{{ Yard::instance('shopping')->subtotalWithShipping() }} €
<div class="no-line-break"> {{ Yard::instance('shopping')->subtotalWithShipping() }} €</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('subtotalWithShipping') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
<tr>
<td class="text-left">zzgl. MwSt:</td>
<td>{{ Yard::instance('shopping')->taxWithShipping() }} €</td>
<td>
<div class="no-line-break">{{ Yard::instance('shopping')->taxWithShipping() }} €</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('taxWithShipping') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@if(Yard::instance('shopping')->getUserTaxFree())
<tr>
<td class="text-left"><strong>Gesamtsumme Netto:</strong></td>
<td>
<strong><div class="no-line-break">{{ Yard::instance('shopping')->totalWithShipping() }} €</div></strong>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('totalWithShipping') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@else
<tr>
<td class="text-left"><strong>Gesamtsumme Brutto:</strong></td>
<td><strong>{{ Yard::instance('shopping')->totalWithShipping() }} €</strong></td>
<td>
<strong><div class="no-line-break">{{ Yard::instance('shopping')->totalWithShipping() }} €</div></strong>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('totalWithShipping') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@endif
</tbody>
</table>