show nps after survey transactionned was answered by a buyer

gip-inclusion · Mar 6, 2024 · de9a053 · de9a053
1 parent 8674309
commit de9a053
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/config/settings/base.py b/config/settings/base.py
@@ -813,7 +813,8 @@
 FORM_PARTENAIRES = (
     "https://docs.google.com/forms/d/e/1FAIpQLScx1k-UJ-962_rSgPJGabc327gGjFUho6ypgcZHCubuwTl7Lg/viewform"
 )
-TALLY_NPS_FORM_ID = env.str("TALLY_NPS_FORM_ID", "")
+TALLY_BUYER_NPS_FORM_ID = env.str("TALLY_BUYER_NPS_FORM_ID", "")
+TALLY_SIAE_NPS_FORM_ID = env.str("TALLY_SIAE_NPS_FORM_ID", "")
 PARTNER_APPROCH_USER_ID = env.int("PARTNER_APPROCH_USER_ID", 0)
 
 

diff --git a/lemarche/templates/tenders/detail.html b/lemarche/templates/tenders/detail.html
@@ -72,11 +72,11 @@
 {% endblock %}
 
 {% block extra_js %}
-{% if TALLY_NPS_FORM_ID and show_nps %}
+{% if nps_form_id %}
     <script async type="text/javascript" src="https://tally.so/widgets/embed.js"></script>
     <script type="text/javascript">
         window.TallyConfig = {
-            "formId": "{{ TALLY_NPS_FORM_ID }}",
+            "formId": "{{ nps_form_id }}",
             "popup": {
                 "width": 400,
                 "emoji": {

diff --git a/lemarche/utils/settings_context_processors.py b/lemarche/utils/settings_context_processors.py
@@ -28,6 +28,5 @@ def expose_settings(request):
         "TYPEFORM_BESOIN_ACHAT_RECHERCHE": settings.TYPEFORM_BESOIN_ACHAT_RECHERCHE,
         "TYPEFORM_GROUPEMENT_AJOUT": settings.TYPEFORM_GROUPEMENT_AJOUT,
         "FORM_PARTENAIRES": settings.FORM_PARTENAIRES,
-        "TALLY_NPS_FORM_ID": settings.TALLY_NPS_FORM_ID,
         "MTCAPTCHA_PUBLIC_KEY": settings.MTCAPTCHA_PUBLIC_KEY,
     }
diff --git a/lemarche/www/tenders/tests.py b/lemarche/www/tenders/tests.py
@@ -1762,7 +1762,7 @@ def test_update_tender_stats_on_tender_survey_transactioned_answer_true(self):
             url, data={"survey_transactioned_amount": 1000, "survey_transactioned_feedback": "Feedback"}, follow=True
         )
         self.assertEqual(response.status_code, 200)  # redirect
-        self.assertRedirects(response, reverse("tenders:detail", kwargs={"slug": self.tender.slug}))
+        self.assertRedirects(response, reverse("tenders:detail", kwargs={"slug": self.tender.slug}) + "?nps=true")
         self.assertContains(response, "Merci pour votre réponse")
         self.assertTrue(Tender.objects.get(id=self.tender.id).survey_transactioned_answer)
         self.assertEqual(Tender.objects.get(id=self.tender.id).survey_transactioned_amount, 1000)
@@ -1785,7 +1785,7 @@ def test_update_tender_stats_on_tender_survey_transactioned_answer_false(self):
         # fill in form
         response = self.client.post(url, data={"survey_transactioned_feedback": "Feedback"}, follow=True)
         self.assertEqual(response.status_code, 200)  # redirect
-        self.assertRedirects(response, reverse("tenders:detail", kwargs={"slug": self.tender.slug}))
+        self.assertRedirects(response, reverse("tenders:detail", kwargs={"slug": self.tender.slug}) + "?nps=true")
         self.assertContains(response, "Merci pour votre réponse")
         self.assertFalse(Tender.objects.get(id=self.tender.id).survey_transactioned_answer)
         self.assertIsNone(Tender.objects.get(id=self.tender.id).survey_transactioned_amount)

diff --git a/lemarche/www/tenders/views.py b/lemarche/www/tenders/views.py
@@ -409,7 +409,10 @@ def get_context_data(self, **kwargs):
                     ).exists()
                 )
                 if show_nps:
-                    context["show_nps"] = True
+                    context["nps_form_id"] = settings.TALLY_SIAE_NPS_FORM_ID
+            elif user.kind == User.KIND_BUYER:
+                if show_nps:
+                    context["nps_form_id"] = settings.TALLY_BUYER_NPS_FORM_ID
             elif user.kind == User.KIND_PARTNER:
                 context["user_partner_can_display_tender_contact_details"] = user.can_display_tender_contact_details
             else:
@@ -646,10 +649,12 @@ def get_form_kwargs(self):
     def form_valid(self, form):
         super().form_valid(form)
         messages.add_message(self.request, messages.SUCCESS, self.get_success_message())
-        return HttpResponseRedirect(self.get_success_url())
+        return HttpResponseRedirect(self.get_success_url(survey_was_answered=True))
 
-    def get_success_url(self):
+    def get_success_url(self, survey_was_answered=None):
         success_url = reverse_lazy("tenders:detail", args=[self.kwargs.get("slug")])
+        if survey_was_answered:
+            success_url += "?nps=true"
         return success_url
 
     def get_success_message(self, already_answered=False):