Fix validation of URLs and translations of validation messages

app/Http/Requests/BookingOptionRequest.php

@@ -63,6 +63,7 @@ public function rules(): array
             'available_from' => [
                 'nullable',
                 'date_format:Y-m-d\TH:i',
+                'required_with:available_until',
             ],
             'available_until' => [
                 'nullable',

app/Http/Requests/EventRequest.php

@@ -58,14 +58,15 @@ public function rules(): array
             'started_at' => [
                 'nullable',
                 'date_format:Y-m-d\TH:i',
+                'required_with:finished_at',
             ],
             'finished_at' => [
                 'nullable',
                 'date_format:Y-m-d\TH:i',
             ],
             'website_url' => [
                 'nullable',
-                'string',
+                'url:http,https',
                 'max:255',
             ],
             'location_id' => [

app/Http/Requests/GenerateGroupsRequest.php

@@ -93,8 +93,15 @@ public function rules(): array
 
     public function attributes(): array
     {
-        return [
+        $attributes = [
             'booking_option_id' => __('Booking options'),
+            'exclude_parent_group_id' => __('Exclude members of groups'),
         ];
+
+        foreach (range(0, count($this->input('exclude_parent_group_id')) - 1) as $id) {
+            $attributes['exclude_parent_group_id.' . $id] = __('Exclude members of groups');
+        }
+
+        return $attributes;
     }
 }

app/Http/Requests/LocationRequest.php

@@ -23,19 +23,18 @@ class LocationRequest extends FormRequest
      */
     public function rules(): array
     {
-        $rules = [
+        return [
             'name' => [
                 'nullable',
                 'string',
                 'max:255',
             ],
             'website_url' => [
                 'nullable',
-                'string',
+                'url:http,https',
                 'max:255',
             ],
+            ...$this->rulesForAddressFields('nullable'),
         ];
-
-        return array_replace($rules, $this->rulesForAddressFields('nullable'));
     }
 }

app/Http/Requests/OrganizationRequest.php

@@ -47,7 +47,7 @@ public function rules(): array
             ],
             'website_url' => [
                 'nullable',
-                'string',
+                'url:http,https',
                 'max:255',
             ],
             'location_id' => [

lang/de.json

@@ -107,6 +107,7 @@
     "Edit users": "Benutzer bearbeiten",
     "email field": "E-Mail-Feld",
     "End date": "Enddatum",
+    "End of the booking period": "Ende des Anmeldezeitraums",
     "End of the period": "Ende des Zeitraums",
     "Event": "Veranstaltung",
     "Event series": "Veranstaltungsreihen",
@@ -244,6 +245,7 @@
     "Sorting": "Sortierung",
     "spreadsheet": "Tabellenkalkulation",
     "Start date": "Startdatum",
+    "Start of the booking period": "Beginn des Anmeldezeitraums",
     "Start of the period": "Beginn des Zeitraums",
     "Status": "Status",
     "Street": "Straße",

lang/de/validation.php

@@ -162,7 +162,12 @@
         'abilities' => 'Berechtigungen',
         'address' => 'Adresse',
         'approval_status' => 'Freigabestatus',
+        'available_from' => 'Beginn des Anmeldezeitraums',
+        'available_until' => 'Ende des Anmeldezeitraums',
+        'booking_option_id' => 'Anmeldeoption',
+        'city' => 'Stadt',
         'comment' => 'Kommentar',
+        'country' => 'Land',
         'current_password' => 'Derzeitiges Passwort',
         'date' => 'Datum',
         'date_from' => 'Beginn des Zeitraums',
@@ -171,17 +176,21 @@
         'day' => 'Tag',
         'description' => 'Beschreibung',
         'email' => 'E-Mail-Adresse',
+        'event_series_id' => 'Teil der Veranstaltungsreihe',
         'event_series_type' => 'Art der Veranstaltungsreihe',
         'event_type' => 'Art der Veranstaltung',
         'expires_at' => 'Ablaufdatum',
-        'file' => 'Datei',
         'file_type' => 'Dateiformat',
+        'file' => 'Datei',
+        'finished_at' => 'Enddatum',
         'first_name' => 'Vorname',
         'groups_count' => 'Anzahl der Gruppen',
         'height' => 'Höhe',
         'hour' => 'Stunde',
+        'house_number' => 'Hausnummer',
         'last_name' => 'Nachname',
         'location_id' => 'Standort',
+        'maximum_bookings' => 'Maximale Anmeldungen',
         'method' => 'Methode',
         'minute' => 'Minute',
         'month' => 'Monat',
@@ -194,21 +203,27 @@
         'password' => 'Passwort',
         'password_confirmation' => 'Passwort Bestätigung',
         'phone' => 'Telefonnummer',
+        'postal_code' => 'Postleitzahl',
         'price' => 'Preis',
         'register_entry' => 'Registereintrag',
         'representatives' => 'Vertreter',
+        'restrictions' => 'Einschränkungen',
         'search' => 'Suchbegriff',
         'second' => 'Sekunde',
         'size' => 'Größe',
+        'slug' => 'Slug',
         'sort' => 'Sortierung',
+        'started_at' => 'Startdatum',
         'status' => 'Status',
+        'street' => 'Straße',
+        'terms_and_conditions' => 'AGB',
         'thickness' => 'Dicke',
         'time' => 'Uhrzeit',
         'title' => 'Titel',
-        'terms_and_conditions' => 'AGB',
         'unit' => 'Einheit',
         'user_role_id' => 'Benutzerrolle',
         'visibility' => 'Sichtbarkeit',
+        'website_url' => 'Webauftritt',
         'width' => 'Breite',
         'year' => 'Jahr',
     ],

lang/en/validation.php

@@ -163,9 +163,23 @@
          * As the database scheme is in English, translations work out of the box for the most attributes.
          * The other attributes have to be added here.
          */
+        'available_from' => 'Start of the booking period',
+        'available_until' => 'End of the booking period',
+        'booking_option_id' => 'Booking option',
+        'date_from' => 'start of the period',
+        'date_until' => 'end of the period',
+        'event_series_id' => 'Part of the event series',
+        'expires_at' => 'expiration date',
+        'finished_at' => 'End date',
         'location_id' => 'Location',
+        'organization_id' => 'Organization',
+        'parent_event_id' => 'Part of the event',
+        'parent_event_series_id' => 'Part of the event series',
         'parent_organization_id' => 'Parent organization',
+        'search' => 'search term',
+        'started_at' => 'Start date',
         'user_role_id' => 'User role',
+        'website_url' => 'website',
     ],
 
 ];

resources/views/booking_options/booking_option_form.blade.php

@@ -51,9 +51,9 @@
                     @endisset
                 </x-bs::form.field>
                 <x-bs::form.field name="available_from" type="datetime-local"
-                                  :value="isset($bookingOption->available_from) ? $bookingOption->available_from->format('Y-m-d\TH:i') : null">{{ __('Start date') }}</x-bs::form.field>
+                                  :value="isset($bookingOption->available_from) ? $bookingOption->available_from->format('Y-m-d\TH:i') : null">{{ __('Start of the booking period') }}</x-bs::form.field>
                 <x-bs::form.field name="available_until" type="datetime-local"
-                                  :value="isset($bookingOption->available_until) ? $bookingOption->available_until->format('Y-m-d\TH:i') : null">{{ __('End date') }}</x-bs::form.field>
+                                  :value="isset($bookingOption->available_until) ? $bookingOption->available_until->format('Y-m-d\TH:i') : null">{{ __('End of the booking period') }}</x-bs::form.field>
                 <x-bs::form.field name="price" type="number" min="0.01" step="0.01"
                                   :value="$bookingOption->price ?? null">
                     {{ __('Price') }}