add status icon for license, change icons

docker-compose.yml

@@ -6,6 +6,8 @@ services:
         container_name: dokumentor-web
         build: .
         volumes:
+            - /etc/localtime:/etc/localtime:ro
+            - /etc/timezone:/etc/timezone:ro
             - ./:/opt/app
         ports:
             - "32768:80"
@@ -23,6 +25,8 @@ services:
         expose:
             - "5432"
         volumes:
+            - /etc/localtime:/etc/localtime:ro
+            - /etc/timezone:/etc/timezone:ro
             - ./db:/var/lib/postgresql/data
         environment:
             - POSTGRES_USER=dokumentor
@@ -32,6 +36,9 @@ services:
         restart: always
         container_name: dokumentor-redis
         image: redis:alpine
+        volumes:
+            - /etc/localtime:/etc/localtime:ro
+            - /etc/timezone:/etc/timezone:ro
         expose:
             - "6379"
 
@@ -42,6 +49,9 @@ services:
         environment:
             - RABBITMQ_DEFAULT_USER=dokumentor
             - RABBITMQ_DEFAULT_PASS=dokumentor
+        volumes:
+            - /etc/localtime:/etc/localtime:ro
+            - /etc/timezone:/etc/timezone:ro
         expose:
             - "5672"
             - "5671"

static/css/style.css

@@ -1026,3 +1026,25 @@ input[type=number] {
 	display: inline-block;
 	vertical-align: middle;
 }
+
+.delete_license {
+	opacity: 0.5;
+	-webkit-transition: opacity 0.5s ease-in-out;
+  -moz-transition: opacity 0.5s ease-in-out;
+  -ms-transition: opacity 0.5s ease-in-out;
+  -o-transition: opacity 0.5s ease-in-out;
+  transition: opacity 0.5s ease-in-out;
+}
+
+.delete_license:hover {
+	opacity: 1;
+	-webkit-transition: opacity 0.5s ease-in-out;
+  -moz-transition: opacity 0.5s ease-in-out;
+  -ms-transition: opacity 0.5s ease-in-out;
+  -o-transition: opacity 0.5s ease-in-out;
+  transition: opacity 0.5s ease-in-out;
+}
+
+.status-license {
+	opacity: 0.5;
+}

static/img/check.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="100px" height="100px" viewBox="0 0 100 100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 39 (31667) - http://www.bohemiancoding.com/sketch -->
+    <title>Shape</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M50,1.9 C23.4,1.9 1.9,23.4 1.9,50 C1.9,76.6 23.4,98.1 50,98.1 C76.6,98.1 98.1,76.6 98.1,50 C98.1,23.4 76.6,1.9 50,1.9 L50,1.9 Z M85,34.1 C83.3,35.9 81.6,37.6 79.9,39.4 C78.4,40.9 76.9,42.4 75.5,43.9 C73.7,45.8 71.9,47.6 70,49.5 C67.8,51.8 65.5,54.1 63.3,56.4 C60.2,59.6 57.1,62.8 54,66 C51.7,68.3 49.5,70.6 47.2,72.9 C46.4,73.7 45.4,74.1 44.1,74.1 C42.8,74.2 41.7,73.2 40.6,72.1 C39.1,70.6 37.7,69 36.2,67.5 C34.5,65.8 32.8,64 31.1,62.3 C29,60.2 27,58.1 24.9,56.1 C23.3,54.5 21.7,53 20.2,51.3 C18.8,49.8 18.9,46.9 20.7,45.4 C22.7,43.7 25.1,44.1 26.9,46.1 C28.3,47.7 29.8,49.1 31.3,50.6 C33.2,52.5 35.1,54.5 37,56.4 C38.8,58.2 40.6,60.1 42.4,61.9 C42.9,62.4 43.4,62.9 43.9,63.4 C44.3,63.8 44.5,64 45,63.4 C46.8,61.5 48.6,59.7 50.5,57.9 C52.3,56 54.1,54.2 55.9,52.3 C58.3,49.9 60.7,47.5 63.1,45 C65.3,42.7 67.6,40.4 69.8,38.1 C72,35.9 74.1,33.7 76.3,31.6 C77.6,30.3 78.9,29 80.1,27.7 C81.5,26.2 84.1,26.1 85.6,27.4 C87.2,28.8 87.3,30.5 86.9,31.9 C86.4,32.8 85.6,33.4 85,34.1 L85,34.1 Z" id="Shape" stroke="#000000" stroke-width="3" fill="#000000"></path>
+    </g>
+</svg>

