merge conflict

.gitignore

@@ -71,6 +71,7 @@ wp-content/plugins/*
 *.tbk
 *.csv
 *.json
+!afc_fields.json
 *.BAK
 
 # GP | Dirs & files
@@ -84,6 +85,7 @@ timthumb_cache/
 webstat/
 .idea/
 .tmb/
+.well-known/
 .csscomb.json
 sftp-config.json
 bower.json

wp-content/themes/cosmopet/404.php

@@ -6,4 +6,4 @@
 $context = Timber::get_context();
 Timber::render('templates/404.twig', $context);
 
-?>
+?>

wp-content/themes/cosmopet/functions.php

@@ -16,6 +16,7 @@ require_once __DIR__ . '/temp-functions/blog-logic.php';
 require_once __DIR__ . '/temp-functions/filters-logic.php';
 require_once __DIR__ . '/temp-functions/custom-admin-panel-logic.php';
 require_once __DIR__ . '/temp-functions/login-logic.php';
+
 // include_module('forms');
 // include_module('shop');
 // include_module('profile');

wp-content/themes/cosmopet/global-functions/global-constaints.php

@@ -0,0 +1,11 @@
+<?php
+
+add_action('wp_head', function() {
+?>
+
+<script>
+    window.ajax_url = '<?php echo admin_url('admin-ajax.php') ?>';
+</script>
+
+<?php
+}, 1);

wp-content/themes/cosmopet/global-functions/multisite-functions.php

@@ -1,15 +1,13 @@
 <?php
-
 /* Start | Работа с проверкой мультисайтовости и стендов */
 global $site_env;
