Merge pull request #1 from Kendysond/master

Merge new changes

Author: ibrahimlawal

README.txt

@@ -1,114 +1,89 @@
-=== Plugin Name ===
-Contributors: (this should be a list of wordpress.org userid's)
-Donate link: kendyson.com
-Tags: comments, spam
-Requires at least: 3.0.1
-Tested up to: 3.4
-Stable tag: 4.3
+=== Paystack Forms ===
+Contributors: kendysond
+Donate link: https://paystack.com/demo
+Tags: paystack, recurrent payments, nigeria, mastercard, visa, target
+Requires at least: 3.1
+Tested up to: 4.6
+Stable tag: 1.0.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
-Here is a short description of the plugin.  This should be no more than 150 characters.  No markup here.
+Paystack forms allows you create forms that will be used to bill clients for goods and services.
+
 
 == Description ==
 
-This is the long description.  No limit, and you can use Markdown (as well as in the following sections).
+This is a Paystack plugin that provides Payment forms for Wordpress.
 
-For backwards compatibility, if this section is missing, the full length of the short description will be used, and
-Markdown parsed.
+Paystack is on a mission to deliver a safe and convenient payment experience for customers and merchants. Paystack provide Nigerian merchants with the tools and services needed to accept online payments from local and international customers using MasterCard, Visa and Verve Cards.
 
-A few notes about the sections above:
+To signup for a Paystack Merchant account, visit [https://dashboard.paystack.co](https://dashboard.paystack.co).
 
-*   "Contributors" is a comma separated list of wp.org/wp-plugins.org usernames
-*   "Tags" is a comma separated list of tags that apply to the plugin
-*   "Requires at least" is the lowest version that the plugin will work on
-*   "Tested up to" is the highest version that you've *successfully used to test the plugin*. Note that it might work on
-higher versions... this is just the highest one you've verified.
-*   Stable tag should indicate the Subversion "tag" of the latest stable version, or "trunk," if you use `/trunk/` for
-stable.
+Paystack forms allows you to create payment forms for numerous purposes. You can see the form and payment data from your dashboard.
 
-    Note that the `readme.txt` of the stable tag is the one that is considered the defining one for the plugin, so
-if the `/trunk/readme.txt` file says that the stable tag is `4.3`, then it is `/tags/4.3/readme.txt` that'll be used
-for displaying information about the plugin.  In this situation, the only thing considered from the trunk `readme.txt`
-is the stable tag pointer.  Thus, if you develop in trunk, you can update the trunk `readme.txt` to reflect changes in
-your in-development version, without having that information incorrectly disclosed about the current stable version
-that lacks those changes -- as long as the trunk's `readme.txt` points to the correct stable tag.
+With this Paystack Forms, you will be able to accept the following payment methods on a recurring basis:
 
-    If no stable tag is provided, it is assumed that trunk is stable, but you should specify "trunk" if that's where
-you put the stable version, in order to eliminate any doubt.
+* __MasterCard__
+* __Visa__
 
-== Installation ==
+= Note =
 
-This section describes how to install the plugin and get it working.
+This plugin is meant to be used by merchants in Nigeria.
 
-e.g.
+= Plugin Features =
 
-1. Upload `paystack-forms.php` to the `/wp-content/plugins/` directory
-1. Activate the plugin through the 'Plugins' menu in WordPress
-1. Place `<?php do_action('plugin_name_hook'); ?>` in your templates
+*   __Accept payment__ via MasterCard and Visa Cards.
+*    __Seamless integration__ into any WordPress page or post. Accept subscription payments directly on your site
 
-== Frequently Asked Questions ==
 
-= A question that someone might have =
 
-An answer to that question.
+= Suggestions / Feature Request =
 
-= What about foo bar? =
+If you have suggestions or a new feature request, feel free to get in touch with us via [http://paystack.com](http://paystack.com)
 
-Answer to foo bar dilemma.
+You can also follow us on Twitter! **[@paystack](http://twitter.com/paystack)**
 
-== Screenshots ==
 
-1. This screen shot description corresponds to screenshot-1.(png|jpg|jpeg|gif). Note that the screenshot is taken from
-the /assets directory or the directory that contains the stable readme.txt (tags or trunk). Screenshots in the /assets
-directory take precedence. For example, `/assets/screenshot-1.png` would win over `/tags/4.3/screenshot-1.png`
-(or jpg, jpeg, gif).
-2. This is the second screen shot
+== Installation ==
 
-== Changelog ==
+= Automatic Installation =
+*    Login to your WordPress Admin area
+*    Go to "Plugins > Add New" from the left hand menu
+*    In the search box type __Paystack Forms__
+*    From the search result you will see __Paystack Forms__ click on __Install Now__ to install the plugin
+*    A popup window will ask you to confirm your wish to install the Plugin.
+*    After installation, activate the plugin.
+*    Open the settings page for Paystack Forms
+*    Configure your __Paystack Forms__ settings as instructed on the page.
 
-= 1.0 =
-* A change since the previous version.
-* Another change.
+= Manual Installation =
+1.  Download the plugin zip file
+2.  Login to your WordPress Admin. Click on "Plugins > Add New" from the left hand menu.
+3.  Click on the "Upload" option, then click "Choose File" to select the zip file from your computer. Once selected, press "OK" and press the "Install Now" button.
+4.  Activate the plugin.
+5.  Under paystack forms, configure your api keys under api keys settings.
+6.  Click on paystack forms and create a form.
+7.  Paste the form shortcode on any page or widget.
 
-= 0.5 =
-* List versions from most recent at top to oldest at bottom.
 
-== Upgrade Notice ==
 
-= 1.0 =
-Upgrade notices describe the reason a user should upgrade.  No more than 300 characters.
 
-= 0.5 =
-This version fixes a security related bug.  Upgrade immediately.
+== Frequently Asked Questions ==
 
-== Arbitrary section ==
+= What Do I Need To Use The Plugin =
 
-You may provide arbitrary sections, in the same format as the ones above.  This may be of use for extremely complicated
-plugins where more information needs to be conveyed that doesn't fit into the categories of "description" or
-"installation."  Arbitrary sections will be shown below the built-in sections outlined above.
+1. You need to open a Paystack merchant account on [Paystack](https://paystack.com)
 
-== A brief Markdown Example ==
 
-Ordered list:
 
-1. Some feature
-1. Another feature
-1. Something else about the plugin
 
-Unordered list:
+== Changelog ==
 
-* something
-* something else
-* third thing
+= 1.0.0 =
+*   First release
 
-Here's a link to [WordPress](http://wordpress.org/ "Your favorite software") and one to [Markdown's Syntax Documentation][markdown syntax].
-Titles are optional, naturally.
+== Screenshots ==
 
-[markdown syntax]: http://daringfireball.net/projects/markdown/syntax
-            "Markdown is what the parser uses to process much of the readme file"
 
-Markdown uses email style notation for blockquotes and I've been told:
-> Asterisks for *emphasis*. Double it up  for **strong**.
 
-`<?php code(); // goes in backticks ?>`
+== Other Notes ==

admin/class-paystack-forms-admin.php

@@ -1,25 +1,5 @@
 <?php
 
-/**
- * The admin-specific functionality of the plugin.
- *
- * @link       kendyson.com
- * @since      1.0.0
- *
- * @package    Paystack_Forms
- * @subpackage Paystack_Forms/admin
- */
-
-/**
- * The admin-specific functionality of the plugin.
- *
- * Defines the plugin name, version, and two examples hooks for how to
- * enqueue the admin-specific stylesheet and JavaScript.
- *
- * @package    Paystack_Forms
- * @subpackage Paystack_Forms/admin
- * @author     kendysond <[email protected]>
- */
 class Paystack_Forms_Admin {
 
 	private $plugin_name;
@@ -338,7 +318,8 @@ function wpt_form_data() {
 			if ($currency == "") {$currency = 'NGN';}
 	  	// Echo out the field
 			echo '<p>Currency:</p>';
-	  	echo '<input type="text" name="_currency" value="' . $currency  . '" class="widefat" />';
+	  	echo '<input type="text" name="_currency" value="' . $currency  . '" class="widefat" />
+			<small>We currently support only payments in Naira(NGN).</small>';
 			echo '<p>Amount to be paid(Set 0 for customer input):</p>';
 	  	echo '<input type="number" name="_amount" value="' . $amount  . '" class="widefat pf-number" />';
 			echo '<p>Pay button Description:</p>';

icon.png

@@ -1,25 +1,5 @@
 <?php
 
-/**
- * Fired during plugin activation
- *
- * @link       kendyson.com
- * @since      1.0.0
- *
- * @package    Paystack_Forms
- * @subpackage Paystack_Forms/includes
- */
-
-/**
- * Fired during plugin activation.
- *
- * This class defines all code necessary to run during the plugin's activation.
- *
- * @since      1.0.0
- * @package    Paystack_Forms
- * @subpackage Paystack_Forms/includes
- * @author     kendysond <[email protected]>
- */
 class Paystack_Forms_Activator {
 
 	/**
@@ -31,10 +11,9 @@ class Paystack_Forms_Activator {
 	 */
 	public static function activate() {
 		global $wpdb;
-		$charset_collate = $wpdb->get_charset_collate();
 		$table_name = $wpdb->prefix . 'paystack_forms_payments';
 
-		$sql = "CREATE TABLE $table_name (
+		$sql = "CREATE TABLE IF NOT EXISTS `".$table_name."` (
 			id int(11) NOT NULL AUTO_INCREMENT,
 			post_id int(11) NOT NULL,
 		  user_id int(11) NOT NULL,
@@ -43,15 +22,14 @@ public static function activate() {
 		  paid int(1) NOT NULL DEFAULT '0',
 			txn_code varchar(255) DEFAULT '' NOT NULL,
 		  amount varchar(255) DEFAULT '' NOT NULL,
-		  views smallint(5) NOT NULL,
+		  ip varchar(255) NOT NULL,
 			deleted_at varchar(255) DEFAULT '' NULL,
-			created_at datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-		  modified datetime DEFAULT '0000-00-00 00:00:00' NOT NULL,
+			created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+		  modified timestamp DEFAULT '0000-00-00 00:00:00' NOT NULL,
 		  UNIQUE KEY id (id)
-		) $charset_collate;";
-
+		);";
 		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
-		dbDelta( $sql );
+		dbDelta($sql);
 	}
 
 

includes/class-paystack-forms-activator.php

@@ -1,25 +1,6 @@
 <?php
 
-/**
- * Fired during plugin deactivation
- *
- * @link       kendyson.com
- * @since      1.0.0
- *
- * @package    Paystack_Forms
- * @subpackage Paystack_Forms/includes
- */
 
-/**
- * Fired during plugin deactivation.
- *
- * This class defines all code necessary to run during the plugin's deactivation.
- *
- * @since      1.0.0
- * @package    Paystack_Forms
- * @subpackage Paystack_Forms/includes
- * @author     kendysond <[email protected]>
- */
 class Paystack_Forms_Deactivator {
 
 	/**

includes/class-paystack-forms-deactivator.php

@@ -1,29 +1,6 @@
 <?php
 
-/**
- * Define the internationalization functionality
- *
- * Loads and defines the internationalization files for this plugin
- * so that it is ready for translation.
- *
- * @link       kendyson.com
- * @since      1.0.0
- *
- * @package    Paystack_Forms
- * @subpackage Paystack_Forms/includes
- */
-
-/**
- * Define the internationalization functionality.
- *
- * Loads and defines the internationalization files for this plugin
- * so that it is ready for translation.
- *
- * @since      1.0.0
- * @package    Paystack_Forms
- * @subpackage Paystack_Forms/includes
- * @author     kendysond <[email protected]>
- */
+
 class Paystack_Forms_i18n {
 
 

includes/class-paystack-forms-i18n.php

@@ -1,26 +1,6 @@
 <?php
 
-/**
- * Register all actions and filters for the plugin
- *
- * @link       kendyson.com
- * @since      1.0.0
- *
- * @package    Paystack_Forms
- * @subpackage Paystack_Forms/includes
- */
-
-/**
- * Register all actions and filters for the plugin.
- *
- * Maintain a list of all hooks that are registered throughout
- * the plugin, and register them with the WordPress API. Call the
- * run function to execute the list of actions and filters.
- *
- * @package    Paystack_Forms
- * @subpackage Paystack_Forms/includes
- * @author     kendysond <[email protected]>
- */
+
 class Paystack_Forms_Loader {
 
 	/**

includes/class-paystack-forms-loader.php

@@ -1,32 +1,6 @@
 <?php
 
-/**
- * The file that defines the core plugin class
- *
- * A class definition that includes attributes and functions used across both the
- * public-facing side of the site and the admin area.
- *
- * @link       kendyson.com
- * @since      1.0.0
- *
- * @package    Paystack_Forms
- * @subpackage Paystack_Forms/includes
- */
 
-/**
- * The core plugin class.
- *
- * This is used to define internationalization, admin-specific hooks, and
- * public-facing site hooks.
- *
- * Also maintains the unique identifier of this plugin as well as the current
- * version of the plugin.
- *
- * @since      1.0.0
- * @package    Paystack_Forms
- * @subpackage Paystack_Forms/includes
- * @author     kendysond <[email protected]>
- */
 class Paystack_Forms {
 
 	/**