fixed newsletter template

marktplatz/signals.py

@@ -60,6 +60,7 @@ def process_triggers():
 
         for agent in SearchAgent.objects.all(  ):
 
+            # This is needed because ort is a multiple selection.
             for agentOrt in agent.ort:
                 if agentOrt == instance.ort:
                     context = {}
@@ -73,7 +74,7 @@ def process_triggers():
                     context['recipient'] = [ agent.email, ]
                     context['msg_subject' ] = ('Gemeinschaffen - ' + instance.name )
 
-                    print( "triggered!!!!", context['product']['name'],  context['product']['ort'] )
+                    # print( "triggered!!!!", context['product']['name'],  context['product']['ort'] )
 
                     mail.send(
                         context['recipient'],

marktplatz/templates/marktplatz/form_newsletter.html

@@ -25,6 +25,7 @@
     {{ form_content | safe }}
 
     {% csrf_token %}
+
     <!-- Left here in case we need to debug -->
     {% if form_errors %}
     <div class='invalid-feedback' style="display: none;">{{ form_errors }}</div>
@@ -42,12 +43,6 @@
 
 
 
-    <!-- <form enctype="multipart/form-data" method="post" action="/newsletter/gemeinschaffen-newsletter/subscribe/">
-    {% csrf_token %}
-    <label for="id_email_field">E-mail:</label> <input type="email" name="email_field" required="" id="id_email_field">
-    <button id="id_submit" name="submit" value="Subscribe" type="submit">Subscribe</button>
-    </form> -->
-
 
     <div class="">
       <br><br><br>

marktplatz/templates/marktplatz/product_overview.html

@@ -281,7 +281,7 @@ $(document).ready(function(){
       <button class="border-thin mybtn btn-toggle urbanem_true" data-toggler='urbanem_true' style="margin-bottom: 2px; " style="">#Urbane Mischung</button>
       {% endif %}
       <button class="border-thin mybtn" style="margin-bottom: 2px;">{% include "marktplatz/modal-sa.html" %}</button>
-      <button class="border-thin mybtn" style="margin-bottom: 2px;" onclick="window.location='{% url 'newsletter-anmeldung' newsletter_slug='gemeinschaffen-newsletter' %}'" style=""><i class="fas fa-envelope"></i> Newsletter </button>
+      <button class="border-thin mybtn" style="margin-bottom: 2px;" onclick="window.location='{% url 'only-newsletter-anmeldung' newsletter_slug='gemeinschaffen-newsletter' %}'" style=""><i class="fas fa-envelope"></i> Newsletter </button>
 
 
 

marktplatz/urls.py

@@ -43,11 +43,6 @@ urlpatterns = [
     path('up-submit-pics/<slug:type>/<int:pk>',  views.ProductUpdateAddPicsView.as_view(),     name='projekt-bearbeiten-submit-pics'),
     path('up-publish/<slug:type>/<int:pk>',      views.ProductUpdatePublishView.as_view(),     name='projekt-bearbeiten-publish'),
 
-    # path('wohnprojekt-bearbeiten/<int:pk>',         views.WohnProjektUpdateView.as_view(),        name='wohnprojekt-bearbeiten'),
-    # path('mobilitaetsprojekt-bearbeiten/<int:pk>',  views.MobilitaetsProjektUpdateView.as_view(), name='mobilitaetsprojekt-bearbeiten'),
-    # path('ernaehrungsprojekt-bearbeiten/<int:pk>',  views.ErnaehrungsProjektUpdateView.as_view(), name='ernaehrungsprojekt-bearbeiten'),
-    # path('energyprojekt-bearbeiten/<int:pk>',       views.EnergyProjektUpdateView.as_view(),      name='energyprojekt-bearbeiten'),
-
     # DELETE
     path('projekt/<int:pk>/delete', views.ProductDelete.as_view(), name='product-delete'),
 
@@ -78,6 +73,7 @@ urlpatterns = [
     path('search-agent-form/embed/', views.AgentNewslwtterFormView.as_view( embed=True, ), name='search-agent-form-embed'),
     path('search-agent-create/<slug:newsletter_slug>/anmelden/', views.AgentNewsletterSubscribeView.as_view(   ), name='agent-newsletter-create'),
     path('newsletter-anmeldung/<slug:newsletter_slug>/anmelden/', views.SubscribeRequestView.as_view(   ), name='newsletter-anmeldung'),
+    path('only-newsletter-anmeldung/<slug:newsletter_slug>/anmelden/', views.OnlySubscribeRequestView.as_view(   ), name='only-newsletter-anmeldung'),
     path('suchagent/<int:pk>/<slug:hash>/', views.SearchAgentDelete.as_view(), name='search-agent-delete'),
     # path('suchagent/embed', views.SearchAgentCreate.as_view( embed=True, ), name='search-agent-create-embed'),
 

marktplatz/views.py

@@ -124,6 +124,11 @@ class  SubscribeRequestView( SubscribeRequestView):
 
     form_class = NewsletterForm
 
+class  OnlySubscribeRequestView( SubscribeRequestView):
+
+    template_name =  'newsletter/subscription_subscribe_onlyns.html'
+
+
 class AgentNewslwtterFormView(TemplateView):
     template_name =  'marktplatz/form_newsletter.html'
     embed = False

project_base/templates/newsletter/subscription_subscribe_onlyns.html

@@ -0,0 +1,27 @@
+{% extends "newsletter/common.html" %}
+
+{% load crispy_forms_tags %}
+{% load i18n %}
+
+{% block title %}{% trans "Newsletter Anmeldung" %}{% endblock title %}
+
+{% block body %}
+    <h1>{% trans "Newsletter Anmeldung" %} {{ newsletter.title }}</h1>
+
+    {% if error %}
+        <p>{% trans "Due to a technical error we were not able to submit your confirmation email. This could be because your email address is invalid." %}</p>
+
+        {% comment %} Replace the the following dummy with a valid email address and remove this comment.
+
+        <p>{% trans "If the error persists, please don't hesitate to contact us at the following email address:" %} <a href="mailto:office@realitylab.at">office@realitylab.at</a></p>
+
+        {% endcomment %}
+    {% else %}
+        <form enctype="multipart/form-data" method="post" action=".">
+            {% csrf_token %}
+            {% crispy form %}
+
+            <!-- <p><input id="id_submit" name="submit" value="{% trans "Subscribe" %}" type="submit" /></p> -->
+        </form>
+    {% endif %}
+{% endblock body %}