Skip to content

Commit 47ac8d4

Browse files
MelevirMelevir
authored
Merge pull request #56 from moscowpython/feature/hello_platim
Feature/hello platim
2 parents 2eb40bb + ed98f96 commit 47ac8d4

File tree

8 files changed

+166
-34
lines changed

8 files changed

+166
-34
lines changed

‎landing_page/mainpage/migrations/0042_enrollment_platim_url.py‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Generated by Django 4.2.4 on 2023-08-25 15:01
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('mainpage', '0041_enrollment'),
10+
]
11+
12+
operations = [
13+
migrations.AddField(
14+
model_name='enrollment',
15+
name='platim_url',
16+
field=models.CharField(blank=True, max_length=254, null=True),
17+
),
18+
]

‎landing_page/mainpage/models.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ def __str__(self) -> str:
5757

5858
class Enrollment(models.Model):
5959
timepad_event_id = models.CharField(max_length=64, null=True, blank=True)
60+
platim_url = models.CharField(max_length=254, null=True, blank=True)
61+
6062
start_date = models.DateField()
6163
end_date = models.DateField()
6264
end_registration_date = models.DateField()

‎landing_page/mainpage/static/css/style.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1878,7 +1878,7 @@ ul.who-we-icon {
18781878
}
18791879

18801880
.how-to-pay-cont {
1881-
padding-bottom: 40px;
1881+
padding-bottom: 60px;
18821882
}
18831883

