diff --git a/.env b/.env index fcd44b8..e44c26b 100755 --- a/.env +++ b/.env @@ -53,6 +53,7 @@ MAIL_BBC=kevin@adametz.media MAIL_FEWO_EMPLOYEE=kevin@adametz.media #MAIL_FEWO_EMPLOYEE=katrin.nikolai@stern-tours.de,gerda.fritsch@stern-tours.de #MAIL_BBC=kontakt@stern-tours.de,thomas.stern@stern-tours.de +MAIL_FROM_ADDRESS=info@mein.sterntours.de MAIL_DRIVER=smtp MAIL_HOST=mail.your-server.de MAIL_PORT=587 @@ -60,6 +61,13 @@ MAIL_USERNAME=info@mein.sterntours.de MAIL_PASSWORD=B7f8Ojt98v6tMz8W MAIL_ENCRYPTION=TLS +#MAIL_FROM_ADDRESS=stern@stern-tours.de +#MAIL_HOST=zimbra.managedemail.de +#MAIL_PORT=587 +#MAIL_USERNAME=stern@stern-tours.de +#MAIL_PASSWORD=bMzG8aYHjTCN0IsKCp +#MAIL_ENCRYPTION=TLS + PUSHER_APP_ID= PUSHER_APP_KEY= diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 387d774..abc7dd2 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,32 +2,75 @@ - - - - - + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + - - - @@ -77,108 +120,169 @@ + + + + + '.$label.' + '; + + } +} + +if (! function_exists('get_file_last_time')) { + function get_file_last_time($value) + { + if (file_exists($value)) { + return filemtime($value); + } + return date("Ymd-i", time()); + } } \ No newline at end of file diff --git a/config/mail.php b/config/mail.php index ae991ba..09b3546 100755 --- a/config/mail.php +++ b/config/mail.php @@ -29,7 +29,7 @@ return [ | */ - 'host' => env('MAIL_HOST', 'mail.your-server.de'), + 'host' => env('MAIL_HOST', 'zimbra.managedemail.de'), /* |-------------------------------------------------------------------------- @@ -56,7 +56,7 @@ return [ */ 'from' => [ - 'address' => env('MAIL_FROM_ADDRESS', 'info@mein.sterntours.de'), + 'address' => env('MAIL_FROM_ADDRESS', 'stern@stern-tours.de'), 'name' => env('MAIL_FROM_NAME', 'Mein Stern-Tours'), ], 'mail_bbc' => explode(',', env('MAIL_BBC', 'kontakt@stern-tours.de')), diff --git a/database/migrations/2019_03_11_094922_create_travel_guides_table.php b/database/migrations/2019_03_11_094922_create_travel_guides_table.php index e152c68..9a8c4b9 100644 --- a/database/migrations/2019_03_11_094922_create_travel_guides_table.php +++ b/database/migrations/2019_03_11_094922_create_travel_guides_table.php @@ -16,11 +16,16 @@ class CreateTravelGuidesTable extends Migration Schema::connection('mysql_stern')->create('travel_guides', function (Blueprint $table) { $table->increments('id'); + + $table->unsignedBigInteger('tree_node_id'); + $table->string('name'); $table->string('slug')->index()->unique(); $table->string('text')->nullable(); $table->text('full_text')->nullable(); + $table->string('keyword')->nullable(); + $table->string('meta_title')->nullable(); $table->string('meta_description')->nullable(); @@ -31,6 +36,11 @@ class CreateTravelGuidesTable extends Migration $table->boolean('active')->default(true); $table->timestamps(); + + $table->foreign('tree_node_id') + ->references('id') + ->on('i_q_content_tree_nodes'); + }); } diff --git a/database/migrations/2019_07_19_155842_create_i_q_content_trees_table.php b/database/migrations/2019_07_19_155842_create_i_q_content_trees_table.php new file mode 100644 index 0000000..cdefa96 --- /dev/null +++ b/database/migrations/2019_07_19_155842_create_i_q_content_trees_table.php @@ -0,0 +1,46 @@ +create('i_q_content_trees', function (Blueprint $table) { + $table->bigIncrements('id'); + + + $table->string('name', 64)->index(); + $table->string('identifier', 80)->index(); + $table->string('slug', 80)->index()->unique(); + $table->string('description')->nullable(); + + $table->text('settings')->nullable(); + $table->unsignedTinyInteger('pos')->default(0); + + $table->boolean('active')->default(true); + + $table->timestamps(); + $table->softDeletes(); + + + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::connection('mysql_stern')->dropIfExists('i_q_content_trees'); + } +} diff --git a/database/migrations/2019_07_19_155853_create_i_q_content_tree_nodes_table.php b/database/migrations/2019_07_19_155853_create_i_q_content_tree_nodes_table.php new file mode 100644 index 0000000..5e06c92 --- /dev/null +++ b/database/migrations/2019_07_19_155853_create_i_q_content_tree_nodes_table.php @@ -0,0 +1,67 @@ +create('i_q_content_tree_nodes', function (Blueprint $table) { + $table->bigIncrements('id'); + + //from tree + $table->unsignedBigInteger('tree_id'); + + //parent node + $table->unsignedBigInteger('parent_id')->index()->nullable(); + $table->unsignedTinyInteger('lvl')->index()->default(0); + + //used site + // $table->unsignedBigInteger('site_id'); + + $table->string('name', 64)->index(); + $table->string('identifier', 80)->index(); + $table->string('slug', 80)->index()->unique(); + $table->string('description')->nullable(); + + $table->text('settings')->nullable(); + $table->unsignedTinyInteger('pos')->default(0); + + $table->boolean('active')->default(true); + + $table->timestamps(); + $table->softDeletes(); + + + $table->foreign('tree_id') + ->references('id') + ->on('i_q_content_trees'); + + $table->foreign('parent_id') + ->references('id') + ->on('i_q_content_tree_nodes'); + + /*$table->foreign('site_id') + ->references('id') + ->on('i_q_content_sites'); + */ + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::connection('mysql_stern')->dropIfExists('i_q_content_tree_nodes'); + } +} diff --git a/public/css/application.css b/public/css/application.css index 0182942..dd4ffe7 100644 --- a/public/css/application.css +++ b/public/css/application.css @@ -97,4 +97,106 @@ margin: 0; } +/* Custom drag handle */ +.dd-custom-drag-handle .dd-handle { + border: 0; + float: left; + margin: 1px; + font-size: 0.9rem; + line-height: 1.25rem; +} +.dd-custom-drag-handle .dd-handle>* { + vertical-align: middle; +} +[dir=rtl] .dd-custom-drag-handle .dd-handle { + float: right; +} +.dd-item > button:before { + content: '\f284'; + +} +.dd-item > button[data-action="collapse"]:before { + content: '\f280'; +} +.dd-item > button { + display: inline-block; + font-size: 1.4rem; + text-transform: none; + font-weight: normal; + font-style: normal; + font-variant: normal; + font-family: "Ionicons"; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + speak: none; + text-rendering: auto +} +.alert ul { + margin-bottom: 0; +} + +.dragula-example { + margin-bottom: 6px; + border: 1px dotted #d6d6d6; +} + +.sortable-example { + margin: 0; + padding: 0; +} + +.sortable-example li { + padding: 6px 10px; + margin-bottom: 8px; + list-style: none; +} + +.sortable-example-inline li { + margin-right: 8px; + display: inline-block; +} + +[dir=rtl] .sortable-example-inline li { + margin-right: 0; + margin-left: 8px; +} + +#sortable-3 { + width: 220px; +} + +#sortable-3 img { + margin-right: 8px; + margin-bottom: 8px; + width: 100px; + height: 100px; + border-radius: 999px; + display: block; + float: left; +} + +.card-header { + border-bottom: 1px solid rgba(115, 113, 150, 0.50); + +} + +.modal-header { + padding-bottom: 10px; + border-bottom: 1px solid rgba(115, 113, 150, 0.50); + +} +.modal-footer { + padding-top: 10px; + border-top: 1px solid rgba(115, 113, 150, 0.50); + +} + + +@media (min-width: 768px) { + .default-style .messages-sidebox.large { + -ms-flex-preferred-size: 23rem; + flex-basis: 23rem; + } +} \ No newline at end of file diff --git a/public/js/custom.js b/public/js/custom.js index 16c8f96..b35590d 100644 --- a/public/js/custom.js +++ b/public/js/custom.js @@ -1,6 +1,129 @@ +// Nestable +$('.iq-save-bar').closest('form').find(':input, select, textarea').change(function() { + showIqSaveBar($(this).closest('form')); +}); + +$('.iq-save-bar').closest('form').find(':input, select, textarea').keydown(function() { + showIqSaveBar($(this).closest('form')); +}); + + +function showIqSaveBar(form){ + if(!$(form).data('save-bar')){ + $(form).find('.iq-save-bar').show(300); + $(form).data('save-bar', 1) + } +} + +$(function() { + if($('#netstable-content-tree').length){ + + function updateNetstableOutput(e) { + + var list = e.length ? e : $(e.target); + var output = list.data('output'); + + output.val(window.JSON ? window.JSON.stringify(list.nestable('serialize')) : + 'JSON browser support required for this demo.'); + }; + + $('#netstable-content-tree').nestable(); + + $('#netstable-content-tree').nestable().on('change', function(){ + showIqSaveBar($('#netstable-content-tree').closest('form')); + updateNetstableOutput($('#netstable-content-tree')); + }); + + // output initial serialised data + updateNetstableOutput($('#netstable-content-tree').data('output', $('#nestable-output'))); + + $('#nestable-menu-collapse').on('click', function(e) { + $('.dd').nestable('collapseAll'); + }); + $('#nestable-menu-expand').on('click', function(e) { + $('.dd').nestable('expandAll'); + }); + } +}); + +$(function() { + // Drag handle + dragula([$('#dragula-drag-handles')[0]], { + moves: function (el, container, handle) { + showIqSaveBar(el.closest('form')); + return handle.classList.contains('handle'); + }, + }); +}); + $(function () { - // $('.selectpicker').selectpicker(); - // $('[data-toggle="tooltip"]').tooltip(); + function initModalInner() { + $('[data-toggle="reloadModal"]').off().on('click', function(event) { + event.preventDefault(); + button = $(this); + var data = {}; + data.id = button.data('id'); + data.model = button.data('model'); + data.action = button.data('action'); + data.request = button.data('request'); + data.route = button.data('route'); + data.target = button.data('target'); + console.log(data); + loadModalInner(this, data); + }); + + } + function loadModalInner(self, data){ + + var url = data.route, + contentType = 'application/x-www-form-urlencoded; charset=UTF-8'; + $.ajax({ + url: url, + data: data, + type: "POST", + dataType: "json", + cache: false, + contentType: contentType, + encode: true, + headers: { + 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') + }, + success: function(data) { + console.log(data); + $(data.response.target).find('.modal-dialog').html(data.html); + $('.selectpicker').selectpicker('refresh'); + initModalInner(); + }, + error: function(xhr, status, errorThrown) { + console.log(xhr); + console.log(xhr.responseText); + console.log(errorThrown); + console.log("Sorry, there was a problem!"); + } + }); + return false; + } + + + + + + $('#modals-load-content').on('show.bs.modal', function (event) { + var button = $(event.relatedTarget); + if (!button.data('id')) { + return; + } + var data = {}; + data.id = button.data('id'); + data.model = button.data('model'); + data.action = button.data('action'); + data.request = button.data('request'); + data.route = button.data('route'); + data.target = button.data('target'); + console.log(data); + loadModalInner(this, data); + + }); }); function update_modal_data_show(e, $ele) { @@ -115,171 +238,3 @@ $(function() { }); }); -/* -$(function() { - $('.select2-main').each(function() { - $(this) - .wrap('
') - .select2({ - placeholder: 'Bitte wählen', - dropdownParent: $(this).parent(), - }); - }) - $('.select2-sub').each(function() { - $(this) - .wrap('
') - .select2({ - placeholder: 'Bitte wählen', - dropdownParent: $(this).parent(), - closeOnSelect: false - }); - }) -}); -*/ -/* -jQuery(document).ready(function() { - - $('.main-branch').on('change', function () { - - target = $(this).data('target'); - if ($(this).is(':checked')) { - $(target).stop().show('slow'); - } else { - $(target).stop().hide('slow'); - $(target).find('.custom-control-input').prop('checked', false); - } - }); - - var $form = $('#lead-form-validation'); - if($form.find('#company_country_id').length){ - $form.find('#company_country_id').on('change', function(){ - $form.find('#company_pre_phone_id').val($(this).val()); - $form.find('#company_pre_phone_id').selectpicker('refresh'); - }); - } - - if($form.find('#country_id').length){ - $form.find('#country_id').on('change', function(){ - $form.find('#pre_phone_id').val($(this).val()); - $form.find('#pre_phone_id').selectpicker('refresh'); - - $form.find('#pre_mobil_id').val($(this).val()); - $form.find('#pre_mobil_id').selectpicker('refresh'); - }); - } - - - -}); -*/ - -/* -function trigger_company($ele, $speed){ - if($ele.val() == 1){ - $('.show_company_holder').show($speed); - $('.show_company_holder').find('#company_name').prop('required', true); - $('.show_company_holder').find('#company_country_id').prop('required', true); - - }else{ - $('.show_company_holder').hide($speed); - $('.show_company_holder').find('#company_name').prop('required', false); - $('.show_company_holder').find('#company_country_id').prop('required', false); - } - } - - $( document ).ready(function() { - - // With validation - var $form = $('#lead-form-validation'); - $form.find('#company').on('change', function () { - trigger_company($(this), 'slow'); - }); - - trigger_company($form.find('#company'), 0); - - // Set up validator - $form.validate({ - rules: { - 'email': { - required: true, - email: true, - remote: - { - url: "{{ route('user_check_mail') }}", - type: "post", - data: - { - user_id: function() - { - return $('#lead-form-validation :input[name="user_id"]').val(); - }, - email: function() - { - return $('#lead-form-validation :input[name="email"]').val(); - } - }, - encode: true, - headers: { - 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') - }, - } - }, - 'email-confirm': { - required: true, - equalTo: "#email" - }, - 'accepted_data_protection': { - required: true - }, - }, - errorPlacement: function errorPlacement(error, element) { - $(element).parents('.form-group').append( - error.addClass('invalid-feedback small d-block') - ) - }, - highlight: function (element) { - if ($(element).hasClass('selectpicker')) { - $(element).parent().addClass('is-invalid'); - } - $(element).addClass('is-invalid'); - }, - unhighlight: function (element) { - $(element).removeClass('is-invalid'); - $(element).parents('.form-group').find('.is-invalid').removeClass('is-invalid'); - }, - messages : { - required: "{{__('This field is required.')}}", - company_country_id : { - required: "{{__('This field is required.')}}", - }, - accepted_data_protection : { - required: "{{__('This field is required.')}}", - }, - salutation : { - required: "{{__('This field is required.')}}", - }, - company_name : { - required: "{{__('This field is required.')}}", - }, - last_name : { - required: "{{__('This field is required.')}}", - }, - equalTo : "{{__('Please enter the same value again.')}}", - 'email-confirm' : { - equalTo : "{{__('Please enter the same value again.')}}", - required: "{{__('This field is required.')}}", - }, - email: { - required : "{{__('This field is required.')}}", - email: "{{ __('Please enter a valid email address.') }}", - remote : "{{ __('This E-mail is already in use.') }}" - }, - }, - onkeyup: false - }); - - - - - }); - */ \ No newline at end of file diff --git a/resources/views/cms/travel_guide/detail.blade.php b/resources/views/cms/travel_guide/detail.blade.php index f26e32e..89c939a 100755 --- a/resources/views/cms/travel_guide/detail.blade.php +++ b/resources/views/cms/travel_guide/detail.blade.php @@ -74,6 +74,10 @@
+
+ + {{ Form::text('keyword', $travel_guide->keyword, array('placeholder'=>__('Keyword'), 'class'=>'form-control', 'id'=>'travel_guide_keyword')) }} +
{{ Form::text('meta_title', $travel_guide->meta_title, array('placeholder'=>__('meta_title'), 'class'=>'form-control', 'id'=>'travel_guide_meta_title')) }} diff --git a/resources/views/cms/travel_guide/tree-detail.blade.php b/resources/views/cms/travel_guide/tree-detail.blade.php new file mode 100755 index 0000000..af22062 --- /dev/null +++ b/resources/views/cms/travel_guide/tree-detail.blade.php @@ -0,0 +1,276 @@ +@extends('layouts.layout-2') + +@section('content') + + @if ($errors->any()) +
+
+
+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
+
+
+ @endif + + + +

