Reiseland Kontaktdaten, Rabatt API

This commit is contained in:
Kevin Adametz 2019-11-07 17:08:16 +01:00
parent 8f29c15a2b
commit 70704be1ea
30 changed files with 471 additions and 95 deletions

View file

@ -5,4 +5,5 @@
'aufpreis_kategorie' => 'pro Person: #Kategorie#',
'aufpreis_flug' => 'Aufschlag für Abfahrts-/Abflugort pro Person: ab #Flughafen#',
'aufpreis_option' => 'pro Person: #Option#',
'rabatt' => 'Rabatt',
);

View file

@ -117,7 +117,7 @@
<td>
{{ Form::text('draft_item['.$booking_draft_item->id.'][end_date]', $booking_draft_item->end_date, array('placeholder'=>__('End Datum'), 'class'=>'form-control datepicker-base', 'id'=>'draft_item_'.$booking_draft_item->id.'_end_date')) }}
</td>
@if(in_array($booking_draft_item->draft_type_id, [24, 26, 30, 31, 32, 33, 34, 35, 36, 37, 41]))
@if(in_array($booking_draft_item->draft_type_id, [24, 26, 30, 31, 32, 33, 34, 35, 36, 37, 41, 42]))
<td>
<div class="input-group">
<select class="custom-select" name="draft_item[{{$booking_draft_item->id}}][adult]" id="draft_item_{{$booking_draft_item->id }}_adult">
@ -183,8 +183,6 @@
<td colspan="7">
@endif
{{ Form::textarea('draft_item['.$booking_draft_item->id.'][service]', $booking_draft_item->service, array('placeholder'=>__('Leistungen'), 'class'=>'form-control autoExpand', 'id'=>'draft_item_'.$booking_draft_item->id.'_service', 'rows'=>'1', 'data-min-rows'=>'1')) }}
</td>
<td>
<label class="custom-control custom-checkbox mt-2" style="margin-right: 20px;">

View file

@ -64,6 +64,17 @@
<div class="tab-pane fade @if($step == 'contact') active show @endif" id="navs-contact">
<div class="card-body">
<div class="form-row">
<div class="form-group col-sm-12">
<label class="form-label" for="contact_lands">Kontaktdaten aus folgenden Ländern nehmen</label>
<select class="selectpicker" data-style="btn-default" name="contact_lands[]" multiple>
{!! HTMLHelper::getTravelCountriesOptions($model->contact_lands) !!}
</select>
<em>Land/Länder müssen angeben sein, die Kontaktdaten des Landes (Reiselandes) werden nacheinander im PDF (RA, RB, Voucher) eingefügt.</em>
</div>
</div>
<hr>
<br>
<h4>Kontaktdaten</h4>

View file

