From a123a63afe69feaea3315ca75eaac154539f402c Mon Sep 17 00:00:00 2001
From: dinamiko <e.castells@inpsyde.com>
Date: Thu, 29 Jul 2021 15:33:16 +0200
Subject: [PATCH 1/2] Use `get_icon` to display credit card gateway icons

---
 .../src/Gateway/class-creditcardgateway.php      | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/modules/ppcp-wc-gateway/src/Gateway/class-creditcardgateway.php b/modules/ppcp-wc-gateway/src/Gateway/class-creditcardgateway.php
index 6bb790518..1bc7938f8 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/class-creditcardgateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/class-creditcardgateway.php
@@ -236,21 +236,16 @@ public function replace_credit_card_cvv_label( string $translation, string $text
 	}
 
 	/**
-	 * Returns the title of the gateway.
+	 * Returns the icons of the gateway.
 	 *
 	 * @return string
 	 */
-	public function get_title() {
+	public function get_icon() {
+		$icon = parent::get_icon();
 
-		//phpcs:disable WordPress.Security.NonceVerification.Recommended
-		if ( ! is_checkout() || ( is_ajax() && isset( $_GET['wc-ajax'] ) && 'update_order_review' !== $_GET['wc-ajax'] ) ) {
-			return parent::get_title();
-		}
-		//phpcs:enable WordPress.Security.NonceVerification.Recommended
-		$title = parent::get_title();
 		$icons = $this->config->has( 'card_icons' ) ? (array) $this->config->get( 'card_icons' ) : array();
 		if ( empty( $icons ) ) {
-			return $title;
+			return $icon;
 		}
 
 		$title_options = $this->card_labels();
@@ -264,7 +259,8 @@ class="ppcp-card-icon"
 			},
 			$icons
 		);
-		return $title . implode( '', $images );
+
+		return implode( '', $images );
 	}
 
 	/**

From 00cc01376717e55204a8c60226bfab290053d571 Mon Sep 17 00:00:00 2001
From: dinamiko <e.castells@inpsyde.com>
Date: Tue, 3 Aug 2021 13:00:28 +0200
Subject: [PATCH 2/2] Remove double slash in icons src

---
 modules/ppcp-wc-gateway/src/Gateway/class-creditcardgateway.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ppcp-wc-gateway/src/Gateway/class-creditcardgateway.php b/modules/ppcp-wc-gateway/src/Gateway/class-creditcardgateway.php
index 1bc7938f8..86604af4b 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/class-creditcardgateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/class-creditcardgateway.php
@@ -253,7 +253,7 @@ public function get_icon() {
 			function ( string $type ) use ( $title_options ): string {
 				return '<img
                  title="' . esc_attr( $title_options[ $type ] ) . '"
-                 src="' . esc_url( $this->module_url ) . '/assets/images/' . esc_attr( $type ) . '.svg"
+                 src="' . esc_url( $this->module_url ) . 'assets/images/' . esc_attr( $type ) . '.svg"
                  class="ppcp-card-icon"
                 > ';
 			},