gitmedia/gruene-seele
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

main system

Browse source
This commit is contained in:
Kevin Adametz 2021-01-15 18:16:31 +01:00
parent 0baac018a2
commit a96d7d5c77
115 changed files with 4589 additions and 557 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<title>mivita care</title>
<title>gruene-seele.bio</title>
<meta name="description" content="" />
<meta name="Author" content="" />

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

@ -247,7 +247,7 @@
<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.
<span class="custom-control-label">Für Newsletter abonniert. Es ist Dir bzw. gruene-seele.bio 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>
</label>
</div>

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

@ -31,7 +31,7 @@
<strong>{{__('Daten vollständig, freigeschaltet')}}</strong>: {{ $user->getActiveDateFormat() }}</p>
@if($user->files->count())
@foreach($user->files()->whereIdentifier('contract')->get() as $file)
<a class="btn btn-secondary" href="{{ route('storage_file', [$file->id, 'user']) }}" target="_blank">MIVITA_Beratervertrag.pdf</a>
<a class="btn btn-secondary" href="{{ route('storage_file', [$file->id, 'user']) }}" target="_blank">Beratervertrag.pdf</a>
@endforeach
@endif
@else

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

@ -48,8 +48,9 @@
{{$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">Points gesamt</div>
{{ $shopping_order->points }}
--}}
</div>
</div>
</div>
@ -296,7 +297,6 @@
}
</style>
@if($shopping_order->shopping_user->is_from !== 'homeparty')
<div class="table-responsive">
<table class="table table-product m-0" style="">
@ -330,7 +330,7 @@
<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">Points: </span> {{ $shopping_order_item->product->points }} --}}
</small>
</div>
@endif
@ -402,105 +402,6 @@
</tfoot>
</table>
</div>
@else
@if($shopping_order->homeparty)
<style>
.table-small {
font-size: 0.9em;
width: auto;
}
.table-small td {
padding: 0.225rem 1rem 0.225rem 0;
}
.btn-md-extra {
padding: 0.3rem 0.6rem;
font-size: 0.8rem;
line-height: 1.5;
border-radius: 0.25rem;
}
.md-btn-extra {
width: calc(1.7rem + 2px) !important;
line-height: 1.5rem;
}
.form-control.input-extra {
padding: 0.28rem 0.6rem;
font-size: 0.8rem;
font-weight: 500;
min-height: calc(1.8rem + 2px);
height: calc(1.8rem + 2px);
width: 44px;
}
.input-group-min-w {
min-width: 102px;
}
.img-extra {
min-width:55px;
max-height: 120px;
}
.table td.border-top {
border: none;
border-top: 1px solid #ccccdb;
}
.table td {
border: none;
}
.table th {
border: none;
border-bottom: 1px solid #c3c3d2;
}
@media (max-width: 767px) {
.default-style:not([dir=rtl]) div.card-datatable table.dataTable thead th:first-child,
.default-style:not([dir=rtl]) div.card-datatable table.dataTable tbody td:first-child,
.default-style:not([dir=rtl]) div.card-datatable table.dataTable tfoot th:first-child {
padding-left: 0.6rem !important;
}
.img-extra {
min-width:35px;
max-height: 160px;
}
}
.table .foot-small td {
padding: 0.225rem 0.625rem;
}
.table .text-body {
font-size: 0.9em;
}
.table .options a.auto-delete-product {
font-size: 0.7em;
font-weight: bold;
text-transform: uppercase;
}
.table .min-width-80 {
min-width: 160px;
}
</style>
@php($homeparty = $shopping_order->homeparty)
@if($homeparty->homeparty_host)
<p><strong>Bestellung Gastgeber/in {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}}</strong></p>
@include('admin.sales._detail_homparty', ['homeparty'=>$shopping_order->homeparty, 'homeparty_guest' => $homeparty->homeparty_host])
@endif
@if($homeparty->homeparty_guests)
@php($g_count = 1)
@foreach($homeparty->homeparty_guests as $homeparty_guest)
<hr>
<p><strong>Bestellung {!! $g_count++ !!}. Gast {{$homeparty_guest->billing_firstname}} {{$homeparty_guest->billing_lastname}}</strong></p>
@include('admin.sales._detail_homparty', ['homeparty'=>$shopping_order->homeparty, 'homeparty_guest' => $homeparty_guest])
@endforeach
@endif
<hr>
@include('admin.sales._detail_homparty_total', ['homeparty' => $homeparty])
@endif
@endif
</div>
<hr class="m-0">
@ -531,7 +432,7 @@
<hr class="m-0">
@endif
<!-- / Payment -->
<div class="card-body">
<h6 class="small font-weight-semibold">
Zahlung
@ -557,7 +458,7 @@
<td>{{$shopping_payment->getPaymentType()}}</td>
<td>{{$shopping_payment->getPaymentAmount()}}</td>
<td>
@if($isAdmin && $shopping_payment->clearingtype === 'fnc' && $shopping_payment->onlinebanktransfertype === 'MIV')
@if($isAdmin && ($shopping_payment->clearingtype === 'fnc' || $shopping_payment->clearingtype === 'vor'))
<button type="button" class="btn btn-sm btn-{{ \App\Services\Payment::getFormattedTxactionColor($shopping_payment->txaction)}}" data-toggle="modal" data-target="#modals-txaction"
data-id="{{ $shopping_order->id }}"
data-payment_id="{{ $shopping_payment->id }}"
@ -620,7 +521,6 @@
</div>
@if($isAdmin)
<!-- Modal template -->
<div class="modal fade" id="modals-shipped">
<div class="modal-dialog">
<form class="modal-content" action="{{ route('admin_sales_store') }}" method="post">
@ -648,8 +548,6 @@
</div>
</div>
<!-- Modal template -->
<div class="modal fade" id="modals-txaction">
<div class="modal-dialog">
<form class="modal-content" action="{{ route('admin_sales_store') }}" method="post">
@ -660,13 +558,13 @@
<input type="hidden" name="back" value="{{url()->current()}}">
<div class="modal-header">
<h5 class="modal-title">{{__('Bestellung')}} {{__('Rechnung')}} </h5>
<h5 class="modal-title">{{__('Bestellung')}} {{__('Zahlung')}} </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', array('data-live-search'=>'false', 'class'=>'selectpicker') ) }}
<label class="form-label" for="txaction">{{ __('Zahlung') }}</label>
{{ Form::select('txaction', \App\Services\Payment::$txaction_invoice, 'open', array('data-live-search'=>'false', 'class'=>'selectpicker') ) }}
</div>
</div>