static/img/delete.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="100px" height="100px" viewBox="0 0 100 100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 39 (31667) - http://www.bohemiancoding.com/sketch -->
+    <title>Group 2</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group-2" transform="translate(2.000000, 2.000000)">
+            <path d="M48.1,0 C21.5,0 0,21.5 0,48.1 C0,74.7 21.5,96.2 48.1,96.2 C74.7,96.2 96.2,74.7 96.2,48.1 C96.2,21.5 74.7,0 48.1,0 L48.1,0 Z" id="Path" stroke="#000000" stroke-width="3"></path>
+            <path d="M67.5595,28.73275 C66.5825,27.75575 65.0005,27.75575 64.0245,28.73275 L48.0995,44.65775 L32.1745,28.73275 C31.1975,27.75575 29.6155,27.75575 28.6395,28.73275 C27.6635,29.70975 27.6625,31.29175 28.6395,32.26775 L44.5645,48.19275 L28.6395,64.11775 C27.6625,65.09475 27.6625,66.67675 28.6395,67.65275 C29.1275,68.14075 29.7675,68.38475 30.4075,68.38475 C31.0475,68.38475 31.6865,68.14075 32.1755,67.65275 L48.0995,51.72775 L64.0245,67.65275 C64.5125,68.14075 65.1525,68.38475 65.7925,68.38475 C66.4325,68.38475 67.0715,68.14075 67.5605,67.65275 C68.5375,66.67575 68.5375,65.09375 67.5605,64.11775 L51.6345,48.19275 L67.5595,32.26775 C68.5365,31.29175 68.5365,29.70975 67.5595,28.73275 L67.5595,28.73275 Z" id="Path" fill="#000000"></path>
+        </g>
+    </g>
+</svg>

static/img/not-check.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="100px" height="100px" viewBox="0 0 100 100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 39 (31667) - http://www.bohemiancoding.com/sketch -->
+    <title>Group</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group" transform="translate(1.000000, 1.000000)">
+            <path d="M41.1,69.9 C40,70 39,69.2 38,68.2 C36.7,66.9 35.4,65.5 34.1,64.2 C32.6,62.7 31.1,61.1 29.6,59.6 C27.8,57.8 26,55.9 24.2,54.1 C22.8,52.7 21.4,51.4 20.1,49.9 C18.9,48.5 18.9,46 20.5,44.7 C22.3,43.2 24.3,43.6 25.9,45.3 C27.1,46.7 28.4,47.9 29.7,49.2 C31.4,50.9 33,52.6 34.7,54.3 C36.3,55.9 37.8,57.5 39.4,59.1 C39.8,59.5 40.3,60 40.7,60.4 C41,60.8 41.3,60.9 41.7,60.4 C43.3,58.7 44.9,57.2 46.5,55.5 C48.1,53.9 49.7,52.2 51.3,50.6 C53.4,48.5 55.5,46.4 57.6,44.2 C59.6,42.2 61.5,40.1 63.5,38.1 C65.4,36.2 67.3,34.3 69.2,32.4 C70.3,31.3 71.4,30.1 72.5,29 C73.8,27.7 76,27.6 77.3,28.8 C78.7,30 78.8,31.5 78.5,32.8 C78.2,33.8 77.6,34.3 77,34.9 C75.5,36.5 74,38 72.5,39.5 C71.2,40.8 69.9,42.1 68.6,43.4 C67,45 65.4,46.7 63.8,48.3 C61.8,50.3 59.8,52.3 57.9,54.3 C55.2,57.1 52.5,59.9 49.8,62.7 C47.8,64.7 45.8,66.8 43.8,68.8 C43.1,69.6 42.2,69.9 41.1,69.9 L41.1,69.9 Z" id="Shape" fill="#000000"></path>
+            <circle id="Oval" stroke="#000000" stroke-width="3" cx="49" cy="49" r="48.1"></circle>
+        </g>
+    </g>
+</svg>

