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

Mitgliedschaft: Erinnerungen und eigenes Verlaengerungs-Produkt

Browse source 
Die Erinnerungsmails vor Ablauf der Mitgliedschaft beschrieben noch den
abgeschafften SEPA-Einzug und verlinkten auf die Hauptdomain, wo
/user/membership nicht existiert. Das Produkt fuer die Verlaengerung war
zudem dasselbe wie bei der Registrierung und sprach deshalb vom
Neuabschluss.

- Erinnerungen: nur noch Stufen 31/33/34/35, SEPA-Stufen 32/36/37 samt
  :price und :pay_date entfallen; Button verlinkt auf my.mivita.care;
  fehlt ein Text zum Status, wird die Mail geloggt statt roh versendet.
- Alle Erinnerungstexte (de/en/es/fr) erklaeren jetzt, dass ohne Zahlung
  der Account pausiert und offene Provisionen ausgezahlt werden.
- Eigenes Produkt fuer die Verlaengerung (identifier show_renewal) als
  Kopie des Mitgliedschafts-Produkts inkl. Preisen, Kategorien und
  Uebersetzungen fuer en/es/fr; die Mitgliedschaftsseite faellt ohne
  dieses Produkt auf das bisherige zurueck.
- Mitgliedschaftsseite auf ein Paket reduziert: Upgrade-, Wechsel- und
  Abo-Optionen entfernt, Texte auf die manuelle Verlaengerung umgestellt.
- Alte Cron-Weboberflaeche entfernt, der Versand laeuft ueber den
  Scheduler (payments:check-accounts).

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Kevin 2026-08-26 08:24:32 +00:00
parent 0bdb6eabc6
commit 30fb031d12
30 changed files with 810 additions and 1223 deletions
Download patch file Download diff file Expand all files Collapse all files

31
resources/views/dashboard/_reminder.blade.php
View file

@ -17,45 +17,26 @@
@else
<h5 class="alert badge-danger">{{__('membership.home_copy_alert_36', ['days'=>$user->daysActiveAccount()*-1, 'datetime'=>$user->getPaymentAccountDateFormat()])}}</h5>
@endif
{{--
Abo Option deaktiviert @if($user->payment_account && $user->isAboOption())
{{ __('membership.home_copy_SEPA_36', ['price'=> 'von '.$user->payment_order_product->getFormattedPrice().' EUR', 'pay_date'=>Carbon::parse($user->payment_account)->modify('- '.config('mivita.abo_booking_days').' days')->format('d.m.Y')]) }}
<hr>
@endif
--}}
<p>{{__('membership.home_copy_last_36', ['days'=>$user->daysActiveAccount(), 'datetime'=>$user->getPaymentAccountDateFormat()])}}</p>
@endif
@elseif($user->daysActiveAccount() < config('mivita.remind_last_days') )
{{-- 33 --}}
{{-- 34 --}}
<h5 class="alert badge-warning">{{ __('membership.home_copy_alert_31', ['datetime'=>$user->getPaymentAccountDateFormat()]) }}</h5>
<p>{{__('membership.home_copy_last_34', ['days'=>$user->daysActiveAccount(), 'datetime'=>$user->getPaymentAccountDateFormat()])}}</p>
@elseif($user->daysActiveAccount() < config('mivita.remind_sec_days'))
{{-- 33 --}}
<h5 class="alert badge-warning">{{ __('membership.home_copy_alert_31', ['datetime'=>$user->getPaymentAccountDateFormat()]) }}</h5>
{{-- Abo Option deaktiviert
@if($user->payment_account && $user->isAboOption())
@if($user->daysActiveAccount() < config('mivita.abo_booking_days') )
<p>{{ __('membership.home_copy_SEPA_33', ['price'=> 'von '.$user->payment_order_product->getFormattedPrice().' EUR', 'pay_date'=>Carbon::parse($user->payment_account)->modify('- '.config('mivita.abo_booking_days').' days')->format('d.m.Y')]) }}</p>
@else
<p>{{ __('membership.home_copy_SEPA_32', ['price'=> 'von '.$user->payment_order_product->getFormattedPrice().' EUR', 'pay_date'=>Carbon::parse($user->payment_account)->modify('- '.config('mivita.abo_booking_days').' days')->format('d.m.Y')]) }}</p>
@endif
<hr>
@endif
--}}
<p>{{__('membership.home_copy_last_33', ['days'=>$user->daysActiveAccount()])}}</p>
@else
{{-- 32 / 31 --}}
{{-- 31 --}}
<h5 class="alert badge-default">{{ __('membership.home_copy_alert_31', ['datetime'=>$user->getPaymentAccountDateFormat()]) }}</h5>
{{-- Abo Option deaktiviert
@if($user->payment_account && $user->isAboOption())
{{ __('membership.home_copy_SEPA_32', ['price'=> 'von '.$user->payment_order_product->getFormattedPrice().' EUR', 'pay_date'=>Carbon::parse($user->payment_account)->modify('- '.config('mivita.abo_booking_days').' days')->format('d.m.Y')]) }}
<hr>
@endif
--}}
<p>{{__('membership.home_copy_last_31', ['days'=>$user->daysActiveAccount()])}}</p>
@endif
@if($user->isActiveAccount())
<p>{{ __('membership.renewal_consequence') }}</p>
@endif
</div>
<div class="card-footer py-3">
<a href="{{route('user_membership')}}" class="btn btn-info mb-3"><i class="ion ion-ios-refresh text-default mr-1"></i> {{ __('home.manage_membership_now_here') }}</a>