-$site_env = new SiteEnvironment(); // глобальный объект выполняющий проверку по домену
-class SiteEnvironment
-{
-    public string $mode;
-    public string $region;
-    
-    public function __construct(string $host = null)
-    {
+$site_env = new SiteEnvironment();
+class SiteEnvironment {
+    public string $site_mode;
+    public string $site_region;
+    public bool $is_gp_test_mode;
+
+    public function __construct(string $host = null) {
         $map = [
             'cosmopet.ru' => ['mode' => 'production', 'region' => 'ru'],
             'cosmopet.ae' => ['mode' => 'production', 'region' => 'ae'],
@@ -17,63 +15,41 @@ class SiteEnvironment
             'cosmopet-test-ru.cp.good-production.xyz' => ['mode' => 'develope', 'region' => 'ru'],
             'cosmopet-test-ae.cp.good-production.xyz' => ['mode' => 'develope', 'region' => 'ae'],
         ];
-
         $host = strtolower($host ?: $_SERVER['SERVER_NAME']);
         $config = $map[$host] ?? ['mode' => 'develope', 'region' => 'unknown'];
-
         $this->site_mode = $config['mode'];
         $this->site_region = $config['region'];
+        $this->is_gp_test_mode = (isset($_GET['gp-test']) && $_GET['gp-test'] == '1') || (is_user_logged_in() && current_user_can('administrator'));
     }
-
 }
 
-
-
 add_filter('timber/twig', function (\Twig\Environment $twig) {
     global $site_env;
-    
     $twig->addGlobal('site_region', $site_env->site_region);
-    $twig->addGlobal('site_mode', $site_env->site_mode);
-    $twig->addGlobal('header_scripts', get_field('header_scripts', 'option')); // со страницы "Общих настроек контента ACF" 
+    $twig->addGlobal('site_env', $site_env);
+    $twig->addGlobal('header_scripts', get_field('header_scripts', 'option'));
     return $twig;
 });
 /* End | Работа с проверкой мультисайтовости и стендов */
 
+add_filter('woocommerce_currency_symbol', function($currency_symbol, $currency) {
+    return $currency === 'AED' ? 'AED' : $currency_symbol;
+}, 10, 2);
 
-
-add_filter('woocommerce_currency_symbol', 'change_aed_currency_symbol', 10, 2);
-
-function change_aed_currency_symbol($currency_symbol, $currency) {
-    if ($currency == 'AED') {
-        $currency_symbol = 'AED';
-    }
-    return $currency_symbol;
-}
-
-// Отключаем канонические ссылки и hreflang от Yoast SEO
 add_filter('wpseo_canonical', '__return_false');
-add_filter('wpseo_opengraph_url', '__return_false'); // Отключаем OG URL
-add_filter('wpseo_add_x_default_hreflang', '__return_false'); // Отключаем hreflang от Yoast
-add_filter('wpseo_disable_adjacent_rel_links', '__return_true'); // Отключаем соседние rel-ссылки
+add_filter('wpseo_opengraph_url', '__return_false');
+add_filter('wpseo_add_x_default_hreflang', '__return_false');
+add_filter('wpseo_disable_adjacent_rel_links', '__return_true');
 
-// Добавляем каноническую ссылку
-add_action('wp_head', 'custom_canonical_url', 5);
-function custom_canonical_url() {
+add_action('wp_head', function() {
     if (!is_admin()) {
-        // Защищаем от дублирования
         static $canonical_added = false;
-        if ($canonical_added) {
-            return;
-        }
+        if ($canonical_added) return;
         $canonical_added = true;
-
-        // Формируем текущий URL без лишних параметров
-        $current_url = trailingslashit(home_url($_SERVER['REQUEST_URI']));
-        // Удаляем возможные параметры запроса, если они не нужны
-        $current_url = strtok($current_url, '?');
+        $current_url = strtok(trailingslashit(home_url($_SERVER['REQUEST_URI'])), '?');
         echo '<link rel="canonical" href="' . esc_url($current_url) . '" />' . "\n";
     }
-}
+})
 
 
 /**
@@ -292,12 +268,26 @@ if ($site_env->site_mode == 'production' && $site_env->site_region == 'ae') {
 }
 
 
-// TO_DO: удалить, если не нужно
-// Отключаем кэширование для страниц товаров
-add_action('template_redirect', function() {
-    if (is_product()) {
-        header('Cache-Control: no-cache, no-store, must-revalidate');
-        header('Pragma: no-cache');
-        header('Expires: 0');
+add_action('wp_head', function() {
+    global $site_env;
+    $show_pixel = false;
+    
+    // Для продакшена
+    if ($site_env->site_mode === 'production' && $site_env->site_region === 'ae') {
+        $show_pixel = true;
     }
-});
+    
+    // Для тестовых стендов AE
+    if ($site_env->site_mode === 'develope' && $site_env->site_region === 'ae') {
+        $show_pixel = true;
+    }
+    
+    if ($show_pixel && !$site_env->is_gp_test_mode) {
+        $context = [
+            'pixel_event_type' => 'AddToCart', // или определите логику
+            'currency' => get_woocommerce_currency(),
+            // добавьте другие переменные при необходимости
+        ];
+        \Timber\Timber::render('templates/head-pixel-functions.twig', $context);
+    }
+});

wp-content/themes/cosmopet/modules/blog/components/main-page-block/assets/js/main-page-blog.js

@@ -0,0 +1,23 @@
+jQuery('.main-blog_tags-tag').on('click', function(){
+    var category = jQuery(this).data('category'); // Получаем значение data-category
+    jQuery('.main-blog_tags-tag').removeClass('active')
+    jQuery(this).addClass('active')
+    jQuery.ajax({
+        url: window.ajax_url, 
+        type: 'POST',
+        data: {
+            action: 'front_page_get_blog_posts',
+            category: category
+        },
+        beforeSend: function() {
+           
+        },
+        success: function(response) {
+           jQuery('.main-blog_wrapper').html(response)
+        },
+        error: function(error) {
+            // Обработка ошибок
+            console.error('Ошибка AJAX:', error);
+        }
+    });
+});

wp-content/themes/cosmopet/modules/blog/components/main-page-block/component-controller.php

@@ -0,0 +1,25 @@
+<?php
+include_component('blog', 'themes');
+add_filter('timber/context', function($context) {
+    $args = array(
+        'post_type' => 'post', 
+        'posts_per_page' => 5,
+        'post_status'    => 'publish', // Только опубликованные записи
+    );
+    $featured_query = new WP_Query($args);
+    $f_query = array();
+    $i = 0;
+    foreach($featured_query->posts as $item){
+        if ($i > 0){
+            $f_query[] = Timber::get_post($item, 'BlogPost');
+        }
+        else{
+            $featured_post = Timber::get_post($item, 'BlogPost');
+        }
+        $i++;
+    }
+
+    $context['blog_posts'] = $f_query;
+    $context['featured_post'] = $featured_post;
+    return $context;
+});

wp-content/themes/cosmopet/modules/blog/module-ajax-controller.php

@@ -44,3 +44,52 @@ add_action('wp_ajax_load_blog_posts', 'ajax_load_blog_posts');
 add_action('wp_ajax_nopriv_load_blog_posts', 'ajax_load_blog_posts'); 
 
 
+
+
+
+function ajax_front_page_get_blog_posts() {
+    $context = Timber::context();
+    $category = $_POST['category'];
+
+    $args = [
+        'post_type' => 'post',
+        'posts_per_page' => 5, // Adjust the number of posts per page
+        'paged' => intval($paged) + 1,
+        'post_status'    => 'publish', // Только опубликованные записи
+    ];
+    if (!empty($category)) {
+        $args['tax_query'] = [
+            [
+                'taxonomy' => 'category',
+                'field' => 'slug', // or 'term_id', 'name' depending on how you identify categories
+                'terms' => $category,
+            ],
+        ];
+    }
+    $featured_query = new WP_Query($args);
+
+    $f_query = array();
+    $i = 0;
+    foreach($featured_query->posts as $item){
+        if ($i > 0){
+            $f_query[] = Timber::get_post($item, 'BlogPost');
+        }
+        else{
+            $featured_post = Timber::get_post($item, 'BlogPost');
+        }
+        $i++;
+    }
+
+    $context['blog_posts'] = $f_query;
+    $context['featured_post'] = $featured_post;
+
+    $html = Timber::compile('/blog/blog-front-page-post-list_block.twig', $context); 
+    echo $html;
+    wp_die();
+}
+
+
+add_action('wp_ajax_front_page_get_blog_posts', 'ajax_front_page_get_blog_posts'); 
+add_action('wp_ajax_nopriv_front_page_get_blog_posts', 'ajax_front_page_get_blog_posts'); 
+
+

wp-content/themes/cosmopet/modules/forms/assets/css/forms.css

@@ -0,0 +1,27 @@
+.mform-offer input, .mform-offer textarea {
+    width: 100%!important;
+    padding: 12px 15px!important;
+    border: none!important;
+    border-radius: 20px!important;
+    font-size: 16px!important;
+    background-color: white!important;
+    font-family: inherit;
+}
+.mform-offer select{
+    font-size: 16px;
+    width: 100%;
+    padding: 12px 0;
+}
+
+.form-select-label {
+    width: 100%;
+    padding: 0px 15px;
+    border: none;
+    border-radius: 20px;
+    font-size: 16px;
+    background-color: white;
+}
+.mform-parthnership.mform .mform-content{
+    color: #fff;
+    background: radial-gradient(278.91% 196.13% at 128.36% -48.29%, #ee6868 0%, #569ef0 57.69%);
+}

wp-content/themes/cosmopet/modules/forms/module-ajax-controller.php

@@ -63,6 +63,51 @@ add_action('wp_ajax_nopriv_blogauth_form', function() {
 });
 
 
+add_action('wp_ajax_parthnership_form', function() {
+    $enabledHandlers = ['b24', 'email', 'tg']; 
+    $user_data = get_current_user_data();
+    $formData = json_decode($_POST['formData']);
+    $crmData = array(
+        'phone' => $formData['phone'],
+        'name' => $formData['name'],
+        'email' => $formData['email'],
+        'msg' => 'Вид партнерства: ' . $formData['parthner_type'] . ' ' . $formData['msg'],
+        'url' => $formData['url'],
+        'stage' => 'C4:NEW',
+        'fName' => 4,
+        'order_total' => 0,
+        'user_id' => $user_data['user_id'],
+        'method' => 'crm.deal.add',
+        'form_title' => 'Стать партнером',
+        'is_subscribe' => false,
+        'order_id' => '',
+    );
+    process_form($enabledHandlers, $crmData);
+});
+
+add_action('wp_ajax_nopriv_parthnership_form', function() {
+    $enabledHandlers = ['b24', 'email', 'tg']; 
+    $user_data = get_current_user_data();
+    $formData = json_decode($_POST['formData']);
+    $crmData = array(
+        'phone' => $formData['phone'],
+        'name' => $formData['name'],
+        'email' => $formData['email'],
+        'msg' => 'Вид партнерства: ' . $formData['parthner_type'] . ' ' . $formData['msg'],
+        'url' => $formData['url'],
+        'stage' => 'C4:NEW',
+        'fName' => 4,
+        'order_total' => 0,
+        'user_id' => $user_data['user_id'],
+        'method' => 'crm.deal.add',
+        'form_title' => 'Стать партнером',
+        'is_subscribe' => false,
+        'order_id' => '',
+    );
+    process_form($enabledHandlers, $crmData);
+});
+
+
 add_action('wp_ajax_contact_form', function() {
     $enabledHandlers = ['b24', 'email', 'tg']; 
     $user_data = get_current_user_data();

wp-content/themes/cosmopet/modules/layout/assets/css/gp-style-core.css

@@ -1,3 +1,10 @@
+@font-face {
+    font-family: "Craftwork Grotesk";
+    src: local("CraftworkGrotesk-Heavy"),
+      url("../fonts/craftwork/CraftworkGrotesk-Heavy.ttf") format("ttf");
+    font-weight: 900;
+}
+
 @font-face {
     font-family: "Craftwork Grotesk";
     src: local("Craftwork Grotesk Bold"),
@@ -160,6 +167,7 @@ body {
     font-size: 20px;
     font-weight: 400;
     line-height: 24px;
+    font-family: inherit;
 }
 
 .form-inp::placeholder {
@@ -167,7 +175,7 @@ body {
 }
 
 .form-inp:hover,
-.form-inp:focus {
+.form-inp:focus, .form-textarea:hover, .form-textarea:focus {
     border-color: var(--main_black);
 }
 
@@ -175,11 +183,11 @@ body {
     height: 96px;
     width: 100%;
     resize: none;
-    background: var(--main_white) !important;
-    border: 1px solid var(--placeholder) !important;;
+    background: var(--main_white);
+    border: 1px solid var(--placeholder);
     padding: 12px 16px;
     border-radius: 20px;
-    color: var(--main_black) !important;
+    color: var(--main_black);
     font-size: 20px;
     font-weight: 400;
     line-height: 24px;
@@ -379,14 +387,6 @@ textarea{
     max-width: 380px;
   }
   
-  .modal-offer input, textarea {
-    width: 100%!important;
-    padding: 12px 15px!important;
-    border: none!important;
-    border-radius: 20px!important;
-    font-size: 16px!important;
-    background-color: white!important;
-  }
   
   /* Контейнер для текстового поля и изображения автора */
   .message-container {
@@ -635,7 +635,6 @@ textarea{
   height: 100%;
 
   overflow: hidden;
-  transition: width .4s ease-out;
 }
 .modal__item{
   height: 100%;
@@ -2024,92 +2023,12 @@ textarea{
     margin-left: auto;
 }
 
-.about_slider .prev, .about_slider .next {
-    position: absolute;
-    top: 50%;
-    transform: translateY(-50%);
-    cursor: pointer;
-    z-index: 99;
-    background-color: unset;
-}
-
-.about_slider .next {
-    right: 29vw;
-}
-
-.about_slider .prev {
-    left: 29vw;
-}
-
-.about_slider .carousel-item {
-    height: 546px;
-    padding: 35px 50px 25px 50px;
-    padding: 50px 53px;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    /* background: var(--creme-white, #F4F1F0); */
-    background: #ffffff30;
-    backdrop-filter: blur(6px);
-    z-index: 1;
-    box-shadow: -2px 5px 22.9px 0px rgba(0, 0, 0, 0.25);
-}
-
-.about_slider .swiper-slide-active {
-    backdrop-filter: blur(6px);
-    width: 429px!important;
-    z-index: 3;
-}
-
-.about_slider .carousel-item img {
-    width: auto;
-}
-
-.about_slider .slide_info {
-    display: flex;
-    flex-direction: column;
-    gap: 15px;
-}
-
-.about_slider .carousel-item::after {
-    content: '';
-    background-image: url(/wp-content/themes/cosmopet/static/front-page/img/border.png);
-    background-size: cover;
-    /* background: linear-gradient(21.69deg, #F44242 23.69%, #569EF0 66.57%); */
-    display: block;
-    position: absolute;
-    width: calc(100% + 4px);
-    height: calc(100% + 4px);
-    border-radius: 60px;
-    top: -2px;
-    left: -2px;
-    z-index: -2;
-    transform: translateZ(-1px);
-}
-
-.about_slider .slide_title {
-    text-transform: uppercase;
-    font-size: 24px;
-    font-weight: 700;
-    line-height: 28.8px;
-    color: #121212;
-}
-
-.about_slider .slide_text {
-    font-size: 20px;
-    font-weight: 500;
-    line-height: 24px;
-    color:#121212;
-}
 
 .discount_block .discount_cosmodog {
     margin-top: 60px;
 }
 
-.about_slider .carousel .carousel-item {
-    border-radius: 60px!important;
-}
+
 
 .about_slider {
     position: relative;
@@ -2122,27 +2041,10 @@ textarea{
   width: max-content;
 }
 
-.marketplace {
-  overflow: hidden!important;
-}
-
-.marketplace__swiper {
-  overflow: visible!important;
-}
-
 .about_us-title {
   font-weight: 700;
 }
 
-.modal__aside {
-    width: 20vw;
-    right: -20vw;
-    transition: right 0.3s ease;
-}
-
-.modal__aside.active {
-    right: 0;
-}
 
 .button.loading::before {
     content: '';
@@ -2311,3 +2213,8 @@ textarea{
         display: flex !important;
     }
 }
+
+
+a, button{
+  cursor: pointer;
+}

wp-content/themes/cosmopet/modules/popup/assets/css/gp-style-desktop.css

@@ -7,8 +7,10 @@
     transition: transform 0.3s ease-in-out, opacity 0.3s ease-in-out;
     background: white; /* Или твой стиль фона */
     z-index: 1000;
+    min-width: max-content;
 }
 
+
 .modal__aside.active {
     transform: translateX(0); /* Показываем, сдвигая влево */
 }
@@ -37,13 +39,15 @@
 @media (max-width: 720px) {
     .modal__aside {
         width: 100% !important; /* Полная ширина на мобильных */
+        min-width: 100%;
     }
 }
 
 @media (min-width: 721px) {
     .modal__aside {
-        min-width: 400px; /* Минимальная ширина или твоя фиксированная ширина */
+        min-width: max-content; /* Минимальная ширина или твоя фиксированная ширина */
         width: auto;
+        width: 400px;
     }
 }
 

wp-content/themes/cosmopet/modules/popup/assets/js/modal.js

@@ -95,6 +95,22 @@ window.addEventListener('resize', () => {
     modalClose('.modal__close, .m__close');
 });
 
+    let width = window.innerWidth; // Используем innerWidth для актуальной ширины окна
+    let modalItem = document.querySelectorAll('.modal__item');
+    let aside = document.querySelector('.modal__aside');
+
+    modalItem.forEach(modal => {
+        if (modal.classList.contains('active')) {
+            if (width <= 720) {
+                aside.style.width = '100%'; // Полная ширина на мобильных
+            } else {
+                let openAside = document.querySelector('.modal__item.active'),
+                    newWidth = openAside.clientWidth;
+                aside.style.width = newWidth < 400 ? '400px' : `${newWidth}px`;
+            }
+        }
+  });
+
 jQuery('[data-pname]').on('click', function(){
     jQuery('#sub_product_name').val(jQuery(this).data('pname'))
 })
@@ -153,4 +169,10 @@ function showModal(modalClass) {
         modal.style.display = 'none';
       }
     });
-});
+});
+
+
+jQuery('.main-about_banner-overlay__list-item').on('click', function(){
+  showModal('modal-parthnership');
+  jQuery('#parthnership-select').val(jQuery(this).data('dir'));
+})

