From a7a4112312ab4aea2bca5e1190576f283dba79a3 Mon Sep 17 00:00:00 2001
From: ArtemB <mil.basalyga@gmail.com>
Date: Fri, 1 Dec 2023 11:14:04 +0300
Subject: [PATCH] 0.0.287

---
 .../static_pages_blocks/b_about_service.html  |  3 +-
 .../static_pages_blocks/b_advertisement.html  | 37 +++++++++---------
 .../static_pages_blocks/b_contacts.html       |  3 +-
 .../b_customer_service.html                   |  3 +-
 .../static_pages_blocks/b_partners.html       | 38 ++++++++++---------
 templates/forms/f_commercial_offer.html       | 26 +++++++++++++
 templates/forms/f_feedback_form.html          | 11 +++---
 7 files changed, 79 insertions(+), 42 deletions(-)
 create mode 100644 templates/forms/f_commercial_offer.html

diff --git a/templates/blocks/static_pages_blocks/b_about_service.html b/templates/blocks/static_pages_blocks/b_about_service.html
index 2b07365..31ab40e 100644
--- a/templates/blocks/static_pages_blocks/b_about_service.html
+++ b/templates/blocks/static_pages_blocks/b_about_service.html
@@ -60,7 +60,8 @@
     </div>
 
         <div class="form_wrapper">
-                        {% include "blocks/static_pages_blocks/../../widgets/../../forms/f_feedback_form.html" %}
+                           {% include "forms/f_feedback_form.html" %}
+
 
         </div>
 
diff --git a/templates/blocks/static_pages_blocks/b_advertisement.html b/templates/blocks/static_pages_blocks/b_advertisement.html
index e74accc..141303b 100644
--- a/templates/blocks/static_pages_blocks/b_advertisement.html
+++ b/templates/blocks/static_pages_blocks/b_advertisement.html
@@ -46,25 +46,28 @@
         <h2 id=title_static>{% translate "Стоимость" %}</h2>
         <span id="sub_title_static">{% translate "Оставьте заявку и получите персональное коммерческое предложение" %}</span>
 
-        <form data-name="msg_from_advertisement">
-          <div class="inputs_l">
-            <input name="name" type="text" placeholder="{{ p_name }}" {% if form.data.username %} value="{{ form.data.username }}"{% endif %}>
-            {% if form.username and form.errors.username %}
-            <span>{{ form.errors.username }}</span>
-                 {% endif %}
-          </div>
+        {% include "forms/f_commercial_offer.html" %}
 
-          <div class="inputs_l">
-            <input name="phone" type="tel" placeholder="{% translate 'Телефон' %}"{% if form.data.tel %} value="{{ form.data.tel }}"{% endif %}>
-            {% if form.tel and form.errors.tel %}
-            <span>{{ form.errors.tel }}</span>
-                 {% endif %}
-          </div>
 
