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

Updates to 03-2025

Browse source
This commit is contained in:
Kevin Adametz 2025-04-01 10:36:47 +02:00
parent bfa3bb1df4
commit 9ae662f63e
243 changed files with 12580 additions and 12018 deletions
Download patch file Download diff file Expand all files Collapse all files

109
resources/views/admin/abo/_detail.blade.php Normal file
View file

@ -0,0 +1,109 @@
<!-- Info -->
<div class="card-body pb-1">
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('tables.start_date') }}</div>
{{ $user_abo->start_date }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('tables.next_date') }}</div>
<strong>{{ $user_abo->next_date }}</strong>
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('tables.abo_delivery_day') }}</div>
<strong>{{ \App\Services\HTMLHelper::getAboStrLang($user_abo->abo_interval) }}</strong>
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('tables.last_date') }}</div>
{{ $user_abo->last_date }}
</div>
</div>
</div>
<hr class="m-0">
<div class="card-body pb-1">
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('tables.status') }} / {{ __('tables.active') }}</div>
{!! $user_abo->getStatusFormated() !!} &nbsp;{!! get_active_badge($user_abo->active) !!}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('tables.abo_delivery') }}</div>
{{ $user_abo->getCountOrders() }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('tables.payment') }}</div>
{{ $user_abo->getPaymentType() }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('tables.amount') }}</div>
<span class="text-nowrap" id="value-amount">{{ $user_abo->getFormattedAmount() }}</span> €
</div>
</div>
</div>
<hr class="m-0">
@if($isAdmin)
<div class="card-body pb-1">
<div class="row">
<div class="col-md-3 mb-3">
<button type="button" class="btn btn-sm btn-secondary" data-toggle="modal" data-target="#modals-load-content"
data-id="{{ $user_abo->id }}"
data-action="abo_update_settings"
data-view="admin"
data-route="{{ route('modal_load') }}"><span class="fa fa-edit"></span>{{ __('abo.abo_settings') }}</button>
</div>
<div class="col-md-6 mb-3">
@if(isset($user_abo->shopping_user) && $user_abo->shopping_user->member_id > 0)
<div class="text-muted small">{{ __('tables.adviser') }}</div>
{!! '<a href="'.route('admin_lead_edit', [$user_abo->shopping_user->member_id]).'">'.$user_abo->shopping_user->member->getFullName().'</a>' !!}
@endif
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('tables.is_for') }}</div>
{!! $user_abo->getIsForFormated() !!}
@if($user_abo->is_for === 'me')
<a class="btn btn-xs btn-secondary" href="{{ route('admin_lead_edit', $user_abo->user_id) }}"><i class="fa fa-edit"></i></a>
@endif
@if($user_abo->is_for === 'ot')
<a class="btn btn-xs btn-secondary" href="{{ route('admin_customer_edit', $user_abo->shopping_user->id) }}"><i class="fa fa-edit"></i></a>
@endif
</div>
</div>
</div>
@else
<div class="card-body pb-1">
<div class="row">
<div class="col-md-6 mb-3">
<button type="button" class="btn btn-sm btn-secondary" data-toggle="modal" data-target="#modals-load-content"
data-id="{{ $user_abo->id }}"
data-action="abo_update_settings"
data-view="{{ $view }}"
data-route="{{ route('modal_load') }}"><span class="fa fa-edit"></span>{{ __('abo.abo_settings') }}</button>
</div>
<div class="col-md-3 mb-3">
{!! $user_abo->getIsForFormated() !!}
@if($user_abo->is_for === 'me')
<a class="btn btn-xs btn-secondary" href="{{ route('user_edit') }}"><i class="fa fa-edit"></i></a>
@endif
@if($user_abo->is_for === 'ot')
<a class="btn btn-xs btn-secondary" href="{{ route('user_customer_edit', $user_abo->shopping_user->id) }}"><i class="fa fa-edit"></i></a>
@endif
</div>
</div>
</div>
@endif

109
resources/views/admin/abo/_executions.blade.php Normal file
View file

@ -0,0 +1,109 @@
<div class="card-body">
<h5 class="font-weight-semibold">
{{ __('navigation.abo') }} {{ __('tables.executions') }}
</h5>
<style>
table.table-product,
table.table-product tr td,
table.table-product tr th {
border: none;
}
table.table-product tr.border-top td {
border-top: 1px solid #b8b8b9;
}
table.table-product tr.border-bottom td,
table.table-product tr.border-bottom th {
border-bottom: 1px solid #b8b8b9;
}
</style>
<div class="table-responsive">
<table class="table table-product m-0" style="min-width:550px;">
<tbody>
<tr>
<th>#</th>
<th>{{__('tables.date')}}</th>
<th>{{__('tables.amount')}}</th>
<th>{{__('tables.payment')}}</th>
<th>{{__('tables.status')}}</th>
<th>{{__('tables.shipping')}}</th>
<th>{{__('tables.art')}}</th>
<th>{{__('tables.invoice')}}</th>
<th>{{__('tables.firstname')}}</th>
<th>{{__('tables.lastname')}}</th>
<th>{{__('tables.email')}}</th>
<th>{{__('tables.status')}}</th>
<th>{{__('tables.rf_no')}}</th>
</tr>
@if($user_abo->user_abo_orders)
@foreach($user_abo->user_abo_orders()->orderBy('id', 'desc')->get() as $user_abo_order)
@if($user_abo_order->shopping_order)
<tr class="border-top">
<td>
@if($isAdmin)
@if($user_abo->is_for === 'me')
{!! '<a href="' . route('admin_sales_users_detail', [$user_abo_order->shopping_order_id]) . '" class="btn btn-xs btn-primary">'.$user_abo_order->shopping_order_id.'</a>' !!}
@endif
@if($user_abo->is_for === 'ot')
{!! '<a href="' . route('admin_sales_customers_detail', [$user_abo_order->shopping_order_id]) . '" class="btn btn-xs btn-secondary">'.$user_abo_order->shopping_order_id.'</a>' !!}
@endif
@else
@if($user_abo->is_for === 'me')
{!! '<a href="' . route('user_order_detail', [$user_abo_order->shopping_order_id]) . '" class="btn btn-xs btn-primary">'.$user_abo_order->shopping_order_id.'</a>' !!}
@endif
@if($user_abo->is_for === 'ot')
{!! '<a href="' . route('user_shop_order_detail', [$user_abo_order->shopping_order_id]) . '" class="btn btn-xs btn-secondary">'.$user_abo_order->shopping_order_id.'</a>' !!}
@endif
@endif
</td>
<td>
{!! $user_abo_order->shopping_order->created_at->format("d.m.Y H:i") !!}
</td>
<td>
<span class="no-line-break">{!! $user_abo_order->shopping_order->getFormattedTotalShipping() !!} €</span>
</td>
<td>
{!! $user_abo_order->shopping_order->getLastShoppingPayment('getPaymentType'); !!}
</td>
<td>
{!! \App\Services\Payment::getShoppingOrderBadge($user_abo_order->shopping_order) !!}
</td>
<td>
{!! '<span class="badge badge-pill badge-'.$user_abo_order->shopping_order->getShippedColor().'">'.$user_abo_order->shopping_order->getShippedType().'</span>' !!}
</td>
<td>
{!! '<span class="badge badge-pill badge-'.$user_abo_order->shopping_order->getPaymentForColor().'">'.$user_abo_order->shopping_order->getPaymentForType().'</span>' !!}
</td>
<td>
@if($user_abo_order->shopping_order->isInvoice())
{!! '<span class="no-line-break"><a href="'.route('storage_file', [$user_abo_order->shopping_order->id, 'invoice', 'download']).'" class="btn btn-primary btn-xs"><i class="fa fa-download"></i></a>
<a href="'.route('storage_file', [$user_abo_order->shopping_order->id, 'invoice', 'stream']).'" target="_blank" class="btn btn-warning btn-xs"><i class="fa fa-eye"></i></a></span>' !!}
@endif
</td>
<td>
{{ $user_abo_order->shopping_order->shopping_user->shipping_firstname }}
</td>
<td>
{{ $user_abo_order->shopping_order->shopping_user->shipping_lastname }}
</td>
<td>
{{ $user_abo_order->shopping_order->shopping_user->shipping_email }}
</td>
<td>
{!! $user_abo_order->getStatusFormated()!!}
</td>
<td>
{{ $user_abo_order->shopping_order->getLastShoppingPayment('reference') }}
</td>
</tr>
@endif
@endforeach
@endif
</tbody>
</table>
</div>
</div>

123
resources/views/admin/abo/_order_abo.blade.php Normal file
View file

@ -0,0 +1,123 @@
<style>
table.table-product,
table.table-product tr td,
table.table-product tr th {
border: none;
}
table.table-product tr.border-top td {
border-top: 1px solid #b8b8b9;
}
table.table-product tr.border-bottom td,
table.table-product tr.border-bottom th {
border-bottom: 1px solid #b8b8b9;
}
.table-small {
font-size: 0.9em;
width: auto;
}
.table-small td {
padding: 0.225rem 1rem 0.225rem 0;
}
.btn-md-extra {
padding: 0.3rem 0.6rem;
font-size: 0.8rem;
line-height: 1.5;
border-radius: 0.25rem;
}
.md-btn-extra {
width: calc(1.7rem + 2px) !important;
line-height: 1.5rem;
}
.form-control.input-extra {
padding: 0.28rem 0.6rem;
font-size: 0.8rem;
font-weight: 500;
min-height: calc(1.8rem + 2px);
height: calc(1.8rem + 2px);
width: 44px;
}
.input-group-min-w {
min-width: 102px;
}
.img-extra {
min-width:55px;
max-height: 120px;
}
.table td.border-top {
border: none;
border-top: 1px solid #ccccdb;
}
.table td {
border: none;
}
.table th {
border: none;
border-bottom: 1px solid #c3c3d2;
}
@media (max-width: 767px) {
.default-style:not([dir=rtl]) div.card-datatable table.dataTable thead th:first-child,
.default-style:not([dir=rtl]) div.card-datatable table.dataTable tbody td:first-child,
.default-style:not([dir=rtl]) div.card-datatable table.dataTable tfoot th:first-child {
padding-left: 0.6rem !important;
}
.img-extra {
min-width:35px;
max-height: 160px;
}
}
.table .foot-small td {
padding: 0.225rem 0.625rem;
}
.table .text-body {
font-size: 0.9em;
}
.table .options a.auto-delete-product {
font-size: 0.7em;
font-weight: bold;
text-transform: uppercase;
}
.table .min-width-80 {
min-width: 160px;
}
.bg-warning-light {
background-color: rgba(255, 217, 80, 0.6) !important;
}
.small {
font-size: 90%;
}
.table tfoot td {
padding: 0.225rem;
}
</style>
<div class="card-body">
<h5 class=" font-weight-semibold mb-2">
{{ __('abo.abo_order_hl') }}
</h5>
<p>{{ __('abo.abo_order_info') }}</p>
<hr>
@include('user.abo.vat_info')
<button type="button" class="btn btn-sm btn-secondary btn-block mt-2" data-toggle="modal" data-target="#modals-load-content"
data-id="{{ $user_abo->id }}"
data-action="abo-add-product"
data-route="{{ route('modal_load') }}"><i class="fa fa-plus-circle"></i> {{ __('abo.add_product') }}</button>
<div class="" id="insert_show_products_order" data-cart-order-id="{{ $user_abo->id }}">
@include('admin.abo._order_abo_show')
</div>
</div>

93
resources/views/admin/abo/_order_abo_show.blade.php Normal file
View file

@ -0,0 +1,93 @@
@if(isset($error_message) && $error_message)
<div class="alert alert-danger mt-2" id="insert_show_error_message">{{ $error_message }}</div>
@endif
<div class="table-responsive">
<table class="table table-product m-0" style="min-width:550px;">
<thead> <tr>
<th>#</th>
<th>{{__('order.article')}}</th>
<th>{{__('tables.quantity')}}</th>
<th class="text-right"> {{ __('tables.price') }}</th>
</tr>
</thead>
<tbody>
@if($user_abo->user_abo_items)
@foreach($user_abo->user_abo_items as $abo_item)
@if(!$abo_item->comp)
<tr>
<td>
@if(count($abo_item->product->images))
<img class="img-fluid img-extra" alt="" src="{{ route('product_image', [$abo_item->product->images->first()->slug]) }}">
@endif
</td>
<td class="min-width-80">
<strong>{{ $abo_item->product->getLang('name') }}</strong>
&nbsp; {!! get_abo_type_badge_by_product($abo_item->product) !!}
<div class="text-body">
<div>{{ __('order.content') }}: {{ $abo_item->product->contents }}</div>
<div>{{ __('order.art_no') }}: {{ $abo_item->product->number }}</div>
</div>
<div class="options">
<a href="#" class="auto-delete-product remove_item_form_cart product-tooltip" data-order-item-id="{{$abo_item->id}}" data-product-id="{{ $abo_item->product->id }}"><i class="fa fa-times"></i> {{ __('order.article_remove') }}</a>
</div>
</td>
<td>
<div class="no-line-break input-group-min-w">
<div class="input-group d-inline-flex w-auto">
<span class="input-group-prepend">
<button type="button" class="btn btn-secondary icon-btn md-btn-extra remove-from-basket" data-order-item-id="{{$abo_item->id}}" data-product-id="{{ $abo_item->product->id }}">-</button>
</span>
<input type="text" class="form-control text-center input-extra table-input-event-onchange" name="product_qty_{{$abo_item->id}}" data-order-item-id="{{$abo_item->id}}" data-product-id="{{ $abo_item->product->id }}" value="{{$abo_item->qty}}">
<span class="input-group-append">
<button type="button" class="btn btn-secondary icon-btn md-btn-extra add-from-basket" data-order-item-id="{{$abo_item->id}}" data-product-id="{{ $abo_item->product->id }}">+</button>
</span>
</div>
</div>
</td>
<td class="text-right font-weight-semibold align-top px-3 py-2" style="width: 100px;">
<div class="no-line-break"> {{ $abo_item->getFormattedTotalPrice() }} &euro;</div>
</td>
</tr>
@endif
@endforeach
@endif
</tbody>
<tfoot>
<tr>
<td colspan="4"><hr></td>
</tr>
<tr>
<td colspan="3" class="text-right small"><strong>{{ __('order.subtotal') }}:</strong></td>
<td class="text-right small">{{ Yard::instance('shopping')->subtotal() }} €</td>
</tr>
<tr>
<td colspan="3" class="text-right small no-border-top"><strong>{{ __('Delivery country') }}:</strong></td>
<td class="text-right small no-border-top">{{ Yard::instance('shopping')->getShippingCountryName() }}</td>
</tr>
<tr>
<td colspan="3" class="text-right small no-border-top"><strong>{{ __('order.shipping_costs') }}:</strong></td>
<td class="text-right small no-border-top">{{ Yard::instance('shopping')->shipping() }} € </td>
</tr>
@if(Yard::instance('shopping')->getUserTaxFree())
<tr>
<td colspan="3" class="text-right small no-border-top"><strong>{{ __('order.sum_net') }}:</strong></td>
<td class="text-right small no-border-top">{{ Yard::instance('shopping')->subtotalWithShipping() }} €</td>
</tr>
@else
<tr>
<td colspan="3" class="text-right small no-border-top"><strong>{{ __('order.total_without_VAT') }}:</strong></td>
<td class="text-right small no-border-top">{{ Yard::instance('shopping')->subtotalWithShipping() }} €</td>
</tr>
<tr>
<td colspan="3" class="text-right small no-border-top"><strong>{{ __('order.plus_VAT') }}:</strong></td>
<td class="text-right small no-border-top">{{ Yard::instance('shopping')->taxWithShipping() }} €</td>
</tr>
@endif
<tr>
<td colspan="3" class="text-right"><strong>{{ __('order.total_sum') }}:</strong></td>
<td class="text-right">{{ Yard::instance('shopping')->totalWithShipping() }} €</td>
</tr>
</tfoot>
</table>
</div>

61
resources/views/admin/abo/detail.blade.php Normal file
View file

@ -0,0 +1,61 @@
@extends('layouts.layout-2')
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
<a href="{{route('admin_abos')}}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
{{ __('navigation.abo') }} <span class="text-muted">{{ '#'.$user_abo->payone_userid }}</span>
</h4>
@if(Session::has('alert-error'))
<div class="col-sm-12">
<div class="alert alert-danger p-2 mt-2">
<ul>
<li>{{ Session::get('alert-error') }}</li>
</ul>
</div>
</div>
@endif
<div class="card">
@include('admin.abo._detail')
</div>
<div class="card mt-3">
@include('admin.customer._customer_detail', ['shopping_user' => $customer_detail])
</div>
{!! Form::open(['url' => route('user_abos_update', [$view, $user_abo->id]), 'class' => 'form-horizontal', 'id'=>'cart-order-form']) !!}
<input type="hidden" name="is_for" value="{{ $user_abo->is_for }}">
<div class="card mt-3">
@include('admin.abo._order_abo')
</div>
@if($comp_products && Yard::instance('shopping')->getNumComp() > 0)
<div id="holder_html_view_comp_product">
@include('user.order.comp_product')
</div>
@endif
{{ Form::close() }}
<div class="card mt-3">
@include('admin.abo._executions')
</div>
<a href="{{route('admin_abos')}}" class="btn btn-sm btn-default mt-2 float-right">{{ __('back') }}</a>
@endsection
@section('scripts')
<script src="{{ asset('/js/iq-modal-cart.js') }}?v=1{{ get_file_last_time('/js/iq-modal-cart.js') }}"></script>
<script type="application/javascript">
var iqModalCart = IqModalCart.init();
$( document ).ready(function() {
});
</script>
@endsection

118
resources/views/admin/abo/index.blade.php Normal file
View file

@ -0,0 +1,118 @@
@extends('layouts.layout-2')
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Abos') }}
</h4>
<div class="card">
{{--
<div class="card-header">
<div class="form-row align-items-center">
<div class="col-sm-4 mb-2">
<label class="form-label" for="filter_user_shop_id">Filter zugewiesener Berater</label>
<select class="selectpicker" data-style="btn-default" name="filter_member_id" id="filter_member_id" data-live-search="true">
<option value="">Filter aus</option>
@foreach($filter_members as $member)
<option value="{{$member->id}}" @if(get_user_attr('filter_member_id') == $member->id) selected @endif>{{$member->first_name}} {{$member->last_name}} | {{$member->email}}</option>
@endforeach
</select>
</div>
<div class="col-10 col-sm-3 mb-2">
<label class="form-label" for="filter_status">Filter Status</label>
<select class="custom-select" name="filter_status" id="filter_status">
<option value="">Filter aus</option>
@foreach(\App\Services\AboHelper::getTransStatusFilterText() as $id=>$name)
<option value="{{$id}}" @if(get_user_attr('filter_status') == $id) selected @endif>{{$name}}</option>
@endforeach
</select>
</div>
<div class="col-2 col-sm-1 mb-2 mt-4">
<a href="{{ route('admin_sales_customers') }}?reset=filter" data-toggle="tooltip" data-placement="top" title="Reset Filter" class="btn icon-btn btn-sm btn-outline-dark float-right">
<span class="fa fa-sync"></span>
</a>
</div>
</div>
</div>
--}}
<div class="card-datatable table-responsive">
<table class="datatable-abos table table-striped table-bordered" id="datatable-abos">
<thead>
<tr>
<th>#</th>
<th>{{__('tables.start_date')}}</th>
<th>{{__('tables.next_date')}}</th>
<th>{{__('tables.abo_delivery_day')}}</th>
<th>{{__('tables.status')}}</th>
<th>{{__('tables.active')}}</th>
<th>{{__('tables.is_for')}}</th>
<th>{{__('First name')}}</th>
<th>{{__('Last name')}}</th>
<th>{{__('E-Mail')}}</th>
<th>{{__('tables.exc')}}</th>
<th>{{__('tables.amount')}}</th>
<th>{{__('tables.payment')}}</th>
<th>{{__('tables.adviser')}}</th>
<th>{{__('PayOneID')}}</th>
</tr>
</thead>
</table>
</div>
</div>
<script>
$( document ).ready(function() {
var oTable = $('#datatable-abos').DataTable({
"processing": true,
"serverSide": true,
ajax: {
url: '{!! route( 'admin_abos_datatable') !!}',
data: function(d) {
d.filter_member_id = $('select[name=filter_member_id]').val();
d.filter_user_shop_id = $('select[name=filter_user_shop_id]').val();
d.filter_status = $('select[name=filter_status]').val();
}
},
"order": [[0, "desc" ]],
"columns": [
{ data: 'id', searchable: false },
{ data: 'start_date', name: 'start_date', searchable: false },
{ data: 'next_date', name: 'next_date', searchable: false },
{ data: 'abo_interval', name: 'abo_interval', searchable: false },
{ data: 'status', name: 'status', searchable: false },
{ data: 'active', name: 'active', searchable: false },
{ data: 'is_for', name: 'is_for', searchable: false },
{ data: 'shopping_user.billing_firstname', name: 'shopping_user.billing_firstname' },
{ data: 'shopping_user.billing_lastname', name: 'shopping_user.billing_lastname' },
{ data: 'shopping_user.billing_email', name: 'shopping_user.billing_email' },
{ data: 'count', name: 'count', searchable: false },
{ data: 'amount', name: 'amount', searchable: false },
{ data: 'payment', name: 'payment', searchable: false, orderable: false },
{ data: 'member', name: 'member', searchable: false, orderable: false },
{ data: 'payone_userid', name: 'payone_userid', searchable: true },
],
"bLengthChange": false,
"iDisplayLength": 100,
"language": {
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
$('#filter_member_id').on('change', function(){
oTable.draw();
});
$('#filter_user_shop_id').on('change', function(){
oTable.draw();
});
$('#filter_txaction').on('change', function(){
oTable.draw();
});
});
</script>
@endsection

88
resources/views/admin/abo/modal_abo_update.blade.php Normal file
View file

@ -0,0 +1,88 @@
{!! Form::open(['url' => $route, 'class' => 'modal-content', 'enctype' => 'multipart/form-data']) !!}
<div class="modal-header">
<h5 class="modal-title">
{{ __('abo.abo_settings') }} <span class="text-muted">{{ '#'.$user_abo->payone_userid }}</span>
</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<div class="modal-body">
<input type="hidden" name="action" value="{{$data['action']}}">
<input type="hidden" name="id" value="{{$data['id']}}">
<input type="hidden" name="view" value="{{$data['view']}}">
@if($data['view'] !== 'admin' && ($user_abo->user_id != \Auth::user()->id && $user_abo->member_id != \Auth::user()->id))
<div class="alert alert-danger">
Unauthorized action. Is not my abo
</div>
@else
<div class="form-row">
<div class="col-sm-6">
<label for="abo_interval" class="form-label">{{ __('tables.abo_delivery_day') }}*</label>
<select class="custom-select" name="abo_interval" id="abo_interval" required>
{!! HTMLHelper::getAboDeliveryOptions($user_abo->abo_interval) !!}
</select>
</div>
<div class="col-sm-12 mt-1">
<i class="text-muted">{{ __('abo.abo_copy_abo_interval') }}</i>
</div>
</div>
<hr>
{{-- <div class="form-row">
<div class="col-sm-6">
<label for="next_date" class="form-label">{{ __('tables.next_date') }} ({{ $user_abo->next_date }})</label>
{!! Form::text('next_date', $user_abo->next_date, ['class'=>'form-control datepicker-base']) !!}
</div>
<div class="form-group col-sm-12 mt-1">
<i class="text-muted">{{ __('abo.abo_copy_next_date') }}</i>
</div>
</div>
<hr>
--}}
<div class="form-row">
<div class="col-sm-12">
<label class="switcher switcher-primary">
<input type="checkbox" class="switcher-input" name="abo_is_active" value="true" @if($user_abo->active) checked @endif>
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">{{ __('abo.abo_is_active') }}</span>
</label>
</div>
<div class="col-sm-12 mt-1">
<i class="text-muted">{{ __('abo.abo_copy_active') }}</i>
</div>
</div>
@endif
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ __('close') }}</button>
<button type="submit" class="btn btn-primary">{{__('speichern')}}</button>
</div>
{!! Form::close() !!}
<script type="text/javascript">
$( document ).ready(function() {
$('.datepicker-base').datepicker({
orientation: 'auto right',
calendarWeeks: true,
todayBtn: 'linked',
//daysOfWeekDisabled: '1',
todayHighlight: true,
multidate: false,
daysOfWeekHighlighted: '0,6',
autoclose: true,
format: 'dd.mm.yyyy',
language: '{{ \App::getLocale() }}',
clearBtn: true,
}).on('clearDate', function(e) {
$('.datepicker-base').datepicker('update', '{{ $user_abo->next_date }}');
});
});
</script>

2
resources/views/admin/category/products.blade.php
View file

@ -41,7 +41,7 @@
@else
&nbsp; | &nbsp;<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>
@endif
&nbsp; | &nbsp;<span class="small">{!! implode($product_category->product->getShowOnTypes(), ' / ') !!}</span>
&nbsp; | &nbsp;<span class="small">{!! implode(' / ', $product_category->product->getShowOnTypes()) !!}</span>
&nbsp; | &nbsp;<a href="{{ route('admin_product_edit', [$product_category->product->id]) }}" class="btn btn-xs btn-secondary"><i class="fa fa-eye"></i></a>
@else
-

4
resources/views/admin/customer/_customer_detail.blade.php
View file

@ -47,6 +47,10 @@
<div class="text-muted small">{{ __('Phone') }}</div>
{{ $shopping_user->billing_phone }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('E-Mail') }}</div>
@if($shopping_user->faker_mail) "-" @else {{ $shopping_user->billing_email }} @endif
</div>
</div>
</div>
<hr class="m-0">

55
resources/views/admin/customer/_detail.blade.php
View file

@ -90,8 +90,8 @@
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('customer.about_shop') }} </div>
@if($shopping_user->shopping_order)
@if($shopping_user->shopping_order->user_shop->user->isActive() && $shopping_user->shopping_order->user_shop->user->isActiveShop())
@if($shopping_user->shopping_order && $shopping_user->shopping_order->user_shop)
@if($shopping_user->shopping_order->user_shop->user && $shopping_user->shopping_order->user_shop->user->isActive() && $shopping_user->shopping_order->user_shop->user->isActiveShop())
<a href="{{$shopping_user->shopping_order->user_shop->getSubdomain(false)}}" class="badge badge-success" target="_blank">{{$shopping_user->shopping_order->user_shop->getSubdomain(false)}}</a>
@else
<span class="badge badge-danger" target="_blank">{{$shopping_user->shopping_order->user_shop->getSubdomain(false)}}</span>
@ -195,7 +195,6 @@
<img src="{{ route('product_image', [$image->slug]) }}" class="d-block ui-w-80 mr-4" alt>
@endif
@endif
<div class="media-body">
<a href="{{route('admin_product_edit', [$shopping_order_item->product->id])}}" class="d-block">{{ $shopping_order_item->product->getLang('name') }}
<span class="text-muted">#{{ $shopping_order_item->product->number }}</span></a>
@ -289,4 +288,54 @@
</div>
</div>
@endif
<div class="card-body">
<h6 class="small font-weight-semibold">
{{ __('tables.previous_orders') }}
</h6>
<div class="table-responsive">
<table class="table table-striped table-bordered m-0" style="min-width:550px;">
<tbody>
<tr>
<th>#</th>
<th>{{__('tables.date')}}</th>
<th>{{__('tables.amount')}}</th>
<th>{{__('tables.status')}}</th>
<th>{{__('tables.shipping')}}</th>
<th>{{__('tables.art')}}</th>
</tr>
@if($shopping_user->shopping_order)
@forelse($shopping_user->getAllOrdersByMember() as $shopping_order)
<tr>
<td>
<a href="{{ route('user_shop_order_detail', $shopping_order->id) }}"
class="btn icon-btn btn-sm btn-primary">
<span class="fa fa-edit"></span>
</a>
</td>
<td>{{ $shopping_order->created_at->format('d.m.Y') }}</td>
<td>
<span class="no-line-break">
{{ $shopping_order->getFormattedTotalShipping() }} €
</span>
</td>
<td>{!! \App\Services\Payment::getShoppingOrderBadge($shopping_order) !!}</td>
<td>
<span class="badge badge-pill badge-{{ $shopping_order->getShippedColor() }}">
{{ $shopping_order->getShippedType() }}
</span>
</td>
<td>{!! \App\Services\Payment::getPaymentForBadge($shopping_order) !!}</td>
</tr>
@empty
<tr>
<td colspan="6" class="text-center">{{ __('order.no_orders_found') }}</td>
</tr>
@endforelse
@endif
</tbody>
</table>
</div>
</div>
<hr class="m-0">
</div>

