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

Booking edit v3

Browse source
This commit is contained in:
Kevin Adametz 2021-06-18 15:00:12 +02:00
parent 6706d28f51
commit 6880c7e989
20 changed files with 691 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

49
resources/views/booking/_detail_booking.blade.php
View file

@ -30,7 +30,7 @@
</div>
<div class="form-group col-sm-6 col-md-4">
<label class="form-label" for="travelagenda_id">{{ __('Reiseprogramm') }}</label>
{{ Form::select('travelagenda_id', \App\Services\Model::getTravelAgendaArray(true) , $booking->travelagenda_id, array('class'=>'custom-select', 'id'=>'travelagenda_id')) }}
{{ Form::select('travelagenda_id', \App\Services\Model::getTravelAgendaArray(true, $booking->travel_country_id) , $booking->travelagenda_id, array('class'=>'custom-select', 'id'=>'travelagenda_id')) }}
</div>
<div class="form-group col-sm-6 col-md-4">
<label class="form-label" for="travel_category_id">{{ __('Reiseart') }}</label>
@ -60,6 +60,26 @@
{{ Form::text('title', $booking->title, array('placeholder'=>__('Reisetitel'), 'class'=>'form-control', 'id'=>'title')) }}
</div>
<div class="form-group col-sm-6 col-md-3">
<label class="form-label" for="pax">{{ __('Pax') }}</label>
{{ Form::select('pax', range(0, 80) , $booking->pax, array('class'=>'custom-select', 'id'=>'pax')) }}
</div>
<div class="form-group col-sm-6 col-md-3">
<label class="form-label" for="travel_documents">{{ __('Reiseunterlagen') }}</label>
{{ Form::select('travel_documents', [0=>'nicht vollständig', 1=>'vollständig'], $booking->travel_documents, array('class'=>'custom-select', 'id'=>'travel_documents')) }}
</div>
<div class="form-group col-sm-6 col-md-3">
<label class="form-label" for="branch_id">{{ __('Filiale') }}</label>
{{ Form::select('branch_id', \App\Services\Model::getBranchArray(false) , $booking->branch_id, array('class'=>'custom-select', 'id'=>'branch_id')) }}
</div>
<div class="form-group col-sm-6 col-md-3">
<label class="form-label" for="travel_company_id">{{ __('Reiseveranstalter') }}</label>
{{ Form::select('travel_company_id', \App\Services\Model::getTravelCompanyArray(false) , $booking->travel_company_id, array('class'=>'custom-select', 'id'=>'travel_company_id')) }}
</div>
<div class="col-12">
<h5 class="card-title mt-3 mb-1">Status</h5>
<hr class="mt-0">
@ -138,9 +158,32 @@
<button type="submit" name="action" value="update_booking" class="btn btn-sm btn-secondary">{{ __('save changes') }}</button>&nbsp;
<a href="{{route('bookings')}}" class="btn btn-sm btn-default">{{ __('zur Übersicht') }}</a>
</div>
</div>
</div>
</div>
</div>
</div>
<script>
$(document).ready(function() {
function callback_ajax_selected_travelagenda(data){
var $el = $("#travelagenda_id");
$el.empty(); // remove old options
$.each(data.html, function(key,value) {
$el.append($("<option></option>")
.attr("value", key).text(value));
});
}
function load_selected_travelagenda(){
var $elem = $('<div/>');
$elem.data('action', 'load_travelagenda_by_country');
$elem.data('travel_country_id', $('#travel_country_id').val());
$elem.data('url', '{{route('ajax_load_data')}}');
ajax_object_action(false, $elem, callback_ajax_selected_travelagenda);
}
$('#travel_country_id').on('change', function () {
load_selected_travelagenda();
});
});
</script>

86
resources/views/booking/_detail_company.blade.php
View file

