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

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>