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

web/src/js/modules/popup.js

@@ -50,7 +50,6 @@ $(document).ready(function () {
 
     var selectedWeekdays = {};
     $(document).on('change', '[data-day]', function(){
-        var days = ['', 'Понедельник', 'Вторник', 'Среда', 'Четврг', 'Пятница', 'Суббота', 'Воскресенье'];
         var weekday = $(this).data('day');
         var price = $(this).data('price');
         var discount = $(this).data('discount');
@@ -62,6 +61,11 @@ $(document).ready(function () {
             delete selectedWeekdays[weekday];
         }
 
+        updateCart();
+    });
+
+    function updateCart(){
+        var days = ['', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота', 'Воскресенье'];
         var weekdays = [], daysText = [], price = 0, discount = 0;
         for(var i in selectedWeekdays) {
             price += parseInt(selectedWeekdays[i].price);
@@ -77,11 +81,13 @@ $(document).ready(function () {
             text = price+'p.';
         }
         $('.order_price_text').html(text);
-        $('.order__days').html(daysText.join(', '));
+        $('.order__days').html((daysText.length) ? daysText.join(', '):'Ничего не выбрано');
 
         var link = $('.but_btn_popup').data('link');
 
         link = link+'?'+decodeURIComponent($.param({weekdays: weekdays}, true));
         $('.but_btn_popup').attr('href', link);
-    });
+    }
+
+    updateCart();
 });

web/src/sass/_common.sass

@@ -2648,6 +2648,8 @@ a.grey-link
   padding: 2px
   background-image: linear-gradient(-225deg, #FFE2EB 0%, #D8F5F5 100%)
   border-radius: 8px
+  &__days
+    min-height: 58px
   &__wrap
     padding: 20px 30px 30px
     background: white
@@ -2681,6 +2683,8 @@ a.grey-link
       padding: 20px 20px 0
   &__total
     margin-left: auto
+    del
+      color: #a0a0a0
 
 .lock
   padding: 50px 60px 40px