Small improvements

app/Domains/Event/Actions/SignUp/SignUpRequest.php

@@ -19,7 +19,7 @@ class SignUpRequest {
         public Tenant $localGroup,
         public DateTime $birthday,
         public string $address_1,
-        public string $address_2,
+        public ?string $address_2,
         public string $postcode,
         public string $city,
         public string $email_1,

app/Domains/Event/Controllers/CreateController.php

@@ -41,7 +41,8 @@ class CreateController extends CommonController {
         $payPerDay = $request->input('eventPayPerDay');
         $payDirect = $request->input('eventPayDirectly');
 
-        $billingDeadline = $eventEnd->modify('+6 weeks');
+        $billingDeadline = clone $eventEnd;
+        $billingDeadline->modify('+6 weeks');
 
         $createRequest = new CreateEventRequest(
             $request->input('eventName'),

app/Domains/Event/Controllers/SignupController.php

@@ -97,7 +97,8 @@ class SignupController extends CommonController {
         );
 
         $signupRequest = new SignUpRequest(
-            $event,$registrationData['userId'],
+            $event,
+            $registrationData['userId'] ?? null,
             $registrationData['vorname'],
             $registrationData['nachname'],
             $registrationData['pfadiname'],

app/Domains/Event/Routes/web.php

@@ -16,10 +16,13 @@ Route::middleware(IdentifyTenant::class)->group(function () {
         Route::get('/{eventId}/signup', SignupController::class);
 
         Route::middleware(['auth'])->group(function () {
-            Route::get('/new', CreateController::class);
             Route::get('/details/{eventId}', DetailsController::class);
             Route::get('/details/{eventId}/pdf/{listType}', [DetailsController::class, 'downloadPdfList']);
             Route::get('/details/{eventId}/csv/{listType}', [DetailsController::class, 'downloadCsvList']);
         });
     });
+
+    Route::middleware(['auth'])->group(function () {
+        Route::get('/create-event', CreateController::class);
+    });
 });

app/Domains/Event/Views/Partials/SignUpForm/steps/StepPersonalData.vue

@@ -1,5 +1,6 @@
 <script setup>
 import {reactive} from "vue";
+import ErrorText from "../../../../../../Views/Components/ErrorText.vue";
 
 const props = defineProps({ formData: Object, localGroups: Array })
 const emit = defineEmits(['next', 'back'])
@@ -64,6 +65,11 @@ const next = () => {
         hasError = true
     }
 
+    if (!props.formData.telefon_1) {
+        errors.telefon_1 = 'Bitte eine Telefonnummer angeben.'
+        hasError = true
+    }
+
     if (!props.formData.email_1) {
         errors.email_1 = 'Bitte eine E-Mail-Adresse angeben.'
         hasError = true
@@ -80,8 +86,8 @@ const next = () => {
     <div>
         <h3>Persönliche Daten</h3>
         <table class="form-table">
-            <tr><td>Vorname:</td><td><input type="text" v-model="props.formData.vorname" /></td></tr>
-            <tr><td>Nachname:</td><td><input type="text" v-model="props.formData.nachname" /></td></tr>
+            <tr><td>Vorname:</td><td><input type="text" v-model="props.formData.vorname" /><ErrorText :message="errors.vorname"/></td></tr>
+            <tr><td>Nachname:</td><td><input type="text" v-model="props.formData.nachname" /><ErrorText :message="errors.nachname"/></td></tr>
             <tr><td>Pfadiname:</td><td><input type="text" v-model="props.formData.pfadiname" /></td></tr>
             <tr>
                 <td>Stamm:</td>
@@ -90,9 +96,10 @@ const next = () => {
                         <option value="-1">Bitte wählen</option>
                         <option v-for="lg in localGroups" :key="lg.id" :value="lg.id">{{ lg.name }}</option>
                     </select>
+                    <ErrorText :message="errors.localGroup" />
                 </td>
             </tr>
-            <tr><td>Geburtsdatum:</td><td><input type="date" v-model="props.formData.geburtsdatum" /></td></tr>
+            <tr><td>Geburtsdatum:</td><td><input type="date" v-model="props.formData.geburtsdatum" /><ErrorText :message="errors.geburtsdatum" /></td></tr>
             <tr>
                 <td>Adresse:</td>
                 <td>
@@ -103,6 +110,7 @@ const next = () => {
                 <td></td>
                 <td>
                     <input type="text" v-model="props.formData.address2" />
+                    <ErrorText :message="errors.address1" />
                 </td>
             </tr>
             <tr>
@@ -110,10 +118,12 @@ const next = () => {
                 <td>
                     <input maxlength="5" type="text" v-model="props.formData.plz" style="width: 100px; margin-right: 8px;" />
                     <input type="text" v-model="props.formData.ort" style="width: calc(100% - 110px);" />
+                    <ErrorText :message="errors.plz" />
+                    <ErrorText :message="errors.ort" />
                 </td>
             </tr>
-            <tr><td>Telefon:</td><td><input type="text" v-model="props.formData.telefon_1" /></td></tr>
-            <tr><td>E-Mail:</td><td><input type="text" v-model="props.formData.email_1" /></td></tr>
+            <tr><td>Telefon:</td><td><input type="text" v-model="props.formData.telefon_1" /><ErrorText :message="errors.telefon_1" /></td></tr>
+            <tr><td>E-Mail:</td><td><input type="text" v-model="props.formData.email_1" /><ErrorText :message="errors.email_1" /></td></tr>
             <tr>
                 <td colspan="2" class="btn-row">
                     <button type="button" class="btn-primary" @click="next">Weiter →</button>

app/Domains/Invoice/Views/Partials/newInvoice/refund-data.vue

@@ -118,7 +118,7 @@ async function sendData() {
             name="contact_telephone" v-model="userTelephone"
             style="font-size: 14pt; width: 550px;" /><br /><br />
 
-        <span id="decision" v-if="userEmail !== '' && decision === ''">
+        <span id="decision" v-if="userEmail !== '' && userTelephone !== '' && decision === ''">
           <label><br />
               <strong>Möchtest du den Betrag spenden?</strong>
           </label><br />

app/Providers/GlobalDataProvider.php

@@ -129,7 +129,7 @@ class GlobalDataProvider {
                     $navigation['events'][] = ['url' => '/event/details/' . $event->identifier, 'display' => $event->name];
                 }
 
-                $navigation['events'][] = ['url' => '/event/new', 'display' => 'Neue Veranstaltung'];
+                $navigation['events'][] = ['url' => '/create-event', 'display' => 'Neue Veranstaltung'];
 
             }
         }

app/Repositories/CostUnitRepository.php

@@ -90,7 +90,7 @@ class CostUnitRepository {
         $visibleCostUnits = [];
         /** @var CostUnit $costUnit */
         foreach (Costunit::where($criteria)->get() as $costUnit) {
-            if ($costUnit->treasurers()->where('user_id', $user->id)->exists() || $canSeeAll || $disableAccessCheck) {
+            if ($canSeeAll || $disableAccessCheck || $costUnit->treasurers()->where('user_id', $user->id)->exists() ) {
                 if ($forDisplay) {
                     $visibleCostUnits[] = new CostUnitResource($costUnit)->toArray(request());
                 } else {

docker/prod.Dockerfile

@@ -22,7 +22,9 @@ RUN apk add --no-cache --virtual .build-deps \
     libxml2-dev \
     oniguruma-dev \
     nodejs \
-    npm
+    imagemagick-dev \
+    npm && \
+    pecl install imagick && docker-php-ext-enable imagick
 
 RUN docker-php-ext-install mysqli pdo pdo_mysql mbstring zip exif pcntl gd
 
@@ -36,4 +38,6 @@ EXPOSE 9000
 
 RUN mv /var/www/html /src
 COPY docker/run-mareike.sh /usr/local/bin/
+
+USER mareike
 CMD ["run-mareike.sh"]

docker/run-mareike.sh

@@ -12,6 +12,24 @@ install -d -m 0755 -o $USER -g $GROUPNAME \
   storage/app/private \
   storage/logs
 
+rm .dockerignore
+rm .editorconfig
+rm .env.example
+rm .gitattributes
+rm .gitignore
+rm Makefile
+rm README.md
+rm docker-compose.dev
+rm docker-compose.prod
+rm justfile
+rm phpunit.xml
+rm -rf node_modules
+rm composer.json
+rm composer.lock
+rm package-lock.json
+rm package.json
+rm -rf docker
+
 php artisan migrate --force
 
 exec "php-fpm"