diff --git a/.env b/.env index 07403ca..94407fc 100755 --- a/.env +++ b/.env @@ -11,6 +11,8 @@ APP_URL_V2=https://v2.sterntours.test #APP_URL_STERN=https://www.sterntours.de APP_URL_STERN=https://sterntours.test +APP_DOMAIN_TLD=test + LOG_CHANNEL=stack DB_CONNECTION=mysql diff --git a/app/Helper/Booking.php b/app/Helper/Booking.php new file mode 100644 index 0000000..1254989 --- /dev/null +++ b/app/Helper/Booking.php @@ -0,0 +1,234 @@ +id); + if($files){ + $ret .= self::makeHTMLTable($files, $identifier, 'v3'); + }else{ + $files = self::getV2BookingDocuments($identifier, $booking); + if($files){ + $ret .= self::makeHTMLTable($files, $identifier, 'v2'); + } + } + return $ret; + } + + public static function getBookingDocuments($identifier, $booking_id){ + + switch($identifier){ + case 'registration': + $files = BookingDocument::where('booking_id', $booking_id)->where('identifier', 'registration')->get(); + break; + case 'confirmation': + $files = BookingDocument::where('booking_id', $booking_id)->where('identifier', 'confirmation')->get(); + break; + case 'storno': + $files = BookingDocument::where('booking_id', $booking_id)->where('identifier', 'storno')->get(); + break; + case 'coupon': + $files = BookingDocument::where('booking_id', $booking_id)->where('identifier', 'coupon')->get(); + break; + case 'voucher': + $files = BookingDocument::where('booking_id', $booking_id)->where('identifier', 'voucher')->get(); + break; + case 'voucher_agency': + $files = BookingDocument::where('booking_id', $booking_id)->where('identifier', 'voucher_agency')->get(); + break; + default: + $files = null; + } + return $files; + } + + + public static function getV2BookingDocuments($identifier, $booking){ + + switch($identifier){ + case 'registration': + $files = $booking->booking_applications; + break; + case 'confirmation': + $files = $booking->booking_confirmations; + break; + case 'storno': + $files = $booking->booking_stornos; + break; + case 'coupon': + $files = $booking->coupons; + break; + case 'voucher': + $files = $booking->booking_vouchers; + break; + case 'voucher_agency': + $files = $booking->booking_voucher_agencys; + break; + default: + $files = null; + } + return $files; + } + + + + private static function makeHTMLTable($files, $identifier, $version){ + $ret = ""; + + foreach($files as $file){ + ; + if($version === 'v2'){ + $file_details = self::getV2FileDetails($file, $identifier); + } + if($version === 'v3'){ + $file_details = self::getV2FileDetails($file, $identifier); + } + if(isset($file_details)){ + $ret .= ""; + $ret .= "".self::getFilesCount().""; + $ret .= ""; + $ret .= "id])."' target='_blank' class='badge badge-md badge-".$file_details->color."'>"; + $ret .= " ".$file_details->name; + $ret .= ""; + $ret .= ""; + $ret .= "".$file_details->cell.""; + $ret .= "".$file_details->date.""; + $ret .= ""; + $ret .= "id, true])."' class='btn btn-xs btn-default' title='Download' data-placement='left' rel='tooltip'>"; + $ret .= ""; + $ret .= ""; + $ret .= ""; + $ret .= ""; + } + + } + return $ret; + } + + + private static function getV3FileDetails($file, $identifier){ + $ret = new \stdClass(); + + switch($identifier){ + case 'registration': + $ret->name = "Reiseanmeldung"; + $ret->color = "primary"; + $ret->cell = "Reise | Gesamtpreis: ".\App\Services\Util::_number_format($file->total)." €"; + $ret->date = \App\Services\Util::_format_date($file->updated_at, 'date'); + break; + case 'confirmation': + $ret->name = "Reisebestätigung"; + $ret->color = "success"; + $ret->cell = "Reise | Gesamtpreis: ".\App\Services\Util::_number_format($file->total)." €
+ Anzahlung: ".\App\Services\Util::_number_format($file->deposit)." €
+ Restzahlung: ".\App\Services\Util::_number_format($file->final_payment)." €"; + $ret->date = \App\Services\Util::_format_date($file->updated_at, 'date'); + break; + case 'storno': + $ret->name = "Stornobestätigung"; + $ret->color = "danger"; + $ret->cell = "Storno | Betrag: ".\App\Services\Util::_number_format($file->total)." €"; + $ret->date = \App\Services\Util::_format_date($file->updated_at, 'date'); + break; + case 'coupon': + $ret->name = "Gutschein ".$file->number; + $ret->color = "danger"; + $ret->cell = "Gutschein | Wert: ".\App\Services\Util::_number_format($file->value)." € | + bis: ".\App\Services\Util::_format_date($file->valid_date, 'date')." | + ".(($file->is_redeemed) ? ' '.\App\Services\Util::_format_date($file->redeem_date, 'date') : '').""; + $ret->date = \App\Services\Util::_format_date($file->issue_date, 'date'); + break; + case 'voucher': + $ret->name = " Voucher ID ".$file->id; + $ret->color = "dark"; + $ret->cell = " Voucher für den Kunden"; + $ret->date = \App\Services\Util::_format_date($file->updated_at, 'date'); + break; + case 'voucher_agency': + $ret->name = "Voucher-Agentur ID ".$file->id; + $ret->color = "dark"; + $ret->cell = "Voucher für die Agentur"; + $ret->date = \App\Services\Util::_format_date($file->updated_at, 'date'); + break; + default: + $ret->name = ""; + $ret->color = ""; + $ret->cell = ""; + $ret->date = ""; + } + return $ret; + return $ret; + } + + private static function getV2FileDetails($file, $identifier){ + $ret = new \stdClass(); + + switch($identifier){ + case 'registration': + $ret->name = "Reiseanmeldung"; + $ret->color = "primary"; + $ret->cell = "Reise | Gesamtpreis: ".\App\Services\Util::_number_format($file->total)." €"; + $ret->date = \App\Services\Util::_format_date($file->updated_at, 'date'); + break; + case 'confirmation': + $ret->name = "Reisebestätigung"; + $ret->color = "success"; + $ret->cell = "Reise | Gesamtpreis: ".\App\Services\Util::_number_format($file->total)." €
+ Anzahlung: ".\App\Services\Util::_number_format($file->deposit)." €
+ Restzahlung: ".\App\Services\Util::_number_format($file->final_payment)." €"; + $ret->date = \App\Services\Util::_format_date($file->updated_at, 'date'); + break; + case 'storno': + $ret->name = "Stornobestätigung"; + $ret->color = "danger"; + $ret->cell = "Storno | Betrag: ".\App\Services\Util::_number_format($file->total)." €"; + $ret->date = \App\Services\Util::_format_date($file->updated_at, 'date'); + break; + case 'coupon': + $ret->name = "Gutschein ".$file->number; + $ret->color = "danger"; + $ret->cell = "Gutschein | Wert: ".\App\Services\Util::_number_format($file->value)." € | + bis: ".\App\Services\Util::_format_date($file->valid_date, 'date')." | + ".(($file->is_redeemed) ? ' '.\App\Services\Util::_format_date($file->redeem_date, 'date') : '').""; + $ret->date = \App\Services\Util::_format_date($file->issue_date, 'date'); + break; + case 'voucher': + $ret->name = " Voucher ID ".$file->id; + $ret->color = "dark"; + $ret->cell = " Voucher für den Kunden"; + $ret->date = \App\Services\Util::_format_date($file->updated_at, 'date'); + break; + case 'voucher_agency': + $ret->name = "Voucher-Agentur ID ".$file->id; + $ret->color = "dark"; + $ret->cell = "Voucher für die Agentur"; + $ret->date = \App\Services\Util::_format_date($file->updated_at, 'date'); + break; + default: + $ret->name = ""; + $ret->color = ""; + $ret->cell = ""; + $ret->date = ""; + } + return $ret; + } +} \ No newline at end of file diff --git a/app/Helper/BookingDocument.php b/app/Helper/BookingDocument.php new file mode 100644 index 0000000..d153d89 --- /dev/null +++ b/app/Helper/BookingDocument.php @@ -0,0 +1,313 @@ +price > 0 ? true : false; + break; + case 'confirmation': + return $booking->hasDocument('registration') > 0 ? true : false; + break; + case 'storno': + return $booking->hasDocument('confirmation') > 0 ? true : false; + break; + case 'coupon': + return $booking->hasDocument('confirmation') > 0 ? true : false; + case 'voucher': + return $booking->hasDocument('confirmation') > 0 ? true : false; + case 'voucher_agency': + return $booking->hasDocument('confirmation') > 0 ? true : false; + + } + return false; + } + + /* + functions to make the html table for the booking documents + */ + public static function getFilesCount(){ + return self::$files_count++; + } + + public static function getBookingDocumentsHTMLTable($identifier, Booking $booking, $look = 'show'){ + $ret = ""; + $files = self::getBookingDocuments($identifier, $booking->id); + if($files && $files->count() > 0){ + $ret .= self::makeHTMLTable($files, $identifier, 'v3', $look); + } + $files = self::getV2BookingDocuments($identifier, $booking); + if($files && $files->count() > 0){ + $ret .= self::makeHTMLTable($files, $identifier, 'v2', $look); + } + + + return $ret; + } + + public static function getBookingDocuments($identifier, $booking_id){ + + switch($identifier){ + case 'registration': + $files = BookingDocumentModel::where('booking_id', $booking_id)->where('identifier', 'registration')->get(); + break; + case 'confirmation': + $files = BookingDocumentModel::where('booking_id', $booking_id)->where('identifier', 'confirmation')->get(); + break; + case 'storno': + $files = null; //BookingDocumentModel::where('booking_id', $booking_id)->where('identifier', 'storno')->get(); + break; + case 'coupon': + $files = null; //BookingDocumentModel::where('booking_id', $booking_id)->where('identifier', 'coupon')->get(); + break; + case 'voucher': + $files = BookingDocumentModel::where('booking_id', $booking_id)->where('identifier', 'voucher')->get(); + break; + case 'voucher_agency': + $files = BookingDocumentModel::where('booking_id', $booking_id)->where('identifier', 'voucher_agency')->get(); + break; + default: + $files = null; + } + return $files; + } + + + public static function getV2BookingDocuments($identifier, Booking $booking){ + + switch($identifier){ + case 'registration': + $files = $booking->booking_applications; + break; + case 'confirmation': + $files = $booking->booking_confirmations; + break; + case 'storno': + $files = $booking->booking_stornos; + break; + case 'coupon': + $files = $booking->coupons; + break; + case 'voucher': + $files = $booking->booking_vouchers; + break; + case 'voucher_agency': + $files = $booking->booking_voucher_agencys; + break; + default: + $files = null; + } + return $files; + } + + private static function makeHTMLTable($files, $identifier, $version, $look){ + $ret = ""; + + foreach($files as $file){ + ; + if($version === 'v2'){ + $file_details = self::getV2FileDetails($file, $identifier, $look); + } + if($version === 'v3'){ + $file_details = self::getV3FileDetails($file, $identifier, $look); + } + if(isset($file_details)){ + $ret .= ""; + $ret .= "".self::getFilesCount().""; + $ret .= ""; + $ret .= ""; + $ret .= " ".$file_details->name; + $ret .= ""; + $ret .= ""; + $ret .= "".$file_details->cell.""; + $ret .= "".$file_details->date.""; + $ret .= ""; + if($look === 'show'){ + $ret .= ""; + $ret .= ""; + $ret .= ""; + } + if($look === 'mail'){ + + $ret .= " + + + {!! Form::close() !!} + + + +@endsection \ No newline at end of file diff --git a/resources/views/admin/report/leads.blade.php b/resources/views/admin/report/leads.blade.php new file mode 100644 index 0000000..a9a91a7 --- /dev/null +++ b/resources/views/admin/report/leads.blade.php @@ -0,0 +1,175 @@ +@extends('layouts.layout-2') + +@section('content') +

