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

Registierung Korrekturen

Browse source
This commit is contained in:
Kevin Adametz 2020-04-29 20:06:51 +02:00
parent 8e4bb0c2f6
commit d8b5206031
70 changed files with 1192 additions and 569 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,16 +31,8 @@
<a href="{{ route('admin_leads') }}" class="btn btn-default">{{ __('back') }}</a>
</div>
@if($m_data_load)
@include('admin.lead.m_data_form_edit')
@endif
@include('admin.lead.m_register_data')
@if(!$m_data_load)
@include('admin.lead.m_data_form')
@endif
@if(!$user->id || $user->id === 'new')
@include('user.user_new_form')
@include('user.data_verify')
@ -62,20 +54,20 @@
<form class="modal-content" action="{{route('admin_lead_edit', [$user->id])}}?show={{$show}}" method="post">
@csrf
<div class="modal-header">
<h5 class="modal-title"> {{__('Inhalte mivita')}} <span class="font-weight-light">{{__('create/edit')}}</span></h5>
<h5 class="modal-title"> {{__('Daten mivita')}} <span class="font-weight-light">{{__('edit')}}</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">
<label for="name" class="form-label">{{__('Passwort')}}</label>
<label for="name" class="form-label">{{__('Passwort eingeben')}}</label>
<input type="text" class="form-control" name="edit_m_data_key" placeholder="mivita">
</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">{{__('save')}}</button>
<button type="submit" class="btn btn-primary">{{__('öffnen')}}</button>
</div>
</form>
</div>

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

@ -9,22 +9,12 @@
</div>
</div>
@endif
<div class="card mb-4">
<h5 class="card-header">
<a href="#" class="@if($show !== 'check_lead') collapsed @endif" data-toggle="collapse" data-target="#collapseMDataForm" aria-expanded="@if($show !== 'check_lead') false @else true @endif" aria-controls="collapseMDataForm">
<i class="fa fa-caret-expand"></i> {{ __('mivita interne Daten') }}
</a>
<div class="card-body">
<div class="float-right">
<button type="button" class="btn icon-btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-edit-m-data">
<span class="far fa-edit"></span>
<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
</button>
</div>
</h5>
<div class="collapse @if($show === 'check_lead') show @endif" id="collapseMDataForm">
<div class="card-body mb-4 pb-1">
<div class="table-responsive">
<table class="table card-table m-0">
<tbody>
@ -54,6 +44,6 @@
</table>
</div>
</div>
</div>
</div>

14
resources/views/admin/lead/m_data_form_edit.blade.php
View file

@ -1,14 +1,11 @@
<div class="card mb-4">
<h5 class="card-header">
{{ __('mivita interne Daten') }}
</h5>
<input type="hidden" name="m_data_edit" value="TSOK">
<input type="hidden" name="m_data_edit" value="TSOK">
<div class="card-body">
<div class="form-row">
<div class="form-group col-md-4">
<label for="m_account" class="form-label">{{ __('Account ID') }}</label>
{{ Form::text('m_account', $user->account->m_account, array('placeholder'=>__(' Account ID'), 'class'=>'form-control', 'id'=>'m_account')) }}
<label for="m_account" class="form-label">{{ __('Account ID') }} (unique)</label>
<span class="badge badge-secondary float-right">Nächste freie ID: {{$next_account_id}}</span>
{{ Form::text('m_account', $user->account->m_account, array('placeholder'=>__('Account ID'), 'class'=>'form-control', 'id'=>'m_account')) }}
</div>
<div class="form-group col-md-4">
<label class="form-label">{{ __('Karriere-Level') }}</label>
@ -47,7 +44,6 @@
<div class="text-left mt-3">
<button type="submit" class="btn btn-submit btn-primary">{{ __('save') }}</button>&nbsp;
</div>
<hr>
</div>
</div>

48
resources/views/admin/lead/m_register_data.blade.php
View file

@ -1,13 +1,20 @@
<div class="card mb-4">
<div class="card mb-4">
<h5 class="card-header">
<a href="#" class="@if($show !== 'check_lead') collapsed @endif" data-toggle="collapse" data-target="#collapseMRegister" aria-expanded="@if($show !== 'check_lead') false @else true @endif" aria-controls="collapseMRegister">
<i class="fa fa-caret-expand"></i> {{__('Activities') }}
<a href="#" class="@if($show !== 'check_lead' || !$m_data_load) collapsed @endif" data-toggle="collapse" data-target="#collapseMRegister" aria-expanded="@if($show !== 'check_lead' || !$m_data_load) false @else true @endif" aria-controls="collapseMRegister">
<i class="fa fa-caret-expand"></i> {{__('Berater Status') }}
</a>
</h5>
<div class="collapse @if($show === 'check_lead') show @endif" id="collapseMRegister">
<div class="collapse @if($show === 'check_lead' || $m_data_load) show @endif" id="collapseMRegister">
@if($m_data_load)
@include('admin.lead.m_data_form_edit')
@endif
@if(!$m_data_load)
@include('admin.lead.m_data_form')
@endif
<div class="card-body mb-2 pb-1">
<div class="card-body mb-2 pb-1">
<div class="row">
<div class="col-sm-6">
@if($user->payment_shop)
@ -69,11 +76,10 @@
<hr>
@if($user->release_account)
<strong>Registrierung abgeschlossen {{ $user->getReleaseAccountFormat() }}</strong><br>
<a href="{{route('admin_lead_released', ['completed', $user->id])}}" class="btn btn-info" onclick="return confirm('Alle Daten vollständig und Berater freischalten?');">Daten vollständigt => Berater freischalten</a>
<a href="{{route('admin_lead_released', ['completed', $user->id])}}" class="btn btn-success" onclick="return confirm('Alle Daten vollständig und Berater freischalten?');">Die Daten sind vollständigt => Berater freischalten</a>
<button type="button" class="btn btn-sm btn-danger float-right" data-toggle="modal" data-target="#modals-register-m-data">
nicht vollständigt => E-Mail senden
Berater eine E-Mail senden => Daten nicht vollständigt
</button>
@else
<strong><span class="text-danger">Berater muss Registrierung noch abschließen</span></strong>
@endif
@ -81,9 +87,6 @@
</div>
</div>
<hr>
</div>
@if($user->files->count())
<div class="card-body mb-4 pb-1">
@ -119,6 +122,29 @@
</table>
</div>
<hr>
@if($user->account_id)
@if($user->account->getNotice('business_license') === 'later')
<div class="row">
<div class="col-12">
<div class="bg-warning rounded py-2 px-3">
{{__('register.business_license_later')}}
</div>
</div>
</div>
@endif
@if($user->account->getNotice('business_license') === 'non')
<div class="row">
<div class="col-12">
<div class="bg-warning rounded py-2 px-3">
<div class="font-weight-semibold mb-1">{{__('register.business_license_non')}}</div>
<em>{{$user->account->getNotice('business_license_reason')}}</em>
</div>
</div>
</div>
@endif
@endif
<div class="table-responsive">
<table class="table card-table m-0">
<tbody>

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