9
resources/views/admin/modal/show_user_customers.blade.php
View file

@ -21,8 +21,6 @@
<th>{{ __('City') }}</th>
<th>{{ __('Country') }}</th>
<th>{{__('Käufe')}}</th>
<th>{{__('Newsletter')}}</th>
<th>{{__('erstellt')}}</th>
<th>{{__('tables.status')}}</th>
<th>{{__('ID Kunden')}}</th>
<th>WP</th>
@ -43,7 +41,7 @@
url: '{!! route( 'user_customer_datatable') !!}',
data: function(d) {
// d.filter_member_id = $('select[name=filter_member_id]').val();
d.isfor = "{{ $data['isfor'] }}";
d.isfor = "{{ $data['isfor'] }}";
}
},
"order": [[0, "desc" ]],
@ -58,8 +56,6 @@
{ data: 'billing_city', name: 'billing_city' },
{ data: 'billing_country_id', name: 'billing_country_id' },
{ data: 'orders', name: 'orders' },
{ data: 'subscribed', name: 'subscribed' },
{ data: 'first_created_at', name: 'first_created_at' },
{data: 'status', name: 'status', searchable: false, orderable: false },
{ data: 'number', name: 'number'},
{ data: 'extras', name: 'extras', searchable: false, orderable: false},
@ -75,6 +71,5 @@
});
</script>
</div>
</div>
</div>

186
resources/views/admin/payment/credit_detail.blade.php
View file

@ -90,6 +90,78 @@
</div>
<hr>
@endif
{{-- Eigene Marge --}}
@if (isset($collection->own_order[$date]))
@php($order = $collection->own_order[$date])
@if (isset($cbot))
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
<tr>
<td>
<strong>{{ __('team.own') }} {{ __('tables.margin') }} </strong>
</td>
<td>
<span class="badge badge-info"
style="font-size: 1em;"><strong>
{{ formatNumber($cbot->business_user->getSalesVolumeTotalMargin()) }}
&euro;</strong></span>
&nbsp;
({{ __('team.net_turnover') }}:
{{ formatNumber($cbot->business_user->sales_volume_total) }} &euro; /
{{ $cbot->business_user->margin }} %)
<br>
<em>{{ __('team.consultant_margin_info') }}</em>
</td>
</tr>
</tbody>
</table>
</div>
@endif
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>
<tr>
<th>{{ __('tables.date') }}</th>
<th>{{ __('tables.net_sales') }}</th>
<th>{{ __('tables.margin') }} %</th>
<th>{{ __('tables.margin') }} &euro;</th>
<th>{{ __('tables.order') }}</th>
</tr>
</thead>
<tbody>
@foreach ($order->user_sales_volumes as $user_sales_volume)
<tr>
<td>{{ $user_sales_volume->date }}</td>
<td>{{ formatNumber($user_sales_volume->total_net) }} &euro;</td>
<td>{{ $cbot->business_user->margin }} %</td>
<td>{{ formatNumber($user_sales_volume->caluCommissonTotalNet($cbot->business_user->margin)) }} &euro;</td>
<td>
{{ $user_sales_volume->shopping_order_id }}
@if ($user_sales_volume->shopping_order)
<br><span
class="small">{{ $user_sales_volume->shopping_order->getShoppingUserFullName() }}</span>
@endif
</td>
</tr>
@endforeach
</tbody>
<tfoot>
<tr style="background-color: #28c3d7; color:#fff;">
<td class="text-left"><b>{{ __('tables.total') }}<b></td>
<td>{{ formatNumber($order->credit_total_net) }} &euro;</td>
<td>&nbsp;</td>
<td><strong>{{ formatNumber($cbot->business_user->getSalesVolumeTotalMargin()) }} &euro;</strong></td>
<td>&nbsp;</td>
</tr>
</tfoot>
</table>
</div>
<hr>
@endif
{{-- Provision Shop --}}
@if (isset($collection->commission_shop[$date]))
@php($cs = $collection->commission_shop[$date])
@if (isset($cbot))
@ -159,8 +231,8 @@
</tbody>
<tfoot>
<tr>
<td class="text-right"> {{ __('tables.total') }} </td>
<tr style="background-color: #b5c49b;">
<td class="text-left"><b>{{ __('tables.total') }}</b></td>
<td>{{ formatNumber($cs->user_sales_volumes_total->month_shop_total_net) }} &euro;</td>
<td>&nbsp;</td>
<td><strong>{{ formatNumber($cbot->business_user->commission_shop_sales) }} &euro;</strong></td>
@ -173,78 +245,9 @@
@endif
@if (isset($collection->own_order[$date]))
@php($order = $collection->own_order[$date])
@if (isset($cbot))
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
<tr>
<td>
<strong>{{ __('team.own') }} {{ __('tables.margin') }} </strong>
</td>
<td>
<span class="badge badge-primary"
style="font-size: 1em;"><strong>
{{ formatNumber($cbot->business_user->getSalesVolumeTotalMargin()) }}
&euro;</strong></span>
&nbsp;
({{ __('team.net_turnover') }}:
{{ formatNumber($cbot->business_user->sales_volume_total) }} &euro; /
{{ $cbot->business_user->margin }} %)
<br>
<em>{{ __('team.consultant_margin_info') }}</em>
</td>
</tr>
</tbody>
</table>
</div>
@endif
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>
<tr>
<th>{{ __('tables.date') }}</th>
<th>{{ __('tables.net_sales') }}</th>
<th>{{ __('tables.margin') }} %</th>
<th>{{ __('tables.margin') }} &euro;</th>
<th>{{ __('tables.order') }}</th>
</tr>
</thead>
<tbody>
@foreach ($order->user_sales_volumes as $user_sales_volume)
<tr>
<td>{{ $user_sales_volume->date }}</td>
<td>{{ formatNumber($user_sales_volume->total_net) }} &euro;</td>
<td>{{ $cbot->business_user->margin }} %</td>
<td>{{ formatNumber($user_sales_volume->caluCommissonTotalNet($cbot->business_user->margin)) }} &euro;</td>
<td>
{{ $user_sales_volume->shopping_order_id }}
@if ($user_sales_volume->shopping_order)
<br><span
class="small">{{ $user_sales_volume->shopping_order->getShoppingUserFullName() }}</span>
@endif
</td>
</tr>
@endforeach
</tbody>
<tfoot>
<tr>
<td class="text-right"> {{ __('tables.total') }} </td>
<td>{{ formatNumber($order->credit_total_net) }} &euro;</td>
<td>&nbsp;</td>
<td><strong>{{ formatNumber($cbot->business_user->getSalesVolumeTotalMargin()) }} &euro;</strong></td>
<td>&nbsp;</td>
</tr>
</tfoot>
</table>
</div>
<hr>
@endif
{{-- Points Registration
@if (isset($collection->commission_registration[$date]))
@php($cr = $collection->commission_registration[$date])
<div class="card-header">
@ -288,8 +291,10 @@
<hr>
@endif
--}}
@if (isset($cbot))
@if (isset($cbot))
{{-- Payline Points / Provision / Wachstumsbonus
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
@ -317,6 +322,9 @@
</tbody>
</table>
</div>
--}}
{{-- Payline Points / Provision / Wachstumsbonus
<hr>
<div class="card-header">
<table class="table user-view-table m-0">
@ -364,6 +372,9 @@
</tbody>
</table>
</div>
--}}
{{-- Table Payline Points / Provision / Wachstumsbonus
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>
@ -404,7 +415,32 @@
</tfoot>
</table>
</div>
<hr>
<hr>
--}}
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
@if($cbot->business_user->version == 2)
<tr>
<td><strong>{{ __('team.commission_payline') }}:</strong></td>
<td>
<span class="badge badge-secondary" style="font-size: 1em;"><strong>{{ formatNumber($cbot->business_user->commission_pp_total) }} &euro;</strong></span>
</td>
</tr>
<tr>
<td><strong>{{ __('team.commission_WB') }}:</strong></td>
<td>
<span class="badge badge-secondary" style="font-size: 1em;"><strong>{{ formatNumber($cbot->business_user->commission_growth_total) }} &euro;</strong></span>
</td>
</tr>
@endif
</tbody>
</table>
</div>
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">

4
resources/views/admin/payment_method/index.blade.php
View file

@ -14,7 +14,7 @@
<th>{{__('Name')}}</th>
<th>{{__('sichtbar') }}</th>
<th>{{__('Standard')}}</th>
<th>{{__('Abo')}}</th>
<th>{{__('abo.abo')}}</th>
<th>{{__('tables.status')}}</th>
</tr>
</thead>
@ -36,7 +36,7 @@
</td>
<td>{{ $value->pos }}</td>
<td>{{ $value->name }} ({{ $value->short }})</td>
<td>{!! implode($value->getShowOnTypes(), '<br>') !!}</td>
<td>{!! implode('<br>', $value->getShowOnTypes()) !!}</td>
<td data-sort="{{ $value->default }}">{!! get_active_badge($value->default) !!}</td>
<td data-sort="{{ $value->is_abo }}">{!! get_active_badge($value->is_abo) !!}</td>
<td data-sort="{{ $value->active }}">{!! get_active_badge($value->active) !!}</td>

2
resources/views/admin/product/index.blade.php
View file

@ -63,7 +63,7 @@
<td>{{ $value->getUnitType() }}</td>
<td>{{ $value->getBasePriceFormatted() }}</td>
<td>{{ $value->weight }}</td>
<td>{!! implode($value->getShowOnTypes(), '<br>') !!}</td>
<td>{!! implode('<br>', $value->getShowOnTypes()) !!}</td>
<td data-sort="{{ $value->shipping_addon }}">{!! get_active_badge($value->shipping_addon) !!}</td>
<td data-sort="{{ $value->no_commission }}">{!! get_active_badge($value->no_commission) !!}</td>
<td data-sort="{{ $value->no_free_shipping }}">{!! get_active_badge($value->no_free_shipping) !!}</td>

