diff --git a/lemarche/templates/tenders/_detail_cocontracting_click_confirm.html b/lemarche/templates/tenders/_detail_cocontracting_click_confirm.html index 9ae834e94..db9759aab 100644 --- a/lemarche/templates/tenders/_detail_cocontracting_click_confirm.html +++ b/lemarche/templates/tenders/_detail_cocontracting_click_confirm.html @@ -1,5 +1,5 @@ diff --git a/lemarche/templates/tenders/_detail_cta_cocontracting.html b/lemarche/templates/tenders/_detail_cta_cocontracting.html index 214040dc2..c5c938d41 100644 --- a/lemarche/templates/tenders/_detail_cta_cocontracting.html +++ b/lemarche/templates/tenders/_detail_cta_cocontracting.html @@ -1,23 +1,25 @@
- {% if not tender.siae_detail_cocontracting_click_date_count %} -
-
-

Répondre en co-traitance ?

-

- Cette demande vous intéresse mais vous ne pouvez pas répondre seul ? Signalez au client que vous souhaiteriez répondre en co-traitance. -

+
+
+

Répondre en co-traitance ?

+

+ Cette demande vous intéresse mais vous ne pouvez pas répondre seul ? Signalez au client que vous souhaiteriez répondre en co-traitance. +

+ {% if user_can_click %} {% if user.is_authenticated %} - {% elif siae_id %} - {% endif %} -
+ {% else %} + + {{ tender.cta_cocontracting_card_button_text|safe }} + + {% endif %}
- {% else %} - {% include "tenders/_detail_cocontracting_click_confirm.html" %} - {% endif %} +
diff --git a/lemarche/templates/tenders/_detail_cta_not_interested.html b/lemarche/templates/tenders/_detail_cta_not_interested.html index 7f7d73935..48db894b7 100644 --- a/lemarche/templates/tenders/_detail_cta_not_interested.html +++ b/lemarche/templates/tenders/_detail_cta_not_interested.html @@ -6,7 +6,7 @@

Pas intéressé ?

Cette demande ne vous intéresse pas ? Dites-le nous !

{% if user_can_click %} - {% else %} diff --git a/lemarche/templates/tenders/_detail_sidebar.html b/lemarche/templates/tenders/_detail_sidebar.html index bdee44e83..b9ba281cb 100644 --- a/lemarche/templates/tenders/_detail_sidebar.html +++ b/lemarche/templates/tenders/_detail_sidebar.html @@ -39,22 +39,26 @@ {% if not user.has_siae %} {% include "tenders/_detail_siae_user_without_siae.html" %} {% elif siae_has_detail_contact_click_date %} + {% elif siae_has_detail_cocontracting_click_date %} + {% include "tenders/_detail_cocontracting_click_confirm.html" %} {% elif siae_has_detail_not_interested_click_date %} {% include "tenders/_detail_not_interested_click_confirm.html" %} {% else %} {% include "tenders/_detail_cta.html" with tender=tender user_can_click=True %} - {% include "tenders/_detail_cta_cocontracting.html" with tender=tender %} + {% include "tenders/_detail_cta_cocontracting.html" with tender=tender user_can_click=True %} {% include "tenders/_detail_cta_not_interested.html" with tender=tender user_can_click=True %} {% endif %} {% endif %} {% elif siae_id %} {% if siae_has_detail_contact_click_date %} + {% elif siae_has_detail_cocontracting_click_date %} + {% include "tenders/_detail_cocontracting_click_confirm.html" %} {% elif siae_has_detail_not_interested_click_date %} {% include "tenders/_detail_not_interested_click_confirm.html" %} {% else %} {% include "tenders/_detail_cta.html" with tender=tender user_can_click=True siae_id=siae_id %} - {% include "tenders/_detail_cta_cocontracting.html" with tender=tender siae_id=siae_id %} + {% include "tenders/_detail_cta_cocontracting.html" with tender=tender user_can_click=True siae_id=siae_id %} {% include "tenders/_detail_cta_not_interested.html" with tender=tender user_can_click=True siae_id=siae_id %} {% endif %} {% endif %} @@ -65,10 +69,13 @@ {% include "tenders/_detail_siae_user_without_siae.html" %} {% elif siae_has_detail_contact_click_date %} {% include "tenders/_detail_contact_click_confirm_tender_response_is_anonymous.html" %} + {% elif siae_has_detail_cocontracting_click_date %} + {% include "tenders/_detail_cocontracting_click_confirm.html" %} {% elif siae_has_detail_not_interested_click_date %} {% include "tenders/_detail_not_interested_click_confirm.html" %} {% else %} {% include "tenders/_detail_cta.html" with tender=tender user_can_click=True siae_id=siae_id tender_response_is_anonymous=True %} + {% include "tenders/_detail_cta_cocontracting.html" with tender=tender user_can_click=True siae_id=siae_id %} {% include "tenders/_detail_cta_not_interested.html" with tender=tender user_can_click=True siae_id=siae_id %} {% endif %} {% endif %} @@ -76,6 +83,7 @@ {% if not user.is_authenticated and not siae_id %} {% include "tenders/_detail_cta.html" with tender=tender user_can_click=False %} + {% include "tenders/_detail_cta_cocontracting.html" with tender=tender user_can_click=False %} {% include "tenders/_detail_cta_not_interested.html" with tender=tender user_can_click=False %} {% endif %} {% endif %} diff --git a/lemarche/tenders/models.py b/lemarche/tenders/models.py index 4196c482e..a70afb16c 100644 --- a/lemarche/tenders/models.py +++ b/lemarche/tenders/models.py @@ -653,6 +653,10 @@ def cta_card_button_text(self): return "Je suis intéressé !" return "Accéder aux coordonnées" + @property + def cta_cocontracting_card_button_text(self): + return "Répondre en co-traitance" + @property def cta_not_interested_card_button_text(self): return "Je ne suis pas intéressé" diff --git a/lemarche/www/tenders/tests.py b/lemarche/www/tenders/tests.py index 03e75cf8a..bd78a1acd 100644 --- a/lemarche/www/tenders/tests.py +++ b/lemarche/www/tenders/tests.py @@ -575,10 +575,12 @@ def setUpTestData(cls): cls.siae_3 = SiaeFactory(name="ABC Insertion bis") cls.siae_4 = SiaeFactory(name="ESAT 4") cls.siae_5 = SiaeFactory(name="ESAT 5") + cls.siae_6 = SiaeFactory(name="ESAT 6") cls.siae_user_1 = UserFactory(kind=User.KIND_SIAE, siaes=[cls.siae_1]) cls.siae_user_2 = UserFactory(kind=User.KIND_SIAE, siaes=[cls.siae_2, cls.siae_3]) cls.siae_user_4 = UserFactory(kind=User.KIND_SIAE, siaes=[cls.siae_4]) cls.siae_user_5 = UserFactory(kind=User.KIND_SIAE, siaes=[cls.siae_5]) + cls.siae_user_6 = UserFactory(kind=User.KIND_SIAE, siaes=[cls.siae_6]) cls.siae_user_without_siae = UserFactory(kind=User.KIND_SIAE) cls.user_buyer_1 = UserFactory(kind=User.KIND_BUYER, company_name="Entreprise Buyer") cls.user_buyer_2 = UserFactory(kind=User.KIND_BUYER) @@ -621,6 +623,15 @@ def setUpTestData(cls): email_send_date=timezone.now(), email_link_click_date=timezone.now(), detail_display_date=timezone.now(), + detail_cocontracting_click_date=timezone.now(), + ) + cls.tendersiae_1_5 = TenderSiae.objects.create( + tender=cls.tender_1, + siae=cls.siae_5, + source="EMAIL", + email_send_date=timezone.now(), + email_link_click_date=timezone.now(), + detail_display_date=timezone.now(), detail_not_interested_click_date=timezone.now(), ) TenderQuestionFactory(tender=cls.tender_1) @@ -653,6 +664,15 @@ def setUpTestData(cls): email_send_date=timezone.now(), email_link_click_date=timezone.now(), detail_display_date=timezone.now(), + detail_cocontracting_click_date=timezone.now(), + ) + cls.tendersiae_3_5 = TenderSiae.objects.create( + tender=cls.tender_3_response_is_anonymous, + siae=cls.siae_5, + source="EMAIL", + email_send_date=timezone.now(), + email_link_click_date=timezone.now(), + detail_display_date=timezone.now(), detail_not_interested_click_date=timezone.now(), ) @@ -796,13 +816,13 @@ def test_tender_author_has_additional_stats(self): self.client.force_login(self.user_buyer_1) url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) response = self.client.get(url) - self.assertContains(response, "2 prestataires ciblés") + self.assertContains(response, "3 prestataires ciblés") self.assertContains(response, "1 prestataire intéressé") # but hidden for non-author self.client.force_login(self.user_buyer_2) url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) response = self.client.get(url) - self.assertNotContains(response, "2 prestataires ciblés") + self.assertNotContains(response, "3 prestataires ciblés") self.assertNotContains(response, "1 prestataire intéressé") def test_admin_has_extra_info(self): @@ -826,36 +846,57 @@ def test_tender_contact_display(self): response = self.client.get(url) self.assertNotContains(response, "Clôturé") self.assertContains(response, "Voir l'appel d'offres") + self.assertContains(response, "Répondre en co-traitance ?") + self.assertContains(response, "Je ne suis pas intéressé") # siae user interested self.client.force_login(self.siae_user_1) url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) response = self.client.get(url) self.assertContains(response, "Contactez le client dès maintenant") self.assertNotContains(response, "Voir l'appel d'offres") - # siae user not interested + self.assertNotContains(response, "Répondre en co-traitance ?") + self.assertNotContains(response, "Je ne suis pas intéressé") + # siae user cocontracting self.client.force_login(self.siae_user_4) url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) response = self.client.get(url) self.assertNotContains(response, "Contactez le client dès maintenant") + self.assertNotContains(response, "Voir l'appel d'offres") # TODO: fix + self.assertNotContains(response, "Répondre en co-traitance ?") + self.assertNotContains(response, "Je ne suis pas intéressé") + # siae user not interested + self.client.force_login(self.siae_user_5) + url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) + response = self.client.get(url) + self.assertNotContains(response, "Contactez le client dès maintenant") self.assertNotContains(response, "Voir l'appel d'offres") + self.assertNotContains(response, "Répondre en co-traitance ?") + self.assertNotContains(response, "Je ne suis pas intéressé") self.assertContains(response, "Vous n'êtes pas intéressé par ce besoin") # siae user not concerned - self.client.force_login(self.siae_user_5) + self.client.force_login(self.siae_user_6) url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) response = self.client.get(url) self.assertContains(response, "Voir l'appel d'offres") + self.assertContains(response, "Répondre en co-traitance ?") + self.assertContains(response, "Je ne suis pas intéressé") + self.assertNotContains(response, "Vous n'êtes pas intéressé par ce besoin") # siae user without siae self.client.force_login(self.siae_user_without_siae) url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) response = self.client.get(url) self.assertContains(response, "veuillez d'abord vous") self.assertNotContains(response, "Voir l'appel d'offres") + self.assertNotContains(response, "Répondre en co-traitance ?") + self.assertNotContains(response, "Je ne suis pas intéressé") # author self.client.force_login(self.user_buyer_1) url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) response = self.client.get(url) self.assertContains(response, "Coordonnées") self.assertNotContains(response, "Voir l'appel d'offres") + self.assertNotContains(response, "Répondre en co-traitance ?") + self.assertNotContains(response, "Je ne suis pas intéressé") def test_tender_response_is_anonymous_contact_display(self): # anonymous user @@ -870,16 +911,24 @@ def test_tender_response_is_anonymous_contact_display(self): self.assertNotContains(response, "Contactez le client dès maintenant") self.assertNotContains(response, "Voir l'appel d'offres") self.assertContains(response, "Votre intérêt a été signalé au client") - # siae user not interested + # siae user cocontracting self.client.force_login(self.siae_user_4) url = reverse("tenders:detail", kwargs={"slug": self.tender_3_response_is_anonymous.slug}) response = self.client.get(url) self.assertNotContains(response, "Contactez le client dès maintenant") + self.assertNotContains(response, "Voir l'appel d'offres") # TODO: fix + self.assertNotContains(response, "Répondre en co-traitance ?") + self.assertNotContains(response, "Je ne suis pas intéressé") + # siae user not interested + self.client.force_login(self.siae_user_5) + url = reverse("tenders:detail", kwargs={"slug": self.tender_3_response_is_anonymous.slug}) + response = self.client.get(url) + self.assertNotContains(response, "Contactez le client dès maintenant") self.assertNotContains(response, "Voir l'appel d'offres") self.assertNotContains(response, "Votre intérêt a été signalé au client") self.assertContains(response, "Vous n'êtes pas intéressé par ce besoin") # siae user not concerned - self.client.force_login(self.siae_user_5) + self.client.force_login(self.siae_user_6) url = reverse("tenders:detail", kwargs={"slug": self.tender_3_response_is_anonymous.slug}) response = self.client.get(url) self.assertNotContains(response, "Voir l'appel d'offres") @@ -916,7 +965,7 @@ def test_tender_outdated_contact_display(self): self.assertNotContains(response, "Contactez le client dès maintenant") self.assertNotContains(response, "Répondre à cette opportunité") # siae user not concerned - self.client.force_login(self.siae_user_5) + self.client.force_login(self.siae_user_6) url = reverse("tenders:detail", kwargs={"slug": tender_2.slug}) response = self.client.get(url) self.assertContains(response, "Clôturé") @@ -1049,45 +1098,9 @@ def test_tender_contact_details_display(self): self.assertNotContains(response, "Voir l'appel d'offres") self.assertContains(response, "Lien partagé") - def test_tender_cocontracting_display(self): - # anonymous user - url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) - response = self.client.get(url) - self.assertNotContains(response, "Répondre en co-traitance ?") - # anonymous user but with siae_id in url - url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) - response = self.client.get(f"{url}?siae_id=15") - self.assertContains(response, "Répondre en co-traitance ?") - # siae user interested but has a detail_contact_click_date - self.client.force_login(self.siae_user_1) - url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) - response = self.client.get(url) - self.assertNotContains(response, "Répondre en co-traitance ?") - # siae user not concerned - self.client.force_login(self.siae_user_5) - url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) - response = self.client.get(url) - self.assertContains(response, "Répondre en co-traitance ?") - # siae user interested - TenderSiae.objects.create(tender=self.tender_1, siae=self.siae_2, email_send_date=timezone.now()) - self.client.force_login(self.siae_user_2) - url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) - response = self.client.get(url) - self.assertContains(response, "Répondre en co-traitance ?") - # siae user without siae - self.client.force_login(self.siae_user_without_siae) - url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) - response = self.client.get(url) - self.assertNotContains(response, "Répondre en co-traitance ?") - # author - self.client.force_login(self.user_buyer_1) - url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) - response = self.client.get(url) - self.assertNotContains(response, "Répondre en co-traitance ?") - def test_update_tendersiae_stats_on_tender_view(self): self.tender_1.siaes.add(self.siae_2) - self.assertEqual(self.tender_1.tendersiae_set.count(), 2 + 1) + self.assertEqual(self.tender_1.tendersiae_set.count(), 3 + 1) self.assertEqual(self.tender_1.tendersiae_set.first().siae, self.siae_2) self.assertIsNone(self.tender_1.tendersiae_set.first().email_link_click_date) self.assertIsNone(self.tender_1.tendersiae_set.first().detail_display_date) @@ -1098,42 +1111,42 @@ def test_update_tendersiae_stats_on_tender_view(self): url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) response = self.client.get(url) self.assertEqual(response.status_code, 200) - self.assertContains(response, "Déjà 2 prestataires inclusifs") + self.assertContains(response, "Déjà 3 prestataires inclusifs") # reload anonymous user with ?siae_id= (already in tendersiae) url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) + f"?siae_id={self.siae_2.id}" response = self.client.get(url) self.assertEqual(response.status_code, 200) - self.assertEqual(self.tender_1.tendersiae_set.count(), 3) # unchanged + self.assertEqual(self.tender_1.tendersiae_set.count(), 4) # unchanged siae_2_email_link_click_date = self.tender_1.tendersiae_set.first().email_link_click_date self.assertIsNotNone(siae_2_email_link_click_date) # email_link_click_date updated self.assertIsNone(self.tender_1.tendersiae_set.first().detail_display_date) self.assertIsNotNone(self.tender_1.tendersiae_set.last().detail_display_date) - self.assertContains(response, "Déjà 3 prestataires inclusifs") + self.assertContains(response, "Déjà 4 prestataires inclusifs") self.assertNotContains(response, "contactez dès maintenant le client") # reload logged in with ?siae_id= (updats detail_display_date, but not email_link_click_date) self.client.force_login(self.siae_user_2) url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) + f"?siae_id={self.siae_2.id}" response = self.client.get(url) self.assertEqual(response.status_code, 200) - self.assertEqual(self.tender_1.tendersiae_set.count(), 3) # unchanged + self.assertEqual(self.tender_1.tendersiae_set.count(), 4) # unchanged self.assertEqual(self.tender_1.tendersiae_set.first().email_link_click_date, siae_2_email_link_click_date) siae_2_detail_display_date = self.tender_1.tendersiae_set.first().detail_display_date self.assertIsNotNone(siae_2_detail_display_date) # detail_display_date updated self.assertIsNotNone(self.tender_1.tendersiae_set.last().detail_display_date) - self.assertContains(response, "Déjà 3 prestataires inclusifs") + self.assertContains(response, "Déjà 4 prestataires inclusifs") self.assertNotContains(response, "contactez dès maintenant le client") # reload (doesn't update detail_display_date) url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) response = self.client.get(url) self.assertEqual(response.status_code, 200) - self.assertEqual(self.tender_1.tendersiae_set.count(), 3) # unchanged + self.assertEqual(self.tender_1.tendersiae_set.count(), 4) # unchanged self.assertEqual(self.tender_1.tendersiae_set.first().detail_display_date, siae_2_detail_display_date) - self.assertContains(response, "Déjà 3 prestataires inclusifs") + self.assertContains(response, "Déjà 4 prestataires inclusifs") self.assertNotContains(response, "contactez dès maintenant le client") def test_create_tendersiae_stats_on_tender_view_by_existing_user(self): self.tender_1.siaes.add(self.siae_2) - self.assertEqual(self.tender_1.tendersiae_set.count(), 2 + 1) + self.assertEqual(self.tender_1.tendersiae_set.count(), 3 + 1) self.assertEqual(self.tender_1.tendersiae_set.first().siae, self.siae_2) self.assertIsNone(self.tender_1.tendersiae_set.first().email_link_click_date) self.assertIsNone(self.tender_1.tendersiae_set.first().detail_display_date) @@ -1143,36 +1156,36 @@ def test_create_tendersiae_stats_on_tender_view_by_existing_user(self): # first load anonymous user url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) response = self.client.get(url) - self.assertContains(response, "Déjà 2 prestataires inclusifs") + self.assertContains(response, "Déjà 3 prestataires inclusifs") # first load, new user has already 1 siae contacted, we update only this one self.client.force_login(self.siae_user_2) url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) response = self.client.get(url) self.assertEqual(response.status_code, 200) - self.assertEqual(self.tender_1.tendersiae_set.count(), 2 + 1) + self.assertEqual(self.tender_1.tendersiae_set.count(), 3 + 1) self.assertEqual(self.tender_1.tendersiae_set.first().siae, self.siae_2) self.assertIsNone(self.tender_1.tendersiae_set.first().email_link_click_date) self.assertIsNotNone(self.tender_1.tendersiae_set.first().detail_display_date) - self.assertContains(response, "Déjà 3 prestataires inclusifs") + self.assertContains(response, "Déjà 4 prestataires inclusifs") def test_create_tendersiae_stats_on_tender_view_by_new_user(self): - self.assertEqual(self.tender_1.tendersiae_set.count(), 2) - self.assertEqual(self.tender_1.tendersiae_set.first().siae, self.siae_4) - self.assertIsNotNone(self.tender_1.tendersiae_set.first().detail_display_date) # siae_4 + self.assertEqual(self.tender_1.tendersiae_set.count(), 3) + self.assertEqual(self.tender_1.tendersiae_set.first().siae, self.siae_5) + self.assertIsNotNone(self.tender_1.tendersiae_set.first().detail_display_date) # siae_5 # first load anonymous user url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) response = self.client.get(url) - self.assertContains(response, "Déjà 2 prestataires inclusifs") + self.assertContains(response, "Déjà 3 prestataires inclusifs") # first load, new user has 2 siaes self.client.force_login(self.siae_user_2) url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug}) response = self.client.get(url) self.assertEqual(response.status_code, 200) - self.assertEqual(self.tender_1.tendersiae_set.count(), 2 + 2) # adds both siae_2 & siae_3 + self.assertEqual(self.tender_1.tendersiae_set.count(), 3 + 2) # adds both siae_2 & siae_3 self.assertEqual(self.tender_1.tendersiae_set.first().siae, self.siae_3) self.assertIsNone(self.tender_1.tendersiae_set.first().email_link_click_date) self.assertIsNotNone(self.tender_1.tendersiae_set.first().detail_display_date) - self.assertContains(response, "Déjà 4 prestataires inclusifs") + self.assertContains(response, "Déjà 5 prestataires inclusifs") class TenderDetailContactClickStatViewTest(TestCase): @@ -1329,18 +1342,18 @@ def test_user_can_notify_cocontracting_wish_with_siae_id(self): self.assertIsNone(tendersiae.detail_cocontracting_click_date) response = self.client.get(detail_url) self.assertContains(response, "Répondre en co-traitance ?") - self.assertNotContains(response, "Votre intérêt a bien été signalé au client.") + self.assertNotContains(response, "votre intérêt a bien été signalé au client.") with mock.patch("lemarche.www.tenders.tasks.send_mail_async") as mock_send_mail_async: response = self.client.post(f"{url}?siae_id={self.siae.id}", data={}) tendersiae = TenderSiae.objects.get(tender=self.tender, siae=self.siae) - self.assertContains(response, "Votre intérêt a bien été signalé au client.") + self.assertContains(response, "votre intérêt a bien été signalé au client.") mock_send_mail_async.assert_called_once() email_body = mock_send_mail_async.call_args[1]["email_body"] self.assertTrue(f"La structure {self.siae.name } souhaite répondre en co-traitance" in email_body) self.assertIsNotNone(tendersiae.detail_cocontracting_click_date) response = self.client.get(detail_url) - self.assertContains(response, "Votre intérêt a bien été signalé au client.") + self.assertContains(response, "votre intérêt a bien été signalé au client.") self.assertNotContains(response, "Répondre en co-traitance ?") def test_user_can_notify_cocontracting_wish_with_authenticated_user(self): @@ -1350,19 +1363,21 @@ def test_user_can_notify_cocontracting_wish_with_authenticated_user(self): response = self.client.get(detail_url) self.assertContains(response, "Répondre en co-traitance ?") - self.assertNotContains(response, "Votre intérêt a bien été signalé au client.") + self.assertNotContains(response, "votre intérêt a bien été signalé au client.") + + url = reverse("tenders:detail-cocontracting-click", kwargs={"slug": self.tender.slug}) tendersiae = TenderSiae.objects.get(tender=self.tender, siae=self.siae) self.assertIsNone(tendersiae.detail_cocontracting_click_date) with mock.patch("lemarche.www.tenders.tasks.send_mail_async") as mock_send_mail_async: response = self.client.post(url, data={}) tendersiae = TenderSiae.objects.get(tender=self.tender, siae=self.siae) - self.assertContains(response, "Votre intérêt a bien été signalé au client.") + self.assertContains(response, "votre intérêt a bien été signalé au client.") mock_send_mail_async.assert_called_once() email_body = mock_send_mail_async.call_args[1]["email_body"] self.assertTrue(f"La structure {self.siae.name } souhaite répondre en co-traitance" in email_body) self.assertIsNotNone(tendersiae.detail_cocontracting_click_date) response = self.client.get(detail_url) - self.assertContains(response, "Votre intérêt a bien été signalé au client.") + self.assertContains(response, "votre intérêt a bien été signalé au client.") self.assertNotContains(response, "Répondre en co-traitance ?") user_without_siae = UserFactory(kind=User.KIND_SIAE) self.client.force_login(user_without_siae) diff --git a/lemarche/www/tenders/views.py b/lemarche/www/tenders/views.py index 6bf0e0373..8a34c4cc6 100644 --- a/lemarche/www/tenders/views.py +++ b/lemarche/www/tenders/views.py @@ -377,6 +377,9 @@ def get_context_data(self, **kwargs): context["siae_has_detail_contact_click_date"] = TenderSiae.objects.filter( tender=self.object, siae_id=int(self.siae_id), detail_contact_click_date__isnull=False ).exists() + context["siae_has_detail_cocontracting_click_date"] = TenderSiae.objects.filter( + tender=self.object, siae_id=int(self.siae_id), detail_cocontracting_click_date__isnull=False + ).exists() context["siae_has_detail_not_interested_click_date"] = TenderSiae.objects.filter( tender=self.object, siae_id=int(self.siae_id), detail_not_interested_click_date__isnull=False ).exists() @@ -388,6 +391,12 @@ def get_context_data(self, **kwargs): tender=self.object, siae__in=user.siaes.all(), detail_contact_click_date__isnull=False ).exists() ) + context["siae_has_detail_cocontracting_click_date"] = ( + getattr(context, "siae_has_detail_cocontracting_click_date", None) + or TenderSiae.objects.filter( + tender=self.object, siae__in=user.siaes.all(), detail_cocontracting_click_date__isnull=False + ).exists() + ) context["siae_has_detail_not_interested_click_date"] = ( getattr(context, "siae_has_detail_not_interested_click_date", None) or TenderSiae.objects.filter(