From fcf828c11bbb704940176a6d5ab8ff65d2d71890 Mon Sep 17 00:00:00 2001
From: maksim <maksim@good-production.ru>
Date: Sat, 28 Jun 2025 18:55:38 +0300
Subject: [PATCH] =?UTF-8?q?Maks=20|=20=D0=B2=D1=8B=D0=B2=D0=B5=D0=BB=20?=
 =?UTF-8?q?=D1=81=D0=BE=D1=86.=D1=81=D0=B5=D1=82=D0=B8=20=D0=B2=20=D1=84?=
 =?UTF-8?q?=D1=83=D1=82=D0=B5=D1=80=D0=B5=20=D0=B8=20=D0=BD=D0=B5=D0=BA?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D0=B5=20=D0=BF=D0=BE=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=82=D0=BA=D0=B8=20TO=5FDO=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/footer/module-ajax-controller.php |   2 +-
 .../modules/footer/module-controller.php      |   9 +-
 .../themes/cosmopet/templates/footer.twig     | 191 +++++++++---------
 .../cosmopet/templates/form-coupon.twig       |   1 +
 4 files changed, 110 insertions(+), 93 deletions(-)

diff --git a/wp-content/themes/cosmopet/modules/footer/module-ajax-controller.php b/wp-content/themes/cosmopet/modules/footer/module-ajax-controller.php
index de7cb21..0407e48 100644
--- a/wp-content/themes/cosmopet/modules/footer/module-ajax-controller.php
+++ b/wp-content/themes/cosmopet/modules/footer/module-ajax-controller.php
@@ -1,6 +1,6 @@
 <?php
 
