From 9eeeeab0b4b72b405b2c2a6e69969537706535bf Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Tue, 23 May 2023 12:32:14 +0200 Subject: [PATCH] checkout styles --- src/club/models.py | 8 +++ .../club/2022/donation_step1_form.html | 4 +- .../templates/club/2022/donation_step2.html | 7 +- .../templates/club/2022/donation_step3.html | 4 +- .../static/2022/styles/layout/_checkout.scss | 69 ++++++++++++------- 5 files changed, 63 insertions(+), 29 deletions(-) diff --git a/src/club/models.py b/src/club/models.py index 98b4ee00e..676669497 100644 --- a/src/club/models.py +++ b/src/club/models.py @@ -69,6 +69,10 @@ class Club(models.Model): c[f'{tag}_wide_spot'] = wide_spot return c + def get_description_for_amount(self, amount, monthly): + amounts = self.monthlyamount_set if monthly else self.singleamount_set + amount = amounts.all().filter(amount__lte=amount).last() + return amount.description if amount is not None else '' class SingleAmount(models.Model): @@ -146,6 +150,10 @@ class Schedule(models.Model): super(Schedule, self).save(*args, **kwargs) self.update_contact() + def get_description(self): + club = Club.objects.first() + return club.get_description_for_amount(self.amount, self.monthly) + def initiate_payment(self, request): return self.get_payment_method().initiate(request, self) diff --git a/src/club/templates/club/2022/donation_step1_form.html b/src/club/templates/club/2022/donation_step1_form.html index cfdd5d387..6b985eded 100644 --- a/src/club/templates/club/2022/donation_step1_form.html +++ b/src/club/templates/club/2022/donation_step1_form.html @@ -80,11 +80,11 @@ Bezpieczne płatności zapewniają:
nazwa odbiorcy
-

Fundacja Nowoczesna Polska

+

Fundacja Wolne Lektury

- +
adres odbiorcy
diff --git a/src/club/templates/club/2022/donation_step2.html b/src/club/templates/club/2022/donation_step2.html index cd7a9f4be..f115ece6b 100644 --- a/src/club/templates/club/2022/donation_step2.html +++ b/src/club/templates/club/2022/donation_step2.html @@ -18,6 +18,7 @@ {% endif %} +

{{ schedule.get_description }}

@@ -105,5 +106,9 @@
- Bezpieczne płatności zapewniają +
+ + Bezpieczne płatności zapewniają: + +
{% endblock %} diff --git a/src/club/templates/club/2022/donation_step3.html b/src/club/templates/club/2022/donation_step3.html index 4da3456df..a368c659b 100644 --- a/src/club/templates/club/2022/donation_step3.html +++ b/src/club/templates/club/2022/donation_step3.html @@ -34,11 +34,11 @@
nazwa odbiorcy
-

Fundacja Nowoczesna Polska

+

Fundacja Wolne Lektury

- +
adres odbiorcy
diff --git a/src/wolnelektury/static/2022/styles/layout/_checkout.scss b/src/wolnelektury/static/2022/styles/layout/_checkout.scss index 779324ae6..89b97f164 100644 --- a/src/wolnelektury/static/2022/styles/layout/_checkout.scss +++ b/src/wolnelektury/static/2022/styles/layout/_checkout.scss @@ -188,11 +188,15 @@ .l-switch label { color: #fff; font-weight: 600; - font-size: 21.5px; + font-size: 18.5px; line-height: 26px; transition: color .2s ease; width: 122px; cursor: pointer; + + @include rwd($break-flow) { + font-size: 21.5px; + } } .l-switch label:nth-of-type(1) { @@ -349,6 +353,12 @@ background: rgba(#92BD39, 0.75); } } + img { + display: none; + @include rwd($break-flow) { + display: block; + } + } &.is-active { box-shadow: 0px 0px 20px rgba(55, 170, 156, 0.35); @@ -527,6 +537,7 @@ span { color: #FF4C54; } } input, select, textarea { + width: 100%; height: 56px; background: #FFFFFF; border: 1px solid #D5ECED; @@ -541,19 +552,25 @@ } button { - height: 56px; + height: 40px; background: #083F4D; + border: none; border-radius: 3px; font-weight: 600; - font-size: 20px; + font-size: 16px; line-height: 25px; display: flex; align-items: center; justify-content: center; text-align: center; - margin-left: 32px; color: #FFFFFF; - width: 340px; + + @include rwd($break-flow) { + height: 56px; + font-size: 20px; + width: 340px; + margin-left: 32px; + } } } @@ -586,7 +603,7 @@ } } &:nth-child(2) { - width: calc(100% - 340px); + width: calc(100% - 402px); } &.full { width: 100%; @@ -635,9 +652,15 @@ } .l-checkout__form__row { - display: flex; + display: flex; + flex-direction: column; + gap: 20px; margin-bottom: 24px; + @include rwd($break-flow) { + flex-direction: row; + } + &:nth-child(4) { .l-checkout__input { &:nth-child(1) { width: 172px; } @@ -647,14 +670,8 @@ &.full { flex-direction: column; - - .l-checkout__input { - &:nth-child(1) { - padding-right: 0; - } - &:nth-child(2) { - padding-left: 0; - } + @include rwd($break-flow) { + flex-direction: column; } } @@ -673,12 +690,6 @@ .l-checkout__input { width: 100%; - &:nth-child(1) { - padding-right: 10px; - } - &:nth-child(2) { - padding-left: 10px; - } } & > a { @@ -694,13 +705,23 @@ } &.confirm { - display: flex; + display: flex; + flex-direction: row; align-items: center; - justify-content: space-between; + justify-content: stretch; width: 100%; + gap: 50px; + @include rwd($break-flow) { + justify-content: space-between; + } + .l-checkout__input { - width: auto; + flex-grow: 1; + @include rwd($break-flow) { + width: auto; + flex-grow: 0; + } } } .errorlist { -- 2.20.1