8
resources/views/admin/sales/_detail_collection.blade.php
View file

@ -18,13 +18,13 @@
</td>
<td class="text-right">
{{$shop_item['points_total']}}
{{ number_format($shop_item['points_total'], 0) }}
</td>
<td class="text-right">
{{ formatNumber($shop_item['user_price_net']) }} &euro;
</td>
<td class="text-right">
{{$shop_item['qty']}}
{{ number_format($shop_item['qty'], 0) }}
</td>
<td class="text-right">
@ -72,12 +72,12 @@
{{ __('order.sums') }}
</td>
<td class="text-right" colspan="1">
<strong>{{ $shopping_order->shopping_collect_order->points }} <strong>
<strong>{{ number_format($shopping_order->shopping_collect_order->points, 0) }} <strong>
</td>
<td class="text-right">
</td>
<td class="text-right">
<strong>{{ $shopping_order->shopping_collect_order->qty_total }}</strong>
<strong>{{ number_format($shopping_order->shopping_collect_order->qty_total, 0) }}</strong>
</td>
<td class="text-right">
<strong>{{ formatNumber($shopping_order->shopping_collect_order->price_total_net) }} &euro;</strong>

13
resources/views/admin/sales/_detail_shopping_order.blade.php
View file

@ -25,12 +25,19 @@
@endif
<div class="media-body">
<a href="{{route('admin_product_edit', [$shopping_order_item->product->id])}}" class="d-block">{{ $shopping_order_item->product->getLang('name') }}
<span class="text-muted">#{{ $shopping_order_item->product->number }}</span></a>
<a href="{{route('admin_product_edit', [$shopping_order_item->product->id])}}" class="d-block"><strong>{{ $shopping_order_item->product->getLang('name') }} </strong>
@if($shopping_order->is_abo)
&nbsp; {!! get_abo_type_badge_by_product($shopping_order_item->product) !!}
@endif
</a>
<small>
<span class="text-muted">{{ __('order.content') }}: </span> {{ $shopping_order_item->product->contents }}<br>
<span class="text-muted">{{ __('order.weight') }}: </span> {{ $shopping_order_item->product->weight }} g<br>
<span class="text-muted">{{ __('order.points') }}: </span> {{ $shopping_order_item->product->points }}
<span class="text-muted">{{ __('order.points') }}: </span> {{ $shopping_order_item->product->points }}<br>
<span class="text-muted">{{ __('order.number') }}: </span> {{ $shopping_order_item->product->number }}
</small>
</div>
@endif

1
resources/views/admin/sales/customers.blade.php
View file

@ -43,7 +43,6 @@
</a>
</div>
</div>
</div>
<div class="card-datatable table-responsive">
<table class="datatable-customers table table-striped table-bordered" id="datatable-customers">

2
resources/views/admin/settings/index.blade.php
View file

