From ae00cb34ede15fee52bf59a5cbc51525a050b33f Mon Sep 17 00:00:00 2001 From: Sanasol Date: Mon, 19 Mar 2018 12:42:55 +0300 Subject: [PATCH] comments filter, new discount config and conditions --- project/templates/lilcity/index.html | 1 + web/src/js/modules/popup.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/project/templates/lilcity/index.html b/project/templates/lilcity/index.html index ed99dd81..9a6ee2b2 100644 --- a/project/templates/lilcity/index.html +++ b/project/templates/lilcity/index.html @@ -500,6 +500,7 @@ {% block foot %}{% endblock foot %} diff --git a/web/src/js/modules/popup.js b/web/src/js/modules/popup.js index db9824b1..4f39ad08 100644 --- a/web/src/js/modules/popup.js +++ b/web/src/js/modules/popup.js @@ -73,7 +73,7 @@ $(document).ready(function () { } var text = ''; - if(weekdays.length >= 7) { + if(schoolAmountForDiscount >= price) { text = ''+price+' '+(price-schoolDiscount)+'р.'; } else { text = price+'p.';