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

Custom Price / Land / User Order Homeparty

Browse source
This commit is contained in:
Kevin Adametz 2021-08-20 18:22:21 +02:00
parent d46824a4ac
commit 51d81d8ec6
55 changed files with 1951 additions and 681 deletions
Download patch file Download diff file Expand all files Collapse all files

88
resources/views/web/templates/checkout.blade.php
View file

@ -12,6 +12,9 @@
<!-- /PAGE HEADER -->
<style>
.no-line-break {
white-space: nowrap;
}
.checkbox.error{
color:#b92c28 !important;
}
@ -179,7 +182,6 @@
<!-- BILLING -->
<fieldset class="mb-0 box-border-shadow p-20">
<h4>Rechnungsadresse</h4>
<hr />
@if($is_from === 'shopping')
<div class="is_from_shopping">
@ -506,20 +508,28 @@
</div>
@if($is_from === 'user_order')
{!! Form::hidden('shipping_state', $shopping_user->shipping_state) !!}
{!! Form::hidden('shipping_country_id', \App\Services\Shop::getShippingCountryCountryId($shopping_user->shipping_state)) !!}
<div class="row">
<div class="col-md-12 col-sm-12">
<label class="mt-0 fs-14 fw-400" for="shipping_state">Lieferland *</label>
<div class="text-normal">{{ $shopping_user->shipping_country->getLocated() }}</div>
<span class="info-small">Das Lieferland kann nur im Salescenter geändert werden.</span>
</div>
</div>
@else
<div class="row">
<div class="col-md-12 col-sm-12">
<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>
<select id="shipping_state" name="shipping_state" class="form-control" required>
{!! 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>
@endif
<div class="row">
<div class="col-md-12 col-sm-12">
@ -565,7 +575,6 @@
@if(($shopping_user->abo_options === 1) && (Util::getUserPaymentFor() >= 3))
@if(array_key_exists('SEPA', $payment_methods_active) && in_array($payment_methods_active['SEPA'], $payment_methods))
<div class="col-lg-12 nomargin clearfix">
<label class="mt-4 fs-14 fw-400 radio pull-left" style="width: 100%">
@ -785,19 +794,34 @@
<div class="toggle-content">
@if($is_from === 'user_order')
<div class="clearfix mb-2">
<span class="pull-right">{{ Yard::instance('shopping')->subtotal() }} €</span>
<span class="pull-right text-right">
<div class="no-line-break">{{ Yard::instance('shopping')->subtotal() }} €</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('subtotal') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</span>
<strong class="pull-left">Zwischensumme:</strong>
</div>
<hr class="mt-4 mb-4">
<div class="clearfix mb-2">
<span class="pull-right small">{{ Yard::instance('shopping')->shippingNet() }} € </span>
<span class="pull-right small text-right">
<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>
@endif
</span>
<span class="pull-left small">Versandkosten:</span>
</div>
@else
<div class="clearfix mb-2">
<span class="pull-right">{{ Yard::instance('shopping')->total() }} €</span>
<span class="pull-right text-right">
<div class="no-line-break">{{ Yard::instance('shopping')->total() }} €</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('total') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</span>
<strong class="pull-left">Zwischensumme:</strong>
</div>
@ -806,7 +830,12 @@
<hr class="mt-4 mb-4">
<div class="clearfix mb-2">
<span class="pull-right small">{{ Yard::instance('shopping')->shipping() }} € </span>
<span class="pull-right small text-right">
<div class="no-line-break">{{ Yard::instance('shopping')->shipping() }} €</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('shipping') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</span>
<span class="pull-left small">Versandkosten:</span>
</div>
@endif
@ -814,7 +843,7 @@
@if($shopping_user->is_from !== 'homeparty')
<div class="clearfix mb-2">
<span class="pull-right small">{{ Yard::instance('shopping')->getShippingCountryName() }}</span>
<span class="pull-right small text-right">{{ Yard::instance('shopping')->getShippingCountryName() }}</span>
<span class="pull-left small">Lieferland:</span>
</div>
@ -822,31 +851,56 @@
<hr class="mt-4 mb-4">
<div class="clearfix mb-2" style="font-size: 90%">
<span class="pull-right small">{{ Yard::instance('shopping')->subtotalWithShipping() }} €</span>
<span class="pull-right small text-right">
<div class="no-line-break">{{ Yard::instance('shopping')->subtotalWithShipping() }} €</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('subtotalWithShipping') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</span>
<span class="pull-left small">Summe ohne MwSt:</span>
</div>
<div class="clearfix mb-2" style="font-size: 90%">
<span class="pull-right small">{{ Yard::instance('shopping')->taxWithShipping() }} €</span>
<span class="pull-right small text-right">
<div class="no-line-break">{{ Yard::instance('shopping')->taxWithShipping() }} €</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('taxWithShipping') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</span>
<span class="pull-left small"> zzgl. {{-- Yard::getTaxRate() --}} MwSt:</span>
</div>
@else
<hr class="mt-4 mb-4">
<div class="clearfix mb-2" style="font-size: 90%">
<span class="pull-right small">{!! $shopping_data['shop_price_net'] !!} €</span>
<span class="pull-right small text-right">
<div class="no-line-break">{!! $shopping_data['shop_price_net'] !!} €</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->convertCurrency($shopping_data['shop_price_net']) }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</span>
<span class="pull-left small">Summe ohne MwSt:</span>
</div>
<div class="clearfix mb-2" style="font-size: 90%">
<span class="pull-right small">{!! $shopping_data['shop_price_tax'] !!} €</span>
<span class="pull-right small text-right">
<div class="no-line-break">{!! $shopping_data['shop_price_tax'] !!} €</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->convertCurrency($shopping_data['shop_price_tax']) }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</span>
<span class="pull-left small"> zzgl. {{-- Yard::getTaxRate() --}} MwSt:</span>
</div>
@endif
<hr />
<div class="clearfix">
<span class="pull-right size-20"><strong>{{ Yard::instance('shopping')->totalWithShipping() }} €</strong></span>
<span class="pull-right size-20 text-right">
<strong><div class="no-line-break">{{ Yard::instance('shopping')->totalWithShipping() }} €</div></strong>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('totalWithShipping') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</span>
<strong class="pull-left">Gesamtsumme:</strong>
</div>