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

20-02-2026

Browse source
This commit is contained in:
Kevin Adametz 2026-02-20 17:55:06 +01:00
parent a8b395e20d
commit a00c42e770
252 changed files with 28785 additions and 8907 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,12 +44,9 @@
<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>
<div class="pl-1 ml-auto">
<div class="badge badge-secondary">VIP only</div>
</div>
<h4>{{ __('abo.abo_delivery') }}
@ -94,7 +91,6 @@
</div>
</div>
</div>
@endif
</div>
<hr>

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

@ -5,6 +5,22 @@
{{ __('navigation.payment_links') }} / {{ __('navigation.overview') }}
</h4>
{{-- Status-Legende --}}
<div class="card mb-3">
<div class="card-body">
<h6 class="card-title mb-3">{{ __('tables.status') }} - {{ __('legend') }}</h6>
<div class="row">
@foreach(\App\Services\OrderPaymentService::getStatusBadgeClasses() as $statusKey => $badgeClass)
<div class="col-md-3 mb-2">
<span class="badge badge-pill badge-{{ $badgeClass }}">
{{ __('payment.' . $statusKey) }}
</span>
</div>
@endforeach
</div>
</div>
</div>
<div class="card">
<div class="card-datatable table-responsive">
<table class="datatable-users table table-striped table-bordered">

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

@ -12,6 +12,7 @@
{{ Form::hidden('billing_state', Yard::instance('shopping')->getShippingCountryId()) }}
{{ Form::hidden('billing_email', $shopping_user->billing_email) }}
{{ Form::hidden('shipping_email', $shopping_user->shipping_email) }}
{{ Form::hidden('language', $shopping_user->getLocale()) }}
@endif
@if($shopping_user->same_as_billing)

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

@ -203,9 +203,39 @@
<tr>
<td class="text-left">{{ __('order.shipping_costs') }}:</td>
<td>
<div class="no-line-break">{{ Yard::instance('shopping')->shippingNet() }} €</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('shippingNet') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@php($shippingFree = Yard::instance('shopping')->getShippingFree())
@php($missingValue = Yard::instance('shopping')->getShippingFreeMissingValue())
@php($currentShipping = Yard::instance('shopping')->shippingNet())
@if($shippingFree && intval($currentShipping) == 0)
{{-- Versandkostenfrei erreicht --}}
<div class="badge badge-success font-weight-bold" style="font-size: 0.80rem; padding: 0.3rem 0.4rem;">
<i class="fa fa-check-circle"></i> {{ __('order.free_shipping') }}
</div>
<div class="mt-1">
<small class="text-success font-weight-bold">
<i class="fa fa-gift"></i> {{ __('order.free_shipping_reached', ['amount' => number_format($shippingFree, 2, ',', '.')]) }}
</small>
</div>
@else
{{-- Normale Versandkosten --}}
<div class="no-line-break">{{ $currentShipping }} €</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('shippingNet') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
@if($shippingFree && $missingValue > 0)
{{-- Zeige wie viel noch fehlt --}}
<div class="mt-1">
<small class="text-info">
<i class="fa fa-info-circle"></i>
{{ __('order.free_shipping_info', [
'amount' => number_format($shippingFree, 2, ',', '.'),
'missing' => number_format($missingValue, 2, ',', '.')
]) }}
</small>
</div>
@endif
@endif
</td>
</tr>
@ -336,3 +366,4 @@
@endif
@endif