diff --git a/src/Controller/AccountController.php b/src/Controller/AccountController.php index 3a48309..a4093c4 100644 --- a/src/Controller/AccountController.php +++ b/src/Controller/AccountController.php @@ -1559,15 +1559,10 @@ class AccountController extends AbstractController /** @var User $user */ $user = $this->getUser(); - if (!$user->isStripeChargesEnabled() || !$user->isStripePayoutsEnabled()) { - return $this->redirectToRoute('app_account'); - } + $stripeNotReady = !$user->isStripeChargesEnabled() || !$user->isStripePayoutsEnabled(); + $billingBlocked = $user->isBilling() && 'good' !== $user->getBillingState(); - if ($user->isBilling() && 'good' !== $user->getBillingState()) { - return $this->redirectToRoute('app_account'); - } - - return null; + return ($stripeNotReady || $billingBlocked) ? $this->redirectToRoute('app_account') : null; } /** diff --git a/src/Controller/ScannerController.php b/src/Controller/ScannerController.php index c9129fb..77da408 100644 --- a/src/Controller/ScannerController.php +++ b/src/Controller/ScannerController.php @@ -8,6 +8,8 @@ use Symfony\Component\Routing\Attribute\Route; class ScannerController extends AbstractController { + private const SCANNER_PATH = '/scanner/'; + #[Route('/scanner/', name: 'app_scanner', methods: ['GET'])] public function index(): Response { @@ -21,8 +23,8 @@ class ScannerController extends AbstractController 'name' => 'E-Ticket Scanner', 'short_name' => 'Scanner', 'description' => 'Application de scan de billets pour organisateurs', - 'start_url' => '/scanner/', - 'scope' => '/scanner/', + 'start_url' => self::SCANNER_PATH, + 'scope' => self::SCANNER_PATH, 'display' => 'standalone', 'orientation' => 'portrait', 'theme_color' => '#111827', diff --git a/templates/scanner/index.html.twig b/templates/scanner/index.html.twig index 1684e6b..72dc9b3 100644 --- a/templates/scanner/index.html.twig +++ b/templates/scanner/index.html.twig @@ -2,7 +2,7 @@
- +