Changeset 2916256

Timestamp:

05/23/2023 08:53:09 AM (3 years ago)

Author:

ryviu

Message:

Update Ryviu Short Code

Location:

ryviu/trunk/includes

Files:

• functions.php (modified) (2 diffs)
• settings.php (modified) (5 diffs)

ryviu/trunk/includes/functions.php

@@ -697 +697 @@
 // Total shortcode
 
+function ryviu_widget_total_func( $atts ) {
+    $a = shortcode_atts( array(
+        'product_id' => 0
+    ), $atts );
+
+    ob_start();
+    
+    ryviu_widget_rating_total();
+    
+    return ob_get_clean();
+}
 add_shortcode( 'ryviu_widget_total', 'ryviu_widget_total_func' );
 
-function ryviu_widget_total_func( $atts ) {
-    $atts = shortcode_atts( array(
-        'product_id' => 0,
+// Reviews shortcode
+
+function ryviu_widget_sc( $atts ) {
+    $a = shortcode_atts( array(
+        'product_id' => 0
     ), $atts );
 
-    ryviu_widget_rating_total();
-}
-
-// Reviews shortcode
-
+    ob_start();
+    
+    ryviu_product_display_review();
+    
+    return ob_get_clean();
+}
 add_shortcode( 'ryviu_widget', 'ryviu_widget_sc' );
 
-function ryviu_widget_sc( $atts ) {
-    $atts = shortcode_atts( array(
-        'product_id' => 0,
+// Collection shortcode
+
+function ryviu_widget_colection_func( $atts ) {
+    $a = shortcode_atts( array(
+        'product_id' => 0
     ), $atts );
 
-    ryviu_product_display_review();
-}
-
-// Collection shortcode
-
+    ob_start();
+    
+    ryviu_widget_rating_total_in_product_category();
+    
+    return ob_get_clean();
+}
 add_shortcode( 'ryviu_widget_colection', 'ryviu_widget_colection_func' );
 
-function ryviu_widget_colection_func( $atts ) {
-    $atts = shortcode_atts( array(
-        'product_id' => 0,
-    ), $atts );
-
-    ryviu_widget_rating_total_in_product_category();
-}
-
 // Question and answer shortcode
-
-add_shortcode( 'ryviu_question_and_answer', 'question_and_answer_func' );
 
 function question_and_answer_func( $atts ) {
@@ -739 +746 @@
         'product_id' => 0,
     ), $atts );
+    ob_start();
 
     ryviu_add_questions_answers_section();
-}
+
+    return ob_get_clean();
+}
+
+add_shortcode( 'ryviu_question_and_answer', 'question_and_answer_func' );

ryviu/trunk/includes/settings.php

@@ -99 +99 @@
         );
 
-        add_settings_section(
-            'stars_section_id', // ID
-            'Star rating', // Title
-            array( $this, 'print_stars_info' ), // Callback
-            'ryviu-setting-admin' // Page
-        );
-
-        foreach ($this->star_rating_settings() as $field) {
-            add_settings_field(
-                $field['name'], // name
-                $field['title'], // Title
-                array( $this, $field['name'].'_callback' ), // Callback
-                'ryviu-setting-admin', // Page
-                'stars_section_id' // Section
-            );
-        }
-
-        add_settings_section(
-            'ryviu_widget_id', // ID
-            'Ryviu widget', // Title
-            array( $this, 'print_reviews_info' ), // Callback
-            'ryviu-setting-admin' // Page
-        );
-
-        foreach ($this->reviews_widget_settings() as $field) {
-            add_settings_field(
-                $field['name'], // name
-                $field['title'], // Title
-                array( $this, $field['name'].'_callback' ), // Callback
-                'ryviu-setting-admin', // Page
-                'ryviu_widget_id' // Section
-            );
-        }
-
-        add_settings_section(
-            'question_widget_id', // ID
-            'Question and answer', // Title
-            array( $this, 'print_question_info' ), // Callback
-            'ryviu-setting-admin' // Page
-        );
-
-        foreach ($this->questions_and_answer_settings() as $field) {
-            add_settings_field(
-                $field['name'], // name
-                $field['title'], // Title
-                array( $this, $field['name'].'_callback' ), // Callback
-                'ryviu-setting-admin', // Page
-                'question_widget_id' // Section
-            );
-        }
 
         add_settings_section(
             'general_id', // ID
-            'Other settings', // Title
+            'Ryviu settings', // Title
             array( $this, 'print_section_info' ), // Callback
             'ryviu-setting-admin' // Page
@@ -167 +117 @@
         }
     }
-    public function star_rating_settings(){
+   
+    public function general_settings(){
         $fields = [
             'position_display_widget' => 'Star rating on product page',
             'show_average_rating' => 'Show average rating',
             'position_display_widget_in_loop' => 'Star rating on collection page',
-        ];
-    
-        return array_map(function($name, $title) {
-            return ['name' => $name, 'title' => $title];
-        }, array_keys($fields), array_values($fields));
-    }
-    public function general_settings(){
-        $fields = [
+            'position_display' => 'Review box on product page',
+            'custom_tab_title' => 'Title reviews tab',
+            'active_reviews_tab' => 'Default active review tab',
+            'one_column_mobile' => '1 column on mobile',
+            'element_trigger_click' => 'Title reviews tab HTML',
+            'question_and_answer' => 'Question and Answer',
+            'custom_question_tab_title' => 'Title Question & Answer tab',
             'wordpress_theme' => 'Wordpress Theme',
             'data_rocket_status' => 'Cloudfare CDN & Data Rocket',
@@ -189 +139 @@
     }
 
-    public function reviews_widget_settings(){
-        $fields = [
-            'position_display' => 'Review box on product page',
-            'custom_tab_title' => 'Title reviews tab',
-            'active_reviews_tab' => 'Default active review tab',
-            'one_column_mobile' => '1 column on mobile',
-            'element_trigger_click' => 'Title reviews tab HTML',
-        ];
-    
-        return array_map(function($name, $title) {
-            return ['name' => $name, 'title' => $title];
-        }, array_keys($fields), array_values($fields));
-    }
-
-    public function questions_and_answer_settings(){
-        $fields = [
-            'question_and_answer' => 'Question and Answer',
-            'custom_question_tab_title' => 'Title Question & Answer tab',
-        ];
-    
-        return array_map(function($name, $title) {
-            return ['name' => $name, 'title' => $title];
-        }, array_keys($fields), array_values($fields));
-    }
-
     public function check_selected($val1 = '1', $val2 = '2'){
         if($val1 == $val2){
@@ -230 +155 @@
         $new_input = array();
 
-        $star_rating_settings = $this->star_rating_settings();
-        $general_settings = $this->general_settings();
-        $reviews_widget_settings = $this->reviews_widget_settings();
-        $questions_and_answer_settings = $this->questions_and_answer_settings();
-
-        $fields_setting = array_merge($star_rating_settings, $general_settings, $reviews_widget_settings, $questions_and_answer_settings);
-
+        $fields_setting = $this->general_settings();
 
         $fields_setting[] = array(
@@ -262 +181 @@
      */
     public function print_section_info(){
-        print '';
+        print 'Enter your settings below:';
     }