Change donation form

diff --git a/src/club/forms.py b/src/club/forms.py
index b75877d..e096303 100644 (file)
--- a/src/club/forms.py
+++ b/src/club/forms.py
@@ -35,6 +35,8 @@ class DonationStep1Form(forms.ModelForm):
         self.referer = referer
         super().__init__(*args, **kwargs)
         club = models.Club.objects.first()
         self.referer = referer
         super().__init__(*args, **kwargs)
         club = models.Club.objects.first()

+        if self.instance.is_custom_amount():
+            self.fields['custom_amount'].initial = int(self.instance.amount)

         if club is not None:
             self.fields['custom_amount'].widget.attrs['min'] = club.min_amount
 
         if club is not None:
             self.fields['custom_amount'].widget.attrs['min'] = club.min_amount
 


@@ -50,7 +52,8 @@ class DonationStep1Form(forms.ModelForm):
         return state
 
     def save(self, *args, **kwargs):
         return state
 
     def save(self, *args, **kwargs):

-        self.instance.source = self.referer
+        if self.referer is not None:
+            self.instance.source = self.referer

         return super().save(*args, **kwargs)
 
 
         return super().save(*args, **kwargs)
 
 

diff --git a/src/club/models.py b/src/club/models.py
index c40428d..7715495 100644 (file)
--- a/src/club/models.py
+++ b/src/club/models.py
@@ -161,6 +161,15 @@ class Schedule(models.Model):
         club = Club.objects.first()
         return club.get_description_for_amount(self.amount, self.monthly)
 
         club = Club.objects.first()
         return club.get_description_for_amount(self.amount, self.monthly)
 

+    def is_custom_amount(self):
+        club = Club.objects.first()
+        if not self.amount:
+            return False
+        if self.monthly:
+            return not club.monthlyamount_set.filter(amount=self.amount).exists()
+        else:
+            return not club.singleamount_set.filter(amount=self.amount).exists()
+

     def initiate_payment(self, request):
         return self.get_payment_method().initiate(request, self)
 
     def initiate_payment(self, request):
         return self.get_payment_method().initiate(request, self)
 

diff --git a/src/club/templates/club/donation_infobox.html b/src/club/templates/club/donation_infobox.html
new file mode 100644 (file)
index 0000000..6008f07
--- /dev/null
+++ b/src/club/templates/club/donation_infobox.html
@@ -0,0 +1,8 @@
+<div class="checkout-infobar" style="background: yellow; padding:20px; border: 1px solid yellow; border-radius: 10px; margin: 0 0 20px;">
+  <div class="if-monthly">
+    Dziękujemy za wybranie comiesięcznej wpłaty.
+  </div>
+  <div class="if-not-monthly">
+    Czy na pewno nie comiesięczna? <a class="donation-mod-monthly" data-url="{% url 'donation_set_monthly' schedule.key %}" href="{% url 'donation_step1' schedule.key %}">Zmień na comiesięczną wpłatę.</a>
+  </div>
+</div>

diff --git a/src/club/templates/club/donation_step1_form.html b/src/club/templates/club/donation_step1_form.html
index 033b0ea..655febe 100644 (file)
--- a/src/club/templates/club/donation_step1_form.html
+++ b/src/club/templates/club/donation_step1_form.html
@@ -1,7 +1,7 @@
 {% load static %}
 {% load i18n %}
 
 {% load static %}
 {% load i18n %}
 

-<form method="post" action="{% url 'club_join' %}">
+<form method="post" action="{% if schedule %}{% url 'donation_step1' key=schedule.key %}{% else %}{% url 'club_join' %}{% endif %}">

   {% csrf_token %}
   {{ form.errors }}
   <input type="radio" name="switch" id="switch-once" value="single" class="toggle-input" {% if schedule and not schedule.monthly %}checked{% endif %}>
   {% csrf_token %}
   {{ form.errors }}
   <input type="radio" name="switch" id="switch-once" value="single" class="toggle-input" {% if schedule and not schedule.monthly %}checked{% endif %}>


