Main <- develop (#404)

* Fix promo code input styles (#395)

* Homepage design tweaks (#399)

* Update deprecated timezones (#400)

* Update deprecated timezones

* remove comments

* Allow editing of Order questions (#398)

* Allow editing of Order questions

* Update designs

* Fix Checkout Bugs (#403)

Author: daveearley

backend/app/Services/Application/Handlers/Order/Payment/Stripe/CreatePaymentIntentHandler.php

@@ -10,7 +10,9 @@
 use HiEvents\DomainObjects\AccountConfigurationDomainObject;
 use HiEvents\DomainObjects\Generated\StripePaymentDomainObjectAbstract;
 use HiEvents\DomainObjects\OrderItemDomainObject;
+use HiEvents\DomainObjects\Status\OrderStatus;
 use HiEvents\DomainObjects\StripePaymentDomainObject;
+use HiEvents\Exceptions\ResourceConflictException;
 use HiEvents\Exceptions\Stripe\CreatePaymentIntentFailedException;
 use HiEvents\Exceptions\UnauthorizedException;
 use HiEvents\Repository\Eloquent\Value\Relationship;
@@ -58,6 +60,10 @@ public function handle(string $orderShortId): CreatePaymentIntentResponseDTO
             throw new UnauthorizedException(__('Sorry, we could not verify your session. Please create a new order.'));
         }
 
+        if ($order->getStatus() !== OrderStatus::RESERVED->name || $order->isReservedOrderExpired()) {
+            throw new ResourceConflictException(__('Sorry, is expired or not in a valid state.'));
+        }
+
         $account = $this->accountRepository
             ->loadRelation(new Relationship(
                 domainObject: AccountConfigurationDomainObject::class,

backend/app/Services/Domain/Order/MarkOrderAsPaidService.php

@@ -6,6 +6,7 @@
 use HiEvents\DomainObjects\AccountDomainObject;
 use HiEvents\DomainObjects\Enums\PaymentProviders;
 use HiEvents\DomainObjects\Enums\WebhookEventType;
+use HiEvents\DomainObjects\EventDomainObject;
 use HiEvents\DomainObjects\Generated\OrderDomainObjectAbstract;
 use HiEvents\DomainObjects\OrderDomainObject;
 use HiEvents\DomainObjects\Status\AttendeeStatus;
@@ -116,8 +117,8 @@ private function updateAttendeeStatuses(OrderDomainObject $updatedOrder): void
 
     private function storeApplicationFeePayment(OrderDomainObject $updatedOrder): void
     {
-        /** @var AccountConfigurationDomainObject $config */
-        $config = $this->eventRepository
+        /** @var EventDomainObject $event */
+        $event = $this->eventRepository
             ->loadRelation(new Relationship(
                 domainObject: AccountDomainObject::class,
                 nested: [
@@ -128,16 +129,18 @@ private function storeApplicationFeePayment(OrderDomainObject $updatedOrder): vo
                 ],
                 name: 'account'
             ))
-            ->findById($updatedOrder->getEventId())
-            ->getAccount()
-            ->getConfiguration();
+            ->findById($updatedOrder->getEventId());
+
+        /** @var AccountConfigurationDomainObject $config */
+        $config = $event->getAccount()->getConfiguration();
 
         $this->orderApplicationFeeService->createOrderApplicationFee(
             orderId: $updatedOrder->getId(),
             applicationFeeAmount: $this->orderApplicationFeeCalculationService->calculateApplicationFee(
                 $config,
                 $updatedOrder->getTotalGross(),
-            ),
+                $event->getCurrency(),
+            )->toFloat(),
             orderApplicationFeeStatus: OrderApplicationFeeStatus::AWAITING_PAYMENT,
             paymentMethod: PaymentProviders::OFFLINE,
         );

backend/app/Services/Domain/Order/OrderApplicationFeeCalculationService.php

@@ -3,6 +3,7 @@
 namespace HiEvents\Services\Domain\Order;
 
 use HiEvents\DomainObjects\AccountConfigurationDomainObject;
+use HiEvents\Values\MoneyValue;
 use Illuminate\Config\Repository;
 
 class OrderApplicationFeeCalculationService
@@ -15,16 +16,20 @@ public function __construct(
 
     public function calculateApplicationFee(
         AccountConfigurationDomainObject $accountConfiguration,
-        float                            $orderTotal
-    ): float
+        float                            $orderTotal,
+        string                           $currency
+    ): MoneyValue
     {
         if (!$this->config->get('app.saas_mode_enabled')) {
-            return 0;
+            return MoneyValue::zero($currency);
         }
 
         $fixedFee = $accountConfiguration->getFixedApplicationFee();
         $percentageFee = $accountConfiguration->getPercentageApplicationFee();
 
-        return ($fixedFee) + ($orderTotal * ($percentageFee / 100));
+        return MoneyValue::fromFloat(
+            amount: $fixedFee + ($orderTotal * $percentageFee / 100),
+            currency: $currency
+        );
     }
 }

backend/app/Services/Domain/Order/OrderApplicationFeeService.php

@@ -28,7 +28,7 @@ public function createOrderApplicationFee(
             OrderApplicationFeeDomainObjectAbstract::STATUS => $orderApplicationFeeStatus->value,
             OrderApplicationFeeDomainObjectAbstract::PAYMENT_METHOD => $paymentMethod->value,
             OrderApplicationFeeDomainObjectAbstract::PAID_AT => $orderApplicationFeeStatus->value === OrderApplicationFeeStatus::PAID->value
-                ? now()
+                ? now()->toDateTimeString()
                 : null,
         ]);
     }

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

@@ -64,8 +64,9 @@ public function createPaymentIntent(CreatePaymentIntentRequestDTO $paymentIntent
 
             $applicationFee = $this->orderApplicationFeeCalculationService->calculateApplicationFee(
                 accountConfiguration: $paymentIntentDTO->account->getConfiguration(),
-                orderTotal: $paymentIntentDTO->amount / 100
-            );
+                orderTotal: $paymentIntentDTO->amount / 100,
+                currency: $paymentIntentDTO->currencyCode,
+            )->toMinorUnit();
 
             $paymentIntent = $this->stripeClient->paymentIntents->create([
                 'amount' => $paymentIntentDTO->amount,

backend/app/Values/MoneyValue.php

@@ -46,6 +46,11 @@ public function add(MoneyValue $other): MoneyValue
         return new self($this->money->plus($other->getMoney()));
     }
 
+    public static function zero(string $currency): MoneyValue
+    {
+        return new self(Money::zero($currency));
+    }
+
     /**
      * @throws UnknownCurrencyException
      * @throws NumberFormatException

backend/config/app.php

@@ -221,4 +221,6 @@
         // 'Example' => App\Facades\Example::class,
     ])->toArray(),
 
+
+    'is_hi_events' => env('APP_IS_HI_EVENTS', false),
 ];

backend/vapor.yml

@@ -6,6 +6,7 @@ environments:
     domain: api.hi.events
     memory: 2048
     cli-memory: 512
+    storage: hievents-assets-prod
     runtime: 'php-8.3:al2'
     warm: 3
     cache: hievents-redis
@@ -31,7 +32,7 @@ environments:
     cache: hievents-redis
     database: hievents-postgres
     queue:
-      - hievents-queue-prod
+      - hievents-queue-staging
       - hievents-webhook-queue-staging
     queue-memory: 1024
     queue-concurrency: 2