50
resources/views/admin/settings/index.blade.php Executable file
View file

@ -0,0 +1,50 @@
@extends('layouts.layout-2')
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Einstellungen') }}
</h4>
{!! Form::open(['url' => route('admin_setting_store'), 'class' => 'form-horizontal']) !!}
<div class="card mb-2">
<div class="card-body">
<h4>Vorkasse Infos</h4>
<div class="form-row">
<div class="form-group col-sm-12">
<label class="form-label" for="de">{{ __('Kontoinhaber') }}*</label>
{{ Form::text('settings[prepayment-account-owner][val]', \App\Models\Setting::getContentBySlug('prepayment-account-owner'), array('class'=>'form-control')) }}
{{ Form::hidden('settings[prepayment-account-owner][type]', 'text') }}
</div>
<div class="form-group col-sm-12">
<label class="form-label" for="de">{{ __('IBAN') }}*</label>
{{ Form::text('settings[prepayment-iban][val]', \App\Models\Setting::getContentBySlug('prepayment-iban'), array('class'=>'form-control')) }}
{{ Form::hidden('settings[prepayment-iban][type]', 'text') }}
</div>
<div class="form-group col-sm-12">
<label class="form-label" for="de">{{ __('BIC') }}*</label>
{{ Form::text('settings[prepayment-bic][val]', \App\Models\Setting::getContentBySlug('prepayment-bic'), array('class'=>'form-control')) }}
{{ Form::hidden('settings[prepayment-bic][type]', 'text') }}
</div>
<div class="form-group col-sm-12">
<label class="form-label" for="de">{{ __('Bank') }}*</label>
{{ Form::text('settings[prepayment-bank][val]', \App\Models\Setting::getContentBySlug('prepayment-bank'), array('class'=>'form-control')) }}
{{ Form::hidden('settings[prepayment-bank][type]', 'text') }}
</div>
{{--
<div class="form-group col-sm-12">
{{ Form::textarea('settings[prepayment-info][val]', \App\Models\Setting::getContentBySlug('prepayment-info'), array('placeholder'=>__('Inhalt zur Vorkasse'), 'class'=>'form-control summernote-small', 'rows'=>10)) }}
{{ Form::hidden('settings[prepayment-info][type]', 'full_text') }}
</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>
{!! Form::close() !!}
@endsection

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

@ -69,8 +69,7 @@
<tr>
<th style="max-width: 60px;">&nbsp;</th>
<th>{{__('Kunden Preis')}}</th>
<th>{{__('Kompensation Preis')}}</th>
<th>{{__('Anzahl KP')}}</th>
<th>{{__('Tax')}}</th>
<th>{{__('Preis von - bis')}}</th>
<th>{{__('Gewicht von - bis')}}</th>
@ -97,8 +96,6 @@
</button>
</td>
<td>{{ $price->getFormattedPrice() }}</td>
<td>{{ $price->getFormattedPriceComp() }}</td>
<td>{{ $price->num_comp }}</td>
<td>{{ $price->getFormattedTaxRate() }}</td>
<td>{{ $price->getFormatTotalFrom() }} - {{ $price->getFormattedTotalTo() }}</td>
<td>{{ $price->weight_from }} - {{ $price->weight_to }}</td>
@ -112,8 +109,6 @@
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-price"
data-id="new"
data-price=""
data-price_comp=""
data-num_comp=""
data-tax_rate=""
data-factor="1"
data-total_from=""
@ -146,23 +141,13 @@
<label for="price" class="form-label">{{__('Kunden Preis (brutto)')}}*</label>
<input type="text" class="form-control" name="price" placeholder="{{__('Preis in Euro')}}" required>
</div>
<div class="form-group col-6">
<label for="price_comp" class="form-label">{{__('Kompensation Preis (brutto)')}}*</label>
<input type="text" class="form-control" name="price_comp" placeholder="{{__('Preis in Euro')}}" required>
</div>
</div>
<div class="form-row">
<div class="form-group col-6">
<label for="tax_rate" class="form-label">{{__('enthaltene Tax (%)')}}</label>
<input type="text" class="form-control" name="tax_rate" placeholder="{{__('Tax in %')}}">
</div>
<div class="form-group col-6">
<label for="num_comp" class="form-label">{{__('Anzahl Kompensationsprodukte')}}*</label>
<input type="text" class="form-control" name="num_comp" placeholder="{{__('Anzahl Kompensationsprodukte')}}" required>
</div>
</div>
<div class="form-row">
<div class="form-group col-6">
<label for="total_from" class="form-label">{{__('von Preis')}}</label>
@ -270,8 +255,6 @@
var button = $(event.relatedTarget);
$(this).find(".modal-content input[name='id']").val(button.data('id'));
$(this).find(".modal-body input[name='price']").val(button.data('price'));
$(this).find(".modal-body input[name='price_comp']").val(button.data('price_comp'));
$(this).find(".modal-body input[name='num_comp']").val(button.data('num_comp'));
$(this).find(".modal-body input[name='tax_rate']").val(button.data('tax_rate'));
$(this).find(".modal-body input[name='factor']").val(button.data('factor'));
$(this).find(".modal-body input[name='total_from']").val(button.data('total_from'));

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

@ -24,6 +24,9 @@
<form method="POST" class="my-3" action="{{ route('user_register') }}" aria-label="{{ __('Register') }}">
@csrf
@if($from_member_id)
{!! Form::hidden('from_member_id', $from_member_id) !!}
@endif
<div class="form-group">
<label for="salutation" class="form-label">{{ __('Salutation') }}*</label>

294
resources/views/dashboard.blade.php Executable file
View file

@ -0,0 +1,294 @@
@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="media align-items-center font-weight-bold py-3 mb-2">
{{-- <img src="assets/img/avatars/1.png" alt="" class="ui-w-50 rounded-circle"> --}}
<div class="media-body ml-3">
Willkommen zurück, {{$user->account->first_name}}!
<div class="text-muted text-tiny mt-1"><small class="font-weight-normal">Heute ist {{__('cal.weekdays.'.$now->format('l'))}}, {{$now->format('j')}}. {{__('cal.months.'.$now->format('F'))}} {{$now->format('Y')}}</small></div>
</div>
</h4>
<hr class="container-m-nx mt-0 mb-4">
<div class="row">
@if($user->active == 1)
@if($user->payment_account && $user->daysActiveAccount() <= config('main.remind_first_days'))
<div class="d-flex col-xl-12 align-items-stretch">
<!-- SHOP -->
<div class="card w-100 mb-4">
<h5 class="card-header">
{{__('membership.home_hl') }}
</h5>
<div class="card-body">
@if($user->daysActiveAccount() <= 0)
@if($user->isActiveAccount())
<h5 class="alert badge-danger">{{__('membership.home_copy_alert_35')}}</h5>
<p>{{__('membership.home_copy_last_35', ['days'=>$user->daysActiveAccount(), 'datetime'=>$user->getPaymentAccountDateFormat()])}}</p>
@else
{{-- 35, 36 --}}
@if($user->daysActiveAccount() == 0)
<h5 class="alert badge-danger">{{__('membership.home_copy_alert_36_today', ['datetime'=>$user->getPaymentAccountDateFormat()])}}</h5>
@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())
{{ __('membership.home_copy_SEPA_36', ['price'=> 'von '.$user->payment_order_product->getFormattedPrice().' EUR', 'pay_date'=>Carbon::parse($user->payment_account)->modify('- '.config('main.abo_booking_days').' days')->format('d.m.Y')]) }}
<hr>
@endif
<p>{{__('membership.home_copy_last_36', ['days'=>$user->daysActiveAccount(), 'datetime'=>$user->getPaymentAccountDateFormat()])}}</p>
@endif
@elseif($user->daysActiveAccount() < config('main.remind_last_days') )
{{-- 33 --}}
<h5 class="alert badge-warning">{{ __('membership.home_copy_alert_31', ['datetime'=>$user->getPaymentAccountDateFormat()]) }}</h5>
<p>{{__('membership.home_copy_last_34', ['days'=>$user->daysActiveAccount(), 'datetime'=>$user->getPaymentAccountDateFormat()])}}</p>
@elseif($user->daysActiveAccount() < config('main.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('main.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('main.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('main.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())
{{ __('membership.home_copy_SEPA_32', ['price'=> 'von '.$user->payment_order_product->getFormattedPrice().' EUR', 'pay_date'=>Carbon::parse($user->payment_account)->modify('- '.config('main.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>
</div>
</div>
<!-- / SHOP -->
</div>
@endif
@endif
{{-- <div class="d-flex col-xl-6 align-items-stretch">
<!-- Stats + Links -->
<div class="card d-flex w-100 mb-4">
<div class="row no-gutters row-bordered h-100">
<div class="d-flex col-sm-6 col-md-4 col-lg-6 align-items-center">
<a href="javascript:void(0)" class="card-body media align-items-center text-body">
<i class="lnr lnr-chart-bars display-4 d-block text-primary"></i>
<span class="media-body d-block ml-3">
<span class="text-big font-weight-bolder">$1,342.11</span><br>
<small class="">Umsatz diesen Monat</small>
</span>
</a>
</div>
<div class="d-flex col-sm-6 col-md-4 col-lg-6 align-items-center">
<a href="javascript:void(0)" class="card-body media align-items-center text-body">
<i class="lnr lnr-hourglass display-4 d-block text-primary"></i>
<span class="media-body d-block ml-3">
<span class="text-big"><span class="font-weight-bolder">152</span> Working Hours</span><br>
<small class="">Umsatz dieses Jahr</small>
</span>
</a>
</div>
<div class="d-flex col-sm-6 col-md-4 col-lg-6 align-items-center">
<a href="javascript:void(0)" class="card-body media align-items-center text-body">
<i class="lnr lnr-checkmark-circle display-4 d-block text-primary"></i>
<span class="media-body d-block ml-3">
<span class="text-big"><span class="font-weight-bolder">54</span> Tasks</span><br>
<small class="">Punkte</small>
</span>
</a>
</div>
<div class="d-flex col-sm-6 col-md-4 col-lg-6 align-items-center">
<a href="javascript:void(0)" class="card-body media align-items-center text-body">
<i class="lnr lnr-license display-4 d-block text-primary"></i>
<span class="media-body d-block ml-3">
<span class="text-big"><span class="font-weight-bolder">6</span> Projects</span><br>
<small class="">Verkäufe</small>
</span>
</a>
</div>
</div>
</div>
<!-- / Stats + Links -->
</div> --}}
<div class="d-flex col-xl-6 align-items-stretch">
<!-- SHOP -->
<div class="card w-100 mb-4">
<h5 class="card-header with-elements">
<div class="card-header-title">{{__('Mitgliedschaft') }}</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>
<hr>
<p><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
</p>
<hr>
<p><span class="ion ion-md-checkmark-circle-outline text-success"></span>
<strong>{{__('Guthaben')}}:</strong>
@if($user->payment_credit)
{{ $user->getFormattedPaymentCredit() }} &euro;
@endif
</p>
@else
<div class="badge badge-danger p-2">
<i class="ion ion-md-close-circle-outline text-white"></i>
<strong>{{__('Berater-Account inaktiv')}} </strong>
@if($user->payment_account)
{{__('abgelaufen am')}}: <strong></strong>{{ $user->getPaymentAccountDateFormat() }}
@endif
</div>
@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>
</div>
</div>
</div>
<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">{{__('Activities') }}</div>
</h5>
<div class="card-body">
@if($user->active == 1)
<p><span class="ion ion-md-checkmark-circle-outline text-success"></span>
<strong>{{__('Daten vollständig, freigeschaltet')}}</strong> {{__('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-success"></span>
<strong>{{__('Einverständniserklärung')}}</strong> {{__('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>
@endif
@endif
@if($user->account->data_protection)
<p><span class="ion ion-md-checkmark-circle-outline text-success"></span>
<strong>{{__('Privacy policy approved')}}</strong> {{__('at')}}: {{ $user->account->getDataProtectionFormat() }}
</p>
@endif
@endif
@if($user->confirmed == 1)
<p><span class="ion ion-md-checkmark-circle-outline text-success"></span>
<strong>{{__('E-Mail verified')}}</strong> {{__('at')}}: {{ $user->getConfirmationDateFormat() }}</p>
@endif
</div>
@if($user->active == 1)
@if($user->files->count())
@foreach($user->files()->whereIdentifier('contract')->get() as $file)
<div class="card-footer pt-3">
<a class="btn btn-secondary btn-block" href="{{ route('storage_file', [$file->id, 'user']) }}" target="_blank"><i class="ion ion-ios-download text-default mr-1"></i> Beratervertrag.pdf</a>
</div>
@endforeach
@endif
@endif
</div>
</div>
<div class="col-xl-12">
<div class="row">
<div class="col-md-6">
<div class="card mb-4">
<h5 class="card-header with-elements">
<div class="card-header-title">{{__('Daten') }}</div>
</h5>
<div class="card-body">
@if($user->active == 1)
<p>{{__('Ändere Deine persönlichen Datan.')}}</p>
<a href="{{ route('user_edit') }}" class="btn btn-secondary"><i class="ion ion-ios-contact text-default mr-1"></i> {{ __('Adjust data') }}</a>
@endif
</div>
</div>
</div>
<div class="col-md-6">
<div class="card mb-4">
<h5 class="card-header with-elements">
<div class="card-header-title">{{ __('Sicherheit') }}</div>
</h5>
<div class="card-body">
@if($user->active == 1)
<p>{{__('Ändere Dein persönliches Passwort.')}}</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
</div>
</div>
</div>
<div class="col-md-6">
<div class="card mb-4">
<h5 class="card-header with-elements">
<div class="card-header-title">{{ __('Anmeldung') }}</div>
</h5>
<div class="card-body">
@if($user->active == 1)
<p>{{__('Ändere Deine E-Mail Adresse.')}}</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>
@endif
</div>
</div>
</div>
<div class="col-md-6">
<div class="card mb-4">
<h5 class="card-header with-elements">
<div class="card-header-title">{{ __('Logout') }}</div>
</h5>
<div class="card-body">
<p>Abmelden und bis bald.</p></o>
<a href="{{route('logout')}}" class="btn btn-primary"><i class="ion ion-ios-log-out text-default mr-1"></i> {{ __('Logout') }}</a>
</div>
</div>
</div>
</div>
</div>
</div>
<hr class="container-m-nx mt-0 mb-4">
@endsection

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

@ -4,7 +4,7 @@
<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>
<title>gruene-seele.bio</title>
<style type="text/css">
img {

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

@ -142,6 +142,9 @@
<td style="line-height:1.6em;">
@if($txaction === 'failed')
<b>{{__('email.checkout_mail_pay_error')}}</b><br>
@elseif($txaction === 'non')
<b>{{__('email.checkout_mail_pay_error')}}</b><br>
@elseif($txaction === 'open')
@if($shopping_payment->clearingtype === "vor")
@ -149,10 +152,10 @@
{{__('email.checkout_mail_pay_pre_c1')}} {{ number_format( (float) ($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['reference'] }} <br>
<b>{{__('email.checkout_mail_bank_iban')}}</b> {{ $pay_trans->transmitted_data['reference'] }} <br>
<b>{{__('email.checkout_mail_bank_bic')}}</b> {{ $pay_trans->transmitted_data['reference'] }} <br>
<b>{{__('email.checkout_mail_bank_name')}}</b> {{ $pay_trans->transmitted_data['reference'] }} <br>
<b>{{__('email.checkout_mail_bank_holder')}}</b> {!! \App\Models\Setting::getContentBySlug('prepayment-account-owner') !!}<br>
<b>{{__('email.checkout_mail_bank_iban')}}</b> {!! \App\Models\Setting::getContentBySlug('prepayment-iban') !!} <br>
<b>{{__('email.checkout_mail_bank_bic')}}</b> {!! \App\Models\Setting::getContentBySlug('prepayment-bic') !!} <br>
<b>{{__('email.checkout_mail_bank_name')}}</b> {!! \App\Models\Setting::getContentBySlug('prepayment-bank') !!} <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['reference'] }}
</p>
@ -293,7 +296,6 @@
</table>
</td>
</tr>
<tr>
<td>
<hr>
@ -333,7 +335,6 @@
</table>
</td>
</tr>
<tr>
<td>
<hr>

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

@ -11,7 +11,7 @@
<title>{{ config('app.name') }}</title>
<!-- Main font -->
<link href="https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,500,500i,700,700i,900" rel="stylesheet">
<link rel="stylesheet" href="{{ asset('/fonts/roboto.css') }}">
<!-- Icons. Uncomment required icon fonts -->
<link rel="stylesheet" href="{{ mix('/vendor/fonts/fontawesome.css') }}">

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

@ -73,7 +73,7 @@
</ul>
</li>
@endif
@if(Auth::user()->isActiveAccount() && Auth::user()->isSySAdmin())
@if(Auth::user()->isActiveAccount())
<li class="sidenav-item @if(Request::is('user/orders', 'user/order/*')) open @endif">
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
<i class="sidenav-icon ion ion-ios-cart"></i>
@ -89,19 +89,6 @@
</ul>
</li>
@endif
@if(Auth::user()->isActiveAccount() && Auth::user()->isSySAdmin())
<li class="sidenav-item @if(Request::is('user/homepartys', 'user/homeparty/*')) open @endif">
<a href="javascript:void(0)" class="sidenav-link sidenav-toggle">
<i class="sidenav-icon ion ion-ios-pizza"></i>
<div>{{ __('navigation.my_homeparty') }}</div>
</a>
<ul class="sidenav-menu">
<li class="sidenav-item{{ Request::is('user/homepartys', 'user/homeparty/*') ? ' active' : '' }}">
<a href="{{ route('user_homepartys') }}" class="sidenav-link"><i class="sidenav-icon ion ion ion-ios-list"></i><div>{{ __('navigation.overview') }}</div></a>
<li>
</ul>
</li>
@endif
@endif
@if(Auth::user()->isAdmin())
@ -203,6 +190,10 @@
<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>{{ __('navigation.countries') }}</div></a>
</li>
<li class="sidenav-item{{ Request::is('admin/settings') ? ' active' : '' }} {{ Request::is('admin/setting/*') ? ' active' : '' }}">
<a href="{{ route('admin_settings') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-cog"></i><div>{{ __('navigation.settings') }}</div></a>
</li>
@endif
@if(Auth::user()->isSySAdmin())
<li class="sidenav-divider mb-1"></li>

3
resources/views/user/checkout/checkout.blade.php
View file

@ -140,12 +140,11 @@
{!! Form::open(['url' => route('user_checkout_store', [$identifier]), 'class' => 'row clearfix', 'id'=>'checkout_card_final']) !!}
{!! Form::hidden('selected_country', '') !!}
{!! Form::hidden('is_for', $shopping_user->is_for) !!}
{!! Form::hidden('is_from', $shopping_user->is_from) !!}
@dump($shopping_user->is_from)
<div class="row m-checkout">
<div class="col-lg-8 col-md-7">
<!-- BILLING -->

8
resources/views/user/checkout/final.blade.php
View file

@ -96,10 +96,10 @@
<h4>Bezahlung per Vorkasse:</h4>
<p style="line-height: 1.4em">Bitte überweise {{ number_format(($pay_trans->shopping_payment->amount/100), 2, ",", ".") }} EUR auf die folgende Kontoverbindung, um den Kauf abzuschließen.
<br>
<strong>Kontoinhaber:</strong> Name <br>
<strong>IBAN:</strong> IBAN<br>
<strong>BIC:</strong> BIC <br>
<strong>Bank:</strong> Bank <br>
<strong>{{__('email.checkout_mail_bank_holder')}}</strong> {!! \App\Models\Setting::getContentBySlug('prepayment-account-owner') !!}<br>
<strong>{{__('email.checkout_mail_bank_iban')}}</strong> {!! \App\Models\Setting::getContentBySlug('prepayment-iban') !!} <br>
<strong>{{__('email.checkout_mail_bank_bic')}}</strong> {!! \App\Models\Setting::getContentBySlug('prepayment-bic') !!} <br>
<strong>{{__('email.checkout_mail_bank_name')}}</strong> {!! \App\Models\Setting::getContentBySlug('prepayment-bank') !!} <br>
<strong>Gesamtbetrag:</strong> {{ number_format( ($pay_trans->shopping_payment->amount/100), 2, ",", ".") }} EUR<br>
<strong>Verwendungszweck:</strong> {{ $pay_trans->transmitted_data['reference'] }}
</p>

2
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 Du hast 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 gruene-seele.bio 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>

4
resources/views/user/customer/add.blade.php
View file

@ -55,7 +55,7 @@
<strong>{{ $errors->first('email') }}</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>
<p class="mt-2">Kundenhoheit: Es können nur Kunden hinzugefügt werden, die noch nicht im Salescenter vorhanden sind. </p>
</div>
</div>
<div class="text-left mt-2">
@ -78,7 +78,7 @@
</div>
</div>
<div class="text-left" style="display: none" id="show-button-without-email">
<p class="mt-2">Hinweis: Du kannst Deine Kunden auch ohne Email-Adresse anlegen. Das System gleicht dann Nachname und Postleitzahl ab. Sollte es hier mal Übereinstimmungen geben, gleicht der Support von MIVITA die Kundensätze ab und ordnet sie den Beratern entsprechend zu. Daher empfehlen wir im besten Fall immer die Angabe einer Email-Adresse. Diese ist einzigartig und damit eindeutig einem Kunden zuzuordnen.</p>
<p class="mt-2">Hinweis: Du kannst Deine Kunden auch ohne Email-Adresse anlegen. Das System gleicht dann Nachname und Postleitzahl ab. Sollte es hier mal Übereinstimmungen geben, gleicht der Support von gruene-seele.bio die Kundensätze ab und ordnet sie den Beratern entsprechend zu. Daher empfehlen wir im besten Fall immer die Angabe einer Email-Adresse. Diese ist einzigartig und damit eindeutig einem Kunden zuzuordnen.</p>
<button type="submit" class="btn btn-secondary" name="action" value="add_customer_without_email">{{ __('weiter ohne E-Mail') }}</button>&nbsp;
</div>
{!! Form::close() !!}

37
resources/views/user/membership/_change_level.blade.php Normal file
View file

@ -0,0 +1,37 @@
{!! Form::open(['url' => route('user_membership_store', ['change_level']), 'class' => 'form-horizontal']) !!}
<div class="table-responsive">
<table class="table table- m-0">
<tbody class="switchers-stacked">
@foreach($user_levels as $user_level)
<tr>
<td class="text-center align-middle px-0">
<label class="switcher switcher-secondary">
<input type="radio" class="switcher-input" value="{{$user_level->id}}" name="switchers-package-level" required @if($user_level->id === Auth::user()->next_m_level) checked @endif>
<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">
<div class="media-body">
<h5 class="d-block text-dark">{{$user_level->name}}</h5>
{!! $user_level->getLang('content') !!}
</div>
</div>
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
<div class="text-left mt-3">
<hr>
<button type="submit" class="btn btn-secondary">{{ __('auswählen und speichern') }}</button>&nbsp;
</div>
{!! Form::close() !!}

2
resources/views/user/membership/_payment_order.blade.php
View file

@ -51,7 +51,7 @@
<hr>
@else
<p><strong>Alternativ hast Du die Möglichkeit jetzt direkt Deine Mitgliedschaft mit anderen Zahlungsmöglichkeite zu bezahlen.</strong><br>
Ist die Mitgliedschaft vor dem {!! Carbon::parse($user->payment_account)->modify('-'.config('mivita.abo_booking_days').' days')->format('d.m.Y') !!} bezahlt, wird das SEPA Mandart nicht ausgeführt!</p>
Ist die Mitgliedschaft vor dem {!! Carbon::parse($user->payment_account)->modify('-'.config('main.abo_booking_days').' days')->format('d.m.Y') !!} bezahlt, wird das SEPA Mandart nicht ausgeführt!</p>
<hr>
@endif
<button type="submit" class="btn btn-secondary">{{ __('wählen und weiter zur Kasse') }}</button>&nbsp;

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

@ -28,12 +28,12 @@
@if($userHistoryPaymentOrder && $userHistoryPaymentOrder->status > 2)
<h6 class="alert badge-{{$userHistoryPaymentOrder->getStatusColor()}}">Eine Zahlung wurde ausgeführt. Status: {{ trans('payment.status.'.$userHistoryPaymentOrder->getStatusType())}}</h6>
@endif
@if($user->payment_account && $user->isAboOption())
{{-- @if($user->payment_account && $user->isAboOption())
@if($user->payment_account && $user->isAboOption())
@if($user->daysActiveAccount() < config('mivita.abo_booking_days') )
<p class="alert py-2 px-2 badge-secondary">Wir konnten am <strong>{!! Carbon::parse($user->payment_account)->modify('-'.config('mivita.abo_booking_days').' days')->format('d.m.Y') !!}</strong> Deine Mitgliedschaftsgebühr <strong>nicht</strong> automatisch per SEPA Mandat einziehen.<br>
@if($user->daysActiveAccount() < config('main.abo_booking_days') )
<p class="alert py-2 px-2 badge-secondary">Wir konnten am <strong>{!! Carbon::parse($user->payment_account)->modify('-'.config('main.abo_booking_days').' days')->format('d.m.Y') !!}</strong> Deine Mitgliedschaftsgebühr <strong>nicht</strong> automatisch per SEPA Mandat einziehen.<br>
@else
<p class="alert py-2 px-2 badge-secondary">Deine automatische Verlängerung ist aktiv, wir werden am <strong>{!! Carbon::parse($user->payment_account)->modify('-'.config('mivita.abo_booking_days').' days')->format('d.m.Y') !!}</strong> Deine Mitgliedschaftsgebühr automatisch per SEPA Mandat einziehen.<br>
<p class="alert py-2 px-2 badge-secondary">Deine automatische Verlängerung ist aktiv, wir werden am <strong>{!! Carbon::parse($user->payment_account)->modify('-'.config('main.abo_booking_days').' days')->format('d.m.Y') !!}</strong> Deine Mitgliedschaftsgebühr automatisch per SEPA Mandat einziehen.<br>
@endif
<hr>
@endif
@ -42,6 +42,7 @@
<p></p>
@endif
@endif
--}}
@if($user->payment_order_id)
@if($user->payment_order_product->identifier === 'show_upgrade')
<p><strong>Eine Rückstufung Deiner Berater-Mitgliedschaft ist nicht mehr möglich.</strong></p>
@ -68,7 +69,7 @@
</div>
@else
{{-- no Shop - Upgrade --}}
{{-- no Shop - Upgrade
@if($user->isActiveAccount() && !$user->isActiveShop())
<div class="card w-100 mb-4">
<h5 class="card-header">{{__('MIVITA BUSINESS Paket')}} {{__('Upgrade')}}</h5>
@ -94,8 +95,9 @@
</div>
</div>
@endif
--}}
{{-- upgrade downgrade next booking --}}
{{-- upgrade downgrade next booking
@if($user->payment_account)
<div class="card w-100 mb-4">
<h5 class="card-header">{{__('Mitgliedschaft')}} {{__('anpassen')}}</h5>
@ -106,13 +108,29 @@
</div>
</div>
@endif
--}}
{{-- upgrade downgrade next booking level --}}
@if($user->payment_account)
<div class="card w-100 mb-4">
<h5 class="card-header">{{__('Mitgliedschaft')}} {{__('anpassen')}}</h5>
<div class="card-body">
<h6 class="d-block text-dark">Du kannst Deine Mitglidschaftsrolle bis zur nächsten Vertragsverlängerung ({{ $user->nextRenewalAccount() }}), ändern.
<br> <span class="small">Erst nach der Verlängerug ist die neue Rolle aktiv.</span>
</h6>
@include('user.membership._change_level')
</div>
</div>
@endif
@endif
{{-- remove ABO Options --}}
{{-- remove ABO Options
@if($user->payment_account && $user->isAboOption())
<div class="card w-100 mb-4">
{!! Form::open(['url' => route('user_membership_store', ['remove_abo']), 'class' => 'form-horizontal']) !!}
@ -120,7 +138,7 @@
<div class="card-body">
<p>Automatische Verlängerung dekativeren und SEPA Mandat zurückziehen.<br>
Die nächste Buchung ist am: <strong>{!! Carbon::parse($user->payment_account)->modify('-'.config('mivita.abo_booking_days').' days')->format('d.m.Y') !!}</strong></p>
Die nächste Buchung ist am: <strong>{!! Carbon::parse($user->payment_account)->modify('-'.config('main.abo_booking_days').' days')->format('d.m.Y') !!}</strong></p>
<label class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" name="abo_options_remove">
@ -131,6 +149,7 @@
{!! Form::close() !!}
</div>
@endif
--}}
@if($user->payment_account)
<div class="card w-100 mb-4">
@ -139,15 +158,15 @@
<div class="card-body">
<p>Du möchtest kein MIVITA Berater mehr sein und Deine Mitgliedschaft beenden?<br>
<p>Du möchtest kein Berater mehr sein und Deine Mitgliedschaft beenden?<br>
Damit gibst du alle möglichen Provisionen, Vergünstigungen, Zugang zum Sales-Center und noch viel mehr auf. Mit absenden dieser Option erhalten wir ein Nachricht und kümmern uns um die Löschung Deines Accounts. Dieser Vorgang kann ein paar Tage dauern.</p>
@if($userHistoryDeleteMembership && $userHistoryDeleteMembership->status == 50)
<p class="alert py-2 px-2 badge-danger">Die Beendigung und Löschung Deiner MIVITA Mitgliedschaft ist beantragt.<br>
<p class="alert py-2 px-2 badge-danger">Die Beendigung und Löschung Deiner Mitgliedschaft ist beantragt.<br>
@else
<label class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" name="delete_membership_mivita">
<span class="custom-control-label secondary">Ja, ich möchte die MIVITA Mitgliedschaft beenden, ich verzichte auf jeglichen Anspruch gegenüber MIVITA und möchte, dass mein Account gelöscht wird!</span>
<input type="checkbox" class="custom-control-input" name="delete_membership">
<span class="custom-control-label secondary">Ja, ich möchte die Mitgliedschaft beenden, ich verzichte auf jeglichen Anspruch gegenüber und möchte, dass mein Account gelöscht wird!</span>
</label>
<button type="submit" class="btn btn-default btn-sm">{{ __('Mitgliedschaft hiermit beenden') }}</button>&nbsp;
@endif
@ -165,10 +184,18 @@
<ul class="list-group list-group-flush">
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{__('gebuchtes Paket')}}</div>
<div class="text-muted">{{__('Rolle')}}</div>
<div class="text-right">
@if($user->payment_order_id)
{{ $user->payment_order_product->name }}
@if($user->m_level && $user->user_level)
{{ $user->user_level->name }}
@endif
</div>
</li>
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{__('Guthaben')}}</div>
<div class="text-right">
@if($user->payment_credit)
{{ $user->getFormattedPaymentCredit() }} &euro;
@endif
</div>
</li>
@ -207,34 +234,7 @@
</li>
@endif
@endif
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{ __('Berater-Online-Shop') }}</div>
<div class="text-right">
@if($user->isActiveShop() )
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i> {{ __('aktiv') }}</span>
@else
<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i> {{ __('inaktiv') }}</span>
@endif
</div>
</li>
@if($user->isActiveShop() )
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{__('bis zum')}}</div>
<div class="text-right">
{{ $user->getPaymentShopDateFormat() }}
</div>
</li>
@else
@if($user->payment_shop)
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{__('abgelaufen am')}}</div>
<div class="text-right">
{{ $user->getPaymentShopDateFormat() }}
</div>
</li>
@endif
@endif
{{-- @if($user->isAboOption())
<li class="list-group-item d-flex justify-content-between align-items-center">
<div class="text-muted">{{__('payment.status.auto_renewal_hl')}}</div>
<div class="text-right">
@ -245,7 +245,8 @@
@endif
</div>
</li>
@endif
--}}
</ul>
</div>
<!-- / Project details -->

13
resources/views/user/order/list.blade.php
View file

@ -49,9 +49,11 @@
</style>
@if($user->user_level)
<p>Die Produktpreise werden entsprechend Deinem Karriere-Level <strong>{{$user->user_level->name}}</strong> abzüglich <strong>{{$user->user_level->getFormattedMargin()}} %</strong> Marge angezeigt. Hinweis: Wenn Du den Warenkorb verlässt, gehen alle Einstellungen verloren.</p>
<p>Die Produktpreise werden entsprechend Deiner Rolle: <strong>{{$user->user_level->name}}</strong> angezeigt.<br>
Hinweis: Wenn Du den Warenkorb verlässt, gehen alle Einstellungen verloren.</p>
<strong>Prozente noch nicht eingebaut, müssen über Produkte eingestellt werden</strong>
@else
<p>Hinweis: Dir wurde noch kein Karriere-Level zugewisen. Bitte wende dich an info@mivita.care</p>
<p>Hinweis: Dir wurde noch keine Rolle zugewisen. Bitte wende dich an serivce@gruene-seele.bio</p>
@endif
@if($errors->has('switchers-comp-product'))
@ -78,7 +80,7 @@
<th>{{__('Produkt')}}</th>
<th>{{__('Mein Preis netto')}}</th>
<th>{{__('Mein Preis brutto')}}</th>
<th>{{__('Points')}}</th>
<th>{{__('Gewicht')}}</th>
<th>{{__('VK-Preis brutto')}}</th>
<th><span class="no-line-break">{{__('Inhalt (ml)')}}</span></th>
<th>{{__('Artikelnummer')}}</th>
@ -109,9 +111,10 @@
</div>
@if($for === 'me')
<div id="holder_html_view_comp_product">
{{-- <div id="holder_html_view_comp_product">
@include('user.order.comp_product')
</div>
--}}
@endif
<div class="card mt-4">
@ -150,7 +153,7 @@
{ data: 'product', name: 'product' },
{ data: 'price_net', name: 'price_net', searchable: false, orderable: false },
{ data: 'price_gross', name: 'price_gross', searchable: false, orderable: false },
{ data: 'points', name: 'points', searchable: false },
{ data: 'weight', name: 'weight', searchable: false },
{ data: 'price_vk_gross', name: 'price_vk_gross', searchable: false },
{ data: 'contents_total', name: 'contents_total', searchable: false },
{ data: 'number', name: 'number' },

5
resources/views/user/order/shipping_ot.blade.php
View file

@ -1,11 +1,10 @@
@if($shopping_user->same_as_billing)
<!-- Billing -->
{{ Form::hidden('shipping_company', $shopping_user->billing_company) }}
{{ Form::hidden('shipping_salutation', $shopping_user->billing_salutation) }}
{{ Form::hidden('shipping_firstname', $shopping_user->billing_first_name) }}
{{ Form::hidden('shipping_lastname', $shopping_user->billing_last_name) }}
{{ Form::hidden('shipping_firstname', $shopping_user->billing_firstname) }}
{{ Form::hidden('shipping_lastname', $shopping_user->billing_lastname) }}
{{ Form::hidden('shipping_address', $shopping_user->billing_address) }}
{{ Form::hidden('shipping_address_2', $shopping_user->billing_address_2) }}
{{ Form::hidden('shipping_zipcode', $shopping_user->billing_zipcode) }}

11
resources/views/user/order/yard_view_form.blade.php
View file

@ -128,8 +128,10 @@
</div>
</div>
<div class="options">
@if(!$row->options->comp)
<a href="#" class="auto-delete-product remove_item_form_cart product-tooltip" data-row-id="{{$row->rowId}}" data-product-id="{{ $product->id }}"><i class="fa fa-times"></i> Artikel entfernen</a>
{{--
@if(!$row->options->comp)
@else
@if(Yard::instance('shopping')->getNumComp() > 1)
{{$row->options->comp}}. Kompensationsprodukt
@ -138,6 +140,7 @@
@endif
@endif
--}}
</div>
</div>
@ -147,11 +150,13 @@
<div class="col-6 col-sm-3 col-md-3 quantity">
<div class="quantity-select">
<input type="number" class="form-control text-center cart-input-event-onchange" data-row-id="{{$row->rowId}}" data-product-id="{{ $product->id }}" value="{{ $row->qty }}" name="quantity[{{$row->rowId}}]" maxlength="3" max="999" min="1">
{{--
@if($row->options->comp)
<span class="text-right product-tooltip" data-toggle="tooltip" title="Kompensationsprodukt">1 x</span>
@else
<input type="number" class="form-control text-center cart-input-event-onchange" data-row-id="{{$row->rowId}}" data-product-id="{{ $product->id }}" value="{{ $row->qty }}" name="quantity[{{$row->rowId}}]" maxlength="3" max="999" min="1">
@endif
--}}
</div>
<div class="price-total text-right">
<div class="no-line-break">{{ Yard::instance('shopping')->rowSubtotalNet($row) }} &euro;</div>
@ -170,7 +175,7 @@
<div class="d-flex flex-wrap justify-content-between pb-4">
<div class="mt-2">
<p class="small mb-2">Du hast {{ Yard::instance('shopping')->compCount() }} Artikel in Deinem Warenkorb</p>
<p>Gesamte Points: {{ Yard::instance('shopping')->points() }}</p>
{{-- <p>Gesamte Points: {{ Yard::instance('shopping')->points() }}</p> --}}
<button type="button" class="btn btn-default btn-sm" id="clear-products-basket"><i class="ion ion-ios-trash"></i> Warenkorb löschen</button>
</div>
<div class="d-flex">

6
resources/views/user/team/members.blade.php
View file

@ -26,12 +26,12 @@
<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>
<button class="btn btn-secondary" type="button" title="Kopiert!" data-clipboard-demo data-clipboard-target="#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="">
<input type="text" class="form-control" name="register_link" value="{{$register_link}}" id="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.
<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 partner.gruene-seele.bio. 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 -->

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

@ -37,6 +37,23 @@
<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>
@if($userHistoryWizardPayment->shopping_order && $userHistoryWizardPayment->shopping_order->shopping_payment_last)
@if($userHistoryWizardPayment->shopping_order->shopping_payment_last->clearingtype === 'vor')
<h4>Bezahlung per Vorkasse:</h4>
<p style="line-height: 1.4em">Bitte überweise {{ number_format(($userHistoryWizardPayment->shopping_order->shopping_payment_last->amount/100), 2, ",", ".") }} EUR auf die folgende Kontoverbindung, um den Kauf abzuschließen.
<br>
<strong>{{__('email.checkout_mail_bank_holder')}}</strong> {!! \App\Models\Setting::getContentBySlug('prepayment-account-owner') !!}<br>
<strong>{{__('email.checkout_mail_bank_iban')}}</strong> {!! \App\Models\Setting::getContentBySlug('prepayment-iban') !!} <br>
<strong>{{__('email.checkout_mail_bank_bic')}}</strong> {!! \App\Models\Setting::getContentBySlug('prepayment-bic') !!} <br>
<strong>{{__('email.checkout_mail_bank_name')}}</strong> {!! \App\Models\Setting::getContentBySlug('prepayment-bank') !!} <br>
<strong>Gesamtbetrag:</strong> {{ number_format( ($userHistoryWizardPayment->shopping_order->shopping_payment_last->amount/100), 2, ",", ".") }} EUR<br>
<strong>Verwendungszweck:</strong> {{ $userHistoryWizardPayment->shopping_order->shopping_payment_last->reference }}
</p>
<hr />
@endif
@endif
<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') }}