Updates to 03-2025
This commit is contained in:
parent
6167273a48
commit
9b54eb0512
348 changed files with 34535 additions and 5774 deletions
|
|
@ -62,8 +62,8 @@
|
|||
{{ Form::text('address_2', $user->account->address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'address_2', 'tabindex' => 6)) }}
|
||||
</div>
|
||||
<div class="form-group col-md-5">
|
||||
<label for="birthday" class="form-label">{{ __('Geburtsdatum') }}*</label>
|
||||
{{ Form::text('birthday', $user->account->birthday, array('placeholder'=>Util::formatDate(), 'data-date-format'=>Util::formatDate(), 'data-start_view'=>2, 'required'=>true, 'class'=>'form-control datepicker-birthday')) }}
|
||||
<label for="birthday" class="form-label">{{ __('Geburtsdatum') }}</label>
|
||||
{{ Form::text('birthday', $user->account->birthday, array('placeholder'=>Util::formatDate(), 'data-date-format'=>Util::formatDate(), 'data-start_view'=>2, 'required'=>false, 'class'=>'form-control datepicker-birthday')) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
|
|
@ -170,6 +170,69 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="card mb-4">
|
||||
<div class="card-body">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<label class="form-label" for="taxable_sales">{{ __('account.VAT_liability') }} @if($user->account->getCountryAttrAs('taxable_sales'))* @endif</label>
|
||||
<select class="selectpicker" name="taxable_sales" id="taxable_sales" data-style="btn-light" @if($user->account->getCountryAttrAs('taxable_sales')) required @endif>
|
||||
{!! HTMLHelper::getTaxSaleOptions($user->account->taxable_sales) !!}
|
||||
</select>
|
||||
<p class="badge">{{ __('account.VAT_copy_1') }}</p>
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-6">
|
||||
<label class="form-label" for="tax_number">{{ __('account.tax_number') }} @if($user->account->getCountryAttrAs('tax_number'))* @endif</label>
|
||||
{{ Form::text('tax_number', $user->account->tax_number, array('placeholder'=>__('account.tax_number'), 'class'=>'form-control', 'id'=>'tax_number', $user->account->getCountryAttrAs('tax_number','required'))) }}
|
||||
</div>
|
||||
{{-- !isset($step) && --}}
|
||||
@if($user->account->country_id && $user->account->country->eu_country)
|
||||
<div class="col-sm-12">
|
||||
<hr>
|
||||
</div>
|
||||
<div class="form-group col-md-6 {{ $errors->has('tax_identification_number') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="tax_identification_number">{{ __('account.VAT_ID_number') }} @if($user->account->getCountryAttrAs('tax_id_number'))* @endif</label>
|
||||
|
||||
{{ Form::text('tax_identification_number', $user->account-> tax_identification_number, array('placeholder'=>__('account.VAT_ID_number'), 'class'=>'form-control', 'id'=>'tax_identification_number', $user->account->getCountryAttrAs('tax_id_number','required'), ($user->account->reverse_charge_valid ? 'readonly' : ''))) }}
|
||||
@if ($errors->has('tax_identification_number'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('tax_identification_number') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
<div class="form-group col-sm-12 {{ $errors->has('reverse_charge') ? 'has-error' : '' }}">
|
||||
<label class="custom-control custom-checkbox">
|
||||
{!! Form::checkbox('reverse_charge', 1, $user->account->reverse_charge, ['class'=>'custom-control-input']) !!}
|
||||
<span class="custom-control-label">{{ __('account.reverse_charge_procedure') }}</span><br>
|
||||
<em>{{ __('account.reverse_charge_copy_1') }}
|
||||
<strong>{{ __('account.reverse_charge_note_1') }}</strong></em>
|
||||
</label>
|
||||
@if($user->account->reverse_charge_valid)
|
||||
<div class="badge badge-secondary">Aktiv seit: {{ $user->account->getReverseChargeValidFormat() }}</div>
|
||||
<button type="submit" class="btn btn-xs btn-danger" name="reverse_charge_delete" value="1"><i class="fa fa-trash"></i> {{ __('account.reverse_charge_action_1') }}</button>
|
||||
|
||||
@endif
|
||||
@if ($errors->has('reverse_charge'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('reverse_charge') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
@if(!$user->account->reverse_charge_valid)
|
||||
<button type="submit" class="btn btn-sm btn-primary" name="reverse_charge_validate" value="1">{{ __('account.reverse_charge_action_2') }}</button>
|
||||
@endif
|
||||
@else
|
||||
<div class="form-group col-md-6">
|
||||
<label class="form-label" for="tax_identification_number">{{ __('account.VAT_ID_number') }} @if($user->account->getCountryAttrAs('tax_id_number'))* @endif</label>
|
||||
{{ Form::text('tax_identification_number', $user->account-> tax_identification_number, array('placeholder'=>__('account.VAT_ID_number'), 'class'=>'form-control', 'id'=>'tax_identification_number', $user->account->getCountryAttrAs('tax_id_number','required'))) }}
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card mb-4">
|
||||
<div class="card-body">
|
||||
<div class="form-row">
|
||||
|
|
|
|||
|
|
@ -450,13 +450,19 @@
|
|||
<div class="form-row">
|
||||
<div class="form-group col-md-12 {{ $errors->has('shipping_country_id') ? 'has-error' : '' }}">
|
||||
<label class="form-label">{{ __('Lieferland') }}*</label>
|
||||
<select class="selectpicker" name="shipping_country_id" id="shipping_country_id" data-style="btn-light" data-live-search="false" tabindex="24">
|
||||
{!! HTMLHelper::getCountriesForShipping($shopping_user->shipping_state) !!}
|
||||
</select>
|
||||
@if($is_from === 'shopping')
|
||||
<select class="custom-select" name="shipping_country_id" id="shipping_country_id">
|
||||
{!! HTMLHelper::getCountriesForShipping($shopping_user->shipping_state) !!}
|
||||
</select>
|
||||
@else
|
||||
{{ Form::hidden('shipping_country_id', $shopping_user->shipping_state) }}
|
||||
{{ Form::text('shipping_country_show', $shopping_user->shipping_country->getLocated(), array('readonly'=>true, 'class'=>'form-control', 'id'=>'shipping_country_show')) }}
|
||||
<p class="text-muted small mb-0"><i>Dei das Lieferland kann nur vor der Bestellung in den Daten geändert werden.</i></p>
|
||||
@endif
|
||||
@if ($errors->has('shipping_country_id'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('shipping_country_id') }}</strong>
|
||||
</span>
|
||||
<strong>{{ $errors->first('shipping_country_id') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -26,4 +26,45 @@
|
|||
<a href="{{route('home')}}" class="btn btn-default">{{ __('back') }}</a>
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
|
||||
|
||||
<!-- Modal template -->
|
||||
<div class="modal fade" id="modal-user-vat-validation">
|
||||
<div class="modal-dialog">
|
||||
{!! Form::open(['url' => route('user_edit'), 'class' => 'modal-content']) !!}
|
||||
<input type="hidden" name="user_id" id="user_id" value="@if($user->id>0){{$user->id}}@else new @endif">
|
||||
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">Neue UST-ID validieren und Reverse Charge Verfahren aktivieren</span></h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-12">
|
||||
<p>Umkehrung der Steuerschuldnerschaft oder auch Abzugsverfahren. In diesem Spezialfall muss der Leistungsempfänger (Vertriebspartner) und nicht der leistende Unternehmer (Grüne Seele) die Umsatzsteuer entrichten.</p>
|
||||
<p>Bei der Aktivierung wird die USt-ID benötigt und validiert.</p>
|
||||
</div>
|
||||
<div class="form-group col-sm-12 {{ $errors->has('reverse_charge') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="tax_identification_number">{{ __('USt-ID Nummer') }} *</label>
|
||||
{{ Form::text('tax_identification_number', $user->account-> tax_identification_number, array('placeholder'=>__('USt-ID Nummer'), 'class'=>'form-control', 'id'=>'tax_identification_number', 'required'=>true)) }}
|
||||
|
||||
@if ($errors->has('reverse_charge'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('reverse_charge') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">{{__('close')}}</button>
|
||||
<button type="submit" class="btn btn-primary" name="action" value="reverse_charge_validate">USt-ID Nummer validieren</button>
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
@endsection
|
||||
|
|
|
|||
|
|
@ -105,8 +105,8 @@
|
|||
</div>
|
||||
|
||||
<div class="form-group col-md-4">
|
||||
<label for="birthday" class="form-label">{{ __('Geburtsdatum') }}*</label>
|
||||
{{ Form::text('birthday', $user->account->birthday, array('placeholder'=>Util::formatDate(), 'data-date-format'=>Util::formatDate(), 'data-start_view'=>2, 'required'=>true, 'class'=>'form-control datepicker-birthday')) }}
|
||||
<label for="birthday" class="form-label">{{ __('Geburtsdatum') }}</label>
|
||||
{{ Form::text('birthday', $user->account->birthday, array('placeholder'=>Util::formatDate(), 'data-date-format'=>Util::formatDate(), 'data-start_view'=>2, 'required'=>false, 'class'=>'form-control datepicker-birthday')) }}
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
|
|
|
|||
|
|
@ -48,7 +48,13 @@
|
|||
</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">
|
||||
|
|
@ -64,13 +70,9 @@
|
|||
</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:
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
@section('content')
|
||||
<h4 class="font-weight-bold py-2 mb-2">
|
||||
<a href="{{route('user_orders')}}" class="btn btn-sm btn-default float-right">zurück</a>
|
||||
<a href="{{route('user_myorders')}}" 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_orders')}}" class="btn btn-sm btn-default mt-2 float-right">zurück</a>
|
||||
<a href="{{route('user_myorders')}}" class="btn btn-sm btn-default mt-2 float-right">zurück</a>
|
||||
|
||||
@endsection
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
$('.datatable-users').dataTable({
|
||||
"processing": true,
|
||||
"serverSide": true,
|
||||
"ajax": '{!! route('user_orders_datatable') !!}',
|
||||
"ajax": '{!! route('user_myorder_datatable') !!}',
|
||||
"order": [[0, "desc" ]],
|
||||
"columns": [
|
||||
{ data: 'id', searchable: false },
|
||||
|
|
|
|||
|
|
@ -80,6 +80,36 @@
|
|||
</div>
|
||||
@endif
|
||||
|
||||
<div class="card mt-2 mb-2">
|
||||
<div class="card-body">
|
||||
<h4>{{ __('order.delivery_to_me') }}</h4>
|
||||
<div class="row">
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">{{ __('payment.ordering_country') }}</div>
|
||||
{{ App\Services\UserService::getOrderInfo('billing_state') }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">{{ __('payment.country_of_delivery') }}</div>
|
||||
{{ App\Services\UserService::getOrderInfo('shipping_state') }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">{{ __('payment.VAT') }}</div>
|
||||
{{ App\Services\UserService::getOrderInfo('tax_free') }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">{{ __('payment.reverse_charge_procedure') }}</div>
|
||||
{{ App\Services\UserService::getOrderInfo('user_reverse_charge') }}
|
||||
</div>
|
||||
</div>
|
||||
<i>{!! __('order.delivery_country_changed_info', ['link'=> route('user_edit')]) !!}</i>
|
||||
<hr>
|
||||
@if($user->user_level)
|
||||
<p>{!! __('order.product_prices_career_level_info', ['user_level_name'=>$user->user_level->getLang('name'), 'user_level_margin'=>$user->user_level->getFormattedMargin()]) !!}</p>
|
||||
@else
|
||||
<p>{{ __('order.no_career_level_info') }}</p>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<div class="card-datatable table-responsive">
|
||||
|
|
@ -118,7 +148,6 @@
|
|||
@if($for === 'me' || $for === 'mp')
|
||||
<h4>Mein Lieferland</h4>
|
||||
@include('user.order.shipping_me')
|
||||
<i>Kann bei der Zahlung/Checkout nicht mehr geändert werden.</i>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -10,21 +10,6 @@
|
|||
{{ Form::hidden('shipping_zipcode', $user->account->zipcode) }}
|
||||
{{ Form::hidden('shipping_city', $user->account->city) }}
|
||||
{{ Form::hidden('shipping_phone', $user->account->phone) }}
|
||||
|
||||
<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">
|
||||
{!! 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>
|
||||
@else
|
||||
{{ Form::hidden('shipping_company', $user->account->shipping_company) }}
|
||||
{{ Form::hidden('shipping_salutation', $user->account->shipping_salutation) }}
|
||||
|
|
@ -35,29 +20,38 @@
|
|||
{{ Form::hidden('shipping_zipcode', $user->account->shipping_zipcode) }}
|
||||
{{ Form::hidden('shipping_city', $user->account->shipping_city) }}
|
||||
{{ Form::hidden('shipping_phone', $user->account->shipping_phone) }}
|
||||
@endif
|
||||
|
||||
<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">
|
||||
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!}
|
||||
</select>
|
||||
@if ($errors->has('shipping_state'))
|
||||
@if(!App\Services\UserService::getTaxFree())
|
||||
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="me">
|
||||
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!}
|
||||
</select>
|
||||
<p class="text-muted small mt-1"<i>Lieferadresse kann bei der Zahlung im Checkout nicht mehr geändert werden.</i></p>
|
||||
|
||||
@else
|
||||
{{ Form::hidden('shipping_state', Yard::instance('shopping')->getShippingCountryId()) }}
|
||||
{{ Form::text('shipping_state_show', App\Services\UserService::getShippingCountryNameById(Yard::instance('shopping')->getShippingCountryId()), array('readonly'=>true, 'class'=>'form-control')) }}
|
||||
<p class="text-muted small mt-1"><i>Dei das Lieferland kann nur vor der Bestellung in den Daten geändert werden.</i></p>
|
||||
@endif
|
||||
@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')) }}
|
||||
@if(!$user->account->same_as_billing)
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<label class="form-label" for="shipping_phone">Lieferadresse {{ __('Phone') }}</label>
|
||||
{{ Form::text('shipping_phone', $user->account->shipping_phone, array('placeholder'=>__('Phone'), 'class'=>'form-control')) }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
@else
|
||||
<h4>Fehler: Keine Adressdaten gefunden!</h4>
|
||||
@endif
|
||||
|
|
@ -1,6 +1,4 @@
|
|||
@if($shopping_user->same_as_billing)
|
||||
<!-- Billing -->
|
||||
|
||||
{{ Form::hidden('shipping_company', $shopping_user->billing_company) }}
|
||||
{{ Form::hidden('shipping_salutation', $shopping_user->billing_salutation) }}
|
||||
{{ Form::hidden('shipping_firstname', $shopping_user->billing_firstname) }}
|
||||
|
|
@ -10,23 +8,6 @@
|
|||
{{ Form::hidden('shipping_zipcode', $shopping_user->billing_zipcode) }}
|
||||
{{ Form::hidden('shipping_city', $shopping_user->billing_city) }}
|
||||
{{ Form::hidden('shipping_phone', $shopping_user->billing_phone) }}
|
||||
|
||||
|
||||
<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">
|
||||
{!! 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>
|
||||
<!-- / Billing -->
|
||||
@else
|
||||
|
||||
{{ Form::hidden('shipping_company', $shopping_user->shipping_company) }}
|
||||
|
|
@ -38,18 +19,38 @@
|
|||
{{ Form::hidden('shipping_zipcode', $shopping_user->shipping_zipcode) }}
|
||||
{{ Form::hidden('shipping_city', $shopping_user->shipping_city) }}
|
||||
{{ Form::hidden('shipping_phone', $shopping_user->shipping_phone) }}
|
||||
|
||||
@endif
|
||||
|
||||
|
||||
<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">
|
||||
@if(!App\Services\UserService::getTaxFree())
|
||||
<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'))
|
||||
</select>
|
||||
<p class="text-muted small mt-1"<i>Lieferadresse kann bei der Zahlung im Checkout nicht mehr geändert werden.</i></p>
|
||||
|
||||
@else
|
||||
{{ Form::hidden('shipping_state', Yard::instance('shopping')->getShippingCountryId()) }}
|
||||
{{ Form::text('shipping_state_show', App\Services\UserService::getShippingCountryNameById(Yard::instance('shopping')->getShippingCountryId()), array('readonly'=>true, 'class'=>'form-control')) }}
|
||||
<p class="text-muted small mt-1"><i>Dei das Lieferland kann nur vor der Bestellung in den Daten geändert werden.</i></p>
|
||||
@endif
|
||||
@if($errors->has('shipping_state'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('shipping_state') }}</strong>
|
||||
</span>
|
||||
<strong>{{ $errors->first('shipping_state') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
@if(!$shopping_user->same_as_billing)
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<label class="form-label" for="shipping_phone">Lieferadresse {{ __('Phone') }}</label>
|
||||
{{ Form::text('shipping_phone', $shopping_user->shipping_phone, array('placeholder'=>__('Phone'), 'class'=>'form-control')) }}
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
|
||||
|
|
@ -92,13 +92,13 @@
|
|||
<div class="form-group col-12">
|
||||
<label class="form-label" for="about_you">Kurzer Text über Dich (erscheint auf Deiner Promotion Seite) max. 600 Zeichen</label>
|
||||
{{ Form::textarea('about_you', $user_promotion->about_you, ['placeholder' => __('Über dich'), 'class' => 'form-control bootstrap-maxlength text-autosize', 'maxlength'=>600, 'rows' => 1, 'id' => 'about_you']) }}
|
||||
<p class="mt-1 mb-0"><i>Einen kurzen Text über Dich kannst Du in <a class="btn btn-xs btn-outline-primary" href="{{ route('user_profile') }}">"Mein Konto - Mein Profil"</a> hinterlegen, dieser wird automatisch hier eingefügt, kann aber abgeändert werden.</i></p>
|
||||
<p class="mt-2 mb-0"><i>Einen kurzen Text über Dich kannst Du in <a class="btn btn-xs btn-outline-primary" href="{{ route('user_profile') }}">"Mein Konto - Mein Profil"</a> hinterlegen, dieser wird automatisch hier eingefügt, kann aber abgeändert werden.</i></p>
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12 {{ $errors->has('internal_name') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="internal_name">Interner Titel*</label>
|
||||
<label class="form-label" for="internal_name">Interner Titel (erscheint auf Deiner Übersichtsseite)*</label>
|
||||
{{ Form::text('internal_name', $user_promotion->internal_name, ['placeholder' => __('Promotion Interner Titel'), 'class' => 'form-control', 'id' => 'internal_name', 'required' => true]) }}
|
||||
@if ($errors->has('internal_name'))
|
||||
<span class="help-block">
|
||||
|
|
@ -107,8 +107,8 @@
|
|||
@endif
|
||||
</div>
|
||||
<div class="form-group col-12">
|
||||
<label class="form-label" for="description">Internere Kurzbeschreibung</label>
|
||||
{{ Form::textarea('internal_description', $user_promotion->internal_description, ['placeholder' => __('Internere Kurzbeschreibung'), 'class' => 'form-control text-autosize', 'rows' => 1, 'id' => 'internal_description']) }}
|
||||
<label class="form-label" for="description">Interne Kurzbeschreibung (erscheint auf Deiner Übersichtsseite)</label>
|
||||
{{ Form::textarea('internal_description', $user_promotion->internal_description, ['placeholder' => __('Interne Kurzbeschreibung'), 'class' => 'form-control text-autosize', 'rows' => 1, 'id' => 'internal_description']) }}
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
|
|
@ -117,7 +117,7 @@
|
|||
<div class="input-group mt-2 mb-2 ">
|
||||
<span class="input-group-prepend">
|
||||
<div class="py-2 px-1">
|
||||
<strong>www.testemich.jetzt/ </strong>
|
||||
<strong>{{ config('app.promo_domain') }} / </strong>
|
||||
</div>
|
||||
</span>
|
||||
{{ Form::text('user_promotion_url', $user_promotion->url, ['placeholder' => 'z.B. "thomas" oder "dani21" o.ä.', 'class' => 'form-control' . ($errors->has('user_promotion_url') ? ' is-invalid' : ''), 'id' => 'user_promotion_url', 'required' => true]) }}
|
||||
|
|
@ -142,10 +142,12 @@
|
|||
<label class="form-label">Vorschau Domain / URL für Deine Promotion</label>
|
||||
<div class="input-group">
|
||||
<span class="input-group-prepend">
|
||||
<button class="btn btn-sm btn-secondary" type="button" title="Kopiert!" data-clipboard-demo data-clipboard-target="#promotion_link"><i class="ion ion-ios-copy"></i> Domain kopieren</button>
|
||||
<button class="btn btn-sm btn-secondary" type="button" title="Kopiert!" data-clipboard-demo data-clipboard-target="#preview_user_promotion_url"><i class="ion ion-ios-copy"></i> Domain kopieren</button>
|
||||
</span>
|
||||
{{ Form::text('preview_user_promotion_url', $user_promotion->getUrlPreview(), ['placeholder' => __('Vorschau Shop-Internet Adresse'), 'class' => 'form-control', 'id' => 'preview_user_promotion_url', 'readonly']) }}
|
||||
</div>
|
||||
<p class="mt-2 mb-0"><i>Wird die Domain für die Promotion geändert, ist die aktuelle Domain ab sofort nicht mehr aufrufbar, bitte denkt daran Eure Kunden zu informieren.</i></p>
|
||||
|
||||
</div>
|
||||
<div class="form-group col-sm-2 mb-0">
|
||||
<label class="form-label"> </label>
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
@section('content')
|
||||
<h4 class="font-weight-bold py-2 mb-2">
|
||||
<a href="{{route('user_sales_orders')}}" class="btn btn-sm btn-default float-right">zurück</a>
|
||||
<a href="{{route('user_sales')}}" 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_sales_orders')}}" class="btn btn-sm btn-default mt-2 float-right">zurück</a>
|
||||
<a href="{{route('user_sales')}}" class="btn btn-sm btn-default mt-2 float-right">zurück</a>
|
||||
@endsection
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
$('.datatable-customers').dataTable({
|
||||
"processing": true,
|
||||
"serverSide": true,
|
||||
"ajax": '{!! route('user_sales_orders_datatable') !!}',
|
||||
"ajax": '{!! route('user_sales_datatable') !!}',
|
||||
"order": [[0, "desc" ]],
|
||||
"columns": [
|
||||
{ data: 'id', searchable: false },
|
||||
|
|
@ -2,11 +2,38 @@
|
|||
|
||||
@section('content')
|
||||
|
||||
<h4 class="font-weight-bold py-2 mb-2">
|
||||
<a href="{{route('admin_customers')}}" class="btn btn-sm btn-default float-right">zurück</a>
|
||||
{{ __('Kunden Details') }} <span class="text-muted">#{{$shopping_user->id}}</span>
|
||||
</h4>
|
||||
@include('admin.customer._detail')
|
||||
<a href="{{route('admin_customers')}}" class="btn btn-sm btn-default mt-2 float-right">zurück</a>
|
||||
@if ($errors->any())
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<div class="alert alert-danger">
|
||||
<ul>
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{{ $error }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@endsection
|
||||
<h4 class="font-weight-bold py-2 mb-2">
|
||||
<div>{{ __('navigation.my_shop') }} / {{ __('navigation.settings') }}</div>
|
||||
</h4>
|
||||
|
||||
{!! Form::open(['url' => route('user_shop_store'), 'class' => 'form-horizontal', 'id'=>"user-shop-form-validations"]) !!}
|
||||
|
||||
@include('user.shop.form')
|
||||
|
||||
<div class="text-left mt-0 mb-2">
|
||||
<button type="submit" class="btn btn-submit" name="action" value="save-user-shop">Shop {{ __('navigation.settings') }} {{ __('save') }}</button>
|
||||
</div>
|
||||
|
||||
{!! Form::close() !!}
|
||||
|
||||
<script>
|
||||
$( document ).ready(function() {
|
||||
|
||||
});
|
||||
</script>
|
||||
|
||||
@endsection
|
||||
|
|
|
|||
292
resources/views/user/shop/form.blade.php
Normal file
292
resources/views/user/shop/form.blade.php
Normal file
|
|
@ -0,0 +1,292 @@
|
|||
|
||||
<style>
|
||||
|
||||
table.table-product,
|
||||
table.table-product tr td,
|
||||
table.table-product tr th {
|
||||
border: none;
|
||||
}
|
||||
|
||||
table.table-product tr.border-top td {
|
||||
border-top: 1px solid #b8b8b9;
|
||||
}
|
||||
|
||||
table.table-product tr.border-bottom td,
|
||||
table.table-product tr.border-bottom th {
|
||||
border-bottom: 1px solid #b8b8b9;
|
||||
}
|
||||
|
||||
|
||||
.btn-md-extra {
|
||||
padding: 0.3rem 0.6rem;
|
||||
font-size: 0.8rem;
|
||||
line-height: 1.5;
|
||||
border-radius: 0.25rem;
|
||||
}
|
||||
|
||||
.md-btn-extra {
|
||||
width: calc(1.7rem + 2px) !important;
|
||||
line-height: 1.5rem;
|
||||
}
|
||||
|
||||
.form-control.input-extra {
|
||||
padding: 0.28rem 0.6rem;
|
||||
font-size: 0.8rem;
|
||||
font-weight: 500;
|
||||
min-height: calc(1.8rem + 2px);
|
||||
height: calc(1.8rem + 2px);
|
||||
width: 44px;
|
||||
}
|
||||
|
||||
.input-group-min-w {
|
||||
min-width: 102px;
|
||||
}
|
||||
|
||||
.img-extra {
|
||||
min-width: 55px;
|
||||
max-height: 160px;
|
||||
}
|
||||
|
||||
@media (max-width: 767px) {
|
||||
.default-style:not([dir=rtl]) div.card-datatable table.dataTable thead th:first-child, .default-style:not([dir=rtl]) div.card-datatable table.dataTable tbody td:first-child, .default-style:not([dir=rtl]) div.card-datatable table.dataTable tfoot th:first-child {
|
||||
padding-left: 0.6rem !important;
|
||||
}
|
||||
|
||||
.img-extra {
|
||||
min-width: 35px;
|
||||
max-height: 160px;
|
||||
}
|
||||
}
|
||||
|
||||
</style>
|
||||
<div class="card mb-2">
|
||||
<h5 class="card-header">
|
||||
Deine Shop Domain
|
||||
</h5>
|
||||
<div class="card-body">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-8">
|
||||
<div class="input-group mt-2 mb-2 ">
|
||||
<span class="input-group-prepend">
|
||||
<div class="py-2 px-1">
|
||||
<strong>{{ config('app.shop_domain') }} </strong>
|
||||
</div>
|
||||
</span>
|
||||
{{ Form::text('user_shop_url', $user_shop->url, ['placeholder' => 'z.B. "thomas" oder "dani21" o.ä.', 'class' => 'form-control' . ($errors->has('user_shop_url') ? ' is-invalid' : ''), 'id' => 'user_shop_url', 'required' => true]) }}
|
||||
</div>
|
||||
@if ($errors->has('user_shop_url'))
|
||||
<span class="invalid-feedback" style="display: inline-block;">
|
||||
<strong>{{ $errors->first('user_shop_url') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
<div class="form-group col-md-4">
|
||||
<div class="px-3 py-0 py-md-3">
|
||||
<div class="badge badge-success" style="display: none" id="user_shop_url_success"><i
|
||||
class="fa fa-check"></i> ist noch frei</div>
|
||||
<div class="badge badge-danger" style="display: none" id="user_shop_url_error"><i
|
||||
class="fa fa-times"></i> nicht verfügbar/Fehler</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-sm-10 mb-0">
|
||||
<label class="form-label">Vorschau Domain / URL für Deinen Shop</label>
|
||||
<div class="input-group">
|
||||
<span class="input-group-prepend">
|
||||
<button class="btn btn-sm btn-secondary" type="button" title="Kopiert!" data-clipboard-demo data-clipboard-target="#preview_user_shop_url"><i class="ion ion-ios-copy"></i> Domain kopieren</button>
|
||||
</span>
|
||||
{{ Form::text('preview_user_shop_url', $user_shop->getUrlPreview(), ['placeholder' => __('Vorschau Shop-Internet Adresse'), 'class' => 'form-control', 'id' => 'preview_user_shop_url', 'readonly']) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-sm-2 mb-0">
|
||||
<label class="form-label"> </label>
|
||||
<div>
|
||||
<a class="btn btn-sm btn-outline-primary mt-1" href="{{ $user_shop->getUrlPreview() }}" target="_blank"><i class="ion ion-ios-share-alt"></i></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<p class="mt-2 mb-0"><i>Wird die Domain für den Shop geändert, ist die aktuelle Domain ab sofort nicht mehr aufrufbar, bitte denke daran Deine Kunden zu informieren.</i></p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="card mb-2">
|
||||
<h5 class="card-header">
|
||||
Deine Shop Inhalte
|
||||
</h5>
|
||||
<div class="card-body">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12 {{ $errors->has('name') ? 'has-error' : '' }}">
|
||||
<label class="custom-control custom-checkbox float-right">
|
||||
{!! Form::checkbox('active', 1, $user_shop->active, ['class' => 'custom-control-input']) !!}
|
||||
<span class="custom-control-label">{{ __('Shop aktiv') }}</span>
|
||||
</label>
|
||||
<label class="form-label" for="name">Dein angezeigter Name (erscheint auf Deiner Shop Seite) max. 50 Zeichen*</label>
|
||||
{{ Form::text('name', $user_shop->name, ['placeholder' => __('Shop Titel'), 'class' => 'form-control bootstrap-maxlength', 'maxlength'=>50, 'id' => 'name', 'required' => true]) }}
|
||||
@if ($errors->has('name'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('name') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
{{--
|
||||
<div class="form-group col-12">
|
||||
<label class="form-label" for="description">Kurzbeschreibung Deines Shops (erscheint auf Deiner Shop Seite) max. 600 Zeichen</label>
|
||||
{{ Form::textarea('description', $user_shop->description, ['placeholder' => __('Kurzbeschreibung'), 'class' => 'form-control bootstrap-maxlength text-autosize', 'maxlength'=>600, 'rows' => 1, 'id' => 'description']) }}
|
||||
</div>
|
||||
--}}
|
||||
|
||||
<div class="form-group col-12">
|
||||
<label class="form-label" for="about_you">Kurzer Text über Dich (erscheint auf Deiner Shop Seite) max. 600 Zeichen</label>
|
||||
{{ Form::textarea('about_you', $user_shop->about_you, ['placeholder' => __('Über dich'), 'class' => 'form-control bootstrap-maxlength text-autosize', 'maxlength'=>600, 'rows' => 1, 'id' => 'about_you']) }}
|
||||
<p class="mt-2 mb-0"><i>Einen kurzen Text über Dich kannst Du in <a class="btn btn-xs btn-outline-primary" href="{{ route('user_profile') }}">"Mein Konto - Mein Profil"</a> hinterlegen, dieser wird automatisch hier eingefügt, kann aber abgeändert werden.</i></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-row">
|
||||
{{-- <div class="form-group col-sm-12">
|
||||
<hr>
|
||||
<label class="custom-control custom-checkbox mt-2">
|
||||
{!! Form::checkbox('pick_up', 1, $user_shop->pick_up, ['class' => 'custom-control-input']) !!}
|
||||
<span class="custom-control-label">Kunden können bei mir persönlich abholen.</span>
|
||||
</label>
|
||||
</div>
|
||||
--}}
|
||||
<div class="from-group mb-2 col-md-6">
|
||||
<label class="form-label">Deine Kontaktadresse</label>
|
||||
{{ Form::textarea('user_address', $user_shop->user_address, ['class' => 'form-control', 'rows' => 5, 'id' => 'user_address']) }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script type="application/javascript">
|
||||
|
||||
|
||||
|
||||
$(document).ready(function() {
|
||||
|
||||
var clipboardDemos = new ClipboardJS('[data-clipboard-demo]');
|
||||
clipboardDemos.on('success', function (e) {
|
||||
e.clearSelection();
|
||||
$(e.trigger).tooltip('enable').tooltip('show');
|
||||
});
|
||||
clipboardDemos.on('error', function (e) {
|
||||
console.error('Action:', e.action);
|
||||
console.error('Trigger:', e.trigger);
|
||||
});
|
||||
|
||||
$('button[data-clipboard-demo]').on('mouseout', function () {
|
||||
$(this).tooltip('disable');
|
||||
});
|
||||
$.extend($.validator.messages, {
|
||||
required: "Dieses Feld ist ein Pflichtfeld.",
|
||||
maxlength: $.validator.format("Gib bitte maximal {0} Zeichen ein."),
|
||||
minlength: $.validator.format("Gib bitte mindestens {0} Zeichen ein."),
|
||||
rangelength: $.validator.format("Gib bitte mindestens {0} und maximal {1} Zeichen ein."),
|
||||
email: "Gib bitte eine gültige E-Mail Adresse ein.",
|
||||
url: "Gib bitte eine gültige URL ein.",
|
||||
date: "Bitte gib ein gültiges Datum ein.",
|
||||
number: "Gib bitte eine Nummer ein.",
|
||||
digits: "Gib bitte nur Ziffern ein.",
|
||||
equalTo: "Bitte denselben Wert wiederholen.",
|
||||
range: $.validator.format("Gib bitte einen Wert zwischen {0} und {1} ein."),
|
||||
max: $.validator.format("Gib bitte einen Wert kleiner oder gleich {0} ein."),
|
||||
min: $.validator.format("Gib bitte einen Wert größer oder gleich {0} ein."),
|
||||
creditcard: "Gib bitte eine gültige Kreditkarten-Nummer ein.",
|
||||
|
||||
});
|
||||
// Set up validator
|
||||
var message = 'Default error message';
|
||||
$('#user-shop-form-validations').validate({
|
||||
rules: {
|
||||
'user_shop_url': {
|
||||
required: true,
|
||||
remote: {
|
||||
url: "{{ route('user_shop_load') }}",
|
||||
type: "post",
|
||||
data: {
|
||||
user_shop_url: function() {
|
||||
return $(
|
||||
'#user-shop-form-validations :input[name="user_shop_url"]'
|
||||
).val();
|
||||
},
|
||||
action: 'validate_url',
|
||||
usid: '{{ $user_shop->id }}',
|
||||
},
|
||||
encode: true,
|
||||
headers: {
|
||||
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
|
||||
},
|
||||
dataFilter: function(response) {
|
||||
response = $.parseJSON(response);
|
||||
console.log(response);
|
||||
$('#user_shop_url_success').hide();
|
||||
$('#user_shop_url_error').hide();
|
||||
if (response.success === true) {
|
||||
$('#user_shop_url_success').show();
|
||||
$('#preview_user_shop_url').val(response
|
||||
.preview_user_shop_url);
|
||||
return true;
|
||||
} else {
|
||||
$('#user_shop_url_error').show();
|
||||
message = response.errors.user_shop_url;
|
||||
console.log(message);
|
||||
|
||||
$('#preview_user_shop_url').val('');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
errorPlacement: function errorPlacement(error, element) {
|
||||
//console.log(error);
|
||||
$(element).parents('.form-group').find('.input-group').after(
|
||||
error.addClass('invalid-feedback d-block font-weight-bold')
|
||||
)
|
||||
},
|
||||
highlight: function(element) {
|
||||
if($(element).attr('required')){
|
||||
$(element).parent().find('button').removeClass('btn-success');
|
||||
$(element).parent().find('button').addClass('btn-danger');
|
||||
$(element).parent().find('button i').removeClass('fa-check');
|
||||
$(element).parent().find('button i').addClass('fa-times');
|
||||
$(element).removeClass('is-valid');
|
||||
$(element).addClass('is-invalid');
|
||||
}
|
||||
},
|
||||
unhighlight: function(element) {
|
||||
if($(element).attr('required')){
|
||||
$(element).removeClass('is-invalid');
|
||||
$(element).addClass('is-valid');
|
||||
$(element).parent().find('button').removeClass('btn-danger');
|
||||
$(element).parent().find('button').addClass('btn-success');
|
||||
$(element).parent().find('button i').removeClass('fa-times');
|
||||
$(element).parent().find('button i').addClass('fa-check');
|
||||
$(element).parents('.form-group').find('.is-invalid').removeClass('is-invalid');
|
||||
}
|
||||
},
|
||||
messages: {
|
||||
required: "{{ __('This field is required.') }}",
|
||||
user_shop_url: {
|
||||
email: "{{ __('Please enter a valid email address.') }}",
|
||||
remote: function() {
|
||||
return message;
|
||||
}
|
||||
},
|
||||
},
|
||||
onkeyup: function(element) {
|
||||
$(element).valid()
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
@section('scripts')
|
||||
@endsection
|
||||
|
|
@ -139,21 +139,21 @@
|
|||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-4">
|
||||
<label for="birthday_day" class="form-label">{{ __('Geburtsdatum') }}*</label>
|
||||
<select class="selectpicker" name="birthday_day" id="birthday_day" data-style="btn-light" data-live-search="false" required>
|
||||
<label for="birthday_day" class="form-label">{{ __('Geburtsdatum') }}</label>
|
||||
<select class="selectpicker" name="birthday_day" id="birthday_day" data-style="btn-light" data-live-search="false">
|
||||
{!! HTMLHelper::getCustomListOf('day', $user->getBirthdayFormat('d')) !!}
|
||||
</select>
|
||||
|
||||
</div>
|
||||
<div class="form-group col-md-4">
|
||||
<label for="birthday_month" class="form-label"> </label>
|
||||
<select class="selectpicker" name="birthday_month" id="birthday_month" data-style="btn-light" data-live-search="false" required>
|
||||
<select class="selectpicker" name="birthday_month" id="birthday_month" data-style="btn-light" data-live-search="false">
|
||||
{!! HTMLHelper::getCustomListOf('month', $user->getBirthdayFormat('m')) !!}
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group col-md-4">
|
||||
<label for="birthday_year" class="form-label"> </label>
|
||||
<select class="selectpicker" name="birthday_year" id="birthday_year" data-style="btn-light" data-live-search="false" required>
|
||||
<select class="selectpicker" name="birthday_year" id="birthday_year" data-style="btn-light" data-live-search="false">
|
||||
{!! HTMLHelper::getCustomListOf('year', $user->getBirthdayFormat('Y')) !!}
|
||||
</select>
|
||||
|
||||
|
|
@ -319,6 +319,14 @@
|
|||
</div>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<hr>
|
||||
<button type="submit" class=" float-right btn btn-sm btn-submit">{{ __('save') }}</button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -364,19 +372,26 @@
|
|||
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<hr>
|
||||
<button type="submit" class=" float-right btn btn-sm btn-submit">{{ __('save') }}</button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="card mb-4">
|
||||
<h5 class="card-header">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
Steuerdaten
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</h5>
|
||||
<div class="card-body">
|
||||
<div class="card-body" id="user-vat-validation">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<label class="form-label" for="taxable_sales">{{ __('Umsatzsteuerpflicht') }} @if($user->account->getCountryAttrAs('taxable_sales'))* @endif</label>
|
||||
|
|
@ -385,27 +400,89 @@
|
|||
</select>
|
||||
<p class="badge">Wähle Kleinunternehmer, wenn Du nicht mehr als 22.000 EUR Umsatz pro Jahr mit Deinem Gewerbe erwirtschaftest.</p>
|
||||
</div>
|
||||
<div class="form-group col-md-6">
|
||||
|
||||
<div class="form-group col-md-6 {{ $errors->has('tax_number') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="tax_number">{{ __('Steuernummer') }} @if($user->account->getCountryAttrAs('tax_number'))* @endif</label>
|
||||
{{ Form::text('tax_number', $user->account->tax_number, array('placeholder'=>__('Steuernummer'), 'class'=>'form-control', 'id'=>'tax_number', $user->account->getCountryAttrAs('tax_number','required'))) }}
|
||||
@if ($errors->has('tax_number'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('tax_number') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
@if($user->account->country_id && $user->account->country->eu_country)
|
||||
<div class="col-sm-12">
|
||||
<hr>
|
||||
</div>
|
||||
<div class="form-group col-md-6 {{ $errors->has('tax_identification_number') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="tax_identification_number">{{ __('USt-ID Nummer') }} @if($user->account->getCountryAttrAs('tax_id_number'))* @endif</label>
|
||||
{{ Form::text('tax_identification_number', $user->account-> tax_identification_number, array('placeholder'=>__('USt-ID Nummer'), 'class'=>'form-control', 'id'=>'tax_identification_number', $user->account->getCountryAttrAs('tax_id_number','required'), 'readonly')) }}
|
||||
@if ($errors->has('tax_identification_number'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('tax_identification_number') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
@if($user->account->reverse_charge_valid)
|
||||
<div class="mt-3">
|
||||
<div class="badge badge-primary">Aktiv seit: {{ $user->account->getReverseChargeValidFormat() }}</div>
|
||||
<button type="submit" class="btn btn-xs btn-default" name="action" value="reverse_charge_delete"><i class="fa fa-trash"></i> {{ __('account.reverse_charge_action_1') }}</button>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
{{-- ($user->account->reverse_charge_valid ? 'readonly' : '') --}}
|
||||
@if(!$user->account->reverse_charge_valid)
|
||||
<button type="button" class="btn btn-primary btn-sm mt-3" data-toggle="modal" data-target="#modal-user-vat-validation">
|
||||
<span class="ion ion-md-add"></span> Neue USt-ID Nummer anlegen und Reverse Charge Verfahren aktivieren
|
||||
</button>
|
||||
@endif
|
||||
</div>
|
||||
@else
|
||||
<div class="form-group col-md-6">
|
||||
<label class="form-label" for="tax_identification_number">{{ __('USt-ID Nummer') }} @if($user->account->getCountryAttrAs('tax_id_number'))* @endif</label>
|
||||
{{ Form::text('tax_identification_number', $user->account->tax_identification_number, array('placeholder'=>__('USt-ID Nummer'), 'class'=>'form-control', 'id'=>'tax_identification_number', $user->account->getCountryAttrAs('tax_id_number','required'))) }}
|
||||
{{ Form::text('tax_identification_number', $user->account-> tax_identification_number, array('placeholder'=>__('USt-ID Nummer'), 'class'=>'form-control', 'id'=>'tax_identification_number', $user->account->getCountryAttrAs('tax_id_number','required'))) }}
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="form-group col-md-12">
|
||||
@if($errors->has('tax_number') || $errors->has('tax_identification_number'))
|
||||
<div class="alert badge-danger block p-2">Fehler: Bitte {{ __('Steuernummer') }} und/oder {{ __('USt-ID Nummer') }} angeben!*</div>
|
||||
|
||||
@if($errors->has('tax_identification_number_validated'))
|
||||
<div class="alert badge-danger block p-2">
|
||||
<ul>
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{{ $error }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
@else
|
||||
<div class="badge badge-default">Hinweis: Bitte {{ __('Steuernummer') }} und/oder {{ __('USt-ID Nummer') }} angeben!*</div>
|
||||
@if(!$user->account-> tax_identification_number && !$user->account->tax_number)
|
||||
<div class="badge badge-default">Hinweis: Bitte {{ __('Steuernummer') }} und/oder {{ __('USt-ID Nummer') }} angeben!*</div>
|
||||
@endif
|
||||
{{-- @if($errors->has('tax_number') || $errors->has('tax_identification_number'))
|
||||
<div class="alert badge-danger block p-2">Fehler: Bitte {{ __('Steuernummer') }} und/oder {{ __('USt-ID Nummer') }} angeben!*</div>
|
||||
@else
|
||||
<div class="badge badge-default">Hinweis: Bitte {{ __('Steuernummer') }} und/oder {{ __('USt-ID Nummer') }} angeben!*</div>
|
||||
@endif
|
||||
--}}
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<hr>
|
||||
<button type="submit" class=" float-right btn btn-sm btn-submit">{{ __('save') }}</button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<script type="application/javascript">
|
||||
|
||||
$( document ).ready(function() {
|
||||
|
|
|
|||
|
|
@ -119,6 +119,40 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Modal template -->
|
||||
<div class="modal fade" id="modal-user-vat-validation">
|
||||
<div class="modal-dialog">
|
||||
{!! Form::open(['url' => route('wizard_store_register', [1]), 'class' => 'modal-content']) !!}
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">{{ __('account.new_vat_validate') }}</span></h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-12">
|
||||
<p>{{ __('account.reverse_charge_copy_1') }}</p>
|
||||
<p>{{ __('account.reverse_charge_note_1') }}</p>
|
||||
</div>
|
||||
<div class="form-group col-sm-12 {{ $errors->has('reverse_charge') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="tax_identification_number">{{ __('account.VAT_ID_number') }} *</label>
|
||||
{{ Form::text('tax_identification_number', $user->account-> tax_identification_number, array('placeholder'=>__('account.VAT_ID_number'), 'class'=>'form-control', 'id'=>'tax_identification_number', 'required'=>true)) }}
|
||||
|
||||
@if ($errors->has('reverse_charge'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('reverse_charge') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">{{__('close')}}</button>
|
||||
<button type="submit" class="btn btn-primary" name="action" value="reverse_charge_validate">{{ __('account.btn_vat_validate') }}n</button>
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
</div>
|
||||
</div>
|
||||
<link rel="stylesheet" href="{{ mix('/vendor/libs/smartwizard/smartwizard.css') }}">
|
||||
<script src="{{ mix('/vendor/libs/smartwizard/smartwizard.js') }}"></script>
|
||||
<script type="text/javascript">
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
<a href="#smartwizard-3-step-3" class="mb-3">
|
||||
<span class="sw-done-icon ion ion-md-checkmark"></span>
|
||||
<span class="sw-number">3</span>
|
||||
Ausweis
|
||||
Gewerbeschein
|
||||
<div class="text-muted small">hochladen</div>
|
||||
|
||||
</a>
|
||||
|
|
@ -52,15 +52,6 @@
|
|||
<a href="#smartwizard-3-step-4" class="mb-3">
|
||||
<span class="sw-done-icon ion ion-md-checkmark"></span>
|
||||
<span class="sw-number">4</span>
|
||||
Gewerbeschein
|
||||
<div class="text-muted small">hochladen</div>
|
||||
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#smartwizard-3-step-5" class="mb-3">
|
||||
<span class="sw-done-icon ion ion-md-checkmark"></span>
|
||||
<span class="sw-number">5</span>
|
||||
Registrierung
|
||||
<div class="text-muted small">abschließen</div>
|
||||
</a>
|
||||
|
|
@ -89,6 +80,8 @@
|
|||
{!! Form::close() !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{--
|
||||
<div id="smartwizard-3-step-3" class="card animated fadeIn">
|
||||
<div class="card-body">
|
||||
<div class="card mb-4">
|
||||
|
|
@ -143,8 +136,9 @@
|
|||
{!! Form::close() !!}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="smartwizard-3-step-4" class="card animated fadeIn">
|
||||
</div>
|
||||
--}}
|
||||
<div id="smartwizard-3-step-3" class="card animated fadeIn">
|
||||
<div class="card-body">
|
||||
<div class="card mb-4">
|
||||
<h5 class="card-header">
|
||||
|
|
@ -154,7 +148,7 @@
|
|||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
<div class="mt-4">
|
||||
{!! Form::open([ 'url' => route('wizard_store_register', [3]), 'method' => 'post', 'files' => true, 'enctype' => 'multipart/form-data', 'class' => 'dropzone', 'id' => 'businesslDropzone' ]) !!}
|
||||
{!! Form::open([ 'url' => route('wizard_store_register', [2]), 'method' => 'post', 'files' => true, 'enctype' => 'multipart/form-data', 'class' => 'dropzone', 'id' => 'businesslDropzone' ]) !!}
|
||||
<div class="fallback">
|
||||
<input name="file" type="file" multiple>
|
||||
</div>
|
||||
|
|
@ -191,7 +185,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{!! Form::open(['url' => route('wizard_store_register', [3])]) !!}
|
||||
{!! Form::open(['url' => route('wizard_store_register', [2])]) !!}
|
||||
@php($business_license_choose = $user->account->getNotice('business_license'))
|
||||
<div class="card-body pt-0">
|
||||
<div class="row">
|
||||
|
|
@ -231,10 +225,10 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="smartwizard-3-step-5" class="card animated fadeIn">
|
||||
<div id="smartwizard-3-step-4" class="card animated fadeIn">
|
||||
<div class="card-body">
|
||||
<h4>{{ trans('register.wizard_finish_hl') }}</h4>
|
||||
{!! Form::open(['url' => route('wizard_store_register', [4])]) !!}
|
||||
{!! Form::open(['url' => route('wizard_store_register', [3])]) !!}
|
||||
@include('user.wizard._change')
|
||||
<p>{{ trans('register.wizard_finish_line_1') }}.</p>
|
||||
<button type="submit" name="submit" value="do" class="btn btn-primary">{{ __('Registrierung abschließen') }}</button>
|
||||
|
|
@ -243,6 +237,49 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Modal template -->
|
||||
<div class="modal fade" id="modal-user-vat-validation">
|
||||
<div class="modal-dialog">
|
||||
{!! Form::open(['url' => route('wizard_store_register', [1]), 'class' => 'modal-content']) !!}
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">{{ __('account.new_vat_validate') }}</span></h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-12">
|
||||
<p>{{ __('account.reverse_charge_copy_1') }}</p>
|
||||
<p>{{ __('account.reverse_charge_note_1') }}</p>
|
||||
</div>
|
||||
<div class="form-group col-sm-12 {{ $errors->has('reverse_charge') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="tax_identification_number">{{ __('account.VAT_ID_number') }} *</label>
|
||||
{{ Form::text('tax_identification_number', $user->account-> tax_identification_number, array('placeholder'=>__('account.VAT_ID_number'), 'class'=>'form-control', 'id'=>'tax_identification_number', 'required'=>true)) }}
|
||||
|
||||
@if ($errors->has('reverse_charge'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('reverse_charge') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">{{__('close')}}</button>
|
||||
<button type="submit" class="btn btn-primary" name="action" value="reverse_charge_validate">{{ __('account.btn_vat_validate') }}n</button>
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="hidden">
|
||||
{!! Form::open(['url' => route('wizard_store_register', [7]), 'id' => 'user-change-country']) !!}
|
||||
<input type="hidden" name="user_country_id" id="user_country_id" value="">
|
||||
{!! Form::close() !!}
|
||||
</div>
|
||||
|
||||
@endsection
|
||||
|
||||
@section('scripts')
|
||||
|
|
@ -261,6 +298,12 @@
|
|||
showPreviousButton: false,
|
||||
}
|
||||
});
|
||||
|
||||
$('#lead-form-validation #country_id').on('change', function(e) {
|
||||
var $country_id = $(this).val();
|
||||
$('#user-change-country #user_country_id').val($country_id);
|
||||
$('#user-change-country').submit();
|
||||
});
|
||||
});
|
||||
|
||||
var real_dropzone = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue