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

Free Shipping, Business Levels correction, Products Buying, Fonts

Browse source
This commit is contained in:
Kevin Adametz 2023-01-25 12:37:29 +01:00
parent 3f2fbd6d5b
commit 0341c9c189
197 changed files with 9161 additions and 329 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/lang/de/email.php
View file

@ -49,6 +49,8 @@
'credit_title' => 'Deine Gutschrift auf mivita.care',
'invoice_copy1line' => 'vielen Dank für Deine Bestellung bei mivita.care. Nachfolgend senden wir Dir die Rechnung zu deiner Bestellung: ',
'credit_copy1line' => 'nachfolgend senden wir Dir Deine Gutschrift zu.',
'update_level_title' => 'Deine Karriere-Level auf mivita.care',
'update_level_copy1line' => 'Herzlichen Glückwunsch, Du hast im letzten Monat Deine Qualifikation (TP :tp) erreicht und hast damit Deinen nächsten Karriere-Level erreicht.<br><br>Ab sofort bist Du: <b>:to</b>',
'footer_copy1' => 'mivita e.K. | Leinfeld 2 | 87755 Kirchhaslach | Telefon: +49 (0) 8333 946 17 67 | E-Mail: info@mivita.care',
'footer_copy2' => 'Geschäftsinhaber: Alois Ried | Registergericht: Memmingen | Registernummer: HRA 12236 | USt-ID-Nr.: DE 244162340',
'footer_copy3' => '© 2020 All Rights Reserved',

1
resources/lang/de/navigation.php
View file

@ -44,5 +44,6 @@ return [
'system_settings' => 'System-E.',
'business' => 'Business',
'structure' => 'Struktur',
'commissions' => 'Provisionen',
];

26
resources/views/admin/business/_user_detail_in.blade.php
View file

@ -7,7 +7,7 @@
</td>
</tr>
<tr>
<td>Level:</td>
<td>Karriere-Level:</td>
<td>
{{ $TreeCalcBot->business_user->user_level_name }}
</td>
@ -66,14 +66,14 @@
<td>Gesamte Points:</td>
<td>
<strong>{{ $TreeCalcBot->business_user->sales_volume_points_sum }}</strong>
(Berater: {{ $TreeCalcBot->business_user->sales_volume_points }} | Shop: {{ $TreeCalcBot->business_user->sales_volume_points_shop }})
(Eigene: {{ $TreeCalcBot->business_user->sales_volume_points }} | Shop: {{ $TreeCalcBot->business_user->sales_volume_points_shop }})
</td>
</tr>
<tr>
<td>Umsatz netto:</td>
<td>
<strong>{{ formatNumber($TreeCalcBot->business_user->sales_volume_total_sum) }} &euro;</strong>
(Berater: {{ formatNumber($TreeCalcBot->business_user->sales_volume_total) }} &euro; | Shop: {{ formatNumber($TreeCalcBot->business_user->sales_volume_total_shop) }} &euro;)
(Eigene: {{ formatNumber($TreeCalcBot->business_user->sales_volume_total) }} &euro; | Shop: {{ formatNumber($TreeCalcBot->business_user->sales_volume_total_shop) }} &euro;)
</td>
</tr>
<tr>
@ -83,19 +83,31 @@
</td>
</tr>
<tr>
<td>Qualifikation:</td>
<td>Qualifikation Provision:</td>
<td>
TP {{ formatNumber($TreeCalcBot->business_user->qual_tp, 0) }} /
@if($TreeCalcBot->business_user->isQualKP())
<strong> TP {{ formatNumber($TreeCalcBot->business_user->total_qual_tp, 0) }}</strong> &nbsp;
@if($TreeCalcBot->business_user->qual_user_level)
<span class="badge badge-outline-success">{{ formatNumber($TreeCalcBot->business_user->qual_tp, 0) }} | {{ $TreeCalcBot->business_user->qual_user_level['name'] }}</span>
<span class="badge badge-outline-success">{{ formatNumber($TreeCalcBot->business_user->qual_user_level['qual_tp'], 0) }} | {{ $TreeCalcBot->business_user->qual_user_level['name'] }}</span>
@endif
@else
<span class="ion ion-md-close text-danger"></span>
@endif
</td>
</tr>
<tr>
<td>Qualifikation Karriere:</td>
<td>
@if($TreeCalcBot->business_user->next_qual_user_level)
<span class="badge badge-outline-success">{{ formatNumber($TreeCalcBot->business_user->next_qual_user_level['qual_tp'], 0) }} | {{ $TreeCalcBot->business_user->next_qual_user_level['name'] }}</span>
@else
<span class="badge badge-outline-warning"><i class="fa fa-times"></i></span>
@endif
</td>
</tr>
<tr>
<td><strong>Provision Shop:</strong></td>
<td>
@ -136,7 +148,7 @@
<div class="font-weight-bolder line-height-1 my-2 text-dark badge badge-outline-dark">{{ $line }}</div>
</td>
<td>{{ formatNumber($TreeCalcBot->getKeybyLine($line, 'points'), 0) }}</td>
<td>{{ formatNumber($TreeCalcBot->getKeybyLine($line, 'margin'), 0) }} %</td>
<td>{{ formatNumber($TreeCalcBot->getKeybyLine($line, 'margin'), 1) }} %</td>
<td>{{ formatNumber($TreeCalcBot->getKeybyLine($line, 'commission'), 2) }} &euro;</td>
</tr>
@endfor
@ -146,7 +158,7 @@
<div class="font-weight-bolder line-height-1 my-2 text-dark badge badge-outline-dark">{{ $line+7 }}</div>
</td>
<td>{{ formatNumber($TreeCalcBot->getKeybyLine($line+7, 'points'), 0) }}</td>
<td>{{ formatNumber($TreeCalcBot->getKeybyLine($line+7, 'margin'), 0) }} %</td>
<td>{{ formatNumber($TreeCalcBot->getKeybyLine($line+7, 'margin'), 1) }} %</td>
<td>{{ formatNumber($TreeCalcBot->getKeybyLine($line+7, 'commission'), 2) }} &euro;</td>
</tr>
@endforeach

113
resources/views/admin/business/commissions.blade.php Normal file
View file

@ -0,0 +1,113 @@
@extends('layouts.layout-2')
@section('content')
<div class="card">
<h5 class="card-header">
Business Provisionen
</h5>
<div class="card-body p-0">
{!! Form::open(['url' => route('admin_business_commissions'), 'class' => 'form-horizontal', 'id'=>'form_admin_business_commissions']) !!}
<div class="form-row align-items-center px-4 pb-2 pt-3">
<div class="col-12 col-sm-12 col-md-12 col-lg-3 mb-1">
<select class="selectpicker on_change_select" data-style="btn-default" name="commissions_filter_member_id" id="commissions_filter_member_id" data-live-search="true">
<option value="">Filter Berater aus</option>
@foreach($filter_members as $member)
<option value="{{$member->id}}" @if(session('commissions_filter_member_id') == $member->id) selected @endif>{{$member->first_name}} {{$member->last_name}} | {{$member->email}}</option>
@endforeach
</select>
</div>
<div class="col-6 col-sm-4 col-md-4 col-lg-3 mb-1">
<select class="custom-select on_change_select" name="commissions_filter_month">
@foreach($filter_months as $key=>$value)
<option value="{{$key}}" @if(session('commissions_filter_month') == $key) selected @endif>{{$value}}</option>
@endforeach
</select>
</div>
<div class="col-6 col-sm-4 col-md-4 col-lg-3 mb-1">
<select class="custom-select on_change_select" name="commissions_filter_year">
@foreach($filter_years as $key=>$value)
<option value="{{$value}}" @if(session('commissions_filter_year') == $value) selected @endif>{{$value}}</option>
@endforeach
</select>
</div>
<div class="col-12 col-sm-4 col-md-4 col-lg-3 mb-1">
<select class="custom-select on_change_select" name="commissions_filter_show">
@foreach($filter_show as $key=>$value)
<option value="{{$key}}" @if(session('commissions_filter_show') == $key) selected @endif>{{$value}}</option>
@endforeach
</select>
</div>
</div>
{!! Form::close() !!}
<div class="card-datatable table-responsive pt-0">
<table class="datatables-style table table-striped table-bordered" id="datatable-invoice">
<thead>
<tr>
<th>{{__('Gesamt netto')}}</th>
<th>{{__('Team Provision')}}</th>
<th>{{__('Shop Provision')}}</th>
<th>{{__('Berater Nr.')}}</th>
<th>{{__('Vorname')}}</th>
<th>{{__('Nachname') }}</th>
<th>{{__('E-Mail') }}</th>
<th>{{__('Account')}}</th>
<th>{{__('bis')}}</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
</div>
</div>
<script>
$( document ).ready(function() {
var oTable = $('#datatable-invoice').DataTable({
"processing": true,
"serverSide": true,
"stateSave": true,
"searching": true,
ajax: {
url: '{!! route('admin_business_commissions_datatable') !!}',
data: function(d) {
d.commissions_filter_member_id = $('select[name=commissions_filter_member_id]').val();
d.commissions_filter_month = $('select[name=commissions_filter_month]').val();
d.commissions_filter_year = $('select[name=commissions_filter_year]').val();
d.commissions_filter_show = $('select[name=commissions_filter_show]').val();
}
},
"order": [[3, "desc" ]],
"columns": [
{ data: 'commission_total', name: 'commission_total', orderable: false, searchable: false },
{ data: 'commission_team_total', name: 'commission_team_total', orderable: true, searchable: false },
{ data: 'commission_shop_sales', name: 'commission_shop_sales', orderable: true, searchable: false },
{ data: 'm_account', name: 'm_account', orderable: true , searchable: true },
{ data: 'first_name', name: 'first_name', orderable: true , searchable: true },
{ data: 'last_name', name: 'last_name', orderable: true , searchable: true },
{ data: 'email', name: 'email', orderable: true, searchable: true },
{ data: 'active_account', name: 'active_account', orderable: false, searchable: false },
{ data: 'payment_account_date', name: 'payment_account_date', orderable: false, searchable: false },
],
"bLengthChange": false,
"iDisplayLength": 100,
"language": {
"url": "/js/German.json"
}
});
$('select.on_change_select').on('change', function(){
oTable.draw();
});
$('input.on_keyup_input').on('keyup', function(){
oTable.draw();
});
});
</script>
@endsection

