Bug fixes to price calculation

Author: Kendysond

admin/class-paystack-forms-admin.php

@@ -32,6 +32,9 @@ function kkd_pff_paystack_txncheck($name,$txncharge){
 		function kkd_pff_paystack_setting_page() {
 			?>
 			 <h1>Paystack Forms API KEYS Settings!</h1>
+			 <h3>Paystack</h3>
+
+        <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 get_site_url().'/kkd/wpffp/webhook/'; ?></code></pre></strong></
 			 <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">

includes/class-paystack-forms.php

@@ -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__ ) ) . 'public/class-paystack-forms-webhook.php';
 
 		$this->loader = new Kkd_Pff_Paystack_Loader();
 

public/class-paystack-forms-webhook.php

@@ -0,0 +1,78 @@
+<?php
+
+class Kkd_Pff_Paystack_webhook{
+	
+	/**
+	*	@var string Pug Bomb Headquarters
+	*/
+	
+	
+	/** Hook WordPress
+	*	@return void
+	*/
+	public function __construct(){
+		add_filter('query_vars', array($this, 'add_query_vars'), 0);
+		add_action('parse_request', array($this, 'sniff_requests'), 0);
+		add_action('init', array($this, 'add_endpoint'), 0);
+	}	
+	
+	/** Add public query vars
+	*	@param array $vars List of current public query vars
+	*	@return array $vars 
+	*/
+	public function add_query_vars($vars){
+		$vars[] = '__api';
+		$vars[] = 'pugs';
+		return $vars;
+	}
+	
+	/** Add API Endpoint
+	*	This is where the magic happens - brush up on your regex skillz
+	*	@return void
+	*/
+	public function add_endpoint(){
+		add_rewrite_rule('/ kkd/wpffp/webhook/','index.php?__api=1&pugs=$matches[1]','top');
+	}
+	/**	Sniff Requests
+	*	This is where we hijack all API requests
+	* 	If $_GET['__api'] is set, we kill WP and serve up pug bomb awesomeness
+	*	@return die if API request
+	*/
+	public function sniff_requests(){
+		global $wp;
+		if(isset($wp->query_vars['__api'])){
+			$this->handle_request();
+			exit;
+		}
+	}
+	
+	/** Handle Requests
+	*	This is where we send off for an intense pug bomb package
+	*	@return void 
+	*/
+	protected function handle_request(){
+		global $wp;
+		$pugs = $wp->query_vars['pugs'];
+		if(!$pugs)
+			$this->send_response('Please tell us how many pugs to send.');
+		
+		$pugs = file_get_contents(get_site_url().'/kkd/wpffp/webhook/'.$pugs);
+		if($pugs)
+			$this->send_response('200 OK', json_decode($pugs));
+		else
+			$this->send_response('Something went wrong with the pug bomb factory');
+	}
+	
+	/** Response Handler
+	*	This sends a JSON response to the browser
+	*/
+	protected function send_response($msg, $pugs = ''){
+		$response['message'] = $msg;
+		if($pugs)
+			$response['pugs'] = $pugs;
+		header('content-type: application/json; charset=utf-8');
+	    echo json_encode($response)."\n";
+	    exit;
+	}
+}
+new Kkd_Pff_Paystack_webhook();

public/js/paystack-forms-public.js

@@ -50,11 +50,11 @@
 								 var fees = multiplier * transaction_amount;
 								 var extrafee = 0;
 								 if (fees > 2000) {
-									 var extrafee = 2000;
+									 var fees = 2000;
 								 }else{
-									 if (transaction_amount > 2500) {extrafee = 100};
+									 if (transaction_amount > 2500) {fees += 100};
 								 }
-								 var total = transaction_amount + fees + extrafee;
+								 var total = transaction_amount + fees;
 								//  console.log(transaction_amount);
 		             if (transaction_amount == '' || transaction_amount == 0 || transaction_amount.length == 0 || transaction_amount == null || isNaN (transaction_amount)) {
 									 var total = 0;
@@ -148,7 +148,7 @@
 									var lastName = names[1] || "";
 									var quantity =data.quantity;
 									// console.log(firstName+ " - "+lastName);
-									if (data.plan == 'none') {
+									if (data.plan == 'none' || data.plan == ''  || data.plan == 'no' ) {
 										var handler = PaystackPop.setup({
 						 					key: settings.key,
 						 					email: data.email,
@@ -158,6 +158,7 @@
 						 					subaccount:data.subaccount,
 						 					bearer:data.txnbearer,
                             				ref: data.code,
+                            				transaction_charge:'0',
 						 					metadata: {'custom_fields': data.custom_fields},
 						 					callback: function(response){
 						 						$.blockUI({ message: 'Please wait...' });
@@ -198,6 +199,7 @@
 			 								lastname: lastName,
 						 					ref: data.code,
 						 					subaccount:data.subaccount,
+						 					transaction_charge:'0',
 						 					bearer:data.txnbearer,
                             				metadata: {'custom_fields': data.custom_fields},
 						 					callback: function(response){