v1.2.0-alpha.1 (#735)

Co-authored-by: Dave Earley <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: creativeindustriesgroup <[email protected]>
Co-authored-by: Sundeep Narang <[email protected]>
Co-authored-by: Arda Kılıçdağı <[email protected]>

Author: 5 people

.github/workflows/post-release-push-images.yml

@@ -9,6 +9,7 @@ jobs:
   push_to_registry:
     name: Push Docker images to Docker Hub
     runs-on: ubuntu-latest
+
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
@@ -28,6 +29,9 @@ jobs:
         uses: docker/metadata-action@v3
         with:
           images: daveearley/hi.events-all-in-one
+          tags: |
+            type=ref,event=tag
+            type=raw,value=latest,enable=${{ github.event.release.prerelease == false }}
 
       - name: Build and push All-in-one Docker image
         uses: docker/build-push-action@v3
@@ -44,6 +48,9 @@ jobs:
         uses: docker/metadata-action@v3
         with:
           images: daveearley/hi.events-backend
+          tags: |
+            type=ref,event=tag
+            type=raw,value=latest,enable=${{ github.event.release.prerelease == false }}
 
       - name: Build and push Backend Docker image
         uses: docker/build-push-action@v3
@@ -60,6 +67,9 @@ jobs:
         uses: docker/metadata-action@v3
         with:
           images: daveearley/hi.events-frontend
+          tags: |
+            type=ref,event=tag
+            type=raw,value=latest,enable=${{ github.event.release.prerelease == false }}
 
       - name: Build and push Frontend Docker image
         uses: docker/build-push-action@v3

backend/app/DomainObjects/AccountDomainObject.php

@@ -3,11 +3,16 @@
 namespace HiEvents\DomainObjects;
 
 use HiEvents\DomainObjects\DTO\AccountApplicationFeeDTO;
+use HiEvents\DomainObjects\Enums\StripePlatform;
+use Illuminate\Support\Collection;
 
 class AccountDomainObject extends Generated\AccountDomainObjectAbstract
 {
     private ?AccountConfigurationDomainObject $configuration = null;
 
+    /** @var Collection<int, AccountStripePlatformDomainObject>|null */
+    private ?Collection $stripePlatforms = null;
+
     public function getApplicationFee(): AccountApplicationFeeDTO
     {
         /** @var AccountConfigurationDomainObject $applicationFee */
@@ -28,4 +33,68 @@ public function setConfiguration(AccountConfigurationDomainObject $configuration
     {
         $this->configuration = $configuration;
     }
+
+    public function getAccountStripePlatforms(): ?Collection
+    {
+        return $this->stripePlatforms;
+    }
+
+    public function setAccountStripePlatforms(Collection $stripePlatforms): void
+    {
+        $this->stripePlatforms = $stripePlatforms;
+    }
+
+    /**
+     * Get the primary active Stripe platform for this account
+     * Returns the platform with setup completed, preferring the most recent
+     */
+    public function getPrimaryStripePlatform(): ?AccountStripePlatformDomainObject
+    {
+        if (!$this->stripePlatforms || $this->stripePlatforms->isEmpty()) {
+            return null;
+        }
+
+        return $this->stripePlatforms
+            ->filter(fn($platform) => $platform->getStripeSetupCompletedAt() !== null)
+            ->sortByDesc(fn($platform) => $platform->getCreatedAt())
+            ->first();
+    }
+
+    /**
+     * Get the Stripe platform for a specific platform type
+     * Handles null platform for open-source installations
+     */
+    public function getStripePlatformByType(?StripePlatform $platformType): ?AccountStripePlatformDomainObject
+    {
+        if (!$this->stripePlatforms || $this->stripePlatforms->isEmpty()) {
+            return null;
+        }
+
+        return $this->stripePlatforms
+            ->filter(fn($platform) => $platform->getStripeConnectPlatform() === $platformType?->value)
+            ->first();
+    }
+
+    public function getActiveStripeAccountId(): ?string
+    {
+        return $this->getPrimaryStripePlatform()?->getStripeAccountId();
+    }
+
+    public function getActiveStripePlatform(): ?StripePlatform
+    {
+        $primaryPlatform = $this->getPrimaryStripePlatform();
+        if (!$primaryPlatform || !$primaryPlatform->getStripeConnectPlatform()) {
+            return null;
+        }
+
+        return StripePlatform::fromString($primaryPlatform->getStripeConnectPlatform());
+    }
+
+    /**
+     * Check if Stripe is set up and ready for payments
+     */
+    public function isStripeSetupComplete(): bool
+    {
+        return $this->getPrimaryStripePlatform() !== null;
+    }
 }

backend/app/DomainObjects/AccountStripePlatformDomainObject.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace HiEvents\DomainObjects;
+
+class AccountStripePlatformDomainObject extends Generated\AccountStripePlatformDomainObjectAbstract
+{
+}

backend/app/DomainObjects/EmailTemplateDomainObject.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace HiEvents\DomainObjects;
+
+class EmailTemplateDomainObject extends Generated\EmailTemplateDomainObjectAbstract
+{
+}

backend/app/DomainObjects/Enums/EmailTemplateEngine.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace HiEvents\DomainObjects\Enums;
+
+enum EmailTemplateEngine: string
+{
+    use BaseEnum;
+
+    case LIQUID = 'liquid';
+    case BLADE = 'blade'; // For future use
+
+    public function label(): string
+    {
+        return match ($this) {
+            self::LIQUID => __('Liquid'),
+            self::BLADE => __('Blade'),
+        };
+    }
+}

backend/app/DomainObjects/Enums/EmailTemplateType.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace HiEvents\DomainObjects\Enums;
+
+enum EmailTemplateType: string
+{
+    use BaseEnum;
+
+    case ORDER_CONFIRMATION = 'order_confirmation';
+    case ATTENDEE_TICKET = 'attendee_ticket';
+
+    public function label(): string
+    {
+        return match ($this) {
+            self::ORDER_CONFIRMATION => __('Order Confirmation'),
+            self::ATTENDEE_TICKET => __('Attendee Ticket'),
+        };
+    }
+
+    public function description(): string
+    {
+        return match ($this) {
+            self::ORDER_CONFIRMATION => __('Sent to the customer after placing an order'),
+            self::ATTENDEE_TICKET => __('Sent to each attendee with their ticket'),
+        };
+    }
+}

backend/app/DomainObjects/Enums/ImageType.php

@@ -15,6 +15,7 @@ enum ImageType
 
     // Event images
     case EVENT_COVER;
+    case TICKET_LOGO;
 
     // Organizer images
     case ORGANIZER_LOGO;
@@ -24,6 +25,7 @@ public static function eventImageTypes(): array
     {
         return [
             self::EVENT_COVER,
+            self::TICKET_LOGO,
         ];
     }
 
@@ -47,6 +49,7 @@ public static function getMinimumDimensionsMap(ImageType $imageType): array
         $map = [
             self::GENERIC->name => [50, 50],
             self::EVENT_COVER->name => [600, 50],
+            self::TICKET_LOGO->name => [100, 100],
             self::ORGANIZER_LOGO->name => [100, 100],
             self::ORGANIZER_COVER->name => [600, 50],
         ];

backend/app/DomainObjects/Enums/StripePlatform.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace HiEvents\DomainObjects\Enums;
+
+enum StripePlatform: string
+{
+    case CANADA = 'ca';
+    case IRELAND = 'ie';
+    
+    public static function fromString(?string $value): ?self
+    {
+        if ($value === null) {
+            return null;
+        }
+        
+        return self::tryFrom($value);
+    }
+    
+    public function toString(): string
+    {
+        return $this->value;
+    }
+    
+    public static function getAllValues(): array
+    {
+        return array_column(self::cases(), 'value');
+    }
+}

backend/app/DomainObjects/Generated/AccountDomainObjectAbstract.php

@@ -19,11 +19,8 @@ abstract class AccountDomainObjectAbstract extends \HiEvents\DomainObjects\Abstr
     final public const DELETED_AT = 'deleted_at';
     final public const NAME = 'name';
     final public const EMAIL = 'email';
-    final public const STRIPE_ACCOUNT_ID = 'stripe_account_id';
     final public const SHORT_ID = 'short_id';
-    final public const STRIPE_CONNECT_SETUP_COMPLETE = 'stripe_connect_setup_complete';
     final public const ACCOUNT_VERIFIED_AT = 'account_verified_at';
-    final public const STRIPE_CONNECT_ACCOUNT_TYPE = 'stripe_connect_account_type';
     final public const IS_MANUALLY_VERIFIED = 'is_manually_verified';
 
     protected int $id;
@@ -35,11 +32,8 @@ abstract class AccountDomainObjectAbstract extends \HiEvents\DomainObjects\Abstr
     protected ?string $deleted_at = null;
     protected string $name;
     protected string $email;
-    protected ?string $stripe_account_id = null;
     protected string $short_id;
-    protected ?bool $stripe_connect_setup_complete = false;
     protected ?string $account_verified_at = null;
-    protected ?string $stripe_connect_account_type = null;
     protected bool $is_manually_verified = false;
 
     public function toArray(): array
@@ -54,11 +48,8 @@ public function toArray(): array
                     'deleted_at' => $this->deleted_at ?? null,
                     'name' => $this->name ?? null,
                     'email' => $this->email ?? null,
-                    'stripe_account_id' => $this->stripe_account_id ?? null,
                     'short_id' => $this->short_id ?? null,
-                    'stripe_connect_setup_complete' => $this->stripe_connect_setup_complete ?? null,
                     'account_verified_at' => $this->account_verified_at ?? null,
-                    'stripe_connect_account_type' => $this->stripe_connect_account_type ?? null,
                     'is_manually_verified' => $this->is_manually_verified ?? null,
                 ];
     }
@@ -162,17 +153,6 @@ public function getEmail(): string
         return $this->email;
     }
 
