Merge pull request #1215 from HiEventsDev/develop

v1.10.0-beta

Author: daveearley

VERSION

@@ -1 +1 @@
-1.8.0-beta
+1.10.0-beta

backend/VERSION

@@ -0,0 +1,12 @@
+<?php
+
+namespace HiEvents\DomainObjects\Enums;
+
+enum TicketDateDisplayMode: string
+{
+    use BaseEnum;
+
+    case START_DATE_TIME = 'START_DATE_TIME';
+    case DATE_RANGE = 'DATE_RANGE';
+    case HIDDEN = 'HIDDEN';
+}

backend/app/DomainObjects/Enums/TicketDateDisplayMode.php

@@ -7,6 +7,7 @@
 use HiEvents\DomainObjects\Enums\HomepageFontFamily;
 use HiEvents\DomainObjects\Enums\PaymentProviders;
 use HiEvents\DomainObjects\Enums\PriceDisplayMode;
+use HiEvents\DomainObjects\Enums\TicketDateDisplayMode;
 use HiEvents\Http\Request\BaseRequest;
 use HiEvents\Validators\Rules\RulesHelper;
 use Illuminate\Validation\Rule;
@@ -85,6 +86,7 @@ public function rules(): array
             'ticket_design_settings.logo_image_id' => ['nullable', 'integer'],
             'ticket_design_settings.footer_text' => ['nullable', 'string', 'max:500'],
             'ticket_design_settings.layout_type' => ['nullable', 'string', Rule::in(['default', 'modern'])],
+            'ticket_design_settings.date_display_mode' => ['nullable', 'string', Rule::in(TicketDateDisplayMode::valuesArray())],
             'ticket_design_settings.enabled' => ['boolean'],
 
             // Marketing settings

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

@@ -8,6 +8,7 @@
 use HiEvents\DomainObjects\Enums\HomepageBackgroundType;
 use HiEvents\DomainObjects\Enums\PaymentProviders;
 use HiEvents\DomainObjects\Enums\PriceDisplayMode;
+use HiEvents\DomainObjects\Enums\TicketDateDisplayMode;
 use HiEvents\DomainObjects\OrganizerDomainObject;
 
 class UpdateEventSettingsDTO extends BaseDTO
@@ -150,6 +151,7 @@ public static function createWithDefaults(
                 'logo_image_id' => null,
                 'footer_text' => null,
                 'layout_type' => 'classic',
+                'date_display_mode' => TicketDateDisplayMode::START_DATE_TIME->value,
                 'enabled' => true,
             ],
 

backend/app/Services/Application/Handlers/EventSettings/DTO/UpdateEventSettingsDTO.php

@@ -4,7 +4,7 @@
     "description": "hi.events - Ticket selling and event management.",
     "keywords": ["ticketing", "events"],
     "license": "AGPL-3.0",
-    "version": "1.8.0-beta",
+    "version": "1.10.0-beta",
     "require": {
         "php": "^8.2",
         "ext-intl": "*",

backend/composer.json

@@ -68,11 +68,11 @@ public function test_can_get_order_confirmation_tokens(): void
         $tokens = $response->json('tokens');
         $this->assertNotEmpty($tokens);
 
-        $firstNameToken = collect($tokens)->firstWhere('token', '{{ order_first_name }}');
+        $firstNameToken = collect($tokens)->firstWhere('token', '{{ order.first_name }}');
         $this->assertNotNull($firstNameToken);
         $this->assertEquals('The first name of the person who placed the order', $firstNameToken['description']);
 
-        $lastNameToken = collect($tokens)->firstWhere('token', '{{ order_last_name }}');
+        $lastNameToken = collect($tokens)->firstWhere('token', '{{ order.last_name }}');
         $this->assertNotNull($lastNameToken);
         $this->assertEquals('The last name of the person who placed the order', $lastNameToken['description']);
     }
@@ -97,7 +97,7 @@ public function test_can_get_attendee_ticket_tokens(): void
         $tokens = $response->json('tokens');
         $this->assertNotEmpty($tokens);
 
-        $attendeeNameToken = collect($tokens)->firstWhere('token', '{{ attendee_name }}');
+        $attendeeNameToken = collect($tokens)->firstWhere('token', '{{ attendee.name }}');
         $this->assertNotNull($attendeeNameToken);
     }
 
@@ -128,10 +128,10 @@ public function test_tokens_include_order_specific_tokens(): void
         $tokens = $response->json('tokens');
         $tokenNames = collect($tokens)->pluck('token')->toArray();
 
-        $this->assertContains('{{ event_title }}', $tokenNames);
-        $this->assertContains('{{ order_number }}', $tokenNames);
-        $this->assertContains('{{ order_total }}', $tokenNames);
-        $this->assertContains('{{ organizer_name }}', $tokenNames);
+        $this->assertContains('{{ event.title }}', $tokenNames);
+        $this->assertContains('{{ order.number }}', $tokenNames);
+        $this->assertContains('{{ order.total }}', $tokenNames);
+        $this->assertContains('{{ organizer.name }}', $tokenNames);
     }
 
     public function test_tokens_have_proper_structure(): void

backend/lang/es.json

@@ -0,0 +1,46 @@
+<?php
+
+namespace Tests\Unit\Http\Request\EventSettings;
+
+use HiEvents\DomainObjects\Enums\TicketDateDisplayMode;
+use HiEvents\Http\Request\EventSettings\UpdateEventSettingsRequest;
+use Illuminate\Support\Facades\Validator;
+use Tests\TestCase;
+
+class UpdateEventSettingsRequestTest extends TestCase
+{
+    public function test_valid_date_display_modes_are_accepted(): void
+    {
+        foreach (TicketDateDisplayMode::valuesArray() as $mode) {
+            $validator = Validator::make(
+                ['ticket_design_settings' => ['date_display_mode' => $mode]],
+                (new UpdateEventSettingsRequest)->rules()
+            );
+
+            $this->assertFalse(
+                $validator->errors()->has('ticket_design_settings.date_display_mode'),
+                "Expected '{$mode}' to be a valid date display mode"
+            );
+        }
+    }
+
+    public function test_invalid_date_display_mode_is_rejected(): void
+    {
+        $validator = Validator::make(
+            ['ticket_design_settings' => ['date_display_mode' => 'NOT_A_MODE']],
+            (new UpdateEventSettingsRequest)->rules()
+        );
+
+        $this->assertTrue($validator->errors()->has('ticket_design_settings.date_display_mode'));
+    }
+
+    public function test_date_display_mode_is_optional(): void
+    {
+        $validator = Validator::make(
+            ['ticket_design_settings' => ['accent_color' => '#333333']],
+            (new UpdateEventSettingsRequest)->rules()
+        );
+
+        $this->assertFalse($validator->errors()->has('ticket_design_settings.date_display_mode'));
+    }
+}

backend/tests/Feature/Http/Actions/EmailTemplates/EmailTemplateTokenTest.php

@@ -1,7 +1,7 @@
 {
   "name": "hievents-frontend",
   "private": true,
-  "version": "1.8.0-beta",
+  "version": "1.10.0-beta",
   "type": "module",
   "scripts": {
     "dev:csr": "vite --port 5678 --host 0.0.0.0",