2
resources/views/sys/index.blade.php
View file

@ -21,8 +21,6 @@
class="ion ion-ios-arrow-forward"></i>&nbsp; Buchnungen Pakete Berater nach Jahren</a>
<a href="{{ route('sysadmin_tool', ['customers']) }}" class="d-block mb-3"><i
class="ion ion-ios-arrow-forward"></i>&nbsp; Kundenhoheit prüfen</a>
<a href="{{ route('sysadmin_tool', ['cronjobs']) }}" class="d-block mb-3"><i
class="ion ion-ios-arrow-forward"></i>&nbsp; Cron Jobs</a>
<a href="{{ route('sysadmin_tool', ['shopping_orders']) }}" class="d-block mb-3"><i
class="ion ion-ios-arrow-forward"></i>&nbsp; Shopping Orders Käufe</a>
<a href="{{ route('sysadmin_tool', ['import']) }}" class="d-block mb-3"><i

39
resources/views/sys/tools/cronjobs.blade.php
View file

@ -1,39 +0,0 @@
@extends('layouts.layout-2')
@section('content')
@if ($errors->any())
<div class="row">
<div class="col-sm-12">
<div class="alert alert-danger">
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
</div>
</div>
@endif
<h4 class="font-weight-bold mb-4">
SysAdmin Cron Jobs
</h4>
<div class="card mb-4">
@if(count($values)>0)
<div class="card-body">
<!-- Controls -->
@foreach($values as $name=>$link)
<p>{{ $name }}</p>
<a href="{{$link}}" target="_blank">{{$link}}</a><hr><br><br>
@endforeach
</div>
@endif
</div>
@endsection

13
resources/views/user/membership/_abo_options.blade.php
View file

@ -1,13 +0,0 @@
{{--
Abo Option deaktiviert
<hr>
<label class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" name="abo_options" @if($user && $user->isAboOption()) checked="checked" @endif>
<span class="custom-control-label secondary"><strong>{{__('payment.auto_renewal_hl')}}:</strong> {{__('payment.auto_renewal_line_1')}}</span>
<p class="text-muted">{{__('payment.auto_renewal_line_2')}}</p>
</label>
<hr>
--}}

