Merge remote-tracking branch 'origin/develop' into develop

Author: daveearley

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

@@ -128,9 +128,9 @@ public function handle(string $orderShortId): CreatePaymentIntentResponseDTO
             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,
         ]);

backend/app/Services/Domain/Report/AbstractOrganizerReportService.php

@@ -31,8 +31,8 @@ public function generateReport(
         $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();

backend/app/Services/Domain/Report/AbstractReportService.php

@@ -24,8 +24,9 @@ public function generateReport(int $eventId, ?Carbon $startDate = null, ?Carbon
         $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();

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;

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;

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;

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;

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;

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;

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;