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

08 2024

Browse source
This commit is contained in:
Kevin Adametz 2024-08-05 12:05:24 +02:00
parent 04d677d37a
commit bfa3bb1df4
1191 changed files with 637397 additions and 10619 deletions
Download patch file Download diff file Expand all files Collapse all files

468
resources/views/user/_user_form.blade.php
View file

@ -1,468 +0,0 @@
<div class="card mb-4">
<h5 class="card-header">
{{ __('Rechnungsdaten') }}
<span class="text-tiny float-right">* {{trans('register.required_fields')}}</span>
</h5>
<div class="card-body">
<input type="hidden" name="user_id" value="{{$user->id}}">
<div class="form-row">
<div class="form-group col-md-12">
<label for="company" class="form-label">{{ __('Company name') }} (optional)</label>
{{ Form::text('company', $user->account->company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'company', 'tabindex' => 1)) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-md-2 {{ $errors->has('salutation') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Salutation') }}*</label>
<select class="selectpicker" data-style="btn-light" name="salutation" id="salutation" required tabindex="2">
{!! HTMLHelper::getSalutation($user->account->salutation) !!}
</select>
@if ($errors->has('salutation'))
<span class="help-block">
<strong>{{ $errors->first('salutation') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-5 {{ $errors->has('first_name') ? 'has-error' : '' }}">
<label class="form-label" for="first_name">{{ __('First name') }}*</label>
{{ Form::text('first_name', $user->account->first_name, array('placeholder'=>__('First name'), 'class'=>'form-control', 'id'=>'first_name', 'required'=>true, 'tabindex' => 4)) }}
@if ($errors->has('first_name'))
<span class="help-block">
<strong>{{ $errors->first('first_name') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-5 {{ $errors->has('last_name') ? 'has-error' : '' }}">
<label class="form-label" for="last_name">{{ __('Last name') }}*</label>
{{ Form::text('last_name', $user->account->last_name, array('placeholder'=>__('Last name'), 'class'=>'form-control', 'id'=>'last_name', 'required'=>true, 'tabindex' => 5)) }}
@if ($errors->has('last_name'))
<span class="help-block">
<strong>{{ $errors->first('last_name') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-group {{ $errors->has('address') ? 'has-error' : '' }}">
<label class="form-label" for="address">{{ __('Street') }} / {{ __('House number') }}*</label>
{{ Form::text('address', $user->account->address, array('placeholder'=>__('Street'), 'class'=>'form-control', 'required'=>true, 'id'=>'address', 'tabindex' => 6)) }}
@if ($errors->has('address'))
<span class="help-block">
<strong>{{ $errors->first('address') }}</strong>
</span>
@endif
</div>
<div class="form-row">
<div class="form-group col-md-7 {{ $errors->has('address_2') ? 'has-error' : '' }}">
<label class="form-label" for="address_2">{{ __('Wohnung / Gebäude (optional)') }}</label>
{{ 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')) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-md-2 {{ $errors->has('zipcode') ? 'has-error' : '' }}">
<label class="form-label" for="zipcode">{{ __('Postcode') }}*</label>
{{ Form::text('zipcode', $user->account->zipcode, array('placeholder'=>__('Postcode'), 'class'=>'form-control', 'required'=>true, 'id'=>'zipcode', 'tabindex' => 7)) }}
@if ($errors->has('zipcode'))
<span class="help-block">
<strong>{{ $errors->first('zipcode') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-6 {{ $errors->has('city') ? 'has-error' : '' }}">
<label class="form-label" for="city">{{ __('City') }}*</label>
{{ Form::text('city', $user->account->city, array('placeholder'=>__('City'), 'class'=>'form-control', 'required'=>true, 'id'=>'city', 'tabindex' => 8)) }}
@if ($errors->has('city'))
<span class="help-block">
<strong>{{ $errors->first('city') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-4 {{ $errors->has('country_id') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Country') }}*</label>
<select class="selectpicker" name="country_id" id="country_id" data-style="btn-light" data-live-search="true" required tabindex="9">
{!! HTMLHelper::getContriesWithMore($user->account->country_id) !!}
</select>
@if ($errors->has('country_id'))
<span class="help-block">
<strong>{{ $errors->first('country_id') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<label class="form-label" for="pre_phone_id">{{ __('Country code') }}</label>
<select class="selectpicker" name="pre_phone_id" id="pre_phone_id" data-style="btn-light" data-live-search="true" tabindex="10">
{!! HTMLHelper::getContriesCodes($user->account->pre_phone_id) !!}
</select>
</div>
<div class="form-group col-md-8 {{ $errors->has('phone') ? 'has-error' : '' }}">
<label class="form-label" for="phone">{{ __('Phone') }}</label>
{{ Form::text('phone', $user->account->phone, array('placeholder'=>__('Phone'), 'class'=>'form-control', 'id'=>'phone', 'tabindex' => 11)) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<label class="form-label" for="pre_mobil_id">{{ __('Country code') }}</label>
<select class="selectpicker" name="pre_mobil_id" id="pre_mobil_id" data-style="btn-light" data-live-search="true" tabindex="12">
{!! HTMLHelper::getContriesCodes($user->account->pre_mobil_id) !!}
</select>
</div>
<div class="form-group col-md-8 {{ $errors->has('mobil') ? 'has-error' : '' }}">
<label class="form-label" for="mobil">{{ __('Mobile Phone') }}</label>
{{ Form::text('mobil', $user->account->mobil, array('placeholder'=>__('Mobile Phone'), 'class'=>'form-control', 'id'=>'mobil', 'tabindex' => 13)) }}
</div>
<div class="form-group col-md-12">
@if($errors->has('phone') || $errors->has('mobil'))
<div class="alert badge-danger block p-2">Bitte {{ __('Phone') }} und/oder {{ __('Mobile Phone') }} angeben!*</div>
@else
<div class="badge badge-warning">Bitte {{ __('Phone') }} und/oder {{ __('Mobile Phone') }} angeben!*</div>
@endif
</div>
</div>
@if(!isset($step))
<hr>
@if($user->email)
<div class="form-row">
<div class="form-group col-md-6">
<label class="form-label" for="email">{{ __('E-Mail Address') }}*</label>
{{ Form::text('email', $user->email, array('placeholder'=>'E-Mail', 'class'=>'form-control', 'id'=>'email', 'readonly'=>true, 'tabindex' => 14)) }}
</div>
<div class="form-group col-md-6">
<label class="form-label" for="email-confirm">{{ __('Confirm E-Mail') }}</label>
{{ Form::text('email-confirm', $user->email, array('placeholder'=>__('Confirm E-Mail'), 'class'=>'form-control', 'id'=>'email-confirm', 'readonly'=>true, 'tabindex' => 15)) }}
</div>
</div>
@if(isset($can_change_mail))
@if(count($user->user_update_email) > 0)
<p class="badge badge-primary" style=" color:#fff;">{{ $user->user_update_email->first()->email }} {{__('waiting for activation since')}} | {{ $user->user_update_email->first()->created_at->format('d.m.Y H:i') }}</p><br>
@endif
<a href="{{ route('admin_lead_change_mail', [$user->id]) }}" class="btn btn-default btn-sm"> {{ __('Contact') }} {{__('Change E-Mail')}}</a>
@else
<a href="{{ route('user_update_email', [$user->id]) }}" class="btn btn-default btn-sm">{{__('Change E-Mail')}}</a>
@endif
@else
<div class="form-row">
<div class="form-group col-md-6">
<label class="form-label" for="email">{{ __('E-Mail Address') }}*</label>
{{ Form::text('email', $user->email, array('placeholder'=>'E-Mail', 'class'=>'form-control', 'id'=>'email', 'tabindex' => 14)) }}
</div>
<div class="form-group col-md-6">
<label class="form-label" for="email-confirm">{{ __('Confirm E-Mail') }}</label>
{{ Form::text('email-confirm', $user->email, array('placeholder'=>__('Confirm E-Mail'), 'class'=>'form-control', 'id'=>'email-confirm', 'tabindex' => 15)) }}
</div>
</div>
@endif
@endif
</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">{{ __('Umsatzsteuerpflicht') }} @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">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">
<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'))) }}
</div>
<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'))) }}
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="custom-control custom-checkbox m-0">
<input type="checkbox" class="custom-control-input" name="same_as_billing" id="same_as_billing" @if($user->account->same_as_billing) checked="checked" @endif>
<span class="custom-control-label">{{__('Versand an die gleiche Adresse')}}</span>
</label>
</div>
<div class="card mb-4" id="show_shipping_address" style="@if($user->account->same_as_billing) display:none @endif">
<h5 class="card-header">
{{ __('Versand Adresse') }}
</h5>
<div class="card-body">
<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', 'id'=>'shipping_company', 'tabindex' => 16)) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-md-2 {{ $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 tabindex="17">
{!! 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 class="form-group col-md-5 {{ $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, 'id'=>'shipping_firstname', 'tabindex' => 18)) }}
@if ($errors->has('shipping_firstname'))
<span class="help-block">
<strong>{{ $errors->first('shipping_firstname') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-5 {{ $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, 'id'=>'shipping_lastname', 'tabindex' => 19)) }}
@if ($errors->has('shipping_lastname'))
<span class="help-block">
<strong>{{ $errors->first('shipping_lastname') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-group {{ $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, 'id'=>'shipping_address', 'tabindex' => 20)) }}
@if ($errors->has('shipping_address'))
<span class="help-block">
<strong>{{ $errors->first('shipping_address') }}</strong>
</span>
@endif
</div>
<div class="form-group {{ $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', 'id'=>'shipping_address_2', 'tabindex' => 21)) }}
@if ($errors->has('shipping_address_2'))
<span class="help-block">
<strong>{{ $errors->first('shipping_address_2') }}</strong>
</span>
@endif
</div>
<div class="form-row">
<div class="form-group col-md-2 {{ $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, 'id'=>'shipping_zipcode', 'tabindex' => 22)) }}
@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, 'id'=>'shipping_city', 'tabindex' => 23)) }}
@if ($errors->has('shipping_city'))
<span class="help-block">
<strong>{{ $errors->first('shipping_city') }}</strong>
</span>
@endif
</div>
<div class="form-group col-md-4 {{ $errors->has('shipping_country_id') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Country') }}*</label>
<select class="selectpicker" name="shipping_country_id" id="shipping_country_id" data-style="btn-light" data-live-search="true" required tabindex="24">
{!! HTMLHelper::getContriesWithMore($user->account->shipping_country_id) !!}
</select>
@if ($errors->has('shipping_country_id'))
<span class="help-block">
<strong>{{ $errors->first('shipping_country_id') }}</strong>
</span>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<label class="form-label" for="shipping_pre_phone_id">{{ __('Country code') }}</label>
<select class="selectpicker" name="shipping_pre_phone_id" id="shipping_pre_phone_id" data-style="btn-light" data-live-search="true" tabindex="25">
{!! HTMLHelper::getContriesCodes($user->account->shipping_pre_phone_id) !!}
</select>
</div>
<div class="form-group col-md-8">
<label class="form-label" for="shipping_phone">{{ __('Phone') }}</label>
{{ Form::text('shipping_phone', $user->account->shipping_phone, array('placeholder'=>__('Phone'), 'class'=>'form-control', 'id'=>'shipping_phone', 'tabindex' => 26)) }}
</div>
</div>
</div>
</div>
{{-- <div class="card mb-4">
<h5 class="card-header">
{{ __('weiteres') }}
</h5>
<div class="card-body">
<div class="form-row">
<div class="form-group col-md-4">
<label class="form-label" for="website">{{ __('Webseite') }}</label>
{{ Form::text('website', $user->account->website, array('placeholder'=>__('Webseite'), 'class'=>'form-control', 'id'=>'website')) }}
</div>
<div class="form-group col-md-4">
<label class="form-label" for="instagram">{{ __('Instagram') }}</label>
{{ Form::text('instagram', $user->account->instagram, array('placeholder'=>__('Instagram'), 'class'=>'form-control', 'id'=>'instagram')) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6">
<label class="form-label" for="facebook">{{ __('Facebook') }}</label>
{{ Form::text('facebook', $user->account->facebook, array('placeholder'=>__('Facebook'), 'class'=>'form-control', 'id'=>'facebook')) }}
</div>
<div class="form-group col-md-6">
<label class="form-label" for="facebook_fanpage">{{ __('Facebook Fanpage') }}</label>
{{ Form::text('facebook_fanpage', $user->account->facebook_fanpage, array('placeholder'=>__('Facebook Fanpage'), 'class'=>'form-control', 'id'=>'facebook_fanpage')) }}
</div>
</div>
</div>
</div>--}}
<script type="application/javascript">
$( document ).ready(function() {
// Shipping Address show|hide
$("#same_as_billing").on("change", function () {
$('#show_shipping_address').slideToggle(200, function () {
// scroll down to shipping area.
if ($('#show_shipping_address').is(":visible")) {
_scrollTo('#show_shipping_address', 20);
}
});
});
$.extend( $.validator.messages, {
required: "Dieses Feld ist ein Pflichtfeld.",
maxlength: $.validator.format( "Geben Sie bitte maximal {0} Zeichen ein." ),
minlength: $.validator.format( "Geben Sie bitte mindestens {0} Zeichen ein." ),
rangelength: $.validator.format( "Geben Sie bitte mindestens {0} und maximal {1} Zeichen ein." ),
email: "Geben Sie bitte eine gültige E-Mail Adresse ein.",
url: "Geben Sie bitte eine gültige URL ein.",
date: "Bitte geben Sie ein gültiges Datum ein.",
number: "Geben Sie bitte eine Nummer ein.",
digits: "Geben Sie bitte nur Ziffern ein.",
equalTo: "Bitte denselben Wert wiederholen.",
range: $.validator.format( "Geben Sie bitte einen Wert zwischen {0} und {1} ein." ),
max: $.validator.format( "Geben Sie bitte einen Wert kleiner oder gleich {0} ein." ),
min: $.validator.format( "Geben Sie bitte einen Wert größer oder gleich {0} ein." ),
creditcard: "Geben Sie bitte eine gültige Kreditkarten-Nummer ein."
});
// Set up validator
$('#lead-form-validation').validate({
rules: {
'email': {
required: true,
email: true,
remote:
{
url: "{{ route('user_check_mail') }}",
type: "post",
data:
{
user_id: function()
{
return $('#lead-form-validation :input[name="user_id"]').val();
},
email: function()
{
return $('#lead-form-validation :input[name="email"]').val();
}
},
encode: true,
headers: {
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
},
}
},
'email-confirm': {
required: true,
equalTo: "#email"
},
},
errorPlacement: function errorPlacement(error, element) {
$(element).parents('.form-group').append(
error.addClass('invalid-feedback small d-block')
)
},
highlight: function (element) {
if ($(element).hasClass('selectpicker')) {
$(element).parent().addClass('is-invalid');
}
$(element).addClass('is-invalid');
},
unhighlight: function (element) {
$(element).removeClass('is-invalid');
$(element).parents('.form-group').find('.is-invalid').removeClass('is-invalid');
},
messages : {
required: "{{__('This field is required.')}}",
country_id : {
required: "{{__('This field is required.')}}",
},
salutation : {
required: "{{__('Bitte angeben.')}}",
},
first_name : {
required: "{{__('This field is required.')}}",
},
last_name : {
required: "{{__('This field is required.')}}",
},
zipcode : {
required: "{{__('This field is required.')}}",
},
address : {
required: "{{__('This field is required.')}}",
},
city : {
required: "{{__('This field is required.')}}",
},
birthday : {
required: "{{__('This field is required.')}}",
},
equalTo : "{{__('Please enter the same value again.')}}",
'email-confirm' : {
equalTo : "{{__('Please enter the same value again.')}}",
required: "{{__('This field is required.')}}",
},
email: {
required : "{{__('This field is required.')}}",
email: "{{ __('Please enter a valid email address.') }}",
remote : "{{ __('This E-mail is already in use.') }}"
},
},
onkeyup: false
});
});
</script>

63
resources/views/user/components/user_shop_edit.blade.php
View file

@ -9,36 +9,43 @@
<div class="form-group">
<label class="custom-control custom-checkbox float-right">
{!! Form::checkbox('active', 1, $user->shop->active, ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">{{__('aktiv')}}</span>
<span class="custom-control-label">{{__('activ')}}</span>
</label>
<label class="form-label" for="title">{{ __('shop_title') }}</label>
{{ Form::text('title', $user->shop->title, array('placeholder'=>__('shop_title'), 'class'=>'form-control', 'id'=>'title')) }}
<small class="form-text text-muted">{{ __('shop_title_help') }}</small>
<label class="form-label" for="title">{{ __('shop.shop_title') }}</label>
{{ Form::text('title', $user->shop->title, array('placeholder'=>__('shop.shop_title'), 'class'=>'form-control', 'id'=>'title')) }}
<small class="form-text text-muted">{{ __('shop.shop_title_help') }}</small>
</div>
<hr>
<div class="form-group">
<label class="form-label" for="contact">{{ __('shop.shop_contact') }} | <strong style="text-transform: uppercase"> {{ __('website.language') }} {{ \App::getLocale() }}</strong></label>
{{ Form::textarea('contact', $user->shop->getLang('contact', false) , array('placeholder'=>__('shop.shop_contact'), 'class'=>'form-control', 'id'=>'contact', 'rows'=>4)) }}
<small class="form-text text-muted">{{ __('shop.shop_contact_help') }}</small>
</div>
<div class="form-group">
<label class="form-label" for="contact">{{ __('shop_contact') }}</label>
{{ Form::textarea('contact', $user->shop->contact , array('placeholder'=>__('shop_contact'), 'class'=>'form-control', 'id'=>'contact', 'rows'=>4)) }}
<small class="form-text text-muted">{{ __('shop_contact_help') }}</small>
<label class="form-label" for="accessibility">{{ __('shop.shop_accessibility') }} | <strong style="text-transform: uppercase"> {{ __('website.language') }} {{ \App::getLocale() }}</strong></label>
{{ Form::textarea('accessibility', $user->shop->getLang('accessibility', false), array('placeholder'=>__('shop.shop_accessibility'), 'class'=>'form-control', 'id'=>'accessibility', 'rows'=>2)) }}
<small class="form-text text-muted">{{ __('shop.shop_accessibility_help') }}</small>
</div>
<div class="form-group">
<label class="form-label" for="accessibility">{{ __('shop_accessibility') }}</label>
{{ Form::textarea('accessibility', $user->shop->accessibility , array('placeholder'=>__('shop_accessibility'), 'class'=>'form-control', 'id'=>'accessibility', 'rows'=>2)) }}
<small class="form-text text-muted">{{ __('shop_accessibility_help') }}</small>
<label class="form-label" for="about">{{ __('shop.shop_about') }} | <strong style="text-transform: uppercase"> {{ __('website.language') }} {{ \App::getLocale() }}</strong></label>
{{ Form::textarea('about', $user->shop->getLang('about', false) , array('placeholder'=>'', 'class'=>'form-control', 'id'=>'about', 'rows'=>2)) }}
<small class="form-text text-muted">{{ __('shop.shop_about_help') }}</small>
</div>
<div class="form-group">
<label class="form-label" for="about">{{ __('shop_about') }}</label>
{{ Form::textarea('about', $user->shop->about , array('placeholder'=>'', 'class'=>'form-control', 'id'=>'about', 'rows'=>2)) }}
<small class="form-text text-muted">{{ __('shop_about_help') }}</small>
<div class="text-right mt-0 mb-2">
<a href="{{ route('user_shop_translate') }}" class="btn btn-sm btn-primary">{{ __('navigation.translate') }}</a>&nbsp;
</div>
<div class="text-left mt-0 mb-2">
<button type="submit" class="btn btn-secondary">{{ __('save') }}</button>&nbsp;
</div>
{!! Form::close() !!}
{!! Form::close() !!}
</div>
</div>
<!-- / Description -->
@ -47,16 +54,16 @@
<!-- Project details -->
<div class="card mb-4">
<h5 class="card-header">{{ __('Shop details') }}</h5>
<h5 class="card-header">{{ __('shop.Shop details') }}</h5>
<ul class="list-group list-group-flush">
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{ __('name') }}</div>
<div class="text-muted">{{ __('shop.name') }}</div>
<div>
{{ $user->shop->name }}
</div>
</li>
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{ __('Domain') }}</div>
<div class="text-muted">{{ __('shop.domain') }}</div>
<div>
<a href="{{ $user->shop->getSubdomain(false) }}" target="_blank">{{ $user->shop->getSubdomain(false) }}
</a>
@ -66,31 +73,31 @@
<div class="text-muted">{{ __('Status') }}</div>
<div class="text-right">
@if($user->shop->getSubdomainStatus())
<span class="badge badge-pill badge-success"><i class="fa fa-check"> {{ __('available') }} </i> DNS</span><br>
<span class="badge badge-pill badge-success"><i class="fa fa-check"> {{ __('shop.available') }} </i> DNS</span><br>
@else
<span class="badge badge-pill badge-danger"><i class="fa fa-times"> {{ __('not available') }} </i> DNS</span>
<span class="badge badge-pill badge-danger"><i class="fa fa-times"> {{ __('shop.not_available') }} </i> DNS</span>
@endif
@if($user->shop->getSubdomainAvailable())
<span class="badge badge-pill badge-success"><i class="fa fa-check"> {{ __('available') }} </i>
<span class="badge badge-pill badge-success"><i class="fa fa-check"> {{ __('shop.available') }} </i>
@if($user->shop->getSubdomainSslSin()) HTTPS @else HTTP @endif
</span>
@else
<span class="badge badge-pill badge-danger"><i class="fa fa-times"> {{ __('not available') }} </i> HTTP </span>
<span class="badge badge-pill badge-danger"><i class="fa fa-times"> {{ __('shop.not_available') }} </i> HTTP </span>
@endif
@if($user->shop->getSubdomainSslSinActive())
<span class="badge badge-pill badge-success"><i class="fa fa-check"> {{ __('available') }} </i> SSL
<span class="badge badge-pill badge-success"><i class="fa fa-check"> {{ __('shop.available') }} </i> SSL
</span>
@else
<span class="badge badge-pill badge-danger"><i class="fa fa-times"> {{ __('not available') }} </i> SSL </span>
<span class="badge badge-pill badge-danger"><i class="fa fa-times"> {{ __('shop.not_available') }} </i> SSL </span>
@endif
</div>
</li>
@if(!$user->shop->getSubdomainStatus() || !$user->shop->getSubdomainAvailable() || !$user->shop->getSubdomainSslSinActive())
<li class="list-group-item d-flex justify-content-between align-items-center">
<p class="text-danger">{{ __('not available copy') }}
<p class="text-danger">{{ __('shop.not_available_copy') }}
<a href="" class="btn icon-btn btn-xs btn-outline-primary">
<span class="lnr lnr-redo"></span>
</a>
@ -99,7 +106,7 @@
</li>
@endif
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{ __('active since') }}</div>
<div class="text-muted">{{ __('shop.active_since') }}</div>
<div>
<strong>{{ $user->shop->getActiveDateFormat() }}</strong>
</div>

28
resources/views/user/components/user_shop_image.blade.php
View file

@ -2,7 +2,7 @@
<h5 class="card-header">{{ __('shop image') }}<br><small>{{ __('shop image copy') }}</small>
<h5 class="card-header">{{ __('shop.shop_image') }}<br><small>{{ __('shop.shop_image_copy') }}</small>
</h5>
<div class="card-body p-3">
<style>
@ -21,7 +21,7 @@
<div class="text-center">
<img class="img-fluid" style="margin: 0 auto;" alt="" src="{{ url($user->shop->getImage()) }}">
<br><br>
<a href="{{ route('user_shop_delete_image') }}" class="btn btn-danger" onclick="return confirm('Bild wirklich löschen?');"><i class="fa fa-trash"></i></a>
<a href="{{ route('user_shop_delete_image') }}" class="btn btn-danger" onclick="return confirm('{{ __('actions.really_delete_picture') }}');"><i class="fa fa-trash"></i></a>
</div>
</div>
@else
@ -32,25 +32,25 @@
@csrf
<div class="slim_holder text-center">
<div class="slim" style="margin:20px auto;"
data-label='<span class="text-green">Foto-Upload</span><br>(Datei suchen oder Drag & Drop)'
data-label='<span class="text-green">{{ __('actions.upload_photo') }}</span><br>({{ __('actions.search_file_or_drag_drop') }})'
data-fetcher="fetch.php"
data-size="400,400"
data-size="600,800"
data-min-size="200,200"
data-max-file-size="10"
data-status-image-too-small="Bild zu klein<br>min. $0 Pixel"
data-status-file-type="Ungültige Datei<br>bitte nur: $0"
data-status-file-size="Die Datei ist zu groß<br>max. $0 MB"
data-button-confirm-label="bestätigen"
data-button-cancel-label="abbrechen"
data-button-confirm-title="bestätigen"
data-button-cancel-title="abbrechen"
data-button-rotate-title="drehen"
data-ratio="1:1">
data-status-image-too-small="{{ __('actions.image_too_small') }}"
data-status-file-type="{{ __('actions.invalid_file') }}"
data-status-file-size="{{ __('actions.file_is_too_big') }}"
data-button-confirm-label="{{ __('actions.confirm') }}"
data-button-cancel-label="{{ __('actions.cancel') }}"
data-button-confirm-title="{{ __('actions.confirm') }}"
data-button-cancel-title="{{ __('actions.cancel') }}"
data-button-rotate-title="{{ __('actions.rotate') }}"
data-ratio="3:4">
<input type="file" name="images[]" required />
</div>
<br>
<button class="btn btn-primary" type="submit">Bild speichern</button>
<button class="btn btn-primary" type="submit">{{ __('actions.save_image') }}</button>
</div>
</form>
</div>

37
resources/views/user/components/user_shop_on_site.blade.php
View file

@ -1,14 +1,7 @@
<h5 class="card-header">{{ __('shop on site') }}<br><small>{{ __('shop on site copy') }}</small>
<h5 class="card-header">
{{ __('shop.shop_on_site') }}<br>
<small>{{ __('shop.shop_on_site_copy') }}</small>
</h5>
<div class="card-body p-3">
<style>
@ -29,7 +22,7 @@
<div class="col-6 col-md-4 text-center" style="border: 1px solid #eee;">
<img class="img-fluid" alt="" src="{{ route('user_shop_image', [$image->slug]) }}">
<br>
<a href="{{ route('user_shop_on_site_delete_image', [$image->id, $user->shop->id]) }}" class="btn btn-sm btn-danger mt-2 mb-2" onclick="return confirm('Bild wirklich löschen?');"><i class="fa fa-trash"></i></a>
<a href="{{ route('user_shop_on_site_delete_image', [$image->id, $user->shop->id]) }}" class="btn btn-sm btn-danger mt-2 mb-2" onclick="return confirm('{{ __('actions.really_delete_picture') }}');"><i class="fa fa-trash"></i></a>
</div>
@endforeach
</div>
@ -42,25 +35,25 @@
<input type="hidden" name="user_shop_id" value="{{$user->shop->id}}">
<div class="slim_holder text-center">
<div class="slim" style="margin:20px auto;"
data-label='<span class="text-green">Foto-Upload</span><br>(Datei suchen oder Drag & Drop)'
data-label='<span class="text-green">{{ __('actions.upload_photo') }}</span><br>({{ __('actions.search_file_or_drag_drop') }})'
data-fetcher="fetch.php"
data-size="600,800"
data-min-size="200,200"
data-max-file-size="10"
data-status-image-too-small="Bild zu klein<br>min. $0 Pixel"
data-status-file-type="Ungültige Datei<br>bitte nur: $0"
data-status-file-size="Die Datei ist zu groß<br>max. $0 MB"
data-button-confirm-label="bestätigen"
data-button-cancel-label="abbrechen"
data-button-confirm-title="bestätigen"
data-button-cancel-title="abbrechen"
data-button-rotate-title="drehen"
="{{ __('actions.image_too_small') }}"
data-status-file-type="{{ __('actions.invalid_file') }}"
data-status-file-size="{{ __('actions.file_is_too_big') }}"
data-button-confirm-label="{{ __('actions.confirm') }}"
data-button-cancel-label="{{ __('actions.cancel') }}"
data-button-confirm-title="{{ __('actions.confirm') }}"
data-button-cancel-title="{{ __('actions.cancel') }}"
data-button-rotate-title="{{ __('actions.rotate') }}"
data-ratio="3:4">
<input type="file" name="images[]" required />
</div>
<br>
<button class="btn btn-primary" type="submit">Bild speichern</button>
<button class="btn btn-primary" type="submit">{{ __('actions.save_image') }}</button>
</div>
</form>
</div>
@ -72,7 +65,7 @@
<div class="col-6 col-md-4 text-center" style="border: 1px solid #eee;">
<img class="img-fluid" alt="" src="{{ route('user_shop_image', [$image->slug]) }}">
<br>
<a href="{{ route('user_shop_on_site_delete_image', [$image->id, $user->shop->id]) }}" class="btn btn-sm btn-danger mt-2 mb-2" onclick="return confirm('Bild wirklich löschen?');"><i class="fa fa-trash"></i></a>
<a href="{{ route('user_shop_on_site_delete_image', [$image->id, $user->shop->id]) }}" class="btn btn-sm btn-danger mt-2 mb-2" onclick="return confirm('{{ __('actions.really_delete_picture') }}');"><i class="fa fa-trash"></i></a>
</div>
@endforeach
</div>

56
resources/views/user/components/user_shop_register.blade.php
View file

@ -1,5 +1,5 @@
<div class="card-body" style="background: #fff; border: 1px solid rgba(24, 28, 33, 0.06);">
<h4>{{ __('open your shop') }}</h4>
<h4>{{ __('shop.open_your_shop') }}</h4>
{!! Form::open(['url' => route('user_shop_register_form'), 'class' => 'form-horizontal' , 'id'=>'data-shop-form-validations']) !!}
@php
@ -27,33 +27,33 @@
<p class="mt-2">
Wähle das Präfix Deines Shopnamens - z. B. vorname(.mivita.care) - Du musst nicht "mivita.care" eingeben. Wähle einen kurzen und prägnanten Namen, damit Du diese URL auch auf kleinen Werbemitteln unterbringen kannst. Achte auch darauf, dass Du keine Markenrechte Dritter verletzt. Dafür kann MIVITA keine Haftung übernehmen. Daher versucht Phantasiebegriffe zu vermeiden, es sei denn Du hast sie als Marke angemeldet.
{{ __('shop.open_copy_1') }}
<br><br>
Deine Internetadresse kann später mit „www.“ und ohne aufgerufen werden.
{{ __('shop.open_copy_2') }}
<br><br>
<strong>WICHTIGER HINWEIS:</strong>
Aus Deinem Shop-Namen wird die Internet-Adresse (Domain) erstellt, mit der Dein Shop aufgerufen werden kann. Wähle Deinen Shop-Namen sorgfältig aus. Dieser ist nur durch die IT änderbar und wir müssten eine Aufwandsentschädigung von 59,50 € erheben.
<strong>{{ __('shop.open_note_hl') }}</strong><br>
{{ __('shop.open_note_1') }}
</p>
<div class="form-group">
<div class="input-group mt-2 mb-2 ">
{{ Form::text('user_shop_name', old('user_shop_name'), array('placeholder'=>__('Your Shop Name'), 'class'=>'form-control'.$shop_name_form_control.($errors->has('user_shop_name') ? ' is-invalid' : ''), 'id'=>'user_shop_name', 'tabindex' => 2)) }}
{{ Form::text('user_shop_name', old('user_shop_name'), array('placeholder'=>__('shop.your_shop_name'), 'class'=>'form-control'.$shop_name_form_control.($errors->has('user_shop_name') ? ' is-invalid' : ''), 'id'=>'user_shop_name', 'tabindex' => 2)) }}
<span class="input-group-append">
<button class="btn {{ $shop_name_btn_color }}" type="submit" name="shop_submit" value="check"><i class="fa {{ $shop_name_fa }}"></i> prüfen!</button>
<button class="btn {{ $shop_name_btn_color }}" type="submit" name="shop_submit" value="check"><i class="fa {{ $shop_name_fa }}"></i> {{ __('shop.check') }}!</button>
</span>
</div>
@if ($errors->has('user_shop_name'))
<span class="invalid-feedback" style="display: inline-block;">
<strong>{{ $errors->first('user_shop_name') }}</strong>
</span>
<strong>{{ $errors->first('user_shop_name') }}</strong>
</span>
@endif
</div>
<div class="from-group mt-2 mb-2 ">
{{ Form::text('preview_user_shop_name', '', array('placeholder'=>__('Vorschau Shop-Internet Adresse'), 'class'=>'form-control', 'id'=>'preview_user_shop_name', 'readonly')) }}
{{ Form::text('preview_user_shop_name', '', array('placeholder'=>__('shop.preview_shop_internet_address'), 'class'=>'form-control', 'id'=>'preview_user_shop_name', 'readonly')) }}
</div>
<div class="form-group">
<label class="custom-control custom-checkbox m-0">
<input type="checkbox" class="custom-control-input {{ $errors->has('user_shop_active') ? 'is-invalid' : '' }}" name="user_shop_active" id="user_shop_active" tabindex = "1">
<span class="custom-control-label">{!! __('Declaration of shop') !!}</span>
<span class="custom-control-label">{!! __('shop.declaration_of_shop') !!}</span>
</label>
@if ($errors->has('user_shop_active'))
@ -64,7 +64,7 @@
</div>
<hr>
<div class="text-left mt-3">
<button type="submit" class="btn btn-secondary" name="shop_submit" value="action">{{__('akzeptieren und weiter') }}</button>&nbsp;
<button type="submit" class="btn btn-secondary" name="shop_submit" value="action">{{__('shop.accept_and_next') }}</button>&nbsp;
</div>
@ -75,23 +75,25 @@
<script type="application/javascript">
$( document ).ready(function() {
$.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."
$.extend( $.validator.messages, {
required: "{{__('account.validator_required')}}",
maxlength: $.validator.format( "{{__('account.validator_maxlength')}}" ),
minlength: $.validator.format( "{{__('account.validator_minlength')}}" ),
rangelength: $.validator.format( "{{__('account.validator_rangelength')}}" ),
email: "{{__('account.validator_email')}}",
url: "{{__('account.validator_url')}}",
date: "{{__('account.validator_date')}}",
number: "{{__('account.validator_number')}}",
digits: "{{__('account.validator_digits')}}",
equalTo: "{{__('account.validator_equalTo')}}",
range: $.validator.format( "{{__('account.validator_range')}}" ),
max: $.validator.format( "{{__('account.validator_max')}}" ),
min: $.validator.format( "{{__('account.validator_min')}}" ),
creditcard: "{{__('account.validator_creditcard')}}"
});
// Set up validator
var message = 'Default error message';
$('#data-shop-form-validations').validate({

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

@ -18,7 +18,7 @@
@endif
--}}
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Kunden hinzufügen') }}
{{ __('customer.customer_add') }}
</h4>
<div id="smartwizard-3" class="smartwizard-add-client">
@ -27,8 +27,8 @@
<a href="#smartwizard-3-step-1" class="mb-3">
<span class="sw-done-icon ion ion-md-checkmark"></span>
<span class="sw-number">1</span>
E-Mail Adresse
<div class="text-muted small">prüfen</div>
{{ __('E-Mail Address') }}
<div class="text-muted small">{{ __('customer.check') }}</div>
</a>
</li>
@ -36,8 +36,8 @@
<a href="#smartwizard-3-step-2" class="mb-3">
<span class="sw-done-icon ion ion-md-checkmark"></span>
<span class="sw-number">2</span>
Daten
<div class="text-muted small">eingeben</div>
{{ __('Data') }}
<div class="text-muted small">{{ __('customer.enter') }}</div>
</a>
</li>
</ul>
@ -49,17 +49,17 @@
<div class="form-row">
<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)) }}
{{ Form::text('email', '', array('placeholder'=>__('E-Mail Address'), 'class'=>'form-control', 'id'=>'email', 'required'=>true ,'tabindex' => 1)) }}
@if ($errors->has('email'))
<span class="help-block">
<strong>{{ $errors->first('email') }}</strong>
</span>
@endif
<p class="mt-2">Kundenhoheit: Es können nur Kunden hinzugefügt werden, die noch nicht im mivita-Salescenter vorhanden sind. </p>
<p class="mt-2">{{ __('customer.customer_sovereignty_info1') }}</p>
</div>
</div>
<div class="text-left mt-2">
<button type="submit" class="btn btn-secondary" name="action" value="add_customer_with_email">{{ __('prüfen und weiter') }}</button>&nbsp;
<button type="submit" class="btn btn-secondary" name="action" value="add_customer_with_email">{{ __('customer.check_and_next') }}</button>&nbsp;
</div>
<hr>
@ -73,13 +73,13 @@
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">Kunde ohne E-Mail hinzufügen</span>
<span class="switcher-label">{{ __('customer.add_customer_without_email') }}</span>
</label>
</div>
</div>
<div class="text-left" style="display: none" id="show-button-without-email">
<p class="mt-2">Hinweis: Du kannst Deine Kunden auch ohne Email-Adresse anlegen. Das System gleicht dann Nachname und Postleitzahl ab. Sollte es hier mal Übereinstimmungen geben, gleicht der Support von MIVITA die Kundensätze ab und ordnet sie den Beratern entsprechend zu. Daher empfehlen wir im besten Fall immer die Angabe einer Email-Adresse. Diese ist einzigartig und damit eindeutig einem Kunden zuzuordnen.</p>
<button type="submit" class="btn btn-secondary" name="action" value="add_customer_without_email">{{ __('weiter ohne E-Mail') }}</button>&nbsp;
<p class="mt-2">{{ __('customer.add_customer_without_email_info1') }}</p>
<button type="submit" class="btn btn-secondary" name="action" value="add_customer_without_email">{{ __('customer.next_without_email') }}</button>&nbsp;
</div>
{!! Form::close() !!}
@ -90,7 +90,6 @@
@if($step == 1)
{!! Form::open(['url' => route('user_customer_edit', ['new']), 'class' => 'form-horizontal', 'id'=>'lead-form-validation']) !!}
@include('admin.customer._edit')
<div class="text-left mt-3">
<button type="submit" class="btn btn-secondary" name="action" value="shopping-user-store-new">{{ __('save changes') }}</button>&nbsp;
</div>

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

@ -3,8 +3,8 @@
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
<a href="{{route('user_customers')}}" class="btn btn-sm btn-default float-right">zurück</a>
{{ __('Kunden Details') }}
<a href="{{route('user_customers')}}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
{{ __('customer.customer_details') }}
</h4>
@if(Session::has('custom-error'))
@ -15,6 +15,6 @@
@endif
@include('admin.customer._detail')
<a href="{{route('user_customers')}}" class="btn btn-sm btn-default mt-2 float-right">zurück</a>
<a href="{{route('user_customers')}}" class="btn btn-sm btn-default mt-2 float-right">{{ __('back') }}</a>
@endsection

6
resources/views/user/customer/edit.blade.php
View file

@ -3,8 +3,8 @@
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
<a href="{{route('user_customer_detail', [$shopping_user->id])}}" class="btn btn-sm btn-default float-right">zurück</a>
{{ __('Kunden Details') }} bearbeiten
<a href="{{route('user_customer_detail', [$shopping_user->id])}}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
{{ __('customer.customer_details') }} {{ __('customer.edit') }}
</h4>
{!! Form::open(['url' => route('user_customer_edit', [$shopping_user->id]), 'class' => 'form-horizontal', 'id'=>'lead-form-validation']) !!}
@include('admin.customer._edit')
@ -12,5 +12,5 @@
<button type="submit" class="btn btn-secondary" name="action" value="shopping-user-store">{{ __('save changes') }}</button>&nbsp;
</div>
{!! Form::close() !!}
<a href="{{route('user_customer_detail', [$shopping_user->id])}}" class="btn btn-sm btn-default float-right">zurück</a>
<a href="{{route('user_customer_detail', [$shopping_user->id])}}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
@endsection

31
resources/views/user/customer/index.blade.php
View file

@ -8,34 +8,33 @@
<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> -->
<!--<a href="{{ route('admin_lead_edit', ['new']) }}" class="btn btn-sm btn-primary">{{__('team.create_new_consultant')}}</a> -->
</div>
<table class="datatables-customers table table-striped table-bordered" id="datatables-customers">
<thead>
<tr>
<th>#</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>{{__('Käufe')}}</th>
<th>{{__('Newsletter')}}</th>
<th>{{__('erstellt')}}</th>
<th>{{__('Status')}}</th>
<th>{{__('ID Kunden')}}</th>
<th>{{__('Salutation')}}</th>
<th>{{__('Company')}}</th>
<th>{{__('First name')}}</th>
<th>{{__('Last name')}}</th>
<th>{{__('Postcode') }}</th>
<th>{{ __('City') }}</th>
<th>{{ __('Country') }}</th>
<th>{{__('tables.purchases')}}</th>
<th>{{__('tables.newsletter')}}</th>
<th>{{__('tables.created')}}</th>
<th>{{__('tables.status')}}</th>
<th>{{__('ID')}} {{__('tables.customer')}}</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> -->
<!-- <a href="{{ route('admin_lead_edit', ['new']) }}" class="btn btn-sm btn-primary">{{__('team.create_new_consultant')}}</a> -->
</div>
</div>
</div>
@ -74,7 +73,7 @@
"bLengthChange": false,
"iDisplayLength": 50,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
/* $('#filter_member_id').on('change', function(){

10
resources/views/user/data_confirm.blade.php
View file

@ -1,20 +1,20 @@
<div class="card mb-4">
<h5 class="card-header">
{{ __('Vertrag & Datenschutz') }}
<span class="text-tiny float-right">* {{trans('register.required_fields')}}</span>
{{ __('register.contract_data_protection') }}
<span class="text-tiny float-right">* {{__('register.required_fields')}}</span>
</h5>
<div class="card-body">
<div class="form-group">
<label class="custom-control custom-checkbox m-0">
<input type="checkbox" class="custom-control-input" name="accepted_data_protection" id="accepted_data_protection" @if($user->account && $user->account->data_protection) checked="checked" @endif>
<span class="custom-control-label">{!! __('I have read the :link and accept it.*', ['link' => '<a href="#" class="update_modal_data_load" data-url="'.route('loading_modal').'" data-data="data_protection" data-target="#modal-loading">'.__('data protection').'</a>']) !!}</span>
<span class="custom-control-label">{!! __('register.i_have_read_and_accept_it', ['link' => '<a href="#" class="update_modal_data_load" data-url="'.route('loading_modal').'" data-data="data_protection" data-target="#modal-loading">'.__('register.data_protection').'</a>']) !!}</span>
</label>
</div>
<div class="form-group">
<label class="custom-control custom-checkbox m-0">
<input type="checkbox" class="custom-control-input" name="accepted_active" id="accepted_active" @if($user->agreement) checked="checked" @endif required>
<span class="custom-control-label">{!! trans('register.declaration-of-consent') !!}*</span>
<span class="custom-control-label">{!! __('register.declaration-of-consent') !!}*</span>
</label>
</div>
@ -27,7 +27,7 @@
<div class="form-group">
<label class="custom-control custom-checkbox m-0">
<input type="checkbox" class="custom-control-input" name="accepted_contract" id="accepted_contract" required @if($user->account && $user->account->accept_contract) checked="checked" @endif>
<span class="custom-control-label">{!! trans('register.accept-contract') !!}*</span>
<span class="custom-control-label">{!! __('register.accept-contract') !!}*</span>
</label>
</div>

4
resources/views/user/data_verify.blade.php
View file

@ -1,12 +1,12 @@
<div class="card mb-4">
<h5 class="card-header">
{{ __('Berater einladen') }}
{{ __('register.advisor_invite') }}
</h5>
<div class="card-body">
<div class="form-group">
<label class="custom-control custom-checkbox m-0">
<input type="checkbox" class="custom-control-input" name="contact_verify" id="contact_verify" checked>
<span class="custom-control-label"> {{ __('Berater erstellen und eine E-Mail zur Einladung senden!') }}</span>
<span class="custom-control-label"> {{ __('register.create_advisor_send_email_to_invite') }}</span>
</label>
</div>
</div>

6
resources/views/user/delete_account.blade.php
View file

@ -3,10 +3,10 @@
@section('content')
<div class="card mb-4">
<h5 class="card-header">
{{__('Delete Account')}}
{{__('register.delete_account')}}
</h5>
<div class="card-body">
<p>{{__('Confirm your identity with your password before proceeding.')}}</p>
<p>{{__('register.confirm_your_identity')}}</p>
{!! Form::open(['url' => route('user_delete_account')]) !!}
<div class="form-group row">
@ -22,7 +22,7 @@
</div>
<div class="form-group row">
<div class="col-sm-10 ml-sm-auto">
<button type="submit" class="btn btn-danger">{{__('Delete Account')}}</button>
<button type="submit" class="btn btn-danger">{{__('register.delete_account')}}</button>
</div>
</div>
{!! Form::close() !!}

274
resources/views/user/documents/index.blade.php Normal file
View file

@ -0,0 +1,274 @@
@extends('layouts.layout-2')
@section('content')
@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
<h4 class="font-weight-bold py-2 mb-2">
{{ __('navigation.documents') }}
</h4>
<div class="card mb-4">
<h5 class="card-header">
@if($business_license_choose !== 'now')
{{ __('register.wizard_business_license_hl') }}
@else
{{ __('webcontent.trade_licence_hl') }}
@endif
</h5>
<div class="card-body pb-0">
<div class="row">
@if($business_license_choose === 'now')
<div class="col-sm-12">
@if($user->files->count())
<div class="row">
@foreach($user->files()->whereIdentifier('business_license')->get() as $file)
<div class="col-md-12 col-xl-6">
<div class="card mb-3">
<div class="card-body">
<h6 class="card-title"><a target="_blank" href="{{ route('storage_file', [$file->id, 'user']) }}">{{ $file->original_name }}</a></h6>
<p class="card-text">{{ $file->formatBytes() }}
{{--
<a href="route('user_documents_delete',[$file->id,'upload']) " class="btn btn-sm btn-default float-right" onclick="return confirm('{{__('register.really_delete_the_file')}}');">
<span class="ion ion-md-trash text-danger"></span>
</a>
--}}
</p>
</div>
@if(strtolower($file->ext ) == 'pdf')
<object data="{{ route('storage_file', [$file->id, 'user']) }}" type="application/pdf" class="card-img-bottom" style="height: 400px;"></object>
@else
<img src="{{ route('storage_file', [$file->id, 'user']) }}" alt="" class="card-img-bottom">
@endif
</div>
</div>
@endforeach
</div>
@endif
</div>
@endif
@if(!$business_license_choose || $business_license_choose == 'later' || $business_license_choose === 'non')
<div class="col-sm-6">
<div class="mt-4">
{!! Form::open([ 'url' => route('user_documents_store', ['business_license']), 'method' => 'post', 'files' => true, 'enctype' => 'multipart/form-data', 'class' => 'dropzone', 'id' => 'businesslDropzone' ]) !!}
<input type="hidden" name="redirect" value="{{ route('user_documents') }}">
<div class="fallback">
<input name="file" type="file" multiple>
</div>
{!! Form::close() !!}
<br>
<div class="alert alert-danger alert-dismissable" style="display:none;"></div>
<p>{{ __('register.wizard_business_license_line_1') }}</p>
</div>
</div>
<div class="col-sm-6">
@if($user->files->count())
<div class="row">
@foreach($user->files()->whereIdentifier('business_license')->get() as $file)
<div class="col-md-12 col-xl-6">
<div class="card mb-3">
<div class="card-body">
<h6 class="card-title"><a target="_blank" href="{{ route('storage_file', [$file->id, 'user']) }}">{{ $file->original_name }}</a></h6>
<p class="card-text">{{ $file->formatBytes() }}
<a href="{{ route('user_documents_delete', [$file->id, 'upload']) }}" class="btn btn-sm btn-default float-right" onclick="return confirm('{{__('register.really_delete_the_file')}}');">
<span class="ion ion-md-trash text-danger"></span>
</a>
</p>
</div>
@if(strtolower($file->ext ) == 'pdf')
<object data="{{ route('storage_file', [$file->id, 'user']) }}" type="application/pdf" class="card-img-bottom"></object>
@else
<img src="{{ route('storage_file', [$file->id, 'user']) }}" alt="" class="card-img-bottom">
@endif
</div>
</div>
@endforeach
</div>
@endif
</div>
@endif
</div>
</div>
@if($business_license_choose !== 'now')
{!! Form::open(['url' => route('user_documents_store', ['business_license'])]) !!}
<div class="card-body pt-0">
<div class="row">
<div class="col-12">
<hr>
</div>
<div class="col-12">
<label class="custom-control custom-radio">
{{ Form::radio('business_license_choose', 'now' , (($business_license_choose === 'now' || !$business_license_choose) ? true : false), array('class'=>'custom-control-input')) }}
<span class="custom-control-label">{{__('register.business_license_release')}}</span>
</label>
</div>
<div class="col-12">
<hr>
<label class="custom-control custom-radio">
{{ Form::radio('business_license_choose', 'later' , (($business_license_choose === 'later') ? true : false), array('class'=>'custom-control-input')) }}
<span class="custom-control-label">{{__('register.business_license_later')}}</span>
</label>
</div>
<div class="col-12">
<hr>
<label class="custom-control custom-radio">
{{ Form::radio('business_license_choose', 'non' , (($business_license_choose === 'non') ? true : false), array('class'=>'custom-control-input')) }}
<span class="custom-control-label">{{__('register.business_license_non')}}</span>
</label>
<p>{{__('register.business_license_non_text')}}</p>
{{ Form::textarea('non_business_license_reason', $user->account->getNotice('business_license_reason'), array('placeholder'=>__('Begründung'), 'class'=>'form-control', 'rows'=>' 2')) }}
</div>
<div class="col-12 mt-2">
<hr>
<button type="submit" name="submit" value="do" class="btn btn-secondary">{{ __('save changes') }}</button>&nbsp;
</div>
</div>
</div>
{!! Form::close() !!}
@endif
</div>
<div class="card mb-4">
<h5 class="card-header">
@if($business_license_choose !== 'now')
{{ __('register.wizard_verification_hl') }}
@else
{{ __('register.badge') }}
@endif
</h5>
<div class="card-body">
<div class="row">
{{-- <div class="col-sm-6">
<div class="mt-4">
{!! Form::open([ 'url' => route('wizard_store_register', ['verification']), 'method' => 'post', 'files' => true, 'enctype' => 'multipart/form-data', 'class' => 'dropzone', 'id' => 'idcardDropzone' ]) !!}
<div class="fallback">
<input name="file" type="file" multiple>
</div>
{!! Form::close() !!}
<br>
<div class="alert alert-danger alert-dismissable" style="display:none;"></div>
<p>{{ __('register.wizard_verification_line_1') }}</p>
</div>
</div>--}}
<div class="col-sm-12">
@if($user->files->count())
<div class="row">
@foreach($user->files()->whereIdentifier('id_card')->get() as $file)
<div class="col-12 col-md-6">
<div class="card mb-3">
<div class="card-body">
<h6 class="card-title"><a target="_blank" href="{{ route('storage_file', [$file->id, 'user']) }}">{{ $file->original_name }}</a></h6>
<p class="card-text">{{ $file->formatBytes() }}
{{-- <a href="route('user_documents_delete', [$file->id, 'upload']) }}" class="btn btn-sm btn-default float-right" onclick="return confirm('{{__('register.really_delete_the_file')}}');">
<span class="ion ion-md-trash text-danger"></span>
</a>
--}}
</p>
</div>
@if(strtolower($file->ext ) == 'pdf')
<object data="{{ route('storage_file', [$file->id, 'user']) }}" type="application/pdf" class="card-img-bottom" style="height: 400px;"></object>
@else
<img src="{{ route('storage_file', [$file->id, 'user']) }}" alt="" class="card-img-bottom">
@endif
</div>
</div>
@endforeach
</div>
@endif
</div>
</div>
</div>
</div>
@endsection
@section('scripts')
<script type="text/javascript">
var real_dropzone = {
uploadMultiple: false,
parallelUploads: 1,
maxFilesize: 32,
addRemoveLinks: true,
dictDefaultMessage: "{{ __('actions.dictDefaultMessage') }}",
dictFallbackMessage: "{{ __('actions.dictFallbackMessage') }}",
dictFallbackText:"{{ __('actions.dictFallbackText') }}",
dictFileTooBig: "{{ __('actions.dictFileTooBig') }}",
dictInvalidFileType: "{{ __('actions.dictInvalidFileType') }}",
dictResponseError: "{{ __('actions.dictResponseError') }}",
dictCancelUpload: "{{ __('actions.dictCancelUpload') }}",
dictCancelUploadConfirmation: null,
dictRemoveFile: "{{ __('actions.dictRemoveFile') }}",
dictMaxFilesExceeded: "{{ __('actions.dictMaxFilesExceeded') }}",
acceptedFiles: "image/jpeg,image/pjpeg,image/png,image/gif,application/pdf,text/plain,.pdf",
// The setting up of the dropzone
init:function() {
this.on("removedfile", function(file) {
var _ele = $('.alert-danger');
_ele.fadeOut();
} );
this.on("addedfile", function (file) {
var _ele = $('.alert-danger');
_ele.fadeOut();
});
},
error: function(file, response) {
var message;
if($.type(response) === "string")
message = response; //dropzone sends it's own error messages in string
else
message = response.message;
var _ele = $('.alert-danger');
_ele.fadeIn();
_ele.text(message);
},
success: function(file,response) {
console.log(file);
console.log(response.filename);
console.log(response.filedata);
console.log(response);
if(response.redirect){
window.location.href = response.redirect;
}else{
if(response.error === false){
//true
window.location.href = window.location.href;
}
}
}
};
Dropzone.options.idcardDropzone = real_dropzone;
Dropzone.options.businesslDropzone = real_dropzone;
</script>
@endsection

43
resources/views/user/downloadcenter/content-files.blade.php Normal file
View file

@ -0,0 +1,43 @@
@foreach ($files as $file)
<div class="col-6 col-md-4 col-lg-4 col-xl-3">
<div class="card mb-4">
<div class="card-body">
<div class="contact-content">
<div class="text-center" style="height: 250px; ">
<a target="_blank" href="{{ route('storage_file', [$file->id, 'dc_file', 'stream']) }}" class="">
@if($file->hasThumb())
<img data-src="{{ route('storage_file', [$file->id, 'dc_thumb', 'image']) }}" class="lozad img-fluid" style="max-height: 250px">
@else
@if($file->ext == 'jpg' || $file->ext == 'jpeg' || $file->ext == 'png')
<img data-src="{{ route('storage_file', [$file->id, 'dc_file', 'image']) }}" class="lozad img-fluid" style="max-height: 250px">
@else
<button type="button" class="btn icon-btn btn-xl btn-outline-info" style="margin-top: 100px">
{{ $file->ext }}
</button>
@endif
@endif
</a>
</div>
<div class="file-content-about mt-5">
<h6 class="file-content-name mb-1">
<a class="text-dark" target="_blank" href="{{ route('storage_file', [$file->id, 'dc_file', 'stream']) }}" data-toggle="tooltip" data-placement="top" title="{{ $file->original_name }}">
{{ $file->original_name }}
</a>
</h6>
<div class="file-content-details">
<span><i class="ion ion-ios-document"></i></span> {{ $file->ext }} &nbsp; &nbsp; <span><i class="ion ion-ios-download"></i></span> {{ Util::formatBytes($file->size) }}<br>
<span><i class="ion ion-ios-time"></i></span> {{ $file->created_at->format('d.m.Y H:i') }}<br>
</div>
<hr class="border-light">
<div class="text-center">
<a target="_self" href="{{ route('storage_file', [$file->id, 'dc_file', 'download']) }}" class="btn btn-primary btn-sm"><span class="ion ion-md-download"></span></a> &nbsp;&nbsp;
<a target="_blank" href="{{ route('storage_file', [$file->id, 'dc_file', 'stream']) }}" class="btn btn-secondary btn-sm"><span class="ion ion-md-eye"></span></a> &nbsp;&nbsp;
</div>
</div>
</div>
</div>
</div>
</div>
@endforeach

85
resources/views/user/downloadcenter/index.blade.php Normal file
View file

@ -0,0 +1,85 @@
@extends('layouts.layout-2')
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
{{ __('navigation.downloadcenter') }}
</h4>
<div class="card mb-4">
<div class="card-body">
{!! Form::open(['url' => route('user_downloadcenter_search'), 'class' => 'form-horizontal', 'id'=>'dcformfilter']) !!}
<div class="form-row pb-1 pt-1">
<div class="col-md-6 col-lg-4 mb-1">
<div class="form-group">
<input type="text" class="form-control" placeholder="{{ __('search_for') }}" id="searchinput">
</div>
</div>
</div>
<h6 class="card-header bg-light px-2 py-2">
<a href="#" class="" data-toggle="collapse" data-target="#collapseFilter" aria-expanded="false" aria-controls="collapseFilter">
<i class="fa fa-caret-expand"></i> {{ __('show_all_filters') }}
</a>
</h6>
<div class="collapse" id="collapseFilter">
<div class="form-row pb-1 pt-1">
<div class="col-12 col-sm-12 col-md-3 col-lg-3 mb-1" style="vertical-align: top">
{!! $filter_html = \App\Services\DcHelper::makeFilterList($filter_list, 4, 0) !!}
</div>
<div class="col-12 col-sm-12 col-md-3 col-lg-3 mb-1" style="vertical-align: top">
{!! $filter_html = \App\Services\DcHelper::makeFilterList($filter_list, 4, 1) !!}
</div>
<div class="col-6 col-sm-6 col-md-3 col-lg-3 mb-1" style="vertical-align: top">
{!! $filter_html = \App\Services\DcHelper::makeFilterList($filter_list, 4, 2) !!}
</div>
<div class="col-6 col-sm-6 col-md-3 col-lg-3 mb-1" style="vertical-align: top">
{!! $filter_html = \App\Services\DcHelper::makeFilterList($filter_list, 4, 3) !!}
</div>
</div>
</div>
{!! Form::close() !!}
</div>
</div>
<div class="row" id="holder-content-files">
@include('user.downloadcenter.content-files')
</div>
<script>
$( document ).ready(function() {
});
</script>
@endsection
@section('styles')
<style>
.file-content-details {
font-size: 0.9em;
line-height: 22px;
color: #858585 !important;
}
.file-content-details span {
min-width: 16px;
display: inline-block;
}
.file-content-name {
line-height: 1.3em;
height: 1.4em;
white-space: nowrap; overflow: hidden ; text-overflow: ellipsis;
}
</style>
@endsection
@section('scripts')
<script src="/vendor/lozad/dist/lozad.min.js"></script>
<script src="/js/dc-filter.js"></script>
<script type="text/javascript">
</script>
@endsection

39
resources/views/user/edit.blade.php
View file

@ -24,8 +24,45 @@
<div class="text-left mt-3">
<button type="submit" class="btn btn-secondary">{{ __('save changes') }}</button>&nbsp;
<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">{{ __('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>
@endsection

6
resources/views/user/form.blade.php
View file

@ -106,7 +106,7 @@
</div>
<div class="form-group col-md-4">
<label for="birthday" class="form-label">{{ __('Geburtsdatum') }}*</label>
<label for="birthday" class="form-label">{{ __('Date of birth') }}*</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')) }}
</div>
@ -127,9 +127,9 @@
@if(count($user->user_update_email) > 0)
<p class="badge badge-primary" style=" color:#fff;">{{ $user->user_update_email->first()->email }} {{__('waiting for activation since')}} | {{ $user->user_update_email->first()->created_at->format('d.m.Y H:i') }}</p><br>
@endif
<a href="{{ route('admin_lead_change_mail', [$user->id]) }}" class="btn btn-default btn-sm"> {{ __('Contact') }} {{__('Change E-Mail')}}</a>
<a href="{{ route('admin_lead_change_mail', [$user->id]) }}" class="btn btn-default btn-sm"> {{ __('Contact') }} {{__('register.change_email')}}</a>
@else
<a href="{{ route('user_update_email', [$user->id]) }}" class="btn btn-default btn-sm">{{__('Change E-Mail')}}</a>
<a href="{{ route('user_update_email', [$user->id]) }}" class="btn btn-default btn-sm">{{__('register.change_email')}}</a>
@endif
@else
<div class="form-row">

6
resources/views/user/homeparty/_address.blade.php
View file

@ -25,7 +25,7 @@
<br>
@endif
@if($homeparty_user->billing_email)
E-Mail:{{ $homeparty_user->billing_email }}
{{ __('E-Mail') }}:{{ $homeparty_user->billing_email }}
<br>
@endif
@if($homeparty_user->billing_phone)
@ -57,7 +57,7 @@
<br>
@endif
@if($homeparty_user->shipping_email)
E-Mail:{{ $homeparty_user->shipping_email }}
{{ __('E-Mail') }}:{{ $homeparty_user->shipping_email }}
<br>
@endif
@if($homeparty_user->shipping_phone)
@ -66,6 +66,6 @@
</p>
@endif
@else
<p>Keine Adresse angelegt</p>
<p>{{ __('order.no_address_created') }}</p>
@endif
@endif

20
resources/views/user/homeparty/_edit.blade.php
View file

@ -4,7 +4,7 @@
<div class="col-12 col-lg-6">
<div class="form-row">
<div class="form-group col-md-12">
<label for="billing_company" class="form-label">{{ __('Company name') }} (optional)</label>
<label for="billing_company" class="form-label">{{ __('Company name') }} ({{__('optional')}})</label>
{{ Form::text('billing_company', $homeparty_user->billing_company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'billing_company', 'tabindex' => 1)) }}
</div>
</div>
@ -56,8 +56,8 @@
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('billing_address_2') ? 'has-error' : '' }}">
<label class="form-label" for="billing_address_2">{{ __('Wohnung / Gebäude (optional)') }}</label>
{{ Form::text('billing_address_2', $homeparty_user->billing_address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'billing_address_2', 'tabindex' => 6)) }}
<label class="form-label" for="billing_address_2">{{ __('Flat Building optional') }}</label>
{{ Form::text('billing_address_2', $homeparty_user->billing_address_2, array('placeholder'=>__('Flat Building optional'), 'class'=>'form-control', 'id'=>'billing_address_2', 'tabindex' => 6)) }}
</div>
</div>
<div class="form-row">
@ -84,7 +84,7 @@
<div class="form-group col-md-12">
{{ Form::hidden('billing_country_id', $homeparty_user->billing_country_id) }}
<label class="form-label">{{ __('Country') }}</label>
<div class="">@if($homeparty_user->billing_country) {{ $homeparty_user->billing_country->getLocated() }} @endif <i>(Das Land kann nicht mehr geändert werden.)</i></div>
<div class="">@if($homeparty_user->billing_country) {{ $homeparty_user->billing_country->getLocated() }} @endif <i>({{ __('order.land_can_no_longer_be_changed') }}.)</i></div>
</div>
</div>
<div class="form-row">
@ -103,12 +103,12 @@
<div class="col-12 col-lg-6">
<div class="d-md-block d-lg-none">
<hr>
<h5 class="mt-4">Lieferadresse</h5>
<h5 class="mt-4">{{ __('Delivery address') }}</h5>
</div>
<div id="show_shipping_address" style="@if($homeparty_user->same_as_billing) display:none @endif">
<div class="form-row">
<div class="form-group col-md-12">
<label for="shipping_company" class="form-label">{{ __('Company name') }} (optional)</label>
<label for="shipping_company" class="form-label">{{ __('Company name') }} ({{__('optional')}})</label>
{{ Form::text('shipping_company', $homeparty_user->shipping_company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'shipping_company', 'tabindex' => 16)) }}
</div>
</div>
@ -159,8 +159,8 @@
</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', $homeparty_user->shipping_address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'shipping_address_2', 'tabindex' => 21)) }}
<label class="form-label" for="shipping_address_2">{{ __('Flat Building optional') }}</label>
{{ Form::text('shipping_address_2', $homeparty_user->shipping_address_2, array('placeholder'=>__('Flat Building optional'), 'class'=>'form-control', 'id'=>'shipping_address_2', 'tabindex' => 21)) }}
@if ($errors->has('shipping_address_2'))
<span class="help-block">
<strong>{{ $errors->first('shipping_address_2') }}</strong>
@ -193,7 +193,7 @@
<div class="form-group col-md-12">
{{ Form::hidden('shipping_country_id', $homeparty_user->shipping_country_id) }}
<label class="form-label">{{ __('Country') }}</label>
<div class="">@if($homeparty_user->shipping_country) {{ $homeparty_user->shipping_country->getLocated() }} @endif <i>(Das Land kann nicht mehr geändert werden.)</i></div>
<div class="">@if($homeparty_user->shipping_country) {{ $homeparty_user->shipping_country->getLocated() }} @endif <i>({{ __('order.land_can_no_longer_be_changed') }}.)</i></div>
</div>
</div>
<div class="form-row">
@ -212,7 +212,7 @@
<div class="form-group">
<label class="custom-control custom-checkbox m-0">
<input type="checkbox" class="custom-control-input" name="same_as_billing" id="same_as_billing" @if($homeparty_user->same_as_billing) checked="checked" @endif>
<span class="custom-control-label">{{__('Versand an die gleiche Adresse')}}</span>
<span class="custom-control-label">{{__('Shipping to the same address')}}</span>
</label>
</div>
<hr>

125
resources/views/user/homeparty/detail.blade.php
View file

@ -10,24 +10,24 @@
@endif
</div>
<a href="{{route('user_homepartys')}}" class="btn btn-sm btn-default float-right">zurück</a>
<a href="{{route('user_homepartys')}}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
</h4>
<div class="nav-tabs-top mb-4">
<ul class="nav nav-tabs nav-responsive-xl">
@if(!$step || $step >= 1)
<li class="nav-item">
<a class="nav-link @if(!$step || $step == 1 || $step == 10) active @endif" data-toggle="tab" href="#navs-top-homeparty">Auszeitparty</a>
<a class="nav-link @if(!$step || $step == 1 || $step == 10) active @endif" data-toggle="tab" href="#navs-top-homeparty">{{ __('homeparty.homeparty') }}</a>
</li>
@endif
@if($homeparty->id)
@if($step && $step >= 2)
<li class="nav-item">
<a class="nav-link @if($step == 2 || $step == 12) active @endif" data-toggle="tab" href="#navs-top-address">Lieferadresse</a>
<a class="nav-link @if($step == 2 || $step == 12) active @endif" data-toggle="tab" href="#navs-top-address">{{ __('Delivery address') }}</a>
</li>
@endif
@if($step && $step >= 3)
<li class="nav-item">
<a class="nav-link @if($step == 3 || $step == 13) active @endif" data-toggle="tab" href="#navs-top-host">Gastgeber:in</a>
<a class="nav-link @if($step == 3 || $step == 13) active @endif" data-toggle="tab" href="#navs-top-host">{{ __('homeparty.host') }}</a>
</li>
@endif
@endif
@ -41,15 +41,15 @@
@if($homeparty->step < 10)
<div class="col-12">
<span class="text-tiny float-right">* {{trans('register.required_fields')}}</span>
Auszeitparty verwalten
{{ __('homeparty.homeparty_manage') }}
</div>
@else
<div class="col-12">
<div class="d-flex justify-content-between align-items-center w-100">
<div>Auszeitparty verwalten</div>
<div>{{ __('homeparty.homeparty_manage') }}</div>
<div class="float-right">
<a href="{{route('user_homeparty_guests', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-md-person-add"></i> Gäste anlegen</a>
<a href="{{route('user_homeparty_order', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-md-basket"></i> Bestellung</a>
<a href="{{route('user_homeparty_guests', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-md-person-add"></i> {{ __('homeparty.create_guests') }}</a>
<a href="{{route('user_homeparty_order', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-md-basket"></i> {{ __('homeparty.order') }}</a>
</div>
</div>
</div>
@ -59,8 +59,8 @@
<div class="card-body">
<div class="form-row">
<div class="form-group col-md-3 {{ $errors->has('name') ? 'has-error' : '' }}">
<label for="name" class="form-label">{{ __('Gastgeber / Veranstalter') }}*</label>
{{ Form::text('name', $homeparty->name, array('placeholder'=>__('Gastgeber / Veranstalter'), 'class'=>'form-control', 'required')) }}
<label class="form-label">{{ __('homeparty.host_organiser_event') }}*</label>
{{ Form::text('name', $homeparty->name, array('placeholder'=>__('homeparty.host_organiser_event'), 'class'=>'form-control', 'required')) }}
@if ($errors->has('name'))
<span class="help-block">
<strong>{{ $errors->first('name') }}</strong>
@ -68,7 +68,7 @@
@endif
</div>
<div class="form-group col-md-3 {{ $errors->has('date') ? 'has-error' : '' }}">
<label for="date" class="form-label">{{ __('Veranstaltungsdatum') }}*</label>
<label for="date" class="form-label">{{ __('homeparty.event_date') }}*</label>
{{ Form::text('date', $homeparty->date, array('placeholder'=>Util::formatDate(), 'data-date-format'=>Util::formatDate(), 'data-start_view'=>2, 'class'=>'form-control datepicker-base', 'required')) }}
@if ($errors->has('date'))
<span class="help-block">
@ -77,8 +77,8 @@
@endif
</div>
<div class="form-group col-md-3 {{ $errors->has('place') ? 'has-error' : '' }}">
<label for="place" class="form-label">{{ __('Veranstaltungsort') }}*</label>
{{ Form::text('place', $homeparty->place, array('placeholder'=>__('Veranstaltungsort'), 'class'=>'form-control', 'required')) }}
<label for="place" class="form-label">{{ __('homeparty.event_place') }}*</label>
{{ Form::text('place', $homeparty->place, array('placeholder'=>__('homeparty.event_place'), 'class'=>'form-control', 'required')) }}
@if ($errors->has('place'))
<span class="help-block">
<strong>{{ $errors->first('place') }}</strong>
@ -88,12 +88,12 @@
@if($homeparty->id)
<div class="form-group col-md-3 {{ $errors->has('country_id') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Lieferland') }}*</label>
<label class="form-label">{{ __('Delivery country') }}*</label>
<div class="mt-2">@if($homeparty->country) {{ $homeparty->country->getLocated() }} @endif</div>
</div>
@else
<div class="form-group col-md-3 {{ $errors->has('country_id') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Lieferland') }}*</label>
<label class="form-label">{{ __('Delivery country') }}*</label>
{{ Form::select('country_id', \App\Models\ShippingCountry::getActiveShippingCountries(), $homeparty->country_id, array('data-live-search'=>'false', 'class'=>'selectpicker', 'id'=>'country_id') ) }}
@if ($errors->has('country_id'))
<span class="help-block">
@ -102,33 +102,33 @@
@endif
</div>
<div class="form-group col-md-12 text-right">
<i> Das Lieferland kann nach dem Anlegen nicht mehr geändert werden. Alle Lieferadressen müssen in diesem Land sein.</i>
<i> {{ __('homeparty.country_can_no_longer_be_changed_after_created') }}</i>
</div>
@endif
</div>
<div class="form-group">
<label class="form-label" for="description">{{ __('Beschreibung / Willkommenstext') }}</label>
{{ Form::textarea('description', $homeparty->description , array('placeholder'=>__('Beschreibung'), 'class'=>'form-control', 'rows'=>5)) }}
<label class="form-label" for="description">{{ __('homeparty.description_welcome_text') }} | <strong style="text-transform: uppercase"> {{ __('website.language') }} {{ \App::getLocale() }}</strong></label>
{{ Form::textarea('description', $homeparty->getLangOrDefault('description', false) , array('placeholder'=>__('homeparty.description_welcome_text'), 'class'=>'form-control', 'rows'=>5)) }}
</div>
<div class="form-group">
<button type="submit" class="btn btn-secondary mr-2 mb-2" name="action" value="homeparty-party-store-detail">
@if($homeparty->id) {{ __('Änderungen speichern') }} @else {{ __('Neue Auszeitparty anlegen') }} @endif</button>&nbsp;
<a href="{{route('user_homepartys')}}" class="btn btn-default mb-2">zurück zur Übersicht</a>
@if($homeparty->id) {{ __('save changes') }} @else {{ __('homeparty.create_new_homeparty') }} @endif</button>&nbsp;
<a href="{{route('user_homepartys')}}" class="btn btn-default mb-2">{{ __('back_to_overview') }}</a>
</div>
@if($homeparty->id && $homeparty->step >= 10)
<hr>
<div class="pt-2">
<label class="form-label">Einladungslink für Gäste <span class="text-muted"> (lass Deine Gäste ihre Daten selber ausfüllen)</span></label>
<label class="form-label">{{ __('homeparty.invitation_link_for_guests') }} <span class="text-muted"> ({{ __('homeparty.let_your_guests_fill_in_their_own_details') }})</span></label>
<div class="form-group">
<div class="input-group">
<span class="input-group-prepend">
<button class="btn btn-secondary" type="button" title="Kopiert!" data-clipboard-demo data-clipboard-target="#homeparty_link"><i class="ion ion-ios-copy"></i> Link kopieren</button>
<button class="btn btn-secondary" type="button" title="{{ __('homeparty.copy') }}" data-clipboard-demo data-clipboard-target="#homeparty_link"><i class="ion ion-ios-copy"></i> {{ __('homeparty.copy_link') }}</button>
</span>
<input type="text" class="form-control" name="homeparty_link" value="{{ $homeparty->getTokenLink() }}" id="homeparty_link" placeholder="">
</div>
</div>
<p>Teile diesen Link mit den Gästen (z.B. WhatsApp oder SMS), damit gelangt sie auf eine Zielseite wo sie ihre Daten selber ausfüllen können. Nutze das „Kopier-Symbol“, um den Link gleich in Deine Zwischenablage zu kopieren.</p>
<p>{{ __('homeparty.copy_link_info') }}</p>
</div>
@endif
</div>
@ -144,15 +144,15 @@
@if($homeparty->step < 10)
<div class="col-12">
<span class="text-tiny float-right">* {{trans('register.required_fields')}}</span>
Lieferadresse Auszeitparty {{ $homeparty->name }}
{{ __('homeparty.delivery_address_homeparty') }} {{ $homeparty->name }}
</div>
@else
<div class="col-12">
<div class="d-flex justify-content-between align-items-center w-100">
<div>Lieferadresse Auszeitparty {{ $homeparty->name }}</div>
<div>{{ __('homeparty.delivery_address_homeparty') }} {{ $homeparty->name }}</div>
<div class="float-right">
<a href="{{route('user_homeparty_guests', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-md-person-add"></i> Gäste anlegen</a>
<a href="{{route('user_homeparty_order', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-md-basket"></i> Bestellung</a>
<a href="{{route('user_homeparty_guests', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-md-person-add"></i> {{ __('homeparty.') }}Gäste anlegen</a>
<a href="{{route('user_homeparty_order', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-md-basket"></i> {{ __('homeparty.') }}Bestellung</a>
</div>
</div>
</div>
@ -160,12 +160,12 @@
</div>
</h5>
<div class="card-body">
<p>Trage hier bitte die zentrale Lieferadresse für die getätigten Bestellungen dieser Auszeitparty. Das kann Deine eigene Adresse aber auch die des Gastgebers sein. Je nachdem, wie Du die Verteilung der Produkte mit Deinen Gästen organisieren möchtest.</p>
<p>Wenn ein Gast seine Bestellung direkt an seine persönliche Adresse geschickt haben möchte, kannst Du das im Bestellprozess gesondert angeben.</p>
<p>{{ __('homeparty.please_enter_delivery_address_info') }}</p>
<p>{{ __('homeparty.guest_order_sent_directly_info') }}</p>
<hr>
<div class="form-row">
<div class="form-group col-md-12">
<label for="shipping_company" class="form-label">{{ __('Company name') }} (optional)</label>
<label for="shipping_company" class="form-label">{{ __('Company name') }} ({{__('optional')}})</label>
{{ Form::text('shipping_company', $homeparty_user->shipping_company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'shipping_company',)) }}
</div>
</div>
@ -216,8 +216,8 @@
</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', $homeparty_user->shipping_address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'shipping_address_2')) }}
<label class="form-label" for="shipping_address_2">{{ __('Flat Building optional') }}</label>
{{ Form::text('shipping_address_2', $homeparty_user->shipping_address_2, array('placeholder'=>__('Flat Building optional'), 'class'=>'form-control', 'id'=>'shipping_address_2')) }}
@if ($errors->has('shipping_address_2'))
<span class="help-block">
<strong>{{ $errors->first('shipping_address_2') }}</strong>
@ -250,7 +250,7 @@
<div class="form-group col-md-12">
{{ Form::hidden('shipping_country_id', $homeparty_user->shipping_country_id) }}
<label class="form-label">{{ __('Country') }}</label>
<div class="">@if($homeparty_user->shipping_country) {{ $homeparty_user->shipping_country->getLocated() }} @endif <i>(Das Land kann nicht mehr geändert werden.)</i></div>
<div class="">@if($homeparty_user->shipping_country) {{ $homeparty_user->shipping_country->getLocated() }} @endif <i>({{ __('order.land_can_no_longer_be_changed') }}.)</i></div>
</div>
</div>
<div class="form-row">
@ -267,9 +267,9 @@
</div>
<div class="form-group">
<button type="submit" class="btn btn-secondary mr-2 mb-2" name="action" value="homeparty-party-store-address">
Lieferadresse speichern
{{ __('Delivery address') }} {{ __('save') }}
</button>&nbsp;
<a href="{{route('user_homepartys')}}" class="btn btn-default mb-2">zurück zur Übersicht</a>
<a href="{{route('user_homepartys')}}" class="btn btn-default mb-2">{{ __('back_to_overview') }}</a>
</div>
</div>
@ -284,15 +284,15 @@
@if($homeparty->step < 10)
<div class="col-12">
<span class="text-tiny float-right">* {{trans('register.required_fields')}}</span>
Gastgeber:in Auszeitparty {{ $homeparty->name }}
{{ __('homeparty.host_homeparty') }} {{ $homeparty->name }}
</div>
@else
<div class="col-12">
<div class="d-flex justify-content-between align-items-center w-100">
<div>Gastgeber:in Auszeitparty {{ $homeparty->name }}</div>
<div>{{ __('homeparty.host_homeparty') }} {{ $homeparty->name }}</div>
<div class="float-right">
<a href="{{route('user_homeparty_guests', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-md-person-add"></i> Gäste anlegen</a>
<a href="{{route('user_homeparty_order', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-md-basket"></i> Bestellung</a>
<a href="{{route('user_homeparty_guests', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-md-person-add"></i> {{ __('homeparty.create_guests') }}</a>
<a href="{{route('user_homeparty_order', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-md-basket"></i> {{ __('homeparty.order') }}</a>
</div>
</div>
</div>
@ -300,12 +300,12 @@
</div>
</h5>
<div class="card-body">
<p>Trage hier bitte die Adresse des Gastgeber:in wo die Auszeitparty organisiert wird.</p>
<p>Die Rechnung von mivita wird an deine Adresse (Berater:in) gestellt. Die Abrechnung mit dem Gastgeber:in und den Gästern übernimmst du selbst.</p>
<p>{{ __('homeparty.homeparty_add_host_address_info') }}</p>
<p>{{ __('homeparty.homeparty_invoice_info') }}</p>
<hr>
<div class="form-row">
<div class="form-group col-md-12">
<label for="billing_company" class="form-label">{{ __('Company name') }} (optional)</label>
<label for="billing_company" class="form-label">{{ __('Company name') }} ({{__('optional')}})</label>
{{ Form::text('billing_company', $homeparty_user->billing_company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'billing_company', 'tabindex' => 1)) }}
</div>
</div>
@ -357,8 +357,8 @@
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('billing_address_2') ? 'has-error' : '' }}">
<label class="form-label" for="billing_address_2">{{ __('Wohnung / Gebäude (optional)') }}</label>
{{ Form::text('billing_address_2', $homeparty_user->billing_address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'billing_address_2', 'tabindex' => 6)) }}
<label class="form-label" for="billing_address_2">{{ __('Flat Building optional') }}</label>
{{ Form::text('billing_address_2', $homeparty_user->billing_address_2, array('placeholder'=>__('Flat Building optional'), 'class'=>'form-control', 'id'=>'billing_address_2', 'tabindex' => 6)) }}
</div>
</div>
<div class="form-row">
@ -385,7 +385,7 @@
<div class="form-group col-md-12">
{{ Form::hidden('billing_country_id', $homeparty_user->billing_country_id) }}
<label class="form-label">{{ __('Country') }}</label>
<div class="">@if($homeparty_user->billing_country) {{ $homeparty_user->billing_country->getLocated() }} @endif <i>(Das Land kann nicht mehr geändert werden.)</i></div>
<div class="">@if($homeparty_user->billing_country) {{ $homeparty_user->billing_country->getLocated() }} @endif <i>({{ __('order.land_can_no_longer_be_changed') }}.)</i></div>
</div>
</div>
<div class="form-row">
@ -402,9 +402,9 @@
</div>
<div class="form-group">
<button type="submit" class="btn btn-secondary mr-2 mb-2" name="action" value="homeparty-party-store-host">
Gastgeber:in Adresse speichern
{{ __('homeparty.host_address_save') }}
</button>&nbsp;
<a href="{{route('user_homepartys')}}" class="btn btn-default mb-2">zurück zur Übersicht</a>
<a href="{{route('user_homepartys')}}" class="btn btn-default mb-2">{{ __('back_to_overview') }}</a>
</div>
</div>
@ -432,21 +432,22 @@
});
$.extend( $.validator.messages, {
required: "Dieses Feld ist ein Pflichtfeld.",
maxlength: $.validator.format( "Geben Sie bitte maximal {0} Zeichen ein." ),
minlength: $.validator.format( "Geben Sie bitte mindestens {0} Zeichen ein." ),
rangelength: $.validator.format( "Geben Sie bitte mindestens {0} und maximal {1} Zeichen ein." ),
email: "Geben Sie bitte eine gültige E-Mail Adresse ein.",
url: "Geben Sie bitte eine gültige URL ein.",
date: "Bitte geben Sie ein gültiges Datum ein.",
number: "Geben Sie bitte eine Nummer ein.",
digits: "Geben Sie bitte nur Ziffern ein.",
equalTo: "Bitte denselben Wert wiederholen.",
range: $.validator.format( "Geben Sie bitte einen Wert zwischen {0} und {1} ein." ),
max: $.validator.format( "Geben Sie bitte einen Wert kleiner oder gleich {0} ein." ),
min: $.validator.format( "Geben Sie bitte einen Wert größer oder gleich {0} ein." ),
creditcard: "Geben Sie bitte eine gültige Kreditkarten-Nummer ein."
required: "{{__('account.validator_required')}}",
maxlength: $.validator.format( "{{__('account.validator_maxlength')}}" ),
minlength: $.validator.format( "{{__('account.validator_minlength')}}" ),
rangelength: $.validator.format( "{{__('account.validator_rangelength')}}" ),
email: "{{__('account.validator_email')}}",
url: "{{__('account.validator_url')}}",
date: "{{__('account.validator_date')}}",
number: "{{__('account.validator_number')}}",
digits: "{{__('account.validator_digits')}}",
equalTo: "{{__('account.validator_equalTo')}}",
range: $.validator.format( "{{__('account.validator_range')}}" ),
max: $.validator.format( "{{__('account.validator_max')}}" ),
min: $.validator.format( "{{__('account.validator_min')}}" ),
creditcard: "{{__('account.validator_creditcard')}}"
});
@ -496,7 +497,7 @@
required: "{{__('This field is required.')}}",
},
salutation : {
required: "{{__('Bitte angeben.')}}",
required: "{{__('please specify')}}",
},
first_name : {
required: "{{__('This field is required.')}}",

41
resources/views/user/homeparty/guest_detail.blade.php
View file

@ -10,10 +10,10 @@
<div class="card mb-3">
<div class="card-body py-3">
<div class="form-group mb-0">
<label class="form-label">Einladungslink für Gäste <span class="text-muted"> (lass Deine Gäste ihre Daten selber ausfüllen)</span></label>
<label class="form-label">{{ __('homeparty.invitation_link_for_guests') }} <span class="text-muted"> ({{ __('homeparty.let_your_guests_fill_in_their_own_details') }})</span></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="#homeparty_link_{{$homeparty->id}}"><i class="ion ion-ios-copy"></i> Link kopieren</button>
<button class="btn btn-sm btn-secondary" type="button" title="{{ __('homeparty.copy') }}" data-clipboard-demo data-clipboard-target="#homeparty_link_{{$homeparty->id}}"><i class="ion ion-ios-copy"></i> {{ __('homeparty.copy_link') }}</button>
</span>
<input type="text" class="form-control" name="homeparty_link_{{$homeparty->id}}" value="{{ $homeparty->getTokenLink() }}" id="homeparty_link_{{$homeparty->id}}" placeholder="">
</div>
@ -26,11 +26,11 @@
<h5 class="card-header">
<div class="row">
<div class="col-xs-12 col-sm-6">
@if($homeparty_user->is_host) Gastgeber, @else Gast-, @endif Rechungsadresse
@if($homeparty_user->is_host) {{ __('homeparty.host') }}, @else {{ __('homeparty.guest') }}, @endif {{ __('homeparty.invoice_address') }}
</div>
<div class="col-xs-12 col-sm-6">
<span class="text-tiny float-right">* {{trans('register.required_fields')}}</span>
<span class="d-none d-lg-inline">Lieferadresse</span>
<span class="d-none d-lg-inline">{{ __('Delivery address') }}</span>
</div>
</div>
</h5>
@ -38,7 +38,7 @@
</div>
<div class="text-left mt-3">
<button type="submit" class="btn btn-secondary mr-2 mb-2" name="action" value="homeparty-user-store">{{ __('save') }}</button>&nbsp;
<a href="{{route('user_homeparty_guests', [$homeparty->id])}}" class="btn btn-default mb-2">zurück zur Übersicht</a>
<a href="{{route('user_homeparty_guests', [$homeparty->id])}}" class="btn btn-default mb-2">{{ __('back_to_overview') }}</a>
</div>
{!! Form::close() !!}
@ -57,21 +57,22 @@
});
$.extend( $.validator.messages, {
required: "Dieses Feld ist ein Pflichtfeld.",
maxlength: $.validator.format( "Geben Sie bitte maximal {0} Zeichen ein." ),
minlength: $.validator.format( "Geben Sie bitte mindestens {0} Zeichen ein." ),
rangelength: $.validator.format( "Geben Sie bitte mindestens {0} und maximal {1} Zeichen ein." ),
email: "Geben Sie bitte eine gültige E-Mail Adresse ein.",
url: "Geben Sie bitte eine gültige URL ein.",
date: "Bitte geben Sie ein gültiges Datum ein.",
number: "Geben Sie bitte eine Nummer ein.",
digits: "Geben Sie bitte nur Ziffern ein.",
equalTo: "Bitte denselben Wert wiederholen.",
range: $.validator.format( "Geben Sie bitte einen Wert zwischen {0} und {1} ein." ),
max: $.validator.format( "Geben Sie bitte einen Wert kleiner oder gleich {0} ein." ),
min: $.validator.format( "Geben Sie bitte einen Wert größer oder gleich {0} ein." ),
creditcard: "Geben Sie bitte eine gültige Kreditkarten-Nummer ein."
required: "{{__('account.validator_required')}}",
maxlength: $.validator.format( "{{__('account.validator_maxlength')}}" ),
minlength: $.validator.format( "{{__('account.validator_minlength')}}" ),
rangelength: $.validator.format( "{{__('account.validator_rangelength')}}" ),
email: "{{__('account.validator_email')}}",
url: "{{__('account.validator_url')}}",
date: "{{__('account.validator_date')}}",
number: "{{__('account.validator_number')}}",
digits: "{{__('account.validator_digits')}}",
equalTo: "{{__('account.validator_equalTo')}}",
range: $.validator.format( "{{__('account.validator_range')}}" ),
max: $.validator.format( "{{__('account.validator_max')}}" ),
min: $.validator.format( "{{__('account.validator_min')}}" ),
creditcard: "{{__('account.validator_creditcard')}}"
});
@ -98,7 +99,7 @@
required: "{{__('This field is required.')}}",
},
salutation : {
required: "{{__('Bitte angeben.')}}",
required: "{{__('please specify')}}",
},
first_name : {
required: "{{__('This field is required.')}}",

32
resources/views/user/homeparty/guests.blade.php
View file

@ -18,14 +18,12 @@
@if(!$homeparty->completed)
<div>
@if($homeparty_user->is_host)
<a href="{{route('user_homeparty_detail', [$homeparty->id, 13])}}" class="text-body text-big font-weight-semibold">
<span class="text-muted">Gastgeber:in </span>
<span class="text-muted">{{ __('homeparty.host') }} </span>
@else
<a href="{{route('user_homeparty_guest_detail', [$homeparty->id, $homeparty_user->id])}}" class="text-body text-big font-weight-semibold">
<span class="text-muted">Gast {{$g_count++}} </span>
<span class="text-muted">{{ __('homeparty.guest') }} {{$g_count++}} </span>
@endif
{{$homeparty_user->billing_firstname}} {{$homeparty_user->billing_lastname}}</a>
@ -34,16 +32,16 @@
</div>
<div>
@if($homeparty_user->is_host)
<a href="{{route('user_homeparty_detail', [$homeparty->id, 13])}}" class="btn btn-sm btn-secondary mr-2"><i class="fa fa-edit"></i> bearbeiten</a>
<a href="{{route('user_homeparty_detail', [$homeparty->id, 13])}}" class="btn btn-sm btn-secondary mr-2"><i class="fa fa-edit"></i> {{ __('edit') }}</a>
@else
<a href="{{route('user_homeparty_guest_detail', [$homeparty->id, $homeparty_user->id])}}" class="text-body text-big font-weight-semibold">
@endif
<div class="btn-group project-actions">
@if($homeparty_user->is_host)
<span class="ion ion-md-trash text-muted" data-toggle="tooltip" title="Gastgeber:in kann nicht gelsöcht werden"></span>
<span class="ion ion-md-trash text-muted" data-toggle="tooltip" title="{{ __('homeparty.host_can_not_delete') }} "></span>
@else
<a href="{{ route('user_homeparty_delete', ['hpu', $homeparty->id, $homeparty_user->id]) }}"
class="" onclick="return confirm('Homeparty Gast wirklich löschen?');">
class="" onclick="return confirm('{{ __('homeparty.guest_delete_really') }} ');">
<span class="ion ion-md-trash text-danger"></span>
</a>
@endif
@ -54,9 +52,9 @@
<div class="text-body text-big font-weight-semibold">
@if($homeparty_user->is_host)
<span class="text-muted">Gastgeber:in </span>
<span class="text-muted">{{ __('homeparty.host') }} </span>
@else
<span class="text-muted">Gast {{$g_count++}} </span>
<span class="text-muted">{{ __('homeparty.guest') }} {{$g_count++}} </span>
@endif
{{$homeparty_user->billing_firstname}} {{$homeparty_user->billing_lastname}}
</div>
@ -70,7 +68,7 @@
<div class="card-body pt-0 mt-2">
<div class="row">
<div class="col">
<div class="text-muted small">Adresse</div>
<div class="text-muted small">{{ __('Address') }}</div>
<div class="font-weight-bold">{{$homeparty_user->billing_address}}
{{$homeparty_user->billing_zipcode}}
{{$homeparty_user->city}}
@ -78,11 +76,11 @@
</div>
</div>
<div class="col">
<div class="text-muted small">E-Telefon</div>
<div class="text-muted small">{{ __('Phone') }}</div>
<div class="font-weight-bold">{{$homeparty_user->billing_phone}}</div>
</div>
<div class="col">
<div class="text-muted small">E-Mail</div>
<div class="text-muted small">{{ __('E-Mail') }}</div>
<div class="font-weight-bold">{{$homeparty_user->billing_email}}</div>
</div>
</div>
@ -95,10 +93,10 @@
<div class="card">
<div class="card-body py-3">
<div class="form-group mb-0">
<label class="form-label">Einladungslink für Gäste <span class="text-muted"> (lass Deine Gäste ihre Daten selber ausfüllen)</span></label>
<label class="form-label">{{ __('homeparty.invitation_link_for_guests') }} <span class="text-muted"> ({{ __('homeparty.let_your_guests_fill_in_their_own_details') }})</span></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="#homeparty_link_{{$homeparty->id}}"><i class="ion ion-ios-copy"></i> Link kopieren</button>
<button class="btn btn-sm btn-secondary" type="button" title="{{ __('homeparty.copy') }}" data-clipboard-demo data-clipboard-target="#homeparty_link_{{$homeparty->id}}"><i class="ion ion-ios-copy"></i> {{ __('homeparty.copy_link') }}</button>
</span>
<input type="text" class="form-control" name="homeparty_link_{{$homeparty->id}}" value="{{ $homeparty->getTokenLink() }}" id="homeparty_link_{{$homeparty->id}}" placeholder="">
</div>
@ -110,10 +108,10 @@
</div>
<div class="text-left mt-3">
@if(!$homeparty->completed)
<a href="{{route('user_homeparty_detail', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-2"><i class="ion ion-ios-cog"></i> Homparty verwalten</a>
<a href="{{route('user_homeparty_detail', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-2"><i class="ion ion-ios-cog"></i> {{ __('homeparty.homeparty_manage') }}</a>
@endif
<a href="{{route('user_homeparty_order', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-2"><i class="ion ion-md-basket"></i> Bestellung</a>
<a href="{{route('user_homepartys')}}" class="btn btn-sm btn-default mb-2">zurück zur Übersicht</a>
<a href="{{route('user_homeparty_order', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-2"><i class="ion ion-md-basket"></i> {{ __('homeparty.order') }}</a>
<a href="{{route('user_homepartys')}}" class="btn btn-sm btn-default mb-2">{{ __('back_to_overview') }}</a>
</div>

36
resources/views/user/homeparty/index.blade.php
View file

@ -3,7 +3,7 @@
@section('content')
<h4 class="font-weight-bold py-2 mb-2 d-flex justify-content-between align-items-center w-100 ">
<div>{{ __('navigation.my_homeparty') }} / {{ __('navigation.overview') }}</div>
<a href="{{route('user_homeparty_detail', ['new'])}}" class="btn btn-secondary rounded-pill d-block float-right"><span class="ion ion-md-add"></span>&nbsp; Neue Auszeitparty anlegen</a>
<a href="{{route('user_homeparty_detail', ['new'])}}" class="btn btn-secondary rounded-pill d-block float-right"><span class="ion ion-md-add"></span>&nbsp; {{ __('homeparty.create_new_homeparty') }} </a>
</h4>
<div class="row">
@ -15,13 +15,13 @@
<div>
<a href="{{route('user_homeparty_detail', [$homeparty->id])}}" class="text-body text-big font-weight-semibold">{{$homeparty->name}}</a>
@if($homeparty->completed)
<span class="badge badge-secondary align-text-bottom ml-1">abgeschlossen</span>
<span class="badge badge-secondary align-text-bottom ml-1">{{ __('homeparty.completed') }} </span>
@endif
</div>
@if(!$homeparty->completed)
<div class="btn-group project-actions">
<a href="{{ route('user_homeparty_delete', ['hp', $homeparty->id]) }}"
class=" dropdown-item" onclick="return confirm('Auszeitparty wirklich löschen?');">
class=" dropdown-item" onclick="return confirm('{{ __('homeparty.homeparty_delete_really') }}');">
<span class="ion ion-md-trash text-danger"></span>
</a>
</div>
@ -31,28 +31,28 @@
<div class="progress-bar" style="width: 100%;"></div>
</div>
<div class="card-body pt-1 pb-3">
{{$homeparty->description}}
{{$homeparty->getLangOrDefault('description', false)}}
</div>
<div class="card-body pt-0">
<div class="row">
<div class="col">
<div class="text-muted small">Datum</div>
<div class="text-muted small">{{ __('order.date') }}</div>
<div class="font-weight-bold">{{$homeparty->date}}</div>
</div>
<div class="col">
<div class="text-muted small">Veranstaltungsort</div>
<div class="text-muted small">{{ __('homeparty.event_place') }} </div>
<div class="font-weight-bold">{{$homeparty->place}} / @if($homeparty->country) {{ $homeparty->country->getLocated() }} @endif</div>
</div>
<div class="col">
<div class="text-muted small">Gäste</div>
<div class="text-muted small">{{ __('homeparty.guests') }}</div>
<div class="font-weight-bold">{{$homeparty->homeparty_guests->count()}}</div>
</div>
<div class="col">
<div class="text-muted small">Umsatz</div>
<div class="text-muted small">{{ __('order.turnover') }}</div>
<div class="font-weight-bold">@if(isset($homeparty->order['price'])){{Util::formatNumber($homeparty->order['price'])}}@endif</div>
</div>
<div class="col">
<div class="text-muted small">Points</div>
<div class="text-muted small">{{ __('order.points') }}</div>
<div class="font-weight-bold">@if(isset($homeparty->order['points'])){{$homeparty->order['points']}}@endif</div>
</div>
</div>
@ -61,10 +61,10 @@
<hr class="m-0">
<div class="card-body py-3">
<div class="form-group mb-0">
<label class="form-label">Einladungslink für Gäste <span class="text-muted"> (lass Deine Gäste ihre Daten selber ausfüllen)</span></label>
<label class="form-label">{{ __('homeparty.invitation_link_for_guests') }} <span class="text-muted"> ({{ __('homeparty.let_your_guests_fill_in_their_own_details') }}l)</span></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="#homeparty_link_{{$homeparty->id}}"><i class="ion ion-ios-copy"></i> Link kopieren</button>
<button class="btn btn-sm btn-secondary" type="button" title="{{ __('homeparty.copy') }}" data-clipboard-demo data-clipboard-target="#homeparty_link_{{$homeparty->id}}"><i class="ion ion-ios-copy"></i> {{ __('homeparty.copy_link') }}</button>
</span>
<input type="text" class="form-control" name="homeparty_link_{{$homeparty->id}}" value="{{ $homeparty->getTokenLink() }}" id="homeparty_link_{{$homeparty->id}}" placeholder="">
</div>
@ -76,17 +76,17 @@
<div class="d-flex flex-wrap">
@if(!$homeparty->completed)
<a href="{{route('user_homeparty_detail', [$homeparty->id])}}" class="btn btn-secondary mr-2 mb-2"><i class="ion ion-ios-cog"></i> Verwalten</a>
<a href="{{route('user_homeparty_detail', [$homeparty->id])}}" class="btn btn-secondary mr-2 mb-2"><i class="ion ion-ios-cog"></i> {{ __('homeparty.manage') }}</a>
@if($homeparty->step < 10)
<div class="alert alert-danger py-1">Lieferadresse und Gastgeber:in sind noch nicht angelegt. <a href="{{route('user_homeparty_detail', [$homeparty->id])}}"><i class="ion ion-ios-cog"></i> Verwalten</a> Danach können Gäste angelegt und Bestellung aufgegeben werden.</div>
<div class="alert alert-danger py-1">{{ __('homeparty.create_delivery_address_host_info') }} <a href="{{route('user_homeparty_detail', [$homeparty->id])}}"><i class="ion ion-ios-cog"></i> {{ __('homeparty.manage') }}</a> {{ __('homeparty.create_guests_info') }} </div>
@else
<a href="{{route('user_homeparty_guests', [$homeparty->id])}}" class="btn btn-secondary mr-2 mb-2"><i class="ion ion-md-contacts"></i> Gästeliste</a>
<a href="{{ route('user_homeparty_guest_detail', [$homeparty->id, 'new']) }}" class="btn btn-secondary mr-2 mb-2"><i class="ion ion-md-person-add"></i> Gast anlegen</a>
<a href="{{route('user_homeparty_order', [$homeparty->id])}}" class="btn btn-secondary mr-2 mb-2"><i class="ion ion-md-basket"></i> Bestellung</a>
<a href="{{route('user_homeparty_guests', [$homeparty->id])}}" class="btn btn-secondary mr-2 mb-2"><i class="ion ion-md-contacts"></i> {{ __('homeparty.guest_lists') }}</a>
<a href="{{ route('user_homeparty_guest_detail', [$homeparty->id, 'new']) }}" class="btn btn-secondary mr-2 mb-2"><i class="ion ion-md-person-add"></i> {{ __('homeparty.create_guest') }}</a>
<a href="{{route('user_homeparty_order', [$homeparty->id])}}" class="btn btn-secondary mr-2 mb-2"><i class="ion ion-md-basket"></i> {{ __('homeparty.order') }}</a>
@endif
@else
<a href="{{route('user_homeparty_guests', [$homeparty->id])}}" class="btn btn-secondary mr-2 mb-2"><i class="ion ion-md-contacts"></i> Gästeliste</a>
<a href="{{route('user_homeparty_order', [$homeparty->id])}}" class="btn btn-secondary mr-2 mb-2"><i class="ion ion-md-basket"></i> Bestellung ansehen</a>
<a href="{{route('user_homeparty_guests', [$homeparty->id])}}" class="btn btn-secondary mr-2 mb-2"><i class="ion ion-md-contacts"></i> {{ __('homeparty.guest_lists') }}</a>
<a href="{{route('user_homeparty_order', [$homeparty->id])}}" class="btn btn-secondary mr-2 mb-2"><i class="ion ion-md-basket"></i> {{ __('homeparty.order_show') }}</a>
@endif
</div>
</div>

26
resources/views/user/homeparty/modal_show_products.blade.php
View file

@ -1,11 +1,11 @@
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">
Produkt hinzufügen /
{{ __('homeparty.add_product') }} /
@if($homeparty_user->is_host)
Gastgeber/in
{{ __('homeparty.host') }}
@else
Gast
{{ __('homeparty.guest') }}
@endif
{{ $homeparty_user->billing_firstname }} {{ $homeparty_user->billing_lastname }}
</h5>
@ -17,24 +17,24 @@
<thead>
<tr>
<th></th>
<th>{{__('Bild')}}</th>
<th>{{__('Produkt')}}</th>
<th>{{__('Artikelnr.')}}</th>
<th>{{__('tables.image')}}</th>
<th>{{__('tables.products')}}</th>
<th>{{__('tables.article_no')}}</th>
@if($homeparty->getCardInfo('user_tax_free'))
<th><span class="no-line-break">EK-Preis</span> netto</th>
<th><span class="no-line-break">VK-Preis</span> netto</th>
<th><span class="no-line-break">{{ __('tables.ek_price') }}</span> {{__('tables.net')}}</th>
<th><span class="no-line-break">{{__('tables.vk_price')}}</span> {{__('tables.net')}}</th>
@else
<th><span class="no-line-break">EK-Preis</span> brutto</th>
<th><span class="no-line-break">VK-Preis</span> brutto</th>
<th><span class="no-line-break">{{ __('tables.ek_price') }}</span> {{__('tables.gross')}}</th>
<th><span class="no-line-break">{{__('tables.vk_price')}}</span> {{__('tables.gross')}}</th>
@endif
<th>{{__('Points')}}</th>
<th>{{__('tables.points')}}</th>
</tr>
</thead>
</table>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
<button type="button" class="btn btn-default" data-dismiss="modal">{{ __('close') }}</button>
</div>
</div>
<script>
@ -59,7 +59,7 @@
"iDisplayLength": 1000,
"paging": false,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
},
drawCallback: function (settings) {
iqHomepartyCart.reInitModal();

48
resources/views/user/homeparty/order.blade.php
View file

@ -84,7 +84,7 @@
</style>
<h4 class="font-weight-bold py-2 mb-2 d-flex justify-content-between align-items-center w-100 ">
<div>{{ __('navigation.my_homeparty') }} / {{ $homeparty->name }} - {{ $homeparty->date }}</div>
<a href="{{route('user_homepartys')}}" class="btn btn-sm btn-default float-right">zurück</a>
<a href="{{route('user_homepartys')}}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
</h4>
@if(Session::has('custom-error'))
@ -95,30 +95,30 @@
@endif
@if($userHistoryPaymentOrder && $userHistoryPaymentOrder->status > 2)
<h6 class="alert badge-{{$userHistoryPaymentOrder->getStatusColor()}}">Eine Zahlung wurde ausgeführt. Status: {{ trans('payment.status.'.$userHistoryPaymentOrder->getStatusType())}}</h6>
<h6 class="alert badge-{{$userHistoryPaymentOrder->getStatusColor()}}"> {{__('membership.payment_has_been_made') }}: {{ trans('payment.status.'.$userHistoryPaymentOrder->getStatusType())}}</h6>
@endif
<div class="card mb-4">
<div class="card-body">
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Bestellland</div>
<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">Lieferland</div>
<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">MwSt</div>
<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">Reverse Charge Verfahren</div>
<div class="text-muted small">{{ __('payment.reverse_charge_procedure') }}</div>
{{ App\Services\UserService::getOrderInfo('user_reverse_charge') }}
</div>
</div>
<i>Das Lieferland kann nicht mehr geändert werden.</i>
<i>{{ __('order.delivery_country_can_no_longer_be_changed') }}</i>
</div>
</div>
@ -129,11 +129,11 @@
<div class="row">
<div class="col-12">
<div class="d-flex justify-content-between align-items-center w-100">
<div>Bestellung anlegen</div>
<div>{{ __('homeparty.order_create') }}</div>
@if(!$homeparty->completed)
<div class="float-right">
<a href="{{route('user_homeparty_detail', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-ios-cog"></i> Verwalten</a>
<a href="{{route('user_homeparty_guests', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-md-person-add"></i> Gäste anlegen</a>
<a href="{{route('user_homeparty_detail', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-ios-cog"></i> {{ __('homeparty.manage') }}</a>
<a href="{{route('user_homeparty_guests', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-1"><i class="ion ion-md-person-add"></i> {{ __('homeparty.create_guests') }}</a>
</div>
@endif
</div>
@ -143,7 +143,7 @@
<div class="card-body">
<div class="row">
<div class="col-md-6">
<h6>Lieferadresse
<h6>{{ __('Delivery address') }}
@if(!$homeparty->completed)
<a href="{{route('user_homeparty_detail', [$homeparty->id, 13])}}"><i class="fa fa-edit"></i> </a>
@endif
@ -153,7 +153,7 @@
{{-- TODO Berechnung Bonus --}}
<div class="col-md-6">
<h6>Aktuelle Bonusansicht</h6>
<h6>{{ __('homeparty.current_bonus_view') }}</h6>
<div id="insert_show_bonus">
@include('user.homeparty.show_bonus', ['homeparty' => $homeparty])
</div>
@ -168,7 +168,7 @@
<div class="row">
<div class="col-12">
<div class="d-flex justify-content-between align-items-center w-100">
<div>Bestellung Gastgeber:in {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}}</div>
<div>{{ __('homeparty.order_host') }} {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}}</div>
</div>
</div>
@if(!$homeparty->completed)
@ -177,7 +177,7 @@
data-id="{{ $homeparty->id }}"
data-action="homeparty-add-product"
data-user_id="{{$homeparty->homeparty_host->id}}"
data-route="{{ route('modal_load') }}"><i class="fa fa-plus-circle"></i> Produkt hinzufügen</button>
data-route="{{ route('modal_load') }}"><i class="fa fa-plus-circle"></i> {{ __('homeparty.add_product') }}</button>
</div>
@endif
</div>
@ -198,7 +198,7 @@
<div class="row">
<div class="col-12">
<div class="d-flex justify-content-between align-items-center w-100">
<div>Bestellung {!! $g_count++ !!}. Gast {{$homeparty_guest->billing_firstname}} {{$homeparty_guest->billing_lastname}}</div>
<div>{{ __('homeparty.order') }} {!! $g_count++ !!}. {{ __('homeparty.guest') }} {{$homeparty_guest->billing_firstname}} {{$homeparty_guest->billing_lastname}}</div>
</div>
</div>
@if(!$homeparty->completed)
@ -207,7 +207,7 @@
data-id="{{ $homeparty->id }}"
data-action="homeparty-add-product"
data-user_id="{{$homeparty_guest->id}}"
data-route="{{ route('modal_load') }}"><i class="fa fa-plus-circle"></i> Produkt hinzufügen</button>
data-route="{{ route('modal_load') }}"><i class="fa fa-plus-circle"></i> {{ __('homeparty.add_product') }}</button>
</div>
@endif
</div>
@ -227,7 +227,7 @@
<div class="row">
<div class="col-12">
<div class="d-flex justify-content-between align-items-center w-100">
<div>Gesamtübersicht</div>
<div>{{ __('homeparty.general_overview') }}</div>
</div>
</div>
</div>
@ -241,13 +241,13 @@
<hr>
@if($homeparty->homeparty_host && $homeparty->homeparty_host->isAddress())
<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>
<button type="submit" class="btn btn-secondary"><i class="ion ion-ios-redo"></i> {{ __('order.confirm_and_proceed_to_checkout') }}</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>
<em class="small text-center"> <i class="fa fa-lock"></i> {{ __('payment.checkout_ssl_server') }}</em>
@else
<div class="alert alert-warning">
Die Bestellung kann erst abgesendet werden, wenn die Lieferadresse Gastgeber/in angelegt ist. <a href="{{route('user_homeparty_guest_detail', [$homeparty->id, $homeparty->homeparty_host->id])}}"><i class="fa fa-edit"></i> </a></h6>
{{ __('homeparty.order_can_be_send_delivery_address_info') }} <a href="{{route('user_homeparty_guest_detail', [$homeparty->id, $homeparty->homeparty_host->id])}}"><i class="fa fa-edit"></i> </a></h6>
</div>
@endif
@ -257,9 +257,9 @@
<div class="text-left mt-3">
@if(!$homeparty->completed)
<a href="{{route('user_homeparty_detail', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-2"><i class="ion ion-ios-cog"></i> Homparty verwalten</a>
<a href="{{route('user_homeparty_detail', [$homeparty->id])}}" class="btn btn-sm btn-secondary mr-2 mb-2"><i class="ion ion-ios-cog"></i> {{ __('homeparty.homeparty_manage') }}</a>
@endif
<a href="{{route('user_homepartys')}}" class="btn btn-sm btn-default mb-2">zurück zur Übersicht</a>
<a href="{{route('user_homepartys')}}" class="btn btn-sm btn-default mb-2">{{ __('back_to_overview') }}</a>
</div>
{!! Form::close() !!}
@ -271,11 +271,7 @@
<script src="{{ asset('/js/iq-homeparty-cart.js') }}?v=1{{ get_file_last_time('/js/iq-homeparty-cart.js') }}"></script>
<script type="application/javascript">
var iqHomepartyCart = IqHomepartyCart.init();
$( document ).ready(function() {
});

111
resources/views/user/homeparty/self_guest_detail.blade.php
View file

@ -5,13 +5,13 @@
@if($homeparty_user === null)
<h4 class="font-weight-bold py-2 mb-2 d-flex justify-content-between align-items-center w-100 ">
<div>Auszeitparty / {{ $homeparty->name }} - {{ $homeparty->date }}</div>
<div>{{ __('homeparty.homeparty') }} / {{ $homeparty->name }} - {{ $homeparty->date }}</div>
</h4>
@if(Session::has('alert-save'))
<div class="alert alert-dark-secondary alert-dismissible fade show">
<div class="font-weight-bold">
{{__('saved')}}:
Deine Daten erfolgreich wurden angelegt. Viel Spaß bei der Auszeitparty!
{{ __('homeparty.your_data_has_been_successfully_created_have_fun') }}
</div>
</div>
@endif
@ -24,9 +24,9 @@
<h4 class="font-weight-normal mb-0">
@if($homeparty_host)
@if($homeparty_host->billing_salutation === 'mr')
Dein Gastgeber
{{ __('homeparty.your_host') }}
@else
Deine Gastgeberin
{{ __('homeparty.your_hostess') }}
@endif
@endif
</h4>
@ -53,7 +53,7 @@
</div>
</div>
<div class="col-md-6">
<h4 class="font-weight-normal mb-0">Deine MIVITA Beratung</h4>
<h4 class="font-weight-normal mb-0">{{ __('homeparty.your_MIVITA_advice') }}</h4>
<div class="media align-items-center py-3 mb-3 mt-0">
<img src="{{ asset('images/avatar.png') }}" alt="" class="d-block ui-w-80 rounded-circle">
<div class="media-body ml-4">
@ -83,21 +83,21 @@
<div class="progress-bar" style="width: 100%;"></div>
</div>
<div class="card-body pt-3 pb-3">
<h4 class="font-weight-normal mb-2">Einladung</h4>
{{$homeparty->description}}
<h4 class="font-weight-normal mb-2">{{ __('homeparty.invitation') }} </h4>
{{$homeparty->getLangOrDefault('description', false)}}
</div>
<div class="card-body pt-0">
<div class="row">
<div class="col">
<div class="text-muted small">Datum</div>
<div class="text-muted small">{{ __('order.date') }} </div>
<div class="font-weight-bold">{{$homeparty->date}}</div>
</div>
<div class="col">
<div class="text-muted small">Veranstaltungsort</div>
<div class="text-muted small">{{ __('homeparty.event_place') }} </div>
<div class="font-weight-bold">{{$homeparty->place}} / @if($homeparty->country) {{ $homeparty->country->getLocated() }} @endif</div>
</div>
<div class="col">
<div class="text-muted small">Straße / Hausnummer</div>
<div class="text-muted small">{{ __('Street') }} / {{ __('House number') }}</div>
<div class="font-weight-bold">
@if($homeparty_host)
{{ $homeparty_host->billing_address }}
@ -105,7 +105,7 @@
</div>
</div>
<div class="col">
<div class="text-muted small">PLZ &amp; Ort</div>
<div class="text-muted small">{{ __('Postcode') }} &amp; {{ __('City') }}</div>
<div class="font-weight-bold">
@if($homeparty_host)
{{ $homeparty_host->billing_zipcode }} {{ $homeparty_host->billing_city }}
@ -113,7 +113,7 @@
</div>
</div>
<div class="col">
<div class="text-muted small">Land</div>
<div class="text-muted small">{{ __('Country') }}</div>
<div class="font-weight-bold">
@if($homeparty_host && $homeparty_host->billing_country)
{{ $homeparty_host->billing_country->de }}
@ -134,52 +134,25 @@
<div>
<div class="text-body text-big font-weight-semibold">
@if($homeparty_user->is_host)
<span class="text-muted">Gastgeber/in: </span>
<span class="text-muted">{{ __('homeparty.host') }}: </span>
@else
<span class="text-muted">Gast {{$g_count++}}: </span>
<span class="text-muted">{{ __('homeparty.guest') }} {{$g_count++}}: </span>
@endif
{{$homeparty_user->billing_firstname}} {{$homeparty_user->billing_lastname}}
</div>
{{-- <span class="badge badge-success align-text-bottom ml-1">offen ...</span> --}}
</div>
{{-- <div>
<a href="{{route('homeparty', [$homeparty->token, $homeparty_user->id])}}" class="btn btn-sm btn-secondary mr-2"><i class="fa fa-edit"></i> bearbeiten</a>
</div>
--}}
</div>
{{-- <div class="progress rounded-0" style="height: 2px;">
<div class="progress-bar" style="width: 100%;"></div>
</div>
<div class="card-body pt-3">
<div class="row">
<div class="col">
<div class="text-muted small">Adresse</div>
<div class="font-weight-bold">{{$homeparty_user->billing_address}}
{{$homeparty_user->billing_zipcode}}
{{$homeparty_user->city}}
@if($homeparty_user->billing_country_id){{ $homeparty_user->billing_country->getLocated() }}@endif
</div>
</div>
<div class="col">
<div class="text-muted small">E-Telefon</div>
<div class="font-weight-bold">{{$homeparty_user->billing_phone}}</div>
</div>
<div class="col">
<div class="text-muted small">E-Mail</div>
<div class="font-weight-bold">{{$homeparty_user->billing_email}}</div>
</div>
</div>
</div>--}}
</div>
@endforeach
</div>
</div>
<a href="{{route('homeparty', [$homeparty->token, 'new'])}}" class="btn btn-md btn-secondary rounded-pill"><span class="ion ion-md-person-add"></span>&nbsp; als Gast eintragen</a>
<a href="{{route('homeparty', [$homeparty->token, 'new'])}}" class="btn btn-md btn-secondary rounded-pill"><span class="ion ion-md-person-add"></span>&nbsp; {{ __('homeparty.add_as_guest') }} </a>
@else
<h4 class="font-weight-bold py-2 mb-2 d-flex justify-content-between align-items-center w-100 ">
<div>Auszeitparty / {{ $homeparty->name }} - {{ $homeparty->date }}</div>
<a href="{{route('homeparty', [$homeparty->token])}}" class="btn btn-sm btn-default float-right">zurück</a>
<div>{{ __('homeparty.homeparty') }} / {{ $homeparty->name }} - {{ $homeparty->date }}</div>
<a href="{{route('homeparty', [$homeparty->token])}}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
</h4>
{!! Form::open(['url' => route('homeparty', [$homeparty->token, $homeparty_user->id]), 'class' => 'form-horizontal', 'id'=>'homeparty-user-form-validation']) !!}
@ -205,18 +178,18 @@
@endif
<div class="card mb-4">
<div class="col-md-12 px-4 pt-4">
<h6 class="mb-2">Eingabe Deiner persönlichen Daten für die Auszeitparty</h6>
<p>Hinweis: Aus Datenschutzgründen werden Deine persönlichen Daten hier den anderen Teilnehmern nicht angezeigt. Nach dem Absenden können Sie auch nicht mehr bearbeitet werden. Möchtest Du nachträglich eine Änderung vornehmen, wende Dich bitte an Deinen persönlichen MIVITA Berater.</p>
<h6 class="mb-2">{{ __('homeparty.enter_your_personal_data_for_homeparty') }}</h6>
<p>{{ __('homeparty.data_protection_reasons_your_personal_data_will_not_be_shown') }}</p>
<hr>
</div>
<h5 class="card-header">
<div class="row">
<div class="col-xs-12 col-sm-6">
@if($homeparty_user->is_host) Gastgeber/in, @else Gast-, @endif Rechungsadresse
@if($homeparty_user->is_host) {{ __('homeparty.host') }}, @else {{ __('homeparty.guest') }} , @endif {{ __('homeparty.invoice_address') }}
</div>
<div class="col-xs-12 col-sm-6">
<span class="text-tiny float-right">* {{trans('register.required_fields')}}</span>
<span class="d-none d-lg-inline">Lieferadresse</span>
<span class="d-none d-lg-inline">{{ __('Delivery address') }}</span>
</div>
</div>
</h5>
@ -228,8 +201,8 @@
<input type="checkbox" class="custom-control-input" name="checkbox_datenverarbeitung" id="checkbox_datenverarbeitung" required>
<span class="custom-control-label secondary">
<span class="fa fa-angle-double-left text-primary fa-lg"></span>
Hiermit willige ich in die im Rahmen der <button type="button" class="btn btn-outline-primary btn-xs update_modal_data_load" data-url="https://my.mivita.test/loading/modal" data-data="data_protection" data-target="#modal-loading">Datenschutzerklärung</button>
genannte Datenverarbeitung ein. Ich wurde darüber informiert, dass ich diese Einwilligung jederzeit widerrufen kann.*
{!! __('homeparty.acceptect_data_protection', ['datenschutz'=>'<button type="button" class="btn btn-outline-primary btn-xs update_modal_data_load" data-url="https://my.mivita.test/loading/modal" data-data="data_protection" data-target="#modal-loading">'.__('homeparty.data_protection').'</button>']) !!}
{{ __('homeparty.revoke_consent_at_any_time') }}
</span>
</label>
</div>
@ -240,14 +213,14 @@ genannte Datenverarbeitung ein. Ich wurde darüber informiert, dass ich diese Ei
<input type="checkbox" class="custom-control-input" name="checkbox_daten_completely" id="checkbox_daten_completely">
<span class="custom-control-label secondary">
<span class="fa fa-angle-double-left text-primary fa-lg"></span>
Ich bestätige, dass meine Daten richtig und vollständig sind. Eine Änderung ist nach dem Absenden nur noch über meinen persönlichen MIVITA Berater möglich.*
{{ __('homeparty.confirm_my_data_is_correct_and_complete') }}
</span>
</label>
</div>
</div>
</div>
<div class="text-left mt-3">
<button type="submit" class="btn btn-secondary mr-2 mb-2" name="action" value="homeparty-user-store"> @if($homeparty_user->id) {{ __('Änderungen speichern') }} @else {{ __('absenden') }} @endif</button>&nbsp;
<button type="submit" class="btn btn-secondary mr-2 mb-2" name="action" value="homeparty-user-store"> @if($homeparty_user->id) {{ __('save changes') }} @else {{ __('sended') }} @endif</button>&nbsp;
</div>
{!! Form::close() !!}
@ -266,22 +239,22 @@ genannte Datenverarbeitung ein. Ich wurde darüber informiert, dass ich diese Ei
});
$.extend( $.validator.messages, {
required: "Dieses Feld ist ein Pflichtfeld.",
maxlength: $.validator.format( "Geben Sie bitte maximal {0} Zeichen ein." ),
minlength: $.validator.format( "Geben Sie bitte mindestens {0} Zeichen ein." ),
rangelength: $.validator.format( "Geben Sie bitte mindestens {0} und maximal {1} Zeichen ein." ),
email: "Geben Sie bitte eine gültige E-Mail Adresse ein.",
url: "Geben Sie bitte eine gültige URL ein.",
date: "Bitte geben Sie ein gültiges Datum ein.",
number: "Geben Sie bitte eine Nummer ein.",
digits: "Geben Sie bitte nur Ziffern ein.",
equalTo: "Bitte denselben Wert wiederholen.",
range: $.validator.format( "Geben Sie bitte einen Wert zwischen {0} und {1} ein." ),
max: $.validator.format( "Geben Sie bitte einen Wert kleiner oder gleich {0} ein." ),
min: $.validator.format( "Geben Sie bitte einen Wert größer oder gleich {0} ein." ),
creditcard: "Geben Sie bitte eine gültige Kreditkarten-Nummer ein."
required: "{{__('account.validator_required')}}",
maxlength: $.validator.format( "{{__('account.validator_maxlength')}}" ),
minlength: $.validator.format( "{{__('account.validator_minlength')}}" ),
rangelength: $.validator.format( "{{__('account.validator_rangelength')}}" ),
email: "{{__('account.validator_email')}}",
url: "{{__('account.validator_url')}}",
date: "{{__('account.validator_date')}}",
number: "{{__('account.validator_number')}}",
digits: "{{__('account.validator_digits')}}",
equalTo: "{{__('account.validator_equalTo')}}",
range: $.validator.format( "{{__('account.validator_range')}}" ),
max: $.validator.format( "{{__('account.validator_max')}}" ),
min: $.validator.format( "{{__('account.validator_min')}}" ),
creditcard: "{{__('account.validator_creditcard')}}"
});
// Set up validator
@ -307,7 +280,7 @@ genannte Datenverarbeitung ein. Ich wurde darüber informiert, dass ich diese Ei
required: "{{__('This field is required.')}}",
},
salutation : {
required: "{{__('Bitte angeben.')}}",
required: "{{__('please specify')}}",
},
first_name : {
required: "{{__('This field is required.')}}",

18
resources/views/user/homeparty/show_bonus.blade.php
View file

@ -1,43 +1,43 @@
<table class="table table-small">
<tr>
<td>Zielumsatz {{\App\Services\HomepartyCart::getFormattedBonusValue()}} &euro; Gutschein:</td>
<td>{{ __('homeparty.target_turnover') }} {{\App\Services\HomepartyCart::getFormattedBonusValue()}} &euro; {{ __('homeparty.voucher') }}:</td>
<td>{{\App\Services\HomepartyCart::getFormattedPrice()}} &euro; / {{\App\Services\HomepartyCart::getFormattedBonusStart()}} &euro;</td>
</tr>
@if(!\App\Services\HomepartyCart::$is_bonus)
<tr>
<td>fehlen noch:</td>
<td>{{ __('homeparty.missing') }}:</td>
<td><span class="text-danger font-weight-bold"> {{\App\Services\HomepartyCart::getFormattedBonusDiff()}} &euro;</span></td>
</tr>
<tr>
<td class="border-top">Nächster Bonus:</td>
<td class="border-top">{{ __('homeparty.next_bonus') }}:</td>
<td class="border-top">- &euro; </td>
</tr>
<tr>
<td class="">fehlen noch:</td>
<td class="">{{ __('homeparty.missing') }}:</td>
<td class="">- &euro;</td>
</tr>
@else
<tr>
<td>fehlen noch:</td>
<td>{{ __('homeparty.missing') }}:</td>
<td>0 &euro;</td>
</tr>
<tr>
<td class="border-top">Nächster Bonus {{\App\Services\HomepartyCart::getFormattedBonusCouponNextValue()}} &euro; ab:</td>
<td class="border-top">{{ __('homeparty.next_bonus') }} {{\App\Services\HomepartyCart::getFormattedBonusCouponNextValue()}} &euro; {{ __('homeparty.from') }}:</td>
<td class="border-top">{{\App\Services\HomepartyCart::getFormattedBonusCouponNextStep()}} &euro; </td>
</tr>
<tr>
<td class="">fehlen noch:</td>
<td class="">{{ __('homeparty.missing') }}:</td>
<td class="">{{\App\Services\HomepartyCart::getFormattedBonusCouponFault()}} &euro;</td>
</tr>
@endif
<tr>
<td>Gutschein Bonus:</td>
<td>{{ __('homeparty.voucher_bonus') }}:</td>
<td>{{\App\Services\HomepartyCart::getFormattedBonusCoupon()}} &euro;</td>
</tr>
<tr>
<td class="border-top"><strong>Gutschein Gesamt</strong></td>
<td class="border-top"><strong>{{ __('homeparty.voucher_total') }}</strong></td>
<td class="border-top"><strong>{{\App\Services\HomepartyCart::getFormattedBonusTotal()}} &euro;</strong></td>
</tr>
</table>

12
resources/views/user/homeparty/show_calc_bonus_host.blade.php
View file

@ -4,7 +4,7 @@
@if(!$user_cart->isPrice() && (\App\Services\HomepartyCart::$is_bonus || \App\Services\HomepartyCart::$is_bonus_coupon))
<tr class="foot-small">
<td colspan="8" class="text-left bg-danger text-white">
<strong>Gutschein / Bonus kann nicht angewendet werden, da beim Gastgeber:in keine Produkte hinzugefügt wurden.</strong>
<strong>{{ __('homeparty.voucher_bonus_cannot_be_applied') }} </strong>
</td>
</tr>
@ -12,7 +12,7 @@
@if(\App\Services\HomepartyCart::$is_bonus)
<tr class="foot-small">
<td colspan="5" class="text-left">Gutschrift Homeparty Gutschein</td>
<td colspan="5" class="text-left">{{ __('homeparty.credit_homeparty_voucher') }}</td>
<td>&nbsp;</td>
<td class="text-right">
<div class="no-line-break">- {{ \App\Services\HomepartyCart::getFormattedBonusValue() }} &euro;</div>
@ -31,7 +31,7 @@
@endif
@if(\App\Services\HomepartyCart::$is_bonus_coupon)
<tr class="foot-small">
<td colspan="5" class="text-left">Gutschrift Bonus</td>
<td colspan="5" class="text-left">{{ __('homeparty.credit_bonus') }}</td>
<td>&nbsp;</td>
<td class="text-right">
<div class="no-line-break">- {{ \App\Services\HomepartyCart::getFormattedBonusCoupon() }} &euro;</div>
@ -49,7 +49,7 @@
@endif
@if(\App\Services\HomepartyCart::$is_bonus)
<tr class="foot-small">
<td colspan="4" class="text-left">Abzug Points durch Gutschein</td>
<td colspan="4" class="text-left">{{ __('homeparty.deduct_points_by_voucher') }}</td>
<td class="text-right">- {{ \App\Services\HomepartyCart::getFormattedBonusPointsDiff() }} </td>
<td>&nbsp;</td>
<td>&nbsp;</td>
@ -59,7 +59,7 @@
{{-- <tr class="foot-small">
<td colspan="5" class="text-left bg-warning-light">Versandkosten:</td>
<td colspan="5" class="text-left bg-warning-light">{{ __('order.shipping_costs') }}:</td>
<td class="bg-warning-light">&nbsp;</td>
<td class="text-right bg-warning-light">&nbsp;</td>
<td class="text-right bg-warning-light">
@ -70,7 +70,7 @@
</td>
</tr>--}}
<tr>
<td colspan="4" class="border-top"><strong>Gesamt:</strong></td>
<td colspan="4" class="border-top"><strong>{{ __('order.total') }} :</strong></td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{$user_cart->getFormattedPoints()}}</strong></div>
</td>

38
resources/views/user/homeparty/show_products_order.blade.php
View file

@ -3,14 +3,14 @@
<table class="table table-striped">
<thead>
<tr>
<th>{{__('Bild')}}</th>
<th>{{__('Produkt')}}</th>
<th>{{__('Anzahl')}}</th>
<th>{{__('Marge')}}</th>
<th class="text-right">{{__('Points')}}</th>
<th class="text-right">{{__('Verdienst')}}</th>
<th class="text-right">{{__('VK-Preis')}}</th>
<th class="text-right">{{__('EK-Preis')}}</th>
<th>{{__('tables.image')}}</th>
<th>{{__('tables.product')}}</th>
<th>{{__('tables.quantity')}}</th>
<th>{{__('tables.margin')}}</th>
<th class="text-right">{{__('tables.points')}}</th>
<th class="text-right">{{__('tables.earnings')}}</th>
<th class="text-right">{{__('tables.vk_price')}}</th>
<th class="text-right"> {{ __('tables.ek_price') }}</th>
</tr>
</thead>
@ -23,14 +23,14 @@
@endif
</td>
<td class="min-width-80">
<strong>{{ $value->product->name }}</strong>
<strong>{{ $value->product->getLang('name') }}</strong>
<div class="text-body">
<div>Inhalt: {{ $value->product->contents }}</div>
<div>Art.-Nr.: {{ $value->product->number }}</div>
<div>{{ __('order.content') }}: {{ $value->product->contents }}</div>
<div>{{ __('order.art_no') }}: {{ $value->product->number }}</div>
</div>
@if(!$homeparty->completed)
<div class="options">
<a href="#" class="auto-delete-product remove_item_form_cart product-tooltip" data-order-item-id="{{$value->id}}" data-product-id="{{ $value->product->id }}"><i class="fa fa-times"></i> Artikel entfernen</a>
<a href="#" class="auto-delete-product remove_item_form_cart product-tooltip" data-order-item-id="{{$value->id}}" data-product-id="{{ $value->product->id }}"><i class="fa fa-times"></i> {{ __('order.article_remove') }}</a>
</div>
@endif
</td>
@ -87,19 +87,19 @@
@if(!$homeparty_guest->isAddress())
<td colspan="3" class="border-top">
<p>Keine Lieferadresse angelegt <a href="{{route('user_homeparty_guest_detail', [$homeparty_guest->homeparty->id, $homeparty_guest->id])}}"><i class="fa fa-edit"></i> </a></p>
<p>{{ __('order.') }} <a href="{{route('user_homeparty_guest_detail', [$homeparty_guest->homeparty->id, $homeparty_guest->id])}}"><i class="fa fa-edit"></i> </a></p>
<td colspan="5" class="border-top">&nbsp;</td>
@else
<td colspan="3" class="border-top">
@if(!$homeparty->completed)
<select class="custom-select select_delivery_option" name="select_delivery_option">
<option value="host" @if($homeparty_guest->getDelivery() === 'host') selected @endif>Lieferung an Gastgeber</option>
<option value="direct" @if($homeparty_guest->getDelivery() === 'direct') selected @endif>Lieferung direkt an den Gast</option>
<option value="host" @if($homeparty_guest->getDelivery() === 'host') selected @endif>{{ __('homeparty.delivery_to_host') }}</option>
<option value="direct" @if($homeparty_guest->getDelivery() === 'direct') selected @endif>{{ __('homeparty.delivery_directly_to_the_guest') }}</option>
</select>
@else
@if($homeparty_guest->getDelivery() === 'host') Lieferung an Gastgeber @endif
@if($homeparty_guest->getDelivery() === 'direct') Lieferung direkt an den Gast @endif
@if($homeparty_guest->getDelivery() === 'host') {{ __('homeparty.delivery_to_host') }} @endif
@if($homeparty_guest->getDelivery() === 'direct') {{ __('homeparty.delivery_directly_to_the_guest') }} @endif
@endif
</td>
<td colspan="5" class="border-top">&nbsp;</td>
@ -107,7 +107,7 @@
</tr>
@if($homeparty_guest->getDelivery() === 'direct')
{{-- <tr>
<td colspan="5" class="text-left bg-warning-light">Versandkosten</td>
<td colspan="5" class="text-left bg-warning-light">{{ __('order.shipping_costs') }}</td>
<td class="bg-warning-light">&nbsp;</td>
<td class="text-right bg-warning-light">
<div class="no-line-break">{{$user_cart->getFormattedShippingPrice()}} &euro;</div>
@ -124,7 +124,7 @@
</tr>--}}
@endif
<tr>
<td colspan="4" class="border-top"><strong>Gesamt:</strong></td>
<td colspan="4" class="border-top"><strong>{{ __('order.total') }} :</strong></td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{ $user_cart->getFormattedPoints()}}</strong></div>
</td>

24
resources/views/user/homeparty/show_total_order.blade.php
View file

@ -3,10 +3,10 @@
<thead>
<tr>
<th>&nbsp;</th>
<th class="text-right">{{__('Points')}}</th>
<th class="text-right">{{__('Verdienst')}}</th>
<th class="text-right">{{__('VK-Preis')}}</th>
<th class="text-right">{{__('EK-Preis')}}</th>
<th class="text-right">{{__('tables.points')}}</th>
<th class="text-right">{{__('tables.earnings')}}</th>
<th class="text-right">{{__('tables.vk_price')}}</th>
<th class="text-right"> {{ __('tables.ek_price') }}</th>
</tr>
</thead>
<tbody>
@ -14,7 +14,7 @@
@php($user_cart = \App\Services\HomepartyCart::getUserCart($homeparty->homeparty_host->id))
<tr>
<td>
<strong>Gastgeber:in | {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}}</strong>
<strong>{{ __('homeparty.host') }}| {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}}</strong>
</td>
<td class="text-right">
{{$user_cart->getFormattedPoints()}}
@ -40,7 +40,7 @@
</tr>
@if($user_cart->shipping_price > 0)
<tr>
<td class="text-left bg-warning-light1" colspan="4">Versandkosten Gastgeber:in</td>
<td class="text-left bg-warning-light1" colspan="4">{{ __('homeparty.shipping_costs_host') }}</td>
<td class="text-right bg-warning-light1">
<div class="no-line-break">{{$user_cart->getFormattedShippingPrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
@ -57,7 +57,7 @@
@php($user_cart = \App\Services\HomepartyCart::getUserCart($homeparty_guest->id))
<tr>
<td>
<strong> {!! ++$g_count !!}. Gast | {{$homeparty_guest->billing_firstname}} {{$homeparty_guest->billing_lastname}}</strong>
<strong> {!! ++$g_count !!}. {{ __('homeparty.guest') }} | {{$homeparty_guest->billing_firstname}} {{$homeparty_guest->billing_lastname}}</strong>
</td>
<td class="text-right">
{{$user_cart->getFormattedPoints()}}
@ -83,7 +83,7 @@
</tr>
@if($user_cart->shipping_price > 0)
<tr>
<td class="text-left bg-warning-light1" colspan="4">Versandkosten {!! $g_count !!}. Gast</td>
<td class="text-left bg-warning-light1" colspan="4">{{ __('order.shipping_costs') }} {!! $g_count !!}. {{ __('homeparty.guest') }} </td>
<td class="text-right bg-warning-light1">
<div class="no-line-break">{{$user_cart->getFormattedShippingPrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
@ -110,7 +110,7 @@
@endif
<tr class="foot-small">
<td colspan="1" class="border-top">
<strong>Gesamtsummen:</strong>
<strong>{{ __('order.total_sums') }}:</strong>
</td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{\App\Services\HomepartyCart::getFormattedPointsTotal()}}</strong></div>
@ -137,7 +137,7 @@
@if($homeparty->getCardInfo('user_tax_free'))
<tr class="foot-small">
<td colspan="1" class="text-muted">
Enthaltene MwSt:
{{ __('order.included_VAT') }}:
</td>
<td class="">&nbsp;</td>
@ -148,7 +148,7 @@
@else
<tr class="foot-small">
<td colspan="1" class="text-muted">
Summe ohne MwSt:
{{ __('order.total_without_VAT') }}:
</td>
<td class="">&nbsp;</td>
@ -168,7 +168,7 @@
</tr>
<tr class="foot-small">
<td colspan="1" class="text-muted">
Enthaltene MwSt:
{{ __('order.included_VAT') }}:
</td>
<td class="">&nbsp;</td>

13
resources/views/user/membership/_abo_options.blade.php
View file

@ -1,8 +1,13 @@
<hr>
{{--
Abo Option deaktiviert
<hr>
<label class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" name="abo_options" @if($user && $user->isAboOption()) checked="checked" @endif>
<span class="custom-control-label secondary"><strong>{{__('payment.status.auto_renewal_hl')}}:</strong> {{__('payment.status.auto_renewal_line_1')}}</span>
<p class="text-muted">{{__('payment.status.auto_renewal_line_2')}}</p>
<span class="custom-control-label secondary"><strong>{{__('payment.auto_renewal_hl')}}:</strong> {{__('payment.auto_renewal_line_1')}}</span>
<p class="text-muted">{{__('payment.auto_renewal_line_2')}}</p>
</label>
<hr>
<hr>
--}}

7
resources/views/user/membership/_change.blade.php
View file

@ -4,14 +4,11 @@
<!-- Description -->
<div class="card mb-4">
<div class="card-body">
{!! Form::open(['url' => route('user_membership_store', ['change_order']), 'class' => 'form-horizontal']) !!}
<div class="table-responsive">
<table class="table table- m-0">
<tbody class="switchers-stacked">
@foreach($products as $product)
<tr>
<td class="text-center align-middle px-0">
<label class="switcher switcher-secondary">
@ -29,7 +26,7 @@
<img src="{{ route('product_image', [$product->images->first()->slug]) }}" class="d-block ui-w-60 ui-bordered mr-4" alt="">
@endif
<div class="media-body">
<h5 class="d-block text-dark">{{$product->name}} @if($product->id == $user->payment_order_id) (aktives Paket) @endif</h5>
<h5 class="d-block text-dark">{{$product->getLang('name')}} @if($product->id == $user->payment_order_id) ({{ __('membership.active_package') }}) @endif</h5>
{!! $product->getLang('copy') !!}
</div>
</div>
@ -48,7 +45,7 @@
</div>
<div class="text-left mt-3">
<hr>
<button type="submit" class="btn btn-secondary">{{ __('auswählen und speichern') }}</button>&nbsp;
<button type="submit" class="btn btn-secondary">{{ __('payment.select_and_save') }}</button>&nbsp;
</div>
{!! Form::close() !!}

14
resources/views/user/membership/_payment.blade.php
View file

@ -27,7 +27,7 @@
<img src="{{ route('product_image', [$product->images->first()->slug]) }}" class="d-block ui-w-60 ui-bordered mr-4" alt="">
@endif
<div class="media-body">
<h5 class="d-block text-dark">{{$product->name}}</h5>
<h5 class="d-block text-dark">{{$product->getLang('name')}}</h5>
{!! $product->getLang('copy') !!}
</div>
</div>
@ -39,16 +39,18 @@
</table>
</div>
<div class="text-left mt-3">
<hr>
{{-- Abo Option deaktiviert
<hr>
<label class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" name="abo_options">
<span class="custom-control-label secondary"><strong>{{__('payment.status.auto_renewal_hl')}}:</strong> {{__('payment.status.auto_renewal_line_1')}}</span>
<p class="text-muted">{{__('payment.status.auto_renewal_line_2')}}</p>
<span class="custom-control-label secondary"><strong>{{__('payment.auto_renewal_hl')}}:</strong> {{__('payment.auto_renewal_line_1')}}</span>
<p class="text-muted">{{__('payment.auto_renewal_line_2')}}</p>
</label>
<hr>
<button type="submit" class="btn btn-secondary">{{ __('wählen und weiter zur Kasse') }}</button>&nbsp;
--}}
<button type="submit" class="btn btn-secondary">{{ __('payment.select_and_proceed_to_checkout') }}</button>&nbsp;
<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>
<em class="small text-center"> <i class="fa fa-lock"></i> {{ __('payment.checkout_ssl_server') }}</em>
</div>
{!! Form::close() !!}

31
resources/views/user/membership/_payment_order.blade.php
View file

@ -4,25 +4,23 @@
<!-- Description -->
<div class="card mb-4">
<div class="card-body">
<h5>Dein gebuchtes Paket</h5>
<h5>{{ __('membership.your_booked_package') }}</h5>
{!! Form::open(['url' => route('user_membership_store', ['payment_order']), 'class' => 'form-horizontal']) !!}
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Bestellland</div>
<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">Lieferland</div>
<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">MwSt</div>
<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">Reverse Charge Verfahren</div>
<div class="text-muted small">{{ __('payment.reverse_charge_procedure') }}</div>
{{ App\Services\UserService::getOrderInfo('user_reverse_charge') }}
</div>
</div>
@ -49,7 +47,7 @@
<img src="{{ route('product_image', [$product->images->first()->slug]) }}" class="d-block ui-w-60 ui-bordered mr-4" alt="">
@endif
<div class="media-body">
<h5 class="d-block text-dark">{{$product->name}}</h5>
<h5 class="d-block text-dark">{{$product->getLang('name')}}</h5>
{!! $product->getLang('copy') !!}
</div>
</div>
@ -68,23 +66,28 @@
</table>
</div>
<div class="text-left mt-3">
{{-- Abo Option deaktiviert
@if(!$user->isAboOption())
<hr>
<label class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" name="abo_options">
<span class="custom-control-label secondary"><strong>{{__('payment.status.auto_renewal_hl')}}:</strong> {{__('payment.status.auto_renewal_line_1')}}</span>
<p class="text-muted">{{__('payment.status.auto_renewal_line_2')}}</p>
<span class="custom-control-label secondary"><strong>{{__('payment.auto_renewal_hl')}}:</strong> {{__('payment.auto_renewal_line_1')}}</span>
<p class="text-muted">{{__('payment.auto_renewal_line_2')}}</p>
</label>
<hr>
@else
<p><strong>Alternativ hast Du die Möglichkeit jetzt direkt Deine Mitgliedschaft mit anderen Zahlungsmöglichkeite zu bezahlen.</strong><br>
Ist die Mitgliedschaft vor dem {!! Carbon::parse($user->payment_account)->modify('-'.config('mivita.abo_booking_days').' days')->format('d.m.Y') !!} bezahlt, wird das SEPA Mandart nicht ausgeführt!</p>
<p><strong>{{__('membership.payment_copy_1')}}</strong><br>
{!! __('membership.payment_copy_2', ['date'=> Carbon::parse($user->payment_account)->modify('-'.config('mivita.abo_booking_days').' days')->format('d.m.Y')]) !!}</p>
<hr>
@endif
<button type="submit" class="btn btn-secondary">{{ __('wählen und weiter zur Kasse') }}</button>&nbsp;
--}}
<button type="submit" class="btn btn-secondary">{{ __('payment.select_and_proceed_to_checkout') }}</button>&nbsp;
<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>
<em class="small text-center"> <i class="fa fa-lock"></i> {{ __('payment.checkout_ssl_server') }}</em>
</div>
{!! Form::close() !!}
</div>

22
resources/views/user/membership/_upgrade.blade.php
View file

@ -8,19 +8,19 @@
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Bestellland</div>
<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">Lieferland</div>
<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">MwSt</div>
<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">Reverse Charge Verfahren</div>
<div class="text-muted small">{{ __('payment.reverse_charge_procedure') }}</div>
{{ App\Services\UserService::getOrderInfo('user_reverse_charge') }}
</div>
</div>
@ -47,20 +47,20 @@
<img src="{{ route('product_image', [$product->images->first()->slug]) }}" class="d-block ui-w-60 ui-bordered mr-4" alt="">
@endif
<div class="media-body">
<h5 class="d-block text-dark">{{$product->name}}</h5>
<h5 class="d-block text-dark">{{$product->getLang('name')}}</h5>
{!! $product->getLang('copy') !!}
</div>
</div>
</td>
<td class="text-right font-weight-semibold align-middle p-4">
<span class="no-line-break">{{ $product->getFormattedPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) }} €</span> Monat
<span class="no-line-break">{{ $product->getFormattedPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) }} €</span> {{ __('payment.month') }}
@if(\App\Services\UserService::$user_country->currency)
<span class="no-line-break">{!! $product->getFormattedPriceCurrencyWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) !!}</span>
@endif
</td>
</tr>
<tr>
<td colspan="2" class="text-right">Restlaufzeit: {{$diff_months}} @if($diff_months==1) Monat @else Monate @endif</td>
<td colspan="2" class="text-right">{{ __('payment.remaining_time') }}: {{$diff_months}} @if($diff_months==1) {{ __('payment.month') }} @else {{ __('payment.Monate') }} @endif</td>
<td class="text-right font-weight-semibold"> {!! Util::formatNumber($diff_months * $product->getPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country)) !!} EUR</td>
</tr>
@endforeach
@ -68,10 +68,12 @@
</table>
</div>
<div class="text-left mt-3">
@include('user.membership._abo_options')
<button type="submit" class="btn btn-secondary">{{ __('wählen und weiter zur Kasse') }}</button>&nbsp;
{{-- Abo Option deaktiviert
@include('user.membership._abo_options')
--}}
<button type="submit" class="btn btn-secondary"> {{ __('payment.select_and_proceed_to_checkout') }}</button>&nbsp;
<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>
<em class="small text-center"> <i class="fa fa-lock"></i> {{ __('payment.checkout_ssl_server') }}</em>
</div>
</div>
</div>

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

@ -23,39 +23,48 @@
@if($user->isRenewalAccount())
<div class="card w-100 mb-4">
<h5 class="card-header">Deine Mitglidschaft wurde am {{ $user->nextRenewalAccount() }} verlängert.</h5>
<h5 class="card-header">
{!! __('membership.membership_was_renewed', ['date'=>$user->nextRenewalAccount()]) !!}
</h5>
<div class="card-body">
@if($userHistoryPaymentOrder && $userHistoryPaymentOrder->status > 2)
<h6 class="alert badge-{{$userHistoryPaymentOrder->getStatusColor()}}">Eine Zahlung wurde ausgeführt. Status: {{ trans('payment.status.'.$userHistoryPaymentOrder->getStatusType())}}</h6>
<h6 class="alert badge-{{$userHistoryPaymentOrder->getStatusColor()}}">{{__('membership.payment_has_been_made') }} {{__('membership.status') }}: {{ trans('payment.status.'.$userHistoryPaymentOrder->getStatusType())}}</h6>
@endif
@if($user->payment_account && $user->isAboOption())
@if($user->payment_account && $user->isAboOption())
@if($user->daysActiveAccount() < config('mivita.abo_booking_days') )
<p class="alert py-2 px-2 badge-secondary">Wir konnten am <strong>{!! Carbon::parse($user->payment_account)->modify('-'.config('mivita.abo_booking_days').' days')->format('d.m.Y') !!}</strong> Deine Mitgliedschaftsgebühr <strong>nicht</strong> automatisch per SEPA Mandat einziehen.<br>
@else
<p class="alert py-2 px-2 badge-secondary">Deine automatische Verlängerung ist aktiv, wir werden am <strong>{!! Carbon::parse($user->payment_account)->modify('-'.config('mivita.abo_booking_days').' days')->format('d.m.Y') !!}</strong> Deine Mitgliedschaftsgebühr automatisch per SEPA Mandat einziehen.<br>
{{--
Abo Option deaktiviert
@if($user->payment_account && $user->isAboOption())
@if($user->payment_account && $user->isAboOption())
@if($user->daysActiveAccount() < config('mivita.abo_booking_days') )
<p class="alert py-2 px-2 badge-secondary">
{!! __('membership.we_do_not_collect_membership_fee', ['date'=>Carbon::parse($user->payment_account)->modify('-'.config('mivita.abo_booking_days').' days')->format('d.m.Y')]) !!}
<br>
@else
<p class="alert py-2 px-2 badge-secondary">
{!! __('membership.renewal_is_active_membership_fee_automatic', ['date'=>Carbon::parse($user->payment_account)->modify('-'.config('mivita.abo_booking_days').' days')->format('d.m.Y')]) !!}
<br>
@endif
<hr>
@endif
<hr>
@else
@if($user->payment_order_id && $user->payment_order_product->identifier === 'show_upgrade')
<p></p>
@endif
@else
@if($user->payment_order_id && $user->payment_order_product->identifier === 'show_upgrade')
<p></p>
@endif
@endif
--}}
@if($user->payment_order_id)
@if($user->payment_order_product->identifier === 'show_upgrade')
<p><strong>Eine Rückstufung Deiner Berater-Mitgliedschaft ist nicht mehr möglich.</strong></p>
<p><strong>Du hast die Möglichkeit Dein Paket zu upgraden, wähle einfach das erweiterte Paket aus und gehe weiter zur Zahlung.</strong></p>
<p><strong>{{ __('membership.downgrade_membership_is_not_possible') }}</strong></p>
<p><strong>{{ __('membership.upgrade_package_and_proceed_payment') }}</strong></p>
@endif
@if($user->payment_order_product->identifier === 'show_order')
<p><strong>Eine Änderung Deines Berater-Paketes ist nicht mehr möglich.</strong></p>
<p><strong>{{ __('membership.is_no_longer_possible_to_change_package') }}</strong></p>
@endif
@endif
@if($userHistoryPaymentOrder && $userHistoryPaymentOrder->status > 2)
<h5 class="card-header bg-light">
<a href="#" class="" data-toggle="collapse" data-target="#collapsePaymentForm" aria-expanded="false" aria-controls="collapsePaymentForm">
<i class="fa fa-caret-expand"></i> {{ __('Zahlungsoptionen öffnen') }}
<i class="fa fa-caret-expand"></i> {{ __('membership.open_payment_options') }}
</a>
</h5>
<div class="collapse" id="collapsePaymentForm">
@ -71,13 +80,14 @@
{{-- no Shop - Upgrade --}}
@if($user->isActiveAccount() && !$user->isActiveShop())
<div class="card w-100 mb-4">
<h5 class="card-header">{{__('MIVITA BUSINESS Paket')}} {{__('Upgrade')}}</h5>
<h5 class="card-header">{{__('membership.MIVITA_BUSINESS_Paket')}} {{__('membership.upgrade')}}</h5>
<div class="card-body">
@if($userHistoryUpgradeOrder && $userHistoryUpgradeOrder->status > 2)
<h6 class="alert badge-{{$userHistoryUpgradeOrder->getStatusColor()}}">Eine Zahlung wurde ausgeführt. Status: {{ trans('payment.status.'.$userHistoryUpgradeOrder->getStatusType())}}</h6>
<h6 class="alert badge-{{$userHistoryUpgradeOrder->getStatusColor()}}">
{{__('membership.payment_has_been_made') }} {{__('membership.status') }}: {{ trans('payment.status.'.$userHistoryUpgradeOrder->getStatusType())}}</h6>
@endif
<h5 class="d-block text-dark">Erweitere jetzt Deine Mitglidschaft auf MIVITA BUSINESS Paket!</h5>
<p>Berechnet werden die restlichen Monate bis zur Berater-Mitgliedschaft Verlängerung. Danach wird jährlich der MIVITA BUSINESS Paketpreis berechnet.</p>
<h5 class="d-block text-dark">>{{ __('membership.upgrade_copy_1') }}</h5>
<p>{{ __('membership.upgrade_copy_2') }}</p>
@if($userHistoryUpgradeOrder && $userHistoryUpgradeOrder->status > 2)
<h5 class="card-header bg-light">
<a href="#" class="" data-toggle="collapse" data-target="#collapsePaymentForm" aria-expanded="false" aria-controls="collapsePaymentForm">
@ -98,58 +108,59 @@
{{-- upgrade downgrade next booking --}}
@if($user->payment_account)
<div class="card w-100 mb-4">
<h5 class="card-header">{{__('Mitgliedschaft')}} {{__('anpassen')}}</h5>
<h5 class="card-header">{{__('membership.membership')}} {{__('membership.change')}}</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 Laufzeiten bleiben erhalten, erst mit der Verlängerung wird das geänderte Paket aktiv.</p>
<h6 class="d-block text-dark">
{!! __('membership.change_copy_1', ['date'=> $user->nextRenewalAccount()]) !!}
</h6>
<p>{{__('membership.change_copy_2')}}</p>
@include('user.membership._change')
</div>
</div>
@endif
@endif
{{-- remove ABO Options --}}
@if($user->payment_account && $user->isAboOption())
{{--
Abo Option deaktiviert
@if($user->payment_account && $user->is())
<div class="card w-100 mb-4">
{!! Form::open(['url' => route('user_membership_store', ['remove_abo']), 'class' => 'form-horizontal']) !!}
<h5 class="card-header">{{__('payment.status.auto_renewal_hl')}} {{__('deaktivieren')}}</h5>
<h5 class="card-header">{{__('payment.auto_renewal_hl')}} {{__('membership.deactivate')}}</h5>
<div class="card-body">
<p>Automatische Verlängerung dekativeren und SEPA Mandat zurückziehen.<br>
Die nächste Buchung ist am: <strong>{!! Carbon::parse($user->payment_account)->modify('-'.config('mivita.abo_booking_days').' days')->format('d.m.Y') !!}</strong></p>
<p>{{__('membership.abo_copy_1')}}<br>
{!! __('membership.abo_copy_2', ['date'=> Carbon::parse($user->payment_account)->modify('-'.config('mivita.abo_booking_days').' days')->format('d.m.Y')]) !!}
</p>
<label class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" name="abo_options_remove">
<span class="custom-control-label secondary">Hiermit bestätige ich, mein SEPA zu löschen und die automatische Verlängerung dekativeren.</span>
<span class="custom-control-label secondary">{{__('membership.abo_copy_3')}}</span>
</label>
<button type="submit" class="btn btn-secondary btn-sm">{{__('payment.status.auto_renewal_hl')}} {{__('deaktivieren')}}</button>&nbsp;
<button type="submit" class="btn btn-secondary btn-sm">{{__('payment.auto_renewal_hl')}} {{__('membership.deactivate')}}</button>&nbsp;
</div>
{!! Form::close() !!}
</div>
@endif
--}}
@if($user->payment_account)
<div class="card w-100 mb-4">
{!! Form::open(['url' => route('user_membership_store', ['delete_membership']), 'class' => 'form-horizontal']) !!}
<h5 class="card-header">{{__('Mitgliedschaft')}} {{__('beenden')}}</h5>
<h5 class="card-header">{{__('membership.membership')}} {{__('membership.end')}}</h5>
<div class="card-body">
<p>Du möchtest kein MIVITA Berater mehr sein und Deine Mitgliedschaft beenden?<br>
Damit gibst du alle möglichen Provisionen, Vergünstigungen, Zugang zum Sales-Center und noch viel mehr auf. Mit absenden dieser Option erhalten wir ein Nachricht und kümmern uns um die Löschung Deines Accounts. Dieser Vorgang kann ein paar Tage dauern.</p>
<p>{{__('membership.end_copy_1')}}<br>
{{__('membership.end_copy_2')}}</p>
@if($userHistoryDeleteMembership && $userHistoryDeleteMembership->status == 50)
<p class="alert py-2 px-2 badge-danger">Die Beendigung und Löschung Deiner MIVITA Mitgliedschaft ist beantragt.<br>
<p class="alert py-2 px-2 badge-danger">{{__('membership.end_copy_3')}}<br>
@else
<label class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" name="delete_membership_mivita">
<span class="custom-control-label secondary">Ja, ich möchte die MIVITA Mitgliedschaft beenden, ich verzichte auf jeglichen Anspruch gegenüber MIVITA und möchte, dass mein Account gelöscht wird!</span>
<span class="custom-control-label secondary">{{__('membership.end_checkbox')}}</span>
</label>
<button type="submit" class="btn btn-default btn-sm">{{ __('Mitgliedschaft hiermit beenden') }}</button>&nbsp;
<button type="submit" class="btn btn-default btn-sm">{{__('membership.end_button')}}</button>&nbsp;
@endif
</div>
{!! Form::close() !!}
@ -159,21 +170,20 @@
</div>
<div class="col-md-5 col-xl-4 order-1 order-md-2">
<!-- Project details -->
<div class="card mb-4">
<h5 class="card-header">{{ __('Mitgliedschaft Details') }}</h5>
<h5 class="card-header">{{__('membership.membership')}} {{__('membership.details')}}</h5>
<ul class="list-group list-group-flush">
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{__('gebuchtes Paket')}}</div>
<div class="text-muted">{{__('membership.booked_package')}}</div>
<div class="text-right">
@if($user->payment_order_id)
{{ $user->payment_order_product->name }}
{{ $user->payment_order_product->getLang('name') }}
@endif
</div>
</li>
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{__('Vertragsverlängerung')}}</div>
<div class="text-muted">{{__('membership.contract_renewal')}}</div>
<div class="text-right">
@if($user->payment_account)
{{ $user->nextRenewalAccount() }}
@ -181,18 +191,18 @@
</div>
</li>
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{ __('Berater-Mitgliedschaft') }}</div>
<div class="text-muted">{{ __('membership.consultant_membership') }}</div>
<div class="text-right">
@if($user->isActiveAccount() )
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i> {{ __('aktiv') }}</span>
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i> {{ __('membership.active') }}</span>
@else
<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i> {{ __('inaktiv') }}</span>
<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i> {{ __('membership.inactive') }}</span>
@endif
</div>
</li>
@if($user->isActiveAccount() )
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{__('bis zum')}}</div>
<div class="text-muted">{{__('membership.until')}}</div>
<div class="text-right">
{{ $user->getPaymentAccountDateFormat() }}
</div>
@ -200,7 +210,7 @@
@else
@if($user->payment_account)
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{__('abgelaufen am')}}</div>
<div class="text-muted">{{__('membership.expired_on')}}</div>
<div class="text-right">
{{ $user->getPaymentAccountDateFormat() }}
</div>
@ -208,18 +218,18 @@
@endif
@endif
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{ __('Berater-Online-Shop') }}</div>
<div class="text-muted">{{ __('membership.consultant_online_shop') }}</div>
<div class="text-right">
@if($user->isActiveShop() )
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i> {{ __('aktiv') }}</span>
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i> {{ __('membership.active') }}</span>
@else
<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i> {{ __('inaktiv') }}</span>
<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i> {{ __('membership.inactive') }}</span>
@endif
</div>
</li>
@if($user->isActiveShop() )
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{__('bis zum')}}</div>
<div class="text-muted">{{__('membership.until')}}</div>
<div class="text-right">
{{ $user->getPaymentShopDateFormat() }}
</div>
@ -227,28 +237,28 @@
@else
@if($user->payment_shop)
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{__('abgelaufen am')}}</div>
<div class="text-muted">{{__('membership.expired_on')}}</div>
<div class="text-right">
{{ $user->getPaymentShopDateFormat() }}
</div>
</li>
@endif
@endif
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{__('payment.status.auto_renewal_hl')}}</div>
<div class="text-right">
@if($user->isAboOption())
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i> {{ __('aktiv') }}</span>
@else
<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i> {{ __('inaktiv') }}</span>
@endif
</div>
</li>
{{--
Abo Option deaktiviert
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{__('payment.auto_renewal_hl')}}</div>
<div class="text-right">
@if($user->isAboOption())
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i> {{ __('membership.active') }}</span>
@else
<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i> {{ __('membership.inactive') }}</span>
@endif
</div>
</li>
--}}
</ul>
</div>
<!-- / Project details -->
</div>
</div>

12
resources/views/user/order/_bak_shipping_me.blade.php
View file

@ -57,8 +57,8 @@
</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')) }}
<label class="form-label" for=shipping_address_2">{{ __('Flat Building optional') }}</label>
{{ Form::text('shipping_address_2', $user->account->address_2, array('placeholder'=>__('Flat Building optional'), 'class'=>'form-control')) }}
</div>
</div>
<div class="form-row">
@ -83,7 +83,7 @@
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_state') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Lieferland') }}*</label>
<label class="form-label">{{ __('Delivery country') }}*</label>
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="me">
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!}
</select>
@ -158,8 +158,8 @@
</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')) }}
<label class="form-label" for="shipping_address_2">{{ __('Flat Building optional') }}</label>
{{ Form::text('shipping_address_2', $user->account->shipping_address_2, array('placeholder'=>__('Flat Building optional'), 'class'=>'form-control')) }}
@if ($errors->has('shipping_address_2'))
<span class="help-block">
<strong>{{ $errors->first('shipping_address_2') }}</strong>
@ -190,7 +190,7 @@
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_state') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Lieferland') }}*</label>
<label class="form-label">{{ __('Delivery country') }}*</label>
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="me">
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!}
</select>

12
resources/views/user/order/_bak_shipping_ot.blade.php
View file

@ -55,8 +55,8 @@
</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')) }}
<label class="form-label" for=shipping_address_2">{{ __('Flat Building optional') }}</label>
{{ Form::text('shipping_address_2', $shopping_user->billing_address_2, array('placeholder'=>__('Flat Building optional'), 'class'=>'form-control')) }}
</div>
</div>
<div class="form-row">
@ -81,7 +81,7 @@
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_state') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Lieferland') }}*</label>
<label class="form-label">{{ __('Delivery country') }}*</label>
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="ot">
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!}
</select>
@ -156,8 +156,8 @@
</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')) }}
<label class="form-label" for="shipping_address_2">{{ __('Flat Building optional') }}</label>
{{ Form::text('shipping_address_2', $shopping_user->shipping_address_2, array('placeholder'=>__('Flat Building optional'), 'class'=>'form-control')) }}
@if ($errors->has('shipping_address_2'))
<span class="help-block">
<strong>{{ $errors->first('shipping_address_2') }}</strong>
@ -188,7 +188,7 @@
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_state') ? 'has-error' : '' }}">
<label class="form-label">{{ __('Lieferland') }}*</label>
<label class="form-label">{{ __('Delivery country') }}}*</label>
<select name="shipping_state" class="selectpicker" id="change_shipping_state" data-is-for="ot">
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId()) !!}
</select>

51
resources/views/user/order/_list_delivery_vat_info.blade.php Normal file
View file

@ -0,0 +1,51 @@
<div class="card mt-2 mb-2">
<div class="card-body">
@if($template === 'me')
<h4>@if($is_abo) {{ __('order.abo_delivery_to_me') }} @else {{ __('order.delivery_to_me') }} @endif</h4>
@endif
@if($template === 'ot-customer')
<h4 class="mb-2">@if($is_abo) {{ __('order.abo_delivery_to_the_customer') }} @else {{ __('order.delivery_to_the_customer') }} @endif</h4>
<p>{{ __('order.cpay_text') }}.</p>
@endif
@if($template === 'ot-member')
<h4 class="mb-2">@if($is_abo) {{ __('order.abo_delivery_to_the_customer') }} @else {{ __('order.delivery_to_the_customer') }} @endif</h4>
<p>{{ __('order.ipay_text') }}.</p>
@endif
<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>
@if($template === 'me')
<i>{!! __('order.delivery_country_changed_info', ['link'=> route('user_edit')]) !!}</i>
@endif
@if($template === 'ot-customer' || $template === 'ot-member')
<i>{!! __('order.delivery_country_changed_customer_info', ['link'=> route('user_customers') ]) !!}</i>
@endif
<hr>
@if($user->user_level)
@if($template === 'me' || $template === 'ot-member')
<p>{!! __('order.product_prices_career_level_info', ['user_level_name'=>$user->user_level->getLang('name'), 'user_level_margin'=>$user->user_level->getFormattedMargin()]) !!}</p>
@endif
@if($template === 'ot-customer')
<p>{!! __('order.product_prices_career_level_cpay_info', ['user_level_name'=>$user->user_level->getLang('name'), 'user_level_margin'=>$user->user_level->getFormattedMargin()]) !!}</p>
@endif
@else
<p>{{ __('order.no_career_level_info') }}</p>
@endif
</div>
</div>

10
resources/views/user/order/comp_product.blade.php
View file

@ -1,13 +1,12 @@
<div class="card mt-4">
<div class="card-body">
@if($comp_products && Yard::instance('shopping')->getNumComp() > 0)
<input type="hidden" name="count_comp_products" value="{{Yard::instance('shopping')->getNumComp()}}">
@for($i = 1; $i <= Yard::instance('shopping')->getNumComp(); $i++)
@if(Yard::instance('shopping')->getNumComp() > 1)
<h4 class="border-bottom pb-2">{{$i}}. Versand Kompensationsprodukt</h4>
<h4 class="border-bottom pb-2">{{$i}}. {{ __('order.shipping_compensation_product') }} </h4>
@else
<h4 class="border-bottom pb-2">Versand Kompensationsprodukt</h4>
<h4 class="border-bottom pb-2">{{ __('order.shipping_compensation_product') }} </h4>
@endif
<div class="row no-gutters row-bordered">
@php($counter = 1)
@ -29,14 +28,13 @@
</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 class="text-body mt-2"><strong>{{ $comp_product->getLang('name') }}</strong></div>
<div class="">{{ __('order.art_no') }}: {{ $comp_product->number }}</div>
</div>
</div>
@php($counter++)
@endforeach
</div>
@endfor
@endif
</div>
</div>

270
resources/views/user/order/custom_payment.blade.php Normal file
View file

@ -0,0 +1,270 @@
@extends('layouts.layout-2')
@section('content')
<div class="card">
<div class="card-body p-2 p-md-4">
<h4>{{ __('order.order_was_placed_successfully') }}</h4>
<h6 class="small font-weight-semibold">
{{ __('order.payment_link_for_your_customer') }}
</h6>
<div class="mt-2">
<a target="_blank" class="btn btn-secondary" href="{{ route('checkout.checkout_card', ['identifier'=>$identifier]) }}">
{{ route('checkout.checkout_card', ['identifier'=>$identifier]) }}
</a>
</div>
</div>
<hr class="m-0">
<div class="card-body">
<h6 class="small font-weight-semibold">
{{ __('customer.customer_billing_address') }}
</h6>
<div class="row">
@if($shopping_user->billing_company)
<div class="col-md-12 mb-3">
<div class="text-muted small">{{ __('Company') }}</div>
{{ $shopping_user->billing_company }}
</div>
@endif
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Salutation') }}</div>
{{ \App\Services\HTMLHelper::getSalutationLang($shopping_user->billing_salutation) }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('First name') }}</div>
{{ $shopping_user->billing_firstname }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Last name') }}</div>
{{ $shopping_user->billing_lastname }}
</div>
</div>
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Street') }}</div>
{{ $shopping_user->billing_address }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Addition') }}</div>
{{ $shopping_user->billing_address_2 }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Postcode') }}</div>
{{ $shopping_user->billing_zipcode }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('City') }}</div>
{{ $shopping_user->billing_city }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Country') }}</div>
{{ $shopping_user->billing_country->getLocated() }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Phone') }}</div>
{{ $shopping_user->billing_phone }}
</div>
</div>
</div>
<hr class="m-0">
<!-- / Billing -->
<!-- Shipping -->
<div class="card-body">
<h6 class="small font-weight-semibold">
{{ __('Delivery address') }}
</h6>
@if($shopping_user->same_as_billing)
{{__('email.checkout_mail_same_address')}}
@else
<div class="row">
@if($shopping_user->shipping_company)
<div class="col-md-12 mb-3">
<div class="text-muted small">{{ __('Company') }}</div>
{{ $shopping_user->shipping_company }}
</div>
@endif
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Salutation') }}</div>
{{ \App\Services\HTMLHelper::getSalutationLang($shopping_user->shipping_salutation) }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('First name') }}</div>
{{ $shopping_user->shipping_firstname }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Last name') }}</div>
{{ $shopping_user->shipping_lastname }}
</div>
</div>
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Street') }}</div>
{{ $shopping_user->shipping_address }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Addition') }}</div>
{{ $shopping_user->shipping_address_2 }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Postcode') }}</div>
{{ $shopping_user->shipping_zipcode }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('City') }}</div>
{{ $shopping_user->shipping_city }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Country') }}</div>
{{ $shopping_user->shipping_country->getLocated() }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">{{ __('Phone') }}</div>
{{ $shopping_user->shipping_phone }}
</div>
</div>
@endif
</div>
<div class="card-body">
<h6 class="small font-weight-semibold">
{{ __('tables.order') }}
</h6>
@if(isset($yard_shopping_items))
<div class="table-responsive">
<table class="table table-bordered m-0" style="min-width:550px;">
<tbody>
<tr>
<th>{{ __('tables.product') }}</th>
<th> @if($yard_shopping_items['tax_free'])
{{ __('tables.net_price') }}
@else
{{ __('tables.price') }}
@endif
</th>
<th>{{ __('tables.quantity') }}</th>
<th>{{ __('tables.sum') }}</th>
</tr>
@foreach($yard_shopping_items['items'] as $item)
<tr>
<td class="px-3 py-2">
<div class="media align-item-center">
@if($item->image)
<img src="{{ route('product_image', [$item->image]) }}" class="d-block ui-w-80 mr-4" alt>
@endif
<div class="media-body">
{{ $item->name }}
</div>
</div>
</td>
<td class="text-right font-weight-semibold align-middle px-3 py-2">
@if($yard_shopping_items['tax_free'])
{{ formatNumber($item->price_net, 2) }} &euro;
@else
{{ formatNumber($item->price, 2) }} &euro;
@endif
</td>
<td class="align-middle px-3 py-2" style="width: 66px;">
{{ $item->qty }}
</td>
<td class="text-right font-weight-semibold align-middle px-3 py-2">
@if($yard_shopping_items['tax_free'])
{{ formatNumber($item->price_net_total, 2) }} &euro;
@else
{{ formatNumber($item->price_total, 2) }} &euro;
@endif
</td>
</tr>
@endforeach
<tr>
<td colspan="4">
<hr>
</td>
</tr>
<tr>
<td colspan="3">
{{__('order.subtotal')}}
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
{{ $yard_shopping_items['total']['subtotal'] }} &euro;
</td>
</tr>
<tr>
<td colspan="3">
{{__('Delivery country')}}
</td>
<td class="text-right">
{{ $yard_shopping_items['total']['shippingCountryName'] }}
</td>
</tr>
<tr>
<td colspan="3">
{{__('order.shipping_costs')}}
</td>
<td class="text-right">
{{ $yard_shopping_items['total']['shippingNet'] }} &euro;
</td>
</tr>
<tr>
<td colspan="3">
{{__('order.total_without_VAT')}}
</td>
<td class="text-right">
{{ $yard_shopping_items['total']['subtotalWithShipping'] }} &euro;
</td>
</tr>
<tr>
<td colspan="3">
{{__('order.plus_VAT')}}
</td>
<td class="text-right">
{{ $yard_shopping_items['total']['taxWithShipping'] }} &euro;
</td>
</tr>
<tr>
<td colspan="3">
{{__('order.total_net')}}
</td>
<td class="text-right">
{{ $yard_shopping_items['total']['totalWithShipping'] }} &euro;
</td>
</tr>
@if($yard_shopping_items['tax_free'])
<tr>
<td colspan="3">
<b>{{__('order.total_net')}}</b>
</td>
<td class="text-right">
<b>{{ $yard_shopping_items['total']['totalWithShipping'] }} &euro;</b>
<br>
<span style="font-size: 0.8em">{{__('email.checkout_mail_subtotal_ws')}}</span>
</td>
</tr>
@else
<tr>
<td colspan="3">
<b>{{__('order.total_gross')}}</b>
</td>
<td class="text-right">
<b>{{ $yard_shopping_items['total']['totalWithShipping'] }} &euro;</b>
<br>
<span style="font-size: 0.8em">{{__('email.checkout_mail_tax_info')}}</span>
</td>
</tr>
@endif
</tbody>
</table>
</div>
@endif
</div>
</div>
@endsection

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

@ -2,112 +2,202 @@
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
{{ __('navigation.my_orders') }} / {{ __('navigation.do_order') }}
{{ __('navigation.my_orders') }}
</h4>
{!! Form::open(['url' => route('user_order_my_delivery', [$for, $delivery_id]), 'class' => 'form-horizontal']) !!}
<div class="card">
<div class="card-body p-2 p-md-4">
{!! 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="me" @if(!$shopping_user) checked="checked" @endif >
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">Ware ist für mich und wird an meine Adresse versandt</span>
</label>
<h4>{{ __('navigation.do_order') }}</h4>
<label class="switcher switcher-secondary">
<input type="radio" class="switcher-input" name="switchers-radio-is-for" value="ot" @if($shopping_user) checked="checked" @endif>
<input type="radio" class="switcher-input" name="switchers-radio-is-for" value="me" @if(!$shopping_user && $for === 'me') checked="checked" @endif >
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">Ware ist für einen Kunden und wird an den Kunden versandt</span>
<span class="switcher-label">{{ __('order.goods_are_for_me_and_shipped') }}</span>
</label>
<label class="switcher switcher-secondary mt-3">
<input type="radio" class="switcher-input" name="switchers-radio-is-for" value="ot-member" @if($shopping_user && $for === 'ot-member') checked="checked" @endif>
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">
{{ __('order.goods_are_for_customer_and_shipped') }}
<span class="badge badge-secondary" data-toggle="tooltip" data-placement="top" title="{{ __('order.ipay_text') }}"><strong>({{ __('order.ipay') }})</strong></span>
</span>
</label>
<label class="switcher switcher-secondary mt-3">
<input type="radio" class="switcher-input" name="switchers-radio-is-for" value="ot-customer" @if($shopping_user && $for === 'ot-customer') checked="checked" @endif>
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">
{{ __('order.goods_are_for_customer_and_shipped') }}
<span class="badge badge-secondary" data-toggle="tooltip" data-placement="top" title="{{ __('order.cpay_text') }}"><strong>({{ __('order.cpay') }})</strong></span>
</span>
</label>
<hr>
<h4>{{ __('order.abo_delivery') }}</h4>
<label class="switcher switcher-secondary">
<input type="radio" class="switcher-input" name="switchers-radio-is-for" value="abo-me" @if(!$shopping_user && $for === 'abo-me') checked="checked" @endif>
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">{{ __('order.abo_are_for_me_and_shipped') }}</span>
</label>
<label class="switcher switcher-secondary mt-3">
<input type="radio" class="switcher-input" name="switchers-radio-is-for" value="abo-ot-member" @if($shopping_user && $for === 'abo-ot-member') checked="checked" @endif>
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">
{{ __('order.abo_are_for_customer_and_shipped') }}
<span class="badge badge-secondary" data-toggle="tooltip" data-placement="top" title="{{ __('order.ipay_text') }}"><strong>({{ __('order.ipay') }})</strong></span>
</span>
</label>
<label class="switcher switcher-secondary mt-3">
<input type="radio" class="switcher-input" name="switchers-radio-is-for" value="abo-ot-customer" @if($shopping_user && $for === 'abo-ot-customer') checked="checked" @endif>
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">
{{ __('order.abo_are_for_customer_and_shipped') }}
<span class="badge badge-secondary" data-toggle="tooltip" data-placement="top" title="{{ __('order.cpay_text') }}"><strong>({{ __('order.cpay') }})</strong></span>
</span>
</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">
<button type="button" class="btn btn-sm btn-secondary" data-toggle="modal" data-target="#modals-load-content"
<button type="button" class="btn btn-sm btn-secondary" id="button-user-order-my-delivery-show" data-toggle="modal" data-target="#modals-load-content"
data-id="show"
data-action="user-order-my-delivery-show"
data-back="{{route('user_order_my_delivery', [$for])}}"
data-isfor="{{ $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> {{ __('order.ship_to_existing_customer_select_customer') }}</button>
</div>
<div class="form-group col-sm-6">
<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>
<a href="{{route('user_customer_add', ['new'])}}" class="btn btn-sm btn-primary">{{ __('order.ship_to_new_customer') }} | <i class="ion ion-md-person-add"></i> {{ __('order.add_customer') }}</a>
</div>
</div>
<hr>
@if($shopping_user)
<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:
<a href="{{route('user_customers')}}">Meine Kunden -> Übersicht</a> -> <a href="{{route('user_customer_detail', $shopping_user->id)}}"><i class="fa fa-edit"></i> Kunde</a></a></p>
<h4>{{ __('order.ship_to_this_customer') }}</h4>
<p>{{ __('order.ship_to_this_customer_info') }}:
<a href="{{route('user_customers')}}">{{ __('navigation.my_clients') }} -> {{ __('navigation.overview') }}</a> -> <a href="{{route('user_customer_detail', $shopping_user->id)}}"><i class="fa fa-edit"></i> {{ __('navigation.clients') }}</a></a></p>
@include('admin.customer._customer_detail')
</div>
@endif
</div>
@if($shopping_user)
<div class="" id="hide_for_me">
<hr>
<div class="form-group">
<label class="custom-control custom-checkbox m-2 ">
<input type="checkbox" class="custom-control-input" name="check_for_ot" id="checkbox_for_me" required>
<span class="custom-control-label secondary">{{__('Mir ist bekannt, dass dieser Bestellvorgang nur für Kundenbestellungen ist und nicht für meine eigenen Bestellungen')}}</span>
</label>
</div>
</div>
<div class="float-rights">
<button type="submit" class="btn btn-secondary" name="action" value="next">bestätigen und weiter zur Bestellung</button>
</div>
@if($shopping_user)
<div class="" id="hide_for_me">
<hr>
<div class="form-group">
<label class="custom-control custom-checkbox m-2 ">
<input type="checkbox" class="custom-control-input" name="check_for_ot" id="checkbox_for_me" required>
<span class="custom-control-label secondary">{{ __('order.ship_to_this_customer_check') }}</span>
</label>
</div>
</div>
<div class="float-rights">
<button type="submit" class="btn btn-secondary" name="action" value="next">{{ __('order.confirm_and_proceed_to_order') }}</button>
</div>
@else
<div class="float-rights" id="hide_for_ot">
<button type="submit" class="btn btn-secondary" name="action" value="next">bestätigen und weiter zur Bestellung</button>
<button type="submit" class="btn btn-secondary" name="action" value="next">{{ __('order.confirm_and_proceed_to_order') }}</button>
</div>
@endif
</div>
{!! Form::close() !!}
</div>
{!! Form::close() !!}
<script>
$( document ).ready(function() {
function showHideCustomer($val) {
switch($val){
case 'me':
$('#show-is-for-customer').hide('slow');
$('#hide_for_ot').show('slow');
$('#hide_for_me').hide('slow');
$('#checkbox_for_me').attr('required', false);
break;
case 'abo-me':
$('#show-is-for-customer').hide('slow');
$('#hide_for_ot').show('slow');
$('#hide_for_me').hide('slow');
$('#checkbox_for_me').attr('required', false);
break;
case 'ot-member':
$('#show-is-for-customer').show('slow');
$('#hide_for_ot').hide('slow');
$('#hide_for_me').show('slow');
$('#button-user-order-my-delivery-show').data('isfor', 'ot-member');
$('#checkbox_for_me').attr('required', true);
break;
case 'ot-customer':
$('#show-is-for-customer').show('slow');
$('#hide_for_ot').hide('slow');
$('#hide_for_me').show('slow');
$('#button-user-order-my-delivery-show').data('isfor', 'ot-customer');
$('#checkbox_for_me').attr('required', true);
break;
case 'abo-ot-member':
$('#show-is-for-customer').show('slow');
$('#hide_for_ot').hide('slow');
$('#hide_for_me').show('slow');
$('#button-user-order-my-delivery-show').data('isfor', 'abo-ot-member');
$('#checkbox_for_me').attr('required', true);
break;
case 'abo-ot-customer':
$('#show-is-for-customer').show('slow');
$('#hide_for_ot').hide('slow');
$('#hide_for_me').show('slow');
$('#button-user-order-my-delivery-show').data('isfor', 'abo-ot-customer');
$('#checkbox_for_me').attr('required', true);
break;
}
}
$('input[name="switchers-radio-is-for"]').on('change', function (){
if($(this).val() === 'ot'){
$('#show-is-for-customer').show('slow');
$('#hide_for_ot').hide('slow');
$('#hide_for_me').show('slow');
$('#checkbox_for_me').attr('required', true);
}else{
$('#show-is-for-customer').hide('slow');
$('#hide_for_ot').show('slow');
$('#hide_for_me').hide('slow');
$('#checkbox_for_me').attr('required', false);
}
showHideCustomer($(this).val());
});
showHideCustomer($('input[name="switchers-radio-is-for"]:checked').val());
});
</script>
@endsection

6
resources/views/user/order/detail.blade.php
View file

@ -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>
{{ __('Bestellung Berater') }} <span class="text-muted">#{{$shopping_order->id}}</span>
<a href="{{route('user_orders')}}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
{{ __('order.order_consultant') }} <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_orders')}}" class="btn btn-sm btn-default mt-2 float-right">{{ __('back') }}</a>
@endsection

24
resources/views/user/order/index.blade.php
View file

@ -12,17 +12,17 @@
<thead>
<tr>
<th>#</th>
<th>{{__('Datum')}}</th>
<th>{{__('Betrag')}}</th>
<th>{{__('Zahlung')}}</th>
<th>{{__('Status')}}</th>
<th>{{__('Versand')}}</th>
<th>{{__('Art')}}</th>
<th>{{__('Rechnung')}}</th>
<th>{{__('First name')}}</th>
<th>{{__('Last name')}}</th>
<th>{{__('E-Mail')}}</th>
<th>{{__('Rf-Nr.')}}</th>
<th>{{__('tables.date')}}</th>
<th>{{__('tables.amount')}}</th>
<th>{{__('tables.payment')}}</th>
<th>{{__('tables.status')}}</th>
<th>{{__('tables.shipping')}}</th>
<th>{{__('tables.art')}}</th>
<th>{{__('tables.invoice')}}</th>
<th>{{__('tables.firstname')}}</th>
<th>{{__('tables.lastname')}}</th>
<th>{{__('tables.email')}}</th>
<th>{{__('tables.rf_no')}}</th>
</tr>
</thead>
</table>
@ -52,7 +52,7 @@
"bLengthChange": false,
"iDisplayLength": 100,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});

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

@ -2,8 +2,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>
{{ __('navigation.my_orders') }} / @if($is_abo) {{ __('order.abo_delivery') }} @else {{ __('navigation.do_order') }} @endif
<a href="{{ route('user_order_my_delivery', [$for, $delivery_id]) }}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
<div class="clearfix"></div>
</h4>
<style>
@ -45,8 +45,6 @@
max-height: 160px;
}
}
</style>
@if($errors->has('switchers-comp-product'))
<div class="row">
@ -61,172 +59,10 @@
</div>
</div>
@endif
<input type="hidden" name="shipping_is_for" value="{{$for}}">
<div class="card mt-2 mb-2">
<div class="card-body">
@if($for === 'ot')
<h4>Lieferung an den Kunden</h4>
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Bestellland</div>
{{ App\Services\UserService::getOrderInfo('billing_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Lieferland</div>
{{ App\Services\UserService::getOrderInfo('shipping_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">MwSt</div>
{{ App\Services\UserService::getOrderInfo('tax_free') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Reverse Charge Verfahren</div>
{{ App\Services\UserService::getOrderInfo('user_reverse_charge') }}
</div>
</div>
<p>Das Lieferland kann nur beim Kunden unter <a href="{{ route('user_customers') }}">Meine Kunden</a> geändert werden.</i>
@endif
@if($for === 'me')
<h4>Lieferung an mich</h4>
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Bestellland</div>
{{ App\Services\UserService::getOrderInfo('billing_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Lieferland</div>
{{ App\Services\UserService::getOrderInfo('shipping_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">MwSt</div>
{{ App\Services\UserService::getOrderInfo('tax_free') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Reverse Charge Verfahren</div>
{{ App\Services\UserService::getOrderInfo('user_reverse_charge') }}
</div>
</div>
<i>Das Lieferland kann nur unter <a href="{{ route('user_edit') }}">Meine Daten</a> geändert werden.</i>
@endif
@if($user->user_level)
<p>Die Produktpreise werden entsprechend Deinem Karriere-Level <strong>{{$user->user_level->name}}</strong> abzüglich <strong>{{$user->user_level->getFormattedMargin()}} %</strong> Marge angezeigt.<br>Hinweis: Wenn Du den die Seite verlässt, wird der Warenkorb zurückgesetzt.</p>
@else
<p>Hinweis: Dir wurde noch kein Karriere-Level zugewisen. Bitte wende dich an info@mivita.care</p>
@endif
</div>
</div>
@include('user.order.list_'.$template)
<div class="card">
<div class="card-datatable table-responsive">
<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>
<th>{{__('Produkt')}}</th>
<th>{{__('Mein Preis netto')}}</th>
<th>{{__('Mein Preis brutto')}}</th>
<th>{{__('Points')}}</th>
<th>{{__('VK-Preis brutto')}}</th>
<th><span class="no-line-break">{{__('Inhalt (ml)')}}</span></th>
<th>{{__('Artikelnummer')}}</th>
<th>#</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
</div>
{!! Form::open(['url' => route('user_order_my_payment', [$for, $delivery_id]), 'class' => 'form-horizontal']) !!}
<input type="hidden" name="shipping_is_for" value="{{$for}}">
@if($for === 'ot')
@include('user.order.shipping_ot')
@endif
@if($for === 'me')
@include('user.order.shipping_me')
@endif
@if($for === 'me')
<div id="holder_html_view_comp_product">
@include('user.order.comp_product')
</div>
@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,
ajax: {
url: '{!! route( 'user_order_my_datatable') !!}',
data: function(d) {
d.shipping_is_for = $('input[name=shipping_is_for]').val();
// d.filter_customer_member = $('select[name=filter_customer_member]').val();
}
},
"order": [[7, "asc" ]],
"columns": [
{ data: 'picture', name: 'picture', searchable: false, width: 35 },
{ data: 'product', name: 'product' },
{ data: 'price_net', name: 'price_net', searchable: false, orderable: false },
{ data: 'price_gross', name: 'price_gross', searchable: false, orderable: false },
{ data: 'points', name: 'points', searchable: false },
{ data: 'price_vk_gross', name: 'price_vk_gross', searchable: false },
{ data: 'contents_total', name: 'contents_total', searchable: false },
{ data: 'number', name: 'number' },
{ data: 'action', name: 'action', searchable: false, orderable: false },
],
"bLengthChange": false,
"iDisplayLength": 1000,
"paging": false,
"language": {
"url": "/js/German.json"
},
drawCallback: function (settings) {
iqShoppingCart.reInit();
}
});
iqShoppingCart.setDatabase(oTable);
/* $('#filter_member_id').on('change', function(){
oTable.draw();
});
$('#filter_customer_member').on('change', function(){
oTable.draw();
});
*/
/*{ data: 'add_card', name: 'add_card', searchable: false, orderable: false},
{ data: 'quantity', name: 'quantity', searchable: false, orderable: false},*/
$('body').tooltip({
selector: '.product-tooltip'
});
});
</script>
@endsection
@section('scripts')

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

@ -87,17 +87,17 @@
</div>
<div class="d-flex">
<div class="text-right mt-4 mr-5">
<label class="text-muted font-weight-normal m-0">Points</label>
<label class="text-muted font-weight-normal m-0">{{ __('order.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>
<label class="text-muted font-weight-normal m-0">{{ __('order.total_sum') }}</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>
<button type="submit" class="btn btn-secondary">{{ __('order.confirm_and_proceed_to_checkout') }}</button>
</div>

96
resources/views/user/order/list_me.blade.php Normal file
View file

@ -0,0 +1,96 @@
@include('user.order._list_delivery_vat_info')
<div class="card">
<div class="card-datatable table-responsive">
<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>{{__('tables.image')}}</th>
<th>{{__('tables.product')}}</th>
<th>{{__('tables.my_price_net')}}</th>
<th>{{__('tables.my_price_gross')}}</th>
<th>{{__('tables.points')}}</th>
<th>{{__('tables.vk_price')}} {{__('tables.gross')}}</th>
<th><span class="no-line-break">{{__('tables.contents')}} (ml)</span></th>
<th>{{__('tables.article_no')}}</th>
<th>#</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
</div>
{!! Form::open(['url' => route('user_order_my_payment', [$for, $delivery_id]), 'class' => 'form-horizontal']) !!}
<input type="hidden" name="shipping_is_for" value="{{$for}}">
<input type="hidden" name="is_abo" value="{{$is_abo}}">
@include('user.order.shipping_me')
@if($comp_products && Yard::instance('shopping')->getNumComp() > 0)
<div id="holder_html_view_comp_product">
@include('user.order.comp_product')
</div>
@endif
<div class="card mt-4">
<div class="card-body">
<h4>{{ __('order.shopping_cart') }} </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">{{ __('back') }}</a>
</div>
{!! Form::close() !!}
<script>
$( document ).ready(function() {
var iqShoppingCart = IqShoppingCart.init();
var oTable = $('#datatables-order-list').DataTable({
"processing": true,
"serverSide": true,
ajax: {
url: '{!! route( 'user_order_my_datatable') !!}',
data: function(d) {
d.shipping_is_for = $('input[name=shipping_is_for]').val();
d.is_abo = $('input[name=is_abo]').val();
}
},
"order": [[7, "asc" ]],
"columns": [
{ data: 'picture', name: 'picture', searchable: false, width: 35 },
{ data: 'product', name: 'product' },
{ data: 'price_net', name: 'price_net', searchable: false, orderable: false },
{ data: 'price_gross', name: 'price_gross', searchable: false, orderable: false },
{ data: 'points', name: 'points', searchable: false },
{ data: 'price_vk_gross', name: 'price_vk_gross', searchable: false },
{ data: 'contents_total', name: 'contents_total', searchable: false },
{ data: 'number', name: 'number' },
{ data: 'action', name: 'action', searchable: false, orderable: false },
],
"bLengthChange": false,
"iDisplayLength": 1000,
"paging": false,
"language": {
"url": "/js/datatables-{{ \App::getLocale() }}.json"
},
drawCallback: function (settings) {
iqShoppingCart.reInit();
}
});
iqShoppingCart.setDatabase(oTable);
$('body').tooltip({
selector: '.product-tooltip'
});
});
</script>

91
resources/views/user/order/list_ot-customer.blade.php Normal file
View file

@ -0,0 +1,91 @@
@include('user.order._list_delivery_vat_info')
<div class="card">
<div class="card-datatable table-responsive">
<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>{{__('tables.image')}}</th>
<th>{{__('tables.product')}}</th>
<th>{{__('tables.vk_price')}} {{__('tables.net')}}</th>
<th>{{__('tables.vk_price')}} {{__('tables.gross')}}</th>
<th>{{__('tables.my_commission')}} {{__('tables.net')}}</th>
<th>{{__('tables.points')}}</th>
<th><span class="no-line-break">{{__('tables.contents')}} (ml)</span></th>
<th>{{__('tables.article_no')}}</th>
<th>#</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
</div>
{!! Form::open(['url' => route('user_order_my_payment', [$for, $delivery_id]), 'class' => 'form-horizontal']) !!}
<input type="hidden" name="shipping_is_for" value="{{$for}}">
<input type="hidden" name="is_abo" value="{{$is_abo}}">
@include('user.order.shipping_ot')
<div class="card mt-4">
<div class="card-body">
<h4>{{ __('order.shopping_cart') }} </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">{{ __('back') }}</a>
</div>
{!! Form::close() !!}
<script>
$( document ).ready(function() {
var iqShoppingCart = IqShoppingCart.init();
var oTable = $('#datatables-order-list').DataTable({
"processing": true,
"serverSide": true,
ajax: {
url: '{!! route( 'user_order_my_datatable') !!}',
data: function(d) {
d.shipping_is_for = $('input[name=shipping_is_for]').val();
d.is_abo = $('input[name=is_abo]').val();
}
},
"order": [[7, "asc" ]],
"columns": [
{ data: 'picture', name: 'picture', searchable: false, width: 35 },
{ data: 'product', name: 'product' },
{ data: 'customer_price_net', name: 'customer_price_net', searchable: false, orderable: false },
{ data: 'customer_price_gross', name: 'customer_price_gross', searchable: false, orderable: false },
{ data: 'my_commission_net', name: 'my_commission_net', searchable: false },
{ data: 'points', name: 'points', searchable: false },
{ data: 'contents_total', name: 'contents_total', searchable: false },
{ data: 'number', name: 'number' },
{ data: 'action', name: 'action', searchable: false, orderable: false },
],
"bLengthChange": false,
"iDisplayLength": 1000,
"paging": false,
"language": {
"url": "/js/datatables-{{ \App::getLocale() }}.json"
},
drawCallback: function (settings) {
iqShoppingCart.reInit();
}
});
iqShoppingCart.setDatabase(oTable);
$('body').tooltip({
selector: '.product-tooltip'
});
});
</script>

89
resources/views/user/order/list_ot-member.blade.php Normal file
View file

@ -0,0 +1,89 @@
@include('user.order._list_delivery_vat_info')
<div class="card">
<div class="card-datatable table-responsive">
<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>{{__('tables.image')}}</th>
<th>{{__('tables.product')}}</th>
<th>{{__('tables.my_price_net')}}</th>
<th>{{__('tables.my_price_gross')}}</th>
<th>{{__('tables.points')}}</th>
<th>{{__('tables.vk_price')}} {{__('tables.gross')}}</th>
<th><span class="no-line-break">{{__('tables.contents')}} (ml)</span></th>
<th>{{__('tables.article_no')}}</th>
<th>#</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
</div>
{!! Form::open(['url' => route('user_order_my_payment', [$for, $delivery_id]), 'class' => 'form-horizontal']) !!}
<input type="hidden" name="shipping_is_for" value="{{$for}}">
<input type="hidden" name="is_abo" value="{{$is_abo}}">
@include('user.order.shipping_ot')
<div class="card mt-4">
<div class="card-body">
<h4>{{ __('order.shopping_cart') }} </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">{{ __('back') }}</a>
</div>
{!! Form::close() !!}
<script>
$( document ).ready(function() {
var iqShoppingCart = IqShoppingCart.init();
var oTable = $('#datatables-order-list').DataTable({
"processing": true,
"serverSide": true,
ajax: {
url: '{!! route( 'user_order_my_datatable') !!}',
data: function(d) {
d.shipping_is_for = $('input[name=shipping_is_for]').val();
d.is_abo = $('input[name=is_abo]').val();
}
},
"order": [[7, "asc" ]],
"columns": [
{ data: 'picture', name: 'picture', searchable: false, width: 35 },
{ data: 'product', name: 'product' },
{ data: 'price_net', name: 'price_net', searchable: false, orderable: false },
{ data: 'price_gross', name: 'price_gross', searchable: false, orderable: false },
{ data: 'points', name: 'points', searchable: false },
{ data: 'price_vk_gross', name: 'price_vk_gross', searchable: false },
{ data: 'contents_total', name: 'contents_total', searchable: false },
{ data: 'number', name: 'number' },
{ data: 'action', name: 'action', searchable: false, orderable: false },
],
"bLengthChange": false,
"iDisplayLength": 1000,
"paging": false,
"language": {
"url": "/js/datatables-{{ \App::getLocale() }}.json"
},
drawCallback: function (settings) {
iqShoppingCart.reInit();
}
});
iqShoppingCart.setDatabase(oTable);
$('body').tooltip({
selector: '.product-tooltip'
});
});
</script>

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

@ -59,5 +59,5 @@
</div>--}}
@endif
@else
<h4>Fehler: Keine Adressdaten gefunden!</h4>
<h4>{{ __('order.error_no_address_data_found') }}</h4>
@endif

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

@ -1,4 +1,19 @@
@if($for == 'ot-customer')
{{ 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_state', Yard::instance('shopping')->getShippingCountryId()) }}
{{ Form::hidden('billing_email', $shopping_user->billing_email) }}
{{ Form::hidden('shipping_email', $shopping_user->shipping_email) }}
@endif
@if($shopping_user->same_as_billing)
<!-- Billing -->

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

@ -1,267 +1,305 @@
@if(Yard::instance('shopping')->content()->count())
@if(Yard::instance('shopping')->compCount() > 0)
<style>
.yard-items-head {
border-bottom: 1px solid #ddd;
padding-bottom: 8px;
margin-bottom: 8px;
}
@if(Yard::instance('shopping')->content()->count())
@if(Yard::instance('shopping')->compCount() > 0)
<style>
.yard-items-head {
border-bottom: 1px solid #ddd;
padding-bottom: 8px;
margin-bottom: 8px;
}
.yard-item {
position: relative;
padding-top: 8px;
border-bottom: 1px solid #ddd;
padding-bottom: 8px;
}
.yard-item {
position: relative;
padding-top: 8px;
border-bottom: 1px solid #ddd;
padding-bottom: 8px;
}
.yard-item a.shop-item-hl {
color: #9aa983;
font-size: 1.1em;
font-weight: bold;
}
.yard-item a.shop-item-hl {
color: #9aa983;
font-size: 1.1em;
font-weight: bold;
}
.yard-item .options {
margin-top: 4px;
}
.yard-item .options {
margin-top: 4px;
}
.yard-item a.auto-delete-product {
font-size: 0.7em;
font-weight: bold;
text-transform: uppercase;
}
.yard-item a.auto-delete-product {
font-size: 0.7em;
font-weight: bold;
text-transform: uppercase;
}
.yard-item .quantity {
position: relative;
}
.yard-item .quantity {
position: relative;
}
.quantity-select {
text-align: right;
}
.quantity-select {
text-align: right;
}
.quantity-select select.form-control:not([size]):not([multiple]) {
width: auto;
min-width: 5em;
display: inline-block;
}
.quantity-select select.form-control:not([size]):not([multiple]) {
width: auto;
min-width: 5em;
display: inline-block;
}
.yard-item .price-total {
margin-top: 6px;
white-space: nowrap;
}
.yard-item .price-total {
margin-top: 6px;
white-space: nowrap;
}
.yard-item .font-semi-bold {
color: #393939;
font-weight: 500;
}
.yard-item .font-semi-bold {
color: #393939;
font-weight: 500;
}
.yard-item .font-semi-bold .small {
font-size: 1rem;
}
.yard-item .font-semi-bold .small {
font-size: 1rem;
}
.yard-item .font-bold {
color: #393939;
font-weight: bold;
}
.yard-item .font-bold {
color: #393939;
font-weight: bold;
}
.price-single {
white-space: nowrap;
}
.price-single {
white-space: nowrap;
}
.price-total {
font-weight: 600;
font-size: 0.95rem;
white-space: nowrap;
}
.quantity-select {
text-align: right;
}
.quantity-select input.form-control {
width: auto;
min-width: 4em;
display: inline-block;
}
.xsmall {
font-size: 85%;
font-weight: 400;
}
</style>
<div id="cartContent">
.price-total {
font-weight: 600;
font-size: 0.95rem;
white-space: nowrap;
}
.quantity-select {
text-align: right;
}
.quantity-select input.form-control {
width: auto;
min-width: 4em;
display: inline-block;
}
.xsmall {
font-size: 85%;
font-weight: 400;
}
</style>
<div id="cartContent">
<div class="yard-items-head d-none d-sm-block">
<div class="row">
<div class="col-3 col-sm-2">
<div class="row">&nbsp;</div>
</div>
<div class="col-9 col-sm-10">
<div class="row">
<div class="col-12 col-sm-6 col-md-7">
Artikel
</div>
<div class="col-6 col-sm-3 col-md-2 text-left">
Einzelpreis
</div>
<div class="col-6 col-sm-3 col-md-3 text-right">
Anzahl
</div>
</div>
</div>
</div>
</div>
@foreach(Yard::instance('shopping')->getContentByOrder() as $row)
@php($product = \App\Models\Product::find($row->id))
<div class="row yard-item">
<div class="col-3 col-sm-2">
@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>
<div class="col-9 col-sm-10">
<div class="row">
<div class="col-12 col-sm-6 col-md-7 description">
<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 class="yard-items-head d-none d-sm-block">
<div class="row">
<div class="col-3 col-sm-2">
<div class="row">&nbsp;</div>
</div>
<div class="col-9 col-sm-10">
<div class="row">
<div class="col-12 col-sm-6 col-md-7">
{{ __('order.article') }}
</div>
<div class="col-6 col-sm-3 col-md-2 text-left">
{{ __('order.unit_price') }}
</div>
<div class="col-6 col-sm-3 col-md-3 text-right">
{{ __('order.quantity') }}
</div>
</div>
</div>
</div>
</div>
<div class="options">
@if(!$row->options->comp)
<a href="#" class="auto-delete-product remove_item_form_cart product-tooltip" data-row-id="{{$row->rowId}}" data-product-id="{{ $product->id }}"><i class="fa fa-times"></i> Artikel entfernen</a>
@else
@if(Yard::instance('shopping')->getNumComp() > 1)
{{$row->options->comp}}. Kompensationsprodukt
@foreach(Yard::instance('shopping')->getContentByOrder() as $row)
@php($product = \App\Models\Product::find($row->id))
<div class="row yard-item">
<div class="col-3 col-sm-2">
@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
Kompensationsprodukt
<img src="{{ asset('/assets/images/1x1.png') }}" class="d-block ui-w-80 ui-bordered mr-4" alt="">
@endif
</div>
@endif
</div>
</div>
<div class="col-9 col-sm-10">
<div class="row">
<div class="col-12 col-sm-6 col-md-7 description">
<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>{{ __('order.content') }}: {{ $product->contents }}</div>
<div>{{ __('order.art_no') }}: {{ $product->number }}</div>
</div>
</div>
<div class="options">
@if(!$row->options->comp)
<a href="#" class="auto-delete-product remove_item_form_cart product-tooltip" data-row-id="{{$row->rowId}}" data-product-id="{{ $product->id }}"><i class="fa fa-times"></i> {{ __('order.article_remove') }}</a>
@else
@if(Yard::instance('shopping')->getNumComp() > 1)
{{$row->options->comp}}. {{ __('order.compensation_product') }}
@else
{{ __('order.compensation_product') }}
@endif
<div class="col-6 col-sm-3 col-md-2 text-left font-semi-bold price-single">
<div class="no-line-break">{{ Yard::instance('shopping')->rowPriceNet($row, 3) }} &euro;</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="xsmall">~{{ Yard::instance('shopping')->getCurrencyByKey('rowPriceNetCurrency', $row, 3) }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</div>
@endif
</div>
</div>
<div class="col-6 col-sm-3 col-md-3 quantity">
<div class="quantity-select">
@if($row->options->comp)
<span class="text-right product-tooltip" data-toggle="tooltip" title="Kompensationsprodukt">1 x</span>
@else
<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">
@endif
</div>
<div class="price-total text-right">
<div class="no-line-break">{{ Yard::instance('shopping')->rowSubtotalNet($row) }} &euro;</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('rowSubtotalCurrency', $row, 3) }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
<div class="col-6 col-sm-3 col-md-2 text-left font-semi-bold price-single">
<div class="no-line-break">{{ Yard::instance('shopping')->rowPriceNet($row, 3) }} &euro;</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="xsmall">~{{ Yard::instance('shopping')->getCurrencyByKey('rowPriceNetCurrency', $row, 3) }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</div>
<div class="col-6 col-sm-3 col-md-3 quantity">
<div class="quantity-select">
@if($row->options->comp)
<span class="text-right product-tooltip" data-toggle="tooltip" title="{{ __('order.compensation_product') }}">1 x</span>
@else
<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">
@endif
</div>
<div class="price-total text-right">
<div class="no-line-break">{{ Yard::instance('shopping')->rowSubtotalNet($row) }} &euro;</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('rowSubtotalCurrency', $row, 3) }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</div>
</div>
</div>
</div>
</div>
@endforeach
<div class="clearfix"></div>
</div>
<!-- / Shopping cart table -->
<div class="d-flex flex-wrap justify-content-between pb-4">
<div class="mt-2">
<p class="small mb-2"> {!! __('order.you_has_article_in_shopping_cart', ['num'=> Yard::instance('shopping')->compCount() ]) !!}</p>
<p>{{ __('order.points_total') }}: {{ 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> {{ __('order.shopping_cart_delete') }}</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;">{{ __('order.subtotal') }}:</td>
<td style="border-top:none;">
<div class="no-line-break">{{ Yard::instance('shopping')->subtotal() }} €</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('subtotal') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
<tr>
<td class="text-left">{{ __('Delivery country') }}:</td>
<td>{{ Yard::instance('shopping')->getShippingCountryName() }}</td>
</tr>
<tr>
<td class="text-left">{{ __('order.shipping_costs') }}:</td>
<td>
<div class="no-line-break">{{ Yard::instance('shopping')->shippingNet() }} €</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('shippingNet') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
<tr>
<td class="text-left">{{ __('order.total_without_VAT') }}:</td>
<td>
<div class="no-line-break"> {{ Yard::instance('shopping')->subtotalWithShipping() }} €</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('subtotalWithShipping') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
<tr>
<td class="text-left">{{ __('order.plus_VAT') }}:</td>
<td>
<div class="no-line-break">{{ Yard::instance('shopping')->taxWithShipping() }} €</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('taxWithShipping') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@if(Yard::instance('shopping')->getUserTaxFree())
<tr>
<td class="text-left"><strong>{{ __('order.total_net') }}:</strong></td>
<td>
<strong><div class="no-line-break">{{ Yard::instance('shopping')->totalWithShipping() }} €</div></strong>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('totalWithShipping') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@else
<tr>
<td class="text-left"><strong>{{ __('order.total_gross') }}:</strong></td>
<td>
<strong><div class="no-line-break">{{ Yard::instance('shopping')->totalWithShipping() }} €</div></strong>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('totalWithShipping') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@endif
</tbody>
</table>
</div>
</div>
</div>
<hr>
</div>
@endforeach
<div class="clearfix"></div>
</div>
@if(isset($is_abo) && $is_abo)
<div class="text-right">
<h4>{{ __('order.abo_settings') }}</h4>
<div class="form-row">
<div class="col-6 col-sm-8 col-md-9 col-lg-9 mb-1">
</div>
<div class="col-6 col-sm-4 col-md-3 col-lg-3 mb-1 text-right">
<label class="form-label">{{ __('order.delivery_intervall') }}*</label>
<select class="custom-select" name="abo_interval">
{!! HTMLHelper::getAboIntervallWeeks(4) !!}
</select>
</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;">
<div class="no-line-break">{{ Yard::instance('shopping')->subtotal() }} €</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('subtotal') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
<tr>
<td class="text-left">Lieferland:</td>
<td>{{ Yard::instance('shopping')->getShippingCountryName() }}</td>
</tr>
<tr>
<td class="text-left">Versandkosten:</td>
<td>
<div class="no-line-break">{{ Yard::instance('shopping')->shippingNet() }} €</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('shippingNet') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
<tr>
<td class="text-left">Summe ohne MwSt:</td>
<td>
<div class="no-line-break"> {{ Yard::instance('shopping')->subtotalWithShipping() }} €</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('subtotalWithShipping') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
<div class="col-12 col-sm-4 col-md-6 mb-1">
</div>
<div class="col-12 col-sm-8 col-md-6 mb-1">
<div class="text-right">
<em class="small"> <i> {!! __('order.abo_order_info') !!}</em>
</div>
</div>
</div>
<tr>
<td class="text-left">zzgl. MwSt:</td>
<td>
<div class="no-line-break">{{ Yard::instance('shopping')->taxWithShipping() }} €</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('taxWithShipping') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@if(Yard::instance('shopping')->getUserTaxFree())
<tr>
<td class="text-left"><strong>Gesamtsumme Netto:</strong></td>
<td>
<strong><div class="no-line-break">{{ Yard::instance('shopping')->totalWithShipping() }} €</div></strong>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('totalWithShipping') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@else
<tr>
<td class="text-left"><strong>Gesamtsumme Brutto:</strong></td>
<td>
<strong><div class="no-line-break">{{ Yard::instance('shopping')->totalWithShipping() }} €</div></strong>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('totalWithShipping') }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
@endif
</tbody>
</table>
</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>
<hr>
</div>
@endif
@if((isset($data['for']) && $data['for'] === 'ot-customer') || (isset($for) && $for === 'ot-customer'))
<div class="float-right">
<button type="submit" class="btn btn-secondary"><i class="ion ion-ios-redo"></i> {{ __('order.confirm_and_send_order') }}</button>
</div>
<br><br>
<div class="text-right">
<em class="small"> <i class="fa fa-info-circle"></i> {!! __('order.confirm_send_order_info') !!}</em>
</div>
@else
<div class="float-right">
<button type="submit" class="btn btn-secondary"><i class="ion ion-ios-redo"></i> {{ __('order.confirm_and_proceed_to_checkout') }}</button>
</div>
<br><br>
<div class="text-right">
<em class="small"> <i class="fa fa-lock"></i> {!! __('payment.checkout_ssl_server') !!}</em>
</div>
@endif
@endif
@endif
@endif

28
resources/views/user/payment/credit.blade.php
View file

@ -10,12 +10,12 @@
<table class="datatables-style table table-striped table-bordered" id="datatable-user-credit">
<thead>
<tr>
<th>{{ __('G.Nr.') }}</th>
<th>{{ __('Gutschrift') }}</th>
<th>{{ __('Betrag') }}</th>
<th>{{ __('Datum') }}</th>
<th>{{ __('Zahlung') }}</th>
<th>{{ __('aus Guthaben') }}</th>
<th>{{ __('tables.c_no') }}</th>
<th>{{ __('tables.credit_note') }}</th>
<th>{{ __('tables.amount') }}</th>
<th>{{ __('tables.date') }}</th>
<th>{{ __('tables.payment') }}</th>
<th>{{ __('tables.from_credit_balance') }}</th>
</tr>
</thead>
<tbody>
@ -26,17 +26,17 @@
<hr>
<div class="card">
<h5 class="card-header">
Mein Guthaben
{{ __('account.my_credit') }}
</h5>
<div class="card-datatable table-responsive">
<table class="datatables-style table table-striped table-bordered" id="datatable-user-credit-item">
<thead>
<tr>
<th style="width: 55%">Betreff</th>
<th>Betrag</th>
<th>Datum</th>
<th>Status</th>
<th>Gutschrift</th>
<th style="width: 55%">{{ __('tables.subject') }}</th>
<th>{{ __('tables.amount') }}</th>
<th>{{ __('tables.date') }}</th>
<th>{{ __('tables.status') }}</th>
<th>{{ __('tables.credit_note') }}</th>
</tr>
</thead>
<tbody>
@ -69,7 +69,7 @@
"bLengthChange": false,
"iDisplayLength": 50,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
/*$('#filter_sales_year').on('change', function(){
@ -100,7 +100,7 @@
"bLengthChange": false,
"iDisplayLength": 50,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
/*$('#filter_user_status').on('change', function(){

6
resources/views/user/shop/detail.blade.php
View file

@ -3,10 +3,10 @@
@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>
<a href="{{route('admin_customers')}}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
{{ __('customer.customer_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>
<a href="{{route('admin_customers')}}" class="btn btn-sm btn-default mt-2 float-right">{{ __('back') }}</a>
@endsection

36
resources/views/user/shop/sales/api_order_list.blade.php
View file

@ -15,8 +15,8 @@
<h4 class="font-weight-bold py-2 mb-2 d-flex justify-content-between align-items-center w-100 ">
<div>{{ __('Externe Bestellungen') }} | Sammelrechnung</div>
<a href="{{route('user_shop_api_orders')}}" class="btn btn-sm btn-default float-right">zurück</a>
<div>{{ __('order.external_orders') }} | {{ __('order.collective_invoice') }}</div>
<a href="{{route('user_shop_api_orders')}}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
</h4>
@if(Session::has('custom-error'))
@ -35,7 +35,7 @@
{{ App\Services\UserService::getOrderInfo('billing_state') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Lieferland</div>
<div class="text-muted small">{{ __('Delivery country') }}</div>
{{ App\Services\UserService::getOrderInfo('shipping_state') }}
</div>
<div class="col-md-3 mb-3">
@ -61,30 +61,30 @@
</div>
<div class="row">
<div class="col-md-12 mb-3">
Bestellnummer: {{ $order->order_id }} | WP Number: {{ $order->wp_order_number }}
{{ __('order.order_number') }}: {{ $order->order_id }} | WP Number: {{ $order->wp_order_number }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Bestelldatum</div>
<div class="text-muted small">{{ __('order.order_date') }}</div>
{{$order->shopping_order->created_at->format("d.m.Y H:i")}}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Anzahl Artikel</div>
<div class="text-muted small">{{ __('order.article') }}</div>
{{$order->shopping_order->getItemsCount()}}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Preis gesamt</div>
<div class="text-muted small">{{ __('order.total_price') }}</div>
{{$order->shopping_order->getFormattedTotalShipping()}} &euro;
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Points gesamt</div>
<div class="text-muted small">{{ __('order.points_total') }}</div>
{{ $order->shopping_order->points }}
</div>
<div class="col-md-12 mb-3">
<div class="text-muted small">Rechnungsadresse</div>
<div class="text-muted small">{{ __('order.invoice_address') }} </div>
{{ $order->billing_address }}
</div>
<div class="col-md-12 mb-3">
<div class="text-muted small">Lieferadresse</div>
<div class="text-muted small">{{ __('Delivery address') }}</div>
{{ $order->shipping_address }}
</div>
</div>
@ -94,17 +94,17 @@
<table class="table table-product m-0" style="">
<tbody>
<tr class="">
<th class="text-left">Produkt</th>
<th class="text-left">{{ __('order.product') }}</th>
<th class="text-right">
VK-Preis brutto
{{__('tables.ek_price')}} {{__('tables.gross')}}
</th>
<th class="text-right">Anzahl</th>
<th class="text-right">Summe</th>
<th class="text-right">{{ __('orderquantity.') }}</th>
<th class="text-right">{{ __('order.sum') }}</th>
</tr>
@foreach($order->shopping_order->shopping_order_items as $shopping_order_item)
<tr class="">
<td class="py-2">
<strong>{{ $shopping_order_item->product->name }}</strong>
<strong>{{ $shopping_order_item->product->getLang('name') }}</strong>
<span class="text-muted">#{{ $shopping_order_item->product->number }}</span>
</td>
<td class="align-middle py-2 nowrap text-right" style="min-width:100px;">
@ -173,7 +173,7 @@
<div class="row">
<div class="col-12">
<div class="d-flex justify-content-between align-items-center w-100">
<div>Warenkorb</div>
<div>{{ __('order.shopping_cart') }}</div>
</div>
</div>
</div>
@ -182,10 +182,10 @@
@include('user.shop.sales.api_order_list_total')
<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>
<button type="submit" class="btn btn-secondary"><i class="ion ion-ios-redo"></i> {{ __('order.confirm_and_proceed_to_checkout') }}</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>
<em class="small text-center"> <i class="fa fa-lock"></i> {{ __('payment.checkout_ssl_server') }}</em>
</div>
</div>
{!! Form::close() !!}

22
resources/views/user/shop/sales/api_order_list_total.blade.php
View file

@ -3,13 +3,13 @@
<table class="table table-striped">
<thead>
<tr>
<th class="text-left">{{__('Produkt')}}</th>
<th class="text-right">{{__('Points')}}</th>
<th class="text-right">{{__('Netto-Preis')}}</th>
<th class="text-right">{{__('Anzahl')}}</th>
<th class="text-right">{{__('Summe Netto')}}</th>
<th class="text-left">{{__('tables.product')}}</th>
<th class="text-right">{{__('tables.points')}}</th>
<th class="text-right">{{__('tables.net_price')}}</th>
<th class="text-right">{{__('tables.quantity')}}</th>
<th class="text-right">{{__('tables.net_sum')}}</th>
<th class="text-right" style="max-width: 5%">{{__('%')}}</th>
<th class="text-right" style="max-width: 10%">{{__('MwSt')}}</th>
<th class="text-right" style="max-width: 10%">{{__('tables.VAT')}}</th>
</tr>
</thead>
@ -44,7 +44,7 @@
@endforeach
<tr>
<td>
<strong>Gesamte Versandkosten</strong>
<strong>{{ __('order.total_shipping_costs') }}</strong>
</td>
<td class="text-right">
</td>
@ -72,7 +72,7 @@
</tr>
<tr>
<td colspan="1">
Summen:
{{ __('order.sums') }}
</td>
<td class="text-right" colspan="1">
<strong>{{ $shopApiOrderCart->points }} <strong>
@ -93,7 +93,7 @@
</tr>
<tr>
<td colspan="6">
<strong>Gesamte netto</strong>
<strong>{{ __('order.total_net') }}</strong>
</td>
<td class="text-right">
<strong>{{ formatNumber($shopApiOrderCart->price_total_net) }} &euro;</strong>
@ -101,7 +101,7 @@
</tr>
<tr class="border-none td-small">
<td colspan="5">
zzgl. MwSt:
{{ __('order.plus_VAT') }}:
</td>
<td class="text-right" colspan="2">
@ -112,7 +112,7 @@
</tr>
<tr>
<td colspan="6">
<strong>Gesamtsumme Brutto: </strong>
<strong>{{ __('order.total_gross') }}:</strong>
</td>
<td class="text-right">
<strong>{{ formatNumber($shopApiOrderCart->getTotalPrice()) }} &euro;</strong>

28
resources/views/user/shop/sales/api_orders.blade.php
View file

@ -5,7 +5,7 @@
{!! Form::open(['url' => route('user_shop_api_orders_action'), 'class' => 'form-horizontal', 'id'=>'user_shop_api_orders-form']) !!}
<div class="card">
<h5 class="card-header">
{{ __('Externe Bestellungen') }}
{{ __('order.external_orders') }}
</h5>
<div class="card-body p-0">
@ -30,9 +30,9 @@
</div>
<div class="col-12 mb-0 mt-1">
<p class="mb-0">
bezahlen = Sammelrechnung erstellen und zum Checkout<br>
entfernen = Bestellungen werden nach entfernt verschoben, für Stornos etc.<br>
zurücksetzen = Bestellungen werden nur nach offen verschoben, Sammelrechnung werden nicht geändert
{{ __('order.external_orders_info_pay') }} <br>
{{ __('order.external_orders_info_remove') }} <br>
{{ __('order.external_orders_info_reset') }}
</p>
</div>
</div>
@ -43,15 +43,15 @@
<thead>
<tr>
<th>#</th>
<th>{{__('Zahlung') }}</th>
<th>{{__('Versand') }}</th>
<th>{{__('First name')}}</th>
<th>{{__('Last name')}}</th>
<th>{{__('E-Mail')}}</th>
<th>{{__('Datum')}}</th>
<th>{{__('Betrag')}}</th>
<th>{{__('Detail')}}</th>
<th>{{__('Art')}}</th>
<th>{{__('tables.shipping') }}</th>
<th>{{__('tables.shipping') }}</th>
<th>{{__('tables.firstname')}}</th>
<th>{{__('tables.lastname')}}</th>
<th>{{__('tables.email')}}</th>
<th>{{__('tables.date')}}</th>
<th>{{__('tables.amount')}}</th>
<th>{{__('tables.detail')}}</th>
<th>{{__('tables.art')}}</th>
</tr>
</thead>
</table>
@ -87,7 +87,7 @@
"bLengthChange": false,
"iDisplayLength": 100,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
$('select.on_change_datatable').on('change', function(){

4
resources/views/user/shop/sales/modal_api_order_detail.blade.php
View file

@ -1,7 +1,7 @@
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">
{{ __('Bestellung Kunde') }} <span class="text-muted">#{{$shopping_order->id}}</span>
{{ __('shop.order_customer') }} <span class="text-muted">#{{$shopping_order->id}}</span>
</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
@ -11,7 +11,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
<button type="button" class="btn btn-default" data-dismiss="modal">{{ __('close') }}</button>
</div>

22
resources/views/user/shop/sales/modal_api_order_shipping_detail.blade.php
View file

@ -1,25 +1,25 @@
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">
{{ __('Bestellung') }} <span class="text-muted">#{{$shopping_order->id}}</span>
{{ __('navigation.order') }} <span class="text-muted">#{{$shopping_order->id}}</span>
</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<div class="modal-body">
<h5 class="mt-4">Sammelrechnung behinhaltet folgende Kundenbestellungen</h5>
<h5 class="mt-4">{{ 'order.collective_invoice_contains_orders' }}</h5>
<div class="card-datatable table-responsive pt-0">
<table class="table table-striped table-bordered">
<thead>
<tr>
<th>#</th>
<th>{{__('Nummer') }}</th>
<th>{{__('Versand') }}</th>
<th>{{__('First name')}}</th>
<th>{{__('Last name')}}</th>
<th>{{__('E-Mail')}}</th>
<th>{{__('Datum')}}</th>
<th>{{__('Betrag')}}</th>
<th>{{__('tables.number') }}</th>
<th>{{__('tables.shipping') }}</th>
<th>{{__('tables.firstname')}}</th>
<th>{{__('tables.lastname')}}</th>
<th>{{__('tables.email')}}</th>
<th>{{__('tables.date')}}</th>
<th>{{__('tables.amount')}}</th>
</tr>
</thead>
<tbody>
@ -32,7 +32,7 @@
data-back=""
data-modal="modal-xl"
data-init_from="admin"
data-route="{{ route('modal_load') }}"><span class="far fa-eye"></span></button>
data-route="{{ route('modal_load') }}"><span class="fa fa-eye"></span></button>
</td>
<td>{{ $order['order_id'] }}</td>
<td>
@ -51,7 +51,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
<button type="button" class="btn btn-default" data-dismiss="modal">{{ __('close') }}</button>
</div>

6
resources/views/user/shop/sales/order_detail.blade.php
View file

@ -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>
{{ __('Bestellung Kunde') }} <span class="text-muted">#{{$shopping_order->id}}</span>
<a href="{{route('user_shop_orders')}}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
{{ __('shop.order_customer') }} <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_shop_orders')}}" class="btn btn-sm btn-default mt-2 float-right">{{ __('back') }}</a>
@endsection

28
resources/views/user/shop/sales/orders.blade.php
View file

@ -4,28 +4,24 @@
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Bestellungen Kunden') }}
{{ __('shop.orders_customers') }}
</h4>
<div class="card">
<div class="card-datatable table-responsive">
<table class="datatable-customers table table-striped table-bordered">
<thead>
<tr>
<th>#</th>
<th>{{__('Datum')}}</th>
<th>{{__('Betrag')}}</th>
<th>{{__('Status')}}</th>
<th>{{__('Versand')}}</th>
<th>{{__('First name')}}</th>
<th>{{__('Last name')}}</th>
<th>{{__('E-Mail')}}</th>
<th>{{__('Rechnung')}}</th>
<th>{{__('Art')}}</th>
<th>{{__('tables.date')}}</th>
<th>{{__('tables.amount')}}</th>
<th>{{__('tables.status')}}</th>
<th>{{__('tables.shipping')}}</th>
<th>{{__('tables.firstname')}}</th>
<th>{{__('tables.lastname')}}</th>
<th>{{__('tables.email')}}</th>
<th>{{__('tables.invoice')}}</th>
<th>{{__('tables.art')}}</th>
</tr>
</thead>
</table>
@ -53,7 +49,7 @@
"bLengthChange": false,
"iDisplayLength": 100,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
});

66
resources/views/user/shop/translate.blade.php Normal file
View file

@ -0,0 +1,66 @@
@extends('layouts.layout-2')
@section('content')
{{-- @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
--}}
<h4 class="font-weight-bold py-2 mb-2">
{{ __('navigation.my_shop') }} {{ __('navigation.translate') }}
</h4>
<div class="row">
<div class="col-12">
<div class="text-right mt-0 mb-2">
<a href="{{ route('user_shop') }}" class="btn btn-default">{{ __('back') }}</a>
</div>
<div class="card mb-4">
<div class="card-body">
{!! Form::open(['url' => route('user_shop_tanslate_store'), 'class' => 'form-horizontal', 'id'=>'']) !!}
@foreach($localizations as $lang)
<div class="form-group">
<label class="form-label" for="contact">{{ __('shop.shop_contact') }} | <strong style="text-transform: uppercase">{{ __('website.language') }} {{$lang}}</strong></label>
{{ Form::textarea('trans['.$lang.'][contact]', $user->shop->getTrans('contact', $lang, false) , array('placeholder'=>__('shop.shop_contact'), 'class'=>'form-control', 'id'=>'contact', 'rows'=>4)) }}
<small class="form-text text-muted">{{ __('shop.shop_contact_help') }}</small>
</div>
<div class="form-group">
<label class="form-label" for="accessibility">{{ __('shop.shop_accessibility') }} | <strong style="text-transform: uppercase">{{ __('website.language') }} {{$lang}}</strong></label>
{{ Form::textarea('trans['.$lang.'][accessibility]', $user->shop->getTrans('accessibility', $lang, false) , array('placeholder'=>__('shop.shop_accessibility'), 'class'=>'form-control', 'id'=>'accessibility', 'rows'=>2)) }}
<small class="form-text text-muted">{{ __('shop.shop_accessibility_help') }}</small>
</div>
<div class="form-group">
<label class="form-label" for="about">{{ __('shop.shop_about') }} | <strong style="text-transform: uppercase">{{ __('website.language') }} {{$lang}}</strong></label>
{{ Form::textarea('trans['.$lang.'][about]', $user->shop->getTrans('about', $lang, false) , array('placeholder'=>'', 'class'=>'form-control', 'id'=>'about', 'rows'=>2)) }}
<small class="form-text text-muted">{{ __('shop.shop_about_help') }}</small>
</div>
<hr>
@endforeach
<div class="text-left mt-0 mb-2">
<button type="submit" class="btn btn-secondary">{{ __('save') }}</button>&nbsp;
</div>
{!! Form::close() !!}
</div>
</div>
<div class="text-right mt-0 mb-2">
<a href="{{ route('user_shop') }}" class="btn btn-default">{{ __('back') }}</a>
</div>
</div>
</div>
@endsection

4
resources/views/user/team/_points_sum.blade.php
View file

@ -1,10 +1,10 @@
<h6>
@if($userSalesVolume)
<div class="mb-2">
<strong>Gesamte Points: {{ $userSalesVolume->getPointsKPSum() }}</strong> | Eigene: {{ $userSalesVolume->month_points }} | Shop: {{ $userSalesVolume->month_shop_points }}<br>
<strong>{{ __('team.total_points') }}: {{ $userSalesVolume->getPointsKPSum() }}</strong> | {{ __('team.own') }}: {{ $userSalesVolume->month_points }} | {{ __('team.shop') }}: {{ $userSalesVolume->month_shop_points }}<br>
</div>
<div>
<strong>Gesamter Umsatz: {{ formatNumber($userSalesVolume->getTotalNetSum()) }} &euro;</strong> | Eigene: {{ formatNumber($userSalesVolume->month_total_net) }} &euro; | Shop: {{ formatNumber($userSalesVolume->month_shop_total_net) }} &euro;
<strong>{{ __('team.total_turnover') }}: {{ formatNumber($userSalesVolume->getTotalNetSum()) }} &euro;</strong> | {{ __('team.own') }}: {{ formatNumber($userSalesVolume->month_total_net) }} &euro; | {{ __('team.shop') }}: {{ formatNumber($userSalesVolume->month_shop_total_net) }} &euro;
</div>
@endif
</h6>

40
resources/views/user/team/export.blade.php
View file

@ -20,12 +20,12 @@
</h4>
<div class="card">
<h5 class="card-header">
{{__('Export')}}
{{__('team.export')}}
</h5>
<div class="card-body">
{!! Form::open(['url' => route('user_team_export_download'), 'class' => '']) !!}
{!! Form::hidden('key', 'value') !!}
<button type="submit" name="action" value="export" class="btn btn-md btn-primary mb-2"><i class="ion ion-md-download"></i> &nbsp;Export als xls</button>
<button type="submit" name="action" value="export" class="btn btn-md btn-primary mb-2"><i class="ion ion-md-download"></i> &nbsp;{{ __('team.export_as_xls') }}</button>
{!! Form::close() !!}
<div class="card">
@ -34,22 +34,22 @@
<thead>
<tr>
<th>{{__('Line') }}</th>
<th>{{__('Level')}}</th>
<th>{{__('E-Mail')}}</th>
<th>{{__('Vorname')}}</th>
<th>{{__('Nachname')}}</th>
<th>{{__('Adresse')}}</th>
<th>{{__('Zusatz') }}</th>
<th>{{__('PLZ') }}</th>
<th>{{__('Ort') }}</th>
<th>{{__('Land') }}</th>
<th>{{__('Tel') }}</th>
<th>{{__('Mobil') }}</th>
<th>{{__('Geburtstag') }}</th>
<th>{{__('Account') }}</th>
<th>{{__('Account bis') }}</th>
<th>{{__('Sponsor')}}</th>
<th>{{__('tables.line') }}</th>
<th>{{__('tables.level')}}</th>
<th>{{__('tables.email')}}</th>
<th>{{__('tables.firstname')}}</th>
<th>{{__('tables.lastname')}}</th>
<th>{{__('tables.address')}}</th>
<th>{{__('tables.addition') }}</th>
<th>{{__('tables.postcode') }}</th>
<th>{{__('tables.city') }}</th>
<th>{{__('tables.country') }}</th>
<th>{{__('tables.phone') }}</th>
<th>{{__('tables.mobil') }}</th>
<th>{{__('tables.birthday') }}</th>
<th>{{__('tables.account') }}</th>
<th>{{__('tables.account_to') }}</th>
<th>{{__('tables.sponsor')}}</th>
</tr>
</thead>
<tbody>
@ -69,7 +69,7 @@
<td>{{ $child->phone }}</td>
<td>{{ $child->mobil }}</td>
<td>{{ $child->birthday }}</td>
<td>{!! ($child->active_account == 1 ? 'JA' : 'NEIN') !!}</td>
<td>{!! ($child->active_account == 1 ? __('yes') : __('no')) !!}</td>
<td>{{ $child->payment_account_date }}</td>
<td>{{ $child->sponsor_name }}</td>
@ -95,7 +95,7 @@
"order": [[ 1, "desc" ]],
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
});

8
resources/views/user/team/members.blade.php
View file

@ -19,19 +19,19 @@
{{ __('navigation.my_team') }}
</h4>
<div class="card">
<h5 class="card-header">Neuen Berater registrieren</h5>
<h5 class="card-header">{{ __('team.register_new_consultant') }}</h5>
<div class="row no-gutters row-bordered">
<div class="col-md-12 p-4">
<h6 class="mb-4">Link für Beraterregistrierung</h6>
<h6 class="mb-4">{{ __('team.link_for_consultant_registration') }}</h6>
<div class="form-group">
<div class="input-group">
<span class="input-group-prepend">
<button class="btn btn-secondary" type="button" title="Kopiert!" data-clipboard-demo data-clipboard-target="#shop_register_link"><i class="ion ion-ios-copy"></i> Link kopieren</button>
<button class="btn btn-secondary" type="button" title="Kopiert!" data-clipboard-demo data-clipboard-target="#shop_register_link"><i class="ion ion-ios-copy"></i> {{ __('Copy link') }}</button>
</span>
<input type="text" class="form-control" name="shop_register_link" value="{{$shop_register_link}}" id="shop_register_link" placeholder="">
</div>
</div>
<p>Du möchtest einen neuen Berater registrieren? Super, das freut uns. Sende ihm einfach nachfolgenden Link per Mail, WhatsApp oder SMS zu. Er gelangt damit auf die Registrierungsseite von www.mivita.care. Wichtig ist, dass Du diesen Link nicht veränderst, denn die angehängte Berater-ID identifiziert Dich als Sponsor von dem neuen Berater. Nur so können Dir künftige Provisionen durch Umsätze von ihm zugeordnet werden. Nutze das „Kopier-Symbol“, um den Link gleich in Deine Zwischenablage zu kopieren.
<p>{{ __('team.new_consultant_copy1') }}</p>
</div>
</div>
</div><!-- Target -->

20
resources/views/user/team/points.blade.php
View file

@ -20,7 +20,7 @@
</h4>
<div class="card">
<h5 class="card-header">
{{__('Points')}}
{{ __('team.points') }}
</h5>
<div class="card-body">
{!! Form::open(['url' => route('user_team_points'), 'class' => 'form-horizontal', 'id'=>'form_filter_user_points']) !!}
@ -52,13 +52,14 @@
<thead>
<tr>
<th>{{__('Datum') }}</th>
<th>{{__('Points')}}</th>
<th>{{__('Umsatz netto')}}</th>
<th>{{__('Art')}}</th>
<th>{{__('Bestellung')}}</th>
<th>{{__('Info') }}</th>
<th>{{__('Notiz') }}</th>
<th>{{__('tables.date') }}</th>
<th>{{__('tables.points')}}</th>
<th>{{__('tables.net_sales')}}</th>
<th>{{__('tables.ve')}}</th>
<th>{{__('tables.art')}}</th>
<th>{{__('tables.order')}}</th>
<th>{{__('tables.info') }}</th>
<th>{{__('tables.note') }}</th>
</tr>
</thead>
@ -100,6 +101,7 @@
{ data: 'date', name: 'date' },
{ data: 'points', name: 'points' },
{ data: 'total_net', name: 'total_net' },
{ data: 'status_turnover', name: 'status_turnover' },
{ data: 'status', name: 'status', searchable: false },
{ data: 'order', name: 'order', orderable: false },
{ data: 'message', name: 'message', searchable: false },
@ -108,7 +110,7 @@
"bLengthChange": false,
"iDisplayLength": 100,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
},
"drawCallback": function( settings ) {
load_team_user_points_sum();

10
resources/views/user/team/structure.blade.php
View file

@ -20,7 +20,7 @@
</h4>
<div class="card">
<h5 class="card-header">
{{__('Business')}} {{__('Struktur')}}
{{__('team.business')}} {{__('team.structure')}}
</h5>
<div class="card-body">
{!! Form::open(['url' => route('user_team_structure'), 'class' => 'form-horizontal', 'id'=>'form_filter_business_user']) !!}
@ -46,14 +46,14 @@
<hr class="container-m-nx border-light mt-0">
<div>
<div id="nestable-menu" class="mb-4">
<button type="button" class="btn btn-default btn-sm" data-action="expand-all">Alles aufklappen</button>
<button type="button" class="btn btn-default btn-sm" data-action="collapse-all">Alles zuklappen</button>
<button type="button" class="btn btn-default btn-sm" data-action="expand-all">{{ __('team.expand_all') }}</button>
<button type="button" class="btn btn-default btn-sm" data-action="collapse-all">{{ __('team.collapse_all') }}</button>
</div>
<div class="row">
<div class="col-md-12">
<h6 class="">
Dein Sponsor
{{ __('team.your_sponsor') }}
</h6>
<div class="dd" id="">
{!! $TreeCalcBot->makeSponsorHtml() !!}
@ -65,7 +65,7 @@
<div class="row">
<div class="col-md-12">
<h6 class="">
Dein Team
{{ __('team.your_team') }}
</h6>
<div class="dd" id="nestable2">
{!! $TreeCalcBot->makeHtmlTree() !!}

4
resources/views/user/update_email.blade.php
View file

@ -3,13 +3,13 @@
@section('content')
<div class="card mb-4">
<h5 class="card-header">
{{__('Change E-Mail')}}
{{__('register.change_email')}}
</h5>
<div class="card-body">
<div class="row">
<div class="col-sm-2"></div>
<div class="col-sm-10">
<p>{{__('Change your e-mail address here. We will send you a new activation link to your new e-mail address to verify it.')}}</p>
<p>{{__('register.change_email_address_verify_it_info')}}</p>
</div>
</div>

2
resources/views/user/update_password.blade.php
View file

@ -3,7 +3,7 @@
@section('content')
<div class="card mb-4">
<h5 class="card-header">
{{__('Change Password')}}
{{__('Change password')}}
</h5>
<div class="card-body">
{!! Form::open(['url' => route('user_update_password')]) !!}

243
resources/views/user/user_form.blade.php
View file

@ -2,11 +2,11 @@
<h5 class="card-header">
<div class="row">
<div class="col-xs-12 col-sm-6">
Rechnungsadresse
{{ __('account.invoice_address') }}
</div>
<div class="col-xs-12 col-sm-6">
<span class="text-tiny float-right">* {{trans('register.required_fields')}}</span>
<span class="d-none d-lg-inline">Lieferadresse</span>
<span class="text-tiny float-right">* {{__('register.required_fields')}}</span>
<span class="d-none d-lg-inline">{{ __('account.delivery_address') }}</span>
</div>
</div>
</h5>
@ -17,7 +17,7 @@
<div class="col-12 col-lg-6">
<div class="form-row">
<div class="form-group col-md-12">
<label for="company" class="form-label">{{ __('Company name') }} (optional)</label>
<label for="company" class="form-label">{{ __('Company name') }} ({{__('optional')}})</label>
{{ Form::text('company', $user->account->company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'company', 'tabindex' => 1)) }}
</div>
</div>
@ -69,8 +69,8 @@
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('address_2') ? 'has-error' : '' }}">
<label class="form-label" for="address_2">{{ __('Wohnung / Gebäude (optional)') }}</label>
{{ Form::text('address_2', $user->account->address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'address_2', 'tabindex' => 6)) }}
<label class="form-label" for="address_2">{{ __('Flat Building optional') }}</label>
{{ Form::text('address_2', $user->account->address_2, array('placeholder'=>__('Flat Building optional'), 'class'=>'form-control', 'id'=>'address_2', 'tabindex' => 6)) }}
</div>
</div>
<div class="form-row">
@ -106,7 +106,7 @@
@endif
</div>
<div class="form-group col-md-6">
<label for="birthday" class="form-label">{{ __('Geburtsdatum') }}*</label>
<label class="form-label">{{ __('Date of birth') }}*</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')) }}
</div>
</div>
@ -135,9 +135,9 @@
</div>
<div class="form-group col-md-12">
@if($errors->has('phone') || $errors->has('mobil'))
<div class="alert badge-danger block p-2">Fehler: Bitte {{ __('Phone') }} und/oder {{ __('Mobile Phone') }} angeben!*</div>
<div class="alert badge-danger block p-2">{{ __('account.phone_need_error') }}</div>
@else
<div class="badge badge-default">Hinweis: Bitte {{ __('Phone') }} und/oder {{ __('Mobile Phone') }} angeben!*</div>
<div class="badge badge-default">{{ __('account.phone_need_note') }}</div>
@endif
</div>
@ -146,12 +146,12 @@
<div class="col-12 col-lg-6">
<div class="d-md-block d-lg-none">
<hr>
<h5 class="mt-4">Lieferadresse</h5>
<h5 class="mt-4">{{ __('account.delivery_address') }}</h5>
</div>
<div id="show_shipping_address" style="@if($user->account->same_as_billing) display:none @endif">
<div class="form-row">
<div class="form-group col-md-12">
<label for="shipping_company" class="form-label">{{ __('Company name') }} (optional)</label>
<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', 'id'=>'shipping_company', 'tabindex' => 16)) }}
</div>
</div>
@ -202,8 +202,8 @@
</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', 'id'=>'shipping_address_2', 'tabindex' => 21)) }}
<label class="form-label" for="shipping_address_2">{{ __('Flat Building optional') }}</label>
{{ Form::text('shipping_address_2', $user->account->shipping_address_2, array('placeholder'=>__('Flat Building optional'), 'class'=>'form-control', 'id'=>'shipping_address_2', 'tabindex' => 21)) }}
@if ($errors->has('shipping_address_2'))
<span class="help-block">
<strong>{{ $errors->first('shipping_address_2') }}</strong>
@ -262,7 +262,7 @@
<div class="form-group">
<label class="custom-control custom-checkbox m-0">
<input type="checkbox" class="custom-control-input" name="same_as_billing" id="same_as_billing" @if($user->account->same_as_billing) checked="checked" @endif>
<span class="custom-control-label">{{__('Versand an die gleiche Adresse')}}</span>
<span class="custom-control-label">{{__('Shipping to the same address')}}</span>
</label>
</div>
</div>
@ -285,9 +285,9 @@
@if(count($user->user_update_email) > 0)
<p class="badge badge-primary" style=" color:#fff;">{{ $user->user_update_email->first()->email }} {{__('waiting for activation since')}} | {{ $user->user_update_email->first()->created_at->format('d.m.Y H:i') }}</p><br>
@endif
<a href="{{ route('admin_lead_change_mail', [$user->id]) }}" class="btn btn-default btn-sm"> {{ __('Contact') }} {{__('Change E-Mail')}}</a>
<a href="{{ route('admin_lead_change_mail', [$user->id]) }}" class="btn btn-default btn-sm"> {{ __('Contact') }} {{__('register.change_email')}}</a>
@else
<a href="{{ route('user_update_email', [$user->id]) }}" class="btn btn-default btn-sm">{{__('Change E-Mail')}}</a>
<a href="{{ route('user_update_email', [$user->id]) }}" class="btn btn-default btn-sm">{{__('register.change_email')}}</a>
@endif
@else
<div class="form-row">
@ -305,102 +305,132 @@
</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">{{ __('Umsatzsteuerpflicht') }} @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">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">
<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'))) }}
</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">{{ __('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'), ($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">Reverse Charge Verfahren</span><br>
<em>Umkehrung der Steuerschuldnerschaft oder auch Abzugsverfahren. In diesem Spezialfall muss der Leistungsempfänger (Berater) und nicht der leistende Unternehmer (mivita) die Umsatzsteuer entrichten.
<strong>Bei der Aktivierung wird die USt-ID benötigt und validiert.</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> &nbsp;{{ __('Reverse Charge Verfahren und UST-ID löschen') }}</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">{{ __('UST-ID validieren und Reverse Charge Verfahren aktivieren') }}</button>
@endif
@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'))) }}
</div>
@endif
</div>
</div>
</div>
<div class="card mb-4">
<h5 class="card-header">
Bankdaten <span class=" text-muted small">(Wird für die Auszahlungen von Provisionen benötigt)</span>
{{ __('account.bank_data') }} <span class=" text-muted small">({{ __('account.required_for_commission_payments') }})</span>
</h5>
<div class="card-body">
<div class="form-row">
<div class="form-group col-md-12">
<label class="form-label" for="bank_owner">{{ __('Kontoinhaber') }}</label>
{{ Form::text('bank_owner', $user->account->bank_owner, array('placeholder'=>__('Vorname Nachname'), 'class'=>'form-control', 'id'=>'bank_owner')) }}
<label class="form-label" for="bank_owner">{{ __('account.account_holder') }}</label>
{{ Form::text('bank_owner', $user->account->bank_owner, array('placeholder'=>__('account.firstname_lastname'), 'class'=>'form-control', 'id'=>'bank_owner')) }}
</div>
<div class="form-group col-md-6">
<label class="form-label" for="bank_iban">{{ __('IBAN') }}</label>
{{ Form::text('bank_iban', $user->account->bank_iban, array('placeholder'=>__('IBAN'), 'class'=>'form-control', 'id'=>'bank_iban')) }}
<label class="form-label" for="bank_iban">{{ __('account.IBAN') }}</label>
{{ Form::text('bank_iban', $user->account->bank_iban, array('placeholder'=>__('account.IBAN'), 'class'=>'form-control', 'id'=>'bank_iban')) }}
</div>
<div class="form-group col-md-6">
<label class="form-label" for="bank_bic">{{ __('BIC') }}</label>
{{ Form::text('bank_bic', $user->account->bank_bic, array('placeholder'=>__('BIC'), 'class'=>'form-control', 'id'=>'bank_bic')) }}
<label class="form-label" for="bank_bic">{{ __('account.BIC') }}</label>
{{ Form::text('bank_bic', $user->account->bank_bic, array('placeholder'=>__('account.BIC'), 'class'=>'form-control', 'id'=>'bank_bic')) }}
</div>
</div>
</div>
</div>
<div class="card mb-4">
<h5 class="card-header">
<div class="row">
<div class="col-md-12">
{{ __('account.vat_data') }}
</div>
</div>
</h5>
<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">{{ __('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 {{ $errors->has('tax_number') ? 'has-error' : '' }}">
<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'))) }}
@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">{{ __('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'), '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> &nbsp;{{ __('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>&nbsp; {{ __('account.reverse_charge_action_2') }}
</button>
@endif
</div>
@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 class="row">
<div class="form-group col-md-12">
@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
@if(!$user->account-> tax_identification_number && !$user->account->tax_number)
<div class="badge badge-default">{{ __('account.info_vat_numbers') }}</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>&nbsp;
</div>
</div>
</div>
</div>
<script type="application/javascript">
$( document ).ready(function() {
// Shipping Address show|hide
$("#same_as_billing").on("change", function () {
$('#show_shipping_address').slideToggle(200, function () {
// scroll down to shipping area.
if ($('#show_shipping_address').is(":visible")) {
_scrollTo('#show_shipping_address', 20);
@ -409,22 +439,21 @@
});
$.extend( $.validator.messages, {
required: "Dieses Feld ist ein Pflichtfeld.",
maxlength: $.validator.format( "Geben Sie bitte maximal {0} Zeichen ein." ),
minlength: $.validator.format( "Geben Sie bitte mindestens {0} Zeichen ein." ),
rangelength: $.validator.format( "Geben Sie bitte mindestens {0} und maximal {1} Zeichen ein." ),
email: "Geben Sie bitte eine gültige E-Mail Adresse ein.",
url: "Geben Sie bitte eine gültige URL ein.",
date: "Bitte geben Sie ein gültiges Datum ein.",
number: "Geben Sie bitte eine Nummer ein.",
digits: "Geben Sie bitte nur Ziffern ein.",
equalTo: "Bitte denselben Wert wiederholen.",
range: $.validator.format( "Geben Sie bitte einen Wert zwischen {0} und {1} ein." ),
max: $.validator.format( "Geben Sie bitte einen Wert kleiner oder gleich {0} ein." ),
min: $.validator.format( "Geben Sie bitte einen Wert größer oder gleich {0} ein." ),
creditcard: "Geben Sie bitte eine gültige Kreditkarten-Nummer ein."
required: "{{__('account.validator_required')}}",
maxlength: $.validator.format( "{{__('account.validator_maxlength')}}" ),
minlength: $.validator.format( "{{__('account.validator_minlength')}}" ),
rangelength: $.validator.format( "{{__('account.validator_rangelength')}}" ),
email: "{{__('account.validator_email')}}",
url: "{{__('account.validator_url')}}",
date: "{{__('account.validator_date')}}",
number: "{{__('account.validator_number')}}",
digits: "{{__('account.validator_digits')}}",
equalTo: "{{__('account.validator_equalTo')}}",
range: $.validator.format( "{{__('account.validator_range')}}" ),
max: $.validator.format( "{{__('account.validator_max')}}" ),
min: $.validator.format( "{{__('account.validator_min')}}" ),
creditcard: "{{__('account.validator_creditcard')}}"
});
// Set up validator
$('#lead-form-validation').validate({
rules: {
@ -478,7 +507,7 @@
required: "{{__('This field is required.')}}",
},
salutation : {
required: "{{__('Bitte angeben.')}}",
required: "{{__('please specify')}}",
},
first_name : {
required: "{{__('This field is required.')}}",

40
resources/views/user/user_new_form.blade.php
View file

@ -11,7 +11,7 @@
<div class="col-12 col-lg-6">
<div class="form-row">
<div class="form-group col-md-12">
<label for="company" class="form-label">{{ __('Company name') }} (optional)</label>
<label for="company" class="form-label">{{ __('Company name') }} ({{__('optional')}})</label>
{{ Form::text('company', $user->account->company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'company', 'tabindex' => 1)) }}
</div>
</div>
@ -63,8 +63,8 @@
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('address_2') ? 'has-error' : '' }}">
<label class="form-label" for="address_2">{{ __('Wohnung / Gebäude (optional)') }}</label>
{{ Form::text('address_2', $user->account->address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'address_2', 'tabindex' => 6)) }}
<label class="form-label" for="address_2">{{ __('Flat Building optional') }}</label>
{{ Form::text('address_2', $user->account->address_2, array('placeholder'=>__('Flat Building optional'), 'class'=>'form-control', 'id'=>'address_2', 'tabindex' => 6)) }}
</div>
</div>
<div class="form-row">
@ -100,7 +100,7 @@
@endif
</div>
<div class="form-group col-md-6">
<label for="birthday" class="form-label">{{ __('Geburtsdatum') }}</label>
<label for="birthday" class="form-label">{{ __('Date of birth') }}</label>
{{ Form::text('birthday', $user->account->birthday, array('placeholder'=>Util::formatDate(), 'data-date-format'=>Util::formatDate(), 'data-start_view'=>2, 'class'=>'form-control datepicker-birthday')) }}
</div>
</div>
@ -134,7 +134,7 @@
<div class="form-group">
<label class="custom-control custom-checkbox m-0">
<input type="checkbox" class="custom-control-input" name="same_as_billing" id="same_as_billing" checked="checked" disabled>
<span class="custom-control-label">{{__('Versand an die gleiche Adresse')}}</span>
<span class="custom-control-label">{{__('Shipping to the same address')}}</span>
</label>
</div>
</div>
@ -172,20 +172,20 @@
$.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."
required: "{{__('account.validator_required')}}",
maxlength: $.validator.format( "{{__('account.validator_maxlength')}}" ),
minlength: $.validator.format( "{{__('account.validator_minlength')}}" ),
rangelength: $.validator.format( "{{__('account.validator_rangelength')}}" ),
email: "{{__('account.validator_email')}}",
url: "{{__('account.validator_url')}}",
date: "{{__('account.validator_date')}}",
number: "{{__('account.validator_number')}}",
digits: "{{__('account.validator_digits')}}",
equalTo: "{{__('account.validator_equalTo')}}",
range: $.validator.format( "{{__('account.validator_range')}}" ),
max: $.validator.format( "{{__('account.validator_max')}}" ),
min: $.validator.format( "{{__('account.validator_min')}}" ),
creditcard: "{{__('account.validator_creditcard')}}"
});
// Set up validator
@ -241,7 +241,7 @@
required: "{{__('This field is required.')}}",
},
salutation : {
required: "{{__('Bitte angeben.')}}",
required: "{{__('please specify')}}",
},
first_name : {
required: "{{__('This field is required.')}}",

26
resources/views/user/wizard/_payment.blade.php
View file

@ -2,19 +2,19 @@
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Bestellland</div>
<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">Lieferland</div>
<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">MwSt</div>
<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">Reverse Charge Verfahren</div>
<div class="text-muted small">{{ __('payment.reverse_charge_procedure') }}n</div>
{{ App\Services\UserService::getOrderInfo('user_reverse_charge') }}
</div>
</div>
@ -43,14 +43,14 @@
<img src="{{ route('product_image', [$product->images->first()->slug]) }}" class="d-block ui-w-60 ui-bordered mr-4" alt="">
@endif
<div class="media-body">
<h5 class="d-block text-dark">{{$product->name}}</h5>
<h5 class="d-block text-dark">{{$product->getLang('name')}}</h5>
{!! $product->getLang('copy') !!}
</div>
</div>
</td>
<td class="text-right font-weight-semibold align-middle p-4">
<span class="no-line-break">{{ $product->getFormattedPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) }} €</span> /p.a.
@if(\App\Services\UserService::$user_country->currency)
@if( \App\Services\UserService::$user_country && \App\Services\UserService::$user_country->currency)
<span class="no-line-break">{!! $product->getFormattedPriceCurrencyWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) !!}</span>
@endif
</td>
@ -85,14 +85,14 @@
<img src="{{ route('product_image', [$product->images->first()->slug]) }}" class="d-block ui-w-60 ui-bordered mr-4" alt="">
@endif
<div class="media-body">
<h5 class="d-block text-dark">{{$product->name}}</h5>
<h5 class="d-block text-dark">{{$product->getLang('name')}}</h5>
{!! $product->getLang('copy') !!}
</div>
</div>
</td>
<td class="text-right font-weight-semibold align-middle p-4">
<span class="no-line-break">{{ $product->getFormattedPriceWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) }} €</span>
@if(\App\Services\UserService::$user_country->currency)
@if(\App\Services\UserService::$user_country && \App\Services\UserService::$user_country->currency)
<span class="no-line-break">{!! $product->getFormattedPriceCurrencyWith(\App\Services\UserService::getTaxFree(), false, \App\Services\UserService::$user_country) !!}</span>
@endif
</td>
@ -106,18 +106,18 @@
<hr>
{{-- <label class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" name="abo_options">
<span class="custom-control-label secondary"><strong>{{__('payment.status.auto_renewal_hl')}}:</strong> {{__('payment.status.auto_renewal_line_1')}}</span>
<p class="text-muted">{{__('payment.status.auto_renewal_line_2')}}</p>
<span class="custom-control-label secondary"><strong>{{__('payment.auto_renewal_hl')}}:</strong> {{__('payment.auto_renewal_line_1')}}</span>
<p class="text-muted">{{__('payment.auto_renewal_line_2')}}</p>
</label>
<hr>
--}}
<div class="float-right">
<strong>Gesamtsumme @if(\App\Services\UserService::getTaxFree()) netto @else brutto @endif: <span id="card_total_price">0</span> €</strong>
<strong>{{ __('order.total_sum') }} @if(\App\Services\UserService::getTaxFree()) {{ __('order.net') }} @else {{ __('order.gross') }} @endif: <span id="card_total_price">0</span> €</strong>
</div>
<button type="submit" class="btn btn-secondary">{{ __('wählen und weiter zur Kasse') }}</button>&nbsp;
<button type="submit" class="btn btn-secondary">{{ __('payment.select_and_proceed_to_checkout') }}</button>&nbsp;
<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>
<em class="small text-center"> <i class="fa fa-lock"></i> {{ __('payment.checkout_ssl_server') }}</em>
</div>
{!! Form::close() !!}

70
resources/views/user/wizard/create.blade.php
View file

@ -17,7 +17,7 @@
@endif
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Registrierung abschließen') }}
{{__('register.complete_registration')}}
</h4>
<div id="smartwizard-3" class="smartwizard-register">
@ -26,8 +26,8 @@
<a href="#smartwizard-3-step-1" class="mb-3">
<span class="sw-done-icon ion ion-md-checkmark"></span>
<span class="sw-number">1</span>
Datenschutz
<div class="text-muted small">zustimmen</div>
{{__('register.data_protection')}}
<div class="text-muted small">{{__('register.agree')}}</div>
</a>
</li>
@ -35,8 +35,8 @@
<a href="#smartwizard-3-step-2" class="mb-3">
<span class="sw-done-icon ion ion-md-checkmark"></span>
<span class="sw-number">2</span>
Passwort
<div class="text-muted small">vergeben</div>
{{__('register.password')}}
<div class="text-muted small">{{__('register.assigned')}}</div>
</a>
</li>
@ -44,8 +44,8 @@
<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>
Daten
<div class="text-muted small">anpassen</div>
{{__('register.data')}}
<div class="text-muted small">{{__('register.adjust')}}</div>
</a>
@ -54,8 +54,8 @@
<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>
Paket
<div class="text-muted small">auswählen</div>
{{__('register.package')}}
<div class="text-muted small">{{__('register.select')}}</div>
</a>
</li>
</ul>
@ -66,7 +66,7 @@
{!! Form::open(['url' => route('wizard_store_create', [10]), 'class' => 'form-horizontal', 'id'=>'lead-form-validation-confirm']) !!}
@include('user.data_confirm')
<div class="text-left mt-3">
<button type="submit" class="btn btn-secondary">{{ __('zustimmen und weiter') }}</button>&nbsp;
<button type="submit" class="btn btn-secondary">{{ __('register.agree_and_continue') }}</button>&nbsp;
</div>
{!! Form::close() !!}
</div>
@ -77,13 +77,13 @@
{!! Form::open(['url' => route('wizard_store_create', [11])]) !!}
@include('user.update_password_first_form')
<div class="text-left mt-3">
<button type="submit" class="btn btn-secondary">{{ __('erstellen und weiter') }}</button>&nbsp;
<button type="submit" class="btn btn-secondary">{{ __('register.create_and_next') }}</button>&nbsp;
</div>
{!! Form::close() !!}
@else
{!! Form::open(['url' => route('wizard_store_create', [11])]) !!}
<p>Passwort wurde bereits erstellt.</p>
<button type="submit" class="btn btn-secondary">{{ __('weiter') }}</button>&nbsp;
<p>{{ __('register.password_has_already_been_created') }}</p>
<button type="submit" class="btn btn-secondary">{{ __('register.next') }}</button>&nbsp;
{!! Form::close() !!}
@endif
</div>
@ -91,9 +91,9 @@
<div id="smartwizard-3-step-3" class="card animated fadeIn">
<div class="card-body">
{!! Form::open(['url' => route('wizard_store_create', [12]), 'class' => 'form-horizontal', 'id'=>'lead-form-validation']) !!}
@include('user.user_form')
@include('user.user_form')
<div class="text-left mt-3">
<button type="submit" class="btn btn-secondary">{{ __('speichern und weiter') }}</button>&nbsp;
<button type="submit" class="btn btn-secondary">{{ __('register.save_and_continue') }}</button>&nbsp;
</div>
{!! Form::close() !!}
</div>
@ -101,10 +101,10 @@
<div id="smartwizard-3-step-4" class="card animated fadeIn">
<div class="card-body">
@if($userHistoryWizardPayment && $userHistoryWizardPayment->status > 2)
<h6 class="alert badge-{{$userHistoryWizardPayment->getStatusColor()}}">Eine Zahlung wurde ausgeführt. Status: {{ trans('payment.status.'.$userHistoryWizardPayment->getStatusType())}}</h6>
<h6 class="alert badge-{{$userHistoryWizardPayment->getStatusColor()}}">E {{__('membership.payment_has_been_made') }} {{__('membership.status') }}: {{ trans('payment.status.'.$userHistoryWizardPayment->getStatusType())}}</h6>
<h5 class="card-header bg-light">
<a href="#" class="" data-toggle="collapse" data-target="#collapsePaymentForm" aria-expanded="false" aria-controls="collapsePaymentForm">
<i class="fa fa-caret-expand"></i> {{ __('Zahlungsoptionen öffnen') }}
<i class="fa fa-caret-expand"></i> {{ __('register.open_payment_options') }}
</a>
</h5>
<div class="collapse" id="collapsePaymentForm">
@ -119,6 +119,42 @@
</div>
</div>
<!-- Modal template -->
<div class="modal fade" id="modal-user-vat-validation">
<div class="modal-dialog">
{!! Form::open(['url' => route('wizard_store_create', [12]), '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">

6
resources/views/user/wizard/create_release.blade.php
View file

@ -17,15 +17,15 @@
@endif
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Registrierung abgeschlossen') }}
{{__('register.registration_completed')}
</h4>
<div id="smartwizard-3" class="smartwizard-register">
<div class="mb-3">
<div id="smartwizard-3-step-6" class="card animated fadeIn">
<div class="card-body">
<h4>{{ trans('register.wizard_create_release_hl') }}</h4>
<p>{!! trans('register.wizard_create_release_line_1') !!}</p>
<h4>{{ __('register.wizard_create_release_hl') }}</h4>
<p>{!! __('register.wizard_create_release_line_1') !!}</p>
</div>
</div>
</div>

124
resources/views/user/wizard/register.blade.php
View file

@ -17,7 +17,7 @@
@endif
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Registrierung abschließen') }}
{{__('register.complete_registration')}}
</h4>
<div id="smartwizard-3" class="smartwizard-register">
@ -26,8 +26,8 @@
<a href="#smartwizard-3-step-1" class="mb-3">
<span class="sw-done-icon ion ion-md-checkmark"></span>
<span class="sw-number">1</span>
Vertrag
<div class="text-muted small">zustimmen</div>
{{__('register.contract')}}
<div class="text-muted small">{{__('register.agree')}}</div>
</a>
</li>
@ -35,16 +35,16 @@
<a href="#smartwizard-3-step-2" class="mb-3">
<span class="sw-done-icon ion ion-md-checkmark"></span>
<span class="sw-number">2</span>
Daten
<div class="text-muted small">anpassen</div>
{{__('register.data')}}
<div class="text-muted small">{{__('register.adjust')}}</div>
</a>
</li>
<li>
<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
<div class="text-muted small">hochladen</div>
{{__('register.badge')}}
<div class="text-muted small">{{__('register.upload')}}</div>
</a>
</li>
@ -52,8 +52,8 @@
<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>
{{__('register.trade_licence')}}
<div class="text-muted small">{{__('register.upload')}}</div>
</a>
</li>
@ -61,8 +61,8 @@
<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>
{{__('register.registration')}}
<div class="text-muted small">{{__('register.complete')}}</div>
</a>
</li>
</ul>
@ -74,7 +74,7 @@
{!! Form::open(['url' => route('wizard_store_register', [0]), 'class' => 'form-horizontal', 'id'=>'lead-form-validation-confirm']) !!}
@include('user.data_confirm')
<div class="text-left mt-3">
<button type="submit" class="btn btn-secondary">{{ __('zustimmen und weiter') }}</button>&nbsp;
<button type="submit" class="btn btn-secondary">{{__('register.agree_and_continue')}}</button>&nbsp;
</div>
{!! Form::close() !!}
</div>
@ -82,9 +82,9 @@
<div id="smartwizard-3-step-2" class="card animated fadeIn">
<div class="card-body">
{!! Form::open(['url' => route('wizard_store_register', [1]), 'class' => 'form-horizontal', 'id'=>'lead-form-validation']) !!}
@include('user.user_form')
@include('user.user_form')
<div class="text-left mt-3">
<button type="submit" class="btn btn-secondary">{{ __('speichern und weiter') }}</button>&nbsp;
<button type="submit" class="btn btn-secondary">{{ __('register.save_and_continue') }}</button>&nbsp;
</div>
{!! Form::close() !!}
</div>
@ -93,20 +93,21 @@
<div class="card-body">
<div class="card mb-4">
<h5 class="card-header">
{{ trans('register.wizard_verification_hl') }}
{{ __('register.wizard_verification_hl') }}
</h5>
<div class="card-body">
<div class="row">
<div class="col-sm-6">
<div class="mt-4">
{!! Form::open([ 'url' => route('wizard_store_register', [2]), 'method' => 'post', 'files' => true, 'enctype' => 'multipart/form-data', 'class' => 'dropzone', 'id' => 'idcardDropzone' ]) !!}
<input type="hidden" name="redirect" value="{{ route('wizard_register') }}">
<div class="fallback">
<input name="file" type="file" multiple>
</div>
{!! Form::close() !!}
<br>
<div class="alert alert-danger alert-dismissable" style="display:none;"></div>
<p>{{ trans('register.wizard_verification_line_1') }}</p>
<p>{{ __('register.wizard_verification_line_1') }}</p>
</div>
</div>
<div class="col-sm-6">
@ -118,7 +119,7 @@
<div class="card-body">
<h6 class="card-title"><a target="_blank" href="{{ route('storage_file', [$file->id, 'user']) }}">{{ $file->original_name }}</a></h6>
<p class="card-text">{{ $file->formatBytes() }}
<a href="{{ route('wizard_delete_file', [$file->id, 'upload']) }}" class="btn btn-sm btn-default float-right" onclick="return confirm('Datei wirklich löschen?');">
<a href="{{ route('wizard_delete_file', [$file->id, 'upload']) }}" class="btn btn-sm btn-default float-right" onclick="return confirm('{{__('register.really_delete_the_file')}}');">
<span class="ion ion-md-trash text-danger"></span>
</a>
</p>
@ -139,7 +140,7 @@
</div>
<div class="text-left mt-3">
{!! Form::open(['url' => route('wizard_store_register', [2])]) !!}
<button type="submit" name="submit" value="do" class="btn btn-secondary">{{ __('speichern und weiter') }}</button>&nbsp;
<button type="submit" name="submit" value="do" class="btn btn-secondary">{{ __('register.save_and_continue') }}</button>&nbsp;
{!! Form::close() !!}
</div>
</div>
@ -148,20 +149,21 @@
<div class="card-body">
<div class="card mb-4">
<h5 class="card-header">
{{ trans('register.wizard_business_license_hl') }}
{{ __('register.wizard_business_license_hl') }}
</h5>
<div class="card-body pb-0">
<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' ]) !!}
<input type="hidden" name="redirect" value="{{ route('wizard_register') }}">
<div class="fallback">
<input name="file" type="file" multiple>
</div>
{!! Form::close() !!}
<br>
<div class="alert alert-danger alert-dismissable" style="display:none;"></div>
<p>{{ trans('register.wizard_business_license_line_1') }}</p>
<p>{{ __('register.wizard_business_license_line_1') }}</p>
</div>
</div>
<div class="col-sm-6">
@ -173,7 +175,7 @@
<div class="card-body">
<h6 class="card-title"><a target="_blank" href="{{ route('storage_file', [$file->id, 'user']) }}">{{ $file->original_name }}</a></h6>
<p class="card-text">{{ $file->formatBytes() }}
<a href="{{ route('wizard_delete_file', [$file->id, 'upload']) }}" class="btn btn-sm btn-default float-right" onclick="return confirm('Datei wirklich löschen?');">
<a href="{{ route('wizard_delete_file', [$file->id, 'upload']) }}" class="btn btn-sm btn-default float-right" onclick="return confirm('{{__('register.really_delete_the_file')}}');">
<span class="ion ion-md-trash text-danger"></span>
</a>
</p>
@ -223,7 +225,7 @@
</div>
<div class="col-12 mt-2">
<hr>
<button type="submit" name="submit" value="do" class="btn btn-secondary">{{ __('speichern und weiter') }}</button>&nbsp;
<button type="submit" name="submit" value="do" class="btn btn-secondary">{{ __('register.save_and_continue') }}</button>&nbsp;
</div>
</div>
</div>
@ -233,15 +235,57 @@
</div>
<div id="smartwizard-3-step-5" class="card animated fadeIn">
<div class="card-body">
<h4>{{ trans('register.wizard_finish_hl') }}</h4>
<p>{{ trans('register.wizard_finish_line_1') }}.</p>
<h4>{{ __('register.wizard_finish_hl') }}</h4>
<p>{{ __('register.wizard_finish_line_1') }}.</p>
{!! Form::open(['url' => route('wizard_store_register', [4])]) !!}
<button type="submit" name="submit" value="do" class="btn btn-secondary">{{ __('Registrierung abschließen') }}</button>&nbsp;
<button type="submit" name="submit" value="do" class="btn btn-secondary">{{ __('register.complete_registration') }}</button>&nbsp;
{!! Form::close() !!}
</div>
</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')
@ -260,6 +304,13 @@
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 = {
@ -267,17 +318,17 @@
parallelUploads: 1,
maxFilesize: 32,
addRemoveLinks: true,
dictDefaultMessage: 'Hier klicken, oder Datei hier reinziehen (Drag&Drop)',
dictFallbackMessage: 'Dein Browser unterstützt Drag&Drop Dateiuploads nicht',
dictFallbackText: 'Benutze das Formular um Deine Dateien hochzuladen',
dictFileTooBig: "Die Datei ist zu groß. Die maximale Dateigröße beträgt 32 MB",
dictInvalidFileType: 'Eine Datei dieses Typs kann nicht hochgeladen werden',
dictResponseError: "Der Server hat ihre Anfrage mit Status error abgelehnt",
dictCancelUpload: 'Hochladen abbrechen',
dictDefaultMessage: "{{ __('actions.dictDefaultMessage') }}",
dictFallbackMessage: "{{ __('actions.dictFallbackMessage') }}",
dictFallbackText:"{{ __('actions.dictFallbackText') }}",
dictFileTooBig: "{{ __('actions.dictFileTooBig') }}",
dictInvalidFileType: "{{ __('actions.dictInvalidFileType') }}",
dictResponseError: "{{ __('actions.dictResponseError') }}",
dictCancelUpload: "{{ __('actions.dictCancelUpload') }}",
dictCancelUploadConfirmation: null,
dictRemoveFile: 'Datei entfernen',
dictMaxFilesExceeded: 'Du kannst keine weiteren Dateien mehr hochladen',
acceptedFiles: "image/jpeg,image/pjpeg,image/png,image/gif,application/pdf,text/plain",
dictRemoveFile: "{{ __('actions.dictRemoveFile') }}",
dictMaxFilesExceeded: "{{ __('actions.dictMaxFilesExceeded') }}",
acceptedFiles: "image/jpeg,image/pjpeg,image/png,image/gif,application/pdf,text/plain,.pdf",
// The setting up of the dropzone
init:function() {
this.on("removedfile", function(file) {
@ -293,7 +344,7 @@
},
error: function(file, response) {
var message
var message;
if($.type(response) === "string")
message = response; //dropzone sends it's own error messages in string
else
@ -321,7 +372,6 @@
}
};
Dropzone.options.idcardDropzone = real_dropzone;
Dropzone.options.businesslDropzone = real_dropzone;

10
resources/views/user/wizard/register_payment.blade.php
View file

@ -17,7 +17,7 @@
@endif
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Registrierung abschließen') }}
{{__('register.complete_registration')}}
</h4>
<div id="smartwizard-3" class="smartwizard-register">
@ -26,8 +26,8 @@
<a href="#smartwizard-3-step-1" class="mb-3">
<span class="sw-done-icon ion ion-md-checkmark"></span>
<span class="sw-number">1</span>
Paket
<div class="text-muted small">auswählen</div>
{{__('register.package')}}
<div class="text-muted small">{{__('register.select')}}</div>
</a>
</li>
</ul>
@ -36,10 +36,10 @@
<div id="smartwizard-3-step-1" class="card animated fadeIn">
<div class="card-body">
@if($userHistoryWizardPayment && $userHistoryWizardPayment->status > 2)
<h6 class="alert badge-{{$userHistoryWizardPayment->getStatusColor()}}">Eine Zahlung wurde ausgeführt. Status: {{ trans('payment.status.'.$userHistoryWizardPayment->getStatusType())}}</h6>
<h6 class="alert badge-{{$userHistoryWizardPayment->getStatusColor()}}">{{__('membership.payment_has_been_made') }} {{__('membership.status') }} {{ trans('payment.status.'.$userHistoryWizardPayment->getStatusType())}}</h6>
<h5 class="card-header bg-light">
<a href="#" class="" data-toggle="collapse" data-target="#collapsePaymentForm" aria-expanded="false" aria-controls="collapsePaymentForm">
<i class="fa fa-caret-expand"></i> {{ __('Zahlungsoptionen öffnen') }}
<i class="fa fa-caret-expand"></i> {{ __('register.open_payment_options') }}
</a>
</h5>
<div class="collapse" id="collapsePaymentForm">

6
resources/views/user/wizard/register_release.blade.php
View file

@ -17,15 +17,15 @@
@endif
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Registrierung abgeschlossen') }}
{{__('register.registration_completed')}}
</h4>
<div id="smartwizard-3" class="smartwizard-register">
<div class="mb-3">
<div id="smartwizard-3-step-6" class="card animated fadeIn">
<div class="card-body">
<h4>{{ trans('register.wizard_reg_release_hl') }}</h4>
<p>{!! trans('register.wizard_reg_release_line_1') !!}</p>
<h4>{{ __('register.wizard_reg_release_hl') }}</h4>
<p>{!! __('register.wizard_reg_release_line_1') !!}</p>
</div>
</div>
</div>