@ -21,7 +21,7 @@
<label class="custom-control custom-checkbox mt-3">
{!! Form::checkbox('settings[is_comp_me_abo][val]', 1, \App\Models\Setting::getContentBySlug('is_comp_me_abo'), ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">Kompensationprodukt für Berater bei Abo - regelmäßige Lieferungn</span>
<span class="custom-control-label">Kompensationprodukt für Berater bei Abo - regelmäßige Lieferungen</span>
</label>
{{ Form::hidden('settings[is_comp_me_abo][type]', 'bool') }}
</div>

549
resources/views/emails/checkout.blade.php
View file

@ -145,10 +145,12 @@
{!! nl2br($copy1line) !!}
</td>
</tr>
<tr>
<td class="sub_headline">
<hr><br>
@if($shopping_order->is_abo)
<b>{{ __('abo.abo') }} / </b>
@endif
@if($shopping_order->shopping_user->is_from === 'user_order')
@if($shopping_order->shopping_user->is_for === 'me')
<b>{{__('email.checkout_mail_order_for_me')}}</b>
@ -173,7 +175,7 @@
<b>{{__('email.checkout_mail_order_for_extern')}}</b>
@endif
@if($shopping_order->shopping_user->is_from === 'collection')
<b>Berater Sammelrechnung</b><br>
<b>Berater Sammelrechnung</b>
@endif
</td>
</tr>
@ -189,306 +191,317 @@
</td>
</tr>
<tr>
<td>
<hr>
</td>
</tr>
@if($shopping_order->shopping_user->is_from !== 'extern')
@if($send_link)
<tr>
<td>
<center>
<table role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
<tbody>
<tr>
<td style="word-wrap:break-word;background:transparent;font-size:0px;padding:10px 25px;padding-top:15px;padding-bottom:15px;padding-right:40px;padding-left:40px;" align="center" valign="top" background="data:image/gif;base64,">
<table role="presentation" cellpadding="0" cellspacing="0" align="center" border="0">
<tbody>
<tr>
<td style="border:none;border-radius:20px;color:#ffffff;cursor:auto;padding:15px 25px;" align="center" valign="middle" bgcolor="#b5c49b">
<p style="text-decoration:none;background:#b5c49b;color:#ffffff;font-family:Arial, sans-serif;font-size:13px;font-weight:normal;line-height:120%;text-transform:none;margin:0px;text-align: center">
<a href="{{ $url }}" style="color:#ffffff;font-size:14px;font-weight:bold;text-align:center;text-decoration:none;-webkit-text-size-adjust:none;">{{ $button }}</a>
</p>
</td>
</tr>
<tr>
<td style="color:#37302d;text-align: center">
<span style="color: #cabda9; font-weight: normal; font-size: 13px; text-decoration: underline; word-wrap: break-word;white-space: pre-line;">{{ $url }}</span>
</td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
</center>
</td>
<tr>
<tr>
<td>
<hr>
</td>
</tr>
@endif
<tr>
<td class="sub_headline" style="line-height:1.6em;">
<b>{{__('email.checkout_mail_pay_info')}}</b>
</td>
</tr>
<tr>
<td>
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
@if($send_link)
<tr>
<td>
<center>
<table role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
<tbody>
<tr>
<td style="line-height:1.6em;">
<b>{{__('email.checkout_mail_pay_success')}} </b><br>
@if($shopping_payment)
{{__('email.checkout_mail_pay_with')}} {{$shopping_payment->getPaymentType()}}<br>
{{__('email.checkout_mail_pay_ref')}} {{$shopping_payment->reference}}<br>
@endif
{{__('email.checkout_mail_your_mail')}} {{ $shopping_order->shopping_user->billing_email }}<br>
<td style="word-wrap:break-word;background:transparent;font-size:0px;padding:10px 25px;padding-top:15px;padding-bottom:15px;padding-right:40px;padding-left:40px;" align="center" valign="top" background="data:image/gif;base64,">
<table role="presentation" cellpadding="0" cellspacing="0" align="center" border="0">
<tbody>
<tr>
<td style="border:none;border-radius:20px;color:#ffffff;cursor:auto;padding:15px 25px;" align="center" valign="middle" bgcolor="#b5c49b">
<p style="text-decoration:none;background:#b5c49b;color:#ffffff;font-family:Arial, sans-serif;font-size:13px;font-weight:normal;line-height:120%;text-transform:none;margin:0px;text-align: center">
<a href="{{ $url }}" style="color:#ffffff;font-size:14px;font-weight:bold;text-align:center;text-decoration:none;-webkit-text-size-adjust:none;">{{ $button }}</a>
</p>
</td>
</tr>
<tr>
<td style="color:#37302d;text-align: center">
<span style="color: #cabda9; font-weight: normal; font-size: 13px; text-decoration: underline; word-wrap: break-word;white-space: pre-line;">{{ $url }}</span>
</td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
</td>
</tr>
<tr>
<td>
<hr>
</td>
</tr>
</center>
</td>
</tr>
@endif
@if($shopping_order->is_abo)
<tr>
<td class="sub_headline">
<b>{{__('email.checkout_mail_invoice_addess')}}</b>
</td>
<tr>
<td style="color:#37302d; ">
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="color:#37302d;line-height:1.6em;">
@if($shopping_order->shopping_user->billing_company)
{{ $shopping_order->shopping_user->billing_company }}<br>
@endif
{{ $shopping_order->shopping_user->billing_firstname }}
{{ $shopping_order->shopping_user->billing_lastname }} <br>
{{ $shopping_order->shopping_user->billing_address }} <br>
@if($shopping_order->shopping_user->billing_address_2)
{{ $shopping_order->shopping_user->billing_address_2 }}<br>
@endif
{{ $shopping_order->shopping_user->billing_zipcode }}
{{ $shopping_order->shopping_user->billing_city }} <br>
{{ $shopping_order->shopping_user->billing_country->getLocated() }} <br>
@if($shopping_order->shopping_user->billing_phone)
<br>{{ $shopping_order->shopping_user->billing_phone }}<br>
@endif
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="sub_headline" style="line-height:1.6em;">
@if($shopping_order->shopping_user->is_from === 'user_order')
@if($shopping_order->shopping_user->is_for === 'me')
<b>{{__('email.checkout_mail_deliver_addess')}}</b>
@else
<b>{{__('email.checkout_mail_deliver_customer')}}</b>
@endif
@else
<b>{{__('email.checkout_mail_deliver_addess')}}</b>
@endif
<hr><br>
<b>{{ __('abo.checkout_mail_abo_hl') }}</b>
</td>
</tr>
<tr>
<td style="color:#37302d;">
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="0" cellspacing="0" width="100%">
@php($user_abo = $shopping_order->getUserAbo())
@if($user_abo)
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="color:#37302d;line-height:1.6em;">
@if($shopping_order->shopping_user->same_as_billing)
{{__('email.checkout_mail_same_address')}}
@else
@if($shopping_order->shopping_user->shipping_company)
{{ $shopping_order->shopping_user->shipping_company }}<br>
@endif
{{ $shopping_order->shopping_user->shipping_firstname }}
{{ $shopping_order->shopping_user->shipping_lastname }} <br>
{{ $shopping_order->shopping_user->shipping_address }} <br>
@if($shopping_order->shopping_user->shipping_address_2)
{{ $shopping_order->shopping_user->shipping_address_2 }}<br>
@endif
{{ $shopping_order->shopping_user->shipping_zipcode }}
{{ $shopping_order->shopping_user->shipping_city }} <br>
{{ $shopping_order->shopping_user->shipping_country->getLocated() }} <br>
@if($shopping_order->shopping_user->shipping_phone)
<br> {{ $shopping_order->shopping_user->shipping_phone }}<br>
@endif
@if($shopping_order->abo_interval)
{{__('abo.checkout_mail_abo_start')}}<br>
{{__('tables.start_date')}}: <b>{{ $user_abo->start_date }}</b><br>
@endif
{{__('tables.next_date')}}: <b>{{ $user_abo->next_date }}</b><br>
{{__('tables.abo_delivery_day')}}: <b>{{ \App\Services\HTMLHelper::getAboStrLang($user_abo->abo_interval) }}</b><br>
{{ __('abo.checkout_mail_abo_info') }}
</td>
</tr>
</table>
@endif
</td>
</tr>
<tr>
<td>
<hr>
</td>
</tr>
<tr>
<td style="color:#37302d;font-size: 14px;line-height:1.6em;">
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="color:#37302d;line-height:1.6em;">
{{ $copy3line }}
<br>
@if($shopping_order->member)
@if($shopping_order->member->shop && $shopping_order->member->isActiveShop())
@if($shopping_order->member->shop->title)
<b>{{ $shopping_order->member->shop->title }}</b><br>
@endif
@if($shopping_order->member->shop->contact)
{!! nl2br($shopping_order->member->shop->contact) !!}<br>
@endif
<a href="{{ $shopping_order->member->shop->getSubdomain(true) }}">{{ $shopping_order->member->shop->getSubdomain(true) }}</a>
@else
Dein Berater: {{$shopping_order->member->getFullName()}}
@endif
@endif
<hr><br>
{{ $greetings }} <br><b>{{ $sender }}</b>
<br>
</td>
</tr>
<tr>
<td><br></td>
</tr>
</table>
</td>
</tr>
@else
@if($shopping_order->wp_invoice_path)
<tr>
<td class="sub_headline">
<b>Rechnung: <a href="{{$shopping_order->wp_invoice_path}}">{{$shopping_order->wp_invoice_path}}</a></b><br>
<hr>
</td>
<tr>
@endif
@if($shopping_order->api_notice['wp_advertising'])
@endif
<tr>
<td class="sub_headline" style="line-height:1.6em;">
<hr><br>
<b>{{__('email.checkout_mail_pay_info')}}</b>
</td>
</tr>
<tr>
<td>
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
<tr>
<td class="sub_headline">
<b>Werbemittel: {!! $shopping_order->api_notice['wp_advertising'] !!}<br></b>
<hr>
<td style="line-height:1.6em;">
<b>{{__('email.checkout_mail_pay_success')}} </b><br>
@if($shopping_payment)
{{__('email.checkout_mail_pay_with')}} {{$shopping_payment->getPaymentType()}}<br>
{{__('email.checkout_mail_pay_ref')}} {{$shopping_payment->reference}}<br>
@endif
{{__('email.checkout_mail_your_mail')}} {{ $shopping_order->shopping_user->billing_email }}<br>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="sub_headline">
<hr><br>
<b>{{__('email.checkout_mail_invoice_addess')}}</b>
</td>
<tr>
<td style="color:#37302d;">
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="0" cellspacing="0" width="100%">
<tr>
@endif
@if($shopping_order->api_notice['wp_incentives'])
<td style="color:#37302d;line-height:1.6em;">
@if($shopping_order->shopping_user->billing_company)
{{ $shopping_order->shopping_user->billing_company }}<br>
@endif
{{ $shopping_order->shopping_user->billing_firstname }}
{{ $shopping_order->shopping_user->billing_lastname }} <br>
{{ $shopping_order->shopping_user->billing_address }} <br>
@if($shopping_order->shopping_user->billing_address_2)
{{ $shopping_order->shopping_user->billing_address_2 }}<br>
@endif
{{ $shopping_order->shopping_user->billing_zipcode }}
{{ $shopping_order->shopping_user->billing_city }} <br>
{{ $shopping_order->shopping_user->billing_country->getLocated() }} <br>
@if($shopping_order->shopping_user->billing_phone)
<br>{{ $shopping_order->shopping_user->billing_phone }}<br>
@endif
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="sub_headline" style="line-height:1.6em;">
@if($shopping_order->shopping_user->is_from === 'user_order')
@if($shopping_order->shopping_user->is_for === 'me')
<b>{{__('email.checkout_mail_deliver_addess')}}</b>
@else
<b>{{__('email.checkout_mail_deliver_customer')}}</b>
@endif
@else
<b>{{__('email.checkout_mail_deliver_addess')}}</b>
@endif
</td>
</tr>
<tr>
<td style="color:#37302d;">
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="color:#37302d;line-height:1.6em;">
@if($shopping_order->shopping_user->same_as_billing)
{{__('email.checkout_mail_same_address')}}
@else
@if($shopping_order->shopping_user->shipping_company)
{{ $shopping_order->shopping_user->shipping_company }}<br>
@endif
{{ $shopping_order->shopping_user->shipping_firstname }}
{{ $shopping_order->shopping_user->shipping_lastname }} <br>
{{ $shopping_order->shopping_user->shipping_address }} <br>
@if($shopping_order->shopping_user->shipping_address_2)
{{ $shopping_order->shopping_user->shipping_address_2 }}<br>
@endif
{{ $shopping_order->shopping_user->shipping_zipcode }}
{{ $shopping_order->shopping_user->shipping_city }} <br>
{{ $shopping_order->shopping_user->shipping_country->getLocated() }} <br>
@if($shopping_order->shopping_user->shipping_phone)
<br> {{ $shopping_order->shopping_user->shipping_phone }}<br>
@endif
@endif
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td>
<hr>
</td>
</tr>
<tr>
<td style="color:#37302d;font-size: 14px;line-height:1.6em;">
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="color:#37302d;line-height:1.6em;">
{{ $copy3line }}
<br>
@if($shopping_order->member)
@if($shopping_order->member->shop && $shopping_order->member->isActiveShop())
@if($shopping_order->member->shop->title)
<b>{{ $shopping_order->member->shop->title }}</b><br>
@endif
@if($shopping_order->member->shop->contact)
{!! nl2br($shopping_order->member->shop->contact) !!}<br>
@endif
<a href="{{ $shopping_order->member->shop->getSubdomain(true) }}">{{ $shopping_order->member->shop->getSubdomain(true) }}</a>
@else
Dein Berater: {{$shopping_order->member->getFullName()}}
@endif
@endif
<hr><br>
{{ $greetings }} <br><b>{{ $sender }}</b>
<br>
</td>
</tr>
<tr>
<td><br></td>
</tr>
</table>
</td>
</tr>
@else
@if($shopping_order->wp_invoice_path)
<tr>
<td class="sub_headline">
<b>Rechnung: <a href="{{$shopping_order->wp_invoice_path}}">{{$shopping_order->wp_invoice_path}}</a></b><br>
<hr>
</td>
<tr>
@endif
@if($shopping_order->api_notice['wp_advertising'])
<tr>
<td class="sub_headline">
<b>Incentives: {!! $shopping_order->api_notice['wp_incentives'] !!}<br></b>
<hr>
<b>Werbemittel: {!! $shopping_order->api_notice['wp_advertising'] !!}<br></b>
<hr>
</td>
<tr>
@endif
@endif
@if($shopping_order->api_notice['wp_incentives'])
<tr>
<td class="sub_headline">
<b>{{__('email.checkout_mail_deliver_customer')}}</b>
<b>Incentives: {!! $shopping_order->api_notice['wp_incentives'] !!}<br></b>
<hr>
</td>
<tr>
<tr>
<td style="color:#37302d; ">
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="color:#37302d;line-height:1.6em;">
@if($shopping_order->shopping_user->same_as_billing)
@if($shopping_order->shopping_user->billing_company)
{{ $shopping_order->shopping_user->billing_company }}<br>
@endif
{{ $shopping_order->shopping_user->billing_firstname }}
{{ $shopping_order->shopping_user->billing_lastname }} <br>
<br>
{{ $shopping_order->shopping_user->billing_address }} <br>
@if($shopping_order->shopping_user->billing_address_2)
{{ $shopping_order->shopping_user->billing_address_2 }}<br>
@endif
{{ $shopping_order->shopping_user->billing_zipcode }}
{{ $shopping_order->shopping_user->billing_city }} <br>
{{ $shopping_order->shopping_user->billing_country->getLocated() }} <br>
@if($shopping_order->shopping_user->billing_phone)
<br><br> {{ $shopping_order->shopping_user->billing_phone }}<br>
@endif
@else
@if($shopping_order->shopping_user->shipping_company)
{{ $shopping_order->shopping_user->shipping_company }}<br>
@endif
{{ $shopping_order->shopping_user->shipping_firstname }}
{{ $shopping_order->shopping_user->shipping_lastname }} <br>
<br>
{{ $shopping_order->shopping_user->shipping_address }} <br>
@if($shopping_order->shopping_user->shipping_address_2)
{{ $shopping_order->shopping_user->shipping_address_2 }}<br>
@endif
{{ $shopping_order->shopping_user->shipping_zipcode }}
{{ $shopping_order->shopping_user->shipping_city }} <br>
{{ $shopping_order->shopping_user->shipping_country->getLocated() }} <br>
@if($shopping_order->shopping_user->shipping_phone)
<br><br> {{ $shopping_order->shopping_user->shipping_phone }}<br>
@endif
@endif
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td>
<hr>
</td>
</tr>
<tr>
<td class="sub_headline">
<b>{{__('email.checkout_copy3line_extern')}}</b>
</td>
<tr>
<tr>
<td style="color:#37302d;font-size: 14px;line-height:1.6em;">
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="color:#37302d;line-height:1.6em;">
@if($shopping_order->member)
Berater: {{ \App\Services\HTMLHelper::getSalutationLang($shopping_order->member->account->m_salutation) }} {{ $shopping_order->member->account->m_first_name }} {{ $shopping_order->member->account->m_last_name }}
<br>
Berater-ID: {{ $shopping_order->member->account->m_account }} <br>
@if($shopping_order->member->user_level)
Karriere-Level: {{ $shopping_order->member->user_level->getLang('name') }} <br>
@endif
@endif
<tr>
<td class="sub_headline">
<b>{{__('email.checkout_mail_deliver_customer')}}</b>
</td>
<tr>
<tr>
<td style="color:#37302d; ">
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="color:#37302d;line-height:1.6em;">
@if($shopping_order->shopping_user->same_as_billing)
@if($shopping_order->shopping_user->billing_company)
{{ $shopping_order->shopping_user->billing_company }}<br>
@endif
</td>
</tr>
<tr>
<td><br></td>
</tr>
</table>
</td>
</tr>
{{ $shopping_order->shopping_user->billing_firstname }}
{{ $shopping_order->shopping_user->billing_lastname }} <br>
<br>
{{ $shopping_order->shopping_user->billing_address }} <br>
@if($shopping_order->shopping_user->billing_address_2)
{{ $shopping_order->shopping_user->billing_address_2 }}<br>
@endif
{{ $shopping_order->shopping_user->billing_zipcode }}
{{ $shopping_order->shopping_user->billing_city }} <br>
{{ $shopping_order->shopping_user->billing_country->getLocated() }} <br>
@if($shopping_order->shopping_user->billing_phone)
<br><br> {{ $shopping_order->shopping_user->billing_phone }}<br>
@endif
@else
@if($shopping_order->shopping_user->shipping_company)
{{ $shopping_order->shopping_user->shipping_company }}<br>
@endif
{{ $shopping_order->shopping_user->shipping_firstname }}
{{ $shopping_order->shopping_user->shipping_lastname }} <br>
<br>
{{ $shopping_order->shopping_user->shipping_address }} <br>
@if($shopping_order->shopping_user->shipping_address_2)
{{ $shopping_order->shopping_user->shipping_address_2 }}<br>
@endif
{{ $shopping_order->shopping_user->shipping_zipcode }}
{{ $shopping_order->shopping_user->shipping_city }} <br>
{{ $shopping_order->shopping_user->shipping_country->getLocated() }} <br>
@if($shopping_order->shopping_user->shipping_phone)
<br><br>{{ $shopping_order->shopping_user->shipping_phone }}<br>
@endif
@endif
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td>
<hr>
</td>
</tr>
<tr>
<td class="sub_headline">
<b>{{__('email.checkout_copy3line_extern')}}</b>
</td>
<tr>
<tr>
<td style="color:#37302d;font-size: 14px;line-height:1.6em;">
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="color:#37302d;line-height:1.6em;">
@if($shopping_order->member)
Berater: {{ \App\Services\HTMLHelper::getSalutationLang($shopping_order->member->account->m_salutation) }} {{ $shopping_order->member->account->m_first_name }} {{ $shopping_order->member->account->m_last_name }}
<br>
Berater-ID: {{ $shopping_order->member->account->m_account }} <br>
@if($shopping_order->member->user_level)
Karriere-Level: {{ $shopping_order->member->user_level->getLang('name') }} <br>
@endif
@endif
</td>
</tr>
<tr>
<td><br></td>
</tr>
</table>
</td>
</tr>
@endif
</table>
<center>
<table cellpadding="0" cellspacing="0" class="force-full-width"

59
resources/views/emails/checkout_status.blade.php
View file

@ -145,7 +145,6 @@
{!! nl2br($copy1line) !!}
</td>
</tr>
<tr>
<td class="sub_headline">
<b>{{__('email.checkout_mail_status_info')}}</b>
@ -182,21 +181,31 @@
<b>{{__('email.checkout_mail_pay_invoice_open')}}</b><br>
@else
<b>{{__('email.checkout_mail_system_status')}} {{$txaction}}</b><br>
@endif
{{__('email.checkout_mail_pay_with')}} {{$shopping_payment->getPaymentType()}}<br>
{{__('email.checkout_mail_pay_ref')}} {{$shopping_payment->reference}}<br>
{{__('email.checkout_mail_your_mail')}} {{ $shopping_order->shopping_user->billing_email }}<br>
@if($txaction === 'error' && isset($payment_error))
<hr>
<b>
@if(isset($payment_error['errorcode'])) {{ $payment_error['errorcode'] }} | @endif
@if(isset($payment_error['errormessage'])) {{ $payment_error['errormessage'] }} @endif
</b><br>
@if(isset($payment_error['customermessage'])) {{ $payment_error['customermessage'] }} @endif
<br>
@endif
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="sub_headline">
<hr><br>
@if($shopping_order->is_abo)
<b>{{ __('abo.abo') }} / </b>
@endif
@if($shopping_order->shopping_user->is_from === 'user_order')
@if($shopping_order->shopping_user->is_for === 'me')
<b>{{__('email.checkout_mail_order_for_me')}}</b>
@ -221,7 +230,7 @@
<b>{{__('email.checkout_mail_order_for_extern')}}</b>
@endif
@if($shopping_order->shopping_user->is_from === 'collection')
<b>Berater Sammelrechnung</b><br>
<b>Berater Sammelrechnung</b>
@endif
</td>
</tr>
@ -236,18 +245,42 @@
@endif
</td>
</tr>
@if($shopping_order->is_abo)
<tr>
<td>
<hr>
<td class="sub_headline">
<hr><br>
<b>{{ __('abo.checkout_mail_abo_hl') }}</b>
</td>
</tr>
<tr>
<td style="color:#37302d;">
@php($user_abo = $shopping_order->getUserAbo())
@if($user_abo)
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="color:#37302d;line-height:1.6em;">
@if($shopping_order->abo_interval)
{{__('abo.checkout_mail_abo_start')}}<br>
{{__('tables.start_date')}}: <b>{{ $user_abo->start_date }}</b><br>
@endif
{{__('tables.next_date')}}: <b>{{ $user_abo->next_date }}</b><br>
{{__('tables.abo_delivery_day')}}: <b>{{ \App\Services\HTMLHelper::getAboStrLang($user_abo->abo_interval) }}</b><br>
{{ __('abo.checkout_mail_abo_info') }}
</td>
</tr>
</table>
@endif
</td>
</tr>
@endif
<tr>
<td class="sub_headline">
<hr><br>
<b>{{__('email.checkout_mail_invoice_addess')}}</b>
</td>
</tr>
<tr>
<td style="color:#37302d; ">
<td style="color:#37302d;">
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="color:#37302d;line-height:1.6em;">
@ -271,14 +304,9 @@
</table>
</td>
</tr>
<tr>
<td>
<hr>
</td>
</tr>
<tr>
<td class="sub_headline">
<hr><br>
@if($shopping_order->shopping_user->is_from === 'user_order')
@if($shopping_order->shopping_user->is_for === 'me')
<b>{{__('email.checkout_mail_deliver_addess')}}</b>
@ -316,7 +344,6 @@
@endif
</td>
</tr>
</table>
</td>
</tr>

2
resources/views/emails/collection_detail.blade.php
View file

@ -14,7 +14,7 @@
{{ formatNumber($shop_item['user_price_net']) }} &euro;
</td>
<td style="color:#37302d; text-align: center; vertical-align: top; width: 10%;line-height:1.6em;">
{{$shop_item['qty']}}
{{ number_format($shop_item['qty'], 0) }}
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
{{ formatNumber($shop_item['user_price_total_net']) }} &euro;

2
resources/views/emails/custom_payment_detail.blade.php
View file

@ -16,7 +16,7 @@
@foreach($yard_shopping_items['items'] as $items)
<tr>
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
{{ $items->name }}
<strong>{{ $items->name }}</strong> @if($items->abo_type) {{ __('abo.abo') }} {{ __('abo.'.$items->abo_type) }} @endif
</td>
<td style="color:#37302d; text-align: center; vertical-align: top;line-height:1.6em;">
@if($yard_shopping_items['tax_free'])

47
resources/views/layouts/includes/layout-sidenav.blade.php
View file

@ -13,7 +13,7 @@
</li>
@if(Auth::user()->showSideNav())
<li class="sidenav-item @if(Request::is('user/edit', 'user/membership', 'user/documents', 'user/payment/credit')) open @endif">
<li class="sidenav-item @if(Request::is('user/edit', 'user/membership', 'user/documents', 'user/payment/credit', 'user/abos/me', 'user/abos/detail/me/*')) open @endif">
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
<i class="sidenav-icon ion ion-ios-contact"></i>
<div>{{ __('navigation.my_account') }}</div>
@ -22,6 +22,15 @@
<li class="sidenav-item{{ Request::is('user/payment/credit') ? ' active' : '' }}">
<a href="{{ route('user_payment_credit') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-cash"></i><div>{{ __('navigation.credit') }}</div></a>
</li>
@if(Auth::user()->isVIP())
<li class="sidenav-item{{ Request::is('user/abos/me', 'user/abos/detail/me/*') ? ' active' : '' }}">
<a href="{{ route('user_abos', ['me']) }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-refresh-circle"></i><div>{{ __('navigation.myabo') }}</div>
<div class="pl-1 ml-auto">
<div class="badge badge-secondary">VIP</div>
</div>
</a>
</li>
@endif
<li class="sidenav-item{{ Request::is('user/edit') ? ' active' : '' }}">
<a href="{{ route('user_edit') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-create"></i><div>{{ __('navigation.my_data') }}</div></a>
</li>
@ -35,7 +44,7 @@
</li>
@if(Auth::user()->isActiveShop())
<li class="sidenav-item @if(Request::is('user/shop', 'user/shop/*')) open @endif">
<li class="sidenav-item @if(Request::is('user/shop')) open @endif">
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
<i class="sidenav-icon ion ion-ios-basket"></i>
<div>{{ __('navigation.my_shop') }}</div>
@ -84,7 +93,7 @@
</li>
@endif
@if(Auth::user()->isActiveAccount())
<li class="sidenav-item @if(Request::is('user/customers', 'user/customer/*')) open @endif">
<li class="sidenav-item @if(Request::is('user/customers', 'user/customer/*', 'user/abos/ot', 'user/shop/*', 'user/abos/detail/ot/*')) open @endif">
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
<i class="sidenav-icon ion ion-md-contacts"></i>
<div>{{ __('navigation.my_clients') }}</div>
@ -96,6 +105,21 @@
<li class="sidenav-item{{ Request::is('user/customer/add/*') ? ' active' : '' }}">
<a href="{{ route('user_customer_add', ['new']) }}" class="sidenav-link"><i class="sidenav-icon ion ion ion-md-person-add"></i><div>{{ __('navigation.add') }}</div></a>
</li>
<li class="sidenav-item{{ Request::is('user/shop/orders', 'user/shop/order/*') ? ' active' : '' }}">
<a href="{{ route('user_shop_orders') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-cart"></i><div>{{ __('navigation.orders') }}</div></a>
</li>
@if(Auth::user()->isVIP())
<li class="sidenav-item{{ Request::is('user/abos/ot', 'user/abos/detail/ot/*') ? ' active' : '' }}">
<a href="{{ route('user_abos', ['ot']) }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-refresh-circle"></i><div>{{ __('navigation.customerabos') }}</div>
<div class="pl-1 ml-auto">
<div class="badge badge-secondary">VIP</div>
</div>
</a>
</li>
@endif
</ul>
</li>
@endif
@ -112,8 +136,10 @@
<li class="sidenav-item{{ Request::is('user/order/my/*') ? ' active' : '' }}">
<a href="{{ route('user_order_my_delivery', ['me']) }}" class="sidenav-link"><i class="sidenav-icon ion ion ion-md-basket"></i><div>{{ __('navigation.do_order') }}</div></a>
</li>
<li class="sidenav-item{{ Request::is('user/order/payment/links', 'user/order/payment/*') ? ' active' : '' }}">
<a href="{{ route('user_order_payment_links') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-link"></i><div>{{ __('navigation.payment_links') }}</div></a>
</li>
</ul>
</li>
@endif
@if(Auth::user()->isActiveAccount())
<li class="sidenav-item @if(Request::is('user/homepartys', 'user/homeparty/*')) open @endif">
@ -129,7 +155,6 @@
</li>
@endif
@if(Auth::user()->isActiveAccount())
<li class="sidenav-item{{ Request::is('user/downloadcenter') ? ' active' : '' }}">
<a href="{{ route('user_downloadcenter') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-download"></i><div>{{ __('navigation.downloadcenter') }}</div></a>
</li>
@ -148,7 +173,7 @@
<li class="sidenav-item{{ Request::is('admin/customers') ? ' active' : '' }} {{ Request::is('admin/customer/*') ? ' active' : '' }}">
<a href="{{ route('admin_customers') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-contacts"></i><div>{{ __('navigation.clients') }}</div></a>
</li>
<li class="sidenav-item @if(Request::is('admin/sales/*')) open @endif">
<li class="sidenav-item @if(Request::is('admin/sales/*', 'admin/abos', 'admin/abos/*')) open @endif">
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
<i class="sidenav-icon ion ion-ios-cart"></i>
<div>{{ __('navigation.orders') }}</div>
@ -160,6 +185,9 @@
<li class="sidenav-item{{ Request::is('admin/sales/customers', 'admin/sales/customers/*') ? ' active' : '' }}">
<a href="{{ route('admin_sales_customers') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-contacts"></i><div>{{ __('navigation.clients') }}</div></a>
</li>
<li class="sidenav-item{{ Request::is('admin/abos', 'admin/abos/*') ? ' active' : '' }}">
<a href="{{ route('admin_abos') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-refresh-circle"></i><div>{{ __('navigation.abos') }}</div></a>
</li>
</ul>
</li>
@ -169,7 +197,6 @@
<div>{{ __('navigation.payments') }}</div>
</a>
<ul class="sidenav-menu">
<li class="sidenav-item{{ Request::is('admin/payments/invoice') ? ' active' : '' }}">
<a href="{{ route('admin_payments_invoice') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-arrow-dropleft-circle"></i><div>{{ __('navigation.invoice') }}</div></a>
</li>
@ -264,11 +291,9 @@
</a>
<ul class="sidenav-menu">
<li class="sidenav-item{{ Request::is('admin/sites/start') ? ' active' : '' }}">
<a href="{{ url('admin/languages') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-globe"></i><div>{{ __('navigation.languages') }}</div></a>
</li>
<li class="sidenav-item{{ Request::is('admin/sites/start') ? ' active' : '' }}">
<a href="{{ url('admin/languages/de/translations') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-list"></i><div>{{ __('navigation.translation') }}</div></a>
<a href="{{ url('admin/languages') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-globe"></i><div>{{ __('navigation.translation') }}</div></a>
</li>
<li class="sidenav-item{{ Request::is('admin/translate/products') ? ' active' : '' }}">
<a href="{{ route('admin_translate', ['products']) }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-list"></i><div>{{ __('navigation.products') }}</div></a>
</li>

198
resources/views/pdf/credit_details.blade.php
View file

@ -299,7 +299,8 @@
border-bottom: 1px solid #d6d6de;
}
.card hr {
border-color: #d7d700;
border:#d7d700 0.2pt solid;
background-color: transparent;
margin: 6mm 0;
}
@ -323,6 +324,11 @@
color: #484e3e;
}
.badge-info {
background-color: #28c3d7;
color: #fff;
}
.badge-secondary {
background-color: #d7d700;
color: #565600;
@ -452,6 +458,79 @@
</div>
<hr>
@endif
{{-- Eigene Marge --}}
@if (isset($collection->own_order[$date]))
@php($order = $collection->own_order[$date])
@if (isset($cbot))
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
<tr>
<td>
<strong>{{ __('team.own') }} {{ __('tables.margin') }} </strong>
</td>
<td>
<span class="badge badge-info"
style="font-size: 1em;"><strong>
{{ formatNumber($cbot->business_user->getSalesVolumeTotalMargin()) }}
&euro;</strong></span>
&nbsp;
({{ __('team.net_turnover') }}:
{{ formatNumber($cbot->business_user->sales_volume_total) }} &euro; /
{{ $cbot->business_user->margin }} %)
<br>
<em>{{ __('team.consultant_margin_info') }}</em>
</td>
</tr>
</tbody>
</table>
</div>
@endif
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>
<tr>
<th>{{ __('tables.date') }}</th>
<th>{{ __('tables.net_sales') }}</th>
<th>{{ __('tables.margin') }} %</th>
<th>{{ __('tables.margin') }} &euro;</th>
<th>{{ __('tables.order') }}</th>
</tr>
</thead>
<tbody>
@foreach ($order->user_sales_volumes as $user_sales_volume)
<tr>
<td>{{ $user_sales_volume->date }}</td>
<td>{{ formatNumber($user_sales_volume->total_net) }} &euro;</td>
<td>{{ $cbot->business_user->margin }} %</td>
<td>{{ formatNumber($user_sales_volume->caluCommissonTotalNet($cbot->business_user->margin)) }} &euro;</td>
<td>
{{ $user_sales_volume->shopping_order_id }}
@if ($user_sales_volume->shopping_order)
<br><span
class="small">{{ $user_sales_volume->shopping_order->getShoppingUserFullName() }}</span>
@endif
</td>
</tr>
@endforeach
</tbody>
<tfoot>
<tr style="background-color: #28c3d7; color:#fff;">
<td class="text-left"><b>{{ __('tables.total') }}<b></td>
<td>{{ formatNumber($order->credit_total_net) }} &euro;</td>
<td>&nbsp;</td>
<td><strong>{{ formatNumber($cbot->business_user->getSalesVolumeTotalMargin()) }} &euro;</strong></td>
<td>&nbsp;</td>
</tr>
</tfoot>
</table>
</div>
<hr>
@endif
{{-- Provision Shop --}}
@if (isset($collection->commission_shop[$date]))
@php($cs = $collection->commission_shop[$date])
@if (isset($cbot))
@ -476,8 +555,6 @@
</table>
</div>
@endif
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>
@ -520,8 +597,8 @@
</tbody>
<tfoot>
<tr>
<td class="text-right"> {{ __('tables.total') }} </td>
<tr style="background-color: #b5c49b;">
<td class="text-left"><b>{{ __('tables.total') }}</b></td>
<td>{{ formatNumber($cs->user_sales_volumes_total->month_shop_total_net) }} &euro;</td>
<td>&nbsp;</td>
<td><strong>{{ formatNumber($cbot->business_user->commission_shop_sales) }} &euro;</strong></td>
@ -530,83 +607,9 @@
</tfoot>
</table>
</div>
<hr>
@endif
@if (isset($collection->own_order[$date]))
@php($order = $collection->own_order[$date])
@if (isset($cbot))
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
<tr>
<td>
<strong>{{ __('team.own') }} {{ __('tables.margin') }} </strong>
</td>
<td>
<span class="badge badge-primary"
style="font-size: 1em;"><strong>
{{ formatNumber($cbot->business_user->getSalesVolumeTotalMargin()) }}
&euro;</strong></span>
&nbsp;
({{ __('team.net_turnover') }}:
{{ formatNumber($cbot->business_user->sales_volume_total) }} &euro; /
{{ $cbot->business_user->margin }} %)
<br>
<em>{{ __('team.consultant_margin_info') }}</em>
</td>
</tr>
</tbody>
</table>
</div>
@endif
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>
<tr>
<th>{{ __('tables.date') }}</th>
<th>{{ __('tables.net_sales') }}</th>
<th>{{ __('tables.margin') }} %</th>
<th>{{ __('tables.margin') }} &euro;</th>
<th>{{ __('tables.order') }}</th>
</tr>
</thead>
<tbody>
@foreach ($order->user_sales_volumes as $user_sales_volume)
<tr>
<td>{{ $user_sales_volume->date }}</td>
<td>{{ formatNumber($user_sales_volume->total_net) }} &euro;</td>
<td>{{ $cbot->business_user->margin }} %</td>
<td>{{ formatNumber($user_sales_volume->caluCommissonTotalNet($cbot->business_user->margin)) }} &euro;</td>
<td>
{{ $user_sales_volume->shopping_order_id }}
@if ($user_sales_volume->shopping_order)
<br><span
class="small">{{ $user_sales_volume->shopping_order->getShoppingUserFullName() }}</span>
@endif
</td>
</tr>
@endforeach
</tbody>
<tfoot>
<tr>
<td class="text-right"> {{ __('tables.total') }} </td>
<td>{{ formatNumber($order->credit_total_net) }} &euro;</td>
<td>&nbsp;</td>
<td><strong>{{ formatNumber($cbot->business_user->getSalesVolumeTotalMargin()) }} &euro;</strong></td>
<td>&nbsp;</td>
</tr>
</tfoot>
</table>
</div>
<hr>
@endif
{{-- Points Registration
@if (isset($collection->commission_registration[$date]))
@php($cr = $collection->commission_registration[$date])
<div class="card-header">
@ -648,10 +651,12 @@
</table>
</div>
<hr>
@endif
--}}
@if (isset($cbot))
{{-- Payline Points / Provision / Wachstumsbonus
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
@ -680,6 +685,10 @@
</table>
</div>
<hr>
--}}
{{-- Payline Points / Provision / Wachstumsbonus
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
@ -726,6 +735,9 @@
</tbody>
</table>
</div>
--}}
{{-- Table Payline Points / Provision / Wachstumsbonus
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>
@ -767,7 +779,28 @@
</table>
</div>
<hr>
--}}
<div class="page-break-always">
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
@if($cbot->business_user->version == 2)
<tr>
<td><strong>{{ __('team.commission_payline') }}:</strong></td>
<td>
<span class="badge badge-secondary" style="font-size: 1em;"><strong>{{ formatNumber($cbot->business_user->commission_pp_total) }} &euro;</strong></span>
</td>
</tr>
<tr>
<td><strong>{{ __('team.commission_WB') }}:</strong></td>
<td>
<span class="badge badge-secondary" style="font-size: 1em;"><strong>{{ formatNumber($cbot->business_user->commission_growth_total) }} &euro;</strong></span>
</td>
</tr>
@endif
</tbody>
</table>
</div>
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>
@ -785,6 +818,7 @@
</tbody>
</table>
</div>
</div>
@endif
@endforeach
</div>

171
resources/views/pdf/credit_details_long.blade.php
View file

@ -328,6 +328,11 @@
color: #565600;
}
.badge-info {
background-color: #28c3d7;
color: #fff;
}
.badge-outline-success {
background-color: #fff;
border-color: #64bc40;
@ -452,6 +457,84 @@
</div>
<hr>
@endif
{{-- Eigene Marge --}}
@if (isset($collection->own_order[$date]))
<div class="page-break">
@php($order = $collection->own_order[$date])
@if (isset($cbot))
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
<tr>
<td>
<strong>{{ __('team.own') }} {{ __('tables.margin') }} </strong>
</td>
<td>
<span class="badge badge-info"
style="font-size: 1em;"><strong>
{{ formatNumber($cbot->business_user->getSalesVolumeTotalMargin()) }}
&euro;</strong></span>
&nbsp;
({{ __('team.net_turnover') }}:
{{ formatNumber($cbot->business_user->sales_volume_total) }} &euro; /
{{ $cbot->business_user->margin }} %)
<br>
<em>{{ __('team.consultant_margin_info') }}</em>
</td>
</tr>
</tbody>
</table>
</div>
@endif
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>
<tr>
<th>#</th>
<th>{{ __('Datum') }}</th>
<th>{{ __('Typ') }}</th>
<th>{{ __('Umsatz netto') }}</th>
<th>{{ __('tables.points') }}</th>
<th>{{ __('für') }}</th>
<th>{{ __('VE') }}</th>
<th>{{ __('Bestellung') }}</th>
</tr>
</thead>
<tbody>
@foreach ($order->user_sales_volumes as $user_sales_volume)
<tr>
<td>{{ $user_sales_volume->id }}</td>
<td>{{ $user_sales_volume->date }}</td>
<td>{{ $user_sales_volume->getStatusType() }}</td>
<td>{{ formatNumber($user_sales_volume->total_net) }} &euro;</td>
<td>{{ $user_sales_volume->points }}</td>
<td>{{ $user_sales_volume->getStatusPointsType() }}</td>
<td>{{ $user_sales_volume->getStatusTurnoverType() }}</td>
<td>
{{ $user_sales_volume->shopping_order_id }}
@if ($user_sales_volume->shopping_order)
<br><span
class="small">{{ $user_sales_volume->shopping_order->getShoppingUserFullName() }}</span>
@endif
</td>
</tr>
@endforeach
</tbody>
<tfoot>
<tr>
<td colspan="3" class="text-right"> {{ __('tables.total') }} </td>
<td><strong>{{ formatNumber($order->credit_total_net) }} &euro;</strong></td>
<td><strong>{{ $order->credit_total_points }}</strong></td>
<td colspan="3"></td>
</tr>
</tfoot>
</table>
</div>
<hr>
</div>
@endif
{{-- Provision Shop --}}
@if (isset($collection->commission_shop[$date]))
<div class="page-break">
@php($cs = $collection->commission_shop[$date])
@ -544,84 +627,9 @@
</div>
@endif
@if (isset($collection->own_order[$date]))
<div class="page-break">
@php($order = $collection->own_order[$date])
@if (isset($cbot))
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
<tr>
<td>
<strong>{{ __('team.own') }} {{ __('tables.margin') }} </strong>
</td>
<td>
<span class="badge badge-primary"
style="font-size: 1em;"><strong>
{{ formatNumber($cbot->business_user->getSalesVolumeTotalMargin()) }}
&euro;</strong></span>
&nbsp;
({{ __('team.net_turnover') }}:
{{ formatNumber($cbot->business_user->sales_volume_total) }} &euro; /
{{ $cbot->business_user->margin }} %)
<br>
<em>{{ __('team.consultant_margin_info') }}</em>
</td>
</tr>
</tbody>
</table>
</div>
@endif
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>
<tr>
<th>#</th>
<th>{{ __('Datum') }}</th>
<th>{{ __('Typ') }}</th>
<th>{{ __('Umsatz netto') }}</th>
<th>{{ __('tables.points') }}</th>
<th>{{ __('für') }}</th>
<th>{{ __('VE') }}</th>
<th>{{ __('Bestellung') }}</th>
</tr>
</thead>
<tbody>
@foreach ($order->user_sales_volumes as $user_sales_volume)
<tr>
<td>{{ $user_sales_volume->id }}</td>
<td>{{ $user_sales_volume->date }}</td>
<td>{{ $user_sales_volume->getStatusType() }}</td>
<td>{{ formatNumber($user_sales_volume->total_net) }} &euro;</td>
<td>{{ $user_sales_volume->points }}</td>
<td>{{ $user_sales_volume->getStatusPointsType() }}</td>
<td>{{ $user_sales_volume->getStatusTurnoverType() }}</td>
<td>
{{ $user_sales_volume->shopping_order_id }}
@if ($user_sales_volume->shopping_order)
<br><span
class="small">{{ $user_sales_volume->shopping_order->getShoppingUserFullName() }}</span>
@endif
</td>
</tr>
@endforeach
</tbody>
<tfoot>
<tr>
<td colspan="3" class="text-right"> {{ __('tables.total') }} </td>
<td><strong>{{ formatNumber($order->credit_total_net) }} &euro;</strong></td>
<td><strong>{{ $order->credit_total_points }}</strong></td>
<td colspan="3"></td>
</tr>
</tfoot>
</table>
</div>
<hr>
</div>
@endif
{{-- Points Registration
@if (isset($collection->commission_registration[$date]))
<div class="page-break">
@php($cr = $collection->commission_registration[$date])
@ -674,9 +682,11 @@
<hr>
</div>
@endif
--}}
@if (isset($cbot))
{{-- Gesamt
<div class="page-break">
<div class="card-header">
<table class="table user-view-table m-0">
@ -706,6 +716,9 @@
</table>
</div>
</div>
––}}
{{-- Payline Points / Provision / Wachstumsbonus
<div class="page-break">
<div class="card-header">
<table class="table user-view-table m-0">
@ -793,7 +806,9 @@
</tfoot>
</table>
</div>
<hr>
<hr>
--}}
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>

2
resources/views/pdf/delivery-detail.blade.php
View file

@ -19,7 +19,7 @@
{{ maxStrLength($shopping_order_item->product->getLang('name'), 35) }}
</td>
<td class="text-right small">
{{ $shopping_order_item->qty }}
{{ cleanIntegerFromString($shopping_order_item->qty) }}
</td>
</tr>
@endforeach

2
resources/views/pdf/delivery-homeparty-detail.blade.php
View file

@ -9,7 +9,7 @@
{{ maxStrLength($value->product->getLang('name'), 35) }}
</td>
<td class="text-right small">
{{ $value->qty }}
{{ cleanIntegerFromString($value->qty) }}
</td>
</tr>
@endforeach

6
resources/views/pdf/invoice-collection.blade.php
View file

@ -28,13 +28,13 @@
{{ maxStrLength($shop_item['name'], 30) }}
</td>
<td class="text-right small">
{{$shop_item['points_total']}}
{{ number_format($shop_item['points_total'], 0) }}
</td>
<td class="text-right small">
{{ formatNumber($shop_item['user_price_net']) }} &euro;
</td>
<td class="text-right small">
{{$shop_item['qty']}}
{{ number_format($shop_item['qty'], 0) }}
</td>
<td class="text-right small">
{{ formatNumber($shop_item['user_price_total_net']) }} &euro;
@ -80,7 +80,7 @@
<td class="text-right">
</td>
<td class="text-right">
<strong>{{ $shopping_order->shopping_collect_order->qty_total }}</strong>
<strong>{{ cleanIntegerFromString($shopping_order->shopping_collect_order->qty_total) }}</strong>
</td>
<td class="text-right">
<span class="no-line-break">

4
resources/views/pdf/invoice-detail.blade.php
View file

@ -39,7 +39,7 @@
{{ $shopping_order_item->getFormattedPrice() }} &euro;
</td>
<td class="text-right small">
{{ $shopping_order_item->qty }}
{{ cleanIntegerFromString($shopping_order_item->qty) }}
</td>
<td class="text-right small">
{{ $shopping_order_item->getFormattedTaxRate() }}%
@ -52,7 +52,7 @@
{{ $shopping_order_item->getFormattedPriceVkNet() }} &euro;
</td>
<td class="text-right small">
{{ $shopping_order_item->qty }}
{{ cleanIntegerFromString($shopping_order_item->qty) }}
</td>
<td class="text-right small">
{{ $shopping_order_item->points }}

2
resources/views/pdf/invoice-homeparty-detail.blade.php
View file

@ -9,7 +9,7 @@
{{ maxStrLength($value->product->getLang('name') , 35) }}
</td>
<td class="text-right small">
{{ $value->qty }}
{{ cleanIntegerFromString($value->qty) }}
</td>
<td class="text-right small">
{{ $value->getFormattedTotalPoints() }}

2
resources/views/pdf/invoice-journal-collection.blade.php
View file

@ -106,7 +106,7 @@
{{ $shopping_order_item->getFormattedPrice() }} &euro;
</td>
<td class="text-right">
{{ $shopping_order_item->qty }}
{{ cleanIntegerFromString($shopping_order_item->qty) }}
</td>
<td class="text-right">
{{ $shopping_order_item->getFormattedTotalPrice() }} &euro;

130
resources/views/user/abo/_bak_index.blade.php Normal file
View file

@ -0,0 +1,130 @@
@extends('layouts.layout-2')
@section('content')
<h4 class="font-weight-bold py-2 mb-2 d-flex justify-content-between align-items-center w-100 ">
<div>
@if($view === 'ot') {{ __('navigation.customerabos') }} @endif
@if($view === 'me') {{ __('navigation.myabos') }} @endif
/ {{ __('navigation.overview') }}
</div>
</h4>
<div class="row">
<div class="col-12">
@if($user_abos->isEmpty())
<div class="card mb-4">
<div class="card-body pb-2">
<div class="row">
<div class="col-sm-12">
<h5>{{ __('abo.abo_delivery') }}</h5>
</div>
<hr class="m-0">
<div class="col-sm-12 mb-4">
<a href="{{ route('user_order_my_delivery', ['me']) }}" class="btn btn-secondary rounded-pill">
<span class="ion ion-md-add"></span>&nbsp; {{ __('abo.add_new_abo') }} </a>
</div>
</div>
</div>
</div>
@endif
@foreach($user_abos as $user_abo)
<div class="card mb-4">
<div class="card-body pb-2">
<div class="row">
<div class="col-sm-6">
<h5 class="mb-1">
<a href="{{ route('user_abos_detail', [$view, $user_abo->id]) }}">
{{ __('navigation.abo') }} <span class="text-muted">{{ '#'.$user_abo->payone_userid }}</span>
</a>
</h5>
</div>
<div class="col-sm-6 text-right">
<a href="{{ route('user_abos_detail', [$view, $user_abo->id]) }}" class="btn btn-sm btn-secondary float-right">
<span class="fa fa-edit"></span>{{ __('abo.abo_details') }}
</a>
</div>
</div>
</div>
<hr class="m-0">
<div class="card-body pb-1">
<div class="row">
<div class="col-md-3 mb-2">
<div class="text-muted small">{{ __('tables.start_date') }}</div>
<div class="font-weight-bold">{{ $user_abo->start_date }}</div>
</div>
<div class="col-md-3 mb-2">
<div class="text-muted small">{{ __('tables.next_date') }} </div>
<div class="font-weight-bold">{{ $user_abo->next_date }}</div>
</div>
<div class="col-md-3 mb-2">
<div class="text-muted small">{{ __('tables.abo_delivery_day') }}</div>
<div class="font-weight-bold">{{ \App\Services\HTMLHelper::getAboStrLang($user_abo->abo_interval) }}</div>
</div>
<div class="col-md-3 mb-2">
<div class="text-muted small">{{ __('tables.last_date') }}</div>
<div class="font-weight-bold">{{ $user_abo->last_date }} / {{ $user_abo->getCountOrders() }}</div>
</div>
</div>
</div>
<hr class="m-0">
<div class="card-body pb-1">
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('tables.status') }}</div>
{!! $user_abo->getStatusFormated() !!}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('tables.active') }}</div>
{!! get_active_badge($user_abo->active) !!}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('tables.amount') }}</div>
{{ $user_abo->getFormattedAmount() }} €
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('tables.payment') }}</div>
{{ $user_abo->getPaymentType() }}
</div>
</div>
</div>
@if($view === 'ot')
<hr class="m-0">
<div class="card-body pb-1">
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('First name') }}</div>
@if($user_abo->shopping_user)
{{ $user_abo->shopping_user->billing_firstname }}
@endif
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Last name') }}</div>
@if($user_abo->shopping_user)
{{ $user_abo->shopping_user->billing_lastname }}
@endif
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('E-Mail') }}</div>
@if($user_abo->shopping_user)
{{ $user_abo->shopping_user->billing_email }}
@endif
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('tables.customer') }}</div>
@if($user_abo->shopping_user)
<a class="btn btn-sm btn-primary" href="{{ route('user_customer_detail', $user_abo->shopping_user->id) }}"><i class="fa fa-edit"></i></a>
@endif
</div>
</div>
</div>
@endif
</div>
@endforeach
</div>
</div>
@endsection

