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

08 2024

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

12
resources/views/admin/attribute/index.blade.php
View file

@ -13,7 +13,7 @@
<th>{{__('Pos')}}</th>
<th>{{__('Description')}}</th>
<th>{{__('Translate') }}</th>
<th>{{__('Status')}}</th>
<th>{{__('tables.status')}}</th>
<th></th>
</tr>
</thead>
@ -27,14 +27,14 @@
data-name="{{ $value->name }}"
data-trans_name="{{ json_encode($value->trans_name) }}"
data-active="{{ $value->active }}">
<span class="far fa-edit"></span>
<span class="fa fa-edit"></span>
</button>
</td>
<td>{{ $value->pos }}</td>
<td>{{ $value->name }}</td>
<td>{{ $value->getTranNames() }}</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><a class="text-danger" href="{{ route('admin_product_attribute_delete', [$value->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a></td>
<td><a class="text-danger" href="{{ route('admin_product_attribute_delete', [$value->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="fa fa-trash-alt"></i></a></td>
</tr>
@endforeach
@ -71,7 +71,7 @@
<div class="form-row">
<div class="form-group col">
<label for="name" class="form-label">{{__('Name')}}</label>
<label class="form-label">{{__('Name')}}</label>
<input type="text" class="form-control" name="name" placeholder="{{__('Bezeichnung')}}">
</div>
</div>
@ -93,7 +93,7 @@
@if($tran != 'de')
<div class="form-row">
<div class="form-group col">
<label for="name" class="form-label">{{__('Translate')}} <strong style="text-transform: uppercase">{{$tran}}</strong></label>
<label class="form-label">{{__('Translate')}} <strong style="text-transform: uppercase">{{$tran}}</strong></label>
<input type="text" class="form-control" name="trans[{{$tran}}]" id="trans_{{$tran}}" placeholder="">
</div>
</div>
@ -140,7 +140,7 @@
{ "sWidth": "8%" },
],
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
});

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

