Merge remote-tracking branch 'origin/main'

static/css/styles.css

@@ -756,6 +756,19 @@ button#send_upgrade:hover {
         color: #ff0000;
 
 }
+.info_text_wrapper{
+    padding-top: 20px;
+    text-align: center;
+    color: red;
+}
+
+.info_text{
+    display: none;
+}
+.info_text.show{
+    display: block;
+
+}
 
 
 .header-second-item,

static/js/user_profile.js

@@ -675,7 +675,7 @@ function confirmUpgrade(el, routeID){
 
             let editButton = document.getElementById('edit_route_' + routeID)
 
-            if(url === '/routes/highlight_route/'){
+            if(url === '/routes/highlight_route/' && !remainsHighlightCount[0].innerText === '0'){
                         el_route.classList.add('highlight-color');
                         editButton.classList.add('highlight-color')
                         document.getElementById('control_frame_' + routeID).classList.remove('show')

static/js/user_profile_2.js

@@ -118,6 +118,8 @@ function select_tab_profile (el,url,owner_type=null, check_orders_required) {
     });
 }
 
+
+
 function checkStatesAfterTransitionToAnotherTabProfile () {
     // check which page if profile - do
     if (window.location.href.includes('profile')){

templates/widgets/w_carrier_card.html

@@ -8,7 +8,7 @@
         {% if departure_date_string < current_date %}
             <div class="carrier-card out_of_date" data-number-of-route="{{ route.id }}">
         {% else %}
-            <div class="carrier-card" data-number-of-route="{{ route.id }}">
+            <div class="carrier-card {% if route.highlight_color %} highlight-color {% endif %}" data-number-of-route="{{ route.id }}">
         {% endif %}
    {% endwith %}