+ Buchungen Anfragen +

+
+ {!! Form::open(['url' => route('admin_report_export_leads'), 'class' => '']) !!} + {!! Form::hidden('order', '[[0, "asc"]]', ['id'=>'order_table']) !!} +
+
+ + {{-- +
+ + +
+ --}} +
+ +
+
+
+ von +
+ +
+ +
+
+ bis +
+ +
+
+
+ + +
+ + + +
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + +
{{__('LeadID')}}{{__('KundenID')}}{{__('Vorname')}}{{__('Nachname')}}{{__('E-Mail')}}{{__('Anfrage-Datum')}}{{__('Reiseland')}}{{__('Sachbearbeiter')}}{{__('Status')}}{{__('E-Mail')}}
+ +
+
+ +
+
+ Max. Export 1000 Einträge, über Datum filtern. +
+
+
+ {!! Form::close() !!} +
+ + +@endsection \ No newline at end of file diff --git a/resources/views/admin/report/service_providers.blade.php b/resources/views/admin/report/service_providers.blade.php index 4381691..a5abb39 100755 --- a/resources/views/admin/report/service_providers.blade.php +++ b/resources/views/admin/report/service_providers.blade.php @@ -11,7 +11,7 @@
-
+
+
+ +
+
+ bis +
+ +
+
+
+ +
-
- - + @if ($errors->has('email')) + + {{ $errors->first('email') }} + + @endif +
+
+ + + @if ($errors->has('password')) + + {{ $errors->first('password') }} + + @endif +
+ @else +
+ + - @if ($errors->has('email')) - - {{ $errors->first('email') }} - - @endif -
-
- - - @if ($errors->has('password')) - - {{ $errors->first('password') }} - - @endif -
+ @if ($errors->has('email')) + + {{ $errors->first('email') }} + + @endif +
+
+ + + @if ($errors->has('password')) + + {{ $errors->first('password') }} + + @endif +
+ @endif
+ +
+ + {{ Form::select('airport_id', \App\Services\Model::getAirportArray(true) , $booking->airport_id, array('class'=>'custom-select', 'id'=>'airport_id')) }} +
+
{{ Form::select('airline_ids[]', \App\Models\Airline::getAsNameIdArray() , $booking->airline_ids, array('class'=>'selectpicker', 'id'=>'airline_ids', 'data-style'=>"btn-default", 'multiple')) }}
-
@@ -68,11 +73,7 @@ {{ Form::text('end_date', _format_date($booking->end_date), array('placeholder'=>__('Aufenthalt bis'), 'class'=>'form-control datepicker-base', 'id'=>'end_date')) }}
-
- - {{ Form::select('pax', range(0, 80) , $booking->pax, array('class'=>'custom-select', 'id'=>'pax')) }} -
- +
{{ Form::text('title', $booking->title, array('placeholder'=>__('Reisetitel'), 'class'=>'form-control', 'id'=>'title')) }} @@ -83,15 +84,17 @@ {{ Form::select('travel_documents', [0=>'nicht vollständig', 1=>'vollständig'], $booking->travel_documents, array('class'=>'custom-select', 'id'=>'travel_documents')) }}
-
- - {{ Form::select('branch_id', \App\Services\Model::getBranchArray(false) , $booking->branch_id, array('class'=>'custom-select', 'id'=>'branch_id')) }} -
- +
{{ Form::select('travel_company_id', \App\Services\Model::getTravelCompanyArray(false) , $booking->travel_company_id, array('class'=>'custom-select', 'id'=>'travel_company_id')) }}
+ +
+ + {{ Form::select('pax', range(0, 80) , $booking->pax, array('class'=>'custom-select', 'id'=>'pax')) }} +
+

