do not set a default booking name for privacy reasons

config/install/field.storage.reserve_category.reserve_maxadv_ext.yml

@@ -12,19 +12,19 @@ settings:
   allowed_values:
     -
       value: 30
-      label: 30
+      label: '30'
     -
       value: 60
-      label: 60
+      label: '60'
     -
       value: 90
-      label: 90
+      label: '90'
     -
       value: 180
-      label: 180
+      label: '180'
     -
       value: 360
-      label: 360
+      label: '360'
 module: options
 locked: true
 cardinality: 1

config/install/field.storage.reserve_category.reserve_maxadv_std.yml

@@ -12,19 +12,19 @@ settings:
   allowed_values:
     -
       value: 7
-      label: 7
+      label: '7'
     -
       value: 14
-      label: 14
+      label: '14'
     -
       value: 30
-      label: 30
+      label: '30'
     -
       value: 60
-      label: 60
+      label: '60'
     -
       value: 90
-      label: 90
+      label: '90'
 module: options
 locked: true
 cardinality: 1

config/install/field.storage.reserve_category.reserve_minadv_ext.yml

@@ -12,19 +12,19 @@ settings:
   allowed_values:
     -
       value: 0
-      label: 0
+      label: '0'
     -
       value: 1
-      label: 1
+      label: '1'
     -
       value: 7
-      label: 7
+      label: '7'
     -
       value: 14
-      label: 14
+      label: '14'
     -
       value: 30
-      label: 30
+      label: '30'
 module: options
 locked: true
 cardinality: 1

config/install/field.storage.reserve_category.reserve_minadv_std.yml

@@ -12,19 +12,19 @@ settings:
   allowed_values:
     -
       value: 0
-      label: 0
+      label: '0'
     -
       value: 1
-      label: 1
+      label: '1'
     -
       value: 7
-      label: 7
+      label: '7'
     -
       value: 14
-      label: 14
+      label: '14'
     -
       value: 30
-      label: 30
+      label: '30'
 module: options
 locked: true
 cardinality: 1

config/install/views.view.reservations.yml

@@ -17,7 +17,7 @@ dependencies:
     - reserve
     - views_bulk_operations
 _core:
-  default_config_hash: qtxsAzivRyJgkwE59iiTdA2ucLdj2OtA9MwdI-OUYzI
+  default_config_hash: Fpw3XOpA8QhT5E7YrASas4PrG75lo7-SVSpwa9dvMYA
 id: reservations
 label: Reservations
 module: views
@@ -25,165 +25,14 @@ description: ''
 tag: ''
 base_table: reserve_reservation_field_data
 base_field: id
-core: 8.x
 display:
   default:
-    display_plugin: default
     id: default
     display_title: Master
+    display_plugin: default
     position: 0
     display_options:
-      access:
+      title: 'My Rese'
-        type: none
-        options: {  }
-      cache:
-        type: tag
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: full
-        options:
-          items_per_page: 40
-          offset: 0
-          id: 0
-          total_pages: null
-          tags:
-            previous: ‹‹
-            next: ››
-            first: '« First'
-            last: 'Last »'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          quantity: 9
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          override: true
-          sticky: false
-          caption: ''
-          summary: ''
-          description: ''
-          columns:
-            views_bulk_operations_bulk_form: views_bulk_operations_bulk_form
-            name: name
-            reservation_date: reservation_date
-            reservation_time: reservation_date
-            reservation_length: reservation_date
-            reservation_private: reservation_private
-            reservation_repeat_type: reservation_repeat_type
-            reservation_repeat_until: reservation_repeat_type
-            reservable_content_type: reservable_content_type
-            reservation_ebundle: reservable_content_type
-            operations: operations
-          info:
-            views_bulk_operations_bulk_form:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            name:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            reservation_date:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ' '
-              empty_column: false
-              responsive: ''
-            reservation_time:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            reservation_length:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            reservation_private:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            reservation_repeat_type:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            reservation_repeat_until:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            reservable_content_type:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: '<br>'
-              empty_column: false
-              responsive: ''
-            reservation_ebundle:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            operations:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          default: '-1'
-          empty_table: false
-      row:
-        type: fields
-        options:
-          inline: {  }
-          separator: ''
-          hide_empty: false
-          default_field_elements: true
       fields:
         views_bulk_operations_bulk_form:
           id: views_bulk_operations_bulk_form
@@ -192,7 +41,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
-          label: ''
+          plugin_id: views_bulk_operations_bulk_form
+          label: 'Views bulk operations'
           exclude: false
           alter:
             alter_text: false
@@ -225,7 +75,7 @@ display:
           element_class: ''
           element_label_type: ''
           element_label_class: ''
-          element_label_colon: false
+          element_label_colon: true
           element_wrapper_type: ''
           element_wrapper_class: ''
           element_default_classes: true
@@ -238,16 +88,11 @@ display:
           form_step: true
           buttons: false
           action_title: Action
+          clear_on_exposed: true
+          force_selection_info: false
           selected_actions:
-            views_bulk_edit: views_bulk_edit
+            -
-            views_bulk_operations_delete_entity: views_bulk_operations_delete_entity
+              action_id: views_bulk_operations_delete_entity
-          preconfiguration:
-            views_bulk_edit:
-              label_override: ''
-              get_bundles_from_results: 1
-            views_bulk_operations_delete_entity:
-              label_override: ''
-          plugin_id: views_bulk_operations_bulk_form
         name:
           id: name
           table: reserve_reservation_field_data
@@ -255,6 +100,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: null
+          entity_field: name
+          plugin_id: field
           label: Group
           exclude: false
           alter:
@@ -310,9 +158,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: null
-          entity_field: name
-          plugin_id: field
         reservation_date:
           id: reservation_date
           table: reserve_reservation__reservation_date
@@ -320,6 +165,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: field
           label: When
           exclude: false
           alter:
@@ -376,7 +222,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          plugin_id: field
         reservation_time:
           id: reservation_time
           table: reserve_reservation__reservation_time
@@ -384,6 +229,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: field
           label: ''
           exclude: false
           alter:
@@ -439,7 +285,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          plugin_id: field
         reservation_length:
           id: reservation_length
           table: reserve_reservation__reservation_length
@@ -447,6 +292,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: field
           label: ''
           exclude: false
           alter:
@@ -501,7 +347,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          plugin_id: field
         reservation_private:
           id: reservation_private
           table: reserve_reservation__reservation_private
@@ -509,6 +354,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: field
           label: Private
           exclude: false
           alter:
@@ -554,8 +400,8 @@ display:
           type: boolean
           settings:
             format: default
-            format_custom_true: ''
             format_custom_false: ''
+            format_custom_true: ''
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -566,7 +412,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          plugin_id: field
         reservation_repeat_type:
           id: reservation_repeat_type
           table: reserve_reservation__reservation_repeat_type
@@ -574,6 +419,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: field
           label: Repeating
           exclude: false
           alter:
@@ -628,7 +474,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          plugin_id: field
         reservation_repeat_until:
           id: reservation_repeat_until
           table: reserve_reservation__reservation_repeat_until
@@ -636,6 +481,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: field
           label: ''
           exclude: false
           alter:
@@ -692,7 +538,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          plugin_id: field
         reservable_content_type:
           id: reservable_content_type
           table: reserve_reservation__reservable_content_type
@@ -700,6 +545,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: field
           label: 'Reservation Type'
           exclude: false
           alter:
@@ -754,7 +600,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          plugin_id: field
         reservation_ebundle:
           id: reservation_ebundle
           table: reserve_reservation__reservation_ebundle
@@ -762,6 +607,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: field
           label: Ebundle
           exclude: false
           alter:
@@ -817,7 +663,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          plugin_id: field
         operations:
           id: operations
           table: reserve_reservation
@@ -825,6 +670,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: reserve_reservation
+          plugin_id: entity_operations
           label: Operations
           exclude: false
           alter:
@@ -867,8 +714,73 @@ display:
           empty_zero: false
           hide_alter_empty: true
           destination: true
-          entity_type: reserve_reservation
+      pager:
-          plugin_id: entity_operations
+        type: full
+        options:
+          offset: 0
+          items_per_page: 40
+          total_pages: null
+          id: 0
+          tags:
+            next: ››
+            previous: ‹‹
+            first: '« First'
+            last: 'Last »'
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          quantity: 9
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: none
+        options: {  }
+      cache:
+        type: tag
+        options: {  }
+      empty:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: text
+          empty: true
+          content:
+            value: 'The are no reservations.'
+            format: basic_html
+          tokenize: false
+      sorts:
+        reservation_date_value:
+          id: reservation_date_value
+          table: reserve_reservation__reservation_date
+          field: reservation_date_value
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: datetime
+          order: ASC
+          expose:
+            label: ''
+            field_identifier: reservation_date_value
+          exposed: false
+          granularity: second
+      arguments: {  }
       filters:
         name:
           id: name
@@ -877,6 +789,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: reserve_reservation
+          entity_field: name
+          plugin_id: string
           operator: contains
           value: ''
           group: 1
@@ -887,6 +802,8 @@ display:
             description: ''
             use_operator: false
             operator: name_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: name
             required: false
             remember: false
@@ -907,9 +824,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: reserve_reservation
-          entity_field: name
-          plugin_id: string
         reservation_date_value:
           id: reservation_date_value
           table: reserve_reservation__reservation_date
@@ -917,6 +831,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: datetime
           operator: '='
           value:
             min: ''
@@ -931,6 +846,8 @@ display:
             description: ''
             use_operator: false
             operator: reservation_date_value_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: reservation_date_value
             required: false
             remember: false
@@ -951,45 +868,122 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          plugin_id: datetime
-      sorts:
-        reservation_date_value:
-          id: reservation_date_value
-          table: reserve_reservation__reservation_date
-          field: reservation_date_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          order: ASC
-          exposed: false
-          expose:
-            label: ''
-          granularity: second
-          plugin_id: datetime
-      header: {  }
-      footer: {  }
-      empty:
-        area:
-          id: area
-          table: views
-          field: area
-          relationship: none
-          group_type: group
-          admin_label: ''
-          empty: true
-          tokenize: false
-          content:
-            value: 'The are no reservations.'
-            format: basic_html
-          plugin_id: text
-      relationships: {  }
-      arguments: {  }
-      display_extenders: {  }
       filter_groups:
         operator: OR
         groups:
           1: AND
-      title: 'My Rese'
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          columns:
+            name: name
+            reservation_date: reservation_date
+            reservation_time: reservation_date
+            reservation_length: reservation_date
+            reservation_private: reservation_private
+            reservation_repeat_type: reservation_repeat_type
+            reservation_repeat_until: reservation_repeat_type
+            reservable_content_type: reservable_content_type
+            reservation_ebundle: reservable_content_type
+            operations: operations
+          default: '-1'
+          info:
+            name:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            reservation_date:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ' '
+              empty_column: false
+              responsive: ''
+            reservation_time:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            reservation_length:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            reservation_private:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            reservation_repeat_type:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            reservation_repeat_until:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            reservable_content_type:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: '<br>'
+              empty_column: false
+              responsive: ''
+            reservation_ebundle:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            operations:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          override: true
+          sticky: false
+          summary: ''
+          empty_table: false
+          caption: ''
+          description: ''
+      row:
+        type: fields
+        options:
+          default_field_elements: true
+          inline: {  }
+          separator: ''
+          hide_empty: false
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      relationships: {  }
+      header: {  }
+      footer: {  }
+      display_extenders: {  }
     cache_metadata:
       max-age: 0
       contexts:
@@ -1007,26 +1001,26 @@ display:
         - 'config:field.storage.reserve_reservation.reservation_repeat_until'
         - 'config:field.storage.reserve_reservation.reservation_time'
   page_1:
-    display_plugin: page
     id: page_1
     display_title: 'Manage (admin)'
+    display_plugin: page
     position: 1
     display_options:
+      title: 'Manage Reservations'
+      defaults:
+        title: false
+      display_description: ''
       display_extenders: {  }
       path: admin/structure/reservations/reserve_reservations/manage-reservations
       menu:
         type: normal
         title: 'Manage Reservations'
         description: ''
+        weight: 0
         expanded: false
+        menu_name: admin
         parent: entity.reserve_reservation.collection
-        weight: 0
         context: '0'
-        menu_name: admin
-      display_description: ''
-      title: 'Manage Reservations'
-      defaults:
-        title: false
     cache_metadata:
       max-age: 0
       contexts:
@@ -1044,14 +1038,12 @@ display:
         - 'config:field.storage.reserve_reservation.reservation_repeat_until'
         - 'config:field.storage.reserve_reservation.reservation_time'
   page_2:
-    display_plugin: page
     id: page_2
     display_title: 'My Reservations'
+    display_plugin: page
     position: 2
     display_options:
-      display_extenders: {  }
+      title: 'My Reservations'
-      display_description: ''
-      path: reserve/%ebundle/my-reservations
       arguments:
         reservation_ebundle_value:
           id: reservation_ebundle_value
@@ -1060,6 +1052,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: string
           default_action: default
           exception:
             value: all
@@ -1075,8 +1068,8 @@ display:
           summary_options:
             base_path: ''
             count: true
-            items_per_page: 25
             override: false
+            items_per_page: 25
           summary:
             sort_order: asc
             number_of_records: 0
@@ -1092,7 +1085,6 @@ display:
           path_case: none
           transform_dash: false
           break_phrase: false
-          plugin_id: string
         user_id:
           id: user_id
           table: reserve_reservation_field_data
@@ -1100,6 +1092,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: reserve_reservation
+          entity_field: user_id
+          plugin_id: numeric
           default_action: default
           exception:
             value: all
@@ -1113,8 +1108,8 @@ display:
           summary_options:
             base_path: ''
             count: true
-            items_per_page: 25
             override: false
+            items_per_page: 25
           summary:
             sort_order: asc
             number_of_records: 0
@@ -1126,22 +1121,21 @@ display:
           validate_options: {  }
           break_phrase: false
           not: false
-          entity_type: reserve_reservation
-          entity_field: user_id
-          plugin_id: numeric
       defaults:
-        arguments: false
         title: false
+        arguments: false
+      display_description: ''
+      display_extenders: {  }
+      path: reserve/%ebundle/my-reservations
       menu:
         type: tab
         title: 'My Reservations'
         description: ''
+        weight: 0
         expanded: false
+        menu_name: main
         parent: ''
-        weight: 0
         context: '0'
-        menu_name: main
-      title: 'My Reservations'
     cache_metadata:
       max-age: 0
       contexts:

reservation.inc

