08 2024
This commit is contained in:
Kevin Adametz
parent
04d677d37a
commit
bfa3bb1df4
1191 changed files with 637397 additions and 10619 deletions
|
|
@ -1,50 +1,50 @@
|
|||
<div class="card-body">
|
||||
<h6 class="small font-weight-semibold">
|
||||
Kunden-, Rechnungsadresse
|
||||
{{ __('customer.customer_billing_address') }}
|
||||
</h6>
|
||||
<div class="row">
|
||||
@if($shopping_user->billing_company)
|
||||
<div class="col-md-12 mb-3">
|
||||
<div class="text-muted small">Firma</div>
|
||||
<div class="text-muted small">{{ __('Company') }}</div>
|
||||
{{ $shopping_user->billing_company }}
|
||||
</div>
|
||||
@endif
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Anrede</div>
|
||||
<div class="text-muted small">{{ __('Salutation') }}</div>
|
||||
{{ \App\Services\HTMLHelper::getSalutationLang($shopping_user->billing_salutation) }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Vorname</div>
|
||||
<div class="text-muted small">{{ __('First name') }}</div>
|
||||
{{ $shopping_user->billing_firstname }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Nachname</div>
|
||||
<div class="text-muted small">{{ __('Last name') }}</div>
|
||||
{{ $shopping_user->billing_lastname }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Straße</div>
|
||||
<div class="text-muted small">{{ __('Street') }}</div>
|
||||
{{ $shopping_user->billing_address }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Zusatz</div>
|
||||
<div class="text-muted small">{{ __('Addition') }}</div>
|
||||
{{ $shopping_user->billing_address_2 }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">PLZ</div>
|
||||
<div class="text-muted small">{{ __('Postcode') }}</div>
|
||||
{{ $shopping_user->billing_zipcode }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Stadt</div>
|
||||
<div class="text-muted small">{{ __('City') }}</div>
|
||||
{{ $shopping_user->billing_city }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Land</div>
|
||||
<div class="text-muted small">{{ __('Country') }}</div>
|
||||
{{ $shopping_user->billing_country->getLocated() }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Telefon</div>
|
||||
<div class="text-muted small">{{ __('Phone') }}</div>
|
||||
{{ $shopping_user->billing_phone }}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
<!-- Shipping -->
|
||||
<div class="card-body">
|
||||
<h6 class="small font-weight-semibold">
|
||||
Lieferadresse
|
||||
{{ __('Delivery address') }}
|
||||
</h6>
|
||||
@if($shopping_user->same_as_billing)
|
||||
{{__('email.checkout_mail_same_address')}}
|
||||
|
|
@ -63,46 +63,46 @@
|
|||
<div class="row">
|
||||
@if($shopping_user->shipping_company)
|
||||
<div class="col-md-12 mb-3">
|
||||
<div class="text-muted small">Firma</div>
|
||||
<div class="text-muted small">{{ __('Company') }}</div>
|
||||
{{ $shopping_user->shipping_company }}
|
||||
</div>
|
||||
@endif
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Anrede</div>
|
||||
<div class="text-muted small">{{ __('Salutation') }}</div>
|
||||
{{ \App\Services\HTMLHelper::getSalutationLang($shopping_user->shipping_salutation) }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Vorname</div>
|
||||
<div class="text-muted small">{{ __('First name') }}</div>
|
||||
{{ $shopping_user->shipping_firstname }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Nachname</div>
|
||||
<div class="text-muted small">{{ __('Last name') }}</div>
|
||||
{{ $shopping_user->shipping_lastname }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Straße</div>
|
||||
<div class="text-muted small">{{ __('Street') }}</div>
|
||||
{{ $shopping_user->shipping_address }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Zusatz</div>
|
||||
<div class="text-muted small">{{ __('Addition') }}</div>
|
||||
{{ $shopping_user->shipping_address_2 }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">PLZ</div>
|
||||
<div class="text-muted small">{{ __('Postcode') }}</div>
|
||||
{{ $shopping_user->shipping_zipcode }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Stadt</div>
|
||||
<div class="text-muted small">{{ __('City') }}</div>
|
||||
{{ $shopping_user->shipping_city }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Land</div>
|
||||
<div class="text-muted small">{{ __('Country') }}</div>
|
||||
{{ $shopping_user->shipping_country->getLocated() }}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Telefon</div>
|
||||
<div class="text-muted small">{{ __('Phone') }}</div>
|
||||
{{ $shopping_user->shipping_phone }}
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
<div class="card">
|
||||
|
||||
|
||||
<!-- Info -->
|
||||
<div class="card-body pb-1">
|
||||
@if($isAdmin)
|
||||
<div class="row">
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">E-Mail</div>
|
||||
<div class="text-muted small">{{ __('E-Mail') }}</div>
|
||||
@if($shopping_user->faker_mail)
|
||||
-
|
||||
@else
|
||||
|
|
@ -14,21 +12,21 @@
|
|||
@endif
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Kundennummer</div>
|
||||
<div class="text-muted small">{{ __('customer.customer_data') }}</div>
|
||||
{{$shopping_user->number}}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Datum</div>
|
||||
<div class="text-muted small">{{ __('customer.date') }}</div>
|
||||
{{$shopping_user->created_at->format("d.m.Y H:i")}}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<a class="btn btn-sm btn-secondary mt-2" href="{{route('admin_customer_edit', [$shopping_user->id])}}">Kundendaten bearbeiten</a>
|
||||
<a class="btn btn-sm btn-secondary mt-2" href="{{route('admin_customer_edit', [$shopping_user->id])}}">{{ __('customer.edit_customer_data') }}</a>
|
||||
</div>
|
||||
</div>
|
||||
@else
|
||||
<div class="row">
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">E-Mail</div>
|
||||
<div class="text-muted small">{{ __('E-Mail') }}</div>
|
||||
@if($shopping_user->faker_mail)
|
||||
-
|
||||
@else
|
||||
|
|
@ -36,17 +34,17 @@
|
|||
@endif
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Kundennummer</div>
|
||||
<div class="text-muted small">{{ __('customer.customer_data') }}</div>
|
||||
{{$shopping_user->number}}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Erstellt</div>
|
||||
<div class="text-muted small">{{ __('customer.created') }}</div>
|
||||
{{$shopping_user->firstEntryByNumber()->created_at->format("d.m.Y H:i")}}
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
|
||||
@if(!$shopping_user->is_like)
|
||||
<a class="btn btn-sm btn-secondary mt-2" href="{{route('user_customer_edit', [$shopping_user->id])}}">Kundendaten bearbeiten</a>
|
||||
<a class="btn btn-sm btn-secondary mt-2" href="{{route('user_customer_edit', [$shopping_user->id])}}">{{ __('customer.edit_customer_data') }}</a>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -70,14 +68,14 @@
|
|||
</div>
|
||||
</div>
|
||||
@endif
|
||||
<div class="text-muted small">Zugewiesener Berater</div>
|
||||
<div class="text-muted small">{{ __('customer.assigned_counsellor') }} </div>
|
||||
@if($shopping_user->is_like)
|
||||
<button type="button" class="btn btn-xs btn-outline-info" data-toggle="modal" data-target="#modals-load-content"
|
||||
data-id="{{$shopping_user->id}}"
|
||||
data-action="shopping-user-is-like-member"
|
||||
data-back="{{route('admin_customer_detail', [$shopping_user->id])}}"
|
||||
data-modal="modal-xl"
|
||||
data-route="{{route('modal_load')}}"><span class="fa fa-edit"></span> Berater zuordnen</button>
|
||||
data-route="{{route('modal_load')}}"><span class="fa fa-edit"></span> {{ __('customer.counsellor_allocate') }} </button>
|
||||
@else
|
||||
@if($shopping_user->member)
|
||||
<a class="btn btn-xs btn-outline-primary" href="{{route('admin_lead_edit', [$shopping_user->member->id])}}"><i class="ion ion-ios-contacts"></i></a>
|
||||
|
|
@ -91,7 +89,7 @@
|
|||
@endif
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">Über Shop</div>
|
||||
<div class="text-muted small">{{ __('customer.about_shop') }} </div>
|
||||
@if($shopping_user->shopping_order)
|
||||
@if($shopping_user->shopping_order->user_shop->user->isActive() && $shopping_user->shopping_order->user_shop->user->isActiveShop())
|
||||
<a href="{{$shopping_user->shopping_order->user_shop->getSubdomain(false)}}" class="badge badge-success" target="_blank">{{$shopping_user->shopping_order->user_shop->getSubdomain(false)}}</a>
|
||||
|
|
@ -101,7 +99,7 @@
|
|||
@endif
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="text-muted small">ist Berater</div>
|
||||
<div class="text-muted small">{{ __('customer.is_counsellor') }} </div>
|
||||
@if($shopping_user->auth_user)
|
||||
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>
|
||||
<a class="btn btn-xs btn-outline-primary" href="{{route('admin_lead_edit', [$shopping_user->auth_user->id])}}"><i class="ion ion-ios-contacts"></i></a>
|
||||
|
|
@ -121,11 +119,11 @@
|
|||
--}}
|
||||
</div>
|
||||
<div class="col-md-6 mb-3">
|
||||
<div class="text-muted small">Kundenhoheit</div>
|
||||
<div class="text-muted small">{{ __('customer.client_sovereignty') }}</div>
|
||||
@if($shopping_user->is_like)
|
||||
<span class="badge badge-pill badge-warning"><i class="fa fa-clock"></i> in Prüfung</span>
|
||||
<span class="badge badge-pill badge-warning"><i class="fa fa-clock"></i> {{ __('customer.under_review') }}</span>
|
||||
@else
|
||||
<span class="badge badge-pill badge-success"><i class="fa fa-check-circle"></i> zugewiesen</span>
|
||||
<span class="badge badge-pill badge-success"><i class="fa fa-check-circle"></i> {{ __('customer.assigned') }}</span>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
|
|
@ -146,16 +144,16 @@
|
|||
<div class="row">
|
||||
<div class="col-md-12 mb-3">
|
||||
@if($shopping_user->has_buyed)
|
||||
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span> Kunde hat schon gekauft.
|
||||
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span> {{ __('customer.customer_has_already_purchased') }}
|
||||
@else
|
||||
<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span> Kunde hat noch nicht gekauft.
|
||||
<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span> {{ __('customer.customer_has_not_yet_purchased') }}
|
||||
@endif
|
||||
</div>
|
||||
<div class="col-md-12 mb-3">
|
||||
@if($shopping_user->subscribed)
|
||||
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span> Kunde ist für Newsletter abonniert.
|
||||
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span> {{ __('customer.customer_is_subscribed_to_newsletter') }}
|
||||
@else
|
||||
<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span> Kunde ist nicht für Newsletter abonniert.
|
||||
<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span> {{ __('customer.customer_is_not_subscribed_to_newsletter') }}
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -163,7 +161,7 @@
|
|||
<hr class="m-0">
|
||||
<div class="card-body">
|
||||
<h6 class="small font-weight-semibold">
|
||||
Bemerkungen
|
||||
{{ __('Comments') }}
|
||||
</h6>
|
||||
<div class="row">
|
||||
<div class="col-md-12 mb-3">
|
||||
|
|
@ -177,15 +175,15 @@
|
|||
<!-- Order -->
|
||||
<div class="card-body">
|
||||
<h6 class="small font-weight-semibold">
|
||||
Bestellung
|
||||
{{ __('tables.order') }}
|
||||
</h6>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-bordered m-0" style="min-width:550px;">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th>Produkt</th>
|
||||
<th>Anzahl</th>
|
||||
<th>Preis</th>
|
||||
<th>{{ __('tables.product') }}</th>
|
||||
<th>{{ __('tables.quantity') }}</th>
|
||||
<th>{{ __('tables.price') }}</th>
|
||||
</tr>
|
||||
@if($shopping_user->shopping_order)
|
||||
@foreach($shopping_user->shopping_order->shopping_order_items as $shopping_order_item)
|
||||
|
|
@ -199,12 +197,12 @@
|
|||
@endif
|
||||
|
||||
<div class="media-body">
|
||||
<a href="{{route('admin_product_edit', [$shopping_order_item->product->id])}}" class="d-block">{{ $shopping_order_item->product->name }}
|
||||
<a href="{{route('admin_product_edit', [$shopping_order_item->product->id])}}" class="d-block">{{ $shopping_order_item->product->getLang('name') }}
|
||||
<span class="text-muted">#{{ $shopping_order_item->product->number }}</span></a>
|
||||
<small>
|
||||
<span class="text-muted">Inhalt: </span> {{ $shopping_order_item->product->contents }}<br>
|
||||
<span class="text-muted">Gewicht: </span> {{ $shopping_order_item->product->weight }} g<br>
|
||||
<span class="text-muted">Points: </span> {{ $shopping_order_item->product->points }}
|
||||
<span class="text-muted">{{ __('order.content') }}: </span> {{ $shopping_order_item->product->contents }}<br>
|
||||
<span class="text-muted">{{ __('order.weight') }}: </span> {{ $shopping_order_item->product->weight }} g<br>
|
||||
<span class="text-muted">{{ __('order.points') }}: </span> {{ $shopping_order_item->product->points }}
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -237,11 +235,11 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<th style="min-width: 60px">#</th>
|
||||
<th>Zahlungsart</th>
|
||||
@if($isAdmin)<th>Referenznummer</th>@endif
|
||||
<th>Gesamt</th>
|
||||
<th>Status</th>
|
||||
<th>Datum</th>
|
||||
<th>{{ __('tables.payment_type') }}</th>
|
||||
@if($isAdmin)<th>{{ __('tables.reference_number') }}</th>@endif
|
||||
<th>{{ __('tables.total') }}</th>
|
||||
<th>{{ __('tables.status') }}</th>
|
||||
<th>{{ __('tables.date') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
@ -265,9 +263,9 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<th style="min-width: 80px">Request</th>
|
||||
<th style="min-width: 80px">Status</th>
|
||||
<th style="min-width: 80px">{{ __('tables.status') }}</th>
|
||||
<th style="min-width: 200px">TX-Action</th>
|
||||
<th style="min-width: 120px">Datum</th>
|
||||
<th style="min-width: 120px">{{ __('tables.date') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
<h5 class="card-header">
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-6">
|
||||
Kunden-, Rechnungsadresse
|
||||
{{ __('customer.customer_billing_address') }}
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-6">
|
||||
<span class="text-tiny float-right">* {{trans('register.required_fields')}}</span>
|
||||
<span class="d-none d-lg-inline">Lieferadresse</span>
|
||||
<span class="d-none d-lg-inline">{{ __('Delivery address') }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</h5>
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
<div class="col-12 col-lg-6">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<label for="billing_company" class="form-label">{{ __('Company name') }} (optional)</label>
|
||||
<label for="billing_company" class="form-label">{{ __('Company name') }} ({{__('optional')}})</label>
|
||||
{{ Form::text('billing_company', $shopping_user->billing_company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'billing_company', 'tabindex' => 1)) }}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -67,8 +67,8 @@
|
|||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12 {{ $errors->has('billing_address_2') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="billing_address_2">{{ __('Wohnung / Gebäude (optional)') }}</label>
|
||||
{{ Form::text('billing_address_2', $shopping_user->billing_address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'billing_address_2', 'tabindex' => 6)) }}
|
||||
<label class="form-label" for="billing_address_2">{{ __('Flat Building optional') }}</label>
|
||||
{{ Form::text('billing_address_2', $shopping_user->billing_address_2, array('placeholder'=>__('Flat Building optional'), 'class'=>'form-control', 'id'=>'billing_address_2', 'tabindex' => 6)) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
|
|
@ -114,12 +114,12 @@
|
|||
<div class="col-12 col-lg-6">
|
||||
<div class="d-md-block d-lg-none">
|
||||
<hr>
|
||||
<h5 class="mt-4">Lieferadresse</h5>
|
||||
<h5 class="mt-4">{{ __('Delivery address') }}</h5>
|
||||
</div>
|
||||
<div id="show_shipping_address" style="@if($shopping_user->same_as_billing) display:none @endif">
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<label for="shipping_company" class="form-label">{{ __('Company name') }} (optional)</label>
|
||||
<label for="shipping_company" class="form-label">{{ __('Company name') }} ({{__('optional')}})</label>
|
||||
{{ Form::text('shipping_company', $shopping_user->shipping_company, array('placeholder'=>__('Company name'), 'class'=>'form-control', 'id'=>'shipping_company', 'tabindex' => 16)) }}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -170,8 +170,8 @@
|
|||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12 {{ $errors->has('shipping_address_2') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="shipping_address_2">{{ __('Wohnung / Gebäude (optional)') }}</label>
|
||||
{{ Form::text('shipping_address_2', $shopping_user->shipping_address_2, array('placeholder'=>__('Wohnung / Gebäude (optional)'), 'class'=>'form-control', 'id'=>'shipping_address_2', 'tabindex' => 21)) }}
|
||||
<label class="form-label" for="shipping_address_2">{{ __('Flat Building optional') }}</label>
|
||||
{{ Form::text('shipping_address_2', $shopping_user->shipping_address_2, array('placeholder'=>__('Flat Building optional'), 'class'=>'form-control', 'id'=>'shipping_address_2', 'tabindex' => 21)) }}
|
||||
@if ($errors->has('shipping_address_2'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('shipping_address_2') }}</strong>
|
||||
|
|
@ -223,7 +223,7 @@
|
|||
<div class="form-group">
|
||||
<label class="custom-control custom-checkbox m-0">
|
||||
<input type="checkbox" class="custom-control-input" name="same_as_billing" id="same_as_billing" @if($shopping_user->same_as_billing) checked="checked" @endif>
|
||||
<span class="custom-control-label">{{__('Versand an die gleiche Adresse')}}</span>
|
||||
<span class="custom-control-label">{{__('Shipping to the same address')}}</span>
|
||||
</label>
|
||||
</div>
|
||||
<hr>
|
||||
|
|
@ -241,14 +241,13 @@
|
|||
<div class="form-group">
|
||||
<label class="custom-control custom-checkbox m-0">
|
||||
<input type="checkbox" class="custom-control-input" name="has_buyed" id="has_buyed" @if($shopping_user->has_buyed) checked="checked" @endif>
|
||||
<span class="custom-control-label">Ich versichere, dass dieser Kunde bereits bei mir gekauft hat</span>
|
||||
<span class="custom-control-label">{{ __('customer.customer_has_already_buy') }}</span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="alert alert-warning mt-3" id="show_has_buyed" style="display: @if($shopping_user->has_buyed) block @else none @endif;">
|
||||
<label class="custom-control custom-checkbox m-0">
|
||||
<input type="checkbox" class="custom-control-input" name="subscribed" id="subscribed" @if($shopping_user->subscribed) checked="checked" @endif >
|
||||
<span class="custom-control-label">Für Newsletter abonniert. Es ist Dir bzw. MIVITA erlaubt, Kunden einen Newsletter zu senden, sofern der Kunde schon mal aktiv gekauft hat.
|
||||
Sollte der Kunde explizit mitgeteilt haben, dass er keinen Newsletter möchte, dann bitte unbedingt das Häkchen entfernen.</span>
|
||||
<span class="custom-control-label">{{ __('customer.newsletter_subscribed_copy1') }}</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -256,13 +255,14 @@
|
|||
<hr>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<label class="form-label" for="remarks">{{ __('Bemerkungen') }}</label>
|
||||
{{ Form::textarea('remarks', $shopping_user->remarks, array('placeholder'=>'Bemerkungen', 'class'=>'form-control', 'rows'=>4, 'id'=>'remarks')) }}
|
||||
<label class="form-label" for="remarks">{{ __('Comments') }}</label>
|
||||
{{ Form::textarea('remarks', $shopping_user->remarks, array('placeholder'=>__('Comments'), 'class'=>'form-control', 'rows'=>4, 'id'=>'remarks')) }}
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
{{ Form::hidden('faker_mail', $shopping_user->faker_mail) }}
|
||||
{{ Form::hidden('language', $shopping_user->language) }}
|
||||
|
||||
@if($isView === 'customer-add')
|
||||
{{ Form::hidden('billing_email_1', $billing_email) }}
|
||||
|
|
@ -295,21 +295,21 @@
|
|||
@endif
|
||||
<h6 class="card-header bg-light">
|
||||
<a href="#" class="" data-toggle="collapse" data-target="#collapseNewMailAddress" aria-expanded="@if($errors->has('new_email_address')) true @else false @endif" aria-controls="collapseNewMailAddress">
|
||||
<i class="fa fa-caret-expand"></i> {{ __('E-Mail Address') }} hinzufügen
|
||||
<i class="fa fa-caret-expand"></i> {{ __('E-Mail Address') }} {{ __('add') }}
|
||||
</a>
|
||||
</h6>
|
||||
<div class="collapse @if($errors->has('new_email_address')) show @endif" id="collapseNewMailAddress">
|
||||
<div class="form-row mt-2 mb-0">
|
||||
<div class="form-group col-md-12 {{ $errors->has('new_email_address') ? 'has-error' : '' }}">
|
||||
<label class="form-label" for="new_email_address">{{ __('E-Mail Address') }}*</label>
|
||||
{{ Form::text('new_email_address', '', array('placeholder'=>'E-Mail Adresse', 'class'=>'form-control', 'id'=>'new_email_address', 'required'=>true ,'tabindex' => 1)) }}
|
||||
{{ Form::text('new_email_address', '', array('placeholder'=>__('E-Mail Address'), 'class'=>'form-control', 'id'=>'new_email_address', 'required'=>true ,'tabindex' => 1)) }}
|
||||
@if ($errors->has('new_email_address'))
|
||||
<span class="help-block">
|
||||
<strong>{{ $errors->first('new_email_address') }}</strong>
|
||||
</span>
|
||||
@endif
|
||||
<p class="mt-2">Kundenhoheit: Es können nur Kunden hinzugefügt werden, die noch nicht im mivita-Salescenter vorhanden sind. </p>
|
||||
<button type="submit" class="btn btn-secondary btn-sm" name="action" value="add-mail-shopping-user-store">{{ __('E-Mail Address') }} prüfen und speichern</button>
|
||||
<p class="mt-2">{{ __('customer.customer_sovereignty_info1') }}</p>
|
||||
<button type="submit" class="btn btn-secondary btn-sm" name="action" value="add-mail-shopping-user-store">{{ __('E-Mail Address') }} {{ __('customer.check_and_save') }}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -356,22 +356,23 @@
|
|||
});
|
||||
|
||||
$.extend( $.validator.messages, {
|
||||
required: "Dieses Feld ist ein Pflichtfeld.",
|
||||
maxlength: $.validator.format( "Geben Sie bitte maximal {0} Zeichen ein." ),
|
||||
minlength: $.validator.format( "Geben Sie bitte mindestens {0} Zeichen ein." ),
|
||||
rangelength: $.validator.format( "Geben Sie bitte mindestens {0} und maximal {1} Zeichen ein." ),
|
||||
email: "Geben Sie bitte eine gültige E-Mail Adresse ein.",
|
||||
url: "Geben Sie bitte eine gültige URL ein.",
|
||||
date: "Bitte geben Sie ein gültiges Datum ein.",
|
||||
number: "Geben Sie bitte eine Nummer ein.",
|
||||
digits: "Geben Sie bitte nur Ziffern ein.",
|
||||
equalTo: "Bitte denselben Wert wiederholen.",
|
||||
range: $.validator.format( "Geben Sie bitte einen Wert zwischen {0} und {1} ein." ),
|
||||
max: $.validator.format( "Geben Sie bitte einen Wert kleiner oder gleich {0} ein." ),
|
||||
min: $.validator.format( "Geben Sie bitte einen Wert größer oder gleich {0} ein." ),
|
||||
creditcard: "Geben Sie bitte eine gültige Kreditkarten-Nummer ein."
|
||||
required: "{{__('account.validator_required')}}",
|
||||
maxlength: $.validator.format( "{{__('account.validator_maxlength')}}" ),
|
||||
minlength: $.validator.format( "{{__('account.validator_minlength')}}" ),
|
||||
rangelength: $.validator.format( "{{__('account.validator_rangelength')}}" ),
|
||||
email: "{{__('account.validator_email')}}",
|
||||
url: "{{__('account.validator_url')}}",
|
||||
date: "{{__('account.validator_date')}}",
|
||||
number: "{{__('account.validator_number')}}",
|
||||
digits: "{{__('account.validator_digits')}}",
|
||||
equalTo: "{{__('account.validator_equalTo')}}",
|
||||
range: $.validator.format( "{{__('account.validator_range')}}" ),
|
||||
max: $.validator.format( "{{__('account.validator_max')}}" ),
|
||||
min: $.validator.format( "{{__('account.validator_min')}}" ),
|
||||
creditcard: "{{__('account.validator_creditcard')}}"
|
||||
});
|
||||
|
||||
|
||||
// Set up validator
|
||||
$('#lead-form-validation').validate({
|
||||
rules: {
|
||||
|
|
@ -401,7 +402,7 @@
|
|||
required: "{{__('This field is required.')}}",
|
||||
},
|
||||
salutation : {
|
||||
required: "{{__('Bitte angeben.')}}",
|
||||
required: "{{__('please specify')}}",
|
||||
},
|
||||
first_name : {
|
||||
required: "{{__('This field is required.')}}",
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@
|
|||
@section('content')
|
||||
|
||||
<h4 class="font-weight-bold py-2 mb-2">
|
||||
<a href="{{route('admin_customers')}}" class="btn btn-sm btn-default float-right">zurück</a>
|
||||
{{ __('Kunden Details') }}
|
||||
<a href="{{route('admin_customers')}}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
|
||||
{{ __('customer.customer_details') }}
|
||||
</h4>
|
||||
@include('admin.customer._detail')
|
||||
<a href="{{route('admin_customers')}}" class="btn btn-sm btn-default mt-2 float-right">zurück</a>
|
||||
<a href="{{route('admin_customers')}}" class="btn btn-sm btn-default mt-2 float-right">{{ __('back') }}</a>
|
||||
|
||||
@endsection
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
@section('content')
|
||||
<h4 class="font-weight-bold py-2 mb-2">
|
||||
<a href="{{route('admin_customer_detail', [$shopping_user->id])}}" class="btn btn-sm btn-default float-right">zurück</a>
|
||||
{{ __('Kunden Details') }} bearbeiten
|
||||
<a href="{{route('admin_customer_detail', [$shopping_user->id])}}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
|
||||
{{ __('customer.customer_details') }} {{ __('customer.edit') }}
|
||||
</h4>
|
||||
{!! Form::open(['url' => route('admin_customer_edit', [$shopping_user->id]), 'class' => 'form-horizontal', 'id'=>'lead-form-validation']) !!}
|
||||
@include('admin.customer._edit')
|
||||
|
|
@ -11,5 +11,5 @@
|
|||
<button type="submit" class="btn btn-secondary" name="action" value="shopping-user-store">{{ __('save changes') }}</button>
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
<a href="{{route('admin_customer_detail', [$shopping_user->id])}}" class="btn btn-sm btn-default float-right">zurück</a>
|
||||
<a href="{{route('admin_customer_detail', [$shopping_user->id])}}" class="btn btn-sm btn-default float-right">{{ __('back') }}</a>
|
||||
@endsection
|
||||
|
|
@ -38,13 +38,13 @@
|
|||
<th>{{__('Nummer')}}</th>
|
||||
<th>{{__('E-Mail')}}</th>
|
||||
<th>{{__('ist Berater')}}</th>
|
||||
<th>{{__('Anrede')}}</th>
|
||||
<th>{{__('Firma')}}</th>
|
||||
<th>{{__('Vorname')}}</th>
|
||||
<th>{{__('Nachname')}}</th>
|
||||
<th>{{__('PLZ')}}</th>
|
||||
<th>{{__('Stadt')}}</th>
|
||||
<th>{{__('Land')}}</th>
|
||||
<th>{{ __('Salutation') }}</th>
|
||||
<th>{{ __('Company') }}</th>
|
||||
<th>{{ __('First name') }}</th>
|
||||
<th>{{__('Last name')}}</th>
|
||||
<th>{{ __('Postcode') }}</th>
|
||||
<th>{{ __('City') }}</th>
|
||||
<th>{{ __('Country') }}</th>
|
||||
<th>{{__('Käufe')}}</th>
|
||||
<th>{{__('Newsletter')}}</th>
|
||||
<th>{{__('zugewiesener Berater')}}</th>
|
||||
|
|
@ -96,7 +96,7 @@
|
|||
"bLengthChange": false,
|
||||
"iDisplayLength": 50,
|
||||
"language": {
|
||||
"url": "/js/German.json"
|
||||
"url": "/js/datatables-{{ \App::getLocale() }}.json"
|
||||
}
|
||||
});
|
||||
$('#filter_member_id').on('change', function(){
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue