Merge branch 'dev' of gitlab.com:lilcity/backend into dev

project/templates/lilcity/index.html

@@ -500,6 +500,7 @@
 <script type="text/javascript" src={% static "app.js" %}></script>
 <script>
   var schoolDiscount = parseFloat({{ config.SERVICE_DISCOUNT }});
+  var schoolAmountForDiscount = parseFloat({{ config.SERVICE_DISCOUNT_MIN_AMOUNT }});
 </script>
 {% block foot %}{% endblock foot %}
 </body>

web/src/js/modules/popup.js

@@ -73,7 +73,7 @@ $(document).ready(function () {
         }
 
         var text = '';
-        if(weekdays.length >= 7) {
+        if(schoolAmountForDiscount >= price) {
             text = '<del>'+price+'</del> '+(price-schoolDiscount)+'р.';
         } else {
             text = price+'p.';