diff --git a/.env b/.env index 72e2ef2..b3b80ff 100755 --- a/.env +++ b/.env @@ -13,6 +13,8 @@ APP_URL_STERN=http://sterntours.local LOG_CHANNEL=stack + + #DB_CONNECTION=mysql #DB_HOST=localhost #DB_PORT=3306 @@ -46,14 +48,16 @@ REDIS_HOST=127.0.0.1 REDIS_PASSWORD=null REDIS_PORT=6379 -#info@@mein.sterntours.de -#B7f8Ojt98v6tMz8W + +MAIL_BBC=info@adametz.media +#MAIL_BBC=info@sterntours.de MAIL_DRIVER=smtp -MAIL_HOST=w00df904.kasserver.com +MAIL_HOST=mail.your-server.de MAIL_PORT=587 -MAIL_USERNAME=m0479305 -MAIL_PASSWORD=m4CowydxoC4dY2DB -MAIL_ENCRYPTION=null +MAIL_USERNAME=info@mein.sterntours.de +MAIL_PASSWORD=B7f8Ojt98v6tMz8W +MAIL_ENCRYPTION=TLS + PUSHER_APP_ID= PUSHER_APP_KEY= diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5c1b8ec..86b7a8e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,47 +2,41 @@ - - - - - - - - - - - - + + + + + + + - - - - - - - - + + - - + - - - - - - - + + + - - + + + + + + + + + + + + - + @@ -92,36 +86,10 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -129,20 +97,32 @@ - - + + - + - + - - + + + + + + + + + + + + + + @@ -150,8 +130,8 @@ - - + + @@ -160,20 +140,11 @@ - slug - feed - reques - book - c - right - change - checked modal selec sele Arrangement Validator - unique live last_data array @@ -190,19 +161,29 @@ We have data register Your re + unique + confirm + Mail:: + confo + getInvoiceLastModified + invoices_fewo + invoices_fewo + stora + invoices $PROJECT_DIR$/database/migrations - $PROJECT_DIR$ $PROJECT_DIR$/app/Http/Controllers $PROJECT_DIR$/resources/assets - $PROJECT_DIR$/resources/views - $PROJECT_DIR$/app $PROJECT_DIR$/app/Models $PROJECT_DIR$/resources + $PROJECT_DIR$/resources/views + $PROJECT_DIR$/app/Http + $PROJECT_DIR$/app + $PROJECT_DIR$ @@ -220,35 +201,9 @@ @@ -391,10 +372,10 @@ - @@ -402,7 +383,6 @@ - @@ -434,14 +414,7 @@ - - - - - - - - + @@ -453,7 +426,7 @@ - + @@ -474,25 +447,55 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -500,31 +503,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @include('admin.user_form') diff --git a/resources/views/cms/content/modal.blade.php b/resources/views/cms/content/modal.blade.php index 95ed750..ef493d5 100755 --- a/resources/views/cms/content/modal.blade.php +++ b/resources/views/cms/content/modal.blade.php @@ -56,6 +56,13 @@ +
+
+ + {{ Form::text('slug', $value->slug, array('class'=>'form-control', 'readonly')) }} +
+
+
diff --git a/resources/views/cms/feedback/detail.blade.php b/resources/views/cms/feedback/detail.blade.php index 2ff8c7e..15231ce 100755 --- a/resources/views/cms/feedback/detail.blade.php +++ b/resources/views/cms/feedback/detail.blade.php @@ -2,11 +2,18 @@ @section('content') -

- Feedback verwalten -

{!! Form::open(['url' => route('cms_feedback_detail', [$id]), 'class' => 'form-horizontal']) !!} + +

+ Feedback @if($id == "new") anlegen @else {{"(ID: ".$id.")"}} verwalten @endif +
+   + {{ __('back') }} +
+

+
+ diff --git a/resources/views/cms/sidebar/detail.blade.php b/resources/views/cms/sidebar/detail.blade.php index 8166dd9..cfd55b5 100755 --- a/resources/views/cms/sidebar/detail.blade.php +++ b/resources/views/cms/sidebar/detail.blade.php @@ -2,11 +2,19 @@ @section('content') -

- Sidebar Widget verwalten -

+ {!! Form::open(['url' => route('cms_sidebar_detail', [$id]), 'class' => 'form-horizontal']) !!} + +

+ Sidebar Widget @if($id == "new") anlegen @else {{"(ID: ".$id.")"}} verwalten @endif +
+   + {{ __('back') }} +
+