54
resources/views/user/membership/_change.blade.php
View file

@ -1,54 +0,0 @@
<!-- Description -->
<div class="card mb-4">
<div class="card-body">
{!! Form::open(['action' => route('user_membership_store', ['change_order']), 'class' => 'form-horizontal']) !!}
<div class="table-responsive">
<table class="table table- m-0">
<tbody class="switchers-stacked">
@foreach($products as $product)
<tr>
<td class="text-center align-middle px-0">
<label class="switcher switcher-secondary">
<input type="radio" class="switcher-input" value="{{$product->id}}" name="switchers-package-wizard" @if($product->id == $user->payment_order_id) checked @endif >
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label"></span>
</label>
</td>
<td class="p-4">
<div class="media align-items-center">
@if(count($product->images))
<img src="{{ route('product_image', [$product->images->first()->slug]) }}" class="d-block ui-w-60 ui-bordered mr-4" alt="">
@endif
<div class="media-body">
<h5 class="d-block text-dark">{{$product->getLang('name')}} @if($product->id == $user->payment_order_id) ({{ __('membership.active_package') }}) @endif</h5>
{!! $product->getLang('copy') !!}
</div>
</div>
</td>
<td class="text-right font-weight-semibold align-middle p-4">
<span class="no-line-break">{{ $product->getFormattedPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) }} €</span> /p.a.
@if(\App\Services\UserService::$user_country->currency)
<span class="no-line-break">{!! $product->getFormattedPriceCurrencyWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) !!}</span>
@endif
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
<div class="text-left mt-3">
<hr>
<button type="submit" class="btn btn-secondary">{{ __('payment.select_and_save') }}</button>&nbsp;
</div>
{!! Form::close() !!}
</div>
</div>
<!-- / Description -->

59
resources/views/user/membership/_payment.blade.php
View file

@ -1,59 +0,0 @@
<!-- Description -->
<div class="card mb-4">
<div class="card-body">
{!! Form::open(['action' => route('user_membership_store', ['payment']), 'class' => 'form-horizontal']) !!}
<div class="table-responsive">
<table class="table table- m-0">
<tbody class="switchers-stacked">
@foreach($products as $product)
<tr>
<td class="text-center align-middle px-0">
<label class="switcher switcher-secondary">
<input type="radio" class="switcher-input" value="{{$product->id}}" name="switchers-package-wizard" @if($product->id == $user->payment_order_id) checked @endif >
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label"></span>
</label>
</td>
<td class="p-4">
<div class="media align-items-center">
@if(count($product->images))
<img src="{{ route('product_image', [$product->images->first()->slug]) }}" class="d-block ui-w-60 ui-bordered mr-4" alt="">
@endif
<div class="media-body">
<h5 class="d-block text-dark">{{$product->getLang('name')}}</h5>
{!! $product->getLang('copy') !!}
</div>
</div>
</td>
<td class="text-right font-weight-semibold align-middle p-4">{{$product->getFormattedPrice()}} EUR / p.a.</td>
</tr>
@endforeach
</tbody>
</table>
</div>
<div class="text-left mt-3">
{{-- Abo Option deaktiviert
<hr>
<label class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" name="abo_options">
<span class="custom-control-label secondary"><strong>{{__('payment.auto_renewal_hl')}}:</strong> {{__('payment.auto_renewal_line_1')}}</span>
<p class="text-muted">{{__('payment.auto_renewal_line_2')}}</p>
</label>
<hr>
--}}
<button type="submit" class="btn btn-secondary">{{ __('payment.select_and_proceed_to_checkout') }}</button>&nbsp;
<br><br>
<em class="small text-center"> <i class="fa fa-lock"></i> {{ __('payment.checkout_ssl_server') }}</em>
</div>
{!! Form::close() !!}
</div>
</div>
<!-- / Description -->

19
resources/views/user/membership/_payment_order.blade.php
View file

