Merge pull request #120 from degica/20240731-examine-current-currency…

…-only Examine currency before recognizing as an available payment method
degica · Aug 2, 2024 · 87c6b4b · 87c6b4b
2 parents f93a6a8 + 95fc946
commit 87c6b4b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/class-wc-settings-page-komoju.php b/class-wc-settings-page-komoju.php
@@ -365,12 +365,23 @@ private function fetch_all_payment_methods()
         try {
             $all_payment_methods = $api->paymentMethods();
             $methods_by_slug     = [];
+            $wc_currency         = get_woocommerce_currency();
 
             foreach ($all_payment_methods as $payment_method) {
-                $slug = $payment_method['type_slug'];
-                if (isset($methods_by_slug[$slug])) {
-                    continue;
+                $slug        = $payment_method['type_slug'];
+                $pm_currency = $payment_method['currency'];
+
+                // If $slug is not set, register
+                if (!isset($methods_by_slug[$slug])) {
+                    $methods_by_slug[$slug] = $payment_method;
+                } else {
+                    // If $slug is already registered and
+                    // the payment currency matches the WooCommerce currency then override it
+                    if ($pm_currency === $wc_currency) {
+                        $methods_by_slug[$slug] = $payment_method;
+                    }
                 }
+
                 $methods_by_slug[$slug] = $payment_method;
             }
 

diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js
@@ -49,6 +49,7 @@ Cypress.Commands.add('installWordpress', () => {
 
 Cypress.Commands.add('signinToWordpress', () => {
   cy.visit('/wp-admin');
+  cy.wait(1000);
 
   cy.get('body').then(($body) => {
     if (!$body.find('#loginform').length) {
@@ -60,6 +61,7 @@ Cypress.Commands.add('signinToWordpress', () => {
     cy.get('#user_pass').should('be.visible').clear().type('deg1kaX7reme!');
     cy.get('#wp-submit').should('be.visible').click();
   });
+  cy.wait(1000);
 });
 
 Cypress.Commands.add('installWooCommerce', () => {