diff --git a/docker-compose.yml b/docker-compose.yml
index 2614db7..83a296e 100644
--- a/docker-compose.yml
+++ b/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"
diff --git a/static/css/style.css b/static/css/style.css
index e9761a8..e4d7fa4 100644
--- a/static/css/style.css
+++ b/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;
+}
diff --git a/static/img/check.png b/static/img/check.png
new file mode 100644
index 0000000..e3f914c
Binary files /dev/null and b/static/img/check.png differ
diff --git a/static/img/check.svg b/static/img/check.svg
new file mode 100644
index 0000000..2107fcd
--- /dev/null
+++ b/static/img/check.svg
@@ -0,0 +1,10 @@
+
+
\ No newline at end of file
diff --git a/static/img/delete.png b/static/img/delete.png
new file mode 100644
index 0000000..ef2cc3f
Binary files /dev/null and b/static/img/delete.png differ
diff --git a/static/img/delete.svg b/static/img/delete.svg
new file mode 100644
index 0000000..abb33bf
--- /dev/null
+++ b/static/img/delete.svg
@@ -0,0 +1,13 @@
+
+
\ No newline at end of file
diff --git a/static/img/not-check.png b/static/img/not-check.png
new file mode 100644
index 0000000..03852a5
Binary files /dev/null and b/static/img/not-check.png differ
diff --git a/static/img/not-check.svg b/static/img/not-check.svg
new file mode 100644
index 0000000..526feaf
--- /dev/null
+++ b/static/img/not-check.svg
@@ -0,0 +1,13 @@
+
+
\ No newline at end of file
diff --git a/templates/customer/profile/orders_list.html b/templates/customer/profile/orders_list.html
index 1b8e70e..0ad3373 100644
--- a/templates/customer/profile/orders_list.html
+++ b/templates/customer/profile/orders_list.html
@@ -11,15 +11,35 @@
| {{ object.order_date }} |
{% if object.type %}
- Счет № {{object.id}} - Лицензия на {{ object.get_term }},
- {% if object.pay_sum > 0 %}{{ object.pay_sum|get_plural:"рубль,рубля,рублей" }}{% else %}бесплатно{% endif %}
- {% if object.paid_date %}{{ object.get_payform_display }}{% else %}{{ object.get_action_link|safe }}{% endif %}
+
+ Счет № {{object.id}} - Лицензия на {{ object.get_term }},
+ {% if object.pay_sum > 0 %}{{ object.pay_sum|get_plural:"рубль,рубля,рублей" }}{% else %}бесплатно{% endif %}
+ {% if object.paid_date %}{{ object.get_payform_display }}{% else %}{{ object.get_action_link|safe }}{% endif %}
+ Лицензия № {{object.id}} на {{ object.get_term }},
- {% if object.pay_sum > 0 %}{{ object.pay_sum|get_plural:"рубль,рубля,рублей" }}{% else %}бесплатно{% endif %}
- {% if object.term > 0 %}{{ object.get_action_link|safe }}{% else %}Пробный период{% endif %}
+
+ Лицензия № {{object.id}} на {{ object.get_term }},
+ {% if object.pay_sum > 0 %}{{ object.pay_sum|get_plural:"рубль,рубля,рублей" }}{% else %}бесплатно{% endif %}
+ {% if object.term > 0 %}{{ object.get_action_link|safe }}{% else %}Пробный период{% endif %}
+ |
+
+ {% if 'активна' in object.get_paid_status %}
+
+
+
+ {% endif %}
+ {% if 'выдана' in object.get_paid_status and not object.type %}
+
+
+
+ {% endif %}
+ |
{% if object.type %}
@@ -36,7 +56,9 @@
{% if object.status == 0 %}
- ![[X]]({% static 'img/icon-delete.png' %} "Удалить счёт на оплату")
+
{% endif %}
|
|