Next Member Shopping
This commit is contained in:
parent
fb27009339
commit
16fe2fa363
23 changed files with 619 additions and 334 deletions
|
|
@ -156,11 +156,11 @@
|
|||
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<td style="line-height:1.6em;">
|
||||
@if($txaction == 'failed')
|
||||
@if($txaction === 'failed')
|
||||
<b>{{__('email.checkout_mail_pay_error')}}</b><br>
|
||||
@elseif($txaction == 'appointed')
|
||||
@elseif($txaction === 'appointed')
|
||||
|
||||
@if($shopping_payment->clearingtype == "vor")
|
||||
@if($shopping_payment->clearingtype === "vor")
|
||||
<b>{{__('email.checkout_mail_pay_pre')}}</b><br>
|
||||
{{__('email.checkout_mail_pay_pre_c1')}} {{ number_format( floatval($shopping_payment->amount/100), 2, ",", ".") }} {{__('email.checkout_mail_pay_pre_c2')}}<br>
|
||||
<p>
|
||||
|
|
@ -176,6 +176,8 @@
|
|||
@else
|
||||
<b>{{__('email.checkout_mail_pay_approved')}}</b><br>
|
||||
@endif
|
||||
@elseif($txaction === 'invoice_open')
|
||||
<b>{{__('email.checkout_mail_pay_invoice_open')}}</b><br>
|
||||
@else
|
||||
<b>{{__('email.checkout_mail_system_status')}} {{$txaction}}</b><br>
|
||||
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
@section('content')
|
||||
<h4 class="font-weight-bold py-2 mb-2">
|
||||
<a href="{{route('user_shop_orders')}}" class="btn btn-sm btn-default float-right">zurück</a>
|
||||
<a href="{{route('user_orders')}}" class="btn btn-sm btn-default float-right">zurück</a>
|
||||
{{ __('Bestellung Kunde') }} <span class="text-muted">#{{$shopping_order->id}}</span>
|
||||
</h4>
|
||||
@include('admin.sales._detail')
|
||||
<a href="{{route('user_shop_orders')}}" class="btn btn-sm btn-default mt-2 float-right">zurück</a>
|
||||
<a href="{{route('user_orders')}}" class="btn btn-sm btn-default mt-2 float-right">zurück</a>
|
||||
|
||||
@endsection
|
||||
|
|
@ -7,83 +7,47 @@
|
|||
|
||||
<div class="card">
|
||||
<div class="card-datatable table-responsive">
|
||||
<div class="ml-4">
|
||||
<!--<a href="{{ route('admin_lead_edit', ['new']) }}" class="btn btn-sm btn-primary">{{__('Neuen Berater erstellen')}}</a> -->
|
||||
</div>
|
||||
<table class="datatables-customers table table-striped table-bordered" id="datatables-customers">
|
||||
<table class="datatable-users table table-striped table-bordered">
|
||||
|
||||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>{{__('First name')}}</th>
|
||||
<th>{{__('Last name')}}</th>
|
||||
<th>{{__('E-Mail')}}</th>
|
||||
<th>{{__('Anrede')}}</th>
|
||||
<th>{{__('Firma')}}</th>
|
||||
<th>{{__('Vorname')}}</th>
|
||||
<th>{{__('Nachname')}}</th>
|
||||
<th>{{__('PLZ')}}</th>
|
||||
<th>{{__('Stadt')}}</th>
|
||||
<th>{{__('Land')}}</th>
|
||||
<th>{{__('Datum')}}</th>
|
||||
<th>{{__('Status')}}</th>
|
||||
<th>{{__('Betrag')}}</th>
|
||||
<th>{{__('Käufe')}}</th>
|
||||
<th>{{__('Newsletter')}}</th>
|
||||
<th>{{__('erstellt')}}</th>
|
||||
<th>{{__('ID Kunden')}}</th>
|
||||
<th>WP</th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="mt-4 ml-4">
|
||||
<!-- <a href="{{ route('admin_lead_edit', ['new']) }}" class="btn btn-sm btn-primary">{{__('Neuen Berater erstellen')}}</a> -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
$( document ).ready(function() {
|
||||
|
||||
var oTable = $('#datatables-customers').DataTable({
|
||||
$('.datatable-users').dataTable({
|
||||
"processing": true,
|
||||
"serverSide": true,
|
||||
ajax: {
|
||||
url: '{!! route( 'user_customer_datatable') !!}',
|
||||
data: function(d) {
|
||||
// d.filter_member_id = $('select[name=filter_member_id]').val();
|
||||
// d.filter_customer_member = $('select[name=filter_customer_member]').val();
|
||||
}
|
||||
},
|
||||
"ajax": '{!! route('user_orders_datatable') !!}',
|
||||
"order": [[0, "desc" ]],
|
||||
"columns": [
|
||||
{ data: 'id', searchable: false},
|
||||
{ data: 'billing_email', name: 'billing_email' },
|
||||
{ data: 'billing_salutation', name: 'billing_salutation' },
|
||||
{ data: 'billing_company', name: 'billing_company' },
|
||||
{ data: 'billing_firstname', name: 'billing_firstname' },
|
||||
{ data: 'billing_lastname', name: 'billing_lastname' },
|
||||
{ data: 'billing_zipcode', name: 'billing_zipcode' },
|
||||
{ data: 'billing_city', name: 'billing_city' },
|
||||
{ data: 'billing_country_id', name: 'billing_country_id' },
|
||||
{ data: 'orders', name: 'orders' },
|
||||
{ data: 'subscribed', name: 'subscribed' },
|
||||
{ data: 'first_created_at', name: 'first_created_at' },
|
||||
{ data: 'number', name: 'number'},
|
||||
{ data: 'extras', name: 'extras', searchable: false, orderable: false},
|
||||
{ data: 'id', searchable: false },
|
||||
{ data: 'shopping_user.billing_firstname', name: 'shopping_user.billing_firstname' },
|
||||
{ data: 'shopping_user.billing_lastname', name: 'shopping_user.billing_lastname' },
|
||||
{ data: 'shopping_user.billing_email', name: 'shopping_user.billing_email' },
|
||||
{ data: 'created_at', name: 'shopping_orders.created_at' },
|
||||
{ data: 'txaction', name: 'txaction' },
|
||||
{ data: 'total_shipping', name: 'total_shipping' },
|
||||
{ data: 'shopping_user.orders', name: 'shopping_user.orders' },
|
||||
],
|
||||
"bLengthChange": false,
|
||||
"iDisplayLength": 50,
|
||||
"iDisplayLength": 100,
|
||||
"language": {
|
||||
"url": "/js/German.json"
|
||||
}
|
||||
});
|
||||
/* $('#filter_member_id').on('change', function(){
|
||||
oTable.draw();
|
||||
});
|
||||
$('#filter_customer_member').on('change', function(){
|
||||
oTable.draw();
|
||||
});
|
||||
*/
|
||||
|
||||
});
|
||||
</script>
|
||||
@endsection
|
||||
|
||||
@endsection
|
||||
|
|
@ -126,6 +126,12 @@
|
|||
<p>Deine Zahlung wird bearbeitet, eine Bestätigung zur Zahlungsabwicklung wird automatisch erstellt.</p>
|
||||
<hr />
|
||||
@endif
|
||||
|
||||
@if($pay_trans->shopping_payment->clearingtype === "fnc" && $pay_trans->shopping_payment->onlinebanktransfertype === 'MIV')
|
||||
<h4>Bezahlung per Rechnung:</h4>
|
||||
<p>Deine Bestellung wird bearbeitet, eine Bestätigung zur Bestellungsabwicklung wird automatisch erstellt.</p>
|
||||
<hr />
|
||||
@endif
|
||||
@endif
|
||||
<p>
|
||||
<strong>Dein Team von mivita.care</strong>
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@
|
|||
<div class="m-checkout">
|
||||
{!! Form::open(['url' => route('checkout.checkout_card_final'), 'class' => 'row clearfix', 'id'=>'checkout_card_final']) !!}
|
||||
|
||||
{!! Form::hidden('selected_country') !!}
|
||||
{!! Form::hidden('selected_country', '') !!}
|
||||
{!! Form::hidden('is_for', $shopping_user->is_for) !!}
|
||||
{!! Form::hidden('is_from', $shopping_user->is_from) !!}
|
||||
|
||||
|
|
@ -177,114 +177,204 @@
|
|||
<fieldset class="mb-0 box-border-shadow p-20">
|
||||
<h4>Rechnung & Versand</h4>
|
||||
<hr />
|
||||
<div class="row">
|
||||
<div class="col-md-12 col-sm-12">
|
||||
<div class="form-group">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_company">Firmenname (optional)</label>
|
||||
{!! Form::text('billing_company', $shopping_user->billing_company, ['class' => 'form-control', 'id'=>'billing_company']) !!}
|
||||
@if($is_from === 'shopping')
|
||||
<div class="is_from_shopping">
|
||||
<div class="row">
|
||||
<div class="col-md-12 col-sm-12">
|
||||
<div class="form-group">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_company">Firmenname (optional)</label>
|
||||
{!! Form::text('billing_company', $shopping_user->billing_company, ['class' => 'form-control', 'id'=>'billing_company']) !!}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12 col-sm-12">
|
||||
<div class="form-group {{($errors->has('billing_salutation') ? 'error' : '')}}">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_salutation">Anrede *</label>
|
||||
<select id="billing_salutation" name="billing_salutation" class="form-control selectpicker">
|
||||
{!! HTMLHelper::getSalutation(($shopping_user->billing_salutation ? $shopping_user->billing_salutation : old('billing_salutation'))) !!}
|
||||
<div class="row">
|
||||
<div class="col-md-12 col-sm-12">
|
||||
<div class="form-group {{($errors->has('billing_salutation') ? 'error' : '')}}">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_salutation">Anrede *</label>
|
||||
<select id="billing_salutation" name="billing_salutation" class="form-control selectpicker">
|
||||
{!! HTMLHelper::getSalutation(($shopping_user->billing_salutation ? $shopping_user->billing_salutation : old('billing_salutation'))) !!}
|
||||
</select>
|
||||
@if ($errors->has('billing_salutation'))
|
||||
<label for="billing_salutation" class="error text-danger small" style="display: block;">{{ $errors->first('billing_salutation') }}</label>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-6 col-sm-6">
|
||||
<div class="form-group">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_firstname">Vorname*</label>
|
||||
{!! Form::text('billing_firstname', $shopping_user->billing_firstname, ['class' => 'form-control '.($errors->has('billing_firstname') ? 'error' : ''), 'id'=>'billing_firstname']) !!}
|
||||
@if ($errors->has('billing_firstname'))
|
||||
<label for="billing_firstname" class="error text-danger small" style="display: block;">{{ $errors->first('billing_firstname') }}</label>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6 col-sm-6">
|
||||
<div class="form-group">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_lastname">Nachname*</label>
|
||||
{!! Form::text('billing_lastname', $shopping_user->billing_lastname, ['class' => 'form-control '.($errors->has('billing_lastname') ? 'error' : ''), 'id'=>'billing_lastname']) !!}
|
||||
@if ($errors->has('billing_lastname'))
|
||||
<label for="billing_lastname" class="error text-danger small" style="display: block;">{{ $errors->first('billing_lastname') }}</label>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<div class="form-group">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_address">Straße Nr. *</label>
|
||||
{!! Form::text('billing_address', $shopping_user->billing_address, ['class' => 'form-control '.($errors->has('billing_address') ? 'error' : ''), 'id'=>'billing_address']) !!}
|
||||
@if ($errors->has('billing_address'))
|
||||
<label for="billing_address" class="error text-danger small" style="display: block;">{{ $errors->first('billing_address') }}</label>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-12">
|
||||
<div class="form-group">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_address_2">Wohnung / Gebäude (optional)</label>
|
||||
{!! Form::text('billing_address_2', $shopping_user->billing_address_2, ['class' => 'form-control '.($errors->has('billing_address_2') ? 'error' : ''), 'id'=>'billing_address_2']) !!}
|
||||
@if ($errors->has('billing_address_2'))
|
||||
<label for="billing_address_2" class="error text-danger small" style="display: block;">{{ $errors->first('billing_address_2') }}</label>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6 col-sm-6">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_zipcode">PLZ *</label>
|
||||
{!! Form::text('billing_zipcode', $shopping_user->billing_zipcode, ['class' => 'form-control '.($errors->has('billing_zipcode') ? 'error' : ''), 'id'=>'billing_zipcode']) !!}
|
||||
@if ($errors->has('billing_zipcode'))
|
||||
<label for="billing_zipcode" class="error text-danger small" style="display: block;">{{ $errors->first('billing_zipcode') }}</label>
|
||||
@endif
|
||||
</div>
|
||||
<div class="col-md-6 col-sm-6">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_city">Stadt *</label>
|
||||
{!! Form::text('billing_city', $shopping_user->billing_city, ['class' => 'form-control '.($errors->has('billing_city') ? 'error' : ''), 'id'=>'billing_city']) !!}
|
||||
@if ($errors->has('billing_city'))
|
||||
<label for="billing_city" class="error text-danger small" style="display: block;">{{ $errors->first('billing_city') }}</label>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<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">
|
||||
{!! HTMLHelper::getCountriesForShipping($shopping_user->billing_state) !!}
|
||||
</select>
|
||||
@if ($errors->has('billing_salutation'))
|
||||
<label for="billing_salutation" class="error text-danger small" style="display: block;">{{ $errors->first('billing_salutation') }}</label>
|
||||
@endif
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-6 col-sm-6">
|
||||
<div class="form-group">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_firstname">Vorname*</label>
|
||||
{!! Form::text('billing_firstname', $shopping_user->billing_firstname, ['class' => 'form-control '.($errors->has('billing_firstname') ? 'error' : ''), 'id'=>'billing_firstname']) !!}
|
||||
@if ($errors->has('billing_firstname'))
|
||||
<label for="billing_firstname" class="error text-danger small" style="display: block;">{{ $errors->first('billing_firstname') }}</label>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6 col-sm-6">
|
||||
<div class="form-group">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_lastname">Nachname*</label>
|
||||
{!! Form::text('billing_lastname', $shopping_user->billing_lastname, ['class' => 'form-control '.($errors->has('billing_lastname') ? 'error' : ''), 'id'=>'billing_lastname']) !!}
|
||||
@if ($errors->has('billing_lastname'))
|
||||
<label for="billing_lastname" class="error text-danger small" style="display: block;">{{ $errors->first('billing_lastname') }}</label>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<div class="form-group">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_address">Straße Nr. *</label>
|
||||
{!! Form::text('billing_address', $shopping_user->billing_address, ['class' => 'form-control '.($errors->has('billing_address') ? 'error' : ''), 'id'=>'billing_address']) !!}
|
||||
@if ($errors->has('billing_address'))
|
||||
<label for="billing_address" class="error text-danger small" style="display: block;">{{ $errors->first('billing_address') }}</label>
|
||||
<div class="row">
|
||||
<div class="col-md-12 col-sm-12">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_phone">Telefon (optional)</label>
|
||||
{!! Form::text('billing_phone', $shopping_user->billing_phone, ['class' => 'form-control '.($errors->has('billing_phone') ? 'error' : ''), 'id'=>'billing_phone']) !!}
|
||||
@if ($errors->has('billing_phone'))
|
||||
<label for="billing_phone" class="error text-danger small" style="display: block;">{{ $errors->first('billing_phone') }}</label>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-12">
|
||||
<div class="form-group">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_address_2">Wohnung / Gebäude (optional)</label>
|
||||
{!! Form::text('billing_address_2', $shopping_user->billing_address_2, ['class' => 'form-control '.($errors->has('billing_address_2') ? 'error' : ''), 'id'=>'billing_address_2']) !!}
|
||||
@if ($errors->has('billing_address_2'))
|
||||
<label for="billing_address_2" class="error text-danger small" style="display: block;">{{ $errors->first('billing_address_2') }}</label>
|
||||
<div class="row">
|
||||
<div class="col-md-12 col-sm-12">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_email">E-Mail *</label>
|
||||
{!! Form::email('billing_email', $shopping_user->billing_email, ['class' => 'form-control '.($errors->has('billing_email') ? 'error' : ''), 'id'=>'billing_email']) !!}
|
||||
@if ($errors->has('billing_email'))
|
||||
<label for="billing_email" class="error text-danger small" style="display: block;">{{ $errors->first('billing_email') }}</label>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12 col-sm-12">
|
||||
<hr>
|
||||
<label class="checkbox {{ ($errors->has('accepted_data_checkbox') ? 'error' : '') }}" for="accepted_data_checkbox" style="font-size: 14px;line-height: 22px; font-weight: 400">
|
||||
{!! Form::checkbox('accepted_data_checkbox', 1, $shopping_user->accepted_data_checkbox, ['id'=>'accepted_data_checkbox', 'class' => 'form-control '.($errors->has('accepted_data_checkbox') ? 'error' : '')]) !!}
|
||||
|
||||
@if($shopping_user->auth_user_id)
|
||||
<i></i> Mit Klick auf "Jetzt kaufen" akzeptiere ich die Allgemeinen Geschäftsbedingungen und die Datenschutzbelehrung, damit für die Bestellung meine Daten verarbeitet werden können.
|
||||
@else
|
||||
<i></i> Mit Klick auf "Jetzt kaufen" akzeptiere ich die <a href="{{ url('/agb') }}">Allgemeinen Geschäftsbedingungen</a>, die <a target="_blank" href="{{ asset('download/mivita_widerruf_formular.pdf') }}">Widerrufsbelehrung</a> und die <a href="{{ url('/datenschutz') }}">Datenschutzerklärung</a>, damit für die Bestellung meine Daten verarbeitet werden können.
|
||||
@endif
|
||||
</label>
|
||||
@if ($errors->has('accepted_data_checkbox'))
|
||||
<label for="accepted_data_checkbox" class="error text-danger small" style="display: block;">{{ $errors->first('accepted_data_checkbox') }}</label>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@else
|
||||
<div class="is_from_user">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6 col-sm-6">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_zipcode">PLZ *</label>
|
||||
{!! Form::text('billing_zipcode', $shopping_user->billing_zipcode, ['class' => 'form-control '.($errors->has('billing_zipcode') ? 'error' : ''), 'id'=>'billing_zipcode']) !!}
|
||||
@if ($errors->has('billing_zipcode'))
|
||||
<label for="billing_zipcode" class="error text-danger small" style="display: block;">{{ $errors->first('billing_zipcode') }}</label>
|
||||
@endif
|
||||
</div>
|
||||
<div class="col-md-6 col-sm-6">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_city">Stadt *</label>
|
||||
{!! Form::text('billing_city', $shopping_user->billing_city, ['class' => 'form-control '.($errors->has('billing_city') ? 'error' : ''), 'id'=>'billing_city']) !!}
|
||||
@if ($errors->has('billing_city'))
|
||||
<label for="billing_city" class="error text-danger small" style="display: block;">{{ $errors->first('billing_city') }}</label>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12 col-sm-12">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_state">Land * {{$shopping_user->billing_state}}</label>
|
||||
<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="{{Yard::instance('shopping')->getShippingCountryCountryId()}}">
|
||||
<span class="info-small" id="show_shipping_country_info">Bei der Änderung des Versandlandes werden die Versandkosten neu berechnet.</span>
|
||||
</div>
|
||||
</div>
|
||||
{!! Form::hidden('billing_company', $shopping_user->billing_company) !!}
|
||||
{!! Form::hidden('billing_salutation', $shopping_user->billing_salutation) !!}
|
||||
{!! Form::hidden('billing_firstname', $shopping_user->billing_firstname) !!}
|
||||
{!! Form::hidden('billing_lastname', $shopping_user->billing_lastname) !!}
|
||||
{!! Form::hidden('billing_address', $shopping_user->billing_address) !!}
|
||||
{!! Form::hidden('billing_address_2', $shopping_user->billing_address_2) !!}
|
||||
{!! Form::hidden('billing_zipcode', $shopping_user->billing_zipcode) !!}
|
||||
{!! Form::hidden('billing_city', $shopping_user->billing_city) !!}
|
||||
{!! Form::hidden('billing_phone', $shopping_user->billing_phone) !!}
|
||||
{!! Form::hidden('billing_email', $shopping_user->billing_email) !!}
|
||||
{!! Form::hidden('billing_state', $shopping_user->billing_state) !!}
|
||||
{!! Form::hidden('billing_country_id', \App\Services\Shop::getShippingCountryCountryId($shopping_user->billing_state)) !!}
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12 col-sm-12">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_phone">Telefon (optional)</label>
|
||||
{!! Form::text('billing_phone', $shopping_user->billing_phone, ['class' => 'form-control '.($errors->has('billing_phone') ? 'error' : ''), 'id'=>'billing_phone']) !!}
|
||||
@if ($errors->has('billing_phone'))
|
||||
<label for="billing_phone" class="error text-danger small" style="display: block;">{{ $errors->first('billing_phone') }}</label>
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12 col-sm-12">
|
||||
<label class="mt-0 fs-14 fw-400" for="billing_email">E-Mail *</label>
|
||||
{!! Form::email('billing_email', $shopping_user->billing_email, ['class' => 'form-control '.($errors->has('billing_email') ? 'error' : ''), 'id'=>'billing_email']) !!}
|
||||
@if ($errors->has('billing_email'))
|
||||
<label for="billing_email" class="error text-danger small" style="display: block;">{{ $errors->first('billing_email') }}</label>
|
||||
@endif
|
||||
<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>
|
||||
{{ $shopping_user->billing_country->getLocated() }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Telefon</div>
|
||||
{{ $shopping_user->billing_phone }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">E-Mail</div>
|
||||
{{ $shopping_user->billing_email }}
|
||||
</div>
|
||||
</div>
|
||||
<p class="text-muted small mb-0">Hinterlegte Rechnungsdaten von Beratern können nur im Salescenter geändert werden.</p>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12 col-sm-12">
|
||||
|
|
@ -303,8 +393,6 @@
|
|||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="row">
|
||||
|
||||
<div class="col-lg-12 nomargin clearfix">
|
||||
|
|
@ -414,11 +502,11 @@
|
|||
|
||||
<div class="row">
|
||||
<div class="col-md-12 col-sm-12">
|
||||
<label class="mt-0 fs-14 fw-400" for="shipping_state">Land * {{$shopping_user->shipping_state}}</label>
|
||||
<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="{{Yard::instance('shopping')->getShippingCountryCountryId()}}">
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -437,11 +525,11 @@
|
|||
<!-- /SHIPPING -->
|
||||
|
||||
@if(isset($order_reference))
|
||||
<a href="{{ Util::getUserShopBackUrl($order_reference) }}" class="btn btn-default btn-sm btn- size-15 mt-4">
|
||||
<a href="{{ Util::getUserShopBackUrl($order_reference) }}" class="btn btn-default btn-sm btn- size-15 mt-4 mb-4">
|
||||
<i class="fa fa-chevron-left"></i> zurück zum Shop
|
||||
</a>
|
||||
@else
|
||||
<a href="{{ Util::getUserCardBackUrl('/card/show') }}" class="btn btn-default btn-sm btn- size-15 mt-4">
|
||||
<a href="{{ Util::getUserCardBackUrl('/card/show') }}" class="btn btn-default btn-sm btn- size-15 mt-4 mb-4">
|
||||
@if(Util::getUserPaymentFor() > 1)
|
||||
<i class="fa fa-chevron-left"></i> zurück {{ Util::getMyMivitaUrl(false) }}
|
||||
@else
|
||||
|
|
@ -463,55 +551,80 @@
|
|||
<div class="toggle active">
|
||||
<div class="toggle-content">
|
||||
<div class="row nomargin-bottom">
|
||||
@if(($shopping_user->abo_options === 1) && (Util::getUserPaymentFor() >= 3))
|
||||
|
||||
|
||||
@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%">
|
||||
{!! Form::radio('payment_method', 'elv', '1') !!}
|
||||
<i></i> <span class="weight-400"><span class="fa fa-check text-primary"></span> SEPA Lastschrift</span>
|
||||
<img class="float-right" width="90" src="{{asset('images/payments-assets/sepa.png')}}" alt="SEPA Lastschrift">
|
||||
</label>
|
||||
</div>
|
||||
@else
|
||||
<p>Zahlungsmethode nicht freigeschaltet, bitte wende dich an {{ config('app.default_mail') }}</p>
|
||||
@endif
|
||||
@else
|
||||
@if(array_key_exists('PP', $payment_methods_active) && in_array($payment_methods_active['PP'], $payment_methods))
|
||||
<div class="col-lg-12 nomargin clearfix">
|
||||
<label class="mt-0 fs-14 fw-400 radio pull-left nomargin-top" style="width: 100%">
|
||||
{!! Form::radio('payment_method', 'wlt#PPE', (!old('payment_method') ? '1' : '')) !!}
|
||||
<i></i> <span class="weight-400"><span class="fa fa-check text-primary"></span> PayPal</span>
|
||||
<img class="float-right" width="90" src="{{asset('images/payments-assets/paypal.png')}}" alt="PayPal">
|
||||
</label>
|
||||
</div>
|
||||
@endif
|
||||
@if(array_key_exists('CC', $payment_methods_active) && in_array($payment_methods_active['CC'], $payment_methods))
|
||||
<div class="col-lg-12 nomargin clearfix">
|
||||
<label class="mt-4 fs-14 fw-400 radio pull-left nomargin-top" style="width: 100%">
|
||||
{!! Form::radio('payment_method', 'cc', '') !!}
|
||||
<i></i> <span class="weight-400"><span class="fa fa-check text-primary"></span> Kreditkarte</span>
|
||||
<img class="float-right" width="90" src="{{asset('images/payments-assets/creditcard.png')}}" alt="Mastercard + Visa">
|
||||
</label>
|
||||
</div>
|
||||
@endif
|
||||
@if(array_key_exists('SB', $payment_methods_active) && in_array($payment_methods_active['SB'], $payment_methods))
|
||||
<div class="col-lg-12 nomargin clearfix">
|
||||
<label class="mt-4 fs-14 fw-400 radio pull-left" style="width: 100%">
|
||||
{!! Form::radio('payment_method', 'elv', '1') !!}
|
||||
{!! Form::radio('payment_method', 'sb#PNT', '') !!}
|
||||
<i></i> <span class="weight-400"><span class="fa fa-check text-primary"></span> Sofort -Überweisung</span>
|
||||
<img class="float-right" width="90" src="{{asset('images/payments-assets/sofort.png')}}" alt="Sofort">
|
||||
</label>
|
||||
</div>
|
||||
@endif
|
||||
@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%">
|
||||
{!! Form::radio('payment_method', 'elv', '') !!}
|
||||
<i></i> <span class="weight-400"><span class="fa fa-check text-primary"></span> SEPA Lastschrift</span>
|
||||
<img class="float-right" width="90" src="{{asset('images/payments-assets/sepa.png')}}" alt="SEPA Lastschrift">
|
||||
</label>
|
||||
</div>
|
||||
@else
|
||||
<div class="col-lg-12 nomargin clearfix">
|
||||
<label class="mt-0 fs-14 fw-400 radio pull-left nomargin-top" style="width: 100%">
|
||||
{!! Form::radio('payment_method', 'wlt#PPE', (!old('payment_method') ? '1' : '')) !!}
|
||||
<i></i> <span class="weight-400"><span class="fa fa-check text-primary"></span> PayPal</span>
|
||||
<img class="float-right" width="90" src="{{asset('images/payments-assets/paypal.png')}}" alt="PayPal">
|
||||
@endif
|
||||
@if(array_key_exists('VOR', $payment_methods_active) && in_array($payment_methods_active['VOR'], $payment_methods))
|
||||
<div class="col-lg-12 nomargin clearfix">
|
||||
<label class="mt-4 fs-14 fw-400 radio pull-left" style="width: 100%">
|
||||
{!! Form::radio('payment_method', 'vor', '') !!}
|
||||
<i></i> <span class="weight-400"><span class="fa fa-check text-primary"></span> Vorkasse</span>
|
||||
<img class="float-right" width="90" src="{{asset('images/payments-assets/vor.png')}}" alt="Vorkasse">
|
||||
</label>
|
||||
</div>
|
||||
@endif
|
||||
@if(array_key_exists('FNC', $payment_methods_active) && in_array($payment_methods_active['FNC'], $payment_methods))
|
||||
<div class="col-lg-12 nomargin clearfix">
|
||||
<label class="mt-4 fs-14 fw-400 radio pull-left" style="width: 100%">
|
||||
<input name="payment_method" type="radio" value="fnc#MIV" />
|
||||
<i></i> <span class="weight-400"><span class="fa fa-check text-primary"></span> Rechnungskauf</span>
|
||||
<img class="float-right" width="90" src="{{asset('images/payments-assets/fnc.png')}}" alt="Vorkasse">
|
||||
</label>
|
||||
</div>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
</label>
|
||||
</div>
|
||||
<div class="col-lg-12 nomargin clearfix">
|
||||
<label class="mt-4 fs-14 fw-400 radio pull-left nomargin-top" style="width: 100%">
|
||||
{!! Form::radio('payment_method', 'cc', '') !!}
|
||||
<i></i> <span class="weight-400"><span class="fa fa-check text-primary"></span> Kreditkarte</span>
|
||||
<img class="float-right" width="90" src="{{asset('images/payments-assets/creditcard.png')}}" alt="Mastercard + Visa">
|
||||
</label>
|
||||
</div>
|
||||
<div class="col-lg-12 nomargin clearfix">
|
||||
<label class="mt-4 fs-14 fw-400 radio pull-left" style="width: 100%">
|
||||
{!! Form::radio('payment_method', 'sb#PNT', '') !!}
|
||||
<i></i> <span class="weight-400"><span class="fa fa-check text-primary"></span> Sofort -Überweisung</span>
|
||||
<img class="float-right" width="90" src="{{asset('images/payments-assets/sofort.png')}}" alt="Sofort">
|
||||
</label>
|
||||
</div>
|
||||
<div class="col-lg-12 nomargin clearfix">
|
||||
<label class="mt-4 fs-14 fw-400 radio pull-left" style="width: 100%">
|
||||
{!! Form::radio('payment_method', 'elv', '') !!}
|
||||
<i></i> <span class="weight-400"><span class="fa fa-check text-primary"></span> SEPA Lastschrift</span>
|
||||
<img class="float-right" width="90" src="{{asset('images/payments-assets/sepa.png')}}" alt="SEPA Lastschrift">
|
||||
</label>
|
||||
</div>
|
||||
<div class="col-lg-12 nomargin clearfix">
|
||||
<label class="mt-4 fs-14 fw-400 radio pull-left" style="width: 100%">
|
||||
{!! Form::radio('payment_method', 'vor', '') !!}
|
||||
<i></i> <span class="weight-400"><span class="fa fa-check text-primary"></span> Vorkasse</span>
|
||||
<img class="float-right" width="90" src="{{asset('images/payments-assets/vor.png')}}" alt="Vorkasse">
|
||||
|
||||
</label>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
{{-- <div class="col-lg-12 nomargin clearfix">
|
||||
{{--
|
||||
<div class="col-lg-12 nomargin clearfix">
|
||||
<label class="mt-0 fs-14 fw-400 radio pull-left" style="width: 100%">
|
||||
<input name="payment_method" type="radio" value="sb#GPY" />
|
||||
<i></i> <span class="weight-400"><span class="fa fa-check text-primary"></span> giropay - Online-Überweisung</span>
|
||||
|
|
@ -744,6 +857,10 @@
|
|||
jQuery("#shipswitch").bind("click", function() {
|
||||
jQuery('#shipping').slideToggle(200, function() {
|
||||
// scroll down to shipping area.
|
||||
if($('#billing_state').val() !== $('#shipping_state').val()){
|
||||
$('input[name="selected_country"]').val('change');
|
||||
$('form#checkout_card_final').submit();
|
||||
}
|
||||
if(jQuery('#shipping').is(":visible")) {
|
||||
_scrollTo('#shipping', 150);
|
||||
showShippingCountryFor('shipping');
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue