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

Berater Bestellungen

Browse source
This commit is contained in:
Kevin Adametz 2020-08-12 19:21:19 +02:00
parent a5db985ae8
commit bde1095014
26 changed files with 1524 additions and 577 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/lang/de/validation.php
View file

@ -130,7 +130,11 @@ return [
*/
'custom' => [
'no_email' => 'Das Feld E-Mail muss angegeben werden',
'unique_email_client' => 'Ein Kunde mit der E-Mail-Adresse ist schon im mivita-Salescenter vorhanden',
'unique_email_member' => 'Ein Berater mit der E-Mail-Adresse ist schon im mivita-Salescenter vorhanden',
'match_found' => 'Kundenhoheit: Es wurde eine Übereinstimmung zu einem bestehenden Kunden gefunden, dieser Konflikt wird erst überprüft. Bis dahin hat der Kunden den Status "in Prüfung". Möchtest du eine Bestellung für den Kunden ausführen, so kannst Du die Produkte auch zu Deiner Adresse bestellen.',
'shipping_not_found' => 'Das Lieferland ist noch nicht im System hinterlegt, bitte wende Dich an info@mivita.care um das Lieferland hinterlegen zu lassen.',
'attribute-name' => [
'rule-name' => 'custom-message',
],

123
resources/views/admin/customer/_detail.blade.php
View file

@ -36,75 +36,94 @@
{{$shopping_user->firstEntryByNumber()->created_at->format("d.m.Y H:i")}}
</div>
<div class="col-md-3 mb-3">
@if(!$shopping_user->is_like)
<a class="btn btn-sm btn-secondary mt-2" href="{{route('user_customer_edit', [$shopping_user->id])}}">Kundendaten bearbeiten</a>
@endif
</div>
</div>
@endif
</div>
<hr class="m-0">
<!-- / Info -->
@if($isAdmin)
<!-- Member -->
<div class="card-body pb-1">
<div class="row">
<div class="col-md-6 mb-3">
@if(isset($change_member_error) && $change_member_error)
<div class="row">
<div class="col-sm-12">
<div class="alert alert-danger p-2">
<ul>
<li>{{ $change_member_error }}</li>
</ul>
<div class="card-body pb-1">
<div class="row">
@if($isAdmin)
<div class="col-md-6 mb-3">
@if(isset($change_member_error) && $change_member_error)
<div class="row">
<div class="col-sm-12">
<div class="alert alert-danger p-2">
<ul>
<li>{{ $change_member_error }}</li>
</ul>
</div>
</div>
</div>
</div>
@endif
<div class="text-muted small">Zugewiesener Berater</div>
@if($shopping_user->is_like)
<button type="button" class="btn btn-xs btn-outline-info" data-toggle="modal" data-target="#modals-load-content"
data-id="{{$shopping_user->id}}"
data-action="shopping-user-is-like-member"
data-back="{{route('admin_customer_detail', [$shopping_user->id])}}"
data-modal="modal-xl"
data-route="{{route('modal_load')}}"><span class="fa fa-edit"></span> Berater zuordnen</button>
@else
@if($shopping_user->member)
<a class="btn btn-xs btn-outline-primary" href="{{route('admin_lead_edit', [$shopping_user->member->id])}}"><i class="ion ion-ios-contacts"></i></a>
{{$shopping_user->member->getFullName()}} <span class="text-muted">#{{$shopping_user->member->number}}</span>
@endif
<button type="button" class="btn btn-xs btn-outline-secondary" data-toggle="modal" data-target="#modals-load-content"
data-id="{{ $shopping_user->id }}"
data-action="shopping-user-change-member"
data-view="customer"
data-route="{{ route('modal_load') }}"><span class="fa fa-edit"></span></button>
@endif
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Über Shop</div>
@if($shopping_user->shopping_order)
@if($shopping_user->shopping_order->user_shop->user->isActive() && $shopping_user->shopping_order->user_shop->user->isActiveShop())
<a href="{{$shopping_user->shopping_order->user_shop->getSubdomain(false)}}" class="badge badge-success" target="_blank">{{$shopping_user->shopping_order->user_shop->getSubdomain(false)}}</a>
<div class="text-muted small">Zugewiesener Berater</div>
@if($shopping_user->is_like)
<button type="button" class="btn btn-xs btn-outline-info" data-toggle="modal" data-target="#modals-load-content"
data-id="{{$shopping_user->id}}"
data-action="shopping-user-is-like-member"
data-back="{{route('admin_customer_detail', [$shopping_user->id])}}"
data-modal="modal-xl"
data-route="{{route('modal_load')}}"><span class="fa fa-edit"></span> Berater zuordnen</button>
@else
<span class="badge badge-danger" target="_blank">{{$shopping_user->shopping_order->user_shop->getSubdomain(false)}}</span>
@if($shopping_user->member)
<a class="btn btn-xs btn-outline-primary" href="{{route('admin_lead_edit', [$shopping_user->member->id])}}"><i class="ion ion-ios-contacts"></i></a>
{{$shopping_user->member->getFullName()}} <span class="text-muted">#{{$shopping_user->member->number}}</span>
@endif
<button type="button" class="btn btn-xs btn-outline-secondary" data-toggle="modal" data-target="#modals-load-content"
data-id="{{ $shopping_user->id }}"
data-action="shopping-user-change-member"
data-view="customer"
data-route="{{ route('modal_load') }}"><span class="fa fa-edit"></span></button>
@endif
@endif
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">ist Berater</div>
@if($shopping_user->auth_user)
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>
<a class="btn btn-xs btn-outline-primary" href="{{route('admin_lead_edit', [$shopping_user->auth_user->id])}}"><i class="ion ion-ios-contacts"></i></a>
{{$shopping_user->auth_user->getFullName()}} <span class="text-muted">#{{$shopping_user->auth_user->number}}</span>
@else
<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>
@endif
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Über Shop</div>
@if($shopping_user->shopping_order)
@if($shopping_user->shopping_order->user_shop->user->isActive() && $shopping_user->shopping_order->user_shop->user->isActiveShop())
<a href="{{$shopping_user->shopping_order->user_shop->getSubdomain(false)}}" class="badge badge-success" target="_blank">{{$shopping_user->shopping_order->user_shop->getSubdomain(false)}}</a>
@else
<span class="badge badge-danger" target="_blank">{{$shopping_user->shopping_order->user_shop->getSubdomain(false)}}</span>
@endif
@endif
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">ist Berater</div>
@if($shopping_user->auth_user)
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>
<a class="btn btn-xs btn-outline-primary" href="{{route('admin_lead_edit', [$shopping_user->auth_user->id])}}"><i class="ion ion-ios-contacts"></i></a>
{{$shopping_user->auth_user->getFullName()}} <span class="text-muted">#{{$shopping_user->auth_user->number}}</span>
@else
<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>
@endif
</div>
@else
<div class="col-md-6 mb-3">
@if(!$shopping_user->is_like)
<a href="{{ route('user_order_my_delivery', ['ot', $shopping_user->id]) }}" class="btn btn-sm btn-secondary mt-2">
<span class="fa fa-shopping-cart"></span> Bestellung für diesen Kunden aufgeben
</a>
@endif
</div>
<div class="col-md-6 mb-3">
<div class="text-muted small">Kundenhoheit</div>
@if($shopping_user->is_like)
<span class="badge badge-pill badge-warning"><i class="fa fa-clock"></i> in Prüfung</span>
@else
<span class="badge badge-pill badge-success"><i class="fa fa-check-circle"></i> zugewiesen</span>
@endif
</div>
@endif
</div>
</div>
</div>
<hr class="m-0">
<!-- / Member -->
@endif
<!-- Billing -->
@include('admin.customer._customer_detail')

6
resources/views/admin/modal/show_product.blade.php
View file

@ -17,7 +17,7 @@
@endif
</div>
<div class="media-body p-4 p-md-5">
<div class="media-body p-4 p-md-5 ">
<h4 class="mb-2">
<a href="#" class="text-body">{{ $product->name }}</a>
</h4>
@ -49,7 +49,8 @@
</tbody>
</table>
<hr class="mt-0 mb-4">
{{--
<hr class="mt-0 mb-4">
<div class="input-group d-inline-flex w-auto">
<span class="input-group-prepend">
@ -64,6 +65,7 @@
<button class="btn btn-secondary ml-3 mb-1">
<strong>&euro; {{$product->getFormattedPriceWith()}}</strong>&nbsp; +<span class="ion ion-md-cart"></span>
</button>
--}}
</div>
</div>

7
resources/views/admin/shipping/edit.blade.php
View file

@ -142,18 +142,17 @@
<label for="price" class="form-label">{{__('Kunden Preis (brutto)')}}*</label>
<input type="text" class="form-control" name="price" placeholder="{{__('Preis in Euro')}}" required>
</div>
</div>
<div class="form-row">
<div class="form-group col-6">
<label for="price_comp" class="form-label">{{__('Kompensation Preis (brutto)')}}*</label>
<input type="text" class="form-control" name="price_comp" placeholder="{{__('Preis in Euro')}}" required>
</div>
</div>
<div class="form-row">
<div class="form-group col-6">
<label for="tax_rate" class="form-label">{{__('enthaltene Tax (%)')}}</label>
<input type="text" class="form-control" name="tax_rate" placeholder="{{__('Tax in %')}}">
</div>
</div>
<div class="form-row">

2
resources/views/layouts/application.blade.php
View file

@ -142,6 +142,8 @@
<script src="{{ mix('/js/application.js') }}"></script>
<script src="{{ asset('/js/custom.js') }}?v=1{{ get_file_last_time('/js/custom.js') }}"></script>
<script src="{{ asset('/js/iq-shopping-cart.js') }}?v=1{{ get_file_last_time('/js/iq-shopping-cart.js') }}"></script>
@yield('scripts')
<script type="text/javascript">

38
resources/views/user/customer/add.blade.php
View file

@ -45,9 +45,9 @@
<div class="mb-3">
<div id="smartwizard-3-step-1" class="card animated fadeIn">
<div class="card-body">
{!! Form::open(['url' => route('user_customer_edit', ['new']), 'class' => 'form-horizontal', 'id'=>'lead-form-validation-confirm']) !!}
{!! Form::open(['url' => route('user_customer_edit', ['new']), 'class' => 'form-horizontal']) !!}
<div class="form-row">
<div class="form-group col-md-6 {{ $errors->has('email') ? 'has-error' : '' }}">
<div class="form-group col-md-12 {{ $errors->has('email') ? 'has-error' : '' }}">
<label class="form-label" for="email">{{ __('E-Mail Address') }}*</label>
{{ Form::text('email', '', array('placeholder'=>'E-Mail Adresse', 'class'=>'form-control', 'id'=>'email', 'required'=>true ,'tabindex' => 1)) }}
@if ($errors->has('email'))
@ -59,9 +59,32 @@
</div>
</div>
<div class="text-left mt-2">
<button type="submit" class="btn btn-secondary" name="action" value="add_customer_step_email">{{ __('prüfen und weiter') }}</button>&nbsp;
<button type="submit" class="btn btn-secondary" name="action" value="add_customer_with_email">{{ __('prüfen und weiter') }}</button>&nbsp;
</div>
<hr>
{!! Form::close() !!}
{!! Form::open(['url' => route('user_customer_edit', ['new']), 'class' => 'form-horizontal']) !!}
<div class="form-row">
<div class="form-group col-md-12 mt-2">
<label class="switcher switcher-secondary">
<input type="checkbox" class="switcher-input" name="switcher-without-email" value="true">
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">Kunde ohne E-Mail hinzufügen</span>
</label>
</div>
</div>
<div class="text-left" style="display: none" id="show-button-without-email">
<p class="mt-2">Hinweis: Der Kunden bekommt eine Platzhalter E-Mail (...@faker-mivita.care), da die E-Mail das primäre Feld für die Kundenhoheit ist.<br>
Wird der Kunden mit seiner E-Mail von einem anderen Berater angelegt oder bestellt in einem anderen Beratershop, wird dem Berater der Kunde zugewiesen.</p>
<button type="submit" class="btn btn-secondary" name="action" value="add_customer_without_email">{{ __('weiter ohne E-Mail') }}</button>&nbsp;
</div>
{!! Form::close() !!}
</div>
</div>
<div id="smartwizard-3-step-2" class="card animated fadeIn">
@ -97,6 +120,15 @@
showPreviousButton: false,
}
});
$('input[name="switcher-without-email"]').on('change', function (){
if($(this).prop('checked') === true){
$('#show-button-without-email').show();
}else{
$('#show-button-without-email').hide();
}
});
});
</script>