@ -2,22 +2,30 @@
@section('content')
<div class="card">
<h6 class="card-header">
{{__('Produkte')}}
<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(Auth::user()->getSetting('show_active_products') === "true") checked @endif>
<span class="custom-control-label font-style-normal font-weight-normal">nur aktive anzeigen</span>
</label>
</h6>
<div class="card-datatable table-responsive">
<table class="datatables-style table table-striped table-bordered">
<table class="datatables-product table table-striped table-bordered">
<thead>
<tr>
<th style="max-width: 60px;">&nbsp;</th>
<th>{{__('Pos')}}</th>
<th>{{__('Bild')}}</th>
<th>{{__('Name')}}</th>
<th>{{__('Artikelnummer')}}</th>
<th>{{__('Kategorie')}}</th>
<th>{{__('Points')}}</th>
<th>{{__('Preis')}}</th>
<th>{{__('Inhalt')}}</th>
<th>{{__('Einheit')}}</th>
<th>{{__('Grundpreis')}}</th>
<th>{{__('Gewicht')}}</th>
<th>{{__('Status')}}</th>
<th></th>
</tr>
@ -36,16 +44,19 @@
<img class="img-fluid" alt="" style="max-height: 80px" src="{{ route('product_image', [$value->images->first()->slug]) }}">
@endif
</td>
<td>{{ $value->name }}</td>
<td>{{ $value->name }}</td>
<td>{{ $value->number }}</td>
<td>
@foreach($value->categories as $category)
{{ $category->category->name }}
<div style="white-space: nowrap">{{ $category->category->name }}</div>
@endforeach
</td>
<td>{{ $value->points }}</td>
<td>{{ $value->getFormattedPrice() }}</td>
<td>{{ $value->contents_total }}</td>
<td>{{ $value->getUnitType() }}</td>
<td>{{ $value->getBasePriceFormatted() }}</td>
<td>{{ $value->weight }}</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-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>
@ -63,23 +74,22 @@
<script>
$( document ).ready(function() {
$('.datatables-style').dataTable({
$('.datatables-product').dataTable({
"bLengthChange": false,
"iDisplayLength": 50,
"aoColumns": [
{ "sWidth": "6%" },
{ "sWidth": "8%" },
{ "sWidth": "19%" },
{ "sWidth": "19%" },
{ "sWidth": "30%" },
{ "sWidth": "10%" },
{ "sWidth": "10%" },
],
"language": {
"url": "/js/German.json"
}
});
$('.show-active-products').on('change', function () {
console.log($(this));
console.log($(this).prop('checked'));
document.location.search = $(this).attr('name')+"="+$(this).prop('checked');
// window.location.reload(true);
})
});
</script>
@endsection

15
resources/views/admin/sales/customer_detail.blade.php Normal file
View file

@ -0,0 +1,15 @@
@extends('layouts.layout-2')
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Bestellung Kunde') }}
</h4>
<div class="card">
<p>Ansicht Bestellung</p>
</div>
@endsection

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

@ -4,7 +4,7 @@
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Bestellungen Berater') }}
{{ __('Bestellungen Kunden') }}
</h4>

14
resources/views/admin/sales/user_detail.blade.php Normal file
View file

@ -0,0 +1,14 @@
@extends('layouts.layout-2')
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Bestellung Berater') }}
</h4>
<div class="card">
<p>Ansicht Bestellung</p>
</div>
@endsection

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

@ -4,10 +4,9 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>mivita</title>
<title>mivita.care</title>
<style type="text/css">
@import url(https://fonts.googleapis.com/css?family=Roboto);
img {
max-width: 600px;
outline: none;
@ -19,18 +18,17 @@
text-decoration: none;
border: 0;
outline: none;
color: #b5c49b;
color: #919f7a;
}
a:hover {
color:#d7d700;
color: #b6b600;
}
a img {
border: none;
}
td, h1, h2, h3 {
font-family: "Roboto", Helvetica, Arial, sans-serif;
font-family: Helvetica, Verdana, Arial, sans-serif;
font-weight: 400;
}
@ -54,7 +52,7 @@
}
.headline {
color: #b5c49b;
color: #37302d;
font-size: 16px;
}
@ -69,7 +67,7 @@
@media screen {
/*Thanks Outlook 2013! http://goo.gl/XLxpyl*/
td, h1, h2, h3 {
font-family: 'Roboto', 'Helvetica Neue', 'Arial', 'sans-serif' !important;
font-family: Helvetica, Verdana, Arial, sans-serif;
}
}
</style>
@ -97,7 +95,12 @@
<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 }}
@if(isset($copy1line))
{{ strip_tags($copy1line) }}
@endif
@if(isset($content))
{{ strip_tags($content) }}
@endif
</div>
<table align="center" cellpadding="0" cellspacing="0" width="100%" height="100%">
@ -118,7 +121,7 @@
<tr class="">
<td align="center" valign="top" style="font-size: 0px;" class="">
<picture class="">
<img src="https://mein.mivita.care/images/logo_mivita.png" alt="mivita.care" style="border:none" width="230">
<img src="https://my.mivita.care/images/logo_mivita.png" alt="mivita.care" style="border:none" width="230">
</picture>
</td>
@ -141,6 +144,7 @@
<b>{{ $salutation }} </b>
</td>
</tr>
@if(isset($copy1line))
<tr>
<td>
<center>
@ -148,7 +152,7 @@
<tr>
<td style="color:#37302d;">
<br>
{{ $copy1line }}
{!! nl2br($copy1line) !!}
<br>
<br>
</td>
@ -157,6 +161,20 @@
</center>
</td>
</tr>
@endif
@if(isset($content))
<tr>
<td>
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="2" cellspacing="0" width="100%">
<tr>
<td>
{!! nl2br($content) !!}
</td>
</tr>
</table>
</td>
</tr>
@endif
<tr>
<td>
<center>
@ -189,10 +207,11 @@
<td style="color:#37302d;">
<br>
{{ $copy2line }}<br>
<span style="color: #cabda9; font-weight: normal; font-size: 13px; text-decoration: underline; word-wrap: break-word;">{{ $url }}</span>
<span style="color: #cabda9; font-weight: normal; font-size: 13px; text-decoration: underline; word-wrap: break-word;white-space: pre-line;">{{ $url }}</span>
<br><br>
{{ $greetings }} <br><b>Ihr Team von mivita</b>
<br>
{{ $copy3line }}
<br><br>
{{ $greetings }} <br><b>{{ $sender }}</b>
<br>
</td>
</tr>
@ -208,13 +227,12 @@
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" class="force-full-width"
bgcolor="#f8f8f8" style="margin: 0 auto">
bgcolor="#f8f8f8">
<tr>
<td style="color:#7B7B7E; font-size:14px;">
<br>
mivita e.K. | Leinfeld 2 | 87755 Kirchhaslach<br>
Telefon: +49 (0) 8333 946 98 90 | Fax: +49 (0) 8333 7268<br>
E-Mail: info@mivita.care<br></p>
<p>
{{__('email.footer_copy1')}}
</p>
<br>
<a href="https://www.mivita.care" style="color: #7B7B7E; text-decoration: underline;">www.mivita.care</a>
<br>
@ -222,13 +240,10 @@
</tr>
<tr>
<td style="color:#bbbbbb; font-size:12px;">
<p>Geschäftsinhaber: Alois Ried | Registergericht: Memmingen<br>
Registernummer: HRA 12236 | USt-ID-Nr.: DE 244162340</p>
<p>{{__('email.footer_copy2')}}</p>
<a href="https://www.mivita.care/datenschutz">Datenschutzerklärung</a> <br>
© 2018 All Rights Reserved <br>
<p>{{__('email.footer_copy3')}}</p>
<br>
<br>
</td>
</tr>

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

@ -59,38 +59,7 @@
.force-full-width {
width: 100% !important;
}
</style>
<style type="text/css" media="screen">
@media screen {
/*Thanks Outlook 2013! http://goo.gl/XLxpyl*/
td, h1, h2, h3 {
font-family: Helvetica, Verdana, Arial, sans-serif;
}
}
</style>
<style type="text/css" media="only screen and (max-width: 480px)">
/* Mobile styles */
@media only screen and (max-width: 480px) {
table[class="w320"] {
width: 320px !important;
}
}
</style>
<!--[if mso]>
<style type="text/css">
body, table, td {
font-family: Helvetica, Arial, sans-serif !important;
}
</style>
<![endif]-->
</head>
<body class="body" style="padding:0; margin:0; display:block; background:#f8f8f8; -webkit-text-size-adjust:none" bgcolor="#f8f8f8">
@ -111,7 +80,6 @@
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="700" class="w320">
<tr>
<td align="center" valign="top">
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style=" text-align:center;">
@ -139,7 +107,7 @@
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="100%"
bgcolor="#ffffff">
<tr>
<td class="headline">
<td class="headline" align="center">
<br><br>
<b>{{ $salutation }} </b>
</td>
@ -150,7 +118,7 @@
<center>
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="90%">
<tr>
<td style="color:#37302d;">
<td style="color:#37302d;line-height:1.6em;" align="center">
<br>
{!! nl2br($copy1line) !!}
<br>
@ -165,7 +133,7 @@
@if(isset($content))
<tr>
<td>
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="2" cellspacing="0" width="100%">
<table style="padding: 20px;line-height:1.6em; border:1px solid #eee; background-color: #f6fdf5" cellpadding="2" cellspacing="0" align="center" width="100%">
<tr>
<td>
{!! nl2br($content) !!}
@ -204,7 +172,7 @@
<center>
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="90%">
<tr>
<td style="color:#37302d;">
<td style="color:#37302d;padding:20px;line-height:1.6em" align="center">
<br>
{{ $copy2line }}<br>
<span style="color: #cabda9; font-weight: normal; font-size: 13px; text-decoration: underline; word-wrap: break-word;white-space: pre-line;">{{ $url }}</span>
@ -229,7 +197,7 @@
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" class="force-full-width"
bgcolor="#f8f8f8">
<tr>
<td style="color:#7B7B7E; font-size:14px;">
<td style="color:#7B7B7E; font-size:14px;padding:20px;line-height:1.6em" align="center">
<p>
{{__('email.footer_copy1')}}
</p>
@ -239,7 +207,7 @@
</td>
</tr>
<tr>
<td style="color:#bbbbbb; font-size:12px;">
<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>
<p>{{__('email.footer_copy3')}}</p>

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

