Merge pull request #4 from yabacon/fix/addpaystackcharge

Improved additional charge calculation

Author: Kendysond

admin/class-paystack-forms-admin.php

@@ -297,7 +297,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%;">

public/class-paystack-forms-public.php

@@ -40,6 +40,28 @@ public function enqueue_scripts() {
 	}
 
 }
+
+define('KKD_PFF_PAYSTACK_PERCENTAGE', 0.015);
+define('KKD_PFF_PAYSTACK_CROSSOVER_TOTAL', 250000);
+define('KKD_PFF_PAYSTACK_ADDITIONAL_CHARGE', 10000);
+define('KKD_PFF_PAYSTACK_LOCAL_CAP', 200000);
+
+define('KKD_PFF_PAYSTACK_CHARGE_DIVIDER', floatval(1-PAYSTACK_PERCENTAGE));
+define('KKD_PFF_PAYSTACK_CROSSOVER_AMOUNT', intval((PAYSTACK_CROSSOVER_TOTAL*PAYSTACK_CHARGE_DIVIDER)-PAYSTACK_ADDITIONAL_CHARGE));
+define('KKD_PFF_PAYSTACK_FLATLINE_AMOUNT_PLUS_CHARGE', intval((PAYSTACK_LOCAL_CAP-PAYSTACK_ADDITIONAL_CHARGE)/PAYSTACK_PERCENTAGE));
+define('KKD_PFF_PAYSTACK_FLATLINE_AMOUNT', PAYSTACK_FLATLINE_AMOUNT_PLUS_CHARGE - PAYSTACK_LOCAL_CAP);
+
+function kkd_pff_paystack_add_paystack_charge($amount)
+{
+    $amountinkobo = $amount * 100;
+    if ($amountinkobo > PAYSTACK_FLATLINE_AMOUNT)
+        return ($amountinkobo + PAYSTACK_LOCAL_CAP)/100;
+    elseif ($amountinkobo > PAYSTACK_CROSSOVER_AMOUNT)
+        return (intval(($amountinkobo + PAYSTACK_ADDITIONAL_CHARGE) / PAYSTACK_CHARGE_DIVIDER))/100;
+    else
+        return (intval($amountinkobo / PAYSTACK_CHARGE_DIVIDER))/100;
+}
+
 add_filter ("wp_mail_content_type", "kkd_pff_paystack_mail_content_type");
 function kkd_pff_paystack_mail_content_type() {
 	return "text/html";
@@ -993,18 +1015,7 @@ function kkd_pff_paystack_submit_action() {
 		}
 	}
 	if ($txncharge == 'customer') {
-		$percent = (1.55/100)*$amount;
-		if ($percent > 2000) {
-			$newamount =  $amount + 2000;
-		}else{
-			if ($amount > 2500) {
-				$newamount =  $amount + $percent+100;
-			}else{
-				$newamount =  $amount + $percent;
-			}
-		}
-
-		$amount = $newamount;
+		$amount = kkd_pff_paystack_add_paystack_charge($amount);
 	}
 	$maxFileSize = $filelimit * 1024 * 1024;
 
@@ -1276,18 +1287,7 @@ function kkd_pff_paystack_confirm_payment() {
 
 
 								if ($txncharge == 'customer') {
-									$percent = (1.55/100)*$amount;
-									if ($percent > 2000) {
-										$newamount =  $amount + 2000;
-									}else{
-										if ($amount > 2500) {
-											$newamount =  $amount + $percent+100;
-										}else{
-											$newamount =  $amount + $percent;
-										}
-									}
-
-									$amount = $newamount;
+									$amount = kkd_pff_paystack_add_paystack_charge($amount);
 								}
 								if( $amount !=  $amount_paid ) {
 									$message = "Invalid amount Paid. Amount required is ".$currency."<b>".number_format($amount)."</b>";