-
+/* TO_DO что за логика ? */
 // Добавление и настройка колонки Telegram
 add_filter('manage_users_columns', 'add_tg_account_column');
 function add_tg_account_column($columns) {
diff --git a/wp-content/themes/cosmopet/modules/footer/module-controller.php b/wp-content/themes/cosmopet/modules/footer/module-controller.php
index 9fef4b7..aafb78e 100644
--- a/wp-content/themes/cosmopet/modules/footer/module-controller.php
+++ b/wp-content/themes/cosmopet/modules/footer/module-controller.php
@@ -1,11 +1,18 @@
 <?php
 
+
+/* TO_DO почему-то здесь берется из админки, а внутри timber/context подтягивает неизвестно откуда старые значения  */
+global $social;
+$social = get_field('social', 'options');
+
 // Добавляем данные в контекст Timber
 add_filter('timber/context', function($context) {
+    global $social;
     $context['email_list'] = get_field('email_list', 'options');
     $context['email_list_ae'] = get_field('email_list_ae', 'options');
     $context['adres'] = get_field('adres', 'options');
-    $context['social'] = get_field('social', 'options');
+    // $context['social'] = get_field('social', 'options'); // вытягивало непонятно откуда
+    $context['social'] = $social;
     $context['footer-links'] = get_field('footer-links', 'options');
     return $context;
 });
diff --git a/wp-content/themes/cosmopet/templates/footer.twig b/wp-content/themes/cosmopet/templates/footer.twig
index 7d632c8..1305eb2 100644
--- a/wp-content/themes/cosmopet/templates/footer.twig
+++ b/wp-content/themes/cosmopet/templates/footer.twig
@@ -1,99 +1,105 @@
 {% set current_path = template_path ~ '/modules/footer' %}
-            <footer class="footer {% if site_region == 'ae' %}footer_ae{% endif %}">
-                <div class="footer__wrapper wrapper">
-                    {% if site_region == 'ae' %}
+<footer class="footer {% if site_region == 'ae' %}footer_ae{% endif %}">
+    <div class="footer__wrapper wrapper">
+        
+        
+        {# Для ОАЭ сайта #}
+        {% if site_region == 'ae' %}
 
-                    <div class="footer-content">
-                        <a href="/" class="logo">
-                            <img src="/wp-content/themes/cosmopet/static/img/svg/logo/logo-gradient.svg" alt="">
+        <div class="footer-content">
+            <a href="/" class="logo">
+                <img src="/wp-content/themes/cosmopet/static/img/svg/logo/logo-gradient.svg" alt="">
+            </a>
+            <p class="footer-content__address">
+                {{adres}}
+            </p>
+            <ul class="footer__list">
+            {% for item in email_list_ae %}
+                <li class="footer-list__item">
+                    <p>{{item.name}}</p>
+                    <a href="mailto:{{item.email}}">{{item.email}}</a>
+                </li>
+            {% endfor %}
+            </ul>
+            <div class="footer-bottom footer__about">
+                <ul class="footer-network">
+                    {% for item in social %}
+                    <li>
+                        <a href="{{item.link}}" target="_blank">
+                            <img class="social-media__icon" src="{{item.img}}">
                         </a>
-                        <p class="footer-content__address">
-                            {{adres}}
-                        </p>
-                        <ul class="footer__list">
-                        {% for item in email_list_ae %}
-                            <li class="footer-list__item">
-                                <p>{{item.name}}</p>
-                                <a href="mailto:{{item.email}}">{{item.email}}</a>
-                            </li>
-                        {% endfor %}
-                        </ul>
-                        <div class="footer-bottom footer__about">
-                            <ul class="footer-network">
-                                {% for item in social %}
-                                <li>
-                                    <a href="{{item.link}}" target="_blank">
-                                        <img class="social-media__icon" src="{{item.img}}">
-                                    </a>
-                                </li>
-                            {% endfor %}
-                            </ul>
-                            <a href="/privacy-policy/" class="footer-about__text">Privacy Policy</a>
-                            <a href="/shipping-policy/" class="footer-about__text">Shipping Policy</a>
-                            <a href="/terms-conditions/" class="footer-about__text">Terms and Conditions</a>
-                        </div>
-                    </div>
-                    
-                    {% include 'forms/footer-form.twig' %}
-
-                    {% elseif site_region == 'ru' %}
-
-                    <div class="footer-top">
-                        <div class="footer-content__wrap">
-                            <div class="footer-content">
-                                <a href="/" class="logo">
-                                    <img src="/wp-content/themes/cosmopet/static/img/svg/logo/logo-gradient.svg" alt="">
-                                    <span>сosmopet</span>
-                                </a>
-                                <p class="footer-content__address">
-                                    {{adres}}
-                                </p>
-                                <ul>
-                                {% for item in email_list %}
-                                    <li>
-                                        <p>{{item.name}}</p>
-                                        <a href="mailto:{{item.email}}">{{item.email}}</a>
-                                    </li>
-                                {% endfor %}
-                                </ul>
-                            </div>
-                            <div class="footer-top__link">
-                                <a href="https://t.me/cosmopet_bot" class="link-black">{{ function('pll_e', 'Чат бот с ветеринаром') }}</a>
-                            </div>
-                        </div>
-                        <form class="footer-contact form-process" action="contact_form">
-                            <h3 class="footer-contact__title">{{ function('pll_e', 'Форма обратной связи') }}</h3>
-                            <input name="name" type="text" placeholder="{{ function('pll_e', 'Ваше имя') }}" class="form-inp">
-                            <input name="email" type="email" placeholder="{{ function('pll_e', 'Эл.почта') }}" class="form-inp">
-                            <textarea name="message" class="form-textarea" name="" placeholder="{{ function('pll_e', 'Текст обращения') }}" id=""></textarea>
-                            <input type="hidden" name="from_url" value="{{ current_url }}">
-                            <input type="hidden" name="form_name" value="Contact form in footer">
-                            <button class="footer-contact__submit" type="submit">{{ function('pll_e', 'ОТПРАВИТЬ') }}</button>
-                        </form>
-                    </div>
-                    <div class="footer-bottom">
-                        <ul class="footer-network">
-                            {% for item in social %}
-                            <li>
-                                <a href="{{item.link}}" target="_blank">
-                                    <img class="social-media__icon" src="{{item.img}}">
-                                </a>
-                            </li>
-                           {% endfor %}
-                        </ul>
-                        <a href="/privacy-policy/" class="footer-about__text" target="_blank">{{ function('pll_e', 'Соглашение о конфиденциальности') }}</a>
-                        <a href="/wp-content/uploads/2025/06/declaration_korm.pdf" class="footer-about__text" target="_blank">{{ function('pll_e', 'Декларация соответствия корма') }}</a>
-                        <a href="/wp-content/uploads/2025/06/declaration_lakomstva.pdf" class="footer-about__text" target="_blank">{{ function('pll_e', 'Декларация соответствия лакомств') }}</a>
-                    </div>
-
-                    {% endif %}
-
-                    
+                    </li>
+                {% endfor %}
+                </ul>
+                <a href="/privacy-policy/" class="footer-about__text">Privacy Policy</a>
+                <a href="/shipping-policy/" class="footer-about__text">Shipping Policy</a>
+                <a href="/terms-conditions/" class="footer-about__text">Terms and Conditions</a>
+            </div>
+        </div>
+        
+        {% include 'forms/footer-form.twig' %}
+
+
+        {# Для РУ-сайта #}
+        {% elseif site_region == 'ru' %}
+
+        <div class="footer-top">
+            <div class="footer-content__wrap">
+                <div class="footer-content">
+                    <a href="/" class="logo">
+                        <img src="/wp-content/themes/cosmopet/static/img/svg/logo/logo-gradient.svg" alt="">
+                        <span>сosmopet</span>
+                    </a>
+                    <p class="footer-content__address">
+                        {{adres}}
+                    </p>
+                    <ul>
+                    {% for item in email_list %}
+                        <li>
+                            <p>{{item.name}}</p>
+                            <a href="mailto:{{item.email}}">{{item.email}}</a>
+                        </li>
+                    {% endfor %}
+                    </ul>
                 </div>
-            </footer>
+                <div class="footer-top__link">
+                    <a href="https://t.me/cosmopet_bot" class="link-black">{{ function('pll_e', 'Чат бот с ветеринаром') }}</a>
+                </div>
+            </div>
+            <form class="footer-contact form-process" action="contact_form">
+                <h3 class="footer-contact__title">{{ function('pll_e', 'Форма обратной связи') }}</h3>
+                <input name="name" type="text" placeholder="{{ function('pll_e', 'Ваше имя') }}" class="form-inp">
+                <input name="email" type="email" placeholder="{{ function('pll_e', 'Эл.почта') }}" class="form-inp">
+                <textarea name="message" class="form-textarea" name="" placeholder="{{ function('pll_e', 'Текст обращения') }}" id=""></textarea>
+                <input type="hidden" name="from_url" value="{{ current_url }}">
+                <input type="hidden" name="form_name" value="Contact form in footer">
+                <button class="footer-contact__submit" type="submit">{{ function('pll_e', 'ОТПРАВИТЬ') }}</button>
+            </form>
+        </div>
+        <div class="footer-bottom">
+            <ul class="footer-network">
+            {# {{ dump( social ) }} #}
+                {% for item in social %}
+                <li>
+                    <a href="{{item.link}}" target="_blank">
+                        <img class="social-media__icon" src="{{item.img}}">
+                    </a>
+                </li>
+                {% endfor %}
+            </ul>
+            <a href="/privacy-policy/" class="footer-about__text" target="_blank">{{ function('pll_e', 'Соглашение о конфиденциальности') }}</a>
+            <a href="/wp-content/uploads/2025/06/declaration_korm.pdf" class="footer-about__text" target="_blank">{{ function('pll_e', 'Декларация соответствия корма') }}</a>
+            <a href="/wp-content/uploads/2025/06/declaration_lakomstva.pdf" class="footer-about__text" target="_blank">{{ function('pll_e', 'Декларация соответствия лакомств') }}</a>
+        </div>
+
+        {% endif %}
+
+        
+    </div>
+</footer>
+
 
-            
-            <!-- Footer end -->
+<!-- Footer end -->
 
 
            
@@ -101,6 +107,8 @@
 {% include 'forms/author-form.twig' %}
 
 <script>
+{# TO_DO перенсти в модуль соответвующий #}
+
 function onTelegramAuth(user) {
         var data = {
             action: 'ontelegramauth',
@@ -138,6 +146,7 @@ function onTelegramAuth(user) {
     }
 
 
+    {# TO_DO вынести логику в шаблоны форм на беке, а не через JS переобходить #}
     document.addEventListener('DOMContentLoaded', function() {
         // Получаем все формы на странице
         const forms = document.querySelectorAll('form');
diff --git a/wp-content/themes/cosmopet/templates/form-coupon.twig b/wp-content/themes/cosmopet/templates/form-coupon.twig
index b287952..5e70d23 100644
--- a/wp-content/themes/cosmopet/templates/form-coupon.twig
+++ b/wp-content/themes/cosmopet/templates/form-coupon.twig
@@ -1,5 +1,6 @@
 {% if fn('wc_coupons_enabled') %}
 
+    {# TO_DO перенести в компоненты модуля форм #}
     {% set applied_coupons = fn('WC').cart.get_applied_coupons %}
     {% set has_coupon = applied_coupons is not empty %}
     {% set first_coupon = has_coupon ? applied_coupons[0] : '' %}