feat(shop): category filter bar + sort/load-more 1:1 UX
Port zibll hierarchical cat tabs, multi-metric sort with price toggle, skeleton/empty states, and REST archive payload (header/html/paginate) while reusing product-card template for AJAX HTML.
This commit is contained in:
kate522 committed
1 parent
e2587ca3a0
commit
433b7cb3a6
9 files changed
+828
-273
No files matched your search
+163
-10
@@ -57,10 +57,39 @@ trait Part1 {
|
||||
$shop_settings = class_exists('\AKSRT\Settings\Settings') ? \AKSRT\Settings\Settings::get_shop_settings() : [];
|
||||
$list = is_array($shop_settings['list'] ?? null) ? $shop_settings['list'] : [];
|
||||
$per_page = max(4, min(100, (int) ($args['per_page'] ?? ($list['count'] ?? 12))));
|
||||
$orderby = sanitize_key((string) ($args['orderby'] ?? ($list['orderby'] ?? 'date')));
|
||||
if (!in_array($orderby, ['date', 'sales', 'price_asc', 'price_desc', 'comments', 'modified'], true)) {
|
||||
$orderby = 'date';
|
||||
|
||||
// Normalize orderby aliases (zibll + legacy AKSRT keys).
|
||||
$orderby_raw = sanitize_key((string) ($args['orderby'] ?? ($list['orderby'] ?? 'date')));
|
||||
$order = strtoupper(sanitize_key((string) ($args['order'] ?? '')));
|
||||
if (!in_array($order, ['ASC', 'DESC'], true)) {
|
||||
$order = '';
|
||||
}
|
||||
// Legacy split price keys → price + order.
|
||||
if ($orderby_raw === 'price_asc') {
|
||||
$orderby_raw = 'price';
|
||||
$order = 'ASC';
|
||||
} elseif ($orderby_raw === 'price_desc') {
|
||||
$orderby_raw = 'price';
|
||||
$order = 'DESC';
|
||||
} elseif ($orderby_raw === 'sales_volume') {
|
||||
$orderby_raw = 'sales';
|
||||
} elseif ($orderby_raw === 'zibpay_price') {
|
||||
$orderby_raw = 'price';
|
||||
} elseif ($orderby_raw === 'comments') {
|
||||
$orderby_raw = 'score';
|
||||
}
|
||||
$allowed_orderby = ['date', 'views', 'favorite_count', 'score', 'sales', 'price', 'modified'];
|
||||
if (!in_array($orderby_raw, $allowed_orderby, true)) {
|
||||
$orderby_raw = 'date';
|
||||
}
|
||||
if ($orderby_raw === 'price' && $order === '') {
|
||||
$order = 'ASC';
|
||||
}
|
||||
if ($order === '' && $orderby_raw !== 'price') {
|
||||
$order = 'DESC';
|
||||
}
|
||||
$orderby = $orderby_raw;
|
||||
|
||||
$paging = sanitize_key((string) ($args['paging'] ?? ($list['paging'] ?? 'number')));
|
||||
if (!in_array($paging, ['number', 'ajax'], true)) {
|
||||
$paging = 'number';
|
||||
@@ -76,12 +105,14 @@ trait Part1 {
|
||||
'max_pages' => 0,
|
||||
'page' => $paged,
|
||||
'orderby' => $orderby,
|
||||
'order' => $order,
|
||||
'paging' => $paging,
|
||||
'ias_s' => $ias_s,
|
||||
'ias_max' => $ias_max,
|
||||
'per_page' => $per_page,
|
||||
'style' => $style,
|
||||
'sales' => is_array($shop_settings['sales'] ?? null) ? $shop_settings['sales'] : [],
|
||||
'filter' => null,
|
||||
];
|
||||
|
||||
if (!in_array($taxonomy, ['aksrt_product_cat', 'aksrt_product_tag'], true) && empty($args['allow_all'])) {
|
||||
@@ -93,7 +124,7 @@ trait Part1 {
|
||||
'posts_per_page' => $per_page,
|
||||
'paged' => $paged,
|
||||
'post_status' => 'publish',
|
||||
'order' => 'DESC',
|
||||
'order' => $order ?: 'DESC',
|
||||
'orderby' => 'date',
|
||||
];
|
||||
|
||||
@@ -114,16 +145,21 @@ trait Part1 {
|
||||
$query_args['meta_key'] = '_aksrt_sales';
|
||||
$query_args['orderby'] = 'meta_value_num';
|
||||
$query_args['order'] = 'DESC';
|
||||
} elseif ($orderby === 'price_asc') {
|
||||
} elseif ($orderby === 'price') {
|
||||
$query_args['meta_key'] = '_aksrt_price';
|
||||
$query_args['orderby'] = 'meta_value_num';
|
||||
$query_args['order'] = 'ASC';
|
||||
} elseif ($orderby === 'price_desc') {
|
||||
$query_args['meta_key'] = '_aksrt_price';
|
||||
$query_args['order'] = $order === 'ASC' ? 'ASC' : 'DESC';
|
||||
} elseif ($orderby === 'favorite_count') {
|
||||
$query_args['meta_key'] = '_aksrt_favorite_count';
|
||||
$query_args['orderby'] = 'meta_value_num';
|
||||
$query_args['order'] = 'DESC';
|
||||
} elseif ($orderby === 'comments') {
|
||||
$query_args['orderby'] = 'comment_count';
|
||||
} elseif ($orderby === 'views') {
|
||||
$query_args['meta_key'] = '_aksrt_views';
|
||||
$query_args['orderby'] = 'meta_value_num';
|
||||
$query_args['order'] = 'DESC';
|
||||
} elseif ($orderby === 'score') {
|
||||
$query_args['meta_key'] = '_aksrt_score_average';
|
||||
$query_args['orderby'] = 'meta_value_num';
|
||||
$query_args['order'] = 'DESC';
|
||||
} elseif ($orderby === 'modified') {
|
||||
$query_args['orderby'] = 'modified';
|
||||
@@ -138,6 +174,11 @@ trait Part1 {
|
||||
}
|
||||
wp_reset_postdata();
|
||||
|
||||
$filter = null;
|
||||
if ($taxonomy === 'aksrt_product_cat' && $term) {
|
||||
$filter = $this->build_product_cat_filter((int) $term->term_id, $orderby, $order);
|
||||
}
|
||||
|
||||
return [
|
||||
'products' => $products,
|
||||
'term' => $term ? [
|
||||
@@ -146,17 +187,129 @@ trait Part1 {
|
||||
'description' => (string) $term->description,
|
||||
'count' => (int) $term->count,
|
||||
'taxonomy' => $taxonomy,
|
||||
'parent' => (int) $term->parent,
|
||||
'url' => get_term_link($term),
|
||||
] : null,
|
||||
'total' => (int) $query->found_posts,
|
||||
'max_pages' => (int) $query->max_num_pages,
|
||||
'page' => $paged,
|
||||
'orderby' => $orderby,
|
||||
'order' => $order,
|
||||
'paging' => $paging,
|
||||
'ias_s' => $ias_s,
|
||||
'ias_max' => $ias_max,
|
||||
'per_page' => $per_page,
|
||||
'style' => $style,
|
||||
'sales' => is_array($shop_settings['sales'] ?? null) ? $shop_settings['sales'] : [],
|
||||
'filter' => $filter,
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Hierarchical cat filter data (zibll zib_shop_get_cat_filter).
|
||||
*
|
||||
* @return array{siblings:array<int,array>,children:array<int,array>,parent_id:int,mode:string}
|
||||
*/
|
||||
public function build_product_cat_filter(int $cat_id, string $orderby = 'date', string $order = 'DESC'): array {
|
||||
$taxonomy = 'aksrt_product_cat';
|
||||
$cat = get_term($cat_id, $taxonomy);
|
||||
if (!$cat || is_wp_error($cat)) {
|
||||
return ['siblings' => [], 'children' => [], 'parent_id' => 0, 'mode' => 'flat', 'orderby' => $orderby, 'order' => $order];
|
||||
}
|
||||
|
||||
$map_term = static function ($t) use ($orderby, $order): array {
|
||||
$url = get_term_link($t);
|
||||
if (!is_wp_error($url) && $orderby) {
|
||||
$url = add_query_arg(array_filter([
|
||||
'orderby' => $orderby,
|
||||
'order' => $orderby === 'price' ? $order : null,
|
||||
]), $url);
|
||||
}
|
||||
return [
|
||||
'id' => (int) $t->term_id,
|
||||
'name' => (string) $t->name,
|
||||
'url' => is_wp_error($url) ? '' : (string) $url,
|
||||
'count' => (int) $t->count,
|
||||
];
|
||||
};
|
||||
|
||||
$parent_id = (int) $cat->parent;
|
||||
$children = get_terms([
|
||||
'taxonomy' => $taxonomy,
|
||||
'parent' => $cat_id,
|
||||
'hide_empty' => false,
|
||||
]);
|
||||
if (is_wp_error($children)) {
|
||||
$children = [];
|
||||
}
|
||||
|
||||
if ($parent_id > 0) {
|
||||
$siblings = get_terms([
|
||||
'taxonomy' => $taxonomy,
|
||||
'parent' => $parent_id,
|
||||
'hide_empty' => false,
|
||||
]);
|
||||
} else {
|
||||
$siblings = get_terms([
|
||||
'taxonomy' => $taxonomy,
|
||||
'parent' => 0,
|
||||
'hide_empty' => false,
|
||||
]);
|
||||
}
|
||||
if (is_wp_error($siblings)) {
|
||||
$siblings = [];
|
||||
}
|
||||
|
||||
$mode = 'siblings';
|
||||
$parent_terms = [];
|
||||
if (empty($children) && $parent_id > 0) {
|
||||
$parent_term = get_term($parent_id, $taxonomy);
|
||||
if ($parent_term && !is_wp_error($parent_term) && (int) $parent_term->parent > 0) {
|
||||
$parent_terms = get_terms([
|
||||
'taxonomy' => $taxonomy,
|
||||
'parent' => (int) $parent_term->parent,
|
||||
'hide_empty' => false,
|
||||
]);
|
||||
if (is_wp_error($parent_terms)) {
|
||||
$parent_terms = [];
|
||||
}
|
||||
$mode = 'parent_siblings';
|
||||
} elseif ($parent_id > 0) {
|
||||
$parent_terms = get_terms([
|
||||
'taxonomy' => $taxonomy,
|
||||
'parent' => 0,
|
||||
'hide_empty' => false,
|
||||
]);
|
||||
if (is_wp_error($parent_terms)) {
|
||||
$parent_terms = [];
|
||||
}
|
||||
$mode = 'parent_siblings';
|
||||
}
|
||||
} elseif (!empty($children)) {
|
||||
$mode = 'with_children';
|
||||
}
|
||||
|
||||
$parent_url = '';
|
||||
if ($parent_id > 0) {
|
||||
$plink = get_term_link($parent_id, $taxonomy);
|
||||
if (!is_wp_error($plink)) {
|
||||
$parent_url = add_query_arg(array_filter([
|
||||
'orderby' => $orderby,
|
||||
'order' => $orderby === 'price' ? $order : null,
|
||||
]), $plink);
|
||||
}
|
||||
}
|
||||
|
||||
return [
|
||||
'mode' => $mode,
|
||||
'current_id' => $cat_id,
|
||||
'parent_id' => $parent_id,
|
||||
'parent_url' => $parent_url,
|
||||
'siblings' => array_map($map_term, empty($parent_terms) ? $siblings : $parent_terms),
|
||||
'children' => array_map($map_term, $mode === 'with_children' ? $children : ($mode === 'parent_siblings' ? $siblings : [])),
|
||||
'child_tabs' => array_map($map_term, $children),
|
||||
'orderby' => $orderby,
|
||||
'order' => $order,
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
@@ -85,7 +85,8 @@ class ProductReview {
|
||||
update_comment_meta($comment_id, '_aksrt_review_images', $images);
|
||||
}
|
||||
|
||||
$this->refresh_product_scores($product_id);
|
||||
$scores = $this->refresh_product_scores($product_id);
|
||||
update_post_meta($product_id, '_aksrt_score_average', (float) ($scores['average'] ?? $average));
|
||||
|
||||
if (class_exists('\AKSRT\Payment\OrderRepository')) {
|
||||
$order = \AKSRT\Payment\OrderRepository::get_instance()->get($order_number);
|
||||
|
||||
Reference in new issue
Block a user