wp-content/themes/cosmopet/modules/shop/components/product-card/assets/css/product-card.css

@@ -0,0 +1,44 @@
+.main-food_products-cardbottom-btn .spinner{
+    height: 17px;
+    width: 17px;
+}
+
+.main-food_products-cardbottom-btn.loading::after{
+    opacity: 0;
+}
+
+.main-food_products-card-title{
+    width: 100%;
+}
+
+.main-food_products-card__weight{
+    padding: 8px;
+    border-radius: 36px;
+    background-color: #fff;
+    display: flex;
+    justify-content: space-around;
+    margin-bottom: 10px;
+}
+.main-food_products-card__weight:empty{
+    display: none;
+}
+.main-food_products-card__weight-item{
+    font-weight: 600;
+    font-size: 16px;
+    text-transform: uppercase;
+    color: rgba(18, 18, 18, 0.75);
+    border-radius: 100px;
+    padding: 2px 8px;
+}
+
+
+.main-food_products-card__weight-item.active{
+    border: 2px solid var(--accent-color);
+    color: var(--accent-color);
+}
+
+@media (max-width: 640px) {
+    .main-food_products-card__weight{
+        display: none;
+    }
+}

wp-content/themes/cosmopet/modules/shop/components/product-card/assets/js/product-card.js

