diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f29e8ef..9810814 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,43 +2,27 @@ - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + + + + + - - - - - - - + + + + + + - + @@ -87,47 +71,86 @@ + +
+
+ + {{ Form::text('email', $user->email, array('placeholder'=>__('E-Mail'), 'class'=>'form-control', 'readonly')) }} +
+
+
+
+
+ + +
+
+
+ @foreach($groups as $role_id => $permissions) +
{{$roles[$role_id]}}
+ @foreach($permissions as $key=>$val) +
+ +
+ @endforeach +
+ @endforeach +
+
+ +
+ +
+ +
+ + +
+ + +
+{!! Form::close() !!} \ No newline at end of file diff --git a/resources/views/admin/users.blade.php b/resources/views/admin/users.blade.php index b5ecb5f..f5de3b2 100644 --- a/resources/views/admin/users.blade.php +++ b/resources/views/admin/users.blade.php @@ -29,79 +29,20 @@ - - - -
-
- - {{ Form::text('price_travel', $travel_user_booking_fewo->price_travel, array('placeholder'=>__('Preis Übernachtungen'), 'class'=>'form-control')) }} + @if(isset($travel_user_booking_fewo->daily_prices)) + @foreach($travel_user_booking_fewo->daily_prices as $s => $d) +
+ {{$s}} | {{$d['fromDay']}} - {{$d['toDay']}} | {{$d['numberDays']}} Tage x {{$d['perNight']}} € / pro Nacht | {{$d['price']}} € Gesamt +
+ @endforeach + @endif +
+ + {{ Form::text('price_travel', $travel_user_booking_fewo->price_travel, array('placeholder'=>__('Preis Übernachtungen'), 'class'=>'form-control input-auto-calc')) }}
-
- - {{ Form::text('price_service', $travel_user_booking_fewo->price_service, array('placeholder'=>__('Preis Service-Gebühr'), 'class'=>'form-control')) }} +
+ + {{ Form::text('price_service', $travel_user_booking_fewo->price_service, array('placeholder'=>__('Preis Service-Gebühr'), 'class'=>'form-control input-auto-calc')) }}
-
- - {{ Form::text('price_deposit', $travel_user_booking_fewo->price_deposit, array('placeholder'=>__('Preis Kaution'), 'class'=>'form-control')) }} +
+ + {{ Form::text('price_deposit', $travel_user_booking_fewo->price_deposit, array('placeholder'=>__('Preis Kaution'), 'class'=>'form-control input-auto-calc')) }}
-
+
+ + {{ Form::text('price_balance', $travel_user_booking_fewo->price_balance, array('placeholder'=>__(' Provisionsausgleich durch Vertriebskanal'), 'class'=>'form-control input-auto-calc')) }} +
+ +
- {{ Form::text('price_total', $travel_user_booking_fewo->price_total, array('placeholder'=>__('Preis Gesamt'), 'class'=>'form-control', 'readonly')) }} + {{ Form::text('price_total', $travel_user_booking_fewo->price_total, array('placeholder'=>__('Preis Gesamt'), 'class'=>'form-control')) }}
@@ -104,7 +118,11 @@
@@ -137,8 +155,25 @@ {{ Form::textarea('notice', $travel_user_booking_fewo->notice, ['class' => 'form-control', 'rows'=>4]) }}
- - -
- \ No newline at end of file + + + + diff --git a/routes/web.php b/routes/web.php index 63a15a8..56ef0cb 100755 --- a/routes/web.php +++ b/routes/web.php @@ -80,131 +80,135 @@ Route::group(['middleware' => ['auth']], function() /* Route::get('/user/edit', 'UserController@userEdit')->name('user_edit'); */ - Route::get('/user/edit', 'UserDataController@userEdit')->name('user_edit'); - Route::post('/user/edit', 'UserDataController@userEditStore')->name('user_edit'); + Route::group(['middleware' => ['auth.permission:my-dat']], function() { + + Route::get('/user/edit', 'UserDataController@userEdit')->name('user_edit'); + Route::post('/user/edit', 'UserDataController@userEditStore')->name('user_edit'); - Route::get('/user/update_password', 'UserUpdatePasswordController@updatePassword')->name('user_update_password'); - Route::post('/user/update_password', 'UserUpdatePasswordController@updatePasswordStore')->name('user_update_password'); - - Route::get('/user/update_password_first', 'UserUpdatePasswordController@updatePasswordFirst')->name('user_update_password_first'); - Route::post('/user/update_password_first', 'UserUpdatePasswordController@updatePasswordFirstStore')->name('user_update_password_first'); - - Route::get('/user/update_email', 'UserUpdateEmailController@index')->name('user_update_email'); - Route::post('/user/update_email', 'UserUpdateEmailController@update')->name('user_update_email'); - - Route::get('/user/delete_account', 'UserDeleteController@deleteAccount')->name('user_delete_account'); - Route::post('/user/delete_account', 'UserDeleteController@deleteAccountAction')->name('user_delete_account'); - - Route::post('/user/data/accepted/form', 'UserDataController@userDataAcceptedForm')->name('user_data_accepted_form'); + Route::get('/user/update_password', 'UserUpdatePasswordController@updatePassword')->name('user_update_password'); + Route::post('/user/update_password', 'UserUpdatePasswordController@updatePasswordStore')->name('user_update_password'); + Route::get('/user/update_password_first', 'UserUpdatePasswordController@updatePasswordFirst')->name('user_update_password_first'); + Route::post('/user/update_password_first', 'UserUpdatePasswordController@updatePasswordFirstStore')->name('user_update_password_first'); + Route::get('/user/update_email', 'UserUpdateEmailController@index')->name('user_update_email'); + Route::post('/user/update_email', 'UserUpdateEmailController@update')->name('user_update_email'); + Route::get('/user/delete_account', 'UserDeleteController@deleteAccount')->name('user_delete_account'); + Route::post('/user/delete_account', 'UserDeleteController@deleteAccountAction')->name('user_delete_account'); + Route::post('/user/data/accepted/form', 'UserDataController@userDataAcceptedForm')->name('user_data_accepted_form'); + }); }); Route::group(['middleware' => ['admin']], function() { - //drafts - Route::get('/drafts/{step?}', 'DraftController@index')->name('drafts'); - Route::get('/draft/detail/{id}', 'DraftController@detail')->name('draft_detail'); - Route::post('/draft/detail/{id}', 'DraftController@store')->name('draft_detail'); + Route::group(['middleware' => ['auth.permission:crm-tp-pr']], function() { + //Reiseprogramme Programme + Route::get('/travel/programs/{step?}', 'TravelProgramController@index')->name('travel_programs'); - Route::get('/draft/item/delete/{id}', 'DraftController@itemDelete')->name('draft_item_delete'); - Route::get('/draft/delete/{id}', 'DraftController@delete')->name('draft_delete'); + Route::get('/travel/program/detail/{id}', 'TravelProgramController@detail')->name('travel_program_detail'); + Route::post('/travel/program/detail/{id}', 'TravelProgramController@store')->name('travel_program_detail'); - Route::post('/draft/type/update', 'DraftController@typeUpdate')->name('draft_type_update'); - Route::get('/draft/type/delete/{id}', 'DraftController@typeDelete')->name('draft_type_delete'); + Route::post('/travel/program/class/update', 'TravelProgramController@classUpdate')->name('travel_program_class_update'); + Route::get('/travel/program/class/delete/{id}', 'TravelProgramController@classDelete')->name('travel_program_class_delete'); - Route::get('/draft/load/new', 'DraftController@loadNew')->name('draft_load_new'); - Route::post('/draft/load/new', 'DraftController@loadNewAction')->name('draft_load_new'); + Route::post('/travel/program/draft/update', 'TravelProgramController@draftUpdate')->name('travel_program_draft_update'); + Route::get('/travel/program/draft/delete/{id}', 'TravelProgramController@draftDelete')->name('travel_program_draft_delete'); + }); - Route::get('/draft/load/old', 'DraftController@loadOld')->name('draft_load_old'); - Route::post('/draft/load/old', 'DraftController@loadOldAction')->name('draft_load_old'); + Route::group(['middleware' => ['auth.permission:crm-tp-dr']], function() { + //Reiseprogramme Vorlagen + Route::get('/drafts/{step?}', 'DraftController@index')->name('drafts'); - //travel Programs - Route::get('/travel/programs/{step?}', 'TravelProgramController@index')->name('travel_programs'); + Route::get('/draft/detail/{id}', 'DraftController@detail')->name('draft_detail'); + Route::post('/draft/detail/{id}', 'DraftController@store')->name('draft_detail'); - Route::get('/travel/program/detail/{id}', 'TravelProgramController@detail')->name('travel_program_detail'); - Route::post('/travel/program/detail/{id}', 'TravelProgramController@store')->name('travel_program_detail'); + Route::get('/draft/item/delete/{id}', 'DraftController@itemDelete')->name('draft_item_delete'); + Route::get('/draft/delete/{id}', 'DraftController@delete')->name('draft_delete'); - Route::post('/travel/program/class/update', 'TravelProgramController@classUpdate')->name('travel_program_class_update'); - Route::get('/travel/program/class/delete/{id}', 'TravelProgramController@classDelete')->name('travel_program_class_delete'); + Route::post('/draft/type/update', 'DraftController@typeUpdate')->name('draft_type_update'); + Route::get('/draft/type/delete/{id}', 'DraftController@typeDelete')->name('draft_type_delete'); - Route::post('/travel/program/draft/update', 'TravelProgramController@draftUpdate')->name('travel_program_draft_update'); - Route::get('/travel/program/draft/delete/{id}', 'TravelProgramController@draftDelete')->name('travel_program_draft_delete'); + Route::get('/draft/load/new', 'DraftController@loadNew')->name('draft_load_new'); + Route::post('/draft/load/new', 'DraftController@loadNewAction')->name('draft_load_new'); - //bookings - Route::get('data/table/bookings', 'DataTableController@getBookings')->name('data_table_bookings'); - Route::get('/bookings/{step?}', 'BookingController@index')->name('bookings'); - Route::get('/booking/detail/{id}', 'BookingController@detail')->name('booking_detail'); - Route::post('/booking/detail/{id}', 'BookingController@store')->name('booking_detail'); + Route::get('/draft/load/old', 'DraftController@loadOld')->name('draft_load_old'); + Route::post('/draft/load/old', 'DraftController@loadOldAction')->name('draft_load_old'); + }); - Route::get('/booking/draft_item/delete/{id}', 'BookingController@draftItemDelete')->name('booking_draft_item_delete'); + Route::group(['middleware' => ['auth.permission:crm-bo-re']], function() { + //Buchungen > Anfragen + Route::get('/requests/{step?}', 'RequestController@index')->name('requests'); + //Route::get('/lead/detail/{id}', 'LeadController@detail')->name('lead_detail'); + Route::get('data/table/requests', 'DataTableController@getRequests')->name('data_table_requests'); + }); + Route::group(['middleware' => ['auth.permission:crm-bo-bo']], function() { + //Buchungen > Buchungen + Route::get('data/table/bookings', 'DataTableController@getBookings')->name('data_table_bookings'); + Route::get('/bookings/{step?}', 'BookingController@index')->name('bookings'); + Route::get('/booking/detail/{id}', 'BookingController@detail')->name('booking_detail'); + Route::post('/booking/detail/{id}', 'BookingController@store')->name('booking_detail'); + Route::get('/booking/draft_item/delete/{id}', 'BookingController@draftItemDelete')->name('booking_draft_item_delete'); + }); + Route::group(['middleware' => ['auth.permission:crm-bo-bo']], function() { + //Kundenverwaltung > Kunden (FeWo + Route::get('/travel_users', 'TravelUserController@index')->name('travel_users'); + Route::get('/data/table/travel_users', 'TravelUserController@getTravelUsers')->name('data_table_travel_users'); + Route::get('/travel_user/detail/{id}', 'TravelUserController@detail')->name('travel_user_detail'); + Route::post('/travel_user/detail/{id}', 'TravelUserController@store')->name('travel_user_detail'); + Route::get('/travel_user/delete/{id}', 'TravelUserController@delete')->name('travel_user_delete'); + }); + Route::group(['middleware' => ['auth.permission:crm-bo-bf']], function() { + //Kundenverwaltung > Buchungen (FeWo + Route::get('/travel_user_booking_fewos', 'TravelUserBookingFewoController@index')->name('travel_user_booking_fewos'); + Route::get('/data/table/travel_user_booking_fewos', 'TravelUserBookingFewoController@getTravelUserBookingFewos')->name('data_table_travel_user_booking_fewos'); + Route::get('/travel_user_booking_fewo/detail/{id}', 'TravelUserBookingFewoController@detail')->name('travel_user_booking_fewo_detail'); + Route::post('/travel_user_booking_fewo/detail/{id}', 'TravelUserBookingFewoController@store')->name('travel_user_booking_fewo_detail'); + Route::get('/travel_user_booking_fewo/delete/{id}', 'TravelUserBookingFewoController@delete')->name('travel_user_booking_fewo_delete'); + }); + Route::group(['middleware' => ['auth.permission:cms-cn']], function() { + // CMS Inhalte + Route::get('/cms/content', 'CMS\CMSContentController@index')->name('cms_content'); + Route::post('/cms/content/store', 'CMS\CMSContentController@store')->name('cms_content_store'); + Route::post('/cms/content/load/modal', 'CMS\CMSContentController@loadModal')->name('cms_content_load_modal'); + Route::get('/cms/content/delete/{id}', 'CMS\CMSContentController@delete')->name('cms_content_delete'); + }); + Route::group(['middleware' => ['auth.permission:cms-tg']], function() { + // CMS Reiseführer + Route::get('/cms/travel_magazine', 'CMS\CMSTravelMagazineController@index')->name('cms_travel_magazine'); + Route::get('/cms/travel_magazine/detail/{id}', 'CMS\CMSTravelMagazineController@detail')->name('cms_travel_magazine_detail'); + Route::post('/cms/travel_magazine/detail/{id}', 'CMS\CMSTravelMagazineController@store')->name('cms_travel_magazine_detail'); + Route::get('/cms/travel_magazine/delete/{id}', 'CMS\CMSTravelMagazineController@delete')->name('cms_travel_magazine_delete'); + }); + Route::group(['middleware' => ['auth.permission:cms-fb']], function() { + // CMS Feedback + Route::get('/cms/feedback', 'CMS\CMSFeedbackController@index')->name('cms_feedback'); + Route::get('/cms/feedback/detail/{id}', 'CMS\CMSFeedbackController@detail')->name('cms_feedback_detail'); + Route::post('/cms/feedback/detail/{id}', 'CMS\CMSFeedbackController@store')->name('cms_feedback_detail'); + Route::get('/cms/feedback/delete/{id}', 'CMS\CMSFeedbackController@delete')->name('cms_feedback_delete'); + }); - Route::get('/requests/{step?}', 'RequestController@index')->name('requests'); - Route::get('/lead/detail/{id}', 'LeadController@detail')->name('lead_detail'); - Route::get('data/table/requests', 'DataTableController@getRequests')->name('data_table_requests'); - - - //travel_users - Route::get('/travel_users', 'TravelUserController@index')->name('travel_users'); - Route::get('/data/table/travel_users', 'TravelUserController@getTravelUsers')->name('data_table_travel_users'); - Route::get('/travel_user/detail/{id}', 'TravelUserController@detail')->name('travel_user_detail'); - Route::post('/travel_user/detail/{id}', 'TravelUserController@store')->name('travel_user_detail'); - Route::get('/travel_user/delete/{id}', 'TravelUserController@delete')->name('travel_user_delete'); - - - //travel_user_booking_fewo - Route::get('/travel_user_booking_fewos', 'TravelUserBookingFewoController@index')->name('travel_user_booking_fewos'); - Route::get('/data/table/travel_user_booking_fewos', 'TravelUserBookingFewoController@getTravelUserBookingFewos')->name('data_table_travel_user_booking_fewos'); - Route::get('/travel_user_booking_fewo/detail/{id}', 'TravelUserBookingFewoController@detail')->name('travel_user_booking_fewo_detail'); - Route::post('/travel_user_booking_fewo/detail/{id}', 'TravelUserBookingFewoController@store')->name('travel_user_booking_fewo_detail'); - Route::get('/travel_user_booking_fewo/delete/{id}', 'TravelUserBookingFewoController@delete')->name('travel_user_booking_fewo_delete'); - - //CMS - //feedback - Route::get('/cms/feedback', 'CMS\CMSFeedbackController@index')->name('cms_feedback'); - Route::get('/cms/feedback/detail/{id}', 'CMS\CMSFeedbackController@detail')->name('cms_feedback_detail'); - Route::post('/cms/feedback/detail/{id}', 'CMS\CMSFeedbackController@store')->name('cms_feedback_detail'); - Route::get('/cms/feedback/delete/{id}', 'CMS\CMSFeedbackController@delete')->name('cms_feedback_delete'); - - - Route::get('/cms/travel_magazine', 'CMS\CMSTravelMagazineController@index')->name('cms_travel_magazine'); - Route::get('/cms/travel_magazine/detail/{id}', 'CMS\CMSTravelMagazineController@detail')->name('cms_travel_magazine_detail'); - Route::post('/cms/travel_magazine/detail/{id}', 'CMS\CMSTravelMagazineController@store')->name('cms_travel_magazine_detail'); - Route::get('/cms/travel_magazine/delete/{id}', 'CMS\CMSTravelMagazineController@delete')->name('cms_travel_magazine_delete'); - - - Route::get('/cms/sidebar', 'CMS\CMSSidebarController@index')->name('cms_sidebar'); - Route::get('/cms/sidebar/detail/{id}', 'CMS\CMSSidebarController@detail')->name('cms_sidebar_detail'); - Route::post('/cms/sidebar/detail/{id}', 'CMS\CMSSidebarController@store')->name('cms_sidebar_detail'); - Route::get('/cms/sidebar/delete/{id}', 'CMS\CMSSidebarController@delete')->name('cms_sidebar_delete'); - - Route::get('/cms/content', 'CMS\CMSContentController@index')->name('cms_content'); - Route::post('/cms/content/store', 'CMS\CMSContentController@store')->name('cms_content_store'); - Route::post('/cms/content/load/modal', 'CMS\CMSContentController@loadModal')->name('cms_content_load_modal'); - Route::get('/cms/content/delete/{id}', 'CMS\CMSContentController@delete')->name('cms_content_delete'); + Route::group(['middleware' => ['auth.permission:cms-sb']], function() { + // CMS Sidebar + Route::get('/cms/sidebar', 'CMS\CMSSidebarController@index')->name('cms_sidebar'); + Route::get('/cms/sidebar/detail/{id}', 'CMS\CMSSidebarController@detail')->name('cms_sidebar_detail'); + Route::post('/cms/sidebar/detail/{id}', 'CMS\CMSSidebarController@store')->name('cms_sidebar_detail'); + Route::get('/cms/sidebar/delete/{id}', 'CMS\CMSSidebarController@delete')->name('cms_sidebar_delete'); + }); }); //login pages for worker Route::group(['middleware' => ['superadmin']], function() { - //leads - Route::get('/admin/users', 'AdminUserController@index')->name('admin_users'); - Route::get('/admin/user/edit/{user_id}', 'AdminUserController@edit')->name('admin_user_edit'); - Route::post('/admin/user/store', 'AdminUserController@store')->name('admin_user_store'); - Route::get('/admin/user/delete/{user_id}', 'AdminUserController@deleteUser')->name('admin_user_delete'); Route::get('data_table', 'DataTableController@datatable')->name('data_table'); // Route::get('datatables/leads', 'DataTableController@getLeads')->name('datatables-leads'); - Route::get('data/table/users', 'DataTableController@getUsers')->name('data_table_users'); - - Route::get('/admin/translate/all', 'TranslationController@index')->name('admin_translate_all'); Route::get('/admin/translate/all/edit/{lang}/{from?}', 'TranslationController@edit')->name('admin_translate_all_edit'); Route::post('/admin/translate/all/update/{lang}/{from?}', 'TranslationController@update')->name('admin_translate_all_update'); @@ -213,22 +217,36 @@ Route::group(['middleware' => ['superadmin']], function() { Route::get('/admin/translation/file/{file}/{language?}/{langsource?}/{show?}', 'TranslationFileController@edit')->name('admin_translate_file_edit'); Route::post('/admin/translation/file/{file}/{language?}/{langsource?}/{show?}', 'TranslationFileController@update')->name('admin_translate_file_update'); + Route::group(['middleware' => ['auth.permission:sua-st-tp']], function() { + //SUPERADMIN > Einstellungen > Reisprogramme + Route::get('/admin/settings/travel/program/{id?}', 'Settings\TravelAgendaController@index')->name('admin_settings_travel_program'); + Route::post('/admin/settings/travel/program/update', 'Settings\TravelAgendaController@update')->name('admin_settings_travel_program_update'); + Route::get('/admin/settings/travel/program/delete/{id}', 'Settings\TravelAgendaController@delete')->name('admin_settings_travel_program_delete'); + }); + Route::group(['middleware' => ['auth.permission:sua-st-tc']], function() { + //SUPERADMIN > Einstellungen > Reiseländer + Route::get('/admin/settings/travel/country', 'Settings\TravelCountryController@index')->name('admin_settings_travel_country'); + Route::get('/admin/settings/travel/country/detail/{id}', 'Settings\TravelCountryController@detail')->name('admin_settings_travel_country_detail'); + Route::post('/admin/settings/travel/country/detail/{id}', 'Settings\TravelCountryController@store')->name('admin_settings_travel_country_detail'); + Route::get('/admin/settings/travel/country/delete/{id}', 'Settings\TravelCountryController@delete')->name('admin_settings_travel_country_delete'); + }); + Route::group(['middleware' => ['auth.permission:sua-st-tn']], function() { + //SUPERADMIN > Einstellungen > Nationalitäten + Route::get('/admin/settings/travel/nationality', 'Settings\TravelNationalityController@index')->name('admin_settings_travel_nationality'); + Route::post('/admin/settings/travel/nationality/update', 'Settings\TravelNationalityController@update')->name('admin_settings_travel_nationality_update'); + Route::get('/admin/settings/travel/nationality/delete/{id}', 'Settings\TravelNationalityController@delete')->name('admin_settings_travel_nationality_delete'); + }); + Route::group(['middleware' => ['auth.permission:sua-ur-rt']], function() { + //SUPERADMIN > User Rechte + Route::get('/admin/users', 'AdminUserController@index')->name('admin_users'); + Route::get('/admin/user/edit/{user_id}', 'AdminUserController@edit')->name('admin_user_edit'); + Route::post('/admin/user/store', 'AdminUserController@store')->name('admin_user_store'); + Route::get('/admin/user/delete/{user_id}', 'AdminUserController@deleteUser')->name('admin_user_delete'); + Route::get('/admin/users/data_table', 'AdminUserController@getUsers')->name('admin_users_data_table'); - Route::get('/admin/settings/travel/country', 'Settings\TravelCountryController@index')->name('admin_settings_travel_country'); - Route::get('/admin/settings/travel/country/detail/{id}', 'Settings\TravelCountryController@detail')->name('admin_settings_travel_country_detail'); - Route::post('/admin/settings/travel/country/detail/{id}', 'Settings\TravelCountryController@store')->name('admin_settings_travel_country_detail'); - Route::get('/admin/settings/travel/country/delete/{id}', 'Settings\TravelCountryController@delete')->name('admin_settings_travel_country_delete'); - - - Route::get('/admin/settings/travel/nationality', 'Settings\TravelNationalityController@index')->name('admin_settings_travel_nationality'); - Route::post('/admin/settings/travel/nationality/update', 'Settings\TravelNationalityController@update')->name('admin_settings_travel_nationality_update'); - Route::get('/admin/settings/travel/nationality/delete/{id}', 'Settings\TravelNationalityController@delete')->name('admin_settings_travel_nationality_delete'); - - - Route::get('/admin/settings/travel/program/{id?}', 'Settings\TravelAgendaController@index')->name('admin_settings_travel_program'); - Route::post('/admin/settings/travel/program/update', 'Settings\TravelAgendaController@update')->name('admin_settings_travel_program_update'); - Route::get('/admin/settings/travel/program/delete/{id}', 'Settings\TravelAgendaController@delete')->name('admin_settings_travel_program_delete'); - + Route::post('/admin/users/load/modal/{id}', 'AdminUserController@loadModal')->name('admin_user_load_modal'); + Route::post('/admin/users/update/modal/{step}', 'AdminUserController@updateModal')->name('admin_user_update_modal'); + }); });