@ -10,61 +10,77 @@
<tr>
<th>Veranstalter</th>
<th>Bezeichnung</th>
<th>Abreisedatum</th>
<th>Reisepreis inkl. MwSt</th>
<th>Rabatt</th>
<th>Erzielte Provision</th>
<th>Datum</th>
<th>Preis inkl. MwSt €</th>
<th>Rabatt €</th>
<th>Erzielte Provision €</th>
<th>Lock</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
@if($booking->booking_service_items)
@foreach($booking->booking_service_items as $item)
<tr>
<th scope="row">
{{$item->travel_company->name}}
<!--<a href="#" target="_blank" class="badge badge-md badge-primary">
</a>-->
{{ Form::select('booking_service_item['.$item->id.'][travel_company_id]', \App\Services\Model::getTravelCompanyArray(false) , $item->travel_company_id, array('class'=>'custom-select', 'id'=>'booking_service_item_'.$item->id.'_travel_company_id')) }}
</th>
<td>{{$item->name}}</td>
<td>{{\App\Services\Util::_format_date($item->travel_data, 'date')}}</td>
<td>{{$item->service_price}}</td>
<td>{{$item->commission}}</td>
<td>{{$item->service_price_refund}}</td>
<td>
{{ Form::text('booking_service_item['.$item->id.'][name]', $item->name, array('placeholder'=>__('Bezeichnung'), 'class'=>'form-control', 'id'=>'booking_service_item_'.$item->id.'_name')) }}
</td>
<td>
{{ Form::text('booking_service_item['.$item->id.'][travel_date]', _format_date($item->travel_date), array('placeholder'=>__('Datum'), 'class'=>'form-control datepicker-base', 'id'=>'booking_service_item_'.$item->id.'_travel_date')) }}
</td>
<td>
{{ Form::text('booking_service_item['.$item->id.'][service_price]', $item->service_price, array('placeholder'=>__('in Euro'), 'class'=>'form-control calculate_refund_service_price', 'data-bsi-id'=>$item->id, 'data-bsi-percentage'=>$item->travel_company->getPercentageRaw(), 'id'=>'booking_service_item_'.$item->id.'_service_price')) }}
</td>
<td>
{{ Form::text('booking_service_item['.$item->id.'][commission]', $item->commission, array('placeholder'=>__('in Euro'), 'class'=>'form-control', 'id'=>'booking_service_item_'.$item->id.'_commission')) }}
</td>
<td>
{{ Form::text('booking_service_item['.$item->id.'][service_price_refund]', $item->service_price_refund, array('placeholder'=>__('in Euro'), 'class'=>'form-control', 'id'=>'booking_service_item_'.$item->id.'_service_price_refund')) }}
</td>
<td>
<label class="custom-control custom-checkbox mt-2">
{!! Form::checkbox('booking_service_item['.$item->id.']', 1, $item->is_commission_locked, ['class'=>'custom-control-input', 'disabled']) !!}
<span class="custom-control-label"></span>
{!! Form::checkbox('booking_service_item['.$item->id.'][is_commission_locked]', 1, $item->is_commission_locked, ['class'=>'custom-control-input calculate_refund_service_price', 'data-bsi-id'=>$item->id, 'data-bsi-percentage'=>$item->travel_company->getPercentageRaw(), 'id'=>'booking_service_item_'.$item->id.'_locked']) !!}
<span class="custom-control-label">{{ $item->travel_company->percentage }}%</span>
</label>
</td>
<td>
<i class="fa fa-trash-alt"></i>
{{--<a class="btn text-danger" href="#" onclick="return confirm('{{__('Wirklich löschen?')}}');"><i class="fa fa-trash-alt"></i></a> --}}
<a class="btn btn-sm text-danger" href="{{ route('booking_delete', [$item->id, 'booking_service_item']) }}" onclick="return confirm('{{__('Wirklich löschen?')}}');"><i class="fa fa-trash-alt"></i></a>
</td>
</tr>
@endforeach
@endif
</tbody>
</table>
</div>
{{--
<div class="text-right d-block w-100">
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal"
data-target="#modals-load-content"
data-id="new-file"
data-model="bookingFile"
data-action="modal-upload-booking-file"
data-url=""
data-redirect="back"
data-booking_id="{{$booking->id}}"
data-route="#"><i class="ion ion-md-cloud-upload"></i>&nbsp;Datei hinzufügen</button>
</div>
--}}
<div class="col-12">
<hr>
<div class="text-left mt-3">
<button type="submit" name="action" value="update_booking_service_item" class="btn btn-sm btn-secondary">{{ __('save changes') }}</button>&nbsp;
<a href="{{route('bookings')}}" class="btn btn-sm btn-default">{{ __('zur Übersicht') }}</a>
<a href="{{route('booking_action', ['booking_service_item_add', $booking->id])}}" class="btn btn-sm btn-primary float-right ml-2"><i class="fa fa-plus-circle"></i> {{ __('Neue Leistung') }}</a>
</div>
</div>
</div>
</div>
</div>
</div>
<script>
$(document).ready(function() {
$('input.calculate_refund_service_price').on('change', function(){
var _bsi_id = $(this).data('bsi-id');
var _percentage = $(this).data('bsi-percentage');
if($('#booking_service_item_'+_bsi_id+'_locked').is(':checked')){
var _service_price = _floatNumber($('#booking_service_item_'+_bsi_id+'_service_price').val());
var eur = 0;
if(_service_price > 0){
eur = _service_price / 100 * _percentage;
}
$('#booking_service_item_'+_bsi_id+'_service_price_refund').val(_formatNumber(eur));
}
});
});
</script>

