eventespresso / event-espresso-core

core/db_classes/EE_Term.class.php

Indentation +82 added lines, -82 removed lines

@@ -9,100 +9,100 @@
  */
 class EE_Term extends EE_Base_Class
 {
-    public array $post_type = [];
+	public array $post_type = [];
 
 
-    /**
-     * Sets some dynamic defaults
-     *
-     * @param array  $fieldValues
-     * @param bool   $bydb
-     * @param string $timezone
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function __construct($fieldValues = [], $bydb = false, $timezone = '')
-    {
-        if (! isset($fieldValues['slug'])) {
-            $fieldValues['slug'] = $fieldValues['name'];
-        }
-        parent::__construct($fieldValues, $bydb, $timezone);
-    }
+	/**
+	 * Sets some dynamic defaults
+	 *
+	 * @param array  $fieldValues
+	 * @param bool   $bydb
+	 * @param string $timezone
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function __construct($fieldValues = [], $bydb = false, $timezone = '')
+	{
+		if (! isset($fieldValues['slug'])) {
+			$fieldValues['slug'] = $fieldValues['name'];
+		}
+		parent::__construct($fieldValues, $bydb, $timezone);
+	}
 
 
-    /**
-     * @param array $props_n_values
-     * @return EE_Term|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function new_instance(array $props_n_values = []): ?EE_Term
-    {
-        $has_object = parent::_check_for_object($props_n_values, __CLASS__);
-        return $has_object ?: new self($props_n_values);
-    }
+	/**
+	 * @param array $props_n_values
+	 * @return EE_Term|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function new_instance(array $props_n_values = []): ?EE_Term
+	{
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ?: new self($props_n_values);
+	}
 
 
-    /**
-     * @param array $props_n_values
-     * @return EE_Term|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function new_instance_from_db(array $props_n_values = []): ?EE_Term
-    {
-        return new self($props_n_values, true);
-    }
+	/**
+	 * @param array $props_n_values
+	 * @return EE_Term|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function new_instance_from_db(array $props_n_values = []): ?EE_Term
+	{
+		return new self($props_n_values, true);
+	}
 
 
-    /**
-     * Gets name
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function name(): string
-    {
-        return (string) $this->get('name');
-    }
+	/**
+	 * Gets name
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function name(): string
+	{
+		return (string) $this->get('name');
+	}
 
 
-    /**
-     * Sets name
-     *
-     * @param string $name
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function set_name(string $name)
-    {
-        $this->set('name', $name);
-    }
+	/**
+	 * Sets name
+	 *
+	 * @param string $name
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function set_name(string $name)
+	{
+		$this->set('name', $name);
+	}
 
 
-    /**
-     * Gets slug
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function slug(): string
-    {
-        return (string) $this->get('slug');
-    }
+	/**
+	 * Gets slug
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function slug(): string
+	{
+		return (string) $this->get('slug');
+	}
 
 
-    /**
-     * Sets slug
-     *
-     * @param string $slug
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function set_slug(string $slug)
-    {
-        $this->set('slug', $slug);
-    }
+	/**
+	 * Sets slug
+	 *
+	 * @param string $slug
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function set_slug(string $slug)
+	{
+		$this->set('slug', $slug);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
      */
     protected function __construct($fieldValues = [], $bydb = false, $timezone = '')
     {
-        if (! isset($fieldValues['slug'])) {
+        if ( ! isset($fieldValues['slug'])) {
             $fieldValues['slug'] = $fieldValues['name'];
         }
         parent::__construct($fieldValues, $bydb, $timezone);

PaymentMethods/PayPalCommerce/PayPalCheckout/EEG_PayPalCheckout.gateway.php

Indentation +265 added lines, -265 removed lines

@@ -15,282 +15,282 @@
  */
 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',
+	];
 
 
-    /**
-     * @param EE_Payment|null $payment
-     * @param array|null      $billing_info
-     * @return EE_Payment
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function do_direct_payment($payment, $billing_info = null)
-    {
-        $failed_status = $this->_pay_model->failed_status();
-        $request       = LoaderFactory::getLoader()->getShared(RequestInterface::class);
-        // Check the payment.
-        $payment_valid = $this->validateThisPayment($payment, $request);
-        if ($payment_valid->details() === 'error' && $payment_valid->status() === $failed_status) {
-            return $payment_valid;
-        }
-        $transaction    = $payment->transaction();
-        $payment_method = $transaction->payment_method();
+	/**
+	 * @param EE_Payment|null $payment
+	 * @param array|null      $billing_info
+	 * @return EE_Payment
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function do_direct_payment($payment, $billing_info = null)
+	{
+		$failed_status = $this->_pay_model->failed_status();
+		$request       = LoaderFactory::getLoader()->getShared(RequestInterface::class);
+		// Check the payment.
+		$payment_valid = $this->validateThisPayment($payment, $request);
+		if ($payment_valid->details() === 'error' && $payment_valid->status() === $failed_status) {
+			return $payment_valid;
+		}
+		$transaction    = $payment->transaction();
+		$payment_method = $transaction->payment_method();
 
-        // Get saved order details.
-        try {
-            $order = PayPalExtraMetaManager::getPmOption($payment_method, Domain::META_KEY_LAST_ORDER);
-        } catch (Exception $exception) {
-            return $this->setPaymentFailure(
-                $payment,
-                $failed_status,
-                $request->postParams(),
-                $exception->getMessage()
-            );
-        }
-        $order_id     = $request->getRequestParam('pp_order_id', '', DataType::STRING);
-        $order_status = $this->isOrderCompleted($order_id, $order);
-        if (! $order_status['completed']) {
-            return $this->setPaymentFailure(
-                $payment,
-                $failed_status,
-                [$order, $request->postParams()],
-                $order_status['message']
-            );
-        }
-        // Remove the saved order data.
-        PayPalExtraMetaManager::deletePmOption($payment_method, Domain::META_KEY_LAST_ORDER);
-        // Looks like all is good. Do a payment success.
-        return $this->setPaymentSuccess($payment, $transaction, $order);
-    }
+		// Get saved order details.
+		try {
+			$order = PayPalExtraMetaManager::getPmOption($payment_method, Domain::META_KEY_LAST_ORDER);
+		} catch (Exception $exception) {
+			return $this->setPaymentFailure(
+				$payment,
+				$failed_status,
+				$request->postParams(),
+				$exception->getMessage()
+			);
+		}
+		$order_id     = $request->getRequestParam('pp_order_id', '', DataType::STRING);
+		$order_status = $this->isOrderCompleted($order_id, $order);
+		if (! $order_status['completed']) {
+			return $this->setPaymentFailure(
+				$payment,
+				$failed_status,
+				[$order, $request->postParams()],
+				$order_status['message']
+			);
+		}
+		// Remove the saved order data.
+		PayPalExtraMetaManager::deletePmOption($payment_method, Domain::META_KEY_LAST_ORDER);
+		// Looks like all is good. Do a payment success.
+		return $this->setPaymentSuccess($payment, $transaction, $order);
+	}
 
 
-    /**
-     * Validate the payment.
-     *
-     * @param mixed            $payment
-     * @param RequestInterface $request
-     * @return EE_Payment
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function validateThisPayment(?EE_Payment $payment, RequestInterface $request): EE_Payment
-    {
-        $failed_status = $this->_pay_model->failed_status();
-        // Check the payment.
-        if (! $payment instanceof EE_Payment) {
-            $payment       = EE_Payment::new_instance();
-            $error_message = esc_html__('Error. No associated payment was found.', 'event_espresso');
-            return $this->setPaymentFailure($payment, $failed_status, $request->postParams(), $error_message);
-        }
-        // Check the transaction.
-        $transaction = $payment->transaction();
-        if (! $transaction instanceof EE_Transaction) {
-            $error_message = esc_html__(
-                'Could not process this payment because it has no associated transaction.',
-                'event_espresso'
-            );
-            return $this->setPaymentFailure($payment, $failed_status, $request->postParams(), $error_message);
-        }
-        // Check for the payment nonce.
-        // $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 $this->setPaymentFailure($payment, $failed_status, $request->postParams(), $error_message);
-        // }
-        return $payment;
-    }
+	/**
+	 * Validate the payment.
+	 *
+	 * @param mixed            $payment
+	 * @param RequestInterface $request
+	 * @return EE_Payment
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function validateThisPayment(?EE_Payment $payment, RequestInterface $request): EE_Payment
+	{
+		$failed_status = $this->_pay_model->failed_status();
+		// Check the payment.
+		if (! $payment instanceof EE_Payment) {
+			$payment       = EE_Payment::new_instance();
+			$error_message = esc_html__('Error. No associated payment was found.', 'event_espresso');
+			return $this->setPaymentFailure($payment, $failed_status, $request->postParams(), $error_message);
+		}
+		// Check the transaction.
+		$transaction = $payment->transaction();
+		if (! $transaction instanceof EE_Transaction) {
+			$error_message = esc_html__(
+				'Could not process this payment because it has no associated transaction.',
+				'event_espresso'
+			);
+			return $this->setPaymentFailure($payment, $failed_status, $request->postParams(), $error_message);
+		}
+		// Check for the payment nonce.
+		// $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 $this->setPaymentFailure($payment, $failed_status, $request->postParams(), $error_message);
+		// }
+		return $payment;
+	}
 
 
-    /**
-     * Validate the Order.
-     *
-     * @param string $provided_order_id
-     * @param        $order
-     * @return array ['completed' => {boolean}, 'message' => {string}]
-     */
-    public function isOrderCompleted(string $provided_order_id, $order): array
-    {
-        $conclusion = [
-            'completed' => false,
-            'message'   => esc_html__('Could not validate this Order.', 'event_espresso'),
-        ];
-        // Check the provided Order and order ID.
-        if (! $provided_order_id) {
-            $conclusion['message'] = esc_html__(
-                'Invalid Order ID provided! Not able to confirm the order',
-                'event_espresso'
-            );
-        } elseif (! $order || ! is_array($order)) {
-            $conclusion['message'] = esc_html__('Order data is in wrong format.', 'event_espresso');
-        } elseif ($order['id'] !== $provided_order_id) {
-            $conclusion['message'] = esc_html__('Order ID mismatch.', '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 string $provided_order_id
+	 * @param        $order
+	 * @return array ['completed' => {boolean}, 'message' => {string}]
+	 */
+	public function isOrderCompleted(string $provided_order_id, $order): array
+	{
+		$conclusion = [
+			'completed' => false,
+			'message'   => esc_html__('Could not validate this Order.', 'event_espresso'),
+		];
+		// Check the provided Order and order ID.
+		if (! $provided_order_id) {
+			$conclusion['message'] = esc_html__(
+				'Invalid Order ID provided! Not able to confirm the order',
+				'event_espresso'
+			);
+		} elseif (! $order || ! is_array($order)) {
+			$conclusion['message'] = esc_html__('Order data is in wrong format.', 'event_espresso');
+		} elseif ($order['id'] !== $provided_order_id) {
+			$conclusion['message'] = esc_html__('Order ID mismatch.', '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;
+	}
 
 
-    /**
-     * Set a payment error and log the data.
-     *
-     * @param EE_Payment   $payment
-     * @param string       $status
-     * @param array|string $response_data
-     * @param string       $err_message
-     * @return EE_Payment
-     * @throws EE_Error|ReflectionException
-     */
-    public function setPaymentFailure(
-        EE_Payment $payment,
-        string     $status,
-                   $response_data,
-        string     $err_message = ''
-    ): EE_Payment {
-        $this->log(['Error request data:' => $response_data], $payment);
-        $err_message = $err_message ?: sprintf(
-            esc_html__(
-                'Your payment could not be processed successfully due to a technical issue.%sPlease try again or contact %s for assistance.',
-                'event_espresso'
-            ),
-            '<br/>',
-            EE_Registry::instance()->CFG->organization->get_pretty('email')
-        );
-        $payment->set_status($status);
-        $payment->set_details($err_message);
-        $payment->set_gateway_response($err_message);
-        return $payment;
-    }
+	/**
+	 * Set a payment error and log the data.
+	 *
+	 * @param EE_Payment   $payment
+	 * @param string       $status
+	 * @param array|string $response_data
+	 * @param string       $err_message
+	 * @return EE_Payment
+	 * @throws EE_Error|ReflectionException
+	 */
+	public function setPaymentFailure(
+		EE_Payment $payment,
+		string     $status,
+				   $response_data,
+		string     $err_message = ''
+	): EE_Payment {
+		$this->log(['Error request data:' => $response_data], $payment);
+		$err_message = $err_message ?: sprintf(
+			esc_html__(
+				'Your payment could not be processed successfully due to a technical issue.%sPlease try again or contact %s for assistance.',
+				'event_espresso'
+			),
+			'<br/>',
+			EE_Registry::instance()->CFG->organization->get_pretty('email')
+		);
+		$payment->set_status($status);
+		$payment->set_details($err_message);
+		$payment->set_gateway_response($err_message);
+		return $payment;
+	}
 
 
-    /**
-     * Set the payment success.
-     *
-     * @param EE_Payment     $payment
-     * @param EE_Transaction $transaction
-     * @param array          $order
-     * @return EE_Payment
-     * @throws EE_Error|ReflectionException
-     */
-    public function setPaymentSuccess(EE_Payment $payment, EE_Transaction $transaction, array $order): EE_Payment
-    {
-        $amount = $order['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 (! $amount) {
-            $this->log(['Success order but amount is 0 !' => $order], $payment);
-        } else {
-            $payment->set_amount((float) $amount);
-        }
-        $payment->set_status(EEM_Payment::status_id_approved);
-        $payment->set_txn_id_chq_nmbr($order['purchase_units'][0]['payments']['captures'][0]['id'] ?? $order['id']);
-        $payment->set_gateway_response($order['status'] ?? 'success');
-        $this->saveBillingDetails($payment, $transaction, $order);
-        return $payment;
-    }
+	/**
+	 * Set the payment success.
+	 *
+	 * @param EE_Payment     $payment
+	 * @param EE_Transaction $transaction
+	 * @param array          $order
+	 * @return EE_Payment
+	 * @throws EE_Error|ReflectionException
+	 */
+	public function setPaymentSuccess(EE_Payment $payment, EE_Transaction $transaction, array $order): EE_Payment
+	{
+		$amount = $order['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 (! $amount) {
+			$this->log(['Success order but amount is 0 !' => $order], $payment);
+		} else {
+			$payment->set_amount((float) $amount);
+		}
+		$payment->set_status(EEM_Payment::status_id_approved);
+		$payment->set_txn_id_chq_nmbr($order['purchase_units'][0]['payments']['captures'][0]['id'] ?? $order['id']);
+		$payment->set_gateway_response($order['status'] ?? 'success');
+		$this->saveBillingDetails($payment, $transaction, $order);
+		return $payment;
+	}
 
 
-    /**
-     * Save some transaction details, like billing information.
-     *
-     * @param EE_Payment     $payment
-     * @param EE_Transaction $transaction
-     * @param array          $order
-     * @return void
-     * @throws EE_Error|ReflectionException
-     */
-    public function saveBillingDetails(EE_Payment $payment, EE_Transaction $transaction, array $order): void
-    {
-        $input_values   = [];
-        $primary_reg    = $transaction->primary_registration();
-        $attendee       = $primary_reg instanceof EE_Registration ? $primary_reg->attendee() : null;
-        $transaction    = $payment->transaction();
-        $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) ?
-        if (! empty($order['payment_source']['paypal'])) {
-            $payer                      = $order['payment_source']['paypal'];
-            $payer_name                 = $payer['name'] ?? '';
-            $input_values['first_name'] = $payer_name['given_name'] ?? $attendee->fname();
-            $input_values['last_name']  = $payer_name['surname'] ?? $attendee->lname();
-            $input_values['email']      = $payer_name['email_address'] ?? $attendee->email();
-            $input_values['address']    = $payer_name['address_line_1'] ?? $attendee->address();
-            $input_values['address2']   = $payer_name['address_line_2'] ?? $attendee->address2();
-            $input_values['city']       = $payer_name['admin_area_2'] ?? $attendee->city();
-            $input_values['country']    = $payer_name['country_code'] ?? $attendee->country();
-            $input_values['zip']        = $payer_name['postal_code'] ?? $attendee->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.
-                $input_values['credit_card'] = $payer_card['last_digits'] ?? '';
-                $input_values['first_name']  = $full_name[0] ?? $attendee->fname();
-                $input_values['last_name']   = $full_name[1] ?? $attendee->lname();
-            }
-        }
-        update_post_meta($attendee->ID(), $postmeta_name, $input_values);
-        $attendee->save();
-    }
+	/**
+	 * Save some transaction details, like billing information.
+	 *
+	 * @param EE_Payment     $payment
+	 * @param EE_Transaction $transaction
+	 * @param array          $order
+	 * @return void
+	 * @throws EE_Error|ReflectionException
+	 */
+	public function saveBillingDetails(EE_Payment $payment, EE_Transaction $transaction, array $order): void
+	{
+		$input_values   = [];
+		$primary_reg    = $transaction->primary_registration();
+		$attendee       = $primary_reg instanceof EE_Registration ? $primary_reg->attendee() : null;
+		$transaction    = $payment->transaction();
+		$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) ?
+		if (! empty($order['payment_source']['paypal'])) {
+			$payer                      = $order['payment_source']['paypal'];
+			$payer_name                 = $payer['name'] ?? '';
+			$input_values['first_name'] = $payer_name['given_name'] ?? $attendee->fname();
+			$input_values['last_name']  = $payer_name['surname'] ?? $attendee->lname();
+			$input_values['email']      = $payer_name['email_address'] ?? $attendee->email();
+			$input_values['address']    = $payer_name['address_line_1'] ?? $attendee->address();
+			$input_values['address2']   = $payer_name['address_line_2'] ?? $attendee->address2();
+			$input_values['city']       = $payer_name['admin_area_2'] ?? $attendee->city();
+			$input_values['country']    = $payer_name['country_code'] ?? $attendee->country();
+			$input_values['zip']        = $payer_name['postal_code'] ?? $attendee->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.
+				$input_values['credit_card'] = $payer_card['last_digits'] ?? '';
+				$input_values['first_name']  = $full_name[0] ?? $attendee->fname();
+				$input_values['last_name']   = $full_name[1] ?? $attendee->lname();
+			}
+		}
+		update_post_meta($attendee->ID(), $postmeta_name, $input_values);
+		$attendee->save();
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -81,7 +81,7 @@ 
         }
         $order_id     = $request->getRequestParam('pp_order_id', '', DataType::STRING);
         $order_status = $this->isOrderCompleted($order_id, $order);
-        if (! $order_status['completed']) {
+        if ( ! $order_status['completed']) {
             return $this->setPaymentFailure(
                 $payment,
                 $failed_status,
@@ -109,14 +109,14 @@ 
     {
         $failed_status = $this->_pay_model->failed_status();
         // Check the payment.
-        if (! $payment instanceof EE_Payment) {
+        if ( ! $payment instanceof EE_Payment) {
             $payment       = EE_Payment::new_instance();
             $error_message = esc_html__('Error. No associated payment was found.', 'event_espresso');
             return $this->setPaymentFailure($payment, $failed_status, $request->postParams(), $error_message);
         }
         // Check the transaction.
         $transaction = $payment->transaction();
-        if (! $transaction instanceof EE_Transaction) {
+        if ( ! $transaction instanceof EE_Transaction) {
             $error_message = esc_html__(
                 'Could not process this payment because it has no associated transaction.',
                 'event_espresso'
@@ -147,12 +147,12 @@ 
             'message'   => esc_html__('Could not validate this Order.', 'event_espresso'),
         ];
         // Check the provided Order and order ID.
-        if (! $provided_order_id) {
+        if ( ! $provided_order_id) {
             $conclusion['message'] = esc_html__(
                 'Invalid Order ID provided! Not able to confirm the order',
                 'event_espresso'
             );
-        } elseif (! $order || ! is_array($order)) {
+        } elseif ( ! $order || ! is_array($order)) {
             $conclusion['message'] = esc_html__('Order data is in wrong format.', 'event_espresso');
         } elseif ($order['id'] !== $provided_order_id) {
             $conclusion['message'] = esc_html__('Order ID mismatch.', 'event_espresso');
@@ -229,7 +229,7 @@ 
     {
         $amount = $order['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 (! $amount) {
+        if ( ! $amount) {
             $this->log(['Success order but amount is 0 !' => $order], $payment);
         } else {
             $payment->set_amount((float) $amount);
@@ -259,7 +259,7 @@ 
         $transaction    = $payment->transaction();
         $payment_method = $transaction->payment_method();
         $postmeta_name  = $payment_method->type_obj() instanceof EE_PMT_Base
-            ? 'billing_info_' . $payment_method->type_obj()->system_name()
+            ? '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.
@@ -267,7 +267,7 @@ 
             return;
         }
         // Do we have order information from the express checkout (PayPal button) ?
-        if (! empty($order['payment_source']['paypal'])) {
+        if ( ! empty($order['payment_source']['paypal'])) {
             $payer                      = $order['payment_source']['paypal'];
             $payer_name                 = $payer['name'] ?? '';
             $input_values['first_name'] = $payer_name['given_name'] ?? $attendee->fname();
@@ -280,9 +280,9 @@ 
             $input_values['zip']        = $payer_name['postal_code'] ?? $attendee->zip();
         }
         // Or card information from ACDC ?
-        if (! empty($order['payment_source']['card'])) {
+        if ( ! empty($order['payment_source']['card'])) {
             $payer_card = $order['payment_source']['card'];
-            if (! empty($payer_card['name'])) {
+            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.
                 $input_values['credit_card'] = $payer_card['last_digits'] ?? '';

PaymentMethods/PayPalCommerce/domain/Domain.php

Indentation +165 added lines, -165 removed lines

@@ -15,169 +15,169 @@
  */
 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 onboarding URL.
-     */
-    public const META_KEY_ONBOARDING_URL = 'onboarding_url';
-
-    /**
-     * 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 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 PP checkout type selected by merchant after onboarding.
-     */
-    public const META_KEY_CHECKOUT_TYPE = 'checkout_type';
-
-    /**
-     * 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
-     */
-    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 onboarding URL.
+	 */
+	public const META_KEY_ONBOARDING_URL = 'onboarding_url';
+
+	/**
+	 * 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 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 PP checkout type selected by merchant after onboarding.
+	 */
+	public const META_KEY_CHECKOUT_TYPE = 'checkout_type';
+
+	/**
+	 * 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
+	 */
+	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/api/orders/CreateOrder.php

Indentation +245 added lines, -245 removed lines

@@ -23,271 +23,271 @@
  */
 class CreateOrder extends OrdersApi
 {
-    /**
-     * Line items total.
-     *
-     * @var float
-     */
-    protected $items_total = 0;
+	/**
+	 * Line items total.
+	 *
+	 * @var float
+	 */
+	protected $items_total = 0;
 
-    /**
-     * Promotions total.
-     *
-     * @var float
-     */
-    protected $promos_total = 0;
+	/**
+	 * Promotions total.
+	 *
+	 * @var float
+	 */
+	protected $promos_total = 0;
 
-    /**
-     * Tax total.
-     *
-     * @var float
-     */
-    protected $tax_total = 0;
+	/**
+	 * Tax total.
+	 *
+	 * @var float
+	 */
+	protected $tax_total = 0;
 
-    /**
-     * Currency.
-     *
-     * @var string
-     */
-    protected string $currency_code;
+	/**
+	 * Currency.
+	 *
+	 * @var string
+	 */
+	protected string $currency_code;
 
-    /**
-     * Billing info.
-     *
-     * @var array
-     */
-    protected array $billing_info;
+	/**
+	 * Billing info.
+	 *
+	 * @var array
+	 */
+	protected array $billing_info;
 
-    /**
-     * Transaction this order is for.
-     *
-     * @var EE_Transaction
-     */
-    protected EE_Transaction $transaction;
+	/**
+	 * Transaction this order is for.
+	 *
+	 * @var EE_Transaction
+	 */
+	protected EE_Transaction $transaction;
 
 
-    /**
-     * CreateOrder constructor.
-     *
-     * @param PayPalApi      $api
-     * @param EE_Transaction $transaction
-     * @param array          $billing_info
-     */
-    public function __construct(PayPalApi $api, EE_Transaction $transaction, array $billing_info)
-    {
-        parent::__construct($api);
-        $this->transaction   = $transaction;
-        $this->currency_code = CurrencyManager::currencyCode();
-        $this->sanitizeRequestParameters($billing_info);
-    }
+	/**
+	 * CreateOrder constructor.
+	 *
+	 * @param PayPalApi      $api
+	 * @param EE_Transaction $transaction
+	 * @param array          $billing_info
+	 */
+	public function __construct(PayPalApi $api, EE_Transaction $transaction, array $billing_info)
+	{
+		parent::__construct($api);
+		$this->transaction   = $transaction;
+		$this->currency_code = CurrencyManager::currencyCode();
+		$this->sanitizeRequestParameters($billing_info);
+	}
 
 
-    /**
-     * Sanitize the array of billing form data.
-     *
-     * @param array $billing_info
-     * @return void
-     */
-    public function sanitizeRequestParameters(array $billing_info): void
-    {
-        $email_validator = new Basic();
-        $sanitizer       = new RequestSanitizer($email_validator);
-        foreach ($billing_info as $item => $value)
-        {
-            $this->billing_info[ $item ] = $sanitizer->clean($value);
-        }
-    }
+	/**
+	 * Sanitize the array of billing form data.
+	 *
+	 * @param array $billing_info
+	 * @return void
+	 */
+	public function sanitizeRequestParameters(array $billing_info): void
+	{
+		$email_validator = new Basic();
+		$sanitizer       = new RequestSanitizer($email_validator);
+		foreach ($billing_info as $item => $value)
+		{
+			$this->billing_info[ $item ] = $sanitizer->clean($value);
+		}
+	}
 
 
-    /**
-     * Create PayPal Order.
-     *
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function create(): array
-    {
-        $order_parameters = $this->getParameters();
-        // Create Order request.
-        $create_response = $this->api->sendRequest($order_parameters, $this->request_url);
-        return $this->validateOrder($create_response, $order_parameters);
-    }
+	/**
+	 * Create PayPal Order.
+	 *
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function create(): array
+	{
+		$order_parameters = $this->getParameters();
+		// Create Order request.
+		$create_response = $this->api->sendRequest($order_parameters, $this->request_url);
+		return $this->validateOrder($create_response, $order_parameters);
+	}
 
 
-    /**
-     * Form order parameters.
-     *
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function getParameters(): array
-    {
-        $registrant  = $this->transaction->primary_registration();
-        $attendee    = $registrant->attendee();
-        $event       = $registrant->event();
-        $description = $event->name() ?: sprintf(
-            esc_html__('Tickets for an event at %1$s', 'event_espresso'),
-            get_bloginfo('name')
-        );
-        return [
-            'intent'              => 'CAPTURE',
-            'purchase_units'      => [
-                [
-                    'custom_id'   => $this->transaction->ID(),
-                    'description' => substr(wp_strip_all_tags($description), 0, 125),
-                    'items'       => $this->getLineItems(),
-                    'amount'      => [
-                        'value'         => $this->transaction->remaining(),
-                        'currency_code' => $this->currency_code,
-                        'breakdown'     => $this->getBreakdown(),
-                    ],
-                ],
-            ],
-            'application_context' => [
-                'shipping_preference' => 'NO_SHIPPING',
-                'user_action'         => 'PAY_NOW',
-            ],
-            'payer'               => [
-                'email_address' => $attendee->email(),
-                'name'          => [
-                    'given_name' => $attendee->fname(),
-                    'surname'    => $attendee->lname(),
+	/**
+	 * Form order parameters.
+	 *
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function getParameters(): array
+	{
+		$registrant  = $this->transaction->primary_registration();
+		$attendee    = $registrant->attendee();
+		$event       = $registrant->event();
+		$description = $event->name() ?: sprintf(
+			esc_html__('Tickets for an event at %1$s', 'event_espresso'),
+			get_bloginfo('name')
+		);
+		return [
+			'intent'              => 'CAPTURE',
+			'purchase_units'      => [
+				[
+					'custom_id'   => $this->transaction->ID(),
+					'description' => substr(wp_strip_all_tags($description), 0, 125),
+					'items'       => $this->getLineItems(),
+					'amount'      => [
+						'value'         => $this->transaction->remaining(),
+						'currency_code' => $this->currency_code,
+						'breakdown'     => $this->getBreakdown(),
+					],
+				],
+			],
+			'application_context' => [
+				'shipping_preference' => 'NO_SHIPPING',
+				'user_action'         => 'PAY_NOW',
+			],
+			'payer'               => [
+				'email_address' => $attendee->email(),
+				'name'          => [
+					'given_name' => $attendee->fname(),
+					'surname'    => $attendee->lname(),
 
-                ],
-            ],
-        ];
-    }
+				],
+			],
+		];
+	}
 
 
-    /**
-     * Itemize the payment. List all the line items, discounts and taxes.
-     *
-     * @return array
-     * @throws EE_Error|ReflectionException
-     */
-    protected function getLineItems(): array
-    {
-        // Order line items.
-        $line_items       = [];
-        $event_line_items = $this->transaction->items_purchased();
-        // List actual line items.
-        foreach ($event_line_items as $line_item) {
-            if ($line_item instanceof EE_Line_Item
-                && $line_item->OBJ_type() !== 'Promotion'
-                && $line_item->quantity() > 0
-            ) {
-                $item_money     = $line_item->unit_price();
-                $li_description = $line_item->desc() ?? esc_html__('Event Ticket', 'event_espresso');
-                $line_items [] = [
-                    'name'        => substr(wp_strip_all_tags($line_item->name()), 0, 126),
-                    'quantity'    => $line_item->quantity(),
-                    'description' => substr(wp_strip_all_tags($li_description), 0, 125),
-                    'unit_amount' => [
-                        'currency_code' => $this->currency_code,
-                        'value'         => $item_money,
-                    ],
-                    'category'    => 'DIGITAL_GOODS',
-                ];
-                // Line item total.
-                $this->items_total += $line_item->pretaxTotal();
-            } elseif ($line_item->OBJ_type() === 'Promotion' && $line_item->quantity() > 0) {
-                // Promotions total.
-                $this->promos_total += $line_item->total();
-            }
-        }
-        // Make sure we have an absolute number with only two decimal laces.
-        $this->items_total  = CurrencyManager::normalizeValue($this->items_total);
-        $this->promos_total = CurrencyManager::normalizeValue($this->promos_total);
-        // If this is a partial payment, apply the paid amount as a promo.
-        if ($this->transaction->paid() > 0) {
-            $this->promos_total += CurrencyManager::normalizeValue($this->transaction->paid());
-        }
-        $this->countTaxTotal();
-        return $line_items;
-    }
+	/**
+	 * Itemize the payment. List all the line items, discounts and taxes.
+	 *
+	 * @return array
+	 * @throws EE_Error|ReflectionException
+	 */
+	protected function getLineItems(): array
+	{
+		// Order line items.
+		$line_items       = [];
+		$event_line_items = $this->transaction->items_purchased();
+		// List actual line items.
+		foreach ($event_line_items as $line_item) {
+			if ($line_item instanceof EE_Line_Item
+				&& $line_item->OBJ_type() !== 'Promotion'
+				&& $line_item->quantity() > 0
+			) {
+				$item_money     = $line_item->unit_price();
+				$li_description = $line_item->desc() ?? esc_html__('Event Ticket', 'event_espresso');
+				$line_items [] = [
+					'name'        => substr(wp_strip_all_tags($line_item->name()), 0, 126),
+					'quantity'    => $line_item->quantity(),
+					'description' => substr(wp_strip_all_tags($li_description), 0, 125),
+					'unit_amount' => [
+						'currency_code' => $this->currency_code,
+						'value'         => $item_money,
+					],
+					'category'    => 'DIGITAL_GOODS',
+				];
+				// Line item total.
+				$this->items_total += $line_item->pretaxTotal();
+			} elseif ($line_item->OBJ_type() === 'Promotion' && $line_item->quantity() > 0) {
+				// Promotions total.
+				$this->promos_total += $line_item->total();
+			}
+		}
+		// Make sure we have an absolute number with only two decimal laces.
+		$this->items_total  = CurrencyManager::normalizeValue($this->items_total);
+		$this->promos_total = CurrencyManager::normalizeValue($this->promos_total);
+		// If this is a partial payment, apply the paid amount as a promo.
+		if ($this->transaction->paid() > 0) {
+			$this->promos_total += CurrencyManager::normalizeValue($this->transaction->paid());
+		}
+		$this->countTaxTotal();
+		return $line_items;
+	}
 
 
-    /**
-     * Count the tax total.
-     *
-     * @return void
-     * @throws EE_Error|ReflectionException
-     */
-    protected function countTaxTotal(): void
-    {
-        // List taxes.
-        $this->tax_total = 0;
-        $tax_items       = $this->transaction->tax_items();
-        foreach ($tax_items as $tax_item) {
-            $this->tax_total += $tax_item->total();
-        }
-        $this->tax_total = CurrencyManager::normalizeValue($this->tax_total);
-    }
+	/**
+	 * Count the tax total.
+	 *
+	 * @return void
+	 * @throws EE_Error|ReflectionException
+	 */
+	protected function countTaxTotal(): void
+	{
+		// List taxes.
+		$this->tax_total = 0;
+		$tax_items       = $this->transaction->tax_items();
+		foreach ($tax_items as $tax_item) {
+			$this->tax_total += $tax_item->total();
+		}
+		$this->tax_total = CurrencyManager::normalizeValue($this->tax_total);
+	}
 
 
-    /**
-     * Itemize the payment the breakdown list.
-     *
-     * @return array
-     */
-    protected function getBreakdown(): array
-    {
-        $breakdown['item_total'] = [
-            'currency_code' => $this->currency_code,
-            'value'         => $this->items_total,
-        ];
-        $breakdown['tax_total']  = [
-            'currency_code' => $this->currency_code,
-            'value'         => $this->tax_total,
-        ];
-        $breakdown['discount']   = [
-            'currency_code' => $this->currency_code,
-            'value'         => abs($this->promos_total),
-        ];
-        return $breakdown;
-    }
+	/**
+	 * Itemize the payment the breakdown list.
+	 *
+	 * @return array
+	 */
+	protected function getBreakdown(): array
+	{
+		$breakdown['item_total'] = [
+			'currency_code' => $this->currency_code,
+			'value'         => $this->items_total,
+		];
+		$breakdown['tax_total']  = [
+			'currency_code' => $this->currency_code,
+			'value'         => $this->tax_total,
+		];
+		$breakdown['discount']   = [
+			'currency_code' => $this->currency_code,
+			'value'         => abs($this->promos_total),
+		];
+		return $breakdown;
+	}
 
 
-    /**
-     * Makes sure that we have received an Order back from the API call.
-     *
-     * @param $response
-     * @param $parameters
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function validateOrder($response, $parameters): array
-    {
-        $message = esc_html__('Validating Order Create:', 'event_espresso');
-        PayPalLogger::errorLog(
-            $message,
-            [$this->request_url, $response],
-            $this->transaction->payment_method(),
-            false,
-            $this->transaction
-        );
-        if (! empty($response['error'])) {
-            return $response;
-        }
-        if (! isset($response['id'])) {
-            $message = esc_html__('Unexpected response. Unable to find the order.', 'event_espresso');
-            try {
-                PayPalLogger::errorLog(
-                    $message,
-                    [$this->request_url, $parameters, $response],
-                    $this->transaction->payment_method()
-                );
-            } catch (EE_Error | ReflectionException $e) {
-                // Just continue.
-            }
-            return [
-                'error'   => $response['error'] ?? 'missing_order',
-                'message' => $response['message'] ?? $message,
-            ];
-        }
-        return $response;
-    }
+	/**
+	 * Makes sure that we have received an Order back from the API call.
+	 *
+	 * @param $response
+	 * @param $parameters
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function validateOrder($response, $parameters): array
+	{
+		$message = esc_html__('Validating Order Create:', 'event_espresso');
+		PayPalLogger::errorLog(
+			$message,
+			[$this->request_url, $response],
+			$this->transaction->payment_method(),
+			false,
+			$this->transaction
+		);
+		if (! empty($response['error'])) {
+			return $response;
+		}
+		if (! isset($response['id'])) {
+			$message = esc_html__('Unexpected response. Unable to find the order.', 'event_espresso');
+			try {
+				PayPalLogger::errorLog(
+					$message,
+					[$this->request_url, $parameters, $response],
+					$this->transaction->payment_method()
+				);
+			} catch (EE_Error | ReflectionException $e) {
+				// Just continue.
+			}
+			return [
+				'error'   => $response['error'] ?? 'missing_order',
+				'message' => $response['message'] ?? $message,
+			];
+		}
+		return $response;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -94,7 +94,7 @@ 
         $sanitizer       = new RequestSanitizer($email_validator);
         foreach ($billing_info as $item => $value)
         {
-            $this->billing_info[ $item ] = $sanitizer->clean($value);
+            $this->billing_info[$item] = $sanitizer->clean($value);
         }
     }
 
@@ -238,11 +238,11 @@ 
             'currency_code' => $this->currency_code,
             'value'         => $this->items_total,
         ];
-        $breakdown['tax_total']  = [
+        $breakdown['tax_total'] = [
             'currency_code' => $this->currency_code,
             'value'         => $this->tax_total,
         ];
-        $breakdown['discount']   = [
+        $breakdown['discount'] = [
             'currency_code' => $this->currency_code,
             'value'         => abs($this->promos_total),
         ];
@@ -269,10 +269,10 @@ 
             false,
             $this->transaction
         );
-        if (! empty($response['error'])) {
+        if ( ! empty($response['error'])) {
             return $response;
         }
-        if (! isset($response['id'])) {
+        if ( ! isset($response['id'])) {
             $message = esc_html__('Unexpected response. Unable to find the order.', 'event_espresso');
             try {
                 PayPalLogger::errorLog(

PaymentMethods/PayPalCommerce/api/orders/CaptureOrder.php

Indentation +87 added lines, -87 removed lines

@@ -20,98 +20,98 @@
  */
 class CaptureOrder extends OrdersApi
 {
-    /**
-     * Currency.
-     *
-     * @var string
-     */
-    protected string $currency_code;
+	/**
+	 * Currency.
+	 *
+	 * @var string
+	 */
+	protected string $currency_code;
 
-    /**
-     * Transaction this order is for.
-     *
-     * @var EE_Transaction
-     */
-    protected EE_Transaction $transaction;
+	/**
+	 * Transaction this order is for.
+	 *
+	 * @var EE_Transaction
+	 */
+	protected EE_Transaction $transaction;
 
 
-    /**
-     * CaptureOrder constructor.
-     *
-     * @param PayPalApi      $api
-     * @param EE_Transaction $transaction
-     * @param string         $order_id
-     */
-    public function __construct(PayPalApi $api, EE_Transaction $transaction, string $order_id)
-    {
-        parent::__construct($api);
-        $this->transaction   = $transaction;
-        $this->order_id      = $order_id;
-        $this->currency_code = CurrencyManager::currencyCode();
-        $this->request_url   = $this->request_url . $order_id . '/capture';
-    }
+	/**
+	 * CaptureOrder constructor.
+	 *
+	 * @param PayPalApi      $api
+	 * @param EE_Transaction $transaction
+	 * @param string         $order_id
+	 */
+	public function __construct(PayPalApi $api, EE_Transaction $transaction, string $order_id)
+	{
+		parent::__construct($api);
+		$this->transaction   = $transaction;
+		$this->order_id      = $order_id;
+		$this->currency_code = CurrencyManager::currencyCode();
+		$this->request_url   = $this->request_url . $order_id . '/capture';
+	}
 
 
-    /**
-     * Capture payment for PayPal Order.
-     *
-     * @return array
-     */
-    public function capture(): array
-    {
-        // Create Order request.
-        $capture_response = $this->api->sendRequest([], $this->request_url);
-        return $this->validateOrder($capture_response);
-    }
+	/**
+	 * Capture payment for PayPal Order.
+	 *
+	 * @return array
+	 */
+	public function capture(): array
+	{
+		// Create Order request.
+		$capture_response = $this->api->sendRequest([], $this->request_url);
+		return $this->validateOrder($capture_response);
+	}
 
 
-    /**
-     * Makes sure that we have received an Order back from the API call.
-     *
-     * @param $response
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function validateOrder($response): array
-    {
-        $message = esc_html__('Validating Order Capture:', 'event_espresso');
-        PayPalLogger::errorLog(
-            $message,
-            [$this->request_url,  $response],
-            $this->transaction->payment_method(),
-            false,
-            $this->transaction
-        );
-        // We got a direct error response. Not valid. Return that error.
-        if (! empty($response['error'])) {
-            return $response;
-        }
-        // This also could be a retry capture, so consider this valid, if order already captured.
-        if (! empty($response['message']['details']['issue'])
-            && $response['message']['details']['issue'] === 'ORDER_ALREADY_CAPTURED'
-        ) {
-            // Need to make sure we pass on the order ID.
-            if (empty($response['id'])) {
-                $response['id'] = $this->order_id;
-            }
-            $response['status'] = 'ORDER_ALREADY_CAPTURED';
-            return $response;
-        }
-        // A success capture should return the order ID.
-        if (! isset($response['id'])) {
-            $message = esc_html__('Unexpected response. No order returned.', 'event_espresso');
-            try {
-                PayPalLogger::errorLog($message, [$this->request_url, $response], $this->transaction->payment_method());
-            } catch (EE_Error | ReflectionException $e) {
-                // Just continue.
-            }
-            return [
-                'error'   => $response['error'] ?? 'missing_order',
-                'message' => $response['message'] ?? $message,
-                'name'    => $response['name'] ?? 'UNKNOWN_ERROR',
-            ];
-        }
-        return $response;
-    }
+	/**
+	 * Makes sure that we have received an Order back from the API call.
+	 *
+	 * @param $response
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function validateOrder($response): array
+	{
+		$message = esc_html__('Validating Order Capture:', 'event_espresso');
+		PayPalLogger::errorLog(
+			$message,
+			[$this->request_url,  $response],
+			$this->transaction->payment_method(),
+			false,
+			$this->transaction
+		);
+		// We got a direct error response. Not valid. Return that error.
+		if (! empty($response['error'])) {
+			return $response;
+		}
+		// This also could be a retry capture, so consider this valid, if order already captured.
+		if (! empty($response['message']['details']['issue'])
+			&& $response['message']['details']['issue'] === 'ORDER_ALREADY_CAPTURED'
+		) {
+			// Need to make sure we pass on the order ID.
+			if (empty($response['id'])) {
+				$response['id'] = $this->order_id;
+			}
+			$response['status'] = 'ORDER_ALREADY_CAPTURED';
+			return $response;
+		}
+		// A success capture should return the order ID.
+		if (! isset($response['id'])) {
+			$message = esc_html__('Unexpected response. No order returned.', 'event_espresso');
+			try {
+				PayPalLogger::errorLog($message, [$this->request_url, $response], $this->transaction->payment_method());
+			} catch (EE_Error | ReflectionException $e) {
+				// Just continue.
+			}
+			return [
+				'error'   => $response['error'] ?? 'missing_order',
+				'message' => $response['message'] ?? $message,
+				'name'    => $response['name'] ?? 'UNKNOWN_ERROR',
+			];
+		}
+		return $response;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -48,7 +48,7 @@ 
         $this->transaction   = $transaction;
         $this->order_id      = $order_id;
         $this->currency_code = CurrencyManager::currencyCode();
-        $this->request_url   = $this->request_url . $order_id . '/capture';
+        $this->request_url   = $this->request_url.$order_id.'/capture';
     }
 
 
@@ -78,17 +78,17 @@ 
         $message = esc_html__('Validating Order Capture:', 'event_espresso');
         PayPalLogger::errorLog(
             $message,
-            [$this->request_url,  $response],
+            [$this->request_url, $response],
             $this->transaction->payment_method(),
             false,
             $this->transaction
         );
         // We got a direct error response. Not valid. Return that error.
-        if (! empty($response['error'])) {
+        if ( ! empty($response['error'])) {
             return $response;
         }
         // This also could be a retry capture, so consider this valid, if order already captured.
-        if (! empty($response['message']['details']['issue'])
+        if ( ! empty($response['message']['details']['issue'])
             && $response['message']['details']['issue'] === 'ORDER_ALREADY_CAPTURED'
         ) {
             // Need to make sure we pass on the order ID.
@@ -99,7 +99,7 @@ 
             return $response;
         }
         // A success capture should return the order ID.
-        if (! isset($response['id'])) {
+        if ( ! isset($response['id'])) {
             $message = esc_html__('Unexpected response. No order returned.', 'event_espresso');
             try {
                 PayPalLogger::errorLog($message, [$this->request_url, $response], $this->transaction->payment_method());

PaymentMethods/PayPalCommerce/tools/extra_meta/PayPalExtraMeta.php

Indentation +158 added lines, -158 removed lines

@@ -18,162 +18,162 @@
  */
 class PayPalExtraMeta
 {
-    /**
-     * Payment method instance.
-     *
-     * @var EE_Payment_Method
-     */
-    public $pm;
-
-    /**
-     * Metadata key.
-     *
-     * @var EE_Payment_Method
-     */
-    public $metadata_key;
-
-
-    /**
-     * Class constructor.
-     *
-     * @param EE_Payment_Method $pm_instance
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function __construct(EE_Payment_Method $pm_instance)
-    {
-        $this->pm           = $pm_instance;
-        $this->metadata_key = $pm_instance->debug_mode()
-            ? Domain::META_KEY_PAYPAL_DATA_SANDBOX
-            : Domain::META_KEY_PAYPAL_DATA;
-    }
-
-
-    /**
-     * Save/update the provided data to the PM extra meta.
-     *
-     * @param array $data
-     * @return bool
-     */
-    public function saveBatch(array $data): bool
-    {
-        // Update the PM data.
-        try {
-            $paypal_data  = $this->pm->get_extra_meta($this->metadata_key, true, []);
-            $data_to_save = array_replace_recursive($paypal_data, $data);
-            $this->saveMetaData($data_to_save);
-        } catch (Exception $e) {
-            $err_msg = sprintf(
-                esc_html__('Could not save merchant data. %1$s', 'event_espresso'),
-                $e->getMessage()
-            );
-            PayPalLogger::errorLog($err_msg, $data, $this->pm);
-            return false;
-        }
-        return true;
-    }
-
-
-    /**
-     * Get PM extra meta by meta name/option.
-     *
-     * @param string $option_name
-     * @return mixed
-     */
-    public function getOption(string $option_name)
-    {
-        $meta_data = $this->getMetaData();
-        return $meta_data[ $option_name ] ?? false;
-    }
-
-
-    /**
-     * Get PM metadata.
-     * Return the metadata array if all good. False otherwise.
-     *
-     * @return array
-     */
-    public function getMetaData(): array
-    {
-        try {
-            return $this->pm->get_extra_meta($this->metadata_key, true, []);
-        } catch (EE_Error | ReflectionException $e) {
-            $err_msg = sprintf(
-                esc_html__('Error getting the PM meta data: %1$s', 'event_espresso'),
-                $e->getMessage()
-            );
-            PayPalLogger::errorLog($err_msg, [], $this->pm);
-            return [];
-        }
-    }
-
-
-    /**
-     * Save/update the provided option to the PM extra meta.
-     *
-     * @param string $name
-     * @param        $value
-     * @return bool
-     */
-    public function saveOption(string $name, $value): bool
-    {
-        $meta_data = $this->getMetaData();
-        if (! $meta_data) {
-            $meta_data = [];
-        }
-        $meta_data[ $name ] = $value;
-        return $this->saveMetaData($meta_data);
-    }
-
-
-    /**
-     * Save/update the PM extra meta.
-     *
-     * @param array $data
-     * @return bool
-     */
-    public function saveMetaData(array $data): bool
-    {
-        try {
-            $this->pm->update_extra_meta($this->metadata_key, $data);
-        } catch (Exception $e) {
-            return false;
-        }
-        return true;
-    }
-
-
-    /**
-     * Delete PM option.
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function deleteOption(string $name): bool
-    {
-        $meta_data = $this->getMetaData();
-        if (! $meta_data) {
-            return false;
-        }
-        unset($meta_data[ $name ]);
-        return $this->saveMetaData($meta_data);
-    }
-
-
-    /**
-     * Delete the PM extra meta.
-     *
-     * @return bool
-     */
-    public function deleteMetaData(): bool
-    {
-        try {
-            // Live and sandbox data.
-            $this->pm->delete_extra_meta(Domain::META_KEY_PAYPAL_DATA);
-            $this->pm->delete_extra_meta(Domain::META_KEY_PAYPAL_DATA_SANDBOX);
-        } catch (Exception $e) {
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * Payment method instance.
+	 *
+	 * @var EE_Payment_Method
+	 */
+	public $pm;
+
+	/**
+	 * Metadata key.
+	 *
+	 * @var EE_Payment_Method
+	 */
+	public $metadata_key;
+
+
+	/**
+	 * Class constructor.
+	 *
+	 * @param EE_Payment_Method $pm_instance
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function __construct(EE_Payment_Method $pm_instance)
+	{
+		$this->pm           = $pm_instance;
+		$this->metadata_key = $pm_instance->debug_mode()
+			? Domain::META_KEY_PAYPAL_DATA_SANDBOX
+			: Domain::META_KEY_PAYPAL_DATA;
+	}
+
+
+	/**
+	 * Save/update the provided data to the PM extra meta.
+	 *
+	 * @param array $data
+	 * @return bool
+	 */
+	public function saveBatch(array $data): bool
+	{
+		// Update the PM data.
+		try {
+			$paypal_data  = $this->pm->get_extra_meta($this->metadata_key, true, []);
+			$data_to_save = array_replace_recursive($paypal_data, $data);
+			$this->saveMetaData($data_to_save);
+		} catch (Exception $e) {
+			$err_msg = sprintf(
+				esc_html__('Could not save merchant data. %1$s', 'event_espresso'),
+				$e->getMessage()
+			);
+			PayPalLogger::errorLog($err_msg, $data, $this->pm);
+			return false;
+		}
+		return true;
+	}
+
+
+	/**
+	 * Get PM extra meta by meta name/option.
+	 *
+	 * @param string $option_name
+	 * @return mixed
+	 */
+	public function getOption(string $option_name)
+	{
+		$meta_data = $this->getMetaData();
+		return $meta_data[ $option_name ] ?? false;
+	}
+
+
+	/**
+	 * Get PM metadata.
+	 * Return the metadata array if all good. False otherwise.
+	 *
+	 * @return array
+	 */
+	public function getMetaData(): array
+	{
+		try {
+			return $this->pm->get_extra_meta($this->metadata_key, true, []);
+		} catch (EE_Error | ReflectionException $e) {
+			$err_msg = sprintf(
+				esc_html__('Error getting the PM meta data: %1$s', 'event_espresso'),
+				$e->getMessage()
+			);
+			PayPalLogger::errorLog($err_msg, [], $this->pm);
+			return [];
+		}
+	}
+
+
+	/**
+	 * Save/update the provided option to the PM extra meta.
+	 *
+	 * @param string $name
+	 * @param        $value
+	 * @return bool
+	 */
+	public function saveOption(string $name, $value): bool
+	{
+		$meta_data = $this->getMetaData();
+		if (! $meta_data) {
+			$meta_data = [];
+		}
+		$meta_data[ $name ] = $value;
+		return $this->saveMetaData($meta_data);
+	}
+
+
+	/**
+	 * Save/update the PM extra meta.
+	 *
+	 * @param array $data
+	 * @return bool
+	 */
+	public function saveMetaData(array $data): bool
+	{
+		try {
+			$this->pm->update_extra_meta($this->metadata_key, $data);
+		} catch (Exception $e) {
+			return false;
+		}
+		return true;
+	}
+
+
+	/**
+	 * Delete PM option.
+	 *
+	 * @param string $name
+	 * @return bool
+	 */
+	public function deleteOption(string $name): bool
+	{
+		$meta_data = $this->getMetaData();
+		if (! $meta_data) {
+			return false;
+		}
+		unset($meta_data[ $name ]);
+		return $this->saveMetaData($meta_data);
+	}
+
+
+	/**
+	 * Delete the PM extra meta.
+	 *
+	 * @return bool
+	 */
+	public function deleteMetaData(): bool
+	{
+		try {
+			// Live and sandbox data.
+			$this->pm->delete_extra_meta(Domain::META_KEY_PAYPAL_DATA);
+			$this->pm->delete_extra_meta(Domain::META_KEY_PAYPAL_DATA_SANDBOX);
+		} catch (Exception $e) {
+			return false;
+		}
+		return true;
+	}
 }

PaymentMethods/PayPalCommerce/tools/extra_meta/PayPalExtraMetaManager.php

Indentation +266 added lines, -266 removed lines

@@ -22,294 +22,294 @@
  */
 class PayPalExtraMetaManager
 {
-    /**
-     * Get payment method option/extra meta
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @param string            $option_name
-     * @return mixed
-     */
-    public static function getPmOption(EE_Payment_Method $paypal_pm, string $option_name)
-    {
-        $pp_meta_data = self::extraMeta($paypal_pm);
-        $option_value = $pp_meta_data->getOption($option_name);
-        // Decrypt the encrypted options.
-        if (
-            $option_name === Domain::META_KEY_ACCESS_TOKEN
-            || $option_name === Domain::META_KEY_PARTNER_MERCHANT_ID
-            || $option_name === Domain::META_KEY_CLIENT_SECRET
-        ) {
-            $option_value = self::decryptString($option_value, $paypal_pm);
-        }
-        return $option_value;
-    }
+	/**
+	 * Get payment method option/extra meta
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @param string            $option_name
+	 * @return mixed
+	 */
+	public static function getPmOption(EE_Payment_Method $paypal_pm, string $option_name)
+	{
+		$pp_meta_data = self::extraMeta($paypal_pm);
+		$option_value = $pp_meta_data->getOption($option_name);
+		// Decrypt the encrypted options.
+		if (
+			$option_name === Domain::META_KEY_ACCESS_TOKEN
+			|| $option_name === Domain::META_KEY_PARTNER_MERCHANT_ID
+			|| $option_name === Domain::META_KEY_CLIENT_SECRET
+		) {
+			$option_value = self::decryptString($option_value, $paypal_pm);
+		}
+		return $option_value;
+	}
 
 
-    /**
-     * Save payment method option/extra meta
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @param string            $option_name
-     * @param                   $option_value
-     * @return bool
-     */
-    public static function savePmOption(EE_Payment_Method $paypal_pm, string $option_name, $option_value): bool
-    {
-        $pp_meta_data = self::extraMeta($paypal_pm);
-        return $pp_meta_data->saveOption($option_name, $option_value);
-    }
+	/**
+	 * Save payment method option/extra meta
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @param string            $option_name
+	 * @param                   $option_value
+	 * @return bool
+	 */
+	public static function savePmOption(EE_Payment_Method $paypal_pm, string $option_name, $option_value): bool
+	{
+		$pp_meta_data = self::extraMeta($paypal_pm);
+		return $pp_meta_data->saveOption($option_name, $option_value);
+	}
 
 
-    /**
-     * Save a list of payment method options/extra meta.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @param array             $options_list
-     * @return bool
-     */
-    public static function savePmOptions(EE_Payment_Method $paypal_pm, array $options_list): bool
-    {
-        $pp_meta_data = self::extraMeta($paypal_pm);
-        return $pp_meta_data->saveBatch($options_list);
-    }
+	/**
+	 * Save a list of payment method options/extra meta.
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @param array             $options_list
+	 * @return bool
+	 */
+	public static function savePmOptions(EE_Payment_Method $paypal_pm, array $options_list): bool
+	{
+		$pp_meta_data = self::extraMeta($paypal_pm);
+		return $pp_meta_data->saveBatch($options_list);
+	}
 
 
-    /**
-     * Delete payment method option/extra meta
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @param string            $option_name
-     * @return bool
-     */
-    public static function deletePmOption(EE_Payment_Method $paypal_pm, string $option_name): bool
-        {
-        $pp_meta_data = self::extraMeta($paypal_pm);
-        return $pp_meta_data->deleteOption($option_name);
-    }
+	/**
+	 * Delete payment method option/extra meta
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @param string            $option_name
+	 * @return bool
+	 */
+	public static function deletePmOption(EE_Payment_Method $paypal_pm, string $option_name): bool
+		{
+		$pp_meta_data = self::extraMeta($paypal_pm);
+		return $pp_meta_data->deleteOption($option_name);
+	}
 
 
-    /**
-     * Get all options for payment method.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @return array|bool
-     */
-    public static function getAllData(EE_Payment_Method $paypal_pm)
-    {
-        $pp_meta_data = self::extraMeta($paypal_pm);
-        return $pp_meta_data->getMetaData();
-    }
+	/**
+	 * Get all options for payment method.
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @return array|bool
+	 */
+	public static function getAllData(EE_Payment_Method $paypal_pm)
+	{
+		$pp_meta_data = self::extraMeta($paypal_pm);
+		return $pp_meta_data->getMetaData();
+	}
 
 
-    /**
-     * Delete all options for this payment method.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @return bool
-     */
-    public static function deleteAllData(EE_Payment_Method $paypal_pm): bool
-    {
-        $pp_meta_data = self::extraMeta($paypal_pm);
-        return $pp_meta_data->deleteMetaData();
-    }
+	/**
+	 * Delete all options for this payment method.
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @return bool
+	 */
+	public static function deleteAllData(EE_Payment_Method $paypal_pm): bool
+	{
+		$pp_meta_data = self::extraMeta($paypal_pm);
+		return $pp_meta_data->deleteMetaData();
+	}
 
 
-    /**
-     * Save the debug mode option if it changed.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @param array             $request_data
-     * @return bool             Updated or not.
-     */
-    public static function updateDebugMode(EE_Payment_Method $paypal_pm, array $request_data): bool
-    {
-        if (
-            isset($request_data['sandbox_mode'])
-            && in_array($request_data['sandbox_mode'], ['0', '1'], true)
-            && $paypal_pm->debug_mode() !== (bool) $request_data['sandbox_mode']
-        ) {
-            try {
-                $paypal_pm->save(['PMD_debug_mode' => (bool) $request_data['sandbox_mode']]);
-            } catch (EE_Error $e) {
-                $err_msg = sprintf(
-                    esc_html__('Note, debug mode not saved ! %1$s', 'event_espresso'),
-                    $e->getMessage()
-                );
-                PayPalLogger::errorLog($err_msg, $request_data, $paypal_pm);
-                return false;
-            }
-             return true;
-        }
-        return false;
-    }
+	/**
+	 * Save the debug mode option if it changed.
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @param array             $request_data
+	 * @return bool             Updated or not.
+	 */
+	public static function updateDebugMode(EE_Payment_Method $paypal_pm, array $request_data): bool
+	{
+		if (
+			isset($request_data['sandbox_mode'])
+			&& in_array($request_data['sandbox_mode'], ['0', '1'], true)
+			&& $paypal_pm->debug_mode() !== (bool) $request_data['sandbox_mode']
+		) {
+			try {
+				$paypal_pm->save(['PMD_debug_mode' => (bool) $request_data['sandbox_mode']]);
+			} catch (EE_Error $e) {
+				$err_msg = sprintf(
+					esc_html__('Note, debug mode not saved ! %1$s', 'event_espresso'),
+					$e->getMessage()
+				);
+				PayPalLogger::errorLog($err_msg, $request_data, $paypal_pm);
+				return false;
+			}
+			 return true;
+		}
+		return false;
+	}
 
 
-    /**
-     * Save partner access token and parameters.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @param array             $response
-     * @return bool
-     */
-    public static function savePartnerAccessToken(EE_Payment_Method $paypal_pm, array $response): bool
-    {
-        $paypal_data         = [];
-        $expected_parameters = [
-            Domain::META_KEY_ACCESS_TOKEN,
-            Domain::META_KEY_TOKEN_EXPIRES_IN,
-            Domain::META_KEY_APP_ID,
-            Domain::META_KEY_PARTNER_CLIENT_ID,
-            Domain::META_KEY_PARTNER_MERCHANT_ID,
-            Domain::META_KEY_BN_CODE,
-        ];
-        foreach ($expected_parameters as $api_key) {
-            if (! isset($response[ $api_key ])) {
-                // Don't want to try saving data that doesn't exist.
-                continue;
-            }
-            try {
-                switch ($api_key) {
-                    case Domain::META_KEY_ACCESS_TOKEN:
-                    case Domain::META_KEY_PARTNER_MERCHANT_ID:
-                        $paypal_data[ $api_key ] = self::encryptString($response[ $api_key ], $paypal_pm);
-                        break;
-                    case Domain::META_KEY_TOKEN_EXPIRES_IN:
-                        $paypal_data[ $api_key ] = time() + (int) sanitize_key($response[ $api_key ]);
-                        break;
-                    default:
-                        $paypal_data[ $api_key ] = sanitize_text_field($response[ $api_key ]);
-                }
-            } catch (Exception $exception) {
-                PayPalLogger::errorLog($exception->getMessage(), $response, $paypal_pm);
-                return false;
-            }
-        }
-        return self::savePmOptions($paypal_pm, $paypal_data);
-    }
+	/**
+	 * Save partner access token and parameters.
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @param array             $response
+	 * @return bool
+	 */
+	public static function savePartnerAccessToken(EE_Payment_Method $paypal_pm, array $response): bool
+	{
+		$paypal_data         = [];
+		$expected_parameters = [
+			Domain::META_KEY_ACCESS_TOKEN,
+			Domain::META_KEY_TOKEN_EXPIRES_IN,
+			Domain::META_KEY_APP_ID,
+			Domain::META_KEY_PARTNER_CLIENT_ID,
+			Domain::META_KEY_PARTNER_MERCHANT_ID,
+			Domain::META_KEY_BN_CODE,
+		];
+		foreach ($expected_parameters as $api_key) {
+			if (! isset($response[ $api_key ])) {
+				// Don't want to try saving data that doesn't exist.
+				continue;
+			}
+			try {
+				switch ($api_key) {
+					case Domain::META_KEY_ACCESS_TOKEN:
+					case Domain::META_KEY_PARTNER_MERCHANT_ID:
+						$paypal_data[ $api_key ] = self::encryptString($response[ $api_key ], $paypal_pm);
+						break;
+					case Domain::META_KEY_TOKEN_EXPIRES_IN:
+						$paypal_data[ $api_key ] = time() + (int) sanitize_key($response[ $api_key ]);
+						break;
+					default:
+						$paypal_data[ $api_key ] = sanitize_text_field($response[ $api_key ]);
+				}
+			} catch (Exception $exception) {
+				PayPalLogger::errorLog($exception->getMessage(), $response, $paypal_pm);
+				return false;
+			}
+		}
+		return self::savePmOptions($paypal_pm, $paypal_data);
+	}
 
 
-    /**
-     * Save merchant/seller API credentials.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @param array             $response
-     * @return bool
-     */
-    public static function saveSellerApiCredentials(EE_Payment_Method $paypal_pm, array $response): bool
-    {
-        $api_credentials     = [];
-        $expected_parameters = [
-            Domain::META_KEY_SELLER_MERCHANT_ID,
-        ];
-        foreach ($expected_parameters as $api_key) {
-            if (! isset($response[ $api_key ])) {
-                // Don't want to try saving data that doesn't exist.
-                continue;
-            }
-            $api_credentials[ $api_key ] = $response[ $api_key ];
-        }
-        return self::savePmOptions($paypal_pm, $api_credentials);
-    }
+	/**
+	 * Save merchant/seller API credentials.
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @param array             $response
+	 * @return bool
+	 */
+	public static function saveSellerApiCredentials(EE_Payment_Method $paypal_pm, array $response): bool
+	{
+		$api_credentials     = [];
+		$expected_parameters = [
+			Domain::META_KEY_SELLER_MERCHANT_ID,
+		];
+		foreach ($expected_parameters as $api_key) {
+			if (! isset($response[ $api_key ])) {
+				// Don't want to try saving data that doesn't exist.
+				continue;
+			}
+			$api_credentials[ $api_key ] = $response[ $api_key ];
+		}
+		return self::savePmOptions($paypal_pm, $api_credentials);
+	}
 
 
-    /**
-     * Save other payment method related settings from a data array.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @param array             $data
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function parseAndSaveOptions(EE_Payment_Method $paypal_pm, array $data): bool
-    {
-        $allowed_checkout_type = 'express_checkout';
-        // Note, although PayPal shows that this should include PPCP_CUSTOM or EXPRESS_CHECKOUT only,
-        // in reality, it will also include other products like MOBILE_PAYMENT_ACCEPTANCE etc.
-        if (! empty($data['response']['products'][0]['name']) && is_array($data['response']['products'])) {
-            foreach ($data['response']['products'] as $product) {
-                if (str_contains($product['name'], 'PPCP')) {
-                    // This merchant has PPCP in the products list, so we can enable both (all) checkout types.
-                    $allowed_checkout_type = 'all';
-                    break;
-                }
-            }
-        }
-        // Set the Checkout type (a PM option), just in case merchant doesn't save PM options manually.
-        $checkout_type = $paypal_pm->get_extra_meta(Domain::META_KEY_CHECKOUT_TYPE, true, false);
-        if (! $checkout_type) {
-            $paypal_pm->update_extra_meta(Domain::META_KEY_CHECKOUT_TYPE, $allowed_checkout_type);
-        }
-        return PayPalExtraMetaManager::savePmOption(
-            $paypal_pm,
-            Domain::META_KEY_ALLOWED_CHECKOUT_TYPE,
-            $allowed_checkout_type
-        );
-    }
+	/**
+	 * Save other payment method related settings from a data array.
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @param array             $data
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function parseAndSaveOptions(EE_Payment_Method $paypal_pm, array $data): bool
+	{
+		$allowed_checkout_type = 'express_checkout';
+		// Note, although PayPal shows that this should include PPCP_CUSTOM or EXPRESS_CHECKOUT only,
+		// in reality, it will also include other products like MOBILE_PAYMENT_ACCEPTANCE etc.
+		if (! empty($data['response']['products'][0]['name']) && is_array($data['response']['products'])) {
+			foreach ($data['response']['products'] as $product) {
+				if (str_contains($product['name'], 'PPCP')) {
+					// This merchant has PPCP in the products list, so we can enable both (all) checkout types.
+					$allowed_checkout_type = 'all';
+					break;
+				}
+			}
+		}
+		// Set the Checkout type (a PM option), just in case merchant doesn't save PM options manually.
+		$checkout_type = $paypal_pm->get_extra_meta(Domain::META_KEY_CHECKOUT_TYPE, true, false);
+		if (! $checkout_type) {
+			$paypal_pm->update_extra_meta(Domain::META_KEY_CHECKOUT_TYPE, $allowed_checkout_type);
+		}
+		return PayPalExtraMetaManager::savePmOption(
+			$paypal_pm,
+			Domain::META_KEY_ALLOWED_CHECKOUT_TYPE,
+			$allowed_checkout_type
+		);
+	}
 
 
-    /**
-     * Get PayPal extra meta helper.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @return PayPalExtraMeta
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function extraMeta(EE_Payment_Method $paypal_pm): PayPalExtraMeta
-    {
-        return new PayPalExtraMeta($paypal_pm);
-    }
+	/**
+	 * Get PayPal extra meta helper.
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @return PayPalExtraMeta
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function extraMeta(EE_Payment_Method $paypal_pm): PayPalExtraMeta
+	{
+		return new PayPalExtraMeta($paypal_pm);
+	}
 
 
-    /**
-     * Encrypt a text field.
-     *
-     * @param string            $text
-     * @param EE_Payment_Method $paypal_pm
-     * @return string|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function encryptString(string $text, EE_Payment_Method $paypal_pm): ?string
-    {
-        // We sure we are getting something ?
-        if (! $text) {
-            return $text;
-        }
-        // Do encrypt.
-        $encryptor      = LoaderFactory::getLoader()->getShared(OpenSSLEncryption::class, [new Base64Encoder()]);
-        $sanitized_text = sanitize_text_field($text);
-        $key_identifier = $paypal_pm->debug_mode()
-            ? PPCommerceEncryptionKeyManager::SANDBOX_ENCRYPTION_KEY_ID
-            : PPCommerceEncryptionKeyManager::PRODUCTION_ENCRYPTION_KEY_ID;
-        return $encryptor->encrypt($sanitized_text, $key_identifier);
-    }
+	/**
+	 * Encrypt a text field.
+	 *
+	 * @param string            $text
+	 * @param EE_Payment_Method $paypal_pm
+	 * @return string|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function encryptString(string $text, EE_Payment_Method $paypal_pm): ?string
+	{
+		// We sure we are getting something ?
+		if (! $text) {
+			return $text;
+		}
+		// Do encrypt.
+		$encryptor      = LoaderFactory::getLoader()->getShared(OpenSSLEncryption::class, [new Base64Encoder()]);
+		$sanitized_text = sanitize_text_field($text);
+		$key_identifier = $paypal_pm->debug_mode()
+			? PPCommerceEncryptionKeyManager::SANDBOX_ENCRYPTION_KEY_ID
+			: PPCommerceEncryptionKeyManager::PRODUCTION_ENCRYPTION_KEY_ID;
+		return $encryptor->encrypt($sanitized_text, $key_identifier);
+	}
 
 
-    /**
-     * Decrypt a string.
-     *
-     * @param string            $text
-     * @param EE_Payment_Method $paypal_pm
-     * @return string
-     */
-    public static function decryptString(string $text, EE_Payment_Method $paypal_pm): string
-    {
-        // Are we even getting something ?
-        if (! $text) {
-            return $text;
-        }
-        // Try decrypting.
-        try {
-            $encryptor      = LoaderFactory::getLoader()->getShared(OpenSSLEncryption::class, [new Base64Encoder()]);
-            $key_identifier = $paypal_pm->debug_mode()
-                ? PPCommerceEncryptionKeyManager::SANDBOX_ENCRYPTION_KEY_ID
-                : PPCommerceEncryptionKeyManager::PRODUCTION_ENCRYPTION_KEY_ID;
-            $decrypted      = $encryptor->decrypt($text, $key_identifier);
-        } catch (Exception $e) {
-            return $text;
-        }
-        return $decrypted ?? $text;
-    }
+	/**
+	 * Decrypt a string.
+	 *
+	 * @param string            $text
+	 * @param EE_Payment_Method $paypal_pm
+	 * @return string
+	 */
+	public static function decryptString(string $text, EE_Payment_Method $paypal_pm): string
+	{
+		// Are we even getting something ?
+		if (! $text) {
+			return $text;
+		}
+		// Try decrypting.
+		try {
+			$encryptor      = LoaderFactory::getLoader()->getShared(OpenSSLEncryption::class, [new Base64Encoder()]);
+			$key_identifier = $paypal_pm->debug_mode()
+				? PPCommerceEncryptionKeyManager::SANDBOX_ENCRYPTION_KEY_ID
+				: PPCommerceEncryptionKeyManager::PRODUCTION_ENCRYPTION_KEY_ID;
+			$decrypted      = $encryptor->decrypt($text, $key_identifier);
+		} catch (Exception $e) {
+			return $text;
+		}
+		return $decrypted ?? $text;
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -163,7 +163,7 @@ 
             Domain::META_KEY_BN_CODE,
         ];
         foreach ($expected_parameters as $api_key) {
-            if (! isset($response[ $api_key ])) {
+            if ( ! isset($response[$api_key])) {
                 // Don't want to try saving data that doesn't exist.
                 continue;
             }
@@ -171,13 +171,13 @@ 
                 switch ($api_key) {
                     case Domain::META_KEY_ACCESS_TOKEN:
                     case Domain::META_KEY_PARTNER_MERCHANT_ID:
-                        $paypal_data[ $api_key ] = self::encryptString($response[ $api_key ], $paypal_pm);
+                        $paypal_data[$api_key] = self::encryptString($response[$api_key], $paypal_pm);
                         break;
                     case Domain::META_KEY_TOKEN_EXPIRES_IN:
-                        $paypal_data[ $api_key ] = time() + (int) sanitize_key($response[ $api_key ]);
+                        $paypal_data[$api_key] = time() + (int) sanitize_key($response[$api_key]);
                         break;
                     default:
-                        $paypal_data[ $api_key ] = sanitize_text_field($response[ $api_key ]);
+                        $paypal_data[$api_key] = sanitize_text_field($response[$api_key]);
                 }
             } catch (Exception $exception) {
                 PayPalLogger::errorLog($exception->getMessage(), $response, $paypal_pm);
@@ -202,11 +202,11 @@ 
             Domain::META_KEY_SELLER_MERCHANT_ID,
         ];
         foreach ($expected_parameters as $api_key) {
-            if (! isset($response[ $api_key ])) {
+            if ( ! isset($response[$api_key])) {
                 // Don't want to try saving data that doesn't exist.
                 continue;
             }
-            $api_credentials[ $api_key ] = $response[ $api_key ];
+            $api_credentials[$api_key] = $response[$api_key];
         }
         return self::savePmOptions($paypal_pm, $api_credentials);
     }
@@ -226,7 +226,7 @@ 
         $allowed_checkout_type = 'express_checkout';
         // Note, although PayPal shows that this should include PPCP_CUSTOM or EXPRESS_CHECKOUT only,
         // in reality, it will also include other products like MOBILE_PAYMENT_ACCEPTANCE etc.
-        if (! empty($data['response']['products'][0]['name']) && is_array($data['response']['products'])) {
+        if ( ! empty($data['response']['products'][0]['name']) && is_array($data['response']['products'])) {
             foreach ($data['response']['products'] as $product) {
                 if (str_contains($product['name'], 'PPCP')) {
                     // This merchant has PPCP in the products list, so we can enable both (all) checkout types.
@@ -237,7 +237,7 @@ 
         }
         // Set the Checkout type (a PM option), just in case merchant doesn't save PM options manually.
         $checkout_type = $paypal_pm->get_extra_meta(Domain::META_KEY_CHECKOUT_TYPE, true, false);
-        if (! $checkout_type) {
+        if ( ! $checkout_type) {
             $paypal_pm->update_extra_meta(Domain::META_KEY_CHECKOUT_TYPE, $allowed_checkout_type);
         }
         return PayPalExtraMetaManager::savePmOption(
@@ -274,7 +274,7 @@ 
     public static function encryptString(string $text, EE_Payment_Method $paypal_pm): ?string
     {
         // We sure we are getting something ?
-        if (! $text) {
+        if ( ! $text) {
             return $text;
         }
         // Do encrypt.
@@ -297,7 +297,7 @@ 
     public static function decryptString(string $text, EE_Payment_Method $paypal_pm): string
     {
         // Are we even getting something ?
-        if (! $text) {
+        if ( ! $text) {
             return $text;
         }
         // Try decrypting.

PaymentMethods/PayPalCommerce/modules/EED_PayPalOnboard.module.php

Indentation +656 added lines, -656 removed lines

@@ -20,660 +20,660 @@
  */
 class EED_PayPalOnboard 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 Admin Core and other modules.
-     *
-     * @return void
-     */
-    public static function set_hooks_admin(): void
-    {
-        if (DbStatus::isOnline()) {
-            // Get onboarding URL.
-            add_action('wp_ajax_eeaPpGetOnboardingUrl', [__CLASS__, 'getOnboardingUrl']);
-            // Catch the return/redirect from PayPal onboarding page.
-            add_action('init', [__CLASS__, 'updateOnboardingStatus'], 10);
-            // Return the connection/onboard status.
-            add_action('wp_ajax_eeaPpGetOnboardStatus', [__CLASS__, 'getOnboardStatus']);
-            // Revoke access.
-            add_action('wp_ajax_eeaPpOffboard', [__CLASS__, 'offboard']);
-            // Admin notice.
-            add_action('admin_init', [__CLASS__, 'adminNotice']);
-        }
-    }
-
-
-    /**
-     * Get the onboarding URL.
-     * (AJAX)
-     *
-     * @return void
-     */
-    public static function getOnboardingUrl(): void
-    {
-        $signup_link = '';
-        try {
-            $paypal_pm = EED_PayPalCommerce::getPaymentMethod();
-            if (! $paypal_pm instanceof EE_Payment_Method) {
-                PayPalLogger::errorLogAndExit(
-                    esc_html__('No payment method.', 'event_espresso'),
-                    EED_Module::getRequest()->postParams(),
-                    $paypal_pm
-                );
-            }
-            PayPalExtraMetaManager::updateDebugMode($paypal_pm, EED_Module::getRequest()->postParams());
-            // $signup_link   = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_ONBOARDING_URL);
-            // $token_expired = EED_PayPalOnboard::partnerAccessTokenExpired($paypal_pm);
-            // if (! $signup_link || $token_expired) {
-            $signup_link = EED_PayPalOnboard::requestOnboardingUrl($paypal_pm);
-            // }
-            if (! $signup_link) {
-                $err_msg = esc_html__('Error! Could not generate a sign-up link.', 'event_espresso');
-                PayPalLogger::errorLogAndExit($err_msg, ['signup_link' => $signup_link], $paypal_pm);
-            }
-            PayPalExtraMetaManager::savePmOption($paypal_pm, Domain::META_KEY_ONBOARDING_URL, $signup_link);
-        } catch (Exception $exception) {
-            PayPalLogger::errorLogAndExit($exception->getMessage());
-        }
-        // Is it empty (can happen if we didn't get the URL through the API).
-        $signup_link = $signup_link ? $signup_link . '?&displayMode=minibrowser' : '#';
-        wp_send_json(
-            [
-                'signup_link' => $signup_link,
-            ]
-        );
-    }
-
-
-    /**
-     * Request the sign-up link from PayPal.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @param bool              $one_time_request
-     * @return string
-     * @throws EE_Error
-     * @throws Exception
-     */
-    public static function requestOnboardingUrl(EE_Payment_Method $paypal_pm, bool $one_time_request = false): string
-    {
-        $signup_link = '';
-        // Get the access token.
-        $access_token = EED_PayPalOnboard::getPartnerAccessToken($paypal_pm);
-        if (! $access_token) {
-            $err_msg = esc_html__('Error! No access token.', 'event_espresso');
-            PayPalLogger::errorLog($err_msg, ['access_token' => $access_token], $paypal_pm);
-            return '';
-        }
-        // Request the access token.
-        $body_params = EED_PayPalOnboard::signupLinkRequestBody($paypal_pm);
-        $bn_code     = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_BN_CODE);
-        $post_params = [
-            'method'  => 'POST',
-            'headers' => [
-                'User-Agent'                    => sanitize_text_field($_SERVER['HTTP_USER_AGENT']),
-                'Content-Type'                  => 'application/json',
-                'Authorization'                 => 'Bearer ' . $access_token,
-                'PayPal-Partner-Attribution-Id' => $bn_code,
-            ],
-            'body'    => $body_params,
-        ];
-        $request_url = Domain::getPayPalApiUrl($paypal_pm) . '/v2/customer/partner-referrals';
-        $response    = EED_PayPalOnboard::sendRequest($paypal_pm, $request_url, $post_params);
-        // Check the data we received.
-        if (isset($response['error']) || empty($response['links'])) {
-            // Did the original access token get replaced by any chance ?
-            if (! $one_time_request
-                && ! empty($response['message'])
-                && $response['message'] === 'Access Token not found in cache'
-            ) {
-                // Clear all PM metadata and try getting the access token One more time.
-                PayPalExtraMetaManager::deleteAllData($paypal_pm);
-                return EED_PayPalOnboard::requestOnboardingUrl($paypal_pm, true);
-            }
-            $err_msg = esc_html__('Incoming sign-up link parameter validation failed.', 'event_espresso');
-            PayPalLogger::errorLog($err_msg, $response, $paypal_pm);
-            return '';
-        }
-        // Now retrieve that sign-up link.
-        foreach ($response['links'] as $link) {
-            if ($link['rel'] === 'action_url') {
-                $signup_link = $link['href'] ?? '';
-            }
-        }
-        return $signup_link;
-    }
-
-
-    /**
-     * Get the return URL.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @return string
-     * @throws Exception
-     */
-    public static function signupLinkRequestBody(EE_Payment_Method $paypal_pm): string
-    {
-        $identifier_string = new OneTimeString($paypal_pm->debug_mode());
-        $tracking_id       = $identifier_string->value();
-        $request           = LoaderFactory::getLoader()->getShared(RequestInterface::class);
-        $checkout_type     = $request->getRequestParam('checkout_type', 'EXPRESS_CHECKOUT', DataType::STRING);
-        // Save the identifier for future use.
-        PayPalExtraMetaManager::savePmOption($paypal_pm, Domain::META_KEY_TRACKING_ID, $tracking_id);
-        // Assemble the return URL.
-        $return_url = EED_PayPalOnboard::getReturnUrl($paypal_pm);
-        return json_encode([
-            'tracking_id'             => $tracking_id,
-            'operations'              => [
-                [
-                    'operation'                  => 'API_INTEGRATION',
-                    'api_integration_preference' => [
-                        'rest_api_integration' => [
-                            'integration_method'  => 'PAYPAL',
-                            'integration_type'    => 'THIRD_PARTY',
-                            'third_party_details' => [
-                                'features' => ['PAYMENT', 'REFUND'],
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-            'products'                => [$checkout_type],
-            'legal_consents'          => [
-                [
-                    'type'    => 'SHARE_DATA_CONSENT',
-                    'granted' => true,
-                ],
-            ],
-            'partner_config_override' => [
-                'return_url' => $return_url,
-            ],
-        ]);
-    }
-
-
-    /**
-     * Get the return URL.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function getReturnUrl(EE_Payment_Method $paypal_pm): string
-    {
-        $wp_nonce = EED_Module::getRequest()->getRequestParam('wp_nonce');
-        $nonce    = wp_create_nonce(Domain::NONCE_NAME_ONBOARDING_RETURN);
-        return add_query_arg(
-            [
-                'page'                        => 'espresso_payment_settings',
-                'webhook_action'              => 'eepPpcMerchantOnboard',
-                'payment_method'              => $paypal_pm->slug(),
-                '_wpnonce'                    => $wp_nonce,
-                'nonce'                       => $nonce,
-                Domain::META_KEY_SANDBOX_MODE => $paypal_pm->debug_mode() ? '1' : '0',
-            ],
-            admin_url('admin.php')
-        );
-    }
-
-
-    /**
-     * Redirect to the payment method (PP) settings home page.
-     *
-     * @return void
-     */
-    public static function redirectToPmSettingsHome(): void
-    {
-        $get_params = EED_Module::getRequest()->getParams();
-        if (empty($get_params['payment_method'])) {
-            // Simply do not redirect.
-            return;
-        }
-        $args_to_add = [
-            'page'           => 'espresso_payment_settings',
-            'payment_method' => $get_params['payment_method'],
-        ];
-        if (isset($get_params['sandbox_mode'])) {
-            $args_to_add[ Domain::META_KEY_SANDBOX_MODE ] = $get_params['sandbox_mode'];
-        }
-        $home_url = add_query_arg($args_to_add, admin_url('admin.php'));
-        wp_redirect($home_url);
-        exit;
-    }
-
-
-    /**
-     * Check user’s onboarding status.
-     * This will handle the user return from the auth page and also check the status via the API.
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function updateOnboardingStatus(): void
-    {
-        // Check if this is the webhook from PayPal.
-        if (! isset($_GET['webhook_action'], $_GET['nonce'])
-            || $_GET['webhook_action'] !== 'eepPpcMerchantOnboard'
-        ) {
-            return;  // Ignore.
-        }
-        $get_params = EED_Module::getRequest()->getParams();
-        // Get the payment method.
-        $paypal_pm = EED_PayPalCommerce::getPaymentMethod();
-        // Check the response (GET) parameters.
-        if (! EED_PayPalOnboard::onboardingStatusResponseValid($get_params, $paypal_pm)) {
-            // Missing parameters. Can't proceed.
-            PayPalLogger::errorLog(
-                esc_html__('Missing required onboarding parameters.', 'event_espresso'),
-                $get_params,
-                $paypal_pm
-            );
-            EED_PayPalOnboard::redirectToPmSettingsHome();
-            return;
-        }
-        // Check on the onboarding status (recommended by PP).
-        $onboarding_status = EED_PayPalOnboard::trackSellerOnboarding(
-            $paypal_pm,
-            $get_params[ Domain::META_KEY_SELLER_MERCHANT_ID ]
-        );
-        if (! isset($onboarding_status['valid']) || ! $onboarding_status['valid']) {
-            PayPalLogger::errorLog(
-                $onboarding_status['message'],
-                array_merge($get_params, $onboarding_status),
-                $paypal_pm
-            );
-            EED_PayPalOnboard::redirectToPmSettingsHome();
-            return;
-        }
-        // Start saving the setup and info.
-        PayPalExtraMetaManager::parseAndSaveOptions($paypal_pm, $onboarding_status);
-        // Save the credentials.
-        PayPalExtraMetaManager::saveSellerApiCredentials($paypal_pm, $get_params);
-        // If onboarded successfully, remove the onboarding URL.
-        PayPalExtraMetaManager::deletePmOption($paypal_pm, Domain::META_KEY_ONBOARDING_URL);
-        // Also clen GET params by redirecting, because PP auto redirects to the return_url on closing the onboarding window.
-        EED_PayPalOnboard::redirectToPmSettingsHome();
-    }
-
-
-    /**
-     * Check if all required parameters for the onboarding status check are present.
-     *
-     * @param array $data
-     * @param mixed $paypal_pm
-     * @return bool
-     */
-    public static function onboardingStatusResponseValid(array $data, $paypal_pm): bool
-    {
-        // Check that we have all the required parameters and the nonce is ok.
-        if ($paypal_pm instanceof EE_Payment_Method
-            && wp_verify_nonce($data['nonce'], Domain::NONCE_NAME_ONBOARDING_RETURN)
-            && ! empty($data[ Domain::API_PARAM_PARTNER_ID ])
-            && ! empty($data[ Domain::META_KEY_SELLER_MERCHANT_ID ])
-            && isset($data[ Domain::API_PARAM_EMAIL_CONFIRMED ])
-        ) {
-            return true;
-        }
-        return false;
-    }
-
-
-    /**
-     * Get partner access token.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function getPartnerAccessToken(EE_Payment_Method $paypal_pm): string
-    {
-        // Do we have it saved ?
-        $access_token = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_ACCESS_TOKEN);
-        $expired      = EED_PayPalOnboard::partnerAccessTokenExpired($paypal_pm);
-        // If we don't have it, request/update it.
-        if (! $access_token || $expired) {
-            return EED_PayPalOnboard::requestPartnerAccessToken($paypal_pm);
-        }
-        // Access token is saved as encrypted, so return decrypted.
-        return $access_token;
-    }
-
-
-    /**
-     * Get partner access token.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @return bool
-     */
-    public static function partnerAccessTokenExpired(EE_Payment_Method $paypal_pm): bool
-    {
-        $expires_at = (int) PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_TOKEN_EXPIRES_IN);
-        if (! $expires_at) {
-            return true;
-        }
-        // Validate the token expiration date.
-        $now          = time();
-        $minutes_left = round(($expires_at - $now) / 60);
-        // Count as expired if less than 60 minutes till expiration left.
-        if ($minutes_left <= 60) {
-            return true;
-        }
-        return false;
-    }
-
-
-    /**
-     * Request the partner access token from PayPal and save/update it.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function requestPartnerAccessToken(EE_Payment_Method $paypal_pm): string
-    {
-        $nonce = wp_create_nonce('eea_pp_commerce_get_access_token');
-        // Request the access token.
-        $post_args = [
-            'method' => 'POST',
-            'body'   => [
-                'nonce'                       => $nonce,
-                'api_version'                 => 'v1',
-                Domain::META_KEY_SANDBOX_MODE => $paypal_pm->debug_mode() ? '1' : '0',
-            ],
-        ];
-        if (defined('LOCAL_MIDDLEMAN_SERVER')) {
-            $post_args['sslverify'] = false;
-        }
-        $post_url = EED_PayPalOnboard::getMiddlemanBaseUrl($paypal_pm) . 'get_token';
-        $response = EED_PayPalOnboard::sendRequest($paypal_pm, $post_url, $post_args);
-        if (isset($response['error'])) {
-            return '';
-        }
-        // Check the data we received.
-        if (! EED_PayPalOnboard::partnerTokenResponseValid($response, $paypal_pm)) {
-            return '';
-        }
-        // If we are here all seems to be ok. Save the token and it's data.
-        $saved = PayPalExtraMetaManager::savePartnerAccessToken($paypal_pm, $response);
-        if (! $saved) {
-            return '';
-        }
-        return $response['access_token'];
-    }
-
-
-    /**
-     * Request seller onboarding status from PayPal.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @param string            $merchant_id
-     * @return array
-     */
-    public static function trackSellerOnboarding(EE_Payment_Method $paypal_pm, string $merchant_id): array
-    {
-        $track_onboarding = EED_PayPalOnboard::getTrackOnboardingApi($paypal_pm, $merchant_id);
-        if (! $track_onboarding instanceof TrackSellerOnboarding) {
-            $err_msg = esc_html__('Failed to track seller onboarding.', 'event_espresso');
-            return ['error' => 'TRACK_ONBOARDING_FAILED', 'message' => $err_msg];
-        }
-        return $track_onboarding->isValid();
-    }
-
-
-    /**
-     * Returns the Track Seller Onboarding API.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @param string            $merchant_id
-     * @return TrackSellerOnboarding|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function getTrackOnboardingApi(
-        EE_Payment_Method $paypal_pm,
-        string            $merchant_id
-    ): ?TrackSellerOnboarding {
-        $partner_id = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_PARTNER_MERCHANT_ID);
-        $paypal_api = EED_PayPalCommerce::getPayPalApi($paypal_pm);
-        if (! $paypal_api instanceof PayPalApi || ! $partner_id) {
-            return null;
-        }
-        return new TrackSellerOnboarding($paypal_api, $partner_id, $merchant_id, $paypal_pm->debug_mode());
-    }
-
-
-    /**
-     * Check the onboard status and return the result.
-     * (AJAX)
-     *
-     * @return void
-     */
-    public static function getOnboardStatus(): void
-    {
-        $paypal_pm = EED_PayPalCommerce::getPaymentMethod();
-        if (! $paypal_pm instanceof EE_Payment_Method) {
-            $err_msg = esc_html__('Could not specify the payment method.', 'event_espresso');
-            PayPalLogger::errorLog($err_msg, EED_Module::getRequest()->postParams(), $paypal_pm);
-            wp_send_json(['on_board' => false]);
-        }
-        try {
-            $seller_id = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_SELLER_MERCHANT_ID) ?? '--';
-        } catch (Exception $e) {
-            $seller_id = '--';
-        }
-        wp_send_json(
-            [
-                'on_board'  => EED_PayPalOnboard::isOnboard($paypal_pm),
-                'seller_id' => $seller_id,
-            ]
-        );
-    }
-
-
-    /**
-     * De-authorize the seller. Remove all API credentials.
-     * (AJAX)
-     *
-     * @return void
-     */
-    public static function offboard(): void
-    {
-        $paypal_pm = EED_PayPalCommerce::getPaymentMethod();
-        if (! $paypal_pm instanceof EE_Payment_Method) {
-            wp_send_json([
-                'error'   => 'INVALID_PM',
-                'message' => esc_html__(
-                    'Invalid payment method. Please refresh the page and try again.',
-                    'event_espresso'
-                ),
-            ]);
-        }
-        PayPalExtraMetaManager::deleteAllData($paypal_pm);
-        wp_send_json(['success' => true]);
-    }
-
-
-    /**
-     * Checks if already onboard.
-     *
-     * @param EE_Payment_Method $payment_method
-     * @return boolean
-     */
-    public static function isOnboard(EE_Payment_Method $payment_method): bool
-    {
-        $pp_meta_data = PayPalExtraMetaManager::getAllData($payment_method);
-        return
-            // onborded with a third party integration ?
-            (! empty($pp_meta_data[ Domain::META_KEY_SELLER_MERCHANT_ID ])
-                && ! empty($pp_meta_data[ Domain::META_KEY_ACCESS_TOKEN ])
-            )
-            // or with the first party integration ?
-            || (! empty($pp_meta_data[ Domain::META_KEY_CLIENT_ID ])
-                && ! empty($pp_meta_data[ Domain::META_KEY_CLIENT_SECRET ])
-                && ! empty($pp_meta_data[ Domain::META_KEY_PAYER_ID ])
-            );
-    }
-
-
-    /**
-     * Send a request and return a decoded response body.
-     *
-     * @param EE_Payment_Method $paypal_pm
-     * @param string            $request_url
-     * @param array             $request_args
-     * @return array
-     */
-    public static function sendRequest(EE_Payment_Method $paypal_pm, string $request_url, array $request_args): array
-    {
-        $error_return = ['error' => true];
-        $response     = wp_remote_request($request_url, $request_args);
-        if (is_wp_error($response)) {
-            $message = $response->get_error_message();
-            PayPalLogger::errorLog($message, [$request_url, $request_args, $response], $paypal_pm);
-            $error_return['message'] = $message;
-            return $error_return;
-        }
-        $response_body = (isset($response['body']) && $response['body']) ? json_decode($response['body'], true) : [];
-        if (empty($response_body) || isset($response_body['error'])) {
-            $message = $response_body['error_description']
-                       ?? sprintf(
-                           esc_html__('Unknown response received while sending a request to: %1$s', 'event_espresso'),
-                           $request_url
-                       );
-            PayPalLogger::errorLog($message, [$request_url, $request_args, $response], $paypal_pm);
-            $error_return['message'] = $message;
-            return $error_return;
-        }
-        return $response_body;
-    }
-
-
-    /**
-     * Check the response for a partner token request.
-     *
-     * @param                   $response
-     * @param EE_Payment_Method $paypal_pm
-     * @return bool
-     */
-    public static function partnerTokenResponseValid($response, EE_Payment_Method $paypal_pm): bool
-    {
-        // Check the data we received.
-        if (
-            empty($response['nonce'])
-            || ! wp_verify_nonce($response['nonce'], 'eea_pp_commerce_get_access_token')
-            || empty($response['access_token'])
-            || empty($response['app_id'])
-            || empty($response['expires_in'])
-            || empty($response['partner_client_id'])
-            || empty($response['partner_merchant_id'])
-        ) {
-            // This is an error.
-            $err_msg = esc_html__('Incoming parameter validation failed.', 'event_espresso');
-            PayPalLogger::errorLog($err_msg, (array) $response, $paypal_pm);
-            return false;
-        }
-        return true;
-    }
-
-
-    /**
-     * Returns the base URL to the middleman server.
-     * If LOCAL_MIDDLEMAN_SERVER is defined, requests will be sent to connect.eventespresso.test
-     *
-     * @param EE_Payment_Method $payment_method
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function getMiddlemanBaseUrl(EE_Payment_Method $payment_method): string
-    {
-        $target = defined('LOCAL_MIDDLEMAN_SERVER') ? 'test' : 'com';
-        // If this PM is used under different provider accounts, you might need an account indicator.
-        $account = defined('EE_PAYPAL_COMMERCE_ACCOUNT_INDICATOR') ? EE_PAYPAL_COMMERCE_ACCOUNT_INDICATOR : '';
-        $postfix = $payment_method->debug_mode() ? '_sandbox' : '';
-        $path    = 'paypal_commerce' . $account . $postfix;
-        return 'https://connect.eventespresso.' . $target . '/' . $path . '/';
-    }
-
-
-    /**
-     * This Payment Method admin notices.
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function adminNotice()
-    {
-        // Show the notice if PayPal Commerce PM is active but merchant is not onboard.
-        $pp_commerce = EEM_Payment_Method::instance()->get_one_by_slug('paypalcheckout');
-        if ($pp_commerce instanceof EE_Payment_Method
-            && $pp_commerce->active()
-            && ! EED_PayPalOnboard::isOnboard($pp_commerce)
-        ) {
-            add_action('admin_notices', [__CLASS__, 'notOnboardNotice']);
-        }
-    }
-
-
-    /**
-     * Contents of the not onboard admin notice.
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function notOnboardNotice()
-    {
-        $open_anchor = $close_anchor = '';
-        $pp_commerce = EEM_Payment_Method::instance()->get_one_by_slug('paypalcheckout');
-        if ($pp_commerce instanceof EE_Payment_Method) {
-            $pm_page = add_query_arg(
-                [
-                    'page'           => 'espresso_payment_settings',
-                    'webhook_action' => 'eepPpcMerchantOnboard',
-                    'payment_method' => $pp_commerce->slug(),
-                ],
-                admin_url('admin.php')
-            );
-            $open_anchor  = "<a href='$pm_page'>";
-            $close_anchor = "</a>";
-        }
-        echo '<div class="error"><p>'
-        . sprintf(
-            esc_html__(
-                '%1$sPayPal Commerce%2$s payment method was activated but is not connected to PayPal. Please %3$sfinish setting up%4$s this payment method.',
-                'event_espresso'
-            ),
-            '<strong>',
-            '</strong>',
-            $open_anchor,
-            $close_anchor
-        )
-        . '</p></div>';
-    }
+	/**
+	 * @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 Admin Core and other modules.
+	 *
+	 * @return void
+	 */
+	public static function set_hooks_admin(): void
+	{
+		if (DbStatus::isOnline()) {
+			// Get onboarding URL.
+			add_action('wp_ajax_eeaPpGetOnboardingUrl', [__CLASS__, 'getOnboardingUrl']);
+			// Catch the return/redirect from PayPal onboarding page.
+			add_action('init', [__CLASS__, 'updateOnboardingStatus'], 10);
+			// Return the connection/onboard status.
+			add_action('wp_ajax_eeaPpGetOnboardStatus', [__CLASS__, 'getOnboardStatus']);
+			// Revoke access.
+			add_action('wp_ajax_eeaPpOffboard', [__CLASS__, 'offboard']);
+			// Admin notice.
+			add_action('admin_init', [__CLASS__, 'adminNotice']);
+		}
+	}
+
+
+	/**
+	 * Get the onboarding URL.
+	 * (AJAX)
+	 *
+	 * @return void
+	 */
+	public static function getOnboardingUrl(): void
+	{
+		$signup_link = '';
+		try {
+			$paypal_pm = EED_PayPalCommerce::getPaymentMethod();
+			if (! $paypal_pm instanceof EE_Payment_Method) {
+				PayPalLogger::errorLogAndExit(
+					esc_html__('No payment method.', 'event_espresso'),
+					EED_Module::getRequest()->postParams(),
+					$paypal_pm
+				);
+			}
+			PayPalExtraMetaManager::updateDebugMode($paypal_pm, EED_Module::getRequest()->postParams());
+			// $signup_link   = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_ONBOARDING_URL);
+			// $token_expired = EED_PayPalOnboard::partnerAccessTokenExpired($paypal_pm);
+			// if (! $signup_link || $token_expired) {
+			$signup_link = EED_PayPalOnboard::requestOnboardingUrl($paypal_pm);
+			// }
+			if (! $signup_link) {
+				$err_msg = esc_html__('Error! Could not generate a sign-up link.', 'event_espresso');
+				PayPalLogger::errorLogAndExit($err_msg, ['signup_link' => $signup_link], $paypal_pm);
+			}
+			PayPalExtraMetaManager::savePmOption($paypal_pm, Domain::META_KEY_ONBOARDING_URL, $signup_link);
+		} catch (Exception $exception) {
+			PayPalLogger::errorLogAndExit($exception->getMessage());
+		}
+		// Is it empty (can happen if we didn't get the URL through the API).
+		$signup_link = $signup_link ? $signup_link . '?&displayMode=minibrowser' : '#';
+		wp_send_json(
+			[
+				'signup_link' => $signup_link,
+			]
+		);
+	}
+
+
+	/**
+	 * Request the sign-up link from PayPal.
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @param bool              $one_time_request
+	 * @return string
+	 * @throws EE_Error
+	 * @throws Exception
+	 */
+	public static function requestOnboardingUrl(EE_Payment_Method $paypal_pm, bool $one_time_request = false): string
+	{
+		$signup_link = '';
+		// Get the access token.
+		$access_token = EED_PayPalOnboard::getPartnerAccessToken($paypal_pm);
+		if (! $access_token) {
+			$err_msg = esc_html__('Error! No access token.', 'event_espresso');
+			PayPalLogger::errorLog($err_msg, ['access_token' => $access_token], $paypal_pm);
+			return '';
+		}
+		// Request the access token.
+		$body_params = EED_PayPalOnboard::signupLinkRequestBody($paypal_pm);
+		$bn_code     = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_BN_CODE);
+		$post_params = [
+			'method'  => 'POST',
+			'headers' => [
+				'User-Agent'                    => sanitize_text_field($_SERVER['HTTP_USER_AGENT']),
+				'Content-Type'                  => 'application/json',
+				'Authorization'                 => 'Bearer ' . $access_token,
+				'PayPal-Partner-Attribution-Id' => $bn_code,
+			],
+			'body'    => $body_params,
+		];
+		$request_url = Domain::getPayPalApiUrl($paypal_pm) . '/v2/customer/partner-referrals';
+		$response    = EED_PayPalOnboard::sendRequest($paypal_pm, $request_url, $post_params);
+		// Check the data we received.
+		if (isset($response['error']) || empty($response['links'])) {
+			// Did the original access token get replaced by any chance ?
+			if (! $one_time_request
+				&& ! empty($response['message'])
+				&& $response['message'] === 'Access Token not found in cache'
+			) {
+				// Clear all PM metadata and try getting the access token One more time.
+				PayPalExtraMetaManager::deleteAllData($paypal_pm);
+				return EED_PayPalOnboard::requestOnboardingUrl($paypal_pm, true);
+			}
+			$err_msg = esc_html__('Incoming sign-up link parameter validation failed.', 'event_espresso');
+			PayPalLogger::errorLog($err_msg, $response, $paypal_pm);
+			return '';
+		}
+		// Now retrieve that sign-up link.
+		foreach ($response['links'] as $link) {
+			if ($link['rel'] === 'action_url') {
+				$signup_link = $link['href'] ?? '';
+			}
+		}
+		return $signup_link;
+	}
+
+
+	/**
+	 * Get the return URL.
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @return string
+	 * @throws Exception
+	 */
+	public static function signupLinkRequestBody(EE_Payment_Method $paypal_pm): string
+	{
+		$identifier_string = new OneTimeString($paypal_pm->debug_mode());
+		$tracking_id       = $identifier_string->value();
+		$request           = LoaderFactory::getLoader()->getShared(RequestInterface::class);
+		$checkout_type     = $request->getRequestParam('checkout_type', 'EXPRESS_CHECKOUT', DataType::STRING);
+		// Save the identifier for future use.
+		PayPalExtraMetaManager::savePmOption($paypal_pm, Domain::META_KEY_TRACKING_ID, $tracking_id);
+		// Assemble the return URL.
+		$return_url = EED_PayPalOnboard::getReturnUrl($paypal_pm);
+		return json_encode([
+			'tracking_id'             => $tracking_id,
+			'operations'              => [
+				[
+					'operation'                  => 'API_INTEGRATION',
+					'api_integration_preference' => [
+						'rest_api_integration' => [
+							'integration_method'  => 'PAYPAL',
+							'integration_type'    => 'THIRD_PARTY',
+							'third_party_details' => [
+								'features' => ['PAYMENT', 'REFUND'],
+							],
+						],
+					],
+				],
+			],
+			'products'                => [$checkout_type],
+			'legal_consents'          => [
+				[
+					'type'    => 'SHARE_DATA_CONSENT',
+					'granted' => true,
+				],
+			],
+			'partner_config_override' => [
+				'return_url' => $return_url,
+			],
+		]);
+	}
+
+
+	/**
+	 * Get the return URL.
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function getReturnUrl(EE_Payment_Method $paypal_pm): string
+	{
+		$wp_nonce = EED_Module::getRequest()->getRequestParam('wp_nonce');
+		$nonce    = wp_create_nonce(Domain::NONCE_NAME_ONBOARDING_RETURN);
+		return add_query_arg(
+			[
+				'page'                        => 'espresso_payment_settings',
+				'webhook_action'              => 'eepPpcMerchantOnboard',
+				'payment_method'              => $paypal_pm->slug(),
+				'_wpnonce'                    => $wp_nonce,
+				'nonce'                       => $nonce,
+				Domain::META_KEY_SANDBOX_MODE => $paypal_pm->debug_mode() ? '1' : '0',
+			],
+			admin_url('admin.php')
+		);
+	}
+
+
+	/**
+	 * Redirect to the payment method (PP) settings home page.
+	 *
+	 * @return void
+	 */
+	public static function redirectToPmSettingsHome(): void
+	{
+		$get_params = EED_Module::getRequest()->getParams();
+		if (empty($get_params['payment_method'])) {
+			// Simply do not redirect.
+			return;
+		}
+		$args_to_add = [
+			'page'           => 'espresso_payment_settings',
+			'payment_method' => $get_params['payment_method'],
+		];
+		if (isset($get_params['sandbox_mode'])) {
+			$args_to_add[ Domain::META_KEY_SANDBOX_MODE ] = $get_params['sandbox_mode'];
+		}
+		$home_url = add_query_arg($args_to_add, admin_url('admin.php'));
+		wp_redirect($home_url);
+		exit;
+	}
+
+
+	/**
+	 * Check user’s onboarding status.
+	 * This will handle the user return from the auth page and also check the status via the API.
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function updateOnboardingStatus(): void
+	{
+		// Check if this is the webhook from PayPal.
+		if (! isset($_GET['webhook_action'], $_GET['nonce'])
+			|| $_GET['webhook_action'] !== 'eepPpcMerchantOnboard'
+		) {
+			return;  // Ignore.
+		}
+		$get_params = EED_Module::getRequest()->getParams();
+		// Get the payment method.
+		$paypal_pm = EED_PayPalCommerce::getPaymentMethod();
+		// Check the response (GET) parameters.
+		if (! EED_PayPalOnboard::onboardingStatusResponseValid($get_params, $paypal_pm)) {
+			// Missing parameters. Can't proceed.
+			PayPalLogger::errorLog(
+				esc_html__('Missing required onboarding parameters.', 'event_espresso'),
+				$get_params,
+				$paypal_pm
+			);
+			EED_PayPalOnboard::redirectToPmSettingsHome();
+			return;
+		}
+		// Check on the onboarding status (recommended by PP).
+		$onboarding_status = EED_PayPalOnboard::trackSellerOnboarding(
+			$paypal_pm,
+			$get_params[ Domain::META_KEY_SELLER_MERCHANT_ID ]
+		);
+		if (! isset($onboarding_status['valid']) || ! $onboarding_status['valid']) {
+			PayPalLogger::errorLog(
+				$onboarding_status['message'],
+				array_merge($get_params, $onboarding_status),
+				$paypal_pm
+			);
+			EED_PayPalOnboard::redirectToPmSettingsHome();
+			return;
+		}
+		// Start saving the setup and info.
+		PayPalExtraMetaManager::parseAndSaveOptions($paypal_pm, $onboarding_status);
+		// Save the credentials.
+		PayPalExtraMetaManager::saveSellerApiCredentials($paypal_pm, $get_params);
+		// If onboarded successfully, remove the onboarding URL.
+		PayPalExtraMetaManager::deletePmOption($paypal_pm, Domain::META_KEY_ONBOARDING_URL);
+		// Also clen GET params by redirecting, because PP auto redirects to the return_url on closing the onboarding window.
+		EED_PayPalOnboard::redirectToPmSettingsHome();
+	}
+
+
+	/**
+	 * Check if all required parameters for the onboarding status check are present.
+	 *
+	 * @param array $data
+	 * @param mixed $paypal_pm
+	 * @return bool
+	 */
+	public static function onboardingStatusResponseValid(array $data, $paypal_pm): bool
+	{
+		// Check that we have all the required parameters and the nonce is ok.
+		if ($paypal_pm instanceof EE_Payment_Method
+			&& wp_verify_nonce($data['nonce'], Domain::NONCE_NAME_ONBOARDING_RETURN)
+			&& ! empty($data[ Domain::API_PARAM_PARTNER_ID ])
+			&& ! empty($data[ Domain::META_KEY_SELLER_MERCHANT_ID ])
+			&& isset($data[ Domain::API_PARAM_EMAIL_CONFIRMED ])
+		) {
+			return true;
+		}
+		return false;
+	}
+
+
+	/**
+	 * Get partner access token.
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function getPartnerAccessToken(EE_Payment_Method $paypal_pm): string
+	{
+		// Do we have it saved ?
+		$access_token = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_ACCESS_TOKEN);
+		$expired      = EED_PayPalOnboard::partnerAccessTokenExpired($paypal_pm);
+		// If we don't have it, request/update it.
+		if (! $access_token || $expired) {
+			return EED_PayPalOnboard::requestPartnerAccessToken($paypal_pm);
+		}
+		// Access token is saved as encrypted, so return decrypted.
+		return $access_token;
+	}
+
+
+	/**
+	 * Get partner access token.
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @return bool
+	 */
+	public static function partnerAccessTokenExpired(EE_Payment_Method $paypal_pm): bool
+	{
+		$expires_at = (int) PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_TOKEN_EXPIRES_IN);
+		if (! $expires_at) {
+			return true;
+		}
+		// Validate the token expiration date.
+		$now          = time();
+		$minutes_left = round(($expires_at - $now) / 60);
+		// Count as expired if less than 60 minutes till expiration left.
+		if ($minutes_left <= 60) {
+			return true;
+		}
+		return false;
+	}
+
+
+	/**
+	 * Request the partner access token from PayPal and save/update it.
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function requestPartnerAccessToken(EE_Payment_Method $paypal_pm): string
+	{
+		$nonce = wp_create_nonce('eea_pp_commerce_get_access_token');
+		// Request the access token.
+		$post_args = [
+			'method' => 'POST',
+			'body'   => [
+				'nonce'                       => $nonce,
+				'api_version'                 => 'v1',
+				Domain::META_KEY_SANDBOX_MODE => $paypal_pm->debug_mode() ? '1' : '0',
+			],
+		];
+		if (defined('LOCAL_MIDDLEMAN_SERVER')) {
+			$post_args['sslverify'] = false;
+		}
+		$post_url = EED_PayPalOnboard::getMiddlemanBaseUrl($paypal_pm) . 'get_token';
+		$response = EED_PayPalOnboard::sendRequest($paypal_pm, $post_url, $post_args);
+		if (isset($response['error'])) {
+			return '';
+		}
+		// Check the data we received.
+		if (! EED_PayPalOnboard::partnerTokenResponseValid($response, $paypal_pm)) {
+			return '';
+		}
+		// If we are here all seems to be ok. Save the token and it's data.
+		$saved = PayPalExtraMetaManager::savePartnerAccessToken($paypal_pm, $response);
+		if (! $saved) {
+			return '';
+		}
+		return $response['access_token'];
+	}
+
+
+	/**
+	 * Request seller onboarding status from PayPal.
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @param string            $merchant_id
+	 * @return array
+	 */
+	public static function trackSellerOnboarding(EE_Payment_Method $paypal_pm, string $merchant_id): array
+	{
+		$track_onboarding = EED_PayPalOnboard::getTrackOnboardingApi($paypal_pm, $merchant_id);
+		if (! $track_onboarding instanceof TrackSellerOnboarding) {
+			$err_msg = esc_html__('Failed to track seller onboarding.', 'event_espresso');
+			return ['error' => 'TRACK_ONBOARDING_FAILED', 'message' => $err_msg];
+		}
+		return $track_onboarding->isValid();
+	}
+
+
+	/**
+	 * Returns the Track Seller Onboarding API.
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @param string            $merchant_id
+	 * @return TrackSellerOnboarding|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function getTrackOnboardingApi(
+		EE_Payment_Method $paypal_pm,
+		string            $merchant_id
+	): ?TrackSellerOnboarding {
+		$partner_id = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_PARTNER_MERCHANT_ID);
+		$paypal_api = EED_PayPalCommerce::getPayPalApi($paypal_pm);
+		if (! $paypal_api instanceof PayPalApi || ! $partner_id) {
+			return null;
+		}
+		return new TrackSellerOnboarding($paypal_api, $partner_id, $merchant_id, $paypal_pm->debug_mode());
+	}
+
+
+	/**
+	 * Check the onboard status and return the result.
+	 * (AJAX)
+	 *
+	 * @return void
+	 */
+	public static function getOnboardStatus(): void
+	{
+		$paypal_pm = EED_PayPalCommerce::getPaymentMethod();
+		if (! $paypal_pm instanceof EE_Payment_Method) {
+			$err_msg = esc_html__('Could not specify the payment method.', 'event_espresso');
+			PayPalLogger::errorLog($err_msg, EED_Module::getRequest()->postParams(), $paypal_pm);
+			wp_send_json(['on_board' => false]);
+		}
+		try {
+			$seller_id = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_SELLER_MERCHANT_ID) ?? '--';
+		} catch (Exception $e) {
+			$seller_id = '--';
+		}
+		wp_send_json(
+			[
+				'on_board'  => EED_PayPalOnboard::isOnboard($paypal_pm),
+				'seller_id' => $seller_id,
+			]
+		);
+	}
+
+
+	/**
+	 * De-authorize the seller. Remove all API credentials.
+	 * (AJAX)
+	 *
+	 * @return void
+	 */
+	public static function offboard(): void
+	{
+		$paypal_pm = EED_PayPalCommerce::getPaymentMethod();
+		if (! $paypal_pm instanceof EE_Payment_Method) {
+			wp_send_json([
+				'error'   => 'INVALID_PM',
+				'message' => esc_html__(
+					'Invalid payment method. Please refresh the page and try again.',
+					'event_espresso'
+				),
+			]);
+		}
+		PayPalExtraMetaManager::deleteAllData($paypal_pm);
+		wp_send_json(['success' => true]);
+	}
+
+
+	/**
+	 * Checks if already onboard.
+	 *
+	 * @param EE_Payment_Method $payment_method
+	 * @return boolean
+	 */
+	public static function isOnboard(EE_Payment_Method $payment_method): bool
+	{
+		$pp_meta_data = PayPalExtraMetaManager::getAllData($payment_method);
+		return
+			// onborded with a third party integration ?
+			(! empty($pp_meta_data[ Domain::META_KEY_SELLER_MERCHANT_ID ])
+				&& ! empty($pp_meta_data[ Domain::META_KEY_ACCESS_TOKEN ])
+			)
+			// or with the first party integration ?
+			|| (! empty($pp_meta_data[ Domain::META_KEY_CLIENT_ID ])
+				&& ! empty($pp_meta_data[ Domain::META_KEY_CLIENT_SECRET ])
+				&& ! empty($pp_meta_data[ Domain::META_KEY_PAYER_ID ])
+			);
+	}
+
+
+	/**
+	 * Send a request and return a decoded response body.
+	 *
+	 * @param EE_Payment_Method $paypal_pm
+	 * @param string            $request_url
+	 * @param array             $request_args
+	 * @return array
+	 */
+	public static function sendRequest(EE_Payment_Method $paypal_pm, string $request_url, array $request_args): array
+	{
+		$error_return = ['error' => true];
+		$response     = wp_remote_request($request_url, $request_args);
+		if (is_wp_error($response)) {
+			$message = $response->get_error_message();
+			PayPalLogger::errorLog($message, [$request_url, $request_args, $response], $paypal_pm);
+			$error_return['message'] = $message;
+			return $error_return;
+		}
+		$response_body = (isset($response['body']) && $response['body']) ? json_decode($response['body'], true) : [];
+		if (empty($response_body) || isset($response_body['error'])) {
+			$message = $response_body['error_description']
+					   ?? sprintf(
+						   esc_html__('Unknown response received while sending a request to: %1$s', 'event_espresso'),
+						   $request_url
+					   );
+			PayPalLogger::errorLog($message, [$request_url, $request_args, $response], $paypal_pm);
+			$error_return['message'] = $message;
+			return $error_return;
+		}
+		return $response_body;
+	}
+
+
+	/**
+	 * Check the response for a partner token request.
+	 *
+	 * @param                   $response
+	 * @param EE_Payment_Method $paypal_pm
+	 * @return bool
+	 */
+	public static function partnerTokenResponseValid($response, EE_Payment_Method $paypal_pm): bool
+	{
+		// Check the data we received.
+		if (
+			empty($response['nonce'])
+			|| ! wp_verify_nonce($response['nonce'], 'eea_pp_commerce_get_access_token')
+			|| empty($response['access_token'])
+			|| empty($response['app_id'])
+			|| empty($response['expires_in'])
+			|| empty($response['partner_client_id'])
+			|| empty($response['partner_merchant_id'])
+		) {
+			// This is an error.
+			$err_msg = esc_html__('Incoming parameter validation failed.', 'event_espresso');
+			PayPalLogger::errorLog($err_msg, (array) $response, $paypal_pm);
+			return false;
+		}
+		return true;
+	}
+
+
+	/**
+	 * Returns the base URL to the middleman server.
+	 * If LOCAL_MIDDLEMAN_SERVER is defined, requests will be sent to connect.eventespresso.test
+	 *
+	 * @param EE_Payment_Method $payment_method
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function getMiddlemanBaseUrl(EE_Payment_Method $payment_method): string
+	{
+		$target = defined('LOCAL_MIDDLEMAN_SERVER') ? 'test' : 'com';
+		// If this PM is used under different provider accounts, you might need an account indicator.
+		$account = defined('EE_PAYPAL_COMMERCE_ACCOUNT_INDICATOR') ? EE_PAYPAL_COMMERCE_ACCOUNT_INDICATOR : '';
+		$postfix = $payment_method->debug_mode() ? '_sandbox' : '';
+		$path    = 'paypal_commerce' . $account . $postfix;
+		return 'https://connect.eventespresso.' . $target . '/' . $path . '/';
+	}
+
+
+	/**
+	 * This Payment Method admin notices.
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function adminNotice()
+	{
+		// Show the notice if PayPal Commerce PM is active but merchant is not onboard.
+		$pp_commerce = EEM_Payment_Method::instance()->get_one_by_slug('paypalcheckout');
+		if ($pp_commerce instanceof EE_Payment_Method
+			&& $pp_commerce->active()
+			&& ! EED_PayPalOnboard::isOnboard($pp_commerce)
+		) {
+			add_action('admin_notices', [__CLASS__, 'notOnboardNotice']);
+		}
+	}
+
+
+	/**
+	 * Contents of the not onboard admin notice.
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function notOnboardNotice()
+	{
+		$open_anchor = $close_anchor = '';
+		$pp_commerce = EEM_Payment_Method::instance()->get_one_by_slug('paypalcheckout');
+		if ($pp_commerce instanceof EE_Payment_Method) {
+			$pm_page = add_query_arg(
+				[
+					'page'           => 'espresso_payment_settings',
+					'webhook_action' => 'eepPpcMerchantOnboard',
+					'payment_method' => $pp_commerce->slug(),
+				],
+				admin_url('admin.php')
+			);
+			$open_anchor  = "<a href='$pm_page'>";
+			$close_anchor = "</a>";
+		}
+		echo '<div class="error"><p>'
+		. sprintf(
+			esc_html__(
+				'%1$sPayPal Commerce%2$s payment method was activated but is not connected to PayPal. Please %3$sfinish setting up%4$s this payment method.',
+				'event_espresso'
+			),
+			'<strong>',
+			'</strong>',
+			$open_anchor,
+			$close_anchor
+		)
+		. '</p></div>';
+	}
 }

Spacing +32 added lines, -32 removed lines

@@ -75,7 +75,7 @@ 
         $signup_link = '';
         try {
             $paypal_pm = EED_PayPalCommerce::getPaymentMethod();
-            if (! $paypal_pm instanceof EE_Payment_Method) {
+            if ( ! $paypal_pm instanceof EE_Payment_Method) {
                 PayPalLogger::errorLogAndExit(
                     esc_html__('No payment method.', 'event_espresso'),
                     EED_Module::getRequest()->postParams(),
@@ -88,7 +88,7 @@ 
             // if (! $signup_link || $token_expired) {
             $signup_link = EED_PayPalOnboard::requestOnboardingUrl($paypal_pm);
             // }
-            if (! $signup_link) {
+            if ( ! $signup_link) {
                 $err_msg = esc_html__('Error! Could not generate a sign-up link.', 'event_espresso');
                 PayPalLogger::errorLogAndExit($err_msg, ['signup_link' => $signup_link], $paypal_pm);
             }
@@ -97,7 +97,7 @@ 
             PayPalLogger::errorLogAndExit($exception->getMessage());
         }
         // Is it empty (can happen if we didn't get the URL through the API).
-        $signup_link = $signup_link ? $signup_link . '?&displayMode=minibrowser' : '#';
+        $signup_link = $signup_link ? $signup_link.'?&displayMode=minibrowser' : '#';
         wp_send_json(
             [
                 'signup_link' => $signup_link,
@@ -120,7 +120,7 @@ 
         $signup_link = '';
         // Get the access token.
         $access_token = EED_PayPalOnboard::getPartnerAccessToken($paypal_pm);
-        if (! $access_token) {
+        if ( ! $access_token) {
             $err_msg = esc_html__('Error! No access token.', 'event_espresso');
             PayPalLogger::errorLog($err_msg, ['access_token' => $access_token], $paypal_pm);
             return '';
@@ -133,17 +133,17 @@ 
             'headers' => [
                 'User-Agent'                    => sanitize_text_field($_SERVER['HTTP_USER_AGENT']),
                 'Content-Type'                  => 'application/json',
-                'Authorization'                 => 'Bearer ' . $access_token,
+                'Authorization'                 => 'Bearer '.$access_token,
                 'PayPal-Partner-Attribution-Id' => $bn_code,
             ],
             'body'    => $body_params,
         ];
-        $request_url = Domain::getPayPalApiUrl($paypal_pm) . '/v2/customer/partner-referrals';
+        $request_url = Domain::getPayPalApiUrl($paypal_pm).'/v2/customer/partner-referrals';
         $response    = EED_PayPalOnboard::sendRequest($paypal_pm, $request_url, $post_params);
         // Check the data we received.
         if (isset($response['error']) || empty($response['links'])) {
             // Did the original access token get replaced by any chance ?
-            if (! $one_time_request
+            if ( ! $one_time_request
                 && ! empty($response['message'])
                 && $response['message'] === 'Access Token not found in cache'
             ) {
@@ -255,7 +255,7 @@ 
             'payment_method' => $get_params['payment_method'],
         ];
         if (isset($get_params['sandbox_mode'])) {
-            $args_to_add[ Domain::META_KEY_SANDBOX_MODE ] = $get_params['sandbox_mode'];
+            $args_to_add[Domain::META_KEY_SANDBOX_MODE] = $get_params['sandbox_mode'];
         }
         $home_url = add_query_arg($args_to_add, admin_url('admin.php'));
         wp_redirect($home_url);
@@ -274,16 +274,16 @@ 
     public static function updateOnboardingStatus(): void
     {
         // Check if this is the webhook from PayPal.
-        if (! isset($_GET['webhook_action'], $_GET['nonce'])
+        if ( ! isset($_GET['webhook_action'], $_GET['nonce'])
             || $_GET['webhook_action'] !== 'eepPpcMerchantOnboard'
         ) {
-            return;  // Ignore.
+            return; // Ignore.
         }
         $get_params = EED_Module::getRequest()->getParams();
         // Get the payment method.
         $paypal_pm = EED_PayPalCommerce::getPaymentMethod();
         // Check the response (GET) parameters.
-        if (! EED_PayPalOnboard::onboardingStatusResponseValid($get_params, $paypal_pm)) {
+        if ( ! EED_PayPalOnboard::onboardingStatusResponseValid($get_params, $paypal_pm)) {
             // Missing parameters. Can't proceed.
             PayPalLogger::errorLog(
                 esc_html__('Missing required onboarding parameters.', 'event_espresso'),
@@ -296,9 +296,9 @@ 
         // Check on the onboarding status (recommended by PP).
         $onboarding_status = EED_PayPalOnboard::trackSellerOnboarding(
             $paypal_pm,
-            $get_params[ Domain::META_KEY_SELLER_MERCHANT_ID ]
+            $get_params[Domain::META_KEY_SELLER_MERCHANT_ID]
         );
-        if (! isset($onboarding_status['valid']) || ! $onboarding_status['valid']) {
+        if ( ! isset($onboarding_status['valid']) || ! $onboarding_status['valid']) {
             PayPalLogger::errorLog(
                 $onboarding_status['message'],
                 array_merge($get_params, $onboarding_status),
@@ -330,9 +330,9 @@ 
         // Check that we have all the required parameters and the nonce is ok.
         if ($paypal_pm instanceof EE_Payment_Method
             && wp_verify_nonce($data['nonce'], Domain::NONCE_NAME_ONBOARDING_RETURN)
-            && ! empty($data[ Domain::API_PARAM_PARTNER_ID ])
-            && ! empty($data[ Domain::META_KEY_SELLER_MERCHANT_ID ])
-            && isset($data[ Domain::API_PARAM_EMAIL_CONFIRMED ])
+            && ! empty($data[Domain::API_PARAM_PARTNER_ID])
+            && ! empty($data[Domain::META_KEY_SELLER_MERCHANT_ID])
+            && isset($data[Domain::API_PARAM_EMAIL_CONFIRMED])
         ) {
             return true;
         }
@@ -354,7 +354,7 @@ 
         $access_token = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_ACCESS_TOKEN);
         $expired      = EED_PayPalOnboard::partnerAccessTokenExpired($paypal_pm);
         // If we don't have it, request/update it.
-        if (! $access_token || $expired) {
+        if ( ! $access_token || $expired) {
             return EED_PayPalOnboard::requestPartnerAccessToken($paypal_pm);
         }
         // Access token is saved as encrypted, so return decrypted.
@@ -371,7 +371,7 @@ 
     public static function partnerAccessTokenExpired(EE_Payment_Method $paypal_pm): bool
     {
         $expires_at = (int) PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_TOKEN_EXPIRES_IN);
-        if (! $expires_at) {
+        if ( ! $expires_at) {
             return true;
         }
         // Validate the token expiration date.
@@ -408,18 +408,18 @@ 
         if (defined('LOCAL_MIDDLEMAN_SERVER')) {
             $post_args['sslverify'] = false;
         }
-        $post_url = EED_PayPalOnboard::getMiddlemanBaseUrl($paypal_pm) . 'get_token';
+        $post_url = EED_PayPalOnboard::getMiddlemanBaseUrl($paypal_pm).'get_token';
         $response = EED_PayPalOnboard::sendRequest($paypal_pm, $post_url, $post_args);
         if (isset($response['error'])) {
             return '';
         }
         // Check the data we received.
-        if (! EED_PayPalOnboard::partnerTokenResponseValid($response, $paypal_pm)) {
+        if ( ! EED_PayPalOnboard::partnerTokenResponseValid($response, $paypal_pm)) {
             return '';
         }
         // If we are here all seems to be ok. Save the token and it's data.
         $saved = PayPalExtraMetaManager::savePartnerAccessToken($paypal_pm, $response);
-        if (! $saved) {
+        if ( ! $saved) {
             return '';
         }
         return $response['access_token'];
@@ -436,7 +436,7 @@ 
     public static function trackSellerOnboarding(EE_Payment_Method $paypal_pm, string $merchant_id): array
     {
         $track_onboarding = EED_PayPalOnboard::getTrackOnboardingApi($paypal_pm, $merchant_id);
-        if (! $track_onboarding instanceof TrackSellerOnboarding) {
+        if ( ! $track_onboarding instanceof TrackSellerOnboarding) {
             $err_msg = esc_html__('Failed to track seller onboarding.', 'event_espresso');
             return ['error' => 'TRACK_ONBOARDING_FAILED', 'message' => $err_msg];
         }
@@ -459,7 +459,7 @@ 
     ): ?TrackSellerOnboarding {
         $partner_id = PayPalExtraMetaManager::getPmOption($paypal_pm, Domain::META_KEY_PARTNER_MERCHANT_ID);
         $paypal_api = EED_PayPalCommerce::getPayPalApi($paypal_pm);
-        if (! $paypal_api instanceof PayPalApi || ! $partner_id) {
+        if ( ! $paypal_api instanceof PayPalApi || ! $partner_id) {
             return null;
         }
         return new TrackSellerOnboarding($paypal_api, $partner_id, $merchant_id, $paypal_pm->debug_mode());
@@ -475,7 +475,7 @@ 
     public static function getOnboardStatus(): void
     {
         $paypal_pm = EED_PayPalCommerce::getPaymentMethod();
-        if (! $paypal_pm instanceof EE_Payment_Method) {
+        if ( ! $paypal_pm instanceof EE_Payment_Method) {
             $err_msg = esc_html__('Could not specify the payment method.', 'event_espresso');
             PayPalLogger::errorLog($err_msg, EED_Module::getRequest()->postParams(), $paypal_pm);
             wp_send_json(['on_board' => false]);
@@ -503,7 +503,7 @@ 
     public static function offboard(): void
     {
         $paypal_pm = EED_PayPalCommerce::getPaymentMethod();
-        if (! $paypal_pm instanceof EE_Payment_Method) {
+        if ( ! $paypal_pm instanceof EE_Payment_Method) {
             wp_send_json([
                 'error'   => 'INVALID_PM',
                 'message' => esc_html__(
@@ -528,13 +528,13 @@ 
         $pp_meta_data = PayPalExtraMetaManager::getAllData($payment_method);
         return
             // onborded with a third party integration ?
-            (! empty($pp_meta_data[ Domain::META_KEY_SELLER_MERCHANT_ID ])
-                && ! empty($pp_meta_data[ Domain::META_KEY_ACCESS_TOKEN ])
+            ( ! empty($pp_meta_data[Domain::META_KEY_SELLER_MERCHANT_ID])
+                && ! empty($pp_meta_data[Domain::META_KEY_ACCESS_TOKEN])
             )
             // or with the first party integration ?
-            || (! empty($pp_meta_data[ Domain::META_KEY_CLIENT_ID ])
-                && ! empty($pp_meta_data[ Domain::META_KEY_CLIENT_SECRET ])
-                && ! empty($pp_meta_data[ Domain::META_KEY_PAYER_ID ])
+            || ( ! empty($pp_meta_data[Domain::META_KEY_CLIENT_ID])
+                && ! empty($pp_meta_data[Domain::META_KEY_CLIENT_SECRET])
+                && ! empty($pp_meta_data[Domain::META_KEY_PAYER_ID])
             );
     }
 
@@ -615,8 +615,8 @@ 
         // If this PM is used under different provider accounts, you might need an account indicator.
         $account = defined('EE_PAYPAL_COMMERCE_ACCOUNT_INDICATOR') ? EE_PAYPAL_COMMERCE_ACCOUNT_INDICATOR : '';
         $postfix = $payment_method->debug_mode() ? '_sandbox' : '';
-        $path    = 'paypal_commerce' . $account . $postfix;
-        return 'https://connect.eventespresso.' . $target . '/' . $path . '/';
+        $path    = 'paypal_commerce'.$account.$postfix;
+        return 'https://connect.eventespresso.'.$target.'/'.$path.'/';
     }
 
 

admin_pages/events/Events_Admin_List_Table.class.php

Indentation +568 added lines, -568 removed lines

@@ -15,168 +15,168 @@ 
  */
 class Events_Admin_List_Table extends EE_Admin_List_Table
 {
-    private ?EE_Datetime $_dtt = null;
-
-
-    /**
-     * Initial setup of data properties for the list table.
-     *
-     * @throws Exception
-     */
-    protected function _setup_data()
-    {
-        $this->_data           = $this->_admin_page->get_events($this->_per_page, $this->_current_page);
-        $this->_all_data_count = $this->_admin_page->get_events(0, 0, true);
-    }
-
-
-    /**
-     * Set up of additional properties for the list table.
-     *
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _set_properties()
-    {
-        $this->_wp_list_args    = [
-            'singular' => esc_html__('event', 'event_espresso'),
-            'plural'   => esc_html__('events', 'event_espresso'),
-            'ajax'     => true, // for now
-            'screen'   => $this->_admin_page->get_current_screen()->id,
-        ];
-        $approved_registrations = esc_html__('Approved Registrations', 'event_espresso');
-        $this->_columns         = [
-            'cb'              => '<input type="checkbox" />',
-            'id'              => esc_html__('ID', 'event_espresso'),
-            'name'            => esc_html__('Name', 'event_espresso'),
-            'author'          => esc_html__('Author', 'event_espresso'),
-            'venue'           => esc_html__('Venue', 'event_espresso'),
-            'start_date_time' => esc_html__('Event Start', 'event_espresso'),
-            'reg_begins'      => esc_html__('On Sale', 'event_espresso'),
-            'attendees'       => '
+	private ?EE_Datetime $_dtt = null;
+
+
+	/**
+	 * Initial setup of data properties for the list table.
+	 *
+	 * @throws Exception
+	 */
+	protected function _setup_data()
+	{
+		$this->_data           = $this->_admin_page->get_events($this->_per_page, $this->_current_page);
+		$this->_all_data_count = $this->_admin_page->get_events(0, 0, true);
+	}
+
+
+	/**
+	 * Set up of additional properties for the list table.
+	 *
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _set_properties()
+	{
+		$this->_wp_list_args    = [
+			'singular' => esc_html__('event', 'event_espresso'),
+			'plural'   => esc_html__('events', 'event_espresso'),
+			'ajax'     => true, // for now
+			'screen'   => $this->_admin_page->get_current_screen()->id,
+		];
+		$approved_registrations = esc_html__('Approved Registrations', 'event_espresso');
+		$this->_columns         = [
+			'cb'              => '<input type="checkbox" />',
+			'id'              => esc_html__('ID', 'event_espresso'),
+			'name'            => esc_html__('Name', 'event_espresso'),
+			'author'          => esc_html__('Author', 'event_espresso'),
+			'venue'           => esc_html__('Venue', 'event_espresso'),
+			'start_date_time' => esc_html__('Event Start', 'event_espresso'),
+			'reg_begins'      => esc_html__('On Sale', 'event_espresso'),
+			'attendees'       => '
                 <span class="dashicons dashicons-groups ee-status-color--RAP ee-aria-tooltip"
                     aria-label="' . $approved_registrations . '"></span>
                 <span class="screen-reader-text">' . $approved_registrations . '</span>',
-            'actions'         => $this->actionsColumnHeader(),
-        ];
-        $this->addConditionalColumns();
-        $this->_sortable_columns = [
-            'id'              => ['EVT_ID' => true],
-            'name'            => ['EVT_name' => false],
-            'author'          => ['EVT_wp_user' => false],
-            'venue'           => ['Venue.VNU_name' => false],
-            'start_date_time' => ['Datetime.DTT_EVT_start' => false],
-            'reg_begins'      => ['Datetime.Ticket.TKT_start_date' => false],
-        ];
-
-        $this->_primary_column = 'id';
-        $this->_hidden_columns = ['author', 'event_category'];
-    }
-
-
-    /**
-     * @return array
-     */
-    protected function _get_table_filters()
-    {
-        return []; // no filters with decaf
-    }
-
-
-    /**
-     * Setup of views properties.
-     *
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _add_view_counts()
-    {
-        $this->_views['all']['count']   = $this->_admin_page->total_events();
-        $this->_views['draft']['count'] = $this->_admin_page->total_events_draft();
-        if (
-            EE_Registry::instance()->CAP->current_user_can(
-                'ee_delete_events',
-                'espresso_events_trash_events'
-            )
-        ) {
-            $this->_views['trash']['count'] = $this->_admin_page->total_trashed_events();
-        }
-    }
-
-
-    /**
-     * @param EE_Event $item
-     * @return string
-     */
-    protected function _get_row_class($item): string
-    {
-        $class = parent::_get_row_class($item);
-        if ($this->_has_checkbox_column) {
-            $class .= ' has-checkbox-column';
-        }
-        return $class;
-    }
-
-
-    /**
-     * @param EE_Event $item
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function column_cb($item): string
-    {
-        if (! $item instanceof EE_Event) {
-            return '';
-        }
-        $this->_dtt = $item->primary_datetime(); // set this for use in other columns
-        $content    = sprintf(
-            '<input type="checkbox" name="EVT_IDs[]" value="%s" />',
-            $item->ID()
-        );
-        return $this->columnContent('cb', $content, 'center');
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function column_id(EE_Event $event): string
-    {
-        $content = '<span class="ee-entity-id">' . $event->ID() . '</span>';
-        $content .= '<span class="show-on-mobile-view-only">';
-        $content .= $this->column_name($event, false);
-        $content .= '</span>';
-        return $this->columnContent('id', $content, 'end');
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @param bool     $prep_content
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function column_name(EE_Event $event, bool $prep_content = true): string
-    {
-        $edit_query_args = [
-            'action' => 'edit',
-            'post'   => $event->ID(),
-        ];
-        $edit_link       = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
-        $actions         = $this->_column_name_action_setup($event);
-        $status          = esc_attr($event->get_active_status());
-        $pretty_status   = EEH_Template::pretty_status($status, false, 'sentence');
-        $status_dot      = '<span class="ee-status-dot ee-status-bg--' . $status . '"></span>';
-        $visibility      = $event->get_visibility_status();
-        $content         = '
+			'actions'         => $this->actionsColumnHeader(),
+		];
+		$this->addConditionalColumns();
+		$this->_sortable_columns = [
+			'id'              => ['EVT_ID' => true],
+			'name'            => ['EVT_name' => false],
+			'author'          => ['EVT_wp_user' => false],
+			'venue'           => ['Venue.VNU_name' => false],
+			'start_date_time' => ['Datetime.DTT_EVT_start' => false],
+			'reg_begins'      => ['Datetime.Ticket.TKT_start_date' => false],
+		];
+
+		$this->_primary_column = 'id';
+		$this->_hidden_columns = ['author', 'event_category'];
+	}
+
+
+	/**
+	 * @return array
+	 */
+	protected function _get_table_filters()
+	{
+		return []; // no filters with decaf
+	}
+
+
+	/**
+	 * Setup of views properties.
+	 *
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _add_view_counts()
+	{
+		$this->_views['all']['count']   = $this->_admin_page->total_events();
+		$this->_views['draft']['count'] = $this->_admin_page->total_events_draft();
+		if (
+			EE_Registry::instance()->CAP->current_user_can(
+				'ee_delete_events',
+				'espresso_events_trash_events'
+			)
+		) {
+			$this->_views['trash']['count'] = $this->_admin_page->total_trashed_events();
+		}
+	}
+
+
+	/**
+	 * @param EE_Event $item
+	 * @return string
+	 */
+	protected function _get_row_class($item): string
+	{
+		$class = parent::_get_row_class($item);
+		if ($this->_has_checkbox_column) {
+			$class .= ' has-checkbox-column';
+		}
+		return $class;
+	}
+
+
+	/**
+	 * @param EE_Event $item
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function column_cb($item): string
+	{
+		if (! $item instanceof EE_Event) {
+			return '';
+		}
+		$this->_dtt = $item->primary_datetime(); // set this for use in other columns
+		$content    = sprintf(
+			'<input type="checkbox" name="EVT_IDs[]" value="%s" />',
+			$item->ID()
+		);
+		return $this->columnContent('cb', $content, 'center');
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function column_id(EE_Event $event): string
+	{
+		$content = '<span class="ee-entity-id">' . $event->ID() . '</span>';
+		$content .= '<span class="show-on-mobile-view-only">';
+		$content .= $this->column_name($event, false);
+		$content .= '</span>';
+		return $this->columnContent('id', $content, 'end');
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @param bool     $prep_content
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function column_name(EE_Event $event, bool $prep_content = true): string
+	{
+		$edit_query_args = [
+			'action' => 'edit',
+			'post'   => $event->ID(),
+		];
+		$edit_link       = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
+		$actions         = $this->_column_name_action_setup($event);
+		$status          = esc_attr($event->get_active_status());
+		$pretty_status   = EEH_Template::pretty_status($status, false, 'sentence');
+		$status_dot      = '<span class="ee-status-dot ee-status-bg--' . $status . '"></span>';
+		$visibility      = $event->get_visibility_status();
+		$content         = '
             <div class="ee-layout-row ee-layout-row--fixed">
                 <a  class="row-title ee-status-color--' . $status . ' ee-aria-tooltip"
                     aria-label="' . $pretty_status . '"
@@ -185,416 +185,416 @@ 
                     ' . $status_dot . $event->name() . '
                 </a>
                 ' . (
-                    $visibility
-                    ? '<span class="ee-event-visibility-status ee-status-text-small">(' . esc_html($visibility) . ')</span>'
-                    : ''
-                ) . '
+					$visibility
+					? '<span class="ee-event-visibility-status ee-status-text-small">(' . esc_html($visibility) . ')</span>'
+					: ''
+				) . '
             </div>';
 
-        $content .= $this->row_actions($actions);
-
-        return $prep_content ? $this->columnContent('name', $content) : $content;
-    }
-
-
-    /**
-     * Just a method for setting up the actions for the name column
-     *
-     * @param EE_Event $event
-     * @return array array of actions
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function _column_name_action_setup(EE_Event $event): array
-    {
-        // todo: remove when attendees is active
-        if (! defined('REG_ADMIN_URL')) {
-            define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
-        }
-        $actions            = [];
-        $restore_event_link = '';
-        $delete_event_link  = '';
-        $trash_event_link   = '';
-        if (
-            EE_Registry::instance()->CAP->current_user_can(
-                'ee_edit_event',
-                'espresso_events_edit',
-                $event->ID()
-            )
-        ) {
-            $edit_query_args = [
-                'action' => 'edit',
-                'post'   => $event->ID(),
-            ];
-            $edit_link       = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
-            $actions['edit'] = '<a href="' . $edit_link . '" class="ee-aria-tooltip" '
-                               . ' aria-label="' . esc_attr__('Edit Event', 'event_espresso') . '">'
-                               . esc_html__('Edit', 'event_espresso')
-                               . '</a>';
-        }
-        if (
-            EE_Registry::instance()->CAP->current_user_can(
-                'ee_read_registrations',
-                'espresso_registrations_view_registration'
-            )
-            && EE_Registry::instance()->CAP->current_user_can(
-                'ee_read_event',
-                'espresso_registrations_view_registration',
-                $event->ID()
-            )
-        ) {
-            $attendees_query_args = [
-                'action'   => 'default',
-                'event_id' => $event->ID(),
-            ];
-            $attendees_link       = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
-            $actions['attendees'] = '<a href="' . $attendees_link . '" class="ee-aria-tooltip"'
-                                    . ' aria-label="' . esc_attr__('View Registrations', 'event_espresso') . '">'
-                                    . esc_html__('Registrations', 'event_espresso')
-                                    . '</a>';
-        }
-        if (
-            EE_Registry::instance()->CAP->current_user_can(
-                'ee_delete_event',
-                'espresso_events_trash_event',
-                $event->ID()
-            )
-        ) {
-            $trash_event_query_args = [
-                'action' => 'trash_event',
-                'EVT_ID' => $event->ID(),
-            ];
-            $trash_event_link       = EE_Admin_Page::add_query_args_and_nonce(
-                $trash_event_query_args,
-                EVENTS_ADMIN_URL
-            );
-        }
-        if (
-            EE_Registry::instance()->CAP->current_user_can(
-                'ee_delete_event',
-                'espresso_events_restore_event',
-                $event->ID()
-            )
-        ) {
-            $restore_event_query_args = [
-                'action' => 'restore_event',
-                'EVT_ID' => $event->ID(),
-            ];
-            $restore_event_link       = EE_Admin_Page::add_query_args_and_nonce(
-                $restore_event_query_args,
-                EVENTS_ADMIN_URL
-            );
-        }
-        if (
-            EE_Registry::instance()->CAP->current_user_can(
-                'ee_delete_event',
-                'espresso_events_delete_event',
-                $event->ID()
-            )
-        ) {
-            $delete_event_query_args = [
-                'action' => 'delete_event',
-                'EVT_ID' => $event->ID(),
-            ];
-            $delete_event_link       = EE_Admin_Page::add_query_args_and_nonce(
-                $delete_event_query_args,
-                EVENTS_ADMIN_URL
-            );
-        }
-        $view_link       = get_permalink($event->ID());
-        $actions['view'] = '<a href="' . $view_link . '" class="ee-aria-tooltip"'
-                           . ' aria-label="' . esc_attr__('View Event', 'event_espresso') . '">'
-                           . esc_html__('View', 'event_espresso')
-                           . '</a>';
-        if ($event->get('status') === 'trash') {
-            if (
-                EE_Registry::instance()->CAP->current_user_can(
-                    'ee_delete_event',
-                    'espresso_events_restore_event',
-                    $event->ID()
-                )
-            ) {
-                $actions['restore_from_trash'] = '<a href="' . $restore_event_link . '" class="ee-aria-tooltip"'
-                                                 . ' aria-label="' . esc_attr__('Restore from Trash', 'event_espresso')
-                                                 . '">'
-                                                 . esc_html__('Restore from Trash', 'event_espresso')
-                                                 . '</a>';
-            }
-            if (
-                EE_Registry::instance()->CAP->current_user_can(
-                    'ee_delete_event',
-                    'espresso_events_delete_event',
-                    $event->ID()
-                )
-            ) {
-                $actions['delete'] = '<a href="' . $delete_event_link . '" class="ee-aria-tooltip"'
-                                     . ' aria-label="' . esc_attr__('Delete Permanently', 'event_espresso') . '">'
-                                     . esc_html__('Delete Permanently', 'event_espresso')
-                                     . '</a>';
-            }
-        } else {
-            if (
-                EE_Registry::instance()->CAP->current_user_can(
-                    'ee_delete_event',
-                    'espresso_events_trash_event',
-                    $event->ID()
-                )
-            ) {
-                $actions['move to trash'] = '<a href="' . $trash_event_link . '" class="ee-aria-tooltip"'
-                                            . ' aria-label="' . esc_attr__('Trash Event', 'event_espresso') . '">'
-                                            . esc_html__('Trash', 'event_espresso')
-                                            . '</a>';
-            }
-        }
-        return $actions;
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function column_author(EE_Event $event): string
-    {
-        // user author info
-        $event_author = get_userdata($event->wp_user());
-        $gravatar     = get_avatar($event->wp_user(), '24');
-        // filter link
-        $query_args = [
-            'action'      => 'default',
-            'EVT_wp_user' => $event->wp_user(),
-        ];
-        $filter_url = EE_Admin_Page::add_query_args_and_nonce($query_args, EVENTS_ADMIN_URL);
-        $content    = '<div class="ee-layout-row ee-layout-row--fixed">';
-        $content    .= '  <a href="' . $filter_url . '" class="ee-event-author ee-aria-tooltip"'
-                       . ' aria-label="' . esc_attr__('Click to filter events by this author.', 'event_espresso') . '">'
-                       . $gravatar . $event_author->display_name
-                       . '</a>';
-        $content    .= '</div>';
-        return $this->columnContent('author', $content);
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function column_event_category(EE_Event $event): string
-    {
-        $event_categories = $event->get_all_event_categories();
-        $content          = implode(
-            ', ',
-            array_map(
-                function (EE_Term $category) {
-                    return $category->name();
-                },
-                $event_categories
-            )
-        );
-        return $this->columnContent('event_category', $content);
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function column_venue(EE_Event $event): string
-    {
-        $venue   = $event->get_first_related('Venue');
-        $content = ! empty($venue)
-            ? $venue->name()
-            : '';
-        return $this->columnContent('venue', $content);
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function column_start_date_time(EE_Event $event): string
-    {
-        $content = $this->_dtt instanceof EE_Datetime
-            ? $this->_dtt->get_i18n_datetime('DTT_EVT_start')
-            : esc_html__('No Date was saved for this Event', 'event_espresso');
-        return $this->columnContent('start_date_time', $content);
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function column_reg_begins(EE_Event $event): string
-    {
-        $reg_start = $event->get_ticket_with_earliest_start_time();
-        $content   = $reg_start instanceof EE_Ticket
-            ? $reg_start->get_i18n_datetime('TKT_start_date')
-            : esc_html__('No Tickets have been setup for this Event', 'event_espresso');
-        return $this->columnContent('reg_begins', $content);
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_attendees(EE_Event $event): string
-    {
-        $attendees_query_args = [
-            'action'   => 'default',
-            'event_id' => $event->ID(),
-            '_reg_status' => EEM_Registration::status_id_approved,
-        ];
-        $attendees_link       = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
-        $registered_attendees = EEM_Registration::instance()->get_event_registration_count($event->ID());
-
-        $content              = EE_Registry::instance()->CAP->current_user_can(
-            'ee_read_event',
-            'espresso_registrations_view_registration',
-            $event->ID()
-        ) && EE_Registry::instance()->CAP->current_user_can(
-            'ee_read_registrations',
-            'espresso_registrations_view_registration'
-        )
-            ? '<a href="' . $attendees_link . '">' . $registered_attendees . '</a>'
-            : $registered_attendees;
-        return $this->columnContent('attendees', $content, 'center');
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @return float
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_tkts_sold(EE_Event $event): float
-    {
-        $content = EEM_Ticket::instance()->sum([['Datetime.EVT_ID' => $event->ID()]], 'TKT_sold');
-        return $this->columnContent('tkts_sold', $content);
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function column_actions(EE_Event $event): string
-    {
-        // todo: remove when attendees is active
-        if (! defined('REG_ADMIN_URL')) {
-            define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
-        }
-        $action_links   = [];
-        $view_link      = get_permalink($event->ID());
-        $action_links[] = '<a href="' . $view_link . '" class="ee-aria-tooltip button button--icon-only"'
-                          . ' aria-label="' . esc_attr__('View Event', 'event_espresso') . '" target="_blank">
+		$content .= $this->row_actions($actions);
+
+		return $prep_content ? $this->columnContent('name', $content) : $content;
+	}
+
+
+	/**
+	 * Just a method for setting up the actions for the name column
+	 *
+	 * @param EE_Event $event
+	 * @return array array of actions
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function _column_name_action_setup(EE_Event $event): array
+	{
+		// todo: remove when attendees is active
+		if (! defined('REG_ADMIN_URL')) {
+			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
+		}
+		$actions            = [];
+		$restore_event_link = '';
+		$delete_event_link  = '';
+		$trash_event_link   = '';
+		if (
+			EE_Registry::instance()->CAP->current_user_can(
+				'ee_edit_event',
+				'espresso_events_edit',
+				$event->ID()
+			)
+		) {
+			$edit_query_args = [
+				'action' => 'edit',
+				'post'   => $event->ID(),
+			];
+			$edit_link       = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
+			$actions['edit'] = '<a href="' . $edit_link . '" class="ee-aria-tooltip" '
+							   . ' aria-label="' . esc_attr__('Edit Event', 'event_espresso') . '">'
+							   . esc_html__('Edit', 'event_espresso')
+							   . '</a>';
+		}
+		if (
+			EE_Registry::instance()->CAP->current_user_can(
+				'ee_read_registrations',
+				'espresso_registrations_view_registration'
+			)
+			&& EE_Registry::instance()->CAP->current_user_can(
+				'ee_read_event',
+				'espresso_registrations_view_registration',
+				$event->ID()
+			)
+		) {
+			$attendees_query_args = [
+				'action'   => 'default',
+				'event_id' => $event->ID(),
+			];
+			$attendees_link       = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
+			$actions['attendees'] = '<a href="' . $attendees_link . '" class="ee-aria-tooltip"'
+									. ' aria-label="' . esc_attr__('View Registrations', 'event_espresso') . '">'
+									. esc_html__('Registrations', 'event_espresso')
+									. '</a>';
+		}
+		if (
+			EE_Registry::instance()->CAP->current_user_can(
+				'ee_delete_event',
+				'espresso_events_trash_event',
+				$event->ID()
+			)
+		) {
+			$trash_event_query_args = [
+				'action' => 'trash_event',
+				'EVT_ID' => $event->ID(),
+			];
+			$trash_event_link       = EE_Admin_Page::add_query_args_and_nonce(
+				$trash_event_query_args,
+				EVENTS_ADMIN_URL
+			);
+		}
+		if (
+			EE_Registry::instance()->CAP->current_user_can(
+				'ee_delete_event',
+				'espresso_events_restore_event',
+				$event->ID()
+			)
+		) {
+			$restore_event_query_args = [
+				'action' => 'restore_event',
+				'EVT_ID' => $event->ID(),
+			];
+			$restore_event_link       = EE_Admin_Page::add_query_args_and_nonce(
+				$restore_event_query_args,
+				EVENTS_ADMIN_URL
+			);
+		}
+		if (
+			EE_Registry::instance()->CAP->current_user_can(
+				'ee_delete_event',
+				'espresso_events_delete_event',
+				$event->ID()
+			)
+		) {
+			$delete_event_query_args = [
+				'action' => 'delete_event',
+				'EVT_ID' => $event->ID(),
+			];
+			$delete_event_link       = EE_Admin_Page::add_query_args_and_nonce(
+				$delete_event_query_args,
+				EVENTS_ADMIN_URL
+			);
+		}
+		$view_link       = get_permalink($event->ID());
+		$actions['view'] = '<a href="' . $view_link . '" class="ee-aria-tooltip"'
+						   . ' aria-label="' . esc_attr__('View Event', 'event_espresso') . '">'
+						   . esc_html__('View', 'event_espresso')
+						   . '</a>';
+		if ($event->get('status') === 'trash') {
+			if (
+				EE_Registry::instance()->CAP->current_user_can(
+					'ee_delete_event',
+					'espresso_events_restore_event',
+					$event->ID()
+				)
+			) {
+				$actions['restore_from_trash'] = '<a href="' . $restore_event_link . '" class="ee-aria-tooltip"'
+												 . ' aria-label="' . esc_attr__('Restore from Trash', 'event_espresso')
+												 . '">'
+												 . esc_html__('Restore from Trash', 'event_espresso')
+												 . '</a>';
+			}
+			if (
+				EE_Registry::instance()->CAP->current_user_can(
+					'ee_delete_event',
+					'espresso_events_delete_event',
+					$event->ID()
+				)
+			) {
+				$actions['delete'] = '<a href="' . $delete_event_link . '" class="ee-aria-tooltip"'
+									 . ' aria-label="' . esc_attr__('Delete Permanently', 'event_espresso') . '">'
+									 . esc_html__('Delete Permanently', 'event_espresso')
+									 . '</a>';
+			}
+		} else {
+			if (
+				EE_Registry::instance()->CAP->current_user_can(
+					'ee_delete_event',
+					'espresso_events_trash_event',
+					$event->ID()
+				)
+			) {
+				$actions['move to trash'] = '<a href="' . $trash_event_link . '" class="ee-aria-tooltip"'
+											. ' aria-label="' . esc_attr__('Trash Event', 'event_espresso') . '">'
+											. esc_html__('Trash', 'event_espresso')
+											. '</a>';
+			}
+		}
+		return $actions;
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function column_author(EE_Event $event): string
+	{
+		// user author info
+		$event_author = get_userdata($event->wp_user());
+		$gravatar     = get_avatar($event->wp_user(), '24');
+		// filter link
+		$query_args = [
+			'action'      => 'default',
+			'EVT_wp_user' => $event->wp_user(),
+		];
+		$filter_url = EE_Admin_Page::add_query_args_and_nonce($query_args, EVENTS_ADMIN_URL);
+		$content    = '<div class="ee-layout-row ee-layout-row--fixed">';
+		$content    .= '  <a href="' . $filter_url . '" class="ee-event-author ee-aria-tooltip"'
+					   . ' aria-label="' . esc_attr__('Click to filter events by this author.', 'event_espresso') . '">'
+					   . $gravatar . $event_author->display_name
+					   . '</a>';
+		$content    .= '</div>';
+		return $this->columnContent('author', $content);
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function column_event_category(EE_Event $event): string
+	{
+		$event_categories = $event->get_all_event_categories();
+		$content          = implode(
+			', ',
+			array_map(
+				function (EE_Term $category) {
+					return $category->name();
+				},
+				$event_categories
+			)
+		);
+		return $this->columnContent('event_category', $content);
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function column_venue(EE_Event $event): string
+	{
+		$venue   = $event->get_first_related('Venue');
+		$content = ! empty($venue)
+			? $venue->name()
+			: '';
+		return $this->columnContent('venue', $content);
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function column_start_date_time(EE_Event $event): string
+	{
+		$content = $this->_dtt instanceof EE_Datetime
+			? $this->_dtt->get_i18n_datetime('DTT_EVT_start')
+			: esc_html__('No Date was saved for this Event', 'event_espresso');
+		return $this->columnContent('start_date_time', $content);
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function column_reg_begins(EE_Event $event): string
+	{
+		$reg_start = $event->get_ticket_with_earliest_start_time();
+		$content   = $reg_start instanceof EE_Ticket
+			? $reg_start->get_i18n_datetime('TKT_start_date')
+			: esc_html__('No Tickets have been setup for this Event', 'event_espresso');
+		return $this->columnContent('reg_begins', $content);
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_attendees(EE_Event $event): string
+	{
+		$attendees_query_args = [
+			'action'   => 'default',
+			'event_id' => $event->ID(),
+			'_reg_status' => EEM_Registration::status_id_approved,
+		];
+		$attendees_link       = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
+		$registered_attendees = EEM_Registration::instance()->get_event_registration_count($event->ID());
+
+		$content              = EE_Registry::instance()->CAP->current_user_can(
+			'ee_read_event',
+			'espresso_registrations_view_registration',
+			$event->ID()
+		) && EE_Registry::instance()->CAP->current_user_can(
+			'ee_read_registrations',
+			'espresso_registrations_view_registration'
+		)
+			? '<a href="' . $attendees_link . '">' . $registered_attendees . '</a>'
+			: $registered_attendees;
+		return $this->columnContent('attendees', $content, 'center');
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @return float
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_tkts_sold(EE_Event $event): float
+	{
+		$content = EEM_Ticket::instance()->sum([['Datetime.EVT_ID' => $event->ID()]], 'TKT_sold');
+		return $this->columnContent('tkts_sold', $content);
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function column_actions(EE_Event $event): string
+	{
+		// todo: remove when attendees is active
+		if (! defined('REG_ADMIN_URL')) {
+			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
+		}
+		$action_links   = [];
+		$view_link      = get_permalink($event->ID());
+		$action_links[] = '<a href="' . $view_link . '" class="ee-aria-tooltip button button--icon-only"'
+						  . ' aria-label="' . esc_attr__('View Event', 'event_espresso') . '" target="_blank">
                           <span class="dashicons dashicons-visibility"></span></a>';
-        if (
-            EE_Registry::instance()->CAP->current_user_can(
-                'ee_edit_event',
-                'espresso_events_edit',
-                $event->ID()
-            )
-        ) {
-            $edit_query_args = [
-                'action' => 'edit',
-                'post'   => $event->ID(),
-            ];
-            $edit_link       = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
-            $action_links[]  = '<a href="' . $edit_link . '" class="ee-aria-tooltip button button--icon-only"'
-                               . ' aria-label="' . esc_attr__('Edit Event', 'event_espresso') . '">'
-                               . '<span class="dashicons dashicons-calendar-alt"></span>'
-                               . '</a>';
-        }
-        if (
-            EE_Registry::instance()->CAP->current_user_can(
-                'ee_read_registrations',
-                'espresso_registrations_view_registration'
-            )
-            && EE_Registry::instance()->CAP->current_user_can(
-                'ee_read_event',
-                'espresso_registrations_view_registration',
-                $event->ID()
-            )
-        ) {
-            $attendees_query_args = [
-                'action'   => 'default',
-                'event_id' => $event->ID(),
-            ];
-            $attendees_link       = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
-            $action_links[]       = '<a href="' . $attendees_link . '" class="ee-aria-tooltip button button--icon-only"'
-                                    . ' aria-label="' . esc_attr__('View Registrants', 'event_espresso') . '">'
-                                    . '<span class="dashicons dashicons-groups"></span>'
-                                    . '</a>';
-        }
-        $action_links = apply_filters(
-            'FHEE__Events_Admin_List_Table__column_actions__action_links',
-            $action_links,
-            $event
-        );
-        $content      = $this->_action_string(
-            implode("\n\t", $action_links),
-            $event,
-            'div',
-            'event-overview-actions ee-list-table-actions'
-        );
-        return $this->columnContent('actions', $this->actionsModalMenu($content));
-    }
-
-
-    /**
-     * Helper for adding columns conditionally
-     *
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    private function addConditionalColumns()
-    {
-        $event_category_count = EEM_Term::instance()->count(
-            [['Term_Taxonomy.taxonomy' => EEM_CPT_Base::EVENT_CATEGORY_TAXONOMY]]
-        );
-        if ($event_category_count === 0) {
-            return;
-        }
-        $column_array = [];
-        foreach ($this->_columns as $column => $column_label) {
-            $column_array[ $column ] = $column_label;
-            if ($column === 'venue') {
-                $column_array['event_category'] = esc_html__('Event Category', 'event_espresso');
-            }
-        }
-        $this->_columns = $column_array;
-    }
+		if (
+			EE_Registry::instance()->CAP->current_user_can(
+				'ee_edit_event',
+				'espresso_events_edit',
+				$event->ID()
+			)
+		) {
+			$edit_query_args = [
+				'action' => 'edit',
+				'post'   => $event->ID(),
+			];
+			$edit_link       = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
+			$action_links[]  = '<a href="' . $edit_link . '" class="ee-aria-tooltip button button--icon-only"'
+							   . ' aria-label="' . esc_attr__('Edit Event', 'event_espresso') . '">'
+							   . '<span class="dashicons dashicons-calendar-alt"></span>'
+							   . '</a>';
+		}
+		if (
+			EE_Registry::instance()->CAP->current_user_can(
+				'ee_read_registrations',
+				'espresso_registrations_view_registration'
+			)
+			&& EE_Registry::instance()->CAP->current_user_can(
+				'ee_read_event',
+				'espresso_registrations_view_registration',
+				$event->ID()
+			)
+		) {
+			$attendees_query_args = [
+				'action'   => 'default',
+				'event_id' => $event->ID(),
+			];
+			$attendees_link       = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL);
+			$action_links[]       = '<a href="' . $attendees_link . '" class="ee-aria-tooltip button button--icon-only"'
+									. ' aria-label="' . esc_attr__('View Registrants', 'event_espresso') . '">'
+									. '<span class="dashicons dashicons-groups"></span>'
+									. '</a>';
+		}
+		$action_links = apply_filters(
+			'FHEE__Events_Admin_List_Table__column_actions__action_links',
+			$action_links,
+			$event
+		);
+		$content      = $this->_action_string(
+			implode("\n\t", $action_links),
+			$event,
+			'div',
+			'event-overview-actions ee-list-table-actions'
+		);
+		return $this->columnContent('actions', $this->actionsModalMenu($content));
+	}
+
+
+	/**
+	 * Helper for adding columns conditionally
+	 *
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	private function addConditionalColumns()
+	{
+		$event_category_count = EEM_Term::instance()->count(
+			[['Term_Taxonomy.taxonomy' => EEM_CPT_Base::EVENT_CATEGORY_TAXONOMY]]
+		);
+		if ($event_category_count === 0) {
+			return;
+		}
+		$column_array = [];
+		foreach ($this->_columns as $column => $column_label) {
+			$column_array[ $column ] = $column_label;
+			if ($column === 'venue') {
+				$column_array['event_category'] = esc_html__('Event Category', 'event_espresso');
+			}
+		}
+		$this->_columns = $column_array;
+	}
 }