+ Reiseführer Tree @if($id == "new") anlegen @else {{"(".$model->name.")"}} verwalten @endif + +
+ {{ __('repair') }} +
+ +

+ +
+ + +
+
+ +
+ +
+
+
+ +
+ × +
+
+
+ +
+ {!! Form::open(['url' => route('iq_content_tree_detail', [$model->id]), 'class' => '']) !!} + + + +
+
+ + +
+ +
+
+
{{$model->name}} + +
+
+ {!! \App\Services\HTMLTreeHelper::makeNestableList($model, ($tree_node ? $tree_node->id : false)) !!} +
+
+ {!! Form::close() !!} +
+ +
+ + +
+ @if($tree_node) + + {!! Form::open(['url' => route('iq_content_tree_detail', [$model->id, $tree_node->id, ($area_section? $area_section->id : '')]), 'class' => '']) !!} +
+
+ +
+ +
+
+
+
+ +
+ + @if(!$site_fields) +
+ + + + +
+
+ +
+ {{ Form::text('uri', $tree_node->getUri(), array('readonly'=>true, 'class'=>'form-control')) }} +
+
+
+ + + {{ Form::text('name', $tree_node->name, array('placeholder'=>'', 'class'=>'form-control', 'required'=>'true')) }} +
+
+
+
+ + + + + @if($tree_node->travel_guides) + + + + + + + + + + + + + + @foreach($tree_node->travel_guides as $travel_guide) + + + + + + + + + @endforeach + +
 {{__('Name')}}{{__('Keyword')}}{{__('Langer Text')}}{{__('sichtbar')}}#
