Native gateway icon feature for all gateways (233)

modules/ppcp-blocks/resources/js/checkout-block.js

@@ -802,9 +802,24 @@ if ( block_enabled ) {
 			);
 		}
 
+		const PaypalLabel = ( { components, config } ) => {
+			const { PaymentMethodIcons } = components;
+
+			return (
+				<>
+					<span
+						dangerouslySetInnerHTML={ {
+							__html: config.title,
+						} }
+					/>
+					<PaymentMethodIcons icons={ config.icon } align="right" />
+				</>
+			);
+		};
+
 		registerPaymentMethod( {
 			name: config.id,
-			label: <div dangerouslySetInnerHTML={ { __html: config.title } } />,
+			label: <PaypalLabel config={ config } />,
 			content: descriptionElement,
 			edit: descriptionElement,
 			placeOrderButtonLabel: config.placeOrderButtonText,

modules/ppcp-blocks/src/PayPalPaymentMethod.php

@@ -262,6 +262,13 @@ public function get_payment_method_data() {
 		return array(
 			'id'                          => $this->gateway->id,
 			'title'                       => $this->gateway->title,
+			'icon'                        => array(
+				array(
+					'id'  => 'paypal',
+					'alt' => 'PayPal',
+					'src' => $this->gateway->icon,
+				),
+			),
 			'description'                 => $this->gateway->description,
 			'smartButtonsEnabled'         => $smart_buttons_enabled,
 			'placeOrderEnabled'           => $place_order_enabled,

modules/ppcp-wc-gateway/services.php

@@ -121,6 +121,7 @@
 			$container->get( 'api.endpoint.payment-tokens' ),
 			$container->get( 'vaulting.vault-v3-enabled' ),
 			$container->get( 'vaulting.wc-payment-tokens' ),
+			$container->get( 'wcgateway.url' ),
 			$container->get( 'wcgateway.settings.admin-settings-enabled' )
 		);
 	},
@@ -1494,7 +1495,8 @@ static function ( ContainerInterface $container ): string {
 			$container->get( 'wcgateway.pay-upon-invoice-helper' ),
 			$container->get( 'wcgateway.checkout-helper' ),
 			$container->get( 'onboarding.state' ),
-			$container->get( 'wcgateway.processor.refunds' )
+			$container->get( 'wcgateway.processor.refunds' ),
+			$container->get( 'wcgateway.url' )
 		);
 	},
 	'wcgateway.fraudnet-source-website-id'                 => static function ( ContainerInterface $container ): FraudNetSourceWebsiteId {

modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php

@@ -202,6 +202,13 @@ class PayPalGateway extends \WC_Payment_Gateway {
 	 */
 	private $wc_payment_tokens;
 
+	/**
+	 * The module URL
+	 *
+	 * @var string
+	 */
+	private $module_url;
+
 	/**
 	 * Whether settings module is enabled.
 	 *
@@ -232,6 +239,7 @@ class PayPalGateway extends \WC_Payment_Gateway {
 	 * @param PaymentTokensEndpoint    $payment_tokens_endpoint Payment tokens endpoint.
 	 * @param bool                     $vault_v3_enabled Whether Vault v3 module is enabled.
 	 * @param WooCommercePaymentTokens $wc_payment_tokens WooCommerce payment tokens.
+	 * @param string                   $module_url The module URL.
 	 * @param bool                     $admin_settings_enabled Whether settings module is enabled.
 	 */
 	public function __construct(
@@ -255,6 +263,7 @@ public function __construct(
 		PaymentTokensEndpoint $payment_tokens_endpoint,
 		bool $vault_v3_enabled,
 		WooCommercePaymentTokens $wc_payment_tokens,
+		string $module_url,
 		bool $admin_settings_enabled
 	) {
 		$this->id                          = self::ID;
@@ -279,6 +288,8 @@ public function __construct(
 		$this->payment_tokens_endpoint     = $payment_tokens_endpoint;
 		$this->vault_v3_enabled            = $vault_v3_enabled;
 		$this->wc_payment_tokens           = $wc_payment_tokens;
+		$this->module_url                  = $module_url;
+		$this->icon                        = apply_filters( 'woocommerce_paypal_payments_paypal_gateway_icon', esc_url( $this->module_url ) . 'assets/images/paypal.svg' );
 		$this->admin_settings_enabled      = $admin_settings_enabled;
 
 		$default_support = array(

modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PayUponInvoiceGateway.php

@@ -103,6 +103,13 @@ class PayUponInvoiceGateway extends WC_Payment_Gateway {
 	 */
 	protected $refund_processor;
 
+	/**
+	 * The module URL
+	 *
+	 * @var string
+	 */
+	private $module_url;
+
 	/**
 	 * PayUponInvoiceGateway constructor.
 	 *
@@ -116,6 +123,7 @@ class PayUponInvoiceGateway extends WC_Payment_Gateway {
 	 * @param CheckoutHelper              $checkout_helper The checkout helper.
 	 * @param State                       $state The onboarding state.
 	 * @param RefundProcessor             $refund_processor The refund processor.
+	 * @param string                      $module_url The module URL.
 	 */
 	public function __construct(
 		PayUponInvoiceOrderEndpoint $order_endpoint,
@@ -127,7 +135,8 @@ public function __construct(
 		PayUponInvoiceHelper $pui_helper,
 		CheckoutHelper $checkout_helper,
 		State $state,
-		RefundProcessor $refund_processor
+		RefundProcessor $refund_processor,
+		string $module_url
 	) {
 		$this->id = self::ID;
 
@@ -157,6 +166,8 @@ public function __construct(
 		$this->transaction_url_provider = $transaction_url_provider;
 		$this->pui_helper               = $pui_helper;
 		$this->checkout_helper          = $checkout_helper;
+		$this->module_url               = $module_url;
+		$this->icon                     = apply_filters( 'woocommerce_paypal_payments_pay_upon_invoice_gateway_icon', esc_url( $this->module_url ) . 'assets/images/ratepay.svg' );
 
 		$this->state = $state;
 		if ( $state->current_state() === State::STATE_ONBOARDED ) {

tests/PHPUnit/WcGateway/Gateway/PayUponInvoice/PayUponInvoiceGatewayTest.php

@@ -64,7 +64,8 @@ public function setUp(): void
 			$this->pui_helper,
 			$this->checkout_helper,
 			$this->state,
-			$this->refund_processor
+			$this->refund_processor,
+			''
 		);
 	}
 

tests/PHPUnit/WcGateway/Gateway/WcGatewayTest.php

@@ -124,6 +124,7 @@ function ($id) {
 			$this->paymentTokensEndpoint,
 			$this->vaultV3Enabled,
 			$this->wcPaymentTokens,
+			'',
 			false
 		);
 	}