Update CHANGELOG

.drone.yml

@@ -34,7 +34,7 @@ steps:
     - name: node_submodules
       image: node:20.15.0-slim
       commands:
-          - cd packages/adrema-form && npm ci && npm run build && rm -R node_modules && cd ../../
+          - cd packages/adrema-form && npm ci && npm run build-import && rm -R node_modules && cd ../../
 
     - name: node
       image: node:20.15.0-slim

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Letzte Änderungen
 
+### 1.12.27
+
+-   Bei Rechnungs-und Erinnerungsmails wird nun der Stammesname angezeigt. Zudm kann eine ReplyTo gesetzt werden, wenn gewünscht
+
+### 1.12.26
+
+-   Felder im Form-Builder können nun verschoben und kopiert werden
+
 ### 1.12.25
 
 -   Ein Bug wurde behoben, sodass nun wieder Bedingungen für Formular-Mails vergeben werden können

app/Invoice/InvoiceSettings.php

@@ -18,6 +18,7 @@ class InvoiceSettings extends LocalSettings implements Storeable
     public ?string $zip;
     public ?string $iban;
     public ?string $bic;
+    public ?string $replyTo;
     public ?int $rememberWeeks;
 
     public static function group(): string
@@ -43,6 +44,7 @@ class InvoiceSettings extends LocalSettings implements Storeable
                 'iban' => $this->iban,
                 'bic' => $this->bic,
                 'rememberWeeks' => $this->rememberWeeks,
+                'replyTo' => $this->replyTo,
             ]
         ];
     }
@@ -64,6 +66,7 @@ class InvoiceSettings extends LocalSettings implements Storeable
             'iban' => '',
             'bic' => '',
             'rememberWeeks' => '',
+            'replyTo' => '',
         ];
     }
 

app/Invoice/Mails/BillMail.php

@@ -2,6 +2,7 @@
 
 namespace App\Invoice\Mails;
 
+use App\Invoice\InvoiceSettings;
 use App\Invoice\Models\Invoice;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
@@ -12,6 +13,8 @@ class BillMail extends Mailable
     use Queueable;
     use SerializesModels;
 