-    public function setStripeAccountId(?string $stripe_account_id): self
-    {
-        $this->stripe_account_id = $stripe_account_id;
-        return $this;
-    }
-
-    public function getStripeAccountId(): ?string
-    {
-        return $this->stripe_account_id;
-    }
-
     public function setShortId(string $short_id): self
     {
         $this->short_id = $short_id;
@@ -184,17 +164,6 @@ public function getShortId(): string
         return $this->short_id;
     }
 
-    public function setStripeConnectSetupComplete(?bool $stripe_connect_setup_complete): self
-    {
-        $this->stripe_connect_setup_complete = $stripe_connect_setup_complete;
-        return $this;
-    }
-
-    public function getStripeConnectSetupComplete(): ?bool
-    {
-        return $this->stripe_connect_setup_complete;
-    }
-
     public function setAccountVerifiedAt(?string $account_verified_at): self
     {
         $this->account_verified_at = $account_verified_at;
@@ -206,17 +175,6 @@ public function getAccountVerifiedAt(): ?string
         return $this->account_verified_at;
     }
 
-    public function setStripeConnectAccountType(?string $stripe_connect_account_type): self
-    {
-        $this->stripe_connect_account_type = $stripe_connect_account_type;
-        return $this;
-    }
-
-    public function getStripeConnectAccountType(): ?string
-    {
-        return $this->stripe_connect_account_type;
-    }
-
     public function setIsManuallyVerified(bool $is_manually_verified): self
     {
         $this->is_manually_verified = $is_manually_verified;