@ -79,6 +79,7 @@
<thead>
<tr>
<th style="max-width: 60px;">&nbsp;</th>
<th style="width: 2%;">{{__('POS')}}</th>
<th>{{__('Name')}}</th>
<th>{{__('Farbe')}}</th>
<th>{{__('sichtbar')}}</th>
@ -93,12 +94,14 @@
data-id="{{ $value->id }}"
data-name="{{ $value->name }}"
data-color="{{ $value->color }}"
data-active="{{ $value->active }}">
data-active="{{ $value->active }}"
data-pos="{{ $value->pos }}">
<span class="far fa-edit"></span>
</button>
</td>
<td>{{ $value->name }}</td>
<td>{{ $value->pos }}</td>
<td>{{ $value->name }}</td>
<td>@if($value->color)
<div style="display:inline-block; width: 20px; height: 20px; border: 1px solid #888a85; background-color: {{$value->color}}"></div>
{{ $value->color }}
@ -124,6 +127,7 @@
data-id="new"
data-name=""
data-active="1"
data-pos="0"
>Neuen Typ anlegen</button>
</div>
@ -147,6 +151,12 @@
<input type="text" class="form-control" name="name" placeholder="{{__('Description')}}" required>
</div>
</div>
<div class="form-row">
<div class="form-group col">
<label for="pos" class="form-label">POS*</label>
<input type="text" class="form-control" name="pos" placeholder="{{__('Position')}}" required>
</div>
</div>
<div class="form-row">
<div class="form-group col">
@ -155,8 +165,6 @@
</div>
</div>
<div class="form-group">
<label class="custom-control custom-checkbox m-0">
<input type="checkbox" class="custom-control-input" name="active" checked>
@ -185,6 +193,7 @@
var button = $(event.relatedTarget);
$(this).find(".modal-content input[name='id']").val(button.data('id'));
$(this).find(".modal-body input[name='name']").val(button.data('name'));
$(this).find(".modal-body input[name='pos']").val(button.data('pos'));
color = '#fff';
if(button.data('color') != ""){
color = button.data('color');
@ -198,7 +207,7 @@
$('.datatables-types').dataTable({
"bLengthChange": false,
"iDisplayLength": 50,
"order": [[ 1, "desc" ]],
"language": {
"url": "/js/German.json"
}

View file

@ -8,7 +8,7 @@
{!! '<a href="'.route('travel_user_detail', [$travel_user_booking_fewo->travel_user_id]) .'">'.$travel_user_booking_fewo->travel_user->first_name.' '.$travel_user_booking_fewo->travel_user->last_name.'</a>' !!}
@endif</label>
<select class="selectpicker" data-style="btn-light" name="travel_user_id" data-live-search="true" required>
{!! HTMLHelper::getTravelUserOptions($travel_user_booking_fewo->travel_user_id) !!}
{!! HTMLHelper::getTravelUserOptions($travel_user_booking_fewo->travel_user_id, "DESC") !!}
</select>
@ -213,28 +213,26 @@
</div>
</h4>
@endif
@if($travel_user_booking_fewo->isInvoice())
@if($travel_user_booking_fewo->send_user_mail)
<table class="table table-striped border-bottom mt-4">
<tbody>
@foreach($travel_user_booking_fewo->send_user_mail as $send_user_mail)
<tr>
<td style="width: 25%"><strong>{!! key($send_user_mail) !!}</strong><br>E-Mail versendet.</td>
<td><span class="small">{!! nl2br(current($send_user_mail)) !!}</span></td>
</tr>
@endforeach
</tbody>
</table>
@endif
<div class="form-row">
<div class="form-group col-sm-12 mt-2">
{{ Form::textarea('send_mail_user_notice', '', ['placeholder'=>'Wichtige Hinweise in E-Mail, werden nur in die aktuelle E-Mail übernommen', 'class' => 'form-control autoExpand', 'rows'=>1]) }}
</div>
</div>
<div class="text-right mt-0">
<button type="submit" name="action" value="sendMailtoUser" class="btn btn-primary btn-sm" onclick="return confirm('{{__('E-Mail Mietbestätigung an Mieter versenden?')}}');">{{ __('E-Mail mit Mietbestätigung / Rechnung und Mietbedingungen an Kunden versenden') }}</button>&nbsp;
</div>
@if($travel_user_booking_fewo->send_user_mail)
<table class="table table-striped border-bottom mt-4">
<tbody>
@foreach($travel_user_booking_fewo->send_user_mail as $send_user_mail)
<tr>
<td style="width: 25%"><strong>{!! key($send_user_mail) !!}</strong><br>E-Mail versendet.</td>
<td><span class="small">{!! nl2br(current($send_user_mail)) !!}</span></td>
</tr>
@endforeach
</tbody>
</table>
@endif
<div class="form-row">
<div class="form-group col-sm-12 mt-2">
{{ Form::textarea('send_mail_user_notice', '', ['placeholder'=>'Wichtige Hinweise in E-Mail, werden nur in die aktuelle E-Mail übernommen', 'class' => 'form-control autoExpand', 'rows'=>1]) }}
</div>
</div>
<div class="text-right mt-0">
<button type="submit" name="action" value="sendMailtoUser" class="btn btn-primary btn-sm" onclick="return confirm('{{__('E-Mail Mietbestätigung an Mieter versenden?')}}');">{{ __('E-Mail mit Mietbestätigung / Rechnung und Mietbedingungen an Kunden versenden') }}</button>&nbsp;
</div>
</div>
</div>
@ -258,36 +256,34 @@
</div>
</h4>
@endif
<div class="form-row">
<div class="form-group col-sm-12">
<button class="btn btn-default btn-sm " type="button" data-toggle="collapse" data-target="#collapseTravelInfo" aria-expanded="false" aria-controls="collapseTravelInfo">
{{ __('Inhalt für das PDF / Mail') }} <i class="fa fa-angle-down"></i>
</button>
<div class="collapse mt-2" id="collapseTravelInfo">
{{ Form::textarea('info_mail_text', $travel_user_booking_fewo->info_mail_text, ['class' => 'form-control autoExpand', 'rows'=>1, 'id'=>'travel_info_user_text']) }}
<em>Grundtext in ADMIN CMS > <a href="{{route('cms_content_all')}}">Inhalte</a> > PDF Vorlage Anreiseinfo FeWo</em>
<em class="small">(Änderungen werden hier gespeichert.)</em>
<div class="form-row">
<div class="form-group col-sm-12">
<button class="btn btn-default btn-sm " type="button" data-toggle="collapse" data-target="#collapseTravelInfo" aria-expanded="false" aria-controls="collapseTravelInfo">
{{ __('Inhalt für das PDF / Mail') }} <i class="fa fa-angle-down"></i>
</button>
<div class="collapse mt-2" id="collapseTravelInfo">
{{ Form::textarea('info_mail_text', $travel_user_booking_fewo->info_mail_text, ['class' => 'form-control autoExpand', 'rows'=>1, 'id'=>'travel_info_user_text']) }}
<em>Grundtext in ADMIN CMS > <a href="{{route('cms_content_all')}}">Inhalte</a> > PDF Vorlage Anreiseinfo FeWo</em>
<em class="small">(Änderungen werden hier gespeichert.)</em>
</div>
</div>
</div>
@if($travel_user_booking_fewo->isTravelInfo())
@if($travel_user_booking_fewo->send_info_mail)
<table class="table table-striped border-bottom">
<tbody>
@foreach($travel_user_booking_fewo->send_info_mail as $send_info_mail)
<tr>
<td style="width: 25%"><strong>{!! key($send_info_mail) !!}</strong><br>E-Mail versendet.</td>
<td><span class="small">{!! nl2br(current($send_info_mail)) !!}</span></td>
</tr>
@endforeach
</tbody>
</table>
@endif
<div class="text-right mt-0">
<button type="submit" name="action" value="sendInfosMailtoUser" class="btn btn-primary btn-sm" onclick="return confirm('{{__('Mail an Mieter versenden?')}}');">{{ __('E-Mail mit Anreiseinfo an Kunden versenden') }}</button>&nbsp;
</div>
</div>
@if($travel_user_booking_fewo->send_info_mail)
<table class="table table-striped border-bottom">
<tbody>
@foreach($travel_user_booking_fewo->send_info_mail as $send_info_mail)
<tr>
<td style="width: 25%"><strong>{!! key($send_info_mail) !!}</strong><br>E-Mail versendet.</td>
<td><span class="small">{!! nl2br(current($send_info_mail)) !!}</span></td>
</tr>
@endforeach
</tbody>
</table>
@endif
<div class="text-right mt-0">
<button type="submit" name="action" value="sendInfosMailtoUser" class="btn btn-primary btn-sm" onclick="return confirm('{{__('Mail an Mieter versenden?')}}');">{{ __('E-Mail mit Anreiseinfo an Kunden versenden') }}</button>&nbsp;
</div>
</div>
</div>
@endif

View file

@ -20,6 +20,7 @@
<th>{{__('vom')}}</th>
<th>{{__('bis')}}</th>
<th>{{__('Eingetragen')}}</th>
<th>{{__('Mails')}}</th>
<th>{{__('Status')}}</th>
<th>{{__('Datum')}}</th>
<th>{{__('R.-Nr.')}}</th>
@ -48,6 +49,7 @@
{ data: 'from_date', name: 'from_date' },
{ data: 'to_date', name: 'to_date' },
{ data: 'is_calendar', name: 'is_calendar', orderable: false },
{ data: 'is_mail', name: 'is_mail', orderable: false },
{ data: 'status_name', name: 'status_name' },
{ data: 'booking_date', name: 'booking_date' },
{ data: 'invoice_number', name: 'invoice_number' },
@ -88,6 +90,7 @@
$('.selectpicker').selectpicker();
}*/
});
$('#datatables-default').tooltip({selector: '[data-toggle="tooltip"]'});
});
</script>