@@ -171,7 +174,7 @@
  - {{ __('zur Übersicht') }} + {{ __('zur Übersicht') }}
diff --git a/resources/views/booking/_detail_company.blade.php b/resources/views/booking/_detail_company.blade.php index 1c93ef0..22cb3f4 100755 --- a/resources/views/booking/_detail_company.blade.php +++ b/resources/views/booking/_detail_company.blade.php @@ -60,7 +60,7 @@
  - {{ __('zur Übersicht') }} + {{ __('zur Übersicht') }} {{ __('Neue Leistung') }}
diff --git a/resources/views/booking/_detail_customer.blade.php b/resources/views/booking/_detail_customer.blade.php new file mode 100644 index 0000000..2ad098c --- /dev/null +++ b/resources/views/booking/_detail_customer.blade.php @@ -0,0 +1,82 @@ +
+ +
+
+ @if($booking->customer->count()) +
+
+ +
+
+ + +
+ {{ Form::text('customer[id]', $booking->customer->id, array('placeholder'=>__('Kunden ID'), 'class'=>'form-control', 'id'=>'customer_id', 'readonly')) }} +
+
+
+
+ +
+ + {{ Form::select('customer[salutation_id]', \App\Models\Customer::$salutationType , $booking->customer->salutation_id, array('class'=>'custom-select', 'required'=>true)) }} +
+ +
+ + {{ Form::text('customer[firstname]', $booking->customer->firstname, array('placeholder'=>__('Vorname'), 'class'=>'form-control', 'id'=>'customer_firstname', 'required'=>true)) }} +
+ +
+ + {{ Form::text('customer[name]', $booking->customer->name, array('placeholder'=>__('Nachname'), 'class'=>'form-control', 'id'=>'customer_name', 'required'=>true)) }} +
+ +
+ + {{ Form::text('customer[street]', $booking->customer->street, array('placeholder'=>__('Straße'), 'class'=>'form-control', 'id'=>'customer_street')) }} +
+ +
+ + {{ Form::text('customer[zip]', $booking->customer->zip, array('placeholder'=>__('PLZ'), 'class'=>'form-control', 'id'=>'customer_zip')) }} +
+ +
+ + {{ Form::text('customer[city]', $booking->customer->city, array('placeholder'=>__('Stadt'), 'class'=>'form-control', 'id'=>'customer_city')) }} +
+ +
+ + {{ Form::select('customer[country_id]', \App\Models\Customer::getCustomerCountriesArray() , $booking->customer->country_id, array('class'=>'custom-select', 'required'=>true)) }} +
+ +
+ + {{ Form::text('customer[phone]', $booking->customer->phone, array('placeholder'=>__('Telefon'), 'class'=>'form-control', 'id'=>'customer_phone')) }} +
+ +
+ + {{ Form::text('customer[phonemobile]', $booking->customer->phonemobile, array('placeholder'=>__('Telefon Mobil'), 'class'=>'form-control', 'id'=>'customer_phonemobile')) }} +
+ +
+ + {{ Form::text('customer[email]', $booking->customer->email, array('placeholder'=>__('E-Mail'), 'class'=>'form-control', 'id'=>'customer_email', 'required'=>true)) }} +
+ +
+
+   + {{ __('zur Übersicht') }} +
+
+
+ @endif +
+
+
\ No newline at end of file diff --git a/resources/views/booking/_detail_delete.blade.php b/resources/views/booking/_detail_delete.blade.php new file mode 100644 index 0000000..df04684 --- /dev/null +++ b/resources/views/booking/_detail_delete.blade.php @@ -0,0 +1,36 @@ +
+ +
+ +
+ +
+ {!! Form::open(['url' => route('booking_delete_complete', [$id]), 'class' => 'form-horizontal']) !!} + +

