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

Homparty v1.0

Browse source
This commit is contained in:
Kevin Adametz 2020-12-17 23:02:22 +01:00
parent ac0d5b781e
commit c73299e52e
40 changed files with 1234 additions and 908 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,9 @@
@section('content')
<h4 class="font-weight-bold py-2 mb-2 d-flex justify-content-between align-items-center w-100 ">
<div>{{ __('navigation.my_homeparty') }} / {{ $homeparty->name }} - {{ $homeparty->date }}</div>
<a href="{{route('user_homeparty_guest_detail', [$homeparty->id, 'new'])}}" class="btn btn-sm btn-secondary rounded-pill d-block float-right"><span class="ion ion-md-add"></span>&nbsp; Neue Gast anlegen</a>
@if(!$homeparty->completed)
<a href="{{route('user_homeparty_guest_detail', [$homeparty->id, 'new'])}}" class="btn btn-sm btn-secondary rounded-pill d-block float-right"><span class="ion ion-md-add"></span>&nbsp; Neue Gast anlegen</a>
@endif
</h4>
<div class="row">
@ -24,6 +26,8 @@
</a>
{{-- <span class="badge badge-success align-text-bottom ml-1">offen ...</span> --}}
</div>
@if(!$homeparty->completed)
<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>
<div class="btn-group project-actions">
@ -46,6 +50,7 @@
</div>
</div>
@endif
</div>
<div class="progress rounded-0" style="height: 2px;">
<div class="progress-bar" style="width: 100%;"></div>
@ -79,7 +84,10 @@
</div>
</div>
<div class="text-left mt-1">
@if(!$homeparty->completed)
<a href="{{route('user_homeparty_detail', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-2"><i class="ion ion-ios-cog"></i> Homparty verwalten</a>
@endif
<a href="{{route('user_homeparty_order', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-2"><i class="ion ion-md-basket"></i> Bestellung</a>
<a href="{{route('user_homepartys')}}" class="btn btn-sm btn-default mb-2">zurück zur Übersicht</a>
</div>

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

@ -14,8 +14,12 @@
<div class="card-body d-flex justify-content-between align-items-start pb-2">
<div>
<a href="{{route('user_homeparty_detail', [$homeparty->id])}}" class="text-body text-big font-weight-semibold">{{$homeparty->name}}</a>
{{-- <span class="badge badge-success align-text-bottom ml-1">offen ...</span> --}}
@if($homeparty->completed)
<span class="badge badge-secondary align-text-bottom ml-1">abgeschlossen</span>
@endif
</div>
@if(!$homeparty->completed)
<div class="btn-group project-actions">
<button type="button" class="btn btn-sm btn-default icon-btn borderless rounded-pill md-btn-flat dropdown-toggle hide-arrow" data-toggle="dropdown">
<i class="ion ion-ios-more"></i>
@ -27,6 +31,7 @@
</a>
</div>
</div>
@endif
</div>
<div class="progress rounded-0" style="height: 2px;">
<div class="progress-bar" style="width: 100%;"></div>
@ -50,14 +55,15 @@
</div>
<div class="col">
<div class="text-muted small">Umsatz</div>
<div class="font-weight-bold">0</div>
<div class="font-weight-bold">@if(isset($homeparty->order['price'])){{Util::formatNumber($homeparty->order['price'])}}@endif</div>
</div>
<div class="col">
<div class="text-muted small">Points</div>
<div class="font-weight-bold">0</div>
<div class="font-weight-bold">@if(isset($homeparty->order['points'])){{$homeparty->order['points']}}@endif</div>
</div>
</div>
</div>
@if(!$homeparty->completed)
<hr class="m-0">
<div class="card-body py-3">
<div class="form-group mb-0">
@ -69,12 +75,21 @@
</div>
</div>
</div>
@endif
<hr class="m-0">
<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>
<a href="{{route('user_homeparty_guests', [$homeparty->id])}}" class="btn btn-secondary mr-2 mb-2"><i class="ion ion-md-person-add"></i> Gäste 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>
<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>
@else
<a href="{{route('user_homeparty_guests', [$homeparty->id])}}" class="btn btn-secondary mr-2 mb-2"><i class="ion ion-md-person"></i> Gäste ansehen</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>
@endif
</div>
</div>
</div>

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

