Add account configuration

Author: daveearley

backend/app/DomainObjects/AccountDomainObject.php

@@ -2,6 +2,17 @@
 
 namespace HiEvents\DomainObjects;
 
+use HiEvents\DomainObjects\DTO\AccountApplicationFeeDTO;
+
 class AccountDomainObject extends Generated\AccountDomainObjectAbstract
 {
+    public function getApplicationFee(): AccountApplicationFeeDTO
+    {
+        $applicationFee = $this->getConfiguration()['application_fee'];
+
+        return new AccountApplicationFeeDTO(
+            $applicationFee['percentage'],
+            $applicationFee['fixed']
+        );
+    }
 }

backend/app/DomainObjects/DTO/AccountApplicationFeeDTO.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace HiEvents\DomainObjects\DTO;
+
+class AccountApplicationFeeDTO
+{
+    public function __construct(
+        public readonly float $percentageFee,
+        public readonly float $fixedFee,
+    )
+    {
+    }
+}

backend/app/DomainObjects/Generated/AccountDomainObjectAbstract.php

@@ -22,6 +22,7 @@ abstract class AccountDomainObjectAbstract extends \HiEvents\DomainObjects\Abstr
     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 CONFIGURATION = 'configuration';
 
     protected int $id;
     protected string $currency_code = 'USD';
@@ -35,6 +36,7 @@ abstract class AccountDomainObjectAbstract extends \HiEvents\DomainObjects\Abstr
     protected string $short_id;
     protected ?bool $stripe_connect_setup_complete = false;
     protected ?string $account_verified_at = null;
+    protected array|string|null $configuration = null;
 
     public function toArray(): array
     {
@@ -51,6 +53,7 @@ public function toArray(): array
                     'short_id' => $this->short_id ?? null,
                     'stripe_connect_setup_complete' => $this->stripe_connect_setup_complete ?? null,
                     'account_verified_at' => $this->account_verified_at ?? null,
+                    'configuration' => $this->configuration ?? null,
                 ];
     }
 
@@ -185,4 +188,15 @@ public function getAccountVerifiedAt(): ?string
     {
         return $this->account_verified_at;
     }
+
+    public function setConfiguration(array|string|null $configuration): self
+    {
+        $this->configuration = $configuration;
+        return $this;
+    }
+
+    public function getConfiguration(): array|string|null
+    {
+        return $this->configuration;
+    }
 }

backend/app/Models/Account.php

@@ -11,7 +11,9 @@ class Account extends BaseModel
 {
     protected function getCastMap(): array
     {
-        return [];
+        return [
+            'configuration' => 'array',
+        ];
     }
 
     protected function getFillableFields(): array

backend/app/Resources/Event/EventResourcePublic.php

@@ -44,7 +44,10 @@ public function toArray(Request $request): array
             ),
             'settings' => $this->when(
                 condition: !is_null($this->getEventSettings()),
-                value: fn() => new EventSettingsResourcePublic($this->getEventSettings(), $this->includePostCheckoutData),
+                value: fn() => new EventSettingsResourcePublic(
+                    $this->getEventSettings(),
+                    $this->includePostCheckoutData
+                ),
             ),
             // @TODO - public question resource
             'questions' => $this->when(

backend/app/Resources/Event/EventSettingsResourcePublic.php

@@ -23,6 +23,9 @@ public function toArray($request): array
         return [
             'pre_checkout_message' => $this->getPreCheckoutMessage(),
 
+            // We only show post checkout data if the order is completed. So this data is only returned when this
+            // resource is returned within the context of an order that is completed.
+            // i.e. order->event->event_settings and not event->event_settings
             $this->mergeWhen($this->includePostCheckoutData, [
                 'post_checkout_message' => $this->getPostCheckoutMessage(),
                 'online_event_connection_details' => $this->getOnlineEventConnectionDetails(),

backend/app/Services/Domain/Payment/Stripe/StripePaymentIntentCreationService.php

@@ -112,7 +112,10 @@ private function getApplicationFee(CreatePaymentIntentRequestDTO $paymentIntentD
             return 0;
         }
 
-        return ceil($paymentIntentDTO->amount * $this->config->get('app.saas_stripe_application_fee_percent') / 100);
+        $fixedFee = $paymentIntentDTO->account->getApplicationFee()->fixedFee;
+        $percentageFee = $paymentIntentDTO->account->getApplicationFee()->percentageFee;
+
+        return ceil(($fixedFee * 100) + ($paymentIntentDTO->amount * $percentageFee / 100));
     }
 
     /**

backend/config/app.php

@@ -14,6 +14,7 @@
     'default_currency_code' => 'USD',
     'saas_mode_enabled' => env('APP_SAAS_MODE_ENABLED', false),
     'saas_stripe_application_fee_percent' => env('APP_SAAS_STRIPE_APPLICATION_FEE_PERCENT', 1.5),
+    'saas_stripe_application_fee_fixed' => env('APP_SAAS_STRIPE_APPLICATION_FEE_FIXED', 0),
     'disable_registration' => env('APP_DISABLE_REGISTRATION', false),
     'api_rate_limit_per_minute' => env('APP_API_RATE_LIMIT_PER_MINUTE', 180),
 

backend/database/migrations/2025_01_20_045159_add_configuration_to_accounts.php

@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        Schema::table('accounts', static function (Blueprint $table) {
+            $table->json('configuration')->nullable();
+        });
+
+        DB::table('accounts')->update(['configuration' => [
+            'application_fee' => [
+                'percentage' => config('app.saas_stripe_application_fee_percent'),
+                'fixed' => 0,
+            ]
+        ]]);
+    }
+
+    public function down(): void
+    {
+        Schema::table('accounts', static function (Blueprint $table) {
+            $table->dropColumn('configuration');
+        });
+    }
+};

frontend/src/components/common/Editor/index.tsx

@@ -16,7 +16,7 @@ interface EditorProps {
     onChange: (value: string) => void;
     value: string;
     label?: React.ReactNode;
-    description?: string;
+    description?: React.ReactNode;
     required?: boolean;
     className?: string;
     error?: string;