eventespresso / event-espresso-core

PaymentMethods/PayPalCommerce/domain/Domain.php

Indentation +177 added lines, -177 removed lines

@@ -17,181 +17,181 @@
  */
 class Domain
 {
-    /**
-     * Name of the extra meta key that stores this PM options as one meta.
-     */
-    public const META_KEY_PAYPAL_DATA = 'paypal_data';
-    /**
-     * Name of the extra meta key that stores this PM options as one meta.
-     */
-    public const META_KEY_PAYPAL_DATA_SANDBOX = 'paypal_data_sandbox';
-
-    /**
-     * Name of the extra meta that stores whether the credentials were for the sandbox or live mode.
-     */
-    public const META_KEY_SANDBOX_MODE = 'sandbox_mode';
-
-    /**
-     * Name of the extra meta that stores the Access Token that is used to auth in API requests to PayPal.
-     */
-    public const META_KEY_ACCESS_TOKEN = 'access_token';
-
-    /**
-     * Name of the extra meta that stores the last request tracking ID.
-     */
-    public const META_KEY_TRACKING_ID = 'tracking_id';
-
-    /**
-     * Name of the extra meta that stores the Event Espresso PayPal Account's merchant id.
-     */
-    public const META_KEY_APP_ID = 'app_id';
-
-    /**
-     * Name of the extra meta that holds the seller client ID.
-     */
-    public const META_KEY_CLIENT_ID = 'client_id';
-
-    /**
-     * Name of the extra meta that holds the seller secret.
-     */
-    public const META_KEY_CLIENT_SECRET = 'client_secret';
-
-    /**
-     * Name of the extra meta that stores the expiration date of the Access Token.
-     */
-    public const META_KEY_TOKEN_EXPIRES_IN = 'expires_in';
-
-    /**
-     * Name of the extra meta that holds the partner client ID.
-     */
-    public const META_KEY_PARTNER_CLIENT_ID = 'partner_client_id';
-
-    /**
-     * Name of the extra meta that holds the partner merchant ID.
-     */
-    public const META_KEY_PARTNER_MERCHANT_ID = 'partner_merchant_id';
-
-    /**
-     * Name of the extra meta that holds the seller merchant ID.
-     */
-    public const META_KEY_SELLER_MERCHANT_ID = 'merchantIdInPayPal';
-
-    /**
-     * Name of the extra meta that holds the BN / request tracking code.
-     */
-    public const META_KEY_BN_CODE = 'bn_code';
-
-    /**
-     * Name of the extra meta that holds the last order details.
-     */
-    public const META_KEY_LAST_ORDER = 'last_order_details';
-
-    /**
-     * Name of the extra meta that holds the list of in progress orders.
-     */
-    public const META_KEY_PAYPAL_ORDERS = 'paypal_orders_list';
-
-    /**
-     * Name of the extra meta that stores the allowed PP checkout type selected by merchant while onboarding.
-     */
-    public const META_KEY_ALLOWED_CHECKOUT_TYPE = 'allowed_checkout_type';
-
-    /**
-     * Name of the extra meta that stores the merchant authorized scopes for our app to work within.
-     */
-    public const META_KEY_AUTHORIZED_SCOPES = 'authorized_scopes';
-
-    /**
-     * Name of the extra meta that stores the PP checkout type selected by merchant after onboarding.
-     */
-    public const META_KEY_CHECKOUT_TYPE = 'checkout_type';
-
-    /**
-     * Name of the extra meta that stores the selected PP function options.
-     */
-    public const META_KEY_FUNDING_OPTIONS = 'funding_options';
-
-    /**
-     * Name of the PayPal API parameter that holds the auth code.
-     */
-    public const API_KEY_AUTH_CODE = 'authCode';
-
-    /**
-     * Name of the PayPal API parameter that holds the client token.
-     */
-    public const API_KEY_CLIENT_TOKEN = 'client_token';
-
-     /**
-     * Name of the extra meta that holds the seller payer ID.
-     */
-    public const META_KEY_PAYER_ID = 'payer_id';
-
-    /**
-     * Name of the PayPal API parameter that holds the client token expiration time.
-     */
-    public const API_KEY_EXPIRES_IN = 'expires_in';
-
-    /**
-     * Name of the PayPal API parameter that holds the list of oAuth integrations related to the merchant.
-     */
-    public const API_PARAM_OAUTH_INTEGRATIONS = 'oauth_integrations';
-
-    /**
-     * Name of the PayPal API parameter that holds the list of third party permissions that were granted.
-     */
-    public const API_PARAM_PERMISSIONS_GRANTED = 'oauth_third_party';
-
-    /**
-     * Name of the PayPal API parameter that holds the bool of if the primary email was confirmed.
-     */
-    public const API_PARAM_PRIM_EMAIL_CONFIRMED = 'primary_email_confirmed';
-
-    /**
-     * Name of the PayPal API parameter that holds the bool of if email was confirmed.
-     */
-    public const API_PARAM_EMAIL_CONFIRMED = 'isEmailConfirmed';
-
-    /**
-     * Name of the PayPal API parameter that holds the partner ID.
-     */
-    public const API_PARAM_PARTNER_ID = 'merchantId';
-
-    /**
-     * Name of the PayPal API parameter that holds the merchant ID in the Track seller onboarding status request.
-     */
-    public const API_PARAM_TRACK_MERCHANT_ID = 'merchant_id';
-
-    /**
-     * Name of the PayPal API parameter that holds the payments_receivable status.
-     */
-    public const API_PARAM_PAYMENTS_RECEIVABLE = 'payments_receivable';
-
-    /**
-     * Name of the nonce used in the capture order request.
-     */
-    public const CAPTURE_ORDER_NONCE_NAME = 'eea_pp_commerce_capture_order_payment';
-
-    /**
-     * Name of the nonce used in the onboarding process.
-     */
-    public const NONCE_NAME_ONBOARDING_RETURN = 'eea_pp_commerce_onboarding_return';
-
-    /**
-     * Holds this payment method slug.
-     */
-    public const PM_SLUG = 'paypalcheckout';
-
-
-    /**
-     * Returns the base PayPal API URL.
-     *
-     * @param EE_Payment_Method $payment_method
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function getPayPalApiUrl(EE_Payment_Method $payment_method): string
-    {
-        return $payment_method->debug_mode() ? 'https://api-m.sandbox.paypal.com' : 'https://api-m.paypal.com';
-    }
+	/**
+	 * Name of the extra meta key that stores this PM options as one meta.
+	 */
+	public const META_KEY_PAYPAL_DATA = 'paypal_data';
+	/**
+	 * Name of the extra meta key that stores this PM options as one meta.
+	 */
+	public const META_KEY_PAYPAL_DATA_SANDBOX = 'paypal_data_sandbox';
+
+	/**
+	 * Name of the extra meta that stores whether the credentials were for the sandbox or live mode.
+	 */
+	public const META_KEY_SANDBOX_MODE = 'sandbox_mode';
+
+	/**
+	 * Name of the extra meta that stores the Access Token that is used to auth in API requests to PayPal.
+	 */
+	public const META_KEY_ACCESS_TOKEN = 'access_token';
+
+	/**
+	 * Name of the extra meta that stores the last request tracking ID.
+	 */
+	public const META_KEY_TRACKING_ID = 'tracking_id';
+
+	/**
+	 * Name of the extra meta that stores the Event Espresso PayPal Account's merchant id.
+	 */
+	public const META_KEY_APP_ID = 'app_id';
+
+	/**
+	 * Name of the extra meta that holds the seller client ID.
+	 */
+	public const META_KEY_CLIENT_ID = 'client_id';
+
+	/**
+	 * Name of the extra meta that holds the seller secret.
+	 */
+	public const META_KEY_CLIENT_SECRET = 'client_secret';
+
+	/**
+	 * Name of the extra meta that stores the expiration date of the Access Token.
+	 */
+	public const META_KEY_TOKEN_EXPIRES_IN = 'expires_in';
+
+	/**
+	 * Name of the extra meta that holds the partner client ID.
+	 */
+	public const META_KEY_PARTNER_CLIENT_ID = 'partner_client_id';
+
+	/**
+	 * Name of the extra meta that holds the partner merchant ID.
+	 */
+	public const META_KEY_PARTNER_MERCHANT_ID = 'partner_merchant_id';
+
+	/**
+	 * Name of the extra meta that holds the seller merchant ID.
+	 */
+	public const META_KEY_SELLER_MERCHANT_ID = 'merchantIdInPayPal';
+
+	/**
+	 * Name of the extra meta that holds the BN / request tracking code.
+	 */
+	public const META_KEY_BN_CODE = 'bn_code';
+
+	/**
+	 * Name of the extra meta that holds the last order details.
+	 */
+	public const META_KEY_LAST_ORDER = 'last_order_details';
+
+	/**
+	 * Name of the extra meta that holds the list of in progress orders.
+	 */
+	public const META_KEY_PAYPAL_ORDERS = 'paypal_orders_list';
+
+	/**
+	 * Name of the extra meta that stores the allowed PP checkout type selected by merchant while onboarding.
+	 */
+	public const META_KEY_ALLOWED_CHECKOUT_TYPE = 'allowed_checkout_type';
+
+	/**
+	 * Name of the extra meta that stores the merchant authorized scopes for our app to work within.
+	 */
+	public const META_KEY_AUTHORIZED_SCOPES = 'authorized_scopes';
+
+	/**
+	 * Name of the extra meta that stores the PP checkout type selected by merchant after onboarding.
+	 */
+	public const META_KEY_CHECKOUT_TYPE = 'checkout_type';
+
+	/**
+	 * Name of the extra meta that stores the selected PP function options.
+	 */
+	public const META_KEY_FUNDING_OPTIONS = 'funding_options';
+
+	/**
+	 * Name of the PayPal API parameter that holds the auth code.
+	 */
+	public const API_KEY_AUTH_CODE = 'authCode';
+
+	/**
+	 * Name of the PayPal API parameter that holds the client token.
+	 */
+	public const API_KEY_CLIENT_TOKEN = 'client_token';
+
+	 /**
+	  * Name of the extra meta that holds the seller payer ID.
+	  */
+	public const META_KEY_PAYER_ID = 'payer_id';
+
+	/**
+	 * Name of the PayPal API parameter that holds the client token expiration time.
+	 */
+	public const API_KEY_EXPIRES_IN = 'expires_in';
+
+	/**
+	 * Name of the PayPal API parameter that holds the list of oAuth integrations related to the merchant.
+	 */
+	public const API_PARAM_OAUTH_INTEGRATIONS = 'oauth_integrations';
+
+	/**
+	 * Name of the PayPal API parameter that holds the list of third party permissions that were granted.
+	 */
+	public const API_PARAM_PERMISSIONS_GRANTED = 'oauth_third_party';
+
+	/**
+	 * Name of the PayPal API parameter that holds the bool of if the primary email was confirmed.
+	 */
+	public const API_PARAM_PRIM_EMAIL_CONFIRMED = 'primary_email_confirmed';
+
+	/**
+	 * Name of the PayPal API parameter that holds the bool of if email was confirmed.
+	 */
+	public const API_PARAM_EMAIL_CONFIRMED = 'isEmailConfirmed';
+
+	/**
+	 * Name of the PayPal API parameter that holds the partner ID.
+	 */
+	public const API_PARAM_PARTNER_ID = 'merchantId';
+
+	/**
+	 * Name of the PayPal API parameter that holds the merchant ID in the Track seller onboarding status request.
+	 */
+	public const API_PARAM_TRACK_MERCHANT_ID = 'merchant_id';
+
+	/**
+	 * Name of the PayPal API parameter that holds the payments_receivable status.
+	 */
+	public const API_PARAM_PAYMENTS_RECEIVABLE = 'payments_receivable';
+
+	/**
+	 * Name of the nonce used in the capture order request.
+	 */
+	public const CAPTURE_ORDER_NONCE_NAME = 'eea_pp_commerce_capture_order_payment';
+
+	/**
+	 * Name of the nonce used in the onboarding process.
+	 */
+	public const NONCE_NAME_ONBOARDING_RETURN = 'eea_pp_commerce_onboarding_return';
+
+	/**
+	 * Holds this payment method slug.
+	 */
+	public const PM_SLUG = 'paypalcheckout';
+
+
+	/**
+	 * Returns the base PayPal API URL.
+	 *
+	 * @param EE_Payment_Method $payment_method
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function getPayPalApiUrl(EE_Payment_Method $payment_method): string
+	{
+		return $payment_method->debug_mode() ? 'https://api-m.sandbox.paypal.com' : 'https://api-m.paypal.com';
+	}
 }

PaymentMethods/PayPalCommerce/modules/EED_PayPalCommerce.module.php

Indentation +490 added lines, -490 removed lines

@@ -22,494 +22,494 @@
  */
 class EED_PayPalCommerce extends EED_Module
 {
-    /**
-     * @return EED_Module
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function instance(): EED_Module
-    {
-        return parent::get_instance(__CLASS__);
-    }
-
-
-    /**
-     * Run - initial module setup.
-     *
-     * @param WP $WP
-     * @return void
-     */
-    public function run($WP)
-    {
-    }
-
-
-    /**
-     * For hooking into EE Core and other modules.
-     *
-     * @return void
-     */
-    public static function set_hooks(): void
-    {
-        if (DbStatus::isOnline()) {
-            // Don't load PM on the front-end if not Connected.
-            add_filter(
-                'FHEE__EEM_Payment_Method__get_all_for_transaction__payment_methods',
-                [__CLASS__, 'filterPaymentMethods'],
-                100
-            );
-        }
-    }
-
-
-    /**
-     * For hooking into EE Core and other modules Admin.
-     *
-     * @return void
-     */
-    public static function set_hooks_admin(): void
-    {
-        if (DbStatus::isOnline()) {
-            // Create an Order.
-            add_action('wp_ajax_eeaPPCCreateOrder', [__CLASS__, 'createOrderRequest']);
-            add_action('wp_ajax_nopriv_eeaPPCCreateOrder', [__CLASS__, 'createOrderRequest']);
-            // Capture the Order.
-            add_action('wp_ajax_eeaPPCCaptureOrder', [__CLASS__, 'captureOrderRequest']);
-            add_action('wp_ajax_nopriv_eeaPPCCaptureOrder', [__CLASS__, 'captureOrderRequest']);
-            // Log errors from the JS side.
-            add_action('wp_ajax_eeaPPCommerceLogError', [__CLASS__, 'logJsError']);
-            add_action('wp_ajax_nopriv_eeaPPCommerceLogError', [__CLASS__, 'logJsError']);
-            // Don't load PM in the admin if not Connected.
-            add_filter(
-                'FHEE__EEM_Payment_Method__get_all_for_transaction__payment_methods',
-                [__CLASS__, 'filterPaymentMethods'],
-                100
-            );
-        }
-    }
-
-
-    /**
-     * Create the order and return its data as JSON.
-     * (AJAX)
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function createOrderRequest(): void
-    {
-        $paypal_pm   = EED_PayPalCommerce::getPaymentMethod();
-        $post_params = EED_Module::getRequest()->postParams();
-        if (! $paypal_pm instanceof EE_Payment_Method) {
-            PayPalLogger::errorLogAndExit(
-                esc_html__('Related payment method not found (create Order).', 'event_espresso'),
-                $post_params
-            );
-        }
-        $transaction  = EED_PayPalCommerce::getTransaction();
-        $billing_info = $post_params['billing_info'] ?? [];
-        if ($billing_info) {
-            $billing_info_decoded = json_decode(stripslashes($billing_info), true);
-            $billing_info         = is_array($billing_info_decoded) ? $billing_info_decoded : [];
-        }
-        if (! $transaction) {
-            PayPalLogger::errorLogAndExit(
-                esc_html__('Transaction info not found.', 'event_espresso'),
-                $post_params,
-                $paypal_pm
-            );
-        }
-        $order_data = EED_PayPalCommerce::createOrder($transaction, $billing_info, $paypal_pm);
-        wp_send_json($order_data);
-    }
-
-
-    /**
-     * Capture the order and return status in JSON.
-     * (AJAX)
-     *
-     * @return void
-     */
-    public static function captureOrderRequest(): void
-    {
-        $error_message = false;
-        $paypal_pm     = EED_PayPalCommerce::getPaymentMethod();
-        if (! $paypal_pm instanceof EE_Payment_Method) {
-            $error_message = esc_html__(
-                'Payment method could not be found while trying to capture the Order.',
-                'event_espresso'
-            );
-        }
-        $transaction = EED_PayPalCommerce::getTransaction();
-        if (! $transaction) {
-            $error_message = esc_html__(
-                'Could not process this payment because it has no associated transaction.',
-                'event_espresso'
-            );
-        }
-        $order_id = EED_Module::getRequest()->getRequestParam('order_id');
-        if (! $order_id) {
-            $error_message = esc_html__('Order ID missing.', 'event_espresso');
-        }
-        // Check for the payment nonce.
-        // $request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
-        // $order_nonce = $request->getRequestParam('pp_order_nonce');
-        // if (empty($order_nonce) || ! wp_verify_nonce($order_nonce, Domain::CAPTURE_ORDER_NONCE_NAME)) {
-        //     $error_message = esc_html__('No or incorrect order capture nonce provided !', 'event_espresso');
-        //     return EEG_PayPalCheckout::updatePaymentStatus($payment, $failed_status, $request->postParams(), $error_message);
-        // }
-        $billing_info         = EED_Module::getRequest()->getRequestParam('billing_info');
-        $billing_info_decoded = json_decode(stripslashes($billing_info), true);
-        $billing_info         = is_array($billing_info_decoded) ? $billing_info_decoded : [];
-        if (! $billing_info) {
-            $error_message = esc_html__('Billing info missing.', 'event_espresso');
-        }
-        // We had an error. Log and EXIT.
-        if ($error_message) {
-            PayPalLogger::errorLogAndExit($error_message, EED_Module::getRequest()->postParams(), $paypal_pm);
-        }
-        try {
-            $capture_response = EED_PayPalCommerce::captureOrder($transaction, $paypal_pm, $order_id, $billing_info);
-        } catch (Exception $e) {
-            $capture_response = [
-                'error'   => 'CAPTURE_ORDER_ERROR',
-                'message' => $e->getMessage(),
-            ];
-        }
-        wp_send_json($capture_response);
-    }
-
-
-    /**
-     * Create a new Order using the PP API.
-     *
-     * @param EE_Transaction    $transaction
-     * @param array             $billing_info
-     * @param EE_Payment_Method $paypal_pm
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function createOrder(
-        EE_Transaction $transaction,
-        array $billing_info,
-        EE_Payment_Method $paypal_pm
-    ): array {
-        $create_order_api = EED_PayPalCommerce::getCreateOrderApi($transaction, $billing_info, $paypal_pm);
-        if (! $create_order_api instanceof CreateOrder) {
-            return [
-                'error'   => 'CREATE_ORDER_API_FAULT',
-                'message' => esc_html__('The Create Order API request fault.', 'event_espresso'),
-            ];
-        }
-        $payment = EEG_PayPalCheckout::createPayment($transaction, $paypal_pm);
-        $order   = $create_order_api->create();
-        if (isset($order['error'])) {
-            EEG_PayPalCheckout::updatePaymentStatus($payment, EEM_Payment::status_id_failed, $order, $order['error']);
-            return [
-                'error'   => 'CREATE_ORDER_API_RESPONSE_ERROR',
-                'message' => $order['message'],
-            ];
-        }
-        return [
-            'pp_order_id' => $order['id'],
-        ];
-    }
-
-
-    /**
-     * Create a new Order using the PP API.
-     *
-     * @param EE_Transaction    $transaction
-     * @param EE_Payment_Method $paypal_pm
-     * @param string            $order_id
-     * @param array             $billing_info
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function captureOrder(
-        EE_Transaction $transaction,
-        EE_Payment_Method $paypal_pm,
-        string $order_id,
-        array $billing_info
-    ): array {
-        $capture_order_api = EED_PayPalCommerce::getCaptureOrderApi($transaction, $paypal_pm, $order_id);
-        if (! $capture_order_api instanceof CaptureOrder) {
-            return [
-                'error'   => 'CAPTURE_ORDER_API_FAULT',
-                'message' => esc_html__('A capture Order API request fault.', 'event_espresso'),
-            ];
-        }
-        $payment = $transaction->last_payment() ?? EEG_PayPalCheckout::createPayment($transaction, $paypal_pm);
-        $order   = $capture_order_api->capture();
-        if (isset($order['error'])) {
-            EEG_PayPalCheckout::updatePaymentStatus($payment, EEM_Payment::status_id_failed, $order, $order['error']);
-            return $order;
-        }
-        // Attach the transaction ID to this order.
-        try {
-            $order['ee_txn_id'] = $transaction->ID();
-        } catch (Exception $e) {
-            // Just don't set the txn id.
-        }
-        $order_status = EEG_PayPalCheckout::isOrderCompleted($order);
-        if ($order_status['completed']) {
-            // Order captured, so payment was successful.
-            $update_message = esc_html__('Order captured successfully.', 'event_espresso');
-            EEG_PayPalCheckout::updatePaymentStatus($payment, EEM_Payment::status_id_approved, $order, $update_message);
-        } else {
-            EEG_PayPalCheckout::updatePaymentStatus(
-                $payment,
-                EEM_Payment::status_id_failed,
-                $order,
-                $order_status['message']
-            );
-        }
-        EEG_PayPalCheckout::saveBillingDetails($payment, $transaction, $order, $billing_info);
-        $nonce = wp_create_nonce(Domain::CAPTURE_ORDER_NONCE_NAME);
-        return [
-            'pp_order_nonce'  => $nonce,
-            'pp_order_id'     => $order['id'],
-            'pp_order_status' => $order['purchase_units'][0]['payments']['captures'][0]['status'] ?? 'ORDER_STATUS_UNKNOWN',
-            'pp_order_amount' => $order['purchase_units'][0]['payments']['captures'][0]['amount']['value'] ?? '',
-        ];
-    }
-
-
-    /**
-     * Create an Order for this transaction.
-     *
-     * @param EE_Transaction    $transaction
-     * @param array             $billing_info
-     * @param EE_Payment_Method $paypal_pm
-     * @return CreateOrder|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function getCreateOrderApi(
-        EE_Transaction $transaction,
-        array $billing_info,
-        EE_Payment_Method $paypal_pm
-    ): ?CreateOrder {
-        $paypal_api = EED_PayPalCommerce::getPayPalApi($paypal_pm);
-        if (! $paypal_api instanceof PayPalApi) {
-            return null;
-        }
-        return LoaderFactory::getNew(CreateOrder::class, [$paypal_api, $transaction, $billing_info]);
-    }
-
-
-    /**
-     * Create an Order for this transaction.
-     *
-     * @param EE_Transaction    $transaction
-     * @param EE_Payment_Method $paypal_pm
-     * @param string            $order_id
-     * @return CaptureOrder|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function getCaptureOrderApi(
-        EE_Transaction $transaction,
-        EE_Payment_Method $paypal_pm,
-        string $order_id
-    ): ?CaptureOrder {
-        $paypal_api = EED_PayPalCommerce::getPayPalApi($paypal_pm);
-        if (! $paypal_api instanceof PayPalApi) {
-            return null;
-        }
-        return LoaderFactory::getNew(CaptureOrder::class, [$paypal_api, $transaction, $order_id]);
-    }
-
-
-    /**
-     * Return a PayPal API object, or false on failure.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @return PayPalApi|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function getPayPalApi(EE_Payment_Method $paypal_pm): ?PayPalApi
-    {
-        // Try getting the first party credentials to determine if this is a first party integration that's active.
-        $client_id     = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_CLIENT_ID);
-        $client_secret = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_CLIENT_SECRET);
-        $bn_code       = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_BN_CODE);
-        if ($client_id && $client_secret) {
-            return new FirstPartyPayPalApi($client_id, $client_secret, $bn_code, $paypal_pm->debug_mode());
-        }
-        // Third party integration credentials:
-        $access_token = EED_PayPalOnboard::getPartnerAccessToken($paypal_pm);
-        if (! $access_token || ! $bn_code) {
-            return null;
-        }
-        $partner_client_id = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_PARTNER_CLIENT_ID) ?: '';
-        $payer_id          = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_SELLER_MERCHANT_ID) ?: '';
-        return new ThirdPartyPayPalApi(
-            $access_token,
-            $bn_code,
-            $partner_client_id,
-            $payer_id,
-            $paypal_pm->debug_mode()
-        );
-    }
-
-
-    /**
-     * Requests a client token.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function requestClientToken(EE_Payment_Method $paypal_pm): array
-    {
-        $error      = ['error' => 'GET_CLIENT_TOKEN_FAULT'];
-        $paypal_api = EED_PayPalCommerce::getPayPalApi($paypal_pm);
-        if (! $paypal_api instanceof PayPalApi) {
-            $error['message'] = esc_html__('Got an error while trying to get the client token.', 'event_espresso');
-            return $error;
-        }
-        $client_token_api = new ClientToken($paypal_api, $paypal_pm->debug_mode());
-        $client_token     = $client_token_api->getToken();
-        if (isset($client_token['error'])) {
-            return $client_token;
-        }
-        if (empty($client_token)) {
-            $error['message'] = esc_html__('Client token not valid.', 'event_espresso');
-            return $error;
-        }
-        return $client_token;
-    }
-
-
-    /**
-     * Retrieve the payment method from the provided data.
-     *
-     * @return EE_Transaction|null
-     */
-    public static function getTransaction(): ?EE_Transaction
-    {
-        try {
-            $txn_id      = EED_Module::getRequest()->getRequestParam('txn_id', 0, DataType::INT);
-            $transaction = EEM_Transaction::instance()->get_one_by_ID($txn_id);
-            if (! $transaction instanceof EE_Transaction) {
-                PayPalLogger::errorLog(
-                    esc_html__('No transaction found by ID:', 'event_espresso'),
-                    EED_Module::getRequest()->postParams()
-                );
-                return null;
-            }
-        } catch (Exception $e) {
-            return null;
-        }
-        return $transaction;
-    }
-
-
-    /**
-     * Return a PayPal API object, or false on failure.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function isThirdParty(EE_Payment_Method $paypal_pm): bool
-    {
-        $pp_meta_data = PayPalExtraMetaManager::getAllData($paypal_pm);
-        return ! empty($pp_meta_data[ Domain::META_KEY_SELLER_MERCHANT_ID ])
-            && ! empty($pp_meta_data[ Domain::META_KEY_ACCESS_TOKEN ]);
-    }
-
-
-    /**
-     * Retrieve the payment method from the provided data.
-     *
-     * @return EE_Payment_Method|null
-     */
-    public static function getPaymentMethod(): ?EE_Payment_Method
-    {
-        try {
-            // Check if all required parameters are present.
-            $pm_slug        = EED_Module::getRequest()->getRequestParam('payment_method');
-            $payment_method = EEM_Payment_Method::instance()->get_one_by_slug($pm_slug);
-            if ($payment_method instanceof EE_Payment_Method) {
-                return $payment_method;
-            }
-        } catch (Exception $e) {
-            return null;
-        }
-        return null;
-    }
-
-
-    /**
-     * Log JS error.
-     *
-     * @return void
-     */
-    public static function logJsError(): void
-    {
-        // Default to the "first" PayPal checkout PM.
-        $request        = EED_Module::getRequest();
-        $pm_slug        = $request->getRequestParam('pm_slug', Domain::PM_SLUG);
-        $payment_method = null;
-        $txn_id         = 'unknown';
-        try {
-            $payment_method = EEM_Payment_Method::instance()->get_one_of_type($pm_slug);
-            $txn_id         = sanitize_text_field($request->getRequestParam('txn_id', '-'));
-        } catch (Exception $e) {
-            // Don't throw out anything, log at least something.
-        }
-        PayPalLogger::errorLog("JS Error on transaction: $txn_id", $request->postParams(), $payment_method);
-    }
-
-
-    /**
-     * Filter the Payment Methods list.
-     * if needed, this filter can also supply the $transaction and $scope parameters.
-     *
-     * @param EE_Payment_Method[] $payment_methods
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function filterPaymentMethods(array $payment_methods): array
-    {
-        // Don't allow this PM on the checkout page if not Connected.
-        foreach ($payment_methods as $key => $pm) {
-            // It is a PayPal Commerce payment method. Check if it's connected. If not - remove from the list.
-            if (str_contains($pm->slug(), Domain::PM_SLUG) && ! EED_PayPalOnboard::isOnboard($pm)) {
-                unset($payment_methods[ $key ]);
-            }
-        }
-        return $payment_methods;
-    }
-
-
-    /**
-     *  Get all active states.
-     *
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function getActiveStates(): array
-    {
-        $state_options = [];
-        $states        = EEM_State::instance()->get_all_active_states();
-        if (! empty($states)) {
-            foreach ($states as $numeral => $state) {
-                if ($state instanceof EE_State) {
-                    $state_options[ $numeral ] = $state->abbrev();
-                }
-            }
-        }
-        return $state_options;
-    }
+	/**
+	 * @return EED_Module
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function instance(): EED_Module
+	{
+		return parent::get_instance(__CLASS__);
+	}
+
+
+	/**
+	 * Run - initial module setup.
+	 *
+	 * @param WP $WP
+	 * @return void
+	 */
+	public function run($WP)
+	{
+	}
+
+
+	/**
+	 * For hooking into EE Core and other modules.
+	 *
+	 * @return void
+	 */
+	public static function set_hooks(): void
+	{
+		if (DbStatus::isOnline()) {
+			// Don't load PM on the front-end if not Connected.
+			add_filter(
+				'FHEE__EEM_Payment_Method__get_all_for_transaction__payment_methods',
+				[__CLASS__, 'filterPaymentMethods'],
+				100
+			);
+		}
+	}
+
+
+	/**
+	 * For hooking into EE Core and other modules Admin.
+	 *
+	 * @return void
+	 */
+	public static function set_hooks_admin(): void
+	{
+		if (DbStatus::isOnline()) {
+			// Create an Order.
+			add_action('wp_ajax_eeaPPCCreateOrder', [__CLASS__, 'createOrderRequest']);
+			add_action('wp_ajax_nopriv_eeaPPCCreateOrder', [__CLASS__, 'createOrderRequest']);
+			// Capture the Order.
+			add_action('wp_ajax_eeaPPCCaptureOrder', [__CLASS__, 'captureOrderRequest']);
+			add_action('wp_ajax_nopriv_eeaPPCCaptureOrder', [__CLASS__, 'captureOrderRequest']);
+			// Log errors from the JS side.
+			add_action('wp_ajax_eeaPPCommerceLogError', [__CLASS__, 'logJsError']);
+			add_action('wp_ajax_nopriv_eeaPPCommerceLogError', [__CLASS__, 'logJsError']);
+			// Don't load PM in the admin if not Connected.
+			add_filter(
+				'FHEE__EEM_Payment_Method__get_all_for_transaction__payment_methods',
+				[__CLASS__, 'filterPaymentMethods'],
+				100
+			);
+		}
+	}
+
+
+	/**
+	 * Create the order and return its data as JSON.
+	 * (AJAX)
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function createOrderRequest(): void
+	{
+		$paypal_pm   = EED_PayPalCommerce::getPaymentMethod();
+		$post_params = EED_Module::getRequest()->postParams();
+		if (! $paypal_pm instanceof EE_Payment_Method) {
+			PayPalLogger::errorLogAndExit(
+				esc_html__('Related payment method not found (create Order).', 'event_espresso'),
+				$post_params
+			);
+		}
+		$transaction  = EED_PayPalCommerce::getTransaction();
+		$billing_info = $post_params['billing_info'] ?? [];
+		if ($billing_info) {
+			$billing_info_decoded = json_decode(stripslashes($billing_info), true);
+			$billing_info         = is_array($billing_info_decoded) ? $billing_info_decoded : [];
+		}
+		if (! $transaction) {
+			PayPalLogger::errorLogAndExit(
+				esc_html__('Transaction info not found.', 'event_espresso'),
+				$post_params,
+				$paypal_pm
+			);
+		}
+		$order_data = EED_PayPalCommerce::createOrder($transaction, $billing_info, $paypal_pm);
+		wp_send_json($order_data);
+	}
+
+
+	/**
+	 * Capture the order and return status in JSON.
+	 * (AJAX)
+	 *
+	 * @return void
+	 */
+	public static function captureOrderRequest(): void
+	{
+		$error_message = false;
+		$paypal_pm     = EED_PayPalCommerce::getPaymentMethod();
+		if (! $paypal_pm instanceof EE_Payment_Method) {
+			$error_message = esc_html__(
+				'Payment method could not be found while trying to capture the Order.',
+				'event_espresso'
+			);
+		}
+		$transaction = EED_PayPalCommerce::getTransaction();
+		if (! $transaction) {
+			$error_message = esc_html__(
+				'Could not process this payment because it has no associated transaction.',
+				'event_espresso'
+			);
+		}
+		$order_id = EED_Module::getRequest()->getRequestParam('order_id');
+		if (! $order_id) {
+			$error_message = esc_html__('Order ID missing.', 'event_espresso');
+		}
+		// Check for the payment nonce.
+		// $request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
+		// $order_nonce = $request->getRequestParam('pp_order_nonce');
+		// if (empty($order_nonce) || ! wp_verify_nonce($order_nonce, Domain::CAPTURE_ORDER_NONCE_NAME)) {
+		//     $error_message = esc_html__('No or incorrect order capture nonce provided !', 'event_espresso');
+		//     return EEG_PayPalCheckout::updatePaymentStatus($payment, $failed_status, $request->postParams(), $error_message);
+		// }
+		$billing_info         = EED_Module::getRequest()->getRequestParam('billing_info');
+		$billing_info_decoded = json_decode(stripslashes($billing_info), true);
+		$billing_info         = is_array($billing_info_decoded) ? $billing_info_decoded : [];
+		if (! $billing_info) {
+			$error_message = esc_html__('Billing info missing.', 'event_espresso');
+		}
+		// We had an error. Log and EXIT.
+		if ($error_message) {
+			PayPalLogger::errorLogAndExit($error_message, EED_Module::getRequest()->postParams(), $paypal_pm);
+		}
+		try {
+			$capture_response = EED_PayPalCommerce::captureOrder($transaction, $paypal_pm, $order_id, $billing_info);
+		} catch (Exception $e) {
+			$capture_response = [
+				'error'   => 'CAPTURE_ORDER_ERROR',
+				'message' => $e->getMessage(),
+			];
+		}
+		wp_send_json($capture_response);
+	}
+
+
+	/**
+	 * Create a new Order using the PP API.
+	 *
+	 * @param EE_Transaction    $transaction
+	 * @param array             $billing_info
+	 * @param EE_Payment_Method $paypal_pm
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function createOrder(
+		EE_Transaction $transaction,
+		array $billing_info,
+		EE_Payment_Method $paypal_pm
+	): array {
+		$create_order_api = EED_PayPalCommerce::getCreateOrderApi($transaction, $billing_info, $paypal_pm);
+		if (! $create_order_api instanceof CreateOrder) {
+			return [
+				'error'   => 'CREATE_ORDER_API_FAULT',
+				'message' => esc_html__('The Create Order API request fault.', 'event_espresso'),
+			];
+		}
+		$payment = EEG_PayPalCheckout::createPayment($transaction, $paypal_pm);
+		$order   = $create_order_api->create();
+		if (isset($order['error'])) {
+			EEG_PayPalCheckout::updatePaymentStatus($payment, EEM_Payment::status_id_failed, $order, $order['error']);
+			return [
+				'error'   => 'CREATE_ORDER_API_RESPONSE_ERROR',
+				'message' => $order['message'],
+			];
+		}
+		return [
+			'pp_order_id' => $order['id'],
+		];
+	}
+
+
+	/**
+	 * Create a new Order using the PP API.
+	 *
+	 * @param EE_Transaction    $transaction
+	 * @param EE_Payment_Method $paypal_pm
+	 * @param string            $order_id
+	 * @param array             $billing_info
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function captureOrder(
+		EE_Transaction $transaction,
+		EE_Payment_Method $paypal_pm,
+		string $order_id,
+		array $billing_info
+	): array {
+		$capture_order_api = EED_PayPalCommerce::getCaptureOrderApi($transaction, $paypal_pm, $order_id);
+		if (! $capture_order_api instanceof CaptureOrder) {
+			return [
+				'error'   => 'CAPTURE_ORDER_API_FAULT',
+				'message' => esc_html__('A capture Order API request fault.', 'event_espresso'),
+			];
+		}
+		$payment = $transaction->last_payment() ?? EEG_PayPalCheckout::createPayment($transaction, $paypal_pm);
+		$order   = $capture_order_api->capture();
+		if (isset($order['error'])) {
+			EEG_PayPalCheckout::updatePaymentStatus($payment, EEM_Payment::status_id_failed, $order, $order['error']);
+			return $order;
+		}
+		// Attach the transaction ID to this order.
+		try {
+			$order['ee_txn_id'] = $transaction->ID();
+		} catch (Exception $e) {
+			// Just don't set the txn id.
+		}
+		$order_status = EEG_PayPalCheckout::isOrderCompleted($order);
+		if ($order_status['completed']) {
+			// Order captured, so payment was successful.
+			$update_message = esc_html__('Order captured successfully.', 'event_espresso');
+			EEG_PayPalCheckout::updatePaymentStatus($payment, EEM_Payment::status_id_approved, $order, $update_message);
+		} else {
+			EEG_PayPalCheckout::updatePaymentStatus(
+				$payment,
+				EEM_Payment::status_id_failed,
+				$order,
+				$order_status['message']
+			);
+		}
+		EEG_PayPalCheckout::saveBillingDetails($payment, $transaction, $order, $billing_info);
+		$nonce = wp_create_nonce(Domain::CAPTURE_ORDER_NONCE_NAME);
+		return [
+			'pp_order_nonce'  => $nonce,
+			'pp_order_id'     => $order['id'],
+			'pp_order_status' => $order['purchase_units'][0]['payments']['captures'][0]['status'] ?? 'ORDER_STATUS_UNKNOWN',
+			'pp_order_amount' => $order['purchase_units'][0]['payments']['captures'][0]['amount']['value'] ?? '',
+		];
+	}
+
+
+	/**
+	 * Create an Order for this transaction.
+	 *
+	 * @param EE_Transaction    $transaction
+	 * @param array             $billing_info
+	 * @param EE_Payment_Method $paypal_pm
+	 * @return CreateOrder|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function getCreateOrderApi(
+		EE_Transaction $transaction,
+		array $billing_info,
+		EE_Payment_Method $paypal_pm
+	): ?CreateOrder {
+		$paypal_api = EED_PayPalCommerce::getPayPalApi($paypal_pm);
+		if (! $paypal_api instanceof PayPalApi) {
+			return null;
+		}
+		return LoaderFactory::getNew(CreateOrder::class, [$paypal_api, $transaction, $billing_info]);
+	}
+
+
+	/**
+	 * Create an Order for this transaction.
+	 *
+	 * @param EE_Transaction    $transaction
+	 * @param EE_Payment_Method $paypal_pm
+	 * @param string            $order_id
+	 * @return CaptureOrder|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function getCaptureOrderApi(
+		EE_Transaction $transaction,
+		EE_Payment_Method $paypal_pm,
+		string $order_id
+	): ?CaptureOrder {
+		$paypal_api = EED_PayPalCommerce::getPayPalApi($paypal_pm);
+		if (! $paypal_api instanceof PayPalApi) {
+			return null;
+		}
+		return LoaderFactory::getNew(CaptureOrder::class, [$paypal_api, $transaction, $order_id]);
+	}
+
+
+	/**
+	 * Return a PayPal API object, or false on failure.
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @return PayPalApi|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function getPayPalApi(EE_Payment_Method $paypal_pm): ?PayPalApi
+	{
+		// Try getting the first party credentials to determine if this is a first party integration that's active.
+		$client_id     = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_CLIENT_ID);
+		$client_secret = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_CLIENT_SECRET);
+		$bn_code       = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_BN_CODE);
+		if ($client_id && $client_secret) {
+			return new FirstPartyPayPalApi($client_id, $client_secret, $bn_code, $paypal_pm->debug_mode());
+		}
+		// Third party integration credentials:
+		$access_token = EED_PayPalOnboard::getPartnerAccessToken($paypal_pm);
+		if (! $access_token || ! $bn_code) {
+			return null;
+		}
+		$partner_client_id = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_PARTNER_CLIENT_ID) ?: '';
+		$payer_id          = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_SELLER_MERCHANT_ID) ?: '';
+		return new ThirdPartyPayPalApi(
+			$access_token,
+			$bn_code,
+			$partner_client_id,
+			$payer_id,
+			$paypal_pm->debug_mode()
+		);
+	}
+
+
+	/**
+	 * Requests a client token.
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function requestClientToken(EE_Payment_Method $paypal_pm): array
+	{
+		$error      = ['error' => 'GET_CLIENT_TOKEN_FAULT'];
+		$paypal_api = EED_PayPalCommerce::getPayPalApi($paypal_pm);
+		if (! $paypal_api instanceof PayPalApi) {
+			$error['message'] = esc_html__('Got an error while trying to get the client token.', 'event_espresso');
+			return $error;
+		}
+		$client_token_api = new ClientToken($paypal_api, $paypal_pm->debug_mode());
+		$client_token     = $client_token_api->getToken();
+		if (isset($client_token['error'])) {
+			return $client_token;
+		}
+		if (empty($client_token)) {
+			$error['message'] = esc_html__('Client token not valid.', 'event_espresso');
+			return $error;
+		}
+		return $client_token;
+	}
+
+
+	/**
+	 * Retrieve the payment method from the provided data.
+	 *
+	 * @return EE_Transaction|null
+	 */
+	public static function getTransaction(): ?EE_Transaction
+	{
+		try {
+			$txn_id      = EED_Module::getRequest()->getRequestParam('txn_id', 0, DataType::INT);
+			$transaction = EEM_Transaction::instance()->get_one_by_ID($txn_id);
+			if (! $transaction instanceof EE_Transaction) {
+				PayPalLogger::errorLog(
+					esc_html__('No transaction found by ID:', 'event_espresso'),
+					EED_Module::getRequest()->postParams()
+				);
+				return null;
+			}
+		} catch (Exception $e) {
+			return null;
+		}
+		return $transaction;
+	}
+
+
+	/**
+	 * Return a PayPal API object, or false on failure.
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function isThirdParty(EE_Payment_Method $paypal_pm): bool
+	{
+		$pp_meta_data = PayPalExtraMetaManager::getAllData($paypal_pm);
+		return ! empty($pp_meta_data[ Domain::META_KEY_SELLER_MERCHANT_ID ])
+			&& ! empty($pp_meta_data[ Domain::META_KEY_ACCESS_TOKEN ]);
+	}
+
+
+	/**
+	 * Retrieve the payment method from the provided data.
+	 *
+	 * @return EE_Payment_Method|null
+	 */
+	public static function getPaymentMethod(): ?EE_Payment_Method
+	{
+		try {
+			// Check if all required parameters are present.
+			$pm_slug        = EED_Module::getRequest()->getRequestParam('payment_method');
+			$payment_method = EEM_Payment_Method::instance()->get_one_by_slug($pm_slug);
+			if ($payment_method instanceof EE_Payment_Method) {
+				return $payment_method;
+			}
+		} catch (Exception $e) {
+			return null;
+		}
+		return null;
+	}
+
+
+	/**
+	 * Log JS error.
+	 *
+	 * @return void
+	 */
+	public static function logJsError(): void
+	{
+		// Default to the "first" PayPal checkout PM.
+		$request        = EED_Module::getRequest();
+		$pm_slug        = $request->getRequestParam('pm_slug', Domain::PM_SLUG);
+		$payment_method = null;
+		$txn_id         = 'unknown';
+		try {
+			$payment_method = EEM_Payment_Method::instance()->get_one_of_type($pm_slug);
+			$txn_id         = sanitize_text_field($request->getRequestParam('txn_id', '-'));
+		} catch (Exception $e) {
+			// Don't throw out anything, log at least something.
+		}
+		PayPalLogger::errorLog("JS Error on transaction: $txn_id", $request->postParams(), $payment_method);
+	}
+
+
+	/**
+	 * Filter the Payment Methods list.
+	 * if needed, this filter can also supply the $transaction and $scope parameters.
+	 *
+	 * @param EE_Payment_Method[] $payment_methods
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function filterPaymentMethods(array $payment_methods): array
+	{
+		// Don't allow this PM on the checkout page if not Connected.
+		foreach ($payment_methods as $key => $pm) {
+			// It is a PayPal Commerce payment method. Check if it's connected. If not - remove from the list.
+			if (str_contains($pm->slug(), Domain::PM_SLUG) && ! EED_PayPalOnboard::isOnboard($pm)) {
+				unset($payment_methods[ $key ]);
+			}
+		}
+		return $payment_methods;
+	}
+
+
+	/**
+	 *  Get all active states.
+	 *
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function getActiveStates(): array
+	{
+		$state_options = [];
+		$states        = EEM_State::instance()->get_all_active_states();
+		if (! empty($states)) {
+			foreach ($states as $numeral => $state) {
+				if ($state instanceof EE_State) {
+					$state_options[ $numeral ] = $state->abbrev();
+				}
+			}
+		}
+		return $state_options;
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -101,7 +101,7 @@ 
     {
         $paypal_pm   = EED_PayPalCommerce::getPaymentMethod();
         $post_params = EED_Module::getRequest()->postParams();
-        if (! $paypal_pm instanceof EE_Payment_Method) {
+        if ( ! $paypal_pm instanceof EE_Payment_Method) {
             PayPalLogger::errorLogAndExit(
                 esc_html__('Related payment method not found (create Order).', 'event_espresso'),
                 $post_params
@@ -113,7 +113,7 @@ 
             $billing_info_decoded = json_decode(stripslashes($billing_info), true);
             $billing_info         = is_array($billing_info_decoded) ? $billing_info_decoded : [];
         }
-        if (! $transaction) {
+        if ( ! $transaction) {
             PayPalLogger::errorLogAndExit(
                 esc_html__('Transaction info not found.', 'event_espresso'),
                 $post_params,
@@ -135,21 +135,21 @@ 
     {
         $error_message = false;
         $paypal_pm     = EED_PayPalCommerce::getPaymentMethod();
-        if (! $paypal_pm instanceof EE_Payment_Method) {
+        if ( ! $paypal_pm instanceof EE_Payment_Method) {
             $error_message = esc_html__(
                 'Payment method could not be found while trying to capture the Order.',
                 'event_espresso'
             );
         }
         $transaction = EED_PayPalCommerce::getTransaction();
-        if (! $transaction) {
+        if ( ! $transaction) {
             $error_message = esc_html__(
                 'Could not process this payment because it has no associated transaction.',
                 'event_espresso'
             );
         }
         $order_id = EED_Module::getRequest()->getRequestParam('order_id');
-        if (! $order_id) {
+        if ( ! $order_id) {
             $error_message = esc_html__('Order ID missing.', 'event_espresso');
         }
         // Check for the payment nonce.
@@ -162,7 +162,7 @@ 
         $billing_info         = EED_Module::getRequest()->getRequestParam('billing_info');
         $billing_info_decoded = json_decode(stripslashes($billing_info), true);
         $billing_info         = is_array($billing_info_decoded) ? $billing_info_decoded : [];
-        if (! $billing_info) {
+        if ( ! $billing_info) {
             $error_message = esc_html__('Billing info missing.', 'event_espresso');
         }
         // We had an error. Log and EXIT.
@@ -197,7 +197,7 @@ 
         EE_Payment_Method $paypal_pm
     ): array {
         $create_order_api = EED_PayPalCommerce::getCreateOrderApi($transaction, $billing_info, $paypal_pm);
-        if (! $create_order_api instanceof CreateOrder) {
+        if ( ! $create_order_api instanceof CreateOrder) {
             return [
                 'error'   => 'CREATE_ORDER_API_FAULT',
                 'message' => esc_html__('The Create Order API request fault.', 'event_espresso'),
@@ -236,7 +236,7 @@ 
         array $billing_info
     ): array {
         $capture_order_api = EED_PayPalCommerce::getCaptureOrderApi($transaction, $paypal_pm, $order_id);
-        if (! $capture_order_api instanceof CaptureOrder) {
+        if ( ! $capture_order_api instanceof CaptureOrder) {
             return [
                 'error'   => 'CAPTURE_ORDER_API_FAULT',
                 'message' => esc_html__('A capture Order API request fault.', 'event_espresso'),
@@ -294,7 +294,7 @@ 
         EE_Payment_Method $paypal_pm
     ): ?CreateOrder {
         $paypal_api = EED_PayPalCommerce::getPayPalApi($paypal_pm);
-        if (! $paypal_api instanceof PayPalApi) {
+        if ( ! $paypal_api instanceof PayPalApi) {
             return null;
         }
         return LoaderFactory::getNew(CreateOrder::class, [$paypal_api, $transaction, $billing_info]);
@@ -317,7 +317,7 @@ 
         string $order_id
     ): ?CaptureOrder {
         $paypal_api = EED_PayPalCommerce::getPayPalApi($paypal_pm);
-        if (! $paypal_api instanceof PayPalApi) {
+        if ( ! $paypal_api instanceof PayPalApi) {
             return null;
         }
         return LoaderFactory::getNew(CaptureOrder::class, [$paypal_api, $transaction, $order_id]);
@@ -343,7 +343,7 @@ 
         }
         // Third party integration credentials:
         $access_token = EED_PayPalOnboard::getPartnerAccessToken($paypal_pm);
-        if (! $access_token || ! $bn_code) {
+        if ( ! $access_token || ! $bn_code) {
             return null;
         }
         $partner_client_id = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_PARTNER_CLIENT_ID) ?: '';
@@ -370,7 +370,7 @@ 
     {
         $error      = ['error' => 'GET_CLIENT_TOKEN_FAULT'];
         $paypal_api = EED_PayPalCommerce::getPayPalApi($paypal_pm);
-        if (! $paypal_api instanceof PayPalApi) {
+        if ( ! $paypal_api instanceof PayPalApi) {
             $error['message'] = esc_html__('Got an error while trying to get the client token.', 'event_espresso');
             return $error;
         }
@@ -397,7 +397,7 @@ 
         try {
             $txn_id      = EED_Module::getRequest()->getRequestParam('txn_id', 0, DataType::INT);
             $transaction = EEM_Transaction::instance()->get_one_by_ID($txn_id);
-            if (! $transaction instanceof EE_Transaction) {
+            if ( ! $transaction instanceof EE_Transaction) {
                 PayPalLogger::errorLog(
                     esc_html__('No transaction found by ID:', 'event_espresso'),
                     EED_Module::getRequest()->postParams()
@@ -422,8 +422,8 @@ 
     public static function isThirdParty(EE_Payment_Method $paypal_pm): bool
     {
         $pp_meta_data = PayPalExtraMetaManager::getAllData($paypal_pm);
-        return ! empty($pp_meta_data[ Domain::META_KEY_SELLER_MERCHANT_ID ])
-            && ! empty($pp_meta_data[ Domain::META_KEY_ACCESS_TOKEN ]);
+        return ! empty($pp_meta_data[Domain::META_KEY_SELLER_MERCHANT_ID])
+            && ! empty($pp_meta_data[Domain::META_KEY_ACCESS_TOKEN]);
     }
 
 
@@ -485,7 +485,7 @@ 
         foreach ($payment_methods as $key => $pm) {
             // It is a PayPal Commerce payment method. Check if it's connected. If not - remove from the list.
             if (str_contains($pm->slug(), Domain::PM_SLUG) && ! EED_PayPalOnboard::isOnboard($pm)) {
-                unset($payment_methods[ $key ]);
+                unset($payment_methods[$key]);
             }
         }
         return $payment_methods;
@@ -503,10 +503,10 @@ 
     {
         $state_options = [];
         $states        = EEM_State::instance()->get_all_active_states();
-        if (! empty($states)) {
+        if ( ! empty($states)) {
             foreach ($states as $numeral => $state) {
                 if ($state instanceof EE_State) {
-                    $state_options[ $numeral ] = $state->abbrev();
+                    $state_options[$numeral] = $state->abbrev();
                 }
             }
         }

PaymentMethods/PayPalCommerce/PayPalCheckout/EE_PMT_PayPalCheckout.pm.php

Indentation +169 added lines, -169 removed lines

@@ -16,186 +16,186 @@
  */
 class EE_PMT_PayPalCheckout extends EE_PMT_Base
 {
-    /**
-     * @param EE_Payment_Method|null $pm_instance
-     * @throws ReflectionException
-     * @throws EE_Error
-     */
-    public function __construct($pm_instance = null)
-    {
-        $this->_template_path       = dirname(__FILE__) . DS . 'templates' . DS;
-        $this->_default_description = esc_html__('Please provide the following billing information.', 'event_espresso');
-        $this->_default_button_url  = $this->file_url() . 'lib/default-cc-logo.png';
-        $this->_pretty_name         = esc_html__('PayPal Commerce', 'event_espresso');
-        $this->_cache_billing_form  = true;
-        $this->_requires_https      = true;
+	/**
+	 * @param EE_Payment_Method|null $pm_instance
+	 * @throws ReflectionException
+	 * @throws EE_Error
+	 */
+	public function __construct($pm_instance = null)
+	{
+		$this->_template_path       = dirname(__FILE__) . DS . 'templates' . DS;
+		$this->_default_description = esc_html__('Please provide the following billing information.', 'event_espresso');
+		$this->_default_button_url  = $this->file_url() . 'lib/default-cc-logo.png';
+		$this->_pretty_name         = esc_html__('PayPal Commerce', 'event_espresso');
+		$this->_cache_billing_form  = true;
+		$this->_requires_https      = true;
 
-        // Load gateway.
-        require_once(
-            EEP_PAYPAL_COMMERCE_PATH . 'EEG_PayPalCheckout.gateway.php'
-        );
-        $this->_gateway = new EEG_PayPalCheckout();
+		// Load gateway.
+		require_once(
+			EEP_PAYPAL_COMMERCE_PATH . 'EEG_PayPalCheckout.gateway.php'
+		);
+		$this->_gateway = new EEG_PayPalCheckout();
 
-        // Display a refund message at transactions actions area.
-        add_action(
-            'AHEE__txn_admin_details_main_meta_box_txn_details__after_actions_buttons',
-            [__CLASS__, 'refundNotice']
-        );
+		// Display a refund message at transactions actions area.
+		add_action(
+			'AHEE__txn_admin_details_main_meta_box_txn_details__after_actions_buttons',
+			[__CLASS__, 'refundNotice']
+		);
 
-        parent::__construct($pm_instance);
-    }
+		parent::__construct($pm_instance);
+	}
 
 
-    /**
-     * Generate a new payment method settings form.
-     *
-     * @return EE_Payment_Method_Form
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function generate_new_settings_form()
-    {
-        // Settings form.
-        $settings_form = new SettingsForm($this, $this->_pm_instance);
-        // Filter the form contents.
-        return apply_filters(
-            'FHEE__EE_PMT_PayPalCheckout__generate_new_settings_form__form_filtering',
-            $settings_form,
-            $this,
-            $this->_pm_instance
-        );
-    }
+	/**
+	 * Generate a new payment method settings form.
+	 *
+	 * @return EE_Payment_Method_Form
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function generate_new_settings_form()
+	{
+		// Settings form.
+		$settings_form = new SettingsForm($this, $this->_pm_instance);
+		// Filter the form contents.
+		return apply_filters(
+			'FHEE__EE_PMT_PayPalCheckout__generate_new_settings_form__form_filtering',
+			$settings_form,
+			$this,
+			$this->_pm_instance
+		);
+	}
 
 
-    /**
-     * Creates a billing form for this payment method type.
-     *
-     * @param EE_Transaction|null $transaction
-     * @param array|null          $extra_args
-     * @return EE_Billing_Info_Form|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function generate_new_billing_form(EE_Transaction $transaction = null, ?array $extra_args = [])
-    {
-        $request        = LoaderFactory::getShared(Request::class);
-        $request_params = $request->requestParams();
-        // Return the default billing form for the postbox if this is a WP admin transaction info page.
-        if (! empty($request_params['page']) && $request_params['page'] === 'espresso_transactions') {
-            $default_form = new EE_Billing_Attendee_Info_Form($this->_pm_instance, $extra_args);
-            $default_form->add_subsections(['credit_card' => new EE_Credit_Card_Input()]);
-            return $default_form;
-        }
-        // Just in case this is used on other admin pages.
-        if (empty($transaction) && ! empty($request_params['TXN_ID'])) {
-            $txn_instance = EEM_Transaction::instance()->get_one_by_ID($request_params['TXN_ID']);
-            $transaction  = $txn_instance instanceof EE_Transaction ? $txn_instance : null;
-        }
-        $options = array_merge(
-            [
-                'transaction'   => $transaction,
-                'template_path' => $this->_template_path,
-            ],
-            $extra_args
-        );
-        return LoaderFactory::getNew(BillingForm::class, [$this->_pm_instance, $options]);
-    }
+	/**
+	 * Creates a billing form for this payment method type.
+	 *
+	 * @param EE_Transaction|null $transaction
+	 * @param array|null          $extra_args
+	 * @return EE_Billing_Info_Form|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function generate_new_billing_form(EE_Transaction $transaction = null, ?array $extra_args = [])
+	{
+		$request        = LoaderFactory::getShared(Request::class);
+		$request_params = $request->requestParams();
+		// Return the default billing form for the postbox if this is a WP admin transaction info page.
+		if (! empty($request_params['page']) && $request_params['page'] === 'espresso_transactions') {
+			$default_form = new EE_Billing_Attendee_Info_Form($this->_pm_instance, $extra_args);
+			$default_form->add_subsections(['credit_card' => new EE_Credit_Card_Input()]);
+			return $default_form;
+		}
+		// Just in case this is used on other admin pages.
+		if (empty($transaction) && ! empty($request_params['TXN_ID'])) {
+			$txn_instance = EEM_Transaction::instance()->get_one_by_ID($request_params['TXN_ID']);
+			$transaction  = $txn_instance instanceof EE_Transaction ? $txn_instance : null;
+		}
+		$options = array_merge(
+			[
+				'transaction'   => $transaction,
+				'template_path' => $this->_template_path,
+			],
+			$extra_args
+		);
+		return LoaderFactory::getNew(BillingForm::class, [$this->_pm_instance, $options]);
+	}
 
 
-    /**
-     * Adds PM info to the help tab.
-     *
-     * @return array
-     * @see EE_PMT_Base::help_tabs_config()
-     */
-    public function help_tabs_config(): array
-    {
-        return [
-            $this->get_help_tab_name() => [
-                'title'    => esc_html__('PayPal Commerce settings', 'event_espresso'),
-                'filename' => 'pp-commerce-overview',
-            ],
-        ];
-    }
+	/**
+	 * Adds PM info to the help tab.
+	 *
+	 * @return array
+	 * @see EE_PMT_Base::help_tabs_config()
+	 */
+	public function help_tabs_config(): array
+	{
+		return [
+			$this->get_help_tab_name() => [
+				'title'    => esc_html__('PayPal Commerce settings', 'event_espresso'),
+				'filename' => 'pp-commerce-overview',
+			],
+		];
+	}
 
 
-    /**
-     * Adds a refund related message section.
-     *
-     * @param bool $can_edit_payments Flag that tells if user can edit payments.
-     * @access public
-     * @return void
-     */
-    public static function refundNotice(bool $can_edit_payments)
-    {
-        if (! $can_edit_payments) {
-            return;
-        }
-        $request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
-        $txn_id  = $request->getRequestParam('TXN_ID', 0, DataType::INT);
-        try {
-            $transaction = EEM_Transaction::instance()->get_one_by_ID($txn_id);
-            if (! $transaction instanceof EE_Transaction) {
-                return;
-            }
-            // Was this transaction paid using PayPal ?
-            if (strpos((string) $transaction->payment_method(), 'PayPal Commerce') === false) {
-                return;
-            }
-            // Try loading the template.
-            EE_Registry::instance()->load_helper('Template');
-        } catch (EE_Error | ReflectionException $e) {
-            // Just return, adding nothing.
-            return;
-        }
-        $html = EEH_Template::locate_template(
-            apply_filters(
-                'FHEEA__EE_PMT_PayPalCheckout__refundNotice',
-                dirname(__FILE__) . DS . 'templates' . DS . 'apply-refund-notice.template.php'
-            )
-        );
-        echo $html;
-    }
+	/**
+	 * Adds a refund related message section.
+	 *
+	 * @param bool $can_edit_payments Flag that tells if user can edit payments.
+	 * @access public
+	 * @return void
+	 */
+	public static function refundNotice(bool $can_edit_payments)
+	{
+		if (! $can_edit_payments) {
+			return;
+		}
+		$request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
+		$txn_id  = $request->getRequestParam('TXN_ID', 0, DataType::INT);
+		try {
+			$transaction = EEM_Transaction::instance()->get_one_by_ID($txn_id);
+			if (! $transaction instanceof EE_Transaction) {
+				return;
+			}
+			// Was this transaction paid using PayPal ?
+			if (strpos((string) $transaction->payment_method(), 'PayPal Commerce') === false) {
+				return;
+			}
+			// Try loading the template.
+			EE_Registry::instance()->load_helper('Template');
+		} catch (EE_Error | ReflectionException $e) {
+			// Just return, adding nothing.
+			return;
+		}
+		$html = EEH_Template::locate_template(
+			apply_filters(
+				'FHEEA__EE_PMT_PayPalCheckout__refundNotice',
+				dirname(__FILE__) . DS . 'templates' . DS . 'apply-refund-notice.template.php'
+			)
+		);
+		echo $html;
+	}
 
 
-    /**
-     * Override the parent.
-     *
-     * @param EE_Transaction            $transaction
-     * @param float|null                $amount
-     * @param EE_Billing_Info_Form|null $billing_info
-     * @param string|null               $return_url
-     * @param string                    $fail_url
-     * @param string                    $method
-     * @param bool                      $by_admin
-     * @return EE_Payment
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function process_payment(
-        EE_Transaction $transaction,
-        $amount = null,
-        $billing_info = null,
-        $return_url = null,
-        $fail_url = '',
-        $method = 'CART',
-        $by_admin = false
-    ): EE_Payment {
-        // This payment should have been processed in the background, while the Order was created and charged.
-        // So simply return the last payment. Unless it's somehow missing.
-        $payment = $transaction->last_payment();
-        if (empty($payment) || $payment->status() === EEM_Payment::status_id_failed) {
-            // Then we try processing the payment as usual.
-            return parent::process_payment(
-                $transaction,
-                $amount,
-                $billing_info,
-                $return_url,
-                $fail_url,
-                $method,
-                $by_admin
-            );
-        }
-        return $transaction->last_payment();
-    }
+	/**
+	 * Override the parent.
+	 *
+	 * @param EE_Transaction            $transaction
+	 * @param float|null                $amount
+	 * @param EE_Billing_Info_Form|null $billing_info
+	 * @param string|null               $return_url
+	 * @param string                    $fail_url
+	 * @param string                    $method
+	 * @param bool                      $by_admin
+	 * @return EE_Payment
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function process_payment(
+		EE_Transaction $transaction,
+		$amount = null,
+		$billing_info = null,
+		$return_url = null,
+		$fail_url = '',
+		$method = 'CART',
+		$by_admin = false
+	): EE_Payment {
+		// This payment should have been processed in the background, while the Order was created and charged.
+		// So simply return the last payment. Unless it's somehow missing.
+		$payment = $transaction->last_payment();
+		if (empty($payment) || $payment->status() === EEM_Payment::status_id_failed) {
+			// Then we try processing the payment as usual.
+			return parent::process_payment(
+				$transaction,
+				$amount,
+				$billing_info,
+				$return_url,
+				$fail_url,
+				$method,
+				$by_admin
+			);
+		}
+		return $transaction->last_payment();
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -23,16 +23,16 @@ 
      */
     public function __construct($pm_instance = null)
     {
-        $this->_template_path       = dirname(__FILE__) . DS . 'templates' . DS;
+        $this->_template_path       = dirname(__FILE__).DS.'templates'.DS;
         $this->_default_description = esc_html__('Please provide the following billing information.', 'event_espresso');
-        $this->_default_button_url  = $this->file_url() . 'lib/default-cc-logo.png';
+        $this->_default_button_url  = $this->file_url().'lib/default-cc-logo.png';
         $this->_pretty_name         = esc_html__('PayPal Commerce', 'event_espresso');
         $this->_cache_billing_form  = true;
         $this->_requires_https      = true;
 
         // Load gateway.
         require_once(
-            EEP_PAYPAL_COMMERCE_PATH . 'EEG_PayPalCheckout.gateway.php'
+            EEP_PAYPAL_COMMERCE_PATH.'EEG_PayPalCheckout.gateway.php'
         );
         $this->_gateway = new EEG_PayPalCheckout();
 
@@ -81,7 +81,7 @@ 
         $request        = LoaderFactory::getShared(Request::class);
         $request_params = $request->requestParams();
         // Return the default billing form for the postbox if this is a WP admin transaction info page.
-        if (! empty($request_params['page']) && $request_params['page'] === 'espresso_transactions') {
+        if ( ! empty($request_params['page']) && $request_params['page'] === 'espresso_transactions') {
             $default_form = new EE_Billing_Attendee_Info_Form($this->_pm_instance, $extra_args);
             $default_form->add_subsections(['credit_card' => new EE_Credit_Card_Input()]);
             return $default_form;
@@ -128,14 +128,14 @@ 
      */
     public static function refundNotice(bool $can_edit_payments)
     {
-        if (! $can_edit_payments) {
+        if ( ! $can_edit_payments) {
             return;
         }
         $request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
         $txn_id  = $request->getRequestParam('TXN_ID', 0, DataType::INT);
         try {
             $transaction = EEM_Transaction::instance()->get_one_by_ID($txn_id);
-            if (! $transaction instanceof EE_Transaction) {
+            if ( ! $transaction instanceof EE_Transaction) {
                 return;
             }
             // Was this transaction paid using PayPal ?
@@ -151,7 +151,7 @@ 
         $html = EEH_Template::locate_template(
             apply_filters(
                 'FHEEA__EE_PMT_PayPalCheckout__refundNotice',
-                dirname(__FILE__) . DS . 'templates' . DS . 'apply-refund-notice.template.php'
+                dirname(__FILE__).DS.'templates'.DS.'apply-refund-notice.template.php'
             )
         );
         echo $html;

PaymentMethods/PayPalCommerce/PayPalCheckout/forms/OnboardingFormHtml.php

Indentation +446 added lines, -446 removed lines

@@ -27,450 +27,450 @@
  */
 class OnboardingFormHtml
 {
-    /**
-     *  Payment method.
-     *
-     * @var EE_PMT_Base
-     */
-    protected $payment_method = null;
-
-    /**
-     *  Payment method instance.
-     *
-     * @var EE_PMT_Base
-     */
-    protected $pm_instance = null;
-
-    /**
-     *  Payment method slug.
-     *
-     * @var EE_PMT_Base
-     */
-    protected $pm_slug = null;
-
-    /**
-     *  PayPal Onboarding button text.
-     *
-     * @var string
-     */
-    public $onboard_btn_text = '';
-
-    /**
-     *  PayPal Onboarding button in sandbox mode text.
-     *
-     * @var string
-     */
-    public $sandbox_btn_text = '';
-
-    /**
-     *  PayPal Onboarding section sandbox mode text.
-     *
-     * @var string
-     */
-    public $authed_sandbox_text = '';
-
-
-    /**
-     * Class constructor.
-     *
-     * @param EE_PMT_Base       $pmt
-     * @param EE_Payment_Method $payment_method
-     */
-    public function __construct(EE_PMT_Base $pmt, EE_Payment_Method $payment_method)
-    {
-        $this->payment_method      = $pmt;
-        $this->pm_instance         = $payment_method;
-        $this->pm_slug             = $this->pm_instance->slug();
-        $this->onboard_btn_text    = esc_html__('Connect with PayPal', 'event_espresso');
-        $this->sandbox_btn_text    = esc_html__('Connect with PayPal (sandbox)', 'event_espresso');
-        $this->authed_sandbox_text = esc_html__('(using sandbox credentials)', 'event_espresso');
-    }
-
-
-    /**
-     * Form a heading.
-     *
-     * @param string $text
-     * @return string
-     */
-    public function getHeader(string $text = ''): string
-    {
-        $text = $text ?: esc_html__('PayPal Onboarding: %1$s', 'event_espresso');
-        return EEH_HTML::th(
-            sprintf(
-                $text,
-                $this->payment_method->get_help_tab_link()
-            ),
-            'eea_paypal_onboard_heading_' . $this->pm_slug,
-            'eea-paypal-onboard-heading'
-        );
-    }
-
-
-    /**
-     * Add the onboarding button.
-     *
-     * @param array $subsections
-     * @param bool  $is_onboard
-     * @return array
-     */
-    public function addOnboardButton(array $subsections, bool $is_onboard): array
-    {
-        // Section to be displayed if not onboard.
-        $subsections['paypal_onboard_btn'] = new EE_Form_Section_HTML(
-            EEH_HTML::tr(
-                $this->getHeader() .
-                EEH_HTML::td(
-                    EEH_HTML::button(
-                        $this->onboard_btn_text,
-                        'eea-paypal-onboard-btn button button--primary',
-                        '',
-                        'eea_paypal_onboard_btn_' . $this->pm_slug,
-                    )
-                    . EEH_HTML::link(
-                        '#',
-                        '',
-                        '',
-                        'eea_paypal_onboard_trigger_btn_' . $this->pm_slug,
-                        'eea-paypal-onboard-trigger-btn',
-                        '',
-                        'data-ee-pm-slug="' . $this->pm_slug . '" data-paypal-button="true"'
-                    )
-                ),
-                'eea_paypal_onboard_section_' . $this->pm_slug,
-                'eea-onboard-section eea-onboard-section-' . $this->pm_slug,
-                // Are we onboard ?
-                $is_onboard ? 'display:none;' : ''
-            ),
-            ['required' => true]
-        );
-        return $subsections;
-    }
-
-
-    /**
-     * Add the offboarding (deauthorize) button.
-     *
-     * @param array $subsections
-     * @param bool  $is_onboard
-     * @return array
-     */
-    public function addOffboardButton(array $subsections, bool $is_onboard): array
-    {
-        $onboard_sandbox_section = $this->getOnboardSandboxSection();
-        // If we are connected, display the seller merchant ID.
-        $seller_id_section = $this->getSellerIdSection();
-        // Section to be displayed when onboard.
-        $subsections['paypal_offboard_btn'] = new EE_Form_Section_HTML(
-            EEH_HTML::tr(
-                $this->getHeader()
-                . EEH_HTML::td(
-                    EEH_HTML::img(
-                        EEP_PAYPAL_COMMERCE_URL . 'assets' . DS . 'lib' . DS . 'paypal-onboard.png',
-                        '',
-                        'eea_paypal_offboard_ico',
-                        'eea-paypal-offboard-ico'
-                    )
-                    . EEH_HTML::strong(
-                        esc_html__('Connected.', 'event_espresso'),
-                        'eea_paypal_offboard_txt_' . $this->pm_slug,
-                        'eea-paypal-offboard-txt'
-                    )
-                    . $onboard_sandbox_section
-                    . $seller_id_section
-                    . EEH_HTML::link(
-                        '#',
-                        EEH_HTML::span(esc_html__('Disconnect', 'event_espresso')),
-                        '',
-                        'eea_paypal_offboard_btn_' . $this->pm_slug,
-                        'eea-paypal-onboard-btn button button--primary'
-                    )
-                ),
-                'eea_paypal_offboard_section_' . $this->pm_slug,
-                'eea-offboard-section-' . $this->pm_slug,
-                // Are we onboard ?
-                ! $is_onboard ? 'display:none;' : ''
-            ),
-            ['required' => true]
-        );
-        return $subsections;
-    }
-
-
-    /**
-     * Get the sandbox onboarding section contents.
-     *
-     * @return string
-     */
-    public function getOnboardSandboxSection(): string
-    {
-        // Is this a test onboarding ?
-        $sandbox_mode_text = $this->pm_instance->debug_mode() ? $this->authed_sandbox_text : '';
-        return ' ' . EEH_HTML::strong(
-            $sandbox_mode_text,
-            'eea_paypal_onboard_test_txt_' . $this->pm_slug,
-            'eea-paypal-onboard-test-txt'
-        );
-    }
-
-
-    /**
-     * Get the seller merchant ID section contents.
-     *
-     * @return string
-     */
-    public function getSellerIdSection(): string
-    {
-        try {
-            $is_third_party = EED_PayPalCommerce::isThirdParty($this->pm_instance);
-            $meta_key       = $is_third_party ? Domain::META_KEY_SELLER_MERCHANT_ID : Domain::META_KEY_PAYER_ID;
-            $payer_id       = PayPalExtraMetaManager::getPmOption($this->pm_instance, $meta_key) ?: '--';
-        } catch (Exception $e) {
-            $payer_id = '--';
-        }
-        return ' ' . EEH_HTML::strong(
-            sprintf(esc_html__('Linked account ID: %1$s', 'event_espresso'), $payer_id),
-            'eea_paypal_seller_id_' . $this->pm_slug,
-            'eea-paypal-seller-id'
-        );
-    }
-
-
-    /**
-     * Add the PM slug holder.
-     *
-     * @param array $subsections
-     * @return array
-     */
-    public function addPmSlugHolder(array $subsections): array
-    {
-        $subsections['paypal_pm_slug_holder'] = new EE_Form_Section_HTML(
-            EEH_HTML::span(
-                '',
-                'eea_paypal_pm_slug',
-                'eea-paypal-pm-slug',
-                'display:none;'
-            )
-        );
-        return $subsections;
-    }
-
-
-    /**
-     * HTML for onboarding settings dialog.
-     *
-     * @return EE_Form_Section_Base
-     */
-    public function connectDialog(): EE_Form_Section_Base
-    {
-        return new EE_Form_Section_HTML(
-            EEH_HTML::div(
-                $this->countriesSelectHtml() .
-                $this->paymentOptionsHtml() .
-                EEH_HTML::div(
-                    EEH_HTML::link(
-                        '',
-                        'Cancel',
-                        'cancel, go back',
-                        'eea_ppc_connect_cancel_' . $this->pm_slug,
-                        'eea-ppc-connect-cancel button button--secondary'
-                    ) .
-                    EEH_HTML::link(
-                        '',
-                        'Continue',
-                        'ok, continue',
-                        'eea_ppc_connect_ok_' . $this->pm_slug,
-                        'eea-ppc-connect-ok button button--primary-alt'
-                    ),
-                    '',
-                    'eep-ppc-dialog-yes-no'
-                ),
-                'eea_paypal_connect_dialog_' . $this->pm_slug
-            )
-        );
-    }
-
-
-    /**
-     * Form a countries select and return as html.
-     *
-     * @return string
-     */
-    public function countriesSelectHtml(): string
-    {
-        $countries = [];
-        $countries_select = EEH_HTML::strong(
-            esc_html__('Please select a country where your PayPal account is registered:', 'event_espresso'),
-            'eep_ppc_country_txt_' . $this->pm_slug,
-            'eep-ppc-country-txt'
-        );
-        try {
-            // Get all countries list.
-            $countries_iso = EEM_Country::instance()->get_all_countries();
-            foreach ($countries_iso as $iso => $country) {
-                if ($country instanceof EE_Country) {
-                    $countries [ $iso ] = $country->get('CNT_name');
-                }
-            }
-            // Now build the select input.
-            $select_input = new EE_Select_Input(
-                $countries,
-                [
-                    'html_name'       => 'eep_ppc_country_' . $this->pm_slug,
-                    'html_id'         => 'eep_ppc_country_' . $this->pm_slug,
-                    'html_class'      => 'eep-ppc-country-' . $this->pm_slug,
-                    'html_label_text' => esc_html__('Select country', 'event_espresso'),
-                    'required'        => true,
-                    'default'         => EE_Config::instance()->organization->CNT_ISO ?? 'US'
-                ]
-            );
-            $countries_select .= $select_input->get_html_for_input();
-        } catch (Exception $e) {
-            // Countries list set at this point, so just continue.
-        }
-        return $countries_select;
-    }
-
-
-    /**
-     * Form the payment options checkboxes and return as html.
-     *
-     * @return string
-     */
-    public function paymentOptionsHtml(): string
-    {
-        $options_lbl = EEH_HTML::strong(
-            esc_html__('Select a product you\'d like to allow at checkout:', 'event_espresso'),
-            'eea_ppc_product_txt_' . $this->pm_slug,
-            'eea-ppc-product-txt'
-        );
-        $express_checkout_lbl = EEH_HTML::label(
-            esc_html__('Accept PayPal ', 'event_espresso')
-            . EEH_HTML::img(
-                'https://www.paypalobjects.com/webstatic/mktg/Logo/pp-logo-100px.png',
-                '',
-                'eea_ppc_express_checkout_img_' . $this->pm_slug,
-                'eea-ppc-express-checkout-img'
-            ),
-            '',
-            '',
-            '',
-            'for="' . 'eep_ppc_checkout_type_' . $this->pm_slug . '-express_checkout"'
-        );
-        $ppcp_lbl = EEH_HTML::label(
-            esc_html__('Accept credit and debit card payments with PayPal ', 'event_espresso')
-            . EEH_HTML::img(
-                'https://www.paypalobjects.com/digitalassets/c/website/marketing/apac/C2/logos-buttons/optimize/Full_Online_Tray_RGB.png',
-                '',
-                'eea_ppc_ppcp_img_' . $this->pm_slug,
-                'eea-ppc-ppcp-img'
-            ),
-            '',
-            '',
-            '',
-            'for="' . 'eep_ppc_checkout_type_' . $this->pm_slug . '-ppcp"'
-        );
-        $checkbox = new EE_Checkbox_Multi_Input(
-            [
-                'express_checkout' => $express_checkout_lbl,
-                'ppcp'             => $ppcp_lbl,
-            ],
-            [
-                'html_id'         => 'eep_ppc_checkout_type_' . $this->pm_slug,
-                'html_label_text' => esc_html__(
-                    'Select a product you\'d like to allow at checkout.',
-                    'event_espresso'
-                ),
-                'html_help_text'  => esc_html__(
-                    'Select a product you\'d like to allow at checkout.',
-                    'event_espresso'
-                ),
-                'default'         => ['express_checkout', 'ppcp']
-            ]
-        );
-        try {
-            return EEH_HTML::div(
-                $options_lbl
-                . $checkbox->get_html_for_input(),
-                'eep_ppc_checkout_types_' . $this->pm_slug,
-                'eep-ppc-checkout-types'
-            );
-        } catch (Exception $e) {
-            return '';
-        }
-    }
-
-
-    /**
-     * HTML for onboarding settings dialog.
-     *
-     * @return EE_Form_Section_Base
-     */
-    public function processingMask(): EE_Form_Section_Base
-    {
-        return new EE_Form_Section_HTML(
-            EEH_HTML::div(
-                EEH_HTML::div(' ', 'eep_ppc_processing_mask', 'eep-ppc-processing-mask') .
-                EEH_HTML::div(' ', 'eep_ppc_processing_spinner', 'ee-spinner ee-spin') .
-                EEH_HTML::div(
-                    esc_html__('The login window should be open. If you don\'t see a new PayPal login window you might need to enable pop-ups in your browser in order to continue.') .
-                    EEH_HTML::div(
-                        EEH_HTML::link(
-                            '#',
-                            esc_html__('Focus window'),
-                            esc_html__('Focus window'),
-                            'eep_ppc_window_focus_' . $this->pm_slug,
-                            'eep-ppc-window-focus'
-                        )
-                    ),
-                    'eep_ppc_processing_message',
-                    'eep-ppc-processing-message'
-                ),
-                'eep_ppc_processing_' . $this->pm_slug,
-                'eep-ppc-processing'
-            )
-        );
-    }
-
-
-    /**
-     * HTML for the disconnect warning dialog.
-     *
-     * @return EE_Form_Section_Base
-     */
-    public function disconnectDialog(): EE_Form_Section_Base
-    {
-        $message = esc_html__(
-            'Disconnecting your PayPal account will prevent you from offering PayPal services and products on your website.',
-            'event_espresso'
-        );
-        return new EE_Form_Section_HTML(
-            EEH_HTML::div(
-                EEH_HTML::strong(
-                    $message,
-                    'eep_ppc_disconnect_dialog_txt_' . $this->pm_slug,
-                    'eep-ppc-disconnect-dialog-txt'
-                ) .
-                EEH_HTML::div(
-                    EEH_HTML::link(
-                        '',
-                        'Cancel',
-                        'cancel, go back',
-                        'eep_ppc_disconnect_cancel_' . $this->pm_slug,
-                        'eep-ppc-disconnect-cancel button button--secondary'
-                    ) .
-                    EEH_HTML::link(
-                        '',
-                        'Disconnect',
-                        'ok, continue',
-                        'eep_ppc_disconnect_ok_' . $this->pm_slug,
-                        'eep-ppc-disconnect-ok button button--primary-alt'
-                    ),
-                    '',
-                    'eep-ppc-dialog-yes-no'
-                ),
-                'eep_paypal_disconnect_dialog_' . $this->pm_slug
-            )
-        );
-    }
+	/**
+	 *  Payment method.
+	 *
+	 * @var EE_PMT_Base
+	 */
+	protected $payment_method = null;
+
+	/**
+	 *  Payment method instance.
+	 *
+	 * @var EE_PMT_Base
+	 */
+	protected $pm_instance = null;
+
+	/**
+	 *  Payment method slug.
+	 *
+	 * @var EE_PMT_Base
+	 */
+	protected $pm_slug = null;
+
+	/**
+	 *  PayPal Onboarding button text.
+	 *
+	 * @var string
+	 */
+	public $onboard_btn_text = '';
+
+	/**
+	 *  PayPal Onboarding button in sandbox mode text.
+	 *
+	 * @var string
+	 */
+	public $sandbox_btn_text = '';
+
+	/**
+	 *  PayPal Onboarding section sandbox mode text.
+	 *
+	 * @var string
+	 */
+	public $authed_sandbox_text = '';
+
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param EE_PMT_Base       $pmt
+	 * @param EE_Payment_Method $payment_method
+	 */
+	public function __construct(EE_PMT_Base $pmt, EE_Payment_Method $payment_method)
+	{
+		$this->payment_method      = $pmt;
+		$this->pm_instance         = $payment_method;
+		$this->pm_slug             = $this->pm_instance->slug();
+		$this->onboard_btn_text    = esc_html__('Connect with PayPal', 'event_espresso');
+		$this->sandbox_btn_text    = esc_html__('Connect with PayPal (sandbox)', 'event_espresso');
+		$this->authed_sandbox_text = esc_html__('(using sandbox credentials)', 'event_espresso');
+	}
+
+
+	/**
+	 * Form a heading.
+	 *
+	 * @param string $text
+	 * @return string
+	 */
+	public function getHeader(string $text = ''): string
+	{
+		$text = $text ?: esc_html__('PayPal Onboarding: %1$s', 'event_espresso');
+		return EEH_HTML::th(
+			sprintf(
+				$text,
+				$this->payment_method->get_help_tab_link()
+			),
+			'eea_paypal_onboard_heading_' . $this->pm_slug,
+			'eea-paypal-onboard-heading'
+		);
+	}
+
+
+	/**
+	 * Add the onboarding button.
+	 *
+	 * @param array $subsections
+	 * @param bool  $is_onboard
+	 * @return array
+	 */
+	public function addOnboardButton(array $subsections, bool $is_onboard): array
+	{
+		// Section to be displayed if not onboard.
+		$subsections['paypal_onboard_btn'] = new EE_Form_Section_HTML(
+			EEH_HTML::tr(
+				$this->getHeader() .
+				EEH_HTML::td(
+					EEH_HTML::button(
+						$this->onboard_btn_text,
+						'eea-paypal-onboard-btn button button--primary',
+						'',
+						'eea_paypal_onboard_btn_' . $this->pm_slug,
+					)
+					. EEH_HTML::link(
+						'#',
+						'',
+						'',
+						'eea_paypal_onboard_trigger_btn_' . $this->pm_slug,
+						'eea-paypal-onboard-trigger-btn',
+						'',
+						'data-ee-pm-slug="' . $this->pm_slug . '" data-paypal-button="true"'
+					)
+				),
+				'eea_paypal_onboard_section_' . $this->pm_slug,
+				'eea-onboard-section eea-onboard-section-' . $this->pm_slug,
+				// Are we onboard ?
+				$is_onboard ? 'display:none;' : ''
+			),
+			['required' => true]
+		);
+		return $subsections;
+	}
+
+
+	/**
+	 * Add the offboarding (deauthorize) button.
+	 *
+	 * @param array $subsections
+	 * @param bool  $is_onboard
+	 * @return array
+	 */
+	public function addOffboardButton(array $subsections, bool $is_onboard): array
+	{
+		$onboard_sandbox_section = $this->getOnboardSandboxSection();
+		// If we are connected, display the seller merchant ID.
+		$seller_id_section = $this->getSellerIdSection();
+		// Section to be displayed when onboard.
+		$subsections['paypal_offboard_btn'] = new EE_Form_Section_HTML(
+			EEH_HTML::tr(
+				$this->getHeader()
+				. EEH_HTML::td(
+					EEH_HTML::img(
+						EEP_PAYPAL_COMMERCE_URL . 'assets' . DS . 'lib' . DS . 'paypal-onboard.png',
+						'',
+						'eea_paypal_offboard_ico',
+						'eea-paypal-offboard-ico'
+					)
+					. EEH_HTML::strong(
+						esc_html__('Connected.', 'event_espresso'),
+						'eea_paypal_offboard_txt_' . $this->pm_slug,
+						'eea-paypal-offboard-txt'
+					)
+					. $onboard_sandbox_section
+					. $seller_id_section
+					. EEH_HTML::link(
+						'#',
+						EEH_HTML::span(esc_html__('Disconnect', 'event_espresso')),
+						'',
+						'eea_paypal_offboard_btn_' . $this->pm_slug,
+						'eea-paypal-onboard-btn button button--primary'
+					)
+				),
+				'eea_paypal_offboard_section_' . $this->pm_slug,
+				'eea-offboard-section-' . $this->pm_slug,
+				// Are we onboard ?
+				! $is_onboard ? 'display:none;' : ''
+			),
+			['required' => true]
+		);
+		return $subsections;
+	}
+
+
+	/**
+	 * Get the sandbox onboarding section contents.
+	 *
+	 * @return string
+	 */
+	public function getOnboardSandboxSection(): string
+	{
+		// Is this a test onboarding ?
+		$sandbox_mode_text = $this->pm_instance->debug_mode() ? $this->authed_sandbox_text : '';
+		return ' ' . EEH_HTML::strong(
+			$sandbox_mode_text,
+			'eea_paypal_onboard_test_txt_' . $this->pm_slug,
+			'eea-paypal-onboard-test-txt'
+		);
+	}
+
+
+	/**
+	 * Get the seller merchant ID section contents.
+	 *
+	 * @return string
+	 */
+	public function getSellerIdSection(): string
+	{
+		try {
+			$is_third_party = EED_PayPalCommerce::isThirdParty($this->pm_instance);
+			$meta_key       = $is_third_party ? Domain::META_KEY_SELLER_MERCHANT_ID : Domain::META_KEY_PAYER_ID;
+			$payer_id       = PayPalExtraMetaManager::getPmOption($this->pm_instance, $meta_key) ?: '--';
+		} catch (Exception $e) {
+			$payer_id = '--';
+		}
+		return ' ' . EEH_HTML::strong(
+			sprintf(esc_html__('Linked account ID: %1$s', 'event_espresso'), $payer_id),
+			'eea_paypal_seller_id_' . $this->pm_slug,
+			'eea-paypal-seller-id'
+		);
+	}
+
+
+	/**
+	 * Add the PM slug holder.
+	 *
+	 * @param array $subsections
+	 * @return array
+	 */
+	public function addPmSlugHolder(array $subsections): array
+	{
+		$subsections['paypal_pm_slug_holder'] = new EE_Form_Section_HTML(
+			EEH_HTML::span(
+				'',
+				'eea_paypal_pm_slug',
+				'eea-paypal-pm-slug',
+				'display:none;'
+			)
+		);
+		return $subsections;
+	}
+
+
+	/**
+	 * HTML for onboarding settings dialog.
+	 *
+	 * @return EE_Form_Section_Base
+	 */
+	public function connectDialog(): EE_Form_Section_Base
+	{
+		return new EE_Form_Section_HTML(
+			EEH_HTML::div(
+				$this->countriesSelectHtml() .
+				$this->paymentOptionsHtml() .
+				EEH_HTML::div(
+					EEH_HTML::link(
+						'',
+						'Cancel',
+						'cancel, go back',
+						'eea_ppc_connect_cancel_' . $this->pm_slug,
+						'eea-ppc-connect-cancel button button--secondary'
+					) .
+					EEH_HTML::link(
+						'',
+						'Continue',
+						'ok, continue',
+						'eea_ppc_connect_ok_' . $this->pm_slug,
+						'eea-ppc-connect-ok button button--primary-alt'
+					),
+					'',
+					'eep-ppc-dialog-yes-no'
+				),
+				'eea_paypal_connect_dialog_' . $this->pm_slug
+			)
+		);
+	}
+
+
+	/**
+	 * Form a countries select and return as html.
+	 *
+	 * @return string
+	 */
+	public function countriesSelectHtml(): string
+	{
+		$countries = [];
+		$countries_select = EEH_HTML::strong(
+			esc_html__('Please select a country where your PayPal account is registered:', 'event_espresso'),
+			'eep_ppc_country_txt_' . $this->pm_slug,
+			'eep-ppc-country-txt'
+		);
+		try {
+			// Get all countries list.
+			$countries_iso = EEM_Country::instance()->get_all_countries();
+			foreach ($countries_iso as $iso => $country) {
+				if ($country instanceof EE_Country) {
+					$countries [ $iso ] = $country->get('CNT_name');
+				}
+			}
+			// Now build the select input.
+			$select_input = new EE_Select_Input(
+				$countries,
+				[
+					'html_name'       => 'eep_ppc_country_' . $this->pm_slug,
+					'html_id'         => 'eep_ppc_country_' . $this->pm_slug,
+					'html_class'      => 'eep-ppc-country-' . $this->pm_slug,
+					'html_label_text' => esc_html__('Select country', 'event_espresso'),
+					'required'        => true,
+					'default'         => EE_Config::instance()->organization->CNT_ISO ?? 'US'
+				]
+			);
+			$countries_select .= $select_input->get_html_for_input();
+		} catch (Exception $e) {
+			// Countries list set at this point, so just continue.
+		}
+		return $countries_select;
+	}
+
+
+	/**
+	 * Form the payment options checkboxes and return as html.
+	 *
+	 * @return string
+	 */
+	public function paymentOptionsHtml(): string
+	{
+		$options_lbl = EEH_HTML::strong(
+			esc_html__('Select a product you\'d like to allow at checkout:', 'event_espresso'),
+			'eea_ppc_product_txt_' . $this->pm_slug,
+			'eea-ppc-product-txt'
+		);
+		$express_checkout_lbl = EEH_HTML::label(
+			esc_html__('Accept PayPal ', 'event_espresso')
+			. EEH_HTML::img(
+				'https://www.paypalobjects.com/webstatic/mktg/Logo/pp-logo-100px.png',
+				'',
+				'eea_ppc_express_checkout_img_' . $this->pm_slug,
+				'eea-ppc-express-checkout-img'
+			),
+			'',
+			'',
+			'',
+			'for="' . 'eep_ppc_checkout_type_' . $this->pm_slug . '-express_checkout"'
+		);
+		$ppcp_lbl = EEH_HTML::label(
+			esc_html__('Accept credit and debit card payments with PayPal ', 'event_espresso')
+			. EEH_HTML::img(
+				'https://www.paypalobjects.com/digitalassets/c/website/marketing/apac/C2/logos-buttons/optimize/Full_Online_Tray_RGB.png',
+				'',
+				'eea_ppc_ppcp_img_' . $this->pm_slug,
+				'eea-ppc-ppcp-img'
+			),
+			'',
+			'',
+			'',
+			'for="' . 'eep_ppc_checkout_type_' . $this->pm_slug . '-ppcp"'
+		);
+		$checkbox = new EE_Checkbox_Multi_Input(
+			[
+				'express_checkout' => $express_checkout_lbl,
+				'ppcp'             => $ppcp_lbl,
+			],
+			[
+				'html_id'         => 'eep_ppc_checkout_type_' . $this->pm_slug,
+				'html_label_text' => esc_html__(
+					'Select a product you\'d like to allow at checkout.',
+					'event_espresso'
+				),
+				'html_help_text'  => esc_html__(
+					'Select a product you\'d like to allow at checkout.',
+					'event_espresso'
+				),
+				'default'         => ['express_checkout', 'ppcp']
+			]
+		);
+		try {
+			return EEH_HTML::div(
+				$options_lbl
+				. $checkbox->get_html_for_input(),
+				'eep_ppc_checkout_types_' . $this->pm_slug,
+				'eep-ppc-checkout-types'
+			);
+		} catch (Exception $e) {
+			return '';
+		}
+	}
+
+
+	/**
+	 * HTML for onboarding settings dialog.
+	 *
+	 * @return EE_Form_Section_Base
+	 */
+	public function processingMask(): EE_Form_Section_Base
+	{
+		return new EE_Form_Section_HTML(
+			EEH_HTML::div(
+				EEH_HTML::div(' ', 'eep_ppc_processing_mask', 'eep-ppc-processing-mask') .
+				EEH_HTML::div(' ', 'eep_ppc_processing_spinner', 'ee-spinner ee-spin') .
+				EEH_HTML::div(
+					esc_html__('The login window should be open. If you don\'t see a new PayPal login window you might need to enable pop-ups in your browser in order to continue.') .
+					EEH_HTML::div(
+						EEH_HTML::link(
+							'#',
+							esc_html__('Focus window'),
+							esc_html__('Focus window'),
+							'eep_ppc_window_focus_' . $this->pm_slug,
+							'eep-ppc-window-focus'
+						)
+					),
+					'eep_ppc_processing_message',
+					'eep-ppc-processing-message'
+				),
+				'eep_ppc_processing_' . $this->pm_slug,
+				'eep-ppc-processing'
+			)
+		);
+	}
+
+
+	/**
+	 * HTML for the disconnect warning dialog.
+	 *
+	 * @return EE_Form_Section_Base
+	 */
+	public function disconnectDialog(): EE_Form_Section_Base
+	{
+		$message = esc_html__(
+			'Disconnecting your PayPal account will prevent you from offering PayPal services and products on your website.',
+			'event_espresso'
+		);
+		return new EE_Form_Section_HTML(
+			EEH_HTML::div(
+				EEH_HTML::strong(
+					$message,
+					'eep_ppc_disconnect_dialog_txt_' . $this->pm_slug,
+					'eep-ppc-disconnect-dialog-txt'
+				) .
+				EEH_HTML::div(
+					EEH_HTML::link(
+						'',
+						'Cancel',
+						'cancel, go back',
+						'eep_ppc_disconnect_cancel_' . $this->pm_slug,
+						'eep-ppc-disconnect-cancel button button--secondary'
+					) .
+					EEH_HTML::link(
+						'',
+						'Disconnect',
+						'ok, continue',
+						'eep_ppc_disconnect_ok_' . $this->pm_slug,
+						'eep-ppc-disconnect-ok button button--primary-alt'
+					),
+					'',
+					'eep-ppc-dialog-yes-no'
+				),
+				'eep_paypal_disconnect_dialog_' . $this->pm_slug
+			)
+		);
+	}
 }

Spacing +45 added lines, -45 removed lines

@@ -101,7 +101,7 @@ 
                 $text,
                 $this->payment_method->get_help_tab_link()
             ),
-            'eea_paypal_onboard_heading_' . $this->pm_slug,
+            'eea_paypal_onboard_heading_'.$this->pm_slug,
             'eea-paypal-onboard-heading'
         );
     }
@@ -119,26 +119,26 @@ 
         // Section to be displayed if not onboard.
         $subsections['paypal_onboard_btn'] = new EE_Form_Section_HTML(
             EEH_HTML::tr(
-                $this->getHeader() .
+                $this->getHeader().
                 EEH_HTML::td(
                     EEH_HTML::button(
                         $this->onboard_btn_text,
                         'eea-paypal-onboard-btn button button--primary',
                         '',
-                        'eea_paypal_onboard_btn_' . $this->pm_slug,
+                        'eea_paypal_onboard_btn_'.$this->pm_slug,
                     )
                     . EEH_HTML::link(
                         '#',
                         '',
                         '',
-                        'eea_paypal_onboard_trigger_btn_' . $this->pm_slug,
+                        'eea_paypal_onboard_trigger_btn_'.$this->pm_slug,
                         'eea-paypal-onboard-trigger-btn',
                         '',
-                        'data-ee-pm-slug="' . $this->pm_slug . '" data-paypal-button="true"'
+                        'data-ee-pm-slug="'.$this->pm_slug.'" data-paypal-button="true"'
                     )
                 ),
-                'eea_paypal_onboard_section_' . $this->pm_slug,
-                'eea-onboard-section eea-onboard-section-' . $this->pm_slug,
+                'eea_paypal_onboard_section_'.$this->pm_slug,
+                'eea-onboard-section eea-onboard-section-'.$this->pm_slug,
                 // Are we onboard ?
                 $is_onboard ? 'display:none;' : ''
             ),
@@ -166,14 +166,14 @@ 
                 $this->getHeader()
                 . EEH_HTML::td(
                     EEH_HTML::img(
-                        EEP_PAYPAL_COMMERCE_URL . 'assets' . DS . 'lib' . DS . 'paypal-onboard.png',
+                        EEP_PAYPAL_COMMERCE_URL.'assets'.DS.'lib'.DS.'paypal-onboard.png',
                         '',
                         'eea_paypal_offboard_ico',
                         'eea-paypal-offboard-ico'
                     )
                     . EEH_HTML::strong(
                         esc_html__('Connected.', 'event_espresso'),
-                        'eea_paypal_offboard_txt_' . $this->pm_slug,
+                        'eea_paypal_offboard_txt_'.$this->pm_slug,
                         'eea-paypal-offboard-txt'
                     )
                     . $onboard_sandbox_section
@@ -182,12 +182,12 @@ 
                         '#',
                         EEH_HTML::span(esc_html__('Disconnect', 'event_espresso')),
                         '',
-                        'eea_paypal_offboard_btn_' . $this->pm_slug,
+                        'eea_paypal_offboard_btn_'.$this->pm_slug,
                         'eea-paypal-onboard-btn button button--primary'
                     )
                 ),
-                'eea_paypal_offboard_section_' . $this->pm_slug,
-                'eea-offboard-section-' . $this->pm_slug,
+                'eea_paypal_offboard_section_'.$this->pm_slug,
+                'eea-offboard-section-'.$this->pm_slug,
                 // Are we onboard ?
                 ! $is_onboard ? 'display:none;' : ''
             ),
@@ -206,9 +206,9 @@ 
     {
         // Is this a test onboarding ?
         $sandbox_mode_text = $this->pm_instance->debug_mode() ? $this->authed_sandbox_text : '';
-        return ' ' . EEH_HTML::strong(
+        return ' '.EEH_HTML::strong(
             $sandbox_mode_text,
-            'eea_paypal_onboard_test_txt_' . $this->pm_slug,
+            'eea_paypal_onboard_test_txt_'.$this->pm_slug,
             'eea-paypal-onboard-test-txt'
         );
     }
@@ -228,9 +228,9 @@ 
         } catch (Exception $e) {
             $payer_id = '--';
         }
-        return ' ' . EEH_HTML::strong(
+        return ' '.EEH_HTML::strong(
             sprintf(esc_html__('Linked account ID: %1$s', 'event_espresso'), $payer_id),
-            'eea_paypal_seller_id_' . $this->pm_slug,
+            'eea_paypal_seller_id_'.$this->pm_slug,
             'eea-paypal-seller-id'
         );
     }
@@ -265,27 +265,27 @@ 
     {
         return new EE_Form_Section_HTML(
             EEH_HTML::div(
-                $this->countriesSelectHtml() .
-                $this->paymentOptionsHtml() .
+                $this->countriesSelectHtml().
+                $this->paymentOptionsHtml().
                 EEH_HTML::div(
                     EEH_HTML::link(
                         '',
                         'Cancel',
                         'cancel, go back',
-                        'eea_ppc_connect_cancel_' . $this->pm_slug,
+                        'eea_ppc_connect_cancel_'.$this->pm_slug,
                         'eea-ppc-connect-cancel button button--secondary'
-                    ) .
+                    ).
                     EEH_HTML::link(
                         '',
                         'Continue',
                         'ok, continue',
-                        'eea_ppc_connect_ok_' . $this->pm_slug,
+                        'eea_ppc_connect_ok_'.$this->pm_slug,
                         'eea-ppc-connect-ok button button--primary-alt'
                     ),
                     '',
                     'eep-ppc-dialog-yes-no'
                 ),
-                'eea_paypal_connect_dialog_' . $this->pm_slug
+                'eea_paypal_connect_dialog_'.$this->pm_slug
             )
         );
     }
@@ -301,7 +301,7 @@ 
         $countries = [];
         $countries_select = EEH_HTML::strong(
             esc_html__('Please select a country where your PayPal account is registered:', 'event_espresso'),
-            'eep_ppc_country_txt_' . $this->pm_slug,
+            'eep_ppc_country_txt_'.$this->pm_slug,
             'eep-ppc-country-txt'
         );
         try {
@@ -309,16 +309,16 @@ 
             $countries_iso = EEM_Country::instance()->get_all_countries();
             foreach ($countries_iso as $iso => $country) {
                 if ($country instanceof EE_Country) {
-                    $countries [ $iso ] = $country->get('CNT_name');
+                    $countries [$iso] = $country->get('CNT_name');
                 }
             }
             // Now build the select input.
             $select_input = new EE_Select_Input(
                 $countries,
                 [
-                    'html_name'       => 'eep_ppc_country_' . $this->pm_slug,
-                    'html_id'         => 'eep_ppc_country_' . $this->pm_slug,
-                    'html_class'      => 'eep-ppc-country-' . $this->pm_slug,
+                    'html_name'       => 'eep_ppc_country_'.$this->pm_slug,
+                    'html_id'         => 'eep_ppc_country_'.$this->pm_slug,
+                    'html_class'      => 'eep-ppc-country-'.$this->pm_slug,
                     'html_label_text' => esc_html__('Select country', 'event_espresso'),
                     'required'        => true,
                     'default'         => EE_Config::instance()->organization->CNT_ISO ?? 'US'
@@ -341,7 +341,7 @@ 
     {
         $options_lbl = EEH_HTML::strong(
             esc_html__('Select a product you\'d like to allow at checkout:', 'event_espresso'),
-            'eea_ppc_product_txt_' . $this->pm_slug,
+            'eea_ppc_product_txt_'.$this->pm_slug,
             'eea-ppc-product-txt'
         );
         $express_checkout_lbl = EEH_HTML::label(
@@ -349,26 +349,26 @@ 
             . EEH_HTML::img(
                 'https://www.paypalobjects.com/webstatic/mktg/Logo/pp-logo-100px.png',
                 '',
-                'eea_ppc_express_checkout_img_' . $this->pm_slug,
+                'eea_ppc_express_checkout_img_'.$this->pm_slug,
                 'eea-ppc-express-checkout-img'
             ),
             '',
             '',
             '',
-            'for="' . 'eep_ppc_checkout_type_' . $this->pm_slug . '-express_checkout"'
+            'for="'.'eep_ppc_checkout_type_'.$this->pm_slug.'-express_checkout"'
         );
         $ppcp_lbl = EEH_HTML::label(
             esc_html__('Accept credit and debit card payments with PayPal ', 'event_espresso')
             . EEH_HTML::img(
                 'https://www.paypalobjects.com/digitalassets/c/website/marketing/apac/C2/logos-buttons/optimize/Full_Online_Tray_RGB.png',
                 '',
-                'eea_ppc_ppcp_img_' . $this->pm_slug,
+                'eea_ppc_ppcp_img_'.$this->pm_slug,
                 'eea-ppc-ppcp-img'
             ),
             '',
             '',
             '',
-            'for="' . 'eep_ppc_checkout_type_' . $this->pm_slug . '-ppcp"'
+            'for="'.'eep_ppc_checkout_type_'.$this->pm_slug.'-ppcp"'
         );
         $checkbox = new EE_Checkbox_Multi_Input(
             [
@@ -376,7 +376,7 @@ 
                 'ppcp'             => $ppcp_lbl,
             ],
             [
-                'html_id'         => 'eep_ppc_checkout_type_' . $this->pm_slug,
+                'html_id'         => 'eep_ppc_checkout_type_'.$this->pm_slug,
                 'html_label_text' => esc_html__(
                     'Select a product you\'d like to allow at checkout.',
                     'event_espresso'
@@ -392,7 +392,7 @@ 
             return EEH_HTML::div(
                 $options_lbl
                 . $checkbox->get_html_for_input(),
-                'eep_ppc_checkout_types_' . $this->pm_slug,
+                'eep_ppc_checkout_types_'.$this->pm_slug,
                 'eep-ppc-checkout-types'
             );
         } catch (Exception $e) {
@@ -410,23 +410,23 @@ 
     {
         return new EE_Form_Section_HTML(
             EEH_HTML::div(
-                EEH_HTML::div(' ', 'eep_ppc_processing_mask', 'eep-ppc-processing-mask') .
-                EEH_HTML::div(' ', 'eep_ppc_processing_spinner', 'ee-spinner ee-spin') .
+                EEH_HTML::div(' ', 'eep_ppc_processing_mask', 'eep-ppc-processing-mask').
+                EEH_HTML::div(' ', 'eep_ppc_processing_spinner', 'ee-spinner ee-spin').
                 EEH_HTML::div(
-                    esc_html__('The login window should be open. If you don\'t see a new PayPal login window you might need to enable pop-ups in your browser in order to continue.') .
+                    esc_html__('The login window should be open. If you don\'t see a new PayPal login window you might need to enable pop-ups in your browser in order to continue.').
                     EEH_HTML::div(
                         EEH_HTML::link(
                             '#',
                             esc_html__('Focus window'),
                             esc_html__('Focus window'),
-                            'eep_ppc_window_focus_' . $this->pm_slug,
+                            'eep_ppc_window_focus_'.$this->pm_slug,
                             'eep-ppc-window-focus'
                         )
                     ),
                     'eep_ppc_processing_message',
                     'eep-ppc-processing-message'
                 ),
-                'eep_ppc_processing_' . $this->pm_slug,
+                'eep_ppc_processing_'.$this->pm_slug,
                 'eep-ppc-processing'
             )
         );
@@ -448,28 +448,28 @@ 
             EEH_HTML::div(
                 EEH_HTML::strong(
                     $message,
-                    'eep_ppc_disconnect_dialog_txt_' . $this->pm_slug,
+                    'eep_ppc_disconnect_dialog_txt_'.$this->pm_slug,
                     'eep-ppc-disconnect-dialog-txt'
-                ) .
+                ).
                 EEH_HTML::div(
                     EEH_HTML::link(
                         '',
                         'Cancel',
                         'cancel, go back',
-                        'eep_ppc_disconnect_cancel_' . $this->pm_slug,
+                        'eep_ppc_disconnect_cancel_'.$this->pm_slug,
                         'eep-ppc-disconnect-cancel button button--secondary'
-                    ) .
+                    ).
                     EEH_HTML::link(
                         '',
                         'Disconnect',
                         'ok, continue',
-                        'eep_ppc_disconnect_ok_' . $this->pm_slug,
+                        'eep_ppc_disconnect_ok_'.$this->pm_slug,
                         'eep-ppc-disconnect-ok button button--primary-alt'
                     ),
                     '',
                     'eep-ppc-dialog-yes-no'
                 ),
-                'eep_paypal_disconnect_dialog_' . $this->pm_slug
+                'eep_paypal_disconnect_dialog_'.$this->pm_slug
             )
         );
     }

PaymentMethods/PayPalCommerce/PayPalCheckout/forms/SettingsForm.php

Indentation +233 added lines, -233 removed lines

@@ -25,252 +25,252 @@
  */
 class SettingsForm extends EE_Payment_Method_Form
 {
-    /**
-     *  Payment method.
-     *
-     * @var EE_PMT_Base|null
-     */
-    protected $payment_method = null;
+	/**
+	 *  Payment method.
+	 *
+	 * @var EE_PMT_Base|null
+	 */
+	protected $payment_method = null;
 
-    /**
-     *  Payment method instance.
-     *
-     * @var EE_PMT_Base|null
-     */
-    protected $pm_instance = null;
+	/**
+	 *  Payment method instance.
+	 *
+	 * @var EE_PMT_Base|null
+	 */
+	protected $pm_instance = null;
 
 
-    /**
-     * Class constructor.
-     *
-     * @param EE_PMT_PayPalCheckout $payment_method
-     * @param EE_Payment_Method     $pm_instance
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function __construct(EE_PMT_PayPalCheckout $payment_method, EE_Payment_Method $pm_instance)
-    {
-        $form_parameters      = [];
-        $this->payment_method = $payment_method;
-        $this->pm_instance    = $pm_instance;
-        // Allow Advanced Card Checkout if PPCP checkout type was possible and selected.
-        $allowed_type = PayPalExtraMetaManager::getPmOption($pm_instance, Domain::META_KEY_ALLOWED_CHECKOUT_TYPE);
-        $is_onboard   = EED_PayPalOnboard::isOnboard($pm_instance);
-        if ($is_onboard && ($allowed_type === 'ppcp' || $allowed_type === 'all')) {
-            $form_parameters = $this->addCheckoutTypeSelect($form_parameters);
-            $form_parameters = $this->addFundingOptions($form_parameters);
-        }
-        // Build the PM form.
-        parent::__construct($form_parameters);
-        // Add a form for PayPal Onboard.
-        $this->addOnboardingForm($payment_method, $pm_instance);
-        // Add a form for PayPal Onboard.
-        $this->addFeesNotice();
-        // Add the clear data button.
-        $this->clearMetadataButton($pm_instance);
-        // Disable inputs if needed.
-        $this->toggleSubsections($pm_instance);
-    }
+	/**
+	 * Class constructor.
+	 *
+	 * @param EE_PMT_PayPalCheckout $payment_method
+	 * @param EE_Payment_Method     $pm_instance
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function __construct(EE_PMT_PayPalCheckout $payment_method, EE_Payment_Method $pm_instance)
+	{
+		$form_parameters      = [];
+		$this->payment_method = $payment_method;
+		$this->pm_instance    = $pm_instance;
+		// Allow Advanced Card Checkout if PPCP checkout type was possible and selected.
+		$allowed_type = PayPalExtraMetaManager::getPmOption($pm_instance, Domain::META_KEY_ALLOWED_CHECKOUT_TYPE);
+		$is_onboard   = EED_PayPalOnboard::isOnboard($pm_instance);
+		if ($is_onboard && ($allowed_type === 'ppcp' || $allowed_type === 'all')) {
+			$form_parameters = $this->addCheckoutTypeSelect($form_parameters);
+			$form_parameters = $this->addFundingOptions($form_parameters);
+		}
+		// Build the PM form.
+		parent::__construct($form_parameters);
+		// Add a form for PayPal Onboard.
+		$this->addOnboardingForm($payment_method, $pm_instance);
+		// Add a form for PayPal Onboard.
+		$this->addFeesNotice();
+		// Add the clear data button.
+		$this->clearMetadataButton($pm_instance);
+		// Disable inputs if needed.
+		$this->toggleSubsections($pm_instance);
+	}
 
 
-    /**
-     * Adds an onboarding form as a subsection.
-     *
-     * @param EE_PMT_PayPalCheckout $payment_method
-     * @param EE_Payment_Method     $pm_instance
-     * @return void
-     */
-    public function addOnboardingForm(EE_PMT_PayPalCheckout $payment_method, EE_Payment_Method $pm_instance): void
-    {
-        // Add the connect button before the app id field.
-        try {
-            $this->add_subsections(
-                [
-                    'paypal_onboard' => new OnboardingForm($payment_method, $pm_instance),
-                ],
-                'PMD_debug_mode',
-                false
-            );
-        } catch (EE_Error $e) {
-            // Simply don't add the form.
-        }
-    }
+	/**
+	 * Adds an onboarding form as a subsection.
+	 *
+	 * @param EE_PMT_PayPalCheckout $payment_method
+	 * @param EE_Payment_Method     $pm_instance
+	 * @return void
+	 */
+	public function addOnboardingForm(EE_PMT_PayPalCheckout $payment_method, EE_Payment_Method $pm_instance): void
+	{
+		// Add the connect button before the app id field.
+		try {
+			$this->add_subsections(
+				[
+					'paypal_onboard' => new OnboardingForm($payment_method, $pm_instance),
+				],
+				'PMD_debug_mode',
+				false
+			);
+		} catch (EE_Error $e) {
+			// Simply don't add the form.
+		}
+	}
 
 
-    /**
-     * Add fees notice.
-     *
-     * @return void
-     */
-    public function addFeesNotice(): void
-    {
-        if (defined('EE_PPC_USE_PAYMENT_FEES') && ! EE_PPC_USE_PAYMENT_FEES) {
-            // We want to be able to disable fees.
-            return;
-        }
-        try {
-            $this->add_subsections(
-                [
-                    'partner_fees_notice' => new EE_Form_Section_HTML(
-                        EEH_HTML::tr(
-                            EEH_HTML::th()
-                            . EEH_HTML::thx()
-                            . EEH_HTML::td(
-                                EEH_HTML::div(
-                                    EEH_HTML::strong(
-                                        esc_html__(
-                                            'PayPal Partner Commission Fees are based upon the status of your Support License:',
-                                            'event_espresso'
-                                        )
-                                    )
-                                    . EEH_HTML::ul()
-                                    . EEH_HTML::li(
-                                        esc_html__('- Active licenses commission fees: 0%', 'event_espresso')
-                                    )
-                                    . EEH_HTML::li(
-                                        esc_html__('- Expired license commission fees: 3%', 'event_espresso')
-                                    )
-                                    . EEH_HTML::ulx()
-                                    . esc_html__(
-                                        'Keep your support license active for: lower fees, up-to-date software and have access to our support team. By connecting and processing payments you agree to these terms.',
-                                        'event_espresso'
-                                    ),
-                                    '',
-                                    'ee-status-outline ee-status-bg--info'
-                                )
-                            )
-                        )
-                    ),
-                ],
-                'paypal_onboard'
-            );
-        } catch (EE_Error $e) {
-            // Don't add this subsection then.
-        }
-    }
+	/**
+	 * Add fees notice.
+	 *
+	 * @return void
+	 */
+	public function addFeesNotice(): void
+	{
+		if (defined('EE_PPC_USE_PAYMENT_FEES') && ! EE_PPC_USE_PAYMENT_FEES) {
+			// We want to be able to disable fees.
+			return;
+		}
+		try {
+			$this->add_subsections(
+				[
+					'partner_fees_notice' => new EE_Form_Section_HTML(
+						EEH_HTML::tr(
+							EEH_HTML::th()
+							. EEH_HTML::thx()
+							. EEH_HTML::td(
+								EEH_HTML::div(
+									EEH_HTML::strong(
+										esc_html__(
+											'PayPal Partner Commission Fees are based upon the status of your Support License:',
+											'event_espresso'
+										)
+									)
+									. EEH_HTML::ul()
+									. EEH_HTML::li(
+										esc_html__('- Active licenses commission fees: 0%', 'event_espresso')
+									)
+									. EEH_HTML::li(
+										esc_html__('- Expired license commission fees: 3%', 'event_espresso')
+									)
+									. EEH_HTML::ulx()
+									. esc_html__(
+										'Keep your support license active for: lower fees, up-to-date software and have access to our support team. By connecting and processing payments you agree to these terms.',
+										'event_espresso'
+									),
+									'',
+									'ee-status-outline ee-status-bg--info'
+								)
+							)
+						)
+					),
+				],
+				'paypal_onboard'
+			);
+		} catch (EE_Error $e) {
+			// Don't add this subsection then.
+		}
+	}
 
 
-    /**
-     * Add a checkout type select.
-     *
-     * @param array $form_parameters
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function addCheckoutTypeSelect(array $form_parameters): array
-    {
-        $pm_slug               = $this->pm_instance->slug();
-        // Section to be displayed if onboard.
-        $form_parameters['extra_meta_inputs'][Domain::META_KEY_CHECKOUT_TYPE] = new EE_Select_Input(
-            [
-                'express_checkout' => esc_html__('Express Checkout', 'event_espresso'),
-                'ppcp'             => esc_html__('Advanced Credit and Debit Card payments', 'event_espresso'),
-                'all'              => esc_html__('Both, ACDC and Express Checkout', 'event_espresso'),
-            ],
-            [
-                'html_name'  => "eep_checkout_type_option_$pm_slug",
-                'html_id'    => "eep_checkout_type_option_$pm_slug",
-                'html_class' => "eep-checkout-type-option-$pm_slug",
-                'required'   => true,
-                'default'    => PayPalExtraMetaManager::getPmOption(
-                    $this->pm_instance,
-                    Domain::META_KEY_ALLOWED_CHECKOUT_TYPE
-                ),
-            ]
-        );
-        return $form_parameters;
-    }
+	/**
+	 * Add a checkout type select.
+	 *
+	 * @param array $form_parameters
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function addCheckoutTypeSelect(array $form_parameters): array
+	{
+		$pm_slug               = $this->pm_instance->slug();
+		// Section to be displayed if onboard.
+		$form_parameters['extra_meta_inputs'][Domain::META_KEY_CHECKOUT_TYPE] = new EE_Select_Input(
+			[
+				'express_checkout' => esc_html__('Express Checkout', 'event_espresso'),
+				'ppcp'             => esc_html__('Advanced Credit and Debit Card payments', 'event_espresso'),
+				'all'              => esc_html__('Both, ACDC and Express Checkout', 'event_espresso'),
+			],
+			[
+				'html_name'  => "eep_checkout_type_option_$pm_slug",
+				'html_id'    => "eep_checkout_type_option_$pm_slug",
+				'html_class' => "eep-checkout-type-option-$pm_slug",
+				'required'   => true,
+				'default'    => PayPalExtraMetaManager::getPmOption(
+					$this->pm_instance,
+					Domain::META_KEY_ALLOWED_CHECKOUT_TYPE
+				),
+			]
+		);
+		return $form_parameters;
+	}
 
 
-    /**
-     * Add a checkout type select.
-     *
-     * @param array $form_parameters
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function addFundingOptions(array $form_parameters): array
-    {
-        $pm_slug               = $this->pm_instance->slug();
-        // Section to be displayed if onboard.
-        $form_parameters['extra_meta_inputs'][Domain::META_KEY_FUNDING_OPTIONS] = new EE_Checkbox_Multi_Input(
-            [
-                'venmo'    => esc_html__('Venmo', 'event_espresso'),
-                'paylater' => esc_html__('PayLater', 'event_espresso'),
-            ],
-            [
-                'html_name'       => "eep_checkout_funding_options_$pm_slug",
-                'html_id'         => "eep_checkout_funding_options_$pm_slug",
-                'html_class'      => "eep-checkout-funding-options-$pm_slug",
-                'html_label_text' => esc_html__('Enable PayPal funding options:', 'event_espresso'),
-                'default'         => ['venmo', 'paylater'],
-            ]
-        );
-        return $form_parameters;
-    }
+	/**
+	 * Add a checkout type select.
+	 *
+	 * @param array $form_parameters
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function addFundingOptions(array $form_parameters): array
+	{
+		$pm_slug               = $this->pm_instance->slug();
+		// Section to be displayed if onboard.
+		$form_parameters['extra_meta_inputs'][Domain::META_KEY_FUNDING_OPTIONS] = new EE_Checkbox_Multi_Input(
+			[
+				'venmo'    => esc_html__('Venmo', 'event_espresso'),
+				'paylater' => esc_html__('PayLater', 'event_espresso'),
+			],
+			[
+				'html_name'       => "eep_checkout_funding_options_$pm_slug",
+				'html_id'         => "eep_checkout_funding_options_$pm_slug",
+				'html_class'      => "eep-checkout-funding-options-$pm_slug",
+				'html_label_text' => esc_html__('Enable PayPal funding options:', 'event_espresso'),
+				'default'         => ['venmo', 'paylater'],
+			]
+		);
+		return $form_parameters;
+	}
 
 
-    /**
-     * Adds a button for clearing the PM metadata.
-     *
-     * @param EE_Payment_Method $pm_instance
-     * @return void
-     */
-    public function clearMetadataButton(EE_Payment_Method $pm_instance): void
-    {
-        try {
-            $is_onboard = EED_PayPalOnboard::isOnboard($pm_instance);
-            if ($is_onboard) {
-                return;
-            }
-            $button_text = sprintf(
-                esc_html__('Clear %1$s metadata', 'event_espresso'),
-                $pm_instance->admin_name()
-            );
-            $this->add_subsections(
-                [
-                    'clear_pm_metadata' => new EE_Form_Section_HTML(
-                        EEH_HTML::tr(
-                            EEH_HTML::th(esc_html__('Clear PM metadata ?', 'event_espresso')) .
-                            EEH_HTML::td(
-                                EEH_HTML::link(
-                                    '',
-                                    $button_text,
-                                    $button_text,
-                                    'eea_clear_metadata_' . $pm_instance->slug(),
-                                    'espresso-button button button--secondary'
-                                )
-                            )
-                        )
-                    ),
-                ],
-                'PMD_order',
-                false
-            );
-        } catch (EE_Error $e) {
-            // Don't add the button if there's some error.
-        }
-    }
+	/**
+	 * Adds a button for clearing the PM metadata.
+	 *
+	 * @param EE_Payment_Method $pm_instance
+	 * @return void
+	 */
+	public function clearMetadataButton(EE_Payment_Method $pm_instance): void
+	{
+		try {
+			$is_onboard = EED_PayPalOnboard::isOnboard($pm_instance);
+			if ($is_onboard) {
+				return;
+			}
+			$button_text = sprintf(
+				esc_html__('Clear %1$s metadata', 'event_espresso'),
+				$pm_instance->admin_name()
+			);
+			$this->add_subsections(
+				[
+					'clear_pm_metadata' => new EE_Form_Section_HTML(
+						EEH_HTML::tr(
+							EEH_HTML::th(esc_html__('Clear PM metadata ?', 'event_espresso')) .
+							EEH_HTML::td(
+								EEH_HTML::link(
+									'',
+									$button_text,
+									$button_text,
+									'eea_clear_metadata_' . $pm_instance->slug(),
+									'espresso-button button button--secondary'
+								)
+							)
+						)
+					),
+				],
+				'PMD_order',
+				false
+			);
+		} catch (EE_Error $e) {
+			// Don't add the button if there's some error.
+		}
+	}
 
 
-    /**
-     * Toggles subsections depending on the OAuth status etc.
-     *
-     * @param EE_Payment_Method $pm_instance
-     * @return void
-     * @throws EE_Error
-     */
-    private function toggleSubsections(EE_Payment_Method $pm_instance): void
-    {
-        $onboard = EED_PayPalOnboard::isOnboard($pm_instance);
-        // Don't allow changing the debug mode setting while connected.
-        if ($onboard) {
-            $debug_mode_input = $this->get_input('PMD_debug_mode', false);
-            if (method_exists($debug_mode_input, 'isDisabled')) {
-                $debug_mode_input->disable();
-            }
-        }
-    }
+	/**
+	 * Toggles subsections depending on the OAuth status etc.
+	 *
+	 * @param EE_Payment_Method $pm_instance
+	 * @return void
+	 * @throws EE_Error
+	 */
+	private function toggleSubsections(EE_Payment_Method $pm_instance): void
+	{
+		$onboard = EED_PayPalOnboard::isOnboard($pm_instance);
+		// Don't allow changing the debug mode setting while connected.
+		if ($onboard) {
+			$debug_mode_input = $this->get_input('PMD_debug_mode', false);
+			if (method_exists($debug_mode_input, 'isDisabled')) {
+				$debug_mode_input->disable();
+			}
+		}
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -160,7 +160,7 @@ 
      */
     public function addCheckoutTypeSelect(array $form_parameters): array
     {
-        $pm_slug               = $this->pm_instance->slug();
+        $pm_slug = $this->pm_instance->slug();
         // Section to be displayed if onboard.
         $form_parameters['extra_meta_inputs'][Domain::META_KEY_CHECKOUT_TYPE] = new EE_Select_Input(
             [
@@ -193,7 +193,7 @@ 
      */
     public function addFundingOptions(array $form_parameters): array
     {
-        $pm_slug               = $this->pm_instance->slug();
+        $pm_slug = $this->pm_instance->slug();
         // Section to be displayed if onboard.
         $form_parameters['extra_meta_inputs'][Domain::META_KEY_FUNDING_OPTIONS] = new EE_Checkbox_Multi_Input(
             [
@@ -233,13 +233,13 @@ 
                 [
                     'clear_pm_metadata' => new EE_Form_Section_HTML(
                         EEH_HTML::tr(
-                            EEH_HTML::th(esc_html__('Clear PM metadata ?', 'event_espresso')) .
+                            EEH_HTML::th(esc_html__('Clear PM metadata ?', 'event_espresso')).
                             EEH_HTML::td(
                                 EEH_HTML::link(
                                     '',
                                     $button_text,
                                     $button_text,
-                                    'eea_clear_metadata_' . $pm_instance->slug(),
+                                    'eea_clear_metadata_'.$pm_instance->slug(),
                                     'espresso-button button button--secondary'
                                 )
                             )

PaymentMethods/PayPalCommerce/PayPalCheckout/forms/BillingForm.php

Indentation +567 added lines, -567 removed lines

@@ -38,571 +38,571 @@
  */
 class BillingForm extends EE_Billing_Attendee_Info_Form
 {
-    protected EE_Payment_Method $paypal_pmt;
-
-    protected ?EE_Transaction $transaction = null;
-
-    protected string $checkout_type;
-
-    /**
-     * Filepath to template files
-     *
-     * @var string $template_path
-     */
-    protected string $template_path;
-
-
-    /**
-     * Class constructor.
-     *
-     * @param EE_Payment_Method    $payment_method
-     * @param array                $options
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function __construct(EE_Payment_Method $payment_method, array $options)
-    {
-        $this->paypal_pmt    = $payment_method;
-        // Can't be too careful.
-        $this->transaction   = $options['transaction'] ?? null;
-        $this->template_path = $options['template_path'] ?? '';
-        $this->checkout_type = $payment_method->get_extra_meta(Domain::META_KEY_CHECKOUT_TYPE, true, '');
-        $pm_slug             = $payment_method->slug();
-        $parameters          = array_replace_recursive(
-            $options,
-            [
-                'name'        => 'PayPalCommerceBillingForm',
-                'html_id'     => 'pp-' . $pm_slug . '-billing-form',
-                'html_class'  => 'pp_commerce_billing_form',
-                'subsections' => [
-                    'eea_paypal_commerce_token' => new EE_Hidden_Input(
-                        [
-                            'html_id'   => 'eea-paypal-commerce-token',
-                            'html_name' => 'EEA_paymentToken',
-                            'default'   => '',
-                        ]
-                    ),
-                    'pp_order_nonce'            => new EE_Hidden_Input(
-                        [
-                            'html_id'   => 'eea-' . $pm_slug . '-order-nonce',
-                            'html_name' => 'pp_order_nonce',
-                            'default'   => '',
-                        ]
-                    ),
-                    'pp_order_id'               => new EE_Hidden_Input(
-                        [
-                            'html_id'   => 'eea-' . $pm_slug . '-order-id',
-                            'html_name' => 'pp_order_id',
-                            'default'   => '',
-                        ]
-                    ),
-                    'pp_order_status'           => new EE_Hidden_Input(
-                        [
-                            'html_id'   => 'eea-' . $pm_slug . '-order-status',
-                            'html_name' => 'pp_order_status',
-                            'default'   => '',
-                        ]
-                    ),
-                    'pp_order_amount'           => new EE_Hidden_Input(
-                        [
-                            'html_id'   => 'eea-' . $pm_slug . '-order-amount',
-                            'html_name' => 'pp_order_amount',
-                            'default'   => '',
-                        ]
-                    ),
-                ],
-            ]
-        );
-        // Add data tags to the PP script.
-        add_filter('script_loader_tag', [$this, 'addDataTagsToScript'], 10, 2);
-        parent::__construct($payment_method, $parameters);
-        // Add and exclude other sections.
-        $this->addPaymentSections();
-        // Additional actions and/or filters.
-        $this->loadActionsAndFilters();
-    }
-
-
-    /**
-     * Add PayPal payment sections.
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function addPaymentSections(): void
-    {
-        // Exclude the default billing form fields.
-        $this->exclude(
-            [
-                'first_name',
-                'last_name',
-                'email',
-            ]
-        );
-        // Add PayPal Hosted Fields.
-        if ($this->checkout_type !== 'express_checkout') {
-            $this->addAdvancedCardFields();
-        }
-        // Add payment types separator, if both are enabled.
-        if ($this->checkout_type === 'all') {
-            $this->addTypesSeparator();
-        }
-        // Add PayPal Buttons section.
-        if ($this->checkout_type !== 'ppcp') {
-            $this->add_subsections(
-                [
-                    'paypal_commerce_pm_form' => $this->addPayPalCheckout(),
-                ]
-            );
-        }
-        // Exclude the rest billing form fields if the payment type is express checkout.
-        if ($this->checkout_type === 'express_checkout') {
-            $this->exclude(
-                [
-                    'address',
-                    'address2',
-                    'state',
-                    'phone',
-                    'city',
-                    'country',
-                    'zip',
-                ]
-            );
-            // Remove the Info subsection.
-            add_filter('FHEE__EE_Form_Section_Proper___construct__options_array', [$this, 'excludeInfoSubsection']);
-        }
-        $this->add_subsections(
-            [
-                'debug_content' => $this->addDebugContent($this->paypal_pmt),
-            ]
-        );
-    }
-
-
-    /**
-     * Additional actions and/or filters.
-     *
-     * @return void
-     */
-    public function loadActionsAndFilters(): void
-    {
-        add_filter(
-            'FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form',
-            [__CLASS__, 'excludeBillingFormFields'],
-            10,
-            2
-        );
-    }
-
-
-    /**
-     * Filter out billing form fields if pay button was used.
-     *
-     * @param EE_Billing_Info_Form $billing_form
-     * @param EE_Payment_Method    $payment_method
-     * @return EE_Billing_Info_Form
-     */
-    public static function excludeBillingFormFields(
-        EE_Billing_Info_Form $billing_form,
-        EE_Payment_Method $payment_method
-    ): EE_Billing_Info_Form {
-        $request        = LoaderFactory::getShared(Request::class);
-        $request_params = $request->requestParams();
-        // Only the PPC billing form.
-        if (! $billing_form instanceof BillingForm) {
-            return $billing_form;
-        }
-        // Make sure the billing form subsections have correct names.
-        $inputs = $billing_form->inputs_in_subsections();
-        if (
-            ! empty($request_params['process_form_submission'])
-            && $request_params['process_form_submission'] === '1'
-            && ! empty($request_params['eep_ppc_skip_form_validation'])
-        ) {
-            // Hide card info fields.
-            $billing_form->exclude(
-                [
-                    'pp_name_on_card',
-                    'address',
-                    'address2',
-                    'state',
-                    'phone',
-                    'city',
-                    'country',
-                    'zip',
-                ]
-            );
-        }
-        return $billing_form;
-    }
-
-
-    /**
-     * Add advanced card & debit card fields.
-     *
-     * @return void
-     * @throws EE_Error|ReflectionException
-     */
-    public function addAdvancedCardFields(): void
-    {
-        $pm_slug = $this->paypal_pmt->slug();
-        $this->add_subsections(
-            [
-                'pp_card_number'     => new EE_Form_Section_HTML(
-                    EEH_HTML::label(
-                        esc_html__('Card Number', 'event_espresso'),
-                        "$pm_slug-card-number-lbl",
-                        "$pm_slug-card-fields",
-                        "",
-                        'for="' . $pm_slug . '-card-number"'
-                    ) .
-                    EEH_HTML::p(
-                        "",
-                        "$pm_slug-card-number",
-                        "card_field $pm_slug-card-fields"
-                    )
-                ),
-                'pp_expiration_date' => new EE_Form_Section_HTML(
-                    EEH_HTML::label(
-                        esc_html__('Expiration Date', 'event_espresso'),
-                        "$pm_slug-expiration-date-lbl",
-                        "$pm_slug-card-fields",
-                        "",
-                        'for="' . $pm_slug . '-expiration-date"'
-                    ) .
-                    EEH_HTML::p(
-                        "",
-                        "$pm_slug-expiration-date",
-                        "card_field $pm_slug-card-fields"
-                    )
-                ),
-                'pp_card_cvv'        => new EE_Form_Section_HTML(
-                    EEH_HTML::label(
-                        esc_html__('CVV', 'event_espresso'),
-                        "$pm_slug-cvv-lbl",
-                        "$pm_slug-card-fields",
-                        "",
-                        'for="' . $pm_slug . '-cvv"'
-                    ) .
-                    EEH_HTML::p(
-                        "",
-                        "$pm_slug-cvv",
-                        "card_field $pm_slug-card-fields"
-                    )
-                ),
-                'pp_name_on_card'    => new EE_Text_Input(
-                    [
-                        'html_label_text' => esc_html__('Name On Card', 'event_espresso'),
-                        'html_id'         => $pm_slug . '-card-holder-name',
-                        'html_name'       => 'card-holder-name',
-                        'html_class'      => '',
-                        'required'        => true,
-                    ]
-                ),
-            ]
-        );
-        // Add the submit button at the end.
-        $this->add_subsections(
-            [
-                'pp_cc_submit' => new EE_Submit_Input(
-                    [
-                        'html_label_text' => esc_html__('Submit', 'event_espresso'),
-                        'html_id'         => $pm_slug,
-                        'html_class'      => 'eep-ppc-btn',
-                    ]
-                ),
-            ],
-            'phone',
-            false
-        );
-    }
-
-
-    /**
-     * Add advanced card & debit card fields.
-     *
-     * @return void
-     * @throws EE_Error|ReflectionException
-     */
-    public function addTypesSeparator(): void
-    {
-        $this->add_subsections(
-            [
-                'pp_payment_types_separator' => new EE_Form_Section_HTML(
-                    EEH_HTML::div(
-                        EEH_HTML::div(
-                            ' ',
-                            'eep-' . $this->paypal_pmt->slug() . '-payments-separator',
-                            'eep-ppc-separator-line eep-left-floating'
-                        ) .
-                        EEH_HTML::div(
-                            esc_html__(' or ', 'event_espresso'),
-                            'eep-' . $this->paypal_pmt->slug() . '-separator-text',
-                            'eep-ppc-separator-text1 eep-mid-floating'
-                        ) . EEH_HTML::div(
-                            ' ',
-                            'eep-' . $this->paypal_pmt->slug() . '-payments-separator',
-                            'eep-ppc-separator-line eep-right-floating'
-                        ),
-                        'eep-ppc-separator-holder',
-                        'eep-ppc-separator-holder'
-                    )
-                ),
-            ]
-        );
-    }
-
-
-    /**
-     * Exclude the info subsection from the PPC checkout form.
-     *
-     * @param array $options_array
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function excludeInfoSubsection(array $options_array): array
-    {
-        if (
-            ! empty($options_array['html_id'])
-            && $options_array['html_id'] === 'spco-payment-method-info-' . $this->paypal_pmt->slug()
-        ) {
-            if (! empty($options_array['subsections']) && isset($options_array['subsections']['info'])) {
-                unset($options_array['subsections']['info']);
-            }
-        }
-        return $options_array;
-    }
-
-
-    /**
-     * Possibly adds debug content to PayPal commerce billing form.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @return EE_Form_Section_Base
-     * @throws EE_Error|ReflectionException
-     */
-    public function addDebugContent(EE_Payment_Method $paypal_pm): EE_Form_Section_Base
-    {
-        if ($paypal_pm->debug_mode()) {
-            return new EE_Form_Section_Proper(
-                [
-                    'layout_strategy' => new EE_Template_Layout(
-                        [
-                            'layout_template_file' => $this->template_path . 'debugInfo.template.php',
-                            'template_args'        => [],
-                        ]
-                    ),
-                ]
-            );
-        }
-        return new EE_Form_Section_HTML();
-    }
-
-
-    /**
-     * Add PayPal checkout buttons.
-     *
-     * @return EE_Form_Section_Proper
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @throws Exception
-     */
-    public function addPayPalCheckout(): EE_Form_Section_Proper
-    {
-        $template_args['pm_slug']     = $this->paypal_pmt->slug();
-        return new EE_Form_Section_Proper(
-            [
-                'layout_strategy' => new EE_Template_Layout(
-                    [
-                        'layout_template_file' => $this->template_path . 'paymentButtons.template.php',
-                        'template_args'        => $template_args,
-                    ]
-                ),
-            ]
-        );
-    }
-
-
-    /**
-     * Load scripts and localize data needed for this form.
-     *
-     * @param $tag
-     * @param $handle
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function addDataTagsToScript($tag, $handle): string
-    {
-        if ($handle === 'eea_paypal_commerce_js_lib') {
-            $bn_code  = PayPalExtraMetaManager::getPmOption($this->_pm_instance, Domain::META_KEY_BN_CODE);
-            $response = EED_PayPalCommerce::requestClientToken($this->paypal_pmt);
-            if (empty($response['client_token'])) {
-                return $tag;
-            }
-            $client_token = $response['client_token'];
-            $attributes   = " data-partner-attribution-id=\"$bn_code\" data-client-token=\"$client_token\"";
-            $tag          = str_replace('></script>', $attributes . '></script>', $tag);
-        }
-        return $tag;
-    }
-
-
-    /**
-     * Load scripts and localize data needed for this form.
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @throws Exception
-     */
-    public function enqueue_js(): void
-    {
-        // Setup default values
-        $client_id_key = Domain::META_KEY_CLIENT_ID;
-        $merchant_id   = false;
-        $funding_options = ['venmo', 'paylater'];
-
-        // Override the above if thrid party integration
-        if (EED_PayPalCommerce::isThirdParty($this->_pm_instance)) {
-            $client_id_key = Domain::META_KEY_PARTNER_CLIENT_ID;
-            $merchant_id   = PayPalExtraMetaManager::getPmOption(
-                $this->_pm_instance,
-                Domain::META_KEY_SELLER_MERCHANT_ID
-            );
-        }
-
-        // Setup query args
-        $url_params            = [
-            'client-id'        => PayPalExtraMetaManager::getPmOption($this->_pm_instance, $client_id_key),
-            'currency'         => CurrencyManager::currencyCode(),
-            'components'       => implode(',', ['buttons','hosted-fields']),
-            'intent'           => 'capture',
-            'merchant-id'      => $merchant_id,
-        ];
-
-        // Which funding methods are active?
-        $enabled_funding = $this->_pm_instance->get_extra_meta(Domain::META_KEY_FUNDING_OPTIONS, true, $funding_options);
-
-        // Any funding method not enabled should be disabled.
-        $disabled_funding = array_diff(
-            $funding_options,
-            $enabled_funding
-        );
-
-        // Any funding options enabled?
-        if (count($enabled_funding) > 0) {
-            $url_params['enable-funding'] = implode(',', $enabled_funding);
-        }
-
-        // Any funding options disabled?
-        if (count($disabled_funding) > 0) {
-            $url_params['disable-funding'] = implode(',', $disabled_funding);
-        }
-
-        // Enqueue the PayPal JS
-        wp_enqueue_script(
-            'eea_paypal_commerce_js_lib',
-            add_query_arg($url_params, 'https://www.paypal.com/sdk/js'),
-            [],
-            null
-        );
-
-        wp_enqueue_script(
-            'eea_paypal_commerce_js',
-            EEP_PAYPAL_COMMERCE_URL . 'assets/js/paypal-commerce-payments.js',
-            ['eea_paypal_commerce_js_lib'],
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        // Styles.
-        wp_enqueue_style(
-            'eea_paypal_checkout_form_styles',
-            EEP_PAYPAL_COMMERCE_URL . 'assets' . DS . 'css' . DS . 'eea-paypal-checkout.css',
-            [],
-            EVENT_ESPRESSO_VERSION
-        );
-        // Localize the script with our transaction data.
-        $parameters = $this->localizeParameters();
-        wp_localize_script('eea_paypal_commerce_js', 'eeaPPCommerceParameters', $parameters);
-        parent::enqueue_js();
-    }
-
-
-    /**
-     * Form and return PayPal commerce parameters for script localization.
-     *
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @throws Exception
-     */
-    public function localizeParameters(): array
-    {
-        // Also tell the script about each instance of this PM.
-        $pm_versions            = [];
-        $active_payment_methods = EEM_Payment_Method::instance()->get_all_active(
-            EEM_Payment_Method::scope_cart,
-            [['PMD_slug' => ['LIKE', '%paypalcheckout%']]]
-        );
-        foreach ($active_payment_methods as $payment_method) {
-            $pm_versions[ $payment_method->slug() ] = [
-                'pm_slug' => $payment_method->slug(),
-            ];
-        }
-        // Convert money for a display format.
-        $decimal_places = CurrencyManager::getDecimalPlaces();
-        $org_country    = isset(EE_Registry::instance()->CFG->organization)
-        && EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config
-            ? EE_Registry::instance()->CFG->organization->CNT_ISO
-            : 'US';
-        $transaction_id = $this->transaction instanceof EE_Transaction ? $this->transaction->ID() : 0;
-        $currency_code  = CurrencyManager::currencyCode();
-        return [
-            'pm_versions'            => $pm_versions,
-            'payment_currency'       => $currency_code,
-            'checkout_type'          => $this->checkout_type,
-            'currency_sign'          => EE_Registry::instance()->CFG->currency->sign,
-            'pp_order_nonce'         => wp_create_nonce(Domain::CAPTURE_ORDER_NONCE_NAME),
-            // The transaction ID is only used for logging errors.
-            'txn_id'                 => $transaction_id,
-            'org_country'            => $org_country,
-            'decimal_places'         => $decimal_places,
-            'site_name'              => get_bloginfo('name'),
-            'active_states'          => EED_PayPalCommerce::getActiveStates(),
-            'no_spco_error'          => esc_html__(
-                'It appears the SDK script was not loaded properly! Please refresh the page and try again or contact support.',
-                'event_espresso'
-            ),
-            'no_pm_error'            => esc_html__(
-                'It appears that PayPal Commerce checkout JavaScript was not loaded properly! Please refresh the page and try again or contact support. PayPal Commerce payments can\'t be processed.',
-                'event_espresso'
-            ),
-            'browser_not_supported'  => esc_html__(
-                'It appears that this browser is not supported by PayPal scripts. We apologize, but PayPal payments won\'t work in this browser version.',
-                'event_espresso'
-            ),
-            'get_token_error'        => esc_html__(
-                'There was an error while trying to get the payment token. Please refresh the page and try again or contact support.',
-                'event_espresso'
-            ),
-            'form_validation_notice' => esc_html__('Billing form information not valid.', 'event_espresso'),
-            'no_verification_token'  => esc_html__('Missing the Verification token.', 'event_espresso'),
-            'error_response'         => esc_html__('Error response received', 'event_espresso'),
-            'payment_error'          => esc_html__(
-                'There was an error with this payment. See the logs for details.',
-                'event_espresso'
-            ),
-            'no_order_id'            => esc_html__('No Order ID found.', 'event_espresso'),
-            'general_pp_error'       => esc_html__('PayPal form threw an error.', 'event_espresso'),
-            'hf_render_error'        => esc_html__('Hosted fields could not be rendered!', 'event_espresso'),
-            'pm_capture_error'       => esc_html__('Payment could not be captured!', 'event_espresso'),
-            'not_acdc_eligible'      => esc_html__(
-                'This merchant is not eligible for Advanced Card Fields checkout type.',
-                'event_espresso'
-            ),
-        ];
-    }
+	protected EE_Payment_Method $paypal_pmt;
+
+	protected ?EE_Transaction $transaction = null;
+
+	protected string $checkout_type;
+
+	/**
+	 * Filepath to template files
+	 *
+	 * @var string $template_path
+	 */
+	protected string $template_path;
+
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param EE_Payment_Method    $payment_method
+	 * @param array                $options
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function __construct(EE_Payment_Method $payment_method, array $options)
+	{
+		$this->paypal_pmt    = $payment_method;
+		// Can't be too careful.
+		$this->transaction   = $options['transaction'] ?? null;
+		$this->template_path = $options['template_path'] ?? '';
+		$this->checkout_type = $payment_method->get_extra_meta(Domain::META_KEY_CHECKOUT_TYPE, true, '');
+		$pm_slug             = $payment_method->slug();
+		$parameters          = array_replace_recursive(
+			$options,
+			[
+				'name'        => 'PayPalCommerceBillingForm',
+				'html_id'     => 'pp-' . $pm_slug . '-billing-form',
+				'html_class'  => 'pp_commerce_billing_form',
+				'subsections' => [
+					'eea_paypal_commerce_token' => new EE_Hidden_Input(
+						[
+							'html_id'   => 'eea-paypal-commerce-token',
+							'html_name' => 'EEA_paymentToken',
+							'default'   => '',
+						]
+					),
+					'pp_order_nonce'            => new EE_Hidden_Input(
+						[
+							'html_id'   => 'eea-' . $pm_slug . '-order-nonce',
+							'html_name' => 'pp_order_nonce',
+							'default'   => '',
+						]
+					),
+					'pp_order_id'               => new EE_Hidden_Input(
+						[
+							'html_id'   => 'eea-' . $pm_slug . '-order-id',
+							'html_name' => 'pp_order_id',
+							'default'   => '',
+						]
+					),
+					'pp_order_status'           => new EE_Hidden_Input(
+						[
+							'html_id'   => 'eea-' . $pm_slug . '-order-status',
+							'html_name' => 'pp_order_status',
+							'default'   => '',
+						]
+					),
+					'pp_order_amount'           => new EE_Hidden_Input(
+						[
+							'html_id'   => 'eea-' . $pm_slug . '-order-amount',
+							'html_name' => 'pp_order_amount',
+							'default'   => '',
+						]
+					),
+				],
+			]
+		);
+		// Add data tags to the PP script.
+		add_filter('script_loader_tag', [$this, 'addDataTagsToScript'], 10, 2);
+		parent::__construct($payment_method, $parameters);
+		// Add and exclude other sections.
+		$this->addPaymentSections();
+		// Additional actions and/or filters.
+		$this->loadActionsAndFilters();
+	}
+
+
+	/**
+	 * Add PayPal payment sections.
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function addPaymentSections(): void
+	{
+		// Exclude the default billing form fields.
+		$this->exclude(
+			[
+				'first_name',
+				'last_name',
+				'email',
+			]
+		);
+		// Add PayPal Hosted Fields.
+		if ($this->checkout_type !== 'express_checkout') {
+			$this->addAdvancedCardFields();
+		}
+		// Add payment types separator, if both are enabled.
+		if ($this->checkout_type === 'all') {
+			$this->addTypesSeparator();
+		}
+		// Add PayPal Buttons section.
+		if ($this->checkout_type !== 'ppcp') {
+			$this->add_subsections(
+				[
+					'paypal_commerce_pm_form' => $this->addPayPalCheckout(),
+				]
+			);
+		}
+		// Exclude the rest billing form fields if the payment type is express checkout.
+		if ($this->checkout_type === 'express_checkout') {
+			$this->exclude(
+				[
+					'address',
+					'address2',
+					'state',
+					'phone',
+					'city',
+					'country',
+					'zip',
+				]
+			);
+			// Remove the Info subsection.
+			add_filter('FHEE__EE_Form_Section_Proper___construct__options_array', [$this, 'excludeInfoSubsection']);
+		}
+		$this->add_subsections(
+			[
+				'debug_content' => $this->addDebugContent($this->paypal_pmt),
+			]
+		);
+	}
+
+
+	/**
+	 * Additional actions and/or filters.
+	 *
+	 * @return void
+	 */
+	public function loadActionsAndFilters(): void
+	{
+		add_filter(
+			'FHEE__EE_SPCO_Reg_Step_Payment_Options___get_billing_form_for_payment_method__billing_form',
+			[__CLASS__, 'excludeBillingFormFields'],
+			10,
+			2
+		);
+	}
+
+
+	/**
+	 * Filter out billing form fields if pay button was used.
+	 *
+	 * @param EE_Billing_Info_Form $billing_form
+	 * @param EE_Payment_Method    $payment_method
+	 * @return EE_Billing_Info_Form
+	 */
+	public static function excludeBillingFormFields(
+		EE_Billing_Info_Form $billing_form,
+		EE_Payment_Method $payment_method
+	): EE_Billing_Info_Form {
+		$request        = LoaderFactory::getShared(Request::class);
+		$request_params = $request->requestParams();
+		// Only the PPC billing form.
+		if (! $billing_form instanceof BillingForm) {
+			return $billing_form;
+		}
+		// Make sure the billing form subsections have correct names.
+		$inputs = $billing_form->inputs_in_subsections();
+		if (
+			! empty($request_params['process_form_submission'])
+			&& $request_params['process_form_submission'] === '1'
+			&& ! empty($request_params['eep_ppc_skip_form_validation'])
+		) {
+			// Hide card info fields.
+			$billing_form->exclude(
+				[
+					'pp_name_on_card',
+					'address',
+					'address2',
+					'state',
+					'phone',
+					'city',
+					'country',
+					'zip',
+				]
+			);
+		}
+		return $billing_form;
+	}
+
+
+	/**
+	 * Add advanced card & debit card fields.
+	 *
+	 * @return void
+	 * @throws EE_Error|ReflectionException
+	 */
+	public function addAdvancedCardFields(): void
+	{
+		$pm_slug = $this->paypal_pmt->slug();
+		$this->add_subsections(
+			[
+				'pp_card_number'     => new EE_Form_Section_HTML(
+					EEH_HTML::label(
+						esc_html__('Card Number', 'event_espresso'),
+						"$pm_slug-card-number-lbl",
+						"$pm_slug-card-fields",
+						"",
+						'for="' . $pm_slug . '-card-number"'
+					) .
+					EEH_HTML::p(
+						"",
+						"$pm_slug-card-number",
+						"card_field $pm_slug-card-fields"
+					)
+				),
+				'pp_expiration_date' => new EE_Form_Section_HTML(
+					EEH_HTML::label(
+						esc_html__('Expiration Date', 'event_espresso'),
+						"$pm_slug-expiration-date-lbl",
+						"$pm_slug-card-fields",
+						"",
+						'for="' . $pm_slug . '-expiration-date"'
+					) .
+					EEH_HTML::p(
+						"",
+						"$pm_slug-expiration-date",
+						"card_field $pm_slug-card-fields"
+					)
+				),
+				'pp_card_cvv'        => new EE_Form_Section_HTML(
+					EEH_HTML::label(
+						esc_html__('CVV', 'event_espresso'),
+						"$pm_slug-cvv-lbl",
+						"$pm_slug-card-fields",
+						"",
+						'for="' . $pm_slug . '-cvv"'
+					) .
+					EEH_HTML::p(
+						"",
+						"$pm_slug-cvv",
+						"card_field $pm_slug-card-fields"
+					)
+				),
+				'pp_name_on_card'    => new EE_Text_Input(
+					[
+						'html_label_text' => esc_html__('Name On Card', 'event_espresso'),
+						'html_id'         => $pm_slug . '-card-holder-name',
+						'html_name'       => 'card-holder-name',
+						'html_class'      => '',
+						'required'        => true,
+					]
+				),
+			]
+		);
+		// Add the submit button at the end.
+		$this->add_subsections(
+			[
+				'pp_cc_submit' => new EE_Submit_Input(
+					[
+						'html_label_text' => esc_html__('Submit', 'event_espresso'),
+						'html_id'         => $pm_slug,
+						'html_class'      => 'eep-ppc-btn',
+					]
+				),
+			],
+			'phone',
+			false
+		);
+	}
+
+
+	/**
+	 * Add advanced card & debit card fields.
+	 *
+	 * @return void
+	 * @throws EE_Error|ReflectionException
+	 */
+	public function addTypesSeparator(): void
+	{
+		$this->add_subsections(
+			[
+				'pp_payment_types_separator' => new EE_Form_Section_HTML(
+					EEH_HTML::div(
+						EEH_HTML::div(
+							' ',
+							'eep-' . $this->paypal_pmt->slug() . '-payments-separator',
+							'eep-ppc-separator-line eep-left-floating'
+						) .
+						EEH_HTML::div(
+							esc_html__(' or ', 'event_espresso'),
+							'eep-' . $this->paypal_pmt->slug() . '-separator-text',
+							'eep-ppc-separator-text1 eep-mid-floating'
+						) . EEH_HTML::div(
+							' ',
+							'eep-' . $this->paypal_pmt->slug() . '-payments-separator',
+							'eep-ppc-separator-line eep-right-floating'
+						),
+						'eep-ppc-separator-holder',
+						'eep-ppc-separator-holder'
+					)
+				),
+			]
+		);
+	}
+
+
+	/**
+	 * Exclude the info subsection from the PPC checkout form.
+	 *
+	 * @param array $options_array
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function excludeInfoSubsection(array $options_array): array
+	{
+		if (
+			! empty($options_array['html_id'])
+			&& $options_array['html_id'] === 'spco-payment-method-info-' . $this->paypal_pmt->slug()
+		) {
+			if (! empty($options_array['subsections']) && isset($options_array['subsections']['info'])) {
+				unset($options_array['subsections']['info']);
+			}
+		}
+		return $options_array;
+	}
+
+
+	/**
+	 * Possibly adds debug content to PayPal commerce billing form.
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @return EE_Form_Section_Base
+	 * @throws EE_Error|ReflectionException
+	 */
+	public function addDebugContent(EE_Payment_Method $paypal_pm): EE_Form_Section_Base
+	{
+		if ($paypal_pm->debug_mode()) {
+			return new EE_Form_Section_Proper(
+				[
+					'layout_strategy' => new EE_Template_Layout(
+						[
+							'layout_template_file' => $this->template_path . 'debugInfo.template.php',
+							'template_args'        => [],
+						]
+					),
+				]
+			);
+		}
+		return new EE_Form_Section_HTML();
+	}
+
+
+	/**
+	 * Add PayPal checkout buttons.
+	 *
+	 * @return EE_Form_Section_Proper
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @throws Exception
+	 */
+	public function addPayPalCheckout(): EE_Form_Section_Proper
+	{
+		$template_args['pm_slug']     = $this->paypal_pmt->slug();
+		return new EE_Form_Section_Proper(
+			[
+				'layout_strategy' => new EE_Template_Layout(
+					[
+						'layout_template_file' => $this->template_path . 'paymentButtons.template.php',
+						'template_args'        => $template_args,
+					]
+				),
+			]
+		);
+	}
+
+
+	/**
+	 * Load scripts and localize data needed for this form.
+	 *
+	 * @param $tag
+	 * @param $handle
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function addDataTagsToScript($tag, $handle): string
+	{
+		if ($handle === 'eea_paypal_commerce_js_lib') {
+			$bn_code  = PayPalExtraMetaManager::getPmOption($this->_pm_instance, Domain::META_KEY_BN_CODE);
+			$response = EED_PayPalCommerce::requestClientToken($this->paypal_pmt);
+			if (empty($response['client_token'])) {
+				return $tag;
+			}
+			$client_token = $response['client_token'];
+			$attributes   = " data-partner-attribution-id=\"$bn_code\" data-client-token=\"$client_token\"";
+			$tag          = str_replace('></script>', $attributes . '></script>', $tag);
+		}
+		return $tag;
+	}
+
+
+	/**
+	 * Load scripts and localize data needed for this form.
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @throws Exception
+	 */
+	public function enqueue_js(): void
+	{
+		// Setup default values
+		$client_id_key = Domain::META_KEY_CLIENT_ID;
+		$merchant_id   = false;
+		$funding_options = ['venmo', 'paylater'];
+
+		// Override the above if thrid party integration
+		if (EED_PayPalCommerce::isThirdParty($this->_pm_instance)) {
+			$client_id_key = Domain::META_KEY_PARTNER_CLIENT_ID;
+			$merchant_id   = PayPalExtraMetaManager::getPmOption(
+				$this->_pm_instance,
+				Domain::META_KEY_SELLER_MERCHANT_ID
+			);
+		}
+
+		// Setup query args
+		$url_params            = [
+			'client-id'        => PayPalExtraMetaManager::getPmOption($this->_pm_instance, $client_id_key),
+			'currency'         => CurrencyManager::currencyCode(),
+			'components'       => implode(',', ['buttons','hosted-fields']),
+			'intent'           => 'capture',
+			'merchant-id'      => $merchant_id,
+		];
+
+		// Which funding methods are active?
+		$enabled_funding = $this->_pm_instance->get_extra_meta(Domain::META_KEY_FUNDING_OPTIONS, true, $funding_options);
+
+		// Any funding method not enabled should be disabled.
+		$disabled_funding = array_diff(
+			$funding_options,
+			$enabled_funding
+		);
+
+		// Any funding options enabled?
+		if (count($enabled_funding) > 0) {
+			$url_params['enable-funding'] = implode(',', $enabled_funding);
+		}
+
+		// Any funding options disabled?
+		if (count($disabled_funding) > 0) {
+			$url_params['disable-funding'] = implode(',', $disabled_funding);
+		}
+
+		// Enqueue the PayPal JS
+		wp_enqueue_script(
+			'eea_paypal_commerce_js_lib',
+			add_query_arg($url_params, 'https://www.paypal.com/sdk/js'),
+			[],
+			null
+		);
+
+		wp_enqueue_script(
+			'eea_paypal_commerce_js',
+			EEP_PAYPAL_COMMERCE_URL . 'assets/js/paypal-commerce-payments.js',
+			['eea_paypal_commerce_js_lib'],
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		// Styles.
+		wp_enqueue_style(
+			'eea_paypal_checkout_form_styles',
+			EEP_PAYPAL_COMMERCE_URL . 'assets' . DS . 'css' . DS . 'eea-paypal-checkout.css',
+			[],
+			EVENT_ESPRESSO_VERSION
+		);
+		// Localize the script with our transaction data.
+		$parameters = $this->localizeParameters();
+		wp_localize_script('eea_paypal_commerce_js', 'eeaPPCommerceParameters', $parameters);
+		parent::enqueue_js();
+	}
+
+
+	/**
+	 * Form and return PayPal commerce parameters for script localization.
+	 *
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @throws Exception
+	 */
+	public function localizeParameters(): array
+	{
+		// Also tell the script about each instance of this PM.
+		$pm_versions            = [];
+		$active_payment_methods = EEM_Payment_Method::instance()->get_all_active(
+			EEM_Payment_Method::scope_cart,
+			[['PMD_slug' => ['LIKE', '%paypalcheckout%']]]
+		);
+		foreach ($active_payment_methods as $payment_method) {
+			$pm_versions[ $payment_method->slug() ] = [
+				'pm_slug' => $payment_method->slug(),
+			];
+		}
+		// Convert money for a display format.
+		$decimal_places = CurrencyManager::getDecimalPlaces();
+		$org_country    = isset(EE_Registry::instance()->CFG->organization)
+		&& EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config
+			? EE_Registry::instance()->CFG->organization->CNT_ISO
+			: 'US';
+		$transaction_id = $this->transaction instanceof EE_Transaction ? $this->transaction->ID() : 0;
+		$currency_code  = CurrencyManager::currencyCode();
+		return [
+			'pm_versions'            => $pm_versions,
+			'payment_currency'       => $currency_code,
+			'checkout_type'          => $this->checkout_type,
+			'currency_sign'          => EE_Registry::instance()->CFG->currency->sign,
+			'pp_order_nonce'         => wp_create_nonce(Domain::CAPTURE_ORDER_NONCE_NAME),
+			// The transaction ID is only used for logging errors.
+			'txn_id'                 => $transaction_id,
+			'org_country'            => $org_country,
+			'decimal_places'         => $decimal_places,
+			'site_name'              => get_bloginfo('name'),
+			'active_states'          => EED_PayPalCommerce::getActiveStates(),
+			'no_spco_error'          => esc_html__(
+				'It appears the SDK script was not loaded properly! Please refresh the page and try again or contact support.',
+				'event_espresso'
+			),
+			'no_pm_error'            => esc_html__(
+				'It appears that PayPal Commerce checkout JavaScript was not loaded properly! Please refresh the page and try again or contact support. PayPal Commerce payments can\'t be processed.',
+				'event_espresso'
+			),
+			'browser_not_supported'  => esc_html__(
+				'It appears that this browser is not supported by PayPal scripts. We apologize, but PayPal payments won\'t work in this browser version.',
+				'event_espresso'
+			),
+			'get_token_error'        => esc_html__(
+				'There was an error while trying to get the payment token. Please refresh the page and try again or contact support.',
+				'event_espresso'
+			),
+			'form_validation_notice' => esc_html__('Billing form information not valid.', 'event_espresso'),
+			'no_verification_token'  => esc_html__('Missing the Verification token.', 'event_espresso'),
+			'error_response'         => esc_html__('Error response received', 'event_espresso'),
+			'payment_error'          => esc_html__(
+				'There was an error with this payment. See the logs for details.',
+				'event_espresso'
+			),
+			'no_order_id'            => esc_html__('No Order ID found.', 'event_espresso'),
+			'general_pp_error'       => esc_html__('PayPal form threw an error.', 'event_espresso'),
+			'hf_render_error'        => esc_html__('Hosted fields could not be rendered!', 'event_espresso'),
+			'pm_capture_error'       => esc_html__('Payment could not be captured!', 'event_espresso'),
+			'not_acdc_eligible'      => esc_html__(
+				'This merchant is not eligible for Advanced Card Fields checkout type.',
+				'event_espresso'
+			),
+		];
+	}
 }

Spacing +29 added lines, -29 removed lines

@@ -72,7 +72,7 @@ 
             $options,
             [
                 'name'        => 'PayPalCommerceBillingForm',
-                'html_id'     => 'pp-' . $pm_slug . '-billing-form',
+                'html_id'     => 'pp-'.$pm_slug.'-billing-form',
                 'html_class'  => 'pp_commerce_billing_form',
                 'subsections' => [
                     'eea_paypal_commerce_token' => new EE_Hidden_Input(
@@ -84,28 +84,28 @@ 
                     ),
                     'pp_order_nonce'            => new EE_Hidden_Input(
                         [
-                            'html_id'   => 'eea-' . $pm_slug . '-order-nonce',
+                            'html_id'   => 'eea-'.$pm_slug.'-order-nonce',
                             'html_name' => 'pp_order_nonce',
                             'default'   => '',
                         ]
                     ),
                     'pp_order_id'               => new EE_Hidden_Input(
                         [
-                            'html_id'   => 'eea-' . $pm_slug . '-order-id',
+                            'html_id'   => 'eea-'.$pm_slug.'-order-id',
                             'html_name' => 'pp_order_id',
                             'default'   => '',
                         ]
                     ),
                     'pp_order_status'           => new EE_Hidden_Input(
                         [
-                            'html_id'   => 'eea-' . $pm_slug . '-order-status',
+                            'html_id'   => 'eea-'.$pm_slug.'-order-status',
                             'html_name' => 'pp_order_status',
                             'default'   => '',
                         ]
                     ),
                     'pp_order_amount'           => new EE_Hidden_Input(
                         [
-                            'html_id'   => 'eea-' . $pm_slug . '-order-amount',
+                            'html_id'   => 'eea-'.$pm_slug.'-order-amount',
                             'html_name' => 'pp_order_amount',
                             'default'   => '',
                         ]
@@ -210,7 +210,7 @@ 
         $request        = LoaderFactory::getShared(Request::class);
         $request_params = $request->requestParams();
         // Only the PPC billing form.
-        if (! $billing_form instanceof BillingForm) {
+        if ( ! $billing_form instanceof BillingForm) {
             return $billing_form;
         }
         // Make sure the billing form subsections have correct names.
@@ -255,8 +255,8 @@ 
                         "$pm_slug-card-number-lbl",
                         "$pm_slug-card-fields",
                         "",
-                        'for="' . $pm_slug . '-card-number"'
-                    ) .
+                        'for="'.$pm_slug.'-card-number"'
+                    ).
                     EEH_HTML::p(
                         "",
                         "$pm_slug-card-number",
@@ -269,8 +269,8 @@ 
                         "$pm_slug-expiration-date-lbl",
                         "$pm_slug-card-fields",
                         "",
-                        'for="' . $pm_slug . '-expiration-date"'
-                    ) .
+                        'for="'.$pm_slug.'-expiration-date"'
+                    ).
                     EEH_HTML::p(
                         "",
                         "$pm_slug-expiration-date",
@@ -283,8 +283,8 @@ 
                         "$pm_slug-cvv-lbl",
                         "$pm_slug-card-fields",
                         "",
-                        'for="' . $pm_slug . '-cvv"'
-                    ) .
+                        'for="'.$pm_slug.'-cvv"'
+                    ).
                     EEH_HTML::p(
                         "",
                         "$pm_slug-cvv",
@@ -294,7 +294,7 @@ 
                 'pp_name_on_card'    => new EE_Text_Input(
                     [
                         'html_label_text' => esc_html__('Name On Card', 'event_espresso'),
-                        'html_id'         => $pm_slug . '-card-holder-name',
+                        'html_id'         => $pm_slug.'-card-holder-name',
                         'html_name'       => 'card-holder-name',
                         'html_class'      => '',
                         'required'        => true,
@@ -333,16 +333,16 @@ 
                     EEH_HTML::div(
                         EEH_HTML::div(
                             ' ',
-                            'eep-' . $this->paypal_pmt->slug() . '-payments-separator',
+                            'eep-'.$this->paypal_pmt->slug().'-payments-separator',
                             'eep-ppc-separator-line eep-left-floating'
-                        ) .
+                        ).
                         EEH_HTML::div(
                             esc_html__(' or ', 'event_espresso'),
-                            'eep-' . $this->paypal_pmt->slug() . '-separator-text',
+                            'eep-'.$this->paypal_pmt->slug().'-separator-text',
                             'eep-ppc-separator-text1 eep-mid-floating'
-                        ) . EEH_HTML::div(
+                        ).EEH_HTML::div(
                             ' ',
-                            'eep-' . $this->paypal_pmt->slug() . '-payments-separator',
+                            'eep-'.$this->paypal_pmt->slug().'-payments-separator',
                             'eep-ppc-separator-line eep-right-floating'
                         ),
                         'eep-ppc-separator-holder',
@@ -366,9 +366,9 @@ 
     {
         if (
             ! empty($options_array['html_id'])
-            && $options_array['html_id'] === 'spco-payment-method-info-' . $this->paypal_pmt->slug()
+            && $options_array['html_id'] === 'spco-payment-method-info-'.$this->paypal_pmt->slug()
         ) {
-            if (! empty($options_array['subsections']) && isset($options_array['subsections']['info'])) {
+            if ( ! empty($options_array['subsections']) && isset($options_array['subsections']['info'])) {
                 unset($options_array['subsections']['info']);
             }
         }
@@ -390,7 +390,7 @@ 
                 [
                     'layout_strategy' => new EE_Template_Layout(
                         [
-                            'layout_template_file' => $this->template_path . 'debugInfo.template.php',
+                            'layout_template_file' => $this->template_path.'debugInfo.template.php',
                             'template_args'        => [],
                         ]
                     ),
@@ -411,12 +411,12 @@ 
      */
     public function addPayPalCheckout(): EE_Form_Section_Proper
     {
-        $template_args['pm_slug']     = $this->paypal_pmt->slug();
+        $template_args['pm_slug'] = $this->paypal_pmt->slug();
         return new EE_Form_Section_Proper(
             [
                 'layout_strategy' => new EE_Template_Layout(
                     [
-                        'layout_template_file' => $this->template_path . 'paymentButtons.template.php',
+                        'layout_template_file' => $this->template_path.'paymentButtons.template.php',
                         'template_args'        => $template_args,
                     ]
                 ),
@@ -444,7 +444,7 @@ 
             }
             $client_token = $response['client_token'];
             $attributes   = " data-partner-attribution-id=\"$bn_code\" data-client-token=\"$client_token\"";
-            $tag          = str_replace('></script>', $attributes . '></script>', $tag);
+            $tag          = str_replace('></script>', $attributes.'></script>', $tag);
         }
         return $tag;
     }
@@ -475,10 +475,10 @@ 
         }
 
         // Setup query args
-        $url_params            = [
+        $url_params = [
             'client-id'        => PayPalExtraMetaManager::getPmOption($this->_pm_instance, $client_id_key),
             'currency'         => CurrencyManager::currencyCode(),
-            'components'       => implode(',', ['buttons','hosted-fields']),
+            'components'       => implode(',', ['buttons', 'hosted-fields']),
             'intent'           => 'capture',
             'merchant-id'      => $merchant_id,
         ];
@@ -512,7 +512,7 @@ 
 
         wp_enqueue_script(
             'eea_paypal_commerce_js',
-            EEP_PAYPAL_COMMERCE_URL . 'assets/js/paypal-commerce-payments.js',
+            EEP_PAYPAL_COMMERCE_URL.'assets/js/paypal-commerce-payments.js',
             ['eea_paypal_commerce_js_lib'],
             EVENT_ESPRESSO_VERSION,
             true
@@ -520,7 +520,7 @@ 
         // Styles.
         wp_enqueue_style(
             'eea_paypal_checkout_form_styles',
-            EEP_PAYPAL_COMMERCE_URL . 'assets' . DS . 'css' . DS . 'eea-paypal-checkout.css',
+            EEP_PAYPAL_COMMERCE_URL.'assets'.DS.'css'.DS.'eea-paypal-checkout.css',
             [],
             EVENT_ESPRESSO_VERSION
         );
@@ -548,7 +548,7 @@ 
             [['PMD_slug' => ['LIKE', '%paypalcheckout%']]]
         );
         foreach ($active_payment_methods as $payment_method) {
-            $pm_versions[ $payment_method->slug() ] = [
+            $pm_versions[$payment_method->slug()] = [
                 'pm_slug' => $payment_method->slug(),
             ];
         }

PaymentMethods/PayPalCommerce/PayPalCheckout/EEG_PayPalCheckout.gateway.php

Indentation +224 added lines, -224 removed lines

@@ -13,238 +13,238 @@
  */
 class EEG_PayPalCheckout extends EE_Onsite_Gateway
 {
-    /**
-     * Currencies supported by this gateway.
-     *
-     * @var array
-     */
-    protected $_currencies_supported = [
-        'AUD',
-        'BRL',
-        'CAD',
-        'CNY',
-        'CZK',
-        'DKK',
-        'EUR',
-        'HKD',
-        'HUF',
-        'ILS',
-        'JPY',
-        'MYR',
-        'MXN',
-        'TWD',
-        'NZD',
-        'NOK',
-        'PHP',
-        'PLN',
-        'GBP',
-        'RUB',
-        'SGD',
-        'SEK',
-        'CHF',
-        'THB',
-        'USD',
-    ];
+	/**
+	 * Currencies supported by this gateway.
+	 *
+	 * @var array
+	 */
+	protected $_currencies_supported = [
+		'AUD',
+		'BRL',
+		'CAD',
+		'CNY',
+		'CZK',
+		'DKK',
+		'EUR',
+		'HKD',
+		'HUF',
+		'ILS',
+		'JPY',
+		'MYR',
+		'MXN',
+		'TWD',
+		'NZD',
+		'NOK',
+		'PHP',
+		'PLN',
+		'GBP',
+		'RUB',
+		'SGD',
+		'SEK',
+		'CHF',
+		'THB',
+		'USD',
+	];
 
 
-    /**
-     * Override the parent.
-     *
-     * @param EE_Payment|null $payment
-     * @param array|null      $billing_info
-     * @return EE_Payment
-     */
-    public function do_direct_payment($payment, $billing_info = null)
-    {
-        // Normally we shouldn't be getting here because the payment should have been processed
-        // along with the PP Order Charge.
-        return $payment;
-    }
+	/**
+	 * Override the parent.
+	 *
+	 * @param EE_Payment|null $payment
+	 * @param array|null      $billing_info
+	 * @return EE_Payment
+	 */
+	public function do_direct_payment($payment, $billing_info = null)
+	{
+		// Normally we shouldn't be getting here because the payment should have been processed
+		// along with the PP Order Charge.
+		return $payment;
+	}
 
 
-    /**
-     * Validate the Order.
-     *
-     * @param      $order
-     * @param null $provided_order_id
-     * @return array ['completed' => {boolean}, 'message' => {string}]
-     */
-    public static function isOrderCompleted($order, $provided_order_id = null): array
-    {
-        $conclusion = [
-            'completed' => false,
-            'message'   => esc_html__('Could not validate this Order.', 'event_espresso'),
-        ];
-        if (! empty($order) && ! empty($provided_order_id) && $order['id'] !== $provided_order_id) {
-            $conclusion['message'] = esc_html__('Order ID mismatch.', 'event_espresso');
-        }
-        if (! $order || ! is_array($order)) {
-            $conclusion['message'] = esc_html__('The Order data is incorrectly formatted.', 'event_espresso');
-        } elseif (empty($order['status'])) {
-            $conclusion['message'] = esc_html__(
-                'There was an error with this payment. The status of the Order could not be determined.',
-                'event_espresso'
-            );
-        } elseif ($order['status'] !== 'COMPLETED') {
-            $conclusion['message'] = esc_html__(
-                'There was an error with this payment. Order was not approved.',
-                'event_espresso'
-            );
-        } elseif (empty($order['purchase_units'][0]['payments']['captures'][0]['status'])) {
-            $conclusion['message'] = esc_html__(
-                'There was an error with this payment. The status of the Payment could not be determined.',
-                'event_espresso'
-            );
-        } elseif ($order['purchase_units'][0]['payments']['captures'][0]['status'] !== 'COMPLETED') {
-            $conclusion['message'] = esc_html__(
-                'This payment was declined or failed validation. Please check the billing information you provided.',
-                'event_espresso'
-            );
-        } else {
-            // If we didn't fail on the above, the Order should be considered valid.
-            $conclusion['completed'] = true;
-        }
-        return $conclusion;
-    }
+	/**
+	 * Validate the Order.
+	 *
+	 * @param      $order
+	 * @param null $provided_order_id
+	 * @return array ['completed' => {boolean}, 'message' => {string}]
+	 */
+	public static function isOrderCompleted($order, $provided_order_id = null): array
+	{
+		$conclusion = [
+			'completed' => false,
+			'message'   => esc_html__('Could not validate this Order.', 'event_espresso'),
+		];
+		if (! empty($order) && ! empty($provided_order_id) && $order['id'] !== $provided_order_id) {
+			$conclusion['message'] = esc_html__('Order ID mismatch.', 'event_espresso');
+		}
+		if (! $order || ! is_array($order)) {
+			$conclusion['message'] = esc_html__('The Order data is incorrectly formatted.', 'event_espresso');
+		} elseif (empty($order['status'])) {
+			$conclusion['message'] = esc_html__(
+				'There was an error with this payment. The status of the Order could not be determined.',
+				'event_espresso'
+			);
+		} elseif ($order['status'] !== 'COMPLETED') {
+			$conclusion['message'] = esc_html__(
+				'There was an error with this payment. Order was not approved.',
+				'event_espresso'
+			);
+		} elseif (empty($order['purchase_units'][0]['payments']['captures'][0]['status'])) {
+			$conclusion['message'] = esc_html__(
+				'There was an error with this payment. The status of the Payment could not be determined.',
+				'event_espresso'
+			);
+		} elseif ($order['purchase_units'][0]['payments']['captures'][0]['status'] !== 'COMPLETED') {
+			$conclusion['message'] = esc_html__(
+				'This payment was declined or failed validation. Please check the billing information you provided.',
+				'event_espresso'
+			);
+		} else {
+			// If we didn't fail on the above, the Order should be considered valid.
+			$conclusion['completed'] = true;
+		}
+		return $conclusion;
+	}
 
 
-    /**
-     * Create an EE Payment.
-     *
-     * @param EE_Transaction    $transaction
-     * @param EE_Payment_Method $payment_method
-     * @return EE_Payment
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function createPayment(EE_Transaction $transaction, EE_Payment_Method $payment_method): EE_Payment
-    {
-        // No payment for this transaction was created at this point.
-        $payment = EE_Payment::new_instance([
-            'PAY_timestamp'     => time(),
-            'TXN_ID'            => $transaction->ID(),
-            'PMD_ID'            => $payment_method->ID(),
-            'PAY_po_number'     => null,
-            'PAY_extra_accntng' => null,
-            'PAY_details'       => null,
-        ]);
-        $payment->save();
-        return $payment;
-    }
+	/**
+	 * Create an EE Payment.
+	 *
+	 * @param EE_Transaction    $transaction
+	 * @param EE_Payment_Method $payment_method
+	 * @return EE_Payment
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function createPayment(EE_Transaction $transaction, EE_Payment_Method $payment_method): EE_Payment
+	{
+		// No payment for this transaction was created at this point.
+		$payment = EE_Payment::new_instance([
+			'PAY_timestamp'     => time(),
+			'TXN_ID'            => $transaction->ID(),
+			'PMD_ID'            => $payment_method->ID(),
+			'PAY_po_number'     => null,
+			'PAY_extra_accntng' => null,
+			'PAY_details'       => null,
+		]);
+		$payment->save();
+		return $payment;
+	}
 
 
-    /**
-     * Set a payment error and log the data.
-     *
-     * @param EE_Payment   $payment
-     * @param string       $status
-     * @param array|string $response_data
-     * @param string       $update_message
-     * @return EE_Payment
-     * @throws EE_Error|ReflectionException
-     */
-    public static function updatePaymentStatus(
-        EE_Payment $payment,
-        string $status,
-        $response_data,
-        string $update_message = ''
-    ): EE_Payment {
-        $paypal_pm = ! empty($payment->payment_method())
-            ? EEM_Payment_Method::instance()->get_one_by_slug($payment->payment_method()->name())
-            : null;
-        // Is this a successful payment ?
-        if ($status === EEM_Payment::status_id_approved) {
-            $default_message = esc_html__('Successful payment.', 'event_espresso');
-            $amount          = $response_data['purchase_units'][0]['payments']['captures'][0]['amount']['value'] ?? 0;
-            // Don't set the amount if there is no info on that with this order.
-            if (! empty($amount)) {
-                $payment->set_amount((float) $amount);
-            }
-            $payment->set_txn_id_chq_nmbr(
-                $order['purchase_units'][0]['payments']['captures'][0]['id'] ?? $response_data['id']
-            );
-        } else {
-            $default_message = sprintf(
-                esc_html__(
-                    'Your payment could not be processed successfully due to a technical issue.%1$sPlease try again or contact%2$s for assistance.',
-                    'event_espresso'
-                ),
-                '<br/>',
-                EE_Registry::instance()->CFG->organization->get_pretty('email')
-            );
-        }
-        $log_message = $update_message ?: $default_message;
-        PayPalLogger::errorLog($log_message, $response_data, $paypal_pm, false, $payment->transaction());
-        $payment->set_status($status);
-        $payment->set_details($log_message);
-        $payment->set_gateway_response($log_message);
-        $payment->save();
-        return $payment;
-    }
+	/**
+	 * Set a payment error and log the data.
+	 *
+	 * @param EE_Payment   $payment
+	 * @param string       $status
+	 * @param array|string $response_data
+	 * @param string       $update_message
+	 * @return EE_Payment
+	 * @throws EE_Error|ReflectionException
+	 */
+	public static function updatePaymentStatus(
+		EE_Payment $payment,
+		string $status,
+		$response_data,
+		string $update_message = ''
+	): EE_Payment {
+		$paypal_pm = ! empty($payment->payment_method())
+			? EEM_Payment_Method::instance()->get_one_by_slug($payment->payment_method()->name())
+			: null;
+		// Is this a successful payment ?
+		if ($status === EEM_Payment::status_id_approved) {
+			$default_message = esc_html__('Successful payment.', 'event_espresso');
+			$amount          = $response_data['purchase_units'][0]['payments']['captures'][0]['amount']['value'] ?? 0;
+			// Don't set the amount if there is no info on that with this order.
+			if (! empty($amount)) {
+				$payment->set_amount((float) $amount);
+			}
+			$payment->set_txn_id_chq_nmbr(
+				$order['purchase_units'][0]['payments']['captures'][0]['id'] ?? $response_data['id']
+			);
+		} else {
+			$default_message = sprintf(
+				esc_html__(
+					'Your payment could not be processed successfully due to a technical issue.%1$sPlease try again or contact%2$s for assistance.',
+					'event_espresso'
+				),
+				'<br/>',
+				EE_Registry::instance()->CFG->organization->get_pretty('email')
+			);
+		}
+		$log_message = $update_message ?: $default_message;
+		PayPalLogger::errorLog($log_message, $response_data, $paypal_pm, false, $payment->transaction());
+		$payment->set_status($status);
+		$payment->set_details($log_message);
+		$payment->set_gateway_response($log_message);
+		$payment->save();
+		return $payment;
+	}
 
 
-    /**
-     * Save some transaction details, like billing information.
-     *
-     * @param EE_Payment     $payment
-     * @param EE_Transaction $transaction
-     * @param array          $order
-     * @param array          $billing_info
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function saveBillingDetails(
-        EE_Payment $payment,
-        EE_Transaction $transaction,
-        array $order,
-        array $billing_info
-    ): void {
-        $primary_reg    = $transaction->primary_registration();
-        $attendee       = $primary_reg instanceof EE_Registration ? $primary_reg->attendee() : null;
-        $payment_method = $transaction->payment_method();
-        $postmeta_name  = $payment_method->type_obj() instanceof EE_PMT_Base
-            ? 'billing_info_' . $payment_method->type_obj()->system_name()
-            : '';
-        if (empty($order['payment_source']) || ! $attendee instanceof EE_Attendee) {
-            // I guess we are done here then. Just save what we have.
-            $payment->set_details($order);
-            return;
-        }
-        // Do we have order information from the express checkout (PayPal button) ?
-        $billing_info['first_name'] = $billing_info['first_name'] ?? $attendee->fname();
-        $billing_info['last_name']  = $billing_info['last_name'] ?? $attendee->lname();
-        $billing_info['email']      = $billing_info['email'] ?? $attendee->email();
-        if (! empty($billing_info['address'])) {
-            $attendee->set_address($billing_info['address']);
-        }
-        if (! empty($billing_info['address_2'])) {
-            $attendee->set_address2($billing_info['address_2']);
-        }
-        if (! empty($billing_info['city'])) {
-            $attendee->set_city($billing_info['city']);
-        }
-        if (! empty($billing_info['state_id'])) {
-            $attendee->set_state((int) $billing_info['state_id']);
-        }
-        if (! empty($billing_info['country'])) {
-            $attendee->set_country($billing_info['country']);
-        }
-        if (! empty($billing_info['zip'])) {
-            $attendee->set_zip($billing_info['zip']);
-        }
-        // Or card information from ACDC ?
-        if (! empty($order['payment_source']['card'])) {
-            $payer_card = $order['payment_source']['card'];
-            if (! empty($payer_card['name'])) {
-                $full_name = explode(' ', $payer_card['name']);
-                // Don't need to save each field because others should be populated from the billing form.
-                $billing_info['credit_card'] = $payer_card['last_digits'] ?? '';
-                $billing_info['first_name']  = $full_name[0] ?? $attendee->fname();
-                $billing_info['last_name']   = $full_name[1] ?? $attendee->lname();
-            }
-        }
-        update_post_meta($attendee->ID(), $postmeta_name, $billing_info);
-        $attendee->save();
-    }
+	/**
+	 * Save some transaction details, like billing information.
+	 *
+	 * @param EE_Payment     $payment
+	 * @param EE_Transaction $transaction
+	 * @param array          $order
+	 * @param array          $billing_info
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function saveBillingDetails(
+		EE_Payment $payment,
+		EE_Transaction $transaction,
+		array $order,
+		array $billing_info
+	): void {
+		$primary_reg    = $transaction->primary_registration();
+		$attendee       = $primary_reg instanceof EE_Registration ? $primary_reg->attendee() : null;
+		$payment_method = $transaction->payment_method();
+		$postmeta_name  = $payment_method->type_obj() instanceof EE_PMT_Base
+			? 'billing_info_' . $payment_method->type_obj()->system_name()
+			: '';
+		if (empty($order['payment_source']) || ! $attendee instanceof EE_Attendee) {
+			// I guess we are done here then. Just save what we have.
+			$payment->set_details($order);
+			return;
+		}
+		// Do we have order information from the express checkout (PayPal button) ?
+		$billing_info['first_name'] = $billing_info['first_name'] ?? $attendee->fname();
+		$billing_info['last_name']  = $billing_info['last_name'] ?? $attendee->lname();
+		$billing_info['email']      = $billing_info['email'] ?? $attendee->email();
+		if (! empty($billing_info['address'])) {
+			$attendee->set_address($billing_info['address']);
+		}
+		if (! empty($billing_info['address_2'])) {
+			$attendee->set_address2($billing_info['address_2']);
+		}
+		if (! empty($billing_info['city'])) {
+			$attendee->set_city($billing_info['city']);
+		}
+		if (! empty($billing_info['state_id'])) {
+			$attendee->set_state((int) $billing_info['state_id']);
+		}
+		if (! empty($billing_info['country'])) {
+			$attendee->set_country($billing_info['country']);
+		}
+		if (! empty($billing_info['zip'])) {
+			$attendee->set_zip($billing_info['zip']);
+		}
+		// Or card information from ACDC ?
+		if (! empty($order['payment_source']['card'])) {
+			$payer_card = $order['payment_source']['card'];
+			if (! empty($payer_card['name'])) {
+				$full_name = explode(' ', $payer_card['name']);
+				// Don't need to save each field because others should be populated from the billing form.
+				$billing_info['credit_card'] = $payer_card['last_digits'] ?? '';
+				$billing_info['first_name']  = $full_name[0] ?? $attendee->fname();
+				$billing_info['last_name']   = $full_name[1] ?? $attendee->lname();
+			}
+		}
+		update_post_meta($attendee->ID(), $postmeta_name, $billing_info);
+		$attendee->save();
+	}
 }

PaymentMethods/PayPalCommerce/tools/fees/PartnerPaymentFees.php

Indentation +31 added lines, -31 removed lines

@@ -16,39 +16,39 @@
  */
 class PartnerPaymentFees
 {
-    private PaymentProcessorFees $payment_processor_fees;
+	private PaymentProcessorFees $payment_processor_fees;
 
 
-    /**
-     * PartnerPaymentFees constructor.
-     *
-     * @param PaymentProcessorFees $payment_processor_fees
-     */
-    public function __construct(PaymentProcessorFees $payment_processor_fees)
-    {
-        $this->payment_processor_fees = $payment_processor_fees;
-    }
+	/**
+	 * PartnerPaymentFees constructor.
+	 *
+	 * @param PaymentProcessorFees $payment_processor_fees
+	 */
+	public function __construct(PaymentProcessorFees $payment_processor_fees)
+	{
+		$this->payment_processor_fees = $payment_processor_fees;
+	}
 
 
-    /**
-     * @param EE_Transaction $transaction
-     * @return float
-     * @throws Exception
-     */
-    public function getPartnerFee(EE_Transaction $transaction): float
-    {
-        $fee_rate = $this->payment_processor_fees->forPaymentMethod(PaymentProcessorFees::GATEWAY_PAYPAL);
-        if ($fee_rate <= 0) {
-            return 0;
-        }
-        // Don't count tax.
-        $total_remaining = $transaction->total() - $transaction->tax_total();
-        // If this is a partial payment, try to get a tax-free amount.
-        if ($transaction->paid() > 0) {
-            $paid_percent    = $transaction->paid() * 100 / $transaction->total();
-            $paid_tax        = ($transaction->tax_total() / 100) * $paid_percent;
-            $total_remaining = $transaction->remaining() - $paid_tax;
-        }
-        return CurrencyManager::normalizeValue(($total_remaining / 100) * $fee_rate);
-    }
+	/**
+	 * @param EE_Transaction $transaction
+	 * @return float
+	 * @throws Exception
+	 */
+	public function getPartnerFee(EE_Transaction $transaction): float
+	{
+		$fee_rate = $this->payment_processor_fees->forPaymentMethod(PaymentProcessorFees::GATEWAY_PAYPAL);
+		if ($fee_rate <= 0) {
+			return 0;
+		}
+		// Don't count tax.
+		$total_remaining = $transaction->total() - $transaction->tax_total();
+		// If this is a partial payment, try to get a tax-free amount.
+		if ($transaction->paid() > 0) {
+			$paid_percent    = $transaction->paid() * 100 / $transaction->total();
+			$paid_tax        = ($transaction->tax_total() / 100) * $paid_percent;
+			$total_remaining = $transaction->remaining() - $paid_tax;
+		}
+		return CurrencyManager::normalizeValue(($total_remaining / 100) * $fee_rate);
+	}
 }

PaymentMethods/PayPalCommerce/tools/logging/PayPalLogger.php

Indentation +154 added lines, -154 removed lines

@@ -19,149 +19,149 @@ 
  */
 class PayPalLogger
 {
-    /**
-     * Log an error, return a json message and maybe exit.
-     *
-     * @param string                 $error_message
-     * @param array                  $data
-     * @param EE_Payment_Method|null $paypal_pm
-     * @param mixed             $object_logged
-     * @param bool                   $return_json Should we echo json and exit
-     * @param bool                   $popup_log
-     * @param bool                   $show_alert  Show an alert on the front end or not
-     * @return void
-     */
-    public static function errorLogAndExit(
-        string $error_message = '',
-        array $data = [],
-        ?EE_Payment_Method $paypal_pm = null,
-        bool $return_json = true,
-        bool $popup_log = false,
-        bool $show_alert = false,
-        $object_logged = null
-    ): void {
-        PayPalLogger::errorLog($error_message, $data, $paypal_pm, $popup_log, $object_logged);
-        // Do we echo json and exit or just close the window ?
-        if ($return_json) {
-            PayPalLogger::exitWithJson($error_message, $show_alert);
-        }
-        if ($popup_log) {
-            PayPalLogger::logInWindow($error_message);
-        }
-        PayPalLogger::closeWindowAndExit();
-    }
+	/**
+	 * Log an error, return a json message and maybe exit.
+	 *
+	 * @param string                 $error_message
+	 * @param array                  $data
+	 * @param EE_Payment_Method|null $paypal_pm
+	 * @param mixed             $object_logged
+	 * @param bool                   $return_json Should we echo json and exit
+	 * @param bool                   $popup_log
+	 * @param bool                   $show_alert  Show an alert on the front end or not
+	 * @return void
+	 */
+	public static function errorLogAndExit(
+		string $error_message = '',
+		array $data = [],
+		?EE_Payment_Method $paypal_pm = null,
+		bool $return_json = true,
+		bool $popup_log = false,
+		bool $show_alert = false,
+		$object_logged = null
+	): void {
+		PayPalLogger::errorLog($error_message, $data, $paypal_pm, $popup_log, $object_logged);
+		// Do we echo json and exit or just close the window ?
+		if ($return_json) {
+			PayPalLogger::exitWithJson($error_message, $show_alert);
+		}
+		if ($popup_log) {
+			PayPalLogger::logInWindow($error_message);
+		}
+		PayPalLogger::closeWindowAndExit();
+	}
 
 
-    /**
-     * Log an error, return a json message.
-     *
-     * @param string                 $error_message
-     * @param array                  $data
-     * @param EE_Payment_Method|null $paypal_pm
-     * @param mixed             $object_logged
-     * @param bool                   $popup_log
-     * @return bool
-     */
-    public static function errorLog(
-        string $error_message = '',
-        array $data = [],
-        ?EE_Payment_Method $paypal_pm = null,
-        bool $popup_log = false,
-        $object_logged = null
-    ): bool {
-        $default_msg = 'PayPal Commerce error';
-        if ($data) {
-            $data        = PayPalLogger::cleanDataArray($data);
-            $default_msg = $error_message;
-        }
-        try {
-            if (! $paypal_pm instanceof EE_Payment_Method) {
-                // Default to the standard PP Commerce PM.
-                $paypal_pm = EEM_Payment_Method::instance()->get_one_by_slug(Domain::PM_SLUG);
-            }
-            $paypal_gateway = $paypal_pm->type_obj()->get_gateway();
-            if ($paypal_gateway instanceof EE_Gateway) {
-                $paypal_gateway->log([$default_msg => $data], $object_logged);
-            }
-            if ($popup_log) {
-                PayPalLogger::logInWindow(json_encode($data));
-            }
-        } catch (ReflectionException | EE_Error $error) {
-            new ExceptionLogger($error);
-            return false;
-        }
-        // Yes, always return true.
-        return true;
-    }
+	/**
+	 * Log an error, return a json message.
+	 *
+	 * @param string                 $error_message
+	 * @param array                  $data
+	 * @param EE_Payment_Method|null $paypal_pm
+	 * @param mixed             $object_logged
+	 * @param bool                   $popup_log
+	 * @return bool
+	 */
+	public static function errorLog(
+		string $error_message = '',
+		array $data = [],
+		?EE_Payment_Method $paypal_pm = null,
+		bool $popup_log = false,
+		$object_logged = null
+	): bool {
+		$default_msg = 'PayPal Commerce error';
+		if ($data) {
+			$data        = PayPalLogger::cleanDataArray($data);
+			$default_msg = $error_message;
+		}
+		try {
+			if (! $paypal_pm instanceof EE_Payment_Method) {
+				// Default to the standard PP Commerce PM.
+				$paypal_pm = EEM_Payment_Method::instance()->get_one_by_slug(Domain::PM_SLUG);
+			}
+			$paypal_gateway = $paypal_pm->type_obj()->get_gateway();
+			if ($paypal_gateway instanceof EE_Gateway) {
+				$paypal_gateway->log([$default_msg => $data], $object_logged);
+			}
+			if ($popup_log) {
+				PayPalLogger::logInWindow(json_encode($data));
+			}
+		} catch (ReflectionException | EE_Error $error) {
+			new ExceptionLogger($error);
+			return false;
+		}
+		// Yes, always return true.
+		return true;
+	}
 
 
-    /**
-     * Clean the array of data from sensitive information.
-     *
-     * @param array $data
-     * @return array
-     */
-    private static function cleanDataArray(array $data): array
-    {
-        $sensitive_data = [
-            'access_token',
-            'refresh_token',
-            'nonce',
-            'seller_nonce',
-            'client_secret',
-            Domain::API_KEY_AUTH_CODE,
-            'Authorization',
-            'merchantIdInPayPal',
-        ];
-        foreach ($data as $key => $value) {
-            if (is_string($value)) {
-                // Json encoded ?
-                $value = json_decode($value) ?? $value;
-            }
-            $value = is_array($value) ? PayPalLogger::cleanDataArray($value) : $value;
-            // Validate the data type. Some objects won't encode easily, so try getting from them some basic info.
-            if (is_object($value)) {
-                $obj_vars = get_object_vars($value);
-                $value    = ! empty($obj_vars) ? PayPalLogger::cleanDataArray($obj_vars) : get_class($value);
-            }
-            if (is_string($key) && in_array($key, $sensitive_data)) {
-                $data[ $key ] = empty($value) ? '**empty**' : '**hidden**';
-            } else {
-                $data[ $key ] = $value;
-            }
-        }
-        return $data;
-    }
+	/**
+	 * Clean the array of data from sensitive information.
+	 *
+	 * @param array $data
+	 * @return array
+	 */
+	private static function cleanDataArray(array $data): array
+	{
+		$sensitive_data = [
+			'access_token',
+			'refresh_token',
+			'nonce',
+			'seller_nonce',
+			'client_secret',
+			Domain::API_KEY_AUTH_CODE,
+			'Authorization',
+			'merchantIdInPayPal',
+		];
+		foreach ($data as $key => $value) {
+			if (is_string($value)) {
+				// Json encoded ?
+				$value = json_decode($value) ?? $value;
+			}
+			$value = is_array($value) ? PayPalLogger::cleanDataArray($value) : $value;
+			// Validate the data type. Some objects won't encode easily, so try getting from them some basic info.
+			if (is_object($value)) {
+				$obj_vars = get_object_vars($value);
+				$value    = ! empty($obj_vars) ? PayPalLogger::cleanDataArray($obj_vars) : get_class($value);
+			}
+			if (is_string($key) && in_array($key, $sensitive_data)) {
+				$data[ $key ] = empty($value) ? '**empty**' : '**hidden**';
+			} else {
+				$data[ $key ] = $value;
+			}
+		}
+		return $data;
+	}
 
 
-    /**
-     * Return error message as json allowing to show an alert on the front-end.
-     *
-     * @param string $error_message
-     * @param bool   $show_alert
-     * @return void
-     */
-    public static function exitWithJson(string $error_message = '', bool $show_alert = false)
-    {
-        wp_send_json(
-            [
-                'error'   => $error_message,
-                'message' => $error_message,
-                'alert'   => $show_alert,
-            ]
-        );
-    }
+	/**
+	 * Return error message as json allowing to show an alert on the front-end.
+	 *
+	 * @param string $error_message
+	 * @param bool   $show_alert
+	 * @return void
+	 */
+	public static function exitWithJson(string $error_message = '', bool $show_alert = false)
+	{
+		wp_send_json(
+			[
+				'error'   => $error_message,
+				'message' => $error_message,
+				'alert'   => $show_alert,
+			]
+		);
+	}
 
 
-    /**
-     * Close the OAuth window with JS.
-     *
-     * @param string $message
-     * @return void
-     */
-    public static function logInWindow(string $message): void
-    {
-        $js_out = '<script type="text/javascript">
+	/**
+	 * Close the OAuth window with JS.
+	 *
+	 * @param string $message
+	 * @return void
+	 */
+	public static function logInWindow(string $message): void
+	{
+		$js_out = '<script type="text/javascript">
                 if (window.opener) {
                     try {
                         window.opener.console.log("' . $message . '");
@@ -170,22 +170,22 @@ 
                     }
                 }
             </script>';
-        echo $js_out;
-        wp_die();
-    }
+		echo $js_out;
+		wp_die();
+	}
 
 
-    /**
-     * Close the JS opened auth window.
-     *
-     * @param string $message
-     * @return void
-     */
-    public static function closeWindowAndExit(string $message = ''): void
-    {
-        $js_out = '<script type="text/javascript">';
-        if (! empty($message)) {
-            $js_out .= '
+	/**
+	 * Close the JS opened auth window.
+	 *
+	 * @param string $message
+	 * @return void
+	 */
+	public static function closeWindowAndExit(string $message = ''): void
+	{
+		$js_out = '<script type="text/javascript">';
+		if (! empty($message)) {
+			$js_out .= '
                 if (window.opener) {
                     try {
                         window.opener.console.log("' . $message . '");
@@ -194,11 +194,11 @@ 
                     }
                 }
             ';
-        }
-        $js_out .= 'window.opener = self;
+		}
+		$js_out .= 'window.opener = self;
             window.close();
             </script>';
-        echo $js_out;
-        wp_die();
-    }
+		echo $js_out;
+		wp_die();
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -75,7 +75,7 @@ 
             $default_msg = $error_message;
         }
         try {
-            if (! $paypal_pm instanceof EE_Payment_Method) {
+            if ( ! $paypal_pm instanceof EE_Payment_Method) {
                 // Default to the standard PP Commerce PM.
                 $paypal_pm = EEM_Payment_Method::instance()->get_one_by_slug(Domain::PM_SLUG);
             }
@@ -125,9 +125,9 @@ 
                 $value    = ! empty($obj_vars) ? PayPalLogger::cleanDataArray($obj_vars) : get_class($value);
             }
             if (is_string($key) && in_array($key, $sensitive_data)) {
-                $data[ $key ] = empty($value) ? '**empty**' : '**hidden**';
+                $data[$key] = empty($value) ? '**empty**' : '**hidden**';
             } else {
-                $data[ $key ] = $value;
+                $data[$key] = $value;
             }
         }
         return $data;
@@ -164,9 +164,9 @@ 
         $js_out = '<script type="text/javascript">
                 if (window.opener) {
                     try {
-                        window.opener.console.log("' . $message . '");
+                        window.opener.console.log("' . $message.'");
                     } catch (e) {
-                        console.log("' . $message . '");
+                        console.log("' . $message.'");
                     }
                 }
             </script>';
@@ -184,13 +184,13 @@ 
     public static function closeWindowAndExit(string $message = ''): void
     {
         $js_out = '<script type="text/javascript">';
-        if (! empty($message)) {
+        if ( ! empty($message)) {
             $js_out .= '
                 if (window.opener) {
                     try {
-                        window.opener.console.log("' . $message . '");
+                        window.opener.console.log("' . $message.'");
                     } catch (e) {
-                        console.log("' . $message . '");
+                        console.log("' . $message.'");
                     }
                 }
             ';