92
resources/views/booking/_detail_participant.blade.php Normal file
View file

@ -0,0 +1,92 @@
<div class="card mb-2">
<h6 class="card-header bg-primary text-white py-2" data-toggle="collapse" data-target="#collapseBookingParticipant" aria-expanded="false" aria-controls="collapseBookingParticipant">
<strong style="line-height: 1.6em">Teilnehmer</strong>
</h6>
<div class="collapse" id="collapseBookingParticipant">
<div class="card-body row">
<div class="table-responsive" id="booking_files_table">
<table class="table table-striped table-sm">
<thead>
<tr>
<th>Anrede</th>
<th>Vorname</th>
<th>Nachname</th>
<th>Geburtsdatum</th>
<th>Nationalität</th>
<th>Kind</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
<tr>
<th scope="row">
{{ Form::select('participant_salutation_id', \App\Services\Model::getSalutationArray(false) , $booking->participant_salutation_id, array('class'=>'custom-select', 'id'=>'participant_salutation_id')) }}
</th>
<td>
{{ Form::text('participant_firstname', $booking->participant_firstname, array('placeholder'=>__('Vorname'), 'class'=>'form-control', 'id'=>'participant_firstname')) }}
</td>
<td>
{{ Form::text('participant_name', $booking->participant_name, array('placeholder'=>__('Nachname'), 'class'=>'form-control', 'id'=>'participant_name')) }}
</td>
<td>
{{ Form::text('participant_birthdate', _format_date($booking->participant_birthdate), array('placeholder'=>__('Datum'), 'class'=>'form-control datepicker-base', 'id'=>'participant_birthdate')) }}
</td>
<td>
{{ Form::select('nationality_id', \App\Services\Model::getTravelNationalityArray(false) , $booking->nationality_id, array('class'=>'custom-select', 'id'=>'nationality_id')) }}
</td>
<td>
&nbsp;
</td>
<td>
&nbsp;
</td>
</tr>
@if($booking->participants)
@foreach($booking->participants as $item)
<tr>
<th scope="row">
{{ Form::select('participant['.$item->id.'][participant_salutation_id]', \App\Services\Model::getSalutationArray(false) , $item->participant_salutation_id, array('class'=>'custom-select', 'id'=>'participant_'.$item->id.'_participant_salutation_id')) }}
</th>
<td>
{{ Form::text('participant['.$item->id.'][participant_firstname]', $item->participant_firstname, array('placeholder'=>__('Vorname'), 'class'=>'form-control', 'id'=>'participant_'.$item->id.'_participant_firstname')) }}
</td>
<td>
{{ Form::text('participant['.$item->id.'][participant_name]', $item->participant_name, array('placeholder'=>__('Nachname'), 'class'=>'form-control', 'id'=>'participant_'.$item->id.'_participant_name')) }}
</td>
<td>
{{ Form::text('participant['.$item->id.'][participant_birthdate]', _format_date($item->participant_birthdate), array('placeholder'=>__('Datum'), 'class'=>'form-control datepicker-base', 'id'=>'participant_'.$item->id.'_participant_birthdate')) }}
</td>
<td>
{{ Form::select('participant['.$item->id.'][nationality_id]', \App\Services\Model::getTravelNationalityArray(false) , $item->nationality_id, array('class'=>'custom-select', 'id'=>'participant_'.$item->id.'_nationality_id')) }}
</td>
<td>
<label class="custom-control custom-checkbox mt-2">
{!! Form::checkbox('participant['.$item->id.'][participant_child]', 1, $item->participant_child, ['class'=>'custom-control-input', 'id'=>'participant_'.$item->id.'_participant_child']) !!}
<span class="custom-control-label"></span>
</label>
</td>
<td>
<a class="btn btn-sm text-danger" href="{{ route('booking_delete', [$item->id, 'participant']) }}" onclick="return confirm('{{__('Wirklich löschen?')}}');"><i class="fa fa-trash-alt"></i></a>
</td>
</tr>
@endforeach
@endif
</tbody>
</table>
</div>
<div class="col-12">
<hr>
<div class="text-left mt-3">
<button type="submit" name="action" value="update_booking_participant" class="btn btn-sm btn-secondary">{{ __('save changes') }}</button>&nbsp;
<a href="{{route('bookings')}}" class="btn btn-sm btn-default">{{ __('zur Übersicht') }}</a>
<a href="{{route('booking_action', ['booking_participant_add', $booking->id])}}" class="btn btn-sm btn-primary float-right ml-2"><i class="fa fa-plus-circle"></i> {{ __('Neuen Teilnehmer') }}</a>
</div>
</div>
</div>
</div>
</div>

