From 14691d0ee4b046a3b63f635b10d641a637bb7eca Mon Sep 17 00:00:00 2001
From: ArtemB <mil.basalyga@gmail.com>
Date: Wed, 8 May 2024 14:24:06 +0300
Subject: [PATCH] 1.0.5 add error_message for subscribe

---
 static/css/styles(boris).css                  | 43 ++++++++++++++-
 static/css/styles.css                         |  5 ++
 static/img/svg/ClockCounterClockwise.svg      |  4 ++
 static/img/svg/Warning.svg                    |  5 ++
 .../blocks/profile/b_subscribe_current.html   | 55 ++++++++++++-------
 templates/widgets/w_route_info.html           |  3 +-
 6 files changed, 92 insertions(+), 23 deletions(-)
 create mode 100644 static/img/svg/ClockCounterClockwise.svg
 create mode 100644 static/img/svg/Warning.svg

diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css
index e6f2c12..c747b96 100644
--- a/static/css/styles(boris).css
+++ b/static/css/styles(boris).css
@@ -1821,14 +1821,18 @@ a.open_inf_carrier{
 
 .another_subscribe{
     width: calc(100% - 50px);
-    padding: 0 20px;
+    padding: 10px 20px;
     background: #FFFFFF;
     box-shadow: -1px 4px 10px 0 rgba(198, 199, 203, 0.20), 0 -1px 10px 0 rgba(198, 199, 203, 0.20);
-    display: flex;
+    /*display: flex;*/
     margin-bottom: 20px;
     border-radius: 10px;
+    /*height: 76px;*/
+}
+
+.subscribe_wrpapper {
+    display: flex;
     align-items: center;
-    height: 76px;
 }
 
 .name_subscribe_another{
@@ -1859,6 +1863,39 @@ a.open_inf_carrier{
     height: 44px;
     width: 160px;
 }
+.read_more_about_subscribe.error{
+    background: unset;
+    color: #FF613A;
+    width: unset;
+    height: unset;
+    font-size: 15px;
+    font-weight: 600;
+    cursor: pointer;
+}
+
+.error_order {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border: 1px solid #FF613A;
+    padding: 5px;
+    border-radius: 10px;
+    margin-top: 10px;
+    width: 100%;
+}
+.error_icon{
+    vertical-align: middle;
+}
+.error_title {
+    font-weight: 600;
+    font-size: 14px;
+}
+.error_text {
+    font-weight: 400;
+    font-size: 12px;
+}
+
+
 
 .subscribe_was_paid{
     color: #27242499;
diff --git a/static/css/styles.css b/static/css/styles.css
index 727aa96..7ad4963 100644
--- a/static/css/styles.css
+++ b/static/css/styles.css
@@ -2023,6 +2023,11 @@ button#raise_route {
 .remove_route.hide{
     display: none;
 }
+
+.filter-orange{
+    filter: invert(43%) sepia(93%) saturate(1113%) hue-rotate(336deg) brightness(100%) contrast(102%);
+}
+
 .msg_send{
     font-size: 24px;
     text-align: center;
diff --git a/static/img/svg/ClockCounterClockwise.svg b/static/img/svg/ClockCounterClockwise.svg
new file mode 100644
index 0000000..73aa624
--- /dev/null
+++ b/static/img/svg/ClockCounterClockwise.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.73145 9.34686H2.98145V5.59686" stroke="#272424" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.16895 17.8313C7.32246 18.9857 8.79246 19.7721 10.393 20.091C11.9935 20.4099 13.6527 20.2469 15.1605 19.6227C16.6684 18.9984 17.9573 17.941 18.8641 16.5842C19.7709 15.2273 20.255 13.632 20.255 12C20.255 10.368 19.7709 8.7727 18.8641 7.41585C17.9573 6.059 16.6684 5.00158 15.1605 4.37735C13.6527 3.75313 11.9935 3.59014 10.393 3.90902C8.79246 4.22789 7.32246 5.0143 6.16895 6.16875L2.98145 9.34688" stroke="#272424" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/static/img/svg/Warning.svg b/static/img/svg/Warning.svg
new file mode 100644
index 0000000..926e607
--- /dev/null
+++ b/static/img/svg/Warning.svg
@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.2748 5.00001L3.27479 24C3.09955 24.3035 3.00715 24.6478 3.00684 24.9983C3.00653 25.3487 3.09832 25.6931 3.27302 25.997C3.44773 26.3008 3.6992 26.5534 4.00226 26.7294C4.30532 26.9055 4.64932 26.9988 4.99979 27H26.9998C27.3503 26.9988 27.6943 26.9055 27.9973 26.7294C28.3004 26.5534 28.5519 26.3008 28.7266 25.997C28.9013 25.6931 28.9931 25.3487 28.9927 24.9983C28.9924 24.6478 28.9 24.3035 28.7248 24L17.7248 5.00001C17.5509 4.6961 17.2997 4.44353 16.9968 4.26787C16.6939 4.09221 16.35 3.99969 15.9998 3.99969C15.6496 3.99969 15.3057 4.09221 15.0028 4.26787C14.6998 4.44353 14.4487 4.6961 14.2748 5.00001Z" fill="#FF613A"/>
+<path d="M16 13V18" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16 24C16.8284 24 17.5 23.3284 17.5 22.5C17.5 21.6716 16.8284 21 16 21C15.1716 21 14.5 21.6716 14.5 22.5C14.5 23.3284 15.1716 24 16 24Z" fill="white"/>
+</svg>
diff --git a/templates/blocks/profile/b_subscribe_current.html b/templates/blocks/profile/b_subscribe_current.html
index b75e46e..886f1dd 100644
--- a/templates/blocks/profile/b_subscribe_current.html
+++ b/templates/blocks/profile/b_subscribe_current.html
@@ -63,27 +63,44 @@
         {% if item.id != subscribe_for_user.subscribe.id  %}
 
             <div class="another_subscribe">
-                <div class="name_subscribe_another padding-n-width-another-subscribes">{{ item.name }}</div>
-                <div class="text_another_subscribe padding-n-width-another-subscribes">
-                    {% translate "Стоимость:" %}<span class="orange-text">
-                        {% if item.price %}
-                            {{ item.price|floatformat }}$
-                        {% else %}
-                            {% translate "Бесплатно" %}
-                        {% endif %}
-                </span>
+                <div class="subscribe_wrpapper">
+                    <div class="name_subscribe_another padding-n-width-another-subscribes">{{ item.name }}</div>
+                    <div class="text_another_subscribe padding-n-width-another-subscribes">
+                        {% translate "Стоимость:" %}
+                        <span class="orange-text">
+                                {% if item.price %}
+                                    {{ item.price|floatformat }}$
+                                {% else %}
+                                    {% translate "Бесплатно" %}
+                                {% endif %}
+                        </span>
+                    </div>
+                    <div class="text_another_subscribe padding-n-width-another-subscribes ">
+                        {% translate "Период" %}: <span class="orange-text">{{ item.period_name }}</span>
+                    </div>
+                    {% if not item.order_error %}
+                        <button class="read_more_about_subscribe"
+                                onclick="send_subscribe({{ item.id }},'{% if page.url == 'for_movers' or page.url == 'for_customers' %}a{% endif %}','{% url "profile_page" "my_subscribe" %}')">{% translate "Перейти" %}
+                        </button>
+                    {% endif %}
                 </div>
-                <div class="text_another_subscribe padding-n-width-another-subscribes ">
-                    {% translate "Период" %}: <span class="orange-text">{{ item.period_name }}</span>
-                </div>
-                <button class="read_more_about_subscribe" onclick="send_subscribe({{ item.id }},'{% if page.url == 'for_movers' or page.url == 'for_customers' %}a{% endif %}','{% url "profile_page" "my_subscribe" %}')">{% translate "Перейти" %}</button>
+
+                {% if item.order_error %}
+                    <div class="error_order">
+                        <div class="error_title">
+                            <img class="error_icon" src="/static/img/svg/Warning.svg" alt="">
+                            {% translate "Ошибка оплаты" %}
+                        </div>
+                        <div class="error_title">{% translate "Сообщение от банка:" %} <span class="error_text">{{ item.order_error }}</span></div>
+                        <div class="read_more_about_subscribe error"
+                            onclick="send_subscribe({{ item.id }},'{% if page.url == 'for_movers' or page.url == 'for_customers' %}a{% endif %}','{% url "profile_page" "my_subscribe" %}')"
+                        >
+                            <img class="error_icon filter-orange" src="/static/img/svg/ClockCounterClockwise.svg" alt="">
+                            {% translate "Повторить оплату" %}
+                        </div>
+                    </div>
+                {% endif %}
             </div>
-            {% if item.order_error %}
-                <div>
-                    <div>Ошибка оплаты</div>
-                    <div>{{ item.order_error }}</div>
-                </div>
-            {% endif %}
 
         {% endif %}
 
diff --git a/templates/widgets/w_route_info.html b/templates/widgets/w_route_info.html
index 5d138f4..538b7e4 100644
--- a/templates/widgets/w_route_info.html
+++ b/templates/widgets/w_route_info.html
@@ -90,7 +90,8 @@
                 </a>
 
              <div class="button_raise_route">
-                    <button onclick="editRoute({{ route.id }})"
+                    <button
+{#                            onclick="editRoute({{ route.id }})"#}
                             id="raise_route">
                             {% translate "Увеличить просмотры" %}
                     </button>