commit 08-2025
This commit is contained in:
Kevin Adametz
parent
9b54eb0512
commit
02f2a4c23e
184 changed files with 31653 additions and 22327 deletions
|
|
@ -3,14 +3,14 @@
|
|||
<!-- Status -->
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
<div class="col-md-3 mb-1">
|
||||
<div class="col-sm-6 col-md-4 col-lg-3 mb-1">
|
||||
<strong class="mr-2">Status:</strong>
|
||||
<span class="text-big">
|
||||
{!! \App\Services\Payment::getPaymentForTypeBadge($shopping_order) !!}
|
||||
{!! \App\Services\Payment::getShoppingOrderBadge($shopping_order) !!}
|
||||
</span>
|
||||
</div>
|
||||
<div class="col-md-3 mb-1">
|
||||
<div class="col-sm-6 col-md-4 col-lg-3 mb-1">
|
||||
<strong class="mr-2">Versand:</strong>
|
||||
@if($isAdmin)
|
||||
<button type="button" class="btn btn-sm btn-{{$shopping_order->getShippedColor()}}" data-toggle="modal" data-target="#modals-shipped"
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
</span>
|
||||
@endif
|
||||
</div>
|
||||
<div class="col-md-3 mb-1">
|
||||
<div class="col-sm-6 col-md-4 col-lg-3 mb-1">
|
||||
<strong class="mr-2">Rechnung:</strong>
|
||||
@if($isAdmin)
|
||||
@if(App\Services\Invoice::isInvoice($shopping_order))
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
@endif
|
||||
</div>
|
||||
|
||||
<div class="col-md-3 mb-1">
|
||||
<div class="col-sm-6 col-md-4 col-lg-3 mb-1">
|
||||
@if ($isAdmin)
|
||||
<strong class="mr-2">Lieferschein:</strong>
|
||||
@if (App\Services\Invoice::isDelivery($shopping_order))
|
||||
|
|
@ -70,10 +70,14 @@
|
|||
|
||||
<a href="{{ route('storage_file', [$shopping_order->id, 'invoice_delivery', 'download']) }}"
|
||||
class="btn btn-dark btn-sm"><i class="fa fa-file-download"></i><i class="fa fa-file-download"></i></a>
|
||||
@endif
|
||||
|
||||
<a href="{{ route('admin_sales_send_logistic_mail', [$shopping_order->id]) }}"
|
||||
class="btn btn-info btn-sm"><i class="fa fa-envelope"></i></a>
|
||||
@endif
|
||||
|
||||
@endif
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
@ -96,9 +100,8 @@
|
|||
{{$shopping_order->getFormattedTotalShipping()}} €
|
||||
</div>
|
||||
<div class="col-md-3 mb-3">
|
||||
{{-- <div class="text-muted small">Points gesamt</div>
|
||||
{{ $shopping_order->points }}
|
||||
--}}
|
||||
<div class="text-muted small">White Label</div>
|
||||
{{ $shopping_order->user_white_label ? 'Ja' : 'Nein' }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -134,7 +137,7 @@
|
|||
<button type="button" class="btn btn-xs btn-outline-info" data-toggle="modal" data-target="#modals-load-content"
|
||||
data-id="{{$shopping_order->shopping_user->id}}"
|
||||
data-action="shopping-user-is-like-member"
|
||||
data-back="{{route('admin_sales_customers_detail', [$shopping_order->id])}}"
|
||||
data-back="{{route('admin_sales_detail', [$shopping_order->id])}}"
|
||||
data-modal="modal-xl"
|
||||
data-route="{{route('modal_load')}}"><span class="fa fa-edit"></span> Vertriebspartner zuordnen</button>
|
||||
@else
|
||||
|
|
|
|||
15
resources/views/admin/sales/detail.blade.php
Normal file
15
resources/views/admin/sales/detail.blade.php
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
@extends('layouts.layout-2')
|
||||
|
||||
@section('content')
|
||||
<h4 class="font-weight-bold py-2 mb-2">
|
||||
<a href="{{route('admin_sales')}}" class="btn btn-sm btn-default float-right">zurück</a>
|
||||
@if($isView === 'sales_customer')
|
||||
{{ __('Bestellung Kunde') }} <span class="text-muted">#{{$shopping_order->id}}</span>
|
||||
@elseif($isView === 'sales_user')
|
||||
{{ __('Bestellung Vertriebspartner') }} <span class="text-muted">#{{$shopping_order->id}}</span>
|
||||
@endif
|
||||
</h4>
|
||||
@include('admin.sales._detail')
|
||||
<a href="{{route('admin_sales')}}" class="btn btn-sm btn-default mt-2 float-right">zurück</a>
|
||||
|
||||
@endsection
|
||||
128
resources/views/admin/sales/index.blade.php
Normal file
128
resources/views/admin/sales/index.blade.php
Normal file
|
|
@ -0,0 +1,128 @@
|
|||
@extends('layouts.layout-2')
|
||||
|
||||
@section('content')
|
||||
|
||||
|
||||
<h4 class="font-weight-bold py-2 mb-2">
|
||||
{{ __('Bestellungen Kunden') }}
|
||||
</h4>
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<div class="form-row align-items-center">
|
||||
|
||||
<div class="col-sm-6 col-md-4 col-lg-3 mb-2">
|
||||
<label class="form-label" for="filter_member_id">Filter zugewiesener Vertriebspartner</label>
|
||||
<select class="custom-select" name="filter_member_id" id="filter_member_id">
|
||||
<option value="">Filter aus</option>
|
||||
@foreach($filter_members as $member)
|
||||
<option value="{{$member->id}}" @if(get_user_attr('filter_member_id') == $member->id) selected @endif>{{$member->first_name}} {{$member->last_name}} |{{$member->email}}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-sm-6 col-md-4 col-lg-3 mb-2">
|
||||
<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_text as $id=>$name)
|
||||
<option value="{{$id}}" @if(get_user_attr('filter_txaction') == $id) selected @endif>{{$name}}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-sm-6 col-md-4 col-lg-3 mb-2">
|
||||
<label class="form-label" for="filter_shipped">Filter Versand</label>
|
||||
<select class="custom-select" name="filter_shipped" id="filter_shipped">
|
||||
<option value="">Filter aus</option>
|
||||
@foreach(\App\Models\ShoppingOrder::$shippedTypes as $id=>$name)
|
||||
<option value="{{$id}}" @if(get_user_attr('filter_shipped') === $id) selected @endif>{{$name}}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-sm-6 col-md-4 col-lg-2 mb-2">
|
||||
<label class="form-label" for="filter_art">Filter Art</label>
|
||||
<select class="custom-select" name="filter_art" id="filter_art">
|
||||
<option value="">Filter aus</option>
|
||||
@foreach(\App\Services\PaymentService::$txaction_art as $id=>$name)
|
||||
<option value="{{$id}}" @if(get_user_attr('filter_art') == $id) selected @endif>{{$name}}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-sm-1 col-md-1 col-lg-1 mb-2 mt-4">
|
||||
<a href="{{ route('admin_sales') }}?reset=filter" data-toggle="tooltip" data-placement="top" title="Reset Filter" class="btn icon-btn btn-sm btn-outline-dark float-right">
|
||||
<span class="fa fa-sync"></span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="card-datatable table-responsive">
|
||||
<table class="datatable-customers table table-striped table-bordered" id="datatable-customers">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>{{__('Datum')}}</th>
|
||||
<th>{{__('Betrag')}}</th>
|
||||
<th>{{__('Zahlung')}}</th>
|
||||
<th>{{__('Status')}}</th>
|
||||
<th>{{__('Versand')}}</th>
|
||||
<th>{{__('Art')}}</th>
|
||||
<th>{{__('First name')}}</th>
|
||||
<th>{{__('Last name')}}</th>
|
||||
<th>{{__('E-Mail')}}</th>
|
||||
<th>{{__('zugewiesener Vertriebspartner')}}</th>
|
||||
<th>{{__('Rf-Nr.')}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
$( document ).ready(function() {
|
||||
var oTable = $('#datatable-customers').DataTable({
|
||||
"processing": true,
|
||||
"serverSide": true,
|
||||
ajax: {
|
||||
url: '{!! route( 'admin_sales_datatable') !!}',
|
||||
data: function(d) {
|
||||
d.filter_member_id = $('select[name=filter_member_id]').val();
|
||||
d.filter_txaction = $('select[name=filter_txaction]').val();
|
||||
d.filter_art = $('select[name=filter_art]').val();
|
||||
d.filter_shipped = $('select[name=filter_shipped]').val();
|
||||
}
|
||||
},
|
||||
"order": [[0, "desc" ]],
|
||||
"columns": [
|
||||
{ data: 'id', searchable: false },
|
||||
{ data: 'created_at', name: 'shopping_orders.created_at' },
|
||||
{ data: 'total_shipping', name: 'total_shipping' },
|
||||
{ data: 'payment', name: 'payment', orderable: false },
|
||||
{ data: 'txaction', name: 'txaction' },
|
||||
{ data: 'shipped', name: 'shipped' },
|
||||
{ data: 'payment_for', name: 'payment_for' },
|
||||
{ data: 'shopping_user.billing_firstname', name: 'shopping_user.billing_firstname' },
|
||||
{ data: 'shopping_user.billing_lastname', name: 'shopping_user.billing_lastname' },
|
||||
{ data: 'shopping_user.billing_email', name: 'shopping_user.billing_email' },
|
||||
{ data: 'member_id', name: 'member_id', searchable: false, orderable: false },
|
||||
{ data: 'reference', name: 'reference' },
|
||||
],
|
||||
"bLengthChange": false,
|
||||
"iDisplayLength": 100,
|
||||
"language": {
|
||||
"url": "/js/German.json"
|
||||
}
|
||||
});
|
||||
$('#filter_member_id').on('change', function(){
|
||||
oTable.draw();
|
||||
});
|
||||
$('#filter_txaction').on('change', function(){
|
||||
oTable.draw();
|
||||
});
|
||||
$('#filter_art').on('change', function(){
|
||||
oTable.draw();
|
||||
});
|
||||
$('#filter_shipped').on('change', function(){
|
||||
oTable.draw();
|
||||
});
|
||||
});
|
||||
</script>
|
||||
@endsection
|
||||
Loading…
Add table
Add a link
Reference in a new issue