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

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

@ -33,7 +33,12 @@
</label>
</div>
<hr>
@if(Session::has('custom-error'))
<div class="alert alert-dark-warning alert-dismissible fade show">
<button type="button" class="close" data-dismiss="alert">×</button>
<strong>{{ Session::get('custom-error') }}</strong>
</div>
@endif
<div id="show-is-for-customer" @if(!$shopping_user) style="display: none" @endif >
<div class="form-row">
<div class="form-group col-sm-6">
@ -49,13 +54,8 @@
</div>
</div>
<hr>
@if($shopping_user)
@if(Session::has('custom-error'))
<div class="alert alert-dark-warning alert-dismissible fade show">
<button type="button" class="close" data-dismiss="alert">×</button>
<strong>{{ Session::get('custom-error') }}</strong>
</div>
@endif
<div class="show-is-for-customer">
<h4>An diesen Kunde versenden</h4>
<p>Sollten unten stehende Angaben nicht korrekt sein oder aktualisiert werden müssen, ändere diese bitte vorerst unter:

81
resources/views/user/order/list.blade.php
View file

@ -48,12 +48,6 @@
</style>
@if($user->user_level)
<p>Die Produktpreise werden entsprechend Deinem Karriere-Level <strong>{{$user->user_level->name}}</strong> abzüglich <strong>{{$user->user_level->getFormattedMargin()}} %</strong> Marge angezeigt. Hinweis: Wenn Du den Warenkorb verlässt, gehen alle Einstellungen verloren.</p>
@else
<p>Hinweis: Dir wurde noch kein Karriere-Level zugewisen. Bitte wende dich an info@mivita.care</p>
@endif
@if($errors->has('switchers-comp-product'))
<div class="row">
<div class="col-sm-12">
@ -67,6 +61,61 @@
</div>
</div>
@endif
<input type="hidden" name="shipping_is_for" value="{{$for}}">
<div class="card mt-2 mb-2">
<div class="card-body">
@if($for === 'ot')
<h4>Lieferung an den Kunden</h4>
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Bestellland</div>
{{ App\Services\UserService::getOrderInfo('billing_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Lieferland</div>
{{ App\Services\UserService::getOrderInfo('shipping_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">MwSt</div>
{{ App\Services\UserService::getOrderInfo('tax_free') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Reverse Charge Verfahren</div>
{{ App\Services\UserService::getOrderInfo('user_reverse_charge') }}
</div>
</div>
<p>Das Lieferland kann nur beim Kunden unter <a href="{{ route('user_customers') }}">Meine Kunden</a> geändert werden.</i>
@endif
@if($for === 'me')
<h4>Lieferung an mich</h4>
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Bestellland</div>
{{ App\Services\UserService::getOrderInfo('billing_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Lieferland</div>
{{ App\Services\UserService::getOrderInfo('shipping_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">MwSt</div>
{{ App\Services\UserService::getOrderInfo('tax_free') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Reverse Charge Verfahren</div>
{{ App\Services\UserService::getOrderInfo('user_reverse_charge') }}
</div>
</div>
<i>Das Lieferland kann nur unter <a href="{{ route('user_edit') }}">Meine Daten</a> geändert werden.</i>
@endif
@if($user->user_level)
<p>Die Produktpreise werden entsprechend Deinem Karriere-Level <strong>{{$user->user_level->name}}</strong> abzüglich <strong>{{$user->user_level->getFormattedMargin()}} %</strong> Marge angezeigt.<br>Hinweis: Wenn Du den die Seite verlässt, wird der Warenkorb zurückgesetzt.</p>
@else
<p>Hinweis: Dir wurde noch kein Karriere-Level zugewisen. Bitte wende dich an info@mivita.care</p>
@endif
</div>
</div>
<div class="card">
@ -93,20 +142,12 @@
{!! Form::open(['url' => route('user_order_my_payment', [$for, $delivery_id]), 'class' => 'form-horizontal']) !!}
<input type="hidden" name="shipping_is_for" value="{{$for}}">
<div class="card mt-4">
<div class="card-body">
@if($for === 'ot')
<h4>Lieferland des Kunden</h4>
@include('user.order.shipping_ot')
@endif
@if($for === 'me')
<h4>Mein Lieferland</h4>
@include('user.order.shipping_me')
<i>Kann bei der Zahlung/Checkout nicht mehr geändert werden.</i>
@endif
</div>
</div>
@if($for === 'ot')
@include('user.order.shipping_ot')
@endif
@if($for === 'me')
@include('user.order.shipping_me')
@endif
@if($for === 'me')
<div id="holder_html_view_comp_product">

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

@ -12,11 +12,13 @@
{{ Form::hidden('shipping_zipcode', $user->account->zipcode) }}
{{ Form::hidden('shipping_city', $user->account->city) }}
{{ Form::hidden('shipping_phone', $user->account->phone) }}
{{ Form::hidden('shipping_state', Yard::instance('shopping')->getShippingCountryId()) }}
<div class="">
{{-- <div class="">
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_state') ? 'has-error' : '' }}">
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="me">
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="me" disabled="true">
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!}
</select>
@if ($errors->has('shipping_state'))
@ -26,7 +28,7 @@
@endif
</div>
</div>
</div>
</div>--}}
<!-- / Billing -->
@else
{{ Form::hidden('shipping_company', $user->account->shipping_company) }}
@ -38,11 +40,13 @@
{{ 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_state', Yard::instance('shopping')->getShippingCountryId()) }}
<div class="">
{{-- <div class="">
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_state') ? 'has-error' : '' }}">
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="me">
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="me" disabled="true">
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!}
</select>
@if ($errors->has('shipping_state'))
@ -52,14 +56,7 @@
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12">
<label class="form-label" for="shipping_phone">{{ __('Phone') }}</label>
{{ Form::text('shipping_phone', $user->account->shipping_phone, array('placeholder'=>__('Phone'), 'class'=>'form-control')) }}
</div>
</div>
</div>
</div>--}}
@endif
@else
<h4>Fehler: Keine Adressdaten gefunden!</h4>

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

@ -11,12 +11,14 @@
{{ Form::hidden('shipping_zipcode', $shopping_user->billing_zipcode) }}
{{ Form::hidden('shipping_city', $shopping_user->billing_city) }}
{{ Form::hidden('shipping_phone', $shopping_user->billing_phone) }}
{{ Form::hidden('shipping_state', Yard::instance('shopping')->getShippingCountryId()) }}
<div class="">
{{-- <div class="">
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_state') ? 'has-error' : '' }}">
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="ot">
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="ot" disabled="true">
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!}
</select>
@if ($errors->has('shipping_state'))
@ -26,7 +28,7 @@
@endif
</div>
</div>
</div>
</div>--}}
<!-- / Billing -->
@else
@ -39,10 +41,11 @@
{{ Form::hidden('shipping_zipcode', $shopping_user->shipping_zipcode) }}
{{ Form::hidden('shipping_city', $shopping_user->shipping_city) }}
{{ Form::hidden('shipping_phone', $shopping_user->shipping_phone) }}
<div class="">
{{ Form::hidden('shipping_state', Yard::instance('shopping')->getShippingCountryId()) }}
{{-- <div class="">
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_state') ? 'has-error' : '' }}">
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="ot">
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="ot" disabled="true">
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!}
</select>
@if ($errors->has('shipping_state'))
@ -52,5 +55,5 @@
@endif
</div>
</div>
</div>
</div>--}}
@endif

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

@ -82,6 +82,10 @@
min-width: 4em;
display: inline-block;
}
.xsmall {
font-size: 85%;
font-weight: 400;
}
</style>
<div id="cartContent">
@ -143,6 +147,9 @@
<div class="col-6 col-sm-3 col-md-2 text-left font-semi-bold price-single">
<div class="no-line-break">{{ Yard::instance('shopping')->rowPriceNet($row, 3) }} &euro;</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="xsmall">~{{ Yard::instance('shopping')->getCurrencyByKey('rowPriceNetCurrency', $row, 3) }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</div>
<div class="col-6 col-sm-3 col-md-3 quantity">
@ -155,6 +162,10 @@
</div>
<div class="price-total text-right">
<div class="no-line-break">{{ Yard::instance('shopping')->rowSubtotalNet($row) }} &euro;</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('rowSubtotalCurrency', $row, 3) }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</div>
</div>
@ -179,7 +190,12 @@
<tbody>
<tr>
<td class="text-left" style="border-top:none;">Zwischensumme:</td>
<td style="border-top:none;">{{ Yard::instance('shopping')->subtotal() }} €</td>
<td style="border-top:none;">
<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
</td>
</tr>
<tr>
<td class="text-left">Lieferland:</td>
@ -188,23 +204,52 @@
<tr>
<td class="text-left">Versandkosten:</td>
<td>
{{ Yard::instance('shopping')->shippingNet() }} €
<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
</td>
</tr>
<tr>
<td class="text-left">Summe ohne MwSt:</td>
<td>
{{ Yard::instance('shopping')->subtotalWithShipping() }} €
<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
</td>
</tr>
<tr>
<td class="text-left">zzgl. MwSt:</td>
<td>{{ Yard::instance('shopping')->taxWithShipping() }} €</td>
<td>
<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
</td>
</tr>
@if(Yard::instance('shopping')->getUserTaxFree())
<tr>
<td class="text-left"><strong>Gesamtsumme Netto:</strong></td>
<td>
<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
</td>
</tr>
@else
<tr>
<td class="text-left"><strong>Gesamtsumme Brutto:</strong></td>
<td><strong>{{ Yard::instance('shopping')->totalWithShipping() }} €</strong></td>
<td>
<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
</td>
</tr>
@endif
</tbody>
</table>