Comments for invoices

app/Domains/Invoice/Actions/CreateInvoice/CreateInvoiceCommand.php

@@ -43,6 +43,7 @@ class CreateInvoiceCommand {
             'passengers' => $this->request->passengers,
             'transportation' => $this->request->transportations,
             'payment_purpose' => $this->request->paymentPurpose,
+            'comment' => $this->request->notices,
             'document_filename' => $this->request->receiptFile !== null ? $this->request->receiptFile->fullPath : null,
         ]);
 

app/Domains/Invoice/Actions/CreateInvoice/CreateInvoiceRequest.php

@@ -24,6 +24,7 @@ class CreateInvoiceRequest {
     public ?int $userId;
     public ?string $travelReason;
     public ?string $paymentPurpose;
+    public ?string $notices;
 
 
     public function __construct(
@@ -45,6 +46,7 @@ class CreateInvoiceRequest {
         ?int $transportations,
         ?string $travelReason = null,
         ?string $paymentPurpose = null,
+        ?string $notices = null,
 
     ) {
         $this->costUnit = $costUnit;
@@ -65,6 +67,7 @@ class CreateInvoiceRequest {
         $this->userId = $userId;
         $this->travelReason = $travelReason;
         $this->paymentPurpose = $paymentPurpose;
+        $this->notices = $notices;
 
         if ($accountIban === 'undefined') {
             $this->accountIban = null;

app/Domains/Invoice/Actions/CreateInvoiceReceipt/CreateInvoiceReceiptCommand.php

@@ -60,7 +60,6 @@ class CreateInvoiceReceiptCommand {
                     storage_path('app/private/' .$filename) . '.zip',
                     ZipArchive::CREATE | ZipArchive::OVERWRITE
                 );
-dd($receipt);
                 $zip->addFile(storage_path('app/private/' . $tmpFileName ), 'antrag.pdf');
                 $zip->addFile(storage_path('app/private/' . $receipt), 'beleg.pdf');
 
@@ -114,6 +113,9 @@ HTML;
                         <tr><td>Name:</td><td>%3\$s</td></tr>
                         <tr><td>E-Mail:</td><td>%4\$s</td></tr>
                         <tr><td>Telefon:</td><td>%5\$s</td></tr>
+                        <tr><td>Anmerkungen:</td><td>%16\$s</td></tr>
+
+
                         <tr><td>Name der Kostenstelle:</td><td>%6\$s</td></tr>
                         <tr><td>Zahlungsgrund:</td><td>%7\$s</td></tr>
                         <tr><td>Wird der Betrag gespendet:</td><td>%8\$s</td></tr>
@@ -186,7 +188,8 @@ HTML;
             $invoiceReadable['createdAt'],
             $invoiceReadable['approvedAt'],
             $invoiceReadable['approvedBy'],
-            $changes
+            $changes,
+            $invoiceReadable['comment'],
         );
     }
 

app/Domains/Invoice/Actions/UpdateInvoice/UpdateInvoiceRequest.php

@@ -8,13 +8,13 @@ use App\Models\Invoice;
 use App\ValueObjects\Amount;
 
 class UpdateInvoiceRequest {
-    public string $comment;
+    public ?string $comment;
     public InvoiceType $invoiceType;
     public CostUnit $costUnit;
     public Invoice $invoice;
     public Amount $amount;
 
-    public function __construct(Invoice $invoice, string $comment, InvoiceType $invoiceType, CostUnit $costUnit, Amount $amount) {
+    public function __construct(Invoice $invoice, ?string $comment, InvoiceType $invoiceType, CostUnit $costUnit, Amount $amount) {
         $this->comment = $comment;
         $this->invoiceType = $invoiceType;
         $this->costUnit = $costUnit;

app/Domains/Invoice/Controllers/EditController.php

@@ -47,7 +47,10 @@ class EditController extends CommonController{
             $invoice->travel_direction,
             $invoice->distance,
             $invoice->passengers,
-            $invoice->transportation
+            $invoice->transportation,
+            $invoice->travel_reason,
+            $invoice->payment_purpose,
+            $invoice->comment,
         );
 
         $invoiceCreationCommand = new CreateInvoiceCommand($createInvoiceRequest);
@@ -86,7 +89,7 @@ class EditController extends CommonController{
 
         $updateInvoiceRequest = new UpdateInvoiceRequest(
             $invoice,
-            $modifyData['reason_of_correction'] ?? 'Abrechnungskorrektur',
+            $modifyData['notices'],
             $invoiceType,
             $newCostUnit,
             $newAmount

app/Domains/Invoice/Controllers/SaveInvoiceController.php

@@ -18,6 +18,7 @@ class SaveInvoiceController extends CommonController
     public function __invoke(Request $request, int $costUnitId, string $invoiceType) : JsonResponse {
         $costUnit = $this->costUnits->getById($costUnitId, true);
         $paymentPurpose = $request->input('paymentPurpose') ?? null;
+        $notices = $request->input('notices') ?? null;
         if (null === $costUnit) {
             return response()->json([
                 'status' => 'error',
@@ -82,6 +83,8 @@ class SaveInvoiceController extends CommonController
                     $request->input('havePassengers'),
                     $request->input('materialTransportation'),
                     $request->input('travelReason'),
+                    null,
+                    $notices
                 );
 
                 break;
@@ -106,6 +109,7 @@ class SaveInvoiceController extends CommonController
                     $request->input('materialTransportation'),
                     null,
                     $paymentPurpose,
+                    $notices
                 );
 
                 break;

app/Domains/Invoice/Views/Partials/invoiceDetails/EditInvoice.vue

@@ -20,7 +20,7 @@ const formData = reactive({
     type_internal: props.newInvoice.internalType || '',
     cost_unit: props.newInvoice.costUnitId || '',
     amount: props.newInvoice.amountPlain || '',
-    reason_of_correction: '',
+    notices: props.newInvoice.comments || '',
 })
 
 const submitForm = () => {
@@ -71,9 +71,13 @@ onMounted(async () => {
             </tr>
 
             <tr>
-                <td>Grund der Korrektur:</td>
+                <td>Anmerkungen:</td>
                 <td>
-                    <input type="text" v-model="formData.reason_of_correction" class="width-half-full" />
+                    <textarea
+                        id="notices"
+                        name="notices" v-model="formData.notices"
+                        maxlength="128"
+                        style="font-size: 14pt; width: 550px;" />
                 </td>
             </tr>
 

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

@@ -41,6 +41,7 @@ const decision = ref('')
 const errorMsg = ref('')
 const confirmation = ref(null)
 const receiptError = ref('')
+const notices = ref('')
 
 async function sendData() {
     if (!userName.value) return
@@ -62,6 +63,7 @@ async function sendData() {
     formData.append('havePassengers', props.havePassengers ? 1 : 0)
     formData.append('materialTransportation', props.materialTransportation ? 1 : 0)
     formData.append('travelReason', props.travelReason)
+    formData.append('notices', notices.value)
 
     if (props.receipt) {
         formData.append('receipt', props.receipt)
@@ -121,6 +123,15 @@ async function sendData() {
             name="contact_telephone" v-model="userTelephone"
             style="font-size: 14pt; width: 550px;" /><br /><br />
 
+        <label v-if="userName !== ''">
+            <strong>Weitere Informationen zur Abrechnung (Max. 128 Zeichen):</strong>
+        </label><br />
+        <textarea
+            id="notices"
+            name="notices" v-model="notices"
+            maxlength="128"
+            style="font-size: 14pt; width: 550px;" /><br /><br />
+
         <span id="decision" v-if="userEmail !== '' && userTelephone !== '' && decision === ''">
           <label><br />
               <strong>Möchtest du den Betrag spenden?</strong>