65
resources/views/user/abo/detail.blade.php Normal file
View file

@ -0,0 +1,65 @@
@extends('layouts.layout-2')
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
<a href="{{route('user_abos', [$view])}}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
<div>
@if($view === 'ot') {{ __('navigation.customerabo') }} @endif
@if($view === 'me') {{ __('navigation.myabo') }} @endif
<span class="text-muted">{{ '#'.$user_abo->payone_userid }}</span>
</div>
</h4>
@if(Session::has('alert-error'))
<div class="col-sm-12">
<div class="alert alert-danger p-2 mt-2">
<ul>
<li>{{ Session::get('alert-error') }}</li>
</ul>
</div>
</div>
@endif
<div class="card">
@include('admin.abo._detail')
</div>
<div class="card mt-3">
@include('admin.customer._customer_detail', ['shopping_user' => $customer_detail])
</div>
{!! Form::open(['url' => route('user_abos_update', [$view, $user_abo->id]), 'class' => 'form-horizontal', 'id'=>'cart-order-form']) !!}
<input type="hidden" name="is_for" value="{{ $user_abo->is_for }}">
<div class="card mt-3">
@include('admin.abo._order_abo')
</div>
@if($comp_products && Yard::instance('shopping')->getNumComp() > 0)
<div id="holder_html_view_comp_product">
@include('user.order.comp_product')
</div>
@endif
{{ Form::close() }}
<div class="card mt-3 mb-3">
@include('admin.abo._executions')
</div>
<a href="{{route('user_abos', [$view])}}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
@endsection
@section('scripts')
<script src="{{ asset('/js/iq-modal-cart.js') }}?v=1{{ get_file_last_time('/js/iq-modal-cart.js') }}"></script>
<script type="application/javascript">
var iqModalCart = IqModalCart.init();
$( document ).ready(function() {
});
</script>
@endsection

130
resources/views/user/abo/index.blade.php Normal file
View file

