Add notes to invoices

Author: daveearley

backend/app/DomainObjects/Generated/EventSettingDomainObjectAbstract.php

@@ -52,10 +52,12 @@ abstract class EventSettingDomainObjectAbstract extends \HiEvents\DomainObjects\
     final public const REQUIRE_BILLING_ADDRESS = 'require_billing_address';
     final public const ORGANIZATION_NAME = 'organization_name';
     final public const ORGANIZATION_ADDRESS = 'organization_address';
-    final public const TAX_DETAILS = 'tax_details';
+    final public const INVOICE_TAX_DETAILS = 'invoice_tax_details';
     final public const PAYMENT_PROVIDERS = 'payment_providers';
     final public const OFFLINE_PAYMENT_INSTRUCTIONS = 'offline_payment_instructions';
     final public const ALLOW_ORDERS_AWAITING_OFFLINE_PAYMENT_TO_CHECK_IN = 'allow_orders_awaiting_offline_payment_to_check_in';
+    final public const INVOICE_PAYMENT_TERMS_DAYS = 'invoice_payment_terms_days';
+    final public const INVOICE_NOTES = 'invoice_notes';
 
     protected int $id;
     protected int $event_id;
@@ -99,10 +101,12 @@ abstract class EventSettingDomainObjectAbstract extends \HiEvents\DomainObjects\
     protected bool $require_billing_address = true;
     protected ?string $organization_name = null;
     protected ?string $organization_address = null;
-    protected ?string $tax_details = null;
+    protected ?string $invoice_tax_details = null;
     protected array|string|null $payment_providers = null;
     protected ?string $offline_payment_instructions = null;
     protected bool $allow_orders_awaiting_offline_payment_to_check_in = false;
+    protected ?int $invoice_payment_terms_days = null;
+    protected ?string $invoice_notes = null;
 
     public function toArray(): array
     {
@@ -149,10 +153,12 @@ public function toArray(): array
                     'require_billing_address' => $this->require_billing_address ?? null,
                     'organization_name' => $this->organization_name ?? null,
                     'organization_address' => $this->organization_address ?? null,
-                    'tax_details' => $this->tax_details ?? null,
+                    'invoice_tax_details' => $this->invoice_tax_details ?? null,
                     'payment_providers' => $this->payment_providers ?? null,
                     'offline_payment_instructions' => $this->offline_payment_instructions ?? null,
                     'allow_orders_awaiting_offline_payment_to_check_in' => $this->allow_orders_awaiting_offline_payment_to_check_in ?? null,
+                    'invoice_payment_terms_days' => $this->invoice_payment_terms_days ?? null,
+                    'invoice_notes' => $this->invoice_notes ?? null,
                 ];
     }
 
@@ -618,15 +624,15 @@ public function getOrganizationAddress(): ?string
         return $this->organization_address;
     }
 
-    public function setTaxDetails(?string $tax_details): self
+    public function setInvoiceTaxDetails(?string $invoice_tax_details): self
     {
-        $this->tax_details = $tax_details;
+        $this->invoice_tax_details = $invoice_tax_details;
         return $this;
     }
 
-    public function getTaxDetails(): ?string
+    public function getInvoiceTaxDetails(): ?string
     {
-        return $this->tax_details;
+        return $this->invoice_tax_details;
     }
 
     public function setPaymentProviders(array|string|null $payment_providers): self
@@ -662,4 +668,26 @@ public function getAllowOrdersAwaitingOfflinePaymentToCheckIn(): bool
     {
         return $this->allow_orders_awaiting_offline_payment_to_check_in;
     }
+
+    public function setInvoicePaymentTermsDays(?int $invoice_payment_terms_days): self
+    {
+        $this->invoice_payment_terms_days = $invoice_payment_terms_days;
+        return $this;
+    }
+
+    public function getInvoicePaymentTermsDays(): ?int
+    {
+        return $this->invoice_payment_terms_days;
+    }
+
+    public function setInvoiceNotes(?string $invoice_notes): self
+    {
+        $this->invoice_notes = $invoice_notes;
+        return $this;
+    }
+
+    public function getInvoiceNotes(): ?string
+    {
+        return $this->invoice_notes;
+    }
 }