+ + + + {{$travel_guide->name}}{{$travel_guide->keyword}} @if($travel_guide->scope) + + @else + + @endif + + @if($travel_guide->active) + + @else + + @endif + + +
+ @endif + + {{----}} +
+
+
+
+ + {{ Form::text('identifier', $tree_node->identifier, array('placeholder'=>'', 'class'=>'form-control')) }} +
+
+
+ + {{ Form::textarea('description', $tree_node->description, array('class'=>'form-control', 'rows'=>2)) }} +
+
+ @else +
+ @foreach($site_fields as $key => $site_field) +
+ + + + + +
+ + + {{ $site_field->iq_content_model_field->name }} + {{ $site_field->iq_content_model_field->identifier }} +
+ {!! get_switcher_input($site_field->active, 'iq_content_site_field['.$key.'][active]') !!} + +
+
+
+ @if($site_field->field == "string") + {{ Form::text('iq_content_site_field['.$key.'][content]', $site_field->content, array('class'=>'form-control')) }} + @endif + @if($site_field->field == "text") + @if($site_field->settings['editor'] == 'off') + {{ Form::textarea('iq_content_site_field['.$key.'][content]', $site_field->content , ['class' => 'form-control']) }} + @else + {{ Form::textarea('iq_content_site_field['.$key.'][content]', $site_field->content , ['class' => 'form-control summernote']) }} + @endif + @endif + @if($site_field->field == "media") + {{ Form::text('iq_content_site_field['.$key.'][content]', $site_field->content, array('class'=>'form-control')) }} + @endif +
+ {{ $site_field->iq_content_model_field->fieldAsName() }} +
+ {!! get_switcher_input($site_field->search, 'iq_content_site_field['.$key.'][search]') !!} +
+
+
+ @endforeach +
+ @endif +
+ {!! Form::close() !!} + + + @endif + +
+ +
+
+ +@endsection \ No newline at end of file diff --git a/resources/views/cms/travel_guide/tree.blade.php b/resources/views/cms/travel_guide/tree.blade.php new file mode 100755 index 0000000..4f6a8f8 --- /dev/null +++ b/resources/views/cms/travel_guide/tree.blade.php @@ -0,0 +1,90 @@ +@extends('layouts.layout-2') + +@section('content') + +