10
resources/views/user/customer/detail.blade.php
View file

@ -6,6 +6,16 @@
<a href="{{route('user_customers')}}" class="btn btn-sm btn-default float-right">zurück</a>
{{ __('Kunden Details') }}
</h4>
@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
@include('admin.customer._detail')
<a href="{{route('user_customers')}}" class="btn btn-sm btn-default mt-2 float-right">zurück</a>

4
resources/views/user/membership/index.blade.php
View file

@ -100,8 +100,8 @@
<div class="card w-100 mb-4">
<h5 class="card-header">{{__('Mitgliedschaft')}} {{__('anpassen')}}</h5>
<div class="card-body">
<h6 class="d-block text-dark">Du kannst Deine Mitglidschaft bis zur nächsten Vertragsverlängerung, am {{ $user->nextRenewalAccount() }}, ändern</h6>
<p>Die restlichen Läufzeiten bleiben erhalten, erst mit der Verlängerung wird das geänderte Paket aktiv.</p>
<h6 class="d-block text-dark">Du kannst Deine Mitglidschaft bis zur nächsten Vertragsverlängerung, am {{ $user->nextRenewalAccount() }}, ändern.</h6>
<p>Die restlichen Laufzeiten bleiben erhalten, erst mit der Verlängerung wird das geänderte Paket aktiv.</p>
@include('user.membership._change')
</div>
</div>