@@ -23,12 +23,11 @@
       {% for amount in amounts.single %}
         <div class="l-checkout__payments__box once{% if not schedule.monthly and schedule.amount == amount.amount or not schedule and club.default_single_amount == amount.amount %} is-active{% endif %}{% if amount.wide %} l-checkout__payments__box--special{% endif %} l-checkout__payments__box--{{ amount.box_variant }}">
 
       {% for amount in amounts.single %}
         <div class="l-checkout__payments__box once{% if not schedule.monthly and schedule.amount == amount.amount or not schedule and club.default_single_amount == amount.amount %} is-active{% endif %}{% if amount.wide %} l-checkout__payments__box--special{% endif %} l-checkout__payments__box--{{ amount.box_variant }}">
 

-          <h3>{{ amount.amount }} zł</h3>

           <div class="l-checkout__payments__box__btn-wrp">
             {% if amount.description %}
               <p>{{ amount.description|safe }}</p>
             {% endif %}
           <div class="l-checkout__payments__box__btn-wrp">
             {% if amount.description %}
               <p>{{ amount.description|safe }}</p>
             {% endif %}

-            <button name="single_amount" value="{{ amount.amount }}">{% trans "Wybierz" %}</button>
+            <button name="single_amount" value="{{ amount.amount }}">{{ amount.amount }} zł</button>

           </div>
         </div>
       {% endfor %}
           </div>
         </div>
       {% endfor %}


@@ -42,12 +41,11 @@
     <div class="l-checkout__payments payments-recurring wide-spot-{{ amounts.monthly_wide_spot }}">
     {% for amount in amounts.monthly %}
       <div class="l-checkout__payments__box{% if schedule.monthly and schedule.amount == amount.amount or not schedule and amount.amount == club.default_monthly_amount %} is-active{% endif %}{% if amount.wide %} l-checkout__payments__box--special{% endif %} l-checkout__payments__box--{{ amount.box_variant }}">
     <div class="l-checkout__payments payments-recurring wide-spot-{{ amounts.monthly_wide_spot }}">
     {% for amount in amounts.monthly %}
       <div class="l-checkout__payments__box{% if schedule.monthly and schedule.amount == amount.amount or not schedule and amount.amount == club.default_monthly_amount %} is-active{% endif %}{% if amount.wide %} l-checkout__payments__box--special{% endif %} l-checkout__payments__box--{{ amount.box_variant }}">

-        <h3>{{ amount.amount }} zł <span>{% trans "/mies." context "kwota na miesiąc" %}</span></h3>

         <div class="l-checkout__payments__box__btn-wrp">
           {% if amount.description %}
             <p>{{ amount.description|safe }}</p>
           {% endif %}
         <div class="l-checkout__payments__box__btn-wrp">
           {% if amount.description %}
             <p>{{ amount.description|safe }}</p>
           {% endif %}

-          <button name="monthly_amount" value="{{ amount.amount }}">{% trans "Wybierz" %}</button>
+          <button name="monthly_amount" value="{{ amount.amount }}">{{ amount.amount }} zł <span> /mies.</span></button>

         </div>
       </div>
     {% endfor %}
         </div>
       </div>
     {% endfor %}


@@ -58,7 +56,7 @@
 
   <div class="l-checkout__amount">
     <div class="l-checkout__input">
 
   <div class="l-checkout__amount">
     <div class="l-checkout__input">

-      <label for="kwota">{% trans "Inna kwota" %}</label>
+      <label for="id_custom_amount">{% trans "Inna kwota" %}</label>

       {{ form.custom_amount }}
     </div>
     <button>{% trans "Dalej" %}</button>
       {{ form.custom_amount }}
     </div>
     <button>{% trans "Dalej" %}</button>

diff --git a/src/club/templates/club/donation_step2.html b/src/club/templates/club/donation_step2.html
index 3864ad5..562bb40 100644 (file)
--- a/src/club/templates/club/donation_step2.html
+++ b/src/club/templates/club/donation_step2.html
@@ -8,26 +8,26 @@
 
 {% block donation-step-content %}
 
 
 {% block donation-step-content %}
 