@ -84,6 +84,10 @@
<a href="{{route('user_homepartys')}}" class="btn btn-sm btn-default float-right">zurück</a>
</h4>
@if($userHistoryPaymentOrder && $userHistoryPaymentOrder->status > 2)
<h6 class="alert badge-{{$userHistoryPaymentOrder->getStatusColor()}}">Eine Zahlung wurde ausgeführt. Status: {{ trans('payment.status.'.$userHistoryPaymentOrder->getStatusType())}}</h6>
@endif
{!! Form::open(['url' => route('user_homeparty_order', [$homeparty->id]), 'class' => 'form-horizontal', 'id'=>'homeparty-order-form']) !!}
<div class="card mb-4">
@ -92,10 +96,12 @@
<div class="col-12">
<div class="d-flex justify-content-between align-items-center w-100">
<div>Bestellung anlegen</div>
@if(!$homeparty->completed)
<div class="float-right">
<a href="{{route('user_homeparty_detail', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-ios-cog"></i> Verwalten</a>
<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>
</div>
@endif
</div>
</div>
</div>
@ -103,7 +109,11 @@
<div class="card-body">
<div class="row">
<div class="col-md-6">
<h6>Lieferadresse Gastgeber/in <a href="{{route('user_homeparty_guest_detail', [$homeparty->id, $homeparty->homeparty_host->id])}}"><i class="fa fa-edit"></i> </a></h6>
<h6>Lieferadresse Gastgeber/in
@if(!$homeparty->completed)
<a href="{{route('user_homeparty_guest_detail', [$homeparty->id, $homeparty->homeparty_host->id])}}"><i class="fa fa-edit"></i> </a>
@endif
</h6>
@include('user.homeparty._address', ['homeparty_user' => $homeparty->homeparty_host])
</div>
@ -128,6 +138,7 @@
<div>Bestellung Gastgeber/in {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}}</div>
</div>
</div>
@if(!$homeparty->completed)
<div class="col-12">
<button type="button" class="btn btn-sm btn-secondary btn-block mt-2" data-toggle="modal" data-target="#modals-load-content"
data-id="{{ $homeparty->id }}"
@ -135,6 +146,7 @@
data-user_id="{{$homeparty->homeparty_host->id}}"
data-route="{{ route('modal_load') }}"><i class="fa fa-plus-circle"></i> Produkt hinzufügen</button>
</div>
@endif
</div>
</h5>
<div class="card-body">
@ -156,6 +168,7 @@
<div>Bestellung {!! $g_count++ !!}. Gast {{$homeparty_guest->billing_firstname}} {{$homeparty_guest->billing_lastname}}</div>
</div>
</div>
@if(!$homeparty->completed)
<div class="col-12">
<button type="button" class="btn btn-sm btn-secondary btn-block mt-2" data-toggle="modal" data-target="#modals-load-content"
data-id="{{ $homeparty->id }}"
@ -163,6 +176,7 @@
data-user_id="{{$homeparty_guest->id}}"
data-route="{{ route('modal_load') }}"><i class="fa fa-plus-circle"></i> Produkt hinzufügen</button>
</div>
@endif
</div>
</h5>
<div class="card-body">
@ -186,31 +200,32 @@
</div>
</h5>
{{-- TODO Berechnung des WK --}}
<div class="card-body">
<div id="insert_show_total_order">
@include('user.homeparty.show_total_order', ['homeparty' => $homeparty])
</div>
<hr>
@if($homeparty->homeparty_host && $homeparty->homeparty_host->isAddress())
<div class="float-right">
<button type="submit" class="btn btn-secondary"><i class="ion ion-ios-redo"></i> bestätigen und weiter zur Kasse</button>
</div>
<br><br>
<em class="small text-center"> <i class="fa fa-lock"></i> Du wirst auf unseren checkout Server weitergeletet, die Verbindung ist SSL verschlüsselt.</em>
@else
<div class="alert alert-warning">
Die Bestellung kann erst abgesendet werden, wenn die Lieferadresse Gastgeber/in angelegt ist. <a href="{{route('user_homeparty_guest_detail', [$homeparty->id, $homeparty->homeparty_host->id])}}"><i class="fa fa-edit"></i> </a></h6>
@if(!$homeparty->completed)
<hr>
@if($homeparty->homeparty_host && $homeparty->homeparty_host->isAddress())
<div class="float-right">
<button type="submit" class="btn btn-secondary"><i class="ion ion-ios-redo"></i> bestätigen und weiter zur Kasse</button>
</div>
<br><br>
<em class="small text-center"> <i class="fa fa-lock"></i> Du wirst auf unseren checkout Server weitergeletet, die Verbindung ist SSL verschlüsselt.</em>
@else
<div class="alert alert-warning">
Die Bestellung kann erst abgesendet werden, wenn die Lieferadresse Gastgeber/in angelegt ist. <a href="{{route('user_homeparty_guest_detail', [$homeparty->id, $homeparty->homeparty_host->id])}}"><i class="fa fa-edit"></i> </a></h6>
</div>
@endif
@endif
</div>
</div>
<div class="text-left mt-3">
@if(!$homeparty->completed)
<a href="{{route('user_homeparty_detail', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-2"><i class="ion ion-ios-cog"></i> Homparty verwalten</a>
@endif
<a href="{{route('user_homepartys')}}" class="btn btn-sm btn-default mb-2">zurück zur Übersicht</a>
</div>
{!! Form::close() !!}

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

