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

23-01-2026

Browse source
This commit is contained in:
Kevin Adametz 2026-01-23 17:35:23 +01:00
parent a939cd51ef
commit a8b395e20d
248 changed files with 29342 additions and 4805 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -49,7 +49,7 @@
@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>
<div class="alert alert-warning"><strong>{!! __('abo.abo_type_info', ['base'=>get_abo_type_badge('base'), 'upgrade'=>get_abo_type_badge('upgrade'), 'abo-min-duration' => \App\Models\Setting::getContentBySlug('abo-min-duration')]) !!}</strong></div>
<p><strong><em></em></strong></p>
@endif
</div>

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

@ -81,15 +81,15 @@
</label>
</div>
<div class="mt-3">
<h6 class="card-header bg-light px-2 py-2">
<h6 class="card-header bg-light text-primary 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 class="list-padding-top">
{!! __('abo.pros_list', ['abo-min-duration' => \App\Models\Setting::getContentBySlug('abo-min-duration')]) !!}
</ul>
</div>
</div>

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

@ -134,6 +134,13 @@
<div class="text-muted small">{{ __('Phone') }}</div>
{{ $shopping_user->shipping_phone }}
</div>
@if($shopping_user->shipping_postnumber)
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('payment.dhl_postnumber') }}</div>
<span class="badge badge-info">{{ $shopping_user->shipping_postnumber }}</span>
<small class="d-block text-muted">{{ __('payment.packstation_delivery') }}</small>
</div>
@endif
</div>
@endif
</div>

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

@ -12,6 +12,7 @@
{{ Form::hidden('shipping_zipcode', $user->account->zipcode) }}
{{ Form::hidden('shipping_city', $user->account->city) }}
{{ Form::hidden('shipping_phone', $user->account->phone) }}
{{ Form::hidden('shipping_postnumber', $user->account->shipping_postnumber) }}
{{ Form::hidden('shipping_state', Yard::instance('shopping')->getShippingCountryId()) }}
@ -40,6 +41,7 @@
{{ Form::hidden('shipping_zipcode', $user->account->shipping_zipcode) }}
{{ Form::hidden('shipping_city', $user->account->shipping_city) }}
{{ Form::hidden('shipping_phone', $user->account->shipping_phone) }}
{{ Form::hidden('shipping_postnumber', $user->account->shipping_postnumber) }}
{{ Form::hidden('shipping_state', Yard::instance('shopping')->getShippingCountryId()) }}

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

@ -27,6 +27,7 @@
{{ Form::hidden('shipping_city', $shopping_user->billing_city) }}
{{ Form::hidden('shipping_phone', $shopping_user->billing_phone) }}
{{ Form::hidden('shipping_state', Yard::instance('shopping')->getShippingCountryId()) }}
{{ Form::hidden('shipping_postnumber', $shopping_user->shipping_postnumber) }}
@ -57,6 +58,7 @@
{{ Form::hidden('shipping_city', $shopping_user->shipping_city) }}
{{ Form::hidden('shipping_phone', $shopping_user->shipping_phone) }}
{{ Form::hidden('shipping_state', Yard::instance('shopping')->getShippingCountryId()) }}
{{ Form::hidden('shipping_postnumber', $shopping_user->shipping_postnumber) }}
{{-- <div class="">
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_state') ? 'has-error' : '' }}">

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

@ -129,6 +129,7 @@
<div class="text-body">
<div>{{ __('order.content') }}: {{ $product->contents }}</div>
<div>{{ __('order.art_no') }}: {{ $product->number }}</div>
<div>{{ __('order.points') }}: @if($row->options->comp) 0 @else {{ $product->getFormattedPoints() }} @endif</div>
</div>
</div>
<div class="options">
@ -179,7 +180,7 @@
<div class="d-flex flex-wrap justify-content-between pb-4">
<div class="mt-2">
<p class="small mb-2"> {!! __('order.you_has_article_in_shopping_cart', ['num'=> Yard::instance('shopping')->compCount() ]) !!}</p>
<p>{{ __('order.points_total') }}: {{ Yard::instance('shopping')->points() }}</p>
<p>{{ __('order.points_total') }}: {{ formatNumber(Yard::instance('shopping')->points()) }}</p>
<button type="button" class="btn btn-default btn-sm" id="clear-products-basket"><i class="ion ion-ios-trash"></i> {{ __('order.shopping_cart_delete') }}</button>
</div>
<div class="d-flex">
@ -258,27 +259,49 @@
@if(isset($is_abo) && $is_abo)
<div class="text-right">
<div class="alert alert-info">
<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">
<div class="col-12 col-sm-4 col-md-3 col-lg-3 mb-1 text-right">
<label class="form-label">{{ __('abo.delivery_day') }}*</label>
<select class="custom-select" name="abo_interval">
{!! HTMLHelper::getAboDeliveryOptions() !!}
</select>
</div>
<div class="col-12 col-sm-4 col-md-6 mb-1">
<div class="col-12 col-sm-12 col-md-4 col-lg-6 mb-1">
</div>
<div class="col-12 col-sm-8 col-md-6 mb-1">
<div class="col-12 col-sm-12 col-md-8 col-lg-6 mb-1">
<div class="text-right">
<em class="small"> <i> {!! __('abo.abo_order_info') !!}</em>
</div>
<em class="small"> <i> {!! __('abo.abo_order_info_check') !!}</em>
<hr style="margin-top: 10px; margin-bottom: 10px; border-color: #b4b4b4; border-width: 1px;">
<em class="font-weight-bold"> <i> {!! __('abo.abo_order_info_check_2') !!}</em>
<hr style="margin-top: 10px; margin-bottom: 10px; border-color: #b4b4b4; border-width: 1px;">
<em class="small"> <i> {!! __('abo.abo_order_info_check_3', ['abo-min-duration' => \App\Models\Setting::getContentBySlug('abo-min-duration')]) !!}</em>
<hr style="margin-top: 10px; margin-bottom: 10px; border-color: #b4b4b4; border-width: 1px;">
<label class="switcher switcher-success">
<input type="checkbox" class="switcher-input" name="abo_order_info_checkbox" value="true" required>
<span class="switcher-indicator">
<span class="switcher-yes">
<span class="ion ion-md-checkmark"></span>
</span>
<span class="switcher-no">
<span class="ion ion-md-close"></span>
</span>
</span>
<span class="switcher-label"><strong>{{ __('abo.abo_order_info_checkbox') }}</strong></span>
</label>
</div>
</div>
</div>
</div>
<hr>
</div>