Buchung löschen

+
Die Buchung wird komplett gelöscht, dieser Vorgang kann nicht rückgängig gemacht werden.
+
Alle Daten, Dokumente, Notizen, E-Mails und Anhänge, die zu dieser Buchung gehören, werden zusammen gelöscht.
+
+ + +
+
+ +
+
+ {!! Form::close() !!} +
+ +
+
+
\ No newline at end of file diff --git a/resources/views/booking/_detail_drafs.blade.php b/resources/views/booking/_detail_drafs.blade.php index d9ec231..04e4afb 100755 --- a/resources/views/booking/_detail_drafs.blade.php +++ b/resources/views/booking/_detail_drafs.blade.php @@ -1,5 +1,5 @@
-
@@ -7,11 +7,27 @@ @if($booking->new_drafts ) @php($i = 1) -
-
+ +
+ +
+ + + + +
+
-
+
+   + {{ __('zur Übersicht') }} +
+ + +
@@ -24,9 +40,9 @@ - + @foreach($booking->booking_draft_items as $booking_draft_item) - + draft_type) style="background-color: {{ $booking_draft_item->draft_type->color }}" @endif> @@ -66,8 +82,8 @@ {{ Form::text('draft_item['.$booking_draft_item->id.'][price_children]', $booking_draft_item->price_children, array('placeholder'=>__('Preis in €'), 'class'=>'form-control', 'id'=>'draft_item_'.$booking_draft_item->id.'_price_children')) }} - - + + @else @@ -77,7 +93,10 @@ draft_type) style="background-color: {{ $booking_draft_item->draft_type->color }}" @endif class="border-none"> @@ -101,8 +120,8 @@ @endif {{ Form::text('draft_item['.$booking_draft_item->id.'][price]', $booking_draft_item->price, array('placeholder'=>__('Preis in €'), 'class'=>'form-control', 'id'=>'draft_item_'.$booking_draft_item->id.'_price',)) }} - - + + @@ -124,12 +152,25 @@
Kinder/EP #
@@ -53,8 +69,8 @@ {{ Form::text('draft_item['.$booking_draft_item->id.'][price_adult]', $booking_draft_item->price_adult, array('placeholder'=>__('Preis in €'), 'class'=>'form-control', 'id'=>'draft_item_'.$booking_draft_item->id.'_price_adult', 'maxlength'=>10)) }} - - + + + + +
@@ -112,10 +131,19 @@ {{ 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')) }} -
-
- +
+ +
+ + + + +
+ + + +
@endif
diff --git a/resources/views/booking/_detail_files.blade.php b/resources/views/booking/_detail_files.blade.php index 6b1f0e9..b7277ae 100755 --- a/resources/views/booking/_detail_files.blade.php +++ b/resources/views/booking/_detail_files.blade.php @@ -5,7 +5,7 @@
- @php($booking_files_count = 1) +
@@ -19,155 +19,23 @@ + {!! App\Helper\BookingDocument::getBookingDocumentsHTMLTable('registration', $booking) !!} + + {!! App\Helper\BookingDocument::getBookingDocumentsHTMLTable('confirmation', $booking) !!} - @if($booking->booking_applications) - @foreach($booking->booking_applications as $booking_application) - - - - - - - - @endforeach - @endif + {!! App\Helper\BookingDocument::getBookingDocumentsHTMLTable('storno', $booking) !!} - @if($booking->booking_confirmations) - @foreach($booking->booking_confirmations as $booking_confirmation) - - - - - - - - @endforeach - @endif + {!! App\Helper\BookingDocument::getBookingDocumentsHTMLTable('coupon', $booking) !!} - @if($booking->booking_stornos) - @foreach($booking->booking_stornos as $booking_storno) - - - - - - - - @endforeach - @endif - - @if($booking->coupons) - @foreach($booking->coupons as $coupon) - - - - - - - - @endforeach - @endif - - @if($booking->booking_vouchers) - @foreach($booking->booking_vouchers as $booking_voucher) - - - - - - - - @endforeach - @endif - - @if($booking->booking_voucher_agencys) - @foreach($booking->booking_voucher_agencys as $booking_voucher_agency) - - - - - - - - @endforeach - @endif + {!! App\Helper\BookingDocument::getBookingDocumentsHTMLTable('voucher', $booking) !!} + {!! App\Helper\BookingDocument::getBookingDocumentsHTMLTable('voucher_agency', $booking) !!} + + @if($booking->insurance_certificates) @foreach($booking->insurance_certificates as $insurance_certificate) - + - + @@ -208,7 +76,7 @@ @foreach(\App\Services\Booking::contentFiles() as $content_file) @if($file = \App\Models\CMSContent::getModelBySlug($content_file)) - + - + - + - + @endforeach @@ -162,8 +178,6 @@
{{$booking_files_count++}} - - Reiseanmeldung - - - Reise | - Gesamtpreis: {{ \App\Services\Util::_number_format($booking_application->total)}} € - {{\App\Services\Util::_format_date($booking_application->updated_at, 'date')}} - - - -
{{$booking_files_count++}} - - Reisebestätigung - - - Reise | - Gesamtpreis: {{ \App\Services\Util::_number_format($booking_confirmation->total)}} € | - Anzahlung: {{ \App\Services\Util::_number_format($booking_confirmation->deposit)}} € | - Restzahlung: {{ \App\Services\Util::_number_format($booking_confirmation->final_payment)}} € - {{\App\Services\Util::_format_date($booking_confirmation->updated_at, 'date')}} - - - -
{{$booking_files_count++}} - - Stornobestätigung - - - Storno | Betrag: {{ \App\Services\Util::_number_format($booking_storno->total)}} € - {{\App\Services\Util::_format_date($booking_storno->updated_at, 'date')}} - - - -
{{$booking_files_count++}} - - Gutschein {{$coupon->number}} - - Gutschein | - Wert: {{ \App\Services\Util::_number_format($coupon->value)}} € | - bis: {{\App\Services\Util::_format_date($coupon->valid_date, 'date')}} | - @if($coupon->is_redeemed) {{\App\Services\Util::_format_date($coupon->redeem_date, 'date')}} @else @endif - {{\App\Services\Util::_format_date($coupon->issue_date, 'date')}} - - - -
{{$booking_files_count++}} - - Voucher ID {{$booking_voucher->id}} - - - Voucher für den Kunden - {{\App\Services\Util::_format_date($booking_voucher->updated_at, 'date')}} - - - -
{{$booking_files_count++}} - - Voucher-Agentur ID {{$booking_voucher_agency->id}} - - - Voucher für die Agentur - {{\App\Services\Util::_format_date($booking_voucher_agency->updated_at, 'date')}} - - - -
{{$booking_files_count++}}{{App\Helper\BookingDocument::getFilesCount()}} Sicherungsschein Nr. {{$insurance_certificate->internal_id}} @@ -190,7 +58,7 @@ @if($booking->travel_insurances) @foreach($booking->travel_insurances as $travel_insurances)
{{$booking_files_count++}}{{App\Helper\BookingDocument::getFilesCount()}} Policennummer {{$travel_insurances->policy_number}}
{{$booking_files_count++}}{{App\Helper\BookingDocument::getFilesCount()}} {{$file->name}} @@ -235,7 +103,7 @@ @if($TravelCountry->stern_travel_country) @foreach($TravelCountry->stern_travel_country->general_files as $general_files)
{{$booking_files_count++}}{{App\Helper\BookingDocument::getFilesCount()}} {{$general_files->original_name}} @@ -262,7 +130,7 @@ @foreach($booking->getPassolutionPDF() as $PassolutionPDF) @if($PassolutionPDF)
{{$booking_files_count++}}{{App\Helper\BookingDocument::getFilesCount()}} {{$PassolutionPDF['filename']}} @@ -286,15 +154,15 @@ @if($booking->booking_files) @foreach($booking->booking_files as $booking_file)
{{$booking_files_count++}}{{App\Helper\BookingDocument::getFilesCount()}} {{$booking_file->original_name}} - hinzugefügt | - {{ $booking_file->mine }} | {{ $booking_file->formatBytes() }} + | {{ $booking_file->ext }} + | {{ $booking_file->formatBytes() }} {{\App\Services\Util::_format_date($booking_file->created_at, 'date')}} @@ -313,26 +181,73 @@ +
+
+
+
PDF Dateien erstellen
+

Die neuen PDF Dateien können hier neu erstellt werden. + @if($booking->booking_applications->count() > 0) +
Achtung: alle schon angelegten PDF Dateien aus der v2 bleiben erhalten. + @endif +

+ {!! Form::open(['url' => route('booking_detail', [$booking->id]), 'class' => 'form-horizontal']) !!} + @if(App\Helper\BookingDocument::showButton('registration', $booking)) + @php($confirm = ($booking->hasDocument('registration') ? "onclick=\"return confirm('Die vorhandene Reiseanmeldung wird überschrieben. Sind sie sicher?')\"" : "")) + + @endif + @if(App\Helper\BookingDocument::showButton('confirmation', $booking)) + @php($confirm = ($booking->hasDocument('confirmation') ? "onclick=\"return confirm('Die vorhandene Reisebestätigung wird überschrieben. Sind sie sicher?')\"" : "")) + + @endif + @if(App\Helper\BookingDocument::showButton('voucher', $booking)) + @php($confirm = ($booking->hasDocument('voucher') ? "onclick=\"return confirm('Die vorhandenen Voucher / Agentur werden überschrieben. Sind sie sicher?')\"" : "")) + + @endif + @if(App\Helper\BookingDocument::showButton('coupon', $booking)) + @php($confirm = ($booking->hasDocument('coupon') ? "onclick=\"return confirm('ACHTUNG: Es wird ein neuer Gutschein angelegt.')\"" : "")) + + @endif + @if(App\Helper\BookingDocument::showButton('storno', $booking)) + @php($confirm = ($booking->hasDocument('storno') ? "onclick=\"return confirm('ACHTUNG: Die vorhandene Storno wird überschrieben.')\"" : "")) + + @endif + {!! Form::close() !!} +
+
+
+ @if(Auth::user()->isPermission('sua-st-em')) @endif @if(Auth::user()->isPermission('sua-st-co'))
Landesspezifische Dateien unter: Einstellungen -> Reieseländer
@endif -
Passolution Dateien aktualisieren: +
Passolution Dateien aktualisieren:
- - -
diff --git a/resources/views/booking/_detail_mails.blade.php b/resources/views/booking/_detail_mails.blade.php index b8fe5ab..240fd41 100755 --- a/resources/views/booking/_detail_mails.blade.php +++ b/resources/views/booking/_detail_mails.blade.php @@ -116,7 +116,7 @@ -
+

diff --git a/resources/views/booking/_detail_myjack.blade.php b/resources/views/booking/_detail_myjack.blade.php index 9b9c420..15b9c55 100755 --- a/resources/views/booking/_detail_myjack.blade.php +++ b/resources/views/booking/_detail_myjack.blade.php @@ -22,7 +22,7 @@

diff --git a/resources/views/booking/_detail_participant.blade.php b/resources/views/booking/_detail_participant.blade.php index 9a3779d..9e28c81 100644 --- a/resources/views/booking/_detail_participant.blade.php +++ b/resources/views/booking/_detail_participant.blade.php @@ -1,6 +1,8 @@
@@ -101,7 +103,7 @@
diff --git a/resources/views/booking/_detail_price.blade.php b/resources/views/booking/_detail_price.blade.php index aca7156..869e6e2 100755 --- a/resources/views/booking/_detail_price.blade.php +++ b/resources/views/booking/_detail_price.blade.php @@ -125,7 +125,7 @@
diff --git a/resources/views/booking/_detail_provider.blade.php b/resources/views/booking/_detail_provider.blade.php index a2b7ee7..23ea050 100755 --- a/resources/views/booking/_detail_provider.blade.php +++ b/resources/views/booking/_detail_provider.blade.php @@ -68,7 +68,7 @@
  - {{ __('zur Übersicht') }} + {{ __('zur Übersicht') }} {{ __('Neuer Rabatt') }} {{ __('Neue Zahlung') }} diff --git a/resources/views/booking/_detail_services.blade.php b/resources/views/booking/_detail_services.blade.php index b79d7d4..c5b4a29 100755 --- a/resources/views/booking/_detail_services.blade.php +++ b/resources/views/booking/_detail_services.blade.php @@ -83,7 +83,7 @@
diff --git a/resources/views/booking/detail.blade.php b/resources/views/booking/detail.blade.php index b789753..4f9fa73 100755 --- a/resources/views/booking/detail.blade.php +++ b/resources/views/booking/detail.blade.php @@ -40,7 +40,7 @@
@@ -79,7 +79,7 @@
{{ Form::text('special_availables['.$special_local->id.'][date]', $special_local->date, array('placeholder'=>__('Datum'), 'class'=>'form-control datepicker-base')) }}
-
{!! \App\Services\HTMLHelper::getDeDay($special_local->wday) !!}
+
{!! \App\Helper\HTMLHelper::getDeDay($special_local->wday) !!}
@@ -134,12 +134,12 @@
@@ -160,7 +160,7 @@
{{ Form::text('special_availables['.$special_phone->id.'][date]', $special_phone->date, array('placeholder'=>__('Datum'), 'class'=>'form-control datepicker-base')) }}
-
{!! \App\Services\HTMLHelper::getDeDay($special_phone->wday) !!}
+
{!! \App\Helper\HTMLHelper::getDeDay($special_phone->wday) !!}
diff --git a/resources/views/cms/feedback/detail.blade.php b/resources/views/cms/feedback/detail.blade.php index 14abaf8..a7eb5d7 100755 --- a/resources/views/cms/feedback/detail.blade.php +++ b/resources/views/cms/feedback/detail.blade.php @@ -31,7 +31,7 @@ @if($feedback->lvl != 1) - {!! HTMLHelper::getParentBy($feedback->parent, $feedback->getParentsArray()) !!} @else @@ -56,8 +56,8 @@
- - {{ Form::textarea('content', HTMLHelper::filterHTML($feedback->content, ['src' => ['addHost']]) , ['class' => 'form-control summernote']) }} + + {{ Form::textarea('content_new', HTMLHelper::filterHTML($feedback->content_new, ['src' => ['addHost']]) , ['class' => 'form-control summernote', 'id'=>'feedback_content_new']) }}
@@ -76,6 +76,34 @@
+

Hauptbild

+
+
+ +
+
+
+ {{ Form::hidden('image[slug]', $feedback->getImage('slug')) }} + {{ Form::hidden('image[thumb_url]', $feedback->getImage('thumb_url')) }} + {{ Form::hidden('image[url]', $feedback->getImage('url')) }} + {{ Form::text('image[title]', $feedback->getImage('title'), array('placeholder'=>'Bildtitel', 'class'=>'form-control mb-2')) }} + {{ Form::text('image[alt]', $feedback->getImage('alt'), array('placeholder'=>'Bild ALT Tag', 'class'=>'form-control')) }} +
+
+ +
+
+
+
+ @@ -187,4 +215,12 @@ --}} +@endsection + +@section('scripts') + @endsection \ No newline at end of file diff --git a/resources/views/cms/travel_guide/test.blade.php b/resources/views/cms/travel_guide/test.blade.php new file mode 100644 index 0000000..750fba9 --- /dev/null +++ b/resources/views/cms/travel_guide/test.blade.php @@ -0,0 +1,91 @@ +@extends('layouts.layout-2') + +@section('content') + + @if ($errors->any()) +
+
+
+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
  • + @endforeach +
