| @@ -78,8 +78,9 @@ | ||
| 78 | 78 | $this->set_locale(); |
| 79 | 79 | $this->define_admin_hooks(); |
| 80 | 80 | $this->define_public_hooks(); |
| 81 | 81 | $this->define_integrations_hooks(); |
| 82 | + $this->define_custom_post_type_hooks(); | |
| 82 | 83 | |
| 83 | 84 | } |
| 84 | 85 | |
| 85 | 86 | /** |
| @@ -139,8 +140,14 @@ | ||
| 139 | 140 | * side of the site. |
| 140 | 141 | */ |
| 141 | 142 | require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-chart-builder-public.php'; |
| 142 | 143 | |
| 144 | + /** | |
| 145 | + * The class responsible for defining all functions for getting all custom post type functions | |
| 146 | + */ | |
| 147 | + require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-chart-builder-custom-post-type.php'; | |
| 148 | + | |
| 149 | + | |
| 143 | 150 | $this->loader = new Chart_Builder_Loader(); |
| 144 | 151 | |
| 145 | 152 | } |
| 146 | 153 | |
| @@ -207,8 +214,10 @@ | ||
| 207 | 214 | $this->loader->add_filter( 'ays_cb_chart_page_settings_contents_settings', $plugin_admin, 'settings_contents_animation_settings', 110, 2 ); |
| 208 | 215 | $this->loader->add_filter( 'ays_cb_chart_page_settings_contents_settings', $plugin_admin, 'settings_contents_live_chart_settings', 115, 2 ); |
| 209 | 216 | $this->loader->add_filter( 'ays_cb_chart_page_settings_contents_settings', $plugin_admin, 'settings_contents_export_options', 120, 2 ); |
| 210 | 217 | $this->loader->add_filter( 'ays_cb_chart_page_settings_contents_settings_chartjs', $plugin_admin, 'settings_contents_general_settings_chartjs', 50, 2 ); |
| 218 | + $this->loader->add_filter( 'ays_cb_chart_page_settings_contents_settings_chartjs', $plugin_admin, 'settings_contents_tooltip_settings_chartjs', 50, 2 ); | |
| 219 | + $this->loader->add_filter( 'ays_cb_chart_page_settings_contents_settings_chartjs', $plugin_admin, 'settings_contents_legend_settings_chartjs', 50, 2 ); | |
| 211 | 220 | |
| 212 | 221 | // Add Chart page styles contents |
| 213 | 222 | $this->loader->add_action( 'ays_cb_chart_page_styles_contents', $plugin_admin, 'ays_chart_page_styles_contents', 10, 3 ); |
| 214 | 223 | $this->loader->add_filter( 'ays_cb_chart_page_styles_contents_settings', $plugin_admin, 'settings_contents_chart_styles_settings', 50, 2 ); |
| @@ -214,8 +223,9 @@ | ||
| 214 | 223 | $this->loader->add_filter( 'ays_cb_chart_page_styles_contents_settings', $plugin_admin, 'settings_contents_chart_styles_settings', 50, 2 ); |
| 215 | 224 | $this->loader->add_filter( 'ays_cb_chart_page_styles_contents_settings', $plugin_admin, 'settings_contents_chart_area_styles_settings', 60, 2 ); |
| 216 | 225 | $this->loader->add_filter( 'ays_cb_chart_page_styles_contents_settings', $plugin_admin, 'settings_contents_title_styles_settings', 70, 2 ); |
| 217 | 226 | $this->loader->add_filter( 'ays_cb_chart_page_styles_contents_settings', $plugin_admin, 'settings_contents_description_styles_settings', 80, 2 ); |
| 227 | + $this->loader->add_filter( 'ays_cb_chart_page_styles_contents_settings_chartjs', $plugin_admin, 'settings_contents_chart_styles_settings_chartjs', 50, 2 ); | |
| 218 | 228 | $this->loader->add_filter( 'ays_cb_chart_page_styles_contents_settings_chartjs', $plugin_admin, 'settings_contents_title_styles_settings_chartjs', 70, 2 ); |
| 219 | 229 | $this->loader->add_filter( 'ays_cb_chart_page_styles_contents_settings_chartjs', $plugin_admin, 'settings_contents_description_styles_settings_chartjs', 80, 2 ); |
| 220 | 230 | |
| 221 | 231 | // Add Chart page advanced settings contents |
| @@ -224,8 +234,9 @@ | ||
| 224 | 234 | $this->loader->add_filter( 'ays_cb_chart_page_advanced_settings_contents_settings', $plugin_admin, 'settings_contents_slices_settings', 60, 2 ); |
| 225 | 235 | $this->loader->add_filter( 'ays_cb_chart_page_advanced_settings_contents_settings', $plugin_admin, 'settings_contents_series_settings', 70, 2 ); |
| 226 | 236 | $this->loader->add_filter( 'ays_cb_chart_page_advanced_settings_contents_settings', $plugin_admin, 'settings_contents_row_settings', 80, 2 ); |
| 227 | 237 | $this->loader->add_filter( 'ays_cb_chart_page_advanced_settings_contents_settings_chartjs', $plugin_admin, 'settings_contents_advanced_settings_chartjs', 50, 2 ); |
| 238 | + $this->loader->add_filter( 'ays_cb_chart_page_advanced_settings_contents_settings_chartjs', $plugin_admin, 'settings_contents_slices_settings_chartjs', 50, 2 ); | |
| 228 | 239 | |
| 229 | 240 | // Add Settings link to the plugin |
| 230 | 241 | $plugin_basename = plugin_basename( plugin_dir_path( __DIR__ ) . $this->plugin_name . '.php' ); |
| 231 | 242 | $this->loader->add_filter( 'plugin_action_links_' . $plugin_basename, $plugin_admin, 'add_action_links' ); |
| @@ -232,17 +243,17 @@ | ||
| 232 | 243 | |
| 233 | 244 | |
| 234 | 245 | // Admin AJAX action |
| 235 | 246 | $this->loader->add_action( 'wp_ajax_ays_chart_admin_ajax', $plugin_admin, 'ays_admin_ajax' ); |
| 236 | - $this->loader->add_action( 'wp_ajax_nopriv_ays_chart_admin_ajax', $plugin_admin, 'ays_admin_ajax' ); | |
| 247 | + // $this->loader->add_action( 'wp_ajax_nopriv_ays_chart_admin_ajax', $plugin_admin, 'ays_admin_ajax' ); | |
| 237 | 248 | $this->loader->add_action( 'wp_ajax_deactivate_plugin_option_cb', $plugin_admin, 'deactivate_plugin_option'); |
| 238 | 249 | $this->loader->add_action( 'wp_ajax_nopriv_deactivate_plugin_option_cb', $plugin_admin, 'deactivate_plugin_option'); |
| 239 | 250 | |
| 240 | 251 | $this->loader->add_action( 'wp_ajax_ays_chart_install_plugin', $plugin_admin, 'ays_chart_install_plugin' ); |
| 241 | - $this->loader->add_action( 'wp_ajax_nopriv_ays_chart_install_plugin', $plugin_admin, 'ays_chart_install_plugin' ); | |
| 252 | + // $this->loader->add_action( 'wp_ajax_nopriv_ays_chart_install_plugin', $plugin_admin, 'ays_chart_install_plugin' ); | |
| 242 | 253 | |
| 243 | 254 | $this->loader->add_action( 'wp_ajax_ays_chart_activate_plugin', $plugin_admin, 'ays_chart_activate_plugin' ); |
| 244 | - $this->loader->add_action( 'wp_ajax_nopriv_ays_chart_activate_plugin', $plugin_admin, 'ays_chart_activate_plugin' ); | |
| 255 | + // $this->loader->add_action( 'wp_ajax_nopriv_ays_chart_activate_plugin', $plugin_admin, 'ays_chart_activate_plugin' ); | |
| 245 | 256 | |
| 246 | 257 | $this->loader->add_action( 'elementor/widgets/widgets_registered', $plugin_admin, 'chart_builder_el_widgets_registered' ); |
| 247 | 258 | |
| 248 | 259 | $this->loader->add_action( 'in_admin_footer', $plugin_admin, 'chart_builder_admin_footer', 1 ); |
| @@ -250,8 +261,10 @@ | ||
| 250 | 261 | // Sale Banner |
| 251 | 262 | $this->loader->add_action( 'admin_notices', $plugin_admin, 'ays_chart_sale_banner', 1 ); |
| 252 | 263 | $this->loader->add_action( 'wp_ajax_ays_chart_dismiss_button', $plugin_admin, 'ays_chart_dismiss_button' ); |
| 253 | 264 | $this->loader->add_action( 'wp_ajax_nopriv_ays_chart_dismiss_button', $plugin_admin, 'ays_chart_dismiss_button' ); |
| 265 | + | |
| 266 | + $this->loader->add_action('current_screen', $plugin_admin, 'ays_chart_disable_all_notice_from_plugin', 200, 1); | |
| 254 | 267 | } |
| 255 | 268 | |
| 256 | 269 | /** |
| 257 | 270 | * Register all of the hooks related to the public-facing functionality |
| @@ -262,9 +275,9 @@ | ||
| 262 | 275 | */ |
| 263 | 276 | private function define_public_hooks() { |
| 264 | 277 | |
| 265 | 278 | $plugin_public = new Chart_Builder_Public( $this->get_plugin_name(), $this->get_version() ); |
| 266 | - | |
| 279 | + $this->loader->add_action( 'wp_head', $plugin_public, 'add_custom_chart_styles' ); | |
| 267 | 280 | // $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' ); |
| 268 | 281 | // $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' ); |
| 269 | 282 | |
| 270 | 283 | } |
| @@ -298,8 +311,17 @@ | ||
| 298 | 311 | // ===== Database integration ===== |
| 299 | 312 | $this->loader->add_filter( 'ays_cb_settings_page_integrations_contents', $plugin_integrations, 'ays_settings_page_database_content', 50, 3 ); |
| 300 | 313 | |
| 301 | 314 | // ===== Database integration ===== |
| 315 | + } | |
| 316 | + | |
| 317 | + /** | |
| 318 | + * Run the loader to execute all of the hooks with WordPress. | |
| 319 | + * | |
| 320 | + * @since 1.0.0 | |
| 321 | + */ | |
| 322 | + private function define_custom_post_type_hooks(){ | |
| 323 | + $plugin_custom_post_type = new Chart_Builder_Custom_Post_Type( $this->get_plugin_name(), $this->get_version() ); | |
| 302 | 324 | } |
| 303 | 325 | |
| 304 | 326 | |
| 305 | 327 | /** |
