feat: split nights off an accommodation booking as separate periods
addresses #869f6z36v
This commit is contained in:
fromme committed
1 parent
972839286c
commit
7001bc0cf2
35 files changed
+2221
-25
No files matched your search
@@ -0,0 +1,81 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Controller\Admin\AccommodationBooking;
|
||||
|
||||
use App\Entity\Groups\AccommodationBookingPeriod;
|
||||
use App\Exception\ImplausibleBookingPriceException;
|
||||
use App\Form\Admin\Groups\AccommodationBookingPeriodType;
|
||||
use App\Form\Model\AccommodationBookingPeriodDto;
|
||||
use App\Htmx\HxTrait;
|
||||
use App\Service\AccommodationBookingService;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
use Symfony\Component\Form\FormError;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\Routing\Attribute\Route;
|
||||
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
||||
|
||||
/** Changes the length and the lines of a split-off period; the main period absorbs the difference. */
|
||||
#[IsGranted('ROLE_GROUPS_MANAGER')]
|
||||
class EditPeriodController extends AbstractController
|
||||
{
|
||||
use HxTrait;
|
||||
use RedirectsToEditFormTrait;
|
||||
|
||||
public function __construct(
|
||||
private readonly AccommodationBookingService $bookingService,
|
||||
private readonly LoggerInterface $logger,
|
||||
) {
|
||||
}
|
||||
|
||||
#[Route('/admin/accommodation-booking-period/{id}/edit', name: 'app_admin_accommodationbooking_period_edit')]
|
||||
public function index(AccommodationBookingPeriod $period, Request $request): Response
|
||||
{
|
||||
$booking = $period->getBooking() ?? throw $this->createNotFoundException();
|
||||
|
||||
$dto = AccommodationBookingPeriodDto::fromPeriod($period);
|
||||
$form = $this->createForm(AccommodationBookingPeriodType::class, $dto, [
|
||||
'currency' => $booking->getPricingCurrency() ?? $booking->getAccommodation()?->getCurrency() ?? 'EUR',
|
||||
'hx_post' => $request->getRequestUri(),
|
||||
]);
|
||||
$form->handleRequest($request);
|
||||
|
||||
if ($form->isSubmitted() && $form->isValid()) {
|
||||
try {
|
||||
$violations = $this->bookingService->updatePeriod($booking, $period, $dto);
|
||||
|
||||
foreach ($violations as $violation) {
|
||||
$form->addError(new FormError((string) $violation->getMessage()));
|
||||
}
|
||||
|
||||
if (0 === count($violations)) {
|
||||
$this->addFlash('success', 'Der Zeitraum wurde aktualisiert.');
|
||||
|
||||
$this->logger->info('Updated a period of accommodation booking', [
|
||||
'id' => $booking->getId(),
|
||||
'periodId' => $period->getId(),
|
||||
'nights' => $dto->nights,
|
||||
]);
|
||||
|
||||
return $this->htmxRedirect($request, $this->editUrl($booking, $request));
|
||||
}
|
||||
} catch (ImplausibleBookingPriceException $e) {
|
||||
$this->logger->error('Refused to update a period over an implausible accommodation booking total', [
|
||||
'exception' => $e,
|
||||
'id' => $booking->getId(),
|
||||
'periodId' => $period->getId(),
|
||||
]);
|
||||
$form->addError(new FormError(ImplausibleBookingPriceException::FORM_ERROR_MESSAGE));
|
||||
}
|
||||
}
|
||||
|
||||
return $this->render('admin/accommodation_booking/modal_period.html.twig', [
|
||||
'booking' => $booking,
|
||||
'form' => $form,
|
||||
'title' => 'Zeitraum bearbeiten',
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Controller\Admin\AccommodationBooking;
|
||||
|
||||
use App\Entity\Groups\AccommodationBooking;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
|
||||
/**
|
||||
* For the modals opened from the edit form: they save on their own and send the browser back to
|
||||
* it, rebuilt with the new price.
|
||||
*/
|
||||
trait RedirectsToEditFormTrait
|
||||
{
|
||||
/**
|
||||
* The return url is forwarded still encoded, the way return_url() handed it over, so that
|
||||
* the edit page keeps leading back to the list the booking was opened from.
|
||||
*/
|
||||
private function editUrl(AccommodationBooking $booking, Request $request): string
|
||||
{
|
||||
$parameters = ['id' => $booking->getId()];
|
||||
$returnUrl = $request->query->getString('r');
|
||||
if ('' !== $returnUrl) {
|
||||
$parameters['r'] = $returnUrl;
|
||||
}
|
||||
|
||||
return $this->generateUrl('app_admin_accommodationbooking_edit', $parameters);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,80 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Controller\Admin\AccommodationBooking;
|
||||
|
||||
use App\Entity\Groups\AccommodationBookingPeriod;
|
||||
use App\Exception\ImplausibleBookingPriceException;
|
||||
use App\Htmx\HxTrait;
|
||||
use App\Service\AccommodationBookingService;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\Routing\Attribute\Route;
|
||||
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
||||
|
||||
/** Gives a split-off period's nights back to the main period, which reprices the booking. */
|
||||
#[IsGranted('ROLE_GROUPS_MANAGER')]
|
||||
class RemovePeriodController extends AbstractController
|
||||
{
|
||||
use HxTrait;
|
||||
use RedirectsToEditFormTrait;
|
||||
|
||||
public function __construct(
|
||||
private readonly AccommodationBookingService $bookingService,
|
||||
private readonly LoggerInterface $logger,
|
||||
) {
|
||||
}
|
||||
|
||||
#[Route('/admin/accommodation-booking-period/{id}/remove', name: 'app_admin_accommodationbooking_period_remove')]
|
||||
public function index(AccommodationBookingPeriod $period, Request $request): Response
|
||||
{
|
||||
$booking = $period->getBooking() ?? throw $this->createNotFoundException();
|
||||
|
||||
if ($request->isMethod(Request::METHOD_POST)) {
|
||||
if (!$this->isCsrfTokenValid('remove_accommodation_booking_period_'.$period->getId(), $request->request->getString('_token'))) {
|
||||
throw $this->createAccessDeniedException('Invalid CSRF token.');
|
||||
}
|
||||
|
||||
$periodId = $period->getId();
|
||||
|
||||
try {
|
||||
$violations = $this->bookingService->removePeriod($booking, $period);
|
||||
} catch (ImplausibleBookingPriceException $e) {
|
||||
$this->logger->error('Refused to remove a period over an implausible accommodation booking total', [
|
||||
'exception' => $e,
|
||||
'id' => $booking->getId(),
|
||||
'periodId' => $periodId,
|
||||
]);
|
||||
$this->addFlash('error', ImplausibleBookingPriceException::FORM_ERROR_MESSAGE);
|
||||
|
||||
return $this->htmxRedirect($request, $this->editUrl($booking, $request));
|
||||
}
|
||||
|
||||
// Removing only ever lengthens the main period, so this is reached only when the
|
||||
// stay's dates were already inconsistent with the periods.
|
||||
foreach ($violations as $violation) {
|
||||
$this->addFlash('error', (string) $violation->getMessage());
|
||||
}
|
||||
|
||||
if (0 === count($violations)) {
|
||||
$this->addFlash('success', 'Der Zeitraum wurde entfernt.');
|
||||
|
||||
$this->logger->info('Removed a period of accommodation booking', [
|
||||
'id' => $booking->getId(),
|
||||
'periodId' => $periodId,
|
||||
]);
|
||||
}
|
||||
|
||||
return $this->htmxRedirect($request, $this->editUrl($booking, $request));
|
||||
}
|
||||
|
||||
return $this->render('admin/accommodation_booking/modal_remove_period.html.twig', [
|
||||
'booking' => $booking,
|
||||
'period' => $period,
|
||||
'csrf_token_id' => 'remove_accommodation_booking_period_'.$period->getId(),
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,107 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Controller\Admin\AccommodationBooking;
|
||||
|
||||
use App\Entity\Groups\AccommodationBooking;
|
||||
use App\Enum\Groups\AccommodationBookingPeriodPosition;
|
||||
use App\Exception\ImplausibleBookingPriceException;
|
||||
use App\Form\Admin\Groups\AccommodationBookingPeriodType;
|
||||
use App\Form\Model\AccommodationBookingPeriodDto;
|
||||
use App\Form\Model\AccommodationBookingPeriodLineDto;
|
||||
use App\Htmx\HxTrait;
|
||||
use App\Service\AccommodationBookingService;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
use Symfony\Component\Form\FormError;
|
||||
use Symfony\Component\Form\FormInterface;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\Routing\Attribute\Route;
|
||||
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
||||
|
||||
/**
|
||||
* Splits nights off the start or the end of the stay, for a part of the group that arrives
|
||||
* early or leaves late and is quoted as free-form lines instead of the booking's parameters.
|
||||
* Each side can be split once; the period can be resized afterwards through its edit modal.
|
||||
*/
|
||||
#[IsGranted('ROLE_GROUPS_MANAGER')]
|
||||
class SplitPeriodController extends AbstractController
|
||||
{
|
||||
use HxTrait;
|
||||
use RedirectsToEditFormTrait;
|
||||
|
||||
public function __construct(
|
||||
private readonly AccommodationBookingService $bookingService,
|
||||
private readonly LoggerInterface $logger,
|
||||
) {
|
||||
}
|
||||
|
||||
#[Route(
|
||||
'/admin/accommodation-booking/{id}/period/split/{position}',
|
||||
name: 'app_admin_accommodationbooking_period_split',
|
||||
requirements: ['position' => 'leading|trailing'],
|
||||
)]
|
||||
public function index(AccommodationBooking $booking, AccommodationBookingPeriodPosition $position, Request $request): Response
|
||||
{
|
||||
// One period per side. The edit page only offers the free sides, so this catches a page
|
||||
// that was open while somebody else split the same side.
|
||||
if (!$booking->canSplitOffPeriod($position)) {
|
||||
$this->addFlash('error', AccommodationBookingPeriodPosition::Leading === $position
|
||||
? 'Am Anfang wurde bereits ein Zeitraum abgeteilt.'
|
||||
: 'Am Ende wurde bereits ein Zeitraum abgeteilt.');
|
||||
|
||||
return $this->htmxRedirect($request, $this->editUrl($booking, $request));
|
||||
}
|
||||
|
||||
$dto = new AccommodationBookingPeriodDto(1, [new AccommodationBookingPeriodLineDto()]);
|
||||
$form = $this->createForm(AccommodationBookingPeriodType::class, $dto, [
|
||||
'currency' => $booking->getPricingCurrency() ?? $booking->getAccommodation()?->getCurrency() ?? 'EUR',
|
||||
'hx_post' => $request->getRequestUri(),
|
||||
]);
|
||||
$form->handleRequest($request);
|
||||
|
||||
if ($form->isSubmitted() && $form->isValid()) {
|
||||
try {
|
||||
$violations = $this->bookingService->splitOffPeriod($booking, $position, $dto);
|
||||
|
||||
foreach ($violations as $violation) {
|
||||
$form->addError(new FormError((string) $violation->getMessage()));
|
||||
}
|
||||
|
||||
if (0 === count($violations)) {
|
||||
$this->addFlash('success', 'Der Zeitraum wurde abgeteilt.');
|
||||
|
||||
$this->logger->info('Split off a period of accommodation booking', [
|
||||
'id' => $booking->getId(),
|
||||
'position' => $position->value,
|
||||
'nights' => $dto->nights,
|
||||
]);
|
||||
|
||||
return $this->htmxRedirect($request, $this->editUrl($booking, $request));
|
||||
}
|
||||
} catch (ImplausibleBookingPriceException $e) {
|
||||
$this->logger->error('Refused to split off a period over an implausible accommodation booking total', [
|
||||
'exception' => $e,
|
||||
'id' => $booking->getId(),
|
||||
]);
|
||||
$form->addError(new FormError(ImplausibleBookingPriceException::FORM_ERROR_MESSAGE));
|
||||
}
|
||||
}
|
||||
|
||||
return $this->renderModal($booking, $position, $form);
|
||||
}
|
||||
|
||||
/** @param FormInterface<AccommodationBookingPeriodDto> $form */
|
||||
private function renderModal(AccommodationBooking $booking, AccommodationBookingPeriodPosition $position, FormInterface $form): Response
|
||||
{
|
||||
return $this->render('admin/accommodation_booking/modal_period.html.twig', [
|
||||
'booking' => $booking,
|
||||
'form' => $form,
|
||||
'title' => AccommodationBookingPeriodPosition::Leading === $position
|
||||
? 'Zeitraum am Anfang abteilen'
|
||||
: 'Zeitraum am Ende abteilen',
|
||||
]);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user