templates/customer/profile/orders_list.html

@@ -11,15 +11,35 @@
     <td>{{ object.order_date }}</td>
     <td>
     {% if object.type %}
-      <p>Счет № {{object.id}} - Лицензия на {{ object.get_term }},
-      {% if object.pay_sum > 0 %}{{ object.pay_sum|get_plural:"рубль,рубля,рублей" }}{% else %}бесплатно{% endif %}</p>
-      <p>{% if object.paid_date %}{{ object.get_payform_display }}{% else %}{{ object.get_action_link|safe }}{% endif %}</p>
+      <div class="col__account-main">
+        <p>Счет № {{object.id}} - Лицензия на {{ object.get_term }},
+        {% if object.pay_sum > 0 %}{{ object.pay_sum|get_plural:"рубль,рубля,рублей" }}{% else %}бесплатно{% endif %}</p>
+        <p>{% if object.paid_date %}{{ object.get_payform_display }}{% else %}{{ object.get_action_link|safe }}{% endif %}</p>
+      </div>
     {% else %}
-      <p>Лицензия № {{object.id}} на {{ object.get_term }},
-      {% if object.pay_sum > 0 %}{{ object.pay_sum|get_plural:"рубль,рубля,рублей" }}{% else %}бесплатно{% endif %}</p>
-      <p>{% if object.term > 0 %}{{ object.get_action_link|safe  }}{% else %}Пробный период{% endif %}</p>
+      <div class="col__lic-main">
+        <p>Лицензия № {{object.id}} на {{ object.get_term }},
+        {% if object.pay_sum > 0 %}{{ object.pay_sum|get_plural:"рубль,рубля,рублей" }}{% else %}бесплатно{% endif %}</p>
+        <p>{% if object.term > 0 %}{{ object.get_action_link|safe  }}{% else %}Пробный период{% endif %}</p>
+      </div>
     {% endif %}
     </td>
+    <td>
+      {% if 'активна' in object.get_paid_status %}
+        <div class="status-license">
+          <svg width="20" height="20">
+            <image xlink:href="{% static 'img/check.svg' %}" src="{% static 'img/check.png' %}" width="20" height="20"/>
+          </svg>
+        </div>
+      {% endif %}
+      {% if 'выдана' in object.get_paid_status and not object.type %}
+        <div class="status-license">
+         <svg width="20" height="20">
+            <image xlink:href="{% static 'img/not-check.svg' %}" src="{% static 'img/not-check.png' %}" width="20" height="20"/>
+         </svg>
+        </div>
+      {% endif %}
+    </td>
     <td>
     {% if object.type %}
       <div class="col__account-detail">
@@ -36,7 +56,9 @@
     <td>
       {% if object.status == 0 %}
         <a class="delete_license" data-id="{{ object.pk }}" href="#" title="Удалить счёт на оплату">
-          <img src="{% static 'img/icon-delete.png' %}" alt="[X]" title="Удалить счёт на оплату" />
+          <svg width="20" height="20">
+            <image xlink:href="{% static 'img/delete.svg' %}" src="{% static 'img/delete.png' %}" width="20" height="20"/>
+          </svg>
         </a>
       {% endif %}
     </td>