From 765d6a2f6bfb41eaf707ee93f0e23f82f7e1f181 Mon Sep 17 00:00:00 2001 From: Kevin Adametz Date: Sat, 17 Nov 2018 02:03:59 +0100 Subject: [PATCH] 17 nov 2018 --- .env | 2 +- .idea/php.xml | 5 + .idea/workspace.xml | 694 +++++++++++++++++- .phpstorm.meta.php | 2 +- _ide_helper.php | 2 +- _ide_helper_models.php | 97 +++ app/Http/Controllers/API/DraftController.php | 390 +++++++++- app/Http/Controllers/API/LoaderController.php | 37 + app/Http/Controllers/BookingController.php | 186 +++++ app/Http/Controllers/DataTableController.php | 21 + app/Http/Controllers/DraftController.php | 2 + app/Http/Controllers/HomeController.php | 17 +- .../Controllers/TranslationController.php | 4 +- .../Controllers/TranslationFileController.php | 288 ++++++++ app/Mail/MailActivateUser.php | 3 +- app/Mail/MailResetPassword.php | 4 +- app/Mail/MailVerifyAccount.php | 15 +- app/Mail/MailVerifyContact.php | 15 +- app/Models/Booking.php | 49 ++ app/Models/BookingDraftItem.php | 130 ++++ app/Models/DraftItem.php | 2 + app/Models/TravelCountry.php | 26 + app/Models/TravelProgram.php | 5 + app/Models/TravelProgramCountry.php | 31 + app/Repositories/BookingRepository.php | 21 + app/Requests/TranslationRequest.php | 73 ++ config/app.php | 4 +- config/localization.php | 6 +- ..._10_19_114519_create_draft_types_table.php | 1 + ..._10_19_114521_create_draft_items_table.php | 10 +- ...93339_create_booking_draft_items_table.php | 75 ++ ..._29_193339_create_travel_country_table.php | 35 + ...49_create_travel_program_country_table.php | 43 ++ ...2018_10_29_202123_create_booking_table.php | 99 +++ public/js/bootstrap-datepicker.de.min.js | 1 + public/js/custom.js | 16 + resources/lang/de/_vorlagen.php | 8 + resources/lang/de/auth.php | 21 +- resources/lang/de/lead.php | 46 -- resources/views/booking/detail.blade.php | 148 ++++ resources/views/booking/index.blade.php | 43 ++ resources/views/drafts/detail.blade.php | 132 +++- resources/views/drafts/index.blade.php | 33 +- resources/views/emails/_auth.blade.php | 214 ++++++ resources/views/emails/auth.blade.php | 123 ++-- resources/views/layouts/application.blade.php | 39 +- .../layouts/includes/layout-sidenav.blade.php | 25 +- resources/views/translation/index.blade.php | 16 +- .../views/translation/index_file.blade.php | 131 ++++ .../translation/translation_row.blade.php | 14 +- routes/api.php | 2 + routes/web.php | 23 +- 52 files changed, 3200 insertions(+), 229 deletions(-) create mode 100755 app/Http/Controllers/API/LoaderController.php create mode 100755 app/Http/Controllers/BookingController.php create mode 100755 app/Http/Controllers/TranslationFileController.php create mode 100644 app/Models/Booking.php create mode 100644 app/Models/BookingDraftItem.php create mode 100644 app/Models/TravelCountry.php create mode 100644 app/Models/TravelProgramCountry.php create mode 100644 app/Repositories/BookingRepository.php create mode 100644 app/Requests/TranslationRequest.php create mode 100644 database/migrations/2018_10_29_193339_create_booking_draft_items_table.php create mode 100644 database/migrations/2018_10_29_193339_create_travel_country_table.php create mode 100644 database/migrations/2018_10_29_193349_create_travel_program_country_table.php create mode 100644 database/migrations/2018_10_29_202123_create_booking_table.php create mode 100755 public/js/bootstrap-datepicker.de.min.js create mode 100755 resources/lang/de/_vorlagen.php delete mode 100644 resources/lang/de/lead.php create mode 100755 resources/views/booking/detail.blade.php create mode 100755 resources/views/booking/index.blade.php create mode 100644 resources/views/emails/_auth.blade.php create mode 100644 resources/views/translation/index_file.blade.php diff --git a/.env b/.env index af1401c..15e171f 100755 --- a/.env +++ b/.env @@ -3,7 +3,7 @@ APP_ENV=local APP_KEY=base64:cxq+xNckU1xLwp8V9Bfj9+nOK5iZL6urcZ1EBO8usXg= APP_DEBUG=true APP_URL=http://crm-stern-tours.local -APP_OLR_URL = http://cms-stern-tours.local +APP_OLD_URL = http://cms-stern-tours.local LOG_CHANNEL=stack diff --git a/.idea/php.xml b/.idea/php.xml index 895b7e7..b7baaf8 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -109,4 +109,9 @@ + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e572424..7381de9 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,31 +2,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $PROJECT_DIR$/composer.json + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + datepic + datepicker + url + translations + + + + + + + + + - - + + @@ -34,6 +246,14 @@ true DEFINITION_ORDER + + + + + + + + @@ -142,12 +362,19 @@ + + + @@ -181,14 +408,6 @@ - - - - - - - - @@ -201,6 +420,12 @@ + + + + + + @@ -232,13 +457,20 @@ - - + + + + + + + + + @@ -246,12 +478,33 @@ + + + + + + + + + + + + + + + + + + + + + @@ -259,6 +512,13 @@ + + + + + + + @@ -266,6 +526,14 @@ + + + + + + + + @@ -286,18 +554,24 @@ - - - - - + + +
+
+
+ + {{ Form::text('merlin_order_number', $booking->merlin_order_number, array('placeholder'=>__('MyJack Nr.'), 'class'=>'form-control', 'id'=>'merlin_order_number')) }} +
+ +
+ + {{ Form::text('id', $booking->id, array('placeholder'=>__('Nr.'), 'class'=>'form-control', 'id'=>'booking_id', 'readonly')) }} +
+ +
+
+
+   + {{ __('zur Übersicht') }} + {{ __('zurück ins CRM v2') }} +
+
+ + @if($booking->new_drafts ) + + @php($i = 1) +
+ +
+
+ @foreach($booking->booking_draft_items as $booking_draft_item) + +
draft_type) style="background-color: {{ $booking_draft_item->draft_type->color }}" @endif> +
+
+ +
+ +
+ {{ Form::text('draft_item['.$booking_draft_item->id.'][start_date]', $booking_draft_item->start_date, array('placeholder'=>__('Start Datum'), 'class'=>'form-control datepicker-base', 'id'=>'draft_item_'.$booking_draft_item->id.'_start_dat')) }} +
+ +
+ {{ Form::text('draft_item['.$booking_draft_item->id.'][end_date]', $booking_draft_item->end_date, array('placeholder'=>__('End Datum'), 'class'=>'form-control datepicker-base', 'id'=>'draft_item_'.$booking_draft_item->id.'_end_date')) }} + +
+
+
#{{ $i++ }}
+ + + +
+ + +
+ {{ Form::textarea('draft_item['.$booking_draft_item->id.'][service]', $booking_draft_item->service, array('placeholder'=>__('Leistungen'), 'class'=>'form-control autoExpand', 'id'=>'draft_item_'.$booking_draft_item->id.'_service', 'rows'=>'1', 'data-min-rows'=>'1')) }} +
+ +
+
+ +
+ +
+ + @if(in_array($booking_draft_item->draft_type_id, [24, 26, 30, 31, 32, 33, 34, 35])) +
+ +
+ +
+
+
+ € +
+ {{ Form::text('draft_item['.$booking_draft_item->id.'][price_adult]', $booking_draft_item->price_adult, array('placeholder'=>__('Preis in €'), 'class'=>'form-control', 'id'=>'draft_item_'.$booking_draft_item->id.'_price_adult',)) }} +
+
+ + +
+ +
+ +
+
+
+ € +
+ {{ Form::text('draft_item['.$booking_draft_item->id.'][price_children]', $booking_draft_item->price_children, array('placeholder'=>__('Preis in €'), 'class'=>'form-control', 'id'=>'draft_item_'.$booking_draft_item->id.'_price_children')) }} +
+
+ @endif + + + +
+
+ @endforeach +
+ @endif + +
+ +
+ +
+   + {{ __('zur Übersicht') }} + {{ __('zurück ins CRM v2') }} + +
+ + {!! Form::close() !!} + + + + + + + + + +@endsection \ No newline at end of file diff --git a/resources/views/booking/index.blade.php b/resources/views/booking/index.blade.php new file mode 100755 index 0000000..5c1cb46 --- /dev/null +++ b/resources/views/booking/index.blade.php @@ -0,0 +1,43 @@ +@extends('layouts.layout-2') + +@section('content') + +