+ Reiseführer Trees +

+
+
+ + +
+ +
+
+ + +
+
+ +
+ + + + + + + + + + + + + + + @foreach($models as $model) + + + + + + + + + + @endforeach + +
#NameIdentifierDescriptionNodes(s)UpdatedStatus
+ + + + {{ $model->name }}{{ $model->identifier }}{{ $model->description }}{{ $model->iq_content_tree_nodes->count() }}{{ $model->updated_at->format("d/m/Y") }}{!! get_active_badge($model->active) !!}
+
+
+ + + +
+ +
Tree
+
+
+
+ +
+ × +
+
+ +
Filter
+
+ +
+ All +
+
{{ count($models) }}
+ +
+
+
+ +
+
+@endsection + diff --git a/resources/views/emails/___auth.blade.php b/resources/views/emails/___auth.blade.php new file mode 100644 index 0000000..bddcb51 --- /dev/null +++ b/resources/views/emails/___auth.blade.php @@ -0,0 +1,237 @@ + + + + + + mein STERN TOURS + + + + + + + + + + + + +
+ {{ $copy1line }} +
+ + + + + +
+
+
+ + + + +
+ + + + +
+
+ + + + + + + + + +
+ + STERN TOURS + + +

+
+
+ + + + + + + + + + + + + +
+