6
resources/views/admin/business/modal_add_points.blade.php
View file

@ -40,6 +40,12 @@
{{ Form::text('total_net', '', array('placeholder'=>__('in Euro'), 'class'=>'form-control', 'id'=>'total_net', 'required'=>true)) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-sm-12">
<label for="info" class="form-label">{{__('Notiz/Grund')}}</label>
{{ Form::text('info', '', array('placeholder'=>__('max 200 Zeichen'), 'class'=>'form-control', 'id'=>'info', 'maxlength'=>200)) }}
</div>
</div>
<label class="custom-control custom-checkbox">
{!! Form::checkbox('is_checked_action', 1, 0, ['class' => 'custom-control-input', 'id' => 'is_checked_action', 'required'=>true]) !!}

6
resources/views/admin/business/modal_edit_points.blade.php
View file

@ -67,6 +67,12 @@
{{ Form::text('total_net', formatNumber($userSalesVolume->total_net), array('class'=>'form-control', 'id'=>'total_net')) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-sm-12">
<label for="info" class="form-label">{{__('Notiz/Grund')}}</label>
{{ Form::text('info', $userSalesVolume->info, array('placeholder'=>__('max 200 Zeichen'), 'class'=>'form-control', 'id'=>'info', 'maxlength'=>200)) }}
</div>
</div>
<label class="custom-control custom-checkbox">
{!! Form::checkbox('is_checked_action', 1, 0, ['class' => 'custom-control-input', 'id' => 'is_checked_action', 'required'=>true]) !!}

27
resources/views/admin/business/points.blade.php
View file

@ -65,10 +65,13 @@
<th>{{__('Umsatz netto')}}</th>
<th>{{__('Art')}}</th>
<th>{{__('Bestellung')}}</th>
<th>{{__('Berater Nr.')}}</th>
<th>{{__('Vorname')}}</th>
<th>{{__('Nachname') }}</th>
<th>{{__('E-Mail') }}</th>
<th>{{__('Info') }}</th>
<th>{{__('Notiz') }}</th>
</tr>
</thead>
<tbody>
@ -84,7 +87,7 @@
"processing": true,
"serverSide": true,
"stateSave": true,
"searching": false,
"searching": true,
ajax: {
url: '{!! route('admin_business_points_datatable') !!}',
data: function(d) {
@ -95,16 +98,18 @@
},
"order": [[0, "desc" ]],
"columns": [
{ data: 'id', searchable: false },
{ data: 'date', name: 'date' },
{ data: 'points', name: 'points' },
{ data: 'total_net', name: 'total_net' },
{ data: 'status', name: 'status', searchable: false },
{ data: 'order', name: 'order', orderable: false },
{ data: 'first_name', name: 'first_name', orderable: false },
{ data: 'last_name', name: 'last_name', orderable: false },
{ data: 'email', name: 'email', orderable: false },
{ data: 'message', name: 'message', searchable: false },
{ data: 'id', orderable: true, searchable: false },
{ data: 'date', name: 'date', orderable: true, searchable: false },
{ data: 'points', name: 'points', orderable: true, searchable: false },
{ data: 'total_net', name: 'total_net', orderable: true, searchable: false },
{ data: 'status', name: 'status', orderable: true, searchable: false },
{ data: 'order', name: 'order', orderable: false , searchable: false },
{ data: 'm_account', name: 'm_account', orderable: true , searchable: true },
{ data: 'first_name', name: 'first_name', orderable: true , searchable: true },
{ data: 'last_name', name: 'last_name', orderable: true , searchable: true },
{ data: 'email', name: 'email', orderable: true, searchable: true },
{ data: 'message', name: 'message', orderable: false, searchable: false },
{ data: 'info', name: 'info', orderable: false, searchable: false },
],
"bLengthChange": false,
"iDisplayLength": 100,

14
resources/views/admin/business/show.blade.php
View file

@ -76,18 +76,18 @@
},
"order": [[1, "asc" ]],
"columns": [
{ data: 'id', name: 'id', searchable: false },
{ data: 'm_account', name: 'm_account', orderable: false },
{ data: 'id', name: 'id', searchable: false, orderable: true },
{ data: 'm_account', name: 'm_account', orderable: true, searchable: true },
{ data: 'user_level', name: 'user_level', orderable: false, searchable: false },
{ data: 'is_qual_kp', name: 'is_qual_kp', orderable: false, searchable: false },
{ data: 'sales_volume_points', name: 'sales_volume_points', orderable: false, searchable: false },
{ data: 'sales_volume_total', name: 'sales_volume_total', orderable: false, searchable: false },
{ data: 'email', name: 'email', orderable: false },
{ data: 'first_name', name: 'first_name', orderable: false },
{ data: 'last_name', name: 'last_name', orderable: false },
{ data: 'email', name: 'email', orderable: true, searchable: true},
{ data: 'first_name', name: 'first_name', orderable: true, searchable: true },
{ data: 'last_name', name: 'last_name', orderable: true, searchable: true },
{ data: 'sponsor', name: 'sponsor', orderable: false, searchable: false },
{ data: 'active_account', name: 'active_account' },
{ data: 'payment_account_date', name: 'payment_account_date' },
{ data: 'active_account', name: 'active_account', orderable: false, searchable: false },
{ data: 'payment_account_date', name: 'payment_account_date', orderable: false, searchable: false },
],
"bLengthChange": false,

9
resources/views/admin/business/user_detail.blade.php
View file

@ -2,13 +2,9 @@
@section('content')
<div class="card">
<h5 class="card-header">
{{__('Business')}} {{__('Übersicht')}} Berater
</h5>
{!! Form::open(['url' => route('admin_business_user_detail', [$user->id]), 'class' => 'form-horizontal', 'id'=>'']) !!}
{{ Form::hidden('user_id', $user->id ) }}
{{ Form::hidden('month', $TreeCalcBot->date->month) }}
@ -22,13 +18,10 @@
{{-- <button type="submit" class="btn btn-submit btn-secondary btn-sm float-right mr-4">{{ __('save') }}</button>&nbsp; --}}
</h4>
</h4>
</div>
</div>
{!! Form::close() !!}
<div class="card-body">
@include('admin.business._user_detail_in')
</div>

34
resources/views/admin/customer/_edit.blade.php
View file

@ -255,7 +255,7 @@
</div>
<hr>
{{ Form::hidden('faker_mail', $shopping_user->faker_mail) }}
@if($isView === 'customer-add')
{{ Form::hidden('billing_email_1', $billing_email) }}
{{ Form::hidden('billing_email-confirm_1', $billing_email) }}
@ -269,16 +269,43 @@
{{ Form::text('billing_email', $billing_email, array('placeholder'=>'E-Mail', 'class'=>'form-control', 'id'=>'billing_email', 'readonly')) }}
</div>
<div class="form-group col-md-6">
<label class="form-label" for="billing_email-confirm">{{ __('Confirm E-Mail') }}</label>
<label class="form-label" for="billing_email-confirm">{{ __('Confirm E-Mail') }}*</label>
{{ Form::text('billing_email-confirm', $billing_email, array('placeholder'=>__('Confirm E-Mail'), 'class'=>'form-control', 'id'=>'billing_email-confirm', 'readonly')) }}
</div>
</div>
@endif
@else
@if($shopping_user->faker_mail)
{{ Form::hidden('billing_email', $shopping_user->billing_email) }}
{{ Form::hidden('billing_email-confirm', $shopping_user->billing_email) }}
@if($isAdmin != 1)
@if ($errors->has('email'))
<span class="help-block">
<strong>{{ $errors->first('email') }}</strong>
</span>
@endif
<h6 class="card-header bg-light">
<a href="#" class="" data-toggle="collapse" data-target="#collapseNewMailAddress" aria-expanded="@if($errors->has('new_email_address')) true @else false @endif" aria-controls="collapseNewMailAddress">
<i class="fa fa-caret-expand"></i> {{ __('E-Mail Address') }} hinzufügen
</a>
</h6>
<div class="collapse @if($errors->has('new_email_address')) show @endif" id="collapseNewMailAddress">
<div class="form-row mt-2 mb-0">
<div class="form-group col-md-12 {{ $errors->has('new_email_address') ? 'has-error' : '' }}">
<label class="form-label" for="new_email_address">{{ __('E-Mail Address') }}*</label>
{{ Form::text('new_email_address', '', array('placeholder'=>'E-Mail Adresse', 'class'=>'form-control', 'id'=>'new_email_address', 'required'=>true ,'tabindex' => 1)) }}
@if ($errors->has('new_email_address'))
<span class="help-block">
<strong>{{ $errors->first('new_email_address') }}</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>
<button type="submit" class="btn btn-secondary btn-sm" name="action" value="add-mail-shopping-user-store">{{ __('E-Mail Address') }} prüfen und speichern</button>
</div>
</div>
</div>
@endif
@else
<div class="form-row">
<div class="form-group col-md-6">
@ -291,6 +318,7 @@
</div>
</div>
@endif
@endif
</div>
</div>

16
resources/views/admin/modal/change_points.blade.php
View file

@ -63,13 +63,17 @@
</tbody>
</table>
</div>
@if($value->user_sales_volume->isCurrentMonthYear())
<label class="custom-control custom-checkbox">
{!! Form::checkbox('change_points', 1, 0, ['class' => 'custom-control-input', 'id' => 'change_points', 'required'=>true]) !!}
<span class="custom-control-label">Points / Umsatz einen neuen Berater zuweisen</span>
</label>
@if(!$value->user_sales_volume)
Points nicht mehr verschoben werden, Umsatz nicht gebucht.
@else
Points können nicht mehr verschoben werden.
@if($value->user_sales_volume->isCurrentMonthYear())
<label class="custom-control custom-checkbox">
{!! Form::checkbox('change_points', 1, 0, ['class' => 'custom-control-input', 'id' => 'change_points', 'required'=>true]) !!}
<span class="custom-control-label">Points / Umsatz einen neuen Berater zuweisen</span>
</label>
@else
Points können nicht mehr verschoben werden.
@endif
@endif
<hr>
<i>Points können nur innerhalb des akutellen Monats verschoben werden, da sonst die monatliche Auswertung schon berechnet ist.

35
resources/views/admin/modal/is_like_member.blade.php
View file

@ -6,15 +6,25 @@
<div class="modal-header">
<h5 class="modal-title">
Der Kunde hat ggf. unter einer anderen Email-Adresse bestellt als sonst.
<span class="font-weight-light"> Bitte vor der Bearbeitung prüfen und dem richtigen Berater zuordnen.</span>
@if($current->shopping_order)
Der Kunde hat ggf. unter einer anderen E-Mail / Adresse bestellt als sonst.<br>
<span class="font-weight-light">Bitte vor der Bearbeitung prüfen und dem richtigen Berater zuordnen.</span>
@else
Der Kunde wurde ggf. mit einer anderen E-Mail / Adresse angelegt.<br>
<span class="font-weight-light"> Bitte prüfen und dem richtigen Berater zuordnen.</span>
@endif
</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<div class="modal-body">
<div class="row">
<div class="col-sm-6">
<p class="font-weight-bold">Die aktuelle Bestellung wurde getätigt von:</p>
@if($current->shopping_order)
<p class="font-weight-bold">Die aktuelle Bestellung wurde getätigt von:</p>
@else
<p class="font-weight-bold">Die aktuelle Kundenadresse ist:</p>
@endif
<div class="bg-light p-3" style="border-radius: 6px">
<div class="row">
<div class="col-sm-6">
@ -222,15 +232,16 @@
<input type="text" class="form-control" name="change_member_key" id="change_member_key" placeholder="mivita" required>
</div>
</div>
<div class="form-row">
<div class="form-group col">
<label class="custom-control custom-checkbox mt-3">
<input type="checkbox" class="custom-control-input" name="send_member_mail" value="send" checked>
<span class="custom-control-label">zugeordneten Berater die Bestellung als E-Mail zusenden</span>
</label>
</div>
</div>
@if($current->shopping_order)
<div class="form-row">
<div class="form-group col">
<label class="custom-control custom-checkbox mt-3">
<input type="checkbox" class="custom-control-input" name="send_member_mail" value="send" checked>
<span class="custom-control-label">zugeordneten Berater die Bestellung als E-Mail zusenden</span>
</label>
</div>
</div>
@endif
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>

45
resources/views/admin/product/form.blade.php
View file

@ -60,7 +60,7 @@
</div>
<label class="custom-control custom-checkbox float-right">
{!! Form::checkbox('shipping_addon', 1, $product->shipping_addon, ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">Kompensationprodukt beim Versand für Berater</span>
<span class="custom-control-label">Kompensationprodukt beim Versand für Berater (KP)</span>
</label>
</div>
</div>
@ -106,15 +106,42 @@
{{ Form::text('amount', $product->amount, array('placeholder'=>__('Anzahl/Verfügbarkeit'), 'class'=>'form-control', 'id'=>'amount')) }}
</div>
</div>
<hr>
<div class="form-row">
<div class="form-group col-sm-12">
<label class="form-label">Keine Provision</label>
<label class="form-label">Keine Provision (NoP.)</label>
<label class="custom-control custom-checkbox">
{!! Form::checkbox('no_commission', 1, $product->no_commission, ['class'=>'custom-control-input', 'id'=>'no_commission']) !!}
<span class="custom-control-label">Dieses Produkt ist nicht provisionsfähig.</span>
</label>
</div>
</div>
<hr>
<div class="form-row">
<div class="form-group col-sm-12">
<label class="form-label">Kein versandkostenfreis Produkt (NoF.)</label>
<label class="custom-control custom-checkbox">
{!! Form::checkbox('no_free_shipping', 1, $product->no_free_shipping, ['class'=>'custom-control-input', 'id'=>'no_free_shipping']) !!}
<span class="custom-control-label">Für dieses Produkt immer Versandkosten berechnen.</span>
</label>
</div>
</div>
<hr>
<div class="form-row">
<div class="form-group col-sm-8">
<label class="form-label">Kaufeinschränkung Berater</label>
<label class="custom-control custom-checkbox">
{!! Form::checkbox('buying_restriction', 1, $product->buying_restriction, ['class'=>'custom-control-input', 'id'=>'buying_restriction']) !!}
<span class="custom-control-label">Für dieses Produkt ist für Berater nur 1x käuflich (z.B. Starter-Kit).</span>
</label>
</div>
{{-- <div class="form-group col-sm-4">
<label class="form-label">Kaufeinschränkung Anzahl</label>
{{ Form::text('buying_restriction_amount', $product->buying_restriction_amount, array('placeholder'=>__('Anzahl'), 'class'=>'form-control', 'id'=>'buying_restriction_amount')) }}
</div>
--}}
</div>
</div>
</div>
@ -336,23 +363,23 @@
@foreach ($product->action as $do )
@if($product->getActionName($do) === 'payment_for_shop_upgrade')
<label class="form-label" for="">{{ __('Upgrade auf das Produkt') }} <span class="small">(Wird nach dem Speichern aktualisiert)</span></label>
<div class="mt-2"><strong>{{ $product->getUpgradeToIdName('payment_for_shop_upgrade') }}</strong>
</div>
<div class="mt-2"><strong>{{ $product->getUpgradeToIdName('payment_for_shop_upgrade') }}</strong></div>
@endif
@if($product->getActionName($do) === 'payment_for_lead_upgrade')
<label class="form-label" for="">{{ __('Upgrade auf Karriere Level') }} <span class="small">(Wird nach dem Speichern aktualisiert)</span></label>
<div class="mt-2"><strong>{{ $product->getUpgradeToIdName('payment_for_lead_upgrade') }}</strong>
<div class="mt-2"><strong>{{ $product->getUpgradeToIdName('payment_for_lead_upgrade') }}</strong></div>
@endif
@endforeach
@endif
</div>
</div>
<div class="form-row">
<div class="form-group col-sm-5">
<label class="form-label" for="wp_number">WP Artikel Number (als Zahl ohne Leerzeichen für die WP-API)</label>
{{ Form::text('wp_number', $product->wp_number, array('placeholder'=>__('WP Number'), 'class'=>'form-control', 'id'=>'wp_number')) }}
</div>
<div class="form-group col-sm-5">
<label class="form-label" for="wp_number">WP Artikel Number (als Zahl ohne Leerzeichen für die WP-API)</label>
{{ Form::text('wp_number', $product->wp_number, array('placeholder'=>__('WP Number'), 'class'=>'form-control', 'id'=>'wp_number')) }}
</div>
</div>
</div>
</div>

6
resources/views/admin/product/index.blade.php
View file

@ -28,8 +28,9 @@
<th>{{__('Grundpreis')}}</th>
<th>{{__('Gewicht')}}</th>
<th>{{__('sichbar')}}</th>
<th>{{__('KP')}}</th>
<th>{{__('NoP.')}}</th>
<th><span data-toggle="tooltip" data-placement="top" title="Kompensationprodukt">{{__('KP')}}</span></th>
<th><span data-toggle="tooltip" data-placement="top" title="Keine Provision">{{__('NoP.')}}</span></th>
<th><span data-toggle="tooltip" data-placement="top" title="Kein versandkostenfreis Produkt">{{__('NoF.')}}</span></th>
<th>{{__('Status')}}</th>
<th></th>
</tr>
@ -65,6 +66,7 @@
<td>{!! implode($value->getShowOnTypes(), '<br>') !!}</td>
<td data-sort="{{ $value->shipping_addon }}">{!! get_active_badge($value->shipping_addon) !!}</td>
<td data-sort="{{ $value->no_commission }}">{!! get_active_badge($value->no_commission) !!}</td>
<td data-sort="{{ $value->no_free_shipping }}">{!! get_active_badge($value->no_free_shipping) !!}</td>
<td data-sort="{{ $value->active }}">{!! get_active_badge($value->active) !!}</td>
<td><a class="text-info" href="{{ route('admin_product_copy', [$value->id]) }}" onclick="return confirm('{{__('Eintrag kopieren?')}}');"><i class="far fa-copy"></i></a> &nbsp;
<a class="text-danger" href="{{ route('admin_product_delete', [$value->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a></td>

54
resources/views/admin/settings/index.blade.php
View file

@ -9,8 +9,8 @@
<div class="card mb-2">
<div class="card-body">
<h4>Rechnungen / Gutschriften Einstellungen</h4>
<div class="form-row">
<div class="form-group col-sm-12">
{{--<div class="form-row">
{{-- <div class="form-group col-sm-12">
<label class="form-label">{{ __('nächste Rechnungsnummer') }}*</label>
{{ Form::text('settings[invoice-number][val]', \App\Models\Setting::getContentBySlug('invoice-number'), array('class'=>'form-control', 'disabled')) }}
{{ Form::hidden('settings[invoice-number][type]', 'int') }}
@ -22,7 +22,7 @@
{{ Form::text('settings[credit-number][val]', \App\Models\Setting::getContentBySlug('credit-number'), array('class'=>'form-control')) }}
{{ Form::hidden('settings[credit-number][type]', 'int') }}
</div>
</div>
</div>--}}
<div class="form-row">
<div class="form-group col-sm-12">
<label class="form-label">{{ __('Tag des Monats für die Fixierung/Auswertungen der Business Marketing Plans') }}*</label>
@ -33,6 +33,54 @@
<button type="submit" name="action" value="save_prepayment" class="btn btn-primary btn-sm mb-2"><i class="ion ion-ios-save"></i> speichern</button>
</div>
</div>
<div class="card mb-2">
<div class="card-body">
<h4>Auszeitparty</h4>
<div class="form-row">
<div class="col-sm-12">
<h5>Bonus Gutschein</h5>
</div>
<div class="form-group col-sm-6">
<label class="form-label">{{ __('Gutschein Wert in €') }}*</label>
{{ Form::text('settings[hp-bonus-value][val]', \App\Models\Setting::getContentBySlug('hp-bonus-value'), array('class'=>'form-control')) }}
{{ Form::hidden('settings[hp-bonus-value][type]', 'int') }}
</div>
<div class="form-group col-sm-6">
<label class="form-label">{{ __('Zielumsatz in €') }}*</label>
{{ Form::text('settings[hp-bonus-start][val]', \App\Models\Setting::getContentBySlug('hp-bonus-start'), array('class'=>'form-control')) }}
{{ Form::hidden('settings[hp-bonus-start][type]', 'int') }}
</div>
</div>
<hr>
<div class="form-row">
<div class="col-sm-12">
<h5>Bonus Stufen</h5>
</div>
<div class="form-group col-sm-12">
<label class="form-label">{{ __('Anzahl der Bonus Stufen ') }}*</label>
{{ Form::text('settings[hp-bonus-steps][val]', \App\Models\Setting::getContentBySlug('hp-bonus-steps'), array('class'=>'form-control')) }}
{{ Form::hidden('settings[hp-bonus-steps][type]', 'int') }}
</div>
@if($hpBonusSteps = \App\Models\Setting::getContentBySlug('hp-bonus-steps'))
@for ($i=1; $i<=$hpBonusSteps; $i++)
<div class="form-group col-sm-6">
<label class="form-label">{{ $i }}.{{ __('Stufe Wert in €') }}*</label>
{{ Form::text('settings[hp-bonus-step-value-'.$i.'][val]', \App\Models\Setting::getContentBySlug('hp-bonus-step-value-'.$i), array('class'=>'form-control')) }}
{{ Form::hidden('settings[hp-bonus-step-value-'.$i.'][type]', 'int') }}
</div>
<div class="form-group col-sm-6">
<label class="form-label">{{ $i }}.{{ __('Stufe min. Umsatz in €') }}*</label>
{{ Form::text('settings[hp-bonus-step-start-'.$i.'][val]', \App\Models\Setting::getContentBySlug('hp-bonus-step-start-'.$i), array('class'=>'form-control')) }}
{{ Form::hidden('settings[hp-bonus-step-start-'.$i.'][type]', 'int') }}
</div>
@endfor
@endif
</div>
<button type="submit" name="action" value="save_prepayment" class="btn btn-primary btn-sm mb-2"><i class="ion ion-ios-save"></i> speichern</button>
</div>
</div>
{!! Form::close() !!}

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

@ -47,7 +47,7 @@
{!! Form::checkbox('active', 1, $value->active, ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">{{__('aktiv')}}</span>
</label>
<label class="form-label" for="title">{{ __('Versandkosten frei ab') }}</label>
<label class="form-label" for="title">{{ __('Versandkostenfrei ab') }} (nur online Shop/Brutto)</label>
{{ Form::text('free', $value->getFormattedFree(), array('placeholder'=>__('in Euro, leer lassen ohne Freigrenze'), 'class'=>'form-control')) }}
</div>
</div>

4
resources/views/admin/shipping/index.blade.php
View file

@ -12,6 +12,8 @@
<th style="max-width: 60px;">&nbsp;</th>
<th>{{__('Name')}}</th>
<th>{{__('Status')}}</th>
<th>{{__('VK frei')}}</th>
<th></th>
</tr>
</thead>
@ -25,8 +27,8 @@
</td>
<td>{{ $value->name }}</td>
<td data-sort="{{ $value->active }}">@if($value->active) <span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>@else<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>@endif</td>
<td data-sort="{{ $value->free }}">@if($value->free) <span class="badge badge-pill badge-success">{{ formatNumber($value->free) }} €</span>@else<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>@endif</td>
<td><a class="text-danger" href="{{ route('admin_shipping_delete', [$value->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a></td>
</tr>
@endforeach
</tbody>

2
resources/views/dashboard/_membership.blade.php
View file

@ -30,6 +30,7 @@
<td class="text-left font-weight-semibold">{{__('Qualifikation')}}:</td>
<td class="text-left font-weight-semibold">{{__('Team Qualifikation')}}:</td>
</tr>
@if($user->m_level && $user->user_level)
<tr>
<td class="text-left font-weight-bold">
{{ $user->user_level->margin }} %
@ -44,6 +45,7 @@
{{ $user->user_level->qual_tp }} Points
</td>
</tr>
@endif
</table>
@endif
</div>

8
resources/views/dashboard/_points.blade.php
View file

@ -9,10 +9,10 @@
@php($userSalesVolume = $user->getUserSalesVolume(date('n'), date('Y'), 'first'))
@if($userSalesVolume)
<div class="mb-2">
<strong>Gesamte Points: {{ $userSalesVolume->getPointsSum() }}</strong> | Berater: {{ $userSalesVolume->month_points }} | Shop: {{ $userSalesVolume->month_shop_points }}<br>
<strong>Gesamte Points: {{ $userSalesVolume->getPointsSum() }}</strong> | Eigene: {{ $userSalesVolume->month_points }} | Shop: {{ $userSalesVolume->month_shop_points }}<br>
</div>
<div>
<strong>Gesamter Umsatz: {{ formatNumber($userSalesVolume->getTotalNetSum()) }} &euro;</strong> | Berater: {{ formatNumber($userSalesVolume->month_total_net) }} &euro; | Shop: {{ formatNumber($userSalesVolume->month_shop_total_net) }} &euro;
<strong>Gesamter Umsatz: {{ formatNumber($userSalesVolume->getTotalNetSum()) }} &euro;</strong> | Eigene: {{ formatNumber($userSalesVolume->month_total_net) }} &euro; | Shop: {{ formatNumber($userSalesVolume->month_shop_total_net) }} &euro;
</div>
@endif
</h6>
@ -26,6 +26,7 @@
<th>{{__('Art')}}</th>
<th>{{__('Bestellung')}}</th>
<th>{{__('Info') }}</th>
<th>{{__('Notiz') }}</th>
</tr>
</thead>
<tbody>
@ -58,6 +59,9 @@
<td class="text-left font-weight-semibold">
<span class="no-line-break"> {{ $userSalesVolume->message }}</span>
</td>
<td class="text-left font-weight-semibold">
<span class="no-line-break"> {{ $userSalesVolume->info }}</span>
</td>
</tr>
@endforeach
@endif

4
resources/views/layouts/app.blade.php
View file

@ -13,10 +13,6 @@
<!-- Scripts -->
<script src="{{ asset('js/app.js') }}" defer></script>
<!-- Fonts -->
<link rel="dns-prefetch" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet" type="text/css">
<!-- Styles -->
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
</head>

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

@ -11,7 +11,7 @@
<title>{{ config('app.name') }}</title>
<!-- Main font -->
<link rel="stylesheet" href="{{ asset('/fonts/roboto.css') }}">
<link rel="stylesheet" href="{{ asset('/fonts/roboto-pacifico.css?v=1') }}">
<!-- Icons. Uncomment required icon fonts -->
<link rel="stylesheet" href="{{ mix('/vendor/fonts/fontawesome.css') }}">
<link rel="stylesheet" href="{{ mix('/vendor/fonts/ionicons.css') }}">
@ -28,14 +28,11 @@
<link rel="stylesheet" href="{{ asset('/vendor/css/mycolors.css') }}">
<link rel="stylesheet" href="{{ mix('/vendor/libs/growl/growl.css') }}">
<link rel="stylesheet" href="{{ mix('/vendor/libs/bootstrap-select/bootstrap-select.css') }}">
<link rel="stylesheet" href="{{ mix('/vendor/libs/select2/select2.css') }}">
<link rel="stylesheet" href="{{ mix('/vendor/libs/datatables/datatables.css') }}">
<link rel="stylesheet" href="{{ mix('/vendor/libs/bootstrap-datepicker/bootstrap-datepicker.css') }}">
<link rel="stylesheet" href="{{ asset('/vendor/libs/bootstrap-material-datetimepicker/bootstrap-material-datetimepicker.css') }}">
<link rel="stylesheet" href="{{ asset('/vendor/libs/summernote/dist/summernote-bs4.css') }}">
<link rel="stylesheet" href="{{ asset('/vendor/libs/slim-image-cropper/slim/slim.css') }}">
<link rel="stylesheet" href="{{ asset('/vendor/libs/dropzone/dropzone.css?v=1') }}">

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

@ -12,7 +12,7 @@
<link rel="icon" type="image/x-icon" href="favicon.ico">
<meta name="csrf-token" content="{{ csrf_token() }}">
<link href="https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,500,500i,700,700i,900" rel="stylesheet">
<link rel="stylesheet" href="{{ asset('/fonts/roboto-pacifico.css?v=1') }}">
<!-- Icons. Uncomment required icon fonts -->
<link rel="stylesheet" href="{{ mix('/vendor/fonts/fontawesome.css') }}">

3
resources/views/layouts/includes/layout-sidenav.blade.php
View file

@ -175,6 +175,9 @@
<li class="sidenav-item{{ Request::is('admin/business/points') ? ' active' : '' }}">
<a href="{{ route('admin_business_points') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-arrow-dropup-circle"></i><div>{{ __('navigation.points') }}</div></a>
</li>
<li class="sidenav-item{{ Request::is('admin/business/commissions') ? ' active' : '' }}">
<a href="{{ route('admin_business_commissions') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-cash"></i><div>{{ __('navigation.commissions') }}</div></a>
</li>
</ul>
</li>

2
resources/views/pdf/delivery-detail.blade.php
View file

@ -16,7 +16,7 @@
{{ $shopping_order_item->product->number }}
</td>
<td class="small text-left">
{{ $shopping_order_item->product->name }}
{{ maxStrLength($shopping_order_item->product->name, 35) }}
</td>
<td class="text-right small">
{{ $shopping_order_item->qty }}

2
resources/views/pdf/delivery-homeparty-detail.blade.php
View file

@ -6,7 +6,7 @@
{{ $value->product->number }}
</td>
<td class="small text-left">
{{ $value->product->name }}
{{ maxStrLength($value->product->name, 35) }}
</td>
<td class="text-right small">
{{ $value->qty }}

2
resources/views/pdf/invoice-collection.blade.php
View file

@ -25,7 +25,7 @@
{{ $shop_item['number'] }}
</td>
<td class="small text-left">
{{$shop_item['name']}}
{{ maxStrLength($shop_item['name'], 30) }}
</td>
<td class="text-right small">
{{$shop_item['points_total']}}

3
resources/views/pdf/invoice-detail.blade.php
View file

@ -32,9 +32,8 @@
{{ $shopping_order_item->product->number }}
</td>
<td class="small text-left">
{{ $shopping_order_item->product->name }}
{{ maxStrLength($shopping_order_item->product->name , 35) }}
</td>
@if($shopping_order->payment_for === 6)
<td class="text-right small">
{{ $shopping_order_item->getFormattedPrice() }} &euro;

2
resources/views/pdf/invoice-homeparty-detail.blade.php
View file

@ -6,7 +6,7 @@
{{ $value->product->number }}
</td>
<td class="small text-left">
{{ $value->product->name }}
{{ maxStrLength($value->product->name , 35) }}
</td>
<td class="text-right small">
{{ $value->qty }}

2
resources/views/pdf/invoice-journal-collection.blade.php
View file

@ -99,7 +99,7 @@
@foreach($order['shopping_order']->shopping_order_items as $shopping_order_item)
<tr class="">
<td class="text-left">
<strong>{{ $shopping_order_item->product->name }}</strong>
<strong>{{ maxStrLength($shopping_order_item->product->name, 35) }}</strong>
<span class="text-muted">#{{ $shopping_order_item->product->number }}</span>
</td>
<td class="text-right">

3
resources/views/sys/index.blade.php
View file

@ -6,6 +6,7 @@
<h5 class="card-header py-4 px-5">Sys Admin Tools</h5>
<div class="row no-gutters row-bordered">
<div class="col-md-12 p-5">
<a href="{{ route('sysadmin_tool', ['buyings_products']) }}" class="d-block mb-3"><i class="ion ion-ios-arrow-forward"></i>&nbsp; Add Buyings Products from Order</a>
<a href="{{ route('sysadmin_tool', ['business_structur']) }}" class="d-block mb-3"><i class="ion ion-ios-arrow-forward"></i>&nbsp; Business Strukrur speichern</a>
<a href="{{ route('sysadmin_tool', ['sales_members']) }}" class="d-block mb-3"><i class="ion ion-ios-arrow-forward"></i>&nbsp; Buchnungen Pakete Berater nach Jahren</a>
<a href="{{ route('sysadmin_tool', ['customers']) }}" class="d-block mb-3"><i class="ion ion-ios-arrow-forward"></i>&nbsp; Kundenhoheit prüfen</a>
@ -18,4 +19,4 @@
</div>
</div>
@endsection
@endsection

20
resources/views/sys/tools/buyings_products.blade.php Normal file
View file

@ -0,0 +1,20 @@
@extends('layouts.layout-2')
@section('content')
<div class="card">
<h5 class="card-header">
SysAdmin Add Buyings Products from Order,
</h5>
<div class="col-sm-6 mb-2">
<p>From shopping_order_items where product_id = 36, 37 | 100, 118</p>
{!! Form::open(['url' => route('sysadmin_tool_store', ['buyings_products']), 'class' => 'form-horizontal', 'id'=>'filter_sales_member']) !!}
<button type="submit" name="action" value="store" class="btn btn-primary"><i class="ion"></i> store</button>
{!! Form::close() !!}
</div>
</div>
@endsection

8
resources/views/sys/tools/domain-ssl.blade.php
View file

@ -70,6 +70,8 @@
<th>Domain</th>
<th>Sub</th>
<th>SSL</th>
<th>#</th>
<th>seit</th>
<th>Datum</th>
<th>Erreichbar</th>
@ -90,6 +92,7 @@
<td><a href="https://{{ $value->slug }}.mivita.care" target="_blank">{{ $value->slug }}.mivita.care</a></td>
<td> {!! get_active_badge($value->hasSubdomain) !!} </td>
<td> {!! get_active_badge($value->hasSSL) !!} </td>
<td><button type="submit" class="btn btn-success btn-xs" name="update_ssl" value="{{ $value->id }}"><i class="ion"></i>update</button></td>
<td>{{ $value->getActiveDateFormatSmall() }}</td>
<td>
@ -165,8 +168,9 @@
</td>
<td>
@if(!$value->user || !$value->user->payment_shop || !$value->user->isActiveShop())
<button type="submit" class="btn btn-danger btn-xs" name="delete_user_shop" value="{{ $value->id }}"><i class="ion"></i> löschen</button>
@endif
<button type="submit" class="btn btn-danger btn-xs" name="delete_user_shop" value="{{ $value->id }}"><i class="ion"></i>Shop löschen</button>
@endif
</td>
</tr>

104
resources/views/sys/tools/import-show.blade.php Normal file
View file

@ -0,0 +1,104 @@
@extends('layouts.layout-2')
@section('content')
<h4 class="font-weight-bold py-3 mb-4">
Kontakte Import Status
</h4>
<div class="row">
<div class="col-sm-6 col-xl-3">
<div class="card mb-4">
<div class="card-body">
<div class="d-flex align-items-center">
<div class="lnr lnr-users display-4 text-primary"></div>
<div class="ml-3">
<div class="text-muted small">{{ __('eingelesene Datensätze') }}</div>
<div class="text-large">{{ $import['count'] }}</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-sm-6 col-xl-3">
<div class="card mb-4">
<div class="card-body">
<div class="d-flex align-items-center">
<div class="lnr lnr-users display-4 text-success"></div>
<div class="ml-3">
<div class="text-muted small">{{ __('Kontakte importiert') }}</div>
<div class="text-large">{{ count($import['imported']) }}</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-sm-6 col-xl-3">
<div class="card mb-4">
<div class="card-body">
<div class="d-flex align-items-center">
<div class="lnr lnr-users display-4 text-danger"></div>
<div class="ml-3">
<div class="text-muted small">{{ __('ohne E-Mai Adresse') }}</div>
<div class="text-large">{{ $import['not'] }}</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-sm-6 col-xl-3">
<div class="card mb-4">
<div class="card-body">
<div class="d-flex align-items-center">
<div class="lnr lnr-users display-4 text-danger"></div>
<div class="ml-3">
<div class="text-muted small">{{__('Mail schon vorhanden')}}</div>
<div class="text-large">{{ count($import['has_imported']) }}</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="card mb-4">
<div class="card-body">
<table class="table user-view-table m-0">
<tbody>
<tr>
<td style="border-top: none">{{__('Datei')}}:</td>
<td style="border-top: none">{{ $file }} </td>
</tr>
<tr>
<td>{{__('Import Position start')}}:</td>
<td>{{$skip}}</td>
</tr>
<tr>
<td>{{__('Import limit')}}:</td>
<td>{{ $limit }}</td>
</tr>
</tbody>
</table>
<hr>
<h5>Vorhandene Mails</h5>
@foreach($import['has_imported'] as $row)
{{$row}} <br>
@endforeach
</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->getPointsSum() }}</strong> | Berater: {{ $userSalesVolume->month_points }} | Shop: {{ $userSalesVolume->month_shop_points }}<br>
<strong>Gesamte Points: {{ $userSalesVolume->getPointsSum() }}</strong> | Eigene: {{ $userSalesVolume->month_points }} | Shop: {{ $userSalesVolume->month_shop_points }}<br>
</div>
<div>
<strong>Gesamter Umsatz: {{ formatNumber($userSalesVolume->getTotalNetSum()) }} &euro;</strong> | Berater: {{ formatNumber($userSalesVolume->month_total_net) }} &euro; | Shop: {{ formatNumber($userSalesVolume->month_shop_total_net) }} &euro;
<strong>Gesamter Umsatz: {{ formatNumber($userSalesVolume->getTotalNetSum()) }} &euro;</strong> | Eigene: {{ formatNumber($userSalesVolume->month_total_net) }} &euro; | Shop: {{ formatNumber($userSalesVolume->month_shop_total_net) }} &euro;
</div>
@endif
</h6>

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

@ -58,6 +58,8 @@
<th>{{__('Art')}}</th>
<th>{{__('Bestellung')}}</th>
<th>{{__('Info') }}</th>
<th>{{__('Notiz') }}</th>
</tr>
</thead>
</table>
@ -101,6 +103,7 @@
{ data: 'status', name: 'status', searchable: false },
{ data: 'order', name: 'order', orderable: false },
{ data: 'message', name: 'message', searchable: false },
{ data: 'info', name: 'info', searchable: false },
],
"bLengthChange": false,
"iDisplayLength": 100,

4
resources/views/web/layouts/application.blade.php
View file

@ -10,7 +10,9 @@
<meta name="viewport" content="width=device-width, maximum-scale=1, initial-scale=1, user-scalable=0" />
<!--[if IE]><meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'><![endif]-->
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600%7CRaleway:300,400,500,600,700%7CLato:300,400,400italic,600,700" rel="stylesheet" type="text/css" />
<link href="{{ asset('/fonts/opensans-raleway-pacifico.css?v=1') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('/assets/plugins/slider.revolution/css/extralayers.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('/assets/plugins/slider.revolution/css/settings.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('/assets/css/mystyle.css') }}" rel="stylesheet" type="text/css" />

19
resources/views/web/start.blade.php
View file

@ -221,13 +221,22 @@
</div>
<div class="col-lg-6">
<div class="col-lg-6" id="youtube-ChHAxy6SbkM">
@if(Request::get('youtube') === 'ChHAxy6SbkM')
<div class="embed-responsive embed-responsive-16by9 box-shadow-1">
<iframe width="560" height="315" src="https://www.youtube.com/embed/ChHAxy6SbkM?rel=0"
frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/ChHAxy6SbkM" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
</div>
@else
<div class="text-center">
<h4 class="mb-2"> Mit dem Laden des Youtube-Video akzeptieren Sie unsere Datenschutzerklärung / XII. Einbindung von Diensten und Inhalten Dritter </h4>
<a class="text-link" href="{{ url('/datenschutz') }}">zur Datenschutzerklärung</a><br>
<a class="btn btn-primary" href="{{ url('/') }}?youtube=ChHAxy6SbkM#youtube-ChHAxy6SbkM" rel="nofollow">akzeptieren und Youtube-Video laden</a>
</div>
<br>
<div class="embed-responsive embed-responsive-16by9 box-shadow-1">
<img src="/images/youtube-screen-1.jpg" alt="" class="img-responsive">
</div>
@endif
</div>

383
resources/views/web/templates/_card.blade.php Normal file
View file

@ -0,0 +1,383 @@
@extends($user_shop ?'web.user.layouts.layout' : 'web.layouts.layout')
@section('content')
<section class="page-header page-header-xlg parallax parallax-3"
style="background-image:url('/assets/images/vision-min.jpg')">
<div class="overlay dark-1"><!-- dark overlay [1 to 9 opacity] --></div>
<div class="container">
</div>
</section>
<!-- /PAGE HEADER -->
<style>
/* div.shop-item {
margin-bottom:30px;
border: 1px solid #ddd;
}
div.shop-item > .thumbnail, .thumbnail {
border: none;
}
div.shop-item-summary {
padding: 8px;
}
div.shop-item-summary h2 a {
color: #9aa983;
font-size: 1.2em;
margin: 0 0 10px 0;
}
div.shop-item-buttons {
padding: 0 8px 10px 8px;
}
div.shop-item-buttons .btn-xs{
padding: 4px;
}
.cartContent a.remove_item {
background: transparent;
}
.cartContent .product_name {
font-size: 1.15em;
}
.cartContent .product_name > small {
line-height: 20px;
}
.cartContent .head .product_name {
min-height: auto;
padding-left: 20px;
}
a.shop-item-hl {
color: #9aa983;
font-size: 1.2em;
}
.table-mi-bordered > thead > tr > td, .table-bordered > tbody > tr > td, .table-bordered > tfoot > tr > td {
border: 1px solid #ddd !important;
}
@media only screen and (max-width: 1200px) {
.cartContent .yard .product_name {
padding-bottom: 0;
min-height: 60px;
width: 60%;
}
.cartContent .yard .remove_item {
clear: right;
}
.cartContent .yard .total_price {
width: auto;
padding-top: 30px;
clear: right;
}
.cartContent .yard .item .qty {
float: left;
text-align: left;
}
.cartContent .yard .item.head {
display: none;
}
}
@media only screen and (min-width: 768px) {
.cartContent .yard .total_price {
padding-top: 10px;
}
}
@media only screen and (min-width: 992px) {
.cartContent .yard .total_price {
padding-top: 30px;
}
}
@media only screen and (min-width: 1200px) {
.cartContent .yard .total_price {
padding-top: 10px;
}
}
*/
select.form-control:not([size]):not([multiple]) {
height: 38px;
color: #6f6f6f;
font-weight: 600;
}
.yard-items-head {
border-bottom: 1px solid #ddd;
padding-bottom: 8px;
margin-bottom: 8px;
}
.yard-item {
position: relative;
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 .options {
margin-top: 4px;
}
.yard-item a.auto-delete-product {
font-size: 0.7em;
font-weight: bold;
text-transform: uppercase;
}
.yard-item .quantity {
position: relative;
}
.quantity-select {
text-align: right;
}
.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 .font-semi-bold {
color: #393939;
font-weight: 500;
}
.yard-item .font-semi-bold .small {
font-size: 1rem;
}
.yard-item .font-bold {
color:#393939;
font-weight: bold;
}
.price-single {
white-space: nowrap;
}
.btn-default {
border: none;
font-size: 0.9em;
}
</style>
<!-- -->
<section>
<div class="container">
<h1 class="mb-0">Warenkorb</h1>
<!-- EMPTY CART -->
<!-- <div class="panel panel-default">
<div class="panel-body">
<strong>Shopping cart is empty!</strong><br />
You have no items in your shopping cart.<br />
Click <a href="index.html">here</a> to continue shopping. <br />
<span class="label label-warning">this is just an empty cart example</span>
</div>
</div>-->
<!-- /EMPTY CART -->
<!-- CART -->
<div class="row">
<!-- LEFT -->
<div class="col-lg-9 col-md-8 col-sm-12">
<h4 class="weight-400">Du hast {{ Yard::instance('shopping')->count() }} Artikel in Deinem Warenkorb</h4>
@if(Yard::instance('shopping')->getShippingFree())
<div class="alert alert-success">Versandkostenfrei ab {{ formatNumber(Yard::instance('shopping')->getShippingFree()) }} &euro;**</div>
@endif
@if(Yard::instance('shopping')->content()->count())
<!-- CART -->
{!! Form::open(['url' => url(Util::getPostRoute().'card/update'), 'class' => 'cartContent clearfix', 'id'=>'']) !!}
<!-- cart content -->
<div id="cartContent">
<div class="yard-items-head">
<div class="row hidden-sm-down">
<div class="col-xs-3 col-sm-2">
</div>
<div class="col-xs-9 col-sm-10">
<div class="row">
<div class="col-sm-6 col-md-7">
Artikel
</div>
<div class="col-sm-3 col-md-2 text-left">
Einzelpreis
</div>
<div class="ol-sm-3 col-md-3 text-right">
Anzahl
</div>
</div>
</div>
</div>
</div>
@foreach(Yard::instance('shopping')->content() as $row)
@php($product = \App\Models\Product::find($row->id))
<div class="row yard-item">
<div class="col-xs-3 col-sm-2">
<a href="{{ url('/produkte/alle-produkte/'.$row->options->slug) }}" title="" class="image">
@if($row->options->has('image'))
<img src="{{ route('product_image', [$row->options->image]) }}" class="img-responsive" alt="">
@else
<img src="{{ asset('/assets/images/1x1.png') }}" width="80" alt="">
@endif
</a>
</div>
<div class="col-xs-9 col-sm-10">
<div class="row">
<div class="col-xs-12 col-sm-6 col-md-7 description">
<a href="{{ url('/produkte/alle-produkte/'.$row->options->slug) }}" class="shop-item-hl"><span>{{ $row->name }}</span></a>
<div style="font-size: 13px; color:#1d1d1d; font-weight: 500;">Inhalt: {{ $product->contents }}</div>
<div style="font-size: 13px; color:#1d1d1d; font-weight: 500;">Art.-Nr.: {{ $product->number }}</div>
<div style="font-size: 13px; color:#6e6e6e; font-weight: 400;"><em>Lieferzeit: 1-3 Werktage</em></div>
<div class="options">
<a class="auto-delete-product" href="{{ url(Util::getPostRoute().'card/remove', $row->rowId) }}"><i class="fa fa-times"></i> Artikel entfernen</a>
</div>
</div>
<div class="col-xs-6 col-sm-3 col-md-2 text-left font-semi-bold price-single">
<div style="">{{ $row->price() }} &euro;</div>
@if(Yard::instance('shopping')->isPriceCurrency())
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('price', $row, 2) }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
<div class="small">{{ $product->getBasePriceFormattedFullWith(Yard::instance('shopping')->getUserTaxFree(), false, Yard::instance('shopping')->getUserCountry()) }}</div>
<div class="small">
@if(Yard::instance('shopping')->getUserTaxFree())
* Preis netto
@else
* inkl. {{ number_format($row->taxRate, 0)}}% MwSt.% MwSt.
@endif
</div>
</div>
<div class="col-xs-6 col-sm-3 col-md-3 quantity">
<div class="quantity-select">
<select class="form-control" name="quantity[{{$row->rowId}}]" onchange="this.form.submit()">
{!! HTMLHelper::getOptionRange($row->qty, 1, 50) !!}
</select>
</div>
<div class="price-total text-right">
<span class="font-bold text-price-total">{{ $row->subtotal() }}</span> &euro;
@if(Yard::instance('shopping')->isPriceCurrency())
<br>
<span class="small">~{{ Yard::instance('shopping')->getCurrencyByKey('subtotal', $row, 2) }} {{ Yard::instance('shopping')->getPriceCurrencyUnit() }} </span>
@endif
</div>
</div>
</div>
</div>
</div>
@endforeach
<a href="{{url(Util::getPostRoute().'card/delete')}}" class="btn btn-default btn-xs pull-left"><i class="glyphicon glyphicon-remove"></i> Warenkorb löschen</a>
<button type="submit" class="btn btn-xs btn-default pull-right "><i class="glyphicon glyphicon-refresh"></i> Warenkorb aktualisieren</button>
<div class="clearfix"></div>
</div>
{!! Form::close() !!}
<!-- /CART -->
@endif
</div>
<!-- RIGHT -->
<div class="col-sm-8 col-sm-offset-4 col-md-4 col-md-offset-0 col-lg-3 col-lg-offset-0">
@if(Yard::instance('shopping')->content()->count())
<h3>Warenkorb Summe</h3>
<div class="toggle-transparent toggle-bordered-full clearfix">
<div class="toggle active cart-content">
<div class="toggle-content">
<div class="clearfix mb-2">
<span class="pull-right">{{ Yard::instance('shopping')->total() }} €</span>
<strong class="pull-left">Zwischensumme:</strong>
</div>
<hr class="mt-4 mb-4">
<div class="clearfix mb-2">
<span class="pull-right small"> {{ Yard::instance('shopping')->getShippingCountryName() }}</span>
<span class="pull-left small">Lieferland:</span>
</div>
{{-- <div class="clearfix mb-2">
<div class=" small">Lieferland:</div>
<div class="small">
<form action="{{ url(Util::getPostRoute().'card/show') }}" method="GET" style="margin-bottom: 0;">
<select name="selected_country" class="form-control" onchange="this.form.submit()">
{!! HTMLHelper::getCountriesForShipping(Yard::instance('shopping')->getShippingCountryId(), false) !!}
</select>
</form>
</div>
</div>--}}
<div class="clearfix mb-2">
<span class="pull-right small">{{ Yard::instance('shopping')->shipping() }} € </span>
<span class="pull-left small"><a href="{{ url('/versandkosten') }}" style="color:#666666;text-decoration: underline">Versandkosten</a>:</span>
</div>
<hr class="mt-4 mb-4">
@if(Yard::instance('shopping')->getUserTaxFree())
<div class="clearfix mb-2" style="font-size: 90%">
<span class="pull-right small">{{ Yard::instance('shopping')->subtotalWithShipping() }} €</span>
<span class="pull-left small">Summe netto:</span>
</div>
@else
<div class="clearfix mb-2" style="font-size: 90%">
<span class="pull-right small">{{ Yard::instance('shopping')->subtotalWithShipping() }} €</span>
<span class="pull-left small">Summe ohne MwSt:</span>
</div>
<div class="clearfix mb-2" style="font-size: 90%">
<span class="pull-right small">{{ Yard::instance('shopping')->taxWithShipping() }} €</span>
<span class="pull-left small"> zzgl. {{-- Yard::getTaxRate() --}} MwSt:</span>
</div>
@endif
<hr />
<span class="clearfix ">
<span class="pull-right size-20"><strong>{{ Yard::instance('shopping')->totalWithShipping() }} €</strong></span>
<strong class="pull-left">Gesamtsumme:</strong>
</span>
<a href="{{ url(Util::getPostRoute().'card/checkout/server') }}" class="btn btn-primary btn-lg btn-block mt-4 btn-text-500 faa-parent animated-hover"><i class="fa fa-mail-forward faa-horizontal"></i> zur Kasse</a>
<hr>
<p class="text-center" style="line-height: 1.2em;"><em class="small text-center"> <i class="fa fa-lock"></i> Sie werden auf unseren checkout Server weitergeletet, die Verbindung ist mit SSL verschlüsselt.</em></p>
</div>
</div>
</div>
@endif
</div>
</div>
<br><br>
<hr>
<p><em class="small" style="color: #828282">Alle Preise inkl. gesetzl. Mehrwertsteuer <a href="{{ url('/versandkosten') }}" style="text-decoration: underline">zzgl. Versandkosten</a>, wenn nicht anders beschrieben</em></p>
<!-- /CART -->
</div>
</section>
@endsection

18
resources/views/web/templates/anforderungsprofil.blade.php
View file

@ -45,12 +45,24 @@
<div class="col-md-12">
<hr>
</div>
<div class="col-md-12">
<div class="col-md-12" id="youtube-HScne8">
@if(Request::get('youtube') === 'HScne8-4d60')
<div class="embed-responsive embed-responsive-16by9 box-shadow-1">
<iframe width="560" height="315" src="https://www.youtube.com/embed/HScne8-4d60?rel=0"
frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/HScne8-4d60" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
</div>
@else
<div class="text-center">
<h4 class="mb-2"> Mit dem Laden des Youtube-Video akzeptieren Sie unsere Datenschutzerklärung / XII. Einbindung von Diensten und Inhalten Dritter </h4>
<a class="text-link" href="{{ url('/datenschutz') }}">zur Datenschutzerklärung</a><br>
<a class="btn btn-primary" href="{{ url('geschaeftsmodell/anforderungsprofil') }}?youtube=HScne8-4d60#youtube-HScne8" rel="nofollow">akzeptieren und Youtube-Video laden</a>
</div>
<br>
<div class="embed-responsive embed-responsive-16by9 box-shadow-1">
<img src="/images/youtube-screen-2.jpg" alt="" class="img-responsive">
</div>
@endif
</div>
<div class="clearfix"><br></div>
@include('web.templates._content_contact')

8
resources/views/web/templates/card.blade.php
View file

@ -195,7 +195,9 @@
<div class="col-lg-9 col-md-8 col-sm-12">
<h4 class="weight-400">Du hast {{ Yard::instance('shopping')->count() }} Artikel in Deinem Warenkorb</h4>
@if(Yard::instance('shopping')->getShippingFree())
<div class="alert alert-success py-2">Versandkostenfrei ab {{ formatNumber(Yard::instance('shopping')->getShippingFree()) }} &euro;**</div>
@endif
@if(Yard::instance('shopping')->content()->count())
@ -269,6 +271,10 @@
@else
* inkl. {{ number_format($row->taxRate, 0)}}% MwSt.% MwSt.
@endif
@if(Yard::instance('shopping')->getShippingFree() && $row->options->no_free_shipping)
<br>**nicht versandkostenfrei
@endif
</div>
</div>

10
resources/views/web/templates/versandkosten.blade.php
View file

@ -7,8 +7,14 @@
<div class="white-box">
<h3 class="box-title m-b-0">Versandarten & Versandkosten</h3>
<hr>
</div>
@if(Yard::instance('shopping')->getShippingFree())
<div class="row mt-4 mb-0">
<div class="col-md-12 text-center">
<p class="alert alert-success">** Versandkostenfrei ab {{ formatNumber(Yard::instance('shopping')->getShippingFree()) }} &euro;. Ausgenommen sind große, sperrige Artikel oder Artikel die eine spezielle Verpackung benötigen.</p>
</div>
</div>
@endif
</div>
</div>
</section>

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

@ -10,7 +10,7 @@
<meta name="viewport" content="width=device-width, maximum-scale=1, initial-scale=1, user-scalable=0" />
<!--[if IE]><meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'><![endif]-->
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600%7CRaleway:300,400,500,600,700%7CLato:300,400,400italic,600,700" rel="stylesheet" type="text/css" />
<link href="{{ asset('/fonts/opensans-raleway-pacifico.css?v=1') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('/assets/plugins/slider.revolution/css/extralayers.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('/assets/plugins/slider.revolution/css/settings.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('/assets/css/mystyle.css') }}" rel="stylesheet" type="text/css" />

8
resources/views/web/user/layouts/includes/footer.blade.php
View file

@ -108,6 +108,14 @@
@endif
</div>
@if(Yard::instance('shopping')->getShippingFree())
<div class="row mt-4 mb-0">
<div class="col-md-12 text-center">
<p class="alert alert-success">** Versandkostenfrei ab {{ formatNumber(Yard::instance('shopping')->getShippingFree()) }} &euro;. Ausgenommen sind große, sperrige Artikel oder Artikel die eine spezielle Verpackung benötigen.</p>
</div>
</div>
@endif
</div>
<div class="copyright">

4
resources/views/web/user/layouts/includes/header.blade.php
View file

@ -176,7 +176,9 @@
@else
<em style="font-size: 0.9em">inkl. MwSt. zzgl. Versandkosten</em>
@endif
@if(Yard::instance('shopping')->getShippingFree())
<em style="font-size: 0.9em"><br>Versandkostenfrei ab {{ formatNumber(Yard::instance('shopping')->getShippingFree()) }} &euro;**</em>
@endif
</div>
<a href="{{ url(Util::getPostRoute().'card/show') }}" class="btn btn-primary btn-text-500 btn-block mt-3 faa-parent animated-hover">zum Warenkorb <i class="fa fa-shopping-cart faa-horizontal"></i></a>

19
resources/views/web/user/start.blade.php
View file

@ -355,13 +355,22 @@
</div>
<div class="col-lg-6">
<div class="col-lg-6" id="youtube-ChHAxy6SbkM">
@if(Request::get('youtube') === 'ChHAxy6SbkM')
<div class="embed-responsive embed-responsive-16by9 box-shadow-1">
<iframe width="560" height="315" src="https://www.youtube.com/embed/ChHAxy6SbkM?rel=0"
frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/ChHAxy6SbkM" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
</div>
@else
<div class="text-center">
<h4 class="mb-2"> Mit dem Laden des Youtube-Video akzeptieren Sie unsere Datenschutzerklärung / XII. Einbindung von Diensten und Inhalten Dritter </h4>
<a class="text-link" href="{{ url('/datenschutz') }}">zur Datenschutzerklärung</a><br>
<a class="btn btn-primary" href="{{ url('/') }}?youtube=ChHAxy6SbkM#youtube-ChHAxy6SbkM" rel="nofollow">akzeptieren und Youtube-Video laden</a>
</div>
<br>
<div class="embed-responsive embed-responsive-16by9 box-shadow-1">
<img src="/images/youtube-screen-1.jpg" alt="" class="img-responsive">
</div>
@endif
</div>