@ -0,0 +1,130 @@
@extends('layouts.layout-2')
@section('content')
<h4 class="font-weight-bold py-2 mb-2 d-flex justify-content-between align-items-center w-100 ">
<div>
@if($view === 'ot') {{ __('navigation.customerabos') }} @endif
@if($view === 'me') {{ __('navigation.myabos') }} @endif
/ {{ __('navigation.overview') }}
</div>
</h4>
<div class="row">
<div class="col-12">
@if(!$user_abos || $user_abos->isEmpty())
<div class="card mb-4">
<div class="card-body pb-2">
<div class="row">
<div class="col-sm-12">
<h5>{{ __('abo.abo_delivery') }}</h5>
</div>
<hr class="m-0">
<div class="col-sm-12 mb-4">
<a href="{{ route('user_order_my_delivery', ['abo-me']) }}" class="btn btn-secondary rounded-pill">
<span class="ion ion-md-add"></span>&nbsp; {{ __('abo.add_new_abo') }} </a>
</div>
</div>
</div>
</div>
@endif
@foreach($user_abos as $user_abo)
<div class="card mb-4">
<div class="card-body pb-2">
<div class="row">
<div class="col-sm-6">
<h5 class="mb-1">
<a href="{{ route('user_abos_detail', [$view, $user_abo->id]) }}">
{{ __('navigation.abo') }} <span class="text-muted">{{ '#'.$user_abo->payone_userid }}</span>
</a>
</h5>
</div>
<div class="col-sm-6 text-right">
<a href="{{ route('user_abos_detail', [$view, $user_abo->id]) }}" class="btn btn-sm btn-secondary float-right">
<span class="fa fa-edit"></span>{{ __('abo.abo_details') }}
</a>
</div>
</div>
</div>
<hr class="m-0">
<div class="card-body pb-1">
<div class="row">
<div class="col-md-3 mb-2">
<div class="text-muted small">{{ __('tables.start_date') }}</div>
<div class="font-weight-bold">{{ $user_abo->start_date }}</div>
</div>
<div class="col-md-3 mb-2">
<div class="text-muted small">{{ __('tables.next_date') }} </div>
<div class="font-weight-bold">{{ $user_abo->next_date }}</div>
</div>
<div class="col-md-3 mb-2">
<div class="text-muted small">{{ __('tables.abo_delivery_day') }}</div>
<div class="font-weight-bold">{{ \App\Services\HTMLHelper::getAboStrLang($user_abo->abo_interval) }}</div>
</div>
<div class="col-md-3 mb-2">
<div class="text-muted small">{{ __('tables.last_date') }}</div>
<div class="font-weight-bold">{{ $user_abo->last_date }}</div>
</div>
</div>
</div>
<hr class="m-0">
<div class="card-body pb-1">
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('tables.status') }} / {{ __('tables.active') }}</div>
{!! $user_abo->getStatusFormated() !!} &nbsp;{!! get_active_badge($user_abo->active) !!}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('tables.abo_delivery') }}</div>
{{ $user_abo->getCountOrders() }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('tables.amount') }}</div>
{{ $user_abo->getFormattedAmount() }} €
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('tables.payment') }}</div>
{{ $user_abo->getPaymentType() }}
</div>
</div>
</div>
@if($view === 'ot')
<hr class="m-0">
<div class="card-body pb-1">
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('First name') }}</div>
@if($user_abo->shopping_user)
{{ $user_abo->shopping_user->billing_firstname }}
@endif
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Last name') }}</div>
@if($user_abo->shopping_user)
{{ $user_abo->shopping_user->billing_lastname }}
@endif
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('E-Mail') }}</div>
@if($user_abo->shopping_user)
{{ $user_abo->shopping_user->billing_email }}
@endif
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('tables.customer') }}</div>
@if($user_abo->shopping_user)
<a class="btn btn-sm btn-secondary" href="{{ route('user_customer_detail', $user_abo->shopping_user->id) }}"><i class="fa fa-edit"></i></a>
@endif
</div>
</div>
</div>
@endif
</div>
@endforeach
</div>
</div>
@endsection

60
resources/views/user/abo/modal_abo_show_products.blade.php Normal file
View file

@ -0,0 +1,60 @@
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">
{{ __('abo.add_product') }}
</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<div class="modal-body px-0">
<div class="card-datatable pt-0 table-responsive">
<table id="datatable-abo" class="table table-striped table-bordered" data-user_abo-id="{{$user_abo->id}}">
<thead>
<tr>
<th></th>
<th>{{__('tables.image')}}</th>
<th>{{__('tables.products')}}</th>
<th>{{__('tables.article_no')}}</th>
<th><span class="no-line-break">{{ __('tables.price') }}</span> {{__('tables.net')}}</th>
<th><span class="no-line-break">{{ __('tables.price') }}</span> {{__('tables.gross')}}</th>
<th>{{__('tables.points')}}</th>
</tr>
</thead>
</table>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ __('close') }}</button>
</div>
</div>
<script>
$( document ).ready(function() {
var oTable = $('#datatable-abo').DataTable({
"processing": true,
"serverSide": true,
"ajax": '{!! route('user_abo_datatable', [$user_abo->id]) !!}',
"order": [[3, "asc" ]],
"columns": [
{ data: 'add_card', name: 'add_card', searchable: false, orderable: false },
{ data: 'picture', name: 'picture', searchable: false, width: 35 },
{ data: 'name', name: 'name' },
{ data: 'number', name: 'number' },
{ data: 'price_net', name: 'price_net', searchable: false, orderable: false },
{ data: 'price_gross', name: 'price_gross', searchable: false, orderable: false },
{ data: 'points', name: 'points', searchable: false },
],
"bLengthChange": false,
"iDisplayLength": 1000,
"paging": false,
"language": {
"url": "/js/datatables-{{ \App::getLocale() }}.json"
},
drawCallback: function (settings) {
iqModalCart.reInitModal();
}
});
iqModalCart.setDatabase('#datatable-abo');
});
</script>

28
resources/views/user/abo/vat_info.blade.php Normal file
View file