…ers/DownloadOrderInvoiceSignedAction.php …ns/Orders/DownloadOrderInvoiceAction.phpbackend/app/Http/Actions/Orders/DownloadOrderInvoiceSignedAction.php renamed to backend/app/Http/Actions/Orders/DownloadOrderInvoiceAction.php backend/app/Http/Actions/Orders/DownloadOrderInvoiceSignedAction.php renamed to backend/app/Http/Actions/Orders/DownloadOrderInvoiceAction.php

@@ -9,7 +9,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
-class DownloadOrderInvoiceSignedAction extends BaseAction
+class DownloadOrderInvoiceAction extends BaseAction
 {
     public function __construct(
         private readonly GetOrderInvoiceHandler $orderInvoiceHandler,

…ons/Orders/CompleteOrderActionPublic.php …ers/Public/CompleteOrderActionPublic.phpbackend/app/Http/Actions/Orders/CompleteOrderActionPublic.php renamed to backend/app/Http/Actions/Orders/Public/CompleteOrderActionPublic.php backend/app/Http/Actions/Orders/CompleteOrderActionPublic.php renamed to backend/app/Http/Actions/Orders/Public/CompleteOrderActionPublic.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace HiEvents\Http\Actions\Orders;
+namespace HiEvents\Http\Actions\Orders\Public;
 
 use HiEvents\Exceptions\ResourceConflictException;
 use HiEvents\Http\Actions\BaseAction;

…tions/Orders/CreateOrderActionPublic.php …rders/Public/CreateOrderActionPublic.phpbackend/app/Http/Actions/Orders/CreateOrderActionPublic.php renamed to backend/app/Http/Actions/Orders/Public/CreateOrderActionPublic.php backend/app/Http/Actions/Orders/CreateOrderActionPublic.php renamed to backend/app/Http/Actions/Orders/Public/CreateOrderActionPublic.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace HiEvents\Http\Actions\Orders;
+namespace HiEvents\Http\Actions\Orders\Public;
 
 use HiEvents\Http\Actions\BaseAction;
 use HiEvents\Http\Request\Order\CreateOrderRequest;

backend/app/Http/Actions/Orders/Public/DownloadOrderInvoicePublicAction.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace HiEvents\Http\Actions\Orders\Public;
+
+use HiEvents\Http\Actions\BaseAction;
+use HiEvents\Services\Application\Handlers\Order\Public\DownloadOrderInvoicePublicHandler;
+use Illuminate\Http\Response;
+
+class DownloadOrderInvoicePublicAction extends BaseAction
+{
+    public function __construct(
+        private readonly DownloadOrderInvoicePublicHandler $downloadOrderInvoicePublicHandler,
+    )
+    {
+    }
+
+    public function __invoke(int $eventId, string $orderShortId): Response
+    {
+        $invoice = $this->downloadOrderInvoicePublicHandler->handle(
+            eventId: $eventId,
+            orderShortId: $orderShortId,
+        );
+
+        return $invoice->pdf->stream($invoice->filename);
+    }
+}

…/Actions/Orders/GetOrderActionPublic.php …s/Orders/Public/GetOrderActionPublic.phpbackend/app/Http/Actions/Orders/GetOrderActionPublic.php renamed to backend/app/Http/Actions/Orders/Public/GetOrderActionPublic.php backend/app/Http/Actions/Orders/GetOrderActionPublic.php renamed to backend/app/Http/Actions/Orders/Public/GetOrderActionPublic.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace HiEvents\Http\Actions\Orders;
+namespace HiEvents\Http\Actions\Orders\Public;
 
 use HiEvents\Http\Actions\BaseAction;
 use HiEvents\Resources\Order\OrderResourcePublic;

…ionOrderToOfflinePaymentPublicAction.php …ionOrderToOfflinePaymentPublicAction.phpbackend/app/Http/Actions/Orders/TransitionOrderToOfflinePaymentPublicAction.php renamed to backend/app/Http/Actions/Orders/Public/TransitionOrderToOfflinePaymentPublicAction.php backend/app/Http/Actions/Orders/TransitionOrderToOfflinePaymentPublicAction.php renamed to backend/app/Http/Actions/Orders/Public/TransitionOrderToOfflinePaymentPublicAction.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace HiEvents\Http\Actions\Orders;
+namespace HiEvents\Http\Actions\Orders\Public;
 
 use HiEvents\Http\Actions\BaseAction;
 use HiEvents\Resources\Order\OrderResourcePublic;

backend/app/Http/Request/EventSettings/UpdateEventSettingsRequest.php

@@ -61,7 +61,7 @@ public function rules(): array
             // Payment settings
             'payment_providers' => ['array'],
             'payment_providers.*' => ['string', Rule::in(PaymentProviders::valuesArray())],
-            'offline_payment_instructions' => ['required_if:payment_providers,offline', 'string', 'nullable'],
+            'offline_payment_instructions' => ['string', 'nullable', Rule::requiredIf(fn() => in_array(PaymentProviders::OFFLINE->name, $this->input('payment_providers', []), true))],
             'allow_orders_awaiting_offline_payment_to_check_in' => ['boolean'],
 
             // Invoice settings
@@ -70,9 +70,11 @@ public function rules(): array
             'invoice_prefix' => ['nullable', 'string', 'max:10', 'regex:/^[A-Za-z0-9\-]*$/'],
             'invoice_start_number' => ['nullable', 'integer', 'min:1'],
             'require_billing_address' => ['boolean'],
-            'organization_name' => ['required_if:enable_invoicing,true', 'string', 'max:255'],
-            'organization_address' => ['required_if:enable_invoicing,true', 'string'],
-            'tax_details' => ['nullable', 'string'],
+            'organization_name' => ['required_if:enable_invoicing,true', 'string', 'max:255', 'nullable'],
+            'organization_address' => ['required_if:enable_invoicing,true', 'string', 'max:255', 'nullable'],
+            'invoice_tax_details' => ['nullable', 'string'],
+            'invoice_notes' => ['nullable', 'string'],
+            'invoice_payment_terms_days' => ['nullable', 'integer', 'gte:0', 'lte:1000'],
         ];
     }
 