+    public InvoiceSettings $settings;
+
     /**
      * Create a new message instance.
      *
@@ -19,6 +22,7 @@ class BillMail extends Mailable
      */
     public function __construct(public Invoice $invoice, public string $filename)
     {
+        $this->settings = app(InvoiceSettings::class);
     }
 
     /**
@@ -30,7 +34,7 @@ class BillMail extends Mailable
     {
         return $this->markdown('mail.invoice.bill')
             ->attach($this->filename)
-            ->replyTo('kasse@stamm-silva.de')
+            ->when($this->settings->replyTo, fn ($mail) => $mail->replyTo($this->settings->replyTo))
-            ->subject('Rechnung | DPSG Stamm Silva');
+            ->subject('Rechnung | '.$this->settings->from_long);
     }
 }

app/Invoice/Mails/RememberMail.php

@@ -2,6 +2,7 @@
 
 namespace App\Invoice\Mails;
 
+use App\Invoice\InvoiceSettings;
 use App\Invoice\Models\Invoice;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
@@ -12,6 +13,8 @@ class RememberMail extends Mailable
     use Queueable;
     use SerializesModels;
 
+    public InvoiceSettings $settings;
+
     /**
      * Create a new message instance.
      *
@@ -19,6 +22,7 @@ class RememberMail extends Mailable
      */
     public function __construct(public Invoice $invoice, public string $filename)
     {
+        $this->settings = app(InvoiceSettings::class);
     }
 
     /**
@@ -30,7 +34,7 @@ class RememberMail extends Mailable
     {
         return $this->markdown('mail.invoice.remember')
             ->attach($this->filename)
-            ->replyTo('kasse@stamm-silva.de')
+            ->when($this->settings->replyTo, fn ($mail) => $mail->replyTo($this->settings->replyTo))
-            ->subject('Zahlungserinnerung | DPSG Stamm Silva');
+            ->subject('Zahlungserinnerung | '.$this->settings->from_long);
     }
 }

database/settings/202511-07_create_replyTo_invoice_mail_settings.php

@@ -0,0 +1,11 @@
+<?php
+
+use Spatie\LaravelSettings\Migrations\SettingsMigration;
+
+return new class extends SettingsMigration
+{
+    public function up(): void
+    {
+        $this->migrator->add('bill.replyTo', '');
+    }
+};

packages/adrema-form

@@ -1 +1 @@
-Subproject commit a4a2a2b3fd7a099cf1e5a9360d5d5450030bf673
+Subproject commit 010825124f7791dfc0dc607e23ec99f49be8aef5

resources/js/views/form/Index.vue

@@ -69,13 +69,13 @@
                     <div>
                         <ui-tabs v-model="activeMailTab" :entries="mailTabs" />
                         <f-editor v-if="activeMailTab === 0" id="mail_top" v-model="single.mail_top" name="mail_top" label="E-Mail-Teil 1" :rows="8" conditions required>
-                            <template #conditions="{cData, resolve}">
+                            <template #conditions="{data, resolve}">
-                                <conditions-form id="mail_top_conditions" :single="single" :value="cData" @save="resolve" />
+                                <conditions-form id="mail_top_conditions" :single="single" :value="data" @save="resolve" />
                             </template>
                         </f-editor>
                         <f-editor v-if="activeMailTab === 1" id="mail_bottom" v-model="single.mail_bottom" name="mail_bottom" label="E-Mail-Teil 2" :rows="8" conditions required>
-                            <template #conditions="{d, resolve}">
+                            <template #conditions="{data, resolve}">
-                                <conditions-form id="mail_bottom_conditions" :single="single" :value="d" @save="resolve" />
+                                <conditions-form id="mail_bottom_conditions" :single="single" :value="data" @save="resolve" />
                             </template>
                         </f-editor>
                     </div>

resources/js/views/formtemplate/FormBuilder.vue

@@ -11,6 +11,17 @@
                 <f-text id="sectionform-name" v-model="singleSection.model.name" label="Name"></f-text>
                 <f-textarea id="sectionform-intro" v-model="singleSection.model.intro" label="Einleitung"></f-textarea>
             </asideform>
+            <asideform
+                v-if="moving !== null"
+                heading="Feld verschieben nach Sektion …"
+                @close="moving = null"
+            >
+                <div class="mt-3 grid gap-3">
+                    <a v-for="(section, index) in modelValue.sections" :key="index" class="py-2 px-3 border rounded bg-zinc-800 hover:bg-zinc-700 transition" href="#" @click.prevent="moveFieldToSection(index)">
+                        <span v-text="section.name"></span>
+                    </a>
+                </div>
+            </asideform>
             <asideform v-if="singleSection !== null && singleSection.mode === 'reorder'" heading="Felder ordnen" @close="singleSection = null" @submit="storeSection">
                 <draggable v-model="singleSection.model.fields" item-key="key" :component-data="{class: 'mt-3 grid gap-3'}">
                     <template #item="{element}">
@@ -59,6 +70,8 @@
                 @editFields="startReordering($event.detail[0])"
                 @deleteSection="deleteSection($event.detail[0])"
                 @active="updateActive($event.detail[0])"
+                @copy-field="copyField($event.detail[0], $event.detail[1])"
+                @move-field="moving = {section: $event.detail[0], field: $event.detail[1]}"
             ></event-form>
         </ui-box>
     </form>
@@ -67,7 +80,7 @@
 <script lang="js" setup>
 import { watch, computed, ref } from 'vue';
 import { snakeCase } from 'change-case';
-import '!/adrema-form/dist/main.js';
+import '!/adrema-form/dist/assets/main.js';
 import Asideform from './Asideform.vue';
 import TextareaField from './TextareaField.vue';
 import TextField from './TextField.vue';
@@ -83,6 +96,7 @@ import Draggable from 'vuedraggable';
 
 const singleSection = ref(null);
 const singleField = ref(null);
+const moving = ref(null);
 const active = ref(null);
 
 async function onReorder() {
@@ -124,6 +138,29 @@ function editSection(sectionIndex) {
         mode: 'edit',
     };
 }
+function moveFieldToSection(newSectionIndex) {
+    if (!moving.value) {
+        return;
+    }
+    singleField.value = {
+        model: JSON.parse(JSON.stringify(inner.value.sections[moving.value.section].fields[moving.value.field])),
+        sectionIndex: newSectionIndex,
+        index: null,
+    };
+    storeField();
+    deleteField(moving.value.section, moving.value.field);
+    moving.value = null;
+}
+
+function copyField(sectionIndex, fieldIndex) {
+    var field = JSON.parse(JSON.stringify(inner.value.sections[sectionIndex].fields[fieldIndex]));
+    field.name = field.name + ' - Kopie';
+    singleField.value = {
+        model: field,
+        sectionIndex: sectionIndex,
+        index: null,
+    };
+}
 
 function startReordering(index) {
     singleSection.value = {

resources/js/views/setting/Bill.vue

@@ -18,6 +18,7 @@
                 <f-text id="iban" v-model="inner.iban" label="IBAN"></f-text>
                 <f-text id="bic" v-model="inner.bic" label="BIC"></f-text>
                 <f-text id="remember_weeks" v-model="inner.rememberWeeks" type="number" label="Erinnerung alle X Wochen versenden"></f-text>
+                <f-text id="reply_to" v-model="inner.replyTo" label="Reply-To E-Mail-Adresse"></f-text>
             </form>
         </setting-layout>
     </page-layout>

resources/views/mail/invoice/bill.blade.php

@@ -1,7 +1,7 @@
 @component('mail::message')
 # {{ $invoice->greeting }},
 
-Im Anhang findet ihr die aktuelle Rechnung des Stammes Silva für das laufende Jahr. Bitte begleicht diese bis zum angegebenen Datum.
+Im Anhang findet ihr die aktuelle Rechnung an {{$settings->from}} für das laufende Jahr. Bitte begleicht diese bis zum angegebenen Datum.
 
 @component('mail::subcopy')
 

resources/views/mail/invoice/remember.blade.php

@@ -1,7 +1,7 @@
 @component('mail::message')
 # {{ $invoice->greeting }},
 
-Hiermit möchten wir euch an die noch ausstehenden Mitgliedsbeiträge des Stammes Silva für das laufende Jahr erinnern. Bitte begleicht diese bis zum angegebenen Datum.
+Hiermit möchten wir euch an die noch ausstehenden Mitgliedsbeiträge an {{$settings->from}} für das laufende Jahr erinnern. Bitte begleicht diese bis zum angegebenen Datum.
 
 @component('mail::subcopy')
 

tests/Feature/Invoice/InvoiceSendActionTest.php

@@ -48,6 +48,7 @@ class InvoiceSendActionTest extends TestCase
         Tex::spy();
         Storage::fake('temp');
         $this->withoutExceptionHandling()->login()->loginNami();
+        app(InvoiceSettings::class)->fill(['from_long' => 'Stammname', 'replyTo' => 'reply@mail.com'])->save();
         $invoice = Invoice::factory()
             ->to(ReceiverRequestFactory::new()->name('Familie Muster'))
             ->has(InvoicePosition::factory()->withMember(), 'positions')
@@ -57,7 +58,13 @@ class InvoiceSendActionTest extends TestCase
 
         InvoiceSendAction::run();
 
-        Mail::assertSent(RememberMail::class, fn ($mail) => $mail->build() && $mail->hasTo('max@muster.de', 'Familie Muster') && Storage::disk('temp')->path('zahlungserinnerung-fur-familie-muster.pdf') === $mail->filename && Storage::disk('temp')->exists('zahlungserinnerung-fur-familie-muster.pdf'));
+        Mail::assertSent(RememberMail::class, fn ($mail) => $mail->build()
+            && $mail->hasTo('max@muster.de', 'Familie Muster')
+            && $mail->hasSubject('Zahlungserinnerung | Stammname')
+            && Storage::disk('temp')->path('zahlungserinnerung-fur-familie-muster.pdf') === $mail->filename
+            && Storage::disk('temp')->exists('zahlungserinnerung-fur-familie-muster.pdf')
+            && $mail->hasReplyTo('reply@mail.com')
+        );
         Tex::assertCompiled(RememberDocument::class, fn ($document) => 'Familie Muster' === $document->toName);
         $this->assertEquals(now()->format('Y-m-d'), $invoice->fresh()->last_remembered_at->format('Y-m-d'));
     }

tests/Feature/Invoice/SettingTest.php

@@ -33,7 +33,8 @@ class SettingTest extends TestCase
             'zip' => '12345',
             'iban' => 'DE05',
             'bic' => 'SOLSDE',
-            'rememberWeeks' => 6
+            'rememberWeeks' => 6,
+            'replyTo' => 'reply@example.com',
         ])->save();
 
         $this->get(route('setting.data', ['settingGroup' => 'bill']))
@@ -49,7 +50,8 @@ class SettingTest extends TestCase
             ->assertInertiaPath('data.zip', '12345')
             ->assertInertiaPath('data.iban', 'DE05')
             ->assertInertiaPath('data.bic', 'SOLSDE')
-            ->assertInertiaPath('data.rememberWeeks', 6);
+            ->assertInertiaPath('data.rememberWeeks', 6)
+            ->assertInertiaPath('data.replyTo', 'reply@example.com');
     }
 
     public function testItReturnsTabs(): void
@@ -78,7 +80,8 @@ class SettingTest extends TestCase
             'zip' => '12345',
             'iban' => 'DE05',
             'bic' => 'SOLSDE',
-            'rememberWeeks' => 10
+            'rememberWeeks' => 10,
+            'replyTo' => 'reply@example.com2',
         ]);
 
         $response->assertRedirect('/setting/bill');
@@ -86,6 +89,7 @@ class SettingTest extends TestCase
         $this->assertEquals('DPSG Stamm Muster', $settings->from_long);
         $this->assertEquals('DE05', $settings->iban);
         $this->assertEquals('SOLSDE', $settings->bic);
+        $this->assertEquals('reply@example.com2', $settings->replyTo);
         $this->assertEquals(10, $settings->rememberWeeks);
     }
 }