';
$pay_later_label .= __( "You have PayPal vaulting enabled, that's why Pay Later Messaging options are unavailable now. You cannot use both features at the same time.", 'woocommerce-paypal-payments' );
diff --git a/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php b/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
index c39d03745..b11116878 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
@@ -14,6 +14,7 @@ use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PaymentsEndpoint;
use WooCommerce\PayPalCommerce\ApiClient\Factory\PayerFactory;
use WooCommerce\PayPalCommerce\ApiClient\Factory\PurchaseUnitFactory;
+use WooCommerce\PayPalCommerce\ApiClient\Factory\ShippingPreferenceFactory;
use WooCommerce\PayPalCommerce\Onboarding\Environment;
use WooCommerce\PayPalCommerce\Onboarding\State;
use WooCommerce\PayPalCommerce\Session\SessionHandler;
@@ -111,6 +112,13 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
*/
private $purchase_unit_factory;
+ /**
+ * The shipping_preference factory.
+ *
+ * @var ShippingPreferenceFactory
+ */
+ private $shipping_preference_factory;
+
/**
* The payer factory.
*
@@ -167,6 +175,7 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
* @param TransactionUrlProvider $transaction_url_provider Service able to provide view transaction url base.
* @param PaymentTokenRepository $payment_token_repository The payment token repository.
* @param PurchaseUnitFactory $purchase_unit_factory The purchase unit factory.
+ * @param ShippingPreferenceFactory $shipping_preference_factory The shipping_preference factory.
* @param PayerFactory $payer_factory The payer factory.
* @param OrderEndpoint $order_endpoint The order endpoint.
* @param SubscriptionHelper $subscription_helper The subscription helper.
@@ -186,6 +195,7 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
TransactionUrlProvider $transaction_url_provider,
PaymentTokenRepository $payment_token_repository,
PurchaseUnitFactory $purchase_unit_factory,
+ ShippingPreferenceFactory $shipping_preference_factory,
PayerFactory $payer_factory,
OrderEndpoint $order_endpoint,
SubscriptionHelper $subscription_helper,
@@ -252,16 +262,17 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
)
);
- $this->module_url = $module_url;
- $this->payment_token_repository = $payment_token_repository;
- $this->purchase_unit_factory = $purchase_unit_factory;
- $this->payer_factory = $payer_factory;
- $this->order_endpoint = $order_endpoint;
- $this->transaction_url_provider = $transaction_url_provider;
- $this->subscription_helper = $subscription_helper;
- $this->logger = $logger;
- $this->payments_endpoint = $payments_endpoint;
- $this->state = $state;
+ $this->module_url = $module_url;
+ $this->payment_token_repository = $payment_token_repository;
+ $this->purchase_unit_factory = $purchase_unit_factory;
+ $this->shipping_preference_factory = $shipping_preference_factory;
+ $this->payer_factory = $payer_factory;
+ $this->order_endpoint = $order_endpoint;
+ $this->transaction_url_provider = $transaction_url_provider;
+ $this->subscription_helper = $subscription_helper;
+ $this->logger = $logger;
+ $this->payments_endpoint = $payments_endpoint;
+ $this->state = $state;
}
/**
diff --git a/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php b/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
index 9770f7c28..1aabbfc5a 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
@@ -12,13 +12,14 @@ namespace WooCommerce\PayPalCommerce\WcGateway\Gateway;
use Psr\Log\LoggerInterface;
use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PaymentsEndpoint;
-use WooCommerce\PayPalCommerce\ApiClient\Entity\CaptureStatus;
+use WooCommerce\PayPalCommerce\ApiClient\Factory\ShippingPreferenceFactory;
use WooCommerce\PayPalCommerce\Onboarding\Environment;
use WooCommerce\PayPalCommerce\Onboarding\State;
use WooCommerce\PayPalCommerce\Session\SessionHandler;
use WooCommerce\PayPalCommerce\Subscription\Helper\SubscriptionHelper;
use WooCommerce\PayPalCommerce\Vaulting\PaymentTokenRepository;
use WooCommerce\PayPalCommerce\WcGateway\FundingSource\FundingSourceRenderer;
+use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayUponInvoice\PayUponInvoiceGateway;
use WooCommerce\PayPalCommerce\WcGateway\Processor\AuthorizedPaymentsProcessor;
use WooCommerce\PayPalCommerce\WcGateway\Processor\OrderProcessor;
use WooCommerce\PayPalCommerce\WcGateway\Processor\RefundProcessor;
@@ -118,6 +119,13 @@ class PayPalGateway extends \WC_Payment_Gateway {
*/
protected $payment_token_repository;
+ /**
+ * The shipping_preference factory.
+ *
+ * @var ShippingPreferenceFactory
+ */
+ private $shipping_preference_factory;
+
/**
* The payments endpoint
*
@@ -160,6 +168,13 @@ class PayPalGateway extends \WC_Payment_Gateway {
*/
private $logger;
+ /**
+ * The api shop country.
+ *
+ * @var string
+ */
+ protected $api_shop_country;
+
/**
* PayPalGateway constructor.
*
@@ -176,9 +191,11 @@ class PayPalGateway extends \WC_Payment_Gateway {
* @param string $page_id ID of the current PPCP gateway settings page, or empty if it is not such page.
* @param Environment $environment The environment.
* @param PaymentTokenRepository $payment_token_repository The payment token repository.
+ * @param ShippingPreferenceFactory $shipping_preference_factory The shipping_preference factory.
* @param LoggerInterface $logger The logger.
* @param PaymentsEndpoint $payments_endpoint The payments endpoint.
* @param OrderEndpoint $order_endpoint The order endpoint.
+ * @param string $api_shop_country The api shop country.
*/
public function __construct(
SettingsRenderer $settings_renderer,
@@ -194,9 +211,11 @@ class PayPalGateway extends \WC_Payment_Gateway {
string $page_id,
Environment $environment,
PaymentTokenRepository $payment_token_repository,
+ ShippingPreferenceFactory $shipping_preference_factory,
LoggerInterface $logger,
PaymentsEndpoint $payments_endpoint,
- OrderEndpoint $order_endpoint
+ OrderEndpoint $order_endpoint,
+ string $api_shop_country
) {
$this->id = self::ID;
@@ -214,6 +233,7 @@ class PayPalGateway extends \WC_Payment_Gateway {
$this->id = self::ID;
$this->order_processor = $order_processor;
$this->authorized_payments = $authorized_payments_processor;
+ $this->shipping_preference_factory = $shipping_preference_factory;
$this->settings_renderer = $settings_renderer;
$this->config = $config;
$this->session_handler = $session_handler;
@@ -277,6 +297,7 @@ class PayPalGateway extends \WC_Payment_Gateway {
$this->payments_endpoint = $payments_endpoint;
$this->order_endpoint = $order_endpoint;
$this->state = $state;
+ $this->api_shop_country = $api_shop_country;
}
/**
@@ -342,6 +363,10 @@ class PayPalGateway extends \WC_Payment_Gateway {
if ( $this->is_paypal_tab() ) {
return __( 'PayPal Checkout', 'woocommerce-paypal-payments' );
}
+ if ( $this->is_pui_tab() ) {
+ return __( 'Pay upon Invoice', 'woocommerce-paypal-payments' );
+ }
+
return __( 'PayPal', 'woocommerce-paypal-payments' );
}
@@ -390,6 +415,19 @@ class PayPalGateway extends \WC_Payment_Gateway {
}
+ /**
+ * Whether we are on the PUI tab.
+ *
+ * @return bool
+ */
+ private function is_pui_tab():bool {
+ if ( 'DE' !== $this->api_shop_country ) {
+ return false;
+ }
+
+ return is_admin() && PayUponInvoiceGateway::ID === $this->page_id;
+ }
+
/**
* Whether we are on the Webhooks Status tab.
*
diff --git a/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/FraudNet.php b/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/FraudNet.php
new file mode 100644
index 000000000..49fa9aad8
--- /dev/null
+++ b/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/FraudNet.php
@@ -0,0 +1,59 @@
+session_id = $session_id;
+ $this->source_website_id = $source_website_id;
+ }
+
+ /**
+ * Returns the session ID.
+ *
+ * @return string
+ */
+ public function session_id(): string {
+ return $this->session_id;
+ }
+
+ /**
+ * Returns the source website id.
+ *
+ * @return string
+ */
+ public function source_website_id(): string {
+ return $this->source_website_id;
+ }
+}
diff --git a/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/FraudNetSessionId.php b/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/FraudNetSessionId.php
new file mode 100644
index 000000000..358c50958
--- /dev/null
+++ b/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/FraudNetSessionId.php
@@ -0,0 +1,47 @@
+session === null ) {
+ return '';
+ }
+
+ if ( WC()->session->get( 'ppcp_fraudnet_session_id' ) ) {
+ return WC()->session->get( 'ppcp_fraudnet_session_id' );
+ }
+
+ // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+ if ( isset( $_GET['pay_for_order'] ) && 'true' === $_GET['pay_for_order'] ) {
+ $pui_pay_for_order_session_id = filter_input( INPUT_POST, 'pui_pay_for_order_session_id', FILTER_SANITIZE_STRING );
+ if ( $pui_pay_for_order_session_id && '' !== $pui_pay_for_order_session_id ) {
+ return $pui_pay_for_order_session_id;
+ }
+ }
+
+ $session_id = bin2hex( random_bytes( 16 ) );
+ WC()->session->set( 'ppcp_fraudnet_session_id', $session_id );
+
+ return $session_id;
+ }
+}
diff --git a/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/FraudNetSourceWebsiteId.php b/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/FraudNetSourceWebsiteId.php
new file mode 100644
index 000000000..6ce1453f3
--- /dev/null
+++ b/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/FraudNetSourceWebsiteId.php
@@ -0,0 +1,41 @@
+api_merchant_id = $api_merchant_id;
+ }
+
+ /**
+ * Returns the source website ID.
+ *
+ * @return string
+ */
+ public function __invoke() {
+ return "{$this->api_merchant_id}_checkout-page";
+ }
+}
diff --git a/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PayUponInvoice.php b/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PayUponInvoice.php
new file mode 100644
index 000000000..87f89997a
--- /dev/null
+++ b/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PayUponInvoice.php
@@ -0,0 +1,538 @@
+module_url = $module_url;
+ $this->fraud_net = $fraud_net;
+ $this->pui_order_endpoint = $pui_order_endpoint;
+ $this->logger = $logger;
+ $this->settings = $settings;
+ $this->environment = $environment;
+ $this->asset_version = $asset_version;
+ $this->state = $state;
+ $this->is_ppcp_settings_page = $is_ppcp_settings_page;
+ $this->current_ppcp_settings_page_id = $current_ppcp_settings_page_id;
+ $this->pui_product_status = $pui_product_status;
+ $this->pui_helper = $pui_helper;
+ $this->capture_factory = $capture_factory;
+ }
+
+ /**
+ * Initializes PUI integration.
+ *
+ * @throws NotFoundException When setting is not found.
+ */
+ public function init(): void {
+ add_filter(
+ 'ppcp_partner_referrals_data',
+ function ( array $data ): array {
+ if ( $this->settings->has( 'ppcp-onboarding-pui' ) && $this->settings->get( 'ppcp-onboarding-pui' ) !== '1' ) {
+ return $data;
+ }
+
+ $data['business_entity'] = array(
+ 'business_type' => array(
+ 'type' => 'PRIVATE_CORPORATION',
+ ),
+ 'addresses' => array(
+ array(
+ 'address_line_1' => WC()->countries->get_base_address(),
+ 'admin_area_1' => WC()->countries->get_base_city(),
+ 'postal_code' => WC()->countries->get_base_postcode(),
+ 'country_code' => WC()->countries->get_base_country(),
+ 'type' => 'WORK',
+ ),
+ ),
+ );
+
+ if ( in_array( 'PPCP', $data['products'], true ) ) {
+ $data['products'][] = 'PAYMENT_METHODS';
+ } elseif ( in_array( 'EXPRESS_CHECKOUT', $data['products'], true ) ) {
+ $data['products'][0] = 'PAYMENT_METHODS';
+ }
+ $data['capabilities'][] = 'PAY_UPON_INVOICE';
+
+ return $data;
+ }
+ );
+
+ add_action(
+ 'wp_enqueue_scripts',
+ array( $this, 'register_assets' )
+ );
+
+ add_action(
+ 'ppcp_payment_capture_completed_webhook_handler',
+ function ( WC_Order $wc_order, string $order_id ) {
+ try {
+ $order = $this->pui_order_endpoint->order( $order_id );
+
+ $payment_instructions = array(
+ $order->payment_source->pay_upon_invoice->payment_reference,
+ $order->payment_source->pay_upon_invoice->deposit_bank_details,
+ );
+ $wc_order->update_meta_data(
+ 'ppcp_ratepay_payment_instructions_payment_reference',
+ $payment_instructions
+ );
+ $wc_order->save_meta_data();
+ $this->logger->info( "Ratepay payment instructions added to order #{$wc_order->get_id()}." );
+
+ $capture = $this->capture_factory->from_paypal_response( $order->purchase_units[0]->payments->captures[0] );
+ $breakdown = $capture->seller_receivable_breakdown();
+ if ( $breakdown ) {
+ $wc_order->update_meta_data( PayPalGateway::FEES_META_KEY, $breakdown->to_array() );
+ $wc_order->save_meta_data();
+ }
+ } catch ( RuntimeException $exception ) {
+ $this->logger->error( $exception->getMessage() );
+ }
+ },
+ 10,
+ 2
+ );
+
+ add_action(
+ 'woocommerce_email_before_order_table',
+ function( WC_Order $order, bool $sent_to_admin ) {
+ if ( ! $sent_to_admin && PayUponInvoiceGateway::ID === $order->get_payment_method() && $order->has_status( 'processing' ) ) {
+ $this->logger->info( "Adding Ratepay payment instructions to email for order #{$order->get_id()}." );
+
+ $instructions = $order->get_meta( 'ppcp_ratepay_payment_instructions_payment_reference' );
+
+ $gateway_settings = get_option( 'woocommerce_ppcp-pay-upon-invoice-gateway_settings' );
+ $merchant_name = $gateway_settings['brand_name'] ?? '';
+
+ $order_date = $order->get_date_created();
+ if ( null === $order_date ) {
+ $this->logger->error( 'Could not get WC order date for Ratepay payment instructions.' );
+ return;
+ }
+
+ $order_purchase_date = $order_date->date( 'd-m-Y' );
+ $order_time = $order_date->date( 'H:i:s' );
+ $order_date = $order_date->date( 'd-m-Y H:i:s' );
+
+ $thirty_days_date = strtotime( $order_date . ' +30 days' );
+ if ( false === $thirty_days_date ) {
+ $this->logger->error( 'Could not create +30 days date from WC order date.' );
+ return;
+ }
+ $order_date_30d = gmdate( 'd-m-Y', $thirty_days_date );
+
+ $payment_reference = $instructions[0] ?? '';
+ $bic = $instructions[1]->bic ?? '';
+ $bank_name = $instructions[1]->bank_name ?? '';
+ $iban = $instructions[1]->iban ?? '';
+ $account_holder_name = $instructions[1]->account_holder_name ?? '';
+
+ echo wp_kses_post( "Für Ihre Bestellung #{$order->get_id()} ({$order_purchase_date} $order_time) bei {$merchant_name} haben Sie die Zahlung mittels “Rechnungskauf mit Ratepay“ gewählt." );
+ echo '
Bitte benutzen Sie die folgenden Informationen für Ihre Überweisung:';
+ echo wp_kses_post( "
Bitte überweisen Sie den Betrag in Höhe von {$order->get_currency()}{$order->get_total()} bis zum {$order_date_30d} auf das unten angegebene Konto. Wichtig: Bitte geben Sie unbedingt als Verwendungszweck {$payment_reference} an, sonst kann die Zahlung nicht zugeordnet werden.
" );
+
+ echo '';
+ echo wp_kses_post( "- Empfänger: {$account_holder_name}
" );
+ echo wp_kses_post( "- IBAN: {$iban}
" );
+ echo wp_kses_post( "- BIC: {$bic}
" );
+ echo wp_kses_post( "- Name der Bank: {$bank_name}
" );
+ echo wp_kses_post( "- Verwendungszweck: {$payment_reference}
" );
+ echo '
';
+
+ echo wp_kses_post( "{$merchant_name} hat die Forderung gegen Sie an die PayPal (Europe) S.à r.l. et Cie, S.C.A. abgetreten, die wiederum die Forderung an Ratepay GmbH abgetreten hat. Zahlungen mit schuldbefreiender Wirkung können nur an die Ratepay GmbH geleistet werden.
" );
+
+ echo 'Mit freundlichen Grüßen';
+ echo '
';
+ echo wp_kses_post( "{$merchant_name}
" );
+ }
+ },
+ 10,
+ 3
+ );
+
+ add_filter(
+ 'woocommerce_gateway_description',
+ function( string $description, string $id ): string {
+ if ( PayUponInvoiceGateway::ID === $id ) {
+ ob_start();
+
+ $site_country_code = explode( '-', get_bloginfo( 'language' ) )[0] ?? '';
+
+ echo '';
+
+ woocommerce_form_field(
+ 'billing_birth_date',
+ array(
+ 'type' => 'date',
+ 'label' => 'de' === $site_country_code ? 'Geburtsdatum' : 'Birth date',
+ 'class' => array( 'form-row-wide' ),
+ 'required' => true,
+ 'clear' => true,
+ )
+ );
+
+ echo '
';
+
+ // phpcs:ignore WordPress.WP.I18n.TextDomainMismatch
+ $button_text = apply_filters( 'woocommerce_order_button_text', __( 'Place order', 'woocommerce' ) );
+
+ if ( 'de' === $site_country_code ) {
+ echo wp_kses_post(
+ 'Mit Klicken auf ' . $button_text . ' akzeptieren Sie die
Ratepay Zahlungsbedingungen und erklären sich mit der Durchführung einer
Risikoprüfung durch Ratepay, unseren Partner, einverstanden. Sie akzeptieren auch PayPals
Datenschutzerklärung. Falls Ihre Transaktion per Kauf auf Rechnung erfolgreich abgewickelt werden kann, wird der Kaufpreis an Ratepay abgetreten und Sie dürfen nur an Ratepay überweisen, nicht an den Händler.'
+ );
+ } else {
+ echo wp_kses_post(
+ 'By clicking on ' . $button_text . ', you agree to the
terms of payment and
performance of a risk check from the payment partner, Ratepay. You also agree to PayPal’s
privacy statement. If your request to purchase upon invoice is accepted, the purchase price claim will be assigned to Ratepay, and you may only pay Ratepay, not the merchant.'
+ );
+ }
+ echo '
+ ' . $message . '';
+ },
+ $error_messages
+ )
+ ?>
+
+ get_payment_method() === 'ppcp-pay-upon-invoice-gateway' ) {
+ $instructions = $order->get_meta( 'ppcp_ratepay_payment_instructions_payment_reference' );
+ if ( $instructions ) {
+ add_meta_box(
+ 'ppcp_pui_ratepay_payment_instructions',
+ __( 'RatePay payment instructions', 'woocommerce-paypal-payments' ),
+ function() use ( $instructions ) {
+ $payment_reference = $instructions[0] ?? '';
+ $bic = $instructions[1]->bic ?? '';
+ $bank_name = $instructions[1]->bank_name ?? '';
+ $iban = $instructions[1]->iban ?? '';
+ $account_holder_name = $instructions[1]->account_holder_name ?? '';
+
+ echo '';
+ echo wp_kses_post( "- Empfänger: {$account_holder_name}
" );
+ echo wp_kses_post( "- IBAN: {$iban}
" );
+ echo wp_kses_post( "- BIC: {$bic}
" );
+ echo wp_kses_post( "- Name der Bank: {$bank_name}
" );
+ echo wp_kses_post( "- Verwendungszweck: {$payment_reference}
" );
+ echo '
';
+ },
+ $post_type,
+ 'side',
+ 'high'
+ );
+ }
+ }
+ }
+ }
+ );
+ }
+
+ /**
+ * Registers PUI assets.
+ */
+ public function register_assets(): void {
+ $gateway_settings = get_option( 'woocommerce_ppcp-pay-upon-invoice-gateway_settings' );
+ $gateway_enabled = $gateway_settings['enabled'] ?? '';
+ if ( $gateway_enabled === 'yes' && ( is_checkout() || is_checkout_pay_page() ) ) {
+ wp_enqueue_script(
+ 'ppcp-pay-upon-invoice',
+ trailingslashit( $this->module_url ) . 'assets/js/pay-upon-invoice.js',
+ array(),
+ $this->asset_version,
+ true
+ );
+
+ wp_localize_script(
+ 'ppcp-pay-upon-invoice',
+ 'FraudNetConfig',
+ array(
+ 'f' => $this->fraud_net->session_id(),
+ 's' => $this->fraud_net->source_website_id(),
+ 'sandbox' => $this->environment->current_environment_is( Environment::SANDBOX ),
+ )
+ );
+ }
+ }
+}
diff --git a/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PayUponInvoiceGateway.php b/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PayUponInvoiceGateway.php
new file mode 100644
index 000000000..fe9d53d38
--- /dev/null
+++ b/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PayUponInvoiceGateway.php
@@ -0,0 +1,274 @@
+id = self::ID;
+
+ $this->method_title = __( 'Pay upon Invoice', 'woocommerce-paypal-payments' );
+ $this->method_description = __( 'Pay upon Invoice is an invoice payment method in Germany. It is a local buy now, pay later payment method that allows the buyer to place an order, receive the goods, try them, verify they are in good order, and then pay the invoice within 30 days.', 'woocommerce-paypal-payments' );
+
+ $gateway_settings = get_option( 'woocommerce_ppcp-pay-upon-invoice-gateway_settings' );
+ $this->title = $gateway_settings['title'] ?? $this->method_title;
+ $this->description = $gateway_settings['description'] ?? __( 'Once you place an order, pay within 30 days. Our payment partner Ratepay will send you payment instructions.', 'woocommerce-paypal-payments' );
+
+ $this->init_form_fields();
+ $this->init_settings();
+
+ add_action(
+ 'woocommerce_update_options_payment_gateways_' . $this->id,
+ array(
+ $this,
+ 'process_admin_options',
+ )
+ );
+
+ $this->order_endpoint = $order_endpoint;
+ $this->purchase_unit_factory = $purchase_unit_factory;
+ $this->payment_source_factory = $payment_source_factory;
+ $this->logger = $logger;
+ $this->environment = $environment;
+ $this->transaction_url_provider = $transaction_url_provider;
+ $this->pui_helper = $pui_helper;
+ }
+
+ /**
+ * Initialize the form fields.
+ */
+ public function init_form_fields() {
+ $this->form_fields = array(
+ 'enabled' => array(
+ 'title' => __( 'Enable/Disable', 'woocommerce-paypal-payments' ),
+ 'type' => 'checkbox',
+ 'label' => __( 'Pay upon Invoice', 'woocommerce-paypal-payments' ),
+ 'default' => 'no',
+ 'desc_tip' => true,
+ 'description' => __( 'Enable/Disable Pay upon Invoice payment gateway.', 'woocommerce-paypal-payments' ),
+ ),
+ 'title' => array(
+ 'title' => __( 'Title', 'woocommerce-paypal-payments' ),
+ 'type' => 'text',
+ 'default' => $this->title,
+ 'desc_tip' => true,
+ 'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce-paypal-payments' ),
+ ),
+ 'description' => array(
+ 'title' => __( 'Description', 'woocommerce-paypal-payments' ),
+ 'type' => 'text',
+ 'default' => $this->description,
+ 'desc_tip' => true,
+ 'description' => __( 'This controls the description which the user sees during checkout.', 'woocommerce-paypal-payments' ),
+ ),
+ 'experience_context' => array(
+ 'title' => __( 'Experience Context', 'woocommerce-paypal-payments' ),
+ 'type' => 'title',
+ 'description' => __( "Specify brand name, logo and customer service instructions to be presented on Ratepay's payment instructions.", 'woocommerce-paypal-payments' ),
+ ),
+ 'brand_name' => array(
+ 'title' => __( 'Brand name', 'woocommerce-paypal-payments' ),
+ 'type' => 'text',
+ 'default' => get_bloginfo( 'name' ) ?? '',
+ 'desc_tip' => true,
+ 'description' => __( 'Merchant name displayed in Ratepay\'s payment instructions.', 'woocommerce-paypal-payments' ),
+ ),
+ 'logo_url' => array(
+ 'title' => __( 'Logo URL', 'woocommerce-paypal-payments' ),
+ 'type' => 'url',
+ 'default' => '',
+ 'desc_tip' => true,
+ 'description' => __( 'Logo to be presented on Ratepay\'s payment instructions.', 'woocommerce-paypal-payments' ),
+ ),
+ 'customer_service_instructions' => array(
+ 'title' => __( 'Customer service instructions', 'woocommerce-paypal-payments' ),
+ 'type' => 'text',
+ 'default' => '',
+ 'desc_tip' => true,
+ 'description' => __( 'Customer service instructions to be presented on Ratepay\'s payment instructions.', 'woocommerce-paypal-payments' ),
+ ),
+ );
+ }
+
+ /**
+ * Processes the order.
+ *
+ * @param int $order_id The WC order ID.
+ * @return array
+ */
+ public function process_payment( $order_id ) {
+ $wc_order = wc_get_order( $order_id );
+ $birth_date = filter_input( INPUT_POST, 'billing_birth_date', FILTER_SANITIZE_STRING ) ?? '';
+
+ $pay_for_order = filter_input( INPUT_GET, 'pay_for_order', FILTER_SANITIZE_STRING );
+ if ( 'true' === $pay_for_order ) {
+ if ( ! $this->pui_helper->validate_birth_date( $birth_date ) ) {
+ wc_add_notice( 'Invalid birth date.', 'error' );
+ return array(
+ 'result' => 'failure',
+ );
+ }
+ }
+
+ $wc_order->update_status( 'on-hold', __( 'Awaiting Pay upon Invoice payment.', 'woocommerce-paypal-payments' ) );
+ $purchase_unit = $this->purchase_unit_factory->from_wc_order( $wc_order );
+ $payment_source = $this->payment_source_factory->from_wc_order( $wc_order, $birth_date );
+
+ try {
+ $order = $this->order_endpoint->create( array( $purchase_unit ), $payment_source );
+ $this->add_paypal_meta( $wc_order, $order, $this->environment );
+
+ as_schedule_single_action(
+ time() + ( 5 * MINUTE_IN_SECONDS ),
+ 'woocommerce_paypal_payments_check_pui_payment_captured',
+ array(
+ 'wc_order_id' => $order_id,
+ 'order_id' => $order->id(),
+ )
+ );
+
+ WC()->cart->empty_cart();
+
+ return array(
+ 'result' => 'success',
+ 'redirect' => $this->get_return_url( $wc_order ),
+ );
+ } catch ( RuntimeException $exception ) {
+ $error = $exception->getMessage();
+
+ if ( is_a( $exception, PayPalApiException::class ) && is_array( $exception->details() ) ) {
+ $details = '';
+ foreach ( $exception->details() as $detail ) {
+ $issue = $detail->issue ?? '';
+ $field = $detail->field ?? '';
+ $description = $detail->description ?? '';
+ $details .= $issue . ' ' . $field . ' ' . $description . '
';
+ }
+
+ $error = $details;
+ }
+
+ $this->logger->error( $error );
+ wc_add_notice( $error, 'error' );
+
+ $wc_order->update_status(
+ 'failed',
+ $error
+ );
+
+ return array(
+ 'result' => 'failure',
+ 'redirect' => wc_get_checkout_url(),
+ );
+ }
+ }
+
+ /**
+ * Return transaction url for this gateway and given order.
+ *
+ * @param WC_Order $order WC order to get transaction url by.
+ *
+ * @return string
+ */
+ public function get_transaction_url( $order ): string {
+ $this->view_transaction_url = $this->transaction_url_provider->get_transaction_url_base( $order );
+
+ return parent::get_transaction_url( $order );
+ }
+}
diff --git a/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PaymentSource.php b/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PaymentSource.php
new file mode 100644
index 000000000..bac9791cb
--- /dev/null
+++ b/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PaymentSource.php
@@ -0,0 +1,322 @@
+given_name = $given_name;
+ $this->surname = $surname;
+ $this->email = $email;
+ $this->birth_date = $birth_date;
+ $this->national_number = $national_number;
+ $this->phone_country_code = $phone_country_code;
+ $this->address_line_1 = $address_line_1;
+ $this->admin_area_2 = $admin_area_2;
+ $this->postal_code = $postal_code;
+ $this->country_code = $country_code;
+ $this->locale = $locale;
+ $this->brand_name = $brand_name;
+ $this->logo_url = $logo_url;
+ $this->customer_service_instructions = $customer_service_instructions;
+ }
+
+ /**
+ * Returns the given name.
+ *
+ * @return string
+ */
+ public function given_name(): string {
+ return $this->given_name;
+ }
+
+ /**
+ * Returns the surname.
+ *
+ * @return string
+ */
+ public function surname(): string {
+ return $this->surname;
+ }
+
+ /**
+ * Returns the email.
+ *
+ * @return string
+ */
+ public function email(): string {
+ return $this->email;
+ }
+
+ /**
+ * Returns the birth date.
+ *
+ * @return string
+ */
+ public function birth_date(): string {
+ return $this->birth_date;
+ }
+
+ /**
+ * Returns the national number.
+ *
+ * @return string
+ */
+ public function national_number(): string {
+ return $this->national_number;
+ }
+
+ /**
+ * Returns the phone country code.
+ *
+ * @return string
+ */
+ public function phone_country_code(): string {
+ return $this->phone_country_code;
+ }
+
+ /**
+ * Returns the address line 1.
+ *
+ * @return string
+ */
+ public function address_line_1(): string {
+ return $this->address_line_1;
+ }
+
+ /**
+ * Returns the admin area 2.
+ *
+ * @return string
+ */
+ public function admin_area_2(): string {
+ return $this->admin_area_2;
+ }
+
+ /**
+ * Returns the postal code.
+ *
+ * @return string
+ */
+ public function postal_code(): string {
+ return $this->postal_code;
+ }
+
+ /**
+ * Returns the country code.
+ *
+ * @return string
+ */
+ public function country_code(): string {
+ return $this->country_code;
+ }
+
+ /**
+ * Returns the locale.
+ *
+ * @return string
+ */
+ public function locale(): string {
+ return $this->locale;
+ }
+
+ /**
+ * Returns the brand name.
+ *
+ * @return string
+ */
+ public function brand_name(): string {
+ return $this->brand_name;
+ }
+
+ /**
+ * The logo URL.
+ *
+ * @return string
+ */
+ public function logo_url(): string {
+ return $this->logo_url;
+ }
+
+ /**
+ * Returns the customer service instructions.
+ *
+ * @return array
+ */
+ public function customer_service_instructions(): array {
+ return $this->customer_service_instructions;
+ }
+
+ /**
+ * Returns payment source as array.
+ *
+ * @return array
+ */
+ public function to_array(): array {
+ return array(
+ 'name' => array(
+ 'given_name' => $this->given_name(),
+ 'surname' => $this->surname(),
+ ),
+ 'email' => $this->email(),
+ 'birth_date' => $this->birth_date(),
+ 'phone' => array(
+ 'national_number' => $this->national_number(),
+ 'country_code' => $this->phone_country_code(),
+ ),
+ 'billing_address' => array(
+ 'address_line_1' => $this->address_line_1(),
+ 'admin_area_2' => $this->admin_area_2(),
+ 'postal_code' => $this->postal_code(),
+ 'country_code' => $this->country_code(),
+ ),
+ 'experience_context' => array(
+ 'locale' => $this->locale(),
+ 'brand_name' => $this->brand_name(),
+ 'logo_url' => $this->logo_url(),
+ 'customer_service_instructions' => $this->customer_service_instructions(),
+ ),
+ );
+ }
+}
diff --git a/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PaymentSourceFactory.php b/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PaymentSourceFactory.php
new file mode 100644
index 000000000..d4dc82562
--- /dev/null
+++ b/modules/ppcp-wc-gateway/src/Gateway/PayUponInvoice/PaymentSourceFactory.php
@@ -0,0 +1,59 @@
+get_address();
+
+ $phone_country_code = WC()->countries->get_country_calling_code( $address['country'] );
+ $phone_country_code = is_array( $phone_country_code ) && ! empty( $phone_country_code ) ? $phone_country_code[0] : $phone_country_code;
+ if ( is_string( $phone_country_code ) && '' !== $phone_country_code ) {
+ $phone_country_code = substr( $phone_country_code, strlen( '+' ) ) ?: '';
+ } else {
+ $phone_country_code = '';
+ }
+
+ $gateway_settings = get_option( 'woocommerce_ppcp-pay-upon-invoice-gateway_settings' );
+ $merchant_name = $gateway_settings['brand_name'] ?? '';
+ $logo_url = $gateway_settings['logo_url'] ?? '';
+ $customer_service_instructions = $gateway_settings['customer_service_instructions'] ?? '';
+
+ return new PaymentSource(
+ $address['first_name'] ?? '',
+ $address['last_name'] ?? '',
+ $address['email'] ?? '',
+ $birth_date,
+ preg_replace( '/[^0-9]/', '', $address['phone'] ) ?? '',
+ $phone_country_code,
+ $address['address_1'] ?? '',
+ $address['city'] ?? '',
+ $address['postcode'] ?? '',
+ $address['country'] ?? '',
+ 'en-DE',
+ $merchant_name,
+ $logo_url,
+ array( $customer_service_instructions )
+ );
+ }
+}
diff --git a/modules/ppcp-wc-gateway/src/Gateway/ProcessPaymentTrait.php b/modules/ppcp-wc-gateway/src/Gateway/ProcessPaymentTrait.php
index fa425c6f3..10e0e1313 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/ProcessPaymentTrait.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/ProcessPaymentTrait.php
@@ -82,9 +82,16 @@ trait ProcessPaymentTrait {
$purchase_unit = $this->purchase_unit_factory->from_wc_order( $wc_order );
$payer = $this->payer_factory->from_customer( $customer );
+
+ $shipping_preference = $this->shipping_preference_factory->from_state(
+ $purchase_unit,
+ ''
+ );
+
try {
$order = $this->order_endpoint->create(
array( $purchase_unit ),
+ $shipping_preference,
$payer,
$selected_token
);
diff --git a/modules/ppcp-wc-gateway/src/Helper/PayUponInvoiceHelper.php b/modules/ppcp-wc-gateway/src/Helper/PayUponInvoiceHelper.php
new file mode 100644
index 000000000..32391bb0a
--- /dev/null
+++ b/modules/ppcp-wc-gateway/src/Helper/PayUponInvoiceHelper.php
@@ -0,0 +1,140 @@
+format( $format ) ) {
+ return false;
+ }
+
+ $date_time = strtotime( $date );
+ if ( $date_time && time() < strtotime( '+18 years', $date_time ) ) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Ensures product is ready for PUI.
+ *
+ * @param WC_Product $product WC product.
+ * @return bool
+ */
+ public function product_ready_for_pui( WC_Product $product ):bool {
+ if ( $product->is_downloadable() || $product->is_virtual() ) {
+ return false;
+ }
+
+ if ( is_a( $product, WC_Product_Variable::class ) ) {
+ foreach ( $product->get_available_variations( 'object' ) as $variation ) {
+ if ( is_a( $variation, WC_Product_Variation::class ) ) {
+ if ( true === $variation->is_downloadable() || true === $variation->is_virtual() ) {
+ return false;
+ }
+ }
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Checks whether checkout is ready for PUI.
+ *
+ * @return bool
+ */
+ public function is_checkout_ready_for_pui(): bool {
+ $gateway_settings = get_option( 'woocommerce_ppcp-pay-upon-invoice-gateway_settings' );
+ if ( $gateway_settings && '' === $gateway_settings['customer_service_instructions'] ) {
+ return false;
+ }
+
+ $billing_country = filter_input( INPUT_POST, 'country', FILTER_SANITIZE_STRING ) ?? null;
+ if ( $billing_country && 'DE' !== $billing_country ) {
+ return false;
+ }
+
+ if ( 'EUR' !== get_woocommerce_currency() ) {
+ return false;
+ }
+
+ $cart = WC()->cart ?? null;
+ if ( $cart && ! is_checkout_pay_page() ) {
+ $cart_total = (float) $cart->get_total( 'numeric' );
+ if ( $cart_total < 5 || $cart_total > 2500 ) {
+ return false;
+ }
+
+ $items = $cart->get_cart_contents();
+ foreach ( $items as $item ) {
+ $product = wc_get_product( $item['product_id'] );
+ if ( is_a( $product, WC_Product::class ) && ! $this->product_ready_for_pui( $product ) ) {
+ return false;
+ }
+ }
+ }
+
+ if ( is_wc_endpoint_url( 'order-pay' ) ) {
+ /**
+ * Needed for WordPress `query_vars`.
+ *
+ * @psalm-suppress InvalidGlobal
+ */
+ global $wp;
+
+ if ( isset( $wp->query_vars['order-pay'] ) && absint( $wp->query_vars['order-pay'] ) > 0 ) {
+ $order_id = absint( $wp->query_vars['order-pay'] );
+ $order = wc_get_order( $order_id );
+ if ( is_a( $order, WC_Order::class ) ) {
+ $order_total = (float) $order->get_total();
+ if ( $order_total < 5 || $order_total > 2500 ) {
+ return false;
+ }
+
+ foreach ( $order->get_items() as $item_id => $item ) {
+ if ( is_a( $item, WC_Order_Item_Product::class ) ) {
+ $product = wc_get_product( $item->get_product_id() );
+ if ( is_a( $product, WC_Product::class ) && ! $this->product_ready_for_pui( $product ) ) {
+ return false;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ return true;
+ }
+}
diff --git a/modules/ppcp-wc-gateway/src/Helper/PayUponInvoiceProductStatus.php b/modules/ppcp-wc-gateway/src/Helper/PayUponInvoiceProductStatus.php
new file mode 100644
index 000000000..60b72dc7f
--- /dev/null
+++ b/modules/ppcp-wc-gateway/src/Helper/PayUponInvoiceProductStatus.php
@@ -0,0 +1,106 @@
+settings = $settings;
+ $this->partners_endpoint = $partners_endpoint;
+ }
+
+ /**
+ * Whether the active/subscribed products support PUI.
+ *
+ * @return bool
+ */
+ public function pui_is_active() : bool {
+ if ( is_bool( $this->current_status_cache ) ) {
+ return $this->current_status_cache;
+ }
+ if ( $this->settings->has( 'products_pui_enabled' ) && $this->settings->get( 'products_pui_enabled' ) ) {
+ $this->current_status_cache = true;
+ return true;
+ }
+
+ try {
+ $seller_status = $this->partners_endpoint->seller_status();
+ } catch ( RuntimeException $error ) {
+ $this->current_status_cache = false;
+ return false;
+ }
+
+ foreach ( $seller_status->products() as $product ) {
+ if ( $product->name() !== 'PAYMENT_METHODS' ) {
+ continue;
+ }
+
+ if ( ! in_array(
+ $product->vetting_status(),
+ array(
+ SellerStatusProduct::VETTING_STATUS_APPROVED,
+ SellerStatusProduct::VETTING_STATUS_SUBSCRIBED,
+ ),
+ true
+ )
+ ) {
+ continue;
+ }
+
+ if ( in_array( 'PAY_UPON_INVOICE', $product->capabilities(), true ) ) {
+ $this->settings->set( 'products_pui_enabled', true );
+ $this->settings->persist();
+ $this->current_status_cache = true;
+ return true;
+ }
+ }
+
+ $this->current_status_cache = false;
+ return false;
+ }
+}
diff --git a/modules/ppcp-wc-gateway/src/Processor/OrderMetaTrait.php b/modules/ppcp-wc-gateway/src/Processor/OrderMetaTrait.php
index 3a9049bbd..815f8d73e 100644
--- a/modules/ppcp-wc-gateway/src/Processor/OrderMetaTrait.php
+++ b/modules/ppcp-wc-gateway/src/Processor/OrderMetaTrait.php
@@ -41,6 +41,8 @@ trait OrderMetaTrait {
if ( $payment_source ) {
$wc_order->update_meta_data( PayPalGateway::ORDER_PAYMENT_SOURCE_META_KEY, $payment_source );
}
+
+ $wc_order->save();
}
/**
diff --git a/modules/ppcp-wc-gateway/src/Settings/SectionsRenderer.php b/modules/ppcp-wc-gateway/src/Settings/SectionsRenderer.php
index 2bddabe1b..24faa5201 100644
--- a/modules/ppcp-wc-gateway/src/Settings/SectionsRenderer.php
+++ b/modules/ppcp-wc-gateway/src/Settings/SectionsRenderer.php
@@ -11,6 +11,7 @@ namespace WooCommerce\PayPalCommerce\WcGateway\Settings;
use WooCommerce\PayPalCommerce\WcGateway\Gateway\CreditCardGateway;
use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway;
+use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayUponInvoice\PayUponInvoiceGateway;
use WooCommerce\PayPalCommerce\Webhooks\Status\WebhooksStatusPage;
/**
@@ -27,13 +28,22 @@ class SectionsRenderer {
*/
protected $page_id;
+ /**
+ * The api shop country.
+ *
+ * @var string
+ */
+ protected $api_shop_country;
+
/**
* SectionsRenderer constructor.
*
* @param string $page_id ID of the current PPCP gateway settings page, or empty if it is not such page.
+ * @param string $api_shop_country The api shop country.
*/
- public function __construct( string $page_id ) {
- $this->page_id = $page_id;
+ public function __construct( string $page_id, string $api_shop_country ) {
+ $this->page_id = $page_id;
+ $this->api_shop_country = $api_shop_country;
}
/**
@@ -54,17 +64,25 @@ class SectionsRenderer {
}
$sections = array(
- PayPalGateway::ID => __( 'PayPal Checkout', 'woocommerce-paypal-payments' ),
- CreditCardGateway::ID => __( 'PayPal Card Processing', 'woocommerce-paypal-payments' ),
- WebhooksStatusPage::ID => __( 'Webhooks Status', 'woocommerce-paypal-payments' ),
+ PayPalGateway::ID => __( 'PayPal Checkout', 'woocommerce-paypal-payments' ),
+ CreditCardGateway::ID => __( 'PayPal Card Processing', 'woocommerce-paypal-payments' ),
+ PayUponInvoiceGateway::ID => __( 'Pay upon Invoice', 'woocommerce-paypal-payments' ),
+ WebhooksStatusPage::ID => __( 'Webhooks Status', 'woocommerce-paypal-payments' ),
);
+ if ( 'DE' !== $this->api_shop_country ) {
+ unset( $sections[ PayUponInvoiceGateway::ID ] );
+ }
+
echo '';
$array_keys = array_keys( $sections );
foreach ( $sections as $id => $label ) {
$url = admin_url( 'admin.php?page=wc-settings&tab=checkout§ion=ppcp-gateway&' . self::KEY . '=' . $id );
+ if ( PayUponInvoiceGateway::ID === $id ) {
+ $url = admin_url( 'admin.php?page=wc-settings&tab=checkout§ion=ppcp-pay-upon-invoice-gateway' );
+ }
echo '- ' . esc_html( $label ) . ' ' . ( end( $array_keys ) === $id ? '' : '|' ) . '
';
}
diff --git a/modules/ppcp-wc-gateway/src/Settings/SettingsListener.php b/modules/ppcp-wc-gateway/src/Settings/SettingsListener.php
index 6552008e9..d93b05504 100644
--- a/modules/ppcp-wc-gateway/src/Settings/SettingsListener.php
+++ b/modules/ppcp-wc-gateway/src/Settings/SettingsListener.php
@@ -81,6 +81,20 @@ class SettingsListener {
*/
protected $page_id;
+ /**
+ * The signup link cache.
+ *
+ * @var Cache
+ */
+ protected $signup_link_cache;
+
+ /**
+ * Signup link ids
+ *
+ * @var array
+ */
+ protected $signup_link_ids;
+
/**
* SettingsListener constructor.
*
@@ -91,6 +105,8 @@ class SettingsListener {
* @param State $state The state.
* @param Bearer $bearer The bearer.
* @param string $page_id ID of the current PPCP gateway settings page, or empty if it is not such page.
+ * @param Cache $signup_link_cache The signup link cache.
+ * @param array $signup_link_ids Signup link ids.
*/
public function __construct(
Settings $settings,
@@ -99,7 +115,9 @@ class SettingsListener {
Cache $cache,
State $state,
Bearer $bearer,
- string $page_id
+ string $page_id,
+ Cache $signup_link_cache,
+ array $signup_link_ids
) {
$this->settings = $settings;
@@ -109,6 +127,8 @@ class SettingsListener {
$this->state = $state;
$this->bearer = $bearer;
$this->page_id = $page_id;
+ $this->signup_link_cache = $signup_link_cache;
+ $this->signup_link_ids = $signup_link_ids;
}
/**
@@ -251,6 +271,7 @@ class SettingsListener {
if ( $credentials_change_status ) {
if ( self::CREDENTIALS_UNCHANGED !== $credentials_change_status ) {
$this->settings->set( 'products_dcc_enabled', null );
+ $this->settings->set( 'products_pui_enabled', null );
}
if ( in_array(
@@ -259,6 +280,12 @@ class SettingsListener {
true
) ) {
$this->webhook_registrar->unregister();
+
+ foreach ( $this->signup_link_ids as $key ) {
+ if ( $this->signup_link_cache->has( $key ) ) {
+ $this->signup_link_cache->delete( $key );
+ }
+ }
}
}
diff --git a/modules/ppcp-wc-gateway/src/WCGatewayModule.php b/modules/ppcp-wc-gateway/src/WCGatewayModule.php
index 35eff5a10..8bb469a9d 100644
--- a/modules/ppcp-wc-gateway/src/WCGatewayModule.php
+++ b/modules/ppcp-wc-gateway/src/WCGatewayModule.php
@@ -14,6 +14,7 @@ use Dhii\Modular\Module\ModuleInterface;
use WC_Order;
use WooCommerce\PayPalCommerce\AdminNotices\Repository\Repository;
use WooCommerce\PayPalCommerce\ApiClient\Entity\Capture;
+use WooCommerce\PayPalCommerce\ApiClient\Entity\OrderStatus;
use WooCommerce\PayPalCommerce\ApiClient\Helper\DccApplies;
use WooCommerce\PayPalCommerce\ApiClient\Repository\PayPalRequestIdRepository;
use WooCommerce\PayPalCommerce\WcGateway\Admin\FeesRenderer;
@@ -214,7 +215,7 @@ class WCGatewayModule implements ModuleInterface {
assert( $settings instanceof Settings );
try {
- if ( $settings->get( '3d_secure_contingency' ) === '3D_SECURE' ) {
+ if ( $settings->has( '3d_secure_contingency' ) && $settings->get( '3d_secure_contingency' ) === '3D_SECURE' ) {
$settings->set( '3d_secure_contingency', 'SCA_ALWAYS' );
$settings->persist();
}
@@ -223,6 +224,42 @@ class WCGatewayModule implements ModuleInterface {
}
}
);
+
+ add_action(
+ 'init',
+ function () use ( $c ) {
+ if ( 'DE' === $c->get( 'api.shop.country' ) && 'EUR' === $c->get( 'api.shop.currency' ) ) {
+ ( $c->get( 'wcgateway.pay-upon-invoice' ) )->init();
+ }
+ }
+ );
+
+ add_action(
+ 'woocommerce_paypal_payments_check_pui_payment_captured',
+ function ( int $wc_order_id, string $order_id ) use ( $c ) {
+ $order_endpoint = $c->get( 'api.endpoint.order' );
+ $logger = $c->get( 'woocommerce.logger.woocommerce' );
+ $order = $order_endpoint->order( $order_id );
+ $order_status = $order->status();
+ $logger->info( "Checking payment captured webhook for WC order #{$wc_order_id}, PayPal order status: " . $order_status->name() );
+
+ $wc_order = wc_get_order( $wc_order_id );
+ if ( ! is_a( $wc_order, WC_Order::class ) || $wc_order->get_status() !== 'on-hold' ) {
+ return;
+ }
+
+ if ( $order_status->name() !== OrderStatus::COMPLETED ) {
+ $message = __(
+ 'Could not process WC order because PAYMENT.CAPTURE.COMPLETED webhook not received.',
+ 'woocommerce-paypal-payments'
+ );
+ $logger->error( $message );
+ $wc_order->update_status( 'failed', $message );
+ }
+ },
+ 10,
+ 2
+ );
}
/**
@@ -246,6 +283,11 @@ class WCGatewayModule implements ModuleInterface {
if ( $dcc_applies->for_country_currency() ) {
$methods[] = $container->get( 'wcgateway.credit-card-gateway' );
}
+
+ if ( 'DE' === $container->get( 'api.shop.country' ) && 'EUR' === $container->get( 'api.shop.currency' ) ) {
+ $methods[] = $container->get( 'wcgateway.pay-upon-invoice-gateway' );
+ }
+
return (array) $methods;
}
);
diff --git a/modules/ppcp-wc-gateway/webpack.config.js b/modules/ppcp-wc-gateway/webpack.config.js
index c9c6c2b55..5abb1f94a 100644
--- a/modules/ppcp-wc-gateway/webpack.config.js
+++ b/modules/ppcp-wc-gateway/webpack.config.js
@@ -7,6 +7,7 @@ module.exports = {
target: 'web',
entry: {
'gateway-settings': path.resolve('./resources/js/gateway-settings.js'),
+ 'pay-upon-invoice': path.resolve('./resources/js/pay-upon-invoice.js'),
},
output: {
path: path.resolve(__dirname, 'assets/'),
diff --git a/modules/ppcp-webhooks/src/Handler/CheckoutOrderApproved.php b/modules/ppcp-webhooks/src/Handler/CheckoutOrderApproved.php
index 45d49762b..fdbdf8abc 100644
--- a/modules/ppcp-webhooks/src/Handler/CheckoutOrderApproved.php
+++ b/modules/ppcp-webhooks/src/Handler/CheckoutOrderApproved.php
@@ -12,6 +12,7 @@ namespace WooCommerce\PayPalCommerce\Webhooks\Handler;
use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
use Psr\Log\LoggerInterface;
+use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayUponInvoice\PayUponInvoiceGateway;
/**
* Class CheckoutOrderApproved
@@ -188,6 +189,10 @@ class CheckoutOrderApproved implements RequestHandler {
}
foreach ( $wc_orders as $wc_order ) {
+ if ( PayUponInvoiceGateway::ID === $wc_order->get_payment_method() ) {
+ continue;
+ }
+
if ( ! in_array( $wc_order->get_status(), array( 'pending', 'on-hold' ), true ) ) {
continue;
}
diff --git a/modules/ppcp-webhooks/src/Handler/CheckoutOrderCompleted.php b/modules/ppcp-webhooks/src/Handler/CheckoutOrderCompleted.php
index 4b1eea7b7..3159c9cb1 100644
--- a/modules/ppcp-webhooks/src/Handler/CheckoutOrderCompleted.php
+++ b/modules/ppcp-webhooks/src/Handler/CheckoutOrderCompleted.php
@@ -10,6 +10,7 @@ declare(strict_types=1);
namespace WooCommerce\PayPalCommerce\Webhooks\Handler;
use Psr\Log\LoggerInterface;
+use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayUponInvoice\PayUponInvoiceGateway;
/**
* Class CheckoutOrderCompleted
@@ -131,6 +132,10 @@ class CheckoutOrderCompleted implements RequestHandler {
}
foreach ( $wc_orders as $wc_order ) {
+ if ( PayUponInvoiceGateway::ID === $wc_order->get_payment_method() ) {
+ continue;
+ }
+
if ( ! in_array( $wc_order->get_status(), array( 'pending', 'on-hold' ), true ) ) {
continue;
}
diff --git a/modules/ppcp-webhooks/src/Handler/PaymentCaptureCompleted.php b/modules/ppcp-webhooks/src/Handler/PaymentCaptureCompleted.php
index 325541671..eda546118 100644
--- a/modules/ppcp-webhooks/src/Handler/PaymentCaptureCompleted.php
+++ b/modules/ppcp-webhooks/src/Handler/PaymentCaptureCompleted.php
@@ -112,6 +112,13 @@ class PaymentCaptureCompleted implements RequestHandler {
return new WP_REST_Response( $response );
}
+ $order_id = $resource['supplementary_data']['related_ids']['order_id'] ?? null;
+
+ /**
+ * Allow access to the webhook logic before updating the WC order.
+ */
+ do_action( 'ppcp_payment_capture_completed_webhook_handler', $wc_order, $order_id );
+
if ( $wc_order->get_status() !== 'on-hold' ) {
$response['success'] = true;
return new WP_REST_Response( $response );
@@ -139,8 +146,6 @@ class PaymentCaptureCompleted implements RequestHandler {
)
);
- $order_id = $resource['supplementary_data']['related_ids']['order_id'] ?? null;
-
if ( $order_id ) {
try {
$order = $this->order_endpoint->order( (string) $order_id );
diff --git a/package.json b/package.json
index 49df04f52..f9b601973 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "woocommerce-paypal-payments",
- "version": "1.8.2",
+ "version": "1.9.1",
"description": "WooCommerce PayPal Payments",
"repository": "https://github.com/woocommerce/woocommerce-paypal-payments",
"license": "GPL-2.0",
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 2efd2c77c..39e82160c 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -23,6 +23,12 @@
+
+
+
+
+
+
diff --git a/readme.txt b/readme.txt
index 641a7679b..2cc995602 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Tags: woocommerce, paypal, payments, ecommerce, e-commerce, store, sales, sell,
Requires at least: 5.3
Tested up to: 6.0
Requires PHP: 7.1
-Stable tag: 1.8.2
+Stable tag: 1.9.1
License: GPLv2
License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -81,7 +81,19 @@ Follow the steps below to connect the plugin to your PayPal account:
== Changelog ==
-= 1.8.2 =
+= 1.9.1 =
+* Fix - ITEM_TOTAL_MISMATCH error when checking out with multiple products #721
+* Fix - Unable to purchase a product with Credit card button in pay for order page #718
+* Fix - Pay Later messaging only displayed when smart button is active on the same page #283
+* Fix - Pay Later messaging displayed for out of stock variable products or with no variation selected #667
+* Fix - Placeholders and card type detection not working for PayPal Card Processing (260) #685
+* Fix - PUI gateway is displayed with unsupported store currency #711
+* Enhancement - Missing PayPal fee in WC order details for PUI purchase #714
+* Enhancement - Skip loading of PUI js file on all pages where PUI gateway is not displayed #723
+* Enhancement - PUI feature capitalization not consistent #724
+
+= 1.9.0 =
+* Add - New Feature - Pay Upon Invoice (Germany only) #608
* Fix - Order not approved: payment via vaulted PayPal account fails #677
* Fix - Cant' refund : "ERROR Refund failed: No country given for address." #639
* Fix - Something went wrong error in Virtual products when using vaulted payment #673
diff --git a/tests/PHPUnit/ApiClient/Endpoint/OrderEndpointTest.php b/tests/PHPUnit/ApiClient/Endpoint/OrderEndpointTest.php
index d24087925..642d9c4b6 100644
--- a/tests/PHPUnit/ApiClient/Endpoint/OrderEndpointTest.php
+++ b/tests/PHPUnit/ApiClient/Endpoint/OrderEndpointTest.php
@@ -952,7 +952,7 @@ class OrderEndpointTest extends TestCase
->expects('email_address')
->andReturn('');
- $result = $testee->create([$purchaseUnit], $payer);
+ $result = $testee->create([$purchaseUnit], ApplicationContext::SHIPPING_PREFERENCE_NO_SHIPPING, $payer);
$this->assertEquals($expectedOrder, $result);
}
@@ -1049,7 +1049,7 @@ class OrderEndpointTest extends TestCase
$payerName = Mockery::mock(PayerName::class);
$payer->expects('name')->andReturn($payerName);
$payer->expects('to_array')->andReturn(['payer']);
- $result = $testee->create([$purchaseUnit], $payer);
+ $result = $testee->create([$purchaseUnit], ApplicationContext::SHIPPING_PREFERENCE_GET_FROM_FILE, $payer);
$this->assertEquals($expectedOrder, $result);
}
@@ -1141,7 +1141,7 @@ class OrderEndpointTest extends TestCase
$payerName = Mockery::mock(PayerName::class);
$payer->expects('name')->andReturn($payerName);
$payer->expects('to_array')->andReturn(['payer']);
- $testee->create([$purchaseUnit], $payer);
+ $testee->create([$purchaseUnit], ApplicationContext::SHIPPING_PREFERENCE_NO_SHIPPING, $payer);
}
public function testCreateForPurchaseUnitsIsNot201()
@@ -1232,6 +1232,6 @@ class OrderEndpointTest extends TestCase
$payerName = Mockery::mock(PayerName::class);
$payer->expects('name')->andReturn($payerName);
$payer->expects('to_array')->andReturn(['payer']);
- $testee->create([$purchaseUnit], $payer);
+ $testee->create([$purchaseUnit], ApplicationContext::SHIPPING_PREFERENCE_GET_FROM_FILE, $payer);
}
}
diff --git a/tests/PHPUnit/ApiClient/Endpoint/PayUponInvoiceOrderEndpointTest.php b/tests/PHPUnit/ApiClient/Endpoint/PayUponInvoiceOrderEndpointTest.php
new file mode 100644
index 000000000..45c5f3ff3
--- /dev/null
+++ b/tests/PHPUnit/ApiClient/Endpoint/PayUponInvoiceOrderEndpointTest.php
@@ -0,0 +1,147 @@
+bearer = Mockery::mock(Bearer::class);
+ $token = Mockery::mock(Token::class);
+ $token->shouldReceive('token')->andReturn('');
+ $this->bearer->shouldReceive('bearer')->andReturn($token);
+
+ $this->orderFactory = Mockery::mock(OrderFactory::class);
+ $this->fraudnet = Mockery::mock(FraudNet::class);
+ $this->logger = Mockery::mock(LoggerInterface::class);
+
+ $this->testee = new PayUponInvoiceOrderEndpoint(
+ '',
+ $this->bearer,
+ $this->orderFactory,
+ $this->fraudnet,
+ $this->logger
+ );
+ }
+
+ public function testCreateOrder()
+ {
+ list($items, $paymentSource, $headers) = $this->setStubs();
+
+ $response = [
+ 'body' => '{"is_correct":true}',
+ 'headers' => $headers,
+ ];
+ expect('wp_remote_get')->andReturn($response);
+ expect('wp_remote_retrieve_response_code')->with($response)->andReturn(200);
+
+ $this->logger->shouldReceive('debug');
+
+ $result = $this->testee->create($items, $paymentSource, '');
+ $this->assertInstanceOf(Order::class, $result);
+ }
+
+ public function testCreateOrderWpError()
+ {
+ list($items, $paymentSource) = $this->setStubsForError();
+
+ $wpError = Mockery::mock(\WP_Error::class);
+ $wpError->shouldReceive('get_error_messages')->andReturn(['foo']);
+ $wpError->shouldReceive('get_error_message')->andReturn('foo');
+ expect('wp_remote_get')->andReturn($wpError);
+
+ $this->logger->shouldReceive('debug');
+
+ $this->expectException(\RuntimeException::class);
+ $this->testee->create($items, $paymentSource, '');
+ }
+
+ public function testCreateOrderApiError()
+ {
+ list($items, $paymentSource) = $this->setStubsForError();
+
+ $headers = Mockery::mock(Requests_Utility_CaseInsensitiveDictionary::class);
+ $headers->shouldReceive('getAll');
+ $response = [
+ 'body' => '{"is_correct":true}',
+ 'headers' => $headers,
+ ];
+
+ when('get_bloginfo')->justReturn('de-DE');
+ expect('wp_remote_get')->andReturn($response);
+ expect('wp_remote_retrieve_response_code')->with($response)->andReturn(500);
+
+ $this->logger->shouldReceive('debug');
+
+ $this->expectException(PayPalApiException::class);
+ $this->testee->create($items, $paymentSource, '');
+ }
+
+ /**
+ * @return array
+ */
+ private function setStubs(): array
+ {
+ $order = Mockery::mock(Order::class);
+ $this->orderFactory
+ ->expects('from_paypal_response')
+ ->andReturnUsing(function (\stdClass $object) use ($order): ?Order {
+ return ($object->is_correct) ? $order : null;
+ });
+
+ $this->fraudnet->shouldReceive('session_id')->andReturn('');
+
+ $purchaseUnit = Mockery::mock(PurchaseUnit::class);
+ $purchaseUnit->shouldReceive('to_array')->andReturn([
+ 'items' => [],
+ ]);
+ $items = [$purchaseUnit];
+
+ $paymentSource = Mockery::mock(PaymentSource::class);
+ $paymentSource->shouldReceive('to_array')->andReturn([]);
+
+ $headers = Mockery::mock(Requests_Utility_CaseInsensitiveDictionary::class);
+ $headers->shouldReceive('getAll');
+ return array($items, $paymentSource, $headers);
+ }
+
+ /**
+ * @return array
+ */
+ private function setStubsForError(): array
+ {
+ $this->fraudnet->shouldReceive('session_id')->andReturn('');
+ $purchaseUnit = Mockery::mock(PurchaseUnit::class);
+ $purchaseUnit->shouldReceive('to_array')->andReturn([
+ 'items' => [],
+ ]);
+ $items = [$purchaseUnit];
+ $paymentSource = Mockery::mock(PaymentSource::class);
+ $paymentSource->shouldReceive('to_array')->andReturn([]);
+ return array($items, $paymentSource);
+ }
+}
diff --git a/tests/PHPUnit/ApiClient/Entity/AmountTest.php b/tests/PHPUnit/ApiClient/Entity/AmountTest.php
index 24d4152c9..96b7f0a1c 100644
--- a/tests/PHPUnit/ApiClient/Entity/AmountTest.php
+++ b/tests/PHPUnit/ApiClient/Entity/AmountTest.php
@@ -22,9 +22,7 @@ class AmountTest extends TestCase
public function testBreakdownIsNull()
{
- $money = Mockery::mock(Money::class);
- $money->shouldReceive('currency_code')->andReturn('currencyCode');
- $money->shouldReceive('value')->andReturn(1.10);
+ $money = new Money(1.10, 'currencyCode');
$testee = new Amount($money);
$this->assertNull($testee->breakdown());
@@ -38,9 +36,7 @@ class AmountTest extends TestCase
public function testBreakdown()
{
- $money = Mockery::mock(Money::class);
- $money->shouldReceive('currency_code')->andReturn('currencyCode');
- $money->shouldReceive('value')->andReturn(1.10);
+ $money = new Money(1.10, 'currencyCode');
$breakdown = Mockery::mock(AmountBreakdown::class);
$breakdown->shouldReceive('to_array')->andReturn([1]);
$testee = new Amount($money, $breakdown);
diff --git a/tests/PHPUnit/ApiClient/Entity/PurchaseUnitTest.php b/tests/PHPUnit/ApiClient/Entity/PurchaseUnitTest.php
index 0aadf968a..dbb18c4de 100644
--- a/tests/PHPUnit/ApiClient/Entity/PurchaseUnitTest.php
+++ b/tests/PHPUnit/ApiClient/Entity/PurchaseUnitTest.php
@@ -412,10 +412,8 @@ class PurchaseUnitTest extends TestCase
foreach ($data as $testKey => $test) {
$items = [];
foreach ($test['items'] as $key => $item) {
- $unitAmount = Mockery::mock(Money::class);
- $unitAmount->shouldReceive('value')->andReturn($item['value']);
- $tax = Mockery::mock(Money::class);
- $tax->shouldReceive('value')->andReturn($item['tax']);
+ $unitAmount = new Money($item['value'], 'EUR');
+ $tax = new Money($item['tax'], 'EUR');
$items[$key] = Mockery::mock(
Item::class,
[
@@ -436,15 +434,14 @@ class PurchaseUnitTest extends TestCase
return null;
}
- $money = Mockery::mock(Money::class);
- $money->shouldReceive('value')->andReturn($value);
+ $money = new Money($value, 'EUR');
return $money;
});
}
}
$amount = Mockery::mock(Amount::class);
$amount->shouldReceive('to_array')->andReturn(['value' => number_format( $test['amount'], 2, '.', '' ), 'breakdown' => []]);
- $amount->shouldReceive('value')->andReturn($test['amount']);
+ $amount->shouldReceive('value_str')->andReturn(number_format( $test['amount'], 2, '.', '' ));
$amount->shouldReceive('currency_code')->andReturn('EUR');
$amount->shouldReceive('breakdown')->andReturn($breakdown);
diff --git a/tests/PHPUnit/ApiClient/Factory/ItemFactoryTest.php b/tests/PHPUnit/ApiClient/Factory/ItemFactoryTest.php
index 64b5b862c..640dffcdf 100644
--- a/tests/PHPUnit/ApiClient/Factory/ItemFactoryTest.php
+++ b/tests/PHPUnit/ApiClient/Factory/ItemFactoryTest.php
@@ -86,6 +86,7 @@ class ItemFactoryTest extends TestCase
$product
->expects('is_virtual')
->andReturn(true);
+
$items = [
[
'data' => $product,
@@ -108,6 +109,7 @@ class ItemFactoryTest extends TestCase
$woocommerce->session = $session;
$session->shouldReceive('get')->andReturn([]);
+
$result = $testee->from_wc_cart($cart);
$item = current($result);
@@ -158,6 +160,7 @@ class ItemFactoryTest extends TestCase
->expects('get_fees')
->andReturn([]);
+
$result = $testee->from_wc_order($order);
$this->assertCount(1, $result);
$item = current($result);
@@ -186,6 +189,7 @@ class ItemFactoryTest extends TestCase
$product
->expects('is_virtual')
->andReturn(true);
+
expect('wp_strip_all_tags')
->with('description')
->andReturn('description');
@@ -240,6 +244,7 @@ class ItemFactoryTest extends TestCase
$product
->expects('is_virtual')
->andReturn(true);
+
expect('wp_strip_all_tags')
->with($description)
->andReturn(mb_substr( $description, 0, 127 ));
diff --git a/tests/PHPUnit/ApiClient/Factory/ShippingPreferenceFactoryTest.php b/tests/PHPUnit/ApiClient/Factory/ShippingPreferenceFactoryTest.php
new file mode 100644
index 000000000..4da631f06
--- /dev/null
+++ b/tests/PHPUnit/ApiClient/Factory/ShippingPreferenceFactoryTest.php
@@ -0,0 +1,118 @@
+testee = new ShippingPreferenceFactory();
+ }
+
+ /**
+ * @dataProvider forStateData
+ */
+ public function testFromState(
+ PurchaseUnit $purchase_unit,
+ string $context,
+ ?WC_Cart $cart,
+ string $funding_source,
+ string $expected_result
+ ) {
+ $result = $this->testee->from_state($purchase_unit, $context, $cart, $funding_source);
+
+ self::assertEquals($expected_result, $result);
+ }
+
+ public function forStateData()
+ {
+ yield [
+ $this->createPurchaseUnit(true, Mockery::mock(Shipping::class)),
+ 'checkout',
+ $this->createCart(true),
+ '',
+ ApplicationContext::SHIPPING_PREFERENCE_SET_PROVIDED_ADDRESS,
+ ];
+ yield [
+ $this->createPurchaseUnit(false, Mockery::mock(Shipping::class)),
+ 'checkout',
+ $this->createCart(false),
+ '',
+ ApplicationContext::SHIPPING_PREFERENCE_NO_SHIPPING,
+ ];
+ yield [
+ $this->createPurchaseUnit(true, null),
+ 'checkout',
+ $this->createCart(true),
+ '',
+ ApplicationContext::SHIPPING_PREFERENCE_NO_SHIPPING,
+ ];
+ yield [
+ $this->createPurchaseUnit(true, Mockery::mock(Shipping::class)),
+ 'checkout',
+ $this->createCart(true),
+ 'card',
+ ApplicationContext::SHIPPING_PREFERENCE_SET_PROVIDED_ADDRESS,
+ ];
+ yield [
+ $this->createPurchaseUnit(true, null),
+ 'product',
+ null,
+ '',
+ ApplicationContext::SHIPPING_PREFERENCE_GET_FROM_FILE,
+ ];
+ yield [
+ $this->createPurchaseUnit(true, null),
+ 'pay-now',
+ null,
+ 'venmo',
+ ApplicationContext::SHIPPING_PREFERENCE_GET_FROM_FILE,
+ ];
+ yield [
+ $this->createPurchaseUnit(true, Mockery::mock(Shipping::class)),
+ 'pay-now',
+ null,
+ 'venmo',
+ ApplicationContext::SHIPPING_PREFERENCE_GET_FROM_FILE,
+ ];
+ yield [
+ $this->createPurchaseUnit(true, Mockery::mock(Shipping::class)),
+ 'pay-now',
+ null,
+ 'card',
+ ApplicationContext::SHIPPING_PREFERENCE_SET_PROVIDED_ADDRESS,
+ ];
+ yield [
+ $this->createPurchaseUnit(true, null),
+ 'pay-now',
+ null,
+ 'card',
+ ApplicationContext::SHIPPING_PREFERENCE_NO_SHIPPING,
+ ];
+ }
+
+ private function createPurchaseUnit(bool $containsPhysicalGoods, ?Shipping $shipping): PurchaseUnit {
+ $pu = Mockery::mock(PurchaseUnit::class);
+ $pu->shouldReceive('contains_physical_goods')->andReturn($containsPhysicalGoods);
+ $pu->shouldReceive('shipping')->andReturn($shipping);
+ return $pu;
+ }
+
+ private function createCart(bool $needsShipping): WC_Cart {
+ $cart = Mockery::mock(WC_Cart::class);
+ $cart->shouldReceive('needs_shipping')->andReturn($needsShipping);
+ return $cart;
+ }
+}
diff --git a/tests/PHPUnit/Button/Endpoint/ChangeCartEndpointTest.php b/tests/PHPUnit/Button/Endpoint/ChangeCartEndpointTest.php
index 7b1132c40..9eb6c654b 100644
--- a/tests/PHPUnit/Button/Endpoint/ChangeCartEndpointTest.php
+++ b/tests/PHPUnit/Button/Endpoint/ChangeCartEndpointTest.php
@@ -5,7 +5,7 @@ namespace WooCommerce\PayPalCommerce\Button\Endpoint;
use WooCommerce\PayPalCommerce\ApiClient\Entity\PurchaseUnit;
-use WooCommerce\PayPalCommerce\ApiClient\Repository\CartRepository;
+use WooCommerce\PayPalCommerce\ApiClient\Factory\PurchaseUnitFactory;
use WooCommerce\PayPalCommerce\TestCase;
use Mockery;
use WooCommerce\WooCommerce\Logging\Logger\NullLogger;
@@ -17,7 +17,7 @@ class ChangeCartEndpointTest extends TestCase
/**
* @dataProvider dataForTestProducts
*/
- public function testProducts($data, $products, $lineItems, $responseExpectation) {
+ public function testProducts($data, $products, $responseExpectation) {
$dataStore = Mockery::mock(\WC_Data_Store::class);
$cart = Mockery::mock(\WC_Cart::class);
@@ -59,16 +59,21 @@ class ChangeCartEndpointTest extends TestCase
->expects('read_request')
->with(ChangeCartEndpoint::nonce())
->andReturn($data);
- $cartRepository = Mockery::mock(CartRepository::class);
- $cartRepository
- ->expects('all')
- ->andReturn($lineItems);
+
+ $pu = Mockery::mock(PurchaseUnit::class);
+ $pu
+ ->shouldReceive('to_array')
+ ->andReturn($responseExpectation[0]);
+ $purchase_unit_factory = Mockery::mock(PurchaseUnitFactory::class);
+ $purchase_unit_factory
+ ->expects('from_wc_cart')
+ ->andReturn($pu);
$testee = new ChangeCartEndpoint(
$cart,
$shipping,
$requestData,
- $cartRepository,
+ $purchase_unit_factory,
$dataStore,
new NullLogger()
);
@@ -97,15 +102,6 @@ class ChangeCartEndpointTest extends TestCase
->with('variable')
->andReturn(true);
- $defaultLineItem = Mockery::mock(PurchaseUnit::class);
- $defaultLineItem
- ->shouldReceive('to_array')
- ->andReturn([1]);
- $variationLineItem = Mockery::mock(PurchaseUnit::class);
- $variationLineItem
- ->shouldReceive('to_array')
- ->andReturn([2]);
-
$testData = [
'default' => [
[
@@ -120,9 +116,6 @@ class ChangeCartEndpointTest extends TestCase
[
$defaultProduct,
],
- [
- $defaultLineItem,
- ],
[
[1],
]
@@ -162,11 +155,7 @@ class ChangeCartEndpointTest extends TestCase
$variationProduct,
],
[
- $defaultLineItem,
- $variationLineItem,
- ],
- [
- [1],[2]
+ [1, 2]
]
]
];
diff --git a/tests/PHPUnit/Button/Endpoint/CreateOrderEndpointTest.php b/tests/PHPUnit/Button/Endpoint/CreateOrderEndpointTest.php
index a6e0bbfb7..00d863a9e 100644
--- a/tests/PHPUnit/Button/Endpoint/CreateOrderEndpointTest.php
+++ b/tests/PHPUnit/Button/Endpoint/CreateOrderEndpointTest.php
@@ -10,7 +10,7 @@ use ReflectionClass;
use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
use WooCommerce\PayPalCommerce\ApiClient\Factory\PayerFactory;
use WooCommerce\PayPalCommerce\ApiClient\Factory\PurchaseUnitFactory;
-use WooCommerce\PayPalCommerce\ApiClient\Repository\CartRepository;
+use WooCommerce\PayPalCommerce\ApiClient\Factory\ShippingPreferenceFactory;
use WooCommerce\PayPalCommerce\Button\Helper\EarlyOrderHandler;
use WooCommerce\PayPalCommerce\Session\SessionHandler;
use WooCommerce\PayPalCommerce\TestCase;
@@ -145,7 +145,7 @@ class CreateOrderEndpointTest extends TestCase
protected function mockTestee()
{
$request_data = Mockery::mock(RequestData::class);
- $cart_repository = Mockery::mock(CartRepository::class);
+ $shippingPreferenceFactory = Mockery::mock(ShippingPreferenceFactory::class);
$purchase_unit_factory = Mockery::mock(PurchaseUnitFactory::class);
$order_endpoint = Mockery::mock(OrderEndpoint::class);
$payer_factory = Mockery::mock(PayerFactory::class);
@@ -155,8 +155,8 @@ class CreateOrderEndpointTest extends TestCase
$testee = new CreateOrderEndpoint(
$request_data,
- $cart_repository,
$purchase_unit_factory,
+ $shippingPreferenceFactory,
$order_endpoint,
$payer_factory,
$session_handler,
diff --git a/tests/PHPUnit/Subscription/RenewalHandlerTest.php b/tests/PHPUnit/Subscription/RenewalHandlerTest.php
index 9fa160612..de3249fd6 100644
--- a/tests/PHPUnit/Subscription/RenewalHandlerTest.php
+++ b/tests/PHPUnit/Subscription/RenewalHandlerTest.php
@@ -16,6 +16,7 @@ use WooCommerce\PayPalCommerce\ApiClient\Entity\PaymentToken;
use WooCommerce\PayPalCommerce\ApiClient\Entity\PurchaseUnit;
use WooCommerce\PayPalCommerce\ApiClient\Factory\PayerFactory;
use WooCommerce\PayPalCommerce\ApiClient\Factory\PurchaseUnitFactory;
+use WooCommerce\PayPalCommerce\ApiClient\Factory\ShippingPreferenceFactory;
use WooCommerce\PayPalCommerce\Onboarding\Environment;
use WooCommerce\PayPalCommerce\TestCase;
use Mockery;
@@ -31,6 +32,7 @@ class RenewalHandlerTest extends TestCase
private $repository;
private $orderEndpoint;
private $purchaseUnitFactory;
+ private $shippingPreferenceFactory;
private $payerFactory;
private $environment;
private $sut;
@@ -43,6 +45,7 @@ class RenewalHandlerTest extends TestCase
$this->repository = Mockery::mock(PaymentTokenRepository::class);
$this->orderEndpoint = Mockery::mock(OrderEndpoint::class);
$this->purchaseUnitFactory = Mockery::mock(PurchaseUnitFactory::class);
+ $this->shippingPreferenceFactory = Mockery::mock(ShippingPreferenceFactory::class);
$this->payerFactory = Mockery::mock(PayerFactory::class);
$this->environment = new Environment(new Dictionary([]));
@@ -56,6 +59,7 @@ class RenewalHandlerTest extends TestCase
$this->repository,
$this->orderEndpoint,
$this->purchaseUnitFactory,
+ $this->shippingPreferenceFactory,
$this->payerFactory,
$this->environment
);
@@ -133,11 +137,16 @@ class RenewalHandlerTest extends TestCase
$this->payerFactory->shouldReceive('from_customer')
->andReturn($payer);
+ $this->shippingPreferenceFactory->shouldReceive('from_state')
+ ->with($purchaseUnit, 'renewal')
+ ->andReturn('no_shipping');
+
$this->orderEndpoint->shouldReceive('create')
- ->with([$purchaseUnit], $payer, $token)
+ ->with([$purchaseUnit], 'no_shipping', $payer, $token)
->andReturn($order);
$wcOrder->shouldReceive('update_status');
+ $wcOrder->shouldReceive('save');
$this->sut->renew($wcOrder);
}
diff --git a/tests/PHPUnit/WcGateway/Gateway/PayUponInvoice/PayUponInvoiceGatewayTest.php b/tests/PHPUnit/WcGateway/Gateway/PayUponInvoice/PayUponInvoiceGatewayTest.php
new file mode 100644
index 000000000..ca9fe38c5
--- /dev/null
+++ b/tests/PHPUnit/WcGateway/Gateway/PayUponInvoice/PayUponInvoiceGatewayTest.php
@@ -0,0 +1,135 @@
+order_endpoint = Mockery::mock(PayUponInvoiceOrderEndpoint::class);
+ $this->purchase_unit_factory = Mockery::mock(PurchaseUnitFactory::class);
+ $this->payment_source_factory = Mockery::mock(PaymentSourceFactory::class);
+ $this->environment = Mockery::mock(Environment::class);
+ $this->logger = Mockery::mock(LoggerInterface::class);
+ $this->transaction_url_provider = Mockery::mock(TransactionUrlProvider::class);
+ $this->pui_helper = Mockery::mock(PayUponInvoiceHelper::class);
+
+ $this->setInitStubs();
+
+ $this->testee = new PayUponInvoiceGateway(
+ $this->order_endpoint,
+ $this->purchase_unit_factory,
+ $this->payment_source_factory,
+ $this->environment,
+ $this->transaction_url_provider,
+ $this->logger,
+ $this->pui_helper
+ );
+ }
+
+ public function testProcessPayment()
+ {
+ list($order, $purchase_unit, $payment_source) = $this->setTestStubs();
+
+ $this->order_endpoint->shouldReceive('create')->with(
+ [$purchase_unit],
+ $payment_source
+ )->andReturn($order);
+
+ define( 'MINUTE_IN_SECONDS', 60 );
+ when('as_schedule_single_action')->justReturn();
+
+ $result = $this->testee->process_payment(1);
+ $this->assertEquals('success', $result['result']);
+ }
+
+ public function testProcessPaymentError()
+ {
+ list($order, $purchase_unit, $payment_source) = $this->setTestStubs();
+
+ $this->logger->shouldReceive('error');
+ when('wc_add_notice')->justReturn();
+ when('wc_get_checkout_url')->justReturn();
+
+ $this->order_endpoint->shouldReceive('create')->with(
+ [$purchase_unit],
+ $payment_source,
+ ''
+ )->andThrows(\RuntimeException::class);
+
+ $result = $this->testee->process_payment(1);
+ $this->assertEquals('failure', $result['result']);
+ }
+
+ private function setInitStubs(): void
+ {
+ when('get_option')->justReturn([
+ 'title' => 'foo',
+ 'description' => 'bar',
+ ]);
+ when('get_bloginfo')->justReturn('Foo');
+
+ $woocommerce = Mockery::mock(\WooCommerce::class);
+ $cart = Mockery::mock(\WC_Cart::class);
+ when('WC')->justReturn($woocommerce);
+ $woocommerce->cart = $cart;
+ $cart->shouldReceive('empty_cart');
+ }
+
+ /**
+ * @return array
+ */
+ private function setTestStubs(): array
+ {
+ $wcOrder = Mockery::mock(WC_Order::class);
+ $wcOrder->shouldReceive('update_meta_data');
+ $wcOrder->shouldReceive('update_status');
+ $wcOrder->shouldReceive('save');
+ when('wc_get_order')->justReturn($wcOrder);
+
+ $order = Mockery::mock(Order::class);
+ $order->shouldReceive('id')->andReturn('1');
+ $order->shouldReceive('intent')->andReturn('CAPTURE');
+ $order->shouldReceive('payment_source')->andReturn('');
+
+ $purchase_unit = Mockery::mock(PurchaseUnit::class);
+ $payment_source = Mockery::mock(PaymentSource::class);
+
+ $this->payment_source_factory->shouldReceive('from_wc_order')
+ ->with($wcOrder, '')
+ ->andReturn($payment_source);
+
+ $this->purchase_unit_factory->shouldReceive('from_wc_order')
+ ->with($wcOrder)
+ ->andReturn($purchase_unit);
+
+ $this->environment->shouldReceive('current_environment_is')->andReturn(true);
+
+ return array($order, $purchase_unit, $payment_source);
+ }
+}
diff --git a/tests/PHPUnit/WcGateway/Gateway/WcGatewayTest.php b/tests/PHPUnit/WcGateway/Gateway/WcGatewayTest.php
index c55220ba3..b9b2a87cb 100644
--- a/tests/PHPUnit/WcGateway/Gateway/WcGatewayTest.php
+++ b/tests/PHPUnit/WcGateway/Gateway/WcGatewayTest.php
@@ -10,6 +10,7 @@ use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PaymentsEndpoint;
use Psr\Log\NullLogger;
use WooCommerce\PayPalCommerce\ApiClient\Entity\Capture;
use WooCommerce\PayPalCommerce\ApiClient\Entity\CaptureStatus;
+use WooCommerce\PayPalCommerce\ApiClient\Factory\ShippingPreferenceFactory;
use WooCommerce\PayPalCommerce\Onboarding\Environment;
use WooCommerce\PayPalCommerce\Onboarding\State;
use WooCommerce\PayPalCommerce\Session\SessionHandler;
@@ -44,9 +45,11 @@ class WcGatewayTest extends TestCase
private $subscriptionHelper;
private $environment;
private $paymentTokenRepository;
+ private $shipping_preference_factory;
private $logger;
private $paymentsEndpoint;
private $orderEndpoint;
+ private $apiShopCountry;
public function setUp(): void {
parent::setUp();
@@ -66,10 +69,12 @@ class WcGatewayTest extends TestCase
$this->subscriptionHelper = Mockery::mock(SubscriptionHelper::class);
$this->environment = Mockery::mock(Environment::class);
$this->paymentTokenRepository = Mockery::mock(PaymentTokenRepository::class);
+ $this->shipping_preference_factory = Mockery::mock(ShippingPreferenceFactory::class);
$this->logger = Mockery::mock(LoggerInterface::class);
$this->paymentsEndpoint = Mockery::mock(PaymentsEndpoint::class);
$this->orderEndpoint = Mockery::mock(OrderEndpoint::class);
$this->funding_source_renderer = new FundingSourceRenderer($this->settings);
+ $this->apiShopCountry = 'DE';
$this->onboardingState->shouldReceive('current_state')->andReturn(State::STATE_ONBOARDED);
@@ -100,9 +105,11 @@ class WcGatewayTest extends TestCase
PayPalGateway::ID,
$this->environment,
$this->paymentTokenRepository,
+ $this->shipping_preference_factory,
$this->logger,
$this->paymentsEndpoint,
- $this->orderEndpoint
+ $this->orderEndpoint,
+ $this->apiShopCountry
);
}
@@ -135,7 +142,6 @@ class WcGatewayTest extends TestCase
->with($orderId)
->andReturn($wcOrder);
-
when('wc_get_checkout_url')
->justReturn('test');
diff --git a/tests/PHPUnit/WcGateway/Helper/PayUponInvoiceHelperTest.php b/tests/PHPUnit/WcGateway/Helper/PayUponInvoiceHelperTest.php
new file mode 100644
index 000000000..3a1d9bdc0
--- /dev/null
+++ b/tests/PHPUnit/WcGateway/Helper/PayUponInvoiceHelperTest.php
@@ -0,0 +1,32 @@
+assertSame((new PayUponInvoiceHelper())->validate_birth_date($input), $output);
+ }
+
+ public function datesProvider(): array{
+ $format = 'Y-m-d';
+
+ return [
+ ['', false],
+ [(new DateTime())->format($format), false],
+ [(new DateTime('-17 years'))->format($format), false],
+ ['1942-02-31', false],
+ ['01-01-1942', false],
+ ['1942-01-01', true],
+ ];
+ }
+
+}
diff --git a/tests/PHPUnit/WcGateway/Processor/OrderProcessorTest.php b/tests/PHPUnit/WcGateway/Processor/OrderProcessorTest.php
index 7a3ce6604..c63a94679 100644
--- a/tests/PHPUnit/WcGateway/Processor/OrderProcessorTest.php
+++ b/tests/PHPUnit/WcGateway/Processor/OrderProcessorTest.php
@@ -168,6 +168,7 @@ class OrderProcessorTest extends TestCase
->with('on-hold', 'Awaiting payment.');
$wcOrder->expects('set_transaction_id')
->with($transactionId);
+ $wcOrder->shouldReceive('save');
$order_helper->shouldReceive('contains_physical_goods')->andReturn(true);
@@ -286,6 +287,7 @@ class OrderProcessorTest extends TestCase
->with($transactionId);
$wcOrder
->expects('payment_complete');
+ $wcOrder->shouldReceive('save');
$order_helper->shouldReceive('contains_physical_goods')->andReturn(true);
@@ -386,6 +388,7 @@ class OrderProcessorTest extends TestCase
PayPalGateway::INTENT_META_KEY,
$orderIntent
);
+ $wcOrder->shouldReceive('save');
$order_helper->shouldReceive('contains_physical_goods')->andReturn(true);
diff --git a/tests/PHPUnit/WcGateway/Settings/SettingsListenerTest.php b/tests/PHPUnit/WcGateway/Settings/SettingsListenerTest.php
index 050b87e40..d4499e874 100644
--- a/tests/PHPUnit/WcGateway/Settings/SettingsListenerTest.php
+++ b/tests/PHPUnit/WcGateway/Settings/SettingsListenerTest.php
@@ -32,12 +32,12 @@ class SettingsListenerTest extends ModularTestCase
$webhook_registrar = Mockery::mock(WebhookRegistrar::class);
$webhook_registrar->shouldReceive('unregister')->andReturnTrue();
$webhook_registrar->shouldReceive('register')->andReturnTrue();
-
$cache = Mockery::mock(Cache::class);
-
$state = Mockery::mock(State::class);
$state->shouldReceive('current_state')->andReturn(State::STATE_ONBOARDED);
$bearer = Mockery::mock(Bearer::class);
+ $signup_link_cache = Mockery::mock(Cache::class);
+ $signup_link_ids = array();
$testee = new SettingsListener(
$settings,
@@ -46,7 +46,9 @@ class SettingsListenerTest extends ModularTestCase
$cache,
$state,
$bearer,
- PayPalGateway::ID
+ PayPalGateway::ID,
+ $signup_link_cache,
+ $signup_link_ids
);
$_GET['section'] = PayPalGateway::ID;
@@ -74,6 +76,8 @@ class SettingsListenerTest extends ModularTestCase
$settings->shouldReceive('persist');
$cache->shouldReceive('has')
->andReturn(false);
+ $signup_link_cache->shouldReceive('has')
+ ->andReturn(false);
$testee->listen();
}
diff --git a/tests/e2e/PHPUnit/Order/PurchaseUnitTest.php b/tests/e2e/PHPUnit/Order/PurchaseUnitTest.php
index 835088cbb..655830693 100644
--- a/tests/e2e/PHPUnit/Order/PurchaseUnitTest.php
+++ b/tests/e2e/PHPUnit/Order/PurchaseUnitTest.php
@@ -68,8 +68,6 @@ class PurchaseUnitTest extends TestCase
$pu = $this->puFactory->from_wc_order($wcOrder);
$puData = $pu->to_array();
- self::assertTrue(isset($puData['amount']['breakdown']));
-
self::assertEquals($expectedAmount, $puData['amount']);
}
@@ -83,8 +81,6 @@ class PurchaseUnitTest extends TestCase
$pu = $this->puFactory->from_wc_cart($this->cart);
$puData = $pu->to_array();
- self::assertTrue(isset($puData['amount']['breakdown']));
-
self::assertEquals($expectedAmount, $puData['amount']);
}
@@ -334,6 +330,37 @@ class PurchaseUnitTest extends TestCase
],
]),
];
+
+ yield 'no decimals currency' => [
+ [
+ 'currency' => 'JPY',
+ 'items' => [
+ ['price' => 18.0, 'quantity' => 2],
+ ],
+ 'shipping' => ['total' => 5.0],
+ 'billing' => ['city' => 'city2'],
+ ],
+ self::adaptAmountFormat([
+ 'value' => 66,
+ 'breakdown' => [
+ 'item_total' => 36,
+ 'tax_total' => 25, // 24.60
+ 'shipping' => 5,
+ ],
+ ], 'JPY'),
+ ];
+
+ yield [
+ [
+ 'items' => [
+ ['price' => 5.345, 'quantity' => 2],
+ ],
+ 'billing' => ['city' => 'city0'],
+ ],
+ self::adaptAmountFormat([
+ 'value' => 10.69,
+ ]),
+ ];
}
public function cartData() {
@@ -390,6 +417,18 @@ class PurchaseUnitTest extends TestCase
],
], get_woocommerce_currency()),
];
+
+ yield [
+ [
+ 'products' => [
+ ['price' => 5.345, 'quantity' => 2],
+ ],
+ 'billing' => ['city' => 'city0'],
+ ],
+ self::adaptAmountFormat([
+ 'value' => 10.69,
+ ], get_woocommerce_currency()),
+ ];
}
private static function adaptAmountFormat(array $data, string $currency = null): array {
diff --git a/woocommerce-paypal-payments.php b/woocommerce-paypal-payments.php
index b33448568..38817fd03 100644
--- a/woocommerce-paypal-payments.php
+++ b/woocommerce-paypal-payments.php
@@ -3,7 +3,7 @@
* Plugin Name: WooCommerce PayPal Payments
* Plugin URI: https://woocommerce.com/products/woocommerce-paypal-payments/
* Description: PayPal's latest complete payments processing solution. Accept PayPal, Pay Later, credit/debit cards, alternative digital wallets local payment types and bank accounts. Turn on only PayPal options or process a full suite of payment methods. Enable global transaction with extensive currency and country coverage.
- * Version: 1.8.2
+ * Version: 1.9.1
* Author: WooCommerce
* Author URI: https://woocommerce.com/
* License: GPL-2.0