@ -29,7 +29,7 @@
<table class="table table- m-0">
<tbody class="switchers-stacked">
@foreach($products as $product)
@if($product->id === $user->payment_order_id || $product->identifier === 'show_order')
@if($product->identifier === 'show_renewal' || $product->identifier === 'show_order' || $product->id == $user->payment_order_id)
<tr>
<td class="text-center align-middle px-0">
<label class="switcher switcher-secondary">
@ -66,23 +66,6 @@
</table>
</div>
<div class="text-left mt-3">
{{-- Abo Option deaktiviert
@if(!$user->isAboOption())
<hr>
<label class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" name="abo_options">
<span class="custom-control-label secondary"><strong>{{__('payment.auto_renewal_hl')}}:</strong> {{__('payment.auto_renewal_line_1')}}</span>
<p class="text-muted">{{__('payment.auto_renewal_line_2')}}</p>
</label>
<hr>
@else
<p><strong>{{__('membership.payment_copy_1')}}</strong><br>
{!! __('membership.payment_copy_2', ['date'=> Carbon::parse($user->payment_account)->modify('-'.config('mivita.abo_booking_days').' days')->format('d.m.Y')]) !!}</p>
<hr>
@endif
--}}
<button type="submit" class="btn btn-secondary">{{ __('payment.select_and_proceed_to_checkout') }}</button>&nbsp;
<br><br>
<em class="small text-center"> <i class="fa fa-lock"></i> {{ __('payment.checkout_ssl_server') }}</em>

80
resources/views/user/membership/_upgrade.blade.php
View file

@ -1,80 +0,0 @@
{!! Form::open(['action' => route('user_membership_store', ['upgrade_order']), 'class' => 'form-horizontal']) !!}
<div class="card mb-4">
<div class="card-body">
{!! Form::open(['action' => route('user_membership_store', ['change_order']), 'class' => 'form-horizontal']) !!}
<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>
<input type="hidden" name="qty" value="{{$diff_months}}">
<div class="table-responsive">
<table class="table table- m-0">
<tbody class="switchers-stacked">
@foreach($upgrade as $product)
<tr>
<td class="text-center align-middle px-0">
<label class="switcher switcher-secondary">
<input type="radio" class="switcher-input" value="{{$product->id}}" name="switchers-package-wizard" checked="checked">
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label"></span>
</label>
</td>
<td class="p-4">
<div class="media align-items-center">
@if(count($product->images))
<img src="{{ route('product_image', [$product->images->first()->slug]) }}" class="d-block ui-w-60 ui-bordered mr-4" alt="">
@endif
<div class="media-body">
<h5 class="d-block text-dark">{{$product->getLang('name')}}</h5>
{!! $product->getLang('copy') !!}
</div>
</div>
</td>
<td class="text-right font-weight-semibold align-middle p-4">
<span class="no-line-break">{{ $product->getFormattedPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) }} €</span> {{ __('payment.month') }}
@if(\App\Services\UserService::$user_country->currency)
<span class="no-line-break">{!! $product->getFormattedPriceCurrencyWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) !!}</span>
@endif
</td>
</tr>
<tr>
<td colspan="2" class="text-right">{{ __('payment.remaining_time') }}: {{$diff_months}} @if($diff_months==1) {{ __('payment.month') }} @else {{ __('payment.Monate') }} @endif</td>
<td class="text-right font-weight-semibold"> {!! Util::formatNumber($diff_months * $product->getPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country)) !!} EUR</td>
</tr>
@endforeach
</tbody>
</table>
</div>
<div class="text-left mt-3">
{{-- Abo Option deaktiviert
@include('user.membership._abo_options')
--}}
<button type="submit" class="btn btn-secondary"> {{ __('payment.select_and_proceed_to_checkout') }}</button>&nbsp;
<br><br>
<em class="small text-center"> <i class="fa fa-lock"></i> {{ __('payment.checkout_ssl_server') }}</em>
</div>
</div>
</div>
{!! Form::close() !!}

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