@ -71,18 +71,14 @@
}
</style>
<style type="text/css" media="screen">
@media screen {
/*Thanks Outlook 2013! http://goo.gl/XLxpyl*/
td, h1, h2, h3 {
font-family: Helvetica, Verdana, Arial, sans-serif;
}
}
</style>
<style type="text/css" media="only screen and (max-width: 480px)">
/* Mobile styles */
@media only screen and (max-width: 480px) {
table[class="w320"] {
@ -91,15 +87,6 @@
}
</style>
<!--[if mso]>
<style type="text/css">
body, table, td {
font-family: Helvetica, Arial, sans-serif !important;
}
</style>
<![endif]-->
</head>
<body class="body" style="padding:0; margin:0; display:block; background:#f8f8f8; -webkit-text-size-adjust:none" bgcolor="#f8f8f8">
@ -154,7 +141,7 @@
</td>
</tr>
<tr>
<td style="color:#37302d;">
<td style="color:#37302d;line-height:1.6em;">
{!! nl2br($copy1line) !!}
</td>
</tr>
@ -167,16 +154,16 @@
</tr>
<tr>
<td>
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="2" cellspacing="0" width="100%">
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
@foreach($shopping_order->shopping_order_items as $shopping_order_item)
<tr>
<td style="color:#37302d; text-align: left; vertical-align: top; width: 10%; " >
<td style="color:#37302d; text-align: left; vertical-align: top; width: 10%;line-height:1.6em;">
{{ $shopping_order_item->qty }} x
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;">
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
{{ $shopping_order_item->product->name }}
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;">
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
{{ $shopping_order_item->getFormattedPrice() }} EUR
</td>
</tr>
@ -187,13 +174,13 @@
</td>
</tr>
<tr>
<td style="color:#37302d; text-align: left; vertical-align: top;">
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
&nbsp;
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;">
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
{{__('email.checkout_mail_shipping')}}
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;">
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
{{ $shopping_order->getFormattedShipping() }} EUR
</td>
</tr>
@ -203,13 +190,13 @@
</td>
</tr>
<tr>
<td style="color:#37302d; text-align: left; vertical-align: top;">
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
&nbsp;
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;">
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
<b>{{__('email.checkout_mail_total')}}</b>
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;">
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
<b>{{ $shopping_order->getFormattedTotalShipping() }} EUR</b>
</td>
</tr>
@ -260,15 +247,15 @@
</tr>
@endif
<tr>
<td class="sub_headline">
<td class="sub_headline" style="line-height:1.6em;">
<b>{{__('email.checkout_mail_pay_info')}}</b>
</td>
</tr>
<tr>
<td>
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="2" cellspacing="0" width="100%">
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
<tr>
<td>
<td style="line-height:1.6em;">
<b>{{__('email.checkout_mail_pay_success')}} </b><br>
{{__('email.checkout_mail_pay_with')}} {{$shopping_payment->getPaymentType()}}<br>
{{__('email.checkout_mail_pay_ref')}} {{$shopping_payment->reference}}<br>
@ -290,9 +277,9 @@
<tr>
<td style="color:#37302d; ">
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="0" cellspacing="0" width="100%">
<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;">
<td style="color:#37302d;line-height:1.6em;">
@if($shopping_order->shopping_user->billing_company)
{{ $shopping_order->shopping_user->billing_company }}<br>
@endif
@ -321,15 +308,15 @@
<tr>
<td class="sub_headline">
<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" cellpadding="0" cellspacing="0" width="100%">
<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;">
<td style="color:#37302d;line-height:1.6em;">
@if($shopping_order->shopping_user->same_as_billing)
{{__('email.checkout_mail_same_address')}}
@else
@ -368,10 +355,10 @@
</td>
</tr>
<tr>
<td style="color:#37302d;font-size: 14px;">
<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;">
<td style="color:#37302d;line-height:1.6em;">
{{ $copy3line }}
<br>
@if($shopping_order->user_shop)
@ -381,7 +368,7 @@
@if($shopping_order->user_shop->contact)
{!! nl2br($shopping_order->user_shop->contact) !!}<br>
@endif
<a href="{{ $shopping_order->user_shop->getSubdomain() }}">{{ $shopping_order->user_shop->getSubdomain() }}</a>
<a href="{{ $shopping_order->user_shop->getSubdomain(true) }}">{{ $shopping_order->user_shop->getSubdomain(true) }}</a>
@endif
<hr><br>
@ -400,7 +387,7 @@
<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">
<td style="color:#7B7B7E; font-size:14px; text-align: center;line-height:1.6em;" align="center">
<p>
{{__('email.footer_copy1')}}
</p>
@ -410,7 +397,7 @@
</td>
</tr>
<tr>
<td style="color:#bbbbbb; font-size:12px; text-align: center">
<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>
<p>{{__('email.footer_copy3')}}</p>

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

@ -71,18 +71,14 @@
}
</style>
<style type="text/css" media="screen">
@media screen {
/*Thanks Outlook 2013! http://goo.gl/XLxpyl*/
td, h1, h2, h3 {
font-family: Helvetica, Verdana, Arial, sans-serif;
}
}
</style>
<style type="text/css" media="only screen and (max-width: 480px)">
/* Mobile styles */
@media only screen and (max-width: 480px) {
table[class="w320"] {
@ -91,15 +87,6 @@
}
</style>
<!--[if mso]>
<style type="text/css">
body, table, td {
font-family: Helvetica, Arial, sans-serif !important;
}
</style>
<![endif]-->
</head>
<body class="body" style="padding:0; margin:0; display:block; background:#f8f8f8; -webkit-text-size-adjust:none" bgcolor="#f8f8f8">
@ -154,7 +141,7 @@
</td>
</tr>
<tr>
<td style="color:#37302d;">
<td style="color:#37302d;line-height:1.6em;">
{!! nl2br($copy1line) !!}
</td>
</tr>
@ -166,9 +153,9 @@
</tr>
<tr>
<td>
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="2" cellspacing="0" width="100%">
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
<tr>
<td>
<td style="line-height:1.6em;">
@if($txaction == 'failed')
<b>{{__('email.checkout_mail_pay_error')}}</b><br>
@elseif($txaction == 'appointed')
@ -212,16 +199,16 @@
</tr>
<tr>
<td>
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="2" cellspacing="0" width="100%">
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
@foreach($shopping_order->shopping_order_items as $shopping_order_item)
<tr>
<td style="color:#37302d; text-align: left; vertical-align: top; width: 10%; " >
<td style="color:#37302d; text-align: left; vertical-align: top; width: 10%;line-height:1.6em;">
{{ $shopping_order_item->qty }} x
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;">
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
{{ $shopping_order_item->product->name }}
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;">
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
{{ $shopping_order_item->getFormattedPrice() }} EUR
</td>
</tr>
@ -232,13 +219,13 @@
</td>
</tr>
<tr>
<td style="color:#37302d; text-align: left; vertical-align: top;">
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
&nbsp;
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;">
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
{{__('email.checkout_mail_shipping')}}
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;">
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
{{ $shopping_order->getFormattedShipping() }} EUR
</td>
</tr>
@ -248,13 +235,13 @@
</td>
</tr>
<tr>
<td style="color:#37302d; text-align: left; vertical-align: top;">
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
&nbsp;
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;">
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
<b>{{__('email.checkout_mail_total')}}</b>
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;">
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
<b>{{ $shopping_order->getFormattedTotalShipping() }} EUR</b>
</td>
</tr>
@ -276,7 +263,7 @@
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="color:#37302d;">
<td style="color:#37302d;line-height:1.6em;">
@if($shopping_order->shopping_user->billing_company)
{{ $shopping_order->shopping_user->billing_company }}<br>
@endif
@ -317,7 +304,7 @@
<td style="color:#37302d;">
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="color:#37302d;">
<td style="color:#37302d;line-height:1.6em;">
@if($shopping_order->shopping_user->same_as_billing)
{{__('email.checkout_mail_same_address')}}
@else
@ -359,7 +346,7 @@
<td style="color:#37302d;font-size: 14px;">
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="color:#37302d;">
<td style="color:#37302d;line-height:1.6em;">
{{ $copy3line }}
<br>
@ -370,7 +357,7 @@
@if($shopping_order->user_shop->contact)
{!! nl2br($shopping_order->user_shop->contact) !!}<br>
@endif
<a href="{{ $shopping_order->user_shop->getSubdomain() }}">{{ $shopping_order->user_shop->getSubdomain() }}</a>
<a href="{{ $shopping_order->user_shop->getSubdomain(true) }}">{{ $shopping_order->user_shop->getSubdomain(true) }}</a>
@endif
<hr><br>
@ -389,7 +376,7 @@
<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">
<td style="color:#7B7B7E; font-size:14px; text-align: center;line-height:1.6em;" align="center">
<p>
{{__('email.footer_copy1')}}
</p>
@ -399,7 +386,7 @@
</td>
</tr>
<tr>
<td style="color:#bbbbbb; font-size:12px; text-align: center">
<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>
<p>{{__('email.footer_copy3')}}</p>

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

@ -62,18 +62,14 @@
</style>
<style type="text/css" media="screen">
@media screen {
/*Thanks Outlook 2013! http://goo.gl/XLxpyl*/
td, h1, h2, h3 {
font-family: Helvetica, Verdana, Arial, sans-serif;
}
}
</style>
<style type="text/css" media="only screen and (max-width: 480px)">
/* Mobile styles */
@media only screen and (max-width: 480px) {
table[class="w320"] {
@ -82,15 +78,6 @@
}
</style>
<!--[if mso]>
<style type="text/css">
body, table, td {
font-family: Helvetica, Arial, sans-serif !important;
}
</style>
<![endif]-->
</head>
<body class="body" style="padding:0; margin:0; display:block; background:#f8f8f8; -webkit-text-size-adjust:none" bgcolor="#f8f8f8">
@ -134,7 +121,7 @@
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="100%"
bgcolor="#ffffff">
<tr>
<td class="headline">
<td class="headline" align="center">
<br><br>
<b>{{ $salutation }} </b>
</td>
@ -144,7 +131,7 @@
<center>
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="90%">
<tr>
<td style="color:#37302d;">
<td style="color:#37302d;line-height:1.6em;" align="center">
<br>
{{ $copy1line }}
<br>
@ -163,10 +150,10 @@
@foreach($data as $key=>$value)
<tr>
<td style="color:#37302d; width: 30%; text-align: right; vertical-align: top;">
<td style="color:#37302d; width: 30%; text-align: right; vertical-align: top;line-height:1.6em;" align="center">
{{__('email.'.$key)}}: &nbsp;
</td>
<td style="color:#37302d; text-align: left; vertical-align: top;">
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;" align="center">
{!! nl2br($value) !!}
</td>
</tr>
@ -182,7 +169,7 @@
<center>
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="90%">
<tr>
<td style="color:#37302d;">
<td style="color:#37302d;line-height:1.6em;" align="center">
<br><br>
{{ $copy3line }}
<br><br>
@ -201,19 +188,19 @@
</table>
<center>
<table cellpadding="0" cellspacing="0" class="force-full-width"
bgcolor="#f8f8f8" style="margin: 0 auto; text-align: center">
bgcolor="#f8f8f8" style="margin: 0 auto; text-align: center;line-height:1.6em;">
<tr>
<td style="color:#7B7B7E; font-size:14px; text-align: center">
<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>
<a href="https://www.mivita.care" style="color: #7B7B7E; text-decoration: underline;line-height:1.6em;">www.mivita.care</a>
<br>
</td>
</tr>
<tr>
<td style="color:#bbbbbb; font-size:12px; text-align: center">
<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>
<p>{{__('email.footer_copy3')}}</p>

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

@ -71,18 +71,14 @@
}
</style>
<style type="text/css" media="screen">
@media screen {
/*Thanks Outlook 2013! http://goo.gl/XLxpyl*/
td, h1, h2, h3 {
font-family: Helvetica, Verdana, Arial, sans-serif;
}
}
</style>
<style type="text/css" media="only screen and (max-width: 480px)">
/* Mobile styles */
@media only screen and (max-width: 480px) {
table[class="w320"] {
@ -91,15 +87,6 @@
}
</style>
<!--[if mso]>
<style type="text/css">
body, table, td {
font-family: Helvetica, Arial, sans-serif !important;
}
</style>
<![endif]-->
</head>
<body class="body" style="padding:0; margin:0; display:block; background:#f8f8f8; -webkit-text-size-adjust:none" bgcolor="#f8f8f8">
@ -142,7 +129,7 @@
<table cellpadding="10" style="padding: 10px;" cellspacing="0" border="0" width="100%" bgcolor="#ffffff">
<tr>
<td class="headline" style="text-align: center">
<td class="headline" style="text-align: center" align="center">
<center>
<b>{{ $title }}</b>
</center>
@ -150,7 +137,7 @@
</tr>
<tr>
<td>
<table style="padding: 0px 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="2" cellspacing="0" width="100%">
<table style="padding: 0px 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
<tr>
<td>
{!! nl2br($content) !!}
@ -188,7 +175,7 @@
<center>
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="90%">
<tr>
<td style="color:#37302d; text-align: center">
<td style="color:#37302d; text-align: center;line-height:1.6em;" align="center">
{{ $copy2line }}<br>
<span style="color: #cabda9; font-weight: normal; font-size: 13px; text-decoration: underline; word-wrap: break-word;white-space: pre-line;">{{ $url }}</span>
</td>
@ -202,7 +189,7 @@
@if(isset($content_last) && $content_last != "")
<tr>
<td>
<table style="padding: 0px 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="2" cellspacing="0" width="100%">
<table style="padding: 0px 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
<tr>
<td>
{!! nl2br($content_last) !!}
@ -215,10 +202,10 @@
<tr>
<td style="color:#37302d;font-size: 14px;">
<center>
<table style="margin: 0 auto;" cellpadding="0" cellspacing="0" width="90%">
<table style="margin: 0 auto;line-height:1.6em;" cellpadding="0" cellspacing="0" width="90%">
<tr>
<td style="color:#37302d; text-align: center">
<td style="color:#37302d; text-align: center;line-height:1.6em;" align="center">
{{ $copy3line }}
<br>
{{ $greetings }} <br><br><b>{{ $sender }}</b>
@ -236,9 +223,9 @@
</table>
<center>
<table cellpadding="0" cellspacing="0" class="force-full-width"
bgcolor="#f8f8f8" style="margin: 0 auto; text-align: center">
bgcolor="#f8f8f8" style="margin: 0 auto; text-align: center;line-height:1.6em;">
<tr>
<td style="color:#7B7B7E; font-size:14px; text-align: center">
<td style="color:#7B7B7E; font-size:14px; text-align: center;line-height:1.6em;" align="center">
<p>
{{__('email.footer_copy1')}}
</p>
@ -247,7 +234,7 @@
</td>
</tr>
<tr>
<td style="color:#bbbbbb; font-size:12px; text-align: center">
<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>
<p>{{__('email.footer_copy3')}}</p>

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

@ -71,18 +71,14 @@
}
</style>
<style type="text/css" media="screen">
@media screen {
/*Thanks Outlook 2013! http://goo.gl/XLxpyl*/
td, h1, h2, h3 {
font-family: Helvetica, Verdana, Arial, sans-serif;
}
}
</style>
<style type="text/css" media="only screen and (max-width: 480px)">
/* Mobile styles */
@media only screen and (max-width: 480px) {
table[class="w320"] {
@ -91,15 +87,6 @@
}
</style>
<!--[if mso]>
<style type="text/css">
body, table, td {
font-family: Helvetica, Arial, sans-serif !important;
}
</style>
<![endif]-->
</head>
<body class="body" style="padding:0; margin:0; display:block; background:#f8f8f8; -webkit-text-size-adjust:none" bgcolor="#f8f8f8">
@ -147,7 +134,7 @@
</td>
</tr>
<tr>
<td style="color:#37302d;">
<td style="color:#37302d;line-height:1.6em;">
{!! nl2br($copy1line) !!}
</td>
</tr>
@ -183,7 +170,7 @@
<tr>
<tr>
<td>
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5" cellpadding="2" cellspacing="0" width="100%">
<table style="padding: 20px; border:1px solid #eee; background-color: #f6fdf5;line-height:1.6em;" cellpadding="2" cellspacing="0" width="100%">
<tr>
<td>
{!! nl2br($content) !!}
@ -195,9 +182,9 @@
</table>
<center>
<table cellpadding="0" cellspacing="0" class="force-full-width"
bgcolor="#f8f8f8" style="margin: 0 auto; text-align: center">
bgcolor="#f8f8f8" style="margin: 0 auto; text-align: center;line-height:1.6em;">
<tr>
<td style="color:#7B7B7E; font-size:14px; text-align: center">
<td style="color:#7B7B7E; font-size:14px; text-align: center;line-height:1.6em;" align="center">
<p>
{{__('email.footer_copy1')}}
</p>
@ -207,7 +194,7 @@
</td>
</tr>
<tr>
<td style="color:#bbbbbb; font-size:12px; text-align: center">
<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>
<p>{{__('email.footer_copy3')}}</p>

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

@ -125,7 +125,7 @@
<script src="{{ asset('/vendor/libs/dropzone/dropzone.js?v=1')}}"></script>
<script src="{{ asset('/js/forms_file-upload.js?v=1') }}"></script>
<script src="{{ asset('/vendor/libs/clipboard/clipboard.min.js')}}"></script>
<!-- `perfect-scrollbar` library required by SideNav plugin -->
<script src="{{ mix('/vendor/libs/perfect-scrollbar/perfect-scrollbar.js') }}"></script>

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

@ -9,70 +9,82 @@
<ul class="sidenav-inner{{ empty($layout_sidenav_horizontal) ? ' py-1' : '' }}">
<li class="sidenav-item{{ Request::is('home') ? ' active' : '' }}">
<a href="{{ route('home') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-home"></i><div>{{__('Home')}}</div></a>
<a href="{{ route('home') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-home"></i><div>{{__('navigation.home')}}</div></a>
</li>
@if(Auth::user()->showSideNav())
<li class="sidenav-item{{ Request::is('user/edit') ? ' active' : '' }}">
<a href="{{ route('user_edit') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-create"></i><div>{{ __('Your Data') }}</div></a>
<a href="{{ route('user_edit') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-create"></i><div>{{ __('navigation.my_data') }}</div></a>
</li>
@if(Auth::user()->isActiveShop())
<li class="sidenav-item{{ Request::is('user/shop') ? ' active' : '' }}">
<a href="{{ route('user_shop') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-basket"></i><div>{{ __('Your Shop') }}</div></a>
<li class="sidenav-item @if(Request::is('user/shop', 'user/shop/*')) open @endif">
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
<i class="sidenav-icon ion ion-ios-basket"></i>
<div>{{ __('navigation.my_shop') }}</div>
</a>
<ul class="sidenav-menu">
<li class="sidenav-item{{ Request::is('user/shop') ? ' active' : '' }}">
<a href="{{ route('user_shop') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-cog"></i><div>{{ __('navigation.settings') }}</div></a>
</li>
<li class="sidenav-item{{ Request::is('user/shop/orders') ? ' active' : '' }}">
<a href="{{ route('user_shop_orders') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-cart"></i><div>{{ __('navigation.orders') }}</div></a>
</li>
</ul>
</li>
@endif
@if(Auth::user()->isActiveAccount())
<li class="sidenav-item @if(Request::is('user/team/*')) open @endif">
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
<i class="sidenav-icon ion ion-ios-people"></i>
<div>{{ __('navigation.my_team') }}</div>
</a>
<ul class="sidenav-menu">
<li class="sidenav-item{{ Request::is('user/team/members') ? ' active' : '' }}">
<a href="{{ route('user_team_members') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-person-add"></i><div>{{ __('navigation.member') }}</div></a>
</li>
</ul>
</li>
@endif
@endif
@if(Auth::user()->isAdmin())
<li class="sidenav-divider mb-1"></li>
<li class="sidenav-header small font-weight-semibold">ADMIN</li>
<li class="sidenav-item{{ Request::is('admin/leads') ? ' active' : '' }} {{ Request::is('admin/lead/edit/*') ? ' active' : '' }}">
<a href="{{ route('admin_leads') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-contacts"></i><div>{{ __('Berater') }}</div></a>
<a href="{{ route('admin_leads') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-contacts"></i><div>{{ __('navigation.member') }}</div></a>
</li>
<li class="sidenav-item @if(Request::is('admin/sales/*')) open @endif">
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
<i class="sidenav-icon ion ion-ios-cart"></i>
<div>{{ __('Bestellungen') }}</div>
<div>{{ __('navigation.orders') }}</div>
</a>
<ul class="sidenav-menu">
<li class="sidenav-item{{ Request::is('admin/sales/users') ? ' active' : '' }}">
<a href="{{ route('admin_sales_users') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-contacts"></i><div>{{ __('Berater') }}</div></a>
<li class="sidenav-item{{ Request::is('admin/sales/users', 'admin/sales/users/*') ? ' active' : '' }}">
<a href="{{ route('admin_sales_users') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-contacts"></i><div>{{ __('navigation.member') }}</div></a>
</li>
<li class="sidenav-item{{ Request::is('admin/sales/customers') ? ' active' : '' }}">
<a href="{{ route('admin_sales_customers') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-contacts"></i><div>{{ __('Kunden') }}</div></a>
<li class="sidenav-item{{ Request::is('admin/sales/customers', 'admin/sales/customers/*') ? ' active' : '' }}">
<a href="{{ route('admin_sales_customers') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-contacts"></i><div>{{ __('navigation.clients') }}</div></a>
</li>
</ul>
</li>
<li class="sidenav-item @if(Request::is('admin/product/*')) open @endif">
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
<i class="sidenav-icon ion ion-md-cube"></i>
<div>{{ __('Produkte') }}</div>
<div>{{ __('navigation.products') }}</div>
</a>
<ul class="sidenav-menu">
<li class="sidenav-item{{ Request::is('admin/product/show') ? ' active' : '' }}">
<a href="{{ route('admin_product_show') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-cube"></i><div>{{ __('Übersicht') }}</div></a>
<a href="{{ route('admin_product_show') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-cube"></i><div>{{ __('navigation.overview') }}</div></a>
</li>
<li class="sidenav-item{{ Request::is('admin/product/categories') ? ' active' : '' }}">
<a href="{{ route('admin_product_categories') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-list"></i><div>{{ __('Kategorien') }}</div></a>
<a href="{{ route('admin_product_categories') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-list"></i><div>{{ __('navigation.categories') }}</div></a>
</li>
<li class="sidenav-item{{ Request::is('admin/product/attributes') ? ' active' : '' }}">
<a href="{{ route('admin_product_attributes') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-apps"></i><div>{{ __('Attribute') }}</div></a>
<a href="{{ route('admin_product_attributes') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-apps"></i><div>{{ __('navigation.attribute') }}</div></a>
</li>
</ul>
</li>
@ -80,11 +92,11 @@
<li class="sidenav-item @if(Request::is('admin/sites/*')) open @endif">
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
<i class="sidenav-icon ion ion-md-albums"></i>
<div>{{ __('Inhalte') }}</div>
<div>{{ __('navigation.contents') }}</div>
</a>
<ul class="sidenav-menu">
<li class="sidenav-item{{ Request::is('admin/sites/start') ? ' active' : '' }}">
<a href="{{route('admin_sites', ['start'])}}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-document"></i><div>{{ __('Startseite') }}</div></a>
<a href="{{route('admin_sites', ['start'])}}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-document"></i><div>{{ __('navigation.start_site') }}</div></a>
</li>
</ul>
</li>
@ -92,15 +104,15 @@
<li class="sidenav-item{{ Request::is('admin/translate/*') ? ' open' : '' }}">
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
<i class="sidenav-icon ion ion-ios-browsers"></i>
<div>{{ __('Translate') }}</div>
<div>{{ __('navigation.translate') }}</div>
</a>
<ul class="sidenav-menu">
<li class="sidenav-item{{ Request::is('admin/translate/all/*') ? ' active' : '' }}">
<a href="{{ route('admin_translate_all') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-browsers"></i><div>{{ __('Allgemein') }}</div></a>
<a href="{{ route('admin_translate_all') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-browsers"></i><div>{{ __('navigation.general') }}</div></a>
</li>
<li class="sidenav-item{{ Request::is('admin/translate/file/*') ? ' active' : '' }}">
<a href="{{ route('admin_translate_file') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-browsers"></i><div>{{ __('Module') }}</div></a>
<a href="{{ route('admin_translate_file') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-browsers"></i><div>{{ __('navigation.modules') }}</div></a>
</li>
</ul>
@ -112,17 +124,17 @@
<li class="sidenav-header small font-weight-semibold">SUPERADMIN</li>
<li class="sidenav-item{{ Request::is('admin/users') ? ' active' : '' }} {{ Request::is('admin/user/edit/*') ? ' active' : '' }}">
<a href="{{ route('admin_users') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-ribbon"></i><div>{{ __('User Rechte') }}</div></a>
<a href="{{ route('admin_users') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-ribbon"></i><div>{{ __('navigation.user_roles') }}</div></a>
</li>
<li class="sidenav-item{{ Request::is('admin/shippings') ? ' active' : '' }} {{ Request::is('admin/shipping/edit/*') ? ' active' : '' }}">
<a href="{{ route('admin_shippings') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-gift"></i><div>{{ __('Versandkosten') }}</div></a>
<a href="{{ route('admin_shippings') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-gift"></i><div>{{ __('navigation.shipping_costs') }}</div></a>
</li>
<li class="sidenav-item{{ Request::is('admin/levels') ? ' active' : '' }} {{ Request::is('admin/level/edit/*') ? ' active' : '' }}">
<a href="{{ route('admin_levels') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-trending-up"></i><div>{{ __(' Karriere-Level') }}</div></a>
<a href="{{ route('admin_levels') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-trending-up"></i><div>{{ __('navigation.career_level') }}</div></a>
</li>
<li class="sidenav-item{{ Request::is('admin/countries') ? ' active' : '' }} {{ Request::is('admin/country/edit/*') ? ' active' : '' }}">
<a href="{{ route('admin_countries') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-globe"></i><div>{{ __('Länder') }}</div></a>
<a href="{{ route('admin_countries') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-globe"></i><div>{{ __('navigation.countries') }}</div></a>
</li>
@endif
@if(Auth::user()->isSySAdmin())
@ -132,17 +144,17 @@
<li class="sidenav-item{{ Request::is('sysadmin/tools/*') ? ' open' : '' }}">
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
<i class="sidenav-icon ion ion-ios-settings"></i>
<div>{{ __('Tools') }}</div>
<div>Tools</div>
</a>
<ul class="sidenav-menu">
<li class="sidenav-item{{ Request::is('sysadmin/tools/cronjobs') ? ' active' : '' }}">
<a href="{{ route('sysadmin_tools_cronjobs') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-settings"></i><div>{{ __('Cron Jobs') }}</div></a>
<a href="{{ route('sysadmin_tools_cronjobs') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-settings"></i><div>Cron Jobs</div></a>
</li>
<li class="sidenav-item{{ Request::is('sysadmin/tools/domainssl') ? ' active' : '' }}">
<a href="{{ route('sysadmin_tools_domainssl') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-lock"></i><div>{{ __('Domain SSL') }}</div></a>
<a href="{{ route('sysadmin_tools_domainssl') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-lock"></i><div>Domain SSL</div></a>
</li>
<li class="sidenav-item{{ Request::is('sysadmin/tools/shopping_orders') ? ' active' : '' }}">
<a href="{{ route('sysadmin_tools_shopping_orders') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-analytics"></i><div>{{ __('Shopping Orders') }}</div></a>
<a href="{{ route('sysadmin_tools_shopping_orders') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-analytics"></i><div>Shopping Orders</div></a>
</li>
</ul>
@ -151,7 +163,7 @@
<li class="sidenav-divider mb-1"></li>
<li class="sidenav-item">
<a href="{{ route('logout') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-power"></i><div>{{ __('Logout') }}</div></a>
<a href="{{ route('logout') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-power"></i><div>{{ __('navigation.logout') }}</div></a>
</li>
</ul>
</div>

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

@ -58,7 +58,7 @@
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{ __('Domain') }}</div>
<div>
<a href="{{ $user->shop->getSubdomain() }}" target="_blank">{{ $user->shop->getSubdomain() }}
<a href="{{ $user->shop->getSubdomain(false) }}" target="_blank">{{ $user->shop->getSubdomain(false) }}
</a>
</div>
</li>
@ -108,9 +108,6 @@
</ul>
</div>
<!-- / Project details -->
</div>
</div>

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

@ -27,7 +27,7 @@
<p class="mt-2">
Wähle das Präfix Deines Shopnamens - z. B. vorname(.mivita.care) - Du musst nicht "mivita.care" eingeben. Wähle einen kurzen und prägnanten Namen, damit Du diese URL auch auf kleinen Werbemitteln unterbringen kannst. Achte auch darauf, dass Du keine Markenrechte Dritter verletzt. Dafür kann MIVITA keine Haftung übernehmen. Daher versucht Phantasiebegriffe zu vermeiden, es sei denn Ihr habt sie als Marke angemeldet.
Wähle das Präfix Deines Shopnamens - z. B. vorname(.mivita.care) - Du musst nicht "mivita.care" eingeben. Wähle einen kurzen und prägnanten Namen, damit Du diese URL auch auf kleinen Werbemitteln unterbringen kannst. Achte auch darauf, dass Du keine Markenrechte Dritter verletzt. Dafür kann MIVITA keine Haftung übernehmen. Daher versucht Phantasiebegriffe zu vermeiden, es sei denn Du hast sie als Marke angemeldet.
<br><br>
Deine Internetadresse kann später mit „www.“ und ohne aufgerufen werden.
<br><br>
@ -77,19 +77,19 @@
$( document ).ready(function() {
$.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.",
maxlength: $.validator.format("Gib bitte maximal {0} Zeichen ein."),
minlength: $.validator.format("Gib bitte mindestens {0} Zeichen ein."),
rangelength: $.validator.format("Gib bitte mindestens {0} und maximal {1} Zeichen ein."),
email: "Gib bitte eine gültige E-Mail Adresse ein.",
url: "Gib bitte eine gültige URL ein.",
date: "Bitte gib ein gültiges Datum ein.",
number: "Gib bitte eine Nummer ein.",
digits: "Gib bitte nur Ziffern ein.",
equalTo: "Bitte denselben Wert wiederholen.",
range: $.validator.format("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."
range: $.validator.format("Gib bitte einen Wert zwischen {0} und {1} ein."),
max: $.validator.format("Gib bitte einen Wert kleiner oder gleich {0} ein."),
min: $.validator.format("Gib bitte einen Wert größer oder gleich {0} ein."),
creditcard: "Gib bitte eine gültige Kreditkarten-Nummer ein."
});
// Set up validator

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

@ -55,7 +55,19 @@
<p><strong>Eine Änderung Deines Berater-Paketes ist nicht mehr möglich.</strong></p>
@endif
@endif
@include('user.membership._payment_order')
@if($userHistoryPaymentOrder && $userHistoryPaymentOrder->status > 2)
<h5 class="card-header bg-light">
<a href="#" class="" data-toggle="collapse" data-target="#collapsePaymentForm" aria-expanded="false" aria-controls="collapsePaymentForm">
<i class="fa fa-caret-expand"></i> {{ __('Zahlungsoptionen öffnen') }}
</a>
</h5>
<div class="collapse" id="collapsePaymentForm">
@include('user.membership._payment_order')
</div>
@else
@include('user.membership._payment_order')
@endif
</div>
</div>
@else
@ -70,7 +82,19 @@
@endif
<h5 class="d-block text-dark">Erweitere jetzt Deine Mitglidschaft auf MIVITA BUSINESS Paket!</h5>
<p>Berechnet werden die restlichen Monate bis zur Berater-Mitgliedschaft Verlängerung. Danach wird jährlich der MIVITA BUSINESS Paketpreis berechnet.</p>
@include('user.membership._upgrade')
@if($userHistoryUpgradeOrder && $userHistoryUpgradeOrder->status > 2)
<h5 class="card-header bg-light">
<a href="#" class="" data-toggle="collapse" data-target="#collapsePaymentForm" aria-expanded="false" aria-controls="collapsePaymentForm">
<i class="fa fa-caret-expand"></i> {{ __('Zahlungsoptionen öffnen') }}
</a>
</h5>
<div class="collapse" id="collapsePaymentForm">
@include('user.membership._upgrade')
</div>
@else
@include('user.membership._upgrade')
@endif
</div>
</div>
@endif

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

@ -17,7 +17,7 @@
@endif
--}}
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Your Shop') }}
{{ __('navigation.my_shop') }}
</h4>
@if($user->shop)
@include('user.components.user_shop_edit')

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

