Report Strono-Date, Booking+Fewo Notice, Custom Mail opti
This commit is contained in:
Kevin Adametz
parent
644ec93c53
commit
5d55e5be3f
35 changed files with 581 additions and 41 deletions
|
|
@ -64,6 +64,7 @@
|
|||
<tr>
|
||||
<th>BuchungsID</th>
|
||||
<th>{{__('Status')}}</th>
|
||||
<th>{{__('Storno')}}</th>
|
||||
<th>{{__('MyJack Nr.')}}</th>
|
||||
<th>{{__('Organisation')}}</th>
|
||||
<th>{{__('Reisepreis')}}</th>
|
||||
|
|
@ -111,6 +112,7 @@
|
|||
"columns": [
|
||||
{ data: 'id', name: 'id' },
|
||||
{ data: 'lead.status_id', name: 'lead.status_id', orderable: false, searchable: false },
|
||||
{ data: 'booking_strono_date', name: 'booking_strono_date', orderable: false, searchable: false },
|
||||
{ data: 'merlin_order_number', name: 'merlin_order_number' },
|
||||
{ data: 'price', name: 'price' },
|
||||
{ data: 'price_total', name: 'price_total' },
|
||||
|
|
@ -121,7 +123,7 @@
|
|||
{ data: 'booking_date', name: 'booking_date' },
|
||||
{ data: 'service_provider.names', name: 'service_provider.names', orderable: false },
|
||||
],
|
||||
"order": [[ 7, "asc" ]],
|
||||
"order": [[ 10, "desc" ]],
|
||||
"orderSequence": ["desc", "asc"],
|
||||
"bLengthChange": false,
|
||||
"iDisplayLength": 100,
|
||||
|
|
@ -136,10 +138,10 @@
|
|||
}
|
||||
});
|
||||
$('#filter_service_provider_id, #filter_is_cleared, #filter_sort_by').on('change', function(){
|
||||
table.order( [ 7, 'asc' ] ).draw();
|
||||
table.order( [ 10, 'desc' ] ).draw();
|
||||
});
|
||||
$('.datepicker-base').on('change', function(){
|
||||
table.order( [ 7, 'asc' ] ).draw();
|
||||
table.order( [ 10, 'desc' ] ).draw();
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -25,20 +25,35 @@
|
|||
<div class="col-sm-12">
|
||||
@if($booking_notice->from_user_id === \Auth::user()->id)
|
||||
<div class="bg-primary rounded py-2 px-3 mr-3 text-white mb-2">
|
||||
<div class="font-weight-semibold mb-1">{{ $booking_notice->getName() }} | {{ $booking_notice->created_at->format("d.m.Y - H:i:s") }}
|
||||
@else
|
||||
<div class="bg-secondary rounded py-2 px-3 mr-3 mb-2">
|
||||
<div class="font-weight-semibold mb-1">{{ $booking_notice->getName() }} | {{ $booking_notice->created_at->format("d.m.Y - H:i:s") }}
|
||||
@endif
|
||||
<div class="font-weight-semibold mb-1">{{ $booking_notice->getName() }} | {{ $booking_notice->created_at->format("d.m.Y - H:i:s") }}</div>
|
||||
{!! nl2br($booking_notice->message) !!}
|
||||
</div>
|
||||
</div>
|
||||
{{-- <div class="col-sm-12">
|
||||
<div class="bg-lighter rounded py-2 px-3 mr-3 mb-2">
|
||||
<div class="font-weight-semibold mb-1">You | {{ $booking_notice->created_at->format("d.m.Y H:i:s") }}</div>
|
||||
@if($booking_notice->edit_at != null)
|
||||
| <i class="ion ion-ios-create"></i> {{ $booking_notice->edit_at->format("d.m.Y - H:i:s") }}
|
||||
@endif
|
||||
@if($booking_notice->from_user_id === \Auth::user()->id || \Auth::user()->isPermission('sua-bo-n-edit'))
|
||||
<div class="float-right"><a href="">
|
||||
<a href="javascript:void(0)" class="btn btn-xs btn-white" data-toggle="modal" data-target="#modals-load-content"
|
||||
data-id="{{ $booking_notice->id }}"
|
||||
data-model="BookingNotice"
|
||||
data-action="edit_notice"
|
||||
data-url="{{ route('booking_detail', [$booking->id]) }}"
|
||||
data-redirect="back"
|
||||
data-booking_id="{{$booking->id}}"
|
||||
data-route="{{ route('booking_modal_load') }}">
|
||||
<i class="ion ion-ios-create"></i>
|
||||
</a>
|
||||
<a href="{{ route('booking_delete', [$booking_notice->id, 'booking_notice']) }}" class="btn btn-xs btn-white text-danger" onclick="return confirm('Wirklich löschen?');"><i class="ion ion-md-trash"></i></a>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
{!! nl2br($booking_notice->message) !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
--}}
|
||||
@endforeach
|
||||
@endif
|
||||
</div>
|
||||
|
|
|
|||
31
resources/views/booking/edit_notice_modal.blade.php
Normal file
31
resources/views/booking/edit_notice_modal.blade.php
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">
|
||||
{{ __('Notiz') }}
|
||||
<span class="font-weight-light">bearbeiten</span>
|
||||
</h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
|
||||
</div>
|
||||
{!! Form::open(['url' => $data['url'], 'class' => '', 'id'=>'edit-notice-form']) !!}
|
||||
{{ Form::hidden('booking_id', $data['booking_id']) }}
|
||||
{{ Form::hidden('action', $data['action']) }}
|
||||
{{ Form::hidden('notice_id', $data['id']) }}
|
||||
|
||||
<div class="modal-body">
|
||||
<div class="form-group">
|
||||
<label for="full_text" class="form-label">{{ __('Notiz') }}</label>
|
||||
{{ Form::textarea('booking_notice', $value->message, array('placeholder'=>__('Notiz bearbeiten'), 'class'=>'form-control', 'rows'=>8)) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
|
||||
<button type="submit" class="btn btn-primary" name="update-action" value="save-edit-notice">speichern</button>
|
||||
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
</script>
|
||||
|
||||
|
|
@ -216,8 +216,11 @@
|
|||
@else
|
||||
<div class="bg-secondary rounded py-2 px-3 mr-3 mb-2">
|
||||
@endif
|
||||
<div class="font-weight-semibold mb-1">{{ $booking_notice->getName() }} | {{ $booking_notice->created_at->format("d.m.Y - H:i:s") }} |
|
||||
<a class="btn btn-white btn-xs " href="{{ route('booking_detail', [$booking_notice->booking_id]) }}#collapseBookingNotice">zur Buchnung {{ $booking_notice->booking_id }}</a>
|
||||
<div class="font-weight-semibold mb-1">{{ $booking_notice->getName() }} | {{ $booking_notice->created_at->format("d.m.Y - H:i:s") }}
|
||||
@if($booking_notice->edit_at != null)
|
||||
| <i class="ion ion-ios-create"></i> {{ $booking_notice->edit_at->format("d.m.Y - H:i:s") }}
|
||||
@endif
|
||||
| <a class="btn btn-white btn-xs " href="{{ route('booking_detail', [$booking_notice->booking_id]) }}#collapseBookingNotice">zur Buchnung {{ $booking_notice->booking_id }}</a>
|
||||
</div>
|
||||
{!! nl2br($booking_notice->message) !!}
|
||||
</div>
|
||||
|
|
@ -233,6 +236,39 @@
|
|||
@endforeach
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="card-body mb-2" style="background: #fff; border: 1px solid rgba(24, 28, 33, 0.06);">
|
||||
<h4>{{__('Notizen') }} FeWo <span class=" text-muted">letzten 10</span></h4>
|
||||
|
||||
@if($last_booking_fewo_notices)
|
||||
@foreach($last_booking_fewo_notices as $booking_fewo_notice)
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
@if($booking_fewo_notice->from_user_id === \Auth::user()->id)
|
||||
<div class="bg-primary rounded py-2 px-3 mr-3 text-white mb-2">
|
||||
@else
|
||||
<div class="bg-secondary rounded py-2 px-3 mr-3 mb-2">
|
||||
@endif
|
||||
<div class="font-weight-semibold mb-1">{{ $booking_fewo_notice->getName() }} | {{ $booking_fewo_notice->created_at->format("d.m.Y - H:i:s") }}
|
||||
@if($booking_fewo_notice->edit_at != null)
|
||||
| <i class="ion ion-ios-create"></i> {{ $booking_fewo_notice->edit_at->format("d.m.Y - H:i:s") }}
|
||||
@endif
|
||||
| <a class="btn btn-white btn-xs " href="{{ route('travel_user_booking_fewo_detail', [$booking_fewo_notice->travel_user_booking_fewo_id]) }}#collapseBookingNotice">zur Buchnung {{ $booking_fewo_notice->travel_user_booking_fewo_id }}</a>
|
||||
</div>
|
||||
{!! nl2br($booking_fewo_notice->message) !!}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{{-- <div class="col-sm-12">
|
||||
<div class="bg-lighter rounded py-2 px-3 mr-3 mb-2">
|
||||
<div class="font-weight-semibold mb-1">You | {{ $booking_notice->created_at->format("d.m.Y H:i:s") }}</div>
|
||||
{!! nl2br($booking_notice->message) !!}
|
||||
</div>
|
||||
</div>
|
||||
--}}
|
||||
@endforeach
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="card-body mb-2" style="background: #fff; border: 1px solid rgba(24, 28, 33, 0.06);">
|
||||
|
|
|
|||
60
resources/views/travel/user/booking/_detail_notice.blade.php
Normal file
60
resources/views/travel/user/booking/_detail_notice.blade.php
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
<div class="card mb-2">
|
||||
<h6 class="card-header bg-primary text-white py-2" data-toggle="collapse" data-target="#collapseBookingNotice" aria-expanded="false" aria-controls="collapseBookingNotice">
|
||||
<strong style="line-height: 1.6em">Notizen</strong>
|
||||
</h6>
|
||||
<div class="collapse" id="collapseBookingNotice">
|
||||
|
||||
<div class="card-body row">
|
||||
|
||||
<div class="col-sm-12">
|
||||
{!! Form::open(['url' => route('travel_user_booking_fewo_detail', [$id]), 'class' => 'form-horizontal']) !!} <input type="hidden" name="action" value="save_notice">
|
||||
<div class="form-group">
|
||||
{{ Form::textarea('booking_fewo_notice', '', array('placeholder'=>__('Neue Notiz hinzufügen …'), 'class'=>'form-control autoExpand', 'id'=>'booking_notice', 'rows'=>'1', 'data-min-rows'=>'1', 'required')) }}
|
||||
</div>
|
||||
<div class="form-group text-right">
|
||||
<button type="submit" class="btn btn-sm btn-primary" ><i class="ion ion-ios-send"></i> Notiz hinzufügen</button>
|
||||
<hr>
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
</div>
|
||||
|
||||
@if($travel_user_booking_fewo->booking_fewo_notices)
|
||||
@foreach($travel_user_booking_fewo->booking_fewo_notices as $booking_fewo_notices)
|
||||
|
||||
<div class="col-sm-12">
|
||||
@if($booking_fewo_notices->from_user_id === \Auth::user()->id)
|
||||
<div class="bg-primary rounded py-2 px-3 mr-3 text-white mb-2">
|
||||
<div class="font-weight-semibold mb-1">{{ $booking_fewo_notices->getName() }} | {{ $booking_fewo_notices->created_at->format("d.m.Y - H:i:s") }}
|
||||
@else
|
||||
<div class="bg-secondary rounded py-2 px-3 mr-3 mb-2">
|
||||
<div class="font-weight-semibold mb-1">{{ $booking_fewo_notices->getName() }} | {{ $booking_fewo_notices->created_at->format("d.m.Y - H:i:s") }}
|
||||
@endif
|
||||
@if($booking_fewo_notices->edit_at != null)
|
||||
| <i class="ion ion-ios-create"></i> {{ $booking_fewo_notices->edit_at->format("d.m.Y - H:i:s") }}
|
||||
@endif
|
||||
@if($booking_fewo_notices->from_user_id === \Auth::user()->id || \Auth::user()->isPermission('sua-bo-n-edit'))
|
||||
<div class="float-right"><a href="">
|
||||
<a href="javascript:void(0)" class="btn btn-xs btn-white" data-toggle="modal" data-target="#modals-load-content"
|
||||
data-id="{{ $booking_fewo_notices->id }}"
|
||||
data-model="TravelUserBookingFewoNotice"
|
||||
data-action="edit_notice"
|
||||
data-url="{{ route('travel_user_booking_fewo_detail', [$travel_user_booking_fewo->id]) }}"
|
||||
data-redirect="back"
|
||||
data-travel_user_booking_fewo_id="{{$travel_user_booking_fewo->id}}"
|
||||
data-route="{{ route('travel_user_booking_fewo_modal_load') }}">
|
||||
<i class="ion ion-ios-create"></i>
|
||||
</a>
|
||||
<a href="{{ route('travel_user_booking_fewo_delete', [$booking_fewo_notices->id, 'booking_fewo_notices']) }}" class="btn btn-xs btn-white text-danger" onclick="return confirm('Wirklich löschen?');"><i class="ion ion-md-trash"></i></a>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
{!! nl2br($booking_fewo_notices->message) !!}
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
@endforeach
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -102,6 +102,11 @@
|
|||
PDF Dateien
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="javascript:void(0)" data-collapse="#collapseBookingNotice">
|
||||
Notizen
|
||||
</a>
|
||||
</li>
|
||||
@endif
|
||||
</ul>
|
||||
|
||||
|
|
@ -109,6 +114,7 @@
|
|||
<input type="hidden" name="id" id="id" value="{{$id}}">
|
||||
|
||||
@include('travel.user.booking._detail_info')
|
||||
|
||||
@if($id !== "new")
|
||||
@include('travel.user.booking._detail_invoice')
|
||||
@include('travel.user.booking._detail_sm_mails')
|
||||
|
|
@ -119,6 +125,9 @@
|
|||
@include('travel.user.booking._detail_mails')
|
||||
@include('travel.user.booking._detail_files')
|
||||
@endif
|
||||
|
||||
@include('travel.user.booking._detail_notice')
|
||||
|
||||
<div class="float-right mt-2">
|
||||
<a href="{{route('travel_user_booking_fewos')}}" class="btn btn-default btn-sm">{{ __('zur Übersicht') }}</a>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">
|
||||
{{ __('Notiz') }}
|
||||
<span class="font-weight-light">bearbeiten</span>
|
||||
</h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
|
||||
</div>
|
||||
{!! Form::open(['url' => $data['url'], 'class' => '', 'id'=>'edit-notice-form']) !!}
|
||||
{{ Form::hidden('travel_user_booking_fewo_id', $data['travel_user_booking_fewo_id']) }}
|
||||
{{ Form::hidden('action', $data['action']) }}
|
||||
{{ Form::hidden('notice_id', $data['id']) }}
|
||||
|
||||
<div class="modal-body">
|
||||
<div class="form-group">
|
||||
<label for="full_text" class="form-label">{{ __('Notiz') }}</label>
|
||||
{{ Form::textarea('booking_fewo_notice', $value->message, array('placeholder'=>__('Notiz bearbeiten'), 'class'=>'form-control', 'rows'=>8)) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
|
||||
<button type="submit" class="btn btn-primary" name="update-action" value="save-edit-notice">speichern</button>
|
||||
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
</script>
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue