Merge branch 'dev'

Author: tubiz

assets/css/paystack.css

@@ -0,0 +1 @@
+.payment_box.payment_method_paystack{ display: none !important; }

assets/js/paystack.js

@@ -7,12 +7,10 @@ jQuery( function( $ ) {
         return payStackFormHandler();
     });
 
-
     jQuery( '#paystack_form form#order_review' ).submit( function() {
         return payStackFormHandler();
     });
 
-
     function payStackFormHandler() {
 
         if ( paystack_submit ) {

readme.txt

@@ -1,7 +1,7 @@
 === Paystack WooCommerce Payment Gateway ===
 Contributors: tubiz
 Donate link: http://bosun.me/donate
-Tags: woocommerce, payment gateway, payment gateways, paystack, interswitch, verve cards, tubiz plugins, verve, nigeria, mastercard, visa card
+Tags: paystack, woocommerce, payment gateway, interswitch, tubiz plugins, verve, nigeria, mastercard, visa
 Requires at least: 4.1
 Tested up to: 4.4
 Stable tag: 1.0.0

paystack-woocommerce-payment-gateway.php woo-paystack.phppaystack-woocommerce-payment-gateway.php renamed to woo-paystack.php

@@ -59,11 +59,32 @@ public function __construct() {
 
 			// Payment listener/API hook
 			add_action( 'woocommerce_api_tbz_wc_paystack_gateway', array( $this, 'verify_paystack_transaction' ) );
+
+			// Check if the gateway can be used
+			if ( ! $this->is_valid_for_use() ) {
+				$this->enabled = false;
+			}
 		}
 
 
 		/**
-		 * display paystack payment icon
+		 * Check if this gateway is enabled and available in the user's country.
+		 */
+		public function is_valid_for_use() {
+
+			if( ! in_array( get_woocommerce_currency(), apply_filters( 'woocommerce_paystack_supported_currencies', array( 'NGN' ) ) ) ) {
+
+				$this->msg = 'Paystack does not support your store currency.';
+
+				return false;
+
+			}
+
+			return true;
+		}
+
+		/**
+		 * Display paystack payment icon
 		 */
 		public function get_icon() {
 
@@ -112,12 +133,20 @@ public function is_available() {
 	     * Admin Panel Options
 	    */
 	    public function admin_options() {
-	    ?>
-	        <h3>Paystack</h3>
-	        <table class="form-table">
-	        	<?php $this->generate_settings_html(); ?>
-	        </table>
-	    <?php
+
+            echo '<h3>Paystack</h3>';
+
+			if ( $this->is_valid_for_use() ){
+
+	            echo '<table class="form-table">';
+	            $this->generate_settings_html();
+	            echo '</table>';
+
+            }
+			else{	 ?>
+			<div class="inline error"><p><strong>Paystack Payment Gateway Disabled</strong>: <?php echo $this->msg ?></p></div>
+
+			<?php }
 	    }
 
 
@@ -175,6 +204,10 @@ public function init_form_fields() {
 		 */
 		public function payment_scripts() {
 
+			if ( is_checkout() ) {
+				wp_enqueue_style( 'paystack', plugins_url( 'assets/css/paystack.css',  __FILE__ ) );
+			}
+
 			if ( ! is_checkout_pay_page() ) {
 				return;
 			}
@@ -237,16 +270,15 @@ public function receipt_page( $order_id ) {
 
 			$order = wc_get_order( $order_id );
 
-			echo '<p>Thank you for your order, please click the button below to pay with credit card using Paystack.</p>';
+			echo '<p>Thank you for your order, please click the button below to pay with debit/credit card using Paystack.</p>';
 
 			echo '<div id="paystack_form"><form id="order_review" method="post" action="'. WC()->api_request_url( 'Tbz_WC_Paystack_Gateway' ) .'"></form><button class="button alt" id="paystack-payment-button">Pay Now</button> <a class="button cancel" href="' . esc_url( $order->get_cancel_order_url() ) . '">Cancel order &amp; restore cart</a></div>
 				';
-
 		}
 
 
 		/**
-		 * Verify paystack payment
+		 * Verify Paystack payment
 		 */
 		public function verify_paystack_transaction() {
 
@@ -352,7 +384,6 @@ function tbz_wc_add_paystack_gateway( $methods ) {
 		$methods[] = 'Tbz_WC_Paystack_Gateway';
 		return $methods;
 	}
-
 	add_filter( 'woocommerce_payment_gateways', 'tbz_wc_add_paystack_gateway' );
 
 }