Merge pull request #81 from Segtel1/master

Changed amount approximation to round up to 2 dp + Fixed invalid amount issues

Author: lukman-paystack

public/class-paystack-forms-public-for-old-themes.php

@@ -1642,23 +1642,11 @@ function kkd_pff_paystack_confirm_payment()
                         $result = "success";
                     // kkd_pff_paystack_send_receipt($currency,$amount,$name,$payment_array->email,$code,$metadata)
                     } else {
-                        $usequantity = get_post_meta($payment_array->post_id, '_usequantity', true);
-                        if ($usequantity == 'no') {
-                            $oamount = (int)str_replace(' ', '', $amount);
-                        } else {
-                            $quantity = $_POST["quantity"];
-                            $unitamount = (int)str_replace(' ', '', $amount);
-                            $oamount = $quantity*$unitamount;
-                        }
                         if ($txncharge == 'customer') {
                             if ($minimum == 0 && $amount != 0) {
                                 $oamount = kkd_pff_paystack_add_paystack_charge($oamount);
                             }
                         }
-
-                        // if ($txncharge == 'customer') {
-                        //     $amount = kkd_pff_paystack_add_paystack_charge($amount);
-                        // }
                         if ($oamount !=  $amount_paid) {
                             // echo $oamount. ' - '.$amount_paid;
                             $message = "Invalid amount Paid. Amount required is ".$currency."<b>".number_format($oamount)."</b>";

public/class-paystack-forms-public.php

@@ -137,15 +137,15 @@ public function add_for_kobo($amountinkobo)
         if ($amountinkobo > $this->flatline) {
             return $amountinkobo + $this->cap;
         } elseif ($amountinkobo > $this->crossover) {
-            return ceil(($amountinkobo + $this->additional_charge) / $this->charge_divider);
+            return round((($amountinkobo + $this->additional_charge) / $this->charge_divider),2);
         } else {
-            return ceil($amountinkobo / $this->charge_divider);
+            return round(($amountinkobo / $this->charge_divider),2);
         }
     }
 
     public function add_for_ngn($amountinngn)
     {
-        return $this->add_for_kobo(ceil($amountinngn * 100)) / 100;
+        return $this->add_for_kobo(round(($amountinngn * 100),2)) / 100;
     }
 }
 
@@ -2950,24 +2950,6 @@ function kkd_pff_paystack_confirm_payment()
                         $result = "success";
                         // kkd_pff_paystack_send_receipt($currency,$amount,$name,$payment_array->email,$code,$metadata)
                     } else {
-                        $usequantity = get_post_meta($payment_array->post_id, '_usequantity', true);
-                        if ($usequantity == 'no') {
-                            $oamount = (int) str_replace(' ', '', $amount);
-                        } else {
-                            $quantity = $_POST["quantity"];
-                            $unitamount = (int) str_replace(' ', '', $amount);
-                            $oamount = $quantity * $unitamount;
-                        }
-                        if ($txncharge == 'customer') {
-                            if ($minimum == 0 && $amount != 0) {
-                                $oamount = kkd_pff_paystack_add_paystack_charge($oamount);
-                            }
-                        }
-
-
-                        // if ($txncharge == 'customer') {
-                        //     $amount = kkd_pff_paystack_add_paystack_charge($amount);
-                        // }
                         if ($oamount !=  $amount_paid) {
                             // echo $oamount. ' - '.$amount_paid;
                             $message = "Invalid amount Paid. Amount required is " . $currency . "<b>" . number_format($oamount) . "</b>";