+
+ diff --git a/resources/views/cms/travel_magazine/detail.blade.php b/resources/views/cms/travel_magazine/detail.blade.php index f4e9aa2..6bc6bc9 100755 --- a/resources/views/cms/travel_magazine/detail.blade.php +++ b/resources/views/cms/travel_magazine/detail.blade.php @@ -19,11 +19,19 @@
@endif -

- Reiseführer verwalten -

+ {!! Form::open(['url' => route('cms_travel_magazine_detail', [$id]), 'class' => 'form-horizontal']) !!} + +

+ Reiseführer @if($id == "new") anlegen @else {{"(ID: ".$id.")"}} verwalten @endif +
+   + {{ __('back') }} +
+

+
+ diff --git a/resources/views/drafts/detail.blade.php b/resources/views/drafts/detail.blade.php index 38a9f4f..4f93b97 100755 --- a/resources/views/drafts/detail.blade.php +++ b/resources/views/drafts/detail.blade.php @@ -102,8 +102,8 @@ @if(count($draft->draft_items)) @php($i = 1)
-   - {{ __('back') }} +   + {{ __('back') }}
@@ -287,7 +287,6 @@
-
  {{ __('back') }} diff --git a/resources/views/emails/auth.blade.php b/resources/views/emails/auth.blade.php index ae573b1..197a1c5 100644 --- a/resources/views/emails/auth.blade.php +++ b/resources/views/emails/auth.blade.php @@ -109,7 +109,6 @@ - +
- @@ -133,7 +132,6 @@
@@ -119,7 +118,7 @@
- STERN TOURS + STERN TOURS
- @@ -181,7 +179,7 @@
@@ -206,9 +204,7 @@
- - - diff --git a/resources/views/pdf/travel_info_fewo.blade.php b/resources/views/pdf/travel_info_fewo.blade.php new file mode 100644 index 0000000..8e1ceba --- /dev/null +++ b/resources/views/pdf/travel_info_fewo.blade.php @@ -0,0 +1,207 @@ + + + + + + + {!! Html::style('css/invoice_fewo_pdf.css') !!} + + + +{{-- +
+ +
+ --}} +
+ +
+ +
+
STERN TOURS GmbH • Emser Str. 3 • 10719 Berlin
+ {!! nl2br($model->getBookingUserAddress()) !!} +
+ +
+ Berlin, den {!! date("d.m.Y") !!} +
+ +
+ Anreiseinfo Nr. {{$model->invoice_number}} +
+ + +
+

{!! nl2br($travel_info_user_text) !!}

+
+ +
diff --git a/resources/views/emails/content.blade.php b/resources/views/emails/content.blade.php new file mode 100644 index 0000000..5595660 --- /dev/null +++ b/resources/views/emails/content.blade.php @@ -0,0 +1,181 @@ + + + + + + mein STERN TOURS + + + + + + + + + + + + +
+ {{ $content }} +
+ + + + + +
+
+
+ + + + +
+ + + + +
+
+ + + + + + + + + +
+ + STERN TOURS + + +

+
+
+ + + + +
+ + + + +
+
+ {!! nl2br($content) !!} +
+
+
+ + + + + + + +
+
+ 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/info.blade.php b/resources/views/emails/info.blade.php new file mode 100644 index 0000000..ffde2bd --- /dev/null +++ b/resources/views/emails/info.blade.php @@ -0,0 +1,178 @@ + + + + + + mein STERN TOURS + + + + + + + + + + + + +
+ {{ $copy1line }} +
+ + + + + +
+
+
+ + + + +
+ + + + +
+
+ + + + + + + + + +
+ + STERN TOURS + +

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

{!! nl2br($copy1line) !!}

+
+
+ + + + + + + +
+
+ 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/invoice.blade.php b/resources/views/emails/invoice.blade.php new file mode 100644 index 0000000..d3bab65 --- /dev/null +++ b/resources/views/emails/invoice.blade.php @@ -0,0 +1,268 @@ + + + + + + mein STERN TOURS + + + + + + + + + + + + +
+ {{ $copy1line }} +
+ + + + + +
+
+
+ + + + +
+ + + + +
+
+ + + + + + + + + +
+ + STERN TOURS + +

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

{{ $copy1line }}

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ {{ __('Belegungszeitraum:') }} + + von {{$model->from_date}} bis {{$model->to_date}} +
+ {{ __('Ferienwohnung:') }} + + {!! nl2br($model->getNameAddressLocation()) !!} +
+ {{ __('Mietpreis:') }} + + {{ $model->price_travel }} € +
+ {{ __('Service-Gebühr:') }} + + {{ $model->price_service }} € +
+ {{ __('Kaution:') }} + + {{ $model->price_deposit }} € +
+ {{ __('Gesamtpreis:') }} + + {{ $model->price_total }} € +
+
+ + @if($notice && $notice != "") + + + + @endif + + + +
+

