Merge pull request #52 from PaystackHQ/improve/add-namespace

Namespace variable name to avoid conflicts

Author: steveamaza

README.txt

@@ -4,7 +4,7 @@ Donate link: https://paystack.com/demo
 Tags: paystack, recurrent payments, nigeria, mastercard, visa, target, Naira, payments, verve, donation, church, NGO, form, contact form 7, form
 Requires at least: 3.1
 Tested up to: 5.0
-Stable tag: 3.3.0
+Stable tag: 3.3.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -94,9 +94,9 @@ Yes you can! Join in on our [GitHub repository](https://github.com/PaystackHQ/wo
 == Changelog ==
 = 3.3.0 =
 * Major fixes to convenience fee option!
-* - Now know as 'Additional Charge' to clarify it does not _always_ pass transaction fees
-* - Now properly pass fee settings to both the frontend and backend
-* - Now properly considers fee when it comes to quantified payments
+* Now known as 'Additional Charge' to clarify it does not _always_ pass transaction fees
+* Now properly pass fee settings to both the frontend and backend
+* Now properly considers fee when it comes to quantified payments
 = 3.2.1 =
 * Fixes an issue where leading zeroes were stripped
 = 3.2.0 =

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:      3.3.0
+  Version:      3.3.1
   Author:       Paystack
   Author URI:   http://paystack.com
   License:      GPL-2.0+

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

@@ -49,7 +49,7 @@ public function enqueue_scripts()
         wp_register_script('Paystack', 'https://js.paystack.co/v1/inline.js', false, '1');
         wp_enqueue_script('Paystack');
         wp_enqueue_script('paystack_frontend', plugin_dir_url(__FILE__) . 'js/paystack-forms-public.js', false, $this->version);
-        wp_localize_script('paystack_frontend', 'settings', array('key'=> Kkd_Pff_Paystack_Public::fetchPublicKey(), 'fee'=>Kkd_Pff_Paystack_Public::fetchFeeSettings()), $this->version, true, true);
+        wp_localize_script('paystack_frontend', 'kkd_pff_settings', array('key'=> Kkd_Pff_Paystack_Public::fetchPublicKey(), 'fee'=>Kkd_Pff_Paystack_Public::fetchFeeSettings()), $this->version, true, true);
     }
 }
 

public/class-paystack-forms-public.php

@@ -48,7 +48,7 @@ public function enqueue_scripts()
         wp_register_script('Paystack', 'https://js.paystack.co/v1/inline.js', false, '1');
         wp_enqueue_script('Paystack');
         wp_enqueue_script('paystack_frontend', plugin_dir_url(__FILE__) . 'js/paystack-forms-public.js', array( 'jquery' ), $this->version, true, true);
-        wp_localize_script('paystack_frontend', 'settings', array('key'=> Kkd_Pff_Paystack_Public::fetchPublicKey(), 'fee'=>Kkd_Pff_Paystack_Public::fetchFeeSettings()), $this->version, true, true);
+        wp_localize_script('paystack_frontend', 'kkd_pff_settings', array('key'=> Kkd_Pff_Paystack_Public::fetchPublicKey(), 'fee'=>Kkd_Pff_Paystack_Public::fetchFeeSettings()), $this->version, true, true);
     }
 }
 

public/js/paystack-forms-public.js

@@ -212,10 +212,10 @@ function KkdPffPaystackFee() {
           } else {
             var obj = new KkdPffPaystackFee();
 
-            obj.withAdditionalCharge(settings.fee.adc);
-            obj.withThreshold(settings.fee.ths);
-            obj.withCap(settings.fee.cap);
-            obj.withPercentage(settings.fee.prc);
+            obj.withAdditionalCharge(kkd_pff_settings.fee.adc);
+            obj.withThreshold(kkd_pff_settings.fee.ths);
+            obj.withCap(kkd_pff_settings.fee.cap);
+            obj.withPercentage(kkd_pff_settings.fee.prc);
             if(quant){
               transaction_amount = transaction_amount * quant;
             }
@@ -381,7 +381,7 @@ function KkdPffPaystackFee() {
                               if (data.plan == "none" || data.plan == "" || data.plan == "no") {
                                   var handler = PaystackPop.setup(
                                       {
-                                          key: settings.key,
+                                          key: kkd_pff_settings.key,
                                           email: data.email,
                                           amount: data.total,
                                           firstname: firstName,
@@ -451,7 +451,7 @@ function KkdPffPaystackFee() {
                               } else {
                                   var handler = PaystackPop.setup(
                                       {
-                                          key: settings.key,
+                                          key: kkd_pff_settings.key,
                                           email: data.email,
                                           plan: data.plan,
                                           firstname: firstName,
@@ -560,7 +560,7 @@ function KkdPffPaystackFee() {
                                 if (data.plan == "none" || data.plan == "" || data.plan == "no") {
                                     var handler = PaystackPop.setup(
                                         {
-                                            key: settings.key,
+                                            key: kkd_pff_settings.key,
                                             email: data.email,
                                             amount: data.total,
                                             firstname: firstName,
@@ -630,7 +630,7 @@ function KkdPffPaystackFee() {
                                 } else {
                                     var handler = PaystackPop.setup(
                                         {
-                                            key: settings.key,
+                                            key: kkd_pff_settings.key,
                                             email: data.email,
                                             plan: data.plan,
                                             firstname: firstName,