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

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>