From: Radek Czajka Date: Mon, 23 Mar 2026 11:32:32 +0000 (+0100) Subject: Simpler payments and introduce seasonal banner. X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/f59de09387c7ceb7d6ab2ccf6ea25cb4be8dacb5 Simpler payments and introduce seasonal banner. --- diff --git a/src/annoy/models.py b/src/annoy/models.py index 6af1cc045..638da5e86 100644 --- a/src/annoy/models.py +++ b/src/annoy/models.py @@ -120,20 +120,26 @@ class Banner(models.Model): return int(self.progress_percent) def update_progress(self): - # Total of new payments during the action. - # This definition will need to change for longer timespans. if not self.since or not self.until or not self.target: return Schedule = apps.get_model('club', 'Schedule') - self.progress = Schedule.objects.filter( - payed_at__gte=self.since, - payed_at__lte=self.until, - ).aggregate(c=models.Sum('amount'))['c'] + PayUOrder = apps.get_model('club', 'PayUOrder') + progress = PayUOrder.objects.filter( + completed_at__gte=self.since, + completed_at__lte=self.until, + ).aggregate(c=models.Sum('schedule__amount'))['c'] + + for schedule in Schedule.objects.filter( + method='paypal', + expires_at__gt=self.since + ): + progress += schedule.n_paypal_payments(self.since, self.until) * schedule.amount + self.progress = progress self.save(update_fields=['progress']) @classmethod def update_all_progress(cls): - for obj in cls.objects.exclude(target=None): + for obj in cls.objects.exclude(target=None).exclude(until__lt=now()): obj.update_progress() diff --git a/src/annoy/places.py b/src/annoy/places.py index 0de0483b9..2fbd34ca3 100644 --- a/src/annoy/places.py +++ b/src/annoy/places.py @@ -13,6 +13,7 @@ PLACE_DEFINITIONS = [ ('quiet', 'Spokojny'), ('loud', 'Ostry'), )), + ('seasonal', 'Sezonowa', False), ] PLACE_CHOICES = [p[:2] for p in PLACE_DEFINITIONS] diff --git a/src/annoy/templates/annoy/banner_seasonal.html b/src/annoy/templates/annoy/banner_seasonal.html new file mode 100644 index 000000000..a3a8a1aae --- /dev/null +++ b/src/annoy/templates/annoy/banner_seasonal.html @@ -0,0 +1,71 @@ +{% load l10n %} +{% load time_tags %} + +{% if banner %} +
+
+ {% if not banner.action_label %} + + {% endif %} +
+ + {% if banner.get_image %} +
+ +
+ {% endif %} +
+ {{ banner.get_text|safe|linebreaks }} +
+ + + + + {% if banner.action_label %} + + {{ banner.action_label }} + + {% endif %} +
+ {% if not banner.action_label %} + + {% endif %} + +
+
+
+
+ +
+
+
+
+
+   +
+ {% if banner.target %} + {{ banner.target }} zł + {% endif %} +
+
+ + +
+
+{% endif %} diff --git a/src/annoy/templatetags/annoy.py b/src/annoy/templatetags/annoy.py index cdf4dbc5d..602fb3cef 100644 --- a/src/annoy/templatetags/annoy.py +++ b/src/annoy/templatetags/annoy.py @@ -45,3 +45,11 @@ def annoy_banner_crisis(context): 'banner': banners.first(), 'closable': True, } + +@register.inclusion_tag('annoy/banner_seasonal.html', takes_context=True) +def annoy_banner_seasonal(context): + banners = Banner.choice('seasonal', request=context['request'], exemptions=False) + return { + 'banner': banners.first(), + 'closable': False, + } diff --git a/src/club/forms.py b/src/club/forms.py index e0963036a..ceda8d5b1 100644 --- a/src/club/forms.py +++ b/src/club/forms.py @@ -62,9 +62,7 @@ class DonationStep2Form(forms.ModelForm, NewsletterForm): model = models.Schedule fields = [ 'first_name', 'last_name', - 'email', 'phone', - 'postal', - 'postal_code', 'postal_town', 'postal_country', + 'email', ] widgets = { 'amount': forms.HiddenInput, @@ -74,16 +72,14 @@ class DonationStep2Form(forms.ModelForm, NewsletterForm): def __init__(self, **kwargs): super().__init__(**kwargs) - self.fields['first_name'].required = True - self.fields['last_name'].required = True - self.consent = [] for c in models.Consent.objects.filter(active=True).order_by('order'): key = f'consent{c.id}' - self.fields[key] = forms.BooleanField( - label=c.text, - required=c.required - ) + if not c.required: + self.fields[key] = forms.BooleanField( + label=c.text, + required=c.required + ) self.consent.append(( c, key, (lambda k: lambda: self[k])(key) )) diff --git a/src/club/models.py b/src/club/models.py index de2d3c62b..eb1439084 100644 --- a/src/club/models.py +++ b/src/club/models.py @@ -201,6 +201,20 @@ class Schedule(models.Model): def is_recurring(self): return self.monthly or self.yearly + def n_paypal_payments(self, since, until): + # TODO: pull BA payments. + t = self.payed_at + if t is None: return 0 + c = 0 + until = min(until, now()) + t += timedelta(days=1) + while t < until: + if t >= since: + c += 1 + m = datetime(t.year, t.month, 1) + t += ((m + timedelta(days=31)).replace(day=1)) - m + return c + def set_payed(self): since = self.expires_at n = now() diff --git a/src/club/templates/club/donation_step1.html b/src/club/templates/club/donation_step1.html index c9f5ed211..d01e69364 100644 --- a/src/club/templates/club/donation_step1.html +++ b/src/club/templates/club/donation_step1.html @@ -1,5 +1,13 @@ {% extends 'club/donation_step_base.html' %} +{% load chunks %} {% block donation-step-content %} {% include "club/donation_step1_form.html" %} {% endblock %} + +{% block donate-bottom %} + +
+ {% chunk "donate-bottom" %} +
+{% endblock %} diff --git a/src/club/templates/club/donation_step2.html b/src/club/templates/club/donation_step2.html index 5d602135d..0a4cba521 100644 --- a/src/club/templates/club/donation_step2.html +++ b/src/club/templates/club/donation_step2.html @@ -30,70 +30,46 @@ {% csrf_token %} {{ form.errors }}
-
-
- - {{ form.first_name }} - {{ form.first_name.errors }} -
-
- - {{ form.last_name }} - {{ form.last_name.errors }} -
-
-
-
+
+
{{ form.email }} {{ form.email.errors }}
-
- - {{ form.phone }} - {{ form.phone.errors }} -
-
-
-
- - {{ form.postal }} - {{ form.postal.errors }} -
- - {{ form.postal_code }} - {{ form.postal_code.errors }} -
-
- - {{ form.postal_town }} - {{ form.postal_town.errors }} + + {{ form.first_name }} + {{ form.first_name.errors }}
-
-
- - {{ form.postal_country }} - {{ form.postal_country.errors }} + + {{ form.last_name }} + {{ form.last_name.errors }}
+
{% for consent, key, field in form.consent %} - {{ field.errors }} + {% if not consent.required %} + {{ field.errors }} + {% endif %}
+ {% if consent.required %} + + {% else %} {{ field }} + {% endif %}
{% endfor %}
{{ form.agree_newsletter }}
diff --git a/src/club/templates/club/donation_step_base.html b/src/club/templates/club/donation_step_base.html index 388932488..0c99d3ca9 100644 --- a/src/club/templates/club/donation_step_base.html +++ b/src/club/templates/club/donation_step_base.html @@ -84,8 +84,9 @@
- {% chunk 'donate-bottom' %} + {% block donate-bottom %}{% endblock %} +

{% trans "Transparentność jest dla nas bardzo ważna." %}

diff --git a/src/wolnelektury/static/2022/styles/layout/_annoy.scss b/src/wolnelektury/static/2022/styles/layout/_annoy.scss index 5c7649835..f6b619a76 100644 --- a/src/wolnelektury/static/2022/styles/layout/_annoy.scss +++ b/src/wolnelektury/static/2022/styles/layout/_annoy.scss @@ -284,6 +284,7 @@ } } + .annoy-banner_book-page-center { background: white; margin-top: 50px; @@ -305,3 +306,59 @@ } } } + + + + + +.annoy-banner_seasonal { + background-color: #ffd430; + color: #083F4D; + border-radius: 10px; + padding: 15px 20px; + margin-top: 20px; + cursor: pointer; + + .annoy-banner-inner { + display: flex; + flex-direction: row; + gap: 20px; + align-items: flex-start; + justify-content: space-between; + + p { + margin: 0; + } + a { + line-height: 1.35; + color: #c32721; + white-space: nowrap; + border: solid #c32721; + border-width: 0 0 1px; + + &:hover { + text-decoration: none; + border-bottom-width: 2px; + } + } + a.action { + color: #fff; + background: #c92834; + padding: 9px 20px; + font-weight: 600; + border-radius: 15px; + border-width: 0; + &:hover { + border-bottom-width: 0; + } + } + + } + .state-box { + margin-top: 15px; + } + .bar-status-box { + display: flex; + justify-content: space-between; + } +} diff --git a/src/wolnelektury/static/2022/styles/layout/_checkout.scss b/src/wolnelektury/static/2022/styles/layout/_checkout.scss index 888df46a2..71d6e827e 100644 --- a/src/wolnelektury/static/2022/styles/layout/_checkout.scss +++ b/src/wolnelektury/static/2022/styles/layout/_checkout.scss @@ -701,13 +701,6 @@ flex-direction: row; } - &:nth-child(4) { - .l-checkout__input { - &:nth-child(1) { width: 172px; } - &:nth-child(2) { width: calc(100% - 172px); } - } - } - &.full { flex-direction: column; @include rwd($break-flow) { @@ -1082,3 +1075,8 @@ border: 1px solid #edc016; background: #edc016; } + + +.donation-more { + margin-bottom:40px; +} diff --git a/src/wolnelektury/static/js/book_text/references.js b/src/wolnelektury/static/js/book_text/references.js index 3f5b7e37f..ee7e2bd91 100644 --- a/src/wolnelektury/static/js/book_text/references.js +++ b/src/wolnelektury/static/js/book_text/references.js @@ -662,14 +662,15 @@ history.pushState({}, '', anchor); }, }); + return true; } } } scrollToAnchor(window.location.hash) - $('#toc, #themes, #book-text, #annotation').on('click', 'a', function(event) { - event.preventDefault(); - scrollToAnchor($(this).attr('href')); + $('#toc, #themes, #book-text, #annotation, .scroll').on('click', 'a', function(event) { + if (scrollToAnchor($(this).attr('href'))) { + event.preventDefault(); + } }); - })})(jQuery); diff --git a/src/wolnelektury/static/js/main.js b/src/wolnelektury/static/js/main.js index 666d7a0d7..b22451168 100644 --- a/src/wolnelektury/static/js/main.js +++ b/src/wolnelektury/static/js/main.js @@ -578,12 +578,10 @@ $(".c-media__settings").toggleClass('active'); }); - const crisis = document.querySelector(".annoy-banner_crisis-container"); - const crisisLink = document.querySelector('.annoy-banner_crisis-container a.action'); - if (crisis) { - crisis.addEventListener("click", function() { - crisisLink.click(); - }); - } + $(".annoy-banner-clickable").each(function() { + $(this).click(() => { + $("a.action", this).click(); + }); + }); })(); diff --git a/src/wolnelektury/templates/base.html b/src/wolnelektury/templates/base.html index f1a7bf685..5b9b8eae1 100644 --- a/src/wolnelektury/templates/base.html +++ b/src/wolnelektury/templates/base.html @@ -6,11 +6,12 @@ {% load funding_tags %} {% load piwik_tags %} {% load title %} +{% load annoy %} {% block settings %} {% endblock %} - + @@ -38,6 +39,8 @@
{% endif %} + {% annoy_banner_seasonal %} + {% block global-content %}