@@ -0,0 +1,57 @@
+jQuery(document).ready(function() {
+
+      //productswiper
+   var productSwiper = new Swiper('.main-food_products-card-slider', {
+        effect: 'fade',
+        fadeEffect: { crossFade: true },
+        loop: true,
+        pagination: {
+            el: '.swiper-dots',
+            clickable: true,
+            bulletClass: 'swiper-pagination-bullet',
+            bulletActiveClass: 'swiper-pagination-bullet-active',
+        },
+    });
+
+  jQuery('[data-image-set]').on('click', function() {
+    // Получаем родительский элемент карточки продукта
+    var productCard = jQuery(this).closest('.main-food_products-card');
+    jQuery(productCard).find('.main-food_products-card__weight-item').removeClass('active')
+    jQuery(this).addClass('active')
+    // Получаем массив изображений из data-атрибута
+    var images = jQuery(this).data('image-set');
+    console.log(images)
+    // Находим слайдер внутри этой карточки
+    var slider = productCard.find('.main-food_products-card-slider .swiper-wrapper');
+    // Очищаем текущие слайды
+    slider.empty();
+    // Добавляем новые слайды с изображениями
+    jQuery.each(images, function(index, image) {
+      slider.append(
+        '<div class="swiper-slide">' +
+          '<div class="main-food_products-card-img">' +
+            '<img src="' + image + '" alt="' + productCard.find('.product-title').text() + '">' +
+          '</div>' +
+        '</div>'
+      );
+    });
+    slider.append(
+        '<div class="swiper-dots"></div>'
+    );
+    productSwiper = new Swiper('.main-food_products-card-slider', {
+        effect: 'fade',
+        fadeEffect: { crossFade: true },
+        loop: true,
+        pagination: {
+            el: '.swiper-dots',
+            clickable: true,
+            bulletClass: 'swiper-pagination-bullet',
+            bulletActiveClass: 'swiper-pagination-bullet-active',
+        },
+    });
+    jQuery(productCard).find('.main-food_products-card-title').html(jQuery(this).data('title'))
+    jQuery(productCard).find('.main-food_products-card-bottom-price').html(jQuery(this).data('product_price'))
+    jQuery(productCard).find('.main-food_products-cardbottom-btn').attr('data-product_id', jQuery(this).data('product_id'))
+    jQuery(productCard).find('.main-food_products-cardbottom-btn').attr('href', '?add-to-cart=' + jQuery(this).data('product_id'))
+    });
+});