added refreshing + showing membership in skautis

SkautDevs · Nov 28, 2023 · 4e893a9 · 4e893a9
1 parent 04635e6
commit 4e893a9
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 1 deletion.
diff --git a/src/Skautis/SkautisController.php b/src/Skautis/SkautisController.php
@@ -40,7 +40,8 @@ public function redirectFromSkautis(Request $request, Response $response): Respo
             return $this->redirect($request, $response, 'landing', ['eventSlug' => $eventSlug]);
         }
 
-        $this->skautisService->getOrCreateAndLogInSkautisUser($skautisUserData, $event);
+        $user = $this->skautisService->getOrCreateAndLogInSkautisUser($skautisUserData, $event);
+        $this->skautisService->updateSkautisUserMembership($user, $skautisUserData);
 
         return $this->redirect($request, $response, 'getDashboard', ['eventSlug' => $eventSlug]);
     }

diff --git a/src/Skautis/SkautisService.php b/src/Skautis/SkautisService.php
@@ -136,4 +136,12 @@ public function prefillDataFromSkautis(Participant $participant): Participant
 
         return $participant;
     }
+
+    public function updateSkautisUserMembership(User $user, SkautisUserData $skautisUserData): User
+    {
+        $user->skautisHasMembership = $skautisUserData->hasMembership;
+        $this->userRepository->persist($user);
+
+        return $user;
+    }
 }
diff --git a/src/Templates/cs.yaml b/src/Templates/cs.yaml
@@ -145,6 +145,7 @@ detail:
     driver-dont: "Nemám nebo na akci nechci řídit"
     driver-less10k: "Mám, na akci chci řídit, ale mám najeto méně než 10 000 km"
     driver-more10k: "Mám, na akci řídit chci a mám najeto víc než 10 000 km"
+    loginMethod: "Přihlášení"
     closed-at: "Uzamknut"
     adminNotice: "Poznámka od admina"
 detail-guest:
@@ -153,6 +154,8 @@ detail-guest:
 _layout:
     title: "Registrace"
     titleBar: "Registrace"
+    skautisAccountNotConnected: "nepropojeno s reálnou osobou"
+    skautisAccountConnected: "ověřeno"
     logOut: "Odhlásit se"
     editingBar: "Vyplnění údajů"
     lockedBar: "Zamknuto"

diff --git a/src/Templates/en.yaml b/src/Templates/en.yaml
@@ -145,6 +145,7 @@ detail:
     driver-dont: "I don't have it or I don't want to drive on the event"
     driver-less10k: "I have it, but have not driven more than 10 000 km"
     driver-more10k: "I have it and have driven more than 10 000 km"
+    loginMethod: "Login method"
     closed-at: "Locked"
     adminNotice: "Note from admin"
 detail-guest:
@@ -153,6 +154,8 @@ detail-guest:
 _layout:
     title: "Registration"
     titleBar: "Registration"
+    skautisAccountNotConnected: "not paired with real person"
+    skautisAccountConnected: "approved"
     logOut: "Log out"
     editingBar: "Editing"
     lockedBar: "Locked"

diff --git a/src/Templates/sk.yaml b/src/Templates/sk.yaml
@@ -127,6 +127,7 @@ detail:
     driver-dont: "Nemám alebo na akcii nechcem šoférovať"
     driver-less10k: "Mám, ale mám najazdených menej ako 10 000 km"
     driver-more10k: "Mám a mám najazdených viac ako 10 000 km"
+    loginMethod: "Přihlášení"
     closed-at: "Uzamknut"
     adminNotice: "Poznámka od admina"
 detail-guest:
@@ -135,6 +136,8 @@ detail-guest:
 _layout:
     title: "Registrácia"
     titleBar: "Registrácia"
+    skautisAccountNotConnected: "nepropojeno s reálnou osobou"
+    skautisAccountConnected: "ověřeno"
     logOut: "Odhlásiť"
     editingBar: "Otvorené"
     lockedBar: "Uzamknuté"

diff --git a/src/Templates/translatable/_layout.twig b/src/Templates/translatable/_layout.twig
@@ -38,6 +38,9 @@
     {% if user is not null %}
         | {% if user.loginType.value == 'skautis' %}
             <img src="https://is.skaut.cz/Login/Favicons/favicon-16x16.png" alt="skautisLogo">
+            {%  if not user.skautisHasMembership %}    
+                {% trans %}_layout.skautisAccountNotConnected{% endtrans %} ❌
+            {% endif %}
         {% else %}
             📧
         {% endif %}

diff --git a/src/Templates/translatable/widgets/detailsForAdmin.twig b/src/Templates/translatable/widgets/detailsForAdmin.twig
@@ -1,4 +1,16 @@
 {% include 'widgets/details.twig' with {'person': person, 'ca': ca} %}
+<i>{% trans %}detail.loginMethod{% endtrans %}: <b>
+{% if person.user.loginType.value == 'skautis' %}
+    skautis <img src="https://is.skaut.cz/Login/Favicons/favicon-16x16.png" alt="skautisLogo">
+    {%  if not person.user.skautisHasMembership %}
+        {% trans %}_layout.skautisAccountNotConnected{% endtrans %} ❌
+    {% else %}
+        {% trans %}_layout.skautisAccountConnected{% endtrans %} ✔
+    {% endif %}
+{% else %}
+    mail 📧
+{% endif %}
+</b></i><br/>
 {% if person.getRegistrationCloseDate %}
     <i>{% trans %}detail.closed-at{% endtrans %}: <b>{{ person.getRegistrationCloseDate.format('d. m. Y, H:i:s') }}</b></i><br/>
 {% endif %}