35
resources/views/user/order/comp_product.blade.php Normal file
View file

@ -0,0 +1,35 @@
<div class="card mt-4">
<div class="card-body">
<h4>Versand Kompensationsprodukt</h4>
@if($comp_products)
<div class="row no-gutters row-bordered">
@php($counter = 1)
@foreach($comp_products as $comp_product)
<div class="media col-md-6 col-lg-4 p-4">
<div class="d-block ui-w-80 ui-bordered mr-3">
@if(count($comp_product->images))
<img src="{{ route('product_image', [$comp_product->images->first()->slug]) }}" class="img-fluid" alt="">
@endif
</div>
<div class="media-body">
<label class="switcher switcher-secondary">
<input type="radio" class="switcher-input" value="{{$comp_product->id}}" name="switchers-comp-product" @if($counter == 1) checked @endif >
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label"></span>
</label>
<div class="text-body mt-2"><strong>{{ $comp_product->name }}</strong></div>
<div class="">Art-Nr.: {{ $comp_product->number }}</div>
</div>
</div>
@php($counter++)
@endforeach
</div>
@endif
</div>
</div>

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

@ -10,12 +10,12 @@
<div class="card">
<div class="card-body p-2 p-md-4">
{!! Form::open(['url' => route('user_order_my_list', [$for, $delivery_id]), 'class' => 'form-horizontal']) !!}
{!! Form::open(['url' => route('user_order_my_delivery', [$for, $delivery_id]), 'class' => 'form-horizontal']) !!}
<h4>Lieferdaten</h4>
<div class="switchers-stacked">
<label class="switcher switcher-secondary">
<input type="radio" class="switcher-input" name="switchers-radio-is-for" value="is-for-member" @if(!$shopping_user) checked="checked" @endif >
<input type="radio" class="switcher-input" name="switchers-radio-is-for" value="me" @if(!$shopping_user) checked="checked" @endif >
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
@ -24,7 +24,7 @@
</label>
<label class="switcher switcher-secondary">
<input type="radio" class="switcher-input" name="switchers-radio-is-for" value="is-for-customer" @if($shopping_user) checked="checked" @endif>
<input type="radio" class="switcher-input" name="switchers-radio-is-for" value="ot" @if($shopping_user) checked="checked" @endif>
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
@ -42,19 +42,20 @@
data-action="user-order-my-delivery-show"
data-back="{{route('user_order_my_delivery', [$for])}}"
data-modal="modal-xl"
data-route="{{route('modal_load')}}"><span class="fa fa-shopping-cart"></span> An bestehenden Kunden versenden (Kunden auswählen)</button>
data-route="{{route('modal_load')}}"><span class="fa fa-shopping-cart"></span> An bestehenden Kunden versenden | Kunden auswählen</button>
</div>
<div class="form-group col-sm-6">
<button type="button" class="btn btn-sm btn-secondary" data-toggle="modal" data-target="#modals-load-content"
data-id="add"
data-action="user-order-my-delivery-add"
data-back="{{route('user_order_my_delivery', [$for])}}"
data-modal="modal-xl"
data-route="{{route('modal_load')}}"><span class="fa fa-plus-circle"></span> An neuen Kunden versenden (Kunden hinzufügen)</button>
<a href="{{route('user_customer_add', ['new'])}}" class="btn btn-sm btn-primary">An neuen Kunden versenden | <i class="ion ion-md-person-add"></i> Kunden hinzufügen</a>
</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>
@include('admin.customer._customer_detail')
@ -62,11 +63,15 @@
@endif
</div>
<div class="float-right">
<button type="submit" class="btn btn-secondary">bestätigen und weiter zur Bestellung</button>
</div>
@if($shopping_user)
<div class="float-right">
<button type="submit" class="btn btn-secondary" name="action" value="next">bestätigen und weiter zur Bestellung</button>
</div>
@else
<div class="float-right" id="hide_for_ot">
<button type="submit" class="btn btn-secondary" name="action" value="next">bestätigen und weiter zur Bestellung</button>
</div>
@endif
</div>
{!! Form::close() !!}
@ -76,18 +81,14 @@
$( document ).ready(function() {
$('input[name="switchers-radio-is-for"]').on('change', function (){
if($(this).val() === 'is-for-customer'){
if($(this).val() === 'ot'){
$('#show-is-for-customer').show('slow');
$('#hide_for_ot').hide('slow');
}else{
$('#show-is-for-customer').hide('slow');
$('#hide_for_ot').show('slow');
}
});
/*
* showCreditCardPayment(jQuery('input[name="payment_method"]:checked').val());
jQuery('input[name="payment_method"]').on('change', function () {
showCreditCardPayment($(this).val());
});*/
});
</script>
@endsection

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

@ -3,8 +3,8 @@
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
{{ __('navigation.my_orders') }} / {{ __('navigation.do_order') }}
<a href="{{ route('user_order_my_delivery', [$for, $delivery_id]) }}" class="btn btn-sm btn-default float-right">zurück</a>
</h4>
<style>
.btn-md-extra {
padding: 0.3rem 0.6rem;
@ -31,12 +31,11 @@
min-width:55px;
max-height: 160px;
}
</style>
<div class="card">
<div class="card-datatable table-responsive">
<table class="datatables-order-list table table-striped table-bordered" id="datatables-order-list">
<table class="datatables-order-list table table-striped table-bordered" id="datatables-order-list" data-url="{{route('user_order_my_perform_request')}}">
<thead>
<tr>
<th>{{__('Bild')}}</th>
@ -45,6 +44,8 @@
<th>{{__('Produkt')}}</th>
<th>{{__('Artikelnummer')}}</th>
<th>{{__('Netto-Preis')}}</th>
<th>{{__('Brutto-Preis')}}</th>
<th>{{__('VK-Brutto-Preis')}}</th>
<th>{{__('Points')}}</th>
<th><span class="no-line-break">{{__('Inhalt (ml)')}}</span></th>
<th><span class="no-line-break">{{__('Gewicht (g)')}}</span></th>
@ -55,33 +56,48 @@
</tbody>
</table>
</div>
</div>
<hr>
{!! Form::open(['url' => route('wizard_store_payment', [20]), 'class' => 'form-horizontal']) !!}
{!! 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>Lieferadresse (Kunde)</h4>
<h4>Lieferadresse des Kunden</h4>
@include('user.order.shipping_ot')
@endif
@if($for === 'me')
<h4>Lieferadresse (meine)</h4>
<h4>Meine Lieferadresse</h4>
@include('user.order.shipping_me')
@endif
</div>
@include('user.order.list_form')
{!! Form::close() !!}
</div>
@if($for === 'me')
@include('user.order.comp_product')
@endif
<div class="card mt-4">
<div class="card-body">
<h4>Warenkorb</h4>
<div id="holder_html_view_card">
@include('user.order.yard_view_form')
</div>
</div>
</div>
<div class="mt-2">
<a href="{{ route('user_order_my_delivery', [$for, $delivery_id]) }}" class="btn btn-sm btn-default float-right">zurück</a>
</div>
{!! Form::close() !!}
<script>
$( document ).ready(function() {
var iqShoppingCart = IqShoppingCart.init();
var oTable = $('#datatables-order-list').DataTable({
"processing": true,
"serverSide": true,
@ -99,7 +115,9 @@
{ data: 'quantity', name: 'quantity', searchable: false, orderable: false},
{ data: 'name', name: 'name' },
{ data: 'number', name: 'number' },
{ data: 'price', name: 'price', searchable: false },
{ data: 'price_net', name: 'price_net', searchable: false },
{ data: 'price_gross', name: 'price_gross', searchable: false },
{ data: 'price_vk_gross', name: 'price_vk_gross', searchable: false },
{ data: 'points', name: 'points', searchable: false },
{ data: 'contents_total', name: 'contents_total', searchable: false },
{ data: 'weight', name: 'weight', searchable: false },
@ -109,23 +127,26 @@
"iDisplayLength": 50,
"language": {
"url": "/js/German.json"
},
drawCallback: function (settings) {
iqShoppingCart.reInit();
}
});
/* $('#filter_member_id').on('change', function(){
oTable.draw();
});
$('#filter_customer_member').on('change', function(){
oTable.draw();
});
*/
iqShoppingCart.setDatabase(oTable);
/* $('#filter_member_id').on('change', function(){
oTable.draw();
});
$('#filter_customer_member').on('change', function(){
oTable.draw();
});
*/
$('body').tooltip({
selector: '.product-tooltip'
});
});
</script>
@endsection

191
resources/views/user/order/list_form.blade.php
View file

@ -1,104 +1,103 @@
<div class="card-body p-2 p-md-4">
<h4>Warenkorb</h4>
<!-- Shopping cart table -->
<div class="table-responsive">
<table class="table table-bordered m-0">
<thead>
<tr>
<!-- Set columns width -->
<th class="text-center py-3 px-4" style="min-width: 400px;">Produkt</th>
<th class="text-right py-3 px-4" style="width: 100px;">Preis</th>
<th class="text-center py-3 px-4" style="width: 120px;">Anzahl</th>
<th class="text-right py-3 px-4" style="width: 100px;">Summe</th>
<th class="py-3 px-4" style="width: 40px;"></th>
</tr>
</thead>
<tbody>
<tr>
<td class="p-4">
<div class="media align-items-center">
<img src="/products/appwork/v152/assets_/img/uikit/nike-1.jpg" class="d-block ui-w-40 ui-bordered mr-4" alt>
<div class="media-body">
<a href="#" class="d-block text-body">Nike Men Black Liteforce III Sneakers</a>
<small>
<span class="text-muted">Color:</span>
<span class="ui-product-color ui-product-color-sm align-text-bottom" style="background:#e81e2c;"></span> &nbsp;
<span class="text-muted">Size: </span> EU 37 &nbsp;
<span class="text-muted">Ships from: </span> China
</small>
</div>
</div>
</td>
<td class="text-right font-weight-semibold align-middle p-4">
$57.55
</td>
<td class="align-middle p-4">
<input type="text" class="form-control text-center" value="2">
</td>
<td class="text-right font-weight-semibold align-middle p-4">
<span class="price">115.1</span> &euro;
</td>
<td class="text-center align-middle px-0">
<a href="#" class="close float-none" data-toggle="tooltip" title data-original-title="Remove">×</a>
</td>
</tr>
<tr>
<td class="p-4">
<div class="media align-items-center">
<img src="/products/appwork/v152/assets_/img/uikit/sunglasses.jpg" class="d-block ui-w-40 ui-bordered mr-4" alt>
<div class="media-body">
<a href="#" class="d-block text-body">WALKING 400 BLUE CAT3</a>
<small>
<span class="text-muted">Ships from: </span> Germany
</small>
</div>
</div>
</td>
<td class="text-right font-weight-semibold align-middle p-4">
$20.55
</td>
<td class="align-middle p-4">
<input type="text" class="form-control text-center" value="1">
</td>
<td class="text-right font-weight-semibold align-middle p-4">
$20.55
</td>
<td class="text-center align-middle px-0">
<a href="#" class="close float-none" data-toggle="tooltip" title data-original-title="Remove">×</a>
</td>
</tr>
</tbody>
</table>
</div>
<!-- / Shopping cart table -->
<!-- Shopping cart table -->
<div class="table-responsive">
<table class="table table-bordered m-0">
<thead>
<tr>
<!-- Set columns width -->
<th class="text-center py-3 px-4" style="min-width: 400px;">Produkt</th>
<th class="text-right py-3 px-4" style="width: 100px;">Preis</th>
<th class="text-center py-3 px-4" style="width: 120px;">Anzahl</th>
<th class="text-right py-3 px-4" style="width: 100px;">Summe</th>
<th class="py-3 px-4" style="width: 40px;"></th>
</tr>
</thead>
<tbody>
<div class="d-flex flex-wrap justify-content-between align-items-center pb-4">
<div class="mt-4">
{{-- <label class="text-muted font-weight-normal">Promocode</label>
<input type="text" placeholder="ABC" class="form-control">
--}}
</div>
<div class="d-flex">
<div class="text-right mt-4 mr-5">
<label class="text-muted font-weight-normal m-0">Points</label>
<div class="text-large"><strong>$20</strong></div>
</div>
<div class="text-right mt-4">
<label class="text-muted font-weight-normal m-0">Gesamtsumme</label>
<div class="text-large"><strong>$1164.65</strong></div>
<tr>
<td class="p-4">
<div class="media align-items-center">
<img src="/products/appwork/v152/assets_/img/uikit/nike-1.jpg" class="d-block ui-w-40 ui-bordered mr-4" alt>
<div class="media-body">
<a href="#" class="d-block text-body">Nike Men Black Liteforce III Sneakers</a>
<small>
<span class="text-muted">Color:</span>
<span class="ui-product-color ui-product-color-sm align-text-bottom" style="background:#e81e2c;"></span> &nbsp;
<span class="text-muted">Size: </span> EU 37 &nbsp;
<span class="text-muted">Ships from: </span> China
</small>
</div>
</div>
</div>
<hr>
<div class="float-right">
<button type="submit" class="btn btn-secondary">bestätigen und weiter zur Kasse</button>
</div>
</td>
<td class="text-right font-weight-semibold align-middle p-4">
$57.55
</td>
<td class="align-middle p-4">
<input type="text" class="form-control text-center" value="2">
</td>
<td class="text-right font-weight-semibold align-middle p-4">
<span class="price">115.1</span> &euro;
</td>
<td class="text-center align-middle px-0">
<a href="#" class="close float-none" data-toggle="tooltip" title data-original-title="Remove">×</a>
</td>
</tr>
<tr>
<td class="p-4">
<div class="media align-items-center">
<img src="/products/appwork/v152/assets_/img/uikit/sunglasses.jpg" class="d-block ui-w-40 ui-bordered mr-4" alt>
<div class="media-body">
<a href="#" class="d-block text-body">WALKING 400 BLUE CAT3</a>
<small>
<span class="text-muted">Ships from: </span> Germany
</small>
</div>
</div>
</td>
<td class="text-right font-weight-semibold align-middle p-4">
$20.55
</td>
<td class="align-middle p-4">
<input type="text" class="form-control text-center" value="1">
</td>
<td class="text-right font-weight-semibold align-middle p-4">
$20.55
</td>
<td class="text-center align-middle px-0">
<a href="#" class="close float-none" data-toggle="tooltip" title data-original-title="Remove">×</a>
</td>
</tr>
</tbody>
</table>
</div>
<!-- / Shopping cart table -->
<div class="d-flex flex-wrap justify-content-between align-items-center pb-4">
<div class="mt-4">
{{-- <label class="text-muted font-weight-normal">Promocode</label>
<input type="text" placeholder="ABC" class="form-control">
--}}
</div>
<div class="d-flex">
<div class="text-right mt-4 mr-5">
<label class="text-muted font-weight-normal m-0">Points</label>
<div class="text-large"><strong>$20</strong></div>
</div>
<div class="text-right mt-4">
<label class="text-muted font-weight-normal m-0">Gesamtsumme</label>
<div class="text-large"><strong>$1164.65</strong></div>
</div>
</div>
</div>
<hr>
<div class="float-right">
<button type="submit" class="btn btn-secondary">bestätigen und weiter zur Kasse</button>
</div>

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

@ -2,100 +2,213 @@
@if($user->account)
@if($user->account->same_as_billing)
<!-- Billing -->
<div class="row">
@if($user->account->company)
<div class="col-md-12 mb-3">
<div class="text-muted small">Firma</div>
{{ $user->account->company }}
</div>
@endif
<div class="col-md-3 mb-3">
<div class="text-muted small">Anrede</div>
{{ \App\Services\HTMLHelper::getSalutationLang($user->account->salutation) }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Vorname</div>
{{ $user->account->first_name }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Nachname</div>
{{ $user->account->last_name }}
<div class="">
<div class="form-row">
<div class="form-group col-md-12">
<label for="shipping_company" class="form-label">{{ __('Company name') }} (optional)</label>
{{ Form::text('shipping_company', $user->account->company, array('placeholder'=>__('Company name'), 'class'=>'form-control')) }}
</div>
</div>
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Straße</div>
{{ $user->account->address }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Zusatz</div>
{{ $user->account->address_2 }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">PLZ</div>
{{ $user->account->zipcode }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Stadt</div>
{{ $user->account->city }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Land</div>
@if($user->account->country){{ $user->account->country->getLocated() }}@endif
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Telefon</div>
{{ $user->account->phone }}
<div class="form-row">
<div class="form-group col-md-6 {{ $errors->has('shipping_salutation') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Salutation') }}*</label>
<select class="selectpicker" data-style="btn-light" name="shipping_salutation" id="shipping_salutation" required>
{!! HTMLHelper::getSalutation($user->account->salutation) !!}
</select>
@if ($errors->has('shipping_salutation'))
<span class="help-block">
<strong>{{ $errors->first('shipping_salutation') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6 {{ $errors->has('shipping_firstname') ? 'has-error' : '' }}">
<label class="form-label" for=shipping_firstname">{{ __('First name') }}*</label>
{{ Form::text('shipping_firstname', $user->account->first_name, array('placeholder'=>__('First name'), 'class'=>'form-control', 'required'=>true)) }}
@if ($errors->has('shipping_firstname'))
<span class="help-block">
<strong>{{ $errors->first('shipping_firstname') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-6 {{ $errors->has('shipping_lastname') ? 'has-error' : '' }}">
<label class="form-label" for=shipping_lastname">{{ __('Last name') }}*</label>
{{ Form::text('shipping_lastname', $user->account->last_name, array('placeholder'=>__('Last name'), 'class'=>'form-control', 'required'=>true)) }}
@if ($errors->has('shipping_lastname'))
<span class="help-block">
<strong>{{ $errors->first('shipping_lastname') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_address') ? 'has-error' : '' }}">
<label class="form-label" for=shipping_address">{{ __('Street') }} / {{ __('House number') }}*</label>
{{ Form::text('shipping_address', $user->account->address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true)) }}
@if ($errors->has('shipping_address'))
<span class="help-block">
<strong>{{ $errors->first('shipping_address') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_address_2') ? 'has-error' : '' }}">
<label class="form-label" for=shipping_address_2">{{ __('Wohnung / Gebäude (optional)') }}</label>
{{ Form::text('shipping_address_2', $user->account->address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control')) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6 {{ $errors->has('shipping_zipcode') ? 'has-error' : '' }}">
<label class="form-label" for=shipping_zipcode">{{ __('Postcode') }}*</label>
{{ Form::text('shipping_zipcode', $user->account->zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true)) }}
@if ($errors->has('shipping_zipcode'))
<span class="help-block">
<strong>{{ $errors->first('shipping_zipcode') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-6 {{ $errors->has('shipping_city') ? 'has-error' : '' }}">
<label class="form-label" for=shipping_city">{{ __('City') }}*</label>
{{ Form::text('shipping_city', $user->account->city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true)) }}
@if ($errors->has('shipping_city'))
<span class="help-block">
<strong>{{ $errors->first('shipping_city') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_state') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Versandland') }}*</label>
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="me">
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!}
</select>
@if ($errors->has('shipping_state'))
<span class="help-block">
<strong>{{ $errors->first('shipping_state') }}</strong>
</span>
@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->phone, array('placeholder'=>__('Phone'), 'class'=>'form-control')) }}
</div>
</div>
</div>
<!-- / Billing -->
@else
<div class="row">
@if($user->account->shipping_company)
<div class="col-md-12 mb-3">
<div class="text-muted small">Firma</div>
{{ $user->account->shipping_company }}
</div>
@endif
<div class="col-md-3 mb-3">
<div class="text-muted small">Anrede</div>
{{ \App\Services\HTMLHelper::getSalutationLang($user->account->shipping_salutation) }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Vorname</div>
{{ $user->account->shipping_firstname }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Nachname</div>
{{ $user->account->shipping_lastname }}
<div class="">
<div class="form-row">
<div class="form-group col-md-12">
<label for="shipping_company" class="form-label">{{ __('Company name') }} (optional)</label>
{{ Form::text('shipping_company', $user->account->shipping_company, array('placeholder'=>__('Company name'), 'class'=>'form-control')) }}
</div>
</div>
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Straße</div>
{{ $user->account->shipping_address }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Zusatz</div>
{{ $user->account->shipping_address_2 }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">PLZ</div>
{{ $user->account->shipping_zipcode }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Stadt</div>
{{ $user->account->shipping_city }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Land</div>
@if($user->account->shipping_country){{ $user->account->shipping_country->getLocated() }}@endif
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Telefon</div>
{{ $user->account->shipping_phone }}
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_salutation') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Salutation') }}*</label>
<select class="selectpicker" data-style="btn-light" name="shipping_salutation" id="shipping_salutation" required>
{!! HTMLHelper::getSalutation($user->account->shipping_salutation) !!}
</select>
@if ($errors->has('shipping_salutation'))
<span class="help-block">
<strong>{{ $errors->first('shipping_salutation') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6 {{ $errors->has('shipping_firstname') ? 'has-error' : '' }}">
<label class="form-label" for="shipping_firstname">{{ __('First name') }}*</label>
{{ Form::text('shipping_firstname', $user->account->shipping_firstname, array('placeholder'=>__('First name'), 'class'=>'form-control', 'required'=>true)) }}
@if ($errors->has('shipping_firstname'))
<span class="help-block">
<strong>{{ $errors->first('shipping_firstname') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-6 {{ $errors->has('shipping_lastname') ? 'has-error' : '' }}">
<label class="form-label" for="shipping_lastname">{{ __('Last Name') }}*</label>
{{ Form::text('shipping_lastname', $user->account->shipping_lastname, array('placeholder'=>__('Last Name'), 'class'=>'form-control', 'required'=>true)) }}
@if ($errors->has('shipping_lastname'))
<span class="help-block">
<strong>{{ $errors->first('shipping_lastname') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_address') ? 'has-error' : '' }}">
<label class="form-label" for="shipping_address">{{ __('Street') }} / {{ __('House number') }}*</label>
{{ Form::text('shipping_address', $user->account->shipping_address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true)) }}
@if ($errors->has('shipping_address'))
<span class="help-block">
<strong>{{ $errors->first('shipping_address') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_address_2') ? 'has-error' : '' }}">
<label class="form-label" for="shipping_address_2">{{ __('Wohnung / Gebäude (optional)') }}</label>
{{ Form::text('shipping_address_2', $user->account->shipping_address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control')) }}
@if ($errors->has('shipping_address_2'))
<span class="help-block">
<strong>{{ $errors->first('shipping_address_2') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6 {{ $errors->has('shipping_zipcode') ? 'has-error' : '' }}">
<label class="form-label" for="shipping_zipcode">{{ __('Postcode') }}*</label>
{{ Form::text('shipping_zipcode', $user->account->shipping_zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true)) }}
@if ($errors->has('shipping_zipcode'))
<span class="help-block">
<strong>{{ $errors->first('shipping_zipcode') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-6 {{ $errors->has('shipping_city') ? 'has-error' : '' }}">
<label class="form-label" for="shipping_city">{{ __('City') }}*</label>
{{ Form::text('shipping_city', $user->account->shipping_city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true)) }}
@if ($errors->has('shipping_city'))
<span class="help-block">
<strong>{{ $errors->first('shipping_city') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_state') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Versandland') }}*</label>
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="me">
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!}
</select>
@if ($errors->has('shipping_state'))
<span class="help-block">
<strong>{{ $errors->first('shipping_state') }}</strong>
</span>
@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>
@endif
@else
<h4>Fehler: Keine Adressdaten gefunden!</h4>

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

@ -1,99 +1,210 @@
@if($shopping_user->same_as_billing)
<!-- Billing -->
<div class="row">
@if($shopping_user->billing_company)
<div class="col-md-12 mb-3">
<div class="text-muted small">Firma</div>
{{ $shopping_user->billing_company }}
</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>
<div class="col-md-3 mb-3">
<div class="text-muted small">Vorname</div>
{{ $shopping_user->billing_firstname }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Nachname</div>
{{ $shopping_user->billing_lastname }}
<div class="">
<div class="form-row">
<div class="form-group col-md-12">
<label for="shipping_company" class="form-label">{{ __('Company name') }} (optional)</label>
{{ Form::text('shipping_company', $shopping_user->billing_company, array('placeholder'=>__('Company name'), 'class'=>'form-control')) }}
</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>
<div class="col-md-3 mb-3">
<div class="text-muted small">Zusatz</div>
{{ $shopping_user->billing_address_2 }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">PLZ</div>
{{ $shopping_user->billing_zipcode }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Stadt</div>
{{ $shopping_user->billing_city }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Land</div>
@if($shopping_user->billing_country){{ $shopping_user->billing_country->getLocated() }}@endif
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Telefon</div>
{{ $shopping_user->billing_phone }}
<div class="form-row">
<div class="form-group col-md-6 {{ $errors->has('shipping_salutation') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Salutation') }}*</label>
<select class="selectpicker" data-style="btn-light" name="shipping_salutation" id="shipping_salutation" required>
{!! HTMLHelper::getSalutation($shopping_user->billing_salutation) !!}
</select>
@if ($errors->has('shipping_salutation'))
<span class="help-block">
<strong>{{ $errors->first('shipping_salutation') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6 {{ $errors->has('shipping_firstname') ? 'has-error' : '' }}">
<label class="form-label" for=shipping_firstname">{{ __('First name') }}*</label>
{{ Form::text('shipping_firstname', $shopping_user->billing_firstname, array('placeholder'=>__('First name'), 'class'=>'form-control', 'required'=>true)) }}
@if ($errors->has('shipping_firstname'))
<span class="help-block">
<strong>{{ $errors->first('shipping_firstname') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-6 {{ $errors->has('shipping_lastname') ? 'has-error' : '' }}">
<label class="form-label" for=shipping_lastname">{{ __('Last name') }}*</label>
{{ Form::text('shipping_lastname', $shopping_user->billing_lastname, array('placeholder'=>__('Last name'), 'class'=>'form-control', 'required'=>true)) }}
@if ($errors->has('shipping_lastname'))
<span class="help-block">
<strong>{{ $errors->first('shipping_lastname') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_address') ? 'has-error' : '' }}">
<label class="form-label" for=shipping_address">{{ __('Street') }} / {{ __('House number') }}*</label>
{{ Form::text('shipping_address', $shopping_user->billing_address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true)) }}
@if ($errors->has('shipping_address'))
<span class="help-block">
<strong>{{ $errors->first('shipping_address') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_address_2') ? 'has-error' : '' }}">
<label class="form-label" for=shipping_address_2">{{ __('Wohnung / Gebäude (optional)') }}</label>
{{ Form::text('shipping_address_2', $shopping_user->billing_address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control')) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6 {{ $errors->has('shipping_zipcode') ? 'has-error' : '' }}">
<label class="form-label" for=shipping_zipcode">{{ __('Postcode') }}*</label>
{{ Form::text('shipping_zipcode', $shopping_user->billing_zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true)) }}
@if ($errors->has('shipping_zipcode'))
<span class="help-block">
<strong>{{ $errors->first('shipping_zipcode') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-6 {{ $errors->has('shipping_city') ? 'has-error' : '' }}">
<label class="form-label" for=shipping_city">{{ __('City') }}*</label>
{{ Form::text('shipping_city', $shopping_user->billing_city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true)) }}
@if ($errors->has('shipping_city'))
<span class="help-block">
<strong>{{ $errors->first('shipping_city') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_state') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Versandland') }}*</label>
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="ot">
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!}
</select>
@if ($errors->has('shipping_state'))
<span class="help-block">
<strong>{{ $errors->first('shipping_state') }}</strong>
</span>
@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', $shopping_user->billing_phone, array('placeholder'=>__('Phone'), 'class'=>'form-control')) }}
</div>
</div>
</div>
<!-- / Billing -->
@else
<div class="row">
@if($shopping_user->shipping_company)
<div class="col-md-12 mb-3">
<div class="text-muted small">Firma</div>
{{ $shopping_user->shipping_company }}
<div class="">
<div class="form-row">
<div class="form-group col-md-12">
<label for="shipping_company" class="form-label">{{ __('Company name') }} (optional)</label>
{{ Form::text('shipping_company', $shopping_user->shipping_company, array('placeholder'=>__('Company name'), 'class'=>'form-control')) }}
</div>
@endif
<div class="col-md-3 mb-3">
<div class="text-muted small">Anrede</div>
{{ \App\Services\HTMLHelper::getSalutationLang($shopping_user->shipping_salutation) }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Vorname</div>
{{ $shopping_user->shipping_firstname }}
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_salutation') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Salutation') }}*</label>
<select class="selectpicker" data-style="btn-light" name="shipping_salutation" id="shipping_salutation" required>
{!! HTMLHelper::getSalutation($shopping_user->shipping_salutation) !!}
</select>
@if ($errors->has('shipping_salutation'))
<span class="help-block">
<strong>{{ $errors->first('shipping_salutation') }}</strong>
</span>
@endif
</div>
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Nachname</div>
{{ $shopping_user->shipping_lastname }}
<div class="form-row">
<div class="form-group col-md-6 {{ $errors->has('shipping_firstname') ? 'has-error' : '' }}">
<label class="form-label" for="shipping_firstname">{{ __('First name') }}*</label>
{{ Form::text('shipping_firstname', $shopping_user->shipping_firstname, array('placeholder'=>__('First name'), 'class'=>'form-control', 'required'=>true)) }}
@if ($errors->has('shipping_firstname'))
<span class="help-block">
<strong>{{ $errors->first('shipping_firstname') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-6 {{ $errors->has('shipping_lastname') ? 'has-error' : '' }}">
<label class="form-label" for="shipping_lastname">{{ __('Last Name') }}*</label>
{{ Form::text('shipping_lastname', $shopping_user->shipping_lastname, array('placeholder'=>__('Last Name'), 'class'=>'form-control', 'required'=>true)) }}
@if ($errors->has('shipping_lastname'))
<span class="help-block">
<strong>{{ $errors->first('shipping_lastname') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_address') ? 'has-error' : '' }}">
<label class="form-label" for="shipping_address">{{ __('Street') }} / {{ __('House number') }}*</label>
{{ Form::text('shipping_address', $shopping_user->shipping_address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true)) }}
@if ($errors->has('shipping_address'))
<span class="help-block">
<strong>{{ $errors->first('shipping_address') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_address_2') ? 'has-error' : '' }}">
<label class="form-label" for="shipping_address_2">{{ __('Wohnung / Gebäude (optional)') }}</label>
{{ Form::text('shipping_address_2', $shopping_user->shipping_address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control')) }}
@if ($errors->has('shipping_address_2'))
<span class="help-block">
<strong>{{ $errors->first('shipping_address_2') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6 {{ $errors->has('shipping_zipcode') ? 'has-error' : '' }}">
<label class="form-label" for="shipping_zipcode">{{ __('Postcode') }}*</label>
{{ Form::text('shipping_zipcode', $shopping_user->shipping_zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true)) }}
@if ($errors->has('shipping_zipcode'))
<span class="help-block">
<strong>{{ $errors->first('shipping_zipcode') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-6 {{ $errors->has('shipping_city') ? 'has-error' : '' }}">
<label class="form-label" for="shipping_city">{{ __('City') }}*</label>
{{ Form::text('shipping_city', $shopping_user->shipping_city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true)) }}
@if ($errors->has('shipping_city'))
<span class="help-block">
<strong>{{ $errors->first('shipping_city') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_state') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Versandland') }}*</label>
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="ot">
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!}
</select>
@if ($errors->has('shipping_state'))
<span class="help-block">
<strong>{{ $errors->first('shipping_state') }}</strong>
</span>
@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', $shopping_user->shipping_phone, array('placeholder'=>__('Phone'), 'class'=>'form-control')) }}
</div>
</div>
</div>
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Straße</div>
{{ $shopping_user->shipping_address }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Zusatz</div>
{{ $shopping_user->shipping_address_2 }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">PLZ</div>
{{ $shopping_user->shipping_zipcode }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Stadt</div>
{{ $shopping_user->shipping_city }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Land</div>
@if($shopping_user->shipping_country){{ $shopping_user->shipping_country->getLocated() }}@endif
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Telefon</div>
{{ $shopping_user->shipping_phone }}
</div>
</div>
@endif
</div>
@endif

115
resources/views/user/order/yard_view_form.blade.php Normal file
View file

@ -0,0 +1,115 @@
@if(Yard::instance('shopping')->content()->count())
@if(Yard::instance('shopping')->compCount() > 0)
<!-- Shopping cart table -->
<div class="table-responsive">
<table class="table table-bordered m-0">
<thead>
<tr>
<!-- Set columns width -->
<th class="text-center py-3 px-4" style="min-width: 400px;">Produkt</th>
<th class="text-right py-3 px-4" style="width: 120px;"><div class="no-line-break">Netto-Preis</div></th>
<th class="text-center py-3 px-2" style="width: 125px;">Anzahl</th>
<th class="text-right py-3 px-4" style="width: 120px;">Summe</th>
</tr>
</thead>
<tbody>
@foreach(Yard::instance('shopping')->content() as $row)
@php($product = \App\Models\Product::find($row->id))
<tr>
<td class="p-4">
<div class="media align-items-center">
@if($row->options->has('image'))
<img src="{{ route('product_image', [$row->options->image]) }}" class="d-block ui-w-80 ui-bordered mr-4" alt="">
@else
<img src="{{ asset('/assets/images/1x1.png') }}" class="d-block ui-w-80 ui-bordered mr-4" alt="">
@endif
<div class="media-body">
<div class="d-block text-body" style="font-size: 15px; font-weight: 500;">{{ $row->name }}</div>
<div class="text-body">
<div>Inhalt: {{ $product->contents }}</div>
<div>Art.-Nr.: {{ $product->number }}</div>
</div>
</div>
</div>
</td>
<td class="text-right font-weight-semibold align-middle p-4">
<div class="no-line-break">{{ Yard::instance('shopping')->rowPriceNet($row, 3) }} &euro;</div>
</td>
<td class="align-middle p-2">
@if($row->options->comp)
<div class="text-center product-tooltip" data-toggle="tooltip" title="Kompensationsprodukt">1x KP</div>
@else
<div class="input-group d-inline-flex" style="width: 110px">
<input type="number" class="form-control text-center cart-input-event-onchange" data-row-id="{{$row->rowId}}" data-product-id="{{ $product->id }}" value="{{ $row->qty }}" name="quantity[{{$row->rowId}}]" maxlength="3" max="999" min="1">
<span class="input-group-append">
<button type="button" class="btn btn-default btn-sm remove_item_form_cart product-tooltip" data-row-id="{{$row->rowId}}" data-product-id="{{ $product->id }}">x</button>
</span>
</div>
@endif
</td>
<td class="text-right font-weight-semibold align-middle p-4">
<div class="no-line-break">{{ Yard::instance('shopping')->rowSubtotalNet($row) }} &euro;</div>
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
<!-- / Shopping cart table -->
<div class="d-flex flex-wrap justify-content-between pb-4">
<div class="mt-2">
<p class="small mb-2">Du hast {{ Yard::instance('shopping')->compCount() }} Artikel in Deinem Warenkorb</p>
<p>Gesamte Points: {{ Yard::instance('shopping')->points() }}</p>
<button type="button" class="btn btn-default btn-sm" id="clear-products-basket"><i class="ion ion-ios-trash"></i> Warenkorb löschen</button>
</div>
<div class="d-flex">
<div class="text-right mt-2">
<table class="table">
<tbody>
<tr>
<td class="text-left" style="border-top:none;">Zwischensumme:</td>
<td style="border-top:none;">{{ Yard::instance('shopping')->subtotal() }} €</td>
</tr>
<tr>
<td class="text-left">Versandland:</td>
<td>{{ Yard::instance('shopping')->getShippingCountryName() }}</td>
</tr>
<tr>
<td class="text-left">Versandkosten:</td>
<td>
{{ Yard::instance('shopping')->shippingNet() }} €
</td>
</tr>
<tr>
<td class="text-left">Summe ohne MwSt:</td>
<td>
{{ Yard::instance('shopping')->subtotalWithShipping() }} €
</td>
</tr>
<tr>
<td class="text-left">zzgl. MwSt:</td>
<td>{{ Yard::instance('shopping')->taxWithShipping() }} €</td>
</tr>
<tr>
<td class="text-left"><strong>Gesamtsumme Brutto:</strong></td>
<td><strong>{{ Yard::instance('shopping')->totalWithShipping() }} €</strong></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<hr>
<div class="float-right">
<button type="submit" class="btn btn-secondary"><i class="ion ion-ios-redo"></i> bestätigen und weiter zur Kasse</button>
</div>
<br><br>
<em class="small text-center"> <i class="fa fa-lock"></i> Du wirst auf unseren checkout Server weitergeletet, die Verbindung ist SSL verschlüsselt.</em>
@endif
@endif

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

@ -322,7 +322,7 @@
<div class="row">
<div class="col-md-12 col-sm-12">
<div class="form-group {{($errors->has('billing_salutation') ? 'error' : '')}}">
<div class="form-group {{($errors->has('billing_salutation') ? 'error' : '')}}">
<label class="mt-0 fs-14 fw-400" for="shipping_salutation">Anrede *</label>
@ -630,9 +630,7 @@
</div>
<div class="form-group col-sm-12 col-md-4">
<label class="mt-0 fs-14 fw-400">Prüfnr.*</label>
{!! Form::text('cc_cardcvc2', '', ['class' => 'form-control', 'id'=>'cc_cardcvc2', 'placeholder'=>'CVC*']) !!}
</div>
</div>
</div>