@ -0,0 +1,52 @@
@extends('layouts.layout-2')
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Bestellungen Kunden') }}
</h4>
<div class="card">
<div class="card-datatable table-responsive">
<table class="datatable-customers table table-striped table-bordered">
<thead>
<tr>
<th>{{__('First name')}}</th>
<th>{{__('Last name')}}</th>
<th>{{__('E-Mail')}}</th>
<th>{{__('Datum')}}</th>
<th>{{__('Status')}}</th>
<th>{{__('Betrag')}}</th>
</tr>
</thead>
</table>
</div>
</div>
<script>
$( document ).ready(function() {
$('.datatable-customers').dataTable({
"processing": true,
"serverSide": true,
"ajax": '{!! route('user_shop_orders_datatable') !!}',
"order": [[0, "desc" ]],
"columns": [
// { data: 'id', searchable: false },
{ data: 'billing_firstname', name: 'shopping_user.billing_firstname' },
{ data: 'billing_lastname', name: 'shopping_user.billing_lastname' },
{ data: 'billing_email', name: 'shopping_user.billing_email' },
{ data: 'created_at', name: 'shopping_orders.created_at' },
{ data: 'txaction', name: 'txaction' },
{ data: 'total_shipping', name: 'shopping_orders.total_shipping' },
],
"bLengthChange": false,
"iDisplayLength": 100,
"language": {
"url": "/js/German.json"
}
});
});
</script>
@endsection

