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

last 12.21

Browse source
This commit is contained in:
Kevin Adametz 2021-12-25 02:53:44 +01:00
parent 73e38a006e
commit 3df0e93c2c
14 changed files with 395 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

19
resources/views/admin/report/bookings.blade.php
View file

@ -11,7 +11,7 @@
<div class="ui-bordered px-4 pt-3 mb-0">
<div class="form-row align-items-center">
<div class="col-12 col-md-4 mb-2">
<div class="col-12 col-md-3 mb-2">
<label class="form-label" for="filter_lead_status_id">Filter Status</label>
<select class="selectpicker" data-style="btn-default" name="filter_lead_status_id[]" id="filter_lead_status_id" multiple>
@foreach($filter_lead_status as $id=>$name)
@ -19,7 +19,14 @@
@endforeach
</select>
</div>
<div class="col-12 col-md-3 mb-2">
<label class="form-label" for="filter_travel_company_id">Filter Veranstalter</label>
<select class="selectpicker" data-style="btn-default" name="filter_travel_company_id[]" id="filter_travel_company_id" data-live-search="true" multiple>
@foreach($filter_travel_companies as $id=>$name)
<option value="{{$id}}" @if($id == 1 or $id == 47) selected @endif>{{$name}}</option>
@endforeach
</select>
</div>
<div class="col-12 col-md-3 mb-2">
<label class="form-label">Reisedatum</label>
<div class="row">
@ -88,11 +95,11 @@
<tbody></tbody>
<tfoot>
<tr>
<td colspan="3">Total</td>
<td colspan="4">Total</td>
<td id="price_total_sum">0</td>
<td id="price_total_total_sum">0</td>
<td id="proceed_total_sum">0</td>
<td colspan="5"></td>
<td colspan="6"></td>
</tr>
</tfoot>
</table>
@ -117,6 +124,7 @@
d.filter_booking_date_from = $('input[name=filter_booking_date_from]').val();
d.filter_booking_date_to = $('input[name=filter_booking_date_to]').val();
d.filter_db_lead_status_id = $('#filter_lead_status_id').val();
d.filter_travel_company_id = $('#filter_travel_company_id').val();
}
},
"columns": [
@ -148,7 +156,8 @@
$('#proceed_total_sum').html(settings.json.proceed_total_sum);
}
});
$('#filter_service_provider_id, #filter_is_cleared, #filter_sort_by, #filter_lead_status_id').on('change', function(){
$('#filter_service_provider_id, #filter_is_cleared, #filter_sort_by, #filter_lead_status_id, #filter_travel_company_id').on('change', function(){
console.log("asd");
table.order( [ 11, 'desc' ] ).draw();
});
$('.datepicker-base').on('change', function(){

157
resources/views/admin/report/check_bookings.blade.php Normal file
View file

@ -0,0 +1,157 @@
@extends('layouts.layout-2')
@section('content')
<h4 class="font-weight-bold py-3 mb-1">
Buchungen Preise überprüfen
</h4>
<div class="card">
{!! Form::open(['url' => route('admin_report_export_bookings'), 'class' => '']) !!}
{!! Form::hidden('order', '[[7, "asc"]]', ['id'=>'order_table']) !!}
<div class="ui-bordered px-4 pt-3 mb-0">
<div class="form-row align-items-center">
<div class="col-12 col-md-3 mb-2">
<label class="form-label" for="filter_lead_status_id">Filter Status</label>
<select class="selectpicker" data-style="btn-default" name="filter_lead_status_id[]" id="filter_lead_status_id" multiple>
@foreach($filter_lead_status as $id=>$name)
<option value="{{$id}}">{{$name}}</option>
@endforeach
</select>
</div>
<div class="col-12 col-md-3 mb-2">
<label class="form-label" for="filter_travel_company_id">Filter Veranstalter</label>
<select class="selectpicker" data-style="btn-default" name="filter_travel_company_id[]" id="filter_travel_company_id" data-live-search="true" multiple>
@foreach($filter_travel_companies as $id=>$name)
<option value="{{$id}}" @if($id == 1 or $id == 47) selected @endif>{{$name}}</option>
@endforeach
</select>
</div>
<div class="col-12 col-md-3 mb-2">
<label class="form-label">Reisedatum</label>
<div class="row">
<div class="input-group col-6 pr-0">
<div class="input-group-prepend">
<span class="input-group-text">von</span>
</div>
<input class="form-control datepicker-base" name="filter_travel_date_from" type="text" value="">
</div>
<div class="input-group col-6 pl-1">
<div class="input-group-prepend">
<span class="input-group-text">bis</span>
</div>
<input class="form-control datepicker-base" name="filter_travel_date_to" type="text" value="">
</div>
</div>
</div>
<div class="col-12 col-md-3 mb-2">
<label class="form-label">Buchungsdatum</label>
<div class="row">
<div class="input-group col-6 pr-0">
<div class="input-group-prepend">
<span class="input-group-text">von</span>
</div>
<input class="form-control datepicker-base" name="filter_booking_date_from" type="text" value="">
</div>
<div class="input-group col-6 pl-1">
<div class="input-group-prepend">
<span class="input-group-text">bis</span>
</div>
<input class="form-control datepicker-base" name="filter_booking_date_to" type="text" value="">
</div>
</div>
</div>
<div class="col-12 mb-4">
<a href="{{ route('admin_report_bookings') }}" class="btn icon-btn btn-sm btn-outline-dark">
<span class="fa fa-sync"></span>
</a>
</div>
</div>
</div>
<div class="card-datatable table-responsive">
<table class="datatables-report table table-striped table-bordered">
<thead>
<tr>
<th>BuchungsID</th>
<th>v2</th>
<th>{{__('Status')}}</th>
<th>{{__('Organisation')}}</th>
<th>{{__('Vermittlung')}}</th>
<th>{{__('Gesamtpreis')}}</th>
<th>{{__('Check')}}</th>
<th>{{__('Strono')}}</th>
<th>{{__('Vorname')}}</th>
<th>{{__('Nachname')}}</th>
<th>{{__('Reisedatum')}}</th>
<th>{{__('bis')}}</th>
<th>{{__('Buchungsdatum')}}</th>
</tr>
</thead>
<tbody></tbody>
</table>
</div>
{!! Form::close() !!}
</div>
<script>
$( document ).ready(function() {
var table = $('.datatables-report').DataTable({
"processing": true,
"serverSide": true,
"ajax": {
"url": '{!! route( 'admin_report_check_bookings_datatable' ) !!}',
"data": function(d) {
d.filter_travel_date_from = $('input[name=filter_travel_date_from]').val();
d.filter_travel_date_to = $('input[name=filter_travel_date_to]').val();
d.filter_booking_date_from = $('input[name=filter_booking_date_from]').val();
d.filter_booking_date_to = $('input[name=filter_booking_date_to]').val();
d.filter_db_lead_status_id = $('#filter_lead_status_id').val();
d.filter_travel_company_id = $('#filter_travel_company_id').val();
}
},
"columns": [
{ data: 'id', name: 'id' },
{ data: 'old_crm', name: 'old_crm' },
{ data: 'lead.status_id', name: 'lead.status_id', orderable: false, searchable: false },
{ data: 'price', name: 'price' },
{ data: 'service_total', name: 'service_total' },
{ data: 'price_total', name: 'price_total' },
{ data: 'check_total', name: 'check_total', orderable: false },
{ data: 'price_canceled', name: 'price_canceled', orderable: false },
{ data: 'customer.firstname', name: 'customer.firstname', orderable: true },
{ data: 'customer.name', name: 'customer.name', orderable: true },
{ data: 'start_date', name: 'start_date' },
{ data: 'end_date', name: 'end_date' },
{ data: 'booking_date', name: 'booking_date' },
],
"order": [[ 0, "desc" ]],
"orderSequence": ["desc", "asc"],
"bLengthChange": false,
"iDisplayLength": 100,
"language": {
"url": "/js/German.json"
},
drawCallback: function (settings) {
$('#order_table').val(table.order());
}
});
$('#filter_service_provider_id, #filter_is_cleared, #filter_sort_by, #filter_lead_status_id, #filter_travel_company_id').on('change', function(){
table.order( [ 0, 'desc' ] ).draw();
});
$('.datepicker-base').on('change', function(){
table.order( [ 0, 'desc' ] ).draw();
});
});
</script>
@endsection

17
resources/views/admin/report/service_providers.blade.php
View file

@ -53,7 +53,15 @@
<option value="0">Nein</option>
</select>
</div>
<div class="col-12 mb-4">
<div class="col-6 col-md-3 mb-2">
<label class="form-label" for="filter_travel_company_id">Filter Veranstalter</label>
<select class="selectpicker" data-style="btn-default" name="filter_travel_company_id[]" id="filter_travel_company_id" data-live-search="true" multiple>
@foreach($filter_travel_companies as $id=>$name)
<option value="{{$id}}" @if($id == 1 or $id == 47) selected @endif>{{$name}}</option>
@endforeach
</select>
</div>
<div class="col-6 col-md-3 mt-3">
<a href="{{ route('admin_report_providers') }}" class="btn icon-btn btn-sm btn-outline-dark">
<span class="fa fa-sync"></span>
</a>
@ -83,11 +91,11 @@
<tbody></tbody>
<tfoot>
<tr>
<td colspan="4">Total</td>
<td colspan="5">Total</td>
<td id="price_total_sum">0</td>
<td id="price_total_total_sum">0</td>
<td id="proceed_total_sum">0</td>
<td colspan="3"></td>
<td colspan="4"></td>
</tr>
</tfoot>
</table>
@ -114,6 +122,7 @@
d.filter_travel_date_to = $('input[name=filter_travel_date_to]').val();
d.filter_is_cleared = $('select[name=filter_is_cleared]').val();
d.filter_db_lead_status_id = $('#filter_lead_status_id').val();
d.filter_travel_company_id = $('#filter_travel_company_id').val();
}
},
"columns": [
@ -147,7 +156,7 @@
}
});
$('#filter_service_provider_id, #filter_is_cleared, #filter_sort_by, #filter_lead_status_id').on('change', function(){
$('#filter_service_provider_id, #filter_is_cleared, #filter_sort_by, #filter_lead_status_id, #filter_travel_company_id').on('change', function(){
table.order( [ 10, 'asc' ] ).draw();
});
$('.datepicker-base').on('change', function(){

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

@ -372,12 +372,19 @@
<li class="sidenav-item{{ Request::is('admin/report/bookings') ? ' active' : '' }}">
<a href="{{ route('admin_report_bookings') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-bed"></i><div>{{ __('Buchungen & Leistungen') }}</div></a>
</li>
@endif
@if(Auth::user()->isPermission('sua-re-pp'))
<li class="sidenav-item{{ Request::is('admin/report/providers') ? ' active' : '' }}">
<a href="{{ route('admin_report_providers') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-cash"></i><div>{{ __('Leistungsträger-Zahlungen') }}</div></a>
</li>
@endif
@if(Auth::user()->isPermission('sua-re-bo'))
<li class="sidenav-item{{ Request::is('admin/report/check/bookings') ? ' active' : '' }}">
<a href="{{ route('admin_report_check_bookings') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-flash"></i><div>{{ __('Preise pürfen') }}</div></a>
</li>
@endif
</ul>
</li>
@endif
@ -399,7 +406,7 @@
</a>
<ul class="sidenav-menu">
<li class="sidenav-item{{ Request::is('sysadmin/tools/content_links') ? ' active' : '' }}">
<a href="{{ route('sysadmin_tools_content_links') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-settings"></i><div>{{ __('Tree from HTML') }}</div></a>
<a href="{{ route('sysadmin_tools_content_links') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-settings"></i><div>{{ __('todo some') }}</div></a>
</li>
<li class="sidenav-item{{ Request::is('sysadmin/tools/tree') ? ' active' : '' }}">
<a href="{{ route('sysadmin_tools_tree') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-settings"></i><div>{{ __('Tree') }}</div></a>

49
resources/views/sys/tools/links.blade.php
View file

@ -23,27 +23,60 @@
<div class="card mb-4">
<div class="card-body">
<!-- Controls -->
{!! Form::open(['url' => route('sysadmin_tools_content_links'), 'class' => '']) !!}
<div class="form-group mb-1">
<label class="form-label" for="description">Description</label>
{{ Form::textarea('text', $text, array('class'=>'form-control', 'rows'=>20)) }}
</div>
<button type="submit" class="btn btn-primary"><i class="ion"></i> action</button>
{!! Form::close() !!}
</div>
@if(count($values)>0)
<div class="card-body">
<!-- Controls -->
@foreach($values as $key=>$value)
{{ $key }} || {{$value}}<br>
@endforeach
<div class="table-responsive">
<table class="table user-view-table m-0">
<thead>
<tr>
<th>ID</th>
<th>Nachname</th>
<th>Organisation</th>
<th>Service</th>
<th>Gesamt</th>
<th>Check</th>
<th>Storno</th>
</tr>
</thead>
<tbody>
@foreach($bookings as $booking)
<tr>
<td><a href="{{ route('booking_detail', [$booking->id]) }}">{{ $booking->id }}</a></td>
<td>{{ $booking->customer->fullName() }}</td>
<td>{{ $booking->price }}</td>
<td>{{ $booking->getServiceTotal() }}</td>
<td>{{ $booking->price_total }}</td>
<td>@if($booking->getPriceTotalRaw() != ($booking->getPriceRaw() + $booking->getServiceTotal(true)))
{{ ($booking->getPriceRaw() + $booking->getServiceTotal(true)) }}
@endif
</td>
<td>@if($booking->isCanceled()) {{ $booking->price_canceled }} @endif</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
@endif
</div>
@endsection