From 2c0d91524ad9ae0f6a4967f9ae9c002c67a57afe Mon Sep 17 00:00:00 2001 From: contactashish13 Date: Thu, 13 Apr 2017 12:23:16 +0530 Subject: [PATCH 1/2] schedule import #46 --- classes/Visualizer/Module/Sources.php | 32 +++++++++++----------- classes/Visualizer/Render/Page/Data.php | 36 ++++++++++++++++--------- 2 files changed, 40 insertions(+), 28 deletions(-) diff --git a/classes/Visualizer/Module/Sources.php b/classes/Visualizer/Module/Sources.php index c6da54f1..7dc1cda7 100644 --- a/classes/Visualizer/Module/Sources.php +++ b/classes/Visualizer/Module/Sources.php @@ -56,7 +56,7 @@ public function __construct( Visualizer_Plugin $plugin ) { $this->_addFilter( Visualizer_Plugin::FILTER_GET_CHART_SERIES, 'filterChartSeries', 1, 2 ); $this->_addFilter( Visualizer_Plugin::FILTER_GET_CHART_DATA, 'filterChartData', 1, 2 ); - $this->_addFilter( 'visualizer_pro_upsell', 'addProUpsell', 10, 1 ); + $this->_addFilter( 'visualizer_pro_upsell', 'addProUpsell', 10, 2 ); } /** @@ -129,25 +129,27 @@ public function filterChartData( $data, $chart_id ) { * Add the pro upsell html. * * @param string $old The previous html string. - * + * @param string $feature What feature is this filter running for. + * * @return string The new html code. */ - public function addProUpsell( $old ) { - if ( VISUALIZER_PRO ) { + public function addProUpsell( $old, $feature = null ) { + $return = ''; + if ( ! $feature || ($feature == 'schedule-chart' && ! apply_filters( 'visualizer_is_business', false )) ) { + $return = '
'; + $return .= '
'; + $return .= '
'; + $return .= '

' . __( 'Enable this feature in PRO version!', 'visualizer' ) . '

'; + $return .= ' ' . __( 'Buy now', 'visualizer' ) . ''; + $return .= '
'; + $return .= '
'; + $return .= '
'; + } + if ( ! $feature && defined( 'Visualizer_Pro' ) ) { remove_filter( 'visualizer_pro_upsell', 'addProUpsell', 10, 1 ); - return; + $return = ''; } - $return = '
'; - $return .= '
'; - $return .= '
'; - $return .= '

' . __( 'Enable this feature in PRO version!', 'visualizer' ) . '

'; - $return .= ' ' . __( 'Buy now', 'visualizer' ) . ''; - $return .= '
'; - $return .= '
'; - $return .= '
'; - return $return; - } } diff --git a/classes/Visualizer/Render/Page/Data.php b/classes/Visualizer/Render/Page/Data.php index f026ae62..54fec879 100644 --- a/classes/Visualizer/Render/Page/Data.php +++ b/classes/Visualizer/Render/Page/Data.php @@ -88,7 +88,7 @@ protected function _renderSidebarContent() { -
  • +