@@ -97,7 +99,7 @@ public function messages(): array
 
             // Payment messages
             'payment_providers.*.in' => __('Invalid payment provider selected.'),
-            'offline_payment_instructions.required_if' => __('Payment instructions are required when offline payments are enabled.'),
+            'offline_payment_instructions.required' => __('Payment instructions are required when offline payments are enabled.'),
 
             // Invoice messages
             'invoice_prefix.regex' => __('The invoice prefix may only contain letters, numbers, and hyphens.'),

backend/app/Models/Invoice.php

@@ -12,6 +12,7 @@ protected function getCastMap(): array
             'taxes_and_fees' => 'array',
             'items' => 'array',
             'total_amount' => 'float',
+            'due_date' => 'datetime',
         ];
     }
 

backend/app/Resources/Event/EventSettingsResource.php

@@ -60,7 +60,9 @@ public function toArray($request): array
             'require_billing_address' => $this->getRequireBillingAddress(),
             'organization_name' => $this->getOrganizationName(),
             'organization_address' => $this->getOrganizationAddress(),
-            'tax_details' => $this->getTaxDetails(),
+            'invoice_tax_details' => $this->getInvoiceTaxDetails(),
+            'invoice_notes' => $this->getInvoiceNotes(),
+            'invoice_payment_terms_days' => $this->getInvoicePaymentTermsDays(),
         ];
     }
 }