+ {{ $salutation }} +
+
+ + + + +
+
+ {{ $copy1line }} +
+
+
+
+
+
+ + + + + + +
+ + + + + + +
+

+ {{ $button }} +

+
+
+
+
+ + + + + + + +
+
+ {{ $copy2line }}
+ {{ $url }} +

+ {{ $greetings }}
Ihr Team von STERN TOURS +
+
+

+
+ +
+ + + + + + + +
+
+ STERN TOURS GmbH | Emser Straße 3 | 10719 Berlin
+ Tel: +49 (0) 30 700 94 100 | Fax: +49 (0) 30 700 94 1044 | stern@sterntours.de
+
+ www.sterntours.de +
+
+ Geschäftsführer: Thomas Stern | Registergericht: Amtsgericht Charlottenburg | Registernummer: HRB 67111
+ Steuernummer: 27/545/30703 | UST-Ident.-Nr.: DE192609253 | Finanzamt: Wilmersdorf
+ Datenschutzerklärung
+ © 2018 All Rights Reserved
+
+
+
+
+
+ + diff --git a/resources/views/emails/_auth.blade.php b/resources/views/emails/_auth.blade.php index 72eb046..3a6c12d 100644 --- a/resources/views/emails/_auth.blade.php +++ b/resources/views/emails/_auth.blade.php @@ -1,214 +1,766 @@ - - - - - - STERN TOURS - - - - - - - - - - - - - - - +
+ - -
-
- - - - -
+ + + + + - -
- - - - -
-
- STERN TOURS -
-
-
- - - - - - - - - - - - - -
-