@@ -8,6 +8,7 @@ use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Datetime\DrupalDateTime;
 use Drupal\Core\Link;
 use Drupal\Core\Url;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 
 function reserve_form_reserve_reservation_form_alter(array &$form, FormStateInterface $form_state) {
   // params either passed in on url -  CREATE
@@ -18,7 +19,7 @@ function reserve_form_reserve_reservation_form_alter(array &$form, FormStateInte
   // Retrieve an array which contains the path pieces.
   $current_path = \Drupal::service('path.current')->getPath();
   $path_args = explode('/', $current_path);
-  
+
   // for case of std reservation add form - this should likely be blocked; but leave for development
   if (count($path_args) <= 3) return;
 
@@ -30,7 +31,7 @@ function reserve_form_reserve_reservation_form_alter(array &$form, FormStateInte
   };
   $user = \Drupal::currentUser();
   $user_roles = $user->getRoles();
-  //Allow users with the 'add reservation extended' to book unlimited number 
+  //Allow users with the 'add reservation extended' to book unlimited number
   //of reservations.'
   $book_extended = FALSE;
   //Allow administrators to create as many reservations as needed.
@@ -79,33 +80,15 @@ function reserve_form_reserve_reservation_form_alter(array &$form, FormStateInte
     $d = $yyyymmdd . ' 00:00:00';
 
     if (reserve_daily_max_exceeded($yyyymmdd) && !$book_extended) {
-      $form = array();
+      $daily_exceeded_message = t('You have exceeded the max number of daily bookings.  Unable to add reservation.');
-      $form['message'] = [
+      reserve_set_modal_message($form, $daily_exceeded_message);
-        '#type' => 'markup',
-        '#weight' => -25,
-        '#markup' => '
-      <div class="messages__wrapper layout-container">
-      <div role="contentinfo" aria-label="Warning message" class="messages messages--warning">' .
-        t('You have exceeded the max number of daily bookings.  Unable to add reservation.') .
-        '</div></div>',
-      ];
-      return;
     }
     $config = \Drupal::config('reserve.settings');
     $max_per_user = $config->get('reservations_per_user');
-    if (count(reserve_user_reservations()) > $max_per_user 
+    if (count(reserve_user_reservations()) > $max_per_user
       && !$book_extended) {
-      $form = array();
+      $max_reservations_exceeded_message =  t('You have exceeded your max number of open bookings.  Unable to add reservation.');
-      $form['message'] = [
+      reserve_set_modal_message($form,  $max_reservations_exceeded_message);
-        '#type' => 'markup',
-        '#weight' => -25,
-        '#markup' => '
-      <div class="messages__wrapper layout-container">
-      <div role="contentinfo" aria-label="Warning message" class="messages messages--warning">' .
-        t('You have exceeded your max number of open bookings.  Unable to add reservation.') .
-        '</div></div>',
-      ];
-      return;
     }
   }
   $entity = \Drupal::entityTypeManager()->getStorage($entity_type)->load($eid);
@@ -116,9 +99,10 @@ function reserve_form_reserve_reservation_form_alter(array &$form, FormStateInte
   $bundleName = $bundle_info[$entity->getEntityTypeId()][$entity->bundle()]['label'];
 
   // set default Group Name as name of current user
-  $form['name']['widget'][0]['value']['#default_value'] = $form['name']['widget'][0]['value']['#default_value'] ?
+  $form['name']['widget'][0]['value']['#required'] = TRUE;
+  /*$form['name']['widget'][0]['value']['#default_value'] = $form['name']['widget'][0]['value']['#default_value'] ?
     $form['name']['widget'][0]['value']['#default_value'] :
-    \Drupal::currentUser()->getDisplayName();
+    \Drupal::currentUser()->getDisplayName();*/
 
   // set values taken from URL
   $form['reservation_date']['widget'][0]['value']['#default_value'] = DrupalDateTime::createFromTimestamp(strtotime($yyyymmdd));
@@ -174,7 +158,7 @@ function reserve_form_reserve_reservation_form_alter(array &$form, FormStateInte
 
       if (isset($_GET['single'])) {
         $series_link = Link::fromTextAndUrl(t('Click here'), Url::fromUri('internal:/reserve_reservation/' . $rid . '/edit', $modal))->toString();
-        $message = t('NOTE: you are editing a SINGLE day in a SERIES of reservations. Any changes made here will impact only the reservation  
+        $message = t('NOTE: you are editing a SINGLE day in a SERIES of reservations. Any changes made here will impact only the reservation
         for this day. %link if you want to edit the entire series.', array('%link' => $series_link));
         // relabel Delete
         $form['actions']['delete']['#title'] = t('Cancel Reservation for This Day');
@@ -182,7 +166,7 @@ function reserve_form_reserve_reservation_form_alter(array &$form, FormStateInte
       else {
         $single_link = Link::fromTextAndUrl('Click here', Url::fromUri('internal:/reserve_reservation/' . $rid . '/edit',
           ['query' => ['single' => 1]] + $modal))->toString();
-        $message = t('NOTE: you are editing a SERIES of reservations. Any changes made here will impact all reservations in this 
+        $message = t('NOTE: you are editing a SERIES of reservations. Any changes made here will impact all reservations in this
         series. %link if you only want to edit this specific day in this series.', array('%link' => $single_link));
         // remove single node delete and add Delete Series button
         //unset($form['actions']['delete']);
@@ -295,6 +279,21 @@ function reserve_return_to_home_page($form, FormStateInterface $form_state) {
   $form_state->setRedirectUrl($url);
 }
 
+function reserve_set_modal_message(&$form, $message) {
+  $form['message'] = [
+    '#type' => 'markup',
+    '#weight' => -25,
+    '#markup' => '
+      <div class="messages__wrapper layout-container">
+      <div role="contentinfo" aria-label="Warning message" class="messages messages--warning">' .
+      $message .
+      '</div></div>',
+  ];
+  $form['message']['#errors'] = TRUE;
+  $form['actions']['submit']['#attributes']['disabled']  = 'disabled';
+  $form['actions']['submit']['#access'] = FALSE;
+}
+
 /**
  * Custom submit handler for login form.
  */
@@ -305,4 +304,4 @@ function reserve_return_to_reservations_page($form, FormStateInterface $form_sta
     'selected_day' => $form_state->getValue('day'),
   ];
   $form_state->setRedirect('reserve.calendar', $arguments);
-}
+}

reserve.inc

@@ -1,4 +1,5 @@
 <?php
+use Drupal\field\Entity\FieldConfig;
 /**
  * @file
  * Classes and general Room Reservations helper functions.
@@ -21,13 +22,13 @@ function reserve_categories($ebundle = null) {
     $entity_type = ebundle_split($ebundle, 'type');
     $bundle = ebundle_split($ebundle, 'bundle');
     $field = reserve_category_fields($ebundle);
-    $fconfig = \Drupal\field\Entity\FieldConfig::loadByName($entity_type, $bundle, $field)->getSettings();
+    $fconfig = FieldConfig::loadByName($entity_type, $bundle, $field)->getSettings();
     $ids = array_filter($fconfig['categories']);
   }
   else {
     $query = \Drupal::service('entity_type.manager')
       ->getStorage('reserve_category')->getQuery();
-    $ids = $query->condition('status', TRUE)->execute();
+    $ids = $query->condition('status', TRUE)->accessCheck(FALSE)->execute();
   }
 
   $cats = \Drupal::entityTypeManager()->getStorage('reserve_category')->loadMultiple($ids);
@@ -66,7 +67,7 @@ function reserve_entities($ebundle) {
   }
 
     //->sort('reservations_display_order', 'ASC')
-  $ids = $query->execute();
+  $ids = $query->accessCheck(FALSE)->execute();
 
   $entities = \Drupal::entityTypeManager()->getStorage($entity_type)->loadMultiple($ids);
 
@@ -277,7 +278,7 @@ function reserve_hours($option = NULL) {
     }
 
     // convert display to 24:00 format if required
-    if ($config->get('reserve_hour_format')) {
+    if ($config->get('hour_format') == 1) {
       $display = date('H:i', strtotime($display));
     }
 
@@ -353,8 +354,8 @@ function reserve_facility_hours($date, $reset = FALSE) {
       $year = substr($month, 0, 4);
       $mo_hours = reserve_default_monthly_hours($year, $m);
     }
-    
+
-    $start = ($day - 1) * 5; 
+    $start = ($day - 1) * 5;
     $first_shift_open = $mo_hours[$start + 1];
     $first_shift_close = $mo_hours[$start + 2];
     $second_shift_open = $mo_hours[$start + 3];
@@ -696,7 +697,7 @@ function reserve_start_conflicts($room, $yyyy_mmdd, $time) {
     )
   ";
   $conflicts_found = FALSE;
-  $conflicts_found = db_query($sql, array(
+  $conflicts_found = \Drupal::database()->query($sql, array(
       ':room' => $room,
       ':date0' => $search_items[0]['date'], ':time0' => $search_items[0]['start_time'], ':length0' => $search_items[0]['length'],
       ':date1' => $search_items[1]['date'], ':time1' => $search_items[1]['start_time'], ':length1' => $search_items[1]['length'],
@@ -705,8 +706,7 @@ function reserve_start_conflicts($room, $yyyy_mmdd, $time) {
       ':date4' => $search_items[4]['date'], ':time4' => $search_items[4]['start_time'], ':length4' => $search_items[4]['length'],
       ':date5' => $search_items[5]['date'], ':time5' => $search_items[5]['start_time'], ':length5' => $search_items[5]['length'],
       ':date6' => $search_items[6]['date'], ':time6' => $search_items[6]['start_time'], ':length6' => $search_items[6]['length'],
-      ':date7' => $search_items[7]['date'], ':time7' => $search_items[7]['start_time'], ':length7' => $search_items[7]['length'])
+      ':date7' => $search_items[7]['date'], ':time7' => $search_items[7]['start_time'], ':length7' => $search_items[7]['length']))->rowCount();
-  )->rowCount();
   return $conflicts_found;
 }
 
@@ -923,7 +923,7 @@ function reserve_valid_lengths($rid, $ebundle, $yyyy_mmdd, $time, $id = NULL, $a
  *   FALSE - the maximum has not been exceeded.
  */
 function reserve_daily_max_exceeded($yyyy_mmdd) {
-  $user = \Drupal::currentUser(); 
+  $user = \Drupal::currentUser();
   $config = \Drupal::config('reserve.settings');
   $max = $config->get('reservations_per_day');
   if (!$max) {
@@ -933,6 +933,7 @@ function reserve_daily_max_exceeded($yyyy_mmdd) {
   if ($user->id()) {
    $ids = \Drupal::service('entity_type.manager')
       ->getStorage('reserve_reservation')->getQuery()
+      ->accessCheck(FALSE)
       ->condition('user_id', $user->id())
       ->condition('reservation_date', $yyyy_mmdd . '%', 'like')
       ->execute();
@@ -966,6 +967,7 @@ function reserve_user_reservations() {
     $latest_date = date('Y-m-d', strtotime("now +13 days"));
     $ids = \Drupal::service('entity_type.manager')
       ->getStorage('reserve_reservation')->getQuery()
+      ->accessCheck(TRUE)
       ->condition('user_id', $user->id())
       ->condition('reservation_date', $earliest_date, '>=')
       ->condition('reservation_date', $latest_date, '<=')
@@ -1091,7 +1093,7 @@ function reserve_which_year($month, $day) {
   // determine if this year or next year
   $yearnow = date('Y');
   $absdaynow = date('z');
-  $absdaydefault = date('z', mktime(0, 0, 0, $month, $day, $yearnow));
+  $absdaydefault = date('z', mktime(0, 0, 0, (int)$month, (int)$day, $yearnow));
   if ($absdaynow > $absdaydefault) {
     $year = $yearnow + 1;
   }
@@ -1123,4 +1125,4 @@ function reserve_get_ebundle_category_field($ebundle) {
       return $field;
     }
   }
-}
+}

reserve.info.yml

@@ -2,7 +2,7 @@ name: Reserve
 type: module
 description: Reservation system.
 package: Reserve
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^9.5 || ^10
 dependencies:
   - drupal:views
   - drupal:options

reserve.module

@@ -16,9 +16,9 @@ use Drupal\Core\Form\FormStateInterface;
 define ('RESERVE_SAVE_CONFIRMATION_MSG', t('Configuration settings have been saved'));
 define ('RESERVE_RESET_CONFIRMATION_MSG', t('Configuration settings have been reset to their default values'));
 
-module_load_include('inc', 'reserve', 'reserve');
+include(dirname(__FILE__) . '/reserve.inc');
-module_load_include('inc', 'reserve', 'reserve.series');
+include(dirname(__FILE__) . '/reserve.series.inc');
-module_load_include('inc', 'reserve', 'reservation');
+include(dirname(__FILE__) . '/reservation.inc');
 
 $GLOBALS['debug'] = false;
 

reserve.series.inc

@@ -1,4 +1,4 @@
-<?php  
+<?php
 
 /**
 *     Reservation CRUD for supporting Series
@@ -39,7 +39,7 @@ function reserve_reserve_reservation_insert($entity) {
   $ebundle = $rtype . '.' . \Drupal::entityTypeManager()
     ->getStorage($rtype)->load($rid)->bundle();
   $day = date('l', strtotime($start));
-  
+
   $msg = '';
   switch ($repeat_type) {
     // every day until....
@@ -48,7 +48,7 @@ function reserve_reserve_reservation_insert($entity) {
       $back = '-1 day';
       $msg = t('You have booked every day from %start until %end', array('%start' => $start_yyyy_mm_dd, '%end' => $end));
       break;
-    
+
     // this day of the week until..
     case 2:
       $skip = '+7 day';
@@ -70,7 +70,7 @@ function reserve_reserve_reservation_insert($entity) {
   $failed = array();
   while (strtotime($date) <= strtotime($back, strtotime($end))) {
     $date = date('Y-m-d', strtotime($skip, strtotime($date)));
-    
+
     // must check to see if next booking is available
     // the first one we don't check as we could not have picked it if it wasn't
     if (reserve_is_slot_free($rid, $ebundle, $date, $time, $length)) {
@@ -111,12 +111,12 @@ function reserve_reserve_reservation_update($entity) {
   }
 
   $sid = $entity->reservation_series_id->getString();
-  
+
   // if not part of a Series or special single only url -> do nothing
   if (!$sid || isset($_GET['single'])) {
     return;
   }
-  
+
   // reservation details
   $start =  $entity->reservation_date->getString();
   $time = $entity->reservation_time->getString();
@@ -130,6 +130,7 @@ function reserve_reserve_reservation_update($entity) {
   // grab all reservations in this series except the one being submitted
   $ids = \Drupal::service('entity_type.manager')
     ->getStorage('reserve_reservation')->getQuery()
+    ->accessCheck(TRUE)
     ->condition('status', TRUE)
     ->condition('reservation_series_id', $sid)
     ->condition('id', $entity->id(), '!=')
@@ -162,7 +163,7 @@ function reserve_reserve_reservation_update($entity) {
   if (count($failed)) {
     $dates = Markup::create('<br>' . implode('<br>', $failed));
     \Drupal::messenger()->addStatus(t('NOTE: The following dates did not have their length changed due to scheduling conflicts: %dates', array('%dates' => $dates)));
-  }  
+  }
 }
 
 /**
@@ -183,6 +184,7 @@ function _reserve_series_delete($entity) {
   // grab all reservations in this series
   $ids = \Drupal::service('entity_type.manager')
     ->getStorage('reserve_reservation')->getQuery()
+    ->accessCheck(TRUE)
     ->condition('reservation_series_id', $sid)
     ->execute();
   $results = \Drupal::entityTypeManager()->getStorage('reserve_reservation')->loadMultiple($ids);
@@ -190,5 +192,5 @@ function _reserve_series_delete($entity) {
     $result->delete();
   }
   $title = $entity->get('name')->getString();
-  \Drupal::messenger()->addStatus(t('The reservation series @title was deleted.', array('@title' => $title)));  
+  \Drupal::messenger()->addStatus(t('The reservation series @title was deleted.', array('@title' => $title)));
 }

src/Controller/CalendarController.php

@@ -1,6 +1,7 @@
 <?php
 namespace Drupal\reserve\Controller;
 
+use Drupal\field\Entity\FieldConfig;
 use Drupal\Core\Controller\ControllerBase;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Drupal\Core\Link;
@@ -334,7 +335,7 @@ class CalendarController extends ControllerBase {
     $extended = \Drupal::currentUser()->hasPermission('add reservations extended');
     $config = \Drupal::config('reserve.settings');
     $category_field = reserve_category_fields($ebundle);
-    $clearimg = '<img src="' . base_path() . drupal_get_path('module', 'reserve') . '/images/clear.png" />';
+    $clearimg = '<img src="' . base_path() . \Drupal::service('extension.list.module')->getPath('reserve') . '/images/clear.png" />';
     $modal = ['attributes' => [
       'class' => ['use-ajax'],
       'data-dialog-type' => 'modal',
@@ -371,12 +372,12 @@ class CalendarController extends ControllerBase {
     $variables['#calendar-text'] = $config->get('calendar_text');
     $variables['#reserve_room_instructions_text'] = $config->get('reserve_instructions') ? $config->get('reserve_instructions') :
       t('To make a reservation, click on the desired time/day in the calendar below. You will be asked to login.');
-    $variables['#arrow'] = base_path() . drupal_get_path('module', 'reserve') . '/images/arrow-icon.png';
+    $variables['#arrow'] = base_path() . \Drupal::service('extension.list.module')->getPath('reserve') . '/images/arrow-icon.png';
     $variables['#date'] = \Drupal::service('date.formatter')->format(strtotime($month . ' ' . $xday . ', ' . $year), 'custom', 'l, F d, Y');
     $variables['#date_picker'] = \Drupal::formBuilder()->getForm('Drupal\reserve\Form\CalendarDatePicker');
 
     $field = reserve_category_fields($ebundle);
-    $fconfig = \Drupal\field\Entity\FieldConfig::loadByName($entity_type, $bundle, $field)->getSettings();
+    $fconfig = FieldConfig::loadByName($entity_type, $bundle, $field)->getSettings();
     $variables['#calendar_header'] = $fconfig['calendar_header'];
     $variables['#reservation_instructions'] = $fconfig['reservation_instructions'];
 

src/Form/ReserveDailyHoursForm.php

@@ -5,7 +5,6 @@ namespace Drupal\reserve\Form;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 
-module_load_include('inc', 'reserve', 'reserve.admin');
 
 /**
 * Class ReserveCategorySettingsForm.

src/Form/ReserveDefaultHoursForm.php

@@ -5,8 +5,6 @@ namespace Drupal\reserve\Form;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 
-module_load_include('inc', 'reserve', 'reserve.admin');
-
 /**
 * Class ReserveCategorySettingsForm.
 *
@@ -235,7 +233,6 @@ class ReserveDefaultHoursForm extends ConfigFormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $values = $form_state->getValues();
-
     $default_hours = array();
     if ($form_state->getTriggeringElement()['#name'] == 'save') {
       for ($day = 0; $day < 7; $day++) {
@@ -244,7 +241,7 @@ class ReserveDefaultHoursForm extends ConfigFormBase {
         $default_hours[] = $values['day_' . $day]['second_shift_open_' . $day];
         $default_hours[] = $values['day_' . $day]['second_shift_close_' . $day];
       }
-      $confirmation = t(RESERVE_SAVE_CONFIRMATION_MSG);
+      $confirmation = RESERVE_SAVE_CONFIRMATION_MSG;
     }
     if ($form_state->getTriggeringElement()['#name'] == 'reset') {
       for ($day = 0; $day < 7; $day++) {

src/Form/ReserveSettingsForm.php

@@ -88,7 +88,7 @@ class ReserveSettingsForm extends ConfigFormBase {
       '#type' => 'select',
       '#options' => $options,
       '#default_value' => $config->get('reservation_max_length_standard') ? $config->get('reservation_max_length_standard') : 120,
-      '#description' => t('The maximum amount of time (in minutes) which a reservation can be made by a user with "Create new reservations (extended)" 
+      '#description' => t('The maximum amount of time (in minutes) which a reservation can be made by a user with "Create new reservations (extended)"
         privilege. Default is 120.'),
     );
 
@@ -97,7 +97,7 @@ class ReserveSettingsForm extends ConfigFormBase {
       '#type' => 'select',
       '#options' => $options,
       '#default_value' => $config->get('reservation_max_length_extended') ? $config->get('reservation_max_length_extended') : 120,
-      '#description' => t('The maximum amount of time (in minutes) which a reservation can be made by a user with "Create new reservations (extended)" 
+      '#description' => t('The maximum amount of time (in minutes) which a reservation can be made by a user with "Create new reservations (extended)"
         privilege. Default is 120.'),
     );
 
@@ -114,7 +114,7 @@ class ReserveSettingsForm extends ConfigFormBase {
       '#title' => t('Time to show on calendar before/after open slots'),
       '#type' => 'select',
       '#options' => array(0 => '0 hours', 1 => t('1 hour'), 2 => t('2 hours'), '3' => t('All day')),
-      '#default_value' => $config->get('show_before_after_hours') ? $config->get('advanced_booking_admin') : 3,
+      '#default_value' => $config->get('show_before_after_hours') ? $config->get('show_before_after_hours') : 3,
       '#description' => t('The number of hours before the first and last open slots for the day that are shown on the calendar. The default is to display the entire day.'),
     );
 

src/Plugin/Field/FieldFormatter/ReserveCategoryFormatter.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\reserve\Plugin\Field\FieldFormatter;
 
+use Drupal\reserve\Entity\ReserveCategory;
 use Drupal\Core\Field\FormatterBase;
 use Drupal\Core\Field\FieldItemListInterface;
 
@@ -35,7 +36,7 @@ class ReserveCategoryFormatter extends FormatterBase {
     $element = [];
 
     foreach ($items as $delta => $item) {
-      $category =  \Drupal\reserve\Entity\ReserveCategory::load($item->cid);
+      $category =  ReserveCategory::load($item->cid);
       // Render each element as markup.
       $element[$delta] = [
         '#type' => 'markup',

src/Plugin/Field/FieldType/ReserveCategory.php

@@ -1,5 +1,5 @@
 <?php
-  
+
 namespace Drupal\reserve\Plugin\Field\FieldType;
 
 use Drupal\Core\Field\FieldItemBase;
@@ -21,7 +21,7 @@ use Drupal\Core\TypedData\DataDefinition;
  *   category = @Translation("Reference"),
  *   cardinality = 1,
  * )
- * 
+ *
  */
 class ReserveCategory extends FieldItemBase implements FieldItemInterface {
   /**
@@ -64,7 +64,8 @@ class ReserveCategory extends FieldItemBase implements FieldItemInterface {
    */
   public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
     // get a list of all Reserve Categories
-    $ids = \Drupal::entityQuery('reserve_category')->sort('name', 'ASC')->execute();
+    $ids = \Drupal::entityQuery('reserve_category')->accessCheck(TRUE)
+      ->sort('name', 'ASC')->execute();
     $categories =  \Drupal\reserve\Entity\ReserveCategory::loadMultiple($ids);
     $options = array();
     foreach ($categories as $cat) {
@@ -113,4 +114,4 @@ class ReserveCategory extends FieldItemBase implements FieldItemInterface {
     ] + parent::defaultFieldSettings();
   }
 
-}
+}

src/Plugin/Field/FieldWidget/ReserveCategorySelect.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\reserve\Plugin\Field\FieldWidget;
 
+use Drupal\reserve\Entity\ReserveCategory;
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Field\WidgetBase;
 use Drupal\Core\Form\FormStateInterface;
@@ -29,8 +30,9 @@ class ReserveCategorySelect extends WidgetBase {
     // get a list of all Reserve Categories for this bundle
     $set = $items->getSettings()['categories'];
 
-    $ids = \Drupal::entityQuery('reserve_category')->sort('name', 'ASC')->execute();
+    $ids = \Drupal::entityQuery('reserve_category')->accessCheck(TRUE)
-    $categories =  \Drupal\reserve\Entity\ReserveCategory::loadMultiple($ids);
+      ->sort('name', 'ASC')->execute();
+    $categories =  ReserveCategory::loadMultiple($ids);
     $options = array();
     foreach ($categories as $key => $cat) {
       if (!in_array($key, $set)) continue;
@@ -46,4 +48,4 @@ class ReserveCategorySelect extends WidgetBase {
     return array('cid' => $element);
   }
 
-}
+}

src/Tests/LoadTest.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace Drupal\reserve\Tests;
-
-use Drupal\Core\Url;
-use Drupal\simpletest\WebTestBase;
-
-/**
- * Simple test to ensure that main page loads with module enabled.
- *
- * @group reserve
- */
-class LoadTest extends WebTestBase{
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['reserve'];
-
-  /**
-   * A user with permission to administer site configuration.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $user;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->user = $this->drupalCreateUser(['administer site configuration']);
-    $this->drupalLogin($this->user);
-  }
-
-  /**
-   * Tests that the home page loads with a 200 response.
-   */
-  public function testLoad() {
-    $this->drupalGet(Url::fromRoute('<front>'));
-    $this->assertResponse(200);
-  }
-
-}