-          <div class="button_register">
-              <button id="request_btn" onclick="RequestCommercialOffer(this)">{% translate "Оставить заявку" %}</button>
-          </div>
-        </form>
+{#        <form data-name="msg_from_advertisement">#}
+{#          <div class="inputs_l">#}
+{#            <input name="name" type="text" placeholder="{{ p_name }}" {% if form.data.username %} value="{{ form.data.username }}"{% endif %}>#}
+{#            {% if form.username and form.errors.username %}#}
+{#            <span>{{ form.errors.username }}</span>#}
+{#                 {% endif %}#}
+{#          </div>#}
+{##}
+{#          <div class="inputs_l">#}
+{#            <input name="phone" type="tel" placeholder="{% translate 'Телефон' %}"{% if form.data.tel %} value="{{ form.data.tel }}"{% endif %}>#}
+{#            {% if form.tel and form.errors.tel %}#}
+{#            <span>{{ form.errors.tel }}</span>#}
+{#                 {% endif %}#}
+{#          </div>#}
+{##}
+{#          <div class="button_register">#}
+{#              <button id="request_btn" onclick="RequestCommercialOffer(this)">{% translate "Оставить заявку" %}</button>#}
+{#          </div>#}
+{#        </form>#}
 
     </div>
 
diff --git a/templates/blocks/static_pages_blocks/b_contacts.html b/templates/blocks/static_pages_blocks/b_contacts.html
index f11ccfc..99e89a6 100644
--- a/templates/blocks/static_pages_blocks/b_contacts.html
+++ b/templates/blocks/static_pages_blocks/b_contacts.html
@@ -1,6 +1,7 @@
 {% load i18n %}
+{% load static %}
 
-   {% include "blocks/static_pages_blocks/../../widgets/../../forms/f_feedback_form.html" %}
+   {% include "forms/f_feedback_form.html" %}
 
 
 
diff --git a/templates/blocks/static_pages_blocks/b_customer_service.html b/templates/blocks/static_pages_blocks/b_customer_service.html
index 86471f1..e4e874e 100644
--- a/templates/blocks/static_pages_blocks/b_customer_service.html
+++ b/templates/blocks/static_pages_blocks/b_customer_service.html
@@ -1,7 +1,8 @@
 {% load i18n %}
 
 
-   {% include "blocks/static_pages_blocks/../../widgets/../../forms/f_feedback_form.html" %}
+      {% include "forms/f_feedback_form.html" %}
+
 
 
 
diff --git a/templates/blocks/static_pages_blocks/b_partners.html b/templates/blocks/static_pages_blocks/b_partners.html
index a3f9666..eb24884 100644
--- a/templates/blocks/static_pages_blocks/b_partners.html
+++ b/templates/blocks/static_pages_blocks/b_partners.html
@@ -33,25 +33,29 @@
     <div id="scroll_to_div" class="bottom_block_static anchor">
         <div id=title_static >{% translate "Стань нашим партнером" %}</div>
         <span id="sub_title_static">{% translate "Оставь заявку и получи пресональное предложение о партнерстве" %}</span>
-    <form data-name="msg_from_partners">
-          <div class="inputs_l">
-            <input name="name" type="text" placeholder="{% translate 'Имя' %}" {% if form.data.username %} value="{{ form.data.username }}"{% endif %}>
-            {% if form.username and form.errors.username %}
-            <span>{{ form.errors.username }}</span>
-                 {% endif %}
-          </div>
 
-          <div class="inputs_l">
-            <input name="phone" type="tel" placeholder="{% translate 'Телефон' %}"{% if form.data.tel %} value="{{ form.data.tel }}"{% endif %}>
-            {% if form.tel and form.errors.tel %}
-            <span>{{ form.errors.tel }}</span>
-                 {% endif %}
-          </div>
+              {% include "forms/f_commercial_offer.html" %}
 
-          <div class="button_register">
-              <button id="request_btn" onclick="RequestCommercialOffer(this)">{% translate "Оставить заявку" %}</button>
-          </div>
-    </form>
+
+{#    <form data-name="msg_from_partners">#}
+{#          <div class="inputs_l">#}
+{#            <input name="name" type="text" placeholder="{% translate 'Имя' %}" {% if form.data.username %} value="{{ form.data.username }}"{% endif %}>#}
+{#            {% if form.username and form.errors.username %}#}
+{#            <span>{{ form.errors.username }}</span>#}
+{#                 {% endif %}#}
+{#          </div>#}
+{##}
+{#          <div class="inputs_l">#}
+{#            <input name="phone" type="tel" placeholder="{% translate 'Телефон' %}"{% if form.data.tel %} value="{{ form.data.tel }}"{% endif %}>#}
+{#            {% if form.tel and form.errors.tel %}#}
+{#            <span>{{ form.errors.tel }}</span>#}
+{#                 {% endif %}#}
+{#          </div>#}
+{##}
+{#          <div class="button_register">#}
+{#              <button id="request_btn" onclick="RequestCommercialOffer(this)">{% translate "Оставить заявку" %}</button>#}
+{#          </div>#}
+{#    </form>#}
 
     </div>
 
diff --git a/templates/forms/f_commercial_offer.html b/templates/forms/f_commercial_offer.html
new file mode 100644
index 0000000..5ade0ca
--- /dev/null
+++ b/templates/forms/f_commercial_offer.html
@@ -0,0 +1,26 @@
+{% load static %}
+{% load i18n %}
+
+    <form
+
+        {% if page.url == 'partners' %} data-name="msg_from_partners"{% endif %}
+        {% if page.url == 'advertisement' %} data-name="msg_from_advertisement"{% endif %}>
+
+              <div class="inputs_l">
+                <input name="name" type="text" placeholder="{{ p_name }}" {% if form.data.name %} value="{{ form.data.name }}"{% endif %}>
+                {% if form.username and form.errors.username %}
+                <span>{{ form.errors.username }}</span>
+                     {% endif %}
+              </div>
+
+              <div class="inputs_l">
+                <input name="phone" type="tel" placeholder="{% translate 'Телефон' %}"{% if form.data.phone %} value="{{ form.data.phone }}"{% endif %}>
+                {% if form.tel and form.errors.tel %}
+                <span>{{ form.errors.tel }}</span>
+                     {% endif %}
+              </div>
+
+              <div class="button_register">
+                  <button id="request_btn" onclick="RequestCommercialOffer(this)">{% translate "Оставить заявку" %}</button>
+              </div>
+    </form>
diff --git a/templates/forms/f_feedback_form.html b/templates/forms/f_feedback_form.html
index ca731ab..737d06b 100644
--- a/templates/forms/f_feedback_form.html
+++ b/templates/forms/f_feedback_form.html
@@ -25,7 +25,7 @@
                    type="text"
 {#                    {% if form.name %} required{% endif %}#}
 
-                   placeholder="{% translate 'Имя' %}" {% if form.data.username %} value="{{ form.data.username }}"{% endif %}>
+                   placeholder="{% translate 'Имя' %}" {% if form.data.name %} value="{{ form.data.name }}"{% endif %}>
             {% if form.username and form.errors.username %}
             <span>{{ form.errors.name }}</span>
                  {% endif %}
@@ -46,7 +46,7 @@
                 <input name="phone"
                        type="tel"
 
-                       placeholder="{% translate 'Телефон' %}"{% if form.data.tel %} value="{{ form.data.tel }}"{% endif %}>
+                       placeholder="{% translate 'Телефон' %}"{% if form.data.phone %} value="{{ form.data.phone }}"{% endif %}>
                 {% if form.tel and form.errors.tel %}
                 <span>{{ form.errors.tel }}</span>
                      {% endif %}
@@ -60,9 +60,10 @@
                             onFocus="this.select()"
 
                             oninput="counterText(this)"
-                            id="id_text" class="feedback_form_message"
-                                    placeholder= '{% translate "Сообщение" %}'
-                            value="{% if form.adding_machine.text %}{{ form.initial.text }}{% endif %}"
+                            id="id_text"
+                            class="feedback_form_message"
+                            placeholder= '{% translate "Сообщение" %}'
+{#                            value="{% if form.data.text_msg %}{{ form.initial.text_msg }}{% endif %}"#}
                             maxlength="100"
                     ></textarea>
                     <span class="counter-text">