Handling mails

Author: JanMikes

config/packages/routing.php

@@ -2,11 +2,14 @@
 
 declare(strict_types=1);
 
+use Symfony\Config\Framework\RouterConfig;
 use Symfony\Config\FrameworkConfig;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\env;
 
 return static function (FrameworkConfig $frameworkConfig): void {
-    $frameworkConfig->router()
-        ->utf8(true)
+    /** @var RouterConfig $router */
+    $router = $frameworkConfig->router();
+
+    $router->utf8(true)
         ->defaultUri(env('APP_URL'));
 };

src/Controller/MembershipController.php

@@ -4,6 +4,7 @@
 namespace SpeedPuzzling\Web\Controller;
 
 use Auth0\Symfony\Models\User;
+use Psr\Clock\ClockInterface;
 use SpeedPuzzling\Web\Exceptions\MembershipNotFound;
 use SpeedPuzzling\Web\Query\GetPlayerMembership;
 use SpeedPuzzling\Web\Services\RetrieveLoggedUserProfile;
@@ -17,6 +18,7 @@ final class MembershipController extends AbstractController
     public function __construct(
         readonly private GetPlayerMembership $getPlayerMembership,
         readonly private RetrieveLoggedUserProfile $retrieveLoggedUserProfile,
+        readonly private ClockInterface $clock,
     ) {
     }
 
@@ -43,6 +45,7 @@ public function __invoke(#[CurrentUser] User $user): Response
 
         return $this->render('membership.html.twig', [
             'membership' => $membership,
+            'now' => $this->clock->now(),
         ]);
     }
 }

src/MessageHandler/CancelMembershipSubscriptionHandler.php

@@ -4,6 +4,7 @@
 
 namespace SpeedPuzzling\Web\MessageHandler;
 
+use Psr\Clock\ClockInterface;
 use SpeedPuzzling\Web\Exceptions\MembershipNotFound;
 use SpeedPuzzling\Web\Message\CancelMembershipSubscription;
 use SpeedPuzzling\Web\Repository\MembershipRepository;
@@ -12,6 +13,7 @@
 {
     public function __construct(
         private MembershipRepository $membershipRepository,
+        private ClockInterface $clock,
     ) {
     }
 
@@ -22,6 +24,6 @@ public function __invoke(CancelMembershipSubscription $message): void
     {
         $membership = $this->membershipRepository->getByStripeSubscriptionId($message->stripeSubscriptionId);
 
-        $membership->cancel();
+        $membership->cancel($this->clock->now());
     }
 }

templates/membership.html.twig

@@ -21,17 +21,21 @@
                                 <p>
                                     {{ 'membership.next_payment'|trans }}: <strong>{{ membership.billingPeriodEndsAt|date('d.m.Y H:i') }}</strong>
                                 </p>
-                            {% elseif membership.endsAt %}
+                            {% elseif membership.endsAt and membership.endsAt > now %}
                                 <p class="text-warning fs-5">
                                     <i class="ci-close-circle me-2"></i> {{ 'membership.membership_cancelling'|trans }}
                                 </p>
-                            {% elseif membership.endsAt is null %}
+                            {% elseif membership.endsAt and membership.endsAt < now %}
+                                <p class="text-danger fs-5">
+                                    <i class="ci-close-circle me-2"></i> {{ 'membership.membership_expired'|trans }}
+                                </p>
+                            {% else %}
                                 <p class="text-danger fs-5">
                                     <i class="ci-close-circle me-2"></i> {{ 'membership.membership_inactive'|trans }}
                                 </p>
                             {% endif %}
 
-                            {% if membership.endsAt %}
+                            {% if membership.endsAt and membership.endsAt > now %}
                                 <p>
                                     {{ 'membership.membership_expiration'|trans }}: <strong>{{ membership.billingPeriodEndsAt|date('d.m.Y') }}</strong>
                                 </p>

translations/messages.cs.yml

@@ -455,6 +455,7 @@ membership:
     membership_active: "Aktivní členství, děkujeme že jste součástí!"
     membership_inactive: "Členství není aktivní"
     membership_cancelling: "Předplatné bylo zrušeno, členství je aktivní do konce období"
+    membership_expired: "Vaše členství vypršelo"
     next_payment: "Příští platba"
     membership_expiration: "Platnost členství do"
     payment_portal_button: "Upravit předplatné (platební portál)"

translations/messages.en.yml

@@ -453,6 +453,7 @@ membership:
     membership_active: "Active membership, thank you for being part of the community!"
     membership_inactive: "Membership is not active"
     membership_cancelling: "Subscription has been canceled, membership is active until the end of the period"
+    membership_expired: "Your membership expired"
     next_payment: "Next payment"
     membership_expiration: "Membership valid until"
     payment_portal_button: "Manage subscription (payment portal)"