@ -27,8 +27,8 @@
<tr class="foot-small">
<td colspan="5" class="text-left">Versandkosten:</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td class="text-right">0 &euro;</td>
<td class="text-right">&nbsp;</td>
<td class="text-right">{{$user_cart->getFormattedShippingPrice()}} &euro;</td>
</tr>
<tr>
<td colspan="4" class="border-top"><strong>Gesamt:</strong></td>

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

@ -1,4 +1,4 @@
@if($homeparty_guest && $homeparty_guest->homeparty_user_order_items->count())
@if($homeparty_guest && $homeparty_guest->homeparty_user_order_items->count() || $homeparty_guest->is_host)
<div class="table-responsive">
<table class="table table-striped">
<thead>
@ -27,11 +27,14 @@
<div>Inhalt: {{ $value->product->contents }}</div>
<div>Art.-Nr.: {{ $value->product->number }}</div>
</div>
<div class="options">
@if(!$homeparty->completed)
<div class="options">
<a href="#" class="auto-delete-product remove_item_form_cart product-tooltip" data-order-item-id="{{$value->id}}" data-product-id="{{ $value->product->id }}"><i class="fa fa-times"></i> Artikel entfernen</a>
</div>
@endif
</td>
<td>
@if(!$homeparty->completed)
<div class="no-line-break input-group-min-w">
<div class="input-group d-inline-flex w-auto">
<span class="input-group-prepend">
@ -43,6 +46,9 @@
</span>
</div>
</div>
@else
{{$value->qty}}
@endif
</td>
<td>
{{ $value->margin }}%
@ -67,21 +73,36 @@
@php($user_cart = \App\Services\HomepartyCart::getUserCart($homeparty_guest->id))
@if(!$homeparty_guest->is_host)
<tr class="foot-small">
@if(!$homeparty_guest->isAddress())
<td colspan="3" class="border-top">
<p>Keine Lieferadresse angelegt <a href="{{route('user_homeparty_guest_detail', [$homeparty_guest->homeparty->id, $homeparty_guest->id])}}"><i class="fa fa-edit"></i> </a></p>
<td colspan="5" class="border-top">&nbsp;</td>
@else
<td colspan="3" class="border-top">
<select class="custom-select" name="filter_member_id" id="filter_member_id">
<option value="">Lieferung an Gastgeber</option>
<option value="">Lieferung direkt an den Gast</option>
@if(!$homeparty->completed)
<select class="custom-select select_delivery_option" name="select_delivery_option">
<option value="host" @if($homeparty_guest->getDelivery() === 'host') selected @endif>Lieferung an Gastgeber</option>
<option value="direct" @if($homeparty_guest->getDelivery() === 'direct') selected @endif>Lieferung direkt an den Gast</option>
</select>
@else
@if($homeparty_guest->getDelivery() === 'host') Lieferung an Gastgeber @endif
@if($homeparty_guest->getDelivery() === 'direct') Lieferung direkt an den Gast @endif
@endif
</td>
<td colspan="5" class="border-top">&nbsp;</td>
@endif
</tr>
{{-- <tr>
@if($homeparty_guest->getDelivery() === 'direct')
<tr>
<td colspan="5" class="text-left">Versandkosten</td>
<td>12</td>
<td>&nbsp;</td>
<td>25,00 &euro;</td>
<td class="text-right">&nbsp;</td>
<td class="text-right">{{$user_cart->getFormattedShippingPrice()}} &euro;</td>
</tr>
--}}
@endif
<tr>
<td colspan="4" class="border-top"><strong>Gesamt:</strong></td>
<td class="border-top text-right"><strong>{{$user_cart->getFormattedEkPrice()}} &euro;</strong></td>

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

@ -57,13 +57,12 @@
@endif
</tbody>
<tfoot>
@if(\App\Services\HomepartyCart::$is_bonus)
<tr class="foot-small">
<td colspan="4" class="border-top">
zzgl. anteiliger Bonusgutschein:
{{ \App\Services\HomepartyCart::$voucher_name }}
</td>
<td class="border-top text-right">{{ App\Services\HomepartyCart::getFormattedBonusPrice() }}&euro;</td>
</tr>
@ -73,7 +72,7 @@
<td colspan="1" class="border-top">
<strong>Gesamtsummen:</strong>
</td>
<td class="border-top text-right"><strong>{{\App\Services\HomepartyCart::getFormattedEkPrice()}}</strong></td>
<td class="border-top text-right"><strong>{{\App\Services\HomepartyCart::getFormattedEkPrice()}} &euro;</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>