@ -20,110 +20,43 @@
</h4>
<div class="row">
<div class="col order-2 order-md-1">
{{-- isRenewalAccount payment_account date - config('mivita.renewal_days') Vertragsverlängerung --}}
{{-- Verlaengerungsfenster: ab config('mivita.renewal_days') Tagen vor Ablauf ist die Zahlung moeglich.
Es gibt nur noch eine Mitgliedschaft: Zahlung eingegangen => +1 Jahr, sonst laeuft sie aus. --}}
@if($user->isRenewalAccount())
<div class="card w-100 mb-4">
<h5 class="card-header">
{!! __('membership.membership_was_renewed', ['date'=>$user->nextRenewalAccount()]) !!}
</h5>
<h5 class="card-header">{{ __('membership.renewal_hl') }}</h5>
<div class="card-body">
<p>{{ __('membership.info_contract_renewal', ['days'=>config('mivita.renewal_days')]) }}</p>
@if($user->isActiveAccount())
<p>{{ __('membership.renewal_info', ['datetime' => $user->getPaymentAccountDateFormat()]) }}</p>
@else
<p>{{ __('membership.renewal_expired_info', ['datetime' => $user->getPaymentAccountDateFormat()]) }}</p>
@endif
<p>{{ __('membership.renewal_consequence') }}</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
@if($user->payment_account && $user->isAboOption())
@if($user->payment_account && $user->isAboOption())
@if($user->daysActiveAccount() < config('mivita.abo_booking_days') )
<p class="alert py-2 px-2 badge-secondary">
{!! __('membership.we_do_not_collect_membership_fee', ['date'=>Carbon::parse($user->payment_account)->modify('-'.config('mivita.abo_booking_days').' days')->format('d.m.Y')]) !!}
<br>
@else
<p class="alert py-2 px-2 badge-secondary">
{!! __('membership.renewal_is_active_membership_fee_automatic', ['date'=>Carbon::parse($user->payment_account)->modify('-'.config('mivita.abo_booking_days').' days')->format('d.m.Y')]) !!}
<br>
@endif
<hr>
@endif
@else
@if($user->payment_order_id && $user->payment_order_product->identifier === 'show_upgrade')
<p></p>
@endif
@endif
--}}
@if($userHistoryPaymentOrder && $userHistoryPaymentOrder->status > 2)
<h5 class="card-header bg-light">
<a href="#" class="" data-toggle="collapse" data-target="#collapsePaymentForm" aria-expanded="false" aria-controls="collapsePaymentForm">
<a href="#" data-toggle="collapse" data-target="#collapsePaymentForm" aria-expanded="false" aria-controls="collapsePaymentForm">
<i class="fa fa-caret-expand"></i> {{ __('membership.open_payment_options') }}
</a>
</h5>
<div class="collapse" id="collapsePaymentForm">
@include('user.membership._payment_order')
</div>
@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
@else
<h6 class="alert badge-warning">{{ __('membership.alert_contract_renewal') }}</h6>
@include('user.membership._payment_order')
@endif
</div>
</div>
@else
{{-- no Shop - Upgrade --}}
@if($user->isActiveAccount() && !$user->isActiveShop())
<div class="card w-100 mb-4">
<h5 class="card-header">{{__('membership.MIVITA_BUSINESS_Paket')}} {{__('membership.upgrade')}}</h5>
<div class="card-body">
@if($userHistoryUpgradeOrder && $userHistoryUpgradeOrder->status > 2)
<h6 class="alert badge-{{$userHistoryUpgradeOrder->getStatusColor()}}">
{{__('membership.payment_has_been_made') }} {{__('membership.status') }}: {{ trans('payment.status.'.$userHistoryUpgradeOrder->getStatusType())}}</h6>
@endif
<h5 class="d-block text-dark">>{{ __('membership.upgrade_copy_1') }}</h5>
<p>{{ __('membership.upgrade_copy_2') }}</p>
@if($userHistoryUpgradeOrder && $userHistoryUpgradeOrder->status > 2)
<h5 class="card-header bg-light">
<a href="#" class="" data-toggle="collapse" data-target="#collapsePaymentForm" aria-expanded="false" aria-controls="collapsePaymentForm">
<i class="fa fa-caret-expand"></i> {{ __('Zahlungsoptionen öffnen') }}
</a>
</h5>
<div class="collapse" id="collapsePaymentForm">
@include('user.membership._upgrade')
</div>
@else
@include('user.membership._upgrade')
@endif
</div>
</div>
@endif
{{-- upgrade downgrade next booking --}}
@if($user->payment_account)
@elseif($user->payment_account && $user->isActiveAccount())
<div class="card w-100 mb-4">
<h5 class="card-header">{{__('membership.membership')}} {{__('membership.change')}}</h5>
<h5 class="card-header">{{ __('membership.renewal_hl') }}</h5>
<div class="card-body">
<h6 class="d-block text-dark">
{!! __('membership.change_copy_1', ['date'=> $user->nextRenewalAccount()]) !!}
</h6>
<p>{{__('membership.change_copy_2')}}</p>
@include('user.membership._change')
<p>{{ __('membership.active_info', ['datetime' => $user->getPaymentAccountDateFormat(), 'renewal_date' => $user->nextRenewalAccount()]) }}</p>
<p>{{ __('membership.renewal_consequence') }}</p>
</div>
</div>
@endif
@endif
@ -169,30 +102,6 @@
</div>
</div>
{{-- remove ABO Options --}}
{{--
Abo Option deaktiviert
@if($user->payment_account && $user->is())
<div class="card w-100 mb-4">
{!! Form::open(['action' => route('user_membership_store', ['remove_abo']), 'class' => 'form-horizontal']) !!}
<h5 class="card-header">{{__('payment.auto_renewal_hl')}} {{__('membership.deactivate')}}</h5>
<div class="card-body">
<p>{{__('membership.abo_copy_1')}}<br>
{!! __('membership.abo_copy_2', ['date'=> Carbon::parse($user->payment_account)->modify('-'.config('mivita.abo_booking_days').' days')->format('d.m.Y')]) !!}
</p>
<label class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" name="abo_options_remove">
<span class="custom-control-label secondary">{{__('membership.abo_copy_3')}}</span>
</label>
<button type="submit" class="btn btn-secondary btn-sm">{{__('payment.auto_renewal_hl')}} {{__('membership.deactivate')}}</button>&nbsp;
</div>
{!! Form::close() !!}
</div>
@endif
--}}
@if($user->payment_account)
<div class="card w-100 mb-4">
{!! Form::open(['action' => route('user_membership_store', ['delete_membership']), 'class' => 'form-horizontal']) !!}
@ -232,14 +141,14 @@
@endif
</div>
</li>
@if($user->payment_account && ! $user->isRenewalAccount())
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{__('membership.contract_renewal')}}</div>
<div class="text-muted">{{__('membership.renewal_possible_from')}}</div>
<div class="text-right">
@if($user->payment_account)
{{ $user->nextRenewalAccount() }}
@endif
{{ $user->nextRenewalAccount() }}
</div>
</li>
@endif
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{ __('membership.consultant_membership') }}</div>
<div class="text-right">
@ -294,19 +203,6 @@
</li>
@endif
@endif
{{--
Abo Option deaktiviert
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{__('payment.auto_renewal_hl')}}</div>
<div class="text-right">
@if($user->isAboOption())
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i> {{ __('membership.active') }}</span>
@else
<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i> {{ __('membership.inactive') }}</span>
@endif
</div>
</li>
--}}
</ul>
</div>
</div>