Work to invoice

This commit is contained in:
Kevin Adametz 2021-02-10 10:42:24 +01:00
parent 224bf9e951
commit 02e78e7255
101 changed files with 23483 additions and 154 deletions

View file

@ -842,16 +842,14 @@
<div class="form-group">
<label class="custom-control custom-checkbox m-0">
<input type="checkbox" class="custom-control-input {{ ($errors->has('accepted_data_checkbox') ? 'has-error' : '') }}" name="accepted_data_checkbox" id="accepted_data_checkbox" required>
<span class="custom-control-label small">Mit Klick auf "Jetzt kaufen" akzeptiere ich die Allgemeinen Geschäftsbedingungen und die Datenschutzbelehrung, damit für die Bestellung meine Daten verarbeitet werden können.*</span>
<span class="custom-control-label small">Mit Klick auf "Jetzt kaufen" akzeptiere ich die <a href="https://www.gruene-seele.bio/vp-agb/" target="_blank" class="text-secondary">Allgemeinen Geschäftsbedingungen</a> und die <a href="https://www.gruene-seele.bio/datenschutzerklaerung/" target="_bank" class="text-secondary">Datenschutzbelehrung</a>, damit für die Bestellung meine Daten verarbeitet werden können.*</span>
</label>
</div>
<button type="submit" class="btn btn-primary btn-lg btn-block size-18 btn-text-500 mt-4 faa-parent animated-hover"><i class="fa fa-mail-forward faa-horizontal"></i> Jetzt kaufen</button>
<hr>
<p class="text-center" style="line-height: 1.2em;"><em class="small text-center"> <i class="fa fa-lock"></i> Sind alle Deine Angaben vollsätndig ausgefüllt, klicke auf "Jetzt kaufen" und Du wist zu unserem Zahlungsanbieter weitergeleitet, die Verbindung wird ist SSL verschlüsselt.</em></p>
</div>
</div>
</div>
<!-- /COL -->

View file

@ -77,13 +77,13 @@
<tr>
<th>{{__('Bild')}}</th>
<th>{{__('Produkt')}}</th>
<th>{{__('Kategorie')}}</th>
<th>{{__('Preis netto')}}</th>
<th>{{__('Preis brutto')}}</th>
<th>{{__('Provision')}}</th>
<th>{{__('Gewicht')}}</th>
<th><span class="no-line-break">{{__('Inhalt (ml)')}}</span></th>
<th>{{__('Artikelnummer')}}</th>
<th>#</th>
</tr>
</thead>
<tbody>
@ -150,13 +150,13 @@
"columns": [
{ data: 'picture', name: 'picture', searchable: false, width: 35 },
{ data: 'product', name: 'product' },
{ data: 'category', name: 'category', orderable: true },
{ data: 'price_net', name: 'price_net', searchable: false, orderable: false },
{ data: 'price_gross', name: 'price_gross', searchable: false, orderable: false },
{ data: 'single_commission', name: 'single_commission', searchable: false },
{ data: 'weight', name: 'weight', 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,

View file

@ -16,13 +16,12 @@
</div>
@endif
<h4 class="font-weight-bold py-2 mb-2">
{{ __('navigation.my_team') }}
{{ __('navigation.member') }} / {{ __('navigation.new_register') }}
</h4>
<div class="card">
<h5 class="card-header">Vertriebspartner registrieren</h5>
<div class="row no-gutters row-bordered">
<div class="col-md-12 p-4">
<h6 class="mb-4">Link für Vertriebspartnerregistrierung</h6>
<h6 class="mb-4">Link für Vertriebspartner-Registrierung</h6>
<div class="form-group">
<div class="input-group">
<span class="input-group-prepend">

View file

@ -17,8 +17,8 @@
<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>
{{ Form::text('company', $user->account->company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'company', 'tabindex' => 1)) }}
<label for="company" class="form-label">{{ __('Company name') }}*</label>
{{ Form::text('company', $user->account->company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'company', 'required'=>true, 'tabindex' => 1)) }}
</div>
</div>
<div class="form-row">
@ -94,7 +94,7 @@
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6 {{ $errors->has('country_id') ? 'has-error' : '' }}">
<div class="form-group col-md-12 {{ $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) !!}
@ -105,10 +105,6 @@
</span>
@endif
</div>
<div class="form-group col-md-6">
<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-4">
@ -140,7 +136,28 @@
<div class="badge badge-warning">Bitte {{ __('Phone') }} und/oder {{ __('Mobile Phone') }} angeben!*</div>
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<label for="birthday_day" class="form-label">{{ __('Geburtsdatum') }}*</label>
<select class="selectpicker" name="birthday_day" id="birthday_day" data-style="btn-light" data-live-search="false" required>
{!! HTMLHelper::getCustomListOf('day', $user->getBirthdayFormat('d')) !!}
</select>
</div>
<div class="form-group col-md-4">
<label for="birthday_month" class="form-label">&nbsp;</label>
<select class="selectpicker" name="birthday_month" id="birthday_month" data-style="btn-light" data-live-search="false" required>
{!! HTMLHelper::getCustomListOf('month', $user->getBirthdayFormat('m')) !!}
</select>
</div>
<div class="form-group col-md-4">
<label for="birthday_year" class="form-label">&nbsp;</label>
<select class="selectpicker" name="birthday_year" id="birthday_year" data-style="btn-light" data-live-search="false" required>
{!! HTMLHelper::getCustomListOf('year', $user->getBirthdayFormat('Y')) !!}
</select>
</div>
</div>
</div>
<div class="col-12 col-lg-6">
@ -321,9 +338,17 @@
</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'))) }}
{{ 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 class="row">
<div class="form-group col-md-12">
@if($errors->has('tax_number') || $errors->has('tax_identification_number'))
<div class="alert badge-danger block p-2">Bitte {{ __('Steuernummer') }} und/oder {{ __('USt-ID Nummer') }} angeben!*</div>
@else
<div class="badge badge-warning">Bitte {{ __('Steuernummer') }} und/oder {{ __('USt-ID Nummer') }} angeben!*</div>
@endif
</div>
</div>
</div>
@ -430,10 +455,6 @@
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.')}}",

View file

@ -88,7 +88,7 @@
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6 {{ $errors->has('country_id') ? 'has-error' : '' }}">
<div class="form-group col-md-12 {{ $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) !!}
@ -99,10 +99,6 @@
</span>
@endif
</div>
<div class="form-group col-md-6">
<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, 'class'=>'form-control datepicker-birthday')) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">