104
resources/views/booking/_detail_provider.blade.php
View file

@ -3,7 +3,6 @@
<strong style="line-height: 1.6em">Leistungsträger</strong>
</h6>
<div class="collapse" id="collapseBookingProvider">
<div class="card-body row">
<div class="table-responsive" id="booking_files_table">
<table class="table table-striped table-sm">
@ -17,7 +16,6 @@
<th>Re.Nr.</th>
<th>bezahlt</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
@ -26,43 +24,89 @@
@foreach($booking->service_provider_entries as $item)
<tr>
<th scope="row">
{{$item->service_provider->name}}
<!--<a href="#" target="_blank" class="badge badge-md badge-primary">
</a>-->
{{ Form::select('service_provider_entry['.$item->id.'][service_provider_id]', \App\Services\Model::getServiceProviderArray(false, $item->type) , $item->service_provider_id, array('class'=>'custom-select', 'id'=>'service_provider_entry_'.$item->id.'_service_provider_id')) }}
</th>
<td>{{$item->amount}}</td>
<td>{{$item->factor}}</td>
<td>{{$item->amount_eur}}</td>
<td>{{\App\Services\Util::_format_date($item->payment_date, 'date')}}</td>
<td>{{$item->invoice_number}}</td>
<td>
<label class="custom-control custom-checkbox mt-2">
{!! Form::checkbox('service_provider_entry['.$item->id.']', 1, $item->is_cleared, ['class'=>'custom-control-input', 'disabled']) !!}
<span class="custom-control-label"></span>
</label>
{{ Form::text('service_provider_entry['.$item->id.'][amount]', $item->amount, array('placeholder'=>__('Betrag'), 'class'=>'form-control calculate_amount_on_change', 'data-spe-id'=>$item->id, 'id'=>'service_provider_entry_'.$item->id.'_amount')) }}
</td>
<td>
{{ Form::text('service_provider_entry['.$item->id.'][factor]', $item->factor, array('placeholder'=>__('Faktor'), 'class'=>'form-control', 'id'=>'service_provider_entry_'.$item->id.'_factor', 'readonly'=>true)) }}
</td>
<td>
<i class="fa fa-trash-alt"></i>
{{--<a class="btn text-danger" href="#" onclick="return confirm('{{__('Wirklich löschen?')}}');"><i class="fa fa-trash-alt"></i></a> --}} </td>
{{ Form::text('service_provider_entry['.$item->id.'][amount_eur]', $item->amount_eur, array('placeholder'=>__('Betrag'), 'class'=>'form-control', 'id'=>'service_provider_entry_'.$item->id.'_amount_eur', 'readonly'=>true)) }}
</td>
<td>
@if($item->type === 'payment')
{{ Form::text('service_provider_entry['.$item->id.'][payment_date]', _format_date($item->payment_date), array('placeholder'=>__('Datum'), 'class'=>'form-control datepicker-base', 'id'=>'service_provider_entry_'.$item->id.'_payment_date')) }}
@else
&nbsp;
@endif
</td>
<td>
{{ Form::text('service_provider_entry['.$item->id.'][invoice_number]', $item->invoice_number, array('placeholder'=>__('Re.Nr.'), 'class'=>'form-control', 'id'=>'service_provider_entry_'.$item->id.'_invoice_number')) }}
</td>
<td>
@if($item->type === 'payment')
<label class="custom-control custom-checkbox mt-2">
{!! Form::checkbox('service_provider_entry['.$item->id.'][is_cleared]', 1, $item->is_cleared, ['class'=>'custom-control-input']) !!}
<span class="custom-control-label"></span>
</label>
@else
&nbsp;
@endif
</td>
<td>
<a class="btn btn-sm text-danger" href="{{ route('booking_delete', [$item->id, 'service_provider_entry']) }}" onclick="return confirm('{{__('Wirklich löschen?')}}');"><i class="fa fa-trash-alt"></i></a>
</td>
</tr>
@endforeach
@endif
</tbody>
</table>
</div>
{{--
<div class="text-right d-block w-100">
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal"
data-target="#modals-load-content"
data-id="new-file"
data-model="bookingFile"
data-action="modal-upload-booking-file"
data-url=""
data-redirect="back"
data-booking_id="{{$booking->id}}"
data-route="#"><i class="ion ion-md-cloud-upload"></i>&nbsp;Datei hinzufügen</button>
</div>
--}}
<div class="col-12">
<hr>
<div class="text-left mt-3">
<button type="submit" name="action" value="update_service_provider_entry" class="btn btn-sm btn-secondary">{{ __('save changes') }}</button>&nbsp;
<a href="{{route('bookings')}}" class="btn btn-sm btn-default">{{ __('zur Übersicht') }}</a>
<a href="{{route('booking_action', ['service_provider_entry_add_discount', $booking->id])}}" class="btn btn-sm btn-primary float-right ml-2"><i class="fa fa-plus-circle"></i> {{ __('Neuer Rabatt') }}</a>
<a href="{{route('booking_action', ['service_provider_entry_add_payment', $booking->id])}}" class="btn btn-sm btn-primary float-right"><i class="fa fa-plus-circle"></i> {{ __('Neue Zahlung') }}</a>
</div>
</div>
</div>
</div>
</div>
</div>
<script>
$(document).ready(function() {
$('input.calculate_amount_on_change').on('change, keyup', function(){
var _spe_id = $(this).data('spe-id');
var amount = _floatNumber($('#service_provider_entry_'+_spe_id+'_amount').val());
var factor = _floatNumber($('#service_provider_entry_'+_spe_id+'_factor').val());
var eur = amount/factor;
$('#service_provider_entry_'+_spe_id+'_amount_eur').val(_formatNumber(eur));
});
function callback_ajax_selected_travelagenda(data){
var $el = $("#travelagenda_id");
$el.empty(); // remove old options
$.each(data.html, function(key,value) {
$el.append($("<option></option>")
.attr("value", key).text(value));
});
}
function load_selected_travelagenda(){
var $elem = $('<div/>');
$elem.data('action', 'load_travelagenda_by_country');
$elem.data('travel_country_id', $('#travel_country_id').val());
$elem.data('url', '{{route('ajax_load_data')}}');
ajax_object_action(false, $elem, callback_ajax_selected_travelagenda);
}
$('#travel_country_id').on('change', function () {
load_selected_travelagenda();
});
});
</script>

