Updates to 03-2025

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

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