-  <div class="l-checkout__cols">
+  <div class="l-checkout__cols q-is-monthly {% if schedule.monthly %}is-monthly{% endif %}">

     <div class="l-checkout__col">
       <div class="l-checkout__payments__box is-active">
         <h3>
           {{ schedule.amount|floatformat }} zł
     <div class="l-checkout__col">
       <div class="l-checkout__payments__box is-active">
         <h3>
           {{ schedule.amount|floatformat }} zł

-          {% if schedule.monthly %}
-            <span>{% trans "/mies." context "kwota na miesiąc" %}</span>
-          {% endif %}
+          <span class="if-monthly">{% trans "/mies." context "kwota na miesiąc" %}</span>

         </h3>
         <img src="{% static '2022/images/checkout-img-3.jpg' %}" alt="">
         </h3>
         <img src="{% static '2022/images/checkout-img-3.jpg' %}" alt="">

+       {% if schedule.get_description %}

         <p>{{ schedule.get_description }}</p>
         <p>{{ schedule.get_description }}</p>

+       {% endif %}

       </div>
     </div>
     <div class="l-checkout__col">
 
       </div>
     </div>
     <div class="l-checkout__col">
 

+      {% include "club/donation_infobox.html" %}
+      

       <form method='post'>
         {% csrf_token %}
         {{ form.errors }}
       <form method='post'>
         {% csrf_token %}
         {{ form.errors }}

-        {{ form.amount }}
-        {{ form.monthly }}

         <div class="l-checkout__form">
           <div class="l-checkout__form__row">
             <div class="l-checkout__input">
         <div class="l-checkout__form">
           <div class="l-checkout__form__row">
             <div class="l-checkout__input">

diff --git a/src/club/templates/club/donation_step3.html b/src/club/templates/club/donation_step3.html
index baeee9f..6222527 100644 (file)
--- a/src/club/templates/club/donation_step3.html
+++ b/src/club/templates/club/donation_step3.html
@@ -8,7 +8,7 @@
 
 
 {% block donation-step-content %}
 
 
 {% block donation-step-content %}

-  <div class="l-checkout__cols">
+  <div class="l-checkout__cols q-reload-is-monthly {% if schedule.monthly %}is-monthly{% endif %}">

     <div class="l-checkout__col">
       <div class="l-checkout__payments__box is-active">
         <h3>
     <div class="l-checkout__col">
       <div class="l-checkout__payments__box is-active">
         <h3>


@@ -20,9 +20,19 @@
       </div>
     </div>
     <div class="l-checkout__col">
       </div>
     </div>
     <div class="l-checkout__col">

+      {% include "club/donation_infobox.html" %}
+
+      {% if schedule.monthly %}
+      <h3>Comiesięczna darowizna będzie pobierana automatycznie</h3>
+      <p>Możesz z niej zrezygnować w dowolnej chwili, korzystając z linku który dostaniesz mailem.</p>
+      {% endif %}
+

       <div class="l-checkout__form">
         <div class="l-checkout__form__row full">
       <div class="l-checkout__form">
         <div class="l-checkout__form__row full">

-          <div class="iframe">
+
+
+      <div class="iframe">
+           

             {% for method in schedule.get_payment_methods %}
               {% invite_payment method schedule %}
             {% endfor %}
             {% for method in schedule.get_payment_methods %}
               {% invite_payment method schedule %}
             {% endfor %}

diff --git a/src/club/templates/club/donation_step_base.html b/src/club/templates/club/donation_step_base.html
index cede1b4..df5e805 100644 (file)
--- a/src/club/templates/club/donation_step_base.html
+++ b/src/club/templates/club/donation_step_base.html
@@ -43,7 +43,7 @@
         {% endif %}
         <div class="{% if view.step == 1 %}is-current{% else %}is-completed{% endif %}">
           <span>1</span>
         {% endif %}
         <div class="{% if view.step == 1 %}is-current{% else %}is-completed{% endif %}">
           <span>1</span>

-          <p>{% trans "Rodzaj wsparcia" %}</p>
+          <p>{% trans "Kwota wsparcia" %}</p>

         </div>
         {% if view.step > 1 and view.step != 4 %}
           </a>
         </div>
         {% if view.step > 1 and view.step != 4 %}
           </a>

