',
),
- 'keys_json' => array(
+ 'keys_json' => array(
'title' => __( 'Manual Keys JSON', 'woocommerce-gateway-amazon-payments-advanced' ),
'type' => 'file',
'description' => __( 'JSON format, retrieve the JSON clicking the "Download JSON file" button in Seller Central under "INTEGRATION- Central - Existing API keys', 'woocommerce-gateway-amazon-payments-advanced' ),
'default' => '',
'desc_tip' => true,
),
- 'private_key' => array(
+ 'private_key' => array(
'title' => __( 'Private Key File', 'woocommerce-gateway-amazon-payments-advanced' ),
'label' => __( 'Add .pem file with the private key generated in the Amazon seller Central', 'woocommerce-gateway-amazon-payments-advanced' ),
'type' => 'file',
'description' => __( 'This key is created automatically when you Connect your Amazon Pay merchant account form the Configure button, but can be created by logging into Seller Central and create keys in INTEGRATION - Central', 'woocommerce-gateway-amazon-payments-advanced' ),
'desc_tip' => true,
),
- 'manual_container_end' => array(
+ 'manual_container_end' => array(
'type' => 'custom',
'html' => '
',
),
- 'default_container_start' => array(
+ 'default_container_start' => array(
'type' => 'custom',
'html' => '',
),
- 'merchant_id' => array(
+ 'merchant_id' => array(
'title' => __( 'Merchant ID', 'woocommerce-gateway-amazon-payments-advanced' ),
'type' => 'text',
'description' => __( 'Obtained from your Amazon account. Usually found on Integration central after logging into your merchant account.', 'woocommerce-gateway-amazon-payments-advanced' ),
'default' => '',
'desc_tip' => true,
),
- 'store_id' => array(
+ 'store_id' => array(
'title' => __( 'Store ID', 'woocommerce-gateway-amazon-payments-advanced' ),
'type' => 'text',
'description' => __( 'Obtained from your Amazon account. Usually found on Integration central after logging into your merchant account.', 'woocommerce-gateway-amazon-payments-advanced' ),
'default' => '',
'desc_tip' => true,
),
- 'public_key_id' => array(
+ 'public_key_id' => array(
'title' => __( 'Public Key Id', 'woocommerce-gateway-amazon-payments-advanced' ),
'type' => 'text',
'description' => __( 'Obtained from your Amazon account. You can get these keys by logging into Seller Central and clicking the "See Details" button under INTEGRATION - Central - Existing API keys.', 'woocommerce-gateway-amazon-payments-advanced' ),
'default' => '',
'desc_tip' => true,
),
- 'default_container_end' => array(
+ 'default_container_end' => array(
'type' => 'custom',
'html' => '
',
),
- 'sandbox' => array(
+ 'sandbox' => array(
'title' => __( 'Use Sandbox', 'woocommerce-gateway-amazon-payments-advanced' ),
'label' => __( 'Enable sandbox mode during testing and development - live payments will not be taken if enabled.', 'woocommerce-gateway-amazon-payments-advanced' ),
'type' => 'select',
@@ -453,7 +453,7 @@ public function get_form_fields() {
'no' => __( 'No', 'woocommerce-gateway-amazon-payments-advanced' ),
),
),
- 'advanced_configuration' => array(
+ 'advanced_configuration' => array(
'title' => __( 'Advanced configurations', 'woocommerce-gateway-amazon-payments-advanced' ),
'type' => 'title',
'description' => sprintf(
@@ -462,7 +462,7 @@ public function get_form_fields() {
wc_apa()->ipn_handler->get_notify_url()
),
),
- 'payment_capture' => array(
+ 'payment_capture' => array(
'title' => __( 'Payment Capture', 'woocommerce-gateway-amazon-payments-advanced' ),
'type' => 'select',
'description' => '',
@@ -473,7 +473,7 @@ public function get_form_fields() {
'manual' => __( 'Don’t Authorize the payment when the order is placed (i.e. for pre-orders).', 'woocommerce-gateway-amazon-payments-advanced' ),
),
),
- 'authorization_mode' => array(
+ 'authorization_mode' => array(
'title' => __( 'Authorization processing mode', 'woocommerce-gateway-amazon-payments-advanced' ),
'type' => 'select',
'description' => '',
@@ -483,12 +483,12 @@ public function get_form_fields() {
'async' => __( 'Asynchronous', 'woocommerce-gateway-amazon-payments-advanced' ),
),
),
- 'display_options' => array(
+ 'display_options' => array(
'title' => __( 'Display options', 'woocommerce-gateway-amazon-payments-advanced' ),
'description' => __( 'Customize the appearance of Amazon widgets.', 'woocommerce-gateway-amazon-payments-advanced' ),
'type' => 'title',
),
- 'button_language' => array(
+ 'button_language' => array(
'title' => __( 'Button language', 'woocommerce-gateway-amazon-payments-advanced' ),
'description' => __( 'Language to use in Login with Amazon or a Amazon Pay button. Only used when Login with Amazon App is enabled.', 'woocommerce-gateway-amazon-payments-advanced' ),
'desc_tip' => true,
@@ -505,7 +505,7 @@ public function get_form_fields() {
'ja-JP' => __( 'Japan\'s Japanese', 'woocommerce-gateway-amazon-payments-advanced' ),
),
),
- 'button_color' => array(
+ 'button_color' => array(
'title' => __( 'Button color', 'woocommerce-gateway-amazon-payments-advanced' ),
'description' => __( 'Button color to display on cart and checkout pages. Only used when Login with Amazon App is enabled.', 'woocommerce-gateway-amazon-payments-advanced' ),
'desc_tip' => true,
@@ -517,19 +517,11 @@ public function get_form_fields() {
'DarkGray' => __( 'Dark gray', 'woocommerce-gateway-amazon-payments-advanced' ),
),
),
- 'hide_standard_checkout_button' => array(
- 'title' => __( 'Standard checkout button', 'woocommerce-gateway-amazon-payments-advanced' ),
- 'description' => __( 'Hide standard checkout button on chart page. Only applies when there are not other gateways enabled.', 'woocommerce-gateway-amazon-payments-advanced' ),
- 'desc_tip' => true,
- 'type' => 'checkbox',
- 'label' => __( 'Hide standard checkout button on cart page', 'woocommerce-gateway-amazon-payments-advanced' ),
- 'default' => 'no',
- ),
- 'misc_options' => array(
+ 'misc_options' => array(
'title' => __( 'Miscellaneous', 'woocommerce-gateway-amazon-payments-advanced' ),
'type' => 'title',
),
- 'debug' => array(
+ 'debug' => array(
'title' => __( 'Debug', 'woocommerce-gateway-amazon-payments-advanced' ),
'label' => __( 'Enable debugging messages', 'woocommerce-gateway-amazon-payments-advanced' ),
'type' => 'checkbox',
@@ -537,7 +529,7 @@ public function get_form_fields() {
'desc_tip' => true,
'default' => 'yes',
),
- 'hide_button_mode' => array(
+ 'hide_button_mode' => array(
'title' => __( 'Hide Button Mode', 'woocommerce-gateway-amazon-payments-advanced' ),
'label' => __( 'Enable hide button mode', 'woocommerce-gateway-amazon-payments-advanced' ),
'description' => __( 'This will hides Amazon buttons on the mini-cart and on cart, checkout and product pages so the gateway looks not available to the customers. It will not hide the classic integration, if it\'s enabled. The buttons are hidden via CSS. Only enable this when troubleshooting your integration.', 'woocommerce-gateway-amazon-payments-advanced' ),
@@ -545,7 +537,7 @@ public function get_form_fields() {
'type' => 'checkbox',
'default' => 'no',
),
- 'enable_classic_gateway' => array(
+ 'enable_classic_gateway' => array(
'title' => __( 'Classic Gateway', 'woocommerce-gateway-amazon-payments-advanced' ),
'label' => __( 'Enable Amazon Pay as a classic Gateway Option', 'woocommerce-gateway-amazon-payments-advanced' ),
'description' => __( 'This will enable Amazon Pay to also appear along other Gateway Options. Compatible with the Checkout Block of WooCommerce Blocks.', 'woocommerce-gateway-amazon-payments-advanced' ),
@@ -553,7 +545,7 @@ public function get_form_fields() {
'type' => 'checkbox',
'default' => 'yes',
),
- 'using_woo_blocks' => array(
+ 'using_woo_blocks' => array(
'title' => __( 'WooCommerce Blocks', 'woocommerce-gateway-amazon-payments-advanced' ),
'label' => __( 'Are you using WooCommerce Blocks for your checkout page?', 'woocommerce-gateway-amazon-payments-advanced' ),
'description' => __( 'Compatibility with WooCommerce blocks should work fine out of the box. This option for the time being ensures compatibility only when using WooCommerce Blocks Checkout without the "Classic" Amazon Gateway enabled.', 'woocommerce-gateway-amazon-payments-advanced' ),
@@ -561,7 +553,7 @@ public function get_form_fields() {
'type' => 'checkbox',
'default' => 'no',
),
- 'mini_cart_button' => array(
+ 'mini_cart_button' => array(
'title' => __( 'Amazon Pay on mini cart', 'woocommerce-gateway-amazon-payments-advanced' ),
'label' => __( 'Enable Amazon Pay on mini cart', 'woocommerce-gateway-amazon-payments-advanced' ),
'description' => __( 'This will only work if you are using WooCommerce\'s mini cart. If you enable it and the Amazon Pay does not show please disable since it also enables loading of required assets globally in your frontend. Compatible with WooCommerce Blocks.', 'woocommerce-gateway-amazon-payments-advanced' ),
@@ -569,7 +561,7 @@ public function get_form_fields() {
'type' => 'checkbox',
'default' => 'no',
),
- 'product_button' => array(
+ 'product_button' => array(
'title' => __( 'Amazon Pay on product pages', 'woocommerce-gateway-amazon-payments-advanced' ),
'label' => __( 'Enable Amazon Pay on product pages', 'woocommerce-gateway-amazon-payments-advanced' ),
'description' => __( 'This will enable the Amazon Pay button on the product pages next to the Add to Cart button. Compatible with WooCommerce Blocks.', 'woocommerce-gateway-amazon-payments-advanced' ),
@@ -577,7 +569,7 @@ public function get_form_fields() {
'type' => 'checkbox',
'default' => 'no',
),
- 'alexa_notifications_support' => array(
+ 'alexa_notifications_support' => array(
'title' => __( 'Support Alexa Delivery Notifications', 'woocommerce-gateway-amazon-payments-advanced' ),
'label' => __( 'Enable support for Alexa Delivery Notifications', 'woocommerce-gateway-amazon-payments-advanced' ),
'description' => __( 'This will enable support for Alexa Delivery notifications.', 'woocommerce-gateway-amazon-payments-advanced' ),
@@ -587,15 +579,6 @@ public function get_form_fields() {
),
);
- if ( $this->has_other_gateways_enabled() ) {
- $this->form_fields['hide_standard_checkout_button'] = array_merge(
- $this->form_fields['hide_standard_checkout_button'],
- array(
- 'disabled' => true,
- )
- );
- }
-
/**
* For new merchants "enforce" the use of LPA ( Hide "Use Login with Amazon App" and consider it ticked.)
* For old merchants, keep "Use Login with Amazon App" checkbox, as they can fallback to APA (no client id)
@@ -1148,4 +1131,16 @@ protected function is_product_button_enabled() {
protected function using_woo_blocks() {
return ! empty( $this->settings['using_woo_blocks'] ) && 'yes' === $this->settings['using_woo_blocks'];
}
+
+ /**
+ * Return if the hide button mode is enabled.
+ *
+ * @return boolean
+ */
+ protected function is_hide_button_mode_enabled() {
+ $hide_button_mode_enabled = 'yes' === $this->settings['hide_button_mode'];
+ $hide_button_mode_enabled = apply_filters( 'woocommerce_amazon_payments_hide_amazon_buttons', $hide_button_mode_enabled );
+
+ return $hide_button_mode_enabled;
+ }
}
diff --git a/includes/class-wc-gateway-amazon-payments-advanced-subscriptions.php b/includes/class-wc-gateway-amazon-payments-advanced-subscriptions.php
index 25d7ea85..79f6aaf4 100644
--- a/includes/class-wc-gateway-amazon-payments-advanced-subscriptions.php
+++ b/includes/class-wc-gateway-amazon-payments-advanced-subscriptions.php
@@ -57,7 +57,7 @@ public function init_handlers() {
add_filter( 'woocommerce_amazon_pa_update_complete_checkout_session_payload', array( $this, 'recurring_complete_checkout_session_update' ), 10, 3 );
add_filter( 'woocommerce_amazon_pa_processed_order', array( $this, 'copy_meta_to_sub' ), 10, 2 );
add_filter( 'wcs_renewal_order_meta', array( $this, 'copy_meta_from_sub' ), 10, 3 );
- add_filter( 'woocommerce_subscriptions_update_payment_via_pay_shortcode', array( $this, 'maybe_not_update_payment_method' ), 10, 2 );
+ add_filter( 'woocommerce_subscriptions_update_payment_via_pay_shortcode', array( $this, 'maybe_not_update_payment_method' ), 10, 3 );
}
do_action( 'woocommerce_amazon_pa_subscriptions_init', $version );
@@ -303,11 +303,13 @@ public function recurring_checkout_session( $payload ) {
);
if ( 1 === $subscriptions_in_cart ) {
- $first_recurring = reset( WC()->cart->recurring_carts );
- $payload['recurringMetadata']['amount'] = array(
+ $first_recurring = reset( WC()->cart->recurring_carts );
+ $recurring_charge_amount = array(
'amount' => WC_Amazon_Payments_Advanced::format_amount( $first_recurring->get_total( 'edit' ) ),
'currencyCode' => get_woocommerce_currency(),
);
+
+ $payload['recurringMetadata']['amount'] = WC_Amazon_Payments_Advanced_API::format_charge_amount( $recurring_charge_amount );
}
} elseif ( $cart_contains_renewal || $change_payment_for_subscription ) {
if ( $cart_contains_renewal ) {
@@ -322,18 +324,29 @@ public function recurring_checkout_session( $payload ) {
}
$subscription = wcs_get_subscription( absint( $_GET['change_payment_method'] ) );
+
+ if ( $subscription && ! empty( $payload['webCheckoutDetails']['checkoutResultReturnUrl'] ) ) {
+ $payload['webCheckoutDetails']['checkoutResultReturnUrl'] = add_query_arg(
+ array(
+ 'change_payment_method' => $subscription->get_id(),
+ ),
+ $payload['webCheckoutDetails']['checkoutResultReturnUrl']
+ );
+ }
} else {
return $payload;
}
$payload['chargePermissionType'] = 'Recurring';
+ $recurring_charge_amount = array(
+ 'amount' => WC_Amazon_Payments_Advanced::format_amount( $subscription->get_total() ),
+ 'currencyCode' => wc_apa_get_order_prop( $subscription, 'order_currency' ),
+ );
+
$payload['recurringMetadata'] = array(
'frequency' => $this->parse_interval_to_apa_frequency( $subscription->get_billing_period( 'edit' ), $subscription->get_billing_interval( 'edit' ) ),
- 'amount' => array(
- 'amount' => WC_Amazon_Payments_Advanced::format_amount( $subscription->get_total() ),
- 'currencyCode' => wc_apa_get_order_prop( $subscription, 'order_currency' ),
- ),
+ 'amount' => WC_Amazon_Payments_Advanced_API::format_charge_amount( $recurring_charge_amount ),
);
}
@@ -351,12 +364,29 @@ public function recurring_checkout_session( $payload ) {
*/
public function recurring_checkout_session_update( $payload, $checkout_session_id, $order, $doing_classic_payment ) {
if ( isset( $_POST['_wcsnonce'] ) && isset( $_POST['woocommerce_change_payment'] ) && $order->get_id() === absint( $_POST['woocommerce_change_payment'] ) ) {
- $checkout_session = wc_apa()->get_gateway()->get_checkout_session();
$payload['paymentDetails']['paymentIntent'] = 'Confirm';
unset( $payload['paymentDetails']['canHandlePendingAuthorization'] );
- $payload['paymentDetails']['chargeAmount'] = WC_Amazon_Payments_Advanced::format_amount( $checkout_session->recurringMetadata->amount ); // phpcs:ignore WordPress.NamingConventions
+ $amount = 0;
+ if ( $doing_classic_payment ) {
+ $amount = $order->get_total( 'edit' );
+ } else {
+ $checkout_session = wc_apa()->get_gateway()->get_checkout_session();
+
+ // phpcs:disable WordPress.NamingConventions
+ if ( isset( $checkout_session->recurringMetadata->amount->amount ) && is_numeric( $checkout_session->recurringMetadata->amount->amount ) ) {
+ $amount = WC_Amazon_Payments_Advanced::format_amount( $checkout_session->recurringMetadata->amount->amount );
+ } elseif ( isset( $checkout_session->chargeAmount->amount ) && is_numeric( $checkout_session->chargeAmount->amount ) ) {
+ $amount = WC_Amazon_Payments_Advanced::format_amount( $checkout_session->chargeAmount->amount );
+ }
+ }
+ // phpcs:enable WordPress.NamingConventions
+ $payload['paymentDetails']['chargeAmount']['amount'] = $amount;
+ $payload['recurringMetadata']['amount'] = array(
+ 'amount' => $amount,
+ 'currencyCode' => wc_apa_get_order_prop( $order, 'order_currency' ),
+ );
return $payload;
}
@@ -386,10 +416,12 @@ public function recurring_checkout_session_update( $payload, $checkout_session_i
$recurring_total = wc_format_decimal( $recurring_total, '' );
if ( 1 === $subscriptions_in_cart ) {
- $payload['recurringMetadata']['amount'] = array(
+ $recurring_charge_amount = array(
'amount' => WC_Amazon_Payments_Advanced::format_amount( $recurring_total ),
'currencyCode' => wc_apa_get_order_prop( $order, 'order_currency' ),
);
+
+ $payload['recurringMetadata']['amount'] = WC_Amazon_Payments_Advanced_API::format_charge_amount( $recurring_charge_amount );
}
if ( 0 >= (float) WC()->cart->get_total( 'edit' ) ) {
@@ -435,6 +467,8 @@ public function recurring_complete_checkout_session_update( $payload ) {
$payload['chargeAmount']['amount'] = WC_Amazon_Payments_Advanced::format_amount( $recurring_total );
+ $payload['chargeAmount'] = WC_Amazon_Payments_Advanced_API::format_charge_amount( $payload['chargeAmount'] );
+
return $payload;
}
@@ -545,16 +579,18 @@ public function scheduled_subscription_payment( $amount_to_charge, $order ) {
$currency = wc_apa_get_order_prop( $order, 'order_currency' );
+ $charge_amount = array(
+ 'amount' => WC_Amazon_Payments_Advanced::format_amount( $amount_to_charge ),
+ 'currencyCode' => $currency,
+ );
+
$response = WC_Amazon_Payments_Advanced_API::create_charge(
$charge_permission_id,
array(
'merchantMetadata' => WC_Amazon_Payments_Advanced_API::get_merchant_metadata( $order_id ),
'captureNow' => $capture_now,
'canHandlePendingAuthorization' => $can_do_async,
- 'chargeAmount' => array(
- 'amount' => WC_Amazon_Payments_Advanced::format_amount( $amount_to_charge ),
- 'currencyCode' => $currency,
- ),
+ 'chargeAmount' => WC_Amazon_Payments_Advanced_API::format_charge_amount( $charge_amount ),
)
);
@@ -743,6 +779,11 @@ public function maybe_change_payment_method( $order, $response ) {
}
WC_Subscriptions_Change_Payment_Gateway::update_payment_method( $order, wc_apa()->get_gateway()->id );
+
+ // We only need to update this for the subscriptions that were changed with the classic method.
+ if ( empty( wc_apa()->get_gateway()->get_checkout_session_id() ) ) {
+ wc_add_notice( __( 'Payment method updated.', 'woocommerce-gateway-amazon-payments-advanced' ) );
+ }
}
/**
@@ -824,4 +865,14 @@ public function ignore_amounts_in_session_validation( $valid, $data ) {
return $valid;
}
+
+
+ /**
+ * Checks if page is pay for order and change subs payment page.
+ *
+ * @return bool
+ */
+ public function is_subs_change_payment() {
+ return isset( $_GET['pay_for_order'] ) && isset( $_GET['change_payment_method'] ) && is_numeric( $_GET['change_payment_method'] ); // WPCS: CSRF ok.
+ }
}
diff --git a/includes/class-wc-gateway-amazon-payments-advanced.php b/includes/class-wc-gateway-amazon-payments-advanced.php
index bf1d69e7..143e9a4e 100644
--- a/includes/class-wc-gateway-amazon-payments-advanced.php
+++ b/includes/class-wc-gateway-amazon-payments-advanced.php
@@ -39,6 +39,14 @@ class WC_Gateway_Amazon_Payments_Advanced extends WC_Gateway_Amazon_Payments_Adv
'order_awaiting_payment',
);
+
+ /**
+ * Cached object for the redirect host.
+ *
+ * @var string
+ */
+ protected $redirect_host;
+
/**
* Constructor
*/
@@ -65,6 +73,9 @@ public function __construct() {
// Sets the payload's addressDetails property if checking out using Amazon "Classic" and there is a physical product.
add_filter( 'woocommerce_amazon_pa_update_checkout_session_payload', array( $this, 'update_address_details_for_classic' ), 10, 4 );
+
+ // Add cart action to each variation.
+ add_filter( 'woocommerce_available_variation', array( $this, 'add_variation_product_action' ), 10, 3 );
}
/**
@@ -195,6 +206,9 @@ public function init_handlers() {
add_action( 'woocommerce_before_cart_totals', array( $this, 'update_js' ) );
}
+ // Change Payment Method.
+ add_action( 'woocommerce_subscriptions_change_payment_after_submit', array( $this, 'classic_integration_button' ) );
+
// Cart.
add_action( 'woocommerce_proceed_to_checkout', array( $this, 'display_amazon_pay_button_separator_html' ), 20 );
add_action( 'woocommerce_proceed_to_checkout', array( $this, 'checkout_button' ), 25 );
@@ -203,10 +217,11 @@ public function init_handlers() {
}
// Maybe Hide Cart Buttons.
- add_action( 'wp_footer', array( $this, 'maybe_hide_standard_checkout_button' ) );
add_action( 'wp_footer', array( $this, 'maybe_hide_amazon_buttons' ) );
add_filter( 'woocommerce_amazon_pa_checkout_session_key', array( $this, 'maybe_change_session_key' ) );
+
+ add_filter( 'allowed_redirect_hosts', array( $this, 'allow_amazon_redirect' ) );
}
/**
@@ -265,7 +280,7 @@ protected function get_js_params() {
return array_merge(
array(
- 'ajax_url' => admin_url( 'admin-ajax.php' ),
+ 'ajax_url' => add_query_arg( $this->get_ajax_url_args(), admin_url( 'admin-ajax.php' ) ),
'create_checkout_session_config' => $checkout_session_config,
'create_checkout_session_hash' => wp_hash( $checkout_session_config['payloadJSON'] . self::get_estimated_order_amount() ),
'button_color' => $this->settings['button_color'],
@@ -608,7 +623,7 @@ public function checkout_init( $checkout ) {
* @return void
*/
public function maybe_separator_and_checkout_button() {
- if ( $this->is_available() && $this->possible_subscription_cart_supported() && $this->is_mini_cart_button_enabled() && WC()->cart->get_cart_contents_count() > 0 ) {
+ if ( $this->is_available() && $this->possible_subscription_cart_supported() && $this->is_mini_cart_button_enabled() && ! $this->is_hide_button_mode_enabled() && WC()->cart->get_cart_contents_count() > 0 ) {
?>
$order_total,
+ 'currencyCode' => $currency,
+ );
+
$payload['paymentDetails'] = array_merge(
isset( $payload['paymentDetails'] ) && is_array( $payload['paymentDetails'] ) ? $payload['paymentDetails'] : array(),
array(
'paymentIntent' => $payment_intent,
'canHandlePendingAuthorization' => $can_do_async,
// "softDescriptor" => "Descriptor", // TODO: Implement setting, if empty, don't set this. ONLY FOR AuthorizeWithCapture
- 'chargeAmount' => array(
- 'amount' => $order_total,
- 'currencyCode' => $currency,
- ),
+ 'chargeAmount' => WC_Amazon_Payments_Advanced_API::format_charge_amount( $charge_amount ),
)
);
@@ -1461,15 +1478,22 @@ public function process_payment( $order_id ) {
$redirect = $response->webCheckoutDetails->amazonPayRedirectUrl; // phpcs:ignore WordPress.NamingConventions
} else {
$create_checkout_config = $this->get_create_checkout_classic_session_config( $payload );
- $order->update_status( 'pending', __( 'Awaiting payment.', 'woocommerce-gateway-amazon-payments-advanced' ) );
wc_apa()->log( "Creating checkout config for order #{$order_id}.", $create_checkout_config );
- $redirect = '#amazon-pay-classic-id-that-should-not-exist';
+
+ if ( ! empty( wc_apa()->get_subscriptions() ) && wc_apa()->get_subscriptions()->is_subs_change_payment() ) {
+ $redirect = ! empty( $payload['webCheckoutDetails']['checkoutResultReturnUrl'] ) ? $payload['webCheckoutDetails']['checkoutResultReturnUrl'] : $order->get_change_payment_method_url();
+ } else {
+ $order->update_status( 'pending', __( 'Awaiting payment.', 'woocommerce-gateway-amazon-payments-advanced' ) );
+ $redirect = '#amazon-pay-classic-id-that-should-not-exist';
+ }
}
+ $this->redirect_host = wp_parse_url( $redirect, PHP_URL_HOST );
+
$order->save();
// Return thank you page redirect.
- return array_merge(
+ $result = array_merge(
array(
'result' => 'success',
'redirect' => $redirect,
@@ -1480,6 +1504,11 @@ public function process_payment( $order_id ) {
) : array() )
);
+ if ( $doing_classic_payment && ! empty( wc_apa()->get_subscriptions() ) && wc_apa()->get_subscriptions()->is_subs_change_payment() ) {
+ wp_send_json_success( $result );
+ }
+
+ return $result;
} catch ( Exception $e ) {
wc_add_notice( __( 'Error:', 'woocommerce-gateway-amazon-payments-advanced' ) . ' ' . $e->getMessage(), 'error' );
}
@@ -1553,15 +1582,17 @@ public function handle_return( $checkout_session_id = '' ) {
$this->get_lock_for_order( $order_id, true );
+ $charge_amount = array(
+ 'amount' => $order_total,
+ 'currencyCode' => $currency,
+ );
+
$response = WC_Amazon_Payments_Advanced_API::complete_checkout_session(
$checkout_session_id,
apply_filters(
'woocommerce_amazon_pa_update_complete_checkout_session_payload',
array(
- 'chargeAmount' => array(
- 'amount' => $order_total,
- 'currencyCode' => $currency,
- ),
+ 'chargeAmount' => WC_Amazon_Payments_Advanced_API::format_charge_amount( $charge_amount ),
),
$checkout_session_id,
$order
@@ -1890,9 +1921,16 @@ public function get_current_cart_action() {
/**
* Product Type used on the Amazon Pay button. Depends to whether the product needs shipping or not.
*
+ * @param WC_Product $product Product object.
+ *
* @return string Either PayAndShip or PayOnly.
*/
- public function get_current_product_action() {
+ public function get_current_product_action( $product = null ) {
+ if ( ! is_null( $product ) ) {
+ $product = wc_get_product( $product );
+ return $product && $product->is_virtual() ? 'PayOnly' : 'PayAndShip';
+ }
+
if ( is_product() ) {
$product = wc_get_product( get_the_ID() );
return $product->is_virtual() ? 'PayOnly' : 'PayAndShip';
@@ -1900,6 +1938,26 @@ public function get_current_product_action() {
return 'PayOnly';
}
+ /**
+ * Get Product Type used on the Amazon button for a variation.
+ *
+ * @param array $data Variation data.
+ * @param WC_Product_Variable $product Parent product object.
+ * @param WC_Product $variation Product variation object.
+ *
+ * @return array
+ */
+ public function add_variation_product_action( $data, $product, $variation ) {
+
+ if ( ! $variation ) {
+ return $data;
+ }
+
+ $data['wc_amazon_product_type'] = $this->get_current_product_action( $variation );
+
+ return $data;
+ }
+
/**
* Render the amazon button when the session is not valid anymore.
*
@@ -2420,10 +2478,7 @@ public function release_lock_for_order( $order ) {
* @since 1.6.0
*/
public function maybe_hide_amazon_buttons() {
- $hide_button_mode_enabled = 'yes' === $this->settings['hide_button_mode'];
- $hide_button_mode_enabled = apply_filters( 'woocommerce_amazon_payments_hide_amazon_buttons', $hide_button_mode_enabled );
-
- if ( ! $hide_button_mode_enabled ) {
+ if ( ! $this->is_hide_button_mode_enabled() ) {
return;
}
@@ -2465,16 +2520,18 @@ public function perform_authorization( $order, $capture_now = true, $id = null )
$currency = wc_apa_get_order_prop( $order, 'order_currency' );
+ $charge_amount = array(
+ 'amount' => WC_Amazon_Payments_Advanced::format_amount( $order->get_total() ),
+ 'currencyCode' => $currency,
+ );
+
$charge = WC_Amazon_Payments_Advanced_API::create_charge(
$id,
array(
'merchantMetadata' => WC_Amazon_Payments_Advanced_API::get_merchant_metadata( $order_id ),
'captureNow' => $capture_now,
'canHandlePendingAuthorization' => $can_do_async,
- 'chargeAmount' => array(
- 'amount' => WC_Amazon_Payments_Advanced::format_amount( $order->get_total() ),
- 'currencyCode' => $currency,
- ),
+ 'chargeAmount' => WC_Amazon_Payments_Advanced_API::format_charge_amount( $charge_amount ),
)
);
@@ -2650,32 +2707,6 @@ public function filter_customer_field( $value ) {
return $wc_data[ $current_field ];
}
- /**
- * Maybe hide standard WC checkout button on the cart, if enabled
- */
- public function maybe_hide_standard_checkout_button() {
- if ( ! $this->is_available() || $this->has_other_gateways_enabled() ) {
- return;
- }
-
- if ( 'yes' !== $this->settings['hide_standard_checkout_button'] ) {
- return;
- }
-
- ?>
-
- get_variation_attributes();
} else {
$attrs = array();
}
+
+ $passed_validation = apply_filters( 'woocommerce_add_to_cart_validation', true, $selected_product_id, $quantity, $variation_id );
+ if ( ! $passed_validation ) {
+ wp_send_json_error();
+ }
+
if ( WC()->cart->get_cart_contents_count() > 0 ) {
WC()->session->set( 'amazon_pay_cart', WC()->cart->get_cart_for_session() );
foreach ( self::$session_keys as $session_key ) {
@@ -2915,12 +2953,14 @@ public function ajax_amazon_change_wc_carts() {
WC()->session->save_data();
WC()->cart->empty_cart();
}
- WC()->cart->add_to_cart( $selected_product, $quantity, $variation_id, $attrs );
+
+ WC()->cart->add_to_cart( $selected_product_id, $quantity, $variation_id, $attrs );
$checkout_session_config = WC_Amazon_Payments_Advanced_API::get_create_checkout_session_config();
$data = array(
'create_checkout_session_config' => $checkout_session_config,
'estimated_order_amount' => self::get_estimated_order_amount(),
+ 'needs_shipping' => WC()->cart->needs_shipping() ? 'PayAndShip' : 'PayOnly',
);
wp_send_json_success( $data, 200 );
}
@@ -3032,9 +3072,44 @@ protected static function get_estimated_order_amount() {
return wp_json_encode(
array(
- 'amount' => WC()->cart->get_total( 'amount' ),
+ 'amount' => WC_Amazon_Payments_Advanced::format_amount( WC()->cart->get_total( 'amount' ) ),
'currencyCode' => get_woocommerce_currency(),
)
);
}
+
+ /**
+ * Add amazon host to allowed hosts for `wp_safe_redirect`.
+ *
+ * @param array $hosts The list of allowed hosts.
+ *
+ * @return array
+ */
+ public function allow_amazon_redirect( $hosts ) {
+
+ if ( empty( $this->redirect_host ) ) {
+ return $hosts;
+ }
+
+ $hosts[] = $this->redirect_host;
+
+ return $hosts;
+ }
+
+ /**
+ * Get the arguments for the AJAX URL.
+ *
+ * @return string
+ */
+ private function get_ajax_url_args() {
+ $args = array();
+
+ if ( isset( $_GET['switch-subscription'] ) && isset( $_GET['item'] ) && isset( $_GET['_wcsnonce'] ) ) {
+ $args['switch-subscription'] = wc_clean( wp_unslash( $_GET['switch-subscription'] ) );
+ $args['item'] = wc_clean( wp_unslash( $_GET['item'] ) );
+ $args['_wcsnonce'] = wc_clean( wp_unslash( $_GET['_wcsnonce'] ) );
+ }
+
+ return $args;
+ }
}
diff --git a/includes/compats/woo-blocks/class-wc-amazon-payments-advanced-block-compat-classic.php b/includes/compats/woo-blocks/class-wc-amazon-payments-advanced-block-compat-classic.php
index 6e3d1dd4..1e44e06a 100644
--- a/includes/compats/woo-blocks/class-wc-amazon-payments-advanced-block-compat-classic.php
+++ b/includes/compats/woo-blocks/class-wc-amazon-payments-advanced-block-compat-classic.php
@@ -64,6 +64,7 @@ protected function scripts_name_per_type( $type = '' ) {
$script_data = include wc_apa()->path . '/build/js/payments-methods/classic/index.asset.php';
wp_register_script( 'amazon_payments_advanced_classic_block_compat', wc_apa()->plugin_url . '/build/js/payments-methods/classic/index' . $min . '.js', $script_data['dependencies'], $script_data['version'], true );
+ wp_set_script_translations( 'amazon_payments_advanced_classic_block_compat', 'woocommerce-gateway-amazon-payments-advanced' );
return array( 'amazon_payments_advanced_classic_block_compat' );
}
diff --git a/includes/compats/woo-blocks/class-wc-amazon-payments-advanced-block-compat-express.php b/includes/compats/woo-blocks/class-wc-amazon-payments-advanced-block-compat-express.php
index dd561731..86429ee0 100644
--- a/includes/compats/woo-blocks/class-wc-amazon-payments-advanced-block-compat-express.php
+++ b/includes/compats/woo-blocks/class-wc-amazon-payments-advanced-block-compat-express.php
@@ -79,6 +79,7 @@ protected function scripts_name_per_type( $type = '' ) {
/* Registering Express Payment Script. */
$script_data = include wc_apa()->path . '/build/js/payments-methods/express/index.asset.php';
wp_register_script( 'amazon_payments_advanced_express_block_compat', wc_apa()->plugin_url . '/build/js/payments-methods/express/index' . $min . '.js', $script_data['dependencies'], $script_data['version'], true );
+ wp_set_script_translations( 'amazon_payments_advanced_express_block_compat', 'woocommerce-gateway-amazon-payments-advanced' );
return array( 'amazon_payments_advanced_express_block_compat' );
}
diff --git a/includes/legacy/class-wc-gateway-amazon-payments-advanced-legacy.php b/includes/legacy/class-wc-gateway-amazon-payments-advanced-legacy.php
index a355e220..6370778a 100644
--- a/includes/legacy/class-wc-gateway-amazon-payments-advanced-legacy.php
+++ b/includes/legacy/class-wc-gateway-amazon-payments-advanced-legacy.php
@@ -52,7 +52,6 @@ public function __construct() {
add_filter( 'woocommerce_ajax_get_endpoint', array( $this, 'filter_ajax_endpoint' ), 10, 2 );
- add_action( 'wp_footer', array( $this, 'maybe_hide_standard_checkout_button' ) );
add_action( 'wp_footer', array( $this, 'maybe_hide_amazon_buttons' ) );
// AJAX calls to get updated order reference details.
@@ -1597,25 +1596,6 @@ public function force_standard_mode_refresh_with_zero_order_total( $cart ) {
}
}
- /**
- * Maybe hide standard WC checkout button on the cart, if enabled
- */
- public function maybe_hide_standard_checkout_button() {
- if ( 'yes' === $this->settings['enabled'] && 'yes' === $this->settings['hide_standard_checkout_button'] ) {
- ?>
-
- settings['enabled'] && 'yes' === $this->settings['hide_button_mode'] );
- $hide_button_mode_enabled = apply_filters( 'woocommerce_amazon_payments_hide_amazon_buttons', $hide_button_mode_enabled );
-
- if ( ! $hide_button_mode_enabled ) {
+ if ( ! $this->is_hide_button_mode_enabled() ) {
return;
}
diff --git a/package-lock.json b/package-lock.json
index a7bbb13e..95bdedb6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
"packages": {
"": {
"name": "woocommerce-gateway-amazon-payments-advanced",
- "version": "2.5.0",
+ "version": "2.5.1",
"hasInstallScript": true,
"license": "GPL-2.0",
"dependencies": {
@@ -22,7 +22,6 @@
"copy-webpack-plugin": "^11.0.0",
"cross-var": "^1.1.0",
"glob": "^10.2.5",
- "node-wp-i18n": "^1.2.7",
"rimraf": "^5.0.1",
"webpack-remove-empty-scripts": "^1.0.3"
}
@@ -6483,12 +6482,6 @@
"readable-stream": "^3.4.0"
}
},
- "node_modules/bluebird": {
- "version": "3.7.2",
- "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
- "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
- "dev": true
- },
"node_modules/body-parser": {
"version": "1.20.1",
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
@@ -13149,67 +13142,6 @@
"integrity": "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==",
"dev": true
},
- "node_modules/node-wp-i18n": {
- "version": "1.2.7",
- "resolved": "https://registry.npmjs.org/node-wp-i18n/-/node-wp-i18n-1.2.7.tgz",
- "integrity": "sha512-4X+890+Irj8sY+6WKkFx+4wk/GGu9mGLDY1PVPF9AWF1zTKWClLA83QikcQKX55rjjKpN1jSZEQoEANNVSSBYw==",
- "dev": true,
- "dependencies": {
- "bluebird": "^3.4.1",
- "gettext-parser": "^3.1.0",
- "glob": "^7.0.5",
- "lodash": "^4.14.2",
- "minimist": "^1.2.5",
- "mkdirp": "^1.0.4",
- "tmp": "^0.2.1"
- },
- "bin": {
- "wpi18n": "bin/wpi18n"
- }
- },
- "node_modules/node-wp-i18n/node_modules/gettext-parser": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/gettext-parser/-/gettext-parser-3.1.1.tgz",
- "integrity": "sha512-vNhWcqXEtZPs5Ft1ReA34g7ByWotpcOIeJvXVy2jF3/G2U9v6W0wG4Z4hXzcU8R//jArqkgHcVCGgGqa4vxVlQ==",
- "dev": true,
- "dependencies": {
- "encoding": "^0.1.12",
- "readable-stream": "^3.2.0",
- "safe-buffer": "^5.1.2"
- }
- },
- "node_modules/node-wp-i18n/node_modules/glob": {
- "version": "7.2.3",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
- "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
- "dev": true,
- "dependencies": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.1.1",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
- },
- "engines": {
- "node": "*"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/node-wp-i18n/node_modules/mkdirp": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
- "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
- "dev": true,
- "bin": {
- "mkdirp": "bin/cmd.js"
- },
- "engines": {
- "node": ">=10"
- }
- },
"node_modules/normalize-package-data": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -17056,53 +16988,6 @@
"integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
"dev": true
},
- "node_modules/tmp": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
- "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
- "dev": true,
- "dependencies": {
- "rimraf": "^3.0.0"
- },
- "engines": {
- "node": ">=8.17.0"
- }
- },
- "node_modules/tmp/node_modules/glob": {
- "version": "7.2.3",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
- "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
- "dev": true,
- "dependencies": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.1.1",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
- },
- "engines": {
- "node": "*"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
- "node_modules/tmp/node_modules/rimraf": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
- "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
- "dev": true,
- "dependencies": {
- "glob": "^7.1.3"
- },
- "bin": {
- "rimraf": "bin.js"
- },
- "funding": {
- "url": "https://github.com/sponsors/isaacs"
- }
- },
"node_modules/tmpl": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
diff --git a/package.json b/package.json
index 68a014d4..f2e02c88 100644
--- a/package.json
+++ b/package.json
@@ -36,12 +36,14 @@
"fix:js": "cross-var wp-scripts format $npm_package_config_webpack_js",
"lint:css": "cross-var wp-scripts lint-style $npm_package_config_webpack_css",
"fix:css": "cross-var wp-scripts lint-style $npm_package_config_webpack_css --fix",
- "makepot": "wpi18n makepot --domain-path=\"languages\" --pot-file=\"woocommerce-gateway-amazon-payments-advanced.pot\" --type=\"plugin\" --main-file=\"woocommerce-gateway-amazon-payments-advanced.php\" --exclude=\"node_modules,tests,docs,docker,vendor\"",
+ "i18n": "npm run i18n:makepot && npm run i18n:merge",
+ "i18n:makepot": "./vendor/bin/wp i18n make-pot . languages/woocommerce-gateway-amazon-payments-advanced.pot --exclude=node_modules,bin,tests,docs,docker",
+ "i18n:merge": "php bin/update-pot-file-references.php languages/woocommerce-gateway-amazon-payments-advanced.pot",
"watch": "wp-scripts start",
- "archive": "cross-var rimraf $npm_package_config_wp_org_slug.zip vendor/ node_modules/ && composer install --no-dev --optimize-autoloader && npm install --only=prod --ignore-scripts && composer archive --file=$npm_package_config_wp_org_slug --dir=$npm_package_config_wp_org_slug --format=zip",
+ "archive": "cross-var rimraf $npm_package_config_wp_org_slug.zip vendor/ node_modules/ build/**/*.js.map && composer install --no-dev --optimize-autoloader && npm install --only=prod --ignore-scripts && composer archive --file=$npm_package_config_wp_org_slug --dir=$npm_package_config_wp_org_slug --format=zip",
"postarchive": "rimraf vendor/ node_modules/ && npm install",
"build:assets": "wp-scripts build",
- "build": "npm run makepot && npm run build:assets && npm run archive && npm run postpackage",
+ "build": "npm run build:assets && npm run i18n && npm run archive && npm run postpackage",
"package": "npm run build && npm run archive",
"postpackage": "cross-var unzip -q $npm_package_config_wp_org_slug/$npm_package_config_wp_org_slug.zip -d $npm_package_config_wp_org_slug && rimraf $npm_package_config_wp_org_slug/$npm_package_config_wp_org_slug.zip && zip -q -r $npm_package_config_wp_org_slug.zip $npm_package_config_wp_org_slug -qq && rimraf -rf $npm_package_config_wp_org_slug"
},
@@ -55,7 +57,6 @@
"copy-webpack-plugin": "^11.0.0",
"cross-var": "^1.1.0",
"glob": "^10.2.5",
- "node-wp-i18n": "^1.2.7",
"rimraf": "^5.0.1",
"webpack-remove-empty-scripts": "^1.0.3"
},
diff --git a/readme.txt b/readme.txt
index fc76d70e..69ef2e46 100644
--- a/readme.txt
+++ b/readme.txt
@@ -80,7 +80,15 @@ Automatic updates should work like a charm; as always though, ensure you backup
== Changelog ==
-= 2.5.1 - 2023-10-30 =
+= 2.5.2 - 2024-xx-xx =
+
+* Fix - Error when using a non Standard decimal amount for a currency.
+* Fix - chargeAmount.Amount is invalid when changing currency after selecting other shipping address.
+* Fix - Hide the -OR- on Minicart when selecting "Enable hide button mode".
+* Fix - Change Payment Method for a Subscription Paid with another Payment Method.
+* Fix - Express Checkout on Product page not getting the values of the variations created by WooCommerce Product Add-Ons and Gravity Forms Product Add-ons
+
+= 2.5.1 - 2023-10-30 =s
* Add - New Amazon Pay Platform related Headers.
* Add - Extendable Multi-currency compatibility.
diff --git a/src/js/non-block/amazon-wc-checkout.js b/src/js/non-block/amazon-wc-checkout.js
index f60fdca8..a51d587b 100644
--- a/src/js/non-block/amazon-wc-checkout.js
+++ b/src/js/non-block/amazon-wc-checkout.js
@@ -35,6 +35,9 @@
success: function( result ) {
unblock( $( 'form#order_review' ) );
try {
+ if ( result.data && result.data.result ) {
+ result = result.data;
+ }
if ( 'success' === result.result && 'undefined' !== typeof result.amazonCreateCheckoutParams && $( classicButtonId ).length > 0 ) {
amazonCreateCheckoutConfig = JSON.parse( result.amazonCreateCheckoutParams );
amazonEstimatedOrderAmount = 'undefined' !== typeof result.amazonEstimatedOrderAmount && result.amazonEstimatedOrderAmount ? JSON.parse( result.amazonEstimatedOrderAmount ) : null;
@@ -87,7 +90,30 @@
var amazonProductButtonContainer = $( '#pay_with_amazon_product' );
if ( amazonProductButtonContainer.length > 0 ) {
+ renderProductButton();
+
+ $( document.body ).on( 'woocommerce_variation_has_changed', function() {
+ $( '#pay_with_amazon_product' ).each( function() {
+ $( this ).data( 'amazonRenderedSettings', null );
+ } );
+ renderProductButton();
+ } );
+ }
+
+ function submit_error( $element, errorMessage ) {
+ $( '.woocommerce-NoticeGroup-checkout, .woocommerce-error, .woocommerce-message' ).remove();
+ $element.prepend( '
' + errorMessage + '
' ); // eslint-disable-line max-len
+ $element.removeClass( 'processing' ).unblock();
+ }
+ function renderAndInitAmazonCheckout( buttonId, flag, checkoutConfig ) {
+ var amazonClassicButton = renderButton( buttonId, flag );
+ if ( null !== amazonClassicButton ) {
+ amazonClassicButton.initCheckout( { createCheckoutSessionConfig: checkoutConfig } );
+ }
+ }
+
+ function renderProductButton() {
var amazonProductButton = renderButton( '#pay_with_amazon_product', 'product' );
if ( null !== amazonProductButton ) {
@@ -111,8 +137,13 @@
};
$.each( singleAddToCart.closest( 'form.cart' ).serializeArray(), function( index, object ) {
- if ( 'add-to-cart' === object.name ) {
+ if ( [ 'add-to-cart', 'product_id' ].includes( object.name ) ) {
data.product_id = object.value;
+ } else if ( 'undefined' !== typeof data[ object.name ] ) {
+ if ( ! $.isArray( data[ object.name ] ) ) {
+ data[ object.name ] = [ data[ object.name ] ];
+ }
+ data[ object.name ].push( object.value );
} else {
data[ object.name ] = object.value;
}
@@ -125,10 +156,10 @@
$.ajax(
{
url: amazon_payments_advanced.ajax_url,
- type: 'get',
+ type: 'post',
data: $.param( data ),
success: function( result ) {
- if ( result.data.create_checkout_session_config ) {
+ if ( 'undefined' !== typeof result.data && result.data.create_checkout_session_config ) {
if ( result.data.estimated_order_amount ) {
var productsEstimatedOrderAmount = JSON.parse( result.data.estimated_order_amount );
if ( 'undefined' !== typeof productsEstimatedOrderAmount.amount && 'undefined' !== typeof productsEstimatedOrderAmount.currencyCode ) {
@@ -153,19 +184,6 @@
}
}
- function submit_error( $element, errorMessage ) {
- $( '.woocommerce-NoticeGroup-checkout, .woocommerce-error, .woocommerce-message' ).remove();
- $element.prepend( '
' + errorMessage + '
' ); // eslint-disable-line max-len
- $element.removeClass( 'processing' ).unblock();
- }
-
- function renderAndInitAmazonCheckout( buttonId, flag, checkoutConfig ) {
- var amazonClassicButton = renderButton( buttonId, flag );
- if ( null !== amazonClassicButton ) {
- amazonClassicButton.initCheckout( { createCheckoutSessionConfig: checkoutConfig } );
- }
- }
-
function renderButton( buttonId, buttonSettingsFlag ) {
buttonId = buttonId || button_id;
@@ -257,6 +275,27 @@
return ! $( '.wc-apa-widget-change' ).length && ( 'amazon_payments_advanced' === $( 'input[name=payment_method]:checked' ).val() );
}
+ function getCurrentProductType() {
+
+ var productType = amazon_payments_advanced.product_action;
+
+ const variations_form = $( 'form.variations_form' );
+
+ if ( variations_form.length > 0 ) {
+ const current_variation = parseInt( variations_form.find( 'input[name="variation_id"]' ).val() );
+
+ if ( current_variation ) {
+ $.each( variations_form.data('product_variations'), function( index, variation ) {
+ if ( current_variation === parseInt( variation.variation_id ) && 'undefined' !== typeof variation.wc_amazon_product_type ) {
+ productType = variation.wc_amazon_product_type;
+ }
+ } );
+ }
+ }
+
+ return productType;
+ }
+
function getButtonSettings( buttonSettingsFlag ) {
var obj = {
// set checkout environment
@@ -270,7 +309,7 @@
productType: amazon_payments_advanced.action,
};
if ( 'product' === buttonSettingsFlag ) {
- obj.productType = amazon_payments_advanced.product_action;
+ obj.productType = getCurrentProductType();
} else if ( 'classic' === buttonSettingsFlag && null !== amazonCreateCheckoutConfig ) {
obj.productType = 'undefined' !== typeof amazonCreateCheckoutConfig.payloadJSON.addressDetails ? 'PayAndShip' : 'PayOnly';
amazonCreateCheckoutConfig.payloadJSON = JSON.stringify( amazonCreateCheckoutConfig.payloadJSON );
diff --git a/tests/e2e/lib/store-owner-flow.js b/tests/e2e/lib/store-owner-flow.js
index 82d22834..7b897977 100644
--- a/tests/e2e/lib/store-owner-flow.js
+++ b/tests/e2e/lib/store-owner-flow.js
@@ -77,12 +77,6 @@ export default class StoreOwnerFlow extends Base {
if ( args.buttonLanguage ) {
settings.selectButtonLanguage( args.buttonLanguage );
}
- if ( args.hasOwnProperty( 'hideStandardCheckoutButton' ) && args.hideStandardCheckoutButton ) {
- settings.checkHideStandardCheckoutButton();
- }
- if ( args.hasOwnProperty( 'hideStandardCheckoutButton' ) && ! args.hideStandardCheckoutButton ) {
- settings.uncheckHideStandardCheckoutButton();
- }
return settings.saveChanges();
}
diff --git a/tests/e2e/lib/wp-admin-wc-settings-checkout-amazon-pay.js b/tests/e2e/lib/wp-admin-wc-settings-checkout-amazon-pay.js
index 99f379f6..92113033 100644
--- a/tests/e2e/lib/wp-admin-wc-settings-checkout-amazon-pay.js
+++ b/tests/e2e/lib/wp-admin-wc-settings-checkout-amazon-pay.js
@@ -20,7 +20,6 @@ const BUTTON_TYPE_SELECTOR = By.css( '#woocommerce_amazon_payments_advanced_butt
const BUTTON_SIZE_SELECTOR = By.css( '#woocommerce_amazon_payments_advanced_button_size' );
const BUTTON_COLOR_SELECTOR = By.css( '#woocommerce_amazon_payments_advanced_button_color' );
const BUTTON_LANGUAGE_SELECTOR = By.css( '#woocommerce_amazon_payments_advanced_button_language' );
-const HIDE_STANDARD_CHECKOUT_BUTTON = By.css( '#woocommerce_amazon_payments_advanced_hide_standard_checkout_button' );
export default class WPAdminWCSettingsCheckoutAmazonPay extends WPAdminWCSettings {
constructor( driver, args = {} ) {
@@ -144,14 +143,4 @@ export default class WPAdminWCSettingsCheckoutAmazonPay extends WPAdminWCSetting
selectButtonLanguage( language ) {
return helper.selectOption( this.driver, BUTTON_LANGUAGE_SELECTOR, language );
}
-
- checkHideStandardCheckoutButton() {
- helper.unsetCheckbox( this.driver, HIDE_STANDARD_CHECKOUT_BUTTON );
- return helper.setCheckbox( this.driver, HIDE_STANDARD_CHECKOUT_BUTTON );
- }
-
- uncheckHideStandardCheckoutButton() {
- helper.setCheckbox( this.driver, HIDE_STANDARD_CHECKOUT_BUTTON );
- return helper.unsetCheckbox( this.driver, HIDE_STANDARD_CHECKOUT_BUTTON );
- }
}
diff --git a/tests/phpunit/includes/test-wc-amazon-payments-advanced-api.php b/tests/phpunit/includes/test-wc-amazon-payments-advanced-api.php
index e3df93ab..23bd0e28 100644
--- a/tests/phpunit/includes/test-wc-amazon-payments-advanced-api.php
+++ b/tests/phpunit/includes/test-wc-amazon-payments-advanced-api.php
@@ -41,7 +41,6 @@ public function test_get_default_settings() : void {
'button_size' => 'small',
'button_color' => 'Gold',
'button_language' => '',
- 'hide_standard_checkout_button' => 'no',
'debug' => 'no',
'hide_button_mode' => 'no',
'amazon_keys_setup_and_validated' => '0',
diff --git a/tests/phpunit/includes/test-wc-gateway-amazon-payments-advanced.php b/tests/phpunit/includes/test-wc-gateway-amazon-payments-advanced.php
index 1110f7ac..4553f05f 100644
--- a/tests/phpunit/includes/test-wc-gateway-amazon-payments-advanced.php
+++ b/tests/phpunit/includes/test-wc-gateway-amazon-payments-advanced.php
@@ -115,7 +115,7 @@ public function test_classic_process_payment_succeeds() : void {
'amazonCreateCheckoutParams' => wp_json_encode( WC_Mocker_Amazon_Payments_Advanced_API::get_create_checkout_classic_session_config( array( 'test' ) ) ),
'amazonEstimatedOrderAmount' => wp_json_encode(
array(
- 'amount' => $order_total,
+ 'amount' => WC_Amazon_Payments_Advanced::format_amount( $order_total, 2 ),
'currencyCode' => get_woocommerce_currency(),
)
),
@@ -124,6 +124,25 @@ public function test_classic_process_payment_succeeds() : void {
);
}
+ /**
+ * Test happy path of classic gateway.
+ *
+ * @return void
+ */
+ public function test_estimated_order_amount_format() : void {
+ $mock_gateway = new WC_Mocker_Gateway_Amazon_Payments_Advanced( '100.2501' );
+
+ $this->assertEquals(
+ wp_json_encode(
+ array(
+ 'amount' => '100.25',
+ 'currencyCode' => get_woocommerce_currency(),
+ )
+ ),
+ $mock_gateway::get_estimated_order_amount()
+ );
+ }
+
/**
* Test maybe_separator_and_checkout_button_single_product method.
*
diff --git a/tests/phpunit/mockers/class-wc-mocker-gateway-amazon-payments-advanced.php b/tests/phpunit/mockers/class-wc-mocker-gateway-amazon-payments-advanced.php
index 608a7bf2..655bdd48 100644
--- a/tests/phpunit/mockers/class-wc-mocker-gateway-amazon-payments-advanced.php
+++ b/tests/phpunit/mockers/class-wc-mocker-gateway-amazon-payments-advanced.php
@@ -21,9 +21,9 @@ class WC_Mocker_Gateway_Amazon_Payments_Advanced extends WC_Gateway_Amazon_Payme
/**
* Overwrite actual constructor so we avoid hooking twice.
*
- * @param int $order_total The order total to be set.
+ * @param int|string $order_total The order total to be set.
*/
- public function __construct( int $order_total = 50 ) {
+ public function __construct( int|string $order_total = 50 ) {
$this->settings = WC_Amazon_Payments_Advanced_API::get_settings();
self::$order_total = $order_total;
@@ -77,10 +77,10 @@ protected function get_create_checkout_classic_session_config( $payload ) : arra
*
* @return string
*/
- protected static function get_estimated_order_amount() : string {
+ public static function get_estimated_order_amount() : string {
return wp_json_encode(
array(
- 'amount' => self::$order_total,
+ 'amount' => WC_Amazon_Payments_Advanced::format_amount( self::$order_total ),
'currencyCode' => get_woocommerce_currency(),
)
);
diff --git a/webpack.config.js b/webpack.config.js
index 2459d7b4..0080ce61 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -264,6 +264,6 @@ module.exports = {
patterns: [
{ from: 'src/images', to: './images/' }
]
- })
+ }),
],
};
diff --git a/woocommerce-gateway-amazon-payments-advanced.php b/woocommerce-gateway-amazon-payments-advanced.php
index 31e9b63f..bfc84bc9 100644
--- a/woocommerce-gateway-amazon-payments-advanced.php
+++ b/woocommerce-gateway-amazon-payments-advanced.php
@@ -8,8 +8,8 @@
* Author URI: https://woocommerce.com
* Text Domain: woocommerce-gateway-amazon-payments-advanced
* Domain Path: /languages/
- * Tested up to: 6.2
- * WC tested up to: 7.8
+ * Tested up to: 6.6
+ * WC tested up to: 9.0.2
* WC requires at least: 4.0
*
* Copyright: © 2023 WooCommerce
@@ -320,7 +320,7 @@ public static function get_site_description() {
public static function format_amount( $num, $decimals = null, $decimals_sep = '.', $thousands_sep = '' ) {
/* Amazon won't accept any decimals more than 2. */
$decimals = $decimals > 2 ? null : $decimals;
- $decimals = $decimals ? $decimals : min( wc_get_price_decimals(), 2 );
+ $decimals = null !== $decimals ? $decimals : min( wc_get_price_decimals(), 2 );
return number_format( $num, $decimals, $decimals_sep, $thousands_sep );
}
@@ -492,10 +492,7 @@ public function rest_api_register_routes() {
if ( ! function_exists( 'WC' ) ) {
return;
}
- if ( ! isset( WC()->api ) ) {
- return;
- }
- if ( ! is_a( WC()->api, 'WC_API' ) ) {
+ if ( ( ! isset( WC()->api ) || ! is_a( WC()->api, 'WC_API' ) ) && ! class_exists( 'Automattic\WooCommerce\StoreApi\StoreApi' ) ) {
return;
}
@@ -559,6 +556,16 @@ public function get_express_gateway() {
return $this->express_gateway;
}
+
+ /**
+ * Return instance of WC_Gateway_Amazon_Payments_Advanced_Subscriptions.
+ *
+ * @return WC_Gateway_Amazon_Payments_Advanced_Subscriptions
+ */
+ public function get_subscriptions() {
+ return $this->subscriptions;
+ }
+
/**
* Checks whether Express Gateway should be loaded or not.
*