Merge pull request #21 from nofrixion/develop

PLU-20: moved 'getPispProviders()' call.

Author: james-nofrixion

nofrixion-for-woocommerce.php

@@ -220,8 +220,10 @@ public function processAjaxPaymentRequestInit()
 	}
 
 	/**
-	 * Handles the AJAX callback from the Payment Request on the checkout page.
+	 * Handles the AJAX callback from the Payment Request on the checkout page. 
+	 * TODO - Don't think this runs any more, confirm and remove.
 	 */
+
 	public function processAjaxPaymentRequestUpdatePm()
 	{
 

src/Gateway/NoFrixionPisp.php

@@ -31,8 +31,6 @@ public function __construct()
 		// Admin facing title and description.
 		$this->method_title       = 'NoFrixion PISP';
 		$this->method_description = __('NoFrixion gateway supporting all available PISP banks.', 'nofrixion-for-woocommerce');
-
-		$this->pispProviders = $this->getPayByBankSettings();
 	}
 
 	// Handles MoneyMoov API success webhook that confirms payments received.
@@ -75,6 +73,9 @@ public function getPayByBankSettings(): array
 
 	public function payment_fields()
 	{
+		if (empty($this->pispProviders)){
+			$this->pispProviders = $this->getPayByBankSettings();
+		}
 
 		echo '<div class="nf-pisp-payment-options">';
 		foreach ($this->pispProviders as $provider) {
@@ -137,6 +138,9 @@ public function process_payment($orderId)
 		Logger::debug('Selected pisp provider: ' . $pispProviderId);
 
 		// Check for allowed pisp providers, store provider id to order.
+		if (empty($this->pispProviders)){
+			$this->pispProviders = $this->getPayByBankSettings();
+		}
 		$allowedPispProviders = array_column($this->pispProviders, 'personalInstitutionID');
 		if (!in_array($pispProviderId, $allowedPispProviders)) {
 			$msg_no_provider = __('No valid pisp provider found, aborting.', 'nofrixion-for-woocommerce');