56
resources/views/user/team/members.blade.php Normal file
View file

@ -0,0 +1,56 @@
@extends('layouts.layout-2')
@section('content')
@if ($errors->any())
<div class="row">
<div class="col-sm-12">
<div class="alert alert-danger">
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
</div>
</div>
@endif
<h4 class="font-weight-bold py-2 mb-2">
{{ __('navigation.my_shop') }}
</h4>
<div class="card">
<h5 class="card-header">Berater registrieren</h5>
<div class="row no-gutters row-bordered">
<div class="col-md-12 p-4">
<h6 class="mb-4">Link für Beraterregistrierung</h6>
<div class="form-group">
<div class="input-group">
<span class="input-group-prepend">
<button class="btn btn-secondary" type="button" title="Kopiert!" data-clipboard-demo data-clipboard-target="#shop_register_link"><i class="ion ion-ios-copy"></i> Link kopieren</button>
</span>
<input type="text" class="form-control" name="shop_register_link" value="{{$shop_register_link}}" id="shop_register_link" placeholder="">
</div>
</div>
<p>Du möchtest einen neuen Berater registrieren? Super, das freut uns. Sende ihm einfach nachfolgenden Link per Mail, WhatsApp oder SMS zu. Er gelangt damit auf die Registrierungsseite von www.mivita.care. Wichtig ist, dass Du diesen Link nicht veränderst, denn die angehängte Berater-ID identifiziert Dich als Sponsor von dem neuen Berater. Nur so können Dir künftige Provisionen durch Umsätze von ihm zugeordnet werden. Nutze das „Kopier-Symbol“, um den Link gleich in Deine Zwischenablage zu kopieren.
</div>
</div>
</div><!-- Target -->
<script>
$( document ).ready(function() {
var clipboardDemos = new ClipboardJS('[data-clipboard-demo]');
clipboardDemos.on('success', function (e) {
e.clearSelection();
$(e.trigger).tooltip('enable').tooltip('show');
});
clipboardDemos.on('error', function (e) {
console.error('Action:', e.action);
console.error('Trigger:', e.trigger);
});
$('button[data-clipboard-demo]').on('mouseout', function () {
$(this).tooltip('disable');
})
});
</script>
@endsection

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

