Good-Production
/
cosmopet-architecture
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Task:6787 | Переработка фильтра, правка стилей

Browse Source
pull/34/head^2
Максим Максимов 2 months ago
parent a4f88d789c
commit d651b4f03a
2 changed files with 106 additions and 86 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 5
      wp-content/themes/cosmopet/modules/popup/assets/css/gp-style-desktop.css
  2. 187
      wp-content/themes/cosmopet/modules/shop/components/catalog/component-controller.php

5
wp-content/themes/cosmopet/modules/popup/assets/css/gp-style-desktop.css
Unescape View File

@ -28,6 +28,11 @@
filter: blur(0);
}
.wpfFilterLayoutVer, .wpfFilterLayoutHor {
display: grid;
grid-template-columns: repeat(2, 1fr);
}
@media (max-width: 720px) {
.modal__aside {
width: 100% !important; /* Полная ширина на мобильных */

187
wp-content/themes/cosmopet/modules/shop/components/catalog/component-controller.php
Unescape View File

@ -1,17 +1,26 @@
<?php
wp_enqueue_script( 'shop_scripts', get_template_directory_uri() . '/woocommerce/assets/js/gp-main.js', 'jquery', '', true);
wp_enqueue_style( 'shop_styles_core', get_template_directory_uri() . '/woocommerce/assets/css/gp-style-core.css');
wp_enqueue_style( 'shop_styles_desktop', get_template_directory_uri() . '/woocommerce/assets/css/gp-style-desktop.css');
wp_enqueue_style( 'shop_styles_tablet', get_template_directory_uri() . '/woocommerce/assets/css/gp-style-tablet.css');
wp_enqueue_style( 'shop_styles_mobile', get_template_directory_uri() . '/woocommerce/assets/css/gp-style-mobile.css');
wp_enqueue_style( 'shop_styles_order', get_template_directory_uri() . '/woocommerce/assets/css/gp-style-order.css');
wp_enqueue_style( 'shop_styles_ultra', get_template_directory_uri() . '/woocommerce/assets/css/gp-style-ultra.css');
function get_active_woobewoo_filters_for_twig() {
wp_enqueue_script('shop_scripts', get_template_directory_uri() . '/woocommerce/assets/js/gp-main.js', ['jquery'], '', true);
wp_enqueue_style('shop_styles_core', get_template_directory_uri() . '/woocommerce/assets/css/gp-style-core.css');
wp_enqueue_style('shop_styles_desktop', get_template_directory_uri() . '/woocommerce/assets/css/gp-style-desktop.css');
wp_enqueue_style('shop_styles_tablet', get_template_directory_uri() . '/woocommerce/assets/css/gp-style-tablet.css');
wp_enqueue_style('shop_styles_mobile', get_template_directory_uri() . '/woocommerce/assets/css/gp-style-mobile.css');
wp_enqueue_style('shop_styles_order', get_template_directory_uri() . '/woocommerce/assets/css/gp-style-order.css');
wp_enqueue_style('shop_styles_ultra', get_template_directory_uri() . '/woocommerce/assets/css/gp-style-ultra.css');
function get_active_woobewoo_filters_for_twig() {
$filters = [];
error_log('=== WooBeWoo: фильтры проверяются ===');
// Получаем все атрибуты WooCommerce
$attribute_taxonomies = wc_get_attribute_taxonomies();
$valid_taxonomies = [];
foreach ($attribute_taxonomies as $attr) {
$taxonomy = 'pa_' . $attr->attribute_name;
$valid_taxonomies[$taxonomy] = $attr->attribute_label;
}
error_log('→ Доступные таксономии атрибутов: ' . implode(', ', array_keys($valid_taxonomies)));
foreach ($_GET as $key => $value) {
error_log("Ключ: $key => " . print_r($value, true));
@ -19,25 +28,37 @@
$raw_taxonomy = str_replace('wpf_filter_', '', $key);
error_log("→ Обнаружен фильтр: $raw_taxonomy");
$slugs = is_array($value) ? $value : explode(',', $value);
$slugs = is_array($value) ? $value : explode('|', $value);
error_log("→ Slugs: " . implode(', ', $slugs));
// Попробуем с pa_ и без, в зависимости от существования таксономии
$taxonomy = taxonomy_exists('pa_' . $raw_taxonomy) ? 'pa_' . $raw_taxonomy : $raw_taxonomy;
foreach ($slugs as $slug) {
$term = get_term_by('slug', $slug, $taxonomy);
if ($term) {
error_log("✔ Найден термин: {$term->name} (ID: {$term->term_id}) в таксономии: $taxonomy");
error_log("→ Проверяемая таксономия: $taxonomy, существует: " . (taxonomy_exists($taxonomy) ? 'Да' : 'Нет'));
if (taxonomy_exists($taxonomy)) {
foreach ($slugs as $slug) {
$term = get_term_by('slug', $slug, $taxonomy);
if ($term) {
error_log("✔ Найден термин: {$term->name} (ID: {$term->term_id}) в таксономии: $taxonomy");
$filters[] = [
'id' => $term->term_id,
'name' => $term->name,
'slug' => $term->slug,
'taxonomy' => $taxonomy,
];
} else {
error_log("✖ Термин не найден: $slug в таксономии: $taxonomy");
}
}
} else {
error_log("→ Таксономия $taxonomy не существует, обрабатываем как кастомный фильтр");
foreach ($slugs as $slug) {
$filters[] = [
'id' => $term->term_id,
'name' => $term->name,
'slug' => $term->slug,
'taxonomy' => $taxonomy,
'id' => $slug,
'name' => ucfirst(str_replace('-', ' ', $slug)),
'slug' => $slug,
'taxonomy' => $raw_taxonomy,
];
} else {
error_log("✖ Термин не найден: $slug в таксономии: $taxonomy");
error_log("✔ Добавлен кастомный фильтр: $slug для $raw_taxonomy");
}
}
}
@ -50,73 +71,67 @@
return $filters;
}
$context = Timber::context();
$context['criteria_for_new_product'] = date('Y-m-d', strtotime('-30 days'));
$context['posts_per_page'] = 12;
$context = Timber::context();
//$context['posts'] = Timber::get_posts();
$context['criteria_for_new_product'] = date('Y-m-d', strtotime('-30 days'));
// Задаем количество постов для подзагрузки Ajax
$context['posts_per_page'] = 12;
$queried_object = get_queried_object();
$queried_object = get_queried_object();
if (is_product_category() || is_tax()) {
$term_id = $queried_object->term_id;
$context['category_type'] = 'product_cat';
$context['category_id'] = $term_id;
$context['category'] = get_term($term_id, 'product_cat');
$context['category_link'] = get_term_link($term_id, 'product_cat');
$context['category_title'] = single_term_title('', false);
}
if (is_tax()) {
$context['category_type'] = $queried_object->taxonomy;
$context['category'] = get_term($term_id, $context['category_type']);
$context['category_link'] = get_term_link($term_id, $context['category_type']);
$context['category_title'] = single_term_title('', false);
}
$args = array(
'post_type' => 'product',
'post_status' => 'publish',
'posts_per_page' => $context['posts_per_page'],
'paged' => 1,
'has_password' => FALSE
);
$count_args = array(
'post_type' => 'product',
'post_status' => 'publish',
'posts_per_page' => -1,
'has_password' => FALSE
);
if ($context['category_id'] != NULL) {
$categories = [
'tax_query' => array(
array(
'taxonomy' => $context['category_type'],
'terms' => $context['category_id'],
'operator' => 'IN'
),
array(
'taxonomy' => 'product_visibility',
'field' => 'slug',
'terms' => 'exclude-from-catalog',
'operator' => 'NOT IN'
)
)
];
$args = array_merge($args, $categories);
$count_args = array_merge($count_args, $categories);
}
if (is_product_category() || is_tax()) {
$term_id = $queried_object->term_id;
$context['category_type'] = 'product_cat';
$context['category_id'] = $term_id;
$context['category'] = get_term($term_id, 'product_cat');
$context['category_link'] = get_term_link($term_id, 'product_cat');
$context['category_title'] = single_term_title('', false);
}
$context['active_filters'] = get_active_woobewoo_filters_for_twig();
if (is_tax()) {
$context['category_type'] = $queried_object->taxonomy;
$context['category'] = get_term($term_id, $context['category_type']);
$context['category_link'] = get_term_link($term_id, $context['category_type']);
$context['category_title'] = single_term_title('', false);
}
$context['posts'] = Timber::get_posts($args);
$context['count'] = count(Timber::get_posts($count_args));
$context['sidebar_filters'] = Timber::get_widgets('sidebar_filters');
$args = [
'post_type' => 'product',
'post_status' => 'publish',
'posts_per_page' => $context['posts_per_page'],
'paged' => 1,
'has_password' => false,
];
$count_args = [
'post_type' => 'product',
'post_status' => 'publish',
'posts_per_page' => -1,
'has_password' => false,
];
if ($context['category_id'] != null) {
$categories = [
'tax_query' => [
[
'taxonomy' => $context['category_type'],
'terms' => $context['category_id'],
'operator' => 'IN',
],
[
'taxonomy' => 'product_visibility',
'field' => 'slug',
'terms' => 'exclude-from-catalog',
'operator' => 'NOT IN',
],
],
];
$args = array_merge($args, $categories);
$count_args = array_merge($count_args, $categories);
}
Timber::render('_pages/shop/archive-product.twig', $context);
$context['active_filters'] = get_active_woobewoo_filters_for_twig();
$context['posts'] = Timber::get_posts($args);
$context['count'] = count(Timber::get_posts($count_args));
$context['sidebar_filters'] = Timber::get_widgets('sidebar_filters');
Timber::render('_pages/shop/archive-product.twig', $context);
?>
Write Preview
Loading…
Cancel
Save