Wichtige Hinweise:
+ {!! nl2br($notice) !!}

+
+
+

Mietbedingungen und Mietbestätigung / Rechnung finden Sie als PDF im Anhang.

+

Mit dieser Buchungsbestätigung ist der Mietvertrag für Sie und uns verbindlich.

+
    +
  • eine sofort zahlungsfällige Anzahlung von 50% Mietpreis = {{ $model->getPriceTravelFirstPay() }} €
    • +
  • sowie eine Restzahlung von {{ $model->getPriceTravelSecondPay() }} € bis spätestens 4 Wochen vor Belegungsbeginn inkl. der oben genannten Kaution.
    • +
+

auf folgendes Bankkonto:
+ STERN TOURS GmbH
+ IBAN: DE83100208900018857111
+ BIC: HYVEDEMM488 +

+

Mit freundlichen Grüßen
+ 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/pdf/invoice_fewo.blade.php b/resources/views/pdf/invoice_fewo.blade.php index ec716d0..b68837b 100644 --- a/resources/views/pdf/invoice_fewo.blade.php +++ b/resources/views/pdf/invoice_fewo.blade.php @@ -167,8 +167,7 @@
- -

Sehr geehrte Damen und Herren,
+

{{$model->getUserSalutation()}},

herzlichen Dank für Ihre Online-Buchung vom {{$model->booking_date}} :

Auf Grundlage der Beschreibung der gebuchten Unterkunft und unserer im Rahmen des Onlinebuchungsprozesses vertraglich einbezogenen Mietbedingungen @@ -178,7 +177,7 @@

{{ __('Belegungszeitraum:') }} -
{{$model->from_date}} von {{$model->to_date}}
+
von {{$model->from_date}} bis {{$model->to_date}}
+ + + + + + +
+ STERN TOURS GmbH
+ Emser Str. 3
+ 10719 Berlin
+ 		+ Fon: 030 | 88 0 313 0
+ Fax: 030 | 88 0 313 44
+ E-Mail: kontakt@sterntours.de
+ Web: www.sterntours.de + 		+ Bankverbindung:
+ STERN TOURS
+ Hypo Vereinsbank
+ IBAN: DE83100208900018857111
+ BIC-/SWIFT-Code: HYVEDEMM488 + 		+ Öffnungszeiten:
+ Mo-Do: 09.00-18.00 Uhr
+ FR: 09.00-16.00 Uhr

+ UStId: DE192609253
+ Registernr.: HRB 67111
+ Amtsgericht Charlottenburg
+
+
+ + \ No newline at end of file diff --git a/resources/views/settings/travel_country/detail.blade.php b/resources/views/settings/travel_country/detail.blade.php index 8edcc6b..2c47a66 100755 --- a/resources/views/settings/travel_country/detail.blade.php +++ b/resources/views/settings/travel_country/detail.blade.php @@ -2,11 +2,17 @@ @section('content') -

- Reiseland verwalten -

- {!! Form::open(['url' => route('admin_settings_travel_country_detail', [$id]), 'class' => 'form-horizontal']) !!} + +

+ Reiseland @if($id == "new") anlegen @else {{"(ID: ".$id.")"}} verwalten @endif +
+   + {{ __('back') }} +
+

+
+ diff --git a/resources/views/travel/program/detail.blade.php b/resources/views/travel/program/detail.blade.php index 41c34f9..c834c14 100755 --- a/resources/views/travel/program/detail.blade.php +++ b/resources/views/travel/program/detail.blade.php @@ -2,11 +2,18 @@ @section('content') -

- Programm verwalten -

{!! Form::open(['url' => route('travel_program_detail', [$id]), 'class' => 'form-horizontal']) !!} + +

+ Programm @if($id == "new") anlegen @else {{"(ID: ".$id.")"}} verwalten @endif +
+   + {{ __('back') }} +
+

+
+ diff --git a/resources/views/travel/user/booking/detail.blade.php b/resources/views/travel/user/booking/detail.blade.php index 1afe78c..35a5c86 100755 --- a/resources/views/travel/user/booking/detail.blade.php +++ b/resources/views/travel/user/booking/detail.blade.php @@ -16,13 +16,17 @@
@endif -

- Kunden @if($id == "new") anlegen @else {{"(ID: ".$id.")"}} verwalten @endif -

- {!! Form::open(['url' => route('travel_user_booking_fewo_detail', [$id]), 'class' => 'form-horizontal']) !!} - +

+ Buchung FeWo @if($id == "new") anlegen @else {{"(ID: ".$id.")"}} verwalten @endif +
+   + {{ __('back') }} +
+

+
+ @include('travel.user.booking.form')
diff --git a/resources/views/travel/user/booking/form.blade.php b/resources/views/travel/user/booking/form.blade.php index 4713b94..f962dd5 100755 --- a/resources/views/travel/user/booking/form.blade.php +++ b/resources/views/travel/user/booking/form.blade.php @@ -123,10 +123,12 @@
@@ -148,7 +150,7 @@
- {{ Form::textarea('status_text', $travel_user_booking_fewo->status_text, ['class' => 'form-control', 'rows'=>4]) }} + {{ Form::textarea('status_text', $travel_user_booking_fewo->status_text, ['class' => 'form-control autoExpand', 'rows'=>1]) }}
@@ -157,7 +159,7 @@
- {{ Form::textarea('notice', $travel_user_booking_fewo->notice, ['class' => 'form-control', 'rows'=>4]) }} + {{ Form::textarea('notice', $travel_user_booking_fewo->notice, ['class' => 'form-control autoExpand', 'rows'=>1]) }}
@@ -166,21 +168,169 @@
-
-   -
- + @if($travel_user_booking_fewo->isInvoice()) +

Mietbestätigung / Rechnung +
+   +
+

+ Mietbestätigung / Rechnung: {{$travel_user_booking_fewo->getInvoiceFileName()}} + Erstellt: {{$travel_user_booking_fewo->getInvoiceLastModified()}} + @else +

Mietbestätigung / Rechnung +
+   +
+

+ @endif + @if($travel_user_booking_fewo->isInvoice()) + @if($travel_user_booking_fewo->send_user_mail) + + + @foreach($travel_user_booking_fewo->send_user_mail as $send_user_mail) + + + + + @endforeach + +
{!! key($send_user_mail) !!}
E-Mail versendet.		{!! nl2br(current($send_user_mail)) !!}
+ @endif +
+
+ + {{ Form::textarea('send_mail_user_notice', '', ['class' => 'form-control autoExpand', 'rows'=>1]) }} +
+
+
+   +
+ @endif
+@if($travel_user_booking_fewo->isInvoice()) + +
+
+ @if($travel_user_booking_fewo->isTravelInfo()) +

Anreiseinfo +
+   +
+

+

{{$travel_user_booking_fewo->getTravelInfoFileName()}} + Erstellt: {{$travel_user_booking_fewo->getTravelInfoLastModified()}}

+ @else +

Anreiseinfo +
+   +
+

+ @endif +
+
+ +
+ {{ Form::textarea('info_mail_text', $travel_user_booking_fewo->info_mail_text, ['class' => 'form-control autoExpand', 'rows'=>1, 'id'=>'travel_info_user_text']) }} + Grundtext in ADMIN CMS > Inhalte > PDF Vorlage Anreiseinfo FeWo +
+
+
+ @if($travel_user_booking_fewo->isTravelInfo()) + @if($travel_user_booking_fewo->send_info_mail) + + + @foreach($travel_user_booking_fewo->send_info_mail as $send_info_mail) + + + + + @endforeach + +
{!! key($send_info_mail) !!}
E-Mail versendet.		{!! nl2br(current($send_info_mail)) !!}
+ @endif + +
+   +
+ @endif +
+
+@endif + +@if($travel_user_booking_fewo->isInvoice()) +
+
+

Dienstleister Mail

+ @if($travel_user_booking_fewo->send_service_mail) + + + @foreach($travel_user_booking_fewo->send_service_mail as $send_service_mail) + + + + + @endforeach + +
{!! $send_service_mail['d'] !!}
{{$send_service_mail['m']}}		{{$send_service_mail['s']}}
+ {!! nl2br($send_service_mail['c']) !!}
+ @endif +
+
+ + {{ Form::text('send_mail_service_subject', $travel_user_booking_fewo->getServiceMailSubject(), ['class' => 'form-control']) }} +
+
+ + {{ Form::text('send_mail_service_mail', 'langosch.birgit@web.de', array('class'=>'form-control')) }} +
+
+ + {{ Form::textarea('send_mail_service_content', $travel_user_booking_fewo->getServiceMailContent(), ['class' => 'form-control autoExpand', 'rows'=>1]) }} +
+
+
+   +
+
+
+@endif + + + +