Merge branch '4.0.1-fixes' of https://github.com/PaystackOSS/plugin-payment-forms-for-wordpress into 4.0.1-fixes

Author: Andrew-Paystack

assets/js/paystack-public.js

@@ -164,7 +164,11 @@ function PffPaystackFee()
                     }
                 }
             );
+
             if ($("#pf-quantity").length) {
+				$( "#pf-quantity" ).on( 'change', function(event){
+					checkMinimumVal();
+				} );
                 calculateTotal();
             };
 
@@ -202,7 +206,6 @@ function PffPaystackFee()
                         .find("#pf-amount")
                         .val();
                     }
-					
 
                     if (Number(amount) > 0) {
                     } else {
@@ -225,6 +228,7 @@ function PffPaystackFee()
                         );
                         return false;
                     }
+
                     if (checkMinimumVal() == false) {
                         $(this)
                         .find("#pf-amount")
@@ -593,11 +597,18 @@ function PffPaystackFee()
                 }
             );
 
-
 			function checkMinimumVal() {
-				if ($("#pf-minimum-hidden").length) {
-					var min_amount = Number($("#pf-minimum-hidden").val());
+				if ( $("#pf-amount").length ) {
+					var min_amount = Number($("#pf-amount").attr('min'));
 					var amt = Number($("#pf-amount").val());
+					var quantity = 1;
+
+					if ( $("#pf-quantity").length ) {
+						quantity = $("#pf-quantity").val();
+					}
+
+					amt = amt * quantity;
+
 					if (min_amount > 0 && amt < min_amount) {
 						$("#pf-min-val-warn").text( "Amount cannot be less than the minimum amount");
 						return false;

includes/classes/class-form-shortcode.php

@@ -390,6 +390,8 @@ public function get_amount_field() {
 				$html[] = '<small>Transaction Charge: <b class="pf-txncharge"></b>, Total:<b  class="pf-txntotal"></b></small>';
 			}
 
+			$html[] = '<div style="color:red;"><small id="pf-min-val-warn"></small></div>';
+
 		$html[] = '</div></div>';
 
 		return implode( '', $html );

paystack-forms.php

@@ -3,7 +3,7 @@
   Plugin Name:  Payment Forms for Paystack
   Plugin URI:   https://github.com/PaystackHQ/Wordpress-Payment-forms-for-Paystack
   Description:  Payment Forms for Paystack allows you create forms that will be used to bill clients for goods and services via Paystack.
-  Version:      32
+  Version:      4.0.4
   Author:       Paystack
   Author URI:   http://paystack.com
   License:      GPL-2.0+
@@ -16,7 +16,7 @@
 define( 'PFF_PAYSTACK_PLUGIN_PATH', plugin_dir_path( __FILE__ ) );
 define( 'PFF_PAYSTACK_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
 define( 'PFF_PAYSTACK_MAIN_FILE', __FILE__ );
-define( 'PFF_PAYSTACK_VERSION', '4.0.3' );
+define( 'PFF_PAYSTACK_VERSION', '4.0.4' );
 define( 'PFF_PAYSTACK_TABLE', 'paystack_forms_payments' );
 define( 'PFF_PLUGIN_BASENAME', plugin_basename(__FILE__) );
 define( 'PFF_PLUGIN_NAME', 'pff-paystack' );

readme.txt

@@ -4,7 +4,7 @@ Donate link: https://paystack.com/demo
 Tags: paystack, recurrent payments, donation, forms, payments
 Requires at least: 5.0
 Tested up to: 6.7
-Stable tag: 4.0.3
+Stable tag: 4.0.4
 Requires PHP: 7.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -92,10 +92,11 @@ Yes you can! Join in on our [GitHub repository](https://github.com/PaystackOSS/p
 
 == Changelog ==
 = 4.0.4 =
-* Add better sanitization to form fields
+* Fixing the UAT error with the amount field and minimum amounts.
 
 = 4.0.3 =
 * Security update - Add extra sanitization to form fields
+* Improved input sanitization
 
 = 4.0.2 =
 * Security Update - Adding in sanitization to the Payments List order variable.