make sure import from chart is working fine #47

Author: contactashish13

classes/Visualizer/Module/Chart.php

@@ -61,11 +61,6 @@ public function __construct( Visualizer_Plugin $plugin ) {
 
 		// Added by Ash/Upwork
 		$this->_addAjaxAction( Visualizer_Plugin::ACTION_EXPORT_DATA, 'exportData' );
-		if ( defined( 'Visualizer_Pro' ) ) {
-			global $Visualizer_Pro;
-			list($action, $name, $class) = $Visualizer_Pro->_getAjaxAction( $this );
-			$this->_addAjaxAction( $action, $name, $class );
-		}
 		// Added by Ash/Upwork
 	}
 
@@ -77,12 +72,12 @@ public function __construct( Visualizer_Plugin $plugin ) {
 	 * @access private
 	 * @param array $results The response array.
 	 */
-	public function _sendResponse( $results ) {
+	public static function _sendResponse( $results ) {
 		header( 'Content-type: application/json' );
 		nocache_headers();
 
 		echo json_encode( $results );
-		exit;
+		wp_die();
 	}
 
 	/**
@@ -153,7 +148,7 @@ public function getCharts() {
 			$charts[] = $chart_data;
 		}
 
-		$this->_sendResponse( array(
+		self::_sendResponse( array(
 			'success' => true,
 			'data'    => $charts,
 			'total'   => $query->max_num_pages,
@@ -188,7 +183,7 @@ public function deleteChart() {
 		}
 
 		if ( $is_post ) {
-			$this->_sendResponse( array( 'success' => $success ) );
+			self::_sendResponse( array( 'success' => $success ) );
 		}
 
 		wp_redirect( wp_get_referer() );

classes/Visualizer/Render/Page/Data.php

@@ -150,11 +150,33 @@ class="dashicons dashicons-lock"></span></h2>
 								<div>
 									<p class="group-description"><?php _e( 'You can import here data from your previously created charts', 'visualizer' ); ?></p>
 									<form>
-										<select name="vz-import-from-chart" id="vz-import-from-chart"
-												class="visualizer-select">
-											<option value="#"><?php _e( 'Chart #123', 'visualizer' ); ?></option>
+										<select name="vz-import-from-chart" id="chart-id" class="visualizer-select">
+			<?php
+				$fetch_link = add_query_arg( array(
+					'action' => Visualizer_Pro::ACTION_FETCH_DATA,
+					'nonce'  => wp_create_nonce(),
+				), admin_url( 'admin-ajax.php' ) );
+
+				$query_args_charts = array(
+					'post_type'         => Visualizer_Plugin::CPT_VISUALIZER,
+					'posts_per_page'    => -1,
+					'no_found_rows'     => true,
+				);
+				$charts            = array();
+				$query             = new WP_Query( $query_args_charts );
+			while ( $query->have_posts() ) {
+				$chart    = $query->next_post();
+				$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
+				?>
+				<option value="<?php echo $chart->ID; ?>"><?php echo empty( $settings['title'] ) ? '#' . $chart->ID : $settings['title']; ?></option>
+				<?php
+			}
+				?>
+
 										</select>
 									</form>
+											<input type="button" id="existing-chart" class="button button-primary"
+												   value="<?php _e( 'Import Chart', 'visualizer' ); ?>" data-viz-link="<?php echo $fetch_link;?>">
 									<?php echo apply_filters( 'visualizer_pro_upsell', '' ); ?>
 								</div>
 							</div>

languages/visualizer.pot

@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Visualizer: Charts and Graphs Lite 2.0.0\n"
 "Report-Msgid-Bugs-To: https://github.com/Codeinwp/visualizer/issues\n"
-"POT-Creation-Date: 2017-03-16 09:39:48+00:00\n"
+"POT-Creation-Date: 2017-03-16 15:47:05+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -101,28 +101,28 @@ msgstr ""
 msgid "Pro Addon"
 msgstr ""
 
-#: classes/Visualizer/Module/Chart.php:332
-#: classes/Visualizer/Module/Chart.php:395
+#: classes/Visualizer/Module/Chart.php:327
+#: classes/Visualizer/Module/Chart.php:390
 msgid "You have entered invalid URL. Please, insert proper URL."
 msgstr ""
 
-#: classes/Visualizer/Module/Chart.php:409
+#: classes/Visualizer/Module/Chart.php:404
 msgid "Save Chart"
 msgstr ""
 
-#: classes/Visualizer/Module/Chart.php:410
+#: classes/Visualizer/Module/Chart.php:405
 msgid "Create Chart"
 msgstr ""
 
-#: classes/Visualizer/Module/Chart.php:412
+#: classes/Visualizer/Module/Chart.php:407
 msgid "Insert Chart"
 msgstr ""
 
-#: classes/Visualizer/Module/Chart.php:470
+#: classes/Visualizer/Module/Chart.php:465
 msgid "CSV file with chart data was not uploaded. Please, try again."
 msgstr ""
 
-#: classes/Visualizer/Module/Chart.php:485
+#: classes/Visualizer/Module/Chart.php:480
 msgid "CSV file is broken or invalid. Please, try again."
 msgstr ""
 
@@ -282,39 +282,39 @@ msgstr ""
 msgid "You can import here data from your previously created charts"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:155
-msgid "Chart #123"
+#: classes/Visualizer/Render/Page/Data.php:179
+msgid "Import Chart"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:164
+#: classes/Visualizer/Render/Page/Data.php:186
 msgid "Edit current data"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:172
+#: classes/Visualizer/Render/Page/Data.php:194
 msgid "You can manually edit the chart data using the spreadsheet like editor."
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:174
+#: classes/Visualizer/Render/Page/Data.php:196
 msgid "View Editor"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:174
+#: classes/Visualizer/Render/Page/Data.php:196
 msgid "Show Chart"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:184
+#: classes/Visualizer/Render/Page/Data.php:206
 msgid "Advanced Settings"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:187
+#: classes/Visualizer/Render/Page/Data.php:209
 msgid "Chart Settings"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:198
+#: classes/Visualizer/Render/Page/Data.php:220
 msgid "Rate our plugin"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:217
+#: classes/Visualizer/Render/Page/Data.php:239
 #: classes/Visualizer/Render/Page/Settings.php:55
 msgid "Back"
 msgstr ""