8
resources/views/booking/detail.blade.php
View file

@ -64,6 +64,11 @@
MyJack
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="javascript:void(0)" data-collapse="#collapseBookingParticipant">
Teilnehmer
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="javascript:void(0)" data-collapse="#collapseBookingPrice">
Preis
@ -121,6 +126,9 @@
<!-- MyJack -->
@include('booking._detail_myjack')
<!-- MyJack -->
@include('booking._detail_participant')
<!-- Preis -->
@include('booking._detail_price')

2
resources/views/layouts/application.blade.php
View file

@ -163,7 +163,7 @@
<!-- Application javascripts -->
<script src="{{ mix('/js/application.js') }}"></script>
<script src="{{ asset('/js/custom.js') }}?v=9{{ get_file_last_time('/js/custom.js') }}"></script>
<script src="{{ asset('/js/custom.js') }}?v=10{{ get_file_last_time('/js/custom.js') }}"></script>
@include('asset.js')

9
resources/views/travel/user/booking/mail/modal-show-mail-inner.blade.php
View file

@ -41,16 +41,16 @@
@if($customer_mail->customer)
<p><strong>Kunde: </strong>
{{ $customer_mail->customer->getSalutation() }} {{ $customer_mail->customer->title }} {{ $customer_mail->customer->firstname }} {{ $customer_mail->customer->name }}
@if($customer_mail->booking)
({{$customer_mail->booking->id}})
@if($customer_mail->customer)
({{$customer_mail->customer->id}})
@endif
</p>
@endif
@if($customer_mail->booking)
<p><strong>Buchung: </strong>
@if($value->booking->fewo_lodging_id) {{ $value->booking->fewo_lodging->name." | " }} @endif
({{ $value->booking->id }})
@if($customer_mail->booking->fewo_lodging_id) {{ $customer_mail->booking->fewo_lodging->name." | " }} @endif
({{ $customer_mail->booking->id }})
</p>
@endif
@ -58,6 +58,7 @@
<span class="badge badge-success">Mail gesendet</span>
<p>Datum: {{$customer_mail->sent_at}}</p>
@endif
@if($customer_mail->fail)
<span class="badge badge-danger">Mail Fehler</span>
<p>{{$customer_mail->error }}</p>