@ -173,20 +173,22 @@
<div class="card mb-4">
<div class="card-body">
<div class="form-row">
<div class="form-group col-md-12">
<label class="form-label" for="taxable_sales">{{ __('Umsatzsteuerpflicht') }} @if($user->account->getCountryAttrAs('taxable_sales'))* @endif</label>
<select class="selectpicker" name="taxable_sales" id="taxable_sales" data-style="btn-light" @if($user->account->getCountryAttrAs('taxable_sales')) required @endif>
{!! HTMLHelper::getTaxSaleOptions($user->account->taxable_sales) !!}
</select>
<p class="badge">Wähle Kleinunternehmer, wenn Du nicht mehr als 22.000 EUR Umsatz pro Jahr mit Deinem Gewerbe erwirtschaftest.</p>
</div>
<div class="form-group col-md-6">
<label class="form-label" for="tax_number">{{ __('Steuernummer') }} @if($user->account->getCountryAttrAs('tax_number'))* @endif</label>
{{ Form::text('tax_number', $user->account->tax_number, array('placeholder'=>__('Steuernummer'), 'class'=>'form-control', 'id'=>'tax_number', $user->account->getCountryAttrAs('tax_number','required'))) }}
</div>
<div class="form-group col-md-6">
<label class="form-label" for=" tax_identification_number">{{ __('USt-ID Nummer') }} @if($user->account->getCountryAttrAs('tax_id_number'))* @endif</label>
{{ Form::text(' tax_identification_number', $user->account-> tax_identification_number, array('placeholder'=>__('USt-ID Nummer'), 'class'=>'form-control', 'id'=>' tax_identification_number', $user->account->getCountryAttrAs('tax_id_number','required'))) }}
</div>
<div class="form-group col-md-12">
<label class="form-label" for="taxable_sales">{{ __('Umsatzsteuerpflicht') }} @if($user->account->getCountryAttrAs('taxable_sales'))* @endif</label>
<select class="selectpicker" name="taxable_sales" id="taxable_sales" data-style="btn-light" @if($user->account->getCountryAttrAs('taxable_sales')) required @endif>
{!! HTMLHelper::getTaxSaleOptions($user->account->taxable_sales) !!}
</select>
{{ Form::text('tax_identification_number', $user->account-> tax_identification_number, array('placeholder'=>__('USt-ID Nummer'), 'class'=>'form-control', 'id'=>'tax_identification_number', $user->account->getCountryAttrAs('tax_id_number','required'))) }}
</div>
</div>
</div>

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

@ -149,19 +149,19 @@
$.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.",
maxlength: $.validator.format( "Gib bitte maximal {0} Zeichen ein." ),
minlength: $.validator.format( "Gib bitte mindestens {0} Zeichen ein." ),
rangelength: $.validator.format( "Gib bitte mindestens {0} und maximal {1} Zeichen ein." ),
email: "Gib bitte eine gültige E-Mail Adresse ein.",
url: "Gib bitte eine gültige URL ein.",
date: "Bitte gib ein gültiges Datum ein.",
number: "Gib bitte eine Nummer ein.",
digits: "Gib bitte nur Ziffern ein.",
equalTo: "Bitte denselben Wert wiederholen.",
range: $.validator.format( "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."
range: $.validator.format( "Gib bitte einen Wert zwischen {0} und {1} ein." ),
max: $.validator.format( "Gib bitte einen Wert kleiner oder gleich {0} ein." ),
min: $.validator.format( "Gib bitte einen Wert größer oder gleich {0} ein." ),
creditcard: "Gib bitte eine gültige Kreditkarten-Nummer ein."
});
// Set up validator

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

@ -2,14 +2,14 @@
{!! Form::open(['url' => route('wizard_store_payment', [20]), 'class' => 'form-horizontal']) !!}
<div class="table-responsive">
<table class="table table- m-0">
<table class="table table- m-0" id="membership_package_payment">
<tbody class="switchers-stacked">
@php($counter = 1)
@foreach($products as $product)
<tr>
<td class="text-center align-middle px-0">
<label class="switcher switcher-secondary">
<input type="radio" class="switcher-input" value="{{$product->id}}" name="switchers-package-wizard" @if($counter == 2) checked @endif >
<label class="switcher switcher-secondary">
<input type="radio" class="switcher-input" data-price="{{$product->price}}" value="{{$product->id}}" name="switchers-package-wizard" @if($counter == 2) checked @endif >
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
@ -35,17 +35,81 @@
</tbody>
</table>
</div>
@if($products_on_board)
<div class="table-responsive">
<table class="table table- m-0" id="membership_onboarding_package">
<tbody class="">
@foreach($products_on_board as $product)
<tr>
<td class="text-center align-middle px-0">
<label class="switcher switcher-square switcher-secondary">
<input type="checkbox" class="switcher-input" data-price="{{$product->price}}" name="products_on_board[]" value="{{$product->id}}">
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label"></span>
</label>
</td>
<td class="p-4">
<div class="media align-items-center">
@if(count($product->images))
<img src="{{ route('product_image', [$product->images->first()->slug]) }}" class="d-block ui-w-60 ui-bordered mr-4" alt="">
@endif
<div class="media-body">
<h5 class="d-block text-dark">{{$product->name}}</h5>
{!! $product->getLang('copy') !!}
</div>
</div>
</td>
<td class="text-right font-weight-semibold align-middle p-4">{{$product->getFormattedPrice()}} EUR / p.a.</td>
</tr>
@endforeach
</tbody>
</table>
</div>
@endif
<div class="text-left mt-3">
<hr>
<hr>
<label class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" name="abo_options">
<span class="custom-control-label secondary"><strong>{{__('payment.status.auto_renewal_hl')}}:</strong> {{__('payment.status.auto_renewal_line_1')}}</span>
<p class="text-muted">{{__('payment.status.auto_renewal_line_2')}}</p>
</label>
<hr>
<div class="float-right">
<strong>Gesamtsumme: <span id="card_total_price">0</span> €</strong>
</div>
<button type="submit" class="btn btn-secondary">{{ __('wählen und weiter zur Kasse') }}</button>&nbsp;
<br><br>
<em class="small text-center"> <i class="fa fa-lock"></i> Du wirst auf unseren checkout Server weitergeletet, die Verbindung ist SSL verschlüsselt.</em>
</div>
{!! Form::close() !!}
<script>
$( document ).ready(function() {
function calculate_package_payment(){
var price_total = 0;
$('#membership_package_payment .switcher-input').each(function () {
if($(this).prop('checked')){
price_total += parseFloat($(this).data('price'));
}
});
$('#membership_onboarding_package .switcher-input').each(function () {
if($(this).prop('checked')){
price_total += parseFloat($(this).data('price'));
}
});
$('#card_total_price').text(price_total.toFixed(2).toString().replace(".", ","));
}
$('#membership_package_payment .switcher-input').on('change', function () {
calculate_package_payment();
});
$('#membership_onboarding_package .switcher-input').on('change', function () {
calculate_package_payment();
});
calculate_package_payment();
});
</script>

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

@ -102,8 +102,18 @@
<div class="card-body">
@if($userHistoryWizardPayment && $userHistoryWizardPayment->status > 2)
<h6 class="alert badge-{{$userHistoryWizardPayment->getStatusColor()}}">Eine Zahlung wurde ausgeführt. Status: {{ trans('payment.status.'.$userHistoryWizardPayment->getStatusType())}}</h6>
<h5 class="card-header bg-light">
<a href="#" class="" data-toggle="collapse" data-target="#collapsePaymentForm" aria-expanded="false" aria-controls="collapsePaymentForm">
<i class="fa fa-caret-expand"></i> {{ __('Zahlungsoptionen öffnen') }}
</a>
</h5>
<div class="collapse" id="collapsePaymentForm">
@include('user.wizard._payment')
</div>
@else
@include('user.wizard._payment')
@endif
@include('user.wizard._payment')
</div>
</div>
</div>

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

@ -150,7 +150,7 @@
<h5 class="card-header">
{{ trans('register.wizard_business_license_hl') }}
</h5>
<div class="card-body">
<div class="card-body pb-0">
<div class="row">
<div class="col-sm-6">
<div class="mt-4">
@ -191,10 +191,42 @@
</div>
</div>
</div>
</div>
<div class="text-left mt-3">
{!! Form::open(['url' => route('wizard_store_register', [3])]) !!}
<button type="submit" name="submit" value="do" class="btn btn-secondary">{{ __('speichern und weiter') }}</button>&nbsp;
@php($business_license_choose = $user->account->getNotice('business_license'))
<div class="card-body pt-0">
<div class="row">
<div class="col-12">
</div>
<div class="col-12">
<label class="custom-control custom-radio">
{{ Form::radio('business_license_choose', 'now' , (($business_license_choose === 'now' || !$business_license_choose) ? true : false), array('class'=>'custom-control-input')) }}
<span class="custom-control-label">{{__('register.business_license_now')}}</span>
</label>
</div>
<div class="col-12">
<hr>
<label class="custom-control custom-radio">
{{ Form::radio('business_license_choose', 'later' , (($business_license_choose === 'later') ? true : false), array('class'=>'custom-control-input')) }}
<span class="custom-control-label">{{__('register.business_license_later')}}</span>
</label>
</div>
<div class="col-12">
<hr>
<label class="custom-control custom-radio">
{{ Form::radio('business_license_choose', 'non' , (($business_license_choose === 'non') ? true : false), array('class'=>'custom-control-input')) }}
<span class="custom-control-label">{{__('register.business_license_non')}}</span>
</label>
<p>{{__('register.business_license_non_text')}}</p>
{{ Form::textarea('non_business_license_reason', $user->account->getNotice('business_license_reason'), array('placeholder'=>__('Begründung'), 'class'=>'form-control', 'rows'=>' 2')) }}
</div>
<div class="col-12 mt-2">
<hr>
<button type="submit" name="submit" value="do" class="btn btn-secondary">{{ __('speichern und weiter') }}</button>&nbsp;
</div>
</div>
</div>
{!! Form::close() !!}
</div>
</div>
@ -236,15 +268,15 @@
maxFilesize: 32,
addRemoveLinks: true,
dictDefaultMessage: 'Hier klicken, oder Datei hier reinziehen (Drag&Drop)',
dictFallbackMessage: 'Ihr Browser unterstützt Drag&Drop Dateiuploads nicht',
dictFallbackText: 'Benutzen Sie das Formular um Ihre Dateien hochzuladen',
dictFallbackMessage: 'Dein Browser unterstützt Drag&Drop Dateiuploads nicht',
dictFallbackText: 'Benutze das Formular um Deine Dateien hochzuladen',
dictFileTooBig: "Die Datei ist zu groß. Die maximale Dateigröße beträgt 32 MB",
dictInvalidFileType: 'Eine Datei dieses Typs kann nicht hochgeladen werden',
dictResponseError: "Der Server hat ihre Anfrage mit Status error abgelehnt",
dictCancelUpload: 'Hochladen abbrechen',
dictCancelUploadConfirmation: null,
dictRemoveFile: 'Datei entfernen',
dictMaxFilesExceeded: 'Sie können keine weiteren Dateien mehr hochladen',
dictMaxFilesExceeded: 'Du kannst keine weiteren Dateien mehr hochladen',
acceptedFiles: "image/jpeg,image/pjpeg,image/png,image/gif,application/pdf,text/plain",
// The setting up of the dropzone
init:function() {

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

@ -37,8 +37,17 @@
<div class="card-body">
@if($userHistoryWizardPayment && $userHistoryWizardPayment->status > 2)
<h6 class="alert badge-{{$userHistoryWizardPayment->getStatusColor()}}">Eine Zahlung wurde ausgeführt. Status: {{ trans('payment.status.'.$userHistoryWizardPayment->getStatusType())}}</h6>
<h5 class="card-header bg-light">
<a href="#" class="" data-toggle="collapse" data-target="#collapsePaymentForm" aria-expanded="false" aria-controls="collapsePaymentForm">
<i class="fa fa-caret-expand"></i> {{ __('Zahlungsoptionen öffnen') }}
</a>
</h5>
<div class="collapse" id="collapsePaymentForm">
@include('user.wizard._payment')
</div>
@else
@include('user.wizard._payment')
@endif
@include('user.wizard._payment')
</div>
</div>
</div>

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

@ -48,6 +48,14 @@
padding-left: 20px;
}
a.shop-item-hl {
color: #9aa983;
font-size: 1.2em;
}
.table-bordered > thead > tr > th, .table-bordered > tbody > tr > th, .table-bordered > tfoot > tr > th, .table-bordered > thead > tr > td, .table-bordered > tbody > tr > td, .table-bordered > tfoot > tr > td {
border: 1px solid #ddd !important;
}
@media only screen and (max-width: 1200px) {
.cartContent .yard .product_name {
@ -107,9 +115,6 @@
</div>
</div>-->
<!-- /EMPTY CART -->
<!-- CART -->
<div class="row">
@ -124,7 +129,63 @@
<!-- cart content -->
<div id="cartContent">
<div class="box-border-shadow">
<!-- Shopping cart table -->
<div class="table-responsive">
<table class="table table-bordered m-0">
<thead>
<tr>
<!-- Set columns width -->
<th colspan="2" class="text-left py-3 px-4" style="min-width: 400px;">Produkt</th>
<th class="text-right py-3 px-4" style="width: 120px;">Preis</th>
<th class="text-center py-3 px-4" style="width: 60px;">Anzahl</th>
<th class="text-right py-3 px-4" style="width: 100px;">Summe</th>
<th class="text-center align-middle py-3 px-0" style="width: 40px;">#</th>
</tr>
</thead>
<tbody>
@foreach(Yard::instance('shopping')->content() as $row)
@php($product = \App\Models\Product::find($row->id))
<tr class="item yard">
<td>
@if($row->options->has('image'))
<img src="{{ route('product_image', [$row->options->image]) }}" width="80" alt="">
@else
<img src="{{ asset('/assets/images/1x1.png') }}" width="80" alt="">
@endif
</td>
<td class="p-4">
<a href="{{ url('/produkte/alle-produkte/'.$row->options->slug) }}" class="shop-item-hl ">
<span>{{ $row->name }}</span>
<div style="font-size: 13px; color:#1d1d1d; font-weight: 500;">Inhalt: {{ $product->contents }}</div>
<div style="font-size: 13px; color:#1d1d1d; font-weight: 500;">Art.-Nr.: {{ $product->number }}</div>
<div style="font-size: 13px; color:#6e6e6e; font-weight: 400;"><em>Lieferzeit: 1-3 Werktage</em></div>
</a>
</td>
<td class="text-right font-weight-semibold align-middle p-2">
<span>{{ $row->price() }} </span> €
<div style="font-size: 11px; color:#1d1d1d; font-weight: 500;">{{$product->getBasePriceFormattedFull()}}</div>
</td>
<td class="align-middle p-2">
<input type="number" value="{{ $row->qty }}" name="quantity[{{$row->rowId}}]" maxlength="3" max="999" min="1" />
</td>
<td class="text-right font-weight-semibold align-middle p-2">
<div class=""><strong>{{ $row->subtotal() }} €</strong></div>
</td>
<td class="text-left p-2">
<a style="margin: 0" href="{{ url(Util::getPostRoute().'card/remove', $row->rowId) }}" class="remove_item"><i class="fa fa-times"></i></a></td>
</tr>
@endforeach
</tbody>
</table>
</div>
{{-- <div class="box-border-shadow">
<!-- cart header -->
<div class="item head clearfix">
<span class="cart_img"></span>
@ -136,7 +197,7 @@
@foreach(Yard::instance('shopping')->content() as $row)
@php($product = \App\Models\Product::find($row->id))
<div class="item yard">
<div class="cart_img pull-left width-100 padding-10 text-left">
@if($row->options->has('image'))
@ -147,7 +208,10 @@
</div>
<a href="{{ url('/produkte/alle-produkte/'.$row->options->slug) }}" class="product_name">
<span>{{ $row->name }}</span>
<small>Lieferzeit: 1-3 Werktage</small>
<div style="font-size: 13px; color:#1d1d1d; font-weight: 500;">{{$product->getBasePriceFormattedFull()}}</div>
<div style="font-size: 13px; color:#6e6e6e; font-weight: 400;"><em>Lieferzeit: 1-3 Werktage</em></div>
</a>
<a href="{{ url(Util::getPostRoute().'card/remove', $row->rowId) }}" class="remove_item"><i class="fa fa-times"></i></a>
@ -157,13 +221,11 @@
</div>
@endforeach
</div>
</div>--}}
<a href="{{url(Util::getPostRoute().'card/delete')}}" class="btn btn-default btn-sm margin-top-20 margin-right-10 pull-left"><i class="glyphicon glyphicon-remove"></i> Warenkorb löschen</a>
<button type="submit" class="btn btn-sm btn-default margin-top-20 margin-left-0 pull-right pull-left-xs"><i class="glyphicon glyphicon-refresh"></i> Warenkorb aktualisieren</button>
<div class="clearfix"></div>
</div>
{!! Form::close() !!}
<!-- /CART -->
@endif
@ -240,7 +302,6 @@
<hr>
<p><em class="small" style="color: #828282">Alle Preise inkl. gesetzl. Mehrwertsteuer zzgl. Versandkosten, wenn nicht anders beschrieben</em></p>
<!-- /CART -->
</div>
</section>

4
resources/views/web/templates/checkout.blade.php
View file

@ -106,7 +106,7 @@
<div class="row">
<div class="col-sm-12">
<div class="alert alert-danger">
Bitte überprüfen Sie das Formular und vervollständigen alle Angaben.
Bitte überprüfe das Formular und vervollständigen alle Angaben.
</div>
</div>
</div>
@ -681,7 +681,7 @@
</div>
<button type="submit" class="btn btn-primary btn-lg btn-block size-18 btn-text-500 mt-4 faa-parent animated-hover"><i class="fa fa-mail-forward faa-horizontal"></i> Jetzt kaufen</button>
<hr><p class="text-center" style="line-height: 1.2em;"><em class="small text-center"> <i class="fa fa-lock"></i> Sind alle Ihre Angaben vollsätndig ausgefüllt, klicken Sie auf "Jetzt kaufen" und Sie werden zu unserem Zahlungsanbieter weitergeleitet, die Verbindung wird ist SSL verschlüsselt.</em></p>
<hr><p class="text-center" style="line-height: 1.2em;"><em class="small text-center"> <i class="fa fa-lock"></i> Sind alle Deine Angaben vollsätndig ausgefüllt, klicke auf "Jetzt kaufen" und Du wist zu unserem Zahlungsanbieter weitergeleitet, die Verbindung wird ist SSL verschlüsselt.</em></p>

4
resources/views/web/templates/kontakt.blade.php
View file

@ -124,7 +124,7 @@
<div class="col-md-12">
<div class="form-group">
{!! Form::label('message', __('Nachricht*')) !!}
{!! Form::textarea('message', null, ['class' => 'form-control '.($errors->has('message') ? 'error' : ''), 'placeholder'=>__('Ihre Nachticht'), 'required']) !!}
{!! Form::textarea('message', null, ['class' => 'form-control '.($errors->has('message') ? 'error' : ''), 'placeholder'=>__('Deine Nachticht'), 'required']) !!}
@if ($errors->has('message'))
<label for="last_name" class="error text-danger small" style="display: block;">{{ $errors->first('message') }}</label>
@endif
@ -189,7 +189,7 @@
{!! nl2br($user_shop->contact) !!}
@endif
<br>
{{ $user_shop->getSubdomain() }}
{{ $user_shop->getSubdomain(true) }}
</p>
@if($user_shop->accessibility)

3
resources/views/web/templates/produkte-item.blade.php
View file

@ -48,10 +48,13 @@
<div class="shop-item-price d-block text-danger mt-2">
<del class="text-muted" style="font-size: 0.85em"> {{ $product->getFormattedPriceOld() }} €</del>
{{ $product->getFormattedPrice() }} €
<div style="font-size: 13px; color:#1d1d1d; font-weight: 500;">{{$product->getBasePriceFormattedFull()}}</div>
</div>
@else
<div class="shop-item-price d-block mt-2 text-muted">
{{ $product->getFormattedPrice() }} €
<div style="font-size: 13px; color:#1d1d1d; font-weight: 500;">{{$product->getBasePriceFormattedFull()}}</div>
</div>
@endif
<!-- price -->

25
resources/views/web/templates/produkte-show.blade.php
View file

@ -25,6 +25,9 @@
text-align: center;
font-size: 16px;
}
div.shop-item-price > span {
color: #6e6e6e;
}
</style>
<section class="page-header page-header-xlg parallax parallax-3 hidden-xs"
style="background-image:url('/assets/images/vision-min.jpg')">
@ -97,34 +100,40 @@
<del class="text-muted" style="font-size: 0.85em"> {{ $product->getFormattedPriceOld() }} €</del>
{{ $product->getFormattedPrice() }} €
@else
<div class="shop-item-price text-right text-muted">
<div class="shop-item-price text-right text-muted" style="line-height: 1.3em;">
{{ $product->getFormattedPrice() }} €
@endif<br>
<span style="font-size: 0.7em; color:#999; font-weight: 400;"><em>inkl. 19% MwSt. zzgl. Versandkosten</em></span>
<span style="font-size: 13px; color:#1d1d1d; font-weight: 500;">{{$product->getBasePriceFormattedFull()}}</span><br>
<span style="font-size: 13px; color:#6e6e6e; font-weight: 500;"><em>inkl. 19% MwSt. zzgl. Versandkosten</em></span>
</div>
<hr>
<div class="shop-item-price text-right">
<div class="shop-item-price text-right" style="line-height: 1.3em">
{!! Form::open(['url' => url(Util::getPostRoute().'card/add/'.$product->id), 'class' => 'mb-0', 'id'=>'']) !!}
<div class="qty float-left">
<input type="number" value="1" name="quantity" maxlength="3" max="999" min="1"><br>
</div>
<button class="btn btn-primary btn-text-500 faa-parent animated-hover"><i class="fa fa-cart-plus faa-horizontal"></i> In den Warenkorb</button>
<br>
<span style="font-size: 0.7em; color:#999; font-weight: 400;"><em>Lieferzeit: 1-3 Werktage</em></span>
<span style="font-size: 13px; color:#6e6e6e; font-weight: 400;"><em>Lieferzeit: 1-3 Werktage</em></span>
{!! Form::close() !!}
</div>
<hr>
@endif
<div class="shop-item-price text-right">
<span class="pull-left"><strong>Inhalt:</strong></span>
<span style="font-size: 0.8em">{{ $product->contents }}</span>
<span>{{ $product->contents }}</span>
</div>
<hr>
<div class="shop-item-price text-left">
<span class=""><strong>Art.-Nr.:</strong> {{ $product->number }}</span>
<div class="shop-item-price text-right">
<span class="pull-left"><strong>Gewicht:</strong></span>
<span>{{ $product->weight }} g</span>
</div>
<hr>
<div class="shop-item-price text-right">
<span class="pull-left"><strong>Art.-Nr.:</strong></span>
<span>{{ $product->number }}</span>
</div>
<hr>

6
resources/views/web/templates/registrierung.blade.php
View file

@ -88,6 +88,10 @@
<div class="box-static box-transparent box-bordered padding-20">
{!! Form::open(['url' => '/registrierung']) !!}
@if(isset($from_member_id))
{!! Form::hidden('from_member_id', $from_member_id) !!}
@endif
<div class="row contact-row">
<div class="form-group col-md-12">
{!! Form::label('first_name', __('Salutation').'*') !!}
@ -223,7 +227,7 @@
{!! nl2br($user_shop->contact) !!}
@endif
<br>
{{ $user_shop->getSubdomain() }}
{{ $user_shop->getSubdomain(true) }}
</p>
@if($user_shop->accessibility)

2
resources/views/web/templates/registrierung_finish.blade.php
View file

@ -119,7 +119,7 @@
{!! nl2br($user_shop->contact) !!}
@endif
<br>
{{ $user_shop->getSubdomain() }}
{{ $user_shop->getSubdomain(true) }}
</p>
@if($user_shop->accessibility)

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

@ -53,7 +53,7 @@
</li>
@endif
<li class="footer-sprite">
{{ $user_shop->getSubdomain() }}
{{ $user_shop->getSubdomain(true) }}
</li>
</ul>
</address>

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

@ -125,7 +125,7 @@
<i class="fa fa-chevron-down"></i>
</div>
<h1>Sparen Sie mit Sets</h1>
<h1>Spare mit Sets</h1>
<ul class="shop-item-list row list-inline nomargin">
@foreach($site->getProductSetModels() as $product)
<!-- ITEM -->
@ -165,7 +165,7 @@
{!! nl2br($user_shop->contact) !!}
@endif
<br>
{{ $user_shop->getSubdomain() }}
{{ $user_shop->getSubdomain(true) }}
</p>
@if($user_shop->accessibility)