- {{ $salutation }} -
-
- - - - -
-
- {{ $copy1line }} -
-
-
-
-
- - {{ $button }} - -
-
-
- - - + + +
-
- {{ $copy2line }}
- {{ $url }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + +
  +
Wenn diese Nachricht nicht korrekt angezeigt wird, klicken Sie +bitte hier +
  +
+
  +
 Telekom - Erleben, was verbindet. 
 
   
 

+ HERZLICH WILLKOMMEN BEI MAIL S FÜR KUNDEN DER TELEKOM

 
 
 

+ Hallo Herr Adametz,

 
 
 

+ Herzlich Willkommen bei Telekom Mail S!

Mail S ist der kostenlose + E-Mail-Dienst für Kunden der Telekom und + bietet Ihnen exklusive Produktvorteile – egal ob auf dem + Smartphone, Tablet oder Computer.

Mit Sync-Plus haben Sie Ihre E-Mails, + Kontakte und Termine immer + dort verfügbar, wo Sie sie brauchen. Richten + Sie Sync-Plus am besten gleich ein!

Für Ihre Ablage senden wir + Ihnen die Informationen, die Sie uns + während der Registrierung mitgeteilt haben:

 
  +
  + + + + + + + + + + + + + + +
  +
  + + + + + + + + + + + + + + + + + + + + + +
+ Name: + + Kevin Adametz +
  +
+ E-Mail-Adresse: + kevin.adametz@t-online.de +
  +
+ Gebuchter Dienst: + + Mail S
+ 		 
  +
+ 		 
  +
 

+ Ihre gebuchten Produkte und Services können Sie jederzeit im Kundencenter + ändern. Verwalten Sie in den Anmeldeeinstellungen + bequem Ihre Benutzerdaten und Passwörter.

+

+ Wir wünschen Ihnen viel Spaß mit Mail S
Ihre Telekom +

 
 
   
 

+ So kommen Sie zu E-Mail!

 
   
  + + + + + + +
+ + + + + + + + + + + + + + + + +
 

+ Rufen Sie Ihr E-Mail-Postfach von zu Hause über Ihren + Internet-Browser auf.

  +
Zum + E-Mail Center
+
+ + + + + + +
+ + + + + + + + + + + + + + + + +
 

+ Nutzen Sie E-Mail mit der Telekom Mail App auch + unterwegs auf Ihrem + Smartphone oder Tablet.

  +
+ + + + + + +
+
+ + + + + + +
+
+
+
+ 		 
 
  + + + + + + +
+ + + + + + + + + + + + + + + + +
 

+ Sie nutzen ein E-Mail-Programm wie z. B. Outlook oder + Thunderbird? + Richten Sie sich dieses hier ein.

  +
Jetzt + einrichten
+
+ + + + + + +
+ + + + + + + + + + + + + + + + +
 

+ Mit Sync-Plus haben Sie Ihre E-Mails, Kontakte und + Termine immer + dort verfügbar, wo Sie sie brauchen.

  +
Sync-Plus + einrichten
+
+ 		 
 
   
 

+ Alles für den erfolgreichen Start!

 
   
  + + + + + + +
+ + + + + + + + +
 

+ Verbinden Sie E-Mail Postfächer von anderen + E-Mail-Anbietern mit + Ihrem Telekom Mail Postfach.
E-Mail + Postfach verbinden.

+
+ + + + + + +
+ + + + + + + + +
 

+ Konfigurieren Sie die individuelle Speicherdauer + Ihrer E-Mails jederzeit und bequem im E-Mail Center.

+
+
+ 		 
 
  + + + + + + + + + + + + + + +
  +
+ + + + + + +
+ + + + + + + + +
 

+ Alles rund um unser E-Mail Center finden Sie + in unserem praktischen
E-Mail-Handbuch + im PDF-Format zum Herunterladen.

+
+
  +
+ 		 
 
  + + + + + + + + + + + + +
Kundencenter +
+ + + + + + + + + + + + +
E-Mail-Hilfe +
+ + + + + + + + + + + + +
MagentaCLOUD +
+ + + + + + + + + + + + + + + +
T-Online.de +
+ 		 
  +
   
  + + + + + + + + +
 

+ E-Mail made in Germany

+ 		 
  +
  + + + + + + +

+ © Telekom Deutschland GmbH

+ + + + + + +
+ Hilfe  |   + Kontakt  |   + Pflichtangaben +
+ 		 
 
+
-

- {{ $greetings }}
Ihr Team von STERN TOURS -
-
-
-
- - -
- - - - - - - - -
-
- STERN TOURS GmbH | Emser Straße 3 | 10719 Berlin
- Tel: +49 (0) 30 700 94 100 | Fax: +49 (0) 30 700 94 1044 | stern@sterntours.de
-
- www.sterntours.de -
-
-
- Geschäftsführer: Thomas Stern | Registergericht: Amtsgericht Charlottenburg | Registernummer: HRB 67111
- Steuernummer: 27/545/30703 | UST-Ident.-Nr.: DE192609253 | Finanzamt: Wilmersdorf
- © 2018 All Rights Reserved -
-
-
-
-
- - + +   + + + \ No newline at end of file diff --git a/resources/views/emails/auth.blade.php b/resources/views/emails/auth.blade.php index 197a1c5..c310e01 100644 --- a/resources/views/emails/auth.blade.php +++ b/resources/views/emails/auth.blade.php @@ -1,5 +1,5 @@ +"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -7,7 +7,6 @@ mein STERN TOURS - - - - - - - diff --git a/resources/views/emails/auth_plain.blade.php b/resources/views/emails/auth_plain.blade.php new file mode 100644 index 0000000..496d259 --- /dev/null +++ b/resources/views/emails/auth_plain.blade.php @@ -0,0 +1,31 @@ +{{ $salutation }} + +{{ $copy1line }} + +{{ $url }} + +{{ $copy2line }} + +{{ $url }} +{{ $greetings }} + +Ihr Team von STERN TOURS + + +--------------- +--------------- + +STERN TOURS GmbH +Emser Straße 3 +10719 Berlin +Tel: +49 (0) 30 700 94 100 +Fax: +49 (0) 30 700 94 1044 +stern@sterntours.de +www.sterntours.de + +--------------- + +Geschäftsführer: Thomas Stern | Registergericht: Amtsgericht Charlottenburg | Registernummer: HRB 67111 +Steuernummer: 27/545/30703 | UST-Ident.-Nr.: DE192609253 | Finanzamt: Wilmersdorf +Datenschutzerklärung +{{route('data_protected')}} \ No newline at end of file diff --git a/resources/views/emails/content.blade.php b/resources/views/emails/content.blade.php index e110947..16e28fb 100644 --- a/resources/views/emails/content.blade.php +++ b/resources/views/emails/content.blade.php @@ -5,40 +5,33 @@ mein STERN TOURS - - - - - - - - diff --git a/resources/views/emails/info.blade.php b/resources/views/emails/info.blade.php index ffde2bd..dd12233 100644 --- a/resources/views/emails/info.blade.php +++ b/resources/views/emails/info.blade.php @@ -7,7 +7,6 @@ mein STERN TOURS - - - - - diff --git a/resources/views/emails/invoice.blade.php b/resources/views/emails/invoice.blade.php index 22a0b6a..d200e52 100644 --- a/resources/views/emails/invoice.blade.php +++ b/resources/views/emails/invoice.blade.php @@ -5,31 +5,25 @@ mein STERN TOURS - - - - - - - - diff --git a/resources/views/iq/modal/content.blade.php b/resources/views/iq/modal/content.blade.php new file mode 100644 index 0000000..6e2c863 --- /dev/null +++ b/resources/views/iq/modal/content.blade.php @@ -0,0 +1,44 @@ +{!! Form::open(['url' => $url, 'class' => 'modal-content']) !!} + + + + + +
+
+ {{$data['title']}} +
+ +
+
+ +
+
+ + + {{ Form::text('name', $value->name, array('placeholder'=>'', 'class'=>'form-control', 'required'=>'true')) }} +
+
+ +
+
+ + {{ Form::text('identifier', $value->identifier, array('placeholder'=>'', 'class'=>'form-control')) }} +
+
+ +
+ + {{ Form::textarea('description', $value->description, array('class'=>'form-control', 'rows'=>2)) }} +
+ +
+
+ + +
+{!! Form::close() !!} + diff --git a/resources/views/iq/modal/site.blade.php b/resources/views/iq/modal/site.blade.php new file mode 100644 index 0000000..cb5a511 --- /dev/null +++ b/resources/views/iq/modal/site.blade.php @@ -0,0 +1,32 @@ +{!! Form::open(['url' => $url, 'class' => 'modal-content']) !!} + + + + + +
+
+ {{$data['title']}} +
+ +
+
+ + @if(!$data['request']) +
+
+ + +
+
+ @endif +
+
+ + +
+{!! Form::close() !!} + diff --git a/resources/views/iq/modal/tree-node.blade.php b/resources/views/iq/modal/tree-node.blade.php new file mode 100644 index 0000000..96b1a8b --- /dev/null +++ b/resources/views/iq/modal/tree-node.blade.php @@ -0,0 +1,45 @@ +{!! Form::open(['url' => $url, 'class' => 'modal-content']) !!} + + + + + + +
+
+ {{$data['title']}} +
+ +
+
+ +
+
+ + + {{ Form::text('name', $value->name, array('placeholder'=>'', 'class'=>'form-control', 'required'=>'true')) }} +
+
+ +
+
+ + {{ Form::text('identifier', $value->identifier, array('placeholder'=>'', 'class'=>'form-control')) }} +
+
+ +
+ + {{ Form::textarea('description', $value->description, array('class'=>'form-control', 'rows'=>2)) }} +
+ +
+
+ + +
+{!! Form::close() !!} + diff --git a/resources/views/layouts/application.blade.php b/resources/views/layouts/application.blade.php index e15dfa0..88e7247 100755 --- a/resources/views/layouts/application.blade.php +++ b/resources/views/layouts/application.blade.php @@ -39,6 +39,11 @@ + + + + + @@ -66,6 +71,12 @@ border: 1px solid rgba(24, 28, 33, 0.20); } + .dd-content-link { + overflow: hidden; + white-space: nowrap; + display: inline-block; + max-width: 7rem; + } @@ -106,6 +117,12 @@ @yield('layout-content') +
+
+ +
+
+ @@ -122,6 +139,7 @@ + diff --git a/resources/views/layouts/includes/layout-sidenav.blade.php b/resources/views/layouts/includes/layout-sidenav.blade.php index d436356..72d7629 100755 --- a/resources/views/layouts/includes/layout-sidenav.blade.php +++ b/resources/views/layouts/includes/layout-sidenav.blade.php @@ -125,12 +125,17 @@ @endif @if(Auth::user()->isPermission('cms-tg')) -
  • +
  • Reiseführer
      +
    • +
      Reiseführer Tree
       +
      • + +
    • Reiseführer Seiten
      • diff --git a/routes/web.php b/routes/web.php index 8bc6f0b..158dd0a 100755 --- a/routes/web.php +++ b/routes/web.php @@ -134,6 +134,17 @@ Route::group(['middleware' => ['auth']], function() Route::group(['middleware' => ['admin']], function() { + Route::post('/iq/content/modal/load', 'IQ\ContentModalController@load')->name('iq_content_modal_load'); + //trees + Route::get('/iq/content/tree/index', 'IQ\ContentTreeController@index')->name('iq_content_tree_index'); + Route::get('/iq/content/tree/detail/{id}/{node_id?}/{area_section_id?}', 'IQ\ContentTreeController@detail')->name('iq_content_tree_detail'); + Route::post('/iq/content/tree/detail/{id}/{node_id?}/{area_section_id?}', 'IQ\ContentTreeController@store')->name('iq_content_tree_detail'); + Route::get('/iq/content/tree/detail/remove/{id}/{node_id}/{travel_guide_id}', 'IQ\ContentTreeController@remove')->name('iq_content_tree_detail_remove'); + + + Route::get('/iq/content/tree/repair/{id}', 'IQ\ContentTreeController@repair')->name('iq_content_tree_repair'); + + Route::group(['middleware' => ['auth.permission:crm-tp-pr']], function() { //Reiseprogramme Programme Route::get('/travel/programs/{step?}', 'TravelProgramController@index')->name('travel_programs'); @@ -211,6 +222,8 @@ Route::group(['middleware' => ['admin']], function() Route::get('/cms/travel_guide/content', 'CMS\CMSTravelGuideController@index')->name('cms_travel_guide_content'); Route::get('/cms/travel_guide/page', 'CMS\CMSTravelGuideController@page')->name('cms_travel_guide_page'); + + Route::get('/cms/travel_guide/page/detail/{id}', 'CMS\CMSTravelGuideController@pageDetail')->name('cms_travel_guide_page_detail'); Route::post('/cms/travel_guide/page/detail/{id}', 'CMS\CMSTravelGuideController@pageStore')->name('cms_travel_guide_page_detail'); @@ -291,26 +304,26 @@ Route::group(['middleware' => ['superadmin']], function() { }); -/* + use App\Mail\MailResetPassword; -Route::get('/send_test_email', function(){ - try { - $mail_bbc = config('mail.mail_bbc'); - // Mail::to('info@adametz.media')->bcc(['k.adametz@kagado.de', 'kevin.adametz@me.com'])->send(new MailResetPassword('asdasd', Auth::user())); +Route::get('/send_test_email', function() { + try { + $mail_bbc = config('mail.mail_bbc'); + // Mail::to('info@adametz.media')->bcc(['k.adametz@kagado.de', 'kevin.adametz@me.com'])->send(new MailResetPassword('asdasd', Auth::user())); - //Mail::to('kevin.adametz@me.com')->send(new MailResetPassword('asdasd', Auth::user())); + Mail::to('kevin.adametz@t-online.de')->send(new MailResetPassword('asdasd', Auth::user())); - Mail::raw('Sending emails with Mailgun and Laravel is easy!', function($message) { - $message->to('kevin.adametz@me.com', 'Kevin Adametz'); - $message->subject('testing Networktrips'); - }); - } catch (\Exception $e) { - dd($e->getMessage()); + /* Mail::raw('Sending clean email', function($message) { + $message->to('kevin.adametz@t-online.de', 'Kevin Adametz'); + $message->subject('test'); + }); + */ + } catch (\Exception $e) { + var_dump($e->getMessage()); + $fail = Mail::failures(); + dd($fail); + } +}); - $fail = Mail::failures(); - dd($fail); - if(!empty($fail)) throw new \Exception('Could not send message to '.$fail[0]); - }); -*/ diff --git a/storage/app/fewo/infos/2019/Anreiseinfo-1231433.pdf b/storage/app/fewo/infos/2019/Anreiseinfo-1231433.pdf new file mode 100644 index 0000000..f3a2f1d Binary files /dev/null and b/storage/app/fewo/infos/2019/Anreiseinfo-1231433.pdf differ diff --git a/storage/app/fewo/invoices/2019/1231433.pdf b/storage/app/fewo/invoices/2019/1231433.pdf new file mode 100644 index 0000000..59e906a Binary files /dev/null and b/storage/app/fewo/invoices/2019/1231433.pdf differ diff --git a/storage/app/fewo/invoices/2019/1234556.pdf b/storage/app/fewo/invoices/2019/1234556.pdf new file mode 100644 index 0000000..816f37d Binary files /dev/null and b/storage/app/fewo/invoices/2019/1234556.pdf differ