diff --git a/src/club/templates/club/payment/paypal_invite.html b/src/club/templates/club/payment/paypal_invite.html
index 5ac0c4c..baaf09d 100644 (file)
--- a/src/club/templates/club/payment/paypal_invite.html
+++ b/src/club/templates/club/payment/paypal_invite.html
@@ -1,5 +1,11 @@
 {% load i18n static %}
 {% load i18n static %}

-<h3>{% trans "Wolisz wpłacić przez PayPal?" %}</h3>
+<h3>
+  {% if schedule.monthly %}
+  {% trans "Wolisz ustawić comiesięczną darowiznę przez PayPal?" %}
+  {% else %}
+  {% trans "Wolisz wpłacić przez PayPal?" %}
+  {% endif %}
+</h3>

 <a href="{% url 'paypal_init' schedule.key %}">
   <div class="iframe">
     <img src="{% static 'club/paypal.png' %}" alt="PayPal">
 <a href="{% url 'paypal_init' schedule.key %}">
   <div class="iframe">
     <img src="{% static 'club/paypal.png' %}" alt="PayPal">

diff --git a/src/club/templates/payu/rec_widget.html b/src/club/templates/payu/rec_widget.html
index 13cf53b..be61a53 100644 (file)
--- a/src/club/templates/payu/rec_widget.html
+++ b/src/club/templates/payu/rec_widget.html
@@ -1,5 +1,5 @@
 {% load i18n %}
 {% load i18n %}

-<h3>{% trans "Podaj dane karty płatniczej" %}</h3>
+<h3>{% trans "Podaj dane karty płatniczej do comiesięcznej darowizny" %}</h3>

 <div class="iframe">
   <form id="theform" method='POST'  action='{% url "club_payu_rec_payment" schedule.key %}'>
     {% csrf_token %}
 <div class="iframe">
   <form id="theform" method='POST'  action='{% url "club_payu_rec_payment" schedule.key %}'>
     {% csrf_token %}

