Sammelbestellung von Extern
This commit is contained in:
parent
d01b4bd560
commit
582ca8299d
33 changed files with 3437 additions and 1466 deletions
|
|
@ -156,6 +156,8 @@
|
|||
{!! Form::hidden('is_for', $shopping_user->is_for) !!}
|
||||
{!! Form::hidden('is_from', $shopping_user->is_from) !!}
|
||||
{!! Form::hidden('homeparty_id', $shopping_user->homeparty_id) !!}
|
||||
{!! Form::hidden('shopping_collect_order_id', $shopping_user->shopping_collect_order_id) !!}
|
||||
|
||||
|
||||
|
||||
@if (\Session::has('elv-managemandate'))
|
||||
|
|
@ -406,7 +408,7 @@
|
|||
@endif
|
||||
</div>
|
||||
</div>
|
||||
@if($shopping_user->is_from !== 'homeparty')
|
||||
@if($shopping_user->is_from !== 'homeparty' && $shopping_user->is_from !== 'collection')
|
||||
@if($shopping_user->is_from === 'membership' || $shopping_user->is_from === 'wizard')
|
||||
{!! Form::hidden('same_as_billing', $shopping_user->same_as_billing) !!}
|
||||
<div class="row" style="display: none">
|
||||
|
|
@ -431,7 +433,7 @@
|
|||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@endif
|
||||
@endif
|
||||
</fieldset>
|
||||
<!-- /BILLING -->
|
||||
|
||||
|
|
@ -857,17 +859,18 @@
|
|||
<span class="pull-left small">Versandkosten:</span>
|
||||
</div>
|
||||
@else
|
||||
|
||||
<div class="clearfix mb-2">
|
||||
<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>
|
||||
@if($shopping_user->is_from !== 'homeparty')
|
||||
@if($shopping_user->is_from !== 'collection')
|
||||
<div class="clearfix mb-2">
|
||||
<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>
|
||||
@endif
|
||||
@if($shopping_user->is_from !== 'homeparty' && $shopping_user->is_from !== 'collection')
|
||||
<hr class="mt-4 mb-4">
|
||||
<div class="clearfix mb-2">
|
||||
<span class="pull-right small text-right">
|
||||
|
|
@ -882,43 +885,55 @@
|
|||
@endif
|
||||
|
||||
@if($shopping_user->is_from !== 'homeparty')
|
||||
<div class="clearfix mb-2">
|
||||
<span class="pull-right small text-right">{{ Yard::instance('shopping')->getShippingCountryName() }}</span>
|
||||
<span class="pull-left small">Lieferland:</span>
|
||||
</div>
|
||||
@if($shopping_user->is_from !== 'collection')
|
||||
<div class="clearfix mb-2">
|
||||
<span class="pull-right small text-right">{{ Yard::instance('shopping')->getShippingCountryName() }}</span>
|
||||
<span class="pull-left small">Lieferland:</span>
|
||||
</div>
|
||||
|
||||
<hr class="mt-4 mb-4">
|
||||
<hr class="mt-4 mb-4">
|
||||
|
||||
<div class="clearfix mb-2" style="font-size: 90%">
|
||||
<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 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 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>
|
||||
<hr />
|
||||
<div class="clearfix mb-2" style="font-size: 90%">
|
||||
<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>
|
||||
<hr />
|
||||
|
||||
<div class="clearfix">
|
||||
<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>
|
||||
<div class="clearfix">
|
||||
<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>
|
||||
@else
|
||||
<div class="clearfix">
|
||||
<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>
|
||||
@endif
|
||||
@else
|
||||
<hr class="mt-4 mb-4">
|
||||
@if(!$shopping_data['user_tax_free'])
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue