Updates to 03-2025
This commit is contained in:
Kevin Adametz
parent
bfa3bb1df4
commit
9ae662f63e
243 changed files with 12580 additions and 12018 deletions
|
|
@ -217,6 +217,13 @@
|
|||
</div>
|
||||
@endif
|
||||
|
||||
@if($instance_status)
|
||||
<div class="row mb-4">
|
||||
<div class="col-sm-12">
|
||||
{!! \App\Services\OrderPaymentService::getStatusAlert($instance_status) !!}
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
<div class="row mb-4">
|
||||
|
||||
{{-- LEFT --}}
|
||||
|
|
@ -252,7 +259,7 @@
|
|||
@endif
|
||||
</td>
|
||||
<td>
|
||||
<div class="shop-item-hl">{{ $row->name }}</div>
|
||||
<div class="shop-item-hl"><strong>{{ $row->name }}</strong> @if(isset($is_abo) && $is_abo) {!! get_abo_type_badge_by_product($product) !!} @endif</div></div>
|
||||
<div style="font-size: 13px; color:#1d1d1d; font-weight: 500;">{{ __('order.content') }}: {{ $product->contents }}</div>
|
||||
<div style="font-size: 13px; color:#1d1d1d; font-weight: 500;">{{ __('order.art_no') }}: {{ $product->number }}</div>
|
||||
<div style="font-size: 13px; color:#6e6e6e; font-weight: 400;"><em>{{ __('weborder.delivery_time_1_3') }}</em></div>
|
||||
|
|
@ -359,7 +366,6 @@
|
|||
</div>
|
||||
<div class="m-checkout">
|
||||
{!! Form::open(['url' => route('checkout.checkout_card_final'), 'class' => 'row clearfix', 'id'=>'checkout_card_final']) !!}
|
||||
|
||||
{!! Form::hidden('selected_country', '') !!}
|
||||
{!! Form::hidden('is_for', $shopping_user->is_for) !!}
|
||||
{!! Form::hidden('is_from', $shopping_user->is_from) !!}
|
||||
|
|
@ -406,7 +412,7 @@
|
|||
<div class="col-md-12 col-sm-12">
|
||||
<div class="form-group {{($errors->has('billing_salutation') ? 'error' : '')}}">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_salutation">{{ __('Salutation') }} *</label>
|
||||
<select id="billing_salutation" name="billing_salutation" class="form-control selectpicker">
|
||||
<select id="billing_salutation" name="billing_salutation" class="form-control custom-select">
|
||||
{!! HTMLHelper::getSalutation(($shopping_user->billing_salutation ? $shopping_user->billing_salutation : old('billing_salutation'))) !!}
|
||||
</select>
|
||||
@if ($errors->has('billing_salutation'))
|
||||
|
|
@ -508,7 +514,12 @@
|
|||
<div class="row">
|
||||
<div class="col-md-12 col-sm-12">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_email">{{ __('E-Mail') }} *</label>
|
||||
{!! Form::email('billing_email', $shopping_user->billing_email, ['class' => 'form-control '.($errors->has('billing_email') ? 'error' : ''), 'id'=>'billing_email']) !!}
|
||||
@if($is_for === 'ot-customer' || $is_for === 'abo-ot-customer')
|
||||
{!! Form::email('billing_email', $shopping_user->billing_email, ['class' => 'form-control '.($errors->has('billing_email') ? 'error' : ''), 'id'=>'billing_email', 'readonly' => 'readonly']) !!}
|
||||
<span class="info-small">{{ __('order.email_can_not_be_changed') }}.</span>
|
||||
@else
|
||||
{!! Form::email('billing_email', $shopping_user->billing_email, ['class' => 'form-control '.($errors->has('billing_email') ? 'error' : ''), 'id'=>'billing_email']) !!}
|
||||
@endif
|
||||
@if ($errors->has('billing_email'))
|
||||
<label for="billing_email" class="error text-danger small" style="display: block;">{{ $errors->first('billing_email') }}</label>
|
||||
@endif
|
||||
|
|
@ -679,7 +690,7 @@
|
|||
|
||||
|
||||
<label class="mt-0 fs-14 fw-400" for="shipping_salutation">{{ __('Salutation') }} *</label>
|
||||
<select id="shipping_salutation" name="shipping_salutation" class="form-control selectpicker">
|
||||
<select id="shipping_salutation" name="shipping_salutation" class="form-control custom-select">
|
||||
{!! HTMLHelper::getSalutation(($shopping_user->shipping_salutation ? $shopping_user->shipping_salutation : old('shipping_salutation'))) !!}
|
||||
</select>
|
||||
@if ($errors->has('shipping_salutation'))
|
||||
|
|
@ -811,7 +822,7 @@
|
|||
@endif
|
||||
{{-- PAYMENT METHOD --}}
|
||||
<fieldset class="box-border-shadow p-20">
|
||||
<h4>@if(!$is_abo) {{ __('payment.payment_method') }} @else {{ __('order.payment_for_abo') }} @endif</h4>
|
||||
<h4>@if(!$is_abo) {{ __('payment.payment_method') }} @else {{ __('abo.payment_for_abo') }} @endif</h4>
|
||||
<hr>
|
||||
<div class="toggle-transparent toggle-bordered-full clearfix">
|
||||
<div class="toggle active">
|
||||
|
|
@ -897,20 +908,20 @@
|
|||
{{-- ABO INFOS --}}
|
||||
@if($is_abo)
|
||||
<fieldset class="box-border-shadow p-20">
|
||||
<h4>{{ __('order.abo_delivery') }}</h4>
|
||||
<h4>{{ __('abo.abo_delivery') }}</h4>
|
||||
<hr>
|
||||
<p class="small mb-2">{{ __('order.abo_order_info') }}</p>
|
||||
<p class="small mb-2">{{ __('abo.abo_order_info') }}</p>
|
||||
<div class="clearfix mb-2">
|
||||
<span class="pull-right small text-right">
|
||||
<div class="no-line-break"><strong> {{ now()->format('d.m.Y') }}</strong></div>
|
||||
</span>
|
||||
<span class="pull-left small"><strong>{{ __('order.abo_start_date') }}:</strong></span>
|
||||
<span class="pull-left small"><strong>{{ __('abo.abo_start_date') }}:</strong></span>
|
||||
</div>
|
||||
<div class="clearfix mb-2">
|
||||
<span class="pull-right small text-right">
|
||||
<div class="no-line-break"><strong> {{ HTMLHelper::getAboWeeksLang($abo_interval) }}</strong></div>
|
||||
<div class="no-line-break"><strong> {{ HTMLHelper::getAboStrLang($abo_interval) }}</strong></div>
|
||||
</span>
|
||||
<span class="pull-left small"><strong>{{ __('order.abo_delivery_intervall') }}:</strong></span>
|
||||
<span class="pull-left small"><strong>{{ __('abo.abo_delivery_intervall') }}:</strong></span>
|
||||
</div>
|
||||
</fieldset>
|
||||
@endif
|
||||
|
|
@ -980,11 +991,10 @@
|
|||
|
||||
<div class="form-group">
|
||||
<label class="mt-0 fs-14 fw-400" for="cc_cardtype">{{ __('payment.credit_card') }}*</label>
|
||||
<select id="cc_cardtype" name="cc_cardtype" class="form-control selectpicker">
|
||||
<select id="cc_cardtype" name="cc_cardtype" class="form-control custom-select" id="cc_cardtype">
|
||||
<option value="V" @if(old('cc_cardtype') && old('cc_cardtype') == 'V') selected="selected" @endif>{{ __('payment.VISA') }}</option>
|
||||
<option value="M" @if(old('cc_cardtype') && old('cc_cardtype') == 'M') selected="selected" @endif>{{ __('payment.Mastercard') }}</option>
|
||||
{{-- <option value="A" @if(old('cc_cardtype') && old('cc_cardtype') == 'A') selected="selected" @endif>{{ __('payment.American Express') }}</option> --}}
|
||||
|
||||
</select>
|
||||
</div>
|
||||
|
||||
|
|
@ -1000,36 +1010,41 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="mt-0 fs-14 fw-400">{{ __('payment.credit_card_number') }}*</label>
|
||||
{!! Form::text('cc_cardpan', '', ['class' => 'form-control', 'id'=>'cc_cardpan', 'placeholder'=>__('payment.credit_card_number')]) !!}
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="form-group col-sm-12 col-md-8">
|
||||
<label class="mt-0 fs-14 fw-400">{{ __('payment.valid') }}*</label>
|
||||
<div style="width: 40%" class="float-left">
|
||||
<select id="cc_cardexpiremonth" name="cc_cardexpiremonth" class="form-control selectpicker">
|
||||
<div class="form-group col-md-12">
|
||||
<label class="mt-0 fs-14 fw-400">{{ __('payment.credit_card_number') }}*</label>
|
||||
{!! Form::text('cc_cardpan', '', ['class' => 'form-control', 'id'=>'cc_cardpan', 'placeholder'=>__('payment.credit_card_number')]) !!}
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-6">
|
||||
<label class="mt-0 fs-14 fw-400" for="cc_cardexpiremonth">{{ __('payment.valid') }} {{ __('validation.attributes.month') }}*</label>
|
||||
<select id="cc_cardexpiremonth" name="cc_cardexpiremonth" class="form-control custom-select">
|
||||
@php( $months = range(1, 12))
|
||||
@foreach($months as $month)
|
||||
@php( $month = sprintf('%02d', $month) )
|
||||
<option value="{{$month}}" @if(old('cc_cardexpiremonth') && old('cc_cardexpiremonth') == $month) selected="selected" @endif>{{$month}}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
<div style="width: 60%;" class="float-right">
|
||||
<select id="cc_cardexpireyear" name="cc_cardexpireyear" class="form-control selectpicker">
|
||||
@php( $years = range(date("Y"), date('Y', strtotime('+6 years'))) )
|
||||
</div>
|
||||
<div class="form-group col-md-6">
|
||||
<label class="mt-0 fs-14 fw-400" for="cc_cardexpireyear">{{ __('payment.valid') }} {{ __('validation.attributes.year') }}*</label>
|
||||
<select id="cc_cardexpireyear" name="cc_cardexpireyear" class="form-control custom-select">
|
||||
@php( $years = range(date("Y"), date('Y', strtotime('+10 years'))) )
|
||||
@foreach($years as $year)
|
||||
<option value="{{$year}}" @if(old('cc_cardexpireyear') && old('cc_cardexpireyear') == $year) selected="selected" @endif>{{$year}}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-sm-12 col-md-4">
|
||||
<label class="mt-0 fs-14 fw-400">{{ __('payment.verification_no') }}*</label>
|
||||
<div class="form-group col-md-6">
|
||||
<label class="mt-0 fs-14 fw-400" for="cc_cardcvc2">{{ __('payment.verification_no') }}*</label>
|
||||
{!! Form::text('cc_cardcvc2', '', ['class' => 'form-control', 'id'=>'cc_cardcvc2', 'placeholder'=>'CVC*']) !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue