Updating the confirm payment to allowing the checking of the retry action as well.

Author: krugazul

includes/classes/class-confirm-payment.php

@@ -19,7 +19,7 @@ class Confirm_Payment {
 	/**
 	 * The helpers class.
 	 *
-	 * @var object
+	 * @var \paystack\payment_forms\Helpers
 	 */
 	public $helpers;
 
@@ -65,6 +65,14 @@ class Confirm_Payment {
 	 */
 	protected $oamount = 0;
 
+	/**
+	 * The transaction column to update.
+	 * Defaults to 'txn_code' and 'txn_code_2' when a payment retry is triggered.
+	 *
+	 * @var integer
+	 */
+	protected $txn_column = 'txn_code';
+
 	/**
 	 * Constructor
 	 */
@@ -74,13 +82,12 @@ public function __construct() {
 	}
 
 	/**
-	 * Undocumented function
+	 * Sets up our data for processing.
 	 *
 	 * @return void
 	 */
 	protected function setup_data( $payment ) {
 		$this->payment_meta = $payment;
-		$this->helpers      = new Helpers();
 		$this->meta         = $this->helpers->parse_meta_values( get_post( $this->payment_meta->post_id ) );
 		$this->amount       = $this->payment_meta->amount;
 		$this->oamount      = $this->meta['amount'];
@@ -103,13 +110,18 @@ public function confirm_payment() {
 
 			exit( wp_json_encode( $response ) );
 		}
+
+		// If this is a retry payment then set the colum accordingly.
+		if ( isset( $_POST['retry'] ) ) {
+			$this->txn_column = 'txn_code_2';
+		}
 
-	
-		$code   = sanitize_text_field( $_POST['code'] );
-		$record = $this->helpers->get_db_record( $code );
+		$this->helpers = new Helpers();
+		$code          = sanitize_text_field( $_POST['code'] );
+		$record        = $this->helpers->get_db_record( $code, $this->txn_column );
 
 		if ( false !== $record ) {
-			
+
 			$this->setup_data( $record );
 
 			// Verify our transaction with the Paystack API.
@@ -221,7 +233,6 @@ protected function update_payment_dates( $data ) {
 			'result' => 'failed',
 		];
 
-		$customer_code  = $data->customer->customer_code;
 		$amount_paid    = $data->amount / 100;
 		$paystack_ref   = $data->reference;
 		$paid_at        = $data->transaction_date;
@@ -233,7 +244,7 @@ protected function update_payment_dates( $data ) {
 					'amount'  => $amount_paid,
 					'paid_at' => $paid_at,
 				),
-				array( 'txn_code' => $paystack_ref )
+				array( $this->txn_column => $paystack_ref )
 			);
 			$return = [
 				'message' => $this->meta['successmsg'],
@@ -249,7 +260,7 @@ protected function update_payment_dates( $data ) {
 						'amount'  => $amount_paid,
 						'paid_at' => $paid_at,
 					),
-					array( 'txn_code' => $paystack_ref )
+					array( $this->txn_column => $paystack_ref )
 				);
 				$return = [
 					'message' => $this->meta['successmsg'],
@@ -268,7 +279,7 @@ protected function update_payment_dates( $data ) {
 							'paid'    => 1,
 							'paid_at' => $paid_at,
 						),
-						array( 'txn_code' => $paystack_ref )
+						array( $this->txn_column => $paystack_ref )
 					);
 					$return = [
 						'message' => $this->meta['successmsg'],

includes/classes/class-email-invoice.php

@@ -23,11 +23,18 @@ class Email_Invoice extends Email {
 	 */
 	public $slug = 'invoice';
 
+	/**
+	 * The form in which this was submitted.
+	 *
+	 * @var string
+	 */
+	public $referer_url = '';
+
 	/**
 	 * Constructor
 	 */
 	public function __construct() {
-		add_action( 'pff_paystack_send_invoice', [ $this, 'send_invoice' ], 10, 6 );
+		add_action( 'pff_paystack_send_invoice', [ $this, 'send_invoice' ], 10, 7 );
 	}
 
 	/**
@@ -41,13 +48,15 @@ public function __construct() {
 	 * @param string $code
 	 * @return void
 	 */
-	public function send_invoice( $form_id, $currency, $amount, $name, $email, $code ) {
-		$this->form_id    = $form_id;
-		$this->amount     = $amount;
-		$this->currency   = $currency;
-		$this->code       = $code;
-		$this->name       = $name;
-		$this->email      = stripslashes( $email );
+	public function send_invoice( $form_id, $currency, $amount, $name, $email, $code, $referer_url ) {
+		$this->form_id     = $form_id;
+		$this->amount      = $amount;
+		$this->currency    = $currency;
+		$this->code        = $code;
+		$this->name        = $name;
+		$this->email       = stripslashes( $email );
+		$this->referer_url = $referer_url;
+
 		/* Translators: %1$s is the currency code, %2$s is the formatted amount */
 		$this->subject = sprintf(
 			__( 'Payment Invoice for %1$s %2$s', 'text-domain' ),
@@ -163,7 +172,7 @@ public function get_html_body() {
 																<tbody>
 																	<tr>
 																		<td class="font_default" style="padding:12px 24px;font-family:Helvetica,Arial,sans-serif;font-size:16px;mso-line-height-rule:exactly;text-align:center;vertical-align:middle;-webkit-border-radius:4px;border-radius:4px;background-color:#666">
-																			<a target="_blank" href="<?php echo esc_url( get_permalink( $this->form_id ) . '/?code=' . $this->code ); ?>" style="display:block;text-decoration:none;font-family:Helvetica,Arial,sans-serif;color:#fff;font-weight:bold;text-align:center">
+																			<a target="_blank" href="<?php echo esc_url( $this->referer_url . '?code=' . $this->code ); ?>" style="display:block;text-decoration:none;font-family:Helvetica,Arial,sans-serif;color:#fff;font-weight:bold;text-align:center">
 																				<span style="text-decoration:none;color:#fff;text-align:center;display:block">
 																					<?php echo esc_html__( 'Try Again', 'pff-paystack' ); ?>
 																				</span>

includes/classes/class-form-submit.php

@@ -73,6 +73,13 @@ class Form_Submit {
 	 */
 	protected $fixed_metadata = array();
 
+	/**
+	 * The URL from where this was submitted.
+	 *
+	 * @var string
+	 */
+	protected $referer_url = '';
+
 	/**
 	 * Constructor
 	 */
@@ -133,6 +140,11 @@ protected function setup_data() {
 		if ( ! isset( $this->form_data['pf-quantity'] ) ) {
 			$this->form_data['pf-quantity'] = 1;
 		}
+
+		if ( isset( $_SERVER['HTTP_REFERER'] ) ) {
+			// Get the referer URL
+			$this->referer_url = sanitize_url( $_SERVER['HTTP_REFERER'] );
+		}
 	}
 
 	/**
@@ -343,7 +355,7 @@ public function submit_action() {
 		 * 11: Email_Invoice::send_invoice();
 		 */
 		if ( 'yes' === $this->meta['sendinvoice'] ) {
-			do_action( 'pff_paystack_send_invoice', $this->form_id, $this->meta['currency'], $insert['amount'], $this->form_data['pf-fname'], $insert['email'], $code );
+			do_action( 'pff_paystack_send_invoice', $this->form_id, $this->meta['currency'], $insert['amount'], $this->form_data['pf-fname'], $insert['email'], $code, $this->referer_url );
 		}
 
 		$transaction_charge = (int) $this->meta['merchantamount'];