Sehr #geehrte/r# #Anrede# #Vorname# #Nachname#,
Text ...
"; + $value->subject = $lead_id ; + $value->message = CMSContent::getContentBySlug('mailvorlage'); $value->s_placeholder = "Betreff der E-Mail"; $value->m_placeholder = "Nachricht der E-Mail"; if(isset($data['customer_mail_id']) && $customer_mail = CustomerMail::find($data['customer_mail_id'])){ diff --git a/app/Repositories/FileRepository.php b/app/Repositories/FileRepository.php new file mode 100644 index 0000000..153be94 --- /dev/null +++ b/app/Repositories/FileRepository.php @@ -0,0 +1,108 @@ +rules = [ + 'file' => 'required|mimes:pdf,jpeg,png|max:32768' + ]; + $this->messages = [ + 'file.mimes' => 'Datei ist kein PDF/JPG/PNG Format', + 'file.required' => 'PDF/JPG/PNG-Datei wird benötigt' + ]; + } + + public function _set($name, $value){ + $this->{$name} = $value; + } + + public function uploadFile( $form_data ) + { + $validator = Validator::make($form_data, $this->rules, $this->messages); + + if ($validator->fails()) { + return Response::json([ + 'error' => true, + 'message' => $validator->messages()->first(), + 'code' => 400 + ], 400); + } + $file = $form_data['file']; + + $this->originalName = $file->getClientOriginalName(); + $this->extension = strtolower($file->getClientOriginalExtension()); + $this->mine = $file->getClientMimeType(); + $this->size = $file->getClientSize(); + + + $this->makeFilename(); + //$dir = $this->model->getInvoiceStorageAttDir(); + + $this->store(file_get_contents($file->getRealPath())); + $this->save(); + return $this->response(); + + } + + public function storeFile( $content ) + { + $this->makeFilename(); + $this->store($content); + $this->size = Storage::disk($this->disk)->size($this->dir.$this->allowed_filename); + $this->save(); + return $this->response(); + } + + public function store($content){ + if(!Storage::disk($this->disk)->exists( $this->dir )){ + Storage::disk($this->disk)->makeDirectory($this->dir); //creates directory + } + Storage::disk($this->disk)->put($this->dir.$this->allowed_filename, $content); + } + + public function save(){ + + } + + public function response(){ + return Response::json([ + 'error' => false, + 'filename' => $this->allowed_filename, + 'originalName' => $this->originalName, + 'file_data' => $this->extension, + 'mine' => $this->mine, + 'size' => $this->size, + 'redirect' => '', + 'code' => 200 + ], 200); + } + + private function makeFilename(){ + $originalNameWithoutExt = substr($this->originalName, 0, strlen($this->originalName) - strlen($this->extension) - 1); + $this->filename = Util::sanitize($originalNameWithoutExt, true, false, true); + $this->allowed_filename = uniqid("", true) . '_' . $this->filename.".".$this->extension; + } +} \ No newline at end of file diff --git a/app/Services/CreateCouponPDF.php b/app/Services/CreateCouponPDF.php index b6e5aac..5f51beb 100644 --- a/app/Services/CreateCouponPDF.php +++ b/app/Services/CreateCouponPDF.php @@ -93,7 +93,7 @@ class CreateCouponPDF { $pdf->SetFont('Helvetica', '', 10); $customerName = ($this->coupon->customer && $this->coupon->customer->salutation ? $this->coupon->customer->salutation->name . ' ' : '' ) - . ($this->coupon->customer->title ? $$this->coupon->customer->title . ' ' : '' ) + . ($this->coupon->customer->title ? $this->coupon->customer->title . ' ' : '' ) . $this->coupon->customer->fullName(); $customerStreet = $this->coupon->customer ? $this->coupon->customer->street : ''; $customerRegion = $this->coupon->customer->zip ? $this->coupon->customer->zip." " : ''; diff --git a/app/Services/Util.php b/app/Services/Util.php index 8511ace..e355d28 100644 --- a/app/Services/Util.php +++ b/app/Services/Util.php @@ -93,7 +93,7 @@ class Util $clean = ($anal) ? preg_replace("/[^a-zA-Z0-9]/", "", $clean) : $clean ; if($substr){ - $clean = (strlen($clean) > 33) ? substr($clean,-33) : $clean; + $clean = (strlen($clean) > 33) ? substr($clean,0,33) : $clean; } return ($force_lowercase) ? @@ -172,4 +172,31 @@ class Util $charset = mb_detect_encoding($value, "UTF-8, ISO-8859-1, ISO-8859-15", true); return mb_convert_encoding($value, "Windows-1252", $charset); } + + + public static function getMimeFromHeader($http_response_header){ + $pattern = "/^content-type\s*:\s*(.*)$/i"; + if (($header = array_values(preg_grep($pattern, $http_response_header))) && + (preg_match($pattern, $header[0], $match) !== false)) + { + return $match[1]; + + } + return ""; + } + + public static function getExtensionFromMime($mine){ + $mime_types = [ + 'application/pdf' => 'pdf', + 'image/png' => 'png', + 'image/jpg' => 'jpg', + 'image/jpeg' => 'jpg', + 'text/html; charset=UTF-8' => 'html', + 'text/html' => 'html', + + ]; + return isset($mime_types[$mine]) ? $mime_types[$mine] : ""; + } + + } \ No newline at end of file diff --git a/config/filesystems.php b/config/filesystems.php index d96f81a..4880ad0 100755 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -60,6 +60,12 @@ return [ 'url' => env('APP_URL').'/storage/customer', 'visibility' => 'public', ], + 'booking' => [ + 'driver' => 'local', + 'root' => storage_path('app/booking'), + 'url' => env('APP_URL').'/storage/booking', + 'visibility' => 'public', + ], 'fewo_invoices' => [ 'driver' => 'local', 'root' => storage_path('app/fewo/invoices'), diff --git a/database/migrations/2018_10_29_202123_create_booking_table.php b/database/migrations/2018_10_29_202123_create_booking_table.php index bb274b6..b434022 100644 --- a/database/migrations/2018_10_29_202123_create_booking_table.php +++ b/database/migrations/2018_10_29_202123_create_booking_table.php @@ -58,9 +58,14 @@ class CreateBookingTable extends Migration $table->unsignedBigInteger('airline_id')->nullable(); $table->tinyInteger('refund')->nullable()->default(0); $table->date('refund_date')->nullable(); + $table->date('lawyer_date')->nullable(); $table->tinyInteger('hold')->nullable()->default(0); - $table->tinyInteger('xx_tkt')->nullable()->default(0); + $table->date('xx_tkt_date')->nullable(); + $table->string('filekey', 255)->nullable(); + $table->tinyInteger('is_rail_fly')->nullable()->default(0); + $table->text('notice')->nullable(); + $table->dateTime('updated_at'); $table->dateTime('created_at'); diff --git a/database/migrations/2020_04_16_165023_create_booking_files_table.php b/database/migrations/2020_04_16_165023_create_booking_files_table.php new file mode 100644 index 0000000..4369fd0 --- /dev/null +++ b/database/migrations/2020_04_16_165023_create_booking_files_table.php @@ -0,0 +1,46 @@ +bigIncrements('id'); + + $table->bigInteger('booking_id')->nullable(); + + $table->string('identifier')->index(); + $table->string('filename'); + $table->string('dir'); + $table->string('original_name'); + $table->string('ext'); + $table->string('mine'); + $table->unsignedInteger('size'); + $table->timestamps(); + + $table->foreign('booking_id') + ->references('id') + ->on('booking'); + + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('booking_files'); + } +} diff --git a/packages/iqcontent/laravel-filemanager/src/views/index.blade.php b/packages/iqcontent/laravel-filemanager/src/views/index.blade.php index a2a89b5..e47ea0e 100644 --- a/packages/iqcontent/laravel-filemanager/src/views/index.blade.php +++ b/packages/iqcontent/laravel-filemanager/src/views/index.blade.php @@ -268,7 +268,7 @@ uploadMultiple: false, parallelUploads: 5, clickable: '#upload-button', - dictDefaultMessage: lfm_lang['message-drop'], + dictDefaultMessage: ''+lfm_lang['message-drop'], init: function() { var _this = this; // For the closure this.on('success', function(file, response) { diff --git a/public/css/application.css b/public/css/application.css index 6ffa65a..c5c28b3 100644 --- a/public/css/application.css +++ b/public/css/application.css @@ -341,362 +341,11 @@ figcaption { margin: 0; width: auto; } -/* -.messages-wrapper { - position: relative; - display: -ms-flexbox; - display: flex; - overflow: hidden; - -ms-flex: 1 1 100%; - flex: 1 1 100%; - width: 100% + +.modal-open .tooltip { + z-index: 2120; } -.messages-card { - overflow: hidden -} - -.messages-wrapper, -.messages-sidebox { - transition: all .2s -} - -.messages-sidebox { - -ms-flex-preferred-size: 100%; - flex-basis: 100%; - -ms-flex-positive: 0; - flex-grow: 0 -} - -.messages-wrapper .messages-sidebox, -.messages-card .messages-sidebox { - position: fixed; - left: calc(-14rem - 1px); - z-index: 10; - -ms-flex-preferred-size: auto; - flex-basis: auto; - -ms-flex-positive: 1; - flex-grow: 1; - width: 14rem -} - -[dir=rtl] .messages-wrapper .messages-sidebox, -[dir=rtl] .messages-card .messages-sidebox { - right: calc(-14rem - 1px); - left: auto -} - -.layout-sidenav-100vh .messages-wrapper .messages-sidebox { - height: 100vh -} - -.messages-card .messages-sidebox { - position: absolute; - bottom: 0 -} - -.messages-scroll { - position: absolute; - top: 0; - bottom: 0; - height: 100% -} - -.messages-scroll.messages-content { - position: absolute; - right: 0; - left: 0; - width: 100% -} - -.messages-list .list-group-item { - z-index: auto !important; - display: -ms-flexbox; - display: flex; - -ms-flex-align: center; - align-items: center; - -ms-flex-wrap: wrap; - flex-wrap: wrap; - padding-top: .375rem; - padding-bottom: .375rem; - width: 100%; - border-right: 0; - border-left: 0; - border-radius: 0 -} - -.messages-list .list-group-item:first-child { - border-top: 0 -} - -.messages-list .list-group-item:last-child { - border-bottom: 0 -} - -.messages-list .list-group-item>* { - padding-top: .375rem; - padding-bottom: .375rem -} - -.message-checkbox .custom-control { - display: block !important; - margin: 0; - margin-top: -1px -} - -.message-sender { - min-width: 10rem -} - -.message-subject { - width: 100% -} - -.message-date { - white-space: nowrap -} - -.message-attachment { - display: -ms-flexbox; - display: flex; - -ms-flex-align: center; - align-items: center; - width: 100% -} - -.message-attachment>.media-body { - min-width: 0 -} - -.message-attachment-file, -.message-attachment-img { - display: block; - -ms-flex-positive: 0; - flex-grow: 0; - -ms-flex-negative: 0; - flex-shrink: 0; - width: 4rem; - height: 4rem -} - -.message-attachment-file { - display: inline-block; - text-align: center; - line-height: 4rem -} - -.message-attachment-img { - background-color: transparent; - background-position: center center; - background-size: cover -} - -.message-attachment-filename { - display: block; - overflow: hidden; - width: 100%; - text-overflow: ellipsis; - white-space: nowrap -} - -.default-style .messages-wrapper .messages-sidebox { - z-index: 1081 -} - -.default-style .messages-sidebox-open .messages-sidebox { - left: 0 -} - -.default-style .messages-card .messages-sidebox { - background: #fff; - box-shadow: 0 0 0 1px rgba(24, 28, 33, 0.075) -} - -@media (min-width: 576px) { - .default-style .messages-list .list-group-item { - -ms-flex-wrap: nowrap; - flex-wrap: nowrap - } - - .default-style .message-subject { - width: auto - } - - .default-style .message-date { - margin-left: auto - } -} - -@media (min-width: 768px) { - .default-style .messages-sidebox { - -ms-flex-preferred-size: 14rem; - flex-basis: 14rem - } - - .default-style .messages-wrapper .messages-sidebox { - -ms-flex-preferred-size: auto; - flex-basis: auto - } -} - -@media (min-width: 992px) { - - .default-style .messages-wrapper, - .default-style .messages-sidebox { - transition: none !important - } - - .default-style .messages-wrapper { - padding-left: 14rem - } - - .default-style .messages-sidebox { - z-index: auto !important - } - - .default-style .messages-wrapper .messages-sidebox { - position: absolute; - left: 0; - z-index: auto - } - - .default-style .messages-wrapper .messages-sidebox { - height: 100% !important - } - - .default-style .messages-card .messages-sidebox { - position: static; - right: auto; - left: auto; - -ms-flex-positive: 0; - flex-grow: 0; - height: auto - } -} - -.default-style[dir=rtl] .messages-sidebox-open .messages-sidebox { - right: 0; - left: auto -} - -@media (min-width: 576px) { - .default-style[dir=rtl] .message-date { - margin-right: auto; - margin-left: 0 - } -} - -@media (min-width: 992px) { - .default-style[dir=rtl] .messages-wrapper { - padding-right: 14rem; - padding-left: 0 - } - - .default-style[dir=rtl] .messages-wrapper .messages-sidebox { - right: 0; - left: auto - } -} - -.material-style .messages-wrapper .messages-sidebox { - z-index: 1081 -} - -.material-style .messages-sidebox-open .messages-sidebox { - left: 0 -} - -.material-style .messages-card .messages-sidebox { - background: #fff; - box-shadow: 0 0 0 1px rgba(24, 28, 33, 0.075) -} - -@media (min-width: 576px) { - .material-style .messages-list .list-group-item { - -ms-flex-wrap: nowrap; - flex-wrap: nowrap - } - - .material-style .message-subject { - width: auto - } - - .material-style .message-date { - margin-left: auto - } -} - -@media (min-width: 768px) { - .material-style .messages-sidebox { - -ms-flex-preferred-size: 14rem; - flex-basis: 14rem - } - - .material-style .messages-wrapper .messages-sidebox { - -ms-flex-preferred-size: auto; - flex-basis: auto - } -} - -@media (min-width: 992px) { - - .material-style .messages-wrapper, - .material-style .messages-sidebox { - transition: none !important - } - - .material-style .messages-wrapper { - padding-left: 14rem - } - - .material-style .messages-sidebox { - z-index: auto !important - } - - .material-style .messages-wrapper .messages-sidebox { - position: absolute; - left: 0; - z-index: auto - } - - .material-style .messages-wrapper .messages-sidebox { - height: 100% !important - } - - .material-style .messages-card .messages-sidebox { - position: static; - right: auto; - left: auto; - -ms-flex-positive: 0; - flex-grow: 0; - height: auto - } -} - -.material-style[dir=rtl] .messages-sidebox-open .messages-sidebox { - right: 0; - left: auto -} - -@media (min-width: 576px) { - .material-style[dir=rtl] .message-date { - margin-right: auto; - margin-left: 0 - } -} - -@media (min-width: 992px) { - .material-style[dir=rtl] .messages-wrapper { - padding-right: 14rem; - padding-left: 0 - } - - .material-style[dir=rtl] .messages-wrapper .messages-sidebox { - right: 0; - left: auto - } -} -*/ .btn-next { border-color: rgba(0, 0, 0, 0); background: #8897AA; @@ -780,4 +429,18 @@ figcaption { } .table th, .table td { padding: 0.4rem; -} \ No newline at end of file +} + +.dz-message i { + font-size: 50px; + display: block; + margin-bottom: 16px; + opacity: 0.8; +} +div.dropzone { + border-style: dashed; +} +div.dropzone.dz-drag-hover { + border-style: dashed; +} + diff --git a/public/js/custom.js b/public/js/custom.js index df715a9..3edfda5 100644 --- a/public/js/custom.js +++ b/public/js/custom.js @@ -7,6 +7,29 @@ $('.iq-save-bar').closest('form').find(':input, select, textarea').keydown(funct showIqSaveBar($(this).closest('form')); }); +CookiesAddJSONValue = function(name, value) { + var elements = []; + if(Cookies.get(name)){ + elements = JSON.parse(Cookies.get(name)); + } + if(elements.indexOf(value) === -1){ + elements.push(value); + } + Cookies.set(name, JSON.stringify(elements), { expires:30 }); +}; + + +CookiesRemoveJSONValue = function(name, value) { + var elements = []; + if(Cookies.get(name)){ + elements = JSON.parse(Cookies.get(name)); + } + var index = elements.indexOf(value); + if(index > -1){ + elements.splice(index, 1); + Cookies.set(name, JSON.stringify(elements), { expires:30 }); + } +}; $(function () { @@ -117,7 +140,7 @@ $(function () { $.each(button.data(), function(index, value){ data[index] = value; }); - console.log(data); + //console.log(data); loadModalInner(this, data); }); @@ -130,13 +153,12 @@ $(function () { $.each(button.data(), function(index, value){ data[index] = value; }); - console.log(data); + //console.log(data); loadModalInner(this, data); }); } function loadModalInner(self, data){ - var url = data.route, contentType = 'application/x-www-form-urlencoded; charset=UTF-8'; $.ajax({ @@ -151,9 +173,9 @@ $(function () { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') }, success: function(data) { - // console.log(data); + // console.log(data); $(data.response.target).find('.modal-dialog').html(data.html); - $(data.response.target + '.selectpicker').selectpicker('refresh'); + $(data.response.target).find('.selectpicker').selectpicker('refresh'); initModalInner(); }, error: function(xhr, status, errorThrown) { @@ -177,8 +199,8 @@ function ajax_object_action(event, object, callback) { data[index] = value; }); var url = data['url']; - /*console.log(data); - console.log(url);*/ + //console.log(data); + //console.log(url); $.ajax({ url: url, data: data, @@ -228,7 +250,7 @@ function update_modal_data_show(e, $ele) { }, success: function(data) { // do what ever you want here. add content to if it was not 1 .
- console.log(data);
+ //console.log(data);
$('#update-modal-content').html(data);
$('.selectpicker').selectpicker(["refresh"]);
$('.input-daterange').datepicker({toggleActive: true,format: 'dd.mm.yyyy'});
@@ -251,8 +273,8 @@ function update_modal_data_load(e, $ele) {
data = {data:ele.data('data'), target:ele.data('target')} ,
contentType = 'application/x-www-form-urlencoded; charset=UTF-8';
- console.log(data);
- console.log(url);
+ //console.log(data);
+ //console.log(url);
$.ajax({
url: url,
data: data,
@@ -287,8 +309,8 @@ function iq_update_data_load(e, $ele) {
data = {action:ele.data('action'), target:ele.data('target'), data:ele.data('data')} ,
contentType = 'application/x-www-form-urlencoded; charset=UTF-8';
- console.log(data);
- console.log(url);
+ //console.log(data);
+ //console.log(url);
$.ajax({
url: url,
data: data,
diff --git a/resources/views/booking/_detail_booking.blade.php b/resources/views/booking/_detail_booking.blade.php
new file mode 100755
index 0000000..c29eaee
--- /dev/null
+++ b/resources/views/booking/_detail_booking.blade.php
@@ -0,0 +1,75 @@
+
+
\ No newline at end of file
diff --git a/resources/views/booking/_detail_drafs.blade.php b/resources/views/booking/_detail_drafs.blade.php
new file mode 100755
index 0000000..d9ec231
--- /dev/null
+++ b/resources/views/booking/_detail_drafs.blade.php
@@ -0,0 +1,137 @@
++ Buchung +
+
+
+
+
+
+
+
+ {{ Form::text('sf_guard_user_id', $booking->sf_guard_user->first_name." ".$booking->sf_guard_user->last_name, array('placeholder'=>__('Sachbearbeiter'), 'class'=>'form-control', 'id'=>'sf_guard_user_id', 'readonly')) }}
+
+
+
+ {{ Form::text('booking_date', _format_date($booking->booking_date), array('placeholder'=>__('Buchungsdatum'), 'class'=>'form-control', 'id'=>'booking_date', 'readonly')) }}
+
+
+
+ {{ Form::text('travel_country_id', $booking->travel_country ? $booking->travel_country->name : '', array('placeholder'=>__('Reiseland'), 'class'=>'form-control', 'id'=>'travel_country_id', 'readonly')) }}
+
+
+
+ {{ Form::text('travel_number', $booking->travel_number, array('placeholder'=>__('Reisenummer'), 'class'=>'form-control', 'id'=>'travel_number', 'readonly')) }}
+
+
+
+ {{ Form::text('travelagenda_id', $booking->travel_agenda ? $booking->travel_agenda->name : '', array('placeholder'=>__('Reiseprogramm'), 'class'=>'form-control', 'id'=>'travelagenda_id', 'readonly')) }}
+
+
+
+ {{ Form::text('travel_category_id', $booking->travel_category ? $booking->travel_category->name : '', array('placeholder'=>__('Reiseart'), 'class'=>'form-control', 'id'=>'travel_category_id', 'readonly')) }}
+
+
+
+ {{ Form::text('start_date', _format_date($booking->start_date), array('placeholder'=>__('Aufenthalt vom'), 'class'=>'form-control', 'id'=>'start_date', 'readonly')) }}
+
+
+
+ {{ Form::text('end_date', _format_date($booking->end_date), array('placeholder'=>__('Aufenthalt bis'), 'class'=>'form-control', 'id'=>'end_date', 'readonly')) }}
+
+
+
+ {{ Form::text('title', $booking->title, array('placeholder'=>__('Reisetitel'), 'class'=>'form-control', 'id'=>'title', 'readonly')) }}
+
+
+
+
+
+ +
+
+ {{ Form::text('paying_out', $booking->getPayingOutType(), array('placeholder'=>__('K-Wunsch'), 'class'=>'form-control', 'id'=>'paying_out', 'readonly')) }}
+
+
+
+ {{ Form::text('paying_out_status', $booking->getPayingOutStatusType(), array('placeholder'=>__('KW-Status'), 'class'=>'form-control', 'id'=>'paying_out_status', 'readonly')) }}
+
+
+
+ {{ Form::text('refund', $booking->getRefundType(), array('placeholder'=>__('Refund'), 'class'=>'form-control', 'id'=>'refund', 'readonly')) }}
+
+
+
+ {{ Form::text('refund_date', _format_date($booking->refund_date), array('placeholder'=>__('Refund Datum'), 'class'=>'form-control', 'id'=>'refund_date', 'readonly')) }}
+
+
+
+ {{ Form::text('xx_tkt', $booking->getXxTktType(), array('placeholder'=>__('XX TKT'), 'class'=>'form-control', 'id'=>'xx_tkt', 'readonly')) }}
+
+
+
+ {{ Form::text('xx_tkt_date', _format_date($booking->xx_tkt_date), array('placeholder'=>__('XX TKT Datum'), 'class'=>'form-control', 'id'=>'xx_tkt_date', 'readonly')) }}
+
+
+
+
\ No newline at end of file
diff --git a/resources/views/booking/_detail_files.blade.php b/resources/views/booking/_detail_files.blade.php
new file mode 100755
index 0000000..91e1bb8
--- /dev/null
+++ b/resources/views/booking/_detail_files.blade.php
@@ -0,0 +1,245 @@
+
++ Organisation +
+
+
+
+ @if($booking->new_drafts )
+
+ @php($i = 1)
+
+
+
+ +
+ + +
+
+
+
+
+
+
+ @endif
+
+
+
diff --git a/resources/views/booking/_detail_info.blade.php b/resources/views/booking/_detail_info.blade.php
new file mode 100755
index 0000000..964920f
--- /dev/null
+++ b/resources/views/booking/_detail_info.blade.php
@@ -0,0 +1,34 @@
++ PDF Dateien +
+
+
+ @php($booking_files_count = 1)
+
+
+
+
+
+
+
+
+
+ | # | +Datei | +Inhalt | +Datum | ++ |
|---|---|---|---|---|
| {{$booking_files_count++}} | ++ + Reiseanmeldung + + | ++ Gesamtpreis: {{ \App\Services\Util::_number_format($booking_application->total)}} € + | +{{\App\Services\Util::_format_date($booking_application->updated_at, 'date')}} | ++ + + + | +
| {{$booking_files_count++}} | ++ + Reisebestätigung + + | ++ 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 + + | ++ Stornobetrag: {{ \App\Services\Util::_number_format($booking_storno->total)}} € + | +{{\App\Services\Util::_format_date($booking_storno->updated_at, 'date')}} | ++ + + + | +
| {{$booking_files_count++}} | ++ + Gutschein {{$coupon->number}} + + | ++ 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}} + + | ++ + | +{{\App\Services\Util::_format_date($booking_voucher->updated_at, 'date')}} | ++ + + + | +
| {{$booking_files_count++}} | ++ + Sicherungsschein Nr. {{$insurance_certificate->internal_id}} + + | ++ + | +{{\App\Services\Util::_format_date($insurance_certificate->updated_at, 'date')}} | ++ + + + | +
| {{$booking_files_count++}} | ++ Policennummer {{$travel_insurances->policy_number}} + | ++ Gesamtprämie: {{ \App\Services\Util::_number_format($travel_insurances->premium)}} € + | +{{\App\Services\Util::_format_date($travel_insurances->updated_at, 'date')}} | ++ + | +
| {{$booking_files_count++}} | ++ + {{$security_certificate->name}} + + | ++ {{ $security_certificate->formatBytes() }} + | +{{\App\Services\Util::_format_date($security_certificate->created_at, 'date')}} | ++ + + + | +
| {{$booking_files_count++}} | ++ + {{$booking_file->original_name}} + + | ++ {{ $booking_file->mine }} | {{ $booking_file->formatBytes() }} + | +{{\App\Services\Util::_format_date($booking_file->created_at, 'date')}} | ++ + + + | +
+
+
+
+
\ No newline at end of file
diff --git a/resources/views/booking/_detail_lead.blade.php b/resources/views/booking/_detail_lead.blade.php
new file mode 100755
index 0000000..411b7bf
--- /dev/null
+++ b/resources/views/booking/_detail_lead.blade.php
@@ -0,0 +1,39 @@
++ Kunde +
+
+
+
+ @if($booking->customer->count())
+
+
+
+
+
+
+
+ {{ Form::text('customer[email]', $booking->customer->email, array('placeholder'=>__('E-Mail'), 'class'=>'form-control', 'id'=>'customer_email', 'readonly')) }}
+
+
+
+ {{ Form::text('customer[firstname]', $booking->customer->firstname, array('placeholder'=>__('Vorname'), 'class'=>'form-control', 'id'=>'customer_firstname', 'readonly')) }}
+
+
+
+
+ {{ Form::text('customer[name]', $booking->customer->name, array('placeholder'=>__('Nachname'), 'class'=>'form-control', 'id'=>'customer_name', 'readonly')) }}
+
+ @endif
+
+
\ No newline at end of file
diff --git a/resources/views/booking/_detail_mails.blade.php b/resources/views/booking/_detail_mails.blade.php
new file mode 100755
index 0000000..4e17be2
--- /dev/null
+++ b/resources/views/booking/_detail_mails.blade.php
@@ -0,0 +1,137 @@
++ Anfrage +
+
+
+
+ @if($booking->lead->count())
+
+
+
+
+
+
+
+ {{ Form::text('lead[status_id]', $booking->lead->status ? $booking->lead->status->name : '', array('placeholder'=>__('Status'), 'class'=>'form-control', 'id'=>'lead_status_id', 'readonly')) }}
+
+
+
+
+
+
+
+
+
+ @endif
+
+
\ No newline at end of file
diff --git a/resources/views/booking/_detail_myjack.blade.php b/resources/views/booking/_detail_myjack.blade.php
new file mode 100755
index 0000000..a9e7dbd
--- /dev/null
+++ b/resources/views/booking/_detail_myjack.blade.php
@@ -0,0 +1,22 @@
++ E-Mails +
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/views/booking/_detail_price.blade.php b/resources/views/booking/_detail_price.blade.php
new file mode 100755
index 0000000..0d6fbef
--- /dev/null
+++ b/resources/views/booking/_detail_price.blade.php
@@ -0,0 +1,18 @@
++ MyJack +
+
+
+
+
+
+
+
+ {{ Form::text('ev_number', $booking->ev_number, array('placeholder'=>__('EV Nummer'), 'class'=>'form-control', 'id'=>'ev_number', 'readonly')) }}
+
+
+
+ {{ Form::text('booking_konto', 4011, array('placeholder'=>__('Konto'), 'class'=>'form-control', 'id'=>'booking_konto', 'readonly')) }}
+
+
+
+ {{ Form::text('merlin_order_number', $booking->merlin_order_number, array('placeholder'=>__('MyJack Nr.'), 'class'=>'form-control', 'id'=>'merlin_order_number', 'readonly')) }}
+
+
+
\ No newline at end of file
diff --git a/resources/views/booking/detail.blade.php b/resources/views/booking/detail.blade.php
index cced3ea..977b65e 100755
--- a/resources/views/booking/detail.blade.php
+++ b/resources/views/booking/detail.blade.php
@@ -115,849 +115,231 @@
- + Preis +
+
+
+
+
+
+
+
+
+
+
+ €
+
+ {{ Form::text('price', $booking->price, array('placeholder'=>__('Gesamtpreis'), 'class'=>'form-control', 'id'=>'price', 'readonly')) }}
+
-
+ @include('booking._detail_info')
- - Kunde -
-
-
-
- @if($booking->customer->count())
-
-
-
-
-
-
-
- {{ Form::text('customer[email]', $booking->customer->email, array('placeholder'=>__('E-Mail'), 'class'=>'form-control', 'id'=>'customer_email', 'readonly')) }}
-
-
-
- {{ Form::text('customer[firstname]', $booking->customer->firstname, array('placeholder'=>__('Vorname'), 'class'=>'form-control', 'id'=>'customer_firstname', 'readonly')) }}
-
-
-
-
- {{ Form::text('customer[name]', $booking->customer->name, array('placeholder'=>__('Nachname'), 'class'=>'form-control', 'id'=>'customer_name', 'readonly')) }}
-
- @endif
-
-
+ @include('booking._detail_lead')
- - Anfrage -
-
-
-
- @if($booking->lead->count())
-
-
-
-
-
-
-
- {{ Form::text('lead[status_id]', $booking->lead->status ? $booking->lead->status->name : '', array('placeholder'=>__('Status'), 'class'=>'form-control', 'id'=>'lead_status_id', 'readonly')) }}
-
-
-
-
-
-
-
-
-
- @endif
-
-
+ @include('booking._detail_booking')
- - Buchung -
-
-
-
-
-
-
-
- {{ Form::text('sf_guard_user_id', $booking->sf_guard_user->first_name." ".$booking->sf_guard_user->last_name, array('placeholder'=>__('Sachbearbeiter'), 'class'=>'form-control', 'id'=>'sf_guard_user_id', 'readonly')) }}
-
-
-
- {{ Form::text('booking_date', _format_date($booking->booking_date), array('placeholder'=>__('Buchungsdatum'), 'class'=>'form-control', 'id'=>'booking_date', 'readonly')) }}
-
-
-
- {{ Form::text('travel_country_id', $booking->travel_country ? $booking->travel_country->name : '', array('placeholder'=>__('Reiseland'), 'class'=>'form-control', 'id'=>'travel_country_id', 'readonly')) }}
-
-
-
- {{ Form::text('travel_number', $booking->travel_number, array('placeholder'=>__('Reisenummer'), 'class'=>'form-control', 'id'=>'travel_number', 'readonly')) }}
-
-
-
- {{ Form::text('travelagenda_id', $booking->travel_agenda ? $booking->travel_agenda->name : '', array('placeholder'=>__('Reiseprogramm'), 'class'=>'form-control', 'id'=>'travelagenda_id', 'readonly')) }}
-
-
-
- {{ Form::text('travel_category_id', $booking->travel_category ? $booking->travel_category->name : '', array('placeholder'=>__('Reiseart'), 'class'=>'form-control', 'id'=>'travel_category_id', 'readonly')) }}
-
-
-
- {{ Form::text('start_date', _format_date($booking->start_date), array('placeholder'=>__('Aufenthalt vom'), 'class'=>'form-control', 'id'=>'start_date', 'readonly')) }}
-
-
-
- {{ Form::text('end_date', _format_date($booking->end_date), array('placeholder'=>__('Aufenthalt bis'), 'class'=>'form-control', 'id'=>'end_date', 'readonly')) }}
-
-
-
- {{ Form::text('title', $booking->title, array('placeholder'=>__('Reisetitel'), 'class'=>'form-control', 'id'=>'title', 'readonly')) }}
-
-
-
-
-
- -
-
- {{ Form::text('paying_out', $booking->getPayingOutType(), array('placeholder'=>__('K-Wunsch'), 'class'=>'form-control', 'id'=>'paying_out', 'readonly')) }}
-
-
-
- {{ Form::text('paying_out_status', $booking->getPayingOutStatusType(), array('placeholder'=>__('KW-Status'), 'class'=>'form-control', 'id'=>'paying_out_status', 'readonly')) }}
-
-
-
- {{ Form::text('refund', $booking->getRefundType(), array('placeholder'=>__('Refund'), 'class'=>'form-control', 'id'=>'refund', 'readonly')) }}
-
-
-
- {{ Form::text('refund_date', _format_date($booking->refund_date), array('placeholder'=>__('Refund Datum'), 'class'=>'form-control', 'id'=>'refund_date', 'readonly')) }}
-
-
-
- {{ Form::text('xx_tkt', $booking->getXxTktType(), array('placeholder'=>__('XX TKT'), 'class'=>'form-control', 'id'=>'xx_tkt', 'readonly')) }}
-
-
-
- {{ Form::text('xx_tkt_date', _format_date($booking->xx_tkt_date), array('placeholder'=>__('XX TKT Datum'), 'class'=>'form-control', 'id'=>'xx_tkt_date', 'readonly')) }}
-
-
-
-
+ @include('booking._detail_myjack')
- - MyJack -
-
-
-
-
-
-
-
- {{ Form::text('ev_number', $booking->ev_number, array('placeholder'=>__('EV Nummer'), 'class'=>'form-control', 'id'=>'ev_number', 'readonly')) }}
-
-
-
- {{ Form::text('booking_konto', 4011, array('placeholder'=>__('Konto'), 'class'=>'form-control', 'id'=>'booking_konto', 'readonly')) }}
-
-
-
- {{ Form::text('merlin_order_number', $booking->merlin_order_number, array('placeholder'=>__('MyJack Nr.'), 'class'=>'form-control', 'id'=>'merlin_order_number', 'readonly')) }}
-
-
-
- {{--
-
- --}}
- - Preis -
-
+ @include('booking._detail_price')
-
-
-
-
-
-
-
-
-
- €
-
- {{ Form::text('price', $booking->price, array('placeholder'=>__('Gesamtpreis'), 'class'=>'form-control', 'id'=>'price', 'readonly')) }}
-
-
{!! Form::close() !!}
- - Organisation -
-
-
-
- @if($booking->new_drafts )
+ @include('booking._detail_drafs')
- @php($i = 1)
-
-
-
- -
- - -
-
-
-
-
-
-
- @endif
-
-
- E-Mails -
-
-
+ @include('booking._detail_mails')
-
-
+
+
+
+
-
-
-
- PDF Dateien -
-
-
- @php($booking_files_count = 1)
-
-
-
-
-
-
-
-
| # | -Datei | -Inhalt | -Datum | -- |
|---|---|---|---|---|
| {{$booking_files_count++}} | -- - Reiseanmeldung - - | -- Gesamtpreis: {{ \App\Services\Util::_number_format($booking_application->total)}} € - | -{{\App\Services\Util::_format_date($booking_application->updated_at, 'date')}} | -- - - - | -
| {{$booking_files_count++}} | -- - Reisebestätigung - - | -- 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 - - | -- Stornobetrag: {{ \App\Services\Util::_number_format($booking_storno->total)}} € - | -{{\App\Services\Util::_format_date($booking_storno->updated_at, 'date')}} | -- - - - | -
| {{$booking_files_count++}} | -- - Gutschein {{$coupon->number}} - - | -- 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}} - - | -- - | -{{\App\Services\Util::_format_date($booking_voucher->updated_at, 'date')}} | -- - - - | -
| {{$booking_files_count++}} | -- - Sicherungsschein Nr. {{$insurance_certificate->internal_id}} - - | -- - | -{{\App\Services\Util::_format_date($insurance_certificate->updated_at, 'date')}} | -- - - - | -
| {{$booking_files_count++}} | -- Policennummer {{$travel_insurances->policy_number}} - | -- Gesamtprämie: {{ \App\Services\Util::_number_format($travel_insurances->premium)}} € - | -{{\App\Services\Util::_format_date($travel_insurances->updated_at, 'date')}} | -- - | -
-
-
-
-
-
-
-
-
-
-
+
+ $('table .move-up-btn').on('click', function () {
+ var thisRow = $(this).closest('tbody');
+ var prevRow = thisRow.prev();
+ if (prevRow.length) {
+ prevRow.before(thisRow);
+ sort_item_pos_number()
+ }
+ });
+
+ $('table .move-down-btn').on('click', function () {
+ var thisRow = $(this).closest('tbody');
+ var nextRow = thisRow.next();
+ if (nextRow.length) {
+ nextRow.after(thisRow);
+ sort_item_pos_number()
+ }
+ });
+ });
+
- @endsection
\ No newline at end of file
+@endsection
+
diff --git a/resources/views/booking/upload_modal.blade.php b/resources/views/booking/upload_modal.blade.php
new file mode 100755
index 0000000..75d0db4
--- /dev/null
+++ b/resources/views/booking/upload_modal.blade.php
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
diff --git a/resources/views/cms/content/all/index.blade.php b/resources/views/cms/content/all/index.blade.php
index 90708d2..98bece9 100755
--- a/resources/views/cms/content/all/index.blade.php
+++ b/resources/views/cms/content/all/index.blade.php
@@ -21,11 +21,13 @@
@endif
-
-
-
-
-
@@ -123,9 +128,10 @@
+
{{__('Name')}}
- {{__('Type')}}
+ {{__('Slug')}}
{{__('Inhalt')}}
+ {{__('Type')}}
+
@@ -45,13 +49,16 @@
{{ $value->name }}
+ {{ $value->slug }}
+ @if($value->isFile()) {!! $value->getPreviewContent() !!} @else {{ $value->getPreviewContent() }} @endif
{{ $value->getFieldName() }}
- {{ $value->getPreviewContent() }}
+
@@ -70,52 +78,6 @@
\ No newline at end of file
diff --git a/resources/views/customer/mail/modal-new-mail.blade.php b/resources/views/customer/mail/modal-new-mail.blade.php
index 82ecee0..891275a 100644
--- a/resources/views/customer/mail/modal-new-mail.blade.php
+++ b/resources/views/customer/mail/modal-new-mail.blade.php
@@ -20,21 +20,26 @@
@if($value->show === 'single' || $value->show === 'reply')
-
@@ -34,8 +36,10 @@
+ @if(isset($value->booking))
-
+
@endforeach
Buchung:
- {{ $value->booking->id }} @if($value->booking->travel_country_id) {{ " | ".$value->booking->travel_country->name }} @endif @if($value->booking->travelagenda_id) {{ " | ".$value->booking->travel_agenda->name }} @endif + ({{ $value->booking->id }})
- {{ $value->booking->id }} @if($value->booking->travel_country_id) {{ " | ".$value->booking->travel_country->name }} @endif @if($value->booking->travelagenda_id) {{ " | ".$value->booking->travel_agenda->name }} @endif + ({{ $value->booking->id }})
@if($value->booking->customer)
- Kunde:
{{ $value->booking->customer->salutation->name }} {{ $value->booking->customer->firstname }} {{ $value->booking->customer->name }} + Kunde:
{{ $value->booking->customer->salutation->name }} {{ $value->booking->customer->title }} {{ $value->booking->customer->firstname }} {{ $value->booking->customer->name }} + @endif + @if($value->booking->lead) + ({{$value->booking->lead->id}}) @endif
+ @endif
{{ $value->booking->customer->salutation->name }} {{ $value->booking->customer->firstname }} {{ $value->booking->customer->name }} + Kunde:
{{ $value->booking->customer->salutation->name }} {{ $value->booking->customer->title }} {{ $value->booking->customer->firstname }} {{ $value->booking->customer->name }} + @endif + @if($value->booking->lead) + ({{$value->booking->lead->id}}) @endif
@if(isset($value->customer_mail))
Antwort auf:
{{ $value->customer_mail->id }} || {{ $value->customer_mail->subject }} @@ -62,7 +67,7 @@
{{ $value->customer_mail->id }} || {{ $value->customer_mail->subject }} @@ -62,7 +67,7 @@
-
+ @if($value->show === 'single' || $value->show === 'multi')
+
{!! Form::close() !!}
@@ -211,7 +226,6 @@
@endforeach
@endif
-
+
+ @endif
@if(Auth::user()->isPermission('cms-cn-co'))
@endif
- @if(Auth::user()->isPermission('cms-cn-al'))
-
-
- @endif
@if(Auth::user()->isPermission('cms-cn-au'))
Vorlage unter: CMS->Inhalte->Allgemein Slug:mailvorlage
+ @endif
-
@@ -155,12 +161,12 @@
{{ Form::textarea('message', $value->message, array('placeholder'=>$value->m_placeholder, 'id'=>'message-editor-fallback', 'class'=>'form-control d-none', 'rows'=>15)) }}
@if(isset($value->customers))
- Platzhalter: #geehrte/r# #Anrede# #Vorname# #Nachname# #Reiseland# #Programm# #Anreisedatum# #Abreisedatum# #Buchungsdatum# #Airline#
+Platzhalter: #geehrte/r# #Anrede# #Titel# #Vorname# #Nachname# #Reiseland# #Programm# #Anreisedatum# #Abreisedatum# #Buchungsdatum# #Airline#
@endif @if($value->show === 'single' || $value->show === 'reply')
-
+
@endif
@if(isset($value->customer_mail))
- {{ Form::hidden('customer_mail_id', $value->customer_mail->id) }}
+ {{ Form::hidden('customer_mail_id', $value->customer_mail->id) }}
@endif
{!! Form::close() !!}
+ @if($value->show === 'single' && isset($value->booking))
+
+ @endif
+
+ @if($value->show === 'single' && isset($value->booking))
+ Datei Anhänge
+ @include('customer.mail.modal-new-booking-files', ['booking'=>$value->booking])
+
+ @endif
{!! Form::open([ 'url' => route('customer_mail_upload_attachment', ['tmp']), 'method' => 'post', 'files' => true, 'enctype' => 'multipart/form-data', 'class' => 'dropzone', 'id' => 'uploadAttachmentFile' ]) !!}
@@ -253,16 +267,21 @@
-
-
\ No newline at end of file
diff --git a/resources/views/layouts/application.blade.php b/resources/views/layouts/application.blade.php
index c309b70..1774b68 100755
--- a/resources/views/layouts/application.blade.php
+++ b/resources/views/layouts/application.blade.php
@@ -68,7 +68,7 @@
@yield('styles')
-
+
@@ -158,7 +158,7 @@
-
+
@include('asset.js')
@@ -182,7 +182,7 @@
uploadMultiple: false,
parallelUploads: 10,
clickable: '#upload-button',
- //dictDefaultMessage: LFileManager.lfm_config['lfm_lang']['message-drop'],
+ dictDefaultMessage: 'Hier klicken, oder Datei hier reinziehen (Drag&Drop)',
init: function () {
var _this = this; // For the closure
this.on('success', function (file, response) {
diff --git a/resources/views/layouts/includes/layout-sidenav.blade.php b/resources/views/layouts/includes/layout-sidenav.blade.php
index f1e5a42..09d5ddc 100755
--- a/resources/views/layouts/includes/layout-sidenav.blade.php
+++ b/resources/views/layouts/includes/layout-sidenav.blade.php
@@ -184,16 +184,16 @@
Infos
@endif
+ @if(Auth::user()->isPermission('cms-cn-al'))
+ Allgemein
+ Reiseländer
Allgemein
- Autoren
diff --git a/resources/views/request/index.blade.php b/resources/views/request/index.blade.php
index 273ff0d..536523e 100755
--- a/resources/views/request/index.blade.php
+++ b/resources/views/request/index.blade.php
@@ -75,19 +75,19 @@
-
-
-
-
-
+
-
+
+
+
+
+
@@ -175,6 +184,7 @@
{{__('BuchungsID')}}
{{__('Reiseland')}}
{{__('Programm')}}
+ {{__('Reiseveranstalter')}}
{{--{{__('Kategorie')}} --}}
{{__('Anreise')}}
{{__('Abreise')}}
@@ -235,6 +245,7 @@
d.travel_option_search = $('select[name=travel_option_search]').val();
d.travel_option_country_id = $('select[name=travel_option_country_id]').val();
d.travel_option_agenda_id = $('select[name=travel_option_agenda_id]').val();
+ d.travel_option_company_id = $('select[name=travel_option_company_id]').val();
d.travel_option_lead_status_id = $('select[name=travel_option_lead_status_id]').val();
d.travel_option_airline_id = $('select[name=travel_option_airline_id]').val();
d.travel_option_paying_out = $('select[name=travel_option_paying_out]').val();
@@ -252,6 +263,7 @@
{ data: 'id', name: 'id' },
{ data: 'travel_country_id', name: 'travel_country_id', orderable: false },
{ data: 'travelagenda_id', name: 'travelagenda_id', orderable: false },
+ { data: 'travel_company_id', name: 'travel_company_id', orderable: true },
{ data: 'start_date', name: 'start_date' },
{ data: 'end_date', name: 'end_date' },
{ data: 'travel_documents', name: 'travel_documents', orderable: false },
@@ -394,6 +406,9 @@
$('#travel_option_agenda_id').on('change', function(){
table.draw();
});
+ $('#travel_option_company_id').on('change', function(){
+ table.draw();
+ });
$('#travel_option_lead_status_id').on('change', function(){
table.draw();
});
diff --git a/routes/web.php b/routes/web.php
index cf4b4c0..a211bc9 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -57,66 +57,14 @@ Route::get('/', 'HomeController@index')->name('home');
Route::get('/check/login/{identify}/{token}/{show?}', 'HomeController@checkLogin')->name('check_login');
Route::get('/user/update_email_confirm/{token}', 'UserUpdateEmailController@activateMail')->name('user_update_email_confirm');
-Route::get('/storage/file/{id}/{disk}', function($id = null, $disk = null)
-{
-
- $file = \App\Models\CustomerFile::findOrFail($id);
- $path = Storage::disk($disk)->path($file->dir.$file->filename);
-
- if (file_exists($path)) {
- return Response::file($path);
- }
-})->name('storage_file');
+Route::get('/storage/file/{id}/{disk}/{do?}', 'FileController@show')->name('storage_file');
+Route::get('customer_file/show/{model}/{id}/{cd?}', 'CustomerFileController@show')->name('customer_file_show');
Route::group(['middleware' => ['auth']], function()
{
-
- Route::get('storage/{type?}/{class?}/{year?}/{file?}/{do?}', function($type = null, $class = null, $year = null, $file = null, $do = null) {
-
- /*if ($type == 'xls') {
- $path = storage_path("app/export/");
- $filename = $file . '.xls';
- }*/
- $path = "";
- $filename = "";
- $headers = [];
-
- if ($class == 'invoices' || $class == 'infos'){
- $headers = [
- 'Content-Type: application/pdf',
- 'Pragma: no-cache',
- 'Cache-Control: no-store,no-cache, must-revalidate, post-check=0, pre-check=0'
- ];
- $dir = $year."/";
- $filename = $file;
- if ($type == 'fewo') {
- if(Storage::disk('fewo_invoices')->exists( $dir.$filename )){
- $path = Storage::disk('fewo_invoices')->path($dir.$filename);
- }
- }
- if ($type == 'fewo') {
- if(Storage::disk('fewo_infos')->exists( $dir.$filename )){
- $path = Storage::disk('fewo_infos')->path($dir.$filename);
- }
- }
- }
-
- if (file_exists($path)) {
- if($do == "download"){
- return Response::download($path, $filename, $headers);
- }
- if($do == "file"){
- return Response::file($path, $headers);
- }
- }
- })->name('storage');
-
+ Route::get('storage/{type?}/{class?}/{year?}/{file?}/{do?}', 'FileController@showExpert')->name('storage');
Route::get('/home', 'HomeController@show')->name('home');
-
- /* Route::get('/user/edit', 'UserController@userEdit')->name('user_edit');
-
- */
Route::group(['middleware' => ['auth.permission:my-dat']], function() {
Route::get('/user/edit', 'UserDataController@userEdit')->name('user_edit');
@@ -160,7 +108,6 @@ Route::group(['middleware' => ['admin']], function()
Route::get('/customer_mail/delete/{id}', 'CustomerMailController@delete')->name('customer_mail_delete');
Route::post('customer_mail/ajax', 'CustomerMailController@ajax')->name('customer_mail_ajax');
- Route::get('customer_file/show/{model}/{id}/{cd?}', 'CustomerFileController@show')->name('customer_file_show');
Route::group(['middleware' => ['auth.permission:cms-iq-assets']], function() {
//assets
@@ -241,7 +188,7 @@ Route::group(['middleware' => ['admin']], function()
Route::get('data/table/customer_mails', 'CustomerMailController@getCustomerMails')->name('data_table_customer_mails');
Route::get('/customer_mails', 'CustomerMailController@index')->name('customer_mails');
Route::get('/customer_mail/detail/{id}', 'CustomerMailController@detail')->name('customer_mail_detail');
- Route::post('/customer_mail/detail/{id}', 'CustomerMailController@store')->name('customer_mail_detail');
+ Route::post('/customer_mail/detail/{id}/{action?}', 'CustomerMailController@store')->name('customer_mail_detail');
Route::get('/customer_mail/delete/{id}', 'CustomerMailController@delete')->name('customer_mail_delete');
});
diff --git a/storage/app/booking/files/2020/04/5e9873901e2bd_jdatlastoollogo.png b/storage/app/booking/files/2020/04/5e9873901e2bd_jdatlastoollogo.png
new file mode 100644
index 0000000..6d4306f
Binary files /dev/null and b/storage/app/booking/files/2020/04/5e9873901e2bd_jdatlastoollogo.png differ
diff --git a/storage/app/booking/files/2020/04/5e997d7b4ecc2_ust111.pdf b/storage/app/booking/files/2020/04/5e997d7b4ecc2_ust111.pdf
new file mode 100644
index 0000000..9c22f8d
Binary files /dev/null and b/storage/app/booking/files/2020/04/5e997d7b4ecc2_ust111.pdf differ
diff --git a/storage/app/booking/files/2020/04/5e99aaf396d750.47072403_muscat-sultan-qaboos-moschee-h1_k.jpg b/storage/app/booking/files/2020/04/5e99aaf396d750.47072403_muscat-sultan-qaboos-moschee-h1_k.jpg
new file mode 100644
index 0000000..bd8e291
Binary files /dev/null and b/storage/app/booking/files/2020/04/5e99aaf396d750.47072403_muscat-sultan-qaboos-moschee-h1_k.jpg differ
diff --git a/storage/app/customer/attachment/2020/04/5e972e144373d7.97972029_jdatlastoollogo.png b/storage/app/customer/attachment/2020/04/5e972e144373d7.97972029_jdatlastoollogo.png
new file mode 100644
index 0000000..6d4306f
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e972e144373d7.97972029_jdatlastoollogo.png differ
diff --git a/storage/app/customer/attachment/2020/04/5e972e27878222.09265384_jdatlastoollogo.png b/storage/app/customer/attachment/2020/04/5e972e27878222.09265384_jdatlastoollogo.png
new file mode 100644
index 0000000..6d4306f
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e972e27878222.09265384_jdatlastoollogo.png differ
diff --git a/storage/app/customer/attachment/2020/04/5e972e38af6043.03271213_jdatlastoollogo.png b/storage/app/customer/attachment/2020/04/5e972e38af6043.03271213_jdatlastoollogo.png
new file mode 100644
index 0000000..6d4306f
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e972e38af6043.03271213_jdatlastoollogo.png differ
diff --git a/storage/app/customer/attachment/2020/04/5e972fbe2ce954.66250128_jdatlastoollogo.png b/storage/app/customer/attachment/2020/04/5e972fbe2ce954.66250128_jdatlastoollogo.png
new file mode 100644
index 0000000..6d4306f
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e972fbe2ce954.66250128_jdatlastoollogo.png differ
diff --git a/storage/app/customer/attachment/2020/04/5e97302ed1c839.78339022_muscat-sultan-qaboos-moschee-h1.JPG b/storage/app/customer/attachment/2020/04/5e97302ed1c839.78339022_muscat-sultan-qaboos-moschee-h1.JPG
new file mode 100644
index 0000000..bd8e291
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e97302ed1c839.78339022_muscat-sultan-qaboos-moschee-h1.JPG differ
diff --git a/storage/app/customer/attachment/2020/04/5e99938369aa5_ust111.pdf b/storage/app/customer/attachment/2020/04/5e99938369aa5_ust111.pdf
new file mode 100644
index 0000000..9c22f8d
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99938369aa5_ust111.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e9993c3a9a28_ust111.pdf b/storage/app/customer/attachment/2020/04/5e9993c3a9a28_ust111.pdf
new file mode 100644
index 0000000..9c22f8d
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e9993c3a9a28_ust111.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e99941ac1f65_ust111.pdf b/storage/app/customer/attachment/2020/04/5e99941ac1f65_ust111.pdf
new file mode 100644
index 0000000..9c22f8d
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99941ac1f65_ust111.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e99943712578_ust111.pdf b/storage/app/customer/attachment/2020/04/5e99943712578_ust111.pdf
new file mode 100644
index 0000000..9c22f8d
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99943712578_ust111.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e99a72f1bfde9.86685319_ust111pd. b/storage/app/customer/attachment/2020/04/5e99a72f1bfde9.86685319_ust111pd.
new file mode 100644
index 0000000..9c22f8d
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99a72f1bfde9.86685319_ust111pd. differ
diff --git a/storage/app/customer/attachment/2020/04/5e99a752cba2a2.94746278_jdatlastoollogopn. b/storage/app/customer/attachment/2020/04/5e99a752cba2a2.94746278_jdatlastoollogopn.
new file mode 100644
index 0000000..6d4306f
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99a752cba2a2.94746278_jdatlastoollogopn. differ
diff --git a/storage/app/customer/attachment/2020/04/5e99aa9cd041d8.89347563_reiseanme.html b/storage/app/customer/attachment/2020/04/5e99aa9cd041d8.89347563_reiseanme.html
new file mode 100644
index 0000000..1dabde0
--- /dev/null
+++ b/storage/app/customer/attachment/2020/04/5e99aa9cd041d8.89347563_reiseanme.html
@@ -0,0 +1,212 @@
+
+
+
+
+
+ STERN TOURS CRM Login
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+STERN TOURS CRM Login
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/storage/app/customer/attachment/2020/04/5e99aad1b1ba55.84697018_reiseanmel.pdf b/storage/app/customer/attachment/2020/04/5e99aad1b1ba55.84697018_reiseanmel.pdf
new file mode 100644
index 0000000..68034f0
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99aad1b1ba55.84697018_reiseanmel.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e99aadc24e747.88797929_reisebestäti.pdf b/storage/app/customer/attachment/2020/04/5e99aadc24e747.88797929_reisebestäti.pdf
new file mode 100644
index 0000000..a686cf3
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99aadc24e747.88797929_reisebestäti.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e99aadce9a149.07769362_gutschein_202258804771.pdf b/storage/app/customer/attachment/2020/04/5e99aadce9a149.07769362_gutschein_202258804771.pdf
new file mode 100644
index 0000000..567bb55
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99aadce9a149.07769362_gutschein_202258804771.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e99aadd9d8d66.71792306_sicherungsscheinnachsis651r.pdf b/storage/app/customer/attachment/2020/04/5e99aadd9d8d66.71792306_sicherungsscheinnachsis651r.pdf
new file mode 100644
index 0000000..7cc1d5c
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99aadd9d8d66.71792306_sicherungsscheinnachsis651r.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e99aadea97ec4.45183917_jdatlastoollogo.png b/storage/app/customer/attachment/2020/04/5e99aadea97ec4.45183917_jdatlastoollogo.png
new file mode 100644
index 0000000..6d4306f
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99aadea97ec4.45183917_jdatlastoollogo.png differ
diff --git a/storage/app/customer/attachment/2020/04/5e99aadf8228a7.04445821_ust111.pdf b/storage/app/customer/attachment/2020/04/5e99aadf8228a7.04445821_ust111.pdf
new file mode 100644
index 0000000..9c22f8d
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99aadf8228a7.04445821_ust111.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e99ab01275620.11542311_muscat-sultan-qaboos-moschee-h1_k.jpg b/storage/app/customer/attachment/2020/04/5e99ab01275620.11542311_muscat-sultan-qaboos-moschee-h1_k.jpg
new file mode 100644
index 0000000..bd8e291
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99ab01275620.11542311_muscat-sultan-qaboos-moschee-h1_k.jpg differ
diff --git a/storage/app/customer/attachment/2020/04/5e99accb7b29a6.14209159_reiseanmel.pdf b/storage/app/customer/attachment/2020/04/5e99accb7b29a6.14209159_reiseanmel.pdf
new file mode 100644
index 0000000..68034f0
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99accb7b29a6.14209159_reiseanmel.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e99adcfe04075.56597947_reiseanmel.pdf b/storage/app/customer/attachment/2020/04/5e99adcfe04075.56597947_reiseanmel.pdf
new file mode 100644
index 0000000..68034f0
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99adcfe04075.56597947_reiseanmel.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e99ae058f7ec3.92405331_reiseanmel.pdf b/storage/app/customer/attachment/2020/04/5e99ae058f7ec3.92405331_reiseanmel.pdf
new file mode 100644
index 0000000..68034f0
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99ae058f7ec3.92405331_reiseanmel.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e99ae5570a9d2.76710677_reiseanmel.pdf b/storage/app/customer/attachment/2020/04/5e99ae5570a9d2.76710677_reiseanmel.pdf
new file mode 100644
index 0000000..68034f0
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99ae5570a9d2.76710677_reiseanmel.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e99ae646eb0a1.78424093_jdatlastoollogo.png b/storage/app/customer/attachment/2020/04/5e99ae646eb0a1.78424093_jdatlastoollogo.png
new file mode 100644
index 0000000..6d4306f
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99ae646eb0a1.78424093_jdatlastoollogo.png differ
diff --git a/storage/app/customer/attachment/2020/04/5e99afbe21f9c2.01938887_reiseanmel.pdf b/storage/app/customer/attachment/2020/04/5e99afbe21f9c2.01938887_reiseanmel.pdf
new file mode 100644
index 0000000..68034f0
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99afbe21f9c2.01938887_reiseanmel.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e99aff4c885b4.22939380_reiseanmel.pdf b/storage/app/customer/attachment/2020/04/5e99aff4c885b4.22939380_reiseanmel.pdf
new file mode 100644
index 0000000..68034f0
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99aff4c885b4.22939380_reiseanmel.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e99b016467117.77860068_reiseanmel.pdf b/storage/app/customer/attachment/2020/04/5e99b016467117.77860068_reiseanmel.pdf
new file mode 100644
index 0000000..68034f0
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99b016467117.77860068_reiseanmel.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e99b065104c37.78810324_reiseanmel.pdf b/storage/app/customer/attachment/2020/04/5e99b065104c37.78810324_reiseanmel.pdf
new file mode 100644
index 0000000..68034f0
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99b065104c37.78810324_reiseanmel.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e99b0c59b2738.41424954_reiseanmel.pdf b/storage/app/customer/attachment/2020/04/5e99b0c59b2738.41424954_reiseanmel.pdf
new file mode 100644
index 0000000..68034f0
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99b0c59b2738.41424954_reiseanmel.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e99b0cb639727.76108821_reisebestäti.pdf b/storage/app/customer/attachment/2020/04/5e99b0cb639727.76108821_reisebestäti.pdf
new file mode 100644
index 0000000..a686cf3
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99b0cb639727.76108821_reisebestäti.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e99b0cda4e229.01104704_reisebestäti.pdf b/storage/app/customer/attachment/2020/04/5e99b0cda4e229.01104704_reisebestäti.pdf
new file mode 100644
index 0000000..a686cf3
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99b0cda4e229.01104704_reisebestäti.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e99b1f2e2bc67.91448850_reiseanmel.pdf b/storage/app/customer/attachment/2020/04/5e99b1f2e2bc67.91448850_reiseanmel.pdf
new file mode 100644
index 0000000..68034f0
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99b1f2e2bc67.91448850_reiseanmel.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e99b1f532d420.57931412_muscat-sultan-qaboos-moschee-h1_k.jpg b/storage/app/customer/attachment/2020/04/5e99b1f532d420.57931412_muscat-sultan-qaboos-moschee-h1_k.jpg
new file mode 100644
index 0000000..bd8e291
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99b1f532d420.57931412_muscat-sultan-qaboos-moschee-h1_k.jpg differ
diff --git a/storage/app/customer/attachment/2020/04/5e99b25f177626.25343338_reiseanmel.pdf b/storage/app/customer/attachment/2020/04/5e99b25f177626.25343338_reiseanmel.pdf
new file mode 100644
index 0000000..68034f0
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99b25f177626.25343338_reiseanmel.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e99b25f7ec553.78598895_reisebestäti.pdf b/storage/app/customer/attachment/2020/04/5e99b25f7ec553.78598895_reisebestäti.pdf
new file mode 100644
index 0000000..a686cf3
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99b25f7ec553.78598895_reisebestäti.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/5e99b2613a9819.26002671_jdatlastoollogo.png b/storage/app/customer/attachment/2020/04/5e99b2613a9819.26002671_jdatlastoollogo.png
new file mode 100644
index 0000000..6d4306f
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99b2613a9819.26002671_jdatlastoollogo.png differ
diff --git a/storage/app/customer/attachment/2020/04/5e99b2673b62c6.52635905_ust111.pdf b/storage/app/customer/attachment/2020/04/5e99b2673b62c6.52635905_ust111.pdf
new file mode 100644
index 0000000..9c22f8d
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/5e99b2673b62c6.52635905_ust111.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/asdas.pdf b/storage/app/customer/attachment/2020/04/asdas.pdf
new file mode 100644
index 0000000..9c22f8d
Binary files /dev/null and b/storage/app/customer/attachment/2020/04/asdas.pdf differ
diff --git a/storage/app/customer/attachment/2020/04/test.pdf b/storage/app/customer/attachment/2020/04/test.pdf
new file mode 100644
index 0000000..07848cc
--- /dev/null
+++ b/storage/app/customer/attachment/2020/04/test.pdf
@@ -0,0 +1,212 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+ Melden Sie sich in Ihrem Account an
+ + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/storage/app/public/cms_files/2020/04/5e98451b1ae7a_sicherungsscheinnachsis651r.pdf b/storage/app/public/cms_files/2020/04/5e98451b1ae7a_sicherungsscheinnachsis651r.pdf
new file mode 100644
index 0000000..7cc1d5c
Binary files /dev/null and b/storage/app/public/cms_files/2020/04/5e98451b1ae7a_sicherungsscheinnachsis651r.pdf differ
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+