Version 5.7.5 Release (#80)

Co-authored-by: gertrude-paystack <110245619+gertrude-paystack@users.noreply.github.com>

Author: tubiz

assets/images/paystack-ke.png

@@ -171,8 +171,8 @@ jQuery( function( $ ) {
 
 		let amount = Number( wc_paystack_params.amount );
 
-		let paystack_callback = function( response ) {
-			$form.append( '<input type="hidden" class="paystack_txnref" name="paystack_txnref" value="' + response.trxref + '"/>' );
+		let paystack_callback = function( transaction ) {
+			$form.append( '<input type="hidden" class="paystack_txnref" name="paystack_txnref" value="' + transaction.reference + '"/>' );
 			paystack_submit = true;
 
 			$form.submit();
@@ -195,14 +195,14 @@ jQuery( function( $ ) {
 			amount: amount,
 			ref: wc_paystack_params.txnref,
 			currency: wc_paystack_params.currency,
-			callback: paystack_callback,
 			subaccount: subaccount_code,
 			bearer: charges_account,
 			transaction_charge: transaction_charges,
 			metadata: {
 				custom_fields: wcPaystackCustomFields(),
 			},
-			onClose: function() {
+			onSuccess: paystack_callback,
+			onCancel: () => {
 				$( '#wc-paystack-form' ).show();
 				$( this.el ).unblock();
 			}
@@ -215,12 +215,8 @@ jQuery( function( $ ) {
 			}
 		}
 
-		let handler = PaystackPop.setup( paymentData );
-
-		handler.openIframe();
-
-		return false;
-
+		const paystack = new PaystackPop();
+		paystack.newTransaction( paymentData );
 	}
 
 } );

assets/js/paystack.js

@@ -587,8 +587,8 @@ public function payment_scripts() {
 				}
 			}
 
-			update_post_meta( $order_id, '_paystack_txn_ref', $txnref );
-
+			$order->update_meta_data( '_paystack_txn_ref', $txnref );
+			$order->save();
 		}
 
 		wp_localize_script( 'wc_paystack', 'wc_paystack_params', $paystack_params );

assets/js/paystack.min.js

@@ -97,11 +97,15 @@ public function process_subscription_payment( $order, $amount ) {
 
 		$order_id = $order->get_id();
 
-		$auth_code = get_post_meta( $order_id, '_paystack_token', true );
+		$paystack_token = $order->get_meta( '_paystack_token' );
 
-		if ( $auth_code ) {
+		if ( ! empty( $paystack_token ) ) {
 
 			$order_amount = $amount * 100;
+			$txnref       = $order_id . '_' . time();
+
+			$order->update_meta_data( '_paystack_txn_ref', $txnref );
+			$order->save();
 
 			$paystack_url = 'https://api.paystack.co/transaction/charge_authorization';
 
@@ -112,11 +116,21 @@ public function process_subscription_payment( $order, $amount ) {
 
 			$metadata['custom_fields'] = $this->get_custom_fields( $order_id );
 
+			if ( strpos( $paystack_token, '###' ) !== false ) {
+				$payment_token  = explode( '###', $paystack_token );
+				$auth_code      = $payment_token[0];
+				$customer_email = $payment_token[1];
+			} else {
+				$auth_code      = $paystack_token;
+				$customer_email = $order->get_billing_email();
+			}
+
 			$body = array(
-				'email'              => $order->get_billing_email(),
+				'email'              => $customer_email,
 				'amount'             => $order_amount,
 				'metadata'           => $metadata,
 				'authorization_code' => $auth_code,
+				'reference'          => $txnref,
 			);
 
 			$args = array(