18841884
.how-to-pay p, .how-to-pay ul {

‎landing_page/mainpage/templates/mainpage/include/index_footer.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ <h4>Мы в социальных сетях</h4>
2626
<div class="sosial-we">
2727
<a target="_blank" href="https://podcast.python.ru/">Наш подкаст</a>
2828
<a target="_blank" href="https://www.youtube.com/channel/UC-OVMPlMA3-YCIeg4z5z23A">Youtube</a>
29-
<a target="_blank" href="https://www.facebook.com/groups/MoscowDjango/">Facebook</a>
3029
<a target="_blank" href="https://vk.com/kursy_python_online_offline">ВКонтакте</a>
31-
<a target="_blank" href="https://www.instagram.com/kursy_python/">Instagram</a>
3230
</div>
3331
</li>
3432
</ul>

‎landing_page/mainpage/templates/mainpage/include/index_hero.html‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ <h4 class="curs-place col-12 col-md-8 col-xl-12">
4141
{% endif %}
4242
</div>
4343
{% if enrollment %}
44-
<div class="ticket-block row ">
44+
<div class="ticket-block row">
4545
<div class="col-md-12 col-lg-8">
4646
<div class="card slideInUp animated-on-ready">
4747
<div class="card-body d-flex flex-column justify-content-between">
@@ -66,9 +66,15 @@ <h3 class="card-heading brackets brackets-yellow">Учитесь онлайн</h
6666
</div>
6767
</div>
6868
{% if today <= enrollment.early_price_date_to %}
69-
<button class="yellow btn btn-warning btn-add btn-buy" data-toggle="modal" data-target="#overlay">
70-
Купить билет
71-
</button>
69+
{% if enrollment.platim_url %}
70+
<a class="btn btn-warning btn-add btn-buy" href="{{ enrollment.platim_url }}" target="_blank">
71+
Купить билет
72+
</a>
73+
{% else %}
74+
<button class="yellow btn btn-warning btn-add btn-buy" data-toggle="modal" data-target="#overlay">
75+
Купить билет
76+
</button>
77+
{% endif %}
7278
{% else %}
7379
<button class="yellow btn btn-warning btn-add btn-buy" data-toggle="modal" disabled data-target="#overlay">
7480
Регистрация закрыта
@@ -90,9 +96,15 @@ <h3 class="card-heading brackets brackets-yellow">Учитесь онлайн</h
9096
</div>
9197
</div>
9298
{% if today >= enrollment.late_price_date_from %}
93-
<button class="btn btn-warning btn-add btn-buy" data-toggle="modal" data-target="#overlay">
94-
Купить билет
95-
</button>
99+
{% if enrollment.platim_url %}
100+
<a class="btn btn-warning btn-add btn-buy" href="{{ enrollment.platim_url }}" target="_blank">
101+
Купить билет
102+
</a>
103+
{% else %}
104+
<button class="btn btn-warning btn-add btn-buy" data-toggle="modal" data-target="#overlay">
105+
Купить билет
106+
</button>
107+
{% endif %}
96108
{% else %}
97109
<button class="btn btn-warning btn-add btn-buy" disabled data-toggle="modal" data-target="#overlay">
98110
Регистрация закрыта

‎landing_page/mainpage/templates/mainpage/include/index_how_to_pay_by_platim.html‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
{% load static %}
2+
3+
<section class="how-to-pay show1" id="howToPay">
4+
<div class="container d-lg-none">
5+
<div class="m-section-header">
6+
<h4>Как оплатить</h4>
7+
</div>
8+
</div>
9+
<div class="container m-hide">
10+
<div class="container d-none d-lg-block">
11+
<div class="pc-section-header ">
12+
<h2>Как оплатить</h2>
13+
</div>
14+
</div>
15+
<div class="row mx-row how-to-pay-cont d-lg-flex">
16+
<div class="col-lg-3 pl-0 d-lg-block pb-lg-4 padd-0">
17+
<div class="curse-heading">
18+
<h3>Частным лицам</h3>
19+
<p class="hdescr">(оплата сразу)</p>
20+
</div>
21+
</div>
22+
<div class="col-lg-9 d-lg-block text-left padd-0">
23+
<p>
24+
Начните регистрацию, чтобы забронировать место на курсе, а затем оплатите курс в течение 4 дней
25+
одним из способов:
26+
</p>
27+
<ul class="installment-plan">
28+
<li>
29+
<p>
30+
<span style="padding-right: 10px">Картой Visa или Mastercard банков РФ.</span>
31+
</p>
32+
</li>
33+
<li>
34+
<p>
35+
<span style="padding-right: 10px">Картой Visa или Mastercard банков многих стран вне РФ.</span>
36+
</p>
37+
</li>
38+
<li>
39+
<p>
40+
<span style="padding-right: 10px">QR-кодом (если вы пользуетесь Тинькофф).</span>
41+
</p>
42+
</li>
43+
</ul>
44+
<p style="margin-top: 30px">
45+
В процессе оплаты вы можете выбрать вариант рассрочки от 3 до 12 месяцев.
46+
</p>
47+
48+
</div>
49+
</div>
50+
<div class="row mx-row how-to-pay-cont d-lg-flex padd-b">
51+
<div class="col-lg-3 pl-0 d-lg-block pb-lg-4 padd-0">
52+
<div class="curse-heading">
53+
<h3>Юридическим лицам</h3>
54+
<p class="hdescr">(безналичная оплата)</p>
55+
</div>
56+
</div>
57+
<div class="col-lg-9 d-lg-block text-left padd-0">
58+
<p>
59+
Свяжитесь с нами, написав на
60+
<a class="mail-lnk" href="mailto:learn@python.ru">learn@python.ru</a>.
61+
</p>
62+
</div>
63+
</div>
64+
</div>
65+
</section>

‎landing_page/mainpage/templates/mainpage/include/index_menu.html‎

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,18 @@
1414
<span class="color-blue">L</span>EARN <span class="color-yellow">P</span>YTHON
1515
</a>
1616
</div>
17-
<a data-toggle="modal" data-target="#overlay" class="custom-btn btn btn-outline-warning" href="#counter">
18-
Записаться
19-
</a>
17+
18+
{% if enrollment %}
19+
{% if enrollment.platim_url %}
20+
<a class="custom-btn btn btn-outline-warning" href="{{ enrollment.platim_url }}" target="_blank">
21+
Записаться
22+
</a>
23+
{% else %}
24+
<a data-toggle="modal" data-target="#overlay" class="custom-btn btn btn-outline-warning" href="#counter">
25+
Записаться
26+
</a>
27+
{% endif %}
28+
{% endif %}
2029
</div>
2130
<ul class="nav justify-content-start justify-content-lg-end smooth-scroll">
2231
<li class="nav-item">
@@ -66,18 +75,30 @@
6675
</li>
6776
{% if enrollment %}
6877
<li class="nav-item d-none d-lg-block">
69-
<a data-toggle="modal" data-target="#overlay" class="custom-btn btn" href="#counter">
70-
Записаться
71-
</a>
78+
{% if enrollment.platim_url %}
79+
<a class="custom-btn btn" href="{{ enrollment.platim_url }}" target="_blank">
80+
Записаться
81+
</a>
82+
{% else %}
83+
<a data-toggle="modal" data-target="#overlay" class="custom-btn btn" href="#counter">
84+
Записаться
85+
</a>
86+
{% endif %}
7287
</li>
7388
{% endif %}
7489
</ul>
7590
</nav>
7691

7792
<div class="d-lg-none">
78-
<a data-toggle="modal" data-target="#overlay" class="custom-btn btn btn-outline-warning" href="#counter">
79-
Записаться
80-
</a>
93+
{% if enrollment.platim_url %}
94+
<a class="custom-btn btn" href="{{ enrollment.platim_url }}" target="_blank">
95+
Записаться
96+
</a>
97+
{% else %}
98+
<a data-toggle="modal" data-target="#overlay" class="custom-btn btn btn-outline-warning" href="#counter">
99+
Записаться
100+
</a>
101+
{% endif %}
81102
</div>
82103
</div>
83104
</div>

‎landing_page/mainpage/templates/mainpage/index.html‎

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ <h3 class="text-center d-none d-lg-block">онлайн курс</h3>
225225
<div class="price-date"><b>Ранняя регистрация</b></div>
226226
<div class="price-date"> До
227227
{{ enrollment.early_price.date_to | date:"j E" }}</div>
228-
<strong class="price">{{ enrollment.early_price.price_rub }}
228+
<strong class="price">{{ enrollment.early_price_rub }}
229229
р.</strong>
230230
</div>
231231
<div class="decr-price-parent">
@@ -237,11 +237,17 @@ <h3 class="text-center d-none d-lg-block">онлайн курс</h3>
237237
рассрочка</a>
238238
</div>
239239
</div>
240-
{% if today <= enrollment.early_price.date_to %}
241-
<button class="yellow btn btn-warning btn-add btn-buy" data-toggle="modal"
242-
data-target="#overlay">
243-
Купить билет
244-
</button>
240+
{% if today <= enrollment.early_price_date_to %}
241+
{% if enrollment.platim_url %}
242+
<a class="yellow btn btn-warning btn-add btn-buy" href="{{ enrollment.platim_url }}" target="_blank">
243+
Купить билет
244+
</a>
245+
{% else %}
246+
<button class="yellow btn btn-warning btn-add btn-buy" data-toggle="modal"
247+
data-target="#overlay">
248+
Купить билет
249+
</button>
250+
{% endif %}
245251
{% else %}
246252
<button class="yellow btn btn-warning btn-add btn-buy" data-toggle="modal"
247253
disabled
@@ -258,7 +264,7 @@ <h3 class="text-center d-none d-lg-block">онлайн курс</h3>
258264
<div class="price-date"><b>Обычная регистрация</b></div>
259265
<div class="price-date"> С
260266
{{ enrollment.late_price.date_from | date:"j E" }}</div>
261-
<strong class="price">{{ enrollment.late_price.price_rub }}
267+
<strong class="price">{{ enrollment.late_price_rub }}
262268
р.</strong>
263269
</div>
264270
<div class="decr-price-parent">
@@ -270,12 +276,18 @@ <h3 class="text-center d-none d-lg-block">онлайн курс</h3>
270276
рассрочка</a>
271277
</div>
272278
</div>
273-
{% if today >= enrollment.late_price.date_from %}
274-
<button class="btn btn-warning btn-add btn-buy"
275-
data-toggle="modal"
276-
data-target="#overlay">
277-
Купить билет
278-
</button>
279+
{% if today >= enrollment.late_price_date_from %}
280+
{% if enrollment.platim_url %}
281+
<a class="yellow btn btn-warning btn-add btn-buy" href="{{ enrollment.platim_url }}" target="_blank">
282+
Купить билет
283+
</a>
284+
{% else %}
285+
<button class="btn btn-warning btn-add btn-buy"
286+
data-toggle="modal"
287+
data-target="#overlay">
288+
Купить билет
289+
</button>
290+
{% endif %}
279291
{% else %}
280292
<button class="btn btn-warning btn-add btn-buy"
281293
disabled
@@ -288,12 +300,16 @@ <h3 class="text-center d-none d-lg-block">онлайн курс</h3>
288300
</div>
289301
</div>
290302
</div>
291-
{% endif %}
303+
{% endif %}
292304
</div>
293305
</div>
294306
</section>
295307

296-
{% include 'mainpage/include/index_how_to_pay.html' %}
308+
{% if enrollment.platim_url %}
309+
{% include 'mainpage/include/index_how_to_pay_by_platim.html' %}
310+
{% else %}
311+
{% include 'mainpage/include/index_how_to_pay.html' %}
312+
{% endif %}
297313

298314
{% include 'mainpage/include/index_reviews.html' with student_videos=student_videos %}
299315

0 commit comments

Comments
 (0)