Erweiterungen / Korrekturen Beraterbestellungen
This commit is contained in:
Kevin Adametz
parent
ecc71c616f
commit
c4ed6b39db
36 changed files with 1104 additions and 617 deletions
|
|
@ -175,7 +175,7 @@
|
|||
<div class="col-lg-7 col-sm-7">
|
||||
<!-- BILLING -->
|
||||
<fieldset class="mb-0 box-border-shadow p-20">
|
||||
<h4>Rechnung & Versand</h4>
|
||||
<h4>Rechnungsadresse</h4>
|
||||
|
||||
<hr />
|
||||
@if($is_from === 'shopping')
|
||||
|
|
@ -262,11 +262,11 @@
|
|||
<div class="row">
|
||||
<div class="col-md-12 col-sm-12">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_state">Land *</label>
|
||||
<select id="billing_state" name="billing_state" class="form-control required">
|
||||
<select id="billing_state" name="billing_state" class="form-control" required>
|
||||
{!! HTMLHelper::getCountriesForShipping($shopping_user->billing_state) !!}
|
||||
</select>
|
||||
<input type="hidden" name="billing_country_id" value="{{ \App\Services\Shop::getShippingCountryCountryId($shopping_user->billing_state)}}">
|
||||
<span class="info-small" id="show_shipping_country_info">Bei der Änderung des Versandlandes werden die Versandkosten neu berechnet.</span>
|
||||
<span class="info-small" id="show_shipping_country_info">Bei der Änderung des Lieferlandes werden die Versandkosten neu berechnet.</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -306,56 +306,70 @@
|
|||
{!! Form::hidden('billing_country_id', \App\Services\Shop::getShippingCountryCountryId($shopping_user->billing_state)) !!}
|
||||
|
||||
<div class="row">
|
||||
<style>
|
||||
.ex-small {
|
||||
color: #868686 !important;
|
||||
font-size: 12px;
|
||||
font-weight: bold;
|
||||
}
|
||||
.text-normal {
|
||||
color: #404040 !important;
|
||||
font-size: 14px;
|
||||
font-weight: normal;
|
||||
margin-bottom: 6px;
|
||||
}
|
||||
</style>
|
||||
@if($shopping_user->billing_company)
|
||||
<div class="col-md-12 mb-3">
|
||||
<div class="text-muted small">Firma</div>
|
||||
{{ $shopping_user->billing_company }}
|
||||
<div class="ex-small">Firma</div>
|
||||
<div class="text-normal">{{ $shopping_user->billing_company }}</div>
|
||||
</div>
|
||||
@endif
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Anrede</div>
|
||||
{{ \App\Services\HTMLHelper::getSalutationLang($shopping_user->billing_salutation) }}
|
||||
<div class="ex-small">Anrede</div>
|
||||
<div class="text-normal">{{ \App\Services\HTMLHelper::getSalutationLang($shopping_user->billing_salutation) }}</div>
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Vorname</div>
|
||||
{{ $shopping_user->billing_firstname }}
|
||||
<div class="ex-small">Vorname</div>
|
||||
<div class="text-normal">{{ $shopping_user->billing_firstname }}</div>
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Nachname</div>
|
||||
{{ $shopping_user->billing_lastname }}
|
||||
<div class="ex-small">Nachname</div>
|
||||
<div class="text-normal">{{ $shopping_user->billing_lastname }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Straße</div>
|
||||
{{ $shopping_user->billing_address }}
|
||||
<div class="ex-small">Straße</div>
|
||||
<div class="text-normal">{{ $shopping_user->billing_address }}</div>
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Zusatz</div>
|
||||
{{ $shopping_user->billing_address_2 }}
|
||||
<div class="ex-small">Zusatz</div>
|
||||
<div class="text-normal">{{ $shopping_user->billing_address_2 }}</div>
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">PLZ</div>
|
||||
{{ $shopping_user->billing_zipcode }}
|
||||
<div class="ex-small">PLZ</div>
|
||||
<div class="text-normal">{{ $shopping_user->billing_zipcode }}</div>
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Stadt</div>
|
||||
{{ $shopping_user->billing_city }}
|
||||
<div class="ex-small">Stadt</div>
|
||||
<div class="text-normal">{{ $shopping_user->billing_city }}</div>
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Land</div>
|
||||
{{ $shopping_user->billing_country->getLocated() }}
|
||||
<div class="ex-small">Land</div>
|
||||
<div class="text-normal">{{ $shopping_user->billing_country->getLocated() }}</div>
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Telefon</div>
|
||||
{{ $shopping_user->billing_phone }}
|
||||
<div class="ex-small">Telefon</div>
|
||||
<div class="text-normal">{{ $shopping_user->billing_phone }}</div>
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">E-Mail</div>
|
||||
{{ $shopping_user->billing_email }}
|
||||
<div class="ex-small">E-Mail</div>
|
||||
<div class="text-normal">{{ $shopping_user->billing_email }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<p class="text-muted small mb-0"><i>Deine hinterlegten Rechnungsdaten können nur im Salescenter geändert werden.</i></p>
|
||||
<hr class="mb-3 mt-1">
|
||||
<p class="text-muted small mb-0"><i>Deine Rechnungsadresse kann nur im Salescenter geändert werden.</i></p>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
|
|
@ -376,18 +390,15 @@
|
|||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
<div class="col-lg-12 nomargin clearfix">
|
||||
<hr>
|
||||
<label class="mt-0 fs-14 fw-400 checkbox pull-left"><!-- see assets/js/view/demo.shop.js - CHECKOUT section -->
|
||||
{!! Form::checkbox('same_as_billing', 1, $shopping_user->same_as_billing, ['id'=>'shipswitch', 'class' => '']) !!}
|
||||
<i></i> <span class="weight-300">Versand an die gleiche Adresse</span>
|
||||
</label>
|
||||
<div class="row" @if($is_from === 'user_order') style="display: none" @endif>
|
||||
<div class="col-lg-12 nomargin clearfix">
|
||||
<hr>
|
||||
<label class="mt-0 fs-14 fw-500 checkbox pull-left">
|
||||
{!! Form::checkbox('same_as_billing', 1, $shopping_user->same_as_billing, ['id'=>'shipswitch']) !!}
|
||||
<i></i> <span class="weight-400">Abweichende Lieferadresse</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</fieldset>
|
||||
<!-- /BILLING -->
|
||||
|
||||
|
|
@ -403,7 +414,7 @@
|
|||
<h4>Lieferadresse des Kunden</h4>
|
||||
@endif
|
||||
@else
|
||||
<h4>Versand Adresse</h4>
|
||||
<h4>Lieferadresse</h4>
|
||||
@endif
|
||||
|
||||
<hr />
|
||||
|
|
@ -494,12 +505,16 @@
|
|||
|
||||
<div class="row">
|
||||
<div class="col-md-12 col-sm-12">
|
||||
<label class="mt-0 fs-14 fw-400" for="shipping_state">Land *</label>
|
||||
<select id="shipping_state" name="shipping_state" class="form-control required">
|
||||
{!! HTMLHelper::getCountriesForShipping($shopping_user->shipping_state) !!}
|
||||
</select>
|
||||
<input type="hidden" name="shipping_country_id" value="{{ \App\Services\Shop::getShippingCountryCountryId($shopping_user->shipping_state) }}">
|
||||
<span class="info-small">Bei der Änderung des Landes werden die Versandkosten neu berechnet.</span>
|
||||
<input type="hidden" name="shipping_country_id" value="{{ \App\Services\Shop::getShippingCountryCountryId($shopping_user->shipping_state) }}">
|
||||
<label class="mt-0 fs-14 fw-400" for="shipping_state">Lieferland *</label>
|
||||
<select id="shipping_state" name="shipping_state" class="form-control" required @if($is_from === 'user_order' && $is_for === 'me') disabled style="background-color: #d4d4d4;" @endif>
|
||||
{!! HTMLHelper::getCountriesForShipping($shopping_user->shipping_state) !!}
|
||||
</select>
|
||||
@if($is_from === 'user_order' && $is_for === 'me')
|
||||
<span class="info-small">Das Lieferland kann nur bei der Bestellübersicht geändert werden.</span>
|
||||
@else
|
||||
<span class="info-small">Bei der Änderung des Landes werden die Versandkosten neu berechnet.</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -793,7 +808,7 @@
|
|||
|
||||
<div class="clearfix mb-2">
|
||||
<span class="pull-right small">{{ Yard::instance('shopping')->getShippingCountryName() }}</span>
|
||||
<span class="pull-left small">Versandland:</span>
|
||||
<span class="pull-left small">Lieferland:</span>
|
||||
</div>
|
||||
|
||||
<hr class="mt-4 mb-4">
|
||||
|
|
@ -870,22 +885,22 @@
|
|||
}
|
||||
if(jQuery('#shipping').is(":visible")) {
|
||||
_scrollTo('#shipping', 150);
|
||||
showShippingCountryFor('shipping');
|
||||
}else{
|
||||
showShippingCountryFor('billing');
|
||||
}else{
|
||||
showShippingCountryFor('shipping');
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
if(!jQuery('#shipswitch').is(':checked')){
|
||||
showShippingCountryFor('billing');
|
||||
}else{
|
||||
jQuery('#shipping').show();
|
||||
showShippingCountryFor('shipping');
|
||||
|
||||
}else{
|
||||
showShippingCountryFor('billing');
|
||||
}
|
||||
|
||||
|
||||
|
||||
jQuery('.quick-cart-box-close').on('click', function () {
|
||||
jQuery('.quick-cart-box').css('display', 'none');
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue