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

08 2024

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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