diff --git a/src/club/urls.py b/src/club/urls.py
index 87bfa5a..c7bab6a 100644 (file)
--- a/src/club/urls.py
+++ b/src/club/urls.py
@@ -18,6 +18,7 @@ urlpatterns = [
     path('plan/<key>/zestawienie/<int:year>/', banner_exempt(views.YearSummaryView.as_view()), name='club_year_summary'),
     path('plan/<key>/rodzaj/', banner_exempt(views.DonationStep1.as_view()), name='donation_step1'),
     path('plan/<key>/dane/', banner_exempt(views.DonationStep2.as_view()), name='donation_step2'),
     path('plan/<key>/zestawienie/<int:year>/', banner_exempt(views.YearSummaryView.as_view()), name='club_year_summary'),
     path('plan/<key>/rodzaj/', banner_exempt(views.DonationStep1.as_view()), name='donation_step1'),
     path('plan/<key>/dane/', banner_exempt(views.DonationStep2.as_view()), name='donation_step2'),

+    path('plan/<key>/ustaw-miesiecznie/', views.set_monthly, name='donation_set_monthly'),

 
     path('przylacz/<key>/', views.claim, name='club_claim'),
     path('anuluj/<key>/', views.cancel, name='club_cancel'),
 
     path('przylacz/<key>/', views.claim, name='club_claim'),
     path('anuluj/<key>/', views.cancel, name='club_cancel'),

diff --git a/src/club/views.py b/src/club/views.py
index b2657e6..a55f284 100644 (file)
--- a/src/club/views.py
+++ b/src/club/views.py
@@ -4,7 +4,7 @@
 from django.conf import settings
 from django.contrib.auth.decorators import login_required, permission_required
 from django.db.models import Sum
 from django.conf import settings
 from django.contrib.auth.decorators import login_required, permission_required
 from django.db.models import Sum

-from django.http import HttpResponse, HttpResponseRedirect
+from django.http import HttpResponse, HttpResponseRedirect, JsonResponse

 from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
 from django.utils.decorators import method_decorator
 from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
 from django.utils.decorators import method_decorator


@@ -59,6 +59,17 @@ class DonationStep2(UpdateView):
         return c
 
 
         return c
 
 

+def set_monthly(request, key):
+    schedule = get_object_or_404(models.Schedule, payed_at=None, key=key)
+    if request.POST:
+        schedule.monthly = True
+        schedule.save(update_fields=['monthly'])
+    return JsonResponse({
+        "amount": schedule.amount,
+        "monthly": schedule.monthly,
+    })
+    
+

 class JoinView(CreateView):
     form_class = forms.DonationStep1Form
     template_name = 'club/donation_step1.html'
 class JoinView(CreateView):
     form_class = forms.DonationStep1Form
     template_name = 'club/donation_step1.html'

diff --git a/src/wolnelektury/static/2022/styles/layout/_checkout.scss b/src/wolnelektury/static/2022/styles/layout/_checkout.scss
index 593794b..636580a 100644 (file)
--- a/src/wolnelektury/static/2022/styles/layout/_checkout.scss
+++ b/src/wolnelektury/static/2022/styles/layout/_checkout.scss
@@ -349,26 +349,35 @@
     }
   }
   button {
     }
   }
   button {

-    height: 56px;
+      margin: 0;
+      font-family: "Source Sans Pro",sans-serif;
+    font-weight: bold;
+    font-size: 44px;
+    line-height: 130%;
+    letter-spacing: -0.01em;
+    height: 90px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transition: all $ease-out 250ms;
+

     background: #FFFFFF;
     border: 1px solid #92BD39;
     border-radius: 3px;
     width: 100%;
     outline: 0;
     cursor: pointer;
     background: #FFFFFF;
     border: 1px solid #92BD39;
     border-radius: 3px;
     width: 100%;
     outline: 0;
     cursor: pointer;

-    font-weight: 600;
-    font-size: 16px;
-    line-height: 24px;
-    display: flex;
-    align-items: center;
-    justify-content: center;

     text-align: center;
     color: #083F4D;
     text-align: center;
     color: #083F4D;

-    transition: background $ease-out 250ms;

 
 

-    @include rwd($break-flow) {
-        font-size: 20px;
-        line-height: 25px;
+    span {
+      font-weight: 600;
+      font-size: 25px;
+      line-height: 200%;
+      letter-spacing: -0.01em;
+      color: #92BD39;
+      margin-left: 10px;
+      transition: opacity $ease-out 250ms;

     }
     
     &:hover {
     }
     
     &:hover {


@@ -397,6 +406,9 @@
       &:hover {
         background: #83AD2B;
       }
       &:hover {
         background: #83AD2B;
       }

+      span {
+         color: white;
+      }

     }
   }
 
     }
   }
 


@@ -1046,3 +1058,14 @@
         }
     }
 }
         }
     }
 }

+
+
+.if-monthly { display: none; }
+.is-monthly {
+    .if-monthly {
+       display: block;
+    }
+    .if-not-monthly {
+       display: none;
+    }
+}

diff --git a/src/wolnelektury/static/js/main.js b/src/wolnelektury/static/js/main.js
index 45a4197..a27d971 100644 (file)
--- a/src/wolnelektury/static/js/main.js
+++ b/src/wolnelektury/static/js/main.js
@@ -338,8 +338,25 @@
         $('input', container).val($(this).val());
         $('.is-active', container).removeClass('is-active');
         $(this).closest('.l-checkout__payments__box').addClass('is-active');
         $('input', container).val($(this).val());
         $('.is-active', container).removeClass('is-active');
         $(this).closest('.l-checkout__payments__box').addClass('is-active');

-        $('#kwota').val('');
-        return false;
+        $('#id_custom_amount').val('');
+    });
+
+    $('.donation-mod-monthly').on('click', function() {
+       $.ajax({
+           method: 'POST',
+           data: {
+               csrfmiddlewaretoken: $("[name=csrfmiddlewaretoken]").val(),
+           },
+           url: $(this).data('url'),
+           success: function(data) {
+               if ($(".q-reload-is-monthly").length) {
+                   window.location.reload()
+               } else {
+                   $(".q-is-monthly").toggleClass('is-monthly', data.monthly);
+               }
+           }
+       });
+       return false;

     });
     
 })();
     });
     
 })();