+
+
+
+ @endif + + + {!! Form::open(['url' => route('cms_travel_guide_test'), 'class' => 'form-horizontal']) !!} + +

+ Reiseführer TEST Editor + +

+
+ + + +
+
+
+
+ +
+ {{ Form::textarea('content_new', '' , ['class' => 'form-control summernote']) }} +
+
+ +
+
+ +
+
+
+
+ +
+ {{ Form::textarea('content_new', '' , ['class' => 'form-control summernote-small']) }} +
+
+ +
+
+ +
+
+
+
+ +
+ {{ Form::textarea('content_new', '' , ['class' => 'form-control summernote-exsmall']) }} +
+
+ +
+
+ +
+
+
+
+ +
+ {{ Form::textarea('content_new', '' , ['class' => 'form-control summernote-air']) }} +
+
+ +
+
+ + {!! Form::close() !!} +@endsection + +@section('scripts') + +@endsection \ No newline at end of file diff --git a/resources/views/cms/travel_guide/tree-detail.blade.php b/resources/views/cms/travel_guide/tree-detail.blade.php index fb95c8b..5a5d17f 100755 --- a/resources/views/cms/travel_guide/tree-detail.blade.php +++ b/resources/views/cms/travel_guide/tree-detail.blade.php @@ -79,7 +79,7 @@ data-route="{{ route('iq_content_modal_load') }}">
- {!! \App\Services\HTMLTreeHelper::makeNestableList($model, ($tree_node ? $tree_node->id : false)) !!} + {!! \App\Helper\TreeHTML::makeNestableList($model, ($tree_node ? $tree_node->id : false)) !!}
{!! Form::close() !!} @@ -106,25 +106,25 @@
- {{-- - --}} - + {{-- + + --}} @if(!$site_fields)
diff --git a/resources/views/customer/_detail_booking.blade.php b/resources/views/customer/_detail_booking.blade.php index a936771..8c6a619 100644 --- a/resources/views/customer/_detail_booking.blade.php +++ b/resources/views/customer/_detail_booking.blade.php @@ -129,9 +129,18 @@ @foreach ($customer->coupons as $coupon)
- - Gutschein {{$coupon->number}} + @if($coupon->booking_document) + + + Gutschein {{$coupon->number}} + @else + + Gutschein {{$coupon->number}} + + @endif + + {{ \App\Services\Util::_number_format($coupon->value)}} € @@ -151,10 +160,17 @@ - - - + @if($coupon->booking_document) + + + + @else + + + + @endif
- -
diff --git a/resources/views/customer/detail.blade.php b/resources/views/customer/detail.blade.php index f6faace..e900984 100755 --- a/resources/views/customer/detail.blade.php +++ b/resources/views/customer/detail.blade.php @@ -39,7 +39,7 @@ @endif @@ -306,6 +310,11 @@
{{ __('Airline') }}
@endif + @if(Auth::user()->isPermission('sua-st-ap')) +
  • +
    {{ __('Airport') }}
    +
  • + @endif @if(Auth::user()->isPermission('sua-st-em'))
  • {{ __('E-Mails') }}
    @@ -405,6 +414,17 @@
    {{ __('Preise pürfen') }}
  • @endif + @if(Auth::user()->isPermission('sua-re-fw')) +
  • +
    {{ __('Buchungen FeWo') }}
    +
  • + @endif + + @if(Auth::user()->isPermission('sua-re-le')) +
  • +
    {{ __('Buchungen Anfragen') }}
    +
  • + @endif diff --git a/resources/views/layouts/layout-2.blade.php b/resources/views/layouts/layout-2.blade.php index 8bad1d0..d573f36 100755 --- a/resources/views/layouts/layout-2.blade.php +++ b/resources/views/layouts/layout-2.blade.php @@ -52,7 +52,7 @@ @include('layouts.includes.layout-navbar') -
    +
    diff --git a/resources/views/lead/_detail_mails.blade.php b/resources/views/lead/_detail_mails.blade.php index dc6e5af..051c9a2 100644 --- a/resources/views/lead/_detail_mails.blade.php +++ b/resources/views/lead/_detail_mails.blade.php @@ -110,7 +110,7 @@
    -
    +

    diff --git a/resources/views/lead/_detail_participant.blade.php b/resources/views/lead/_detail_participant.blade.php index 96f73cf..f925363 100644 --- a/resources/views/lead/_detail_participant.blade.php +++ b/resources/views/lead/_detail_participant.blade.php @@ -1,6 +1,8 @@
    diff --git a/resources/views/lead/_detail_status.blade.php b/resources/views/lead/_detail_status.blade.php index c01bc9f..dad7b3d 100644 --- a/resources/views/lead/_detail_status.blade.php +++ b/resources/views/lead/_detail_status.blade.php @@ -46,7 +46,7 @@
    -   +   {{ __('zur Übersicht') }}
    diff --git a/resources/views/lead/detail.blade.php b/resources/views/lead/detail.blade.php index 852c9e4..e97d4f5 100755 --- a/resources/views/lead/detail.blade.php +++ b/resources/views/lead/detail.blade.php @@ -43,7 +43,7 @@