From 75a0780b597eb8c9b92875a2c0d7ae1ab08063b0 Mon Sep 17 00:00:00 2001 From: Tungnx Date: Mon, 15 Apr 2024 15:35:49 +0700 Subject: [PATCH] = 4.2.6.5 = ~ Tweak: load list course categories. --- .../Course/FilterCourseTemplate.php | 29 ++++++++++++------- package.json | 2 +- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/inc/TemplateHooks/Course/FilterCourseTemplate.php b/inc/TemplateHooks/Course/FilterCourseTemplate.php index 5e4bfd6a8..421fb1689 100644 --- a/inc/TemplateHooks/Course/FilterCourseTemplate.php +++ b/inc/TemplateHooks/Course/FilterCourseTemplate.php @@ -286,18 +286,19 @@ public function html_category( array $data = [] ): string { try { $this->check_param_url_has_lang( $data ); - $params_url = $data['params_url'] ?? []; - $data_selected = $params_url['term_id'] ?? ''; - $data_selected = explode( ',', $data_selected ); - $hide_count_zero = $data['hide_count_zero'] ?? 1; - $parent_cat_id = 0; + $params_url = $data['params_url'] ?? []; + $data_selected = $params_url['term_id'] ?? ''; + $data_selected = explode( ',', $data_selected ); + $data['data_selected'] = $data_selected; + $parent_cat_id = 0; if ( isset( $params_url['page_term_id_current'] ) ) { $category_current_id = $params_url['page_term_id_current']; $category_current = get_term_by( 'id', $category_current_id, LP_COURSE_CATEGORY_TAX ); if ( ! empty( $category_current ) ) { - $this->html_field_category( $category_current->term_id, $category_current->name, $data ); + $parent_cat_id = $category_current_id; + $content .= $this->html_field_category( $category_current->term_id, $category_current->name, $data ); } } @@ -305,11 +306,14 @@ public function html_category( array $data = [] ): string { ob_start(); $data['level_current'] = 0; $data['parent_term_id'] = $parent_cat_id; - $data['data_selected'] = $data_selected; $this->html_struct_categories( $data ); $content .= ob_get_clean(); - $content = $this->html_item( esc_html__( 'Categories', 'learnpress' ), $content ); + $html_wrapper = [ + '
' => '
', + ]; + $content = $this->html_item( esc_html__( 'Categories', 'learnpress' ), $content ); + $content = Template::instance()->nest_elements( $html_wrapper, $content ); } catch ( Throwable $e ) { error_log( __METHOD__ . ': ' . $e->getMessage() ); } @@ -347,8 +351,7 @@ public function html_struct_categories( array $args = [] ) { echo sprintf( '
', esc_attr( $class_wrapper ) ); foreach ( $terms as $term_id => $term_name ) { - echo '
'; - + echo sprintf( '
', esc_attr( $term_id ) ); echo $this->html_field_category( $term_id, $term_name, $args ); $args['level_current'] = $level_current + 1; @@ -402,11 +405,15 @@ public function html_field_category( int $category_id, string $category_name, ar 'label' => [ 'text_html' => $label ], 'count' => [ 'text_html' => $count ], 'end' => [ 'text_html' => '
' ], - ] + ], + $category_id, + $category_name, + $args ); ob_start(); Template::instance()->print_sections( $sections ); + return ob_get_clean(); } diff --git a/package.json b/package.json index f265c6a28..df7b0cfc6 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "dev-build": "npm run build && gulp styles && npm run dev", "release": "npm run build && npm run makepot && gulp styles && gulp release", "makepot:js": "wp-babel-makepot \"./assets/src/**/*.{js,jsx,ts,tsx}\" --ignore \"**/node_modules/**,**/test/**,**/*.d.ts\" --base \"./\" --dir \"./languages/strings\" --output \"./languages/learnpress-js.pot\"", - "makepot:cli": "wp i18n make-pot . languages/learnpress.pot --skip-audit --merge=languages/learnpress-js.pot --exclude=\"test,releases,build,tools,dist,node_modules,vendor,wordpress,\" --headers='{\"last-translator\":\"admin@email.com\",\"Report-Msgid-Bugs-To\":\"https://github.com/LearnPress/learnpress/issues\"}'", + "makepot:cli": "wp i18n make-pot . languages/learnpress.pot --skip-audit --merge=languages/learnpress-js.pot --exclude=\"test,releases,build,tools,dist,node_modules,vendor,wordpress,\"", "makepot": "npm rum makepot:js && npm run makepot:cli && gulp updatePot" }, "repository": {