Merge pull request #3 from Kendysond/master

match up with kendysond master

Author: ibrahimlawal

.DS_Store

@@ -3,8 +3,8 @@ Contributors: kendysond
 Donate link: https://paystack.com/demo
 Tags: paystack, recurrent payments, nigeria, mastercard, visa, target,Naira,payments,verve
 Requires at least: 3.1
-Tested up to: 4.6.1
-Stable tag: 1.1.0
+Tested up to: 4.7
+Stable tag: 2.0.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -29,6 +29,13 @@ When you set the 'recur' option to 'optional' on the form settings, your donors/
 
 This can come in handy for weekly/monthly offerings & tithes or recurring donor donations.
 
+= For selling items =
+
+To create a form to allow your users buy or pay for value in quantity.
+
+*  Set quantified to be 'yes'.
+*  Set the max quantity a user can buy.
+
 = Plugin Features =
 
 *   __Accept payment__ via MasterCard and Visa Cards.
@@ -77,6 +84,21 @@ You can also follow us on Twitter! **[@paystack](http://twitter.com/paystack)**
 
 
 == Changelog ==
+= 2.0.3 =
+*  Send email notification to merchant for every payment.
+*  Export payment data to CSV.
+= 2.0.2 =
+*  Price calculation and bug fixes.
+= 2.0.1 =
+*  Bug fixes.
+= 2.0.1 =
+*  Added option to use subaccount on a form.
+*  General bug fixes.
+= 2.0.0 =
+*  Fixed compatibility for PHP 5.3 and below.
+*  Added option to redirect to page after payment.
+*  Add retry payment link to email invoice.
+*  Fixed pricing calculation.
 = 1.1.1 =
 *  Added country and Nigerian states automatic shortcode, added radio buttons, added form agreement checkbox.
 = 1.1.0 =

README.txt

@@ -32,6 +32,8 @@ function kkd_pff_paystack_txncheck($name,$txncharge){
 		function kkd_pff_paystack_setting_page() {
 			?>
 			 <h1>Paystack Forms API KEYS Settings!</h1>
+			
+        		<h4>Optional: To avoid situations where bad network makes it impossible to verify transactions, set your webhook URL <a href="https://dashboard.paystack.co/#/settings/developer">here</a> to the URL below<strong style="color: red"><pre><code><?php echo admin_url("admin-ajax.php") . "?action=kkd_paystack_pff";?></code></pre></strong></h4>
 			 <form method="post" action="options.php">
 				    <?php settings_fields( 'kkd-pff-paystack-settings-group' ); do_settings_sections( 'kkd-pff-paystack-settings-group' ); ?>
 				    <table class="form-table paystack_setting_page">
@@ -47,8 +49,7 @@ function kkd_pff_paystack_setting_page() {
 								<tr valign="top">
 				        <th scope="row">Test Secret Key</th>
 				        <td>
-
-								<input type="text" name="tsk" value="<?php echo esc_attr( get_option('tsk') ); ?>" /></td>
+				        	<input type="text" name="tsk" value="<?php echo esc_attr( get_option('tsk') ); ?>" /></td>
 				        </tr>
 
 				        <tr valign="top">
@@ -169,7 +170,7 @@ function kkd_pff_paystack_edit_dashboard_header_columns( $columns ) {
 	  	$columns = array(
 	  		'cb' => '<input type="checkbox" />',
 	  		'title' => __( 'Name' ),
-				'shortcode' => __( 'Shortcode' ),
+			'shortcode' => __( 'Shortcode' ),
 	  		'payments' => __( 'Payments' ),
 	  		'date' => __( 'Date' )
 	  	);
@@ -260,6 +261,7 @@ function kkd_pff_paystack_editor_add_extra_metaboxes() {
 			add_meta_box('kkd_pff_paystack_editor_add_email_data', 'Email Receipt Settings', 'kkd_pff_paystack_editor_add_email_data', 'paystack_form', 'normal', 'default');
 			add_meta_box('kkd_pff_paystack_editor_add_quantity_data', 'Quantity Payment', 'kkd_pff_paystack_editor_add_quantity_data', 'paystack_form', 'side', 'default');
 			add_meta_box('kkd_pff_paystack_editor_add_agreement_data', 'Agreement checkbox', 'kkd_pff_paystack_editor_add_agreement_data', 'paystack_form', 'side', 'default');
+			add_meta_box('kkd_pff_paystack_editor_add_subaccount_data', 'Sub Account', 'kkd_pff_paystack_editor_add_subaccount_data', 'paystack_form', 'side', 'default');
 
 	  }
 
@@ -279,6 +281,7 @@ function kkd_pff_paystack_editor_add_form_data() {
 				$loggedin = get_post_meta($post->ID, '_loggedin', true);
 				$currency = get_post_meta($post->ID, '_currency', true);
 		    $filelimit = get_post_meta($post->ID, '_filelimit', true);
+		    $redirect = get_post_meta($post->ID, '_redirect', true);
 
 				if ($amount == "") {$amount = 0;}
 				if ($filelimit == "") {$filelimit = 2;}
@@ -297,7 +300,7 @@ function kkd_pff_paystack_editor_add_form_data() {
 				echo '<p>Transaction Charges:</p>';
 				echo '<select class="form-control" name="_txncharge" id="parent_id" style="width:100%;">
 								<option value="merchant"'.kkd_pff_paystack_txncheck('merchant',$txncharge).'>Merchant Pays(Include in fee)</option>
-								<option value="customer" '.kkd_pff_paystack_txncheck('customer',$txncharge).'>Client Pays(Extra Fee added) - 1.55%+ NGN100 if above NGN2,500 </option>
+								<option value="customer" '.kkd_pff_paystack_txncheck('customer',$txncharge).'>Client Pays(Calculated Paystack Local Fee added) </option>
 							</select>';
 				echo '<p>User logged In:</p>';
 				echo '<select class="form-control" name="_loggedin" id="parent_id" style="width:100%;">
@@ -306,8 +309,10 @@ function kkd_pff_paystack_editor_add_form_data() {
 							</select>';
 		  	echo '<p>Success Message after Payment</p>';
 		    echo '<textarea rows="3"  name="_successmsg"  class="widefat" >'.$successmsg.'</textarea>';
-				echo '<p>File Upload Limit(MB):</p>';
+			echo '<p>File Upload Limit(MB):</p>';
 		  	echo '<input ttype="number" name="_filelimit" value="' . $filelimit  . '" class="widefat  pf-number" />';
+		  	echo '<p>Redirect to page link after payment(keep blank to use normal success message):</p>';
+		  	echo '<input ttype="text" name="_redirect" value="' . $redirect  . '" class="widefat" />';
 
 	  }
 	function kkd_pff_paystack_editor_add_email_data() {
@@ -413,6 +418,27 @@ function kkd_pff_paystack_editor_add_agreement_data() {
 	  	echo '<input type="text" name="_agreementlink" value="' . $agreementlink  . '" class="widefat" />';
 
 	}
+	function kkd_pff_paystack_editor_add_subaccount_data() {
+	  	global $post;
+
+	  	// Noncename needed to verify where the data originated
+	  	echo '<input type="hidden" name="eventmeta_noncename" id="eventmeta_noncename" value="' .
+	  	wp_create_nonce( plugin_basename(__FILE__) ) . '" />';
+
+	  	// Get the location data if its already been entered
+			$subaccount = get_post_meta($post->ID, '_subaccount', true);
+			$txnbearer = get_post_meta($post->ID, '_txnbearer', true);
+
+		
+			if ($subaccount  == "") {$subaccount = '';}
+		echo '<p>Sub Account code:</p>';
+	  	echo '<input type="text" name="_subaccount" value="' . $subaccount  . '" class="widefat" />';
+	  	echo '<p>Transaction Charge bearer:</p>';
+			echo '<select class="form-control" name="_txnbearer" id="parent_id" style="width:100%;">
+							<option value="account" '.kkd_pff_paystack_txncheck('account',$txnbearer).'>Merchant (default)</option>
+							<option value="subaccount" '.kkd_pff_paystack_txncheck('subaccount',$txnbearer).'>Sub Account</option>
+						</select>';
+	}
 	function kkd_pff_paystack_save_data($post_id, $post) {
 
 			if ( !wp_verify_nonce( @$_POST['eventmeta_noncename'], plugin_basename(__FILE__) )) {
@@ -424,13 +450,14 @@ function kkd_pff_paystack_save_data($post_id, $post) {
 				return $post->ID;
 			}
 
-		  $form_meta['_amount'] = $_POST['_amount'];
+		  	$form_meta['_amount'] = $_POST['_amount'];
 			$form_meta['_paybtn'] = $_POST['_paybtn'];
 			$form_meta['_currency'] = $_POST['_currency'];
 			$form_meta['_successmsg'] = $_POST['_successmsg'];
 			$form_meta['_txncharge'] = $_POST['_txncharge'];
 			$form_meta['_loggedin'] = $_POST['_loggedin'];
 			$form_meta['_filelimit'] = $_POST['_filelimit'];
+			$form_meta['_redirect'] = $_POST['_redirect'];
 			///
 			$form_meta['_subject'] = $_POST['_subject'];
 			$form_meta['_heading'] = $_POST['_heading'];
@@ -444,6 +471,8 @@ function kkd_pff_paystack_save_data($post_id, $post) {
 
 			$form_meta['_useagreement'] = $_POST['_useagreement'];
 			$form_meta['_agreementlink'] = $_POST['_agreementlink'];
+			$form_meta['_subaccount'] = $_POST['_subaccount'];
+			$form_meta['_txnbearer'] = $_POST['_txnbearer'];
 
 			// Add values of $form_meta as custom fields
 
@@ -494,11 +523,26 @@ function kkd_pff_paystack_payment_submissions(){
 		 $loggedin = get_post_meta($id,'_loggedin',true);
 		 $txncharge = get_post_meta($id,'_txncharge',true);
 
-		 echo "<title>".$obj->post_title." Payments </title>";
-		 echo "<h1>".$obj->post_title." Payments</h1>";
 		 $exampleListTable = new Kkd_Pff_Paystack_Payments_List_Table();
-		 $exampleListTable->prepare_items();
+		$data = $exampleListTable->prepare_items();
+		
 		 ?>
+		 <div id="welcome-panel" class="welcome-panel">
+			<div class="welcome-panel-content">
+				<h1 style="margin: 0px;"><?php echo $obj->post_title; ?> Payments </h1>
+				<p class="about-description">All payments made for this form</p>
+				<?php if ($data > 0) { ?>
+					
+				<form action="<?php echo admin_url('admin-post.php'); ?>" method="post">
+				  <input type="hidden" name="action" value="kkd_pff_export_excel">
+				  <input type="hidden" name="form_id" value="<?php echo $id; ?>">
+				  <button type="submit"  class="button button-primary button-hero load-customize" >Export Data to Excel</button>
+				</form>
+				<?php } ?>
+				
+				<br><br>
+			</div>
+		</div>
 		 <div class="wrap">
 				 <div id="icon-users" class="icon32"></div>
 				 <?php $exampleListTable->display(); ?>
@@ -507,6 +551,81 @@ function kkd_pff_paystack_payment_submissions(){
 
 	}
 }
+add_action( 'admin_post_kkd_pff_export_excel', 'Kkd_pff_export_excel' );
+
+function Kkd_pff_export_excel() {
+	global $wpdb;
+	
+	$post_id = $_POST['form_id'];
+	$obj = get_post($post_id);
+	$csv_output = "";
+	
+	
+  	$table = $wpdb->prefix.KKD_PFF_PAYSTACK_TABLE;
+	$data = array();
+	$alldbdata = $wpdb->get_results("SELECT * FROM $table WHERE (post_id = '".$post_id."' AND paid = '1')  ORDER BY `id` ASC");
+	$i = 0;
+	
+	if (count($alldbdata) > 0) {
+			$header = $alldbdata[0];
+			$csv_output .= "#,";
+			$csv_output .= "Email,";
+			$csv_output .= "Amount,";
+			$csv_output .= "Reference,";
+			$new = json_decode($header->metadata);
+			$text = '';
+			if (array_key_exists("0", $new)) {
+				foreach ($new as $key => $item) {
+					$csv_output .= $item->display_name.",";
+				}
+			}else{
+				if (count($new) > 0) {
+					foreach ($new as $key => $item) {
+						$csv_output .= $key.",";
+					}
+				}
+			}
+			$csv_output .= "\n";
+			
+			foreach ($alldbdata as $key => $dbdata) {
+			$newkey = $key+1;
+			if ($dbdata->txn_code_2 != "") {
+				$txn_code = $dbdata->txn_code_2;
+			}else{
+				$txn_code = $dbdata->txn_code;
+			}
+			$csv_output .= $newkey.",";
+			$csv_output .= $dbdata->email.",";
+			$csv_output .= $currency.' '.$dbdata->amount.",";
+			$csv_output .= $txn_code.",";
+			$new = json_decode($header->metadata);
+			$text = '';
+			if (array_key_exists("0", $new)) {
+				foreach ($new as $key => $item) {
+					$csv_output .= $item->value.",";
+				}
+			}else{
+				if (count($new) > 0) {
+					foreach ($new as $key => $item) {
+						$csv_output .= $item.",";
+					}
+				}
+			}
+			$csv_output .= "\n";
+		}
+
+
+		$filename = $obj->post_title."_payments_".date("Y-m-d_H-i",time());
+		header("Content-type: application/vnd.ms-excel");
+		header("Content-disposition: csv" . date("Y-m-d") . ".csv");
+		header( "Content-disposition: filename=".$filename.".csv");
+		print $csv_output;
+		exit;
+	}
+	
+	
+    // Handle request then generate response using echo or leaving PHP and using HTML
+}
 class Kkd_Pff_Paystack_Wp_List_Table{
     public function __construct(){
         add_action( 'admin_menu', array($this, 'add_menu_example_list_table_page' ));
@@ -561,17 +680,22 @@ public function prepare_items(){
 
 			global $wpdb;
 
-		  $table = $wpdb->prefix.KKD_PFF_PAYSTACK_TABLE;
+		  	$table = $wpdb->prefix.KKD_PFF_PAYSTACK_TABLE;
 			$data = array();
 			$alldbdata = $wpdb->get_results("SELECT * FROM $table WHERE (post_id = '".$post_id."' AND paid = '1')");
 
 			foreach ($alldbdata as $key => $dbdata) {
 				$newkey = $key+1;
+				if ($dbdata->txn_code_2 != "") {
+					$txn_code = $dbdata->txn_code_2;
+				}else{
+					$txn_code = $dbdata->txn_code;
+				}
 				$data[] = array(
-							'id'  => $newkey,
-							'email' => '<a href="mailto:'.$dbdata->email.'">'.$dbdata->email.'</a>',
+					'id'  => $newkey,
+					'email' => '<a href="mailto:'.$dbdata->email.'">'.$dbdata->email.'</a>',
 		          'amount' => $currency.'<b>'.number_format($dbdata->amount).'</b>',
-		          'txn_code' => $dbdata->txn_code,
+		          'txn_code' => $txn_code,
 		          'metadata' => format_data($dbdata->metadata),
 		          'date'  => $dbdata->created_at
 				);
@@ -591,6 +715,9 @@ public function prepare_items(){
        $data = array_slice($data,(($currentPage-1)*$perPage),$perPage);
        $this->_column_headers = array($columns, $hidden, $sortable);
        $this->items = $data;
+
+       $rows = count($alldbdata);
+       return $rows;
    }
 	 public function get_columns(){
        $columns = array(

admin/class-paystack-forms-admin.php

@@ -14,6 +14,7 @@ public static function activate() {
 		  paid int(1) NOT NULL DEFAULT '0',
 			plan varchar(255) DEFAULT '' NOT NULL,
 			txn_code varchar(255) DEFAULT '' NOT NULL,
+			txn_code_2 varchar(255) DEFAULT '' NOT NULL,
 		  amount varchar(255) DEFAULT '' NOT NULL,
 		  ip varchar(255) NOT NULL,
 			deleted_at varchar(255) DEFAULT '' NULL,
@@ -29,6 +30,12 @@ public static function activate() {
 		if(empty($row)){
 			$wpdb->query("ALTER TABLE `".$table_name."` ADD `plan` VARCHAR(255) NOT NULL AFTER `paid`;");
 		}
+		$row1 = $wpdb->get_results(  "SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS
+			WHERE table_name = '".$table_name."' AND column_name = 'txn_code_2'"  );
+
+		if(empty($row1)){
+			$wpdb->query("ALTER TABLE `".$table_name."` ADD `txn_code_2` VARCHAR(255) DEFAULT '' NULL AFTER `txn_code`;");
+		}
 
 	}
 

banner-772x250.png

@@ -43,7 +43,7 @@ class Kkd_Pff_Paystack {
 	public function __construct() {
 
 		$this->plugin_name = 'pff-paystack';
-		$this->version = '1.0.4';
+		$this->version = '2.0.0';
 
 		$this->load_dependencies();
 		$this->set_locale();
@@ -144,6 +144,7 @@ private function load_dependencies() {
 		 * side of the site.
 		 */
 		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-paystack-forms-public.php';
+		// require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/paystack-webhook.php';
 
 		$this->loader = new Kkd_Pff_Paystack_Loader();