@ -0,0 +1,28 @@
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('payment.ordering_country') }}</div>
{{ App\Services\UserService::getOrderInfo('billing_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('payment.country_of_delivery') }}</div>
{{ App\Services\UserService::getOrderInfo('shipping_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('payment.VAT') }}</div>
{{ App\Services\UserService::getOrderInfo('tax_free') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('payment.reverse_charge_procedure') }}</div>
{{ App\Services\UserService::getOrderInfo('user_reverse_charge') }}
</div>
</div>
<hr>
@if($view === 'me' || $view === 'ot-member')
<p class="small">{!! __('abo.product_prices_career_level_info', ['user_level_name'=>$user_abo->user->user_level->getLang('name'), 'user_level_margin'=>$user_abo->user->user_level->getFormattedMargin()]) !!}</p>
@endif
@if($view === 'ot')
<p class="small">{!! __('abo.product_prices_career_level_cpay_info', ['user_level_name'=>$user_abo->member->user_level->getLang('name'), 'user_level_margin'=>$user_abo->member->user_level->getFormattedMargin()]) !!}</p>
@endif

71
resources/views/user/homeparty/modal_hp_show_products.blade.php Normal file
View file

@ -0,0 +1,71 @@
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">
{{ __('homeparty.add_product') }} /
@if($homeparty_user->is_host)
{{ __('homeparty.host') }}
@else
{{ __('homeparty.guest') }}
@endif
{{ $homeparty_user->billing_firstname }} {{ $homeparty_user->billing_lastname }}
</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<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>
<tr>
<th></th>
<th>{{__('tables.image')}}</th>
<th>{{__('tables.products')}}</th>
<th>{{__('tables.article_no')}}</th>
@if($homeparty->getCardInfo('user_tax_free'))
<th><span class="no-line-break">{{ __('tables.ek_price') }}</span> {{__('tables.net')}}</th>
<th><span class="no-line-break">{{__('tables.vk_price')}}</span> {{__('tables.net')}}</th>
@else
<th><span class="no-line-break">{{ __('tables.ek_price') }}</span> {{__('tables.gross')}}</th>
<th><span class="no-line-break">{{__('tables.vk_price')}}</span> {{__('tables.gross')}}</th>
@endif
<th>{{__('tables.points')}}</th>
</tr>
</thead>
</table>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ __('close') }}</button>
</div>
</div>
<script>
$( document ).ready(function() {
var oTable = $('#datatable-homeparty').DataTable({
"processing": true,
"serverSide": true,
"ajax": '{!! route('user_homeparty_datatable', [$homeparty->id]) !!}',
"order": [[3, "asc" ]],
"columns": [
{ data: 'add_card', name: 'add_card', searchable: false, orderable: false },
{ data: 'picture', name: 'picture', searchable: false, width: 35 },
{ data: 'name', name: 'name' },
{ data: 'number', name: 'number' },
{ data: 'price_gross', name: 'price_gross', searchable: false, orderable: false },
{ data: 'price_vk_gross', name: 'price_vk_gross', searchable: false },
{ data: 'points', name: 'points', searchable: false },
],
"bLengthChange": false,
"iDisplayLength": 1000,
"paging": false,
"language": {
"url": "/js/datatables-{{ \App::getLocale() }}.json"
},
drawCallback: function (settings) {
iqHomepartyCart.reInitModal();
}
});
iqHomepartyCart.setDatabase('#datatable-homeparty');
});
</script>

70
resources/views/user/membership/index.blade.php
View file

@ -20,15 +20,19 @@
</h4>
<div class="row">
<div class="col order-2 order-md-1">
{{-- isRenewalAccount payment_account date - config('mivita.renewal_days') Vertragsverlängerung --}}
@if($user->isRenewalAccount())
<div class="card w-100 mb-4">
<h5 class="card-header">
{!! __('membership.membership_was_renewed', ['date'=>$user->nextRenewalAccount()]) !!}
</h5>
<div class="card-body">
<p>{{ __('membership.info_contract_renewal', ['days'=>config('mivita.renewal_days')]) }}</p>
@if($userHistoryPaymentOrder && $userHistoryPaymentOrder->status > 2)
<h6 class="alert badge-{{$userHistoryPaymentOrder->getStatusColor()}}">{{__('membership.payment_has_been_made') }} {{__('membership.status') }}: {{ trans('payment.status.'.$userHistoryPaymentOrder->getStatusType())}}</h6>
@else
<h6 class="alert badge-warning">{{ __('membership.alert_contract_renewal') }}</h6>
@endif
{{--
Abo Option deaktiviert
@ -51,15 +55,7 @@
@endif
@endif
--}}
@if($user->payment_order_id)
@if($user->payment_order_product->identifier === 'show_upgrade')
<p><strong>{{ __('membership.downgrade_membership_is_not_possible') }}</strong></p>
<p><strong>{{ __('membership.upgrade_package_and_proceed_payment') }}</strong></p>
@endif
@if($user->payment_order_product->identifier === 'show_order')
<p><strong>{{ __('membership.is_no_longer_possible_to_change_package') }}</strong></p>
@endif
@endif
@if($userHistoryPaymentOrder && $userHistoryPaymentOrder->status > 2)
<h5 class="card-header bg-light">
@ -73,6 +69,16 @@
@else
@include('user.membership._payment_order')
@endif
@if($user->payment_order_id)
@if($user->payment_order_product->identifier === 'show_upgrade')
<p><strong><i>{{ __('membership.downgrade_membership_is_not_possible') }}</i></strong></p>
<p><strong><i>{{ __('membership.upgrade_package_and_proceed_payment') }}</i></strong></p>
@endif
@if($user->payment_order_product->identifier === 'show_order')
<p><strong><i>{{ __('membership.is_no_longer_possible_to_change_package') }}</i></strong></p>
@endif
@endif
</div>
</div>
@else
@ -119,6 +125,50 @@
</div>
@endif
@endif
<div class="card w-100 mb-4">
<h5 class="card-header">Zahlungshistorie</h5>
<div class="card-body">
<p>
Die Zahlungshistorie zeigt Dir alle Zahlungen für Deine MIVITA Mitgliedschaft.
</p>
<div class="card-datatable table-responsive py-0">
<table class="datatables-style table table-striped table-bordered">
<thead>
<tr>
<th>#</th>
<th>{{__('tables.date')}}</th>
<th>{{__('tables.amount')}}</th>
<th>{{__('tables.payment')}}</th>
<th>{{__('tables.status')}}</th>
<th>{{__('tables.art')}}</th>
<th>{{__('tables.rf_no')}}</th>
</tr>
</thead>
<tbody>
@foreach($userShoppingOrders as $value)
<tr>
<td>
<a href="{{ route('user_order_detail', [$value->id]) }}" class="btn icon-btn btn-sm btn-primary">
<span class="fa fa-edit"></span>
</a>
</td>
<td>{{ $value->created_at->format("d.m.Y") }}</td>
<td>{{ $value->getFormattedTotalShipping() }}€</td>
<td>{{ $value->getLastShoppingPayment('getPaymentType') }}</td>
<td>{!! \App\Services\Payment::getShoppingOrderBadge($value) !!}</td>
<td>{!! App\Services\Payment::getPaymentForBadge($value) !!}</td>
<td>{{ $value->getLastShoppingPayment('reference') }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
{{-- remove ABO Options --}}
{{--
Abo Option deaktiviert

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

@ -1,14 +1,14 @@
<div class="card mt-2 mb-2">
<div class="card-body">
@if($template === 'me')
<h4>@if($is_abo) {{ __('order.abo_delivery_to_me') }} @else {{ __('order.delivery_to_me') }} @endif</h4>
<h4>@if($is_abo) {{ __('abo.abo_delivery_to_me') }} @else {{ __('order.delivery_to_me') }} @endif</h4>
@endif
@if($template === 'ot-customer')
<h4 class="mb-2">@if($is_abo) {{ __('order.abo_delivery_to_the_customer') }} @else {{ __('order.delivery_to_the_customer') }} @endif</h4>
<h4 class="mb-2">@if($is_abo) {{ __('abo.abo_delivery_to_the_customer') }} @else {{ __('order.delivery_to_the_customer') }} @endif</h4>
<p>{{ __('order.cpay_text') }}.</p>
@endif
@if($template === 'ot-member')
<h4 class="mb-2">@if($is_abo) {{ __('order.abo_delivery_to_the_customer') }} @else {{ __('order.delivery_to_the_customer') }} @endif</h4>
<h4 class="mb-2">@if($is_abo) {{ __('abo.abo_delivery_to_the_customer') }} @else {{ __('order.delivery_to_the_customer') }} @endif</h4>
<p>{{ __('order.ipay_text') }}.</p>
@endif
@ -46,6 +46,12 @@
@endif
@else
<p>{{ __('order.no_career_level_info') }}</p>
@endif
@if($is_abo)
<hr>
<div class="alert alert-warning"><strong>{!! __('abo.abo_type_info', ['base'=>get_abo_type_badge('base'), 'upgrade'=>get_abo_type_badge('upgrade')]) !!}</strong></div>
<p><strong><em></em></strong></p>
@endif
</div>
</div>
</div>

47
resources/views/user/order/comp_product.blade.php
View file

@ -4,36 +4,35 @@
<input type="hidden" name="count_comp_products" value="{{Yard::instance('shopping')->getNumComp()}}">
@for($i = 1; $i <= Yard::instance('shopping')->getNumComp(); $i++)
@if(Yard::instance('shopping')->getNumComp() > 1)
<h4 class="border-bottom pb-2">{{$i}}. {{ __('order.shipping_compensation_product') }} </h4>
<h5 class="border-bottom pb-2">{{$i}}. {{ __('order.shipping_compensation_product') }} </h5>
@else
<h4 class="border-bottom pb-2">{{ __('order.shipping_compensation_product') }} </h4>
<h5 class="border-bottom pb-2">{{ __('order.shipping_compensation_product') }} </h5>
@endif
<div class="row no-gutters row-bordered">
@php($counter = 1)
@php($checked_id = Yard::instance('shopping')->getCompProductBy($i))
@foreach($comp_products as $comp_product)
<div class="media col-md-6 col-lg-4 p-4">
<div class="d-block ui-w-80 ui-bordered mr-3">
@if(count($comp_product->images))
<img src="{{ route('product_image', [$comp_product->images->first()->slug]) }}" class="img-fluid" alt="">
@endif
@foreach($comp_products as $comp_product)
<div class="media col-md-6 col-lg-4 p-4">
<div class="d-block ui-w-80 ui-bordered mr-3">
@if(count($comp_product->images))
<img src="{{ route('product_image', [$comp_product->images->first()->slug]) }}" class="img-fluid" alt="">
@endif
</div>
<div class="media-body">
<label class="switcher switcher-secondary">
<input type="radio" class="switcher-input" value="{{$comp_product->id}}" data-comp_num="{{$i}}" name="switchers-comp-product[{{$i}}]" @if($checked_id == $comp_product->id) checked @endif required>
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label"></span>
</label>
<div class="text-body mt-2"><strong>{{ $comp_product->getLang('name') }}</strong></div>
<div class="">{{ __('order.art_no') }}: {{ $comp_product->number }}</div>
</div>
</div>
<div class="media-body">
<label class="switcher switcher-secondary">
<input type="radio" class="switcher-input" value="{{$comp_product->id}}" data-comp_num="{{$i}}" name="switchers-comp-product[{{$i}}]" @if($checked_id == $comp_product->id) checked @endif required>
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label"></span>
</label>
<div class="text-body mt-2"><strong>{{ $comp_product->getLang('name') }}</strong></div>
<div class="">{{ __('order.art_no') }}: {{ $comp_product->number }}</div>
</div>
</div>
@php($counter++)
@endforeach
@php($counter++)
@endforeach
</div>
@endfor
</div>

24
resources/views/user/order/custom_payment.blade.php
View file

@ -3,8 +3,12 @@
@section('content')
<div class="card">
<div class="card-body p-2 p-md-4">
@if($is_abo)
<h4>{{ __('order.order_abo_was_placed_successfully') }}</h4>
@else
<h4>{{ __('order.order_was_placed_successfully') }}</h4>
@endif
<h6 class="small font-weight-semibold">
{{ __('order.payment_link_for_your_customer') }}
</h6>
@ -64,6 +68,10 @@
<div class="text-muted small">{{ __('Phone') }}</div>
{{ $shopping_user->billing_phone }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('E-Mail') }}</div>
@if($shopping_user->faker_mail) "-" @else {{ $shopping_user->billing_email }} @endif
</div>
</div>
</div>
<hr class="m-0">
@ -133,7 +141,7 @@
@if(isset($yard_shopping_items))
<div class="table-responsive">
<table class="table table-bordered m-0" style="min-width:550px;">
<table class="table table-product m-0" style="min-width:550px;">
<tbody>
<tr>
<th>{{ __('tables.product') }}</th>
@ -155,7 +163,12 @@
@endif
<div class="media-body">
{{ $item->name }}
<div class="d-block text-body"><strong>{{ $item->name }}</strong>
{!! get_abo_type_badge($item->abo_type) !!}</div>
<div class="text-body">
<div>{{ __('order.content') }}: {{ $item->contents }}</div>
<div>{{ __('order.art_no') }}: {{ $item->number }}</div>
</div>
</div>
</div>
</td>
@ -179,11 +192,6 @@
</td>
</tr>
@endforeach
<tr>
<td colspan="4">
<hr>
</td>
</tr>
<tr>
<td colspan="3">
{{__('order.subtotal')}}

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

@ -44,53 +44,61 @@
<span class="badge badge-secondary" data-toggle="tooltip" data-placement="top" title="{{ __('order.cpay_text') }}"><strong>({{ __('order.cpay') }})</strong></span>
</span>
</label>
@if(Auth::user()->isVIP())
<hr>
<h4>{{ __('order.abo_delivery') }}</h4>
<div class="pl-1 ml-auto">
<div class="badge badge-secondary">VIP only</div>
</div>
<label class="switcher switcher-secondary">
<input type="radio" class="switcher-input" name="switchers-radio-is-for" value="abo-me" @if(!$shopping_user && $for === 'abo-me') checked="checked" @endif>
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">{{ __('order.abo_are_for_me_and_shipped') }}</span>
</label>
<h4>{{ __('abo.abo_delivery') }}
</h4>
<div class="">
@if(\App\Services\AboHelper::userHasAbo(Auth::user()))
<p><a class="btn btn-sm btn-default" href="{{ route('user_abos', ['me']) }}">{{ __('navigation.myabo') }} {{ __('edit') }}</a> </p>
@else
<label class="switcher switcher-secondary">
<input type="radio" class="switcher-input" name="switchers-radio-is-for" value="abo-me" @if(!$shopping_user && $for === 'abo-me') checked="checked" @endif>
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">{{ __('abo.abo_are_for_me_and_shipped') }}</span>
</label>
@endif
<label class="switcher switcher-secondary mt-3">
<input type="radio" class="switcher-input" name="switchers-radio-is-for" value="abo-ot-member" @if($shopping_user && $for === 'abo-ot-member') checked="checked" @endif>
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">
{{ __('order.abo_are_for_customer_and_shipped') }}
<span class="badge badge-secondary" data-toggle="tooltip" data-placement="top" title="{{ __('order.ipay_text') }}"><strong>({{ __('order.ipay') }})</strong></span>
</span>
</label>
<label class="switcher switcher-secondary mt-3">
<label class="switcher switcher-secondary mt-3 mb-2">
<input type="radio" class="switcher-input" name="switchers-radio-is-for" value="abo-ot-customer" @if($shopping_user && $for === 'abo-ot-customer') checked="checked" @endif>
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">
{{ __('order.abo_are_for_customer_and_shipped') }}
{{ __('abo.abo_are_for_customer_and_shipped') }}
<span class="badge badge-secondary" data-toggle="tooltip" data-placement="top" title="{{ __('order.cpay_text') }}"><strong>({{ __('order.cpay') }})</strong></span>
</span>
</label>
</div>
<div class="mt-3">
<h6 class="card-header bg-light px-2 py-2">
<a href="#" class="" data-toggle="collapse" data-target="#collapseFilter" aria-expanded="false" aria-controls="collapseFilter">
<i class="fa fa-caret-expand"></i> {{ __('abo.pros_hl') }}
</a>
</h6>
<div class="collapse" id="collapseFilter">
<div class="form-row pb-1 pt-1">
<ul class="">
{!! __('abo.pros_list') !!}
</ul>
</div>
</div>
</div>
@endif
</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">
@ -112,40 +120,50 @@
<div class="show-is-for-customer">
<h4>{{ __('order.ship_to_this_customer') }}</h4>
<p>{{ __('order.ship_to_this_customer_info') }}:
<a href="{{route('user_customers')}}">{{ __('navigation.my_clients') }} -> {{ __('navigation.overview') }}</a> -> <a href="{{route('user_customer_detail', $shopping_user->id)}}"><i class="fa fa-edit"></i> {{ __('navigation.clients') }}</a></a></p>
<a href="{{route('user_customers')}}">{{ __('navigation.my_clients') }} -> {{ __('navigation.overview') }}</a> -> <a href="{{route('user_customer_detail', $shopping_user->id)}}"><i class="fa fa-edit"></i> {{ __('navigation.clients') }}</a></a><br>
<em><i class="fa fa-info-circle"></i> {{ __('order.ship_to_this_customer_info_2') }}</em></p>
@include('admin.customer._customer_detail')
</div>
@endif
</div>
@if($shopping_user)
@if(Session::has('custom-error'))
<div class="alert alert-dark-danger alert-dismissible fade show">
<button type="button" class="close" data-dismiss="alert">×</button>
<strong>{{ Session::get('custom-error') }}</strong>
</div>
@else
@if($shopping_user)
<div class="" id="hide_for_me">
<hr>
<div class="form-group">
<label class="custom-control custom-checkbox m-2 ">
<input type="checkbox" class="custom-control-input" name="check_for_ot" id="checkbox_for_me" required>
<span class="custom-control-label secondary">{{ __('order.ship_to_this_customer_check') }}</span>
</label>
</div>
<div class="form-group">
<label class="custom-control custom-checkbox m-2 ">
<input type="checkbox" class="custom-control-input" name="check_for_ot" id="checkbox_for_me" required>
<span class="custom-control-label secondary">{{ __('order.ship_to_this_customer_check') }}
@if($for === 'ot-customer' || $for === 'abo-ot-customer')
<br>{{ __('order.ship_to_this_email_info') }} <strong>{{ $shopping_user->billing_email }}</strong>
@endif
</span>
</label>
</div>
</div>
<div class="float-rights">
<button type="submit" class="btn btn-secondary" name="action" value="next">{{ __('order.confirm_and_proceed_to_order') }}</button>
</div>
@else
<div class="float-rights" id="hide_for_ot">
<button type="submit" class="btn btn-secondary" name="action" value="next">{{ __('order.confirm_and_proceed_to_order') }}</button>
</div>
<div class="float-rights" id="hide_for_ot">
<button type="submit" class="btn btn-secondary" name="action" value="next">{{ __('order.confirm_and_proceed_to_order') }}</button>
</div>
@endif
</div>
@endif
</div>
</div>
{!! Form::close() !!}
<script>
$( document ).ready(function() {

1
resources/views/user/order/index.blade.php
View file

@ -8,7 +8,6 @@
<div class="card">
<div class="card-datatable table-responsive">
<table class="datatable-users table table-striped table-bordered">
<thead>
<tr>
<th>#</th>

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

@ -2,7 +2,7 @@
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
{{ __('navigation.my_orders') }} / @if($is_abo) {{ __('order.abo_delivery') }} @else {{ __('navigation.do_order') }} @endif
{{ __('navigation.my_orders') }} / @if($is_abo) {{ __('abo.abo_delivery') }} @else {{ __('navigation.do_order') }} @endif
<a href="{{ route('user_order_my_delivery', [$for, $delivery_id]) }}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
<div class="clearfix"></div>
</h4>
@ -60,7 +60,6 @@
</div>
@endif
<input type="hidden" name="shipping_is_for" value="{{$for}}">
@include('user.order.list_'.$template)
@endsection

4
resources/views/user/order/list_me.blade.php
View file

@ -5,6 +5,7 @@
<table class="datatables-order-list table table-striped table-bordered" id="datatables-order-list" data-url="{{route('user_order_my_perform_request')}}">
<thead>
<tr>
@if($is_abo)<th>Abo</th>@endif
<th>{{__('tables.image')}}</th>
<th>{{__('tables.product')}}</th>
<th>{{__('tables.my_price_net')}}</th>
@ -63,8 +64,9 @@
d.is_abo = $('input[name=is_abo]').val();
}
},
"order": [[7, "asc" ]],
"order": [[@if($is_abo) 0 @else 7 @endif, "asc" ]],
"columns": [
@if($is_abo) { data: 'abo', name: 'abo', searchable: false, width: 35 },@endif
{ data: 'picture', name: 'picture', searchable: false, width: 35 },
{ data: 'product', name: 'product' },
{ data: 'price_net', name: 'price_net', searchable: false, orderable: false },

4
resources/views/user/order/list_ot-customer.blade.php
View file

@ -5,6 +5,7 @@
<table class="datatables-order-list table table-striped table-bordered" id="datatables-order-list" data-url="{{route('user_order_my_perform_request')}}">
<thead>
<tr>
@if($is_abo)<th>Abo</th>@endif
<th>{{__('tables.image')}}</th>
<th>{{__('tables.product')}}</th>
<th>{{__('tables.vk_price')}} {{__('tables.net')}}</th>
@ -58,8 +59,9 @@
d.is_abo = $('input[name=is_abo]').val();
}
},
"order": [[7, "asc" ]],
"order": [[@if($is_abo) 0 @else 7 @endif, "asc" ]],
"columns": [
@if($is_abo) { data: 'abo', name: 'abo', searchable: false, width: 35 },@endif
{ data: 'picture', name: 'picture', searchable: false, width: 35 },
{ data: 'product', name: 'product' },
{ data: 'customer_price_net', name: 'customer_price_net', searchable: false, orderable: false },

4
resources/views/user/order/list_ot-member.blade.php
View file

@ -5,6 +5,7 @@
<table class="datatables-order-list table table-striped table-bordered" id="datatables-order-list" data-url="{{route('user_order_my_perform_request')}}">
<thead>
<tr>
@if($is_abo)<th>Abo</th>@endif
<th>{{__('tables.image')}}</th>
<th>{{__('tables.product')}}</th>
<th>{{__('tables.my_price_net')}}</th>
@ -56,8 +57,9 @@
d.is_abo = $('input[name=is_abo]').val();
}
},
"order": [[7, "asc" ]],
"order": [[@if($is_abo) 0 @else 7 @endif, "asc" ]],
"columns": [
@if($is_abo) { data: 'abo', name: 'abo', searchable: false, width: 35 },@endif
{ data: 'picture', name: 'picture', searchable: false, width: 35 },
{ data: 'product', name: 'product' },
{ data: 'price_net', name: 'price_net', searchable: false, orderable: false },

282
resources/views/user/order/payment/custom_payment.blade.php Normal file
View file

@ -0,0 +1,282 @@
@extends('layouts.layout-2')
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
@if($is_abo)
{{ __('order.order_abo_was_placed_successfully') }}
@else
{{ __('order.order_was_placed_successfully') }}
@endif
@if($backlink)<a href="{{ $backlink }}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>@endif
</h4>
<div class="card">
<div class="card-body p-2 p-md-4">
<h6 class=" font-weight-semibold">
{{ __('order.payment_link_for_your_customer') }}
| {{ $shopping_instance->created_at->format('d.m.Y') }}
| {!! \App\Services\OrderPaymentService::getStatusBadge($shopping_instance) !!}
</h6>
<div class="mt-2">
<a target="_blank" class="btn btn-secondary" href="{{ route('checkout.checkout_card', ['identifier'=>$identifier]) }}">
{{ route('checkout.checkout_card', ['identifier'=>$identifier]) }}
</a>
</div>
</div>
<hr class="m-0">
<div class="card-body">
<h6 class="small font-weight-semibold">
{{ __('customer.customer_billing_address') }}
</h6>
<div class="row">
@if($shopping_user->billing_company)
<div class="col-md-12 mb-3">
<div class="text-muted small">{{ __('Company') }}</div>
{{ $shopping_user->billing_company }}
</div>
@endif
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Salutation') }}</div>
{{ \App\Services\HTMLHelper::getSalutationLang($shopping_user->billing_salutation) }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('First name') }}</div>
{{ $shopping_user->billing_firstname }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Last name') }}</div>
{{ $shopping_user->billing_lastname }}
</div>
</div>
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Street') }}</div>
{{ $shopping_user->billing_address }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Addition') }}</div>
{{ $shopping_user->billing_address_2 }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Postcode') }}</div>
{{ $shopping_user->billing_zipcode }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('City') }}</div>
{{ $shopping_user->billing_city }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Country') }}</div>
{{ $shopping_user->billing_country->getLocated() }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Phone') }}</div>
{{ $shopping_user->billing_phone }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('E-Mail') }}</div>
@if($shopping_user->faker_mail) "-" @else {{ $shopping_user->billing_email }} @endif
</div>
</div>
</div>
<hr class="m-0">
<!-- / Billing -->
<!-- Shipping -->
<div class="card-body">
<h6 class="small font-weight-semibold">
{{ __('Delivery address') }}
</h6>
@if($shopping_user->same_as_billing)
{{__('email.checkout_mail_same_address')}}
@else
<div class="row">
@if($shopping_user->shipping_company)
<div class="col-md-12 mb-3">
<div class="text-muted small">{{ __('Company') }}</div>
{{ $shopping_user->shipping_company }}
</div>
@endif
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Salutation') }}</div>
{{ \App\Services\HTMLHelper::getSalutationLang($shopping_user->shipping_salutation) }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('First name') }}</div>
{{ $shopping_user->shipping_firstname }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Last name') }}</div>
{{ $shopping_user->shipping_lastname }}
</div>
</div>
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Street') }}</div>
{{ $shopping_user->shipping_address }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Addition') }}</div>
{{ $shopping_user->shipping_address_2 }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Postcode') }}</div>
{{ $shopping_user->shipping_zipcode }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('City') }}</div>
{{ $shopping_user->shipping_city }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Country') }}</div>
{{ $shopping_user->shipping_country->getLocated() }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Phone') }}</div>
{{ $shopping_user->shipping_phone }}
</div>
</div>
@endif
</div>
<div class="card-body">
<h6 class="small font-weight-semibold">
{{ __('tables.order') }}
</h6>
@if(isset($yard_shopping_items))
<div class="table-responsive">
<table class="table table-product m-0" style="min-width:550px;">
<tbody>
<tr>
<th>{{ __('tables.product') }}</th>
<th> @if($yard_shopping_items['tax_free'])
{{ __('tables.net_price') }}
@else
{{ __('tables.price') }}
@endif
</th>
<th>{{ __('tables.quantity') }}</th>
<th>{{ __('tables.sum') }}</th>
</tr>
@foreach($yard_shopping_items['items'] as $item)
<tr>
<td class="px-3 py-2">
<div class="media align-item-center">
@if($item->image)
<img src="{{ route('product_image', [$item->image]) }}" class="d-block ui-w-80 mr-4" alt>
@endif
<div class="media-body">
<div class="d-block text-body"><strong>{{ $item->name }}</strong>
@if($is_abo) {!! get_abo_type_badge($item->abo_type) !!} @endif</div>
<div class="text-body">
<div>{{ __('order.content') }}: {{ $item->contents }}</div>
<div>{{ __('order.art_no') }}: {{ $item->number }}</div>
</div>
</div>
</div>
</td>
<td class="text-right font-weight-semibold align-middle px-3 py-2">
@if($yard_shopping_items['tax_free'])
{{ formatNumber($item->price_net, 2) }} &euro;
@else
{{ formatNumber($item->price, 2) }} &euro;
@endif
</td>
<td class="align-middle px-3 py-2" style="width: 66px;">
{{ $item->qty }}
</td>
<td class="text-right font-weight-semibold align-middle px-3 py-2">
@if($yard_shopping_items['tax_free'])
{{ formatNumber($item->price_net_total, 2) }} &euro;
@else
{{ formatNumber($item->price_total, 2) }} &euro;
@endif
</td>
</tr>
@endforeach
<tr>
<td colspan="3">
{{__('order.subtotal')}}
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
{{ $yard_shopping_items['total']['subtotal'] }} &euro;
</td>
</tr>
<tr>
<td colspan="3">
{{__('Delivery country')}}
</td>
<td class="text-right">
{{ $yard_shopping_items['total']['shippingCountryName'] }}
</td>
</tr>
<tr>
<td colspan="3">
{{__('order.shipping_costs')}}
</td>
<td class="text-right">
{{ $yard_shopping_items['total']['shippingNet'] }} &euro;
</td>
</tr>
<tr>
<td colspan="3">
{{__('order.total_without_VAT')}}
</td>
<td class="text-right">
{{ $yard_shopping_items['total']['subtotalWithShipping'] }} &euro;
</td>
</tr>
<tr>
<td colspan="3">
{{__('order.plus_VAT')}}
</td>
<td class="text-right">
{{ $yard_shopping_items['total']['taxWithShipping'] }} &euro;
</td>
</tr>
<tr>
<td colspan="3">
{{__('order.total_net')}}
</td>
<td class="text-right">
{{ $yard_shopping_items['total']['totalWithShipping'] }} &euro;
</td>
</tr>
@if($yard_shopping_items['tax_free'])
<tr>
<td colspan="3">
<b>{{__('order.total_net')}}</b>
</td>
<td class="text-right">
<b>{{ $yard_shopping_items['total']['totalWithShipping'] }} &euro;</b>
<br>
<span style="font-size: 0.8em">{{__('email.checkout_mail_subtotal_ws')}}</span>
</td>
</tr>
@else
<tr>
<td colspan="3">
<b>{{__('order.total_gross')}}</b>
</td>
<td class="text-right">
<b>{{ $yard_shopping_items['total']['totalWithShipping'] }} &euro;</b>
<br>
<span style="font-size: 0.8em">{{__('email.checkout_mail_tax_info')}}</span>
</td>
</tr>
@endif
</tbody>
</table>
</div>
@endif
</div>
</div>
@endsection

55
resources/views/user/order/payment/index.blade.php Normal file
View file

@ -0,0 +1,55 @@
@extends('layouts.layout-2')
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
{{ __('navigation.payment_links') }} / {{ __('navigation.overview') }}
</h4>
<div class="card">
<div class="card-datatable table-responsive">
<table class="datatable-users table table-striped table-bordered">
<thead>
<tr>
<th>#</th>
<th>{{__('tables.date')}}</th>
<th>{{__('tables.amount')}}</th>
<th>{{__('tables.status')}}</th>
<th>{{__('tables.art')}}</th>
<th>{{__('tables.firstname')}}</th>
<th>{{__('tables.lastname')}}</th>
<th>{{__('tables.email')}}</th>
<th>{{__('delete')}}</th>
</tr>
</thead>
</table>
</div>
</div>
<script>
$( document ).ready(function() {
$('.datatable-users').dataTable({
"processing": true,
"serverSide": true,
"ajax": '{!! route('user_order_payment_links_datatable') !!}',
"order": [[1, "desc" ]],
"columns": [
{ data: 'id', searchable: false },
{ data: 'created_at', name: 'created_at' },
{ data: 'total', name: 'total' },
{ data: 'status', name: 'status' },
{ data: 'type', name: 'type' },
{ data: 'billing_firstname', name: 'billing_firstname', orderable: false },
{ data: 'billing_lastname', name: 'billing_lastname', orderable: false },
{ data: 'billing_email', name: 'billing_email', orderable: false },
{ data: 'delete', name: 'delete', orderable: false },
],
"bLengthChange": false,
"iDisplayLength": 100,
"language": {
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
});
</script>
@endsection

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

@ -1,5 +1,5 @@
@if($for == 'ot-customer')
@if($for == 'ot-customer' || $for == 'abo-ot-customer')
{{ Form::hidden('billing_company', $shopping_user->billing_company) }}
{{ Form::hidden('billing_salutation', $shopping_user->billing_salutation) }}
{{ Form::hidden('billing_firstname', $shopping_user->billing_firstname) }}

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

@ -125,7 +125,7 @@
<div class="row">
<div class="col-12 col-sm-6 col-md-7 description">
<div class="media-body">
<div class="d-block text-body" style="font-size: 15px; font-weight: 500;">{{ $row->name }}</div>
<div class="d-block text-body" style="font-size: 15px; font-weight: 500;">{{ $row->name }} @if(isset($is_abo) && $is_abo) {!! get_abo_type_badge_by_product($product) !!} @endif</div>
<div class="text-body">
<div>{{ __('order.content') }}: {{ $product->contents }}</div>
<div>{{ __('order.art_no') }}: {{ $product->number }}</div>
@ -258,14 +258,14 @@
@if(isset($is_abo) && $is_abo)
<div class="text-right">
<h4>{{ __('order.abo_settings') }}</h4>
<h4>{{ __('abo.abo_settings') }}</h4>
<div class="form-row">
<div class="col-6 col-sm-8 col-md-9 col-lg-9 mb-1">
</div>
<div class="col-6 col-sm-4 col-md-3 col-lg-3 mb-1 text-right">
<label class="form-label">{{ __('order.delivery_intervall') }}*</label>
<label class="form-label">{{ __('abo.delivery_day') }}*</label>
<select class="custom-select" name="abo_interval">
{!! HTMLHelper::getAboIntervallWeeks(4) !!}
{!! HTMLHelper::getAboDeliveryOptions() !!}
</select>
</div>
@ -273,20 +273,29 @@
</div>
<div class="col-12 col-sm-8 col-md-6 mb-1">
<div class="text-right">
<em class="small"> <i> {!! __('order.abo_order_info') !!}</em>
<em class="small"> <i> {!! __('abo.abo_order_info') !!}</em>
</div>
</div>
</div>
<hr>
</div>
@endif
@if((isset($data['for']) && $data['for'] === 'ot-customer') || (isset($for) && $for === 'ot-customer'))
@php($is_disabled = false)
@if(isset($is_abo) && $is_abo && !\App\Services\AboHelper::aboHasBaseProduct(Yard::instance('shopping')->getContentByOrder()))
@php($is_disabled = true)
<div class="float-right">
<button type="submit" class="btn btn-secondary"><i class="ion ion-ios-redo"></i> {{ __('order.confirm_and_send_order') }}</button>
<div class="alert alert-danger text-right">
<strong>{!! __('abo.abo_type_info_base', ['base'=>get_abo_type_badge('base')]) !!}</strong>
</div>
</div>
<br clear="all">
@endif
@if((isset($data['for']) && $data['for'] === 'ot-customer') || (isset($for) && $for === 'abo-ot-customer'))
<div class="float-right">
<button type="submit" class="btn btn-secondary" @if($is_disabled) disabled @endif><i class="ion ion-ios-redo"></i> {{ __('order.confirm_and_send_order') }}</button>
</div>
<br><br>
<div class="text-right">
@ -294,12 +303,13 @@
</div>
@else
<div class="float-right">
<button type="submit" class="btn btn-secondary"><i class="ion ion-ios-redo"></i> {{ __('order.confirm_and_proceed_to_checkout') }}</button>
<button type="submit" class="btn btn-secondary" @if($is_disabled) disabled @endif><i class="ion ion-ios-redo"></i> {{ __('order.confirm_and_proceed_to_checkout') }}</button>
</div>
<br><br>
<div class="text-right">
<em class="small"> <i class="fa fa-lock"></i> {!! __('payment.checkout_ssl_server') !!}</em>
</div>
@endif
@endif
@endif

4
resources/views/user/shop/sales/api_order_list_total.blade.php
View file

@ -22,13 +22,13 @@
</td>
<td class="text-right">
{{$shop_item->points_total}}
{{ number_format($shop_item->points_total, 0) }}
</td>
<td class="text-right">
{{ formatNumber($shop_item->user_price_net) }} &euro;
</td>
<td class="text-right">
{{$shop_item->qty}}
{{ number_format($shop_item->qty, 0) }}
</td>
<td class="text-right">

2
resources/views/user/team/export.blade.php
View file

@ -47,6 +47,7 @@
<th>{{__('tables.phone') }}</th>
<th>{{__('tables.mobil') }}</th>
<th>{{__('tables.birthday') }}</th>
<th>{{__('tables.partner_since') }}</th>
<th>{{__('tables.account') }}</th>
<th>{{__('tables.account_to') }}</th>
<th>{{__('tables.sponsor')}}</th>
@ -69,6 +70,7 @@
<td>{{ $child->phone }}</td>
<td>{{ $child->mobil }}</td>
<td>{{ $child->birthday }}</td>
<td>{{ $child->partner_since }}</td>
<td>{!! ($child->active_account == 1 ? __('yes') : __('no')) !!}</td>
<td>{{ $child->payment_account_date }}</td>
<td>{{ $child->sponsor_name }}</td>

12
resources/views/user/user_form.blade.php
View file

@ -312,16 +312,16 @@
<div class="card-body">
<div class="form-row">
<div class="form-group col-md-12">
<label class="form-label" for="bank_owner">{{ __('account.account_holder') }}</label>
{{ Form::text('bank_owner', $user->account->bank_owner, array('placeholder'=>__('account.firstname_lastname'), 'class'=>'form-control', 'id'=>'bank_owner')) }}
<label class="form-label" for="bank_owner">{{ __('account.account_holder') }}*</label>
{{ Form::text('bank_owner', $user->account->bank_owner, array('placeholder'=>__('account.firstname_lastname'), 'class'=>'form-control', 'id'=>'bank_owner', 'required'=>true)) }}
</div>
<div class="form-group col-md-6">
<label class="form-label" for="bank_iban">{{ __('account.IBAN') }}</label>
{{ Form::text('bank_iban', $user->account->bank_iban, array('placeholder'=>__('account.IBAN'), 'class'=>'form-control', 'id'=>'bank_iban')) }}
<label class="form-label" for="bank_iban">{{ __('account.IBAN') }}*</label>
{{ Form::text('bank_iban', $user->account->bank_iban, array('placeholder'=>__('account.IBAN'), 'class'=>'form-control', 'id'=>'bank_iban', 'required'=>true)) }}
</div>
<div class="form-group col-md-6">
<label class="form-label" for="bank_bic">{{ __('account.BIC') }}</label>
{{ Form::text('bank_bic', $user->account->bank_bic, array('placeholder'=>__('account.BIC'), 'class'=>'form-control', 'id'=>'bank_bic')) }}
<label class="form-label" for="bank_bic">{{ __('account.BIC') }}*</label>
{{ Form::text('bank_bic', $user->account->bank_bic, array('placeholder'=>__('account.BIC'), 'class'=>'form-control', 'id'=>'bank_bic', 'required'=>true)) }}
</div>
</div>
</div>

2
resources/views/vendor/translation/languages/index.blade.php vendored
View file

@ -24,7 +24,7 @@
<td>
<a href="{{ route('languages.translations.index', $language) }}?group=single" class="btn icon-btn btn-sm btn-primary">
<span class="fa fa-edit"></span>
</a>
</a> {{ __('translation::translation.translations') }} {{ __('edit') }}
</td>
<td>
{{ $name }}

1
resources/views/web/layouts/application.blade.php
View file

@ -11,6 +11,7 @@
<!--[if IE]><meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'><![endif]-->
<link href="{{ asset('/fonts/opensans-raleway-pacifico.css?v=1') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('../vendor/fonts/fontawesome.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('/assets/plugins/slider.revolution/css/extralayers.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('/assets/plugins/slider.revolution/css/settings.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('/assets/css/mystyle.css') }}" rel="stylesheet" type="text/css" />

4
resources/views/web/templates/_bcategories.blade.php
View file

@ -22,11 +22,11 @@
{{ __('webcontent.compatibility_with_family_private_life') }}
</a>
</li>
<li class="list-group-item {{ Request::is('geschaeftsmodell/existenzgruendung') ? ' active' : '' }}">
{{-- <li class="list-group-item {{ Request::is('geschaeftsmodell/existenzgruendung') ? ' active' : '' }}">
<a href="{{ url('/geschaeftsmodell/existenzgruendung') }}">
{{ __('webcontent.start_up') }}
</a>
</li>
--}}
</ul>
</div>

0
resources/views/web/templates/existenzgruendung.blade.php → resources/views/web/templates/_existenzgruendung.blade.php
View file

111
resources/views/web/templates/checkout-is-final.blade.php Normal file
View file

@ -0,0 +1,111 @@
@extends($user_shop ?'web.user.layouts.layout' : 'web.layouts.layout')
@section('content')
<section class="page-header page-header-xlg parallax parallax-3"
style="background-image:url('/assets/images/vision-min.jpg')">
<div class="overlay dark-1"><!-- dark overlay [1 to 9 opacity] --></div>
<div class="container">
</div>
</section>
<!-- /PAGE HEADER -->
<style>
div.shop-item {
margin-bottom:30px;
border: 1px solid #ddd;
}
div.shop-item > .thumbnail, .thumbnail {
border: none;
}
div.shop-item-summary {
padding: 8px;
}
div.shop-item-summary h2 a {
color: #9aa983;
font-size: 1.2em;
margin: 0 0 10px 0;
}
div.shop-item-buttons {
padding: 0 8px 10px 8px;
}
div.shop-item-buttons .btn-xs{
padding: 4px;
}
.cartContent a.remove_item {
background: transparent;
}
.cartContent .product_name {
font-size: 1.15em;
}
.cartContent .product_name > small {
line-height: 20px;
}
@media only screen and (max-width: 1200px) {
.cartContent .product_name {
padding-bottom: 0;
min-height: 60px;
width: 60%;
}
.cartContent .remove_item {
clear: right;
}
.cartContent .total_price {
width: auto;
padding-top: 30px;
clear: right;
}
.cartContent .item .qty {
float: left;
text-align: left;
}
.cartContent .item.head {
display: none;
}
}
@media only screen and (min-width: 768px) {
.cartContent .total_price {
padding-top: 10px;
}
}
@media only screen and (min-width: 992px) {
.cartContent .total_price {
padding-top: 30px;
}
}
@media only screen and (min-width: 1200px) {
.cartContent .total_price {
padding-top: 10px;
}
}
</style>
<!-- -->
<!-- -->
<section>
<div class="container">
<!-- CHECKOUT FINAL MESSAGE -->
<div class="panel panel-default">
<div class="panel-body">
<h3>{{ __('payment.thank_you_very_much') }}</h3>
<h4>{{ __('payment.link_was_paid') }}</h4>
<hr />
<p>
<strong>{{ __('payment.your_mivita_team') }}</strong>
</p>
</div>
</div>
<!-- /CHECKOUT FINAL MESSAGE -->
</div>
</section>
<!-- / -->
@endsection

71
resources/views/web/templates/checkout.blade.php
View file

@ -217,6 +217,13 @@
</div>
@endif
@if($instance_status)
<div class="row mb-4">
<div class="col-sm-12">
{!! \App\Services\OrderPaymentService::getStatusAlert($instance_status) !!}
</div>
</div>
@endif
<div class="row mb-4">
{{-- LEFT --}}
@ -252,7 +259,7 @@
@endif
</td>
<td>
<div class="shop-item-hl">{{ $row->name }}</div>
<div class="shop-item-hl"><strong>{{ $row->name }}</strong> @if(isset($is_abo) && $is_abo) {!! get_abo_type_badge_by_product($product) !!} @endif</div></div>
<div style="font-size: 13px; color:#1d1d1d; font-weight: 500;">{{ __('order.content') }}: {{ $product->contents }}</div>
<div style="font-size: 13px; color:#1d1d1d; font-weight: 500;">{{ __('order.art_no') }}: {{ $product->number }}</div>
<div style="font-size: 13px; color:#6e6e6e; font-weight: 400;"><em>{{ __('weborder.delivery_time_1_3') }}</em></div>
@ -359,7 +366,6 @@
</div>
<div class="m-checkout">
{!! Form::open(['url' => route('checkout.checkout_card_final'), 'class' => 'row clearfix', 'id'=>'checkout_card_final']) !!}
{!! Form::hidden('selected_country', '') !!}
{!! Form::hidden('is_for', $shopping_user->is_for) !!}
{!! Form::hidden('is_from', $shopping_user->is_from) !!}
@ -406,7 +412,7 @@
<div class="col-md-12 col-sm-12">
<div class="form-group {{($errors->has('billing_salutation') ? 'error' : '')}}">
<label class="mt-0 fs-14 fw-400" for="billing_salutation">{{ __('Salutation') }} *</label>
<select id="billing_salutation" name="billing_salutation" class="form-control selectpicker">
<select id="billing_salutation" name="billing_salutation" class="form-control custom-select">
{!! HTMLHelper::getSalutation(($shopping_user->billing_salutation ? $shopping_user->billing_salutation : old('billing_salutation'))) !!}
</select>
@if ($errors->has('billing_salutation'))
@ -508,7 +514,12 @@
<div class="row">
<div class="col-md-12 col-sm-12">
<label class="mt-0 fs-14 fw-400" for="billing_email">{{ __('E-Mail') }} *</label>
{!! Form::email('billing_email', $shopping_user->billing_email, ['class' => 'form-control '.($errors->has('billing_email') ? 'error' : ''), 'id'=>'billing_email']) !!}
@if($is_for === 'ot-customer' || $is_for === 'abo-ot-customer')
{!! Form::email('billing_email', $shopping_user->billing_email, ['class' => 'form-control '.($errors->has('billing_email') ? 'error' : ''), 'id'=>'billing_email', 'readonly' => 'readonly']) !!}
<span class="info-small">{{ __('order.email_can_not_be_changed') }}.</span>
@else
{!! Form::email('billing_email', $shopping_user->billing_email, ['class' => 'form-control '.($errors->has('billing_email') ? 'error' : ''), 'id'=>'billing_email']) !!}
@endif
@if ($errors->has('billing_email'))
<label for="billing_email" class="error text-danger small" style="display: block;">{{ $errors->first('billing_email') }}</label>
@endif
@ -679,7 +690,7 @@
<label class="mt-0 fs-14 fw-400" for="shipping_salutation">{{ __('Salutation') }} *</label>
<select id="shipping_salutation" name="shipping_salutation" class="form-control selectpicker">
<select id="shipping_salutation" name="shipping_salutation" class="form-control custom-select">
{!! HTMLHelper::getSalutation(($shopping_user->shipping_salutation ? $shopping_user->shipping_salutation : old('shipping_salutation'))) !!}
</select>
@if ($errors->has('shipping_salutation'))
@ -811,7 +822,7 @@
@endif
{{-- PAYMENT METHOD --}}
<fieldset class="box-border-shadow p-20">
<h4>@if(!$is_abo) {{ __('payment.payment_method') }} @else {{ __('order.payment_for_abo') }} @endif</h4>
<h4>@if(!$is_abo) {{ __('payment.payment_method') }} @else {{ __('abo.payment_for_abo') }} @endif</h4>
<hr>
<div class="toggle-transparent toggle-bordered-full clearfix">
<div class="toggle active">
@ -897,20 +908,20 @@
{{-- ABO INFOS --}}
@if($is_abo)
<fieldset class="box-border-shadow p-20">
<h4>{{ __('order.abo_delivery') }}</h4>
<h4>{{ __('abo.abo_delivery') }}</h4>
<hr>
<p class="small mb-2">{{ __('order.abo_order_info') }}</p>
<p class="small mb-2">{{ __('abo.abo_order_info') }}</p>
<div class="clearfix mb-2">
<span class="pull-right small text-right">
<div class="no-line-break"><strong> {{ now()->format('d.m.Y') }}</strong></div>
</span>
<span class="pull-left small"><strong>{{ __('order.abo_start_date') }}:</strong></span>
<span class="pull-left small"><strong>{{ __('abo.abo_start_date') }}:</strong></span>
</div>
<div class="clearfix mb-2">
<span class="pull-right small text-right">
<div class="no-line-break"><strong> {{ HTMLHelper::getAboWeeksLang($abo_interval) }}</strong></div>
<div class="no-line-break"><strong> {{ HTMLHelper::getAboStrLang($abo_interval) }}</strong></div>
</span>
<span class="pull-left small"><strong>{{ __('order.abo_delivery_intervall') }}:</strong></span>
<span class="pull-left small"><strong>{{ __('abo.abo_delivery_intervall') }}:</strong></span>
</div>
</fieldset>
@endif
@ -980,11 +991,10 @@
<div class="form-group">
<label class="mt-0 fs-14 fw-400" for="cc_cardtype">{{ __('payment.credit_card') }}*</label>
<select id="cc_cardtype" name="cc_cardtype" class="form-control selectpicker">
<select id="cc_cardtype" name="cc_cardtype" class="form-control custom-select" id="cc_cardtype">
<option value="V" @if(old('cc_cardtype') && old('cc_cardtype') == 'V') selected="selected" @endif>{{ __('payment.VISA') }}</option>
<option value="M" @if(old('cc_cardtype') && old('cc_cardtype') == 'M') selected="selected" @endif>{{ __('payment.Mastercard') }}</option>
{{-- <option value="A" @if(old('cc_cardtype') && old('cc_cardtype') == 'A') selected="selected" @endif>{{ __('payment.American Express') }}</option> --}}
</select>
</div>
@ -1000,36 +1010,41 @@
</div>
</div>
<div class="form-group">
<label class="mt-0 fs-14 fw-400">{{ __('payment.credit_card_number') }}*</label>
{!! Form::text('cc_cardpan', '', ['class' => 'form-control', 'id'=>'cc_cardpan', 'placeholder'=>__('payment.credit_card_number')]) !!}
</div>
<div class="row">
<div class="form-group col-sm-12 col-md-8">
<label class="mt-0 fs-14 fw-400">{{ __('payment.valid') }}*</label>
<div style="width: 40%" class="float-left">
<select id="cc_cardexpiremonth" name="cc_cardexpiremonth" class="form-control selectpicker">
<div class="form-group col-md-12">
<label class="mt-0 fs-14 fw-400">{{ __('payment.credit_card_number') }}*</label>
{!! Form::text('cc_cardpan', '', ['class' => 'form-control', 'id'=>'cc_cardpan', 'placeholder'=>__('payment.credit_card_number')]) !!}
</div>
<div class="form-group col-md-6">
<label class="mt-0 fs-14 fw-400" for="cc_cardexpiremonth">{{ __('payment.valid') }} {{ __('validation.attributes.month') }}*</label>
<select id="cc_cardexpiremonth" name="cc_cardexpiremonth" class="form-control custom-select">
@php( $months = range(1, 12))
@foreach($months as $month)
@php( $month = sprintf('%02d', $month) )
<option value="{{$month}}" @if(old('cc_cardexpiremonth') && old('cc_cardexpiremonth') == $month) selected="selected" @endif>{{$month}}</option>
@endforeach
</select>
</div>
<div style="width: 60%;" class="float-right">
<select id="cc_cardexpireyear" name="cc_cardexpireyear" class="form-control selectpicker">
@php( $years = range(date("Y"), date('Y', strtotime('+6 years'))) )
</div>
<div class="form-group col-md-6">
<label class="mt-0 fs-14 fw-400" for="cc_cardexpireyear">{{ __('payment.valid') }} {{ __('validation.attributes.year') }}*</label>
<select id="cc_cardexpireyear" name="cc_cardexpireyear" class="form-control custom-select">
@php( $years = range(date("Y"), date('Y', strtotime('+10 years'))) )
@foreach($years as $year)
<option value="{{$year}}" @if(old('cc_cardexpireyear') && old('cc_cardexpireyear') == $year) selected="selected" @endif>{{$year}}</option>
@endforeach
</select>
</div>
</div>
<div class="form-group col-sm-12 col-md-4">
<label class="mt-0 fs-14 fw-400">{{ __('payment.verification_no') }}*</label>
<div class="form-group col-md-6">
<label class="mt-0 fs-14 fw-400" for="cc_cardcvc2">{{ __('payment.verification_no') }}*</label>
{!! Form::text('cc_cardcvc2', '', ['class' => 'form-control', 'id'=>'cc_cardcvc2', 'placeholder'=>'CVC*']) !!}
</div>
</div>
</div>
</div>
</div>

1
resources/views/web/user/layouts/application.blade.php
View file

@ -11,6 +11,7 @@
<!--[if IE]><meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'><![endif]-->
<link href="{{ asset('/fonts/opensans-raleway-pacifico.css?v=1') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('../vendor/fonts/fontawesome.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('/assets/plugins/slider.revolution/css/extralayers.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('/assets/plugins/slider.revolution/css/settings.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('/assets/css/mystyle.css') }}" rel="stylesheet" type="text/css" />