@ -1,21 +1,21 @@
<table class="table user-view-table m-0">
<tbody>
<tr>
<td>Account:</td>
<td>{{ __('team.account') }}:</td>
<td>
@if($TreeCalcBot->business_user->active_account)
<span class="badge badge-outline-success">aktiv</span>
<span class="badge badge-outline-success">{{ __('team.active') }}</span>
@else
<span class="badge badge-outline-danger">nicht aktiv</span>
<span class="badge badge-outline-danger">{{ __('team.not_active') }}</span>
@endif
@if($TreeCalcBot->business_user->active_date)
bis: {{ formatDate($TreeCalcBot->business_user->active_date) }}
@if($TreeCalcBot->business_user->payment_account_date)
{{ __('team.until') }}: {{ formatDate($TreeCalcBot->business_user->payment_account_date) }}
@endif
(ID: {{ $TreeCalcBot->business_user->m_account }})
</td>
</tr>
<tr>
<td>Sponsor:</td>
<td>{{ __('team.sponsor') }}:</td>
<td>
@if($TreeCalcBot->business_user->sponsor->is_sponsor)
{{ $TreeCalcBot->business_user->sponsor->first_name }} {{ $TreeCalcBot->business_user->sponsor->last_name }} |
@ -28,9 +28,9 @@
</tr>
<tr>
<td>Datum:</td>
<td>{{ __('team.date') }}:</td>
<td>
<strong>{{ HTMLHelper::getMonth($data['month']) }} {{ $data['year'] }}</strong> | Abgeschlossen:
<strong>{{ HTMLHelper::getMonth($data['month']) }} {{ $data['year'] }}</strong> | {{ __('team.completed') }}:
@if($TreeCalcBot->business_user->isSave())
<span class="badge badge-outline-success"><i class="fa fa-check-circle"></i></span>
@else
@ -40,118 +40,139 @@
</td>
</tr>
<tr>
<td>Karriere-Level:</td>
<td>{{ __('team.career_level') }}:</td>
<td>
{{ $TreeCalcBot->business_user->user_level_name }} &nbsp;
<span class="badge badge-outline-success"> KP {{ $TreeCalcBot->business_user->qual_kp }} / PP {{ formatNumber($TreeCalcBot->business_user->qual_pp, 0) }}</span>
{{ \App\Services\TranslationHelper::transUserLevelName($TreeCalcBot->business_user->user_level_name) }} &nbsp;
<span class="badge badge-outline-success"> {{ __('team.KU') }} {{ $TreeCalcBot->business_user->qual_kp }} / {{ __('team.PP') }} {{ formatNumber($TreeCalcBot->business_user->qual_pp, 0) }}</span>
</td>
</tr>
<tr>
<td>Kundenprovision:</td>
<td>{{ __('team.consultant_margin') }}:</td>
<td>
{{ $TreeCalcBot->business_user->margin }} %
</td>
</tr>
<tr>
<td>Shop Provision:</td>
<td>{{ __('team.shop_commission') }}:</td>
<td>
{{ $TreeCalcBot->business_user->margin_shop }} %
</td>
</tr>
<tr>
<td>Umsatz netto:</td>
<td>{{ __('team.net_turnover') }}:</td>
<td>
<strong>{{ formatNumber($TreeCalcBot->business_user->sales_volume_total_sum) }} &euro;</strong>
(Eigene: {{ formatNumber($TreeCalcBot->business_user->sales_volume_total) }} &euro; | Shop: {{ formatNumber($TreeCalcBot->business_user->sales_volume_total_shop) }} &euro;)
({{ __('team.own') }}: {{ formatNumber($TreeCalcBot->business_user->sales_volume_total) }} &euro; | {{ __('team.shop') }}: {{ formatNumber($TreeCalcBot->business_user->sales_volume_total_shop) }} &euro;)
</td>
</tr>
<tr>
<td>Kunden Points:</td>
<td>{{ __('team.customer_points') }}:</td>
<td>
<strong>{{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} KP</strong>
(Eigene: {{ formatNumber($TreeCalcBot->business_user->sales_volume_KP_points, 0) }} | Shop: {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_shop, 0) }})
&nbsp; <span class="badge {{ $TreeCalcBot->business_user->isQualKP() ? 'badge-outline-success' : 'badge-outline-warning-dark' }}"> KP {{ $TreeCalcBot->business_user->qual_kp }}</span>
<strong>{{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} {{ __('team.KU') }}</strong>
({{ __('team.own') }}: {{ formatNumber($TreeCalcBot->business_user->sales_volume_KP_points, 0) }} | {{ __('team.shop') }}: {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_shop, 0) }})
&nbsp; <span class="badge {{ $TreeCalcBot->business_user->isQualKP() ? 'badge-outline-success' : 'badge-outline-warning-dark' }}"> {{ __('team.KU') }} {{ $TreeCalcBot->business_user->qual_kp }}</span>
</td>
</tr>
@if($TreeCalcBot->business_user->version == 1)
<tr>
<td>Qualifikation Points:</td>
<td>{{ __('team.qualification_points') }}:</td>
<td>
<strong>{{ formatNumber($TreeCalcBot->business_user->total_qual_pp, 0) }} TP</strong> (+ Volumen KP) &nbsp;
<strong>{{ formatNumber($TreeCalcBot->business_user->total_qual_pp, 0) }} {{ __('team.TP') }}</strong> (+ {{ __('team.volume_KU') }}) &nbsp;
</td>
</tr>
<tr>
<td>Qualifikation Provision:</td>
<td>{{ __('team.qualification_commission') }}:</td>
<td>
@if($TreeCalcBot->business_user->isQualLevel())
<span class="badge {{ $TreeCalcBot->business_user->isQualEqualLevel() ? 'badge-outline-success' : 'badge-outline-info' }}">
KP {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} /
<span class="badge {{ $TreeCalcBot->business_user->isQualEqualLevel() ? 'badge-outline-success' : 'badge-outline-info' }}">
{{ __('team.KP') }} {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} /
<strong>{{ formatNumber($TreeCalcBot->business_user->qual_user_level['qual_kp'], 0) }}</strong> |
TP {{ formatNumber($TreeCalcBot->business_user->total_qual_pp, 0) }} /
{{ __('team.TP') }} {{ formatNumber($TreeCalcBot->business_user->total_qual_pp, 0) }} /
<strong>{{ formatNumber($TreeCalcBot->business_user->qual_user_level['qual_pp'], 0) }}</strong>
| {{ $TreeCalcBot->business_user->qual_user_level['name'] }}</span>
@endif
</td>
</tr>
@endif
@if($TreeCalcBot->business_user->version == 2)
<tr>
<td>Payline Points:</td>
<td>{{ __('team.payline_points') }}:</td>
<td>
<strong>{{ formatNumber($TreeCalcBot->business_user->payline_points, 0) }} PP</strong>
<strong>{{ formatNumber($TreeCalcBot->business_user->payline_points, 0) }} {{ __('team.PP') }}</strong>
</td>
</tr>
<tr>
<td>Qualifikation Points:</td>
<td>{{ __('team.qualification_points') }} :</td>
<td>
<strong>{{ formatNumber($TreeCalcBot->business_user->payline_points_qual_kp, 0) }} PP</strong> (+ Volumen KP)
<strong>{{ formatNumber($TreeCalcBot->business_user->payline_points_qual_kp, 0) }} {{ __('team.PP') }}</strong> (+ {{ __('team.volume_KU') }})
</td>
</tr>
<tr>
<td>aktuelle Provisions-Stufe:</td>
<td>{{ __('team.current_commission_level') }}:</td>
<td>
@if($TreeCalcBot->business_user->isQualLevel())
<span class="badge {{ $TreeCalcBot->business_user->isQualEqualLevel() ? 'badge-outline-success' : 'badge-outline-info' }}">
KP {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} /
{{ __('team.KU') }} {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} /
<strong>{{ formatNumber($TreeCalcBot->business_user->qual_user_level['qual_kp'], 0) }}</strong> |
PP {{ formatNumber($TreeCalcBot->business_user->payline_points_qual_kp, 0) }} /
{{ __('team.PP') }} {{ formatNumber($TreeCalcBot->business_user->payline_points_qual_kp, 0) }} /
<strong>{{ formatNumber($TreeCalcBot->business_user->qual_user_level['qual_pp'], 0) }}</strong>
| {{ $TreeCalcBot->business_user->qual_user_level['name'] }}</span>
| {{ \App\Services\TranslationHelper::transUserLevelName($TreeCalcBot->business_user->qual_user_level['name']) }}</span>
@endif
</td>
</tr>
@if($TreeCalcBot->business_user->qual_user_level_next)
<tr>
<td>nächste Provisions-Stufe:</td>
<td>{{ __('team.next_commission_level') }}:</td>
<td>
<span class="badge badge-outline-warning-dark">
KP {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} /
{{ __('team.KU') }} {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} /
<strong>{{ formatNumber($TreeCalcBot->business_user->qual_user_level_next['qual_kp'], 0) }}</strong> |
PP {{ formatNumber($TreeCalcBot->business_user->payline_points_qual_kp, 0) }} /
{{ __('team.PP') }} {{ formatNumber($TreeCalcBot->business_user->payline_points_qual_kp, 0) }} /
<strong>{{ formatNumber($TreeCalcBot->business_user->qual_user_level_next['qual_pp'], 0) }}</strong>
| {{ $TreeCalcBot->business_user->qual_user_level_next['name'] }}</span>
| {{ \App\Services\TranslationHelper::transUserLevelName($TreeCalcBot->business_user->qual_user_level_next['name']) }}</span>
</td>
</tr>
@endif
@endif
<tr>
<td>@if($TreeCalcBot->business_user->next_qual_user_level) {{ __('team.qualification') }}<br> @endif {{ __('team.next_career_level') }}:</td>
<td>
@if($TreeCalcBot->business_user->next_qual_user_level)
<span class="badge badge-outline-success">
{{ __('team.KU') }} {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} /
<strong>{{ formatNumber($TreeCalcBot->business_user->next_qual_user_level['qual_kp'], 0) }}</strong> |
{{ __('team.TP') }} {{ formatNumber($TreeCalcBot->business_user->payline_points_qual_kp, 0) }} /
<strong>{{ formatNumber($TreeCalcBot->business_user->next_qual_user_level['qual_pp'], 0) }}</strong>
| {{ \App\Services\TranslationHelper::transUserLevelName($TreeCalcBot->business_user->next_qual_user_level['name']) }}</span>
@elseif($TreeCalcBot->business_user->next_can_user_level)
<span class="badge badge-outline-warning-dark">
{{ __('team.KU') }} {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} /
<strong>{{ formatNumber($TreeCalcBot->business_user->next_can_user_level['qual_kp'], 0) }}</strong> |
{{ __('team.TP') }} {{ formatNumber($TreeCalcBot->business_user->payline_points_qual_kp, 0) }} /
<strong>{{ formatNumber($TreeCalcBot->business_user->next_can_user_level['qual_pp'], 0) }}</strong>
| {{ \App\Services\TranslationHelper::transUserLevelName($TreeCalcBot->business_user->next_can_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><strong>{{ __('team.commission_shop') }}:</strong></td>
<td>
<span class="badge badge-primary" style="font-size: 1em;"><strong>{{ formatNumber($TreeCalcBot->business_user->commission_shop_sales) }} &euro;</strong></span>
&nbsp;
(Umsatz Shop netto: {{ formatNumber($TreeCalcBot->business_user->sales_volume_total_shop) }} &euro; / {{ $TreeCalcBot->business_user->margin_shop }} %)
({{ __('team.sales_store_net') }}: {{ formatNumber($TreeCalcBot->business_user->sales_volume_total_shop) }} &euro; / {{ $TreeCalcBot->business_user->margin_shop }} %)
</td>
</tr>
@if($TreeCalcBot->business_user->version == 1)
<tr>
<td><strong>Provision Team:</strong></td>
<td><strong>{{ __('team.commission_team') }}:</strong></td>
<td>
<span class="badge badge-primary" style="font-size: 1em;"><strong>{{ formatNumber($TreeCalcBot->business_user->commission_pp_total) }} &euro;</strong></span>
</td>
@ -159,27 +180,27 @@
@endif
@if($TreeCalcBot->business_user->version == 2)
<tr>
<td><strong>Provision Payline:</strong></td>
<td><strong>{{ __('team.commission_payline') }}:</strong></td>
<td>
<span class="badge badge-primary" style="font-size: 1em;"><strong>{{ formatNumber($TreeCalcBot->business_user->commission_pp_total) }} &euro;</strong></span>
</td>
</tr>
<tr>
<td><strong>Provision Wachstumsbonus:</strong></td>
<td><strong>{{ __('team.commission_WB') }}:</strong></td>
<td>
<span class="badge badge-primary" style="font-size: 1em;"><strong>{{ formatNumber($TreeCalcBot->business_user->commission_growth_total) }} &euro;</strong></span>
</td>
</tr>
@endif
<tr>
<td><strong>Provision Gesamt:</strong></td>
<td><strong>{{ __('team.commission_total') }}:</strong></td>
<td>
<span class="badge badge-secondary" style="font-size: 1em;"><strong>{{ formatNumber($TreeCalcBot->business_user->getCommissionTotal()) }} &euro;</strong></span>
</td>
</tr>
@if($TreeCalcBot->business_user->version == 2)
<tr>
{{-- <tr>
<td>Team Points:</td>
<td>
<strong>{{ formatNumber($TreeCalcBot->business_user->total_pp, 0) }} TP</strong>
@ -188,33 +209,12 @@
<tr>
<td>Qualifikation Team Points:</td>
<td>
<strong>{{ formatNumber($TreeCalcBot->business_user->total_qual_pp, 0) }} TP</strong> (+ Volumen KP)
<strong>{{ formatNumber($TreeCalcBot->business_user->payline_points_qual_kp, 0) }} TP</strong> (+ Volumen KP)
</td>
</tr>
--}}
@endif
<tr>
<td>@if($TreeCalcBot->business_user->next_qual_user_level) Qualifikation<br> @endif nächster Karriere-Level:</td>
<td>
@if($TreeCalcBot->business_user->next_qual_user_level)
<span class="badge badge-outline-success">
KP {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} /
<strong>{{ formatNumber($TreeCalcBot->business_user->next_qual_user_level['qual_kp'], 0) }}</strong> |
TP {{ formatNumber($TreeCalcBot->business_user->total_qual_pp, 0) }} /
<strong>{{ formatNumber($TreeCalcBot->business_user->next_qual_user_level['qual_pp'], 0) }}</strong>
| {{ $TreeCalcBot->business_user->next_qual_user_level['name'] }}</span>
@elseif($TreeCalcBot->business_user->next_can_user_level)
<span class="badge badge-outline-warning-dark">
KP {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} /
<strong>{{ formatNumber($TreeCalcBot->business_user->next_can_user_level['qual_kp'], 0) }}</strong> |
TP {{ formatNumber($TreeCalcBot->business_user->total_qual_pp, 0) }} /
<strong>{{ formatNumber($TreeCalcBot->business_user->next_can_user_level['qual_pp'], 0) }}</strong>
| {{ $TreeCalcBot->business_user->next_can_user_level['name'] }}</span>
@else
<span class="badge badge-outline-warning"><i class="fa fa-times"></i></span>
@endif
</td>
</tr>
</tbody>
</table>
<hr class="border-light m-0 mb-2">
@ -222,10 +222,10 @@
<table class="table card-table m-0">
<tbody>
<tr>
<th>Linie</th>
<th>Points</th>
<th>Provision %</th>
<th>Provision &euro;</th>
<th>{{__('tables.line')}}</th>
<th>{{__('tables.points')}}</th>
<th>{{__('tables.commission')}} %</th>
<th>{{__('tables.commission')}} &euro;</th>
</tr>
@foreach ($TreeCalcBot->business_user->business_lines as $line => $object)
@ -233,9 +233,9 @@
<td>
@if($line <= $TreeCalcBot->business_user->getQualLevelPaylines())
<div class="font-weight-bolder line-height-1 my-2 text-dark badge badge-outline-success">{{ $line }}. PP</div>
<div class="font-weight-bolder line-height-1 my-2 text-dark badge badge-outline-success">{{ $line }}. {{ __('team.PP') }}</div>
@elseif($line <= $TreeCalcBot->business_user->isQualLevelGrowth($line))
<div class="font-weight-bolder line-height-1 my-2 text-dark badge badge-outline-warning-dark">{{ $line }}. WB</div>
<div class="font-weight-bolder line-height-1 my-2 text-dark badge badge-outline-warning-dark">{{ $line }}. {{ __('team.WB') }}</div>
@else
<div class="font-weight-bolder line-height-1 my-2 text-dark badge badge-outline-dark">{{ $line }}.</div>
@endif
@ -248,7 +248,7 @@
</tbody>
<tfoot>
<tr>
<td>Gesamt</td>
<td>{{__('tables.total')}}</td>
<td>{{ formatNumber($TreeCalcBot->business_user->total_pp, 0) }}</td>
<td></td>
<td><strong>{{ formatNumber($TreeCalcBot->business_user->commission_pp_total, 2) }} &euro;</strong></td>

10
resources/views/admin/business/commissions.blade.php
View file

@ -52,11 +52,11 @@
<th>{{__('Gesamt netto')}}</th>
<th>{{__('Team Provision')}}</th>
<th>{{__('Shop Provision')}}</th>
<th>{{__('Berater Nr.')}}</th>
<th>{{__('Vorname')}}</th>
<th>{{__('Nachname') }}</th>
<th>{{__('tables.adviser_no')}}</th>
<th>{{__('First name')}}</th>
<th>{{__('Last name') }}</th>
<th>{{__('E-Mail') }}</th>
<th>{{__('Account')}}</th>
<th>{{__('tables.account')}}</th>
<th>{{__('bis')}}</th>
</tr>
</thead>
@ -98,7 +98,7 @@
"bLengthChange": false,
"iDisplayLength": 100,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
$('select.on_change_select').on('change', function(){

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

@ -41,13 +41,22 @@
{{ Form::select('status_points', \App\Models\UserSalesVolume::$statusPointsTypes , 1, array('class'=>'custom-select', 'id'=>'status_points')) }}
</div>
</div>
<hr>
<div class="form-row">
<div class="form-group col-sm-4">
<label for="total_net" class="form-label">{{__('Umsatz netto%')}}</label>
<label for="total_net" class="form-label">{{__('Umsatz netto')}}</label>
{{ 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-4">
<label for="status_turnover" class="form-label">{{__('Umsatz berechnen als')}}*</label>
{{ Form::select('status_turnover', \App\Models\UserSalesVolume::getTransTurnoverTypes() , 1, array('class'=>'custom-select', 'id'=>'status_turnover')) }}
</div>
</div>
<em>Bei einer Gutschrift kann der Umsatz als Beraterbestellung (eigenes Volumen) oder Shopbestellung (wird provisioniert) verrechnet werden</em>
<hr>
<div class="form-row">
<div class="form-group col-sm-12">
<label for="info" class="form-label">{{__('Notiz/Grund')}}</label>
@ -65,7 +74,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
<button type="button" class="btn btn-default" data-dismiss="modal">{{ __('close') }}</button>
<button type="submit" class="btn btn-primary">{{__('speichern')}}</button>
</div>

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

@ -22,10 +22,10 @@
<table class="table table-bordered table-striped">
<thead>
<tr>
<th>Datum</th>
<th>Points</th>
<th>{{__('tables.date')}}</th>
<th>{{__('tables.points')}}</th>
<th>Umsatz netto</th>
<th>Status</th>
<th>{{__('tables.status')}}</th>
<th>Berater</th>
</tr>
</thead>
@ -67,12 +67,24 @@
{{ Form::select('status_points', \App\Models\UserSalesVolume::$statusPointsTypes , $userSalesVolume->status_points, array('class'=>'custom-select', 'id'=>'status_points')) }}
</div>
</div>
<hr>
<div class="form-row">
<div class="form-group col-sm-4">
<label for="total_net" class="form-label">{{__('Umsatz netto')}}</label>
{{ Form::text('total_net', formatNumber($userSalesVolume->total_net), array('class'=>'form-control', 'id'=>'total_net')) }}
</div>
</div>
@if($userSalesVolume->status === 4)
<div class="form-row">
<div class="form-group col-sm-4">
<label for="status_turnover" class="form-label">{{__('Umsatz berechnen als')}}*</label>
{{ Form::select('status_turnover', \App\Models\UserSalesVolume::getTransTurnoverTypes() , $userSalesVolume->status_turnover, array('class'=>'custom-select', 'id'=>'status_turnover')) }}
</div>
</div>
<em>Bei einer Gutschrift kann der Umsatz als Beraterbestellung oder Shopbestellung (wird provisioniert) verrechnet werden</em>
@endif
<hr>
<div class="form-row">
<div class="form-group col-sm-12">
<label for="info" class="form-label">{{__('Notiz/Grund')}}</label>
@ -94,8 +106,8 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
<button type="submit" class="btn btn-primary">{{__('übernehmen')}}</button>
<button type="button" class="btn btn-default" data-dismiss="modal">{{ __('close') }}</button>
<button type="submit" class="btn btn-primary">{{__('take over')}}</button>
</div>
{!! Form::close() !!}

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

@ -10,7 +10,7 @@
data-id="new"
data-action="add_user_sales_volume"
data-back="{{url()->current()}}"
data-route="{{ route('modal_load') }}"><span class="far fa-plus-circle"></span> Points hinzufügen
data-route="{{ route('modal_load') }}"><span class="fa fa-plus-circle"></span> Points hinzufügen
</button>
</div>
</h5>
@ -29,7 +29,7 @@
{!! Form::open(['url' => route('admin_business_points'), 'class' => 'form-horizontal', 'id'=>'form_admin_business_points']) !!}
<div class="form-row align-items-center px-4 pb-2 pt-3">
<div class="col-12 col-sm-4 col-md-4 col-lg-4 mb-1">
<div class="col-12 col-sm-12 col-md-3 col-lg-3 mb-1">
<select class="selectpicker on_change_select" data-style="btn-default" name="points_filter_member_id" id="points_filter_member_id" data-live-search="true">
<option value="">Filter Berater aus</option>
@foreach($filter_members as $member)
@ -37,15 +37,25 @@
@endforeach
</select>
</div>
<div class="col-12 col-sm-12 col-md-3 col-lg-3 mb-1">
<select class="selectpicker on_change_select" data-style="btn-default" name="points_filter_status_type_id" id="points_filter_status_type_id" data-live-search="true">
<option value="">Filter Typ aus</option>
@foreach($filter_status_types as $key=>$value)
<option value="{{$key}}" @if(session('points_filter_status_type_id') == $key) selected @endif>{{$value}}</option>
@endforeach
</select>
</div>
<div class="col-6 col-sm-4 col-md-4 col-lg-4 mb-1">
<div class="col-6 col-sm-6 col-md-3 col-lg-3 mb-1">
<select class="custom-select on_change_select" name="points_filter_month">
@foreach($filter_months as $key=>$value)
<option value="{{$key}}" @if(session('points_filter_month') == $key) selected @endif>{{$value}}</option>
@endforeach
</select>
</div>
<div class="col-6 col-sm-4 col-md-4 col-lg-4 mb-1">
<div class="col-6 col-sm-6 col-md-3 col-lg-3 mb-1">
<select class="custom-select on_change_select" name="points_filter_year">
@foreach($filter_years as $key=>$value)
<option value="{{$value}}" @if(session('points_filter_year') == $value) selected @endif>{{$value}}</option>
@ -61,14 +71,15 @@
<tr>
<th>#</th>
<th>{{__('Datum') }}</th>
<th>{{__('Points')}}</th>
<th>{{__('tables.points')}}</th>
<th>{{__('Umsatz netto')}}</th>
<th>{{__('aus')}}</th>
<th>{{__('VE')}}</th>
<th>{{__('Typ')}}</th>
<th>{{__('für')}}</th>
<th>{{__('Bestellung')}}</th>
<th>{{__('Berater Nr.')}}</th>
<th>{{__('Vorname')}}</th>
<th>{{__('Nachname') }}</th>
<th>{{__('tables.adviser_no')}}</th>
<th>{{__('First name')}}</th>
<th>{{__('Last name') }}</th>
<th>{{__('E-Mail') }}</th>
<th>{{__('Info') }}</th>
<th>{{__('Notiz') }}</th>
@ -93,8 +104,9 @@
url: '{!! route('admin_business_points_datatable') !!}',
data: function(d) {
d.points_filter_member_id = $('select[name=points_filter_member_id]').val();
d.points_filter_status_type_id = $('select[name=points_filter_status_type_id]').val();
d.points_filter_month = $('select[name=points_filter_month]').val();
d.points_filter_year = $('select[name=points_filter_year]').val();
d.points_filter_year = $('select[name=points_filter_year]').val();
}
},
"order": [[0, "desc" ]],
@ -103,6 +115,7 @@
{ 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_turnover', name: 'status_turnover', orderable: false, searchable: false },
{ data: 'status', name: 'status', orderable: true, searchable: false },
{ data: 'status_points', name: 'status_points', orderable: true, searchable: false },
{ data: 'order', name: 'order', orderable: false , searchable: false },
@ -116,7 +129,7 @@
"bLengthChange": false,
"iDisplayLength": 100,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
$('select.on_change_select').on('change', function(){

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

@ -45,10 +45,10 @@
<th>{{__('Gesamte Points')}}</th>
<th>{{__('Umsatz netto')}}</th>
<th>{{__('E-Mail')}}</th>
<th>{{__('Vorname')}}</th>
<th>{{__('Nachname')}}</th>
<th>{{__('First name')}}</th>
<th>{{__('Last name')}}</th>
<th>{{__('Sponsor')}}</th>
<th>{{__('Account')}}</th>
<th>{{__('tables.account')}}</th>
<th>{{__('bis')}}</th>
</tr>
</thead>
@ -93,7 +93,7 @@
"bLengthChange": false,
"iDisplayLength": 100,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
$('select.on_change_invoice').on('change', function(){

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

@ -3,7 +3,7 @@
@section('content')
<div class="card">
<h5 class="card-header">
{{__('Business')}} {{__('Struktur')}}
{{__('team.business')}} {{__('team.structure')}}
</h5>
<div class="card-body">
@ -30,8 +30,8 @@
<hr class="container-m-nx border-light mt-0">
<div>
<div id="nestable-menu" class="mb-4">
<button type="button" class="btn btn-default btn-sm" data-action="expand-all">Alles aufklappen</button>
<button type="button" class="btn btn-default btn-sm" data-action="collapse-all">Alles zuklappen</button>
<button type="button" class="btn btn-default btn-sm" data-action="expand-all">{{ __('team.expand_all') }}</button>
<button type="button" class="btn btn-default btn-sm" data-action="collapse-all">{{ __('team.collapse_all') }}</button>
</div>
<div class="row">

2
resources/views/admin/category/form.blade.php
View file

@ -12,7 +12,7 @@
<div class="form-group col">
<label class="custom-control custom-checkbox float-right">
{!! Form::checkbox('active', 1, $category->active, ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">{{__('aktiv')}}</span>
<span class="custom-control-label">{{__('activ')}}</span>
</label>
<label class="form-label" for="name">{{ __('Name') }}*</label>
{{ Form::text('name', $category->name, array('placeholder'=>__('Name'), 'class'=>'form-control', 'id'=>'name', 'required')) }}

38
resources/views/admin/category/images.blade.php
View file

@ -34,11 +34,11 @@
<div class="col-6 col-md-4 text-center" style="border: 1px solid #eee;">
<img class="" height="60" alt="" src="{{ route('iq_image', [$category->iq_image->slug]) }}">
<br>
<a href="{{ route('admin_product_category_image_delete', [$category->iq_image->id, $category->id]) }}" class="btn btn-sm btn-primary mt-2 mb-2" onclick="return confirm('Bild wirklich löschen?');">Bild löschen</a>
<a href="{{ route('admin_product_category_image_delete', [$category->iq_image->id, $category->id]) }}" class="btn btn-sm btn-primary mt-2 mb-2" onclick="return confirm('{{ __('actions.really_delete_picture') }}');">Bild löschen</a>
@if($category->iq_image->active)
<a href="{{ route('admin_product_category_image_attribute', [$category->iq_image->id, 'active', 0]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span> <i class="far fa-sync"></i></a>
<a href="{{ route('admin_product_category_image_attribute', [$category->iq_image->id, 'active', 0]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span> <i class="fa fa-sync"></i></a>
@else
<a href="{{ route('admin_product_category_image_attribute', [$category->iq_image->id, 'active', 1]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span> <i class="far fa-sync"></i></a>
<a href="{{ route('admin_product_category_image_attribute', [$category->iq_image->id, 'active', 1]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span> <i class="fa fa-sync"></i></a>
@endif
</div>
@endif
@ -54,25 +54,25 @@
<input type="hidden" name="category_id" value="{{$category->id}}">
<div class="slim_holder text-center">
<div class="slim" style="margin:20px auto;"
data-label='<span class="text-green">Foto-Upload</span><br>(Datei suchen oder Drag & Drop)'
data-fetcher="fetch.php"
data-size="1680,640"
data-min-size="100,100"
data-max-file-size="10"
data-status-image-too-small="Bild zu klein<br>min. $0 Pixel"
data-status-file-type="Ungültige Datei<br>bitte nur: $0"
data-status-file-size="Die Datei ist zu groß<br>max. $0 MB"
data-button-confirm-label="bestätigen"
data-button-cancel-label="abbrechen"
data-button-confirm-title="bestätigen"
data-button-cancel-title="abbrechen"
data-button-rotate-title="drehen"
data-ratio="">
<input type="file" name="images[]" required />
data-label='<span class="text-green">{{ __('actions.upload_photo') }}</span><br>({{ __('actions.search_file_or_drag_drop') }})'
data-fetcher="fetch.php"
data-size="600,800"
data-min-size="200,200"
data-max-file-size="10"
data-status-image-too-small="{{ __('actions.image_too_small') }}"
data-status-file-type="{{ __('actions.invalid_file') }}"
data-status-file-size="{{ __('actions.file_is_too_big') }}"
data-button-confirm-label="{{ __('actions.confirm') }}"
data-button-cancel-label="{{ __('actions.cancel') }}"
data-button-confirm-title="{{ __('actions.confirm') }}"
data-button-cancel-title="{{ __('actions.cancel') }}"
data-button-rotate-title="{{ __('actions.rotate') }}"
data-ratio="3:4">
<input type="file" name="images[]" required />
</div>
<br>
<button class="btn btn-primary" type="submit">Bild speichern</button>
<button class="btn btn-primary" type="submit">{{ __('actions.save_image') }}</button>
</div>
</form>
</div>

14
resources/views/admin/category/index.blade.php
View file

@ -14,9 +14,11 @@
<th>{{__('Kategorie')}}</th>
{{--<th>{{__('Kategorie')}}</th>--}}
<th>{{__('Headline')}}</th>
<th>{{__('Produkte')}}</th>
<th>{{__('tables.products')}}</th>
<th>{{ __('activ') }}</th>
{{-- <th>__('Translate') </th>--}}
<th>{{__('Status')}}</th>
<th>{{__('tables.status')}}</th>
<th></th>
</tr>
</thead>
@ -25,7 +27,7 @@
<tr>
<td>
<a href="{{route('admin_product_category_edit', [$value->id])}}" class="btn icon-btn btn-sm btn-primary">
<span class="far fa-edit"></span>
<span class="fa fa-edit"></span>
</a>
</td>
<td>{{ $value->pos }}</td>
@ -33,10 +35,12 @@
{{-- <td>@if($value->parent) {{ $value->name }} @else - @endif</td>--}}
<td>{{ $value->headline }}</td>
<td>{{ $value->product_categories->count() }}</td>
<td>{{ $value->productCategoriesCountActive() }}</td>
{{-- <td>{{ $value->getTranNames() }}</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><a class="text-danger" href="{{ route('admin_product_category_delete', ['category', $value->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a></td>
<td><a class="text-danger" href="{{ route('admin_product_category_delete', ['category', $value->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="fa fa-trash-alt"></i></a></td>
</tr>
@endforeach
@ -61,7 +65,7 @@
"order": [[ 1, "desc" ]],
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
});

4
resources/views/admin/category/products.blade.php
View file

@ -27,7 +27,7 @@
data-id="{{ $product_category->id }}"
data-pos="{{ $product_category->pos }}"
data-product_id="{{ $product_category->product_id }}">
<span class="far fa-edit"></span>
<span class="fa fa-edit"></span>
</button>
</td>
<td>
@ -48,7 +48,7 @@
@endif
</td>
<td>
<a class="text-danger" href="{{ route('admin_product_category_delete', ['product_category', $product_category->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a>
<a class="text-danger" href="{{ route('admin_product_category_delete', ['product_category', $product_category->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="fa fa-trash-alt"></i></a>
</td>
</tr>
@endforeach

5
resources/views/admin/change_email.blade.php
View file

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

50
resources/views/admin/country/form.blade.php
View file

@ -2,10 +2,10 @@
<div class="card mb-2">
<h5 class="card-header">
{{ __('Land') }}
{{ __('Country') }}
<label class="custom-control custom-checkbox float-right">
{!! Form::checkbox('active', 1, $country->active, ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">{{__('aktiv')}}</span>
<span class="custom-control-label">{{__('activ')}}</span>
</label>
</h5>
@ -39,11 +39,11 @@
<hr>
<div class="form-row">
<div class="form-group col-sm-6">
<label class="form-label" for="code">Ländercode</label>
<label class="form-label" for="code">{{ __('Country code') }}</label>
{{ Form::text('code', $country->code, array('placeholder'=>__('code'), 'class'=>'form-control', 'id'=>'code')) }}
</div>
<div class="form-group col-sm-6">
<label class="form-label" for="phone">Telefonvorwahl</label>
<label class="form-label" for="phone">{{ __('Phone code') }}</label>
{{ Form::text('phone', $country->phone, array('placeholder'=>__('phone'), 'class'=>'form-control', 'id'=>'phone')) }}
</div>
</div>
@ -52,7 +52,7 @@
<div class="card mb-2">
<h5 class="card-header">
Lieferland
{{ __('Delivery country') }}
</h5>
<div class="card-body">
<div class="form-group col-sm-12">
@ -90,10 +90,22 @@
<div class="form-group col-sm-12">
<label class="custom-control custom-checkbox">
{!! Form::checkbox('switch', 1, $country->switch, ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">Land als Auswahl auf der Webseite anzeigen (Länderwechsel)</span>
<span class="custom-control-label">Länderwechsel | Land als Auswahl auf den Shopseiten anzeigen</span>
</label>
<p class="small">Hinweis: Die hier aktivierten Länder werden in auf der Shopseite zum Länderwächsel angezeigt, allerdings müssen auch die Versandkosten angelegt sein.</p>
<p class="small">Hinweis: Die hier aktivierten Länder werden auf den Shopseiten zum Länderwächsel angezeigt, allerdings müssen auch die Versandkosten angelegt sein.</p>
</div>
{{--
<div class="form-group col-sm-12">
<label class="custom-control custom-checkbox">
{!! Form::checkbox('translate', 1, $country->translate, ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">Sprachwechsel | Land als Auswahl auf den Shopseiten und im Salescenter anzeigen</span>
</label>
<p class="small">Hinweis: Die hier aktivierten Länder werden auf den Shopseiten und im Salescenter zum Sprachwechsel angezeigt, allerdings muss auch die Übersetzung mit dem Länderkürzel ({{ strtolower($country->code) }}) angelegt sein.</p>
</div>
--}}
<div class="form-group col-sm-12">
<label class="custom-control custom-checkbox">
{!! Form::checkbox('own_eur', 1, $country->own_eur, ['class'=>'custom-control-input']) !!}
@ -150,7 +162,7 @@
<div class="card mb-2">
<h5 class="card-header">
{{trans('register.required_fields')}}
{{__('register.required_fields')}}
</h5>
<div class="card-body">
<div class="form-row">
@ -179,28 +191,6 @@
</div>
<div class="card mb-2">
<h5 class="card-header">
{{ __('Übersetzungen') }}
</h5>
<div class="card-body">
@foreach($trans as $lang)
@if(!in_array($lang, ['en', 'de', 'es', 'fr', 'it', 'ru']))
<div class="form-row">
<div class="form-group col-12">
<label for="trans_name_{{$lang}}" class="form-label">{{__('Name')}} <strong style="text-transform: uppercase">{{$lang}}</strong></label>
{{ Form::text('trans_name['.$lang.']', $country->getLocated($lang), array('class'=>'form-control', 'id'=>'trans_name_'.$lang)) }}
</div>
</div>
@endif
@endforeach
</div>
</div>
<script type="application/javascript">
$( document ).ready(function() {

7
resources/views/admin/country/index.blade.php
View file

@ -14,7 +14,7 @@
<th>{{__('DE')}}</th>
<th>{{__('Code')}}</th>
<th>{{__('Phone')}}</th>
<th>{{__('Status')}}</th>
<th>{{__('tables.status')}}</th>
<th>{{__('Reverse Charge')}}</th>
<th>{{__('Länderwechsel')}}</th>
<th>{{__('Drittland') }}</th>
@ -28,7 +28,7 @@
<tr>
<td data-sort="{{ $value->id }}">
<a href="{{route('admin_country_edit', [$value->id])}}" class="btn icon-btn btn-sm btn-primary">
<span class="far fa-edit"></span>
<span class="fa fa-edit"></span>
</a>
</td>
<td>{{ $value->de }}</td>
@ -65,14 +65,13 @@
<script>
$( document ).ready(function() {
$('.datatables-style').dataTable({
"bLengthChange": false,
"iDisplayLength": 50,
"order": [[ 0, "asc" ]],
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
});

44
resources/views/admin/customer/_customer_detail.blade.php
View file

@ -1,50 +1,50 @@
<div class="card-body">
<h6 class="small font-weight-semibold">
Kunden-, Rechnungsadresse
{{ __('customer.customer_billing_address') }}
</h6>
<div class="row">
@if($shopping_user->billing_company)
<div class="col-md-12 mb-3">
<div class="text-muted small">Firma</div>
<div class="text-muted small">{{ __('Company') }}</div>
{{ $shopping_user->billing_company }}
</div>
@endif
<div class="col-md-3 mb-3">
<div class="text-muted small">Anrede</div>
<div class="text-muted small">{{ __('Salutation') }}</div>
{{ \App\Services\HTMLHelper::getSalutationLang($shopping_user->billing_salutation) }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Vorname</div>
<div class="text-muted small">{{ __('First name') }}</div>
{{ $shopping_user->billing_firstname }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Nachname</div>
<div class="text-muted small">{{ __('Last name') }}</div>
{{ $shopping_user->billing_lastname }}
</div>
</div>
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Straße</div>
<div class="text-muted small">{{ __('Street') }}</div>
{{ $shopping_user->billing_address }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Zusatz</div>
<div class="text-muted small">{{ __('Addition') }}</div>
{{ $shopping_user->billing_address_2 }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">PLZ</div>
<div class="text-muted small">{{ __('Postcode') }}</div>
{{ $shopping_user->billing_zipcode }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Stadt</div>
<div class="text-muted small">{{ __('City') }}</div>
{{ $shopping_user->billing_city }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Land</div>
<div class="text-muted small">{{ __('Country') }}</div>
{{ $shopping_user->billing_country->getLocated() }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Telefon</div>
<div class="text-muted small">{{ __('Phone') }}</div>
{{ $shopping_user->billing_phone }}
</div>
</div>
@ -55,7 +55,7 @@
<!-- Shipping -->
<div class="card-body">
<h6 class="small font-weight-semibold">
Lieferadresse
{{ __('Delivery address') }}
</h6>
@if($shopping_user->same_as_billing)
{{__('email.checkout_mail_same_address')}}
@ -63,46 +63,46 @@
<div class="row">
@if($shopping_user->shipping_company)
<div class="col-md-12 mb-3">
<div class="text-muted small">Firma</div>
<div class="text-muted small">{{ __('Company') }}</div>
{{ $shopping_user->shipping_company }}
</div>
@endif
<div class="col-md-3 mb-3">
<div class="text-muted small">Anrede</div>
<div class="text-muted small">{{ __('Salutation') }}</div>
{{ \App\Services\HTMLHelper::getSalutationLang($shopping_user->shipping_salutation) }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Vorname</div>
<div class="text-muted small">{{ __('First name') }}</div>
{{ $shopping_user->shipping_firstname }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Nachname</div>
<div class="text-muted small">{{ __('Last name') }}</div>
{{ $shopping_user->shipping_lastname }}
</div>
</div>
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Straße</div>
<div class="text-muted small">{{ __('Street') }}</div>
{{ $shopping_user->shipping_address }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Zusatz</div>
<div class="text-muted small">{{ __('Addition') }}</div>
{{ $shopping_user->shipping_address_2 }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">PLZ</div>
<div class="text-muted small">{{ __('Postcode') }}</div>
{{ $shopping_user->shipping_zipcode }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Stadt</div>
<div class="text-muted small">{{ __('City') }}</div>
{{ $shopping_user->shipping_city }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Land</div>
<div class="text-muted small">{{ __('Country') }}</div>
{{ $shopping_user->shipping_country->getLocated() }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Telefon</div>
<div class="text-muted small">{{ __('Phone') }}</div>
{{ $shopping_user->shipping_phone }}
</div>
</div>

72
resources/views/admin/customer/_detail.blade.php
View file

@ -1,12 +1,10 @@
<div class="card">
<!-- Info -->
<div class="card-body pb-1">
@if($isAdmin)
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">E-Mail</div>
<div class="text-muted small">{{ __('E-Mail') }}</div>
@if($shopping_user->faker_mail)
-
@else
@ -14,21 +12,21 @@
@endif
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Kundennummer</div>
<div class="text-muted small">{{ __('customer.customer_data') }}</div>
{{$shopping_user->number}}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Datum</div>
<div class="text-muted small">{{ __('customer.date') }}</div>
{{$shopping_user->created_at->format("d.m.Y H:i")}}
</div>
<div class="col-md-3 mb-3">
<a class="btn btn-sm btn-secondary mt-2" href="{{route('admin_customer_edit', [$shopping_user->id])}}">Kundendaten bearbeiten</a>
<a class="btn btn-sm btn-secondary mt-2" href="{{route('admin_customer_edit', [$shopping_user->id])}}">{{ __('customer.edit_customer_data') }}</a>
</div>
</div>
@else
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">E-Mail</div>
<div class="text-muted small">{{ __('E-Mail') }}</div>
@if($shopping_user->faker_mail)
-
@else
@ -36,17 +34,17 @@
@endif
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Kundennummer</div>
<div class="text-muted small">{{ __('customer.customer_data') }}</div>
{{$shopping_user->number}}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Erstellt</div>
<div class="text-muted small">{{ __('customer.created') }}</div>
{{$shopping_user->firstEntryByNumber()->created_at->format("d.m.Y H:i")}}
</div>
<div class="col-md-3 mb-3">
@if(!$shopping_user->is_like)
<a class="btn btn-sm btn-secondary mt-2" href="{{route('user_customer_edit', [$shopping_user->id])}}">Kundendaten bearbeiten</a>
<a class="btn btn-sm btn-secondary mt-2" href="{{route('user_customer_edit', [$shopping_user->id])}}">{{ __('customer.edit_customer_data') }}</a>
@endif
</div>
</div>
@ -70,14 +68,14 @@
</div>
</div>
@endif
<div class="text-muted small">Zugewiesener Berater</div>
<div class="text-muted small">{{ __('customer.assigned_counsellor') }} </div>
@if($shopping_user->is_like)
<button type="button" class="btn btn-xs btn-outline-info" data-toggle="modal" data-target="#modals-load-content"
data-id="{{$shopping_user->id}}"
data-action="shopping-user-is-like-member"
data-back="{{route('admin_customer_detail', [$shopping_user->id])}}"
data-modal="modal-xl"
data-route="{{route('modal_load')}}"><span class="fa fa-edit"></span> Berater zuordnen</button>
data-route="{{route('modal_load')}}"><span class="fa fa-edit"></span> {{ __('customer.counsellor_allocate') }} </button>
@else
@if($shopping_user->member)
<a class="btn btn-xs btn-outline-primary" href="{{route('admin_lead_edit', [$shopping_user->member->id])}}"><i class="ion ion-ios-contacts"></i></a>
@ -91,7 +89,7 @@
@endif
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Über Shop</div>
<div class="text-muted small">{{ __('customer.about_shop') }} </div>
@if($shopping_user->shopping_order)
@if($shopping_user->shopping_order->user_shop->user->isActive() && $shopping_user->shopping_order->user_shop->user->isActiveShop())
<a href="{{$shopping_user->shopping_order->user_shop->getSubdomain(false)}}" class="badge badge-success" target="_blank">{{$shopping_user->shopping_order->user_shop->getSubdomain(false)}}</a>
@ -101,7 +99,7 @@
@endif
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">ist Berater</div>
<div class="text-muted small">{{ __('customer.is_counsellor') }} </div>
@if($shopping_user->auth_user)
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>
<a class="btn btn-xs btn-outline-primary" href="{{route('admin_lead_edit', [$shopping_user->auth_user->id])}}"><i class="ion ion-ios-contacts"></i></a>
@ -121,11 +119,11 @@
--}}
</div>
<div class="col-md-6 mb-3">
<div class="text-muted small">Kundenhoheit</div>
<div class="text-muted small">{{ __('customer.client_sovereignty') }}</div>
@if($shopping_user->is_like)
<span class="badge badge-pill badge-warning"><i class="fa fa-clock"></i> in Prüfung</span>
<span class="badge badge-pill badge-warning"><i class="fa fa-clock"></i> {{ __('customer.under_review') }}</span>
@else
<span class="badge badge-pill badge-success"><i class="fa fa-check-circle"></i> zugewiesen</span>
<span class="badge badge-pill badge-success"><i class="fa fa-check-circle"></i> {{ __('customer.assigned') }}</span>
@endif
</div>
@ -146,16 +144,16 @@
<div class="row">
<div class="col-md-12 mb-3">
@if($shopping_user->has_buyed)
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span> Kunde hat schon gekauft.
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span> {{ __('customer.customer_has_already_purchased') }}
@else
<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span> Kunde hat noch nicht gekauft.
<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span> {{ __('customer.customer_has_not_yet_purchased') }}
@endif
</div>
<div class="col-md-12 mb-3">
@if($shopping_user->subscribed)
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span> Kunde ist für Newsletter abonniert.
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span> {{ __('customer.customer_is_subscribed_to_newsletter') }}
@else
<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span> Kunde ist nicht für Newsletter abonniert.
<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span> {{ __('customer.customer_is_not_subscribed_to_newsletter') }}
@endif
</div>
</div>
@ -163,7 +161,7 @@
<hr class="m-0">
<div class="card-body">
<h6 class="small font-weight-semibold">
Bemerkungen
{{ __('Comments') }}
</h6>
<div class="row">
<div class="col-md-12 mb-3">
@ -177,15 +175,15 @@
<!-- Order -->
<div class="card-body">
<h6 class="small font-weight-semibold">
Bestellung
{{ __('tables.order') }}
</h6>
<div class="table-responsive">
<table class="table table-bordered m-0" style="min-width:550px;">
<tbody>
<tr>
<th>Produkt</th>
<th>Anzahl</th>
<th>Preis</th>
<th>{{ __('tables.product') }}</th>
<th>{{ __('tables.quantity') }}</th>
<th>{{ __('tables.price') }}</th>
</tr>
@if($shopping_user->shopping_order)
@foreach($shopping_user->shopping_order->shopping_order_items as $shopping_order_item)
@ -199,12 +197,12 @@
@endif
<div class="media-body">
<a href="{{route('admin_product_edit', [$shopping_order_item->product->id])}}" class="d-block">{{ $shopping_order_item->product->name }}
<a href="{{route('admin_product_edit', [$shopping_order_item->product->id])}}" class="d-block">{{ $shopping_order_item->product->getLang('name') }}
<span class="text-muted">#{{ $shopping_order_item->product->number }}</span></a>
<small>
<span class="text-muted">Inhalt: </span> {{ $shopping_order_item->product->contents }}<br>
<span class="text-muted">Gewicht: </span> {{ $shopping_order_item->product->weight }} g<br>
<span class="text-muted">Points: </span> {{ $shopping_order_item->product->points }}
<span class="text-muted">{{ __('order.content') }}: </span> {{ $shopping_order_item->product->contents }}<br>
<span class="text-muted">{{ __('order.weight') }}: </span> {{ $shopping_order_item->product->weight }} g<br>
<span class="text-muted">{{ __('order.points') }}: </span> {{ $shopping_order_item->product->points }}
</small>
</div>
</div>
@ -237,11 +235,11 @@
<thead>
<tr>
<th style="min-width: 60px">#</th>
<th>Zahlungsart</th>
@if($isAdmin)<th>Referenznummer</th>@endif
<th>Gesamt</th>
<th>Status</th>
<th>Datum</th>
<th>{{ __('tables.payment_type') }}</th>
@if($isAdmin)<th>{{ __('tables.reference_number') }}</th>@endif
<th>{{ __('tables.total') }}</th>
<th>{{ __('tables.status') }}</th>
<th>{{ __('tables.date') }}</th>
</tr>
</thead>
<tbody>
@ -265,9 +263,9 @@
<thead>
<tr>
<th style="min-width: 80px">Request</th>
<th style="min-width: 80px">Status</th>
<th style="min-width: 80px">{{ __('tables.status') }}</th>
<th style="min-width: 200px">TX-Action</th>
<th style="min-width: 120px">Datum</th>
<th style="min-width: 120px">{{ __('tables.date') }}</th>
</tr>
</thead>
<tbody>

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

@ -2,11 +2,11 @@
<h5 class="card-header">
<div class="row">
<div class="col-xs-12 col-sm-6">
Kunden-, Rechnungsadresse
{{ __('customer.customer_billing_address') }}
</div>
<div class="col-xs-12 col-sm-6">
<span class="text-tiny float-right">* {{trans('register.required_fields')}}</span>
<span class="d-none d-lg-inline">Lieferadresse</span>
<span class="d-none d-lg-inline">{{ __('Delivery address') }}</span>
</div>
</div>
</h5>
@ -15,7 +15,7 @@
<div class="col-12 col-lg-6">
<div class="form-row">
<div class="form-group col-md-12">
<label for="billing_company" class="form-label">{{ __('Company name') }} (optional)</label>
<label for="billing_company" class="form-label">{{ __('Company name') }} ({{__('optional')}})</label>
{{ Form::text('billing_company', $shopping_user->billing_company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'billing_company', 'tabindex' => 1)) }}
</div>
</div>
@ -67,8 +67,8 @@
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('billing_address_2') ? 'has-error' : '' }}">
<label class="form-label" for="billing_address_2">{{ __('Wohnung / Gebäude (optional)') }}</label>
{{ Form::text('billing_address_2', $shopping_user->billing_address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'billing_address_2', 'tabindex' => 6)) }}
<label class="form-label" for="billing_address_2">{{ __('Flat Building optional') }}</label>
{{ Form::text('billing_address_2', $shopping_user->billing_address_2, array('placeholder'=>__('Flat Building optional'), 'class'=>'form-control', 'id'=>'billing_address_2', 'tabindex' => 6)) }}
</div>
</div>
<div class="form-row">
@ -114,12 +114,12 @@
<div class="col-12 col-lg-6">
<div class="d-md-block d-lg-none">
<hr>
<h5 class="mt-4">Lieferadresse</h5>
<h5 class="mt-4">{{ __('Delivery address') }}</h5>
</div>
<div id="show_shipping_address" style="@if($shopping_user->same_as_billing) display:none @endif">
<div class="form-row">
<div class="form-group col-md-12">
<label for="shipping_company" class="form-label">{{ __('Company name') }} (optional)</label>
<label for="shipping_company" class="form-label">{{ __('Company name') }} ({{__('optional')}})</label>
{{ Form::text('shipping_company', $shopping_user->shipping_company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'shipping_company', 'tabindex' => 16)) }}
</div>
</div>
@ -170,8 +170,8 @@
</div>
<div class="form-row">
<div class="form-group col-md-12 {{ $errors->has('shipping_address_2') ? 'has-error' : '' }}">
<label class="form-label" for="shipping_address_2">{{ __('Wohnung / Gebäude (optional)') }}</label>
{{ Form::text('shipping_address_2', $shopping_user->shipping_address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'shipping_address_2', 'tabindex' => 21)) }}
<label class="form-label" for="shipping_address_2">{{ __('Flat Building optional') }}</label>
{{ Form::text('shipping_address_2', $shopping_user->shipping_address_2, array('placeholder'=>__('Flat Building optional'), 'class'=>'form-control', 'id'=>'shipping_address_2', 'tabindex' => 21)) }}
@if ($errors->has('shipping_address_2'))
<span class="help-block">
<strong>{{ $errors->first('shipping_address_2') }}</strong>
@ -223,7 +223,7 @@
<div class="form-group">
<label class="custom-control custom-checkbox m-0">
<input type="checkbox" class="custom-control-input" name="same_as_billing" id="same_as_billing" @if($shopping_user->same_as_billing) checked="checked" @endif>
<span class="custom-control-label">{{__('Versand an die gleiche Adresse')}}</span>
<span class="custom-control-label">{{__('Shipping to the same address')}}</span>
</label>
</div>
<hr>
@ -241,14 +241,13 @@
<div class="form-group">
<label class="custom-control custom-checkbox m-0">
<input type="checkbox" class="custom-control-input" name="has_buyed" id="has_buyed" @if($shopping_user->has_buyed) checked="checked" @endif>
<span class="custom-control-label">Ich versichere, dass dieser Kunde bereits bei mir gekauft hat</span>
<span class="custom-control-label">{{ __('customer.customer_has_already_buy') }}</span>
</label>
</div>
<div class="alert alert-warning mt-3" id="show_has_buyed" style="display: @if($shopping_user->has_buyed) block @else none @endif;">
<label class="custom-control custom-checkbox m-0">
<input type="checkbox" class="custom-control-input" name="subscribed" id="subscribed" @if($shopping_user->subscribed) checked="checked" @endif >
<span class="custom-control-label">Für Newsletter abonniert. Es ist Dir bzw. MIVITA erlaubt, Kunden einen Newsletter zu senden, sofern der Kunde schon mal aktiv gekauft hat.
Sollte der Kunde explizit mitgeteilt haben, dass er keinen Newsletter möchte, dann bitte unbedingt das Häkchen entfernen.</span>
<span class="custom-control-label">{{ __('customer.newsletter_subscribed_copy1') }}</span>
</label>
</div>
</div>
@ -256,13 +255,14 @@
<hr>
<div class="form-row">
<div class="form-group col-md-12">
<label class="form-label" for="remarks">{{ __('Bemerkungen') }}</label>
{{ Form::textarea('remarks', $shopping_user->remarks, array('placeholder'=>'Bemerkungen', 'class'=>'form-control', 'rows'=>4, 'id'=>'remarks')) }}
<label class="form-label" for="remarks">{{ __('Comments') }}</label>
{{ Form::textarea('remarks', $shopping_user->remarks, array('placeholder'=>__('Comments'), 'class'=>'form-control', 'rows'=>4, 'id'=>'remarks')) }}
</div>
</div>
<hr>
{{ Form::hidden('faker_mail', $shopping_user->faker_mail) }}
{{ Form::hidden('language', $shopping_user->language) }}
@if($isView === 'customer-add')
{{ Form::hidden('billing_email_1', $billing_email) }}
@ -295,21 +295,21 @@
@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
<i class="fa fa-caret-expand"></i> {{ __('E-Mail Address') }} {{ __('add') }}
</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)) }}
{{ Form::text('new_email_address', '', array('placeholder'=>__('E-Mail Address'), '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>
<p class="mt-2">{{ __('customer.customer_sovereignty_info1') }}</p>
<button type="submit" class="btn btn-secondary btn-sm" name="action" value="add-mail-shopping-user-store">{{ __('E-Mail Address') }} {{ __('customer.check_and_save') }}</button>
</div>
</div>
</div>
@ -356,22 +356,23 @@
});
$.extend( $.validator.messages, {
required: "Dieses Feld ist ein Pflichtfeld.",
maxlength: $.validator.format( "Geben Sie bitte maximal {0} Zeichen ein." ),
minlength: $.validator.format( "Geben Sie bitte mindestens {0} Zeichen ein." ),
rangelength: $.validator.format( "Geben Sie bitte mindestens {0} und maximal {1} Zeichen ein." ),
email: "Geben Sie bitte eine gültige E-Mail Adresse ein.",
url: "Geben Sie bitte eine gültige URL ein.",
date: "Bitte geben Sie ein gültiges Datum ein.",
number: "Geben Sie bitte eine Nummer ein.",
digits: "Geben Sie bitte nur Ziffern ein.",
equalTo: "Bitte denselben Wert wiederholen.",
range: $.validator.format( "Geben Sie bitte einen Wert zwischen {0} und {1} ein." ),
max: $.validator.format( "Geben Sie bitte einen Wert kleiner oder gleich {0} ein." ),
min: $.validator.format( "Geben Sie bitte einen Wert größer oder gleich {0} ein." ),
creditcard: "Geben Sie bitte eine gültige Kreditkarten-Nummer ein."
required: "{{__('account.validator_required')}}",
maxlength: $.validator.format( "{{__('account.validator_maxlength')}}" ),
minlength: $.validator.format( "{{__('account.validator_minlength')}}" ),
rangelength: $.validator.format( "{{__('account.validator_rangelength')}}" ),
email: "{{__('account.validator_email')}}",
url: "{{__('account.validator_url')}}",
date: "{{__('account.validator_date')}}",
number: "{{__('account.validator_number')}}",
digits: "{{__('account.validator_digits')}}",
equalTo: "{{__('account.validator_equalTo')}}",
range: $.validator.format( "{{__('account.validator_range')}}" ),
max: $.validator.format( "{{__('account.validator_max')}}" ),
min: $.validator.format( "{{__('account.validator_min')}}" ),
creditcard: "{{__('account.validator_creditcard')}}"
});
// Set up validator
$('#lead-form-validation').validate({
rules: {
@ -401,7 +402,7 @@
required: "{{__('This field is required.')}}",
},
salutation : {
required: "{{__('Bitte angeben.')}}",
required: "{{__('please specify')}}",
},
first_name : {
required: "{{__('This field is required.')}}",

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

@ -3,10 +3,10 @@
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
<a href="{{route('admin_customers')}}" class="btn btn-sm btn-default float-right">zurück</a>
{{ __('Kunden Details') }}
<a href="{{route('admin_customers')}}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
{{ __('customer.customer_details') }}
</h4>
@include('admin.customer._detail')
<a href="{{route('admin_customers')}}" class="btn btn-sm btn-default mt-2 float-right">zurück</a>
<a href="{{route('admin_customers')}}" class="btn btn-sm btn-default mt-2 float-right">{{ __('back') }}</a>
@endsection

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

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

16
resources/views/admin/customer/index.blade.php
View file

@ -38,13 +38,13 @@
<th>{{__('Nummer')}}</th>
<th>{{__('E-Mail')}}</th>
<th>{{__('ist Berater')}}</th>
<th>{{__('Anrede')}}</th>
<th>{{__('Firma')}}</th>
<th>{{__('Vorname')}}</th>
<th>{{__('Nachname')}}</th>
<th>{{__('PLZ')}}</th>
<th>{{__('Stadt')}}</th>
<th>{{__('Land')}}</th>
<th>{{ __('Salutation') }}</th>
<th>{{ __('Company') }}</th>
<th>{{ __('First name') }}</th>
<th>{{__('Last name')}}</th>
<th>{{ __('Postcode') }}</th>
<th>{{ __('City') }}</th>
<th>{{ __('Country') }}</th>
<th>{{__('Käufe')}}</th>
<th>{{__('Newsletter')}}</th>
<th>{{__('zugewiesener Berater')}}</th>
@ -96,7 +96,7 @@
"bLengthChange": false,
"iDisplayLength": 50,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
$('#filter_member_id').on('change', function(){

147
resources/views/admin/downloadcenter/file_edit.blade.php Normal file
View file

@ -0,0 +1,147 @@
@extends('layouts.layout-2')
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
<a href="{{route('admin_downloadcenter_files')}}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
{{ __('navigation.downloadcenter') }} Datei bearbeiten
</h4>
<div class="row">
<div class="col-md-6 col-xl-5">
<div class="card mb-4">
<h5 class="card-header">Datei Vorschaubild</h5>
<div class="card-body">
@if($file->hasThumb())
<img src="{{ route('storage_file', [$file->id, 'dc_thumb', 'image']) }}" class="img-fluid">
<br><br>
<a href="{{ route('admin_downloadcenter_file', ['delete_thumb', $file->id]) }}" class="btn btn-sm btn-danger"> Vorschaubild löschen <i class="ion ion-md-trash"></i></a>
@else
<a href="{{ route('admin_downloadcenter_file', ['make_thumb', $file->id]) }}" class="btn btn-sm btn-warning"> Vorschaubild erstellen <i class="ion ion-md-refresh-circle"></i></a>
@endif
</div>
</div>
<div class="card mb-4">
@if($file->ext == 'jpg' || $file->ext == 'jpeg' || $file->ext == 'png')
<h5 class="card-header">Datei Bild</h5>
<div class="card-body">
<img src="{{ route('storage_file', [$file->id, 'dc_file', 'image']) }}" class="img-fluid">
</div>
@elseif($file->ext == 'pdf')
<h5 class="card-header">Datei PDF</h5>
<div class="card-body">
<object
data="{!! route('storage_file', [$file->id, 'dc_file', 'file']) !!}"
type="application/pdf"
width="100%"
height="600px"
></object>
</div>
@else
<div class="card-body">
<div class="text-center">
<button type="button" class="btn icon-btn btn-xl btn-outline-info">
{{ $file->ext }}
</button>
</div>
</div>
@endif
<hr class="border-light m-0">
<div class="card-body">
<p class="mb-2">
<strong>
<a target="_blank" href="{{ route('storage_file', [$file->id, 'dc_file', 'stream']) }}">{{ $file->original_name }}</a>
</strong>
</p>
<p class="mb-2">
Size: <strong>{{ Util::formatBytes($file->size) }}</strong>
</p>
<p class="mb-2">
Ext: <strong>{{ $file->ext }}</strong>
</p>
<p class="mb-2">
angelegt: <strong>{{ $file->created_at->format('d.m.y H:i') }}</strong>
</p>
</div>
<hr class="border-light m-0">
<div class="card-body">
{!! get_active_badge($file->active) !!}
@if($file->active)
<a href="{{ route('admin_downloadcenter_file', ['deactivate', $file->id]) }}" class="btn btn-sm btn-warning">Deaktivieren <i class="fa fa-eye-slash"></i></a>
@else
<a href="{{ route('admin_downloadcenter_file', ['activate', $file->id]) }}" class="btn btn-sm btn-success">Aktivieren <i class="fa fa-eye"></i></a>
@endif
</div>
<hr class="border-light m-0">
<div class="card-body">
<a onclick="return confirm(\'Diese Datei wirklich löschen?\');" class="btn btn-sm btn-danger" href="{{ route('admin_downloadcenter_file', ['delete', $file->id]) }}">Datei löschen <i class="fa fa-trash"></i></a>
</div>
</div>
</div>
<div class="col">
<div class="card mb-4">
<h5 class="card-header">Tags</h5>
<div class="card-body">
{!! Form::open(['url' => route('admin_downloadcenter_file', ['file_tags_update', $file->id]), 'class' => 'form-horizontal']) !!}
<button type="submit" class="btn btn-submit btn-primary mb-4">{{ __('save') }}</button>&nbsp;
<div class="custom-dd dd" id="nestable_list_check" data-href-save="{{ url('/admin/tags/update')}}">
<ol class="dd-list">
@if(count($categories))
@foreach($categories as $category)
<li class="dd-item" data-id="{{ $category->id }}" data-name="{{ $category->slug }}">
<div class="dd-handle dd-nodrag">
{{ $category->name }}
</div>
<ol class="dd-list">
{!! \App\Services\DcHelper::makeNestableListCheckbox($category->id, $file->id) !!}
</ol>
</li>
@endforeach
@endif
</ol>
</div>
<button type="submit" class="btn btn-submit btn-primary mt-4">{{ __('save') }}</button>&nbsp;
{!! Form::close() !!}
</div>
</div>
</div>
</div>
<script>
$( document ).ready(function() {
});
</script>
@endsection
@section('styles')
<link rel="stylesheet" href="/vendor/libs/nestable/nestable.css">
<style>
.dd-list {
min-width: auto;
}
.dd-nodrag{
pointer-events: none;
}
.custom-checkbox {
pointer-events: all;
}
</style>
@endsection
@section('scripts')
<script src="/vendor/libs/nestable/jquery-nestable-full.js?v=1"></script>
<script src="/js/nestable-init.js?v=1"></script>
@endsection

106
resources/views/admin/downloadcenter/file_upload.blade.php Normal file
View file

@ -0,0 +1,106 @@
@extends('layouts.layout-2')
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
<a href="{{route('admin_downloadcenter_files')}}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
{{ __('navigation.downloadcenter') }} Datei upload
</h4>
<div class="row">
<div class="col">
<div class="card mb-4">
<div class="card-body">
{!! Form::open([ 'url' => route('admin_downloadcenter_upload'), 'method' => 'post', 'files' => true, 'enctype' => 'multipart/form-data', 'class' => 'dropzone', 'id' => 'realDropzone' ]) !!}
<div class="fallback">
<input name="file" type="file" multiple>
</div>
{!! Form::close() !!}
<br>
<div class="alert alert-danger alert-dismissable" style="display:none;"></div>
</div>
</div>
</div>
</div>
<script type="text/javascript">
$( document ).ready(function() {
var real_dropzone = {
uploadMultiple: false,
parallelUploads: 1,
maxFilesize: 32,
addRemoveLinks: true,
dictDefaultMessage: "{{ __('actions.dictDefaultMessage') }}",
dictFallbackMessage: "{{ __('actions.dictFallbackMessage') }}",
dictFallbackText:"{{ __('actions.dictFallbackText') }}",
dictFileTooBig: "{{ __('actions.dictFileTooBig') }}",
dictInvalidFileType: "{{ __('actions.dictInvalidFileType') }}",
dictResponseError: "{{ __('actions.dictResponseError') }}",
dictCancelUpload: "{{ __('actions.dictCancelUpload') }}",
dictCancelUploadConfirmation: null,
dictRemoveFile: "{{ __('actions.dictRemoveFile') }}",
dictMaxFilesExceeded: "{{ __('actions.dictMaxFilesExceeded') }}",
acceptedFiles: "image/jpeg,image/pjpeg,image/png,image/gif,application/pdf,text/plain",
// The setting up of the dropzone
init:function() {
console.log("init");
this.on("removedfile", function(file) {
var _ele = $('.alert-danger');
_ele.fadeOut();
} );
this.on("addedfile", function (file) {
var _ele = $('.alert-danger');
_ele.fadeOut();
});
},
error: function(file, response) {
console.log(file);
console.log(response);
var message
if($.type(response) === "string")
message = response; //dropzone sends it's own error messages in string
else
message = response.message;
var _ele = $('.alert-danger');
_ele.fadeIn();
_ele.text(message);
},
success: function(file,response) {
console.log(file);
console.log(response.filename);
console.log(response.filedata);
console.log(response);
if(response.redirect){
window.location.href = response.redirect;
}else{
if(response.error === false){
//true
window.location.href = window.location.href;
}
}
}
};
Dropzone.options.realDropzone = real_dropzone;
});
</script>
@endsection
@section('styles')
@endsection
@section('scripts')
@endsection

73
resources/views/admin/downloadcenter/files.blade.php Normal file
View file

@ -0,0 +1,73 @@
@extends('layouts.layout-2')
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
{{ __('navigation.downloadcenter') }} {{ __('navigation.files') }}
</h4>
<div class="row">
<div class="col-12">
<div class="card mb-4">
<div class="card-datatable table-responsive">
<div class="ml-4 mb-0">
<a href="{{ route('admin_downloadcenter_upload') }}" class="btn btn-sm btn-primary">Neue Dateien hochladen</a>
</div>
<table class="datatables-dcfiles table table-striped table-bordered" id="datatables-dcfiles">
<thead>
<tr>
<th>ID</th>
<th>Bild</th>
<th>Datei</th>
<th>Größe</th>
<th>ext</th>
<th>aktiv</th>
<th>Tag</th>
<th>angelegt</th>
<th>#</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
<div class="mt-2 ml-4">
<a href="{{ route('admin_downloadcenter_upload') }}" class="btn btn-sm btn-primary">Neue Dateien hochladen</a>
</div>
</div>
</div>
</div>
</div>
<script>
$( document ).ready(function() {
var oTable = $('#datatables-dcfiles').DataTable({
"processing": true,
"serverSide": true,
ajax: {
url: '{!! route( 'admin_downloadcenter_datatable') !!}',
data: function(d) {
}
},
"order": [[0, "desc" ]],
"columns": [
{ data: 'id', searchable: false},
{ data: 'image', name: 'image', searchable: false, orderable: false },
{ data: 'name', name: 'name' },
{ data: 'size', name: 'size' },
{ data: 'ext', name: 'ext' },
{ data: 'active', name: 'active' },
{ data: 'tags', name: 'tags', searchable: false, orderable: false },
{ data: 'created_at', name: 'created_at' },
{ data: 'action', name: 'action', searchable: false, orderable: false },
],
"bLengthChange": false,
"iDisplayLength": 100,
"language": {
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
});
</script>
@endsection

119
resources/views/admin/downloadcenter/tags.blade.php Normal file
View file

@ -0,0 +1,119 @@
@extends('layouts.layout-2')
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
{{ __('navigation.downloadcenter') }} {{ __('navigation.tags') }}
</h4>
<div class="row">
<div class="col-md-8">
<div class="card mb-4">
<h5 class="card-header">Struktur</h5>
<div class="card-body">
<button type="button" id="" data-save="navigation-structure" class="btn btn-primary nestable_list_menu_save">{{ __('save') }}</button>
<hr>
<div class="row">
<div class="col-sm-6">
<div class="white-box">
<div class="custom-dd dd" id="nestable_list_1" data-href-save="{{ route('admin_downloadcenter_item_store', ['structure'])}}">
<ol class="dd-list">
@if(count($category_active))
@foreach($category_active as $category)
<li class="dd-item" data-id="{{ $category->id }}" data-name="{{ $category->slug }}">
<span class="pull-right">
<a href="#" class="btn btn-sm mt-1 nestable_update_btn" data-action="update-category-active" data-target="self" data-id="{{ $category->id }}" data-url="{{ route('admin_downloadcenter_item_store', ['update_ajax']) }}">
@if($category->active) <i class="fa fa-eye text-success"></i> @else <i class="fa fa-eye-slash text-danger"></i> @endif
</a>
<a href="{{ route('admin_downloadcenter_item_delete', ['obj' => 'category', 'id'=> $category->id])}}" class="btn btn-sm mt-1 nestable_list_delete"><i class="fa fa-trash text-danger"></i></a>
</span>
<div class="dd-handle">
<strong> {{ $category->name }} </strong>
</div>
<ol class="dd-list">
{!! \App\Services\DcHelper::makeNestableList($category->id) !!}
<li class="dd-item" data-id="0">
</li>
</ol>
</li>
@endforeach
@endif
</ol>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="white-box">
<h3 class="box-title">Tags</h3>
<div class="custom-dd dd" id="nestable_list_2">
<ol class="dd-list">
<li class="dd-item" data-id="0">
<div class="dd-handle dd-nodrag">
<strong><em> Neue Tags </em></strong>
</div>
<ol class="dd-list">
@if(count($tags_inactive))
@foreach($tags_inactive as $tag)
<li class="dd-item" data-id="{{ $tag->id }}">
<span class="pull-right">
<a href="{{ route('admin_downloadcenter_item_delete', ['obj' => 'tag', 'id'=> $tag->id])}}" class="btn btn-sm nestable_list_delete"><i class="fa fa-trash text-danger"></i></a>
</span>
<div class="dd-handle">
{{ $tag->name }}
</div>
</li>
@endforeach
@endif
<li class="dd-item " data-id="0">
</li>
</ol>
</li>
</ol>
</div>
</div>
</div>
</div>
<hr>
<button type="button" id="" data-save="navigation-structure" class="btn btn-primary nestable_list_menu_save">{{ __('save') }}</button>
</div>
</div>
</div>
<div class="col-md-4">
<div class="card mb-4">
<div class="card-body">
{!! Form::open(['url' => route('admin_downloadcenter_item_store', ['category']), 'class' => 'form-horizontal']) !!}
<label class="form-label" for="dc_category_name">Neue Katagorie anlegen</label>
{{ Form::text('dc_category_name', '', array('placeholder'=>'Bezeichung Katagorie', 'class'=>'form-control', 'id'=>'dc_category_name')) }}
<button type="submit" class="btn btn-submit mt-4">{{ __('save') }}</button>&nbsp;
{!! Form::close() !!}
<br>
<hr>
<br>
{!! Form::open(['url' => route('admin_downloadcenter_item_store', ['tag']), 'class' => 'form-horizontal']) !!}
<label class="form-label" for="dc_tag_name">Neuen Tag anlegen</label>
{{ Form::text('dc_tag_name', '', array('placeholder'=>'Bezeichung Tag', 'class'=>'form-control', 'id'=>'dc_tag_name')) }}
<button type="submit" class="btn btn-submit mt-4">{{ __('save') }}</button>&nbsp;
{!! Form::close() !!}
<br>
</div>
</div>
</div>
</div>
@endsection
@section('styles')
<link rel="stylesheet" href="/vendor/libs/nestable/nestable.css">
<style>
.dd-list {
min-width: auto;
}
.dd-nodrag{
pointer-events: none;
}
</style>
@endsection
@section('scripts')
<script src="/vendor/libs/nestable/jquery-nestable-full.js?v=1"></script>
<script src="/js/nestable-init.js?v=1"></script>
@endsection

2
resources/views/admin/ingredient/form.blade.php
View file

@ -12,7 +12,7 @@
<div class="form-group col">
<label class="custom-control custom-checkbox float-right">
{!! Form::checkbox('active', 1, $model->active, ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">{{__('aktiv')}}</span>
<span class="custom-control-label">{{__('activ')}}</span>
</label>
<label class="form-label" for="name">{{ __('Name') }}*</label>
{{ Form::text('name', $model->name, array('placeholder'=>__('Name'), 'class'=>'form-control', 'id'=>'name', 'required')) }}

8
resources/views/admin/ingredient/index.blade.php
View file

@ -14,7 +14,7 @@
<th>{{__('Name')}}</th>
<th>{{__('INCI')}}</th>
<th>{{__('Wirkung') }}</th>
<th>{{__('Status')}}</th>
<th>{{__('tables.status')}}</th>
<th></th>
</tr>
</thead>
@ -23,7 +23,7 @@
<tr>
<td>
<a href="{{route('admin_product_ingredient_edit', [$value->id])}}" class="btn icon-btn btn-sm btn-primary">
<span class="far fa-edit"></span>
<span class="fa fa-edit"></span>
</a>
</td>
<td>{{ $value->pos }}</td>
@ -31,7 +31,7 @@
<td>{{ $value->inci }}</td>
<td>{{ $value->effect }}</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><a class="text-danger" href="{{ route('admin_product_ingredient_delete', [$value->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a></td>
<td><a class="text-danger" href="{{ route('admin_product_ingredient_delete', [$value->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="fa fa-trash-alt"></i></a></td>
</tr>
@endforeach
@ -64,7 +64,7 @@
{ "sWidth": "8%" },
],
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
});

45
resources/views/admin/lead/edit.blade.php
View file

@ -48,6 +48,45 @@
{!! Form::close() !!}
<!-- Modal template -->
<div class="modal fade" id="modal-user-vat-validation">
<div class="modal-dialog">
{!! Form::open(['url' => route('admin_lead_store'), 'class' => 'modal-content']) !!}
<input type="hidden" name="user_id" id="user_id" value="@if($user->id>0){{$user->id}}@else new @endif">
<div class="modal-header">
<h5 class="modal-title">{{ __('account.new_vat_validate') }}</span></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<div class="modal-body">
<div class="form-row">
<div class="form-group col-12">
<p>{{ __('account.reverse_charge_copy_1') }}</p>
<p>{{ __('account.reverse_charge_note_1') }}</p>
</div>
<div class="form-group col-sm-12 {{ $errors->has('reverse_charge') ? 'has-error' : '' }}">
<label class="form-label" for="tax_identification_number">{{ __('account.VAT_ID_number') }} *</label>
{{ Form::text('tax_identification_number', $user->account-> tax_identification_number, array('placeholder'=>__('account.VAT_ID_number'), 'class'=>'form-control', 'id'=>'tax_identification_number', 'required'=>true)) }}
@if ($errors->has('reverse_charge'))
<span class="help-block">
<strong>{{ $errors->first('reverse_charge') }}</strong>
</span>
@endif
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{__('close')}}</button>
<button type="submit" class="btn btn-primary" name="action" value="reverse_charge_validate">{{ __('account.btn_vat_validate') }}n</button>
</div>
{!! Form::close() !!}
</div>
</div>
<!-- Modal template -->
<div class="modal fade" id="modals-edit-m-data">
<div class="modal-dialog">
@ -60,7 +99,7 @@
<div class="modal-body">
<div class="form-row">
<div class="form-group col">
<label for="name" class="form-label">{{__('Passwort eingeben')}}</label>
<label class="form-label">{{__('Passwort eingeben')}}</label>
<input type="text" class="form-control" name="edit_m_data_key" placeholder="mivita">
</div>
</div>
@ -88,14 +127,14 @@
<div class="form-row">
<div class="form-group col">
<label for="name" class="form-label">{{__('Betreff')}}</label>
<label class="form-label">{{__('Betreff')}}</label>
<input type="text" class="form-control" name="account_incomplete_subject" value="{{__('email.email_incomplete')}}">
</div>
</div>
<div class="form-row">
<div class="form-group col">
<label for="name" class="form-label">{{__('Nachricht')}}</label>
<label class="form-label">{{__('Nachricht')}}</label>
<textarea name="account_incomplete_message" class="form-control" rows="6">{{__('email.account_incomplete_copy1line')}}</textarea>
</div>
</div>

91
resources/views/admin/lead/index.blade.php
View file

@ -8,28 +8,61 @@
</h4>
<div class="card">
<div class="card-datatable table-responsive">
<div class="ml-4">
<div class="card-body p-0">
{!! Form::open(['url' => route('admin_leads'), 'class' => 'form-horizontal', 'id'=>'form_admin_leads']) !!}
<div class="form-row align-items-center px-4 pb-2 pt-3">
<div class="col-12 col-sm-4 col-md-4 col-lg-4 mb-1">
<select class="selectpicker on_change_select" data-style="btn-default" name="leads_filter_sponsor_id" id="leads_filter_sponsor_id" data-live-search="true">
<option value="">Filter Sponsor aus</option>
@foreach($filter_sponsor as $member)
<option value="{{$member->id}}" @if(session('leads_filter_sponsor_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-4 mb-1">
<select class="custom-select on_change_select" name="leads_filter_month">
@foreach($filter_months as $key=>$value)
<option value="{{$key}}" @if(session('leads_filter_month') == $key) selected @endif>{{$value}}</option>
@endforeach
</select>
</div>
<div class="col-6 col-sm-4 col-md-4 col-lg-4 mb-1">
<select class="custom-select on_change_select" name="leads_filter_year">
@foreach($filter_years as $key=>$value)
<option value="{{$value}}" @if(session('leads_filter_year') == $value) selected @endif>{{$value}}</option>
@endforeach
</select>
</div> --}}
</div>
{!! Form::close() !!}
<div class="card-datatable table-responsive pt-0">
{{-- <div class="ml-4">
<a href="{{ route('admin_lead_edit', ['new']) }}" class="btn btn-sm btn-primary">{{__('Neuen Berater erstellen')}}</a>
</div>
--}}
<table class="datatables-leads table table-striped table-bordered">
<thead>
<tr>
<th>#</th>
<th>{{__('E-Mail')}}</th>
<th>{{__('Vorname')}}</th>
<th>{{__('Nachname')}}</th>
<th>{{__('First name')}}</th>
<th>{{__('Last name')}}</th>
<th>{{__('Level')}}</th>
<th>{{__('Mitglied')}}</th>
<th>{{__('bis')}}</th>
<th>{{__('Shop')}}</th>
<th>{{__('bis')}}</th>
<th>{{__('Sponsor')}}</th>
<th>{{__('active')}} (seit)</th>
<th>{{__('tables.account')}} (bis)</th>
<th>{{__('tables.shop')}} (bis)</th>
<th>{{__('Domain')}}</th>
{{-- <th>{{__('Umsatz')}}</th>
<th>{{__('Sales')}}</th> --}}
<th>{{__('verifiziert')}}</th>
<th>{{__('freigegeben')}}</th>
<th>{{__('Einv.')}}</th>
</tr>
</thead>
@ -38,19 +71,29 @@
</tbody>
</table>
<div class="mt-4 ml-4">
{{--<div class="mt-4 ml-4">
<a href="{{ route('admin_lead_edit', ['new']) }}" class="btn btn-sm btn-primary">{{__('Neuen Berater erstellen')}}</a>
</div>
</div>--}}
</div>
</div>
</div>
<script>
$( document ).ready(function() {
$('.datatables-leads').dataTable({
var oTable = $('.datatables-leads').DataTable({
"processing": true,
"serverSide": true,
"ajax": '{!! route('admin_leads_datatable') !!}',
"stateSave": true,
"searching": true,
ajax: {
url: '{!! route('admin_leads_datatable') !!}',
data: function(d) {
d.leads_filter_sponsor_id = $('select[name=leads_filter_sponsor_id]').val();
// d.points_filter_month = $('select[name=points_filter_month]').val();
// d.points_filter_year = $('select[name=points_filter_year]').val();
}
},
"order": [[0, "desc" ]],
"columns": [
{data: 'id', searchable: false},
@ -58,21 +101,33 @@
{ data: 'first_name', name: 'account.first_name' },
{ data: 'last_name', name: 'account.last_name' },
{ data: 'user_level', name: 'user_level' },
{ data: 'payment_account', name: 'payment_account' },
{ data: 'user_sponsor', name: 'user_sponsor', orderable: false },
{ data: 'useractive', name: 'useractive' },
{ data: 'payaccount', name: 'payaccount' },
{ data: 'payshop', name: 'payshop' },
/*{ data: 'payment_account', name: 'payment_account' },
{ data: 'payment_account_date', name: 'payment_account_date' },
{ data: 'payment_shop', name: 'payment_shop' },
{ data: 'payment_shop_date', name: 'payment_shop_date' },
{ data: 'payment_shop_date', name: 'payment_shop_date' },*/
{ data: 'shop_domain', name: 'shop_domain', orderable: false },
{ data: 'confirmed', name: 'confirmed' },
{ data: 'active', name: 'active' },
{ data: 'agreement', name: 'agreement' },
],
"bLengthChange": false,
"iDisplayLength": 50,
"iDisplayLength": 100,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
$('select.on_change_select').on('change', function(){
oTable.draw();
});
$('input.on_keyup_input').on('keyup', function(){
oTable.draw();
});
});
</script>
@endsection

2
resources/views/admin/lead/m_data_form.blade.php
View file

@ -12,7 +12,7 @@
<div class="card-body">
<div class="float-right">
<button type="button" class="btn btn-sm btn-secondary" data-toggle="modal" data-target="#modals-edit-m-data">
<span class="far fa-edit"></span> Berater Daten bearbeiten
<span class="fa fa-edit"></span> Berater Daten bearbeiten
</button>
</div>
<div class="table-responsive">

17
resources/views/admin/level/index.blade.php
View file

@ -15,7 +15,7 @@
<th>{{__('Nächste Ebene')}}</th>
<th>{{__('Pr.') }}</th>
<th>{{__('Pr.Shop') }}</th>
<th>{{__('Qual.KP') }}</th>
<th>{{__('Qual.KU') }}</th>
<th>{{__('Qual.TP') }}</th>
<th>{{__('Pr. L.1') }}</th>
<th>{{__('Pr. L.2') }}</th>
@ -27,7 +27,7 @@
<th>{{__('Pr. L.8') }}</th>
<th>{{__('Paylines') }}</th>
<th>{{__('W.Bonus') }}</th>
<th>{{__('Status')}}</th>
<th>{{__('')}}</th>
<th>{{__('Standard')}}</th>
<th>{{__('ID')}}</th>
</tr>
@ -68,12 +68,11 @@
</tbody>
</table>
<div class="mt-4 ml-4">
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-default"
data-id="new"
data-pos=""
data-name=""
data-margin="0"
data-active="1"
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-load-content"
data-id="new"
data-action="user-level-add"
data-view="view"
data-route="{{ route('modal_load') }}"
>{{__('Neuen Karriere-Level erstellen')}}</button>
</div>
</div>
@ -88,7 +87,7 @@
"iDisplayLength": 50,
"order": [[ 1, "asc" ]],
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
});

2
resources/views/admin/modal/business_user_detail.blade.php
View file

@ -14,7 +14,7 @@
@endif
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
<button type="button" class="btn btn-default" data-dismiss="modal">{{ __('close') }}</button>
</div>
<script>
$( document ).ready(function() {

21
resources/views/admin/modal/business_user_notfound.blade.php Normal file
View file

@ -0,0 +1,21 @@
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">
{{__('Business')}} {{__('Berater')}}<br>
</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<div class="modal-body modal-body-overflow">
<p>{!! __('msg.user_not_found') !!}</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ __('close') }}</button>
</div>
<script>
$( document ).ready(function() {
});
</script>
</div>

133
resources/views/admin/modal/business_user_show.blade.php Normal file
View file

@ -0,0 +1,133 @@
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">
{{__('Business')}} {{__('Berater')}}<br>
@if(isset($user))
<span class="font-weight-light">{{ $user->account->first_name }} {{ $user->account->last_name }} <a class="font-weight-normal" href="mailto:{{ $user->email }}">{{ $user->email }}</a></span>
@endif
</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<div class="modal-body modal-body-overflow">
<table class="table user-view-table m-0">
<tbody>
<tr>
<td>{{ __('Company name') }}:</td>
<td> {{ $user->account->company }} </td>
</tr>
<tr>
<td>{{ __('Salutation') }}:</td>
<td>{{ \App\Services\HTMLHelper::getSalutationLang($user->account->salutation) }}</td>
</tr>
<tr>
<td>{{ __('First name') }}:</td>
<td>{{ $user->account->first_name }}</td>
</tr>
<tr>
<td>{{ __('Last name') }}:</td>
<td>{{ $user->account->last_name }}</td>
</tr>
<tr>
<td>{{ __('Street') }} / {{ __('House number') }}:</td>
<td>{{ $user->account->address }}</td>
</tr>
<tr>
<td>{{ __('Flat Building optional') }}:</td>
<td>{{ $user->account->address_2 }}</td>
</tr>
<tr>
<td>{{ __('Postcode') }}:</td>
<td>{{ $user->account->zipcode }}</td>
</tr>
<tr>
<td>{{ __('City') }}:</td>
<td>{{ $user->account->city }}</td>
</tr>
<tr>
<td>{{ __('Country') }}:</td>
<td>{{ $user->account->country->getLocated() }}</td>
</tr>
<tr>
<td>{{ __('Date of birth') }}:</td>
<td>{{ $user->account->birthday }}</td>
</tr>
<tr>
<td>{{ __('Phone') }}:</td>
<td>{{ $user->account->getPhoneFull() }}</td>
</tr>
<tr>
<td>{{ __('Mobile Phone') }}:</td>
<td>{{ $user->account->getMobilFull() }}</td>
</tr>
<tr>
<td>{{ __('E-Mail') }}:</td>
<td>{{ $user->email }}</td>
</tr>
<tr>
</tr>
@if($user->account->same_as_billing)
<tr>
<td colspan="2">{{__('email.checkout_mail_same_address')}}</td>
</tr>
@else
<tr>
<td colspan="2">{{ __('account.delivery_address') }}</td>
</tr>
<tr>
<td>{{ __('Company name') }}:</td>
<td> {{ $user->account->shipping_company }} </td>
</tr>
<tr>
<td>{{ __('Salutation') }}:</td>
<td>{{ \App\Services\HTMLHelper::getSalutationLang($user->account->shipping_salutation) }}</td>
</tr>
<tr>
<td>{{ __('First name') }}:</td>
<td>{{ $user->account->shipping_firstname }}</td>
</tr>
<tr>
<td>{{ __('Last name') }}:</td>
<td>{{ $user->account->shipping_lastname }}</td>
</tr>
<tr>
<td>{{ __('Street') }} / {{ __('House number') }}:</td>
<td>{{ $user->account->shipping_address }}</td>
</tr>
<tr>
<td>{{ __('Flat Building optional') }}:</td>
<td>{{ $user->account->shipping_address_2 }}</td>
</tr>
<tr>
<td>{{ __('Postcode') }}:</td>
<td>{{ $user->account->shipping_zipcode }}</td>
</tr>
<tr>
<td>{{ __('City') }}:</td>
<td>{{ $user->account->shipping_city }}</td>
</tr>
<tr>
<td>{{ __('Country') }}:</td>
<td>{{ $user->account->shipping_country->getLocated() }}</td>
</tr>
<tr>
<td>{{ __('Phone') }}:</td>
<td>{{ $user->account->getShippingPhoneFull() }}</td>
</tr>
<tr>
@endif
</tbody>
</table>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ __('close') }}</button>
</div>
<script>
$( document ).ready(function() {
});
</script>
</div>

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

@ -32,10 +32,10 @@
<table class="table table-bordered table-striped">
<thead>
<tr>
<th>Datum</th>
<th>Points</th>
<th>{{__('tables.date')}}</th>
<th>{{__('tables.points')}}</th>
<th>Umsatz netto</th>
<th>Status</th>
<th>{{__('tables.status')}}</th>
<th>Berater</th>
</tr>
@ -82,8 +82,8 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
<button type="submit" class="btn btn-primary">{{ __('übernehmen') }}</button>
<button type="button" class="btn btn-default" data-dismiss="modal">{{ __('close') }}</button>
<button type="submit" class="btn btn-primary">{{ __('take over') }}</button>
</div>
{!! Form::close() !!}

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

@ -31,7 +31,7 @@
<p class="font-weight-bold">Rechnungsadresse:</p>
<p>
@if($current->billing_company)
Firma: {{ $current->billing_company }}<br>
{{ __('Company') }}: {{ $current->billing_company }}<br>
@endif
{{ \App\Services\HTMLHelper::getSalutationLang($current->billing_salutation) }}
{{ $current->billing_firstname }}
@ -50,13 +50,13 @@
</p>
</div>
<div class="col-sm-6">
<p class="font-weight-bold">Lieferadresse:</p>
<p class="font-weight-bold">{{ __('Delivery address') }}:</p>
<p>
@if($current->same_as_billing)
{{__('email.checkout_mail_same_address')}}
@else
@if($current->shipping_company)
Firma: {{ $current->shipping_company }}<br>
{{ __('Company') }}: {{ $current->shipping_company }}<br>
@endif
{{ \App\Services\HTMLHelper::getSalutationLang($current->shipping_salutation) }}
{{ $current->shipping_firstname }}
@ -147,7 +147,7 @@
<p class="font-weight-bold">Rechnungsadresse:</p>
<p>
@if($possible->billing_company)
Firma: {{ $possible->billing_company }}<br>
{{ __('Company') }}: {{ $possible->billing_company }}<br>
@endif
{{ \App\Services\HTMLHelper::getSalutationLang($possible->billing_salutation) }}
{{ $possible->billing_firstname }}
@ -166,13 +166,13 @@
</p>
</div>
<div class="col-sm-6">
<p class="font-weight-bold">Lieferadresse:</p>
<p class="font-weight-bold">{{ __('Delivery address') }}:</p>
<p>
@if($possible->same_as_billing)
{{__('email.checkout_mail_same_address')}}
@else
@if($possible->shipping_company)
Firma: {{ $possible->shipping_company }}<br>
{{ __('Company') }}: {{ $possible->shipping_company }}<br>
@endif
{{ \App\Services\HTMLHelper::getSalutationLang($possible->shipping_salutation) }}
{{ $possible->shipping_firstname }}
@ -244,8 +244,8 @@
@endif
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
<button type="submit" class="btn btn-primary">{{__('übernehmen')}}</button>
<button type="button" class="btn btn-default" data-dismiss="modal">{{ __('close') }}</button>
<button type="submit" class="btn btn-primary">{{__('take over')}}</button>
</div>
{!! Form::close() !!}

4
resources/views/admin/modal/member.blade.php
View file

@ -57,8 +57,8 @@
@endif
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
<button type="submit" class="btn btn-primary">{{__('übernehmen')}}</button>
<button type="button" class="btn btn-default" data-dismiss="modal">{{ __('close') }}</button>
<button type="submit" class="btn btn-primary">{{__('take over')}}</button>
</div>
{!! Form::close() !!}

30
resources/views/admin/modal/show_product.blade.php
View file

@ -3,7 +3,7 @@
<div class="modal-header">
<h5 class="modal-title">
Produktdetails
{{ __('weborder.product_details') }}
</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
@ -19,30 +19,30 @@
<div class="media-body p-4 p-md-5 ">
<h4 class="mb-2">
<a href="#" class="text-body">{{ $product->name }}</a>
<a href="#" class="text-body">{{ $product->getLang('name') }}</a>
</h4>
{!! $product->copy !!}
{!! $product->getLang('copy') !!}
<table class="table my-4">
<tbody>
<tr>
<td class="border-0 text-muted align-middle" style="width: 110px">Points:</td>
<td class="border-0 text-muted align-middle" style="width: 110px">{{ __('order.points') }}:</td>
<td class="border-0">{{ $product->points }}</td>
</tr>
<tr>
<td class="border-0 text-muted align-middle" style="width: 110px">Inhalt:</td>
<td class="border-0 text-muted align-middle" style="width: 110px">{{ __('order.content') }}:</td>
<td class="border-0">{{ $product->contents }}</td>
</tr>
<tr>
<td class="border-0 text-muted align-middle" style="width: 110px">Gewicht:</td>
<td class="border-0 text-muted align-middle" style="width: 110px">{{ __('order.weight') }}:</td>
<td class="border-0">{{ $product->weight }} g</td>
</tr>
<tr>
<td class="border-0 text-muted align-middle" style="width: 110px">Art.-Nr.:</td>
<td class="border-0 text-muted align-middle" style="width: 110px">{{ __('order.art_no') }}:</td>
<td class="border-0">{{ $product->number }}</td>
</tr>
<tr>
<td class="border-0 text-muted align-middle" style="width: 110px">Netto-Preis:</td>
<td class="border-0 text-muted align-middle" style="width: 110px">{{ __('order.net_price') }}:</td>
<td class="border-0">{{ $product->getFormattedPriceWith() }} &euro;</td>
</tr>
@ -73,13 +73,13 @@
<ul class="nav nav-tabs tabs-alt justify-content-center border-0 px-4 px-lg-5">
<li class="nav-item">
<a class="nav-link small font-weight-normal text-expanded py-4 active" data-toggle="tab" href="#shop-product-description">Bechreibung</a>
<a class="nav-link small font-weight-normal text-expanded py-4 active" data-toggle="tab" href="#shop-product-description">{{ __('weborder.description') }}</a>
</li>
<li class="nav-item">
<a class="nav-link small font-weight-normal text-expanded py-4" data-toggle="tab" href="#shop-product-usage">Anwendung</a>
<a class="nav-link small font-weight-normal text-expanded py-4" data-toggle="tab" href="#shop-product-usage">{{ __('weborder.application') }}</a>
</li>
<li class="nav-item">
<a class="nav-link small font-weight-normal text-expanded py-4" data-toggle="tab" href="#shop-product-ingredients">Inhaltsstoffe</a>
<a class="nav-link small font-weight-normal text-expanded py-4" data-toggle="tab" href="#shop-product-ingredients">{{ __('weborder.ingredients') }}</a>
</li>
</ul>
<hr class="m-0">
@ -88,7 +88,7 @@
<div class="tab-pane fade show active" id="shop-product-description">
<div class="card borderless">
<div class="card-body">
{!! $product->description !!}
{!! $product->getLang('description') !!}
</div>
</div>
@ -96,14 +96,14 @@
<div class="tab-pane fade" id="shop-product-usage">
<div class="card borderless">
<div class="card-body">
{!! $product->usage !!}
{!! $product->getLang('usage') !!}
</div>
</div>
</div>
<div class="tab-pane fade" id="shop-product-ingredients">
<div class="card borderless">
<div class="card-body">
{!! $product->ingredients !!}
{!! $product->getLang('ingredients') !!}
</div>
</div>
</div>
@ -112,7 +112,7 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
<button type="button" class="btn btn-default" data-dismiss="modal">{{ __('close') }}</button>
</div>
</div>
<script type="text/javascript">

23
resources/views/admin/modal/show_user_customers.blade.php
View file

@ -1,7 +1,7 @@
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">
Meine Kunden / Lieferadressen
{{__('navigation.my_clients')}}/ {{__('Delivery addresses')}}
</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
@ -13,17 +13,17 @@
<tr>
<th>#</th>
<th>{{__('E-Mail')}}</th>
<th>{{__('Anrede')}}</th>
<th>{{__('Firma')}}</th>
<th>{{__('Vorname')}}</th>
<th>{{__('Nachname')}}</th>
<th>{{__('PLZ')}}</th>
<th>{{__('Stadt')}}</th>
<th>{{__('Land')}}</th>
<th>{{ __('Salutation') }}</th>
<th>{{ __('Company') }}</th>
<th>{{__('First name')}}</th>
<th>{{__('Last name')}}</th>
<th>{{ __('Postcode') }}</th>
<th>{{ __('City') }}</th>
<th>{{ __('Country') }}</th>
<th>{{__('Käufe')}}</th>
<th>{{__('Newsletter')}}</th>
<th>{{__('erstellt')}}</th>
<th>{{__('Status')}}</th>
<th>{{__('tables.status')}}</th>
<th>{{__('ID Kunden')}}</th>
<th>WP</th>
@ -33,7 +33,6 @@
</tbody>
</table>
</div>
<script>
$( document ).ready(function() {
@ -44,7 +43,7 @@
url: '{!! route( 'user_customer_datatable') !!}',
data: function(d) {
// d.filter_member_id = $('select[name=filter_member_id]').val();
// d.filter_customer_member = $('select[name=filter_customer_member]').val();
d.isfor = "{{ $data['isfor'] }}";
}
},
"order": [[0, "desc" ]],
@ -68,7 +67,7 @@
"bLengthChange": false,
"iDisplayLength": 50,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});

10
resources/views/admin/modal/user_level_edit.blade.php
View file

@ -16,10 +16,10 @@
<div class="form-group col-12">
<label class="custom-control custom-checkbox float-right">
{!! Form::checkbox('active', 1, $value->active, ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">{{__('aktiv')}}</span>
<span class="custom-control-label">{{__('activ')}}</span>
</label>
<label for="name" class="form-label">{{__('Bezeichnung')}} </label>
{{ Form::text('name', $value->name, array('placeholder'=>__('Bezeichnung'), 'class'=>'form-control', 'id'=>'name')) }}
<label class="form-label">{{__('Bezeichnung')}}*</label>
{{ Form::text('name', $value->name, array('placeholder'=>__('Bezeichnung'), 'class'=>'form-control', 'id'=>'name', 'required')) }}
</div>
<div class="form-group col-12">
<label for="next_id" class="form-label">{{ __('Nächster Karriere-Level') }}*</label>
@ -110,8 +110,8 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
<button type="submit" class="btn btn-primary">{{__('übernehmen')}}</button>
<button type="button" class="btn btn-default" data-dismiss="modal">{{ __('close') }}</button>
<button type="submit" class="btn btn-primary">{{__('take over')}}</button>
</div>
{!! Form::close() !!}

12
resources/views/admin/payment/credit.blade.php
View file

@ -18,7 +18,7 @@
data-id="new"
data-action="add-user-credit"
data-back="{{url()->current()}}"
data-route="{{ route('modal_load') }}"><span class="far fa-plus-circle"></span> Guthaben hinzufügen
data-route="{{ route('modal_load') }}"><span class="fa fa-plus-circle"></span> Guthaben hinzufügen
</button>
</div>
</h5>
@ -38,8 +38,8 @@
<thead>
<tr>
<th>{{__('Account ID')}}</th>
<th>{{__('Vorname')}}</th>
<th>{{__('Nachname') }}</th>
<th>{{__('First name')}}</th>
<th>{{__('Last name') }}</th>
<th>{{__('E-Mail') }}</th>
<th>{{__('Betrag') }}</th>
<th>{{__('Guthaben')}}</th>
@ -125,8 +125,8 @@
<th>ID</th>
<th>{{__('G.Nr.')}}</th>
<th>{{__('Gutschrift')}}</th>
<th>{{__('Vorname')}}</th>
<th>{{__('Nachname') }}</th>
<th>{{__('First name')}}</th>
<th>{{__('Last name') }}</th>
<th>{{__('E-Mail') }}</th>
<th>{{__('Betrag') }}</th>
<th>{{__('Datum') }}</th>
@ -208,7 +208,7 @@
"bLengthChange": false,
"iDisplayLength": 100,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
$('select.on_change_credits').on('change', function(){

430
resources/views/admin/payment/credit_detail.blade.php Normal file
View file

@ -0,0 +1,430 @@
@extends('layouts.layout-2')
@section('content')
<style>
.td-entry-table-margin {
padding-bottom: 6px;
border-bottom: 1px solid rgb(221, 221, 221);
margin-bottom: 6px;
}
div.card-header {
border-bottom: none;
}
.user-view-table tr:first-child td {
border-top: none;
}
.user-view-table tr:first-child td {
border-top: none;
}
.table th, .table td {
border-top: none;
}
.table tbody th, .table tbody td {
border-bottom: 1px solid #d6d6de;
}
.card hr {
border-color: #d7d700
}
</style>
<div class="card">
<h5 class="card-header">
{{ __('team.payout_details') }}
<br>
{{ __('pdf.credit_note') }} | {{ $user_credit->date }} | {{ $user_credit->full_number }} |
{{ $user_credit->user->account->first_name }} {{ $user_credit->user->account->last_name }}
({{ $user_credit->user->email }})
</h5>
@foreach ($dates as $date => $dateObj)
@if (isset($collection->calc_bot[$date]))
@php($cbot = $collection->calc_bot[$date])
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
<tr>
<td>{{ __('team.date') }}:</td>
<td>
<strong> {{ HTMLHelper::getMonth($cbot->date->month) }}
{{ $cbot->date->year }}</strong> | {{ __('team.completed') }}
@if ($cbot->business_user->isSave())
<span class="badge badge-outline-success"><i class="fa fa-check-circle"></i></span>
@else
<span class="badge badge-outline-warning-dark"><i class="fa fa-times"></i></span>
@endif
</td>
</tr>
<tr>
<td>{{ __('team.career_level') }}:</td>
<td>
{{ \App\Services\TranslationHelper::transUserLevelName($cbot->business_user->user_level_name) }}
&nbsp;
<span class="badge badge-outline-success"> {{ __('team.KU') }}
{{ $cbot->business_user->qual_kp }} / {{ __('team.PP') }}
{{ formatNumber($cbot->business_user->qual_pp, 0) }}</span>
</td>
</tr>
<tr>
<td>{{ __('team.shop_commission') }}:</td>
<td>
{{ $cbot->business_user->margin_shop }} %
</td>
</tr>
<tr>
<td>{{ __('team.consultant_margin') }}:</td>
<td>
{{ $cbot->business_user->margin }} %
</td>
</tr>
<tr>
<td><strong>{{ __('team.commission_total') }}:</strong></td>
<td>
<span class="badge badge-secondary" style="font-size: 1em;"><strong>{{ formatNumber($cbot->business_user->getCommissionTotal()) }} &euro;</strong></span>
</td>
</tr>
</tbody>
</table>
</div>
<hr>
@endif
@if (isset($collection->commission_shop[$date]))
@php($cs = $collection->commission_shop[$date])
@if (isset($cbot))
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
<tr>
<td>
<strong>{{ __('team.commission_shop') }}</strong>
</td>
<td>
<span class="badge badge-primary"
style="font-size: 1em;"><strong>{{ formatNumber($cbot->business_user->commission_shop_sales) }}
&euro;</strong></span>
&nbsp;
({{ __('team.sales_store_net') }}:
{{ formatNumber($cbot->business_user->sales_volume_total_shop) }} &euro; /
{{ $cbot->business_user->margin_shop }} %)
</td>
</tr>
</tbody>
</table>
</div>
@endif
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>
<tr>
<th>{{ __('tables.date') }}</th>
<th>{{ __('tables.net_sales') }}</th>
<th>{{__('tables.commission')}} %</th>
<th>{{__('tables.commission')}} &euro;</th>
<th>{{ __('tables.order') }}</th>
</tr>
</thead>
<tbody>
@foreach ($cs->user_sales_volumes as $user_sales_volume)
<tr>
<td>{{ $user_sales_volume->date }}</td>
<td>{{ formatNumber($user_sales_volume->total_net) }} &euro;</td>
<td>{{ $cbot->business_user->margin_shop }} %</td>
<td>{{ formatNumber($user_sales_volume->caluCommissonTotalNet($cbot->business_user->margin_shop)) }} &euro;</td>
<td>
{{ $user_sales_volume->shopping_order_id }}
@if ($user_sales_volume->shopping_order)
<br><span class="small">{{ $user_sales_volume->shopping_order->getShoppingUserFullName() }}</span>
@endif
</td>
</tr>
@endforeach
@if (isset($collection->commission_credit[$date]))
@php($ccredits = $collection->commission_credit[$date])
@foreach ($ccredits as $credit)
<tr>
<td>{{ $credit->date }}</td>
<td>{{ formatNumber($credit->total_net) }} &euro;</td>
<td>{{ $cbot->business_user->margin_shop }} %</td>
<td>{{ formatNumber($credit->caluCommissonTotalNet($cbot->business_user->margin_shop)) }} &euro;</td>
<td>{{ __('pdf.credit_note') }}<br><span class="small">{{ $credit->info }}</span></td>
</tr>
@endforeach
@endif
</tbody>
<tfoot>
<tr>
<td class="text-right"> {{ __('tables.total') }} </td>
<td>{{ formatNumber($cs->user_sales_volumes_total->month_shop_total_net) }} &euro;</td>
<td>&nbsp;</td>
<td><strong>{{ formatNumber($cbot->business_user->commission_shop_sales) }} &euro;</strong></td>
<td>&nbsp;</td>
</tr>
</tfoot>
</table>
</div>
<hr>
@endif
@if (isset($collection->own_order[$date]))
@php($order = $collection->own_order[$date])
@if (isset($cbot))
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
<tr>
<td>
<strong>{{ __('team.own') }} {{ __('tables.margin') }} </strong>
</td>
<td>
<span class="badge badge-primary"
style="font-size: 1em;"><strong>
{{ formatNumber($cbot->business_user->getSalesVolumeTotalMargin()) }}
&euro;</strong></span>
&nbsp;
({{ __('team.net_turnover') }}:
{{ formatNumber($cbot->business_user->sales_volume_total) }} &euro; /
{{ $cbot->business_user->margin }} %)
<br>
<em>{{ __('team.consultant_margin_info') }}</em>
</td>
</tr>
</tbody>
</table>
</div>
@endif
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>
<tr>
<th>{{ __('tables.date') }}</th>
<th>{{ __('tables.net_sales') }}</th>
<th>{{ __('tables.margin') }} %</th>
<th>{{ __('tables.margin') }} &euro;</th>
<th>{{ __('tables.order') }}</th>
</tr>
</thead>
<tbody>
@foreach ($order->user_sales_volumes as $user_sales_volume)
<tr>
<td>{{ $user_sales_volume->date }}</td>
<td>{{ formatNumber($user_sales_volume->total_net) }} &euro;</td>
<td>{{ $cbot->business_user->margin }} %</td>
<td>{{ formatNumber($user_sales_volume->caluCommissonTotalNet($cbot->business_user->margin)) }} &euro;</td>
<td>
{{ $user_sales_volume->shopping_order_id }}
@if ($user_sales_volume->shopping_order)
<br><span
class="small">{{ $user_sales_volume->shopping_order->getShoppingUserFullName() }}</span>
@endif
</td>
</tr>
@endforeach
</tbody>
<tfoot>
<tr>
<td class="text-right"> {{ __('tables.total') }} </td>
<td>{{ formatNumber($order->credit_total_net) }} &euro;</td>
<td>&nbsp;</td>
<td><strong>{{ formatNumber($cbot->business_user->getSalesVolumeTotalMargin()) }} &euro;</strong></td>
<td>&nbsp;</td>
</tr>
</tfoot>
</table>
</div>
<hr>
@endif
@if (isset($collection->commission_registration[$date]))
@php($cr = $collection->commission_registration[$date])
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
<tr>
<td colspan="2">
<strong>{{ __('tables.points') }} {{ __('payment.registration') }}</strong>
</td>
</tr>
</tbody>
</table>
</div>
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>
<tr>
<th>{{ __('tables.date') }}</th>
<th>{{ __('tables.points') }}</th>
<th>{{ __('tables.info') }}</th>
</tr>
</thead>
<tbody>
@foreach ($cr->user_sales_volumes as $user_sales_volume)
<tr>
<td>{{ $user_sales_volume->date }}</td>
<td>{{ $user_sales_volume->points }}</td>
<td>{{ $user_sales_volume->info }}</td>
</tr>
@endforeach
</tbody>
<tfoot>
<tr>
<td class="text-right"> {{ __('tables.total') }} </td>
<td><strong>{{ $cr->credit_total_points }}</strong></td>
<td>&nbsp;</td>
</tr>
</tfoot>
</table>
</div>
<hr>
@endif
@if (isset($cbot))
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
<tr>
<td colspan="2">
<strong>{{ __('tables.total') }} </strong>
</td>
</tr>
<tr>
<td>{{ __('team.net_turnover') }}:</td>
<td>
<strong>{{ formatNumber($cbot->business_user->sales_volume_total_sum) }} &euro;</strong>
({{ __('team.own') }}: {{ formatNumber($cbot->business_user->sales_volume_total) }} &euro; | {{ __('team.shop') }}: {{ formatNumber($cbot->business_user->sales_volume_total_shop) }} &euro;)
</td>
</tr>
<tr>
<td>{{ __('team.customer_points') }}:</td>
<td>
<strong>{{ formatNumber($cbot->business_user->sales_volume_points_KP_sum, 0) }} {{ __('team.KU') }}</strong>
({{ __('team.own') }}: {{ formatNumber($cbot->business_user->sales_volume_KP_points, 0) }} | {{ __('team.shop') }}: {{ formatNumber($cbot->business_user->sales_volume_points_shop, 0) }})
&nbsp; <span class="badge {{ $cbot->business_user->isQualKP() ? 'badge-outline-success' : 'badge-outline-warning-dark' }}"> {{ __('team.KU') }} {{ $cbot->business_user->qual_kp }}</span>
</td>
</tr>
</tbody>
</table>
</div>
<hr>
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
@if($cbot->business_user->version == 2)
<tr>
<td>{{ __('team.payline_points') }}:</td>
<td>
<strong>{{ formatNumber($cbot->business_user->payline_points, 0) }} {{ __('team.PP') }}</strong>
</td>
</tr>
<tr>
<td>{{ __('team.qualification_points') }} :</td>
<td>
<strong>{{ formatNumber($cbot->business_user->payline_points_qual_kp, 0) }} {{ __('team.PP') }}</strong> (+ {{ __('team.volume_KU') }})
</td>
</tr>
<tr>
<td>{{ __('team.current_commission_level') }}:</td>
<td>
@if($cbot->business_user->isQualLevel())
<span class="badge {{ $cbot->business_user->isQualEqualLevel() ? 'badge-outline-success' : 'badge-outline-info' }}">
{{ __('team.KU') }} {{ formatNumber($cbot->business_user->sales_volume_points_KP_sum, 0) }} /
<strong>{{ formatNumber($cbot->business_user->qual_user_level['qual_kp'], 0) }}</strong> |
{{ __('team.PP') }} {{ formatNumber($cbot->business_user->payline_points_qual_kp, 0) }} /
<strong>{{ formatNumber($cbot->business_user->qual_user_level['qual_pp'], 0) }}</strong>
| {{ \App\Services\TranslationHelper::transUserLevelName($cbot->business_user->qual_user_level['name']) }}</span>
@endif
</td>
</tr>
<tr>
<td><strong>{{ __('team.commission_payline') }}:</strong></td>
<td>
<span class="badge badge-primary" style="font-size: 1em;"><strong>{{ formatNumber($cbot->business_user->commission_pp_total) }} &euro;</strong></span>
</td>
</tr>
<tr>
<td><strong>{{ __('team.commission_WB') }}:</strong></td>
<td>
<span class="badge badge-primary" style="font-size: 1em;"><strong>{{ formatNumber($cbot->business_user->commission_growth_total) }} &euro;</strong></span>
</td>
</tr>
@endif
</tbody>
</table>
</div>
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>
<tr>
<th>{{__('tables.line')}}</th>
<th>{{__('tables.points')}}</th>
<th>{{__('tables.commission')}} %</th>
<th>{{__('tables.commission')}} &euro;</th>
</tr>
</thead>
<tbody>
@foreach ($cbot->business_user->business_lines as $line => $object)
<tr>
<td>
@if($line <= $cbot->business_user->getQualLevelPaylines())
<div class="font-weight-bolder line-height-1 my-2 text-dark badge badge-outline-success">{{ $line }}. {{ __('team.PP') }}</div>
@elseif($line <= $cbot->business_user->isQualLevelGrowth($line))
<div class="font-weight-bolder line-height-1 my-2 text-dark badge badge-outline-warning-dark">{{ $line }}. {{ __('team.WB') }}</div>
@else
<div class="font-weight-bolder line-height-1 my-2 text-dark badge badge-outline-dark">{{ $line }}.</div>
@endif
</td>
<td>{{ formatNumber($cbot->getKeybyLine($line, 'points'), 0) }}</td>
<td>{{ formatNumber($cbot->getKeybyLine($line, 'margin'), 1) }} %</td>
<td>{{ formatNumber($cbot->getKeybyLine($line, 'commission'), 2) }} &euro;</td>
</tr>
@endforeach
</tbody>
<tfoot>
<tr>
<td>{{__('tables.total')}}</td>
<td>{{ formatNumber($cbot->business_user->total_pp, 0) }}</td>
<td>&nbsp;</td>
<td><strong>{{ formatNumber($cbot->business_user->commission_pp_total, 2) }} &euro;</strong></td>
</tr>
</tfoot>
</table>
</div>
<hr>
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>
<tr>
<th>{{__('tables.line')}}</th>
<th>{{ __('shop.name') }}</th>
<th>{{__('tables.points')}}</th>
<th>{{__('tables.commission')}} %</th>
<th>{{__('tables.commission')}} &euro;</th>
<th>{{ __('tables.level') }}</th>
</tr>
</thead>
<tbody>
{!! \App\Services\BusinessPlan\SalesPointsVolumeHelper::getBusinessUsersTable($cbot, 'line') !!}
</tbody>
</table>
</div>
@endif
@endforeach
</div>
@endsection

454
resources/views/admin/payment/credit_detail_long.blade.php Normal file
View file

@ -0,0 +1,454 @@
@extends('layouts.layout-2')
@section('content')
<style>
.td-entry-table-margin {
padding-bottom: 6px;
border-bottom: 1px solid rgb(221, 221, 221);
margin-bottom: 6px;
}
div.card-header {
border-bottom: none;
}
.user-view-table tr:first-child td {
border-top: none;
}
.user-view-table tr:first-child td {
border-top: none;
}
.table th, .table td {
border-top: none;
}
.table tbody th, .table tbody td {
border-bottom: 1px solid #d6d6de;
}
.card hr {
border-color: #d7d700
}
</style>
<div class="card">
<h5 class="card-header">
Auszahlungen Details
<br>
{{ __('pdf.credit_note') }} | {{ $user_credit->date }} | {{ $user_credit->full_number }} |
{{ $user_credit->user->account->first_name }} {{ $user_credit->user->account->last_name }}
({{ $user_credit->user->email }})
</h5>
@foreach ($dates as $date => $dateObj)
@if (isset($collection->calc_bot[$date]))
@php($cbot = $collection->calc_bot[$date])
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
<tr>
<td>{{ __('team.date') }}:</td>
<td>
<strong> {{ HTMLHelper::getMonth($cbot->date->month) }}
{{ $cbot->date->year }}</strong> | {{ __('team.completed') }}
@if ($cbot->business_user->isSave())
<span class="badge badge-outline-success"><i class="fa fa-check-circle"></i></span>
@else
<span class="badge badge-outline-warning-dark"><i class="fa fa-times"></i></span>
@endif
</td>
</tr>
<tr>
<td>{{ __('team.career_level') }}:</td>
<td>
{{ \App\Services\TranslationHelper::transUserLevelName($cbot->business_user->user_level_name) }}
&nbsp;
<span class="badge badge-outline-success"> {{ __('team.KU') }}
{{ $cbot->business_user->qual_kp }} / {{ __('team.PP') }}
{{ formatNumber($cbot->business_user->qual_pp, 0) }}</span>
</td>
</tr>
<tr>
<td>{{ __('team.shop_commission') }}:</td>
<td>
{{ $cbot->business_user->margin_shop }} %
</td>
</tr>
<tr>
<td>{{ __('team.consultant_margin') }}:</td>
<td>
{{ $cbot->business_user->margin }} %
</td>
</tr>
<tr>
<td><strong>{{ __('team.commission_total') }}:</strong></td>
<td>
<span class="badge badge-secondary" style="font-size: 1em;"><strong>{{ formatNumber($cbot->business_user->getCommissionTotal()) }} &euro;</strong></span>
</td>
</tr>
</tbody>
</table>
</div>
<hr>
@endif
@if (isset($collection->commission_shop[$date]))
@php($cs = $collection->commission_shop[$date])
@if (isset($cbot))
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
<tr>
<td>
<strong>{{ __('team.commission_shop') }}</strong>
</td>
<td>
<span class="badge badge-primary"
style="font-size: 1em;"><strong>{{ formatNumber($cbot->business_user->commission_shop_sales) }}
&euro;</strong></span>
&nbsp;
({{ __('team.sales_store_net') }}:
{{ formatNumber($cbot->business_user->sales_volume_total_shop) }} &euro; /
{{ $cbot->business_user->margin_shop }} %)
</td>
</tr>
</tbody>
</table>
</div>
@endif
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>
<tr>
<th>#</th>
<th>{{ __('Datum') }}</th>
<th>{{ __('Typ') }}</th>
<th>{{ __('Umsatz netto') }}</th>
<th>{{ __('tables.points') }}</th>
<th>{{ __('für') }}</th>
<th>{{ __('VE') }}</th>
<th>{{ __('Bestellung') }}</th>
</tr>
</thead>
<tbody>
@foreach ($cs->user_sales_volumes as $user_sales_volume)
<tr>
<td>{{ $user_sales_volume->id }}</td>
<td>{{ $user_sales_volume->date }}</td>
<td>{{ $user_sales_volume->getStatusType() }}</td>
<td>{{ formatNumber($user_sales_volume->total_net) }} &euro;</td>
<td>{{ $user_sales_volume->points }}</td>
<td>{{ $user_sales_volume->getStatusPointsType() }}</td>
<td>{{ $user_sales_volume->getStatusTurnoverType() }}</td>
<td>
{{ $user_sales_volume->shopping_order_id }}
@if ($user_sales_volume->shopping_order)
<br><span
class="small">{{ $user_sales_volume->shopping_order->getShoppingUserFullName() }}</span>
@endif
</td>
</tr>
@endforeach
@if (isset($collection->commission_credit[$date]))
@php($ccredits = $collection->commission_credit[$date])
@foreach ($ccredits as $credit)
<tr>
<td>{{ $credit->id }}</td>
<td>{{ $credit->date }}</td>
<td>{{ $credit->getStatusType() }}</td>
<td>{{ formatNumber($credit->total_net) }} &euro;</td>
<td>({{ $credit->points }}) -</td>
<td>{{ $credit->getStatusPointsType() }}</td>
<td>{{ $credit->getStatusTurnoverType() }}</td>
<td>{{ $credit->info }}</td>
</tr>
@endforeach
@endif
</tbody>
<tfoot>
<tr>
<td colspan="3" class="text-right"> {{ __('tables.total') }} </td>
<td><strong>{{ formatNumber($cs->user_sales_volumes_total->month_shop_total_net) }}
&euro;</strong></td>
<td><strong>{{ $cs->user_sales_volumes_total->month_shop_points }}</strong></td>
<td colspan="3"></td>
</tr>
</tfoot>
</table>
</div>
<hr>
@endif
@if (isset($collection->own_order[$date]))
@php($order = $collection->own_order[$date])
@if (isset($cbot))
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
<tr>
<td>
<strong>{{ __('team.own') }} {{ __('tables.margin') }} </strong>
</td>
<td>
<span class="badge badge-primary"
style="font-size: 1em;"><strong>
{{ formatNumber($cbot->business_user->getSalesVolumeTotalMargin()) }}
&euro;</strong></span>
&nbsp;
({{ __('team.net_turnover') }}:
{{ formatNumber($cbot->business_user->sales_volume_total) }} &euro; /
{{ $cbot->business_user->margin }} %)
<br>
<em>{{ __('team.consultant_margin_info') }}</em>
</td>
</tr>
</tbody>
</table>
</div>
@endif
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>
<tr>
<th>#</th>
<th>{{ __('Datum') }}</th>
<th>{{ __('Typ') }}</th>
<th>{{ __('Umsatz netto') }}</th>
<th>{{ __('tables.points') }}</th>
<th>{{ __('für') }}</th>
<th>{{ __('VE') }}</th>
<th>{{ __('Bestellung') }}</th>
</tr>
</thead>
<tbody>
@foreach ($order->user_sales_volumes as $user_sales_volume)
<tr>
<td>{{ $user_sales_volume->id }}</td>
<td>{{ $user_sales_volume->date }}</td>
<td>{{ $user_sales_volume->getStatusType() }}</td>
<td>{{ formatNumber($user_sales_volume->total_net) }} &euro;</td>
<td>{{ $user_sales_volume->points }}</td>
<td>{{ $user_sales_volume->getStatusPointsType() }}</td>
<td>{{ $user_sales_volume->getStatusTurnoverType() }}</td>
<td>
{{ $user_sales_volume->shopping_order_id }}
@if ($user_sales_volume->shopping_order)
<br><span
class="small">{{ $user_sales_volume->shopping_order->getShoppingUserFullName() }}</span>
@endif
</td>
</tr>
@endforeach
</tbody>
<tfoot>
<tr>
<td colspan="3" class="text-right"> {{ __('tables.total') }} </td>
<td><strong>{{ formatNumber($order->credit_total_net) }} &euro;</strong></td>
<td><strong>{{ $order->credit_total_points }}</strong></td>
<td colspan="3"></td>
</tr>
</tfoot>
</table>
</div>
<hr>
@endif
@if (isset($collection->commission_registration[$date]))
@php($cr = $collection->commission_registration[$date])
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
<tr>
<td colspan="2">
<strong>{{ __('tables.points') }} {{ __('payment.registration') }}</strong>
</td>
</tr>
</tbody>
</table>
</div>
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>
<tr>
<th>#</th>
<th>{{ __('Datum') }}</th>
<th>{{ __('Typ') }}</th>
<th>{{ __('tables.points') }}</th>
<th>{{ __('für') }}</th>
<th>{{ __('VE') }}</th>
<th>{{ __('Info') }}</th>
</tr>
</thead>
<tbody>
@foreach ($cr->user_sales_volumes as $user_sales_volume)
<tr>
<td>{{ $user_sales_volume->id }}</td>
<td>{{ $user_sales_volume->date }}</td>
<td>{{ $user_sales_volume->getStatusType() }}</td>
<td>{{ $user_sales_volume->points }}</td>
<td>{{ $user_sales_volume->getStatusPointsType() }}</td>
<td>{{ $user_sales_volume->getStatusTurnoverType() }}</td>
<td>{{ $user_sales_volume->info }}</td>
</tr>
@endforeach
</tbody>
<tfoot>
<tr>
<td colspan="3" class="text-right"> {{ __('tables.total') }} </td>
<td><strong>{{ $cr->credit_total_points }}</strong></td>
<td colspan="4"></td>
</tr>
</tfoot>
</table>
</div>
<hr>
@endif
@if (isset($cbot))
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
<tr>
<td colspan="2">
<strong>{{ __('tables.total') }} </strong>
</td>
</tr>
<tr>
<td>{{ __('team.net_turnover') }}:</td>
<td>
<strong>{{ formatNumber($cbot->business_user->sales_volume_total_sum) }} &euro;</strong>
({{ __('team.own') }}: {{ formatNumber($cbot->business_user->sales_volume_total) }} &euro; | {{ __('team.shop') }}: {{ formatNumber($cbot->business_user->sales_volume_total_shop) }} &euro;)
</td>
</tr>
<tr>
<td>{{ __('team.customer_points') }}:</td>
<td>
<strong>{{ formatNumber($cbot->business_user->sales_volume_points_KP_sum, 0) }} {{ __('team.KU') }}</strong>
({{ __('team.own') }}: {{ formatNumber($cbot->business_user->sales_volume_KP_points, 0) }} | {{ __('team.shop') }}: {{ formatNumber($cbot->business_user->sales_volume_points_shop, 0) }})
&nbsp; <span class="badge {{ $cbot->business_user->isQualKP() ? 'badge-outline-success' : 'badge-outline-warning-dark' }}"> {{ __('team.KU') }} {{ $cbot->business_user->qual_kp }}</span>
</td>
</tr>
</tbody>
</table>
</div>
<hr>
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
@if($cbot->business_user->version == 2)
<tr>
<td>{{ __('team.payline_points') }}:</td>
<td>
<strong>{{ formatNumber($cbot->business_user->payline_points, 0) }} {{ __('team.PP') }}</strong>
</td>
</tr>
<tr>
<td>{{ __('team.qualification_points') }} :</td>
<td>
<strong>{{ formatNumber($cbot->business_user->payline_points_qual_kp, 0) }} {{ __('team.PP') }}</strong> (+ {{ __('team.volume_KU') }})
</td>
</tr>
<tr>
<td>{{ __('team.current_commission_level') }}:</td>
<td>
@if($cbot->business_user->isQualLevel())
<span class="badge {{ $cbot->business_user->isQualEqualLevel() ? 'badge-outline-success' : 'badge-outline-info' }}">
{{ __('team.KU') }} {{ formatNumber($cbot->business_user->sales_volume_points_KP_sum, 0) }} /
<strong>{{ formatNumber($cbot->business_user->qual_user_level['qual_kp'], 0) }}</strong> |
{{ __('team.PP') }} {{ formatNumber($cbot->business_user->payline_points_qual_kp, 0) }} /
<strong>{{ formatNumber($cbot->business_user->qual_user_level['qual_pp'], 0) }}</strong>
| {{ \App\Services\TranslationHelper::transUserLevelName($cbot->business_user->qual_user_level['name']) }}</span>
@endif
</td>
</tr>
<tr>
<td><strong>{{ __('team.commission_payline') }}:</strong></td>
<td>
<span class="badge badge-primary" style="font-size: 1em;"><strong>{{ formatNumber($cbot->business_user->commission_pp_total) }} &euro;</strong></span>
</td>
</tr>
<tr>
<td><strong>{{ __('team.commission_WB') }}:</strong></td>
<td>
<span class="badge badge-primary" style="font-size: 1em;"><strong>{{ formatNumber($cbot->business_user->commission_growth_total) }} &euro;</strong></span>
</td>
</tr>
@endif
</tbody>
</table>
</div>
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>
<tr>
<th>{{__('tables.line')}}</th>
<th>{{__('tables.points')}}</th>
<th>{{__('tables.commission')}} %</th>
<th>{{__('tables.commission')}} &euro;</th>
</tr>
</thead>
<tbody>
@foreach ($cbot->business_user->business_lines as $line => $object)
<tr>
<td>
@if($line <= $cbot->business_user->getQualLevelPaylines())
<div class="font-weight-bolder line-height-1 my-2 text-dark badge badge-outline-success">{{ $line }}. {{ __('team.PP') }}</div>
@elseif($line <= $cbot->business_user->isQualLevelGrowth($line))
<div class="font-weight-bolder line-height-1 my-2 text-dark badge badge-outline-warning-dark">{{ $line }}. {{ __('team.WB') }}</div>
@else
<div class="font-weight-bolder line-height-1 my-2 text-dark badge badge-outline-dark">{{ $line }}.</div>
@endif
</td>
<td>{{ formatNumber($cbot->getKeybyLine($line, 'points'), 0) }}</td>
<td>{{ formatNumber($cbot->getKeybyLine($line, 'margin'), 1) }} %</td>
<td>{{ formatNumber($cbot->getKeybyLine($line, 'commission'), 2) }} &euro;</td>
</tr>
@endforeach
</tbody>
<tfoot>
<tr>
<td>{{__('tables.total')}}</td>
<td>{{ formatNumber($cbot->business_user->total_pp, 0) }}</td>
<td></td>
<td><strong>{{ formatNumber($cbot->business_user->commission_pp_total, 2) }} &euro;</strong></td>
</tr>
</tfoot>
</table>
</div>
<hr>
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>
<tr>
<th>{{__('tables.line')}}</th>
<th>{{ __('shop.name') }}</th>
<th>{{ __('tables.email') }}</th>
<th>{{ __('tables.level') }}</th>
<th>{{__('tables.points')}}</th>
<th>{{__('tables.net_sales')}}</th>
</tr>
</thead>
<tbody>
{!! \App\Services\BusinessPlan\SalesPointsVolumeHelper::getBusinessUsersTable($cbot->business_users, 'line') !!}
</tbody>
</table>
</div>
@endif
@endforeach
</div>
@endsection

22
resources/views/admin/payment/invoice.blade.php
View file

@ -35,15 +35,15 @@
<thead>
<tr>
<th>#</th>
<th>{{__('Re.Nr.')}}</th>
<th>{{__('Rechnung')}}</th>
<th>{{__('Betrag') }}</th>
<th>{{__('Status')}}</th>
<th>{{__('Vorname')}}</th>
<th>{{__('Nachname') }}</th>
<th>{{__('tables.in_no')}}</th>
<th>{{__('tables.invoice')}}</th>
<th>{{__('tables.amount') }}</th>
<th>{{__('tables.status')}}</th>
<th>{{__('First name')}}</th>
<th>{{__('Last name') }}</th>
<th>{{__('E-Mail') }}</th>
<th>{{__('Datum') }}</th>
<th>{{__('Art')}}</th>
<th>{{__('tables.date') }}</th>
<th>{{__('tables.art')}}</th>
</tr>
</thead>
<tbody>
@ -73,8 +73,8 @@
{ data: 'id', searchable: false },
{ data: 'full_number', name: 'full_number' },
{ data: 'invoice', name: 'invoice', orderable: false, searchable: false },
{ data: 'total_shipping', name: 'total_shipping' },
{ data: 'txaction', name: 'txaction', searchable: false },
{ data: 'total_shipping', name: 'total_shipping', orderable: false, searchable: false },
{ data: 'txaction', name: 'txaction', orderable: false, searchable: false },
{ data: 'shopping_order.shopping_user.billing_firstname', name: 'shopping_order.shopping_user.billing_firstname', orderable: false },
{ data: 'shopping_order.shopping_user.billing_lastname', name: 'shopping_order.shopping_user.billing_lastname', orderable: false },
{ data: 'shopping_order.shopping_user.billing_email', name: 'shopping_order.shopping_user.billing_email', orderable: false },
@ -84,7 +84,7 @@
"bLengthChange": false,
"iDisplayLength": 100,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
$('select.on_change_invoice').on('change', function(){

2
resources/views/admin/payment/modal_add_credit.blade.php
View file

@ -32,7 +32,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
<button type="button" class="btn btn-default" data-dismiss="modal">{{ __('close') }}</button>
<button type="submit" class="btn btn-primary button-prevent-multiple-submits"><i class="spinner fa fa-spinner fa-spin"></i> {{__('Gutschrift hinzufügen')}}</button>
</div>

6
resources/views/admin/payment/modal_credit_status.blade.php
View file

@ -25,7 +25,7 @@
<div class="form-row">
<div class="form-group col-12">
<label for="status" class="form-label">{{ __('Status') }}*</label>
{{ Form::select('status', $UserCredit::$statusTypes, $UserCredit->status, array('data-live-search'=>'false', 'class'=>'selectpicker') ) }}
{{ Form::select('status', $UserCredit::getTransStatusType(), $UserCredit->status, array('data-live-search'=>'false', 'class'=>'selectpicker') ) }}
</div>
</div>
<table class="table user-view-table m-0">
@ -66,8 +66,8 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
<button type="submit" class="btn btn-primary">{{__('speichern')}}</button>
<button type="button" class="btn btn-default" data-dismiss="modal">{{ __('close') }}</button>
<button type="submit" class="btn btn-primary">{{__('save')}}</button>
</div>
{!! Form::close() !!}

32
resources/views/admin/product/salesvolume.blade.php → resources/views/admin/payment/salesvolume.blade.php
View file

@ -18,25 +18,29 @@
<div class="card">
<h5 class="card-header">
{{ __('navigation.products') }} {{ __('navigation.sales_volumes') }}
{{ __('navigation.sales_volumes') }} {{ __('navigation.products') }} (nach Rechnungen)
</h5>
<div class="card-body">
{!! Form::open(['url' => route('admin_product_sales_volumes_download'), 'class' => '']) !!}
{!! Form::open(['url' => route('admin_payments_sales_volumes_download'), 'class' => '']) !!}
{!! Form::hidden('key', 'value') !!}
<button type="submit" name="action" value="export" class="btn btn-md btn-primary mb-2"><i class="ion ion-md-download"></i> &nbsp;Export als xls</button>
<button type="submit" name="action" value="export" class="btn btn-sm btn-primary mb-2"><i class="ion ion-md-download"></i> &nbsp;Export kompakte Liste als xls</button>
&nbsp; &nbsp;
<button type="submit" name="action" value="exportfull_paid_invoice" class="btn btn-sm btn-primary mb-2"><i class="ion ion-md-download"></i> &nbsp;Export vollständige Liste als xls</button>
<hr>
<div class="form-row align-items-center px-0 pb-2 pt-0">
<div class="col-6 col-sm-4 col-md-4 col-lg-4 mb-1">
<select class="custom-select on_change_select_filter" name="product_sales_vol_filter_month">
<select class="custom-select on_change_select_filter" name="payment_sales_vol_filter_month">
@foreach($filter_months as $key=>$value)
<option value="{{$key}}" @if(session('product_sales_vol_filter_month') == $key) selected @endif>{{$value}}</option>
<option value="{{$key}}" @if(session('payment_sales_vol_filter_month') == $key) selected @endif>{{$value}}</option>
@endforeach
</select>
</div>
<div class="col-6 col-sm-4 col-md-4 col-lg-4 mb-1">
<select class="custom-select on_change_select_filter" name="product_sales_vol_filter_year">
<select class="custom-select on_change_select_filter" name="payment_sales_vol_filter_year">
@foreach($filter_years as $key=>$value)
<option value="{{$value}}" @if(session('product_sales_vol_filter_year') == $value) selected @endif>{{$value}}</option>
<option value="{{$value}}" @if(session('payment_sales_vol_filter_year') == $value) selected @endif>{{$value}}</option>
@endforeach
</select>
</div>
@ -50,9 +54,9 @@
<thead>
<tr>
<th>{{__('#') }}</th>
<th>{{__('Produkt')}}</th>
<th>{{__('Artikelnummer')}}</th>
<th>{{__('Menge')}}</th>
<th>{{__('tables.product')}}</th>
<th>{{__('tables.article_no')}}</th>
<th>{{__('tables.quantity')}}</th>
</tr>
</thead>
<tbody>
@ -76,10 +80,10 @@
"stateSave": true,
"searching": false,
ajax: {
url: '{!! route('admin_product_sales_volumes_datatable') !!}',
url: '{!! route('admin_payments_sales_volumes_datatable') !!}',
data: function(d) {
d.product_sales_vol_filter_month = $('select[name=product_sales_vol_filter_month]').val();
d.product_sales_vol_filter_year = $('select[name=product_sales_vol_filter_year]').val();
d.payment_sales_vol_filter_month = $('select[name=payment_sales_vol_filter_month]').val();
d.payment_sales_vol_filter_year = $('select[name=payment_sales_vol_filter_year]').val();
}
},
"order": [[0, "asc" ]],
@ -93,7 +97,7 @@
"bLengthChange": false,
"iDisplayLength": 100,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});

129
resources/views/admin/payment/taxadvisor.blade.php Normal file
View file

@ -0,0 +1,129 @@
@extends('layouts.layout-2')
@section('content')
@if ($errors->any())
<div class="row">
<div class="col-sm-12">
<div class="alert alert-danger">
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
</div>
</div>
@endif
<div class="card">
<h5 class="card-header">
{{ __('navigation.payments') }} {{ __('navigation.tax_advisor') }}
</h5>
<div class="alert alert-danger">
<ul>
Modul ist in Arbeit! Noch nicht verwenden.
</ul>
</div>
<div class="card-body">
{!! Form::open(['url' => route('admin_payments_taxadvisor_download'), 'class' => '']) !!}
{!! Form::hidden('key', 'value') !!}
<button type="submit" name="action" value="export" class="btn btn-md btn-primary mb-2"><i class="ion ion-md-download"></i> &nbsp;Export als xls</button>
<hr>
<div class="form-row align-items-center px-0 pb-2 pt-0">
<div class="col-6 col-sm-4 col-md-4 col-lg-4 mb-1">
<select class="custom-select on_change_select_filter" name="payment_taxadvisor_filter_month">
@foreach($filter_months as $key=>$value)
<option value="{{$key}}" @if(session('payment_taxadvisor_filter_month') == $key) selected @endif>{{$value}}</option>
@endforeach
</select>
</div>
<div class="col-6 col-sm-4 col-md-4 col-lg-4 mb-1">
<select class="custom-select on_change_select_filter" name="payment_taxadvisor_filter_year">
@foreach($filter_years as $key=>$value)
<option value="{{$value}}" @if(session('payment_taxadvisor_filter_year') == $value) selected @endif>{{$value}}</option>
@endforeach
</select>
</div>
</div>
{!! Form::close() !!}
<div class="card">
<div class="card-datatable table-responsive">
<table class="table table-striped table-bordered" id="datatable-payment-taxadvisor">
<thead>
<tr>
<th>{{__('#') }}</th>
<th>{{__('Umsatz (ohne Soll/Haben-Kz)')}}</th>
<th>{{__('Soll/Haben-Kennzeichen')}}</th>
<th>{{__('Konto')}}</th>
<th>{{__('Gegenkonto (ohne BU-Schlüssel)')}}</th>
<th>{{__('BU-Schlüssel')}}</th>
<th>{{__('Belegdatum')}}</th>
<th>{{__('Belegfeld 1')}}</th>
<th>{{__('Buchungstext')}}</th>
<th>{{__('Datum')}}</th>
<th>{{__('Rechnung')}}</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
</div>
</div>
</div>
<script>
$( document ).ready(function() {
var oTable = $('#datatable-payment-taxadvisor').DataTable({
"processing": true,
"serverSide": true,
"stateSave": true,
"searching": false,
ajax: {
url: '{!! route('admin_payments_taxadvisor_datatable') !!}',
data: function(d) {
d.payment_taxadvisor_filter_month = $('select[name=payment_taxadvisor_filter_month]').val();
d.payment_taxadvisor_filter_year = $('select[name=payment_taxadvisor_filter_year]').val();
}
},
"order": [[0, "asc" ]],
"columns": [
{ data: 'id', orderable: true, searchable: false },
{ data: 'turnover', name: 'turnover', orderable: false, searchable: false },
{ data: 'debit_credit_indicator', name: 'debit_credit_indicator', orderable: false, searchable: false },
{ data: 'account', name: 'account', orderable: false, searchable: false },
{ data: 'contra_account', name: 'contra_account', orderable: false, searchable: false },
{ data: 'bu_key', name: 'bu_key', orderable: false, searchable: false },
{ data: 'voucher_date', name: 'voucher_date', orderable: true, searchable: false },
{ data: 'document_field_1', name: 'document_field_1', orderable: false, searchable: false },
{ data: 'posting_text', name: 'posting_text', orderable: false, searchable: false },
{ data: 'date', name: 'date', orderable: true, searchable: false },
{ data: 'invoice', name: 'invoice', searchable: false },
],
"bLengthChange": false,
"iDisplayLength": 100,
"language": {
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
$('select.on_change_select_filter').on('change', function(){
oTable.draw();
});
$('input.on_keyup_input_filter').on('keyup', function(){
oTable.draw();
});
});
</script>
@endsection

23
resources/views/admin/payment_method/index.blade.php
View file

@ -14,7 +14,8 @@
<th>{{__('Name')}}</th>
<th>{{__('sichtbar') }}</th>
<th>{{__('Standard')}}</th>
<th>{{__('Status')}}</th>
<th>{{__('Abo')}}</th>
<th>{{__('tables.status')}}</th>
</tr>
</thead>
<tbody>
@ -28,14 +29,16 @@
data-short="{{ $value->short }}"
data-show_on="{{ json_encode($value->show_on) }}"
data-default="{{ $value->default }}"
data-is_abo="{{ $value->is_abo }}"
data-active="{{ $value->active }}">
<span class="far fa-edit"></span>
<span class="fa fa-edit"></span>
</button>
</td>
<td>{{ $value->pos }}</td>
<td>{{ $value->name }} ({{ $value->short }})</td>
<td>{!! implode($value->getShowOnTypes(), '<br>') !!}</td>
<td data-sort="{{ $value->default }}">{!! get_active_badge($value->default) !!}</td>
<td data-sort="{{ $value->is_abo }}">{!! get_active_badge($value->is_abo) !!}</td>
<td data-sort="{{ $value->active }}">{!! get_active_badge($value->active) !!}</td>
</tr>
@endforeach
@ -48,7 +51,8 @@
data-name=""
data-short=""
data-show_on="[]"
data-default="1"
data-default="0"
data-is_abo="0"
data-active="1"
>{{__('Neue Zahlungsart hinzufügen')}}</button>
</div>
@ -109,8 +113,14 @@
<span class="custom-control-label">{{__('Standard')}}</span>
</label>
</div>
</div>
<div class="form-row">
<div class="form-group col-6">
<label class="custom-control custom-checkbox m-2">
<input type="checkbox" class="custom-control-input" name="is_abo" checked>
<span class="custom-control-label">{{__('Zahlung für ABO')}} (muss einprogrammiert werden)</span>
</label>
</div>
</div>
</div>
<div class="modal-footer">
@ -132,6 +142,7 @@
$(this).find(".modal-body select[name='show_on[]']").val(button.data('show_on'));
$(this).find(".modal-body input[name='active']").prop( "checked", button.data('active'));
$(this).find(".modal-body input[name='default']").prop( "checked", button.data('default'));
$(this).find(".modal-body input[name='is_abo']").prop( "checked", button.data('is_abo'));
$('.selectpicker').selectpicker('refresh');
});
@ -140,7 +151,7 @@
"iDisplayLength": 50,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
});

4
resources/views/admin/product/edit.blade.php
View file

@ -24,14 +24,14 @@
<input type="hidden" name="id" id="id" value="@if($product->id>0){{$product->id}}@else new @endif">
<div class="text-left mt-0 mb-2">
<button type="submit" class="btn btn-submit">{{ __('save') }}</button>&nbsp;
<button type="submit" class="btn btn-submit btn-secondary">{{ __('save') }}</button>&nbsp;
<a href="{{ route('admin_product_show') }}" class="btn btn-default">{{ __('back') }}</a>
</div>
@include('admin.product.form')
<div class="text-left mt-0 mb-2">
<button type="submit" class="btn btn-submit">{{ __('save') }}</button>&nbsp;
<button type="submit" class="btn btn-submit btn-secondary">{{ __('save') }}</button>&nbsp;
<a href="{{ route('admin_product_show') }}" class="btn btn-default">{{ __('back') }}</a>
</div>

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

@ -2,7 +2,7 @@
<div class="card mb-2">
<h5 class="card-header">
{{ __('Produkt') }}
{{ __('Product') }}
</h5>
@ -11,10 +11,10 @@
<div class="form-group">
<label class="custom-control custom-checkbox float-right">
{!! Form::checkbox('active', 1, $product->active, ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">{{__('aktiv')}}</span>
<span class="custom-control-label">{{__('activ')}}</span>
</label>
<label class="form-label" for="name">{{ __('Produktname / Titel') }}*</label>
{{ Form::text('name', $product->name, array('placeholder'=>__('Name'), 'class'=>'form-control', 'id'=>'name', 'required')) }}
<label class="form-label">{{ __('Produktname / Titel') }}*</label>
{{ Form::text('name', $product->getLang('name'), array('placeholder'=>__('Name'), 'class'=>'form-control', 'id'=>'name', 'required')) }}
</div>
<div class="form-row">
@ -146,7 +146,7 @@
</label>
</div>
<div class="form-group col-md-3 col-sm-6">
{{ Form::text('sponsor_buying_points_amount', $product->sponsor_buying_points_amount, array('placeholder'=>__('Anzahl KP'), 'class'=>'form-control', 'id'=>'sponsor_buying_points_amount')) }}
{{ Form::text('sponsor_buying_points_amount', $product->sponsor_buying_points_amount, array('placeholder'=>__('Anzahl KU'), 'class'=>'form-control', 'id'=>'sponsor_buying_points_amount')) }}
</div>
</div>
</div>
@ -306,7 +306,7 @@
<div class="card mb-2">
<h5 class="card-header">
{{ __('Inhalte') }}
{{ __('order.contents') }}
</h5>
<div class="card-body">
<div class="card-datatable table-responsive pt-0">
@ -325,7 +325,7 @@
<td>{{ $ingredient->name }}</td>
<td>{{ $ingredient->inci }}</td>
<td>{{ $ingredient->effect }}</td>
<td><a class="text-danger" href="{{ route('admin_product_delete', [$product->id, 'ingredient', $ingredient->id]) }}" onclick="return confirm('{{__('Eintrag entfernen?')}}');"><i class="far fa-trash-alt"></i></a></td>
<td><a class="text-danger" href="{{ route('admin_product_delete', [$product->id, 'ingredient', $ingredient->id]) }}" onclick="return confirm('{{__('Eintrag entfernen?')}}');"><i class="fa fa-trash-alt"></i></a></td>
</tr>
@endforeach
</tbody>

38
resources/views/admin/product/images.blade.php
View file

@ -31,11 +31,11 @@
<div class="col-6 col-md-4 text-center" style="border: 1px solid #eee;">
<img class="img-fluid" alt="" src="{{ route('product_image', [$image->slug]) }}">
<br>
<a href="{{ route('admin_product_image_delete', [$image->id, $product->id]) }}" class="btn btn-sm btn-primary mt-2 mb-2" onclick="return confirm('Bild wirklich löschen?');">Bild löschen</a>
<a href="{{ route('admin_product_image_delete', [$image->id, $product->id]) }}" class="btn btn-sm btn-primary mt-2 mb-2" onclick="return confirm('{{ __('actions.really_delete_picture') }}');">Bild löschen</a>
@if($image->active)
<a href="{{ route('admin_product_image_attribute', [$image->id, 'active', 0]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span> <i class="far fa-sync"></i></a>
<a href="{{ route('admin_product_image_attribute', [$image->id, 'active', 0]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span> <i class="fa fa-sync"></i></a>
@else
<a href="{{ route('admin_product_image_attribute', [$image->id, 'active', 1]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span> <i class="far fa-sync"></i></a>
<a href="{{ route('admin_product_image_attribute', [$image->id, 'active', 1]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span> <i class="fa fa-sync"></i></a>
@endif
<br>
<div class="input-group input-group-sm">
@ -60,25 +60,25 @@
<input type="hidden" name="product_id" value="{{$product->id}}">
<div class="slim_holder text-center">
<div class="slim" style="margin:20px auto;"
data-label='<span class="text-green">Foto-Upload</span><br>(Datei suchen oder Drag & Drop)'
data-fetcher="fetch.php"
data-size="600,800"
data-min-size="200,200"
data-max-file-size="10"
data-status-image-too-small="Bild zu klein<br>min. $0 Pixel"
data-status-file-type="Ungültige Datei<br>bitte nur: $0"
data-status-file-size="Die Datei ist zu groß<br>max. $0 MB"
data-button-confirm-label="bestätigen"
data-button-cancel-label="abbrechen"
data-button-confirm-title="bestätigen"
data-button-cancel-title="abbrechen"
data-button-rotate-title="drehen"
data-ratio="3:4">
<input type="file" name="images[]" required />
data-label='<span class="text-green">{{ __('actions.upload_photo') }}</span><br>({{ __('actions.search_file_or_drag_drop') }})'
data-fetcher="fetch.php"
data-size="600,800"
data-min-size="200,200"
data-max-file-size="10"
data-status-image-too-small="{{ __('actions.image_too_small') }}"
data-status-file-type="{{ __('actions.invalid_file') }}"
data-status-file-size="{{ __('actions.file_is_too_big') }}"
data-button-confirm-label="{{ __('actions.confirm') }}"
data-button-cancel-label="{{ __('actions.cancel') }}"
data-button-confirm-title="{{ __('actions.confirm') }}"
data-button-cancel-title="{{ __('actions.cancel') }}"
data-button-rotate-title="{{ __('actions.rotate') }}"
data-ratio="3:4">
<input type="file" name="images[]" required />
</div>
<br>
<button class="btn btn-primary" type="submit">Bild speichern</button>
<button class="btn btn-primary" type="submit">{{ __('actions.save_image') }}</button>
</div>
</form>
</div>

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

@ -4,7 +4,7 @@
<div class="card">
<h5 class="card-header">
{{__('Produkte')}}
{{__('Products')}}
<label class="custom-control custom-checkbox float-right mb-0">
<input type="checkbox" class="custom-control-input show-active-products" name="show_active_products" @if(get_user_attr('show_active_products') === "true") checked @endif>
<span class="custom-control-label font-style-normal font-weight-normal">nur aktive anzeigen</span>
@ -16,13 +16,13 @@
<tr>
<th style="max-width: 60px;">&nbsp;</th>
<th>{{__('Pos')}}</th>
<th>{{__('Bild')}}</th>
<th>{{__('tables.image')}}</th>
<th>{{__('Name')}}</th>
<th>{{__('Artikelnummer')}}</th>
<th>{{__('Kategorie')}}</th>
<th>{{__('Preis')}}</th>
<th>{{__('MwSt')}}</th>
<th>{{__('Points')}}</th>
<th>{{__('tables.points')}}</th>
<th>{{__('Inhalt')}}</th>
<th>{{__('Einheit')}}</th>
<th>{{__('Grundpreis')}}</th>
@ -31,7 +31,7 @@
<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>{{__('tables.status')}}</th>
<th></th>
</tr>
</thead>
@ -40,7 +40,7 @@
<tr>
<td>
<a href="{{route('admin_product_edit', [$value->id])}}" class="btn icon-btn btn-sm btn-primary">
<span class="far fa-edit"></span>
<span class="fa fa-edit"></span>
</a>
</td>
<td>{{ $value->pos }}</td>
@ -68,8 +68,8 @@
<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>
<td><a class="text-info" href="{{ route('admin_product_copy', [$value->id]) }}" onclick="return confirm('{{__('Eintrag kopieren?')}}');"><i class="fa fa-copy"></i></a> &nbsp;
<a class="text-danger" href="{{ route('admin_product_delete', [$value->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="fa fa-trash-alt"></i></a></td>
</tr>
@endforeach
</tbody>
@ -88,7 +88,7 @@
"bLengthChange": false,
"iDisplayLength": 50,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
$('.show-active-products').on('change', function () {

142
resources/views/admin/sales/_detail.blade.php
View file

@ -3,13 +3,13 @@
<div class="card-body">
<div class="row">
<div class="col-md-3 mb-1">
<strong class="mr-2">Status:</strong>
<strong class="mr-2">{{ __('Status') }}:</strong>
<span class="text-big">
{!! \App\Services\Payment::getShoppingOrderBadge($shopping_order) !!}
</span>
</div>
<div class="col-md-3 mb-1">
<strong class="mr-2">Versand:</strong>
<strong class="mr-2">{{ __('order.shipping') }}:</strong>
@if($shopping_order->payment_for !== 8)
@if ($isAdmin)
@ -17,7 +17,7 @@
data-toggle="modal" data-target="#modals-shipped" data-id="{{ $shopping_order->id }}"
data-shipped="{{ $shopping_order->shipped }}" data-back="{{ url()->current() }}"
data-action="store_shipped">
<span class="far fa-edit"></span> <strong>{{ $shopping_order->getShippedType() }}</strong>
<span class="fa fa-edit"></span> <strong>{{ $shopping_order->getShippedType() }}</strong>
</button>
@else
<span class="text-big">
@ -28,7 +28,7 @@
@endif
</div>
<div class="col-md-3 mb-1">
<strong class="mr-2">Rechnung:</strong>
<strong class="mr-2">{{ __('order.invoice') }}:</strong>
@if ($isAdmin)
@if ($shopping_order->isInvoice())
<a href="{{ route('storage_file', [$shopping_order->id, 'invoice', 'download']) }}"
@ -49,7 +49,7 @@
data-target="#modals-invoice" data-id="{{ $shopping_order->id }}" //TODO //
data-invoice="{{ $shopping_order->invoice_status }}"
data-back="{{ url()->current() }}" data-action="create_invoice">
<span class="fa fa-file"></span> <strong>Rechnung erstellen</strong>
<span class="fa fa-file"></span> <strong>{{ __('order.create_invoice') }}</strong>
</button>
@endif
@endif
@ -68,7 +68,7 @@
</div>
<div class="col-md-3 mb-1">
@if ($isAdmin && $shopping_order->payment_for != 8)
<strong class="mr-2">Lieferschein:</strong>
<strong class="mr-2">{{ __('order.delivery_note') }}:</strong>
@if ($shopping_order->isInvoice())
<a href="{{ route('storage_file', [$shopping_order->id, 'delivery', 'download']) }}"
class="btn btn-primary btn-sm"><i class="fa fa-download"></i></a>
@ -87,19 +87,19 @@
<div class="card-body pb-1">
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Bestelldatum</div>
<div class="text-muted small">{{ __('order.order_date') }}</div>
{{ $shopping_order->created_at->format('d.m.Y H:i') }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Anzahl Artikel</div>
<div class="text-muted small">{{ __('order.number_of_items') }}</div>
{{ $shopping_order->getItemsCount() }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Preis gesamt</div>
<div class="text-muted small">{{ __('order.total_price') }}</div>
{{ $shopping_order->getFormattedTotalShipping() }} &euro;
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Points gesamt</div>
<div class="text-muted small">{{ __('order.points_total') }}</div>
{{ $shopping_order->points }}
</div>
</div>
@ -109,7 +109,7 @@
<div class="card-body pb-1">
<div class="row">
<div class="col-md-12 mb-3">
<div class="text-muted small">Punkte / Umsatz zugewiesen</div>
<div class="text-muted small">{{ __('order.points_turnover_assigned') }}</div>
@if($shopping_order->user_sales_volume && $shopping_order->user_sales_volume->user)
{{ $shopping_order->user_sales_volume->user->getFullName() }}
@endif
@ -141,7 +141,7 @@
</div>
</div>
@endif
<div class="text-muted small">Zugewiesener Berater</div>
<div class="text-muted small">{{ __('order.assigned_counsellor') }}</div>
@if ($isView === 'sales_user')
@if ($shopping_order->user_shop)
{{ $shopping_order->user_shop->title }}
@ -155,7 +155,7 @@
data-action="shopping-user-is-like-member"
data-back="{{ route('admin_sales_customers_detail', [$shopping_order->id]) }}"
data-modal="modal-xl" data-route="{{ route('modal_load') }}"><span
class="fa fa-edit"></span> Berater zuordnen</button>
class="fa fa-edit"></span> {{ __('order.assigned_advisor') }}</button>
@else
@if ($shopping_order->member)
<a class="btn btn-xs btn-outline-primary"
@ -174,8 +174,8 @@
</div>
<div class="col-md-4 mb-3">
<div class="text-muted small">Gekauft im Shop</div>
@if ($shopping_order->user_shop->user->isActive() && $shopping_order->user_shop->user->isActiveShop())
<div class="text-muted small">{{ __('order.purchased_from_shop') }}</div>
@if ($shopping_order->user_shop && $shopping_order->user_shop->user && $shopping_order->user_shop->user->isActive() && $shopping_order->user_shop->user->isActiveShop())
<a href="{{ $shopping_order->user_shop->getSubdomain(false) }}" class="badge badge-success"
target="_blank">{{ $shopping_order->user_shop->getSubdomain(false) }}</a>
@else
@ -195,59 +195,59 @@
<h6 class="small font-weight-semibold">
@if ($shopping_order->shopping_user->is_from === 'shopping' ||
$shopping_order->shopping_user->is_from === 'extern')
Rechnungsadresse des Kunden
{{ __('order.billing_address_of_client') }}
@else
Rechnungsadresse des Beraters
{{ __('order.billing_address_of_the_advisor') }}
@endif
</h6>
<div class="row">
@if ($shopping_order->shopping_user->billing_company)
<div class="col-md-12 mb-3">
<div class="text-muted small">Firma</div>
<div class="text-muted small">{{ __('Company') }}</div>
{{ $shopping_order->shopping_user->billing_company }}
</div>
@endif
<div class="col-md-3 mb-3">
<div class="text-muted small">Anrede</div>
<div class="text-muted small">{{ __('Salutation') }}</div>
{{ \App\Services\HTMLHelper::getSalutationLang($shopping_order->shopping_user->billing_salutation) }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Vorname</div>
<div class="text-muted small">{{ __('First name') }}</div>
{{ $shopping_order->shopping_user->billing_firstname }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Nachname</div>
<div class="text-muted small">{{ __('Last name') }}</div>
{{ $shopping_order->shopping_user->billing_lastname }}
</div>
</div>
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Straße</div>
<div class="text-muted small">{{ __('Street') }}</div>
{{ $shopping_order->shopping_user->billing_address }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Zusatz</div>
<div class="text-muted small">{{ __('Addition') }}</div>
{{ $shopping_order->shopping_user->billing_address_2 }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">PLZ</div>
<div class="text-muted small">{{ __('Postcode') }}</div>
{{ $shopping_order->shopping_user->billing_zipcode }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Stadt</div>
<div class="text-muted small">{{ __('City') }}</div>
{{ $shopping_order->shopping_user->billing_city }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">E-Mail</div>
<div class="text-muted small">{{ __('E-Mail') }}</div>
{{ $shopping_order->shopping_user->billing_email }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Telefon</div>
<div class="text-muted small">{{ __('Phone') }}</div>
{{ $shopping_order->shopping_user->billing_phone }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Land</div>
<div class="text-muted small">{{ __('Country') }}</div>
{{ $shopping_order->shopping_user->billing_country->getLocated() }}
</div>
</div>
@ -263,19 +263,19 @@
@if ($shopping_order->shopping_user->is_from === 'user_order' ||
$shopping_order->shopping_user->is_from === 'extern')
@if ($shopping_order->shopping_user->is_for === 'me')
Lieferadresse des Berater
{{ __('order.delivery_address_of_the_consultant') }}
@else
Lieferadresse des Kunden
{{ __('order.delivery_address_of_the_client') }}
@endif
@endif
@if ($shopping_order->shopping_user->is_from === 'wizard')
Lieferadresse des Berater
{{ __('order.delivery_address_of_the_consultant') }}
@endif
@if ($shopping_order->shopping_user->is_from === 'membership')
Lieferadresse des Berater
{{ __('order.delivery_address_of_the_consultant') }}
@endif
@if ($shopping_order->shopping_user->is_from === 'shopping')
Lieferadresse des Kunden
{{ __('order.delivery_address_of_the_client') }}
@endif
</h6>
@if ($shopping_order->shopping_user->same_as_billing)
@ -284,51 +284,51 @@
<div class="row">
@if ($shopping_order->shopping_user->shipping_company)
<div class="col-md-12 mb-3">
<div class="text-muted small">Firma</div>
<div class="text-muted small">{{ __('Company') }}</div>
{{ $shopping_order->shopping_user->shipping_company }}
</div>
@endif
<div class="col-md-3 mb-3">
<div class="text-muted small">Anrede</div>
<div class="text-muted small">{{ __('Salutation') }}</div>
{{ \App\Services\HTMLHelper::getSalutationLang($shopping_order->shopping_user->shipping_salutation) }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Vorname</div>
<div class="text-muted small">{{ __('First name') }}</div>
{{ $shopping_order->shopping_user->shipping_firstname }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Nachname</div>
<div class="text-muted small">{{ __('Last name') }}</div>
{{ $shopping_order->shopping_user->shipping_lastname }}
</div>
</div>
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Straße</div>
<div class="text-muted small">{{ __('Street') }}</div>
{{ $shopping_order->shopping_user->shipping_address }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Zusatz</div>
<div class="text-muted small">{{ __('Addition') }}</div>
{{ $shopping_order->shopping_user->shipping_address_2 }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">PLZ</div>
<div class="text-muted small">{{ __('Postcode') }}</div>
{{ $shopping_order->shopping_user->shipping_zipcode }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Stadt</div>
<div class="text-muted small">{{ __('City') }}</div>
{{ $shopping_order->shopping_user->shipping_city }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">E-Mail</div>
<div class="text-muted small">{{ __('E-Mail') }}</div>
{{ $shopping_order->shopping_user->shipping_email }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Telefon</div>
<div class="text-muted small">{{ __('Phone') }}</div>
{{ $shopping_order->shopping_user->shipping_phone }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Land</div>
<div class="text-muted small">{{ __('Country') }}</div>
{{ $shopping_order->shopping_user->shipping_country->getLocated() }}
</div>
</div>
@ -343,26 +343,26 @@
<h6 class="small font-weight-semibold">
@if ($shopping_order->shopping_user->is_from === 'user_order')
@if ($shopping_order->shopping_user->is_for === 'me')
<strong>Bestellung für Berater</strong>
<strong>{{ __('order.order_for_consultant') }}</strong>
@else
<strong>Bestellung für Kunde</strong>
<strong>{{ __('order.order_for_client') }}</strong>
@endif
@endif
@if ($shopping_order->shopping_user->is_from === 'wizard')
<strong>Beraterbestellung für Registrierung</strong>
<strong>{{ __('order.adviser_order_for_registration') }}</strong>
@endif
@if ($shopping_order->shopping_user->is_from === 'membership')
<strong>Beraterbestellung für Mitgliedschaft</strong>
<strong>{{ __('order.adviser_order_for_membership') }}</strong>
@endif
@if ($shopping_order->shopping_user->is_from === 'shopping')
<strong>Kundenbestellung über Shop</strong>
<strong>{{ __('order.client_order_via_shop') }}</strong>
@endif
@if ($shopping_order->shopping_user->is_from === 'homeparty')
<h5>Beraterbestellung für eine Homeparty</h5>
<h5>{{ __('order.consultant_order_for_home_party') }} </h5>
<hr>
@endif
@if ($shopping_order->shopping_user->is_from === 'collection')
<h5>Berater Sammelrechnung</h5>
<h5>{{ __('order.adviser_collective_invoice') }}</h5>
<hr>
@endif
</h6>
@ -402,22 +402,22 @@
<div class="row">
<div class="col-sm-12">
<a href="{{ $shopping_order->wp_invoice_path }}" target="_blank"
class="btn btn-secondary btn-sm"><i class="fa fa-external-link-alt"></i> Link zur
Rechnung</a>
class="btn btn-secondary btn-sm"><i class="fa fa-external-link-alt"></i>
{{ __('order.link_to_the_invoice') }}</a>
</div>
</div>
@endif
@if ($shopping_order->api_notice['wp_advertising'])
<div class="row">
<div class="col-sm-12">
<b>Werbemittel: {!! $shopping_order->api_notice['wp_advertising'] !!}<br></b>
<b>{{ __('order.advertising_material') }}: {!! $shopping_order->api_notice['wp_advertising'] !!}<br></b>
</div>
</div>
@endif
@if ($shopping_order->api_notice['wp_incentives'])
<div class="row">
<div class="col-sm-12">
<b>Incentives: {!! $shopping_order->api_notice['wp_incentives'] !!}<br></b>
<b>{{ __('order.incentives') }}: {!! $shopping_order->api_notice['wp_incentives'] !!}<br></b>
</div>
</div>
@endif
@ -428,7 +428,7 @@
<!-- / Payment -->
<div class="card-body">
<h6 class="small font-weight-semibold">
Zahlung
{{ __('tables.payment') }}
</h6>
@if ($shopping_order->txaction !== 'extern')
<div class="table-responsive">
@ -436,11 +436,11 @@
<thead>
<tr>
<th style="min-width: 60px">#</th>
<th>Zahlungsart</th>
<th>Gesamt</th>
<th>Status</th>
<th>Datum</th>
<th>Referenznummer</th>
<th>{{ __('tables.payment_type') }}</th>
<th>{{ __('tables.total') }}</th>
<th>{{ __('tables.status') }}</th>
<th>{{ __('tables.date') }}</th>
<th>{{ __('tables.reference_number') }}</th>
</tr>
</thead>
<tbody>
@ -459,7 +459,7 @@
data-payment_id="{{ $shopping_payment->id }}"
data-txaction="{{ $shopping_payment->txaction }}"
data-back="{{ url()->current() }}" data-action="store_txaction">
<span class="far fa-edit"></span>
<span class="fa fa-edit"></span>
<strong>{{ \App\Services\Payment::getFormattedTxaction($shopping_payment->txaction) }}</strong>
</button>
@else
@ -478,9 +478,9 @@
<thead>
<tr>
<th style="min-width: 80px">Request</th>
<th style="min-width: 80px">Status</th>
<th style="min-width: 80px">{{ __('tables.status') }}</th>
<th style="min-width: 200px">TX-Action</th>
<th style="min-width: 120px">Datum</th>
<th style="min-width: 120px">{{ __('tables.date') }}</th>
</tr>
</thead>
<tbody>
@ -508,7 +508,7 @@
<div class="col-sm-12">
<div class="alert alert-info p-2 mt-2">
<ul>
<li>Bestellung über externen SHOP</li>
<li>{{ __('order.order_via_external_shop') }} </li>
</ul>
</div>
</div>
@ -533,7 +533,7 @@
<div class="modal-body">
<div class="form-group col-sm-12">
<label class="form-label" for="shipped">{{ __('Versand') }}</label>
{{ Form::select('shipped', \App\Models\ShoppingOrder::$shippedTypes, $shopping_order->shipped, ['data-live-search' => 'false', 'class' => 'selectpicker']) }}
{{ Form::select('shipped', \App\Models\ShoppingOrder::getTransShippedType(), $shopping_order->shipped, ['data-live-search' => 'false', 'class' => 'selectpicker']) }}
</div>
</div>
@ -555,7 +555,7 @@
<input type="hidden" name="back" value="{{ url()->current() }}">
<input type="hidden" name="view" value="{{ $isView }}">
<div class="modal-header">
<h5 class="modal-title">{{ __('Rechnung') }}</h5>
<h5 class="modal-title">{{ __('order.invoice') }}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<div class="modal-body">
@ -580,7 +580,7 @@
<div class="form-group col-sm-12">
<label class="custom-control custom-checkbox">
{!! Form::checkbox('invoice_send_mail', 1, false, ['class' => 'custom-control-input']) !!}
<span class="custom-control-label">Rechnung <strong>nicht</strong> senden an:
<span class="custom-control-label">{{ __('order.invoice') }} <strong>nicht</strong> senden an:
{{ $shopping_order->shopping_user->billing_email }}</span>
</label>
</div>
@ -603,13 +603,13 @@
<input type="hidden" name="action" value="store_txaction">
<input type="hidden" name="back" value="{{ url()->current() }}">
<div class="modal-header">
<h5 class="modal-title">{{ __('Bestellung') }} {{ __('Rechnung') }} </h5>
<h5 class="modal-title">{{ __('order.order') }} {{ __('order.invoice') }} </h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<div class="modal-body">
<div class="form-group col-sm-12">
<label class="form-label" for="txaction">{{ __('Rechnung') }}</label>
{{ Form::select('txaction', \App\Services\Payment::$txaction_invoice, 'invoice_paid', ['data-live-search' => 'false', 'class' => 'selectpicker']) }}
<label class="form-label" for="txaction">{{ __('order.invoice') }}</label>
{{ Form::select('txaction', \App\Services\Payment::getTransTxactionInvoice(), 'invoice_paid', ['data-live-search' => 'false', 'class' => 'selectpicker']) }}
</div>
</div>

40
resources/views/admin/sales/_detail_collection.blade.php
View file

@ -2,13 +2,13 @@
<table class="table table-product m-0" style="">
<tbody>
<tr class="border-bottom">
<th class="text-left">{{__('Produkt')}}</th>
<th class="text-right">{{__('Points')}}</th>
<th class="text-right">{{__('Netto-Preis')}}</th>
<th class="text-right">{{__('Anzahl')}}</th>
<th class="text-right">{{__('Summe Netto')}}</th>
<th class="text-left">{{__('tables.product')}}</th>
<th class="text-right">{{__('tables.points')}}</th>
<th class="text-right">{{__('tables.net_price')}}</th>
<th class="text-right">{{__('tables.quantity')}}</th>
<th class="text-right">{{__('tables.net_sum')}}</th>
<th class="text-right" style="max-width: 5%">{{__('%')}}</th>
<th class="text-right" style="max-width: 10%">{{__('MwSt')}}</th>
<th class="text-right" style="max-width: 10%">{{__('tables.VAT')}}</th>
</tr>
@foreach($shopping_order->shopping_collect_order->shop_items as $key => $shop_item)
<tr>
@ -40,7 +40,7 @@
@endforeach
<tr>
<td>
<strong>Gesamte Versandkosten</strong>
<strong>{{ __('order.total_shipping_costs') }}</strong>
</td>
<td class="text-right">
</td>
@ -69,7 +69,7 @@
</tr>
<tr class="border-bottom">
<td colspan="1">
Summen:
{{ __('order.sums') }}
</td>
<td class="text-right" colspan="1">
<strong>{{ $shopping_order->shopping_collect_order->points }} <strong>
@ -90,7 +90,7 @@
</tr>
<tr >
<td colspan="6">
<strong>Gesamte netto</strong>
<strong>{{ __('order.total_net') }}</strong>
</td>
<td class="text-right">
<strong>{{ formatNumber($shopping_order->shopping_collect_order->price_total_net) }} &euro;</strong>
@ -98,7 +98,7 @@
</tr>
<tr class="border-bottom">
<td colspan="5">
zzgl. MwSt:
{{ __('order.plus_VAT') }}
</td>
<td class="text-right" colspan="2">
@ -109,7 +109,7 @@
</tr>
<tr class="border-bottom">
<td colspan="6">
<strong>Gesamtsumme Brutto: </strong>
<strong>{{ __('order.total_gross') }}</strong>
</td>
<td class="text-right">
<strong>{{ formatNumber($shopping_order->shopping_collect_order->price_total) }} &euro;</strong>
@ -121,20 +121,20 @@
</table>
</div>
<h5 class="mt-4">Sammelrechnung behinhaltet folgende Kundenbestellungen</h5>
<h5 class="mt-4">{{ __('order.collective_invoice_contains_orders') }}</h5>
<div class="card-datatable table-responsive pt-0">
<table class="table table-striped table-bordered">
<thead>
<tr>
<th>#</th>
<th>{{__('Nummer') }}</th>
<th>{{__('Versand') }}</th>
<th>{{__('First name')}}</th>
<th>{{__('Last name')}}</th>
<th>{{__('E-Mail')}}</th>
<th>{{__('Datum')}}</th>
<th>{{__('Betrag')}}</th>
<th>{{__('tables.number') }}</th>
<th>{{__('tables.shipping') }}</th>
<th>{{__('tables.firstname')}}</th>
<th>{{__('tables.lastname')}}</th>
<th>{{__('tables.email')}}</th>
<th>{{__('tables.date')}}</th>
<th>{{__('tables.amount')}}</th>
</tr>
</thead>
<tbody>
@ -147,7 +147,7 @@
data-back=""
data-modal="modal-xl"
data-init_from="admin"
data-route="{{ route('modal_load') }}"><span class="far fa-eye"></span></button>
data-route="{{ route('modal_load') }}"><span class="fa fa-eye"></span></button>
</td>
<td>{{ $order['order_id'] }}</td>
<td>

4
resources/views/admin/sales/_detail_homparty.blade.php
View file

@ -87,7 +87,7 @@
</style>
@php($homeparty = $shopping_order->homeparty)
@if ($homeparty->homeparty_host)
<p><strong>Bestellung Gastgeber/in {{ $homeparty->homeparty_host->billing_firstname }}
<p><strong>{{ __('homeparty.order_host') }} {{ $homeparty->homeparty_host->billing_firstname }}
{{ $homeparty->homeparty_host->billing_lastname }}</strong></p>
@include('admin.sales._detail_homparty_user', [
'homeparty' => $shopping_order->homeparty,
@ -99,7 +99,7 @@
@php($g_count = 1)
@foreach ($homeparty->homeparty_guests as $homeparty_guest)
<hr>
<p><strong>Bestellung {!! $g_count++ !!}. Gast {{ $homeparty_guest->billing_firstname }}
<p><strong>{{ __('order.order') }} {!! $g_count++ !!}. {{ __('homeparty.guest') }} {{ $homeparty_guest->billing_firstname }}
{{ $homeparty_guest->billing_lastname }}</strong></p>
@include('admin.sales._detail_homparty_user', [
'homeparty' => $shopping_order->homeparty,

16
resources/views/admin/sales/_detail_homparty_total.blade.php
View file

@ -2,11 +2,11 @@
<table class="table table-striped">
<thead>
<tr>
<th>Gesamt</th>
<th class="text-right">{{__('Points')}}</th>
<th class="text-right">{{__('Verdienst')}}</th>
<th class="text-right">{{__('VK-Preis')}}</th>
<th class="text-right">{{__('EK-Preis')}}</th>
<th>{{ __('tables.total') }}</th>
<th class="text-right">{{__('tables.points')}}</th>
<th class="text-right">{{__('tables.earnings')}}</th>
<th class="text-right">{{__('tables.vk_price')}}</th>
<th class="text-right">{{__('tables.ek_price')}}</th>
</tr>
</thead>
<tbody>
@ -26,7 +26,7 @@
@endif
<tr class="foot-small">
<td colspan="1" class="border-top">
<strong>Gesamtsummen:</strong>
<strong>{{ __('order.total_sums') }}:</strong>
</td>
<td class="border-top text-right"><strong>{{ $hp_order['points'] - $hp_order['bonus_points_diff'] }}</strong></td>
<td class="border-top text-right"><strong>{{ Util::formatNumber($hp_order['income_price'])}} &euro;</strong></td>
@ -35,7 +35,7 @@
</tr>
<tr class="foot-small">
<td colspan="1" class="text-muted">
Summe ohne MwSt:
{{ __('order.total_without_VAT') }}:
</td>
<td class="">&nbsp;</td>
@ -45,7 +45,7 @@
</tr>
<tr class="foot-small">
<td colspan="1" class="text-muted">
Enthaltene MwSt:
{{ __('order.included_VAT') }}:
</td>
<td class="">&nbsp;</td>

88
resources/views/admin/sales/_detail_homparty_user.blade.php
View file

@ -3,14 +3,14 @@
<table class="table table-striped">
<thead>
<tr>
<th>{{__('Bild')}}</th>
<th>{{__('Produkt')}}</th>
<th>{{__('Anzahl')}}</th>
<th>{{__('Marge')}}</th>
<th class="text-right">{{__('Points')}}</th>
<th class="text-right">{{__('Verdienst')}}</th>
<th class="text-right">{{__('VK-Preis')}}</th>
<th class="text-right">{{__('EK-Preis')}}</th>
<th>{{__('tables.image')}}</th>
<th>{{__('tables.product')}}</th>
<th>{{__('tables.quantity')}}</th>
<th>{{__('tables.margin')}}</th>
<th class="text-right">{{__('tables.points')}}</th>
<th class="text-right">{{__('tables.earnings')}}</th>
<th class="text-right">{{__('tables.vk_price')}}</th>
<th class="text-right">{{__('tables.ek_price')}}</th>
</tr>
</thead>
<tbody>
@ -22,10 +22,10 @@
@endif
</td>
<td class="min-width-80">
<strong>{{ $value->product->name }}</strong>
<strong>{{ $value->product->getLang('name') }}</strong>
<div class="text-body">
<div>Inhalt: {{ $value->product->contents }}</div>
<div>Art.-Nr.: {{ $value->product->number }}</div>
<div>{{ __('order.content') }}: {{ $value->product->contents }}</div>
<div>{{ __('order.art_no') }}: {{ $value->product->number }}</div>
</div>
</td>
<td>
@ -58,16 +58,16 @@
<tr class="foot-small">
<td colspan="8" class="text-left">
@if($homeparty_guest->getDelivery() === 'host')
Lieferung an Gastgeber
{{ __('homeparty.delivery_to_host') }}
@endif
@if($homeparty_guest->getDelivery() === 'direct')
Lieferung direkt an den Gast
{{ __('homeparty.delivery_directly_to_the_guest') }}
@endif
</td>
</tr>
@if($homeparty_guest->getDelivery() === 'direct')
<tr>
<td colspan="5" class="text-left">Versandkosten</td>
<td colspan="5" class="text-left">{{ __('order.shipping_costs') }}</td>
<td>&nbsp;</td>
<td class="text-right">{{ Util::formatNumber($user_cart['shipping_price'])}} &euro;</td>
<td class="text-right">{{ Util::formatNumber($user_cart['shipping_price'])}} &euro;</td>
@ -75,7 +75,7 @@
@endif
<tr>
<td colspan="4" class="border-top"><strong>Gesamt:</strong></td>
<td colspan="4" class="border-top"><strong>{{ __('order.total') }}:</strong></td>
<td class="border-top text-right"><strong>{{$user_cart['points']}}</strong></td>
<td class="border-top text-right"><strong>{{Util::formatNumber($user_cart['income_price'])}} &euro;</strong></td>
<td class="border-top text-right"><strong>{{Util::formatNumber($user_cart['price'])}} &euro;</strong></td>
@ -84,7 +84,7 @@
@else
@if($hp_order['is_bonus'])
<tr class="foot-small">
<td colspan="5" class="text-left">Gutschrift Homeparty Gutschein</td>
<td colspan="5" class="text-left">{{ __('homeparty.credit_homeparty_voucher') }}</td>
<td>&nbsp;</td>
<td class="text-right">- {{ Util::formatNumber($hp_order['bonus_value']) }} &euro;</td>
<td class="text-right">- {{ Util::formatNumber($hp_order['bonus_value']) }} &euro;</td>
@ -92,7 +92,7 @@
@endif
@if($hp_order['is_bonus_coupon'])
<tr class="foot-small">
<td colspan="5" class="text-left">Gutschrift Bonus</td>
<td colspan="5" class="text-left">{{ __('homeparty.credit_bonus') }}</td>
<td>&nbsp;</td>
<td class="text-right">- {{ Util::formatNumber($hp_order['bonus_coupon']) }} &euro;</td>
<td class="text-right">- {{ Util::formatNumber($hp_order['bonus_coupon']) }} &euro;</td>
@ -100,7 +100,7 @@
@endif
@if($hp_order['is_bonus'])
<tr class="foot-small">
<td colspan="4" class="text-left">Abzug Points durch Gutschein</td>
<td colspan="4" class="text-left">{{ __('homeparty.deduct_points_by_voucher') }}</td>
<td class="text-right">- {{ $hp_order['bonus_points_diff'] }} </td>
<td>&nbsp;</td>
<td>&nbsp;</td>
@ -108,13 +108,13 @@
</tr>
@endif
<tr class="foot-small">
<td colspan="5" class="text-left">Versandkosten:</td>
<td colspan="5" class="text-left">{{ __('order.shipping_costs') }}:</td>
<td>&nbsp;</td>
<td class="text-right">&nbsp;</td>
<td class="text-right">{{Util::formatNumber($user_cart['shipping_price'])}} &euro;</td>
</tr>
<tr>
<td colspan="4" class="border-top"><strong>Summen:</strong></td>
<td colspan="4" class="border-top"><strong>{{ __('order.sums') }}:</strong></td>
<td class="border-top text-right"><strong>{{$user_cart['points']}}</strong></td>
<td class="border-top text-right"><strong>{{Util::formatNumber($user_cart['income_price'])}} &euro;</strong></td>
<td class="border-top text-right"><strong>{{Util::formatNumber($user_cart['price'])}} &euro;</strong></td>
@ -131,57 +131,57 @@
<hr class="m-0">
<div class="card-body" style="background-color: #E5E9EF">
<h6 class="small font-weight-semibold">
Lieferadresse
{{__('Delivery address')}}
</h6>
@if($homeparty_guest->same_as_billing)
<div class="row">
@if($homeparty_guest->billing_company)
<div class="col-md-12 mb-3">
<div class="text-muted small">Firma</div>
<div class="text-muted small">{{ __('Company') }}</div>
{{ $homeparty_guest->billing_company }}
</div>
@endif
<div class="col-md-3 mb-3">
<div class="text-muted small">Anrede</div>
<div class="text-muted small">{{ __('Salutation') }}</div>
{{ \App\Services\HTMLHelper::getSalutationLang($homeparty_guest->billing_salutation) }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Vorname</div>
<div class="text-muted small">{{ __('First name') }}</div>
{{ $homeparty_guest->billing_firstname }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Nachname</div>
<div class="text-muted small">{{ __('Last name') }}</div>
{{ $homeparty_guest->billing_lastname }}
</div>
</div>
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Straße</div>
<div class="text-muted small">{{ __('Street') }}</div>
{{ $homeparty_guest->billing_address }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Zusatz</div>
<div class="text-muted small">{{ __('Addition') }}</div>
{{ $homeparty_guest->billing_address_2 }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">PLZ</div>
<div class="text-muted small">{{ __('Postcode') }}</div>
{{ $homeparty_guest->billing_zipcode }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Stadt</div>
<div class="text-muted small">{{ __('City') }}</div>
{{ $homeparty_guest->billing_city }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">E-Mail</div>
<div class="text-muted small">{{ __('E-Mail') }}</div>
{{ $homeparty_guest->billing_email }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Telefon</div>
<div class="text-muted small">{{ __('Phone') }}</div>
{{ $homeparty_guest->billing_phone }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Land</div>
<div class="text-muted small">{{ __('Country') }}</div>
{{ $homeparty_guest->billing_country->getLocated() }}
</div>
</div>
@ -189,51 +189,51 @@
<div class="row">
@if($homeparty_guest->shipping_company)
<div class="col-md-12 mb-3">
<div class="text-muted small">Firma</div>
<div class="text-muted small">{{ __('Company') }}</div>
{{ $homeparty_guest->shipping_company }}
</div>
@endif
<div class="col-md-3 mb-3">
<div class="text-muted small">Anrede</div>
<div class="text-muted small">{{ __('Salutation') }}</div>
{{ \App\Services\HTMLHelper::getSalutationLang($homeparty_guest->shipping_salutation) }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Vorname</div>
<div class="text-muted small">{{ __('First name') }}</div>
{{ $homeparty_guest->shipping_firstname }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Nachname</div>
<div class="text-muted small">{{ __('Last name') }}</div>
{{ $homeparty_guest->shipping_lastname }}
</div>
</div>
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Straße</div>
<div class="text-muted small">{{ __('Street') }}</div>
{{ $homeparty_guest->shipping_address }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Zusatz</div>
<div class="text-muted small">{{ __('Addition') }}</div>
{{ $homeparty_guest->shipping_address_2 }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">PLZ</div>
<div class="text-muted small">{{ __('Postcode') }}</div>
{{ $homeparty_guest->shipping_zipcode }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Stadt</div>
<div class="text-muted small">{{ __('City') }}</div>
{{ $homeparty_guest->shipping_city }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">E-Mail</div>
<div class="text-muted small">{{ __('E-Mail') }}</div>
{{ $homeparty_guest->shipping_email }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Telefon</div>
<div class="text-muted small">{{ __('Phone') }}</div>
{{ $homeparty_guest->shipping_phone }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Land</div>
<div class="text-muted small">{{ __('Country') }}</div>
{{ $homeparty_guest->shipping_country->getLocated() }}
</div>
</div>
@ -242,5 +242,5 @@
@endif
@else
<p>Keine Bestellung</p>
<p>{{ __('order.no_order') }}</p>
@endif

18
resources/views/admin/sales/_detail_shopping_order.blade.php
View file

@ -2,16 +2,16 @@
<table class="table table-product m-0" style="">
<tbody>
<tr class="border-bottom">
<th>Produkt</th>
<th>{{ __('tables.product') }}</th>
<th class="text-right">
@if($shopping_order->shopping_user->is_from === 'user_order')
Netto-Preis
{{ __('tables.net_price') }}
@else
Preis
{{ __('tables.price') }}
@endif
</th>
<th class="text-right">Anzahl</th>
<th class="text-right">Summe</th>
<th class="text-right">{{ __('tables.quantity') }}</th>
<th class="text-right">{{ __('tables.sum') }}</th>
</tr>
@foreach($shopping_order->shopping_order_items as $shopping_order_item)
<tr class="border-bottom">
@ -25,12 +25,12 @@
@endif
<div class="media-body">
<a href="{{route('admin_product_edit', [$shopping_order_item->product->id])}}" class="d-block">{{ $shopping_order_item->product->name }}
<a href="{{route('admin_product_edit', [$shopping_order_item->product->id])}}" class="d-block">{{ $shopping_order_item->product->getLang('name') }}
<span class="text-muted">#{{ $shopping_order_item->product->number }}</span></a>
<small>
<span class="text-muted">Inhalt: </span> {{ $shopping_order_item->product->contents }}<br>
<span class="text-muted">Gewicht: </span> {{ $shopping_order_item->product->weight }} g<br>
<span class="text-muted">Points: </span> {{ $shopping_order_item->product->points }}
<span class="text-muted">{{ __('order.content') }}: </span> {{ $shopping_order_item->product->contents }}<br>
<span class="text-muted">{{ __('order.weight') }}: </span> {{ $shopping_order_item->product->weight }} g<br>
<span class="text-muted">{{ __('order.points') }}: </span> {{ $shopping_order_item->product->points }}
</small>
</div>
@endif

4
resources/views/admin/sales/customer_detail.blade.php
View file

@ -2,10 +2,10 @@
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
<a href="{{route('admin_sales_customers')}}" class="btn btn-sm btn-default float-right">zurück</a>
<a href="{{route('admin_sales_customers')}}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
{{ __('Bestellung Kunde') }} <span class="text-muted">#{{$shopping_order->id}}</span>
</h4>
@include('admin.sales._detail')
<a href="{{route('admin_sales_customers')}}" class="btn btn-sm btn-default mt-2 float-right">zurück</a>
<a href="{{route('admin_sales_customers')}}" class="btn btn-sm btn-default mt-2 float-right">{{ __('back') }}</a>
@endsection

26
resources/views/admin/sales/customers.blade.php
View file

@ -32,7 +32,7 @@
<label class="form-label" for="filter_txaction">Filter Status</label>
<select class="custom-select" name="filter_txaction" id="filter_txaction">
<option value="">Filter aus</option>
@foreach(\App\Services\Payment::$txaction_filter_text as $id=>$name)
@foreach(\App\Services\Payment::getTransTxactionFilterText() as $id=>$name)
<option value="{{$id}}" @if(get_user_attr('filter_txaction') == $id) selected @endif>{{$name}}</option>
@endforeach
</select>
@ -50,20 +50,20 @@
<thead>
<tr>
<th>#</th>
<th>{{__('Datum')}}</th>
<th>{{__('Betrag')}}</th>
<th>{{__('Zahlung')}}</th>
<th>{{__('Status')}}</th>
<th>{{__('Versand')}}</th>
<th>{{__('Rechnung')}}</th>
<th>{{__('tables.date')}}</th>
<th>{{__('tables.amount')}}</th>
<th>{{__('tables.payment')}}</th>
<th>{{__('tables.status')}}</th>
<th>{{__('tables.shipping')}}</th>
<th>{{__('tables.invoice')}}</th>
<th>{{__('First name')}}</th>
<th>{{__('Last name')}}</th>
<th>{{__('E-Mail')}}</th>
<th>{{__('zugewiesener Berater')}}</th>
<th>{{__('Rf-Nr.')}}</th>
<th>{{__('Art')}}</th>
<th>{{__('Käufe')}}</th>
<th>{{__('Gekauft im Shop')}}</th>
<th>{{__('tables.assigned_advisor')}}</th>
<th>{{__('tables.rf_no')}}</th>
<th>{{__('tables.art')}}</th>
<th>{{__('tables.purchases')}}</th>
<th>{{__('tables.purchased_in_the_shop')}}</th>
</tr>
</thead>
</table>
@ -103,7 +103,7 @@
"bLengthChange": false,
"iDisplayLength": 100,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
$('#filter_member_id').on('change', function(){

4
resources/views/admin/sales/user_detail.blade.php
View file

@ -3,12 +3,12 @@
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
<a href="{{route('admin_sales_users')}}" class="btn btn-sm btn-default float-right">zurück</a>
<a href="{{route('admin_sales_users')}}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
{{ __('Bestellung Berater') }} <span class="text-muted">#{{$shopping_order->id}}</span>
<span class="badge badge-pill badge-{{ $shopping_order->getPaymentForColor() }}" style="font-size: 0.65em;">{{ $shopping_order->getPaymentForType() }}</span>
</h4>
@include('admin.sales._detail')
<a href="{{route('admin_sales_users')}}" class="btn btn-sm btn-default mt-2 float-right">zurück</a>
<a href="{{route('admin_sales_users')}}" class="btn btn-sm btn-default mt-2 float-right">{{ __('back') }}</a>
@endsection

4
resources/views/admin/sales/users.blade.php
View file

@ -18,7 +18,7 @@
<th>{{__('Datum')}}</th>
<th>{{__('Betrag')}}</th>
<th>{{__('Zahlung')}}</th>
<th>{{__('Status')}}</th>
<th>{{__('tables.status')}}</th>
<th>{{__('Versand')}}</th>
<th>{{__('Art')}}</th>
<th>{{__('Rechnung')}}</th>
@ -65,7 +65,7 @@
"bLengthChange": false,
"iDisplayLength": 100,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});

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

@ -5,6 +5,32 @@
{{ __('Einstellungen') }}
</h4>
{!! Form::open(['url' => route('admin_setting_store'), 'class' => 'form-horizontal']) !!}
<div class="card mb-2">
<div class="card-body">
<h4>Kauf Einstellungen</h4>
<div class="form-row">
<div class="form-group col-sm-12">
<label class="custom-control custom-checkbox mt-2">
{!! Form::checkbox('settings[is_comp_me_order][val]', 1, \App\Models\Setting::getContentBySlug('is_comp_me_order'), ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">Kompensationprodukt für Berater bei Bestellung aufgeben</span>
</label>
{{ Form::hidden('settings[is_comp_me_order][type]', 'bool') }}
<label class="custom-control custom-checkbox mt-3">
{!! Form::checkbox('settings[is_comp_me_abo][val]', 1, \App\Models\Setting::getContentBySlug('is_comp_me_abo'), ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">Kompensationprodukt für Berater bei Abo - regelmäßige Lieferungn</span>
</label>
{{ Form::hidden('settings[is_comp_me_abo][type]', 'bool') }}
</div>
</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>
<div class="card mb-2">
<div class="card-body">
@ -24,7 +50,7 @@
</div>
</div>--}}
<div class="form-row">
<div class="form-group col-sm-12">
<div class="form-group col-sm-6">
<label class="form-label">{{ __('Tag des Monats für die Fixierung/Auswertungen der Business Marketing Plans') }}*</label>
{{ Form::text('settings[day-exectute-business-structur][val]', \App\Models\Setting::getContentBySlug('day-exectute-business-structur'), array('class'=>'form-control')) }}
{{ Form::hidden('settings[day-exectute-business-structur][type]', 'int') }}

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

@ -28,7 +28,7 @@
{!! Form::open(['url' => route('admin_shipping_store'), 'class' => 'form-horizontal', 'id'=>'']) !!}
<input type="hidden" name="id" value="@if($value->id>0){{$value->id}}@else new @endif">
<h5 class="card-header">
{{ __('Versandkosten') }}
{{ __('order.shipping_costs') }}
</h5>
<div class="card-body">
<div class="form-row">
@ -45,7 +45,7 @@
<div class="form-group col-md-6">
<label class="custom-control custom-checkbox float-right">
{!! Form::checkbox('active', 1, $value->active, ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">{{__('aktiv')}}</span>
<span class="custom-control-label">{{__('activ')}}</span>
</label>
<label class="form-label" for="title">{{ __('Versandkostenfrei ab') }} (nur online Shop/Brutto)</label>
{{ Form::text('free', $value->getFormattedFree(), array('placeholder'=>__('in Euro, leer lassen ohne Freigrenze'), 'class'=>'form-control')) }}
@ -93,7 +93,7 @@
data-total_to="{{ $price->getFormattedTotalTo() }}"
data-weight_from="{{ $price->weight_from }}"
data-weight_to="{{ $price->weight_to }}">
<span class="far fa-edit"></span>
<span class="fa fa-edit"></span>
</button>
</td>
<td>{{ $price->getFormattedPrice() }}</td>
@ -102,7 +102,7 @@
<td>{{ $price->getFormattedTaxRate() }}</td>
<td>{{ $price->getFormatTotalFrom() }} - {{ $price->getFormattedTotalTo() }}</td>
<td>{{ $price->weight_from }} - {{ $price->weight_to }}</td>
<td><a class="text-danger" href="{{ route('admin_shipping_price_delete', [$price->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a></td>
<td><a class="text-danger" href="{{ route('admin_shipping_price_delete', [$price->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="fa fa-trash-alt"></i></a></td>
</tr>
@endforeach
@ -196,7 +196,7 @@
<div class="card mb-2">
<h5 class="card-header">
{{__('Land')}}
{{ __('Country') }}
</h5>
<div class="card-datatable table-responsive">
<table class="datatables-style table table-striped table-bordered">
@ -208,7 +208,7 @@
</td>
<td>
@if(!$country->shopping_orders->count())
<a class="text-danger" href="{{ route('admin_shipping_country_delete', [$country->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a>
<a class="text-danger" href="{{ route('admin_shipping_country_delete', [$country->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="fa fa-trash-alt"></i></a>
@else
-
@endif

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

@ -3,7 +3,7 @@
@section('content')
<div class="card">
<h5 class="card-header">
{{__('Versandkosten')}}
{{ __('order.shipping_costs') }}
</h5>
<div class="card-datatable table-responsive">
<table class="datatables-style table table-striped table-bordered">
@ -11,7 +11,7 @@
<tr>
<th style="max-width: 60px;">&nbsp;</th>
<th>{{__('Name')}}</th>
<th>{{__('Status')}}</th>
<th>{{__('tables.status')}}</th>
<th>{{__('VK frei')}}</th>
<th></th>
@ -22,13 +22,13 @@
<tr>
<td>
<a href="{{route('admin_shipping_edit', [$value->id])}}" class="btn icon-btn btn-sm btn-primary">
<span class="far fa-edit"></span>
<span class="fa fa-edit"></span>
</a>
</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>
<td><a class="text-danger" href="{{ route('admin_shipping_delete', [$value->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="fa fa-trash-alt"></i></a></td>
</tr>
@endforeach
</tbody>
@ -54,7 +54,7 @@
{ "sWidth": "10%" },
],
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
});

38
resources/views/admin/site/images.blade.php
View file

@ -33,11 +33,11 @@
<div class="col-12 text-center" style="border: 1px solid #eee;">
<img class="" alt="" src="{{ route('iq_image', [$value->iq_image->slug]) }}">
<br>
<a href="{{ route('admin_sites_image_delete', [$value->slug, $value->iq_image->id]) }}" class="btn btn-sm btn-primary mt-2 mb-2" onclick="return confirm('Bild wirklich löschen?');">Bild löschen</a>
<a href="{{ route('admin_sites_image_delete', [$value->slug, $value->iq_image->id]) }}" class="btn btn-sm btn-primary mt-2 mb-2" onclick="return confirm('{{ __('actions.really_delete_picture') }}');">Bild löschen</a>
@if($value->iq_image->active)
<a href="{{ route('admin_sites_image_attribute', [$value->slug, $value->iq_image->id, 'active', 0]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span> <i class="far fa-sync"></i></a>
<a href="{{ route('admin_sites_image_attribute', [$value->slug, $value->iq_image->id, 'active', 0]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span> <i class="fa fa-sync"></i></a>
@else
<a href="{{ route('admin_sites_image_attribute', [$value->slug, $value->iq_image->id, 'active', 1]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span> <i class="far fa-sync"></i></a>
<a href="{{ route('admin_sites_image_attribute', [$value->slug, $value->iq_image->id, 'active', 1]) }}" class="btn btn-sm btn-default mt-2 mb-2"><span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span> <i class="fa fa-sync"></i></a>
@endif
</div>
@endif
@ -54,25 +54,25 @@
<input type="hidden" name="value_id" value="{{$value->id}}">
<div class="slim_holder text-center">
<div class="slim" style="margin:20px auto;"
data-label='<span class="text-green">Foto-Upload</span><br>(Datei suchen oder Drag & Drop)'
data-fetcher="fetch.php"
data-size="1920,640"
data-min-size="100,100"
data-max-file-size="10"
data-status-image-too-small="Bild zu klein<br>min. $0 Pixel"
data-status-file-type="Ungültige Datei<br>bitte nur: $0"
data-status-file-size="Die Datei ist zu groß<br>max. $0 MB"
data-button-confirm-label="bestätigen"
data-button-cancel-label="abbrechen"
data-button-confirm-title="bestätigen"
data-button-cancel-title="abbrechen"
data-button-rotate-title="drehen"
data-ratio="">
<input type="file" name="images[]" required />
data-label='<span class="text-green">{{ __('actions.upload_photo') }}</span><br>({{ __('actions.search_file_or_drag_drop') }})'
data-fetcher="fetch.php"
data-size="600,800"
data-min-size="200,200"
data-max-file-size="10"
data-status-image-too-small="{{ __('actions.image_too_small') }}"
data-status-file-type="{{ __('actions.invalid_file') }}"
data-status-file-size="{{ __('actions.file_is_too_big') }}"
data-button-confirm-label="{{ __('actions.confirm') }}"
data-button-cancel-label="{{ __('actions.cancel') }}"
data-button-confirm-title="{{ __('actions.confirm') }}"
data-button-cancel-title="{{ __('actions.cancel') }}"
data-button-rotate-title="{{ __('actions.rotate') }}"
data-ratio="3:4">
<input type="file" name="images[]" required />
</div>
<br>
<button class="btn btn-primary" type="submit">Bild speichern</button>
<button class="btn btn-primary" type="submit">{{ __('actions.save_image') }}</button>
</div>
</form>
</div>

20
resources/views/admin/user/index.blade.php
View file

@ -14,16 +14,17 @@
<thead>
<tr>
<th>#</th>
<th>{{__('First name')}}</th>
<th>{{__('Last name')}}</th>
<th>{{__('tables.firstname')}}</th>
<th>{{__('tables.lastname')}}</th>
<th>{{__('E-Mail')}}</th>
<th>{{__('Zugang')}}</th>
<th>{{__('verified')}} (seit)</th>
<th>{{__('active')}} (seit)</th>
<th>{{__('Account')}} (bis)</th>
<th>{{__('Shop')}} (bis)</th>
<th>{{__('Shop')}} ab</th>
<th>{{__('tables.account')}} (bis)</th>
<th>{{__('tables.shop')}} (bis)</th>
<th>{{__('tables.shop')}} ab</th>
<th>{{__('Zahlungsarten')}}</th>
<th>{{__('Land')}}</th>
<th>{{__('Test Modus')}}</th>
<th>{{__('login')}}</th>
<th>{{__('delete')}}</th>
@ -174,7 +175,7 @@
</div>
<div class="form-row">
<div class="form-group col">
<label for="payment_account" class="form-label">{{__('Account')}} bis</label>
<label for="payment_account" class="form-label">{{__('tables.account')}} bis</label>
<input type="text" name="payment_account" class="form-control b-material-datetime-picker" placeholder="25.10.2020 10:30">
</div>
</div>
@ -209,7 +210,7 @@
</div>
<div class="form-row">
<div class="form-group col">
<label for="payment_shop" class="form-label">{{__('Shop')}} bis</label>
<label for="payment_shop" class="form-label">{{__('tables.shop')}} bis</label>
<input type="text" name="payment_shop" class="form-control b-material-datetime-picker" placeholder="25.10.2020 10:30">
</div>
</div>
@ -402,7 +403,7 @@
$('.datatables-users').dataTable({
"processing": true,
"serverSide": true,
"ajax": '{!! route('data_table_users') !!}',
"ajax": '{!! route('admin_user_datatable') !!}',
"order": [[0, "desc" ]],
"columns": [
{ data: 'id', searchable: false},
@ -416,6 +417,7 @@
{ data: 'shop', name: 'shop' },
{ data: 'since', name: 'since' },
{ data: 'my_payment_methods', name: 'my_payment_methods' },
{ data: 'country', name: 'country' },
{ data: 'test_mode', name: 'test_mode' },
{ data: 'action_login', orderable: false, searchable: false},
{ data: 'action_delete', orderable: false, searchable: false},
@ -423,7 +425,7 @@
"bLengthChange": false,
"iDisplayLength": 50,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});

40
resources/views/auth/login.blade.php
View file

@ -10,7 +10,10 @@
<div class="authentication-inner py-5">
<div class="card">
<div class="p-4 p-sm-5" style="padding-bottom: 1.5rem !important;">
@include('layouts.includes.header-language')
<div class="p-4 p-sm-4" style="padding-bottom: 1.5rem !important;">
<!-- Logo -->
<div class="d-flex justify-content-center align-items-center pb-2 mb-2">
<div class="">
@ -20,17 +23,40 @@
</div>
</div>
<!-- / Logo -->
<h5 class="text-center text-muted font-weight-normal mb-4">{{ __('Login to your account') }}</h5>
<!-- Form -->
<form method="POST" class="my-5" action="{{ route('login') }}" aria-label="{{ __('Login') }}">
@csrf
@if(Util::isTestSystem(true))
<h4>TestSystem</h4>
<div class="form-group">
<label class="form-label">{{ __('E-Mail Address') }}</label>
<input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="kevin@adametz.media" required autofocus>
@if ($errors->has('email'))
<span class="invalid-feedback" role="alert">
<strong>{{ $errors->first('email') }}</strong>
</span>
@endif
</div>
<div class="form-group">
<label class="form-label d-flex justify-content-between align-items-end">
<div>{{ __('Password') }}</div>
<a class="" href="{{ route('password.request') }}">
{{ __('Forgot your Password?') }}
</a>
</label>
<input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" value="goto7-my-testsystem" required>
@if ($errors->has('password'))
<span class="invalid-feedback" role="alert">
<strong>{{ $errors->first('password') }}</strong>
</span>
@endif
</div>
@else
<div class="form-group">
<label class="form-label">{{ __('E-Mail Address') }}</label>
<input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required autofocus>
@if ($errors->has('email'))
<span class="invalid-feedback" role="alert">
<strong>{{ $errors->first('email') }}</strong>
@ -51,6 +77,8 @@
</span>
@endif
</div>
@endif
<div class="d-flex justify-content-between align-items-center m-0">
<label class="custom-control custom-checkbox m-0">
<input type="checkbox" class="custom-control-input" name="remember" {{ old('remember') ? 'checked' : '' }}>
@ -63,7 +91,7 @@
<!-- / Form -->
<div class="mt-5">
<button type="button" class="btn btn-outline-primary mt-2 btn-sm update_modal_data_load" data-url="{{ route('loading_modal') }}" data-data="data_protection" data-target="#modal-loading">{{__('data protection')}}</button>
<button type="button" class="btn btn-outline-primary mt-2 btn-sm update_modal_data_load" data-url="{{ route('loading_modal') }}" data-data="data_protection" data-target="#modal-loading">{{__('register.data_protection')}}</button>
<button type="button" class="btn btn-outline-primary mt-2 btn-sm update_modal_data_load" data-url="{{ route('loading_modal') }}" data-data="imprint" data-target="#modal-loading">{{__('imprint')}}</button>
</div>

8
resources/views/auth/passwords/email.blade.php
View file

@ -10,8 +10,10 @@
<div class="authentication-inner py-5">
<div class="card">
<div class="p-4 p-sm-5" style="padding-bottom: 1.5rem !important;">
<!-- Logo -->
@include('layouts.includes.header-language')
<div class="p-4 p-sm-4" style="padding-bottom: 1.5rem !important;"> <!-- Logo -->
<div class="d-flex justify-content-center align-items-center pb-2 mb-2">
<div class="">
<div class="w-100 position-relative">
@ -53,7 +55,7 @@
</div>
<div class="mt-5">
<button type="button" class="btn btn-outline-primary mt-2 btn-sm update_modal_data_load" data-url="{{ route('loading_modal') }}" data-data="data_protection" data-target="#modal-loading">{{__('data protection')}}</button>
<button type="button" class="btn btn-outline-primary mt-2 btn-sm update_modal_data_load" data-url="{{ route('loading_modal') }}" data-data="data_protection" data-target="#modal-loading">{{__('register.data_protection')}}</button>
<button type="button" class="btn btn-outline-primary mt-2 btn-sm update_modal_data_load" data-url="{{ route('loading_modal') }}" data-data="imprint" data-target="#modal-loading">{{__('imprint')}}</button>
</div>

8
resources/views/auth/passwords/reset.blade.php
View file

@ -10,8 +10,10 @@
<div class="authentication-inner py-5">
<div class="card">
<div class="p-4 p-sm-5" style="padding-bottom: 1.5rem !important;">
<!-- Logo -->
@include('layouts.includes.header-language')
<div class="p-4 p-sm-4" style="padding-bottom: 1.5rem !important;"> <!-- Logo -->
<div class="d-flex justify-content-center align-items-center pb-2 mb-4">
<div class="">
<div class="w-100 position-relative">
@ -74,7 +76,7 @@
</div>
<div class="mt-5">
<button type="button" class="btn btn-outline-primary mt-2 btn-sm update_modal_data_load" data-url="{{ route('loading_modal') }}" data-data="data_protection" data-target="#modal-loading">{{__('data protection')}}</button>
<button type="button" class="btn btn-outline-primary mt-2 btn-sm update_modal_data_load" data-url="{{ route('loading_modal') }}" data-data="data_protection" data-target="#modal-loading">{{__('register.data_protection')}}</button>
<button type="button" class="btn btn-outline-primary mt-2 btn-sm update_modal_data_load" data-url="{{ route('loading_modal') }}" data-data="imprint" data-target="#modal-loading">{{__('imprint')}}</button>
</div>

8
resources/views/auth/register.blade.php
View file

@ -9,8 +9,10 @@
<div class="authentication-inner py-5">
<div class="card">
<div class="p-4 p-sm-5" style="adding-bottom: 0.25rem !important;">
<!-- Logo -->
@include('layouts.includes.header-language')
<div class="p-4 p-sm-4" style="padding-bottom: 1.5rem !important;"> <!-- Logo -->
<div class="d-flex justify-content-center align-items-center pb-2 mb-4">
<div class="">
<div class="w-100 position-relative">
@ -71,7 +73,7 @@
</div>
<div class="mt-2">
<button type="button" class="btn btn-outline-primary mt-2 btn-sm update_modal_data_load" data-url="{{ route('loading_modal') }}" data-data="data_protection" data-target="#modal-loading">{{__('data protection')}}</button>
<button type="button" class="btn btn-outline-primary mt-2 btn-sm update_modal_data_load" data-url="{{ route('loading_modal') }}" data-data="data_protection" data-target="#modal-loading">{{__('register.data_protection')}}</button>
<button type="button" class="btn btn-outline-primary mt-2 btn-sm update_modal_data_load" data-url="{{ route('loading_modal') }}" data-data="imprint" data-target="#modal-loading">{{__('imprint')}}</button>
</div>

36
resources/views/dashboard/_activities.blade.php
View file

@ -1,39 +1,61 @@
<div class="col-xl-5">
<div class="card mb-4">
<h5 class="card-header with-elements">
<div class="card-header-title">{{__('Activities') }}</div>
<div class="card-header-title">{{__('register.trade_licence') }}</div>
</h5>
<div class="card-body">
@php($business_license_choose = $user->account->getNotice('business_license'))
@if($business_license_choose === 'now')
<p><strong class="">{{ __('register.business_license_deposited') }}</strong></p>
@endif
@if($business_license_choose === 'later')
<p><strong class="text-danger">{{ __('register.business_license_later') }}</strong></p>
@endif
@if($business_license_choose === 'non')
<p><strong class="">{{ __('register.business_license_non') }}:</strong><br>
{{ $user->account->getNotice('business_license_reason') }}</p>
@endif
<a href="{{ route('user_documents') }}" class="btn btn-secondary"><i
class="ion ion-ios-document text-default mr-1"></i> {{ __('register.change_documents') }}</a>
</div>
</div>
<div class="card mb-4">
<h5 class="card-header with-elements">
<div class="card-header-title">{{__('home.activities') }}</div>
</h5>
<div class="card-body">
@if($user->active == 1)
@if($user->files->count())
@foreach($user->files()->whereIdentifier('contract')->get() as $file)
<a class="btn btn-secondary btn-block mb-3" href="{{ route('storage_file', [$file->id, 'user']) }}" target="_blank"><i class="ion ion-ios-download text-default mr-1"></i> MIVITA_Beratervertrag.pdf</a>
<a class="btn btn-secondary btn-block mb-3" href="{{ route('storage_file', [$file->id, 'user']) }}" target="_blank"><i class="ion ion-ios-download text-default mr-1"></i> {{ __('home.MIVITA_Consultancy_agreement') }}.pdf</a>
<hr class="mb-3">
@endforeach
@endif
<p><span class="ion ion-md-checkmark-circle-outline text-primary"></span>
<strong>{{__('Daten vollständig, freigeschaltet')}}</strong> {{__('at')}}: {{ $user->getActiveDateFormat() }}</p>
<strong>{{__('home.data_complete_unlocked')}}</strong> {{__('home.at')}}: {{ $user->getActiveDateFormat() }}</p>
@endif
@if($user->account_id)
@if($user->active == 1)
@if($user->agreement)
<p><span class="ion ion-md-checkmark-circle-outline text-primary"></span>
<strong>{{__('Einverständniserklärung')}}</strong> {{__('at')}}: {{ $user->getAgreementFormat() }}
<strong>{{__('home.declaration_of_consent')}}</strong> {{__('home.at')}}: {{ $user->getAgreementFormat() }}
</p>
@else
<p><span class="ion ion-md-close-circle-outline text-danger"></span>
<strong>{{__('Einverständniserklärung')}}</strong> {{ __('nicht akzeptiert') }}</p>
<strong>{{__('home.declaration_of_consent')}}</strong> {{ __('nicht akzeptiert') }}</p>
@endif
@endif
@if($user->account->data_protection)
<p><span class="ion ion-md-checkmark-circle-outline text-primary"></span>
<strong>{{__('Privacy policy approved')}}</strong> {{__('at')}}: {{ $user->account->getDataProtectionFormat() }}
<strong>{{__('home.privacy_policy_approved')}}</strong> {{__('home.at')}}: {{ $user->account->getDataProtectionFormat() }}
</p>
@endif
@endif
@if($user->confirmed == 1)
<p><span class="ion ion-md-checkmark-circle-outline text-primary"></span>
<strong>{{__('E-Mail verified')}}</strong> {{__('at')}}: {{ $user->getConfirmationDateFormat() }}</p>
<strong>{{__('home.email_verified')}}</strong> {{__('home.at')}}: {{ $user->getConfirmationDateFormat() }}</p>
@endif
</div>
</div>

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

@ -1,19 +1,19 @@
<div class="d-flex col-xl-6 align-items-stretch">
<div class="card w-100 mb-4">
<h5 class="card-header with-elements">
<div class="card-header-title">{{__('Mitgliedschaft') }}</div>
<div class="card-header-title">{{__('home.membership') }}</div>
</h5>
<div class="card-body">
@if($user->isActiveAccount() )
<div class="badge btn-success p-2">
<i class="ion ion-md-checkmark-circle-outline text-white"></i>
<strong>{{__('Berater-Mitgliedschaft aktiv')}}</strong> {{__('bis zum:')}} <strong></strong>{{ $user->getPaymentAccountDateFormat() }}</div>
<strong>{{__('home.adviser_membership_active')}}</strong> {{__('home.until')}}: <strong></strong>{{ $user->getPaymentAccountDateFormat() }}</div>
@else
<div class="badge badge-danger p-2">
<i class="ion ion-md-close-circle-outline text-white"></i>
<strong>{{__('Berater-Account inaktiv')}} </strong>
<strong>{{__('home.advisor_account_inactive')}} </strong>
@if($user->payment_account)
{{__('abgelaufen am')}}: <strong></strong>{{ $user->getPaymentAccountDateFormat() }}
{{__('home.expired_on')}}: <strong></strong>{{ $user->getPaymentAccountDateFormat() }}
@endif
</div>
@endif
@ -21,14 +21,14 @@
@if($user->isActiveAccount() )
<hr>
<h6><span class="ion ion-md-checkmark-circle-outline text-success"></span>
<strong>{{__('Aktive Rolle')}}:</strong>
@if($user->m_level && $user->user_level) {{ $user->user_level->name }} @endif </h6>
<strong>{{__('home.active_role')}}:</strong>
@if($user->m_level && $user->user_level) {{ $user->user_level->getLang('name') }} @endif </h6>
<table class="table table-striped table-bordered">
<tr>
<td class="text-left font-weight-semibold">{{__('Provision')}}:</td>
<td class="text-left font-weight-semibold">{{__('Shop Provision')}}:</td>
<td class="text-left font-weight-semibold">{{__('Qualifikation')}}:</td>
<td class="text-left font-weight-semibold">{{__('Payline Qualifikation')}}:</td>
<td class="text-left font-weight-semibold">{{__('tables.commission')}}:</td>
<td class="text-left font-weight-semibold">{{__('tables.shop_commission')}}:</td>
<td class="text-left font-weight-semibold">{{__('tables.qualification')}}:</td>
<td class="text-left font-weight-semibold">{{__('tables.payline_qualification')}}:</td>
</tr>
@if($user->m_level && $user->user_level)
<tr>
@ -50,7 +50,7 @@
@endif
</div>
<div class="card-footer py-3">
<a href="{{route('user_membership')}}" class="btn btn-secondary"><i class="ion ion-ios-people text-default mr-1"></i> {{__('Mitgliedschaft verwalten')}}</a>
<a href="{{route('user_membership')}}" class="btn btn-secondary"><i class="ion ion-ios-people text-default mr-1"></i> {{__('home.manage_membership')}}</a>
</div>
</div>
</div>

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

@ -1,7 +1,7 @@
<div class="d-flex col-xl-12 align-items-stretch">
<div class="card w-100 mb-4">
<h5 class="card-header with-elements">
<div class="card-header-title">{{__('Aktuelle Punkte für') }} {{ HTMLHelper::getMonth(date('n')) }} {{ date('Y') }} </div>
<div class="card-header-title">{{__('home.current_points_for') }} {{ HTMLHelper::getMonth(date('n')) }} {{ date('Y') }} </div>
</h5>
<div class="card-body">
@if($user->isActiveAccount())
@ -9,10 +9,10 @@
@php($userSalesVolume = $user->getUserSalesVolume(date('n'), date('Y'), 'first'))
@if($userSalesVolume)
<div class="mb-2">
<strong>Gesamte Points: {{ $userSalesVolume->getPointsKPSum() }}</strong> | Eigene: {{ $userSalesVolume->month_points }} | Shop: {{ $userSalesVolume->month_shop_points }}<br>
<strong>{{ __('team.total_points') }}: {{ $userSalesVolume->getPointsKPSum() }}</strong> | {{ __('team.own') }}: {{ $userSalesVolume->month_points }} | {{ __('team.shop') }}: {{ $userSalesVolume->month_shop_points }}<br>
</div>
<div>
<strong>Gesamter Umsatz: {{ formatNumber($userSalesVolume->getTotalNetSum()) }} &euro;</strong> | Eigene: {{ formatNumber($userSalesVolume->month_total_net) }} &euro; | Shop: {{ formatNumber($userSalesVolume->month_shop_total_net) }} &euro;
<strong>{{ __('team.total_turnover') }}: {{ formatNumber($userSalesVolume->getTotalNetSum()) }} &euro;</strong> | {{ __('team.own') }}: {{ formatNumber($userSalesVolume->month_total_net) }} &euro; | {{ __('team.shop') }}: {{ formatNumber($userSalesVolume->month_shop_total_net) }} &euro;
</div>
@endif
</h6>
@ -20,13 +20,13 @@
<table class="datatables-user-points table table-striped table-bordered">
<thead>
<tr>
<th>{{__('Datum') }}</th>
<th>{{__('Points')}}</th>
<th>{{__('Umsatz netto')}}</th>
<th>{{__('Art')}}</th>
<th>{{__('Bestellung')}}</th>
<th>{{__('Info') }}</th>
<th>{{__('Notiz') }}</th>
<th>{{__('tables.date') }}</th>
<th>{{__('tables.points')}}</th>
<th>{{__('tables.net_sales')}}</th>
<th>{{__('tables.type')}}</th>
<th>{{__('tables.order')}}</th>
<th>{{__('tables.info') }}</th>
<th>{{__('tables.note') }}</th>
</tr>
</thead>
<tbody>
@ -90,7 +90,7 @@
"stateSave": true,
"searching": false,
"language": {
"url": "/js/German.json"
"url": "/js/datatables-{{ \App::getLocale() }}.json"
}
});
});

16
resources/views/dashboard/_reminder.blade.php
View file

@ -17,10 +17,12 @@
@else
<h5 class="alert badge-danger">{{__('membership.home_copy_alert_36', ['days'=>$user->daysActiveAccount()*-1, 'datetime'=>$user->getPaymentAccountDateFormat()])}}</h5>
@endif
@if($user->payment_account && $user->isAboOption())
{{--
Abo Option deaktiviert @if($user->payment_account && $user->isAboOption())
{{ __('membership.home_copy_SEPA_36', ['price'=> 'von '.$user->payment_order_product->getFormattedPrice().' EUR', 'pay_date'=>Carbon::parse($user->payment_account)->modify('- '.config('mivita.abo_booking_days').' days')->format('d.m.Y')]) }}
<hr>
@endif
--}}
<p>{{__('membership.home_copy_last_36', ['days'=>$user->daysActiveAccount(), 'datetime'=>$user->getPaymentAccountDateFormat()])}}</p>
@endif
@ -31,28 +33,32 @@
@elseif($user->daysActiveAccount() < config('mivita.remind_sec_days'))
{{-- 33 --}}
<h5 class="alert badge-warning">{{ __('membership.home_copy_alert_31', ['datetime'=>$user->getPaymentAccountDateFormat()]) }}</h5>
@if($user->payment_account && $user->isAboOption())
@if($user->daysActiveAccount() < config('mivita.abo_booking_days') )
{{-- Abo Option deaktiviert
@if($user->payment_account && $user->isAboOption())
@if($user->daysActiveAccount() < config('mivita.abo_booking_days') )
<p>{{ __('membership.home_copy_SEPA_33', ['price'=> 'von '.$user->payment_order_product->getFormattedPrice().' EUR', 'pay_date'=>Carbon::parse($user->payment_account)->modify('- '.config('mivita.abo_booking_days').' days')->format('d.m.Y')]) }}</p>
@else
<p>{{ __('membership.home_copy_SEPA_32', ['price'=> 'von '.$user->payment_order_product->getFormattedPrice().' EUR', 'pay_date'=>Carbon::parse($user->payment_account)->modify('- '.config('mivita.abo_booking_days').' days')->format('d.m.Y')]) }}</p>
@endif
<hr>
@endif
--}}
<p>{{__('membership.home_copy_last_33', ['days'=>$user->daysActiveAccount()])}}</p>
@else
{{-- 32 / 31 --}}
<h5 class="alert badge-default">{{ __('membership.home_copy_alert_31', ['datetime'=>$user->getPaymentAccountDateFormat()]) }}</h5>
@if($user->payment_account && $user->isAboOption())
{{-- Abo Option deaktiviert
@if($user->payment_account && $user->isAboOption())
{{ __('membership.home_copy_SEPA_32', ['price'=> 'von '.$user->payment_order_product->getFormattedPrice().' EUR', 'pay_date'=>Carbon::parse($user->payment_account)->modify('- '.config('mivita.abo_booking_days').' days')->format('d.m.Y')]) }}
<hr>
@endif
--}}
<p>{{__('membership.home_copy_last_31', ['days'=>$user->daysActiveAccount()])}}</p>
@endif
</div>
<div class="card-footer py-3">
<a href="{{route('user_membership')}}" class="btn btn-info mb-3"><i class="ion ion-ios-refresh text-default mr-1"></i> Mitgliedschaft jetzt hier verwalten</a>
<a href="{{route('user_membership')}}" class="btn btn-info mb-3"><i class="ion ion-ios-refresh text-default mr-1"></i> {{ __('home.manage_membership_now_here') }}</a>
</div>
</div>
</div>

25
resources/views/dashboard/_settings.blade.php
View file

@ -3,13 +3,13 @@
<div class="col-md-6">
<div class="card mb-4">
<h5 class="card-header with-elements">
<div class="card-header-title">{{ __('Daten') }}</div>
<div class="card-header-title">{{ __('home.data') }}</div>
</h5>
<div class="card-body">
@if ($user->active == 1)
<p>{{ __('Ändere Deine persönlichen Datan.') }}</p>
<p>{{ __('home.change_your_personal_data') }}</p>
<a href="{{ route('user_edit') }}" class="btn btn-secondary"><i
class="ion ion-ios-contact text-default mr-1"></i> {{ __('Adjust data') }}</a>
class="ion ion-ios-contact text-default mr-1"></i> {{ __('home.adjust_data') }}</a>
@endif
</div>
</div>
@ -18,16 +18,16 @@
<div class="col-md-6">
<div class="card mb-4">
<h5 class="card-header with-elements">
<div class="card-header-title">{{ __('Sicherheit') }}</div>
<div class="card-header-title">{{ __('home.security') }}</div>
</h5>
<div class="card-body">
@if ($user->active == 1)
@if (!$user->isPasswort())
<p>{{ __('Assign a password for your account.') }}</p>
<p>{{ __('home.create_your_personal_password') }}</p>
<a href="{{ route('user_update_password_first') }}" class="btn btn-submit"><i
class="ion ion-ios-lock text-default mr-1"></i> {{ __('Create Password') }}</a>
@else
<p>{{ __('Ändere Dein persönliches Passwort.') }}</p>
<p>{{ __('home.change_your_personal_password') }}</p>
<a href="{{ route('user_update_password') }}" class="btn btn-secondary"><i
class="ion ion-ios-lock text-default mr-1"></i> {{ __('Change password') }}</a>
@endif
@ -39,13 +39,13 @@
<div class="col-md-6">
<div class="card mb-4">
<h5 class="card-header with-elements">
<div class="card-header-title">{{ __('Anmeldung') }}</div>
<div class="card-header-title">{{ __('home.login') }}</div>
</h5>
<div class="card-body">
@if ($user->active == 1)
<p>{{ __('Ändere Deine E-Mail Adresse.') }}</p>
<p>{{ __('home.change_your_email_address') }}</p>
<a href="{{ route('user_update_email') }}" class="btn btn-secondary"><i
class="ion ion-ios-mail text-default mr-1"></i> {{ __('Change E-Mail') }}</a>
class="ion ion-ios-mail text-default mr-1"></i> {{ __('register.change_email') }}</a>
@endif
</div>
@ -55,13 +55,12 @@
<div class="col-md-6">
<div class="card mb-4">
<h5 class="card-header with-elements">
<div class="card-header-title">{{ __('Logout') }}</div>
<div class="card-header-title">{{ __('navigation.logout') }}</div>
</h5>
<div class="card-body">
<p>Abmelden und bis bald.</p>
</o>
<p> {{ __('home.log_out_and_see_you_soon') }}</p>
<a href="{{ route('logout') }}" class="btn btn-primary"><i
class="ion ion-ios-log-out text-default mr-1"></i> {{ __('Logout') }}</a>
class="ion ion-ios-log-out text-default mr-1"></i> {{ __('navigation.logout') }}</a>
</div>
</div>
</div>

18
resources/views/dashboard/_shop.blade.php
View file

@ -1,19 +1,19 @@
<div class="d-flex col-xl-6 align-items-stretch">
<div class="card w-100 mb-4">
<h5 class="card-header with-elements">
<div class="card-header-title">{{__('Your Shop') }}</div>
<div class="card-header-title">{{__('home.your_shop') }}</div>
</h5>
<div class="card-body">
@if($user->isActiveShop())
<div class="badge btn-success p-2">
<i class="ion ion-md-checkmark-circle-outline text-white"></i>
<strong>{{__('Berater-Online-Shop aktiv')}}</strong> {{__('bis zum')}}: <strong></strong>{{ $user->getPaymentShopDateFormat() }}</div>
<strong>{{__('home.adviser_onlineshop_active')}}</strong> {{__('home.until')}}: <strong></strong>{{ $user->getPaymentShopDateFormat() }}</div>
@else
<div class="badge badge-danger p-2">
<i class="ion ion-md-close-circle-outline text-white"></i>
<strong>{{__('Berater-Shop inaktiv')}}</strong>
<strong>{{__('home.adviser_onlineshop_inactive')}}</strong>
@if($user->payment_shop)
{{__('abgelaufen am')}}: <strong></strong>{{ $user->getPaymentShopDateFormat() }}
{{__('home.expired_on')}}: <strong></strong>{{ $user->getPaymentShopDateFormat() }}
@endif
</div>
@endif
@ -23,7 +23,7 @@
@if($user->isActiveShop())
@if($user->shop)
<p><span class="ion ion-md-checkmark-circle-outline text-success"></span>
<strong>{{__('open since')}}</strong> {{__('at')}} {{ $user->shop->getActiveDateFormat() }}</p>
<strong>{{__('home.open_since')}}</strong> {{__('home.at')}} {{ $user->shop->getActiveDateFormat() }}</p>
@if($user->shop->active)
<p><span class="ion ion-md-checkmark-circle-outline text-success"></span>
<strong>{{__('Status')}}</strong> {{ __('active') }}</p>
@ -31,26 +31,24 @@
<p><span class="ion ion-md-close-circle-outline text-danger"></span>
<strong>{{__('Status')}}</strong> {{ __('inactive') }}</p>
@endif
<div class="mb-2">
<a class="btn btn-default btn-sm" href="{{ $user->shop->getSubdomain(false) }}" target="_blank"><i class="ion ion-md-globe text-default mr-1"></i> {{ $user->shop->getSubdomain(false) }}</a>
</div>
<div>
<a class="btn btn-default btn-sm" href="{{route('user_shop_orders')}}" target="_self"><i class="ion ion-ios-cart text-default mr-1"></i> {{__('navigation.orders')}}</a>
</div>
@else
<a href="{{route('user_shop')}}" class="btn btn-secondary">{{__('open your shop')}}</a>
<a href="{{route('user_shop')}}" class="btn btn-secondary">{{__('home.open_your_shop')}}</a>
@endif
@else
<p><span class="ion ion-md-close-circle-outline text-danger"></span>
<strong>{{__('Shop nicht gebucht')}}</strong></p>
<strong>{{__('home.shop_not_booked')}}</strong></p>
@endif
@endif
</div>
@if($user->isActiveShop())
<div class="card-footer py-3">
<a href="{{route('user_shop')}}" class="btn btn-secondary"><i class="ion ion-ios-basket text-default mr-1"></i> {{__('settings your shop')}}</a>
<a href="{{route('user_shop')}}" class="btn btn-secondary"><i class="ion ion-ios-basket text-default mr-1"></i> {{__('home.settings_your_shop')}}</a>
</div>
@endif
</div>

2
resources/views/emails/_auth.blade.php
View file

@ -241,7 +241,7 @@
<tr>
<td style="color:#bbbbbb; font-size:12px;">
<p>{{__('email.footer_copy2')}}</p>
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
<a href="https://www.mivita.care/datenschutz">{{ __('dataprotect.data_protect') }}</a> <br>
<p>{{__('email.footer_copy3')}}</p>
<br>
<br>

2
resources/views/emails/_blank.blade.php
View file

@ -143,7 +143,7 @@
<tr>
<td style="color:#bbbbbb; font-size:12px; text-align: center;line-height:1.6em;" align="center">
<p>{{__('email.footer_copy2')}}</p>
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
<a href="https://www.mivita.care/datenschutz">{{ __('dataprotect.data_protect') }}</a> <br>
<p>{{__('email.footer_copy3')}}</p>
<br>
<br>

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

@ -209,7 +209,7 @@
<tr>
<td style="color:#bbbbbb; font-size:12px;padding:20px;line-height:1.6em" align="center">
<p>{{__('email.footer_copy2')}}</p>
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
<a href="https://www.mivita.care/datenschutz">{{ __('dataprotect.data_protect') }}</a> <br>
<p>{{__('email.footer_copy3')}}</p>
<br>
<br>

2
resources/views/emails/blank.blade.php
View file

@ -204,7 +204,7 @@
<tr>
<td style="color:#bbbbbb; font-size:12px; text-align: center;line-height:1.6em;" align="center">
<p>{{__('email.footer_copy2')}}</p>
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
<a href="https://www.mivita.care/datenschutz">{{ __('dataprotect.data_protect') }}</a> <br>
<p>{{__('email.footer_copy3')}}</p>
<br>
<br>

6
resources/views/emails/checkout.blade.php
View file

@ -244,8 +244,10 @@
<tr>
<td style="line-height:1.6em;">
<b>{{__('email.checkout_mail_pay_success')}} </b><br>
@if($shopping_payment)
{{__('email.checkout_mail_pay_with')}} {{$shopping_payment->getPaymentType()}}<br>
{{__('email.checkout_mail_pay_ref')}} {{$shopping_payment->reference}}<br>
@endif
{{__('email.checkout_mail_your_mail')}} {{ $shopping_order->shopping_user->billing_email }}<br>
</td>
</tr>
@ -472,7 +474,7 @@
<br>
Berater-ID: {{ $shopping_order->member->account->m_account }} <br>
@if($shopping_order->member->user_level)
Karriere-Level: {{ $shopping_order->member->user_level->name }} <br>
Karriere-Level: {{ $shopping_order->member->user_level->getLang('name') }} <br>
@endif
@endif
@ -504,7 +506,7 @@
<tr>
<td style="color:#bbbbbb; font-size:12px; text-align: center;line-height:1.6em;" align="center">
<p>{{__('email.footer_copy2')}}</p>
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
<a href="https://www.mivita.care/datenschutz">{{ __('dataprotect.data_protect') }}__('dataprotect.data_protect')</a> <br>
<p>{{__('email.footer_copy3')}}</p>
<br>
<br>

16
resources/views/emails/checkout_status.blade.php
View file

@ -165,12 +165,14 @@
{{__('email.checkout_mail_pay_pre_c1')}} {{ number_format( floatval($shopping_payment->amount/100), 2, ",", ".") }} {{__('email.checkout_mail_pay_pre_c2')}}<br>
<p>
@php($pay_trans = $shopping_payment->payment_transactions->where('request', 'authorization')->last())
<b>{{__('email.checkout_mail_bank_holder')}}</b> {{ $pay_trans->transmitted_data['clearing_bankaccountholder'] }} <br>
<b>{{__('email.checkout_mail_bank_iban')}}</b> {{ $pay_trans->transmitted_data['clearing_bankiban'] }} <br>
<b>{{__('email.checkout_mail_bank_bic')}}</b> {{ $pay_trans->transmitted_data['clearing_bankbic'] }} <br>
<b>{{__('email.checkout_mail_bank_name')}}</b> {{ $pay_trans->transmitted_data['clearing_bankname'] }} <br>
<b>{{__('email.checkout_mail_bank_total')}}</b> {{ number_format( (float) ($pay_trans->shopping_payment->amount/100), 2, ",", ".") }} EUR<br>
<b>{{__('email.checkout_mail_bank_code')}}</b> {{ $pay_trans->transmitted_data['txid'] }}
@if(isset($pay_trans->transmitted_data) && is_array($pay_trans->transmitted_data))
<b>{{__('email.checkout_mail_bank_holder')}}</b> @if(isset($pay_trans->transmitted_data['clearing_bankaccountholder'])){{ $pay_trans->transmitted_data['clearing_bankaccountholder'] }} @endif <br>
<b>{{__('email.checkout_mail_bank_iban')}}</b> @if(isset($pay_trans->transmitted_data['clearing_bankiban'])) {{ $pay_trans->transmitted_data['clearing_bankiban'] }} @endif<br>
<b>{{__('email.checkout_mail_bank_bic')}}</b> @if(isset($pay_trans->transmitted_data['clearing_bankbic'])) {{ $pay_trans->transmitted_data['clearing_bankbic'] }} @endif<br>
<b>{{__('email.checkout_mail_bank_name')}}</b> @if(isset($pay_trans->transmitted_data['clearing_bankname'])) {{ $pay_trans->transmitted_data['clearing_bankname'] }} @endif<br>
<b>{{__('email.checkout_mail_bank_total')}}</b> @if(isset($pay_trans->shopping_payment->amount)) {{ number_format( (float) ($pay_trans->shopping_payment->amount/100), 2, ",", ".") }} EUR @endif<br>
<b>{{__('email.checkout_mail_bank_code')}}</b> @if(isset($pay_trans->transmitted_data['txid'])) {{ $pay_trans->transmitted_data['txid'] }} @endif
@endif
</p>
<hr />
@else
@ -371,7 +373,7 @@
<tr>
<td style="color:#bbbbbb; font-size:12px; text-align: center;line-height:1.6em;" align="center">
<p>{{__('email.footer_copy2')}}</p>
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
<a href="https://www.mivita.care/datenschutz">{{ __('dataprotect.data_protect') }}</a> <br>
<p>{{__('email.footer_copy3')}}</p>
<br>
<br>

16
resources/views/emails/collection_detail.blade.php
View file

@ -1,9 +1,9 @@
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
<tr>
<th style="color:#43413f; text-align: left; vertical-align: top;line-height:1.2em;">Produkt</th>
<th style="color:#43413f; text-align: center; vertical-align: top;line-height:1.2em;">Netto-Preis</th>
<th style="color:#43413f; text-align: center; vertical-align: top;line-height:1.2em;">Anzahl</th>
<th style="color:#43413f; text-align: right; vertical-align: top;line-height:1.2em;">Summe</th>
<th style="color:#43413f; text-align: left; vertical-align: top;line-height:1.2em;">{{ __('tables.product') }}</th>
<th style="color:#43413f; text-align: center; vertical-align: top;line-height:1.2em;">{{ __('tables.net_price') }}</th>
<th style="color:#43413f; text-align: center; vertical-align: top;line-height:1.2em;">{{ __('tables.quantity') }}</th>
<th style="color:#43413f; text-align: right; vertical-align: top;line-height:1.2em;">{{ __('tables.sum') }}</th>
</tr>
@foreach($shopping_order->shopping_collect_order->shop_items as $key => $shop_item)
<tr>
@ -23,7 +23,7 @@
@endforeach
<tr>
<td style="color:#37302d; text-align: left; vertical-align:top; line-height:1.6em;">
Gesamte Versandkosten
{{ __('order.total_shipping_costs') }}
</td>
<td style="color:#37302d; text-align: center; vertical-align:top; line-height:1.6em;">
</td>
@ -41,7 +41,7 @@
</tr>
<tr>
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
Summe
{{ __('order.sum') }}
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
{{ formatNumber($shopping_order->shopping_collect_order->price_total_net) }} &euro;
@ -49,7 +49,7 @@
</tr>
<tr>
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
zzgl. MwSt:
{{ __('order.plus_VAT') }}:
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
{{ formatNumber($shopping_order->shopping_collect_order->tax_total) }} &euro;
@ -57,7 +57,7 @@
</tr>
<tr>
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
<b>Gesamtsumme Brutto:</b>
<b>{{ __('order.total_gross') }}:</b>
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
<b>{{ formatNumber($shopping_order->shopping_collect_order->price_total) }} &euro;</b>

2
resources/views/emails/contact.blade.php
View file

@ -202,7 +202,7 @@
<tr>
<td style="color:#bbbbbb; font-size:12px; text-align: center;line-height:1.6em;" align="center">
<p>{{__('email.footer_copy2')}}</p>
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
<a href="https://www.mivita.care/datenschutz">{{ __('dataprotect.data_protect') }}</a> <br>
<p>{{__('email.footer_copy3')}}</p>
<br>
<br>

2
resources/views/emails/custom.blade.php
View file

@ -236,7 +236,7 @@
<tr>
<td style="color:#bbbbbb; font-size:12px; text-align: center;line-height:1.6em;" align="center">
<p>{{__('email.footer_copy2')}}</p>
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
<a href="https://www.mivita.care/datenschutz">{{ __('dataprotect.data_protect') }}</a> <br>
<p>{{__('email.footer_copy3')}}</p>
<br>
<br>

340
resources/views/emails/custom_payment.blade.php Normal file
View file

@ -0,0 +1,340 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>mivita.care</title>
<style type="text/css">
img {
max-width: 600px;
outline: none;
text-decoration: none;
-ms-interpolation-mode: bicubic;
}
a {
text-decoration: none;
border: 0;
outline: none;
color: #919f7a;
}
a:hover {
color: #b6b600;
}
a img {
border: none;
}
td, h1, h2, h3 {
font-family: Helvetica, Verdana, Arial, sans-serif;
font-weight: 400;
}
td {
text-align: left;
}
body {
-webkit-font-smoothing: antialiased;
-webkit-text-size-adjust: none;
width: 100%;
height: 100%;
color: #37302d;
background: #ffffff;
font-size: 15px;
line-height: 26px
}
table {
border-collapse: separate !important;
}
.headline {
color: #37302d;
font-size: 18px;
}
.sub_headline {
color: #788662;
font-size: 15px;
}
.force-full-width {
width: 100% !important;
}
hr {
border: none;
border-top: 1px solid #b7c59e;
}
</style>
<style type="text/css" media="screen">
@media screen {
td, h1, h2, h3 {
font-family: Helvetica, Verdana, Arial, sans-serif;
}
}
</style>
<style type="text/css" media="only screen and (max-width: 480px)">
@media only screen and (max-width: 480px) {
table[class="w320"] {
width: 320px !important;
}
}
</style>
</head>
<body class="body" style="padding:0; margin:0; display:block; background:#f8f8f8; -webkit-text-size-adjust:none" bgcolor="#f8f8f8">
<div style="display: none; mso-hide: all; width: 0px; height: 0px; max-width: 0px; max-height: 0px; font-size: 0px; line-height: 0px;">
{{ $copy1line }}
</div>
<table align="left" cellpadding="0" cellspacing="0" width="100%" height="100%">
<tr>
<td align="left" valign="top" bgcolor="#f8f8f8" width="100%">
<br>
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="700" class="w320">
<tr>
<td align="left" valign="top">
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style=" text-align:center;">
<center>
<table width="100%" cellpadding="0" cellspacing="0" border="0" class="">
<tbody class="">
<tr class="">
<td align="center" valign="middle" style="font-size: 0px;" class="">
<center>
<picture style="text-align: center">
<img src="https://my.mivita.care/images/logo_mivita.png" alt="mivita.care" style="border:none" width="230">
</picture>
</center>
</td>
</tr>
<tr>
<td><br></td>
</tr>
</tbody>
</table>
</center>
</td>
</tr>
</table>
<table cellpadding="10" style="padding: 10px;" cellspacing="0" border="0" width="100%" bgcolor="#ffffff">
@if($mode === 'test' || $mode === 'dev')
<tr>
<td class="headline">
<b>##### TEST MODE ##### TEST MODE ##### TEST MODE #####</b>
</td>
</tr>
@endif
<tr>
<td class="headline">
<b>{{ $salutation }} </b>
</td>
</tr>
<tr>
<td style="color:#37302d;line-height:1.6em;">
{!! nl2br($copy1line) !!}
</td>
</tr>
@if($route)
<tr>
<td>
<center>
<table role="presentation" cellpadding="0" cellspacing="0" width="100%" border="0">
<tbody>
<tr>
<td style="word-wrap:break-word;background:transparent;font-size:0px;padding:10px 25px;padding-top:15px;padding-bottom:15px;padding-right:40px;padding-left:40px;" align="center" valign="top" background="data:image/gif;base64,">
<table role="presentation" cellpadding="0" cellspacing="0" align="center" border="0">
<tbody>
<tr>
<td style="border:none;border-radius:20px;color:#ffffff;cursor:auto;padding:15px 25px;" align="center" valign="middle" bgcolor="#b5c49b">
<p style="text-decoration:none;background:#b5c49b;color:#ffffff;font-family:Arial, sans-serif;font-size:13px;font-weight:normal;line-height:120%;text-transform:none;margin:0px;text-align: center">
<a href="{{ $route }}" style="color:#ffffff;font-size:14px;font-weight:bold;text-align:center;text-decoration:none;-webkit-text-size-adjust:none;">{{ __('email.button_custom_payout') }}</a>
</p>
</td>
</tr>
<tr>
<td style="color:#37302d;text-align: center">
<span style="color: #cabda9; font-weight: normal; font-size: 13px; text-decoration: underline; word-wrap: break-word;white-space: pre-line;">{{ $route }}</span>
</td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
</center>
</td>
</tr>
<tr>
<td>
<hr>
</td>
</tr>
@endif
<tr>
<td class="sub_headline">
<hr><br>
<b>{{__('email.checkout_custom_payout')}}:</b>
</td>
</tr>
<tr>
<td>
@include('emails.custom_payment_detail')
</td>
</tr>
<tr>
<td>
<hr>
</td>
</tr>
<tr>
<td>
<hr>
</td>
</tr>
<tr>
<td class="sub_headline">
<b>{{__('email.checkout_mail_invoice_addess')}}</b>
</td>
</tr>
<td style="color:#37302d;">
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="color:#37302d;line-height:1.6em;">
@if($shopping_user->billing_company)
{{ $shopping_user->billing_company }}<br>
@endif
{{ $shopping_user->billing_firstname }}
{{ $shopping_user->billing_lastname }} <br>
{{ $shopping_user->billing_address }} <br>
@if($shopping_user->billing_address_2)
{{ $shopping_user->billing_address_2 }}<br>
@endif
{{ $shopping_user->billing_zipcode }}
{{ $shopping_user->billing_city }} <br>
{{ $shopping_user->billing_country->getLocated() }} <br>
@if($shopping_user->billing_phone)
<br>{{ $shopping_user->billing_phone }}<br>
@endif
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="sub_headline" style="line-height:1.6em;">
<b>{{__('email.checkout_mail_deliver_addess')}}</b>
</td>
</tr>
<tr>
<td style="color:#37302d;">
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="color:#37302d;line-height:1.6em;">
@if($shopping_user->same_as_billing)
{{__('email.checkout_mail_same_address')}}
@else
@if($shopping_user->shipping_company)
{{ $shopping_user->shipping_company }}<br>
@endif
{{ $shopping_user->shipping_firstname }}
{{ $shopping_user->shipping_lastname }} <br>
{{ $shopping_user->shipping_address }} <br>
@if($shopping_user->shipping_address_2)
{{ $shopping_user->shipping_address_2 }}<br>
@endif
{{ $shopping_user->shipping_zipcode }}
{{ $shopping_user->shipping_city }} <br>
{{ $shopping_user->shipping_country->getLocated() }} <br>
@if($shopping_user->shipping_phone)
<br> {{ $shopping_user->shipping_phone }}<br>
@endif
@endif
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td>
<hr>
</td>
</tr>
<tr>
<td style="color:#37302d;font-size: 14px;line-height:1.6em;">
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="color:#37302d;line-height:1.6em;">
{{ $copy3line }}
<br>
@if($shopping_user->member)
@if($shopping_user->member->shop && $shopping_user->member->isActiveShop())
@if($shopping_user->member->shop->title)
<b>{{ $shopping_user->member->shop->title }}</b><br>
@endif
@if($shopping_user->member->shop->contact)
{!! nl2br($shopping_user->member->shop->contact) !!}<br>
@endif
<a href="{{ $shopping_user->member->shop->getSubdomain(true) }}">{{ $shopping_user->member->shop->getSubdomain(true) }}</a>
@else
Dein Berater: {{$shopping_user->member->getFullName()}}
@endif
@endif
<hr><br>
{{ $greetings }} <br><b>{{ $sender }}</b>
<br>
</td>
</tr>
<tr>
<td><br></td>
</tr>
</table>
</td>
</tr>
</table>
<center>
<table cellpadding="0" cellspacing="0" class="force-full-width"
bgcolor="#f8f8f8" style="margin: 0 auto; text-align: center">
<tr>
<td style="color:#7B7B7E; font-size:14px; text-align: center;line-height:1.6em;" align="center">
<p>
{{__('email.footer_copy1')}}
</p>
<br>
<a href="https://www.mivita.care" style="color: #7B7B7E; text-decoration: underline;">www.mivita.care</a>
<br>
</td>
</tr>
<tr>
<td style="color:#bbbbbb; font-size:12px; text-align: center;line-height:1.6em;" align="center">
<p>{{__('email.footer_copy2')}}</p>
<a href="https://www.mivita.care/datenschutz">{{ __('dataprotect.data_protect') }}__('dataprotect.data_protect')</a> <br>
<p>{{__('email.footer_copy3')}}</p>
<br>
<br>
</td>
</tr>
</table>
</center>
</td>
</tr>
</table>
</td>
</tr>
</table>
</body>
</html>

115
resources/views/emails/custom_payment_detail.blade.php Normal file
View file

@ -0,0 +1,115 @@
@if(isset($yard_shopping_items))
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
<tr>
<th style="color:#43413f; text-align: left; vertical-align: top;line-height:1.2em;">{{ __('tables.product') }}</th>
<th style="color:#43413f; text-align: center; vertical-align: top;line-height:1.2em;">
@if($yard_shopping_items['tax_free'])
{{ __('tables.net_price') }}
@else
{{ __('tables.price') }}
@endif
</th>
<th style="color:#43413f; text-align: center; vertical-align: top;line-height:1.2em;">{{ __('tables.quantity') }}</th>
<th style="color:#43413f; text-align: right; vertical-align: top;line-height:1.2em;">{{ __('tables.sum') }}</th>
</tr>
@foreach($yard_shopping_items['items'] as $items)
<tr>
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
{{ $items->name }}
</td>
<td style="color:#37302d; text-align: center; vertical-align: top;line-height:1.6em;">
@if($yard_shopping_items['tax_free'])
{{ Util::formatNumber($items->price_net) }} &euro;
@else
{{ Util::formatNumber($items->price) }} &euro;
@endif
</td>
<td style="color:#37302d; text-align: center; vertical-align: top; width: 10%;line-height:1.6em;">
{{ $items->qty }}
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
@if($yard_shopping_items['tax_free'])
{{ Util::formatNumber($items->price_net_total) }} &euro;
@else
{{ Util::formatNumber($items->price_total) }} &euro;
@endif
</td>
</tr>
@endforeach
<tr>
<td colspan="4">
<hr>
</td>
</tr>
<tr>
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
{{__('order.subtotal')}}
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
{{ $yard_shopping_items['total']['subtotal'] }} &euro;
</td>
</tr>
<tr>
<td colspan="4">
<hr>
</td>
</tr>
<tr>
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
{{__('Delivery country')}}
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
{{ $yard_shopping_items['total']['shippingCountryName'] }}
</td>
</tr>
<tr>
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
{{__('order.shipping_costs')}}
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
{{ $yard_shopping_items['total']['shippingNet'] }} &euro;
</td>
</tr>
<tr>
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
{{__('order.total_without_VAT')}}
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
{{ $yard_shopping_items['total']['subtotalWithShipping'] }} &euro;
</td>
</tr>
<tr>
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
{{__('order.plus_VAT')}}
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
{{ $yard_shopping_items['total']['taxWithShipping'] }} &euro;
</td>
</tr>
@if($yard_shopping_items['tax_free'])
<tr>
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
<b>{{__('order.total_net')}}</b>
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
<b>{{ $yard_shopping_items['total']['totalWithShipping'] }} &euro;</b>
<br>
<span style="font-size: 0.8em">{{__('email.checkout_mail_subtotal_ws')}}</span>
</td>
</tr>
@else
<tr>
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
<b>{{__('order.total_gross')}}</b>
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
<b>{{ $yard_shopping_items['total']['totalWithShipping'] }} &euro;</b>
<br>
<span style="font-size: 0.8em">{{__('email.checkout_mail_tax_info')}}</span>
</td>
</tr>
@endif
</table>
@endif

15
resources/views/emails/exception.blade.php Normal file
View file

@ -0,0 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>error on mivita.care</title>
<style type="text/css">
{!! $css !!}
</style>
</head>
<body>
{!! $content !!}
</body>
</html>

10
resources/views/emails/homeparty_detail_total.blade.php
View file

@ -4,8 +4,8 @@
<tr>
<th>Gesamt</th>
<th style="color:#37302d; text-align: right;">{{__('VK-Preis')}}</th>
<th style="color:#37302d; text-align: right;">{{__('EK-Preis')}}</th>
<th style="color:#37302d; text-align: right;">{{__('tables.vk_price')}}</th>
<th style="color:#37302d; text-align: right;">{{__('tables.ek_price')}}</th>
</tr>
@if($hp_order['is_bonus'])
<tr class="foot-small">
@ -17,7 +17,7 @@
@endif
<tr class="foot-small">
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
<strong>Gesamtsummen:</strong>
<strong>{{ __('order.total_sums') }}:</strong>
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;"><strong>{{ Util::formatNumber($hp_order['price'])}} &euro;</strong></td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;"><strong>{{ Util::formatNumber($hp_order['ek_price'])}} &euro;</strong></td>
@ -25,14 +25,14 @@
</tr>
<tr class="foot-small">
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
Summe ohne MwSt:
{{ __('order.total_without_VAT') }}:
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">{{ Util::formatNumber($hp_order['price_net'])}} &euro;</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">{{ Util::formatNumber($hp_order['ek_price_net'])}} &euro;</td>
</tr>
<tr class="foot-small" >
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
Enthaltene MwSt:
{{ __('order.included_VAT') }}:
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">{{ Util::formatNumber($hp_order['price']-$hp_order['price_net'])}} &euro;</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">{{ Util::formatNumber($hp_order['ek_price']-$hp_order['ek_price_net'])}} &euro;</td>

26
resources/views/emails/homeparty_detail_user.blade.php
View file

@ -3,18 +3,18 @@
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
<tr>
<th>{{__('Produkt')}}</th>
<th style="color:#37302d; text-align: right;">{{__('Anzahl')}}</th>
<th style="color:#37302d; text-align: right;">{{__('VK-Preis')}}</th>
<th style="color:#37302d; text-align: right;">{{__('EK-Preis')}}</th>
<th>{{__('tables.product')}}</th>
<th style="color:#37302d; text-align: right;">{{__('tables.quantity')}}</th>
<th style="color:#37302d; text-align: right;">{{__('tables.vk_price')}}</th>
<th style="color:#37302d; text-align: right;">{{__('tables.ek_price')}}</th>
</tr>
@foreach($homeparty_guest->homeparty_user_order_items as $value)
<tr>
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
<strong>{{ $value->product->name }}</strong><br>
Art.-Nr.: {{ $value->product->number }}
<strong>{{ $value->product->getLang('name') }}</strong><br>
{{ __('order.art_no') }}: {{ $value->product->number }}
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
{{$value->qty}}
@ -35,37 +35,37 @@
<tr>
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
@if($homeparty_guest->getDelivery() === 'host')
Lieferung an Gastgeber
{{ __('homeparty.delivery_to_host') }}
@endif
@if($homeparty_guest->getDelivery() === 'direct')
Lieferung direkt an den Gast
{{ __('homeparty.delivery_directly_to_the_guest') }}
@endif
</td>
</tr>
@if($homeparty_guest->getDelivery() === 'direct')
<tr>
<td colspan="2" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">Versandkosten</td>
<td colspan="2" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">{{ __('order.shipping_costs') }}</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">{{ Util::formatNumber($user_cart['shipping_price'])}} &euro;</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">{{ Util::formatNumber($user_cart['shipping_price'])}} &euro;</td>
</tr>
@endif
<tr>
<td colspan="2" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;"><strong>Gesamt:</strong></td>
<td colspan="2" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;"><strong>{{ __('order.total') }}:</strong></td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;"><strong>{{Util::formatNumber($user_cart['price'])}} &euro;</strong></td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;"><strong>{{Util::formatNumber($user_cart['ek_price'])}} &euro;</strong></td>
</tr>
@else
@if($hp_order['is_bonus'])
<tr>
<td colspan="2" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">Gutschrift Homeparty Gutschein</td>
<td colspan="2" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">{{ __('homeparty.credit_homeparty_voucher') }}</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">- {{ Util::formatNumber($hp_order['bonus_value']) }} &euro;</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">- {{ Util::formatNumber($hp_order['bonus_value']) }} &euro;</td>
</tr>
@endif
@if($hp_order['is_bonus_coupon'])
<tr>
<td colspan="2" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">Gutschrift Bonus</td>
<td colspan="2" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">{{ __('homeparty.credit_bonus') }}</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">- {{ Util::formatNumber($hp_order['bonus_coupon']) }} &euro;</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">- {{ Util::formatNumber($hp_order['bonus_coupon']) }} &euro;</td>
</tr>
@ -74,7 +74,7 @@
@endif
<tr>
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">Versandkosten:</td>
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">{{ __('order.shipping_costs') }}:</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">{{Util::formatNumber($user_cart['shipping_price'])}} &euro;</td>
</tr>
<tr>

2
resources/views/emails/info.blade.php
View file

@ -196,7 +196,7 @@
<tr>
<td style="color:#bbbbbb; font-size:12px; text-align: center;line-height:1.6em;" align="center">
<p>{{__('email.footer_copy2')}}</p>
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
<a href="https://www.mivita.care/datenschutz">{{ __('dataprotect.data_protect') }}</a> <br>
<p>{{__('email.footer_copy3')}}</p>
<br>
<br>

12
resources/views/emails/shopping_order_detail.blade.php
View file

@ -1,20 +1,20 @@
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
<tr>
<th style="color:#43413f; text-align: left; vertical-align: top;line-height:1.2em;">Produkt</th>
<th style="color:#43413f; text-align: left; vertical-align: top;line-height:1.2em;">{{ __('tables.product') }}</th>
<th style="color:#43413f; text-align: center; vertical-align: top;line-height:1.2em;">
@if($shopping_order->shopping_user->is_from === 'user_order')
Netto-Preis
{{ __('tables.net_price') }}
@else
Preis
{{ __('tables.price') }}
@endif
</th>
<th style="color:#43413f; text-align: center; vertical-align: top;line-height:1.2em;">Anzahl</th>
<th style="color:#43413f; text-align: right; vertical-align: top;line-height:1.2em;">Summe</th>
<th style="color:#43413f; text-align: center; vertical-align: top;line-height:1.2em;">{{ __('tables.quantity') }}</th>
<th style="color:#43413f; text-align: right; vertical-align: top;line-height:1.2em;">{{ __('tables.sum') }}</th>
</tr>
@foreach($shopping_order->shopping_order_items as $shopping_order_item)
<tr>
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
{{ $shopping_order_item->product->name }}
{{ $shopping_order_item->product->getLang('name') }}
</td>
<td style="color:#37302d; text-align: center; vertical-align: top;line-height:1.6em;">
@if($shopping_order->shopping_user->is_from === 'user_order')

2
resources/views/emails/sys.blade.php
View file

@ -161,7 +161,7 @@
<tr>
<td style="color:#bbbbbb; font-size:12px; text-align: center;line-height:1.6em;" align="center">
<p>{{__('email.footer_copy2')}}</p>
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
<a href="https://www.mivita.care/datenschutz">klärung</a> <br>
<p>{{__('email.footer_copy3')}}</p>
<br>
<br>

5
resources/views/errors/401.blade.php Normal file
View file

@ -0,0 +1,5 @@
@extends('errors::layout')
@section('title', __('Unauthorized'))
@section('code', '401')
@section('message', __('Unauthorized'))

5
resources/views/errors/403.blade.php Normal file
View file

@ -0,0 +1,5 @@
@extends('errors::layout')
@section('title', __('Forbidden'))
@section('code', '403')
@section('message', __($exception->getMessage() ?: 'Forbidden'))

5
resources/views/errors/404.blade.php Normal file
View file

@ -0,0 +1,5 @@
@extends('errors::layout')
@section('title', __('Not Found'))
@section('code', '404')
@section('message', __('Not Found'))

5
resources/views/errors/419.blade.php Normal file
View file

@ -0,0 +1,5 @@
@extends('errors::layout')
@section('title', __('Page Expired'))
@section('code', '419')
@section('message', __('Page Expired'))

5
resources/views/errors/429.blade.php Normal file
View file

@ -0,0 +1,5 @@
@extends('errors::layout')
@section('title', __('Too Many Requests'))
@section('code', '429')
@section('message', __('Too Many Requests'))

Some files were not shown because too many files have changed in this diff Show more