+ {{ __('Buchungen') }} +

+ +
+
+ + + + + + + + +
 {{__('Nr.')}}
+
+
+ + + +@endsection \ No newline at end of file diff --git a/resources/views/drafts/detail.blade.php b/resources/views/drafts/detail.blade.php index 5238f51..38a9f4f 100755 --- a/resources/views/drafts/detail.blade.php +++ b/resources/views/drafts/detail.blade.php @@ -4,9 +4,80 @@

Vorlage verwalten + + +

+ + + + + + + + {!! Form::open(['url' => route('draft_detail', [$id]), 'class' => 'form-horizontal', 'id'=>'lead-form-validation']) !!} @@ -27,57 +98,76 @@ + @if(count($draft->draft_items)) @php($i = 1) -
- +
+   + {{ __('back') }} +
+ +
+ +
+ @foreach($draft->draft_items as $draft_item) -
+
draft_type) style="background-color: {{ $draft_item->draft_type->color }}" @endif> +
- - -
+
-
+
-
+
-
+
#{{ $i++ }}
+
-
- {{ Form::textarea('draft_item['.$draft_item->id.'][service]', $draft_item->service, array('placeholder'=>__('Leistungen'), 'class'=>'form-control', 'id'=>'draft_item_'.$draft_item->id.'_service', 'rows'=>'1')) }} +
+ {{ Form::textarea('draft_item['.$draft_item->id.'][service]', $draft_item->service, array('placeholder'=>__('Leistungen'), 'class'=>'form-control autoExpand', 'id'=>'draft_item_'.$draft_item->id.'_service', 'rows'=>'1', 'data-min-rows'=>'1')) }}
-
+
+
+ +
+ + +
+ +
-
+
€ @@ -87,14 +177,14 @@
-
+
-
+
€ @@ -103,22 +193,12 @@
-
- -
-
-
- -
-
@endforeach +
@endif @if(!empty($draft_items)) diff --git a/resources/views/drafts/index.blade.php b/resources/views/drafts/index.blade.php index 802807f..0d6be11 100755 --- a/resources/views/drafts/index.blade.php +++ b/resources/views/drafts/index.blade.php @@ -82,6 +82,7 @@   {{__('Name')}} + {{__('Farbe')}} {{__('sichtbar')}} @@ -93,11 +94,20 @@ {{ $value->name }} + + @if($value->color) +
+ {{ $value->color }} + @else +
+ @endif + @if($value->active) @@ -140,6 +150,15 @@
+
+
+ + +
+
+ + +