Skip to content

Open-source event management and ticket selling platform — perfect for concerts, conferences, and everything in between 🎟️ If you find this project helpful, please consider giving us a star ⭐️

Fix: non-SAAS checkout (#943)

Dave Earley12843b7bb051
diff --git a/backend/app/Services/Application/Handlers/Order/Payment/Stripe/CreatePaymentIntentHandler.php b/backend/app/Services/Application/Handlers/Order/Payment/Stripe/CreatePaymentIntentHandler.php
index d2ede8109..4247cb345 100644
--- a/backend/app/Services/Application/Handlers/Order/Payment/Stripe/CreatePaymentIntentHandler.php
+++ b/backend/app/Services/Application/Handlers/Order/Payment/Stripe/CreatePaymentIntentHandler.php
@@ -128,9 +128,9 @@ readonly class CreatePaymentIntentHandler
StripePaymentDomainObjectAbstract::ORDER_ID => $order->getId(),
StripePaymentDomainObjectAbstract::PAYMENT_INTENT_ID => $paymentIntent->paymentIntentId,
StripePaymentDomainObjectAbstract::CONNECTED_ACCOUNT_ID => $stripeAccountId,
- StripePaymentDomainObjectAbstract::APPLICATION_FEE_GROSS => $applicationFeeData->grossApplicationFee?->toMinorUnit(),
- StripePaymentDomainObjectAbstract::APPLICATION_FEE_NET => $applicationFeeData->netApplicationFee?->toMinorUnit(),
- StripePaymentDomainObjectAbstract::APPLICATION_FEE_VAT => $applicationFeeData->applicationFeeVatAmount?->toMinorUnit(),
+ StripePaymentDomainObjectAbstract::APPLICATION_FEE_GROSS => $applicationFeeData?->grossApplicationFee?->toMinorUnit() ?? 0,
+ StripePaymentDomainObjectAbstract::APPLICATION_FEE_NET => $applicationFeeData?->netApplicationFee?->toMinorUnit() ?? 0,
+ StripePaymentDomainObjectAbstract::APPLICATION_FEE_VAT => $applicationFeeData?->applicationFeeVatAmount?->toMinorUnit() ?? 0,
StripePaymentDomainObjectAbstract::CURRENCY => strtoupper($order->getCurrency()),
StripePaymentDomainObjectAbstract::STRIPE_PLATFORM => $stripePlatform?->value,
]);
diff --git a/backend/app/Services/Domain/Report/AbstractOrganizerReportService.php b/backend/app/Services/Domain/Report/AbstractOrganizerReportService.php
index 8dad78a95..2595ae039 100644
--- a/backend/app/Services/Domain/Report/AbstractOrganizerReportService.php
+++ b/backend/app/Services/Domain/Report/AbstractOrganizerReportService.php
@@ -31,8 +31,8 @@ abstract class AbstractOrganizerReportService
$timezone = $organizer->getTimezone();
$endDate = $endDate
- ? $endDate->copy()->setTimezone($timezone)->startOfDay()
- : now($timezone)->startOfDay();
+ ? $endDate->copy()->setTimezone($timezone)->endOfDay()
+ : now($timezone)->endOfDay();
$startDate = $startDate
? $startDate->copy()->setTimezone($timezone)->startOfDay()
: $endDate->copy()->subDays(30)->startOfDay();
diff --git a/backend/app/Services/Domain/Report/AbstractReportService.php b/backend/app/Services/Domain/Report/AbstractReportService.php
index d30fc007c..5ff76bfdb 100644
--- a/backend/app/Services/Domain/Report/AbstractReportService.php
+++ b/backend/app/Services/Domain/Report/AbstractReportService.php
@@ -24,8 +24,9 @@ abstract class AbstractReportService
$timezone = $event->getTimezone();
$endDate = $endDate
- ? $endDate->copy()->setTimezone($timezone)->startOfDay()
- : now($timezone)->startOfDay();
+ ? $endDate->copy()->setTimezone($timezone)->endOfDay()
+ : now($timezone)->endOfDay();
+
$startDate = $startDate
? $startDate->copy()->setTimezone($timezone)->startOfDay()
: $endDate->copy()->subDays(30)->startOfDay();
diff --git a/backend/tests/Unit/Jobs/Vat/ValidateVatNumberJobTest.php b/backend/tests/Unit/Jobs/Vat/ValidateVatNumberJobTest.php
index 056469f65..1a91aa356 100644
--- a/backend/tests/Unit/Jobs/Vat/ValidateVatNumberJobTest.php
+++ b/backend/tests/Unit/Jobs/Vat/ValidateVatNumberJobTest.php
@@ -1,6 +1,6 @@
<?php
-namespace HiEvents\Tests\Unit\Jobs\Vat;
+namespace Tests\Unit\Jobs\Vat;
use HiEvents\DomainObjects\AccountVatSettingDomainObject;
use HiEvents\DomainObjects\Status\VatValidationStatus;
diff --git a/backend/tests/Unit/Services/Application/Handlers/Account/Vat/GetAccountVatSettingHandlerTest.php b/backend/tests/Unit/Services/Application/Handlers/Account/Vat/GetAccountVatSettingHandlerTest.php
index b2fb87b3b..5eddde1a3 100644
--- a/backend/tests/Unit/Services/Application/Handlers/Account/Vat/GetAccountVatSettingHandlerTest.php
+++ b/backend/tests/Unit/Services/Application/Handlers/Account/Vat/GetAccountVatSettingHandlerTest.php
@@ -1,6 +1,6 @@
<?php
-namespace HiEvents\Tests\Unit\Services\Application\Handlers\Account\Vat;
+namespace Tests\Unit\Services\Application\Handlers\Account\Vat;
use HiEvents\DomainObjects\AccountVatSettingDomainObject;
use HiEvents\Repository\Interfaces\AccountVatSettingRepositoryInterface;
diff --git a/backend/tests/Unit/Services/Application/Handlers/Account/Vat/UpsertAccountVatSettingHandlerTest.php b/backend/tests/Unit/Services/Application/Handlers/Account/Vat/UpsertAccountVatSettingHandlerTest.php
index 373215991..30f6932a9 100644
--- a/backend/tests/Unit/Services/Application/Handlers/Account/Vat/UpsertAccountVatSettingHandlerTest.php
+++ b/backend/tests/Unit/Services/Application/Handlers/Account/Vat/UpsertAccountVatSettingHandlerTest.php
@@ -1,6 +1,6 @@
<?php
-namespace HiEvents\Tests\Unit\Services\Application\Handlers\Account\Vat;
+namespace Tests\Unit\Services\Application\Handlers\Account\Vat;
use HiEvents\DomainObjects\AccountVatSettingDomainObject;
use HiEvents\DomainObjects\Status\VatValidationStatus;
diff --git a/backend/tests/Unit/Services/Application/Handlers/Admin/AssignConfigurationHandlerTest.php b/backend/tests/Unit/Services/Application/Handlers/Admin/AssignConfigurationHandlerTest.php
index 596c2e899..4752bf23c 100644
--- a/backend/tests/Unit/Services/Application/Handlers/Admin/AssignConfigurationHandlerTest.php
+++ b/backend/tests/Unit/Services/Application/Handlers/Admin/AssignConfigurationHandlerTest.php
@@ -1,6 +1,6 @@
<?php
-namespace HiEvents\Tests\Unit\Services\Application\Handlers\Admin;
+namespace Tests\Unit\Services\Application\Handlers\Admin;
use HiEvents\DomainObjects\AccountConfigurationDomainObject;
use HiEvents\DomainObjects\AccountDomainObject;
diff --git a/backend/tests/Unit/Services/Application/Handlers/Admin/DeleteConfigurationHandlerTest.php b/backend/tests/Unit/Services/Application/Handlers/Admin/DeleteConfigurationHandlerTest.php
index 502604375..8844fb8c1 100644
--- a/backend/tests/Unit/Services/Application/Handlers/Admin/DeleteConfigurationHandlerTest.php
+++ b/backend/tests/Unit/Services/Application/Handlers/Admin/DeleteConfigurationHandlerTest.php
@@ -1,6 +1,6 @@
<?php
-namespace HiEvents\Tests\Unit\Services\Application\Handlers\Admin;
+namespace Tests\Unit\Services\Application\Handlers\Admin;
use HiEvents\DomainObjects\AccountConfigurationDomainObject;
use HiEvents\Exceptions\CannotDeleteEntityException;
diff --git a/backend/tests/Unit/Services/Application/Handlers/Admin/GetAccountHandlerTest.php b/backend/tests/Unit/Services/Application/Handlers/Admin/GetAccountHandlerTest.php
index 92584a045..343d34549 100644
--- a/backend/tests/Unit/Services/Application/Handlers/Admin/GetAccountHandlerTest.php
+++ b/backend/tests/Unit/Services/Application/Handlers/Admin/GetAccountHandlerTest.php
@@ -1,6 +1,6 @@
<?php
-namespace HiEvents\Tests\Unit\Services\Application\Handlers\Admin;
+namespace Tests\Unit\Services\Application\Handlers\Admin;
use HiEvents\Models\Account;
use HiEvents\Repository\Interfaces\AccountRepositoryInterface;
diff --git a/backend/tests/Unit/Services/Application/Handlers/Admin/GetAllOrdersHandlerTest.php b/backend/tests/Unit/Services/Application/Handlers/Admin/GetAllOrdersHandlerTest.php
index 7de463613..52010d725 100644
--- a/backend/tests/Unit/Services/Application/Handlers/Admin/GetAllOrdersHandlerTest.php
+++ b/backend/tests/Unit/Services/Application/Handlers/Admin/GetAllOrdersHandlerTest.php
@@ -1,6 +1,6 @@
<?php
-namespace HiEvents\Tests\Unit\Services\Application\Handlers\Admin;
+namespace Tests\Unit\Services\Application\Handlers\Admin;
use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
use HiEvents\Services\Application\Handlers\Admin\DTO\GetAllOrdersDTO;
diff --git a/backend/tests/Unit/Services/Application/Handlers/Admin/UpdateAccountConfigurationHandlerTest.php b/backend/tests/Unit/Services/Application/Handlers/Admin/UpdateAccountConfigurationHandlerTest.php
index f5c270cdc..2f594daaa 100644
--- a/backend/tests/Unit/Services/Application/Handlers/Admin/UpdateAccountConfigurationHandlerTest.php
+++ b/backend/tests/Unit/Services/Application/Handlers/Admin/UpdateAccountConfigurationHandlerTest.php
@@ -1,6 +1,6 @@
<?php
-namespace HiEvents\Tests\Unit\Services\Application\Handlers\Admin;
+namespace Tests\Unit\Services\Application\Handlers\Admin;
use HiEvents\DataTransferObjects\UpdateAccountConfigurationDTO;
use HiEvents\DomainObjects\AccountConfigurationDomainObject;
diff --git a/backend/tests/Unit/Services/Application/Handlers/Admin/UpdateAdminAccountVatSettingHandlerTest.php b/backend/tests/Unit/Services/Application/Handlers/Admin/UpdateAdminAccountVatSettingHandlerTest.php
index eab678cfd..5a8e11b0b 100644
--- a/backend/tests/Unit/Services/Application/Handlers/Admin/UpdateAdminAccountVatSettingHandlerTest.php
+++ b/backend/tests/Unit/Services/Application/Handlers/Admin/UpdateAdminAccountVatSettingHandlerTest.php
@@ -1,6 +1,6 @@
<?php
-namespace HiEvents\Tests\Unit\Services\Application\Handlers\Admin;
+namespace Tests\Unit\Services\Application\Handlers\Admin;
use HiEvents\DataTransferObjects\UpdateAdminAccountVatSettingDTO;
use HiEvents\DomainObjects\AccountVatSettingDomainObject;
diff --git a/backend/tests/Unit/Services/Infrastructure/Vat/ViesValidationServiceTest.php b/backend/tests/Unit/Services/Infrastructure/Vat/ViesValidationServiceTest.php
index 4040d1bcf..1439b0d6a 100644
--- a/backend/tests/Unit/Services/Infrastructure/Vat/ViesValidationServiceTest.php
+++ b/backend/tests/Unit/Services/Infrastructure/Vat/ViesValidationServiceTest.php
@@ -1,6 +1,6 @@
<?php
-namespace HiEvents\Tests\Unit\Services\Infrastructure\Vat;
+namespace Tests\Unit\Services\Infrastructure\Vat;
use HiEvents\Services\Infrastructure\Vat\ViesValidationService;
use Illuminate\Http\Client\Factory as HttpClient;