-
+
-
+
diff --git a/wp-content/plugins/easy-digital-downloads/includes/blocks/views/downloads/footer.php b/wp-content/plugins/easy-digital-downloads/includes/blocks/views/downloads/footer.php
index 365fd05f..742ad9de 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/blocks/views/downloads/footer.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/blocks/views/downloads/footer.php
@@ -4,7 +4,8 @@
'download_id' => get_the_ID(),
'align' => $block_attributes['purchase_link_align'],
'show_price' => (bool) $block_attributes['show_price'],
+ 'direct' => 'direct' === edd_get_download_button_behavior( get_the_ID() ),
);
- echo EDD\Blocks\Downloads\buy_button( $args );
+ echo EDD\Blocks\Downloads\buy_button( $args ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
?>
diff --git a/wp-content/plugins/easy-digital-downloads/includes/blocks/views/orders/downloads.php b/wp-content/plugins/easy-digital-downloads/includes/blocks/views/orders/downloads.php
index 0dd02e63..5dea3683 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/blocks/views/orders/downloads.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/blocks/views/orders/downloads.php
@@ -1,5 +1,4 @@
price_id;
$download_files = edd_get_download_files( $item->product_id, $item->price_id );
if ( $block_attributes['hide_empty'] && empty( $download_files ) ) {
return;
@@ -12,28 +11,49 @@ $classes = array(
if ( $block_attributes['search'] && edd_is_pro() ) {
$classes[] = 'edd-pro-search__product';
}
+
+$registered_columns = EDD\Blocks\Orders\get_user_downloads_block_columns();
?>
-
+ $column ) {
+ $row = $column['row'];
-
-
+ $classes = array(
+ 'edd-blocks__row-column',
+ 'edd-blocks__row-column--' . $column_id,
+ );
+
+ if ( ! empty( $row['classes'] ) ) {
+ $classes = array_merge( $classes, $row['classes'] );
+ }
+
+ ?>
+
$file ) :
- $download_url = edd_get_download_file_url( $order, $order->email, $filekey, $item->product_id, $price_id );
- ?>
-
- $name,
+ 'order_item' => $item,
+ 'order' => $order,
+ 'block_attributes' => $block_attributes,
+ 'download_files' => $download_files,
+ );
+ /**
+ * Renders a column in the user downloads block.
+ *
+ * To add a new column, use the `edd_blocks_user_download_columns` filter.
+ *
+ * @since 2.0.6
+ * @param array $action_args The arguments to pass to the hook.
+ * @param string $name The name of the product.
+ * @param EDD\Orders\Order_Item $item The order item.
+ * @param EDD\Orders\Order $order The order object.
+ * @param array $block_attributes The block attributes.
+ * @param array $download_files The download files.
+ */
+ do_action( 'edd_blocks_user_downloads_block_column_' . $column_id, $action_args );
?>
-
+
diff --git a/wp-content/plugins/easy-digital-downloads/includes/class-easy-digital-downloads.php b/wp-content/plugins/easy-digital-downloads/includes/class-easy-digital-downloads.php
index 00116e32..5519ac4d 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/class-easy-digital-downloads.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/class-easy-digital-downloads.php
@@ -355,7 +355,7 @@ final class Easy_Digital_Downloads {
// Plugin version.
if ( ! defined( 'EDD_VERSION' ) ) {
- define( 'EDD_VERSION', '3.1.1.3' );
+ define( 'EDD_VERSION', '3.1.1.4.2' );
}
// Make sure CAL_GREGORIAN is defined.
@@ -759,7 +759,6 @@ final class Easy_Digital_Downloads {
require_once EDD_PLUGIN_DIR . 'includes/template-actions.php';
require_once EDD_PLUGIN_DIR . 'includes/country-functions.php';
require_once EDD_PLUGIN_DIR . 'includes/extensions/licensing-functions.php';
- require_once EDD_PLUGIN_DIR . 'includes/extensions/ExtensionRegistry.php';
require_once EDD_PLUGIN_DIR . 'includes/date-functions.php';
require_once EDD_PLUGIN_DIR . 'includes/misc-functions.php';
require_once EDD_PLUGIN_DIR . 'includes/discount-functions.php';
diff --git a/wp-content/plugins/easy-digital-downloads/includes/class-edd-license-handler.php b/wp-content/plugins/easy-digital-downloads/includes/class-edd-license-handler.php
index 580750f2..fdec334b 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/class-edd-license-handler.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/class-edd-license-handler.php
@@ -75,20 +75,20 @@ class EDD_License {
$this->item_shortname = 'edd_' . preg_replace( '/[^a-zA-Z0-9_\s]/', '', str_replace( ' ', '_', strtolower( $this->item_name ) ) );
$this->version = $_version;
$this->edd_license = new License( $this->item_name, $_optname );
- if ( empty( $this->edd_license->key ) ) {
- $this->edd_license = new License( 'pro' );
- if ( ! empty( $this->edd_license->key ) ) {
+ if ( empty( $_api_url ) && ( empty( $this->edd_license->key ) || empty( $this->edd_license->license ) ) ) {
+ $pro_license = new License( 'pro' );
+ if ( ! empty( $pro_license->key ) ) {
$this->is_pro_license = true;
+ $this->edd_license = $pro_license;
}
}
$this->license = $this->edd_license->key;
$this->author = $_author;
- $this->api_handler = new API();
- $this->api_url = is_null( $_api_url ) ? $this->api_handler->get_url() : $_api_url;
+ $this->api_handler = new API( $_api_url );
+ $this->api_url = $_api_url;
$this->pass_manager = new \EDD\Admin\Pass_Manager();
// Setup hooks
- $this->includes();
$this->hooks();
/**
@@ -100,7 +100,7 @@ class EDD_License {
*
* @see \EDD\Admin\Promos\Notices\License_Upgrade_Notice::__construct()
*/
- if ( ! empty( $this->license ) ) {
+ if ( ! empty( $this->license ) && is_null( $this->api_url ) ) {
global $edd_licensed_products;
if ( ! is_array( $edd_licensed_products ) ) {
$edd_licensed_products = array();
@@ -115,11 +115,7 @@ class EDD_License {
* @access private
* @return void
*/
- private function includes() {
- if ( ! class_exists( 'EDD_SL_Plugin_Updater' ) ) {
- require_once 'EDD_SL_Plugin_Updater.php';
- }
- }
+ private function includes() {}
/**
* Setup hooks
@@ -130,15 +126,10 @@ class EDD_License {
private function hooks() {
// Register settings
- add_filter( 'edd_settings_licenses', array( $this, 'settings' ), 1 );
-
- // Display help text at the top of the Licenses tab
- add_action( 'edd_settings_tab_top', array( $this, 'license_help_text' ) );
+ add_filter( 'edd_settings_licenses', array( $this, 'settings' ) );
// Check that license is valid once per week
- if ( edd_doing_cron() ) {
- add_action( 'edd_weekly_scheduled_events', array( $this, 'weekly_license_check' ) );
- }
+ add_action( 'edd_weekly_scheduled_events', array( $this, 'weekly_license_check' ) );
// For testing license notices, uncomment this line to force checks on every page load
//add_action( 'admin_init', array( $this, 'weekly_license_check' ) );
@@ -176,7 +167,7 @@ class EDD_License {
$license = $this->license;
// Fall back to the highest license key if one is not saved for this extension or there isn't a pro license.
- if ( empty( $license ) ) {
+ if ( empty( $license ) && empty( $this->api_url ) ) {
if ( $this->pass_manager->highest_license_key ) {
$license = $this->pass_manager->highest_license_key;
}
@@ -200,9 +191,13 @@ class EDD_License {
$args['item_name'] = $this->item_name;
}
+ if ( ! class_exists( 'EDD_SL_Plugin_Updater' ) ) {
+ require_once 'EDD_SL_Plugin_Updater.php';
+ }
+
// Setup the updater
new EDD_SL_Plugin_Updater(
- $this->api_url,
+ is_null( $this->api_url ) ? $this->api_handler->get_url() : $this->api_url,
$this->file,
$args
);
@@ -224,66 +219,13 @@ class EDD_License {
'options' => array(
'is_valid_license_option' => $this->item_shortname . '_license_active',
'item_id' => $this->item_id,
+ 'api_url' => $this->api_url,
),
'size' => 'regular',
)
) );
}
- /**
- * Display help text at the top of the Licenses tag
- *
- * @since 2.5
- * @param string $active_tab
- * @return void
- */
- public function license_help_text( $active_tab = '' ) {
- static $has_ran = false;
-
- if ( 'licenses' !== $active_tab ) {
- return;
- }
-
- if ( ! empty( $has_ran ) ) {
- return;
- }
-
- ?>
-
-
- ',
- ''
- );
- ?>
-
- pass_manager->highest_license_key ) : ?>
-
- 'edd-settings',
- 'tab' => 'general',
- )
- );
- printf(
- __( 'Have a pass? You\'re ready to set up EDD (Pro). %1$sActivate Your Pass%2$s' ),
- '',
- ' '
- );
- ?>
-
-
-
- is_pro_license ) {
+ if ( $this->is_pro_license && empty( $this->api_url ) ) {
return;
}
@@ -322,7 +264,9 @@ class EDD_License {
return false;
}
- $this->pass_manager->maybe_set_pass_flag( $this->license, $license_data );
+ if ( empty( $this->api_url ) ) {
+ $this->pass_manager->maybe_set_pass_flag( $this->license, $license_data );
+ }
$this->edd_license->save( $license_data );
}
@@ -332,8 +276,6 @@ class EDD_License {
* @return void
*/
public function notices() {
- static $showed_invalid_message = false;
-
if ( empty( $this->license ) ) {
return;
}
@@ -342,28 +284,25 @@ class EDD_License {
return;
}
- $messages = array();
-
- $license = $this->edd_license;
-
- if ( ( empty( $license->license ) || 'valid' !== $license->license ) && empty( $showed_invalid_message ) ) {
- if ( empty( $_GET['tab'] ) || 'licenses' !== $_GET['tab'] ) {
-
- $messages[] = sprintf(
- __( 'You have invalid or expired license keys for Easy Digital Downloads.
Fix this ', 'easy-digital-downloads' ),
- esc_url( edd_get_admin_url( array( 'page' => 'edd-settings', 'tab' => 'licenses' ) ) )
- );
-
- $showed_invalid_message = true;
- }
+ if ( ! empty( $_GET['tab'] ) && 'licenses' === $_GET['tab'] ) {
+ return;
}
- if ( ! empty( $messages ) ) {
- foreach( $messages as $message ) {
- echo '
';
- echo '
' . $message . '
';
- echo '
';
- }
+ if ( ( empty( $this->edd_license->license ) || 'valid' !== $this->edd_license->license ) ) {
+
+ EDD()->notices->add_notice(
+ array(
+ 'id' => 'edd-missing-license',
+ 'class' => "error {$this->item_shortname}-license-error",
+ 'message' => sprintf(
+ /* translators: 1. opening anchor tag; 2. closing anchor tag */
+ __( 'You have invalid or expired license keys for Easy Digital Downloads. %1$sActivate License(s)%2$s', 'easy-digital-downloads' ),
+ '
',
+ ' '
+ ),
+ 'is_dismissible' => false,
+ )
+ );
}
}
@@ -568,6 +507,16 @@ class EDD_License {
delete_option( $this->item_shortname . '_license_active' );
}
}
+
+ /**
+ * Display help text at the top of the Licenses tag
+ *
+ * @since 2.5
+ * @deprecated 3.1.1.4
+ * @param string $active_tab
+ * @return void
+ */
+ public function license_help_text( $active_tab = '' ) {}
}
endif; // end class_exists check
diff --git a/wp-content/plugins/easy-digital-downloads/includes/customer-functions.php b/wp-content/plugins/easy-digital-downloads/includes/customer-functions.php
index 50b59bdc..201a38ad 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/customer-functions.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/customer-functions.php
@@ -52,21 +52,8 @@ function edd_add_customer( $data = array() ) {
}
$customers = new EDD\Database\Queries\Customer();
- $customer_id = $customers->add_item( $data );
- if ( ! empty( $customer_id ) ) {
- /**
- * Action that runs when a customer is added with the edd_add_customer function.
- *
- * @since 3.0.4
- *
- * @param int $customer_id Customer ID added.
- * @param array $data Array of arguments sent to create the customer with.
- */
- do_action( 'edd_customer_added', $customer_id, $data );
- }
-
- return $customer_id;
+ return $customers->add_item( $data );
}
/**
@@ -80,20 +67,7 @@ function edd_add_customer( $data = array() ) {
function edd_delete_customer( $customer_id = 0 ) {
$customers = new EDD\Database\Queries\Customer();
- $customer_deleted = $customers->delete_item( $customer_id );
-
- if ( ! empty( $customer_deleted ) ) {
- /**
- * Action that runs when a customer is deleted with the edd_delete_customer function.
- *
- * @since 3.0.4
- *
- * @param int $customer_id Customer ID being deleted.
- */
- do_action( 'edd_customer_deleted', $customer_id );
- }
-
- return $customer_deleted;
+ return $customers->delete_item( $customer_id );
}
/**
@@ -189,23 +163,7 @@ function edd_destroy_customer( $customer_id = 0 ) {
function edd_update_customer( $customer_id = 0, $data = array() ) {
$customers = new EDD\Database\Queries\Customer();
- $previous_customer_data = edd_get_customer( $customer_id );
- $customer_updated = $customers->update_item( $customer_id, $data );
-
- if ( ! empty( $customer_updated ) ) {
- /**
- * Action that runs when a customer is updated with the edd_update_customer function.
- *
- * @since 3.0.4
- *
- * @param int $customer_id Customer ID updated.
- * @param array $data Array of arguments sent to create the customer with.
- * @param EDD_Customer $previous_customer_data The customer row before it was updated.
- */
- do_action( 'edd_customer_updated', $customer_id, $data, $previous_customer_data );
- }
-
- return $customer_updated;
+ return $customers->update_item( $customer_id, $data );
}
/**
diff --git a/wp-content/plugins/easy-digital-downloads/includes/database/engine/class-query.php b/wp-content/plugins/easy-digital-downloads/includes/database/engine/class-query.php
index 9a0ec7f3..f8c59070 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/database/engine/class-query.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/database/engine/class-query.php
@@ -1794,6 +1794,16 @@ class Query extends Base {
// Transition item data
$this->transition_item( $save, $item_id );
+ /**
+ * Adds a hook for a successfully added item.
+ * Custom for EDD.
+ *
+ * @since 3.1.1.4
+ * @param int $item_id The item id.
+ * @param array $data The array of data for the update.
+ */
+ do_action( $this->apply_prefix( "{$this->item_name}_added" ), $item_id, $data );
+
// Return result
return $item_id;
}
@@ -1819,15 +1829,15 @@ class Query extends Base {
$primary = $this->get_primary_column_name();
// Get item to update (from database, not cache)
- $item = $this->get_item_raw( $primary, $item_id );
+ $item_raw = $this->get_item_raw( $primary, $item_id );
// Bail if item does not exist to update
- if ( empty( $item ) ) {
+ if ( empty( $item_raw ) ) {
return false;
}
// Cast as an array for easier manipulation
- $item = (array) $item;
+ $item = (array) $item_raw;
// Unset the primary key from data to parse
unset( $data[ $primary ] );
@@ -1877,6 +1887,17 @@ class Query extends Base {
// Transition item data
$this->transition_item( $save, $item );
+ /**
+ * Adds a hook for a successfully updated item.
+ * Custom for EDD.
+ *
+ * @since 3.1.1.4
+ * @param int $item_id The item id.
+ * @param array $data The array of data for the update.
+ * @param object $item_raw The original item.
+ */
+ do_action( $this->apply_prefix( "{$this->item_name}_updated" ), $item_id, $data, $item_raw );
+
// Return result
return $result;
}
@@ -1930,6 +1951,15 @@ class Query extends Base {
$this->delete_all_item_meta( $item_id );
$this->clean_item_cache( $item );
+ /**
+ * Adds a hook for a successfully deleted item.
+ * Custom for EDD.
+ *
+ * @since 3.1.1.4
+ * @param int $item_id The item id.
+ */
+ do_action( $this->apply_prefix( "{$this->item_name}_deleted" ), $item_id );
+
// Return result
return $result;
}
diff --git a/wp-content/plugins/easy-digital-downloads/includes/database/queries/class-order.php b/wp-content/plugins/easy-digital-downloads/includes/database/queries/class-order.php
index 3cd942d9..9439fd07 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/database/queries/class-order.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/database/queries/class-order.php
@@ -373,6 +373,25 @@ class Order extends Query {
return $clauses;
}
+ /**
+ * When searching by a numeric order number, we need to override the default where clause
+ * to return orders matching either the ID or order number.
+ *
+ * @since 3.1.1.4
+ * @param array $clauses
+ * @return array
+ */
+ public function query_by_order_search( $clauses ) {
+ global $wpdb;
+ $clauses['where'] = $wpdb->prepare(
+ "{$this->table_alias}.id = %d OR {$this->table_alias}.order_number = %d",
+ absint( $this->query_vars['id'] ),
+ absint( $this->query_vars['order_number'] )
+ );
+
+ return $clauses;
+ }
+
/**
* Set the query var defaults for country and region.
*
@@ -441,6 +460,10 @@ class Order extends Query {
'condition' => ! empty( $query['discount_id'] ),
'callback' => 'query_by_discount_id',
),
+ array(
+ 'condition' => ! empty( $query['id'] ) && ! empty( $query['order_number'] ) && $query['id'] === $query['order_number'],
+ 'callback' => 'query_by_order_search',
+ ),
);
}
}
diff --git a/wp-content/plugins/easy-digital-downloads/includes/database/schemas/class-orders.php b/wp-content/plugins/easy-digital-downloads/includes/database/schemas/class-orders.php
index e1f8fe0e..e0cfbc23 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/database/schemas/class-orders.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/database/schemas/class-orders.php
@@ -8,9 +8,10 @@
* @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
* @since 3.0
*/
+
namespace EDD\Database\Schemas;
-// Exit if accessed directly
+// Exit if accessed directly.
defined( 'ABSPATH' ) || exit;
use EDD\Database\Schema;
@@ -30,117 +31,117 @@ class Orders extends Schema {
*/
public $columns = array(
- // id
+ // id.
array(
- 'name' => 'id',
- 'type' => 'bigint',
- 'length' => '20',
- 'unsigned' => true,
- 'extra' => 'auto_increment',
- 'primary' => true,
- 'sortable' => true
+ 'name' => 'id',
+ 'type' => 'bigint',
+ 'length' => '20',
+ 'unsigned' => true,
+ 'extra' => 'auto_increment',
+ 'primary' => true,
+ 'sortable' => true,
),
- // parent
+ // parent.
array(
- 'name' => 'parent',
- 'type' => 'bigint',
- 'length' => '20',
- 'unsigned' => true,
- 'default' => '0',
- 'sortable' => true
+ 'name' => 'parent',
+ 'type' => 'bigint',
+ 'length' => '20',
+ 'unsigned' => true,
+ 'default' => '0',
+ 'sortable' => true,
),
- // order_number
+ // order_number.
array(
'name' => 'order_number',
'type' => 'varchar',
'length' => '255',
'searchable' => true,
- 'sortable' => true
+ 'sortable' => true,
),
- // status
+ // status.
array(
'name' => 'status',
'type' => 'varchar',
'length' => '20',
'default' => 'pending',
'sortable' => true,
- 'transition' => true
+ 'transition' => true,
),
- // type
+ // type.
array(
- 'name' => 'type',
- 'type' => 'varchar',
- 'length' => '20',
- 'default' => 'sale',
- 'sortable' => true
+ 'name' => 'type',
+ 'type' => 'varchar',
+ 'length' => '20',
+ 'default' => 'sale',
+ 'sortable' => true,
),
- // user_id
+ // user_id.
array(
- 'name' => 'user_id',
- 'type' => 'bigint',
- 'length' => '20',
- 'unsigned' => true,
- 'default' => '0',
- 'sortable' => true
+ 'name' => 'user_id',
+ 'type' => 'bigint',
+ 'length' => '20',
+ 'unsigned' => true,
+ 'default' => '0',
+ 'sortable' => true,
),
- // customer_id
+ // customer_id.
array(
- 'name' => 'customer_id',
- 'type' => 'bigint',
- 'length' => '20',
- 'unsigned' => true,
- 'default' => '0',
- 'sortable' => true
+ 'name' => 'customer_id',
+ 'type' => 'bigint',
+ 'length' => '20',
+ 'unsigned' => true,
+ 'default' => '0',
+ 'sortable' => true,
),
- // email
+ // email.
array(
'name' => 'email',
'type' => 'varchar',
'length' => '100',
'searchable' => true,
- 'sortable' => true
- ),
-
- // ip
- array(
- 'name' => 'ip',
- 'type' => 'varchar',
- 'length' => '60',
- 'sortable' => true
- ),
-
- // gateway
- array(
- 'name' => 'gateway',
- 'type' => 'varchar',
- 'length' => '100',
'sortable' => true,
- 'default' => 'manual',
),
- // mode
+ // ip.
array(
- 'name' => 'mode',
- 'type' => 'varchar',
- 'length' => '20'
+ 'name' => 'ip',
+ 'type' => 'varchar',
+ 'length' => '60',
+ 'sortable' => true,
),
- // currency
+ // gateway.
array(
- 'name' => 'currency',
- 'type' => 'varchar',
- 'length' => '20',
- 'validate' => 'strtoupper',
+ 'name' => 'gateway',
+ 'type' => 'varchar',
+ 'length' => '100',
+ 'sortable' => true,
+ 'default' => 'manual',
),
- // payment_key
+ // mode.
+ array(
+ 'name' => 'mode',
+ 'type' => 'varchar',
+ 'length' => '20',
+ ),
+
+ // currency.
+ array(
+ 'name' => 'currency',
+ 'type' => 'varchar',
+ 'length' => '20',
+ 'validate' => 'strtoupper',
+ ),
+
+ // payment_key.
array(
'name' => 'payment_key',
'type' => 'varchar',
@@ -148,7 +149,7 @@ class Orders extends Schema {
'searchable' => true,
),
- // tax_rate_id
+ // tax_rate_id.
array(
'name' => 'tax_rate_id',
'type' => 'bigint',
@@ -156,100 +157,100 @@ class Orders extends Schema {
'unsigned' => true,
'default' => null,
'allow_null' => true,
- 'sortable' => true
- ),
-
- // subtotal
- array(
- 'name' => 'subtotal',
- 'type' => 'decimal',
- 'length' => '18,9',
- 'default' => '0',
'sortable' => true,
- 'validate' => 'edd_sanitize_amount'
),
- // discount
+ // subtotal.
array(
- 'name' => 'discount',
- 'type' => 'decimal',
- 'length' => '18,9',
- 'default' => '0',
- 'sortable' => true,
- 'validate' => 'edd_sanitize_amount'
+ 'name' => 'subtotal',
+ 'type' => 'decimal',
+ 'length' => '18,9',
+ 'default' => '0',
+ 'sortable' => true,
+ 'validate' => 'edd_sanitize_amount',
),
- // tax
+ // discount.
array(
- 'name' => 'tax',
- 'type' => 'decimal',
- 'length' => '18,9',
- 'default' => '0',
- 'sortable' => true,
- 'validate' => 'edd_sanitize_amount'
+ 'name' => 'discount',
+ 'type' => 'decimal',
+ 'length' => '18,9',
+ 'default' => '0',
+ 'sortable' => true,
+ 'validate' => 'edd_sanitize_amount',
),
- // total
+ // tax.
array(
- 'name' => 'total',
- 'type' => 'decimal',
- 'length' => '18,9',
- 'default' => '0',
- 'sortable' => true,
- 'validate' => 'edd_sanitize_amount'
+ 'name' => 'tax',
+ 'type' => 'decimal',
+ 'length' => '18,9',
+ 'default' => '0',
+ 'sortable' => true,
+ 'validate' => 'edd_sanitize_amount',
),
- // rate
+ // total.
array(
- 'name' => 'rate',
- 'type' => 'decimal',
- 'length' => '10,5',
- 'default' => '1.00000',
+ 'name' => 'total',
+ 'type' => 'decimal',
+ 'length' => '18,9',
+ 'default' => '0',
+ 'sortable' => true,
+ 'validate' => 'edd_sanitize_amount',
),
- // date_created
+ // rate.
+ array(
+ 'name' => 'rate',
+ 'type' => 'decimal',
+ 'length' => '10,5',
+ 'default' => '1.00000',
+ ),
+
+ // date_created.
array(
'name' => 'date_created',
'type' => 'datetime',
- 'default' => '', // Defaults to current time in query class
+ 'default' => '', // Defaults to current time in query class.
'created' => true,
'date_query' => true,
- 'sortable' => true
+ 'sortable' => true,
),
- // date_modified
+ // date_modified.
array(
'name' => 'date_modified',
'type' => 'datetime',
- 'default' => '', // Defaults to current time in query class
+ 'default' => '', // Defaults to current time in query class.
'modified' => true,
'date_query' => true,
- 'sortable' => true
+ 'sortable' => true,
),
- // date_completed
+ // date_completed.
array(
'name' => 'date_completed',
'type' => 'datetime',
'default' => null,
'allow_null' => true,
'date_query' => true,
- 'sortable' => true
+ 'sortable' => true,
),
- // date_refundable
+ // date_refundable.
array(
'name' => 'date_refundable',
'type' => 'datetime',
'default' => null,
'allow_null' => true,
'date_query' => true,
- 'sortable' => true
+ 'sortable' => true,
),
- // uuid
+ // uuid.
array(
- 'uuid' => true,
- )
+ 'uuid' => true,
+ ),
);
}
diff --git a/wp-content/plugins/easy-digital-downloads/includes/downloads/recalculations.php b/wp-content/plugins/easy-digital-downloads/includes/downloads/recalculations.php
index ff4938e1..8505154b 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/downloads/recalculations.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/downloads/recalculations.php
@@ -33,7 +33,7 @@ function edd_maybe_schedule_download_recalculation( $download_id ) {
// Check if the recalculation has already been scheduled.
if ( $is_scheduled && ! $bypass_cron ) {
- edd_debug_log( 'Recalculation is already scheduled for ' . $download_id . ' at ' . edd_date_i18n( $is_scheduled, 'datetime' ) );
+ edd_debug_log( 'Recalculation is already scheduled for product ' . $download_id . ' at ' . edd_date_i18n( $is_scheduled, 'datetime' ) );
return;
}
@@ -43,7 +43,7 @@ function edd_maybe_schedule_download_recalculation( $download_id ) {
return;
}
- edd_debug_log( 'Scheduling recalculation for ' . $download_id );
+ edd_debug_log( 'Scheduling recalculation for product ' . $download_id );
wp_schedule_single_event(
time() + ( 5 * MINUTE_IN_SECONDS ),
'edd_recalculate_download_sales_earnings_deferred',
diff --git a/wp-content/plugins/easy-digital-downloads/includes/emails/email-summary/class-edd-email-summary.php b/wp-content/plugins/easy-digital-downloads/includes/emails/email-summary/class-edd-email-summary.php
index 3b4d96d5..4aa82d7e 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/emails/email-summary/class-edd-email-summary.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/emails/email-summary/class-edd-email-summary.php
@@ -57,8 +57,7 @@ class EDD_Email_Summary {
public function __construct( $test_mode = false ) {
$this->test_mode = $test_mode;
$this->email_options = array(
- 'email_summary_frequency' => edd_get_option( 'email_summary_frequency', 'weekly' ),
- 'email_summary_start_of_week' => jddayofweek( (int) get_option( 'start_of_week' ) - 1, 1 ),
+ 'email_summary_frequency' => edd_get_option( 'email_summary_frequency', 'weekly' ),
);
}
@@ -416,5 +415,4 @@ class EDD_Email_Summary {
return $email_sent;
}
-
}
diff --git a/wp-content/plugins/easy-digital-downloads/includes/gateways/paypal/checkout-actions.php b/wp-content/plugins/easy-digital-downloads/includes/gateways/paypal/checkout-actions.php
index f280401e..4f9a52a4 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/gateways/paypal/checkout-actions.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/gateways/paypal/checkout-actions.php
@@ -109,6 +109,11 @@ add_action( 'edd_checkout_user_error_checks', __NAMESPACE__ . '\send_ajax_errors
* @return void
*/
function create_order( $purchase_data ) {
+
+ if ( ! wp_verify_nonce( $purchase_data['gateway_nonce'], 'edd-gateway' ) ) {
+ wp_die( __( 'Nonce verification has failed', 'easy-digital-downloads' ), __( 'Error', 'easy-digital-downloads' ), array( 'response' => 403 ) );
+ }
+
edd_debug_log( 'PayPal - create_order()' );
if ( ! ready_to_accept_payments() ) {
diff --git a/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/assets/css/build/paymentelements.min.css b/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/assets/css/build/paymentelements.min.css
index 14978ba8..a59c0e86 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/assets/css/build/paymentelements.min.css
+++ b/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/assets/css/build/paymentelements.min.css
@@ -1,3 +1,3 @@
-#edd-stripe-card-errors:not(:empty){margin:20px 0 0}:root{--edds-modal-grid-unit: 1rem;--edds-modal-overlay: rgba(0, 0, 0, 0.60)}.edds-modal__overlay{z-index:9999;position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0, 0, 0, 0.60);background:var(--edds-modal-overlay);display:flex;justify-content:center;align-items:center}.edds-modal__container{background-color:#fff;min-width:350px;max-width:90vw;max-height:90vh;box-sizing:border-box;overflow-y:auto}.admin-bar .edds-modal__container{margin-top:32px}.edds-modal__header{padding:calc(1rem*1.5);padding:calc(var(--edds-modal-grid-unit)*1.5);display:flex;justify-content:space-between;align-items:center;position:sticky;top:0;z-index:2;background:#fff;border-bottom:1px solid #eee}.edds-modal__title{text-align:left;font-size:150%;margin:0}.edds-modal__close{line-height:1;padding:1rem}.edds-modal__close:before{content:"✕"}.edds-modal__content{margin:calc(1rem*1.5);margin:calc(var(--edds-modal-grid-unit)*1.5)}@keyframes eddsSlideIn{from{transform:translateY(15%)}to{transform:translateY(0)}}@keyframes eddsSlideOut{from{transform:translateY(0)}to{transform:translateY(15%)}}.edds-modal.has-slide{display:none}.edds-modal.has-slide.is-open{display:block}.edds-modal.has-slide[aria-hidden=false] .edds-modal__container{animation:eddsSlideIn .3s cubic-bezier(0, 0, 0.2, 1)}.edds-modal.has-slide[aria-hidden=true] .edds-modal__container{animation:eddsSlideOut .3s cubic-bezier(0, 0, 0.2, 1)}.edds-modal.has-slide .edds-modal__container,.edds-modal.has-slide .edds-modal__overlay{will-change:transform}.edds-buy-now-modal{width:500px}.edds-buy-now-modal .edds-modal__close{padding:.5rem}.edds-buy-now-modal #edd_checkout_form_wrap input.edd-input,.edds-buy-now-modal #edd_checkout_form_wrap textarea.edd-input{width:100%}.edds-buy-now-modal #edd_checkout_form_wrap #edd_purchase_submit{margin-top:1.5rem;margin-bottom:0}.edds-buy-now-modal .edds-field-spacer-shim{margin-bottom:1rem}.edds-buy-now-modal .edd-alert-error{margin:20px 0}.edds-buy-now-modal #edd-stripe-card-errors:not(:empty){margin-bottom:20px}.edds-buy-now-modal #edd-stripe-card-errors:not(:empty) .edd-alert-error{margin:0}#edd_purchase_submit #edd-purchase-button[data-edd-button-state=disabled]{opacity:.5;cursor:not-allowed}#edd_purchase_submit #edd-purchase-button[data-edd-button-state=updating],#edd_purchase_submit #edd-purchase-button [data-edd-button-state=processing]{opacity:.5;cursor:wait}
+#edd-stripe-card-errors:not(:empty){margin:20px 0 0}:root{--edds-modal-grid-unit: 1rem;--edds-modal-overlay: rgba(0, 0, 0, 0.60)}.edds-modal__overlay{z-index:9999;position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0, 0, 0, 0.60);background:var(--edds-modal-overlay);display:flex;justify-content:center;align-items:center}.edds-modal__container{background-color:#fff;min-width:350px;max-width:90vw;max-height:90vh;box-sizing:border-box;overflow-y:auto}.admin-bar .edds-modal__container{margin-top:32px}.edds-modal__header{padding:calc(1rem*1.5);padding:calc(var(--edds-modal-grid-unit)*1.5);display:flex;justify-content:space-between;align-items:center;position:sticky;top:0;z-index:2;background:#fff;border-bottom:1px solid #eee}.edds-modal__title{text-align:left;font-size:150%;margin:0}.edds-modal__close{line-height:1;padding:1rem}.edds-modal__close:before{content:"✕"}.edds-modal__content{margin:calc(1rem*1.5);margin:calc(var(--edds-modal-grid-unit)*1.5)}@keyframes eddsSlideIn{from{transform:translateY(15%)}to{transform:translateY(0)}}@keyframes eddsSlideOut{from{transform:translateY(0)}to{transform:translateY(15%)}}.edds-modal.has-slide{display:none}.edds-modal.has-slide.is-open{display:block}.edds-modal.has-slide[aria-hidden=false] .edds-modal__container{animation:eddsSlideIn .3s cubic-bezier(0, 0, 0.2, 1)}.edds-modal.has-slide[aria-hidden=true] .edds-modal__container{animation:eddsSlideOut .3s cubic-bezier(0, 0, 0.2, 1)}.edds-modal.has-slide .edds-modal__container,.edds-modal.has-slide .edds-modal__overlay{will-change:transform}.edds-buy-now-modal{width:500px}.edds-buy-now-modal .edds-modal__close{padding:.5rem}.edds-buy-now-modal #edd_checkout_form_wrap input.edd-input,.edds-buy-now-modal #edd_checkout_form_wrap textarea.edd-input{width:100%}.edds-buy-now-modal #edd_checkout_form_wrap #edd_purchase_submit{margin-top:1.5rem;margin-bottom:0}.edds-buy-now-modal .edds-field-spacer-shim{margin-bottom:1rem}.edds-buy-now-modal .edd-alert-error{margin:20px 0}.edds-buy-now-modal #edd-stripe-card-errors:not(:empty){margin-bottom:20px}.edds-buy-now-modal #edd-stripe-card-errors:not(:empty) .edd-alert-error{margin:0}#edd_purchase_submit #edd-purchase-button[data-edd-button-state=disabled]{opacity:.5;cursor:not-allowed}#edd_purchase_submit #edd-purchase-button[data-edd-button-state=updating],#edd_purchase_submit #edd-purchase-button [data-edd-button-state=processing]{opacity:.5;cursor:wait}#card_name,.card-name{padding:8px !important;width:100% !important;box-sizing:border-box}
/*# sourceMappingURL=paymentelements.min.css.map*/
\ No newline at end of file
diff --git a/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/assets/css/build/paymentelements.min.css.map b/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/assets/css/build/paymentelements.min.css.map
index 75b98f72..b242d901 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/assets/css/build/paymentelements.min.css.map
+++ b/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/assets/css/build/paymentelements.min.css.map
@@ -1 +1 @@
-{"version":3,"sources":["webpack:///./assets/css/src/payment-elements.scss"],"names":[],"mappings":"AAAA,oCAAoC,gBAAgB,MAAM,6BAA6B,0CAA0C,qBAAqB,aAAa,eAAe,MAAM,OAAO,QAAQ,SAAS,+BAA+B,qCAAqC,aAAa,uBAAuB,mBAAmB,uBAAuB,sBAAsB,gBAAgB,eAAe,gBAAgB,sBAAsB,gBAAgB,kCAAkC,gBAAgB,oBAAoB,uBAAuB,8CAA8C,aAAa,8BAA8B,mBAAmB,gBAAgB,MAAM,UAAU,gBAAgB,6BAA6B,mBAAmB,gBAAgB,eAAe,SAAS,mBAAmB,cAAc,aAAa,0BAA0B,YAAY,qBAAqB,sBAAsB,6CAA6C,uBAAuB,KAAK,0BAA0B,GAAG,yBAAyB,wBAAwB,KAAK,wBAAwB,GAAG,2BAA2B,sBAAsB,aAAa,8BAA8B,cAAc,gEAAgE,qDAAqD,+DAA+D,sDAAsD,wFAAwF,sBAAsB,oBAAoB,YAAY,uCAAuC,cAAc,2HAA2H,WAAW,iEAAiE,kBAAkB,gBAAgB,4CAA4C,mBAAmB,qCAAqC,cAAc,wDAAwD,mBAAmB,yEAAyE,SAAS,0EAA0E,WAAW,mBAAmB,uJAAuJ,WAAW,Y","file":"assets/css/build/paymentelements.min.css","sourcesContent":["#edd-stripe-card-errors:not(:empty){margin:20px 0 0}:root{--edds-modal-grid-unit: 1rem;--edds-modal-overlay: rgba(0, 0, 0, 0.60)}.edds-modal__overlay{z-index:9999;position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0, 0, 0, 0.60);background:var(--edds-modal-overlay);display:flex;justify-content:center;align-items:center}.edds-modal__container{background-color:#fff;min-width:350px;max-width:90vw;max-height:90vh;box-sizing:border-box;overflow-y:auto}.admin-bar .edds-modal__container{margin-top:32px}.edds-modal__header{padding:calc(1rem*1.5);padding:calc(var(--edds-modal-grid-unit)*1.5);display:flex;justify-content:space-between;align-items:center;position:sticky;top:0;z-index:2;background:#fff;border-bottom:1px solid #eee}.edds-modal__title{text-align:left;font-size:150%;margin:0}.edds-modal__close{line-height:1;padding:1rem}.edds-modal__close:before{content:\"✕\"}.edds-modal__content{margin:calc(1rem*1.5);margin:calc(var(--edds-modal-grid-unit)*1.5)}@keyframes eddsSlideIn{from{transform:translateY(15%)}to{transform:translateY(0)}}@keyframes eddsSlideOut{from{transform:translateY(0)}to{transform:translateY(15%)}}.edds-modal.has-slide{display:none}.edds-modal.has-slide.is-open{display:block}.edds-modal.has-slide[aria-hidden=false] .edds-modal__container{animation:eddsSlideIn .3s cubic-bezier(0, 0, 0.2, 1)}.edds-modal.has-slide[aria-hidden=true] .edds-modal__container{animation:eddsSlideOut .3s cubic-bezier(0, 0, 0.2, 1)}.edds-modal.has-slide .edds-modal__container,.edds-modal.has-slide .edds-modal__overlay{will-change:transform}.edds-buy-now-modal{width:500px}.edds-buy-now-modal .edds-modal__close{padding:.5rem}.edds-buy-now-modal #edd_checkout_form_wrap input.edd-input,.edds-buy-now-modal #edd_checkout_form_wrap textarea.edd-input{width:100%}.edds-buy-now-modal #edd_checkout_form_wrap #edd_purchase_submit{margin-top:1.5rem;margin-bottom:0}.edds-buy-now-modal .edds-field-spacer-shim{margin-bottom:1rem}.edds-buy-now-modal .edd-alert-error{margin:20px 0}.edds-buy-now-modal #edd-stripe-card-errors:not(:empty){margin-bottom:20px}.edds-buy-now-modal #edd-stripe-card-errors:not(:empty) .edd-alert-error{margin:0}#edd_purchase_submit #edd-purchase-button[data-edd-button-state=disabled]{opacity:.5;cursor:not-allowed}#edd_purchase_submit #edd-purchase-button[data-edd-button-state=updating],#edd_purchase_submit #edd-purchase-button [data-edd-button-state=processing]{opacity:.5;cursor:wait}"],"sourceRoot":""}
\ No newline at end of file
+{"version":3,"sources":["webpack:///./assets/css/src/payment-elements.scss"],"names":[],"mappings":"AAAA,oCAAoC,gBAAgB,MAAM,6BAA6B,0CAA0C,qBAAqB,aAAa,eAAe,MAAM,OAAO,QAAQ,SAAS,+BAA+B,qCAAqC,aAAa,uBAAuB,mBAAmB,uBAAuB,sBAAsB,gBAAgB,eAAe,gBAAgB,sBAAsB,gBAAgB,kCAAkC,gBAAgB,oBAAoB,uBAAuB,8CAA8C,aAAa,8BAA8B,mBAAmB,gBAAgB,MAAM,UAAU,gBAAgB,6BAA6B,mBAAmB,gBAAgB,eAAe,SAAS,mBAAmB,cAAc,aAAa,0BAA0B,YAAY,qBAAqB,sBAAsB,6CAA6C,uBAAuB,KAAK,0BAA0B,GAAG,yBAAyB,wBAAwB,KAAK,wBAAwB,GAAG,2BAA2B,sBAAsB,aAAa,8BAA8B,cAAc,gEAAgE,qDAAqD,+DAA+D,sDAAsD,wFAAwF,sBAAsB,oBAAoB,YAAY,uCAAuC,cAAc,2HAA2H,WAAW,iEAAiE,kBAAkB,gBAAgB,4CAA4C,mBAAmB,qCAAqC,cAAc,wDAAwD,mBAAmB,yEAAyE,SAAS,0EAA0E,WAAW,mBAAmB,uJAAuJ,WAAW,YAAY,sBAAsB,uBAAuB,sBAAsB,sB","file":"assets/css/build/paymentelements.min.css","sourcesContent":["#edd-stripe-card-errors:not(:empty){margin:20px 0 0}:root{--edds-modal-grid-unit: 1rem;--edds-modal-overlay: rgba(0, 0, 0, 0.60)}.edds-modal__overlay{z-index:9999;position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0, 0, 0, 0.60);background:var(--edds-modal-overlay);display:flex;justify-content:center;align-items:center}.edds-modal__container{background-color:#fff;min-width:350px;max-width:90vw;max-height:90vh;box-sizing:border-box;overflow-y:auto}.admin-bar .edds-modal__container{margin-top:32px}.edds-modal__header{padding:calc(1rem*1.5);padding:calc(var(--edds-modal-grid-unit)*1.5);display:flex;justify-content:space-between;align-items:center;position:sticky;top:0;z-index:2;background:#fff;border-bottom:1px solid #eee}.edds-modal__title{text-align:left;font-size:150%;margin:0}.edds-modal__close{line-height:1;padding:1rem}.edds-modal__close:before{content:\"✕\"}.edds-modal__content{margin:calc(1rem*1.5);margin:calc(var(--edds-modal-grid-unit)*1.5)}@keyframes eddsSlideIn{from{transform:translateY(15%)}to{transform:translateY(0)}}@keyframes eddsSlideOut{from{transform:translateY(0)}to{transform:translateY(15%)}}.edds-modal.has-slide{display:none}.edds-modal.has-slide.is-open{display:block}.edds-modal.has-slide[aria-hidden=false] .edds-modal__container{animation:eddsSlideIn .3s cubic-bezier(0, 0, 0.2, 1)}.edds-modal.has-slide[aria-hidden=true] .edds-modal__container{animation:eddsSlideOut .3s cubic-bezier(0, 0, 0.2, 1)}.edds-modal.has-slide .edds-modal__container,.edds-modal.has-slide .edds-modal__overlay{will-change:transform}.edds-buy-now-modal{width:500px}.edds-buy-now-modal .edds-modal__close{padding:.5rem}.edds-buy-now-modal #edd_checkout_form_wrap input.edd-input,.edds-buy-now-modal #edd_checkout_form_wrap textarea.edd-input{width:100%}.edds-buy-now-modal #edd_checkout_form_wrap #edd_purchase_submit{margin-top:1.5rem;margin-bottom:0}.edds-buy-now-modal .edds-field-spacer-shim{margin-bottom:1rem}.edds-buy-now-modal .edd-alert-error{margin:20px 0}.edds-buy-now-modal #edd-stripe-card-errors:not(:empty){margin-bottom:20px}.edds-buy-now-modal #edd-stripe-card-errors:not(:empty) .edd-alert-error{margin:0}#edd_purchase_submit #edd-purchase-button[data-edd-button-state=disabled]{opacity:.5;cursor:not-allowed}#edd_purchase_submit #edd-purchase-button[data-edd-button-state=updating],#edd_purchase_submit #edd-purchase-button [data-edd-button-state=processing]{opacity:.5;cursor:wait}#card_name,.card-name{padding:8px !important;width:100% !important;box-sizing:border-box}"],"sourceRoot":""}
\ No newline at end of file
diff --git a/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/assets/js/build/paymentelements.min.js b/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/assets/js/build/paymentelements.min.js
index 0125b9bc..be14869c 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/assets/js/build/paymentelements.min.js
+++ b/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/assets/js/build/paymentelements.min.js
@@ -1 +1 @@
-!function(e){var t={};function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="",r(r.s=110)}([function(e,t,r){"use strict";r.d(t,"a",(function(){return n.a})),r.d(t,"f",(function(){return i.a})),r.d(t,"d",(function(){return a})),r.d(t,"h",(function(){return u})),r.d(t,"g",(function(){return c.b})),r.d(t,"j",(function(){return c.c})),r.d(t,"b",(function(){return c.a})),r.d(t,"i",(function(){return s})),r.d(t,"k",(function(){return d})),r.d(t,"e",(function(){return l})),r.d(t,"c",(function(){return f})),r(32),r(33),r(34),r(35);var n=r(19),o=r(20),i=r.n(o);function a(){i()(arguments,(function(e){document.addEventListener("DOMContentLoaded",e)}))}function u(e){for(var t=[],r=e.nextElementSibling;r;)1===r.nodeType&&t.push(r),r=r.nextElementSibling;return t}var c=r(21);function s(e){var t=!0;return i()(e.querySelectorAll("input"),(function(e){e.checkValidity&&!e.checkValidity()&&(t=!1)})),t}function d(e){var t=document.createElement("input");t.type="submit",t.style.display="none",e.appendChild(t),t.click(),t.remove()}function l(e){return e?""===e.value?null:e.value:null}function f(e,t){"true"===edd_stripe_vars.debuggingEnabled&&console.log("EDD Stripe - Debugging","\n","*".repeat(e.length+5),"\n",e,"\n","*".repeat(e.length+5),"\n",JSON.stringify(t,null,4))}r(7)},function(e,t,r){var n=r(66)();e.exports=n;try{regeneratorRuntime=n}catch(e){"object"==typeof globalThis?globalThis.regeneratorRuntime=n:Function("r","regeneratorRuntime = r")(n)}},function(e,t,r){var n=r(36);e.exports=function(e,t,r){return(t=n(t))in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e},e.exports.__esModule=!0,e.exports.default=e.exports},function(e,t,r){(function(t){function r(e,r,n,o,i,a,u){try{var c=e[a](u),s=c.value}catch(e){return void n(e)}c.done?r(s):t.resolve(s).then(o,i)}e.exports=function(e){return function(){var n=this,o=arguments;return new t((function(t,i){var a=e.apply(n,o);function u(e){r(a,t,i,u,c,"next",e)}function c(e){r(a,t,i,u,c,"throw",e)}u(void 0)}))}},e.exports.__esModule=!0,e.exports.default=e.exports}).call(this,r(22))},function(e,t){function r(t){return e.exports=r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},e.exports.__esModule=!0,e.exports.default=e.exports,r(t)}e.exports=r,e.exports.__esModule=!0,e.exports.default=e.exports},function(e,t,r){(function(t){var r=function(e){return e&&e.Math==Math&&e};e.exports=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof t&&t)||Function("return this")()}).call(this,r(38))},function(e,t){e.exports=jQuery},function(e,t,r){"use strict";function n(e){return null===e?window.eddStripe:!e in window.eddStripe?"":window.eddStripe[e]}function o(e,t,r){if(window.eddStripe[e]=t,r)return window.eddStripe[e]}r.d(t,"a",(function(){return n})),r.d(t,"b",(function(){return o}))},,function(e,t){e.exports=function(e){try{return!!e()}catch(e){return!0}}},function(e,t){var r={}.hasOwnProperty;e.exports=function(e,t){return r.call(e,t)}},function(e,t,r){"use strict";(function(e){r.d(t,"c",(function(){return s})),r.d(t,"e",(function(){return p})),r.d(t,"a",(function(){return h})),r.d(t,"b",(function(){return y})),r.d(t,"d",(function(){return m}));var n=r(3),o=r.n(n),i=r(1),a=r.n(i),u=r(31),c=r(0);function s(){Object(u.a)(),!1!==window.eddStripe.elementMounted&&(window.eddStripe.paymentMethodType="",window.eddStripe.intentFingerprint="",window.eddStripe.intentType="",window.eddStripe.intentId="",h(),e(document).off("click","#edd_purchase_form #edd_purchase_submit [type=submit]"),document.getElementById("edd-purchase-button").addEventListener("click",function(){var t=o()(a.a.mark((function t(r){var n,o,i,c,s,l,h,g,w,_,S,j,O,x,P,E,k;return a.a.wrap((function(t){for(;;)switch(t.prev=t.next){case 0:if("stripe"===e('input[name="edd-gateway"]').val()&&e(".edd_cart_total .edd_cart_amount").data("total")>0){t.next=2;break}return t.abrupt("return");case 2:if(m()){t.next=4;break}return t.abrupt("return",!1);case 4:if(r.preventDefault(),p(),n=Object(u.b)(document.getElementById("edd_purchase_form")),o="","apple_pay"!==window.eddStripe.paymentMethodType){t.next=14;break}return t.next=11,b(n);case 11:i=t.sent,c=i.paymentMethod.id,o=c;case 14:return t.prev=14,t.next=17,d(o);case 17:return s=t.sent,l=s.token,h=s.client_secret,g=s.intent_type,w=s.intent_fingerprint,_=s.intent_id,window.eddStripe.intentType=g,window.eddStripe.intentFingerprint=w,window.eddStripe.intentId=_,e("#edd-process-checkout-nonce").val(l),S="PaymentIntent"===g?"confirmPayment":"confirmSetup",j={clientSecret:h,confirmParams:{},redirect:"if_required"},"apple_pay"===window.eddStripe.paymentMethodType?j.confirmParams.payment_method=o:(j.elements=window.eddStripe.configuredElement,j.confirmParams.payment_method_data={billing_details:n}),t.next=32,window.eddStripe[S](j);case 32:if(O=t.sent,!(x=O.error)){t.next=38;break}return v(x),y(),t.abrupt("return",!1);case 38:return t.next=40,f();case 40:P=t.sent,E=P.intent,k=P.nonce,e("#edd-process-checkout-nonce").val(k),"succeeded"===E.status?window.location.replace(edd_stripe_vars.successPageUri):window.location.replace(edd_stripe_vars.failurePageUri),t.next=52;break;case 47:return t.prev=47,t.t0=t.catch(14),v(t.t0),y(),t.abrupt("return",!1);case 52:case"end":return t.stop()}}),t,null,[[14,47]])})));return function(_x){return t.apply(this,arguments)}}()))}function d(e){return l.apply(this,arguments)}function l(){return(l=o()(a.a.mark((function t(r){var n;return a.a.wrap((function(t){for(;;)switch(t.prev=t.next){case 0:return n=e("#edd-process-stripe-token"),t.abrupt("return",Object(c.a)("edds_process_purchase_form",{form_data:e("#edd_purchase_form").serialize(),timestamp:n.length?n.data("timestamp"):"",token:n.length?n.data("token"):"",intent_type:window.eddStripe.intentType,intent_id:window.eddStripe.intentId,intent_fingerprint:window.eddStripe.intentFingerprint,payment_method_id:r}));case 2:case"end":return t.stop()}}),t)})))).apply(this,arguments)}function f(){var t=e("#edd_purchase_form"),r=e("#edd-process-stripe-token"),n=t.serialize();if(0===t.length){var o=e("#edd-process-checkout-nonce").val();n="edd-process-checkout-nonce=".concat(o)}return Object(c.a)("edds_create_and_complete_order",{form_data:n,timestamp:r.length?r.data("timestamp"):"",token:r.length?r.data("token"):"",intent_id:window.eddStripe.intentId,intent_type:window.eddStripe.intentType})}function p(){window.eddStripe.paymentElement.update({readOnly:!0});var t=e("#edd-purchase-button");e(".edd-loading-ajax").length||t.parent().append('
'),t.attr("data-edd-button-state","updating"),t.prop("disabled","disabled"),t.prop("readonly","readonly"),e(".edd_errors").remove(),e(".edd-error").hide(),e("#edd-stripe-payment-errors").remove(),e(".edd-stripe-alert").remove()}function h(){var t=arguments.length>0&&void 0!==arguments[0]&&arguments[0];window.eddStripe.paymentElement.update({readOnly:!1});var r=e("#edd-purchase-button");r.attr("data-edd-button-state","disabled"),r.prop("disabled","disabled"),r.prop("readonly","readonly"),e(".edd-loading-ajax").remove(),t&&(e(".edd_errors").remove(),e(".edd-error").hide(),e("#edd-stripe-payment-errors").remove(),e(".edd-stripe-alert").remove())}function y(){window.eddStripe.paymentElement.update({readOnly:!1});var t=e("#edd-purchase-button");t.attr("data-edd-button-state","ready"),t.prop("disabled",""),t.prop("readonly",""),e(".edd-loading-ajax").remove(),e(".edd_errors").remove(),e(".edd-error").hide()}function v(t){console.log(t);var r=t.code,n=t.message,o=(t.type,window.edd_stripe_vars.elementsCustomizations.i18n.errorMessages);n||(n=edd_stripe_vars.generic_error);var i=r&&o[r]?o[r]:n,a=Object(c.g)(i);r&&"incomplete"!==r&&Object(c.a)("edds_payment_elements_rate_limit_tick"),e(".edd-stripe-alert").remove(),e(edd_global_vars.checkout_error_anchor).before(a),e(document.body).trigger("edd_checkout_error",[t]),"incomplete"===r&&e(".edd-stripe-alert").removeClass("edd-alert-error").addClass("edd-alert-warn"),window.console&&t.responseText&&window.console.error(t.responseText),h(!1)}function m(){var e=document.getElementById("edd_purchase_form");return"function"!=typeof e.checkValidity||!1!==e.checkValidity()||(e.reportValidity(),h(),!1)}function b(e){return window.eddStripe.createPaymentMethod({elements:window.eddStripe.configuredElement,params:{billing_details:e}}).then((function(e){var t=e.error,r=e.paymentMethod;return t&&v(t),{paymentMethod:r}})).catch((function(e){return v(e),y(),!1}))}}).call(this,r(6))},,,function(e,t,r){var n=r(9);e.exports=!n((function(){return 7!=Object.defineProperty({},1,{get:function(){return 7}})[1]}))},function(e,t,r){var n=r(5),o=r(48),i=r(10),a=r(49),u=r(57),c=r(90),s=o("wks"),d=n.Symbol,l=c?d:d&&d.withoutSetter||a;e.exports=function(e){return i(s,e)||(u&&i(d,e)?s[e]=d[e]:s[e]=l("Symbol."+e)),s[e]}},function(e,t){e.exports=function(e){return"object"==typeof e?null!==e:"function"==typeof e}},function(e,t,r){var n=r(14),o=r(26),i=r(23);e.exports=n?function(e,t,r){return o.f(e,t,i(1,r))}:function(e,t,r){return e[t]=r,e}},,function(e,t,r){"use strict";(function(e){r.d(t,"a",(function(){return s}));var n=r(4),o=r.n(n),i=r(2),a=r.n(i);function u(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}function c(e){for(var t=1;t
-1&&e%1==0&&e-1&&e%1==0&&e<=9007199254740991}(e.length)&&!function(e){var t=function(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}(e)?c.call(e):"";return"[object Function]"==t||"[object GeneratorFunction]"==t}(e)}function m(e){return v(e)?function(e,t){var r=y(e)||function(e){return function(e){return function(e){return!!e&&"object"==typeof e}(e)&&v(e)}(e)&&u.call(e,"callee")&&(!s.call(e,"callee")||"[object Arguments]"==c.call(e))}(e)?function(e,t){for(var r=-1,n=Array(e);++r1&&void 0!==arguments[1]?arguments[1]:"error",r=document.createElement("p");return r.classList.add("edd-alert"),r.classList.add("edd-stripe-alert"),r.style.clear="both","error"===t?r.classList.add("edd-alert-error"):r.classList.add("edd-alert-success"),r.innerHTML=e||edd_stripe_vars.generic_error,r}function o(t){var r=t.errorType,o=t.errorMessage,i=t.errorContainer,a=t.errorContainerReplace,u=void 0===a||a,c=e(i),s=n(o,r);!0===u?c.html(s):c.before(s)}function i(t){e(t).html("")}r.d(t,"b",(function(){return n})),r.d(t,"c",(function(){return o})),r.d(t,"a",(function(){return i}))}).call(this,r(6))},function(e,t,r){e.exports=r(63).Promise},function(e,t){e.exports=function(e,t){return{enumerable:!(1&e),configurable:!(2&e),writable:!(4&e),value:t}}},function(e,t,r){var n=r(42),o=r(44);e.exports=function(e){return n(o(e))}},function(e,t,r){var n=r(16);e.exports=function(e,t){if(!n(e))return e;var r,o;if(t&&"function"==typeof(r=e.toString)&&!n(o=r.call(e)))return o;if("function"==typeof(r=e.valueOf)&&!n(o=r.call(e)))return o;if(!t&&"function"==typeof(r=e.toString)&&!n(o=r.call(e)))return o;throw TypeError("Can't convert object to primitive value")}},function(e,t,r){var n=r(14),o=r(45),i=r(27),a=r(25),u=Object.defineProperty;t.f=n?u:function(e,t,r){if(i(e),t=a(t,!0),i(r),o)try{return u(e,t,r)}catch(e){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(e[t]=r.value),e}},function(e,t,r){var n=r(16);e.exports=function(e){if(!n(e))throw TypeError(String(e)+" is not an object");return e}},function(e,t,r){var n=r(5),o=r(17);e.exports=function(e,t){try{o(n,e,t)}catch(r){n[e]=t}return t}},,,function(e,t,r){"use strict";(function(e){r.d(t,"a",(function(){return y})),r.d(t,"b",(function(){return S}));var n=r(3),o=r.n(n),i=r(2),a=r.n(i),u=r(1),c=r.n(u),s=r(0),d=r(7),l=r(11);function f(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}function p(e){for(var t=1;te.length)&&(t=e.length);for(var r=0,n=new Array(t);r0&&this.registerTriggers.apply(this,a(o)),this.onClick=this.onClick.bind(this),this.onKeydown=this.onKeydown.bind(this)}var t,r;return t=e,(r=[{key:"registerTriggers",value:function(){for(var e=this,t=arguments.length,r=new Array(t),n=0;n0&&void 0!==arguments[0]?arguments[0]:null;if(this.activeElement=document.activeElement,this.modal.setAttribute("aria-hidden","false"),this.modal.classList.add(this.config.openClass),this.scrollBehaviour("disable"),this.addEventListeners(),this.config.awaitOpenAnimation){var r=function t(){e.modal.removeEventListener("animationend",t,!1),e.setFocusToFirstNode()};this.modal.addEventListener("animationend",r,!1)}else this.setFocusToFirstNode();this.config.onShow(this.modal,this.activeElement,t)}},{key:"closeModal",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:null,t=this.modal;if(this.modal.setAttribute("aria-hidden","true"),this.removeEventListeners(),this.scrollBehaviour("enable"),this.activeElement&&this.activeElement.focus&&this.activeElement.focus(),this.config.onClose(this.modal,this.activeElement,e),this.config.awaitCloseAnimation){var r=this.config.openClass;this.modal.addEventListener("animationend",(function e(){t.classList.remove(r),t.removeEventListener("animationend",e,!1)}),!1)}else t.classList.remove(this.config.openClass)}},{key:"closeModalById",value:function(e){this.modal=document.getElementById(e),this.modal&&this.closeModal()}},{key:"scrollBehaviour",value:function(e){if(this.config.disableScroll){var t=document.querySelector("body");switch(e){case"enable":Object.assign(t.style,{overflow:""});break;case"disable":Object.assign(t.style,{overflow:"hidden"})}}}},{key:"addEventListeners",value:function(){this.modal.addEventListener("touchstart",this.onClick),this.modal.addEventListener("click",this.onClick),document.addEventListener("keydown",this.onKeydown)}},{key:"removeEventListeners",value:function(){this.modal.removeEventListener("touchstart",this.onClick),this.modal.removeEventListener("click",this.onClick),document.removeEventListener("keydown",this.onKeydown)}},{key:"onClick",value:function(e){e.target.hasAttribute(this.config.closeTrigger)&&this.closeModal(e)}},{key:"onKeydown",value:function(e){27===e.keyCode&&this.closeModal(e),9===e.keyCode&&this.retainFocus(e)}},{key:"getFocusableNodes",value:function(){var e=this.modal.querySelectorAll(c);return Array.apply(void 0,a(e))}},{key:"setFocusToFirstNode",value:function(){var e=this;if(!this.config.disableFocus){var t=this.getFocusableNodes();if(0!==t.length){var r=t.filter((function(t){return!t.hasAttribute(e.config.closeTrigger)}));r.length>0&&r[0].focus(),0===r.length&&t[0].focus()}}}},{key:"retainFocus",value:function(e){var t=this.getFocusableNodes();if(0!==t.length)if(t=t.filter((function(e){return null!==e.offsetParent})),this.modal.contains(document.activeElement)){var r=t.indexOf(document.activeElement);e.shiftKey&&0===r&&(t[t.length-1].focus(),e.preventDefault()),!e.shiftKey&&t.length>0&&r===t.length-1&&(t[0].focus(),e.preventDefault())}else t[0].focus()}}])&&i(t.prototype,r),e}(),d=null,l=function(e){if(!document.getElementById(e))return console.warn("MicroModal: ❗Seems like you have missed %c'".concat(e,"'"),"background-color: #f8f9fa;color: #50596c;font-weight: bold;","ID somewhere in your code. Refer example below to resolve it."),console.warn("%cExample:","background-color: #f8f9fa;color: #50596c;font-weight: bold;",'
')),!1},f=function(e,t){if(function(e){e.length<=0&&(console.warn("MicroModal: ❗Please specify at least one %c'micromodal-trigger'","background-color: #f8f9fa;color: #50596c;font-weight: bold;","data attribute."),console.warn("%cExample:","background-color: #f8f9fa;color: #50596c;font-weight: bold;",'1)for(var r=1;r=0;--n){var o=this.tryEntries[n],i=o.completion;if("root"===o.tryLoc)return r("end");if(o.tryLoc<=this.prev){var u=a.call(o,"catchLoc"),c=a.call(o,"finallyLoc");if(u&&c){if(this.prev=0;--r){var n=this.tryEntries[r];if(n.tryLoc<=this.prev&&a.call(n,"finallyLoc")&&this.prev=0;--t){var r=this.tryEntries[t];if(r.finallyLoc===e)return this.complete(r.completion,r.afterLoc),k(r),y}},catch:function(e){for(var t=this.tryEntries.length-1;t>=0;--t){var r=this.tryEntries[t];if(r.tryLoc===e){var n=r.completion;if("throw"===n.type){var o=n.arg;k(r)}return o}}throw new Error("illegal catch attempt")},delegateYield:function(e,t,r){return this.delegate={iterator:L(e),resultName:t,nextLoc:r},"next"===this.method&&(this.arg=void 0),y}},r}e.exports=o,e.exports.__esModule=!0,e.exports.default=e.exports}).call(this,r(22))},function(e,t,r){var n=r(39),o=r(82);n({target:"Object",stat:!0,forced:Object.assign!==o},{assign:o})},function(e,t,r){var n=r(5),o=r(16),i=n.document,a=o(i)&&o(i.createElement);e.exports=function(e){return a?i.createElement(e):{}}},function(e,t,r){var n=r(5),o=r(17),i=r(10),a=r(28),u=r(46),c=r(70),s=c.get,d=c.enforce,l=String(String).split("String");(e.exports=function(e,t,r,u){var c=!!u&&!!u.unsafe,s=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof r&&("string"!=typeof t||i(r,"name")||o(r,"name",t),d(r).source=l.join("string"==typeof t?t:"")),e!==n?(c?!f&&e[t]&&(s=!0):delete e[t],s?e[t]=r:o(e,t,r)):s?e[t]=r:a(t,r)})(Function.prototype,"toString",(function(){return"function"==typeof this&&s(this).source||u(this)}))},function(e,t,r){var n,o,i,a=r(71),u=r(5),c=r(16),s=r(17),d=r(10),l=r(72),f=r(50),p=u.WeakMap;if(a){var h=new p,y=h.get,v=h.has,m=h.set;n=function(e,t){return m.call(h,e,t),t},o=function(e){return y.call(h,e)||{}},i=function(e){return v.call(h,e)}}else{var b=l("state");f[b]=!0,n=function(e,t){return s(e,b,t),t},o=function(e){return d(e,b)?e[b]:{}},i=function(e){return d(e,b)}}e.exports={set:n,get:o,has:i,enforce:function(e){return i(e)?o(e):n(e,{})},getterFor:function(e){return function(t){var r;if(!c(t)||(r=o(t)).type!==e)throw TypeError("Incompatible receiver, "+e+" required");return r}}}},function(e,t,r){var n=r(5),o=r(46),i=n.WeakMap;e.exports="function"==typeof i&&/native code/.test(o(i))},function(e,t,r){var n=r(48),o=r(49),i=n("keys");e.exports=function(e){return i[e]||(i[e]=o(e))}},function(e,t){e.exports=!1},function(e,t,r){var n=r(10),o=r(75),i=r(40),a=r(26);e.exports=function(e,t){for(var r=o(t),u=a.f,c=i.f,s=0;sd;)if((u=c[d++])!=u)return!0}else for(;s>d;d++)if((e||d in c)&&c[d]===r)return e||d||0;return!e&&-1}};e.exports={includes:a(!0),indexOf:a(!1)}},function(e,t,r){var n=r(53),o=Math.max,i=Math.min;e.exports=function(e,t){var r=n(e);return r<0?o(r+t,0):i(r,t)}},function(e,t,r){var n=r(9),o=/#|\.prototype\./,i=function(e,t){var r=u[a(e)];return r==s||r!=c&&("function"==typeof t?n(t):!!t)},a=i.normalize=function(e){return String(e).replace(o,".").toLowerCase()},u=i.data={},c=i.NATIVE="N",s=i.POLYFILL="P";e.exports=i},function(e,t,r){"use strict";var n=r(14),o=r(9),i=r(83),a=r(55),u=r(41),c=r(56),s=r(42),d=Object.assign,l=Object.defineProperty;e.exports=!d||o((function(){if(n&&1!==d({b:1},d(l({},"a",{enumerable:!0,get:function(){l(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var e={},t={},r=Symbol();return e[r]=7,"abcdefghijklmnopqrst".split("").forEach((function(e){t[e]=e})),7!=d({},e)[r]||"abcdefghijklmnopqrst"!=i(d({},t)).join("")}))?function(e,t){for(var r=c(e),o=arguments.length,d=1,l=a.f,f=u.f;o>d;)for(var p,h=s(arguments[d++]),y=l?i(h).concat(l(h)):i(h),v=y.length,m=0;v>m;)p=y[m++],n&&!f.call(h,p)||(r[p]=h[p]);return r}:d},function(e,t,r){var n=r(51),o=r(54);e.exports=Object.keys||function(e){return n(e,o)}},function(e,t,r){var n=r(39),o=r(85);n({target:"Array",stat:!0,forced:!r(95)((function(e){Array.from(e)}))},{from:o})},function(e,t,r){"use strict";var n=r(86),o=r(56),i=r(88),a=r(89),u=r(52),c=r(91),s=r(92);e.exports=function(e){var t,r,d,l,f,p,h=o(e),y="function"==typeof this?this:Array,v=arguments.length,m=v>1?arguments[1]:void 0,b=void 0!==m,g=s(h),w=0;if(b&&(m=n(m,v>2?arguments[2]:void 0,2)),null==g||y==Array&&a(g))for(r=new y(t=u(h.length));t>w;w++)p=b?m(h[w],w):h[w],c(r,w,p);else for(f=(l=g.call(h)).next,r=new y;!(d=f.call(l)).done;w++)p=b?i(l,m,[d.value,w],!0):d.value,c(r,w,p);return r.length=w,r}},function(e,t,r){var n=r(87);e.exports=function(e,t,r){if(n(e),void 0===t)return e;switch(r){case 0:return function(){return e.call(t)};case 1:return function(r){return e.call(t,r)};case 2:return function(r,n){return e.call(t,r,n)};case 3:return function(r,n,o){return e.call(t,r,n,o)}}return function(){return e.apply(t,arguments)}}},function(e,t){e.exports=function(e){if("function"!=typeof e)throw TypeError(String(e)+" is not a function");return e}},function(e,t,r){var n=r(27);e.exports=function(e,t,r,o){try{return o?t(n(r)[0],r[1]):t(r)}catch(t){var i=e.return;throw void 0!==i&&n(i.call(e)),t}}},function(e,t,r){var n=r(15),o=r(58),i=n("iterator"),a=Array.prototype;e.exports=function(e){return void 0!==e&&(o.Array===e||a[i]===e)}},function(e,t,r){var n=r(57);e.exports=n&&!Symbol.sham&&"symbol"==typeof Symbol.iterator},function(e,t,r){"use strict";var n=r(25),o=r(26),i=r(23);e.exports=function(e,t,r){var a=n(t);a in e?o.f(e,a,i(0,r)):e[a]=r}},function(e,t,r){var n=r(93),o=r(58),i=r(15)("iterator");e.exports=function(e){if(null!=e)return e[i]||e["@@iterator"]||o[n(e)]}},function(e,t,r){var n=r(94),o=r(43),i=r(15)("toStringTag"),a="Arguments"==o(function(){return arguments}());e.exports=n?o:function(e){var t,r,n;return void 0===e?"Undefined":null===e?"Null":"string"==typeof(r=function(e,t){try{return e[t]}catch(e){}}(t=Object(e),i))?r:a?o(t):"Object"==(n=o(t))&&"function"==typeof t.callee?"Arguments":n}},function(e,t,r){var n={};n[r(15)("toStringTag")]="z",e.exports="[object z]"===String(n)},function(e,t,r){var n=r(15)("iterator"),o=!1;try{var i=0,a={next:function(){return{done:!!i++}},return:function(){o=!0}};a[n]=function(){return this},Array.from(a,(function(){throw 2}))}catch(e){}e.exports=function(e,t){if(!t&&!o)return!1;var r=!1;try{var i={};i[n]=function(){return{next:function(){return{done:r=!0}}}},e(i)}catch(e){}return r}},,,,,,,,,,,function(e,t,r){},,,,function(e,t,r){"use strict";r.r(t),r(106);var n=r(0),o=r(59),i=r(62);function a(){Object(n.f)(document.querySelectorAll(".edds-buy-now"),(function(e){e.classList.contains("edd-free-download")||e.addEventListener("click",(function(e){window.eddStripe.activeBuyNow=e;var t,r,a=e.currentTarget.dataset,u=a.downloadId,c=a.nonce,s=e.currentTarget.dataset.token.length?e.currentTarget.dataset.token:"",d=e.currentTarget.dataset.timestamp.length?e.currentTarget.dataset.timestamp:"";if(u){e.preventDefault(),e.stopImmediatePropagation();var l=null,f=1,p=e.currentTarget.closest(".edd_download_purchase_form"),h=p.querySelector(".edd_price_option_".concat(u,":checked"));h&&(l=h.value);var y=p.querySelector('input[name="edd_download_quantity"]');y&&(f=y.value),t={downloadId:u,priceId:l,quantity:f,nonce:c,addToCartForm:p,timestamp:d,token:s},r=document.querySelector("#edds-buy-now-modal-content"),i.a.open("edds-buy-now",{onShow:function(){var e,i,a,u,c,s,d,l;r.innerHTML='-1&&e%1==0&&e-1&&e%1==0&&e<=9007199254740991}(e.length)&&!function(e){var t=function(e){var t=typeof e;return!!e&&("object"==t||"function"==t)}(e)?c.call(e):"";return"[object Function]"==t||"[object GeneratorFunction]"==t}(e)}function m(e){return v(e)?function(e,t){var r=y(e)||function(e){return function(e){return function(e){return!!e&&"object"==typeof e}(e)&&v(e)}(e)&&u.call(e,"callee")&&(!s.call(e,"callee")||"[object Arguments]"==c.call(e))}(e)?function(e,t){for(var r=-1,n=Array(e);++r1&&void 0!==arguments[1]?arguments[1]:"error",r=document.createElement("p");return r.classList.add("edd-alert"),r.classList.add("edd-stripe-alert"),r.style.clear="both","error"===t?r.classList.add("edd-alert-error"):r.classList.add("edd-alert-success"),r.innerHTML=e||edd_stripe_vars.generic_error,r}function o(t){var r=t.errorType,o=t.errorMessage,i=t.errorContainer,a=t.errorContainerReplace,u=void 0===a||a,c=e(i),s=n(o,r);!0===u?c.html(s):c.before(s)}function i(t){e(t).html("")}r.d(t,"b",(function(){return n})),r.d(t,"c",(function(){return o})),r.d(t,"a",(function(){return i}))}).call(this,r(6))},function(e,t,r){e.exports=r(63).Promise},function(e,t){e.exports=function(e,t){return{enumerable:!(1&e),configurable:!(2&e),writable:!(4&e),value:t}}},function(e,t,r){var n=r(42),o=r(44);e.exports=function(e){return n(o(e))}},function(e,t,r){var n=r(16);e.exports=function(e,t){if(!n(e))return e;var r,o;if(t&&"function"==typeof(r=e.toString)&&!n(o=r.call(e)))return o;if("function"==typeof(r=e.valueOf)&&!n(o=r.call(e)))return o;if(!t&&"function"==typeof(r=e.toString)&&!n(o=r.call(e)))return o;throw TypeError("Can't convert object to primitive value")}},function(e,t,r){var n=r(14),o=r(45),i=r(27),a=r(25),u=Object.defineProperty;t.f=n?u:function(e,t,r){if(i(e),t=a(t,!0),i(r),o)try{return u(e,t,r)}catch(e){}if("get"in r||"set"in r)throw TypeError("Accessors not supported");return"value"in r&&(e[t]=r.value),e}},function(e,t,r){var n=r(16);e.exports=function(e){if(!n(e))throw TypeError(String(e)+" is not an object");return e}},function(e,t,r){var n=r(5),o=r(17);e.exports=function(e,t){try{o(n,e,t)}catch(r){n[e]=t}return t}},,,function(e,t,r){"use strict";(function(e){r.d(t,"a",(function(){return y})),r.d(t,"b",(function(){return S}));var n=r(3),o=r.n(n),i=r(2),a=r.n(i),u=r(1),c=r.n(u),s=r(0),d=r(7),l=r(11);function f(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}function p(e){for(var t=1;te.length)&&(t=e.length);for(var r=0,n=new Array(t);r0&&this.registerTriggers.apply(this,a(o)),this.onClick=this.onClick.bind(this),this.onKeydown=this.onKeydown.bind(this)}var t,r;return t=e,(r=[{key:"registerTriggers",value:function(){for(var e=this,t=arguments.length,r=new Array(t),n=0;n0&&void 0!==arguments[0]?arguments[0]:null;if(this.activeElement=document.activeElement,this.modal.setAttribute("aria-hidden","false"),this.modal.classList.add(this.config.openClass),this.scrollBehaviour("disable"),this.addEventListeners(),this.config.awaitOpenAnimation){var r=function t(){e.modal.removeEventListener("animationend",t,!1),e.setFocusToFirstNode()};this.modal.addEventListener("animationend",r,!1)}else this.setFocusToFirstNode();this.config.onShow(this.modal,this.activeElement,t)}},{key:"closeModal",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:null,t=this.modal;if(this.modal.setAttribute("aria-hidden","true"),this.removeEventListeners(),this.scrollBehaviour("enable"),this.activeElement&&this.activeElement.focus&&this.activeElement.focus(),this.config.onClose(this.modal,this.activeElement,e),this.config.awaitCloseAnimation){var r=this.config.openClass;this.modal.addEventListener("animationend",(function e(){t.classList.remove(r),t.removeEventListener("animationend",e,!1)}),!1)}else t.classList.remove(this.config.openClass)}},{key:"closeModalById",value:function(e){this.modal=document.getElementById(e),this.modal&&this.closeModal()}},{key:"scrollBehaviour",value:function(e){if(this.config.disableScroll){var t=document.querySelector("body");switch(e){case"enable":Object.assign(t.style,{overflow:""});break;case"disable":Object.assign(t.style,{overflow:"hidden"})}}}},{key:"addEventListeners",value:function(){this.modal.addEventListener("touchstart",this.onClick),this.modal.addEventListener("click",this.onClick),document.addEventListener("keydown",this.onKeydown)}},{key:"removeEventListeners",value:function(){this.modal.removeEventListener("touchstart",this.onClick),this.modal.removeEventListener("click",this.onClick),document.removeEventListener("keydown",this.onKeydown)}},{key:"onClick",value:function(e){e.target.hasAttribute(this.config.closeTrigger)&&this.closeModal(e)}},{key:"onKeydown",value:function(e){27===e.keyCode&&this.closeModal(e),9===e.keyCode&&this.retainFocus(e)}},{key:"getFocusableNodes",value:function(){var e=this.modal.querySelectorAll(c);return Array.apply(void 0,a(e))}},{key:"setFocusToFirstNode",value:function(){var e=this;if(!this.config.disableFocus){var t=this.getFocusableNodes();if(0!==t.length){var r=t.filter((function(t){return!t.hasAttribute(e.config.closeTrigger)}));r.length>0&&r[0].focus(),0===r.length&&t[0].focus()}}}},{key:"retainFocus",value:function(e){var t=this.getFocusableNodes();if(0!==t.length)if(t=t.filter((function(e){return null!==e.offsetParent})),this.modal.contains(document.activeElement)){var r=t.indexOf(document.activeElement);e.shiftKey&&0===r&&(t[t.length-1].focus(),e.preventDefault()),!e.shiftKey&&t.length>0&&r===t.length-1&&(t[0].focus(),e.preventDefault())}else t[0].focus()}}])&&i(t.prototype,r),e}(),d=null,l=function(e){if(!document.getElementById(e))return console.warn("MicroModal: ❗Seems like you have missed %c'".concat(e,"'"),"background-color: #f8f9fa;color: #50596c;font-weight: bold;","ID somewhere in your code. Refer example below to resolve it."),console.warn("%cExample:","background-color: #f8f9fa;color: #50596c;font-weight: bold;",'
')),!1},f=function(e,t){if(function(e){e.length<=0&&(console.warn("MicroModal: ❗Please specify at least one %c'micromodal-trigger'","background-color: #f8f9fa;color: #50596c;font-weight: bold;","data attribute."),console.warn("%cExample:","background-color: #f8f9fa;color: #50596c;font-weight: bold;",'1)for(var r=1;r=0;--n){var o=this.tryEntries[n],i=o.completion;if("root"===o.tryLoc)return r("end");if(o.tryLoc<=this.prev){var u=a.call(o,"catchLoc"),c=a.call(o,"finallyLoc");if(u&&c){if(this.prev=0;--r){var n=this.tryEntries[r];if(n.tryLoc<=this.prev&&a.call(n,"finallyLoc")&&this.prev=0;--t){var r=this.tryEntries[t];if(r.finallyLoc===e)return this.complete(r.completion,r.afterLoc),E(r),y}},catch:function(e){for(var t=this.tryEntries.length-1;t>=0;--t){var r=this.tryEntries[t];if(r.tryLoc===e){var n=r.completion;if("throw"===n.type){var o=n.arg;E(r)}return o}}throw new Error("illegal catch attempt")},delegateYield:function(e,t,r){return this.delegate={iterator:L(e),resultName:t,nextLoc:r},"next"===this.method&&(this.arg=void 0),y}},r}e.exports=o,e.exports.__esModule=!0,e.exports.default=e.exports}).call(this,r(22))},function(e,t,r){var n=r(39),o=r(82);n({target:"Object",stat:!0,forced:Object.assign!==o},{assign:o})},function(e,t,r){var n=r(5),o=r(16),i=n.document,a=o(i)&&o(i.createElement);e.exports=function(e){return a?i.createElement(e):{}}},function(e,t,r){var n=r(5),o=r(17),i=r(10),a=r(28),u=r(46),c=r(70),s=c.get,d=c.enforce,l=String(String).split("String");(e.exports=function(e,t,r,u){var c=!!u&&!!u.unsafe,s=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof r&&("string"!=typeof t||i(r,"name")||o(r,"name",t),d(r).source=l.join("string"==typeof t?t:"")),e!==n?(c?!f&&e[t]&&(s=!0):delete e[t],s?e[t]=r:o(e,t,r)):s?e[t]=r:a(t,r)})(Function.prototype,"toString",(function(){return"function"==typeof this&&s(this).source||u(this)}))},function(e,t,r){var n,o,i,a=r(71),u=r(5),c=r(16),s=r(17),d=r(10),l=r(72),f=r(50),p=u.WeakMap;if(a){var h=new p,y=h.get,v=h.has,m=h.set;n=function(e,t){return m.call(h,e,t),t},o=function(e){return y.call(h,e)||{}},i=function(e){return v.call(h,e)}}else{var b=l("state");f[b]=!0,n=function(e,t){return s(e,b,t),t},o=function(e){return d(e,b)?e[b]:{}},i=function(e){return d(e,b)}}e.exports={set:n,get:o,has:i,enforce:function(e){return i(e)?o(e):n(e,{})},getterFor:function(e){return function(t){var r;if(!c(t)||(r=o(t)).type!==e)throw TypeError("Incompatible receiver, "+e+" required");return r}}}},function(e,t,r){var n=r(5),o=r(46),i=n.WeakMap;e.exports="function"==typeof i&&/native code/.test(o(i))},function(e,t,r){var n=r(48),o=r(49),i=n("keys");e.exports=function(e){return i[e]||(i[e]=o(e))}},function(e,t){e.exports=!1},function(e,t,r){var n=r(10),o=r(75),i=r(40),a=r(26);e.exports=function(e,t){for(var r=o(t),u=a.f,c=i.f,s=0;sd;)if((u=c[d++])!=u)return!0}else for(;s>d;d++)if((e||d in c)&&c[d]===r)return e||d||0;return!e&&-1}};e.exports={includes:a(!0),indexOf:a(!1)}},function(e,t,r){var n=r(53),o=Math.max,i=Math.min;e.exports=function(e,t){var r=n(e);return r<0?o(r+t,0):i(r,t)}},function(e,t,r){var n=r(9),o=/#|\.prototype\./,i=function(e,t){var r=u[a(e)];return r==s||r!=c&&("function"==typeof t?n(t):!!t)},a=i.normalize=function(e){return String(e).replace(o,".").toLowerCase()},u=i.data={},c=i.NATIVE="N",s=i.POLYFILL="P";e.exports=i},function(e,t,r){"use strict";var n=r(14),o=r(9),i=r(83),a=r(55),u=r(41),c=r(56),s=r(42),d=Object.assign,l=Object.defineProperty;e.exports=!d||o((function(){if(n&&1!==d({b:1},d(l({},"a",{enumerable:!0,get:function(){l(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var e={},t={},r=Symbol();return e[r]=7,"abcdefghijklmnopqrst".split("").forEach((function(e){t[e]=e})),7!=d({},e)[r]||"abcdefghijklmnopqrst"!=i(d({},t)).join("")}))?function(e,t){for(var r=c(e),o=arguments.length,d=1,l=a.f,f=u.f;o>d;)for(var p,h=s(arguments[d++]),y=l?i(h).concat(l(h)):i(h),v=y.length,m=0;v>m;)p=y[m++],n&&!f.call(h,p)||(r[p]=h[p]);return r}:d},function(e,t,r){var n=r(51),o=r(54);e.exports=Object.keys||function(e){return n(e,o)}},function(e,t,r){var n=r(39),o=r(85);n({target:"Array",stat:!0,forced:!r(95)((function(e){Array.from(e)}))},{from:o})},function(e,t,r){"use strict";var n=r(86),o=r(56),i=r(88),a=r(89),u=r(52),c=r(91),s=r(92);e.exports=function(e){var t,r,d,l,f,p,h=o(e),y="function"==typeof this?this:Array,v=arguments.length,m=v>1?arguments[1]:void 0,b=void 0!==m,g=s(h),w=0;if(b&&(m=n(m,v>2?arguments[2]:void 0,2)),null==g||y==Array&&a(g))for(r=new y(t=u(h.length));t>w;w++)p=b?m(h[w],w):h[w],c(r,w,p);else for(f=(l=g.call(h)).next,r=new y;!(d=f.call(l)).done;w++)p=b?i(l,m,[d.value,w],!0):d.value,c(r,w,p);return r.length=w,r}},function(e,t,r){var n=r(87);e.exports=function(e,t,r){if(n(e),void 0===t)return e;switch(r){case 0:return function(){return e.call(t)};case 1:return function(r){return e.call(t,r)};case 2:return function(r,n){return e.call(t,r,n)};case 3:return function(r,n,o){return e.call(t,r,n,o)}}return function(){return e.apply(t,arguments)}}},function(e,t){e.exports=function(e){if("function"!=typeof e)throw TypeError(String(e)+" is not a function");return e}},function(e,t,r){var n=r(27);e.exports=function(e,t,r,o){try{return o?t(n(r)[0],r[1]):t(r)}catch(t){var i=e.return;throw void 0!==i&&n(i.call(e)),t}}},function(e,t,r){var n=r(15),o=r(58),i=n("iterator"),a=Array.prototype;e.exports=function(e){return void 0!==e&&(o.Array===e||a[i]===e)}},function(e,t,r){var n=r(57);e.exports=n&&!Symbol.sham&&"symbol"==typeof Symbol.iterator},function(e,t,r){"use strict";var n=r(25),o=r(26),i=r(23);e.exports=function(e,t,r){var a=n(t);a in e?o.f(e,a,i(0,r)):e[a]=r}},function(e,t,r){var n=r(93),o=r(58),i=r(15)("iterator");e.exports=function(e){if(null!=e)return e[i]||e["@@iterator"]||o[n(e)]}},function(e,t,r){var n=r(94),o=r(43),i=r(15)("toStringTag"),a="Arguments"==o(function(){return arguments}());e.exports=n?o:function(e){var t,r,n;return void 0===e?"Undefined":null===e?"Null":"string"==typeof(r=function(e,t){try{return e[t]}catch(e){}}(t=Object(e),i))?r:a?o(t):"Object"==(n=o(t))&&"function"==typeof t.callee?"Arguments":n}},function(e,t,r){var n={};n[r(15)("toStringTag")]="z",e.exports="[object z]"===String(n)},function(e,t,r){var n=r(15)("iterator"),o=!1;try{var i=0,a={next:function(){return{done:!!i++}},return:function(){o=!0}};a[n]=function(){return this},Array.from(a,(function(){throw 2}))}catch(e){}e.exports=function(e,t){if(!t&&!o)return!1;var r=!1;try{var i={};i[n]=function(){return{next:function(){return{done:r=!0}}}},e(i)}catch(e){}return r}},,,,,,,,,,,function(e,t,r){},,,,function(e,t,r){"use strict";r.r(t),r(106);var n=r(0),o=r(59),i=r(62);function a(){Object(n.f)(document.querySelectorAll(".edds-buy-now"),(function(e){e.classList.contains("edd-free-download")||e.addEventListener("click",(function(e){window.eddStripe.activeBuyNow=e;var t,r,a=e.currentTarget.dataset,u=a.downloadId,c=a.nonce,s=e.currentTarget.dataset.token.length?e.currentTarget.dataset.token:"",d=e.currentTarget.dataset.timestamp.length?e.currentTarget.dataset.timestamp:"";if(u){e.preventDefault(),e.stopImmediatePropagation();var l=null,f=1,p=e.currentTarget.closest(".edd_download_purchase_form"),h=p.querySelector(".edd_price_option_".concat(u,":checked"));h&&(l=h.value);var y=p.querySelector('input[name="edd_download_quantity"]');y&&(f=y.value),t={downloadId:u,priceId:l,quantity:f,nonce:c,addToCartForm:p,timestamp:d,token:s},r=document.querySelector("#edds-buy-now-modal-content"),i.a.open("edds-buy-now",{onShow:function(){var e,i,a,u,c,s,d,l;r.innerHTML='Notes :
If taxes are enabled, this option cannot be changed from "Full address".
If set to "No address fields", you must disable "zip code verification" in your Stripe account.
', 'easy-digital-downloads' ),
@@ -105,13 +105,13 @@ function edds_add_settings( $settings ) {
'none' => __( 'No address fields', 'easy-digital-downloads' ),
),
),
- 'stripe_statement_descriptor' => array(
+ 'stripe_statement_descriptor' => array(
'id' => 'stripe_statement_descriptor',
'name' => __( 'Statement Descriptor', 'easy-digital-downloads' ),
'desc' => __( 'Choose how charges will appear on customer\'s credit card statements. Max 22 characters ', 'easy-digital-downloads' ),
'type' => 'text',
),
- 'stripe_restrict_assets' => array(
+ 'stripe_restrict_assets' => array(
'id' => 'stripe_restrict_assets',
'name' => ( __( 'Restrict Stripe Assets', 'easy-digital-downloads' ) ),
'check' => ( __( 'Only load Stripe.com hosted assets on pages that specifically utilize Stripe functionality.', 'easy-digital-downloads' ) ),
diff --git a/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/includes/class-edd-stripe-rate-limiting.php b/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/includes/class-edd-stripe-rate-limiting.php
index df8de300..2559c497 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/includes/class-edd-stripe-rate-limiting.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/includes/class-edd-stripe-rate-limiting.php
@@ -420,4 +420,17 @@ class EDD_Stripe_Rate_Limiting {
}
}
+ /**
+ * Get the error message to display when the card error limit has been hit.
+ *
+ * @since 2.9.2.2
+ * @return string The error message.
+ */
+ public function get_rate_limit_error_message() {
+ return esc_html__(
+ 'We are unable to process your payment at this time, please try again later or contact support.',
+ 'easy-digital-downloads'
+ );
+ }
+
}
diff --git a/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/includes/class-edd-stripe.php b/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/includes/class-edd-stripe.php
index 5a07dd43..4ff5f56c 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/includes/class-edd-stripe.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/includes/class-edd-stripe.php
@@ -36,6 +36,22 @@ class EDD_Stripe {
*/
public $rate_limiting;
+ /**
+ * Has Regional Support.
+ *
+ * @since 2.9.2.2
+ * @var bool
+ */
+ public $has_regional_support = false;
+
+ /**
+ * Regional Support class.
+ *
+ * @since 2.9.2.2
+ * @var EDD_Stripe_Country_Base
+ */
+ public $regional_support;
+
/**
* Instantiates or returns the singleton instance.
*
@@ -52,27 +68,15 @@ class EDD_Stripe {
self::$instance->filters();
if ( true === edds_is_pro() ) {
- if ( class_exists( '\\EDD\\Extensions\\ExtensionRegistry' ) ) {
- add_action( 'edd_extension_license_init', function( \EDD\Extensions\ExtensionRegistry $registry ) {
- $registry->addExtension(
- EDD_STRIPE_PLUGIN_FILE,
- 'Stripe Pro Payment Gateway',
- 167,
- EDD_STRIPE_VERSION,
- 'stripe_license_key'
- );
- } );
- } elseif ( class_exists( 'EDD_License' ) ) {
- new EDD_License(
+ add_action( 'edd_extension_license_init', function( \EDD\Extensions\ExtensionRegistry $registry ) {
+ $registry->addExtension(
EDD_STRIPE_PLUGIN_FILE,
'Stripe Pro Payment Gateway',
+ 167,
EDD_STRIPE_VERSION,
- 'Easy Digital Downloads',
- 'stripe_license_key',
- null,
- 167
+ 'stripe_license_key'
);
- }
+ } );
}
}
@@ -173,6 +177,9 @@ class EDD_Stripe {
require_once EDDS_PLUGIN_DIR . '/includes/integrations/edd-auto-register.php';
}
+ // Load Regional Support.
+ $this->load_regional_support();
+
// Pro.
$pro = EDDS_PLUGIN_DIR . '/includes/pro/index.php';
@@ -293,4 +300,33 @@ class EDD_Stripe {
return $gateways;
}
+ /**
+ * Loads regional support.
+ *
+ * @since 2.9.2.2
+ */
+ private function load_regional_support() {
+
+ $base_country = edd_get_option( 'base_country', 'US' );
+ $regions_needing_support = array( 'IN' );
+ if ( ! in_array( $base_country, $regions_needing_support, true ) ) {
+ return;
+ }
+
+ $possible_region_file = 'class-edd-stripe-region-' . strtolower( $base_country ) . '.php';
+ $possible_region_path = EDDS_PLUGIN_DIR . 'includes/utils/regional-support/' . $possible_region_file;
+ if ( ! file_exists( $possible_region_path ) ) {
+ return;
+ }
+
+ // Regional Support is needed.
+ require_once EDDS_PLUGIN_DIR . 'includes/utils/regional-support/class-edd-stripe-region-base.php';
+ require_once $possible_region_path;
+ $possible_region_class = 'EDD_Stripe_Region_' . strtoupper( $base_country );
+ if ( class_exists( $possible_region_class ) ) {
+ $this->has_regional_support = true;
+ require_once EDDS_PLUGIN_DIR . 'includes/utils/regional-support/' . $possible_region_file;
+ $this->regional_support = new $possible_region_class();
+ }
+ }
}
diff --git a/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/includes/elements/payment-elements.php b/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/includes/elements/payment-elements.php
index c9bb1af9..0b65117c 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/includes/elements/payment-elements.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/includes/elements/payment-elements.php
@@ -20,7 +20,7 @@ function edds_get_stripe_payment_elements_theme() {
*
* @link https://stripe.com/docs/elements/appearance-api#theme
*
- * @see assets/js/src/frontend/payment-elements/index.php::generateElementStyles
+ * @see assets/js/src/frontend/payment-elements/index.js::generateElementStyles
*
* @param array $payment_elements_theme The theme to use for the Payment Element object.
*/
@@ -42,7 +42,7 @@ function edds_get_stripe_payment_elements_variables() {
*
* @link https://stripe.com/docs/elements/appearance-api?platform=web#variables
*
- * @see assets/js/src/frontend/payment-elements/index.php::generateElementStyles
+ * @see assets/js/src/frontend/payment-elements/index.js::generateElementStyles
*
* @param array $payment_elements_variables Variables used for the Payment Elements.
*/
@@ -95,7 +95,7 @@ function edds_get_stripe_payment_elements_layout() {
*
* @link https://stripe.com/docs/js/elements_object/create_payment_element#payment_element_create-options-layout
*
- * @see assets/js/src/frontend/payment-elements/index.php::generateElementStyles
+ * @see assets/js/src/frontend/payment-elements/index.js::generateElementStyles
*
* @param array $payment_elements_layout Layout values used to create Stripe Elements object.
*/
@@ -121,7 +121,7 @@ function edds_get_stripe_payment_elements_wallets() {
*
* @link https://stripe.com/docs/js/elements_object/create_payment_element#payment_element_create-options-wallets
*
- * @see assets/js/src/frontend/payment-elements/index.php::generateElementStyles
+ * @see assets/js/src/frontend/payment-elements/index.js::generateElementStyles
*
* @param bool If wallets should be disabled.
*/
@@ -151,7 +151,7 @@ function edds_get_stripe_payment_elements_wallets() {
*
* @link https://stripe.com/docs/js/elements_object/create_payment_element#payment_element_create-options-wallets
*
- * @see assets/js/src/frontend/payment-elements/index.php::generateElementStyles
+ * @see assets/js/src/frontend/payment-elements/index.js::generateElementStyles
*
* @param array $enabled_wallets Allowed wallets payment methods ot use on the Payment Element.
*/
@@ -177,7 +177,7 @@ function edds_get_stripe_payment_elements_label_style() {
*
* @link https://stripe.com/docs/elements/appearance-api?platform=web#others
*
- * @see assets/js/src/frontend/payment-elements/index.php::generateElementStyles
+ * @see assets/js/src/frontend/payment-elements/index.js::generateElementStyles
*
* @param array $label_style The style to use for the Payment Elements labels.
*/
@@ -204,7 +204,7 @@ function edds_get_stripe_payment_elements_fonts() {
* @link https://stripe.com/docs/js/appendix/css_font_source_object
* @link https://stripe.com/docs/js/appendix/custom_font_source_object
*
- * @see assets/js/src/frontend/payment-elements/index.php::generateElementStyles
+ * @see assets/js/src/frontend/payment-elements/index.js::generateElementStyles
*
* @param array $fonts The style to use for the Payment Elements labels.
*/
@@ -212,6 +212,44 @@ function edds_get_stripe_payment_elements_fonts() {
}
+/**
+ * Allows passing custom fields into the Stripe Elements.
+ *
+ * @since 2.9.2.2
+ */
+function edds_get_stripe_payment_elements_fields() {
+ $default_fields = array(
+ 'billingDetails' => array(
+ 'name' => 'auto',
+ 'email' => 'never', // It is not advised to change this to auto, as it will create duplicate email fields on checkout.
+ 'phone' => 'never',
+ 'address' => 'never',
+ ),
+ );
+
+ // By default, if the store has the address fields required, don't include them in the Payment Element.
+ if ( 'none' !== edd_get_option( 'stripe_billing_fields', 'none' ) ) {
+ $default_fields['billingDetails']['address'] = 'never';
+ }
+
+ /**
+ * Allows passing custom fields into the Stripe Elements.
+ *
+ * This needs to be an array. The default fields hold our values for the billingDetails fields. Fields can have a value of
+ * either 'auto' or 'never'. If you want to disable a field, set it to 'never'. When set to 'auto', Stripe will attempt to
+ * determine if the field is necessary based on a combination of currency, country, and account.
+ *
+ * @since 2.9.2.2
+ *
+ * @link https://stripe.com/docs/js/elements_object/create_payment_element#payment_element_create-options-fields
+ *
+ * @see assets/js/src/frontend/payment-elements/index.js::createAndMountElement
+ *
+ * @param array $default_fields The default fields and their values.
+ */
+ return apply_filters( 'edds_stripe_payment_elements_fields', $default_fields );
+}
+
/**
* Gathers all the possible customizations for the Stripe Payment Elements.
*
@@ -234,6 +272,7 @@ function edds_gather_payment_element_customizations() {
'labels' => edds_get_stripe_payment_elements_label_style(),
'fonts' => edds_get_stripe_payment_elements_fonts(),
'paymentMethodTypes' => edds_payment_element_payment_method_types(),
+ 'fields' => edds_get_stripe_payment_elements_fields(),
'i18n' => array(
'errorMessages' => edds_get_localized_error_messages(),
),
diff --git a/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php b/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php
index 3df20740..fe52a73c 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php
@@ -6,13 +6,21 @@
* @since 2.7.0
*/
+ /**
+ * If regional support is enabled, check if the card name field is required.
+ */
function edds_maybe_disable_card_name() {
- // We no longer need a card name field.
- add_filter( 'edd_purchase_form_required_fields', function( $required_fields ) {
- unset( $required_fields['card_name'] );
- return $required_fields;
- } );
- remove_action( 'edd_checkout_error_checks', 'edds_process_post_data' );
+ // We no longer need a card name field for some regions, so remove the requirement if it's not needed.
+ if ( false === edd_stripe()->has_regional_support || false === edd_stripe()->regional_support->requires_card_name ) {
+ add_filter(
+ 'edd_purchase_form_required_fields',
+ function( $required_fields ) {
+ unset( $required_fields['card_name'] );
+ return $required_fields;
+ }
+ );
+ remove_action( 'edd_checkout_error_checks', 'edds_process_post_data' );
+ }
}
add_action( 'edd_pre_process_purchase', 'edds_maybe_disable_card_name' );
@@ -48,12 +56,7 @@ function edds_process_purchase_form( $purchase_data ) {
try {
if ( edd_stripe()->rate_limiting->has_hit_card_error_limit() ) {
- throw new \EDD_Stripe_Gateway_Exception(
- esc_html__(
- 'We are unable to process your payment at this time, please try again later or contact support.',
- 'easy-digital-downloads'
- )
- );
+ throw new \EDD_Stripe_Gateway_Exception( edd_stripe()->rate_limiting->get_rate_limit_error_message() );
}
/**
@@ -70,8 +73,12 @@ function edds_process_purchase_form( $purchase_data ) {
*
* We're also going to attempt to restrict this to a single subscription and no mixed carts, for the time being.
*/
+ $cart_contains_subscription = false;
+
if ( function_exists( 'edd_recurring' ) ) {
- if ( ( count( edd_get_cart_contents() ) > 1 && edd_recurring()->cart_contains_recurring() ) || edd_recurring()->cart_is_mixed() ) {
+ $cart_contains_subscription = edd_recurring()->cart_contains_recurring();
+
+ if ( ( count( edd_get_cart_contents() ) > 1 && $cart_contains_subscription ) || edd_recurring()->cart_is_mixed() ) {
throw new \EDD_Stripe_Gateway_Exception( edds_get_single_subscription_cart_error() );
}
@@ -146,23 +153,23 @@ function edds_process_purchase_form( $purchase_data ) {
'edd_payment_fees' => esc_html( edd_get_cart_fee_total() ),
'edd_payment_total' => esc_html( $purchase_data['price'] ),
'edd_payment_items' => esc_html( implode( ', ', $payment_items ) ),
+ 'zero_decimal_amount' => $amount,
),
);
- if ( ! empty( $_REQUEST['payment_method_id'] ) ) {
- $intent_args['payment_method'] = sanitize_text_field( $_REQUEST['payment_method_id'] );
- } else {
- $payment_method_types = edds_payment_element_payment_method_types();
+ $payment_method = $_REQUEST['payment_method'];
- if ( ! empty( $payment_method_types ) ) {
- $intent_args['payment_method_types'] = $payment_method_types;
- } else {
- $intent_args['automatic_payment_methods'] = array( 'enabled' => true );
- }
- }
+ // Attach the payment method.
+ $intent_args['payment_method'] = sanitize_text_field( $payment_method['id'] );
+
+ // Set to automatic payment methods so any of the supported methods can be used here.
+ $intent_args['automatic_payment_methods'] = array( 'enabled' => true );
+
+ // We need the intent type later, so we'll set it here.
+ $intent_type = ( edds_is_preapprove_enabled() || 0 === $amount ) ? 'SetupIntent' : 'PaymentIntent';
// Create a SetupIntent for a non-payment carts.
- if ( edds_is_preapprove_enabled() || 0 === $amount ) {
+ if ( 'SetupIntent' === $intent_type ) {
$intent_args = array_merge(
array(
'description' => edds_get_payment_description( $purchase_data['cart_details'] ),
@@ -171,8 +178,6 @@ function edds_process_purchase_form( $purchase_data ) {
$intent_args
);
- $intent_type = 'SetupIntent';
-
/**
* BETA Functionality.
*
@@ -229,8 +234,6 @@ function edds_process_purchase_form( $purchase_data ) {
$intent_args
);
- $intent_type = 'PaymentIntent';
-
$stripe_connect_account_id = edd_get_option( 'stripe_connect_account_id' );
if (
@@ -270,7 +273,29 @@ function edds_process_purchase_form( $purchase_data ) {
}
}
+ /**
+ * If purchasing a subscription with a card, we need to add the subscription mandate data.
+ *
+ * This will ensure that any cards that require mandates like INR payments or India based cards will correctly add
+ * the mandates necessary for recurring payments.
+ *
+ * We do this after we check for an existing intent ID, because the mandate data will change depending on the 'timestamp'.
+ */
+ if ( 'card' === $payment_method['type'] && true === $cart_contains_subscription ) {
+ require_once EDDS_PLUGIN_DIR . 'includes/utils/class-edd-stripe-mandates.php';
+ $mandates = new EDD_Stripe_Mandates( $purchase_data, $intent_type );
+ $mandate_options = $mandates->mandate_options;
+
+ // Add the mandate options to the intent arguments.
+ $intent_args['payment_method_options']['card']['mandate_options'] = $mandate_options;
+ }
+
if ( ! empty( $existing_intent ) ) {
+ // Existing intents need to not have the automatic_payment_methods flag set.
+ if ( ! empty( $intent_args['automatic_payment_methods'] ) ) {
+ unset( $intent_args['automatic_payment_methods'] );
+ }
+
edds_api_request( $intent_type, 'update', $intent->id, $intent_args );
$intent = edds_api_request( $intent_type, 'retrieve', $intent->id );
} else {
@@ -520,6 +545,27 @@ function edds_create_and_complete_order() {
)
);
+ // The returned Intent charges might contain a mandate ID, so let's save that and make a note.
+ if ( ! empty( $intent->charges->data ) ) {
+ foreach ( $intent->charges->data as $charge ) {
+ if ( empty( $charge->payment_method_details->card->mandate ) ) {
+ continue;
+ }
+
+ $mandate_id = $charge->payment_method_details->card->mandate;
+ edd_update_order_meta( $order->id, '_edds_stripe_mandate', $mandate_id );
+
+ edd_add_note(
+ array(
+ 'object_id' => $order->id,
+ 'content' => 'Stripe Mandate ID: ' . $mandate_id,
+ 'user_id' => is_admin() ? get_current_user_id() : 0,
+ 'object_type' => 'order',
+ )
+ );
+ }
+ }
+
// Attach the \Stripe\Customer ID to the \EDD_Customer meta if one exists.
$edd_customer = new EDD_Customer( $purchase_data['user_email'] );
@@ -682,7 +728,13 @@ add_action( 'wp_ajax_nopriv_edds_create_and_complete_order', 'edds_create_and_co
function edds_payment_elements_rate_limit_tick() {
// Increase the card error count.
edd_stripe()->rate_limiting->increment_card_error_count();
- exit();
+
+ wp_send_json_success(
+ array(
+ 'is_at_limit' => edd_stripe()->rate_limiting->has_hit_card_error_limit(),
+ 'message' => edd_stripe()->rate_limiting->get_rate_limit_error_message(),
+ )
+ );
}
add_action( 'wp_ajax_edds_payment_elements_rate_limit_tick', 'edds_payment_elements_rate_limit_tick' );
add_action( 'wp_ajax_nopriv_edds_payment_elements_rate_limit_tick', 'edds_payment_elements_rate_limit_tick' );
@@ -698,7 +750,7 @@ add_action( 'wp_ajax_nopriv_edds_payment_elements_rate_limit_tick', 'edds_paymen
function edds_get_payment_description( $cart_details ) {
$purchase_summary = '';
- if( is_array( $cart_details ) && ! empty( $cart_details ) ) {
+ if ( is_array( $cart_details ) && ! empty( $cart_details ) ) {
foreach( $cart_details as $item ) {
$purchase_summary .= $item['name'];
$price_id = isset( $item['item_number']['options']['price_id'] )
@@ -715,7 +767,7 @@ function edds_get_payment_description( $cart_details ) {
$purchase_summary = rtrim( $purchase_summary, ', ' );
}
- // Stripe has a maximum of 999 characters in the charge description
+ // Stripe has a maximum of 999 characters in the charge description.
$purchase_summary = substr( $purchase_summary, 0, 1000 );
return html_entity_decode( $purchase_summary, ENT_COMPAT, 'UTF-8' );
diff --git a/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/includes/template-functions.php b/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/includes/template-functions.php
index 50416ca7..63ed6400 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/includes/template-functions.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/includes/template-functions.php
@@ -135,6 +135,15 @@ function edds_output_payment_elements_form() {
?>
+ has_regional_support && edd_stripe()->regional_support->requires_card_name ) : ?>
+
+
+
+ *
+
+
+
} $required */
+ $required = require $vendorDir.'/composer/installed.php';
+ $installed[] = self::$installedByVendor[$vendorDir] = $required;
if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
self::$installed = $installed[count($installed) - 1];
}
@@ -340,12 +342,17 @@ class InstalledVersions
// only require the installed.php file if this file is loaded from its dumped location,
// and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
if (substr(__DIR__, -8, 1) !== 'C') {
- self::$installed = require __DIR__ . '/installed.php';
+ /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $required */
+ $required = require __DIR__ . '/installed.php';
+ self::$installed = $required;
} else {
self::$installed = array();
}
}
- $installed[] = self::$installed;
+
+ if (self::$installed !== array()) {
+ $installed[] = self::$installed;
+ }
return $installed;
}
diff --git a/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/vendor/composer/installed.php b/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/vendor/composer/installed.php
index e8a5485b..48d09792 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/vendor/composer/installed.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/gateways/stripe/vendor/composer/installed.php
@@ -1,9 +1,9 @@
array(
'name' => 'easy-digital-downloads/edd-stripe',
- 'pretty_version' => 'dev-master',
- 'version' => 'dev-master',
- 'reference' => '47178f1567076390fc6f41a5c5ebdf986b915165',
+ 'pretty_version' => '2.9.2.2',
+ 'version' => '2.9.2.2',
+ 'reference' => '7e59ac4f4357cb3b388182e0601056f60f0b2407',
'type' => 'wordpress-plugin',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -11,9 +11,9 @@
),
'versions' => array(
'easy-digital-downloads/edd-stripe' => array(
- 'pretty_version' => 'dev-master',
- 'version' => 'dev-master',
- 'reference' => '47178f1567076390fc6f41a5c5ebdf986b915165',
+ 'pretty_version' => '2.9.2.2',
+ 'version' => '2.9.2.2',
+ 'reference' => '7e59ac4f4357cb3b388182e0601056f60f0b2407',
'type' => 'wordpress-plugin',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
diff --git a/wp-content/plugins/easy-digital-downloads/includes/orders/functions/adjustments.php b/wp-content/plugins/easy-digital-downloads/includes/orders/functions/adjustments.php
index 4e6f87ec..6ea45f6f 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/orders/functions/adjustments.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/orders/functions/adjustments.php
@@ -63,20 +63,7 @@ function edd_add_order_adjustment( $data ) {
// Instantiate a query object
$order_adjustments = new EDD\Database\Queries\Order_Adjustment();
- $order_adjustment_id = $order_adjustments->add_item( $data );
-
- if ( ! empty( $order_adjustment_id ) ) {
- /**
- * Action that runs when an order item is successfully added.
- *
- * @since 3.1
- * @param int Order adjustment ID.
- * @param array Array of order adjustment data.
- */
- do_action( 'edd_order_adjustment_added', $order_adjustment_id, $data );
- }
-
- return $order_adjustment_id;
+ return $order_adjustments->add_item( $data );
}
/**
@@ -132,22 +119,7 @@ function edd_delete_order_adjustment( $order_adjustment_id = 0 ) {
function edd_update_order_adjustment( $order_adjustment_id = 0, $data = array() ) {
$order_adjustments = new EDD\Database\Queries\Order_Adjustment();
- $previous_adjustment = edd_get_order_adjustment( $order_adjustment_id );
- $order_adjustment_updated = $order_adjustments->update_item( $order_adjustment_id, $data );
-
- if ( ! empty( $order_adjustment_updated ) ) {
- /**
- * Action that runs when an order item is updated.
- *
- * @since 3.1
- * @param int The order adjustment ID.
- * @param array The array of data to update.
- * @param EDD\Orders\Order_Adjustment The original order adjustment object.
- */
- do_action( 'edd_order_adjustment_updated', $order_adjustment_id, $data, $previous_adjustment );
- }
-
- return $order_adjustment_updated;
+ return $order_adjustments->update_item( $order_adjustment_id, $data );
}
/**
diff --git a/wp-content/plugins/easy-digital-downloads/includes/orders/functions/items.php b/wp-content/plugins/easy-digital-downloads/includes/orders/functions/items.php
index dbf86450..5760eb8b 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/orders/functions/items.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/orders/functions/items.php
@@ -62,20 +62,7 @@ function edd_add_order_item( $data = array() ) {
// Instantiate a query object
$order_items = new EDD\Database\Queries\Order_Item();
- $order_item_id = $order_items->add_item( $data );
-
- if ( ! empty( $order_item_id ) ) {
- /**
- * Action that runs when an order item is successfully added.
- *
- * @since 3.1
- * @param int Order item ID.
- * @param array Array of order item data.
- */
- do_action( 'edd_order_item_added', $order_item_id, $data );
- }
-
- return $order_item_id;
+ return $order_items->add_item( $data );
}
/**
@@ -89,20 +76,7 @@ function edd_add_order_item( $data = array() ) {
function edd_delete_order_item( $order_item_id = 0 ) {
$order_items = new EDD\Database\Queries\Order_Item();
- $order_item_deleted = $order_items->delete_item( $order_item_id );
-
- if ( ! empty( $order_item_deleted ) ) {
- /**
- * Action that runs when an order item is deleted.
- *
- * @since 3.0.5
- *
- * @param int $order_item_id Order item ID being deleted.
- */
- do_action( 'edd_order_item_deleted', $order_item_id );
- }
-
- return $order_item_deleted;
+ return $order_items->delete_item( $order_item_id );
}
/**
@@ -143,22 +117,7 @@ function edd_delete_order_item( $order_item_id = 0 ) {
function edd_update_order_item( $order_item_id = 0, $data = array() ) {
$order_items = new EDD\Database\Queries\Order_Item();
- $previous_order_item_data = edd_get_order_item( $order_item_id );
- $order_item_updated = $order_items->update_item( $order_item_id, $data );
-
- if ( ! empty( $order_item_updated ) ) {
- /**
- * Action that runs when an order item is updated.
- *
- * @since 3.1
- * @param int The order item ID.
- * @param array The array of data to update.
- * @param EDD\Orders\Order_Item The original order item object.
- */
- do_action( 'edd_order_item_updated', $order_item_id, $data, $previous_order_item_data );
- }
-
- return $order_item_updated;
+ return $order_items->update_item( $order_item_id, $data );
}
/**
diff --git a/wp-content/plugins/easy-digital-downloads/includes/orders/functions/orders.php b/wp-content/plugins/easy-digital-downloads/includes/orders/functions/orders.php
index 51917cd8..165a719b 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/orders/functions/orders.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/orders/functions/orders.php
@@ -127,12 +127,6 @@ function edd_trash_order( $order_id ) {
}
}
-
- // Update the customer records when an order is trashed.
- if ( ! empty( $order->customer_id ) ) {
- $customer = new EDD_Customer( $order->customer_id );
- $customer->recalculate_stats();
- }
}
return filter_var( $trashed, FILTER_VALIDATE_BOOLEAN );
@@ -362,14 +356,8 @@ function edd_destroy_order( $order_id = 0 ) {
*/
function edd_update_order( $order_id = 0, $data = array() ) {
$orders = new EDD\Database\Queries\Order();
- $update = $orders->update_item( $order_id, $data );
- if ( ! empty( $data['customer_id'] ) ) {
- $customer = new EDD_Customer( $data['customer_id'] );
- $customer->recalculate_stats();
- }
-
- return $update;
+ return $orders->update_item( $order_id, $data );
}
/**
diff --git a/wp-content/plugins/easy-digital-downloads/includes/payments/actions.php b/wp-content/plugins/easy-digital-downloads/includes/payments/actions.php
index 3c4260d3..cba87c88 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/payments/actions.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/payments/actions.php
@@ -144,10 +144,6 @@ function edd_complete_purchase( $order_id, $new_status, $old_status ) {
delete_transient( md5( 'edd_earnings_todaytoday' ) );
}
- // Increase the customer's purchase stats
- $customer = new EDD_Customer( $customer_id );
- $customer->recalculate_stats();
-
edd_increase_total_earnings( $amount );
// Check for discount codes and increment their use counts
@@ -174,7 +170,8 @@ function edd_complete_purchase( $order_id, $new_status, $old_status ) {
) );
// Required for backwards compatibility.
- $payment = edd_get_payment( $order_id );
+ $payment = edd_get_payment( $order_id );
+ $customer = edd_get_customer( $customer_id );
/**
* Runs **when** a purchase is marked as "complete".
diff --git a/wp-content/plugins/easy-digital-downloads/includes/payments/class-edd-payment.php b/wp-content/plugins/easy-digital-downloads/includes/payments/class-edd-payment.php
index b27ac6bf..ecfc82d7 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/payments/class-edd-payment.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/payments/class-edd-payment.php
@@ -989,9 +989,6 @@ class EDD_Payment {
do_action( 'edd_payment_saved', $this->ID, $this );
}
- $customer = new EDD_Customer( $this->customer_id );
- $customer->recalculate_stats();
-
/**
* Update the payment in the object cache
*/
@@ -2655,15 +2652,6 @@ class EDD_Payment {
if ( true === $alter_store_earnings ) {
edd_decrease_total_earnings( $this->total );
}
-
- // Decrement the stats for the customer
- if ( ! empty( $this->customer_id ) ) {
- $customer = new EDD_Customer( $this->customer_id );
-
- if ( ! empty( $alter_customer_value || $alter_customer_purchase_count ) ) {
- $customer->recalculate_stats();
- }
- }
}
/**
diff --git a/wp-content/plugins/easy-digital-downloads/includes/payments/functions.php b/wp-content/plugins/easy-digital-downloads/includes/payments/functions.php
index ab6f290c..6d16509b 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/payments/functions.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/payments/functions.php
@@ -215,10 +215,6 @@ function edd_delete_purchase( $payment_id = 0, $update_customer = true, $delete_
}
}
- if ( $customer && $customer->id && $update_customer ) {
- $customer->recalculate_stats();
- }
-
do_action( 'edd_payment_deleted', $payment_id );
}
diff --git a/wp-content/plugins/easy-digital-downloads/includes/reports/reports-functions.php b/wp-content/plugins/easy-digital-downloads/includes/reports/reports-functions.php
index df0ffca7..d6055d5c 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/reports/reports-functions.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/reports/reports-functions.php
@@ -966,12 +966,64 @@ function get_dates_filter_day_by_day() {
return $day_by_day;
}
+/**
+ * Gets the period for a graph.
+ *
+ * @since 3.1.1.4
+ * @return string
+ */
+function get_graph_period() {
+ if ( get_dates_filter_hour_by_hour() ) {
+ return 'hour';
+ }
+ if ( get_dates_filter_day_by_day() ) {
+ return 'day';
+ }
+
+ return 'month';
+}
+
+/**
+ * Gets the SQL clauses.
+ * The result of this function should be run through $wpdb->prepare().
+ *
+ * @since 3.1.1.4
+ * @param string $period The period for the query.
+ * @param string $column The column to query.
+ * @return array
+ */
+function get_sql_clauses( $period, $column = 'date_created' ) {
+
+ // Get the date for the query.
+ $converted_date = get_column_conversion( $column );
+
+ switch ( $period ) {
+ case 'hour':
+ $date_format = '%%Y-%%m-%%d %%H:00:00';
+ break;
+ case 'day':
+ $date_format = '%%Y-%%m-%%d';
+ break;
+ default:
+ $date_format = '%%Y-%%m';
+ break;
+ }
+
+ return array(
+ 'select' => "DATE_FORMAT({$converted_date}, \"{$date_format}\") AS date",
+ 'where' => '',
+ 'groupby' => 'date',
+ 'orderby' => 'date',
+ );
+}
+
/**
* Given a function and column, make a timezone converted groupby query.
*
* @since 3.0
* @since 3.0.4 If MONTH is passed as the function, always add YEAR and MONTH
* to avoid issues with spanning multiple years.
+ * @since 3.1.1.4 This function isn't needed anymore due to using DATE_FORMAT in the select clause.
*
* @param string $function The function to run the value through, like DATE, HOUR, MONTH.
* @param string $column The column to group by.
@@ -979,25 +1031,40 @@ function get_dates_filter_day_by_day() {
* @return string
*/
function get_groupby_date_string( $function = 'DATE', $column = 'date_created' ) {
- $function = strtoupper( $function );
+ /**
+ * If there is no offset, the default column will be returned.
+ * Otherwise, the column will be converted to the timezone offset.
+ */
+ $column_conversion = get_column_conversion( $column );
+
+ $function = strtoupper( $function );
+ switch ( $function ) {
+ case 'HOUR':
+ $group_by_string = "DAY({$column_conversion}), HOUR({$column_conversion})";
+ break;
+ case 'MONTH':
+ $group_by_string = "YEAR({$column_conversion}), MONTH({$column_conversion})";
+ break;
+ default:
+ $group_by_string = "{$function}({$column_conversion})";
+ break;
+ }
+
+ return $group_by_string;
+}
+
+/**
+ * Get the time zone converted dates for the query.
+ *
+ * @since 3.1.1.4
+ * @param string $column
+ * @return string
+ */
+function get_column_conversion( $column = 'date_created' ) {
$date = EDD()->utils->date( 'now', edd_get_timezone_id(), false );
$gmt_offset = $date->getOffset();
-
if ( empty( $gmt_offset ) ) {
-
- switch ( $function ) {
- case 'HOUR':
- $group_by_string = "DAY({$column}), HOUR({$column})";
- break;
- case 'MONTH':
- $group_by_string = "YEAR({$column}), MONTH({$column})";
- break;
- default:
- $group_by_string = "{$function}({$column})";
- break;
- }
-
- return $group_by_string;
+ return $column;
}
// Output the offset in the proper format.
@@ -1017,20 +1084,7 @@ function get_groupby_date_string( $function = 'DATE', $column = 'date_created' )
*
* @see https://github.com/awesomemotive/easy-digital-downloads/pull/9449
*/
- $column_conversion = "CONVERT_TZ({$column}, '+0:00', '{$math}{$formatted_offset}')";
- switch ( $function ) {
- case 'HOUR':
- $group_by_string = "DAY({$column_conversion}), HOUR({$column_conversion})";
- break;
- case 'MONTH':
- $group_by_string = "YEAR({$column_conversion}), MONTH({$column_conversion})";
- break;
- default:
- $group_by_string = "{$function}({$column_conversion})";
- break;
- }
-
- return $group_by_string;
+ return "CONVERT_TZ({$column}, '+00:00', '{$math}{$formatted_offset}')";
}
/**
diff --git a/wp-content/plugins/easy-digital-downloads/includes/user-functions.php b/wp-content/plugins/easy-digital-downloads/includes/user-functions.php
index 74e853a4..ebaad63a 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/user-functions.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/user-functions.php
@@ -34,8 +34,19 @@ function edd_get_users_purchases( $user = 0, $number = 20, $pagination = false,
$user = get_current_user_id();
}
+ if ( is_email( $user ) ) {
+ $customers = edd_get_customers(
+ array(
+ 'email' => $user,
+ )
+ );
+ if ( $customers ) {
+ $user = $customers[0]->user_id;
+ }
+ }
+
// Bail if no user found.
- if ( 0 === $user ) {
+ if ( empty( $user ) ) {
return false;
}
diff --git a/wp-content/plugins/easy-digital-downloads/includes/users/lost-password.php b/wp-content/plugins/easy-digital-downloads/includes/users/lost-password.php
index 51fed320..1d670459 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/users/lost-password.php
+++ b/wp-content/plugins/easy-digital-downloads/includes/users/lost-password.php
@@ -247,6 +247,22 @@ add_action( 'edd_user_reset_password', 'edd_validate_password_reset' );
* @return void
*/
function edd_validate_password_reset( $data ) {
+
+ // We don't need or use AJAX requests for this, so die if one is received.
+ if ( edd_doing_ajax() ) {
+ wp_die( __( 'Invalid password reset request.', 'easy-digital-downloads' ), __( 'Error', 'easy-digital-downloads' ), array( 'response' => 400 ) );
+ }
+
+ if ( empty( $data['rp_key'] ) ) {
+ edd_set_error( 'password_reset_failed', __( 'Invalid password reset request.', 'easy-digital-downloads' ) );
+ }
+
+ $user = check_password_reset_key( $data['rp_key'], $data['user_login'] );
+
+ if ( ! $user || is_wp_error( $user ) ) {
+ edd_set_error( 'password_reset_failed', __( 'Invalid password reset request.', 'easy-digital-downloads' ) );
+ }
+
// Check if password is one or all empty spaces.
if ( ! empty( $data['pass1'] ) ) {
$_POST['pass1'] = trim( $data['pass1'] );
@@ -262,13 +278,15 @@ function edd_validate_password_reset( $data ) {
}
$user = get_user_by( 'login', $data['user_login'] );
- if ( ! $user || is_wp_error( $user ) ) {
+ if ( false === $user ) {
edd_set_error( 'password_reset_unsuccessful', __( 'Your password could not be reset.', 'easy-digital-downloads' ) );
}
$redirect = remove_query_arg( 'action', $data['edd_redirect'] );
+
// If no errors were registered then reset the password.
- if ( ! edd_get_errors() ) {
+ $errors = edd_get_errors();
+ if ( empty( $errors ) ) {
reset_password( $user, $data['pass1'] );
edd_set_success( 'password_reset_successful', __( 'Your password was successfully reset.', 'easy-digital-downloads' ) );
// todo: check if this is correct
diff --git a/wp-content/plugins/easy-digital-downloads/languages/easy-digital-downloads.pot b/wp-content/plugins/easy-digital-downloads/languages/easy-digital-downloads.pot
index 01533932..4a17f1b3 100644
--- a/wp-content/plugins/easy-digital-downloads/languages/easy-digital-downloads.pot
+++ b/wp-content/plugins/easy-digital-downloads/languages/easy-digital-downloads.pot
@@ -2,14 +2,14 @@
# This file is distributed under the same license as the Easy Digital Downloads plugin.
msgid ""
msgstr ""
-"Project-Id-Version: Easy Digital Downloads 3.1.1.3\n"
+"Project-Id-Version: Easy Digital Downloads 3.1.1.4.2\n"
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/easy-digital-downloads\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2023-03-23T21:29:08+00:00\n"
+"POT-Creation-Date: 2023-05-01T18:15:45+00:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"X-Generator: WP-CLI 2.7.1\n"
"X-Domain: easy-digital-downloads\n"
@@ -41,7 +41,7 @@ msgstr ""
#: includes/admin/adjustments/adjustment-functions.php:43
#: includes/admin/adjustments/adjustment-functions.php:99
#: includes/admin/admin-pages.php:88
-#: includes/admin/reporting/reports.php:2253
+#: includes/admin/reporting/reports.php:2184
#: includes/admin/settings/display-settings.php:40
#: includes/admin/upgrades/upgrade-functions.php:1399
#: includes/post-types.php:129
@@ -131,8 +131,8 @@ msgstr ""
#: includes/admin/admin-deprecated-functions.php:67
#: includes/admin/payments/actions.php:72
#: includes/admin/payments/actions.php:77
-#: includes/admin/payments/actions.php:288
-#: includes/admin/payments/actions.php:318
+#: includes/admin/payments/actions.php:279
+#: includes/admin/payments/actions.php:309
#: includes/emails/actions.php:59
msgid "You do not have permission to edit this payment record"
msgstr ""
@@ -143,15 +143,15 @@ msgstr ""
#: includes/admin/customers/customer-actions.php:557
#: includes/admin/customers/customer-actions.php:614
#: includes/admin/discounts/discount-actions.php:32
-#: includes/admin/discounts/discount-actions.php:166
#: includes/admin/discounts/discount-actions.php:171
-#: includes/admin/discounts/discount-actions.php:180
-#: includes/admin/discounts/discount-actions.php:305
-#: includes/admin/discounts/discount-actions.php:310
+#: includes/admin/discounts/discount-actions.php:176
+#: includes/admin/discounts/discount-actions.php:185
#: includes/admin/discounts/discount-actions.php:315
-#: includes/admin/discounts/discount-actions.php:344
-#: includes/admin/discounts/discount-actions.php:349
-#: includes/admin/discounts/discount-actions.php:377
+#: includes/admin/discounts/discount-actions.php:320
+#: includes/admin/discounts/discount-actions.php:325
+#: includes/admin/discounts/discount-actions.php:354
+#: includes/admin/discounts/discount-actions.php:359
+#: includes/admin/discounts/discount-actions.php:387
#: includes/admin/discounts/edit-discount.php:17
#: includes/admin/discounts/edit-discount.php:28
#: includes/admin/downloads/dashboard-columns.php:190
@@ -160,10 +160,10 @@ msgstr ""
#: includes/admin/import/class-batch-import.php:188
#: includes/admin/payments/actions.php:72
#: includes/admin/payments/actions.php:77
-#: includes/admin/payments/actions.php:222
-#: includes/admin/payments/actions.php:256
-#: includes/admin/payments/actions.php:288
-#: includes/admin/payments/actions.php:318
+#: includes/admin/payments/actions.php:213
+#: includes/admin/payments/actions.php:247
+#: includes/admin/payments/actions.php:279
+#: includes/admin/payments/actions.php:309
#: includes/admin/payments/add-order.php:63
#: includes/admin/payments/add-order.php:67
#: includes/admin/payments/view-order-details.php:23
@@ -202,7 +202,7 @@ msgstr ""
#: includes/blocks/includes/forms/recaptcha.php:180
#: includes/cart/class-edd-cart.php:1451
#: includes/cart/class-edd-cart.php:1465
-#: includes/class-edd-license-handler.php:536
+#: includes/class-edd-license-handler.php:475
#: includes/deprecated-functions.php:488
#: includes/deprecated-functions.php:505
#: includes/deprecated-functions.php:513
@@ -220,13 +220,16 @@ msgstr ""
#: includes/gateways/paypal/admin/connect.php:561
#: includes/gateways/paypal/admin/connect.php:565
#: includes/gateways/paypal/admin/connect.php:707
+#: includes/gateways/paypal/checkout-actions.php:114
#: includes/gateways/stripe/includes/admin/upgrade-functions.php:112
#: includes/process-download.php:296
#: includes/process-download.php:924
#: includes/query-filters.php:51
-#: includes/user-functions.php:895
-#: includes/user-functions.php:920
-#: includes/user-functions.php:972
+#: includes/user-functions.php:906
+#: includes/user-functions.php:931
+#: includes/user-functions.php:983
+#: includes/users/lost-password.php:253
+#: src/Extensions/Updater.php:480
msgid "Error"
msgstr ""
@@ -287,7 +290,7 @@ msgstr ""
#: includes/admin/admin-pages.php:87
#: includes/admin/customers/customers.php:77
-#: includes/admin/reporting/reports.php:2547
+#: includes/admin/reporting/reports.php:2459
#: includes/admin/settings/display-settings.php:43
msgid "Customers"
msgstr ""
@@ -379,252 +382,252 @@ msgstr ""
msgid "Generate New API Keys"
msgstr ""
-#: includes/admin/class-edd-notices.php:266
+#: includes/admin/class-edd-notices.php:272
msgid "No checkout page is configured. Set one in Settings ."
msgstr ""
-#: includes/admin/class-edd-notices.php:320
+#: includes/admin/class-edd-notices.php:326
msgid "The files in %s are not currently protected."
msgstr ""
-#: includes/admin/class-edd-notices.php:321
+#: includes/admin/class-edd-notices.php:327
msgid "To protect them, you must add this NGINX redirect rule ."
msgstr ""
-#: includes/admin/class-edd-notices.php:322
-#: includes/admin/class-edd-notices.php:341
+#: includes/admin/class-edd-notices.php:328
+#: includes/admin/class-edd-notices.php:347
msgid "If you have already done this, or it does not apply to your site, you may permenently %s."
msgstr ""
-#: includes/admin/class-edd-notices.php:322
-#: includes/admin/class-edd-notices.php:341
+#: includes/admin/class-edd-notices.php:328
+#: includes/admin/class-edd-notices.php:347
msgid "dismiss this notice"
msgstr ""
-#: includes/admin/class-edd-notices.php:339
+#: includes/admin/class-edd-notices.php:345
msgid "The .htaccess file is missing from: %s"
msgstr ""
-#: includes/admin/class-edd-notices.php:340
+#: includes/admin/class-edd-notices.php:346
msgid "First, please resave the Misc settings tab a few times. If this warning continues to appear, create a file called \".htaccess\" in the %s directory, and copy the following into it:"
msgstr ""
-#: includes/admin/class-edd-notices.php:362
+#: includes/admin/class-edd-notices.php:368
msgid "Easy Digital Downloads 2.5 contains a built in recount tool . Please deactivate the Easy Digital Downloads - Recount Earnings plugin "
msgstr ""
-#: includes/admin/class-edd-notices.php:396
+#: includes/admin/class-edd-notices.php:402
msgid "Review Tax Rates"
msgstr ""
#. translators: Link to review existing tax rates.
-#: includes/admin/class-edd-notices.php:403
+#: includes/admin/class-edd-notices.php:409
msgid "A default tax rate was detected."
msgstr ""
#. translators: Link to review existing tax rates.
-#: includes/admin/class-edd-notices.php:403
+#: includes/admin/class-edd-notices.php:409
msgid "This setting is no longer used in this version of Easy Digital Downloads. Please confirm your regional tax rates are properly configured and update tax settings to remove this notice."
msgstr ""
-#: includes/admin/class-edd-notices.php:422
+#: includes/admin/class-edd-notices.php:428
msgid "Settings updated."
msgstr ""
-#: includes/admin/class-edd-notices.php:438
+#: includes/admin/class-edd-notices.php:444
msgid "Fix this"
msgstr ""
-#: includes/admin/class-edd-notices.php:444
+#: includes/admin/class-edd-notices.php:450
msgid "No payment gateways are enabled. %s."
msgstr ""
-#: includes/admin/class-edd-notices.php:474
+#: includes/admin/class-edd-notices.php:480
msgid "Discount code added."
msgstr ""
-#: includes/admin/class-edd-notices.php:480
+#: includes/admin/class-edd-notices.php:486
msgid "There was a problem adding that discount code, please try again."
msgstr ""
-#: includes/admin/class-edd-notices.php:487
+#: includes/admin/class-edd-notices.php:493
msgid "A discount with that code already exists, please use a different code."
msgstr ""
-#: includes/admin/class-edd-notices.php:494
+#: includes/admin/class-edd-notices.php:500
msgid "Discount code updated."
msgstr ""
-#: includes/admin/class-edd-notices.php:500
+#: includes/admin/class-edd-notices.php:506
msgid "No changes were made to that discount code."
msgstr ""
-#: includes/admin/class-edd-notices.php:506
+#: includes/admin/class-edd-notices.php:512
msgid "There was a problem updating that discount code, please try again."
msgstr ""
-#: includes/admin/class-edd-notices.php:513
+#: includes/admin/class-edd-notices.php:519
msgid "The discount code could not be added because one or more of the required fields was empty, please try again."
msgstr ""
-#: includes/admin/class-edd-notices.php:520
+#: includes/admin/class-edd-notices.php:526
msgid "The discount code entered is invalid; only alphanumeric characters are allowed, please try again."
msgstr ""
-#: includes/admin/class-edd-notices.php:527
+#: includes/admin/class-edd-notices.php:533
msgid "The discount amount must be a valid percentage or numeric flat amount. Please try again."
msgstr ""
-#: includes/admin/class-edd-notices.php:534
+#: includes/admin/class-edd-notices.php:540
msgid "Discount code deleted."
msgstr ""
-#: includes/admin/class-edd-notices.php:540
+#: includes/admin/class-edd-notices.php:546
msgid "There was a problem deleting that discount code, please try again."
msgstr ""
-#: includes/admin/class-edd-notices.php:547
+#: includes/admin/class-edd-notices.php:553
msgid "Discount code activated."
msgstr ""
-#: includes/admin/class-edd-notices.php:553
+#: includes/admin/class-edd-notices.php:559
msgid "There was a problem activating that discount code, please try again."
msgstr ""
-#: includes/admin/class-edd-notices.php:560
+#: includes/admin/class-edd-notices.php:566
msgid "Discount code deactivated."
msgstr ""
-#: includes/admin/class-edd-notices.php:566
+#: includes/admin/class-edd-notices.php:572
msgid "There was a problem deactivating that discount code, please try again."
msgstr ""
-#: includes/admin/class-edd-notices.php:579
+#: includes/admin/class-edd-notices.php:585
msgid "The reports have been refreshed."
msgstr ""
-#: includes/admin/class-edd-notices.php:591
+#: includes/admin/class-edd-notices.php:597
msgid "The settings have been imported."
msgstr ""
-#: includes/admin/class-edd-notices.php:597
+#: includes/admin/class-edd-notices.php:603
msgid "API keys successfully generated."
msgstr ""
-#: includes/admin/class-edd-notices.php:603
+#: includes/admin/class-edd-notices.php:609
msgid "The specified user already has API keys."
msgstr ""
-#: includes/admin/class-edd-notices.php:610
+#: includes/admin/class-edd-notices.php:616
msgid "API keys successfully regenerated."
msgstr ""
-#: includes/admin/class-edd-notices.php:616
+#: includes/admin/class-edd-notices.php:622
msgid "API keys successfully revoked."
msgstr ""
-#: includes/admin/class-edd-notices.php:623
+#: includes/admin/class-edd-notices.php:629
msgid "The test email was sent successfully."
msgstr ""
-#: includes/admin/class-edd-notices.php:631
+#: includes/admin/class-edd-notices.php:637
msgid "The test email summary was sent successfully."
msgstr ""
-#: includes/admin/class-edd-notices.php:640
+#: includes/admin/class-edd-notices.php:646
msgid "Your extensions could not be refreshed because you have not verified your license key."
msgstr ""
-#: includes/admin/class-edd-notices.php:654
+#: includes/admin/class-edd-notices.php:660
msgid "The note has been added successfully."
msgstr ""
-#: includes/admin/class-edd-notices.php:660
+#: includes/admin/class-edd-notices.php:666
msgid "The order has been updated successfully."
msgstr ""
-#: includes/admin/class-edd-notices.php:666
+#: includes/admin/class-edd-notices.php:672
msgid "Order successfully created."
msgstr ""
-#: includes/admin/class-edd-notices.php:672
+#: includes/admin/class-edd-notices.php:678
msgid "The order has been moved to the trash."
msgstr ""
-#: includes/admin/class-edd-notices.php:678
+#: includes/admin/class-edd-notices.php:684
msgid "The order has been restored."
msgstr ""
-#: includes/admin/class-edd-notices.php:684
+#: includes/admin/class-edd-notices.php:690
msgid "The order has been deleted."
msgstr ""
-#: includes/admin/class-edd-notices.php:690
+#: includes/admin/class-edd-notices.php:696
msgid "The purchase receipt has been resent."
msgstr ""
-#: includes/admin/class-edd-notices.php:696
+#: includes/admin/class-edd-notices.php:702
msgid "Failed to send purchase receipt."
msgstr ""
-#: includes/admin/class-edd-notices.php:702
+#: includes/admin/class-edd-notices.php:708
msgid "The order note has been deleted."
msgstr ""
-#: includes/admin/class-edd-notices.php:714
+#: includes/admin/class-edd-notices.php:720
msgid "Customer successfully deleted."
msgstr ""
-#: includes/admin/class-edd-notices.php:720
+#: includes/admin/class-edd-notices.php:726
msgid "User successfully verified."
msgstr ""
-#: includes/admin/class-edd-notices.php:726
+#: includes/admin/class-edd-notices.php:732
msgid "Customer email added."
msgstr ""
-#: includes/admin/class-edd-notices.php:732
+#: includes/admin/class-edd-notices.php:738
msgid "Customer email deleted."
msgstr ""
-#: includes/admin/class-edd-notices.php:738
+#: includes/admin/class-edd-notices.php:744
msgid "Failed to delete customer email."
msgstr ""
-#: includes/admin/class-edd-notices.php:745
+#: includes/admin/class-edd-notices.php:751
msgid "Primary email updated for customer."
msgstr ""
-#: includes/admin/class-edd-notices.php:751
+#: includes/admin/class-edd-notices.php:757
msgid "Failed to set primary email."
msgstr ""
-#: includes/admin/class-edd-notices.php:758
+#: includes/admin/class-edd-notices.php:764
msgid "Customer address deleted."
msgstr ""
-#: includes/admin/class-edd-notices.php:764
+#: includes/admin/class-edd-notices.php:770
msgid "Failed to delete customer address."
msgstr ""
#. Translators: 1. opening strong tag, do not translate; 2. closing strong tag, do not translate
-#: includes/admin/class-edd-notices.php:777
+#: includes/admin/class-edd-notices.php:783
msgid "Congratulations! You are now running %1$sEasy Digital Downloads (Pro)%2$s."
msgstr ""
-#: includes/admin/class-edd-notices.php:822
+#: includes/admin/class-edd-notices.php:828
msgid "Easy Digital Downloads debug logging is enabled. Please only leave it enabled for as long as it is needed for troubleshooting."
msgstr ""
-#: includes/admin/class-edd-notices.php:825
+#: includes/admin/class-edd-notices.php:831
msgid "View Debug Log"
msgstr ""
-#: includes/admin/class-edd-notices.php:826
+#: includes/admin/class-edd-notices.php:832
msgid "Delete Log File and Disable Logging"
msgstr ""
-#: includes/admin/class-edd-notices.php:842
+#: includes/admin/class-edd-notices.php:848
#: includes/admin/customers/customer-actions.php:606
#: includes/admin/tools/class-edd-tools-recount-all-stats.php:78
#: includes/admin/tools/class-edd-tools-recount-download-stats.php:117
@@ -646,7 +649,7 @@ msgstr ""
msgid "You do not have permission to perform this action."
msgstr ""
-#: includes/admin/class-edd-notices.php:847
+#: includes/admin/class-edd-notices.php:853
msgid "The debug log has been cleared and logging has been disabled."
msgstr ""
@@ -684,7 +687,7 @@ msgstr ""
#: includes/admin/customers/class-customer-email-addresses-table.php:131
#: includes/admin/customers/class-customer-table.php:127
#: includes/misc-functions.php:1460
-#: includes/payments/functions.php:539
+#: includes/payments/functions.php:535
msgid "Pending"
msgstr ""
@@ -714,7 +717,7 @@ msgstr ""
#: includes/admin/discounts/class-discount-codes-table.php:230
#: includes/admin/discounts/class-discount-codes-table.php:316
#: includes/admin/settings/register-settings.php:293
-#: includes/gateways/stripe/includes/template-functions.php:484
+#: includes/gateways/stripe/includes/template-functions.php:493
#: src/Admin/PassHandler/Handler.php:74
#: src/Licensing/Traits/Controls.php:83
msgid "Delete"
@@ -776,8 +779,8 @@ msgstr ""
#: includes/admin/views/tmpl-tax-rates-table-meta.php:16
#: includes/admin/views/tmpl-tax-rates-table-row.php:18
#: includes/blocks/views/checkout/purchase-form/address.php:8
-#: includes/gateways/stripe/includes/template-functions.php:553
#: includes/gateways/stripe/includes/template-functions.php:562
+#: includes/gateways/stripe/includes/template-functions.php:571
#: templates/shortcode-profile-editor.php:162
msgid "Country"
msgstr ""
@@ -818,7 +821,7 @@ msgstr ""
#: includes/admin/reporting/export/class-batch-export-file-downloads.php:43
#: includes/admin/reporting/export/class-batch-export-payments.php:62
#: includes/admin/reporting/export/class-batch-export-sales-and-earnings.php:59
-#: includes/admin/reporting/export/class-batch-export-sales.php:49
+#: includes/admin/reporting/export/class-batch-export-sales.php:57
#: includes/admin/reporting/export/class-batch-export-taxed-orders.php:62
#: includes/admin/tools.php:621
#: includes/blocks/views/orders/totals.php:38
@@ -847,7 +850,7 @@ msgstr ""
#: includes/admin/reporting/class-export-payments.php:58
#: includes/admin/reporting/export/class-batch-export-customers.php:54
#: includes/admin/reporting/export/class-batch-export-payments.php:43
-#: includes/admin/reporting/export/class-batch-export-sales.php:42
+#: includes/admin/reporting/export/class-batch-export-sales.php:50
#: includes/admin/reporting/export/class-batch-export-taxed-customers.php:43
#: includes/admin/reporting/export/class-batch-export-taxed-orders.php:43
#: includes/admin/tools.php:512
@@ -879,7 +882,7 @@ msgstr ""
#: includes/admin/reporting/class-export-customers.php:71
#: includes/admin/reporting/export/class-batch-export-customers.php:53
#: includes/admin/reporting/export/class-batch-export-downloads.php:43
-#: includes/admin/reporting/export/class-batch-export-sales.php:43
+#: includes/admin/reporting/export/class-batch-export-sales.php:51
#: includes/admin/reporting/export/class-batch-export-taxed-customers.php:42
#: includes/admin/tools.php:521
#: includes/privacy-functions.php:594
@@ -937,7 +940,7 @@ msgid "An error has occured. Please try again."
msgstr ""
#: includes/admin/customers/customer-actions.php:215
-#: includes/user-functions.php:920
+#: includes/user-functions.php:931
msgid "Nonce verification failed."
msgstr ""
@@ -974,7 +977,7 @@ msgstr ""
#: includes/admin/import/import-functions.php:104
#: includes/admin/reporting/export/export-actions.php:24
#: includes/api/class-edd-api.php:2030
-#: includes/class-edd-license-handler.php:536
+#: includes/class-edd-license-handler.php:475
msgid "Nonce verification failed"
msgstr ""
@@ -1080,14 +1083,14 @@ msgstr ""
#: includes/admin/customers/customers.php:471
#: includes/admin/thickbox.php:182
#: includes/gateways/stripe/includes/admin/admin-filters.php:105
-#: includes/gateways/stripe/includes/template-functions.php:640
-#: includes/gateways/stripe/includes/template-functions.php:683
+#: includes/gateways/stripe/includes/template-functions.php:649
+#: includes/gateways/stripe/includes/template-functions.php:692
#: includes/scripts.php:541
msgid "Cancel"
msgstr ""
#: includes/admin/customers/customers.php:472
-#: includes/gateways/stripe/includes/template-functions.php:468
+#: includes/gateways/stripe/includes/template-functions.php:477
msgid "Update"
msgstr ""
@@ -1113,7 +1116,7 @@ msgstr ""
#: includes/blocks/views/checkout/purchase-form/address.php:54
#: includes/blocks/views/checkout/purchase-form/address.php:60
#: includes/checkout/template.php:393
-#: includes/gateways/stripe/includes/template-functions.php:528
+#: includes/gateways/stripe/includes/template-functions.php:537
#: templates/shortcode-profile-editor.php:152
msgid "City"
msgstr ""
@@ -1217,7 +1220,7 @@ msgstr ""
#: includes/admin/customers/customers.php:708
#: includes/admin/customers/customers.php:749
#: includes/admin/payments/class-payments-table.php:404
-#: includes/admin/reporting/reports.php:1210
+#: includes/admin/reporting/reports.php:1178
msgid "Number"
msgstr ""
@@ -1400,10 +1403,10 @@ msgstr ""
#: includes/admin/reporting/reports.php:254
#: includes/admin/reporting/reports.php:353
#: includes/admin/reporting/reports.php:714
-#: includes/admin/reporting/reports.php:935
-#: includes/admin/reporting/reports.php:1354
-#: includes/admin/reporting/reports.php:1540
-#: includes/admin/reporting/reports.php:1676
+#: includes/admin/reporting/reports.php:903
+#: includes/admin/reporting/reports.php:1322
+#: includes/admin/reporting/reports.php:1508
+#: includes/admin/reporting/reports.php:1626
#: includes/reports/data/file-downloads/class-top-five-most-downloaded-list-table.php:61
#: includes/blocks/build/downloads/index.js:1
msgid "Earnings"
@@ -1502,7 +1505,7 @@ msgstr ""
#: includes/admin/reporting/class-export-payments.php:70
#: includes/admin/reporting/export/class-batch-export-payments.php:56
#: includes/admin/reporting/export/class-batch-export-taxed-orders.php:56
-#: includes/admin/reporting/reports.php:1198
+#: includes/admin/reporting/reports.php:1166
#: includes/admin/views/tmpl-order-adjustment-discount.php:41
#: includes/admin/views/tmpl-order-adjustment.php:55
#: includes/admin/views/tmpl-order-form-add-order-adjustment.php:80
@@ -1791,31 +1794,31 @@ msgid "Max Uses - this is the maximum number of times this disc
msgstr ""
#: includes/admin/discounts/discount-actions.php:32
-#: includes/admin/discounts/discount-actions.php:382
+#: includes/admin/discounts/discount-actions.php:392
msgid "You do not have permission to create discount codes"
msgstr ""
-#: includes/admin/discounts/discount-actions.php:166
-#: includes/admin/discounts/discount-actions.php:349
+#: includes/admin/discounts/discount-actions.php:171
+#: includes/admin/discounts/discount-actions.php:359
msgid "You do not have permission to edit discount codes"
msgstr ""
-#: includes/admin/discounts/discount-actions.php:171
-#: includes/admin/discounts/discount-actions.php:315
+#: includes/admin/discounts/discount-actions.php:176
+#: includes/admin/discounts/discount-actions.php:325
msgid "No discount ID supplied"
msgstr ""
-#: includes/admin/discounts/discount-actions.php:180
+#: includes/admin/discounts/discount-actions.php:185
msgid "Invalid discount"
msgstr ""
-#: includes/admin/discounts/discount-actions.php:305
-#: includes/admin/discounts/discount-actions.php:344
-#: includes/admin/discounts/discount-actions.php:377
+#: includes/admin/discounts/discount-actions.php:315
+#: includes/admin/discounts/discount-actions.php:354
+#: includes/admin/discounts/discount-actions.php:387
msgid "Trying to cheat or something?"
msgstr ""
-#: includes/admin/discounts/discount-actions.php:310
+#: includes/admin/discounts/discount-actions.php:320
msgid "You do not have permission to delete discount codes"
msgstr ""
@@ -2063,7 +2066,7 @@ msgstr ""
#: includes/admin/downloads/metabox.php:506
#: includes/download-functions.php:674
-#: includes/gateways/stripe/includes/template-functions.php:447
+#: includes/gateways/stripe/includes/template-functions.php:456
#: includes/blocks/build/downloads/index.js:1
msgid "Default"
msgstr ""
@@ -2170,9 +2173,9 @@ msgid "Insert into %s"
msgstr ""
#: includes/admin/downloads/metabox.php:960
-#: includes/admin/reporting/reports.php:1027
-#: includes/admin/reporting/reports.php:1190
-#: includes/admin/reporting/reports.php:1380
+#: includes/admin/reporting/reports.php:995
+#: includes/admin/reporting/reports.php:1158
+#: includes/admin/reporting/reports.php:1348
#: includes/admin/settings/register-settings.php:648
#: includes/admin/settings/register-settings.php:651
#: includes/admin/settings/register-settings.php:1761
@@ -2247,6 +2250,7 @@ msgstr ""
#: includes/admin/downloads/metabox.php:1142
#: includes/admin/settings/register-settings.php:1011
#: includes/admin/thickbox.php:76
+#: includes/blocks/includes/downloads/downloads.php:135
#: includes/checkout/template.php:992
#: includes/gateways/stripe/includes/payment-methods/buy-now/template.php:215
#: includes/shortcodes.php:49
@@ -2302,9 +2306,11 @@ msgstr ""
#: includes/admin/downloads/metabox.php:1238
#: includes/admin/settings/register-settings.php:1039
+#: includes/blocks/includes/downloads/downloads.php:161
#: includes/gateways/stripe/includes/payment-methods/buy-now/template.php:40
#: includes/shortcodes.php:47
#: includes/template-functions.php:87
+#: includes/blocks/build/buy-button/index.js:1
msgid "Buy Now"
msgstr ""
@@ -2423,57 +2429,57 @@ msgstr ""
msgid "A customer with the email address %s already exists. Please go back and assign this payment to them."
msgstr ""
-#: includes/admin/payments/actions.php:222
+#: includes/admin/payments/actions.php:213
msgid "Error updating order."
msgstr ""
-#: includes/admin/payments/actions.php:256
+#: includes/admin/payments/actions.php:247
msgid "You do not have permission to edit this order."
msgstr ""
-#: includes/admin/payments/actions.php:394
-#: includes/admin/payments/actions.php:491
+#: includes/admin/payments/actions.php:385
+#: includes/admin/payments/actions.php:482
msgid "You must be logged in to perform this action."
msgstr ""
-#: includes/admin/payments/actions.php:404
-#: includes/admin/payments/actions.php:496
+#: includes/admin/payments/actions.php:395
+#: includes/admin/payments/actions.php:487
msgid "Your account does not have permission to perform this action."
msgstr ""
-#: includes/admin/payments/actions.php:415
+#: includes/admin/payments/actions.php:406
msgid "Invalid order ID"
msgstr ""
-#: includes/admin/payments/actions.php:425
+#: includes/admin/payments/actions.php:416
msgid "Invalid order"
msgstr ""
-#: includes/admin/payments/actions.php:434
+#: includes/admin/payments/actions.php:425
msgid "Order is already refunded"
msgstr ""
-#: includes/admin/payments/actions.php:443
+#: includes/admin/payments/actions.php:434
msgid "Cannot refund an order that is already refunded."
msgstr ""
-#: includes/admin/payments/actions.php:454
+#: includes/admin/payments/actions.php:445
msgid "View Refund"
msgstr ""
-#: includes/admin/payments/actions.php:500
+#: includes/admin/payments/actions.php:491
msgid "Missing form data or order ID."
msgstr ""
-#: includes/admin/payments/actions.php:509
+#: includes/admin/payments/actions.php:500
msgid "Nonce validation failed when submitting refund."
msgstr ""
-#: includes/admin/payments/actions.php:556
+#: includes/admin/payments/actions.php:547
msgid "Refund successfully processed."
msgstr ""
-#: includes/admin/payments/actions.php:567
+#: includes/admin/payments/actions.php:558
msgid "Unable to process refund."
msgstr ""
@@ -2521,7 +2527,7 @@ msgstr ""
#: includes/admin/reporting/views/export-sales.php:17
#: includes/admin/reporting/views/export-taxed-customers.php:16
#: includes/admin/reporting/views/export-taxed-orders.php:17
-#: includes/reports/reports-functions.php:1287
+#: includes/reports/reports-functions.php:1341
msgctxt "date filter"
msgid "From"
msgstr ""
@@ -2535,7 +2541,7 @@ msgstr ""
#: includes/admin/reporting/views/export-sales.php:28
#: includes/admin/reporting/views/export-taxed-customers.php:27
#: includes/admin/reporting/views/export-taxed-orders.php:28
-#: includes/reports/reports-functions.php:1297
+#: includes/reports/reports-functions.php:1351
msgctxt "date filter"
msgid "To"
msgstr ""
@@ -2564,6 +2570,7 @@ msgstr ""
#: includes/admin/payments/class-refund-items-table.php:77
#: includes/admin/reporting/class-export-download-history.php:62
#: includes/admin/reporting/export/class-batch-export-file-downloads.php:47
+#: includes/blocks/includes/orders/orders.php:540
#: includes/emails/email-summary/edd-email-summary-template.php:340
msgid "Product"
msgstr ""
@@ -2579,7 +2586,7 @@ msgstr ""
#: includes/admin/payments/class-payments-table.php:296
#: includes/admin/reporting/class-base-logs-list-table.php:502
#: includes/admin/tools/logs.php:258
-#: includes/reports/reports-functions.php:1701
+#: includes/reports/reports-functions.php:1755
msgid "Filter"
msgstr ""
@@ -2685,16 +2692,16 @@ msgstr ""
msgid "Move to Trash"
msgstr ""
-#: includes/admin/payments/class-payments-table.php:1103
-#: includes/admin/payments/class-payments-table.php:1106
+#: includes/admin/payments/class-payments-table.php:1104
+#: includes/admin/payments/class-payments-table.php:1107
msgid "Confirmation Required"
msgstr ""
-#: includes/admin/payments/class-payments-table.php:1104
+#: includes/admin/payments/class-payments-table.php:1105
msgid "You are about to permanently delete orders from your store. Once deleted, these orders are not recoverable. Are you sure you want to continue?"
msgstr ""
-#: includes/admin/payments/class-payments-table.php:1107
+#: includes/admin/payments/class-payments-table.php:1108
msgid "You are about to permanently delete this order from your store. Once deleted, this order is not recoverable. Are you sure you want to continue?"
msgstr ""
@@ -2709,7 +2716,7 @@ msgstr ""
#: includes/admin/payments/class-refund-items-table.php:79
#: includes/admin/payments/orders.php:802
#: includes/admin/payments/refunds.php:224
-#: includes/admin/reporting/export/class-batch-export-sales.php:45
+#: includes/admin/reporting/export/class-batch-export-sales.php:53
#: includes/admin/views/tmpl-order-form-add-order-item.php:110
#: includes/admin/views/tmpl-order-item.php:73
#: includes/emails/tags.php:320
@@ -2860,7 +2867,7 @@ msgid "You can enter:"
msgstr ""
#: includes/admin/payments/contextual-help.php:101
-msgid "The order ID"
+msgid "The specific order ID"
msgstr ""
#: includes/admin/payments/contextual-help.php:102
@@ -3360,10 +3367,10 @@ msgstr ""
#: includes/admin/reporting/reports.php:232
#: includes/admin/reporting/reports.php:365
#: includes/admin/reporting/reports.php:664
-#: includes/admin/reporting/reports.php:947
-#: includes/admin/reporting/reports.php:1330
-#: includes/admin/reporting/reports.php:1490
-#: includes/admin/reporting/reports.php:1688
+#: includes/admin/reporting/reports.php:915
+#: includes/admin/reporting/reports.php:1298
+#: includes/admin/reporting/reports.php:1458
+#: includes/admin/reporting/reports.php:1638
#: includes/reports/data/downloads/class-top-selling-downloads-list-table.php:57
#: includes/reports/data/file-downloads/class-top-five-most-downloaded-list-table.php:60
#: includes/blocks/build/downloads/index.js:1
@@ -3444,7 +3451,7 @@ msgstr ""
#: includes/admin/reporting/class-export-payments.php:64
#: includes/admin/reporting/export/class-batch-export-payments.php:49
#: includes/admin/reporting/export/class-batch-export-taxed-orders.php:50
-#: includes/gateways/stripe/includes/template-functions.php:575
+#: includes/gateways/stripe/includes/template-functions.php:584
msgid "State"
msgstr ""
@@ -3454,13 +3461,12 @@ msgstr ""
#: includes/admin/tools.php:746
#: includes/blocks/views/checkout/purchase-form/address.php:105
#: includes/checkout/template.php:403
-#: includes/gateways/stripe/includes/template-functions.php:829
+#: includes/gateways/stripe/includes/template-functions.php:838
#: templates/shortcode-profile-editor.php:157
msgid "Zip / Postal Code"
msgstr ""
#: includes/admin/reporting/class-export-payments.php:67
-#: includes/blocks/includes/orders/orders.php:350
#: includes/blocks/views/orders/receipt-items.php:20
#: includes/reports/reports-functions.php:320
#: src/Admin/Onboarding/Wizard.php:252
@@ -3507,7 +3513,7 @@ msgstr ""
#: includes/admin/reporting/class-export-payments.php:77
#: includes/admin/reporting/export/class-batch-export-payments.php:63
-#: includes/admin/reporting/export/class-batch-export-sales.php:40
+#: includes/admin/reporting/export/class-batch-export-sales.php:48
#: includes/admin/reporting/export/class-batch-export-taxed-orders.php:63
#: includes/admin/tools.php:698
msgid "User"
@@ -3575,7 +3581,7 @@ msgid "Pending / Failed Sales"
msgstr ""
#: includes/admin/reporting/class-sales-logs-list-table.php:100
-#: includes/admin/reporting/export/class-batch-export-sales.php:46
+#: includes/admin/reporting/export/class-batch-export-sales.php:54
msgid "Item Amount"
msgstr ""
@@ -3584,7 +3590,7 @@ msgid "This screen provides you with reports for your earnings, downloads, custo
msgstr ""
#: includes/admin/reporting/contextual-help.php:67
-#: includes/admin/reporting/reports.php:2774
+#: includes/admin/reporting/reports.php:2672
#: includes/admin/reporting/views/export-sales-earnings.php:61
#: includes/admin/tools.php:1012
msgid "Export"
@@ -3692,7 +3698,7 @@ msgid "Tags"
msgstr ""
#: includes/admin/reporting/export/class-batch-export-downloads.php:52
-#: includes/blocks/includes/orders/orders.php:352
+#: includes/blocks/includes/orders/orders.php:565
#: templates/history-downloads.php:46
msgid "Files"
msgstr ""
@@ -3735,7 +3741,7 @@ msgid "Order ID"
msgstr ""
#: includes/admin/reporting/export/class-batch-export-payments.php:44
-#: includes/admin/reporting/export/class-batch-export-sales.php:41
+#: includes/admin/reporting/export/class-batch-export-sales.php:49
#: includes/admin/reporting/export/class-batch-export-taxed-orders.php:44
#: includes/admin/tools.php:551
#: includes/privacy-functions.php:586
@@ -3763,16 +3769,16 @@ msgstr ""
msgid "State Name"
msgstr ""
-#: includes/admin/reporting/export/class-batch-export-sales.php:39
+#: includes/admin/reporting/export/class-batch-export-sales.php:47
msgid "Product ID"
msgstr ""
-#: includes/admin/reporting/export/class-batch-export-sales.php:47
+#: includes/admin/reporting/export/class-batch-export-sales.php:55
#: includes/emails/tags.php:221
msgid "Payment ID"
msgstr ""
-#: includes/admin/reporting/export/class-batch-export-sales.php:48
+#: includes/admin/reporting/export/class-batch-export-sales.php:56
msgid "Price ID"
msgstr ""
@@ -3847,26 +3853,26 @@ msgid "The logs tab has been moved to the Tools screen."
msgstr ""
#: includes/admin/reporting/reports.php:279
-#: includes/admin/reporting/reports.php:1407
+#: includes/admin/reporting/reports.php:1375
msgid "Average Order Value"
msgstr ""
#: includes/admin/reporting/reports.php:303
-#: includes/admin/reporting/reports.php:2567
-#: includes/admin/reporting/reports.php:2641
-#: includes/admin/reporting/reports.php:2728
+#: includes/admin/reporting/reports.php:2479
+#: includes/admin/reporting/reports.php:2553
+#: includes/admin/reporting/reports.php:2626
#: includes/emails/email-summary/edd-email-summary-template.php:279
msgid "New Customers"
msgstr ""
#: includes/admin/reporting/reports.php:322
-#: includes/admin/reporting/reports.php:1111
+#: includes/admin/reporting/reports.php:1079
msgid "Total Refund Amount"
msgstr ""
#: includes/admin/reporting/reports.php:345
#: includes/admin/reporting/reports.php:732
-#: includes/admin/reporting/reports.php:1558
+#: includes/admin/reporting/reports.php:1526
msgid "Sales and Earnings"
msgstr ""
@@ -3902,67 +3908,67 @@ msgstr ""
msgid "Earnings by Variation"
msgstr ""
-#: includes/admin/reporting/reports.php:1052
+#: includes/admin/reporting/reports.php:1020
msgid "Number of Refunds"
msgstr ""
-#: includes/admin/reporting/reports.php:1071
+#: includes/admin/reporting/reports.php:1039
msgid "Number of Fully Refunded Orders"
msgstr ""
-#: includes/admin/reporting/reports.php:1091
+#: includes/admin/reporting/reports.php:1059
msgid "Number of Fully Refunded Items"
msgstr ""
-#: includes/admin/reporting/reports.php:1131
+#: includes/admin/reporting/reports.php:1099
msgid "Average Refund Amount"
msgstr ""
-#: includes/admin/reporting/reports.php:1152
+#: includes/admin/reporting/reports.php:1120
msgid "Average Time to Refund"
msgstr ""
-#: includes/admin/reporting/reports.php:1170
+#: includes/admin/reporting/reports.php:1138
msgid "Refund Rate"
msgstr ""
-#: includes/admin/reporting/reports.php:1318
+#: includes/admin/reporting/reports.php:1286
msgid "Payment Gateways"
msgstr ""
-#: includes/admin/reporting/reports.php:1444
+#: includes/admin/reporting/reports.php:1412
msgid "Gateway Stats"
msgstr ""
-#: includes/admin/reporting/reports.php:1458
+#: includes/admin/reporting/reports.php:1426
msgid "Gateway Sales"
msgstr ""
-#: includes/admin/reporting/reports.php:1507
+#: includes/admin/reporting/reports.php:1475
msgid "Gateway Earnings"
msgstr ""
-#: includes/admin/reporting/reports.php:1800
+#: includes/admin/reporting/reports.php:1750
#: includes/admin/settings/contextual-help.php:99
#: includes/admin/settings/register-settings.php:897
#: includes/admin/settings/register-settings.php:1713
msgid "Taxes"
msgstr ""
-#: includes/admin/reporting/reports.php:1811
+#: includes/admin/reporting/reports.php:1761
msgid "Total Tax Collected"
msgstr ""
-#: includes/admin/reporting/reports.php:1846
+#: includes/admin/reporting/reports.php:1796
msgid "Total Tax Collected for "
msgstr ""
-#: includes/admin/reporting/reports.php:1876
+#: includes/admin/reporting/reports.php:1826
msgid "Tax Collected by Location"
msgstr ""
-#: includes/admin/reporting/reports.php:1955
-#: includes/admin/reporting/reports.php:2158
+#: includes/admin/reporting/reports.php:1905
+#: includes/admin/reporting/reports.php:2089
#: includes/admin/settings/register-settings.php:1793
#: includes/admin/tools/logs.php:195
#: includes/privacy-functions.php:546
@@ -3970,83 +3976,83 @@ msgstr ""
msgid "File Downloads"
msgstr ""
-#: includes/admin/reporting/reports.php:1967
-#: includes/admin/reporting/reports.php:2057
+#: includes/admin/reporting/reports.php:1917
+#: includes/admin/reporting/reports.php:2007
msgid "Number of File Downloads"
msgstr ""
-#: includes/admin/reporting/reports.php:1991
+#: includes/admin/reporting/reports.php:1941
msgid "Average per Customer"
msgstr ""
-#: includes/admin/reporting/reports.php:2009
+#: includes/admin/reporting/reports.php:1959
msgid "Average per Order"
msgstr ""
-#: includes/admin/reporting/reports.php:2027
+#: includes/admin/reporting/reports.php:1977
msgid "Most Downloaded Product"
msgstr ""
-#: includes/admin/reporting/reports.php:2045
+#: includes/admin/reporting/reports.php:1995
msgid "Top Five Most Downloaded Products"
msgstr ""
-#: includes/admin/reporting/reports.php:2265
+#: includes/admin/reporting/reports.php:2196
msgid "Number of Discounts Used"
msgstr ""
-#: includes/admin/reporting/reports.php:2282
+#: includes/admin/reporting/reports.php:2213
msgid "Discount Ratio"
msgstr ""
-#: includes/admin/reporting/reports.php:2300
+#: includes/admin/reporting/reports.php:2231
msgid "Customer Savings"
msgstr ""
-#: includes/admin/reporting/reports.php:2321
+#: includes/admin/reporting/reports.php:2252
msgid "Average Discount Amount"
msgstr ""
-#: includes/admin/reporting/reports.php:2339
+#: includes/admin/reporting/reports.php:2270
msgid "Most Popular Discount"
msgstr ""
-#: includes/admin/reporting/reports.php:2364
+#: includes/admin/reporting/reports.php:2295
msgid "Discount Usage Count"
msgstr ""
-#: includes/admin/reporting/reports.php:2383
+#: includes/admin/reporting/reports.php:2314
msgid "Top Five Discounts"
msgstr ""
-#: includes/admin/reporting/reports.php:2396
-#: includes/admin/reporting/reports.php:2491
+#: includes/admin/reporting/reports.php:2327
+#: includes/admin/reporting/reports.php:2403
msgid "Discount Usage"
msgstr ""
-#: includes/admin/reporting/reports.php:2586
+#: includes/admin/reporting/reports.php:2498
msgid "Average Revenue per Customer"
msgstr ""
-#: includes/admin/reporting/reports.php:2601
+#: includes/admin/reporting/reports.php:2513
msgid "Average Orders per Customer"
msgstr ""
-#: includes/admin/reporting/reports.php:2617
+#: includes/admin/reporting/reports.php:2529
msgid "Top Five Customers — All Time"
msgstr ""
-#: includes/admin/reporting/reports.php:2629
+#: includes/admin/reporting/reports.php:2541
msgid "Most Valuable Customers"
msgstr ""
-#: includes/admin/reporting/reports.php:2885
-#: includes/user-functions.php:924
-#: includes/user-functions.php:928
+#: includes/admin/reporting/reports.php:2783
+#: includes/user-functions.php:935
+#: includes/user-functions.php:939
msgid "Notice"
msgstr ""
-#: includes/admin/reporting/reports.php:2886
+#: includes/admin/reporting/reports.php:2784
msgid "Tax reports are only generated for taxes associated with a location. The legacy default tax rate is unable to be reported on."
msgstr ""
@@ -4124,7 +4130,7 @@ msgstr ""
#: includes/admin/reporting/views/export-download-history.php:13
#: includes/admin/reporting/views/export-downloads.php:17
#: includes/admin/reporting/views/export-sales-earnings.php:42
-#: includes/reports/reports-functions.php:1387
+#: includes/reports/reports-functions.php:1441
msgid "All %s"
msgstr ""
@@ -4431,6 +4437,10 @@ msgstr ""
msgid "Taxes are currently disabled. Rates listed below will not be applied to purchases until taxes are enabled."
msgstr ""
+#: includes/admin/settings/display-settings.php:413
+msgid "Manage extensions for Easy Digital Downloads which are not included with a pass. Having an active license for your extensions gives you access to updates when they're available."
+msgstr ""
+
#: includes/admin/settings/register-settings.php:291
msgid "Do Nothing"
msgstr ""
@@ -5899,13 +5909,13 @@ msgid "Purchased Product(s)"
msgstr ""
#: includes/admin/tools.php:708
-#: includes/gateways/stripe/includes/template-functions.php:500
+#: includes/gateways/stripe/includes/template-functions.php:509
msgid "Address Line 1"
msgstr ""
#: includes/admin/tools.php:718
#: includes/blocks/views/checkout/purchase-form/address.php:43
-#: includes/gateways/stripe/includes/template-functions.php:514
+#: includes/gateways/stripe/includes/template-functions.php:523
msgid "Address Line 2"
msgstr ""
@@ -6777,12 +6787,12 @@ msgid "No download logs found!"
msgstr ""
#: includes/api/class-edd-api.php:1986
-#: includes/user-functions.php:1090
+#: includes/user-functions.php:1101
msgid "Downloads API Keys"
msgstr ""
#: includes/api/class-edd-api.php:1996
-#: includes/user-functions.php:1097
+#: includes/user-functions.php:1108
msgid "Generate API Key"
msgstr ""
@@ -6795,12 +6805,12 @@ msgid "Secret key:"
msgstr ""
#: includes/api/class-edd-api.php:2006
-#: includes/user-functions.php:1108
+#: includes/user-functions.php:1119
msgid "Token:"
msgstr ""
#: includes/api/class-edd-api.php:2010
-#: includes/user-functions.php:1114
+#: includes/user-functions.php:1125
msgid "Revoke API Keys"
msgstr ""
@@ -6821,22 +6831,22 @@ msgstr ""
msgid "Failed to dismiss notification."
msgstr ""
-#: includes/blocks/edd-blocks.php:92
+#: includes/blocks/edd-blocks.php:89
msgid "Confirmation"
msgstr ""
-#: includes/blocks/edd-blocks.php:93
+#: includes/blocks/edd-blocks.php:90
#: includes/install.php:379
msgid "Thank you for your purchase!"
msgstr ""
-#: includes/blocks/edd-blocks.php:96
+#: includes/blocks/edd-blocks.php:93
#: includes/emails/tags.php:245
#: includes/emails/template.php:262
msgid "Receipt"
msgstr ""
-#: includes/blocks/edd-blocks.php:100
+#: includes/blocks/edd-blocks.php:97
msgid "Order History"
msgstr ""
@@ -6985,6 +6995,11 @@ msgctxt "download post type name"
msgid "No %s found."
msgstr ""
+#: includes/blocks/includes/forms/forms.php:67
+#: includes/users/lost-password.php:233
+msgid "Your password reset link appears to be invalid. Please request a new link below."
+msgstr ""
+
#: includes/blocks/includes/forms/recaptcha.php:96
msgid "reCAPTCHA validation missing."
msgstr ""
@@ -7167,13 +7182,15 @@ msgid "This is a secure SSL encrypted payment."
msgstr ""
#: includes/blocks/views/checkout/purchase-form/credit-card.php:22
-#: includes/gateways/stripe/includes/template-functions.php:154
+#: includes/gateways/stripe/includes/template-functions.php:141
+#: includes/gateways/stripe/includes/template-functions.php:163
msgid "Name on the Card"
msgstr ""
#: includes/blocks/views/checkout/purchase-form/credit-card.php:26
#: includes/checkout/template.php:280
-#: includes/gateways/stripe/includes/template-functions.php:158
+#: includes/gateways/stripe/includes/template-functions.php:144
+#: includes/gateways/stripe/includes/template-functions.php:167
msgid "Card name"
msgstr ""
@@ -7189,7 +7206,7 @@ msgstr ""
#: includes/blocks/views/checkout/purchase-form/credit-card.php:42
#: includes/checkout/template.php:268
-#: includes/gateways/stripe/includes/template-functions.php:200
+#: includes/gateways/stripe/includes/template-functions.php:209
msgid "CVC"
msgstr ""
@@ -7200,7 +7217,7 @@ msgstr ""
#: includes/blocks/views/checkout/purchase-form/credit-card.php:52
#: includes/checkout/template.php:285
-#: includes/gateways/stripe/includes/template-functions.php:597
+#: includes/gateways/stripe/includes/template-functions.php:606
msgid "Expiration (MM/YY)"
msgstr ""
@@ -7311,7 +7328,7 @@ msgid "Log In"
msgstr ""
#: includes/blocks/views/forms/login.php:44
-#: includes/payments/actions.php:438
+#: includes/payments/actions.php:435
#: templates/shortcode-login.php:33
#: includes/blocks/build/login/index.js:1
msgid "Lost Password?"
@@ -7479,7 +7496,7 @@ msgid "Name on the card"
msgstr ""
#: includes/checkout/template.php:279
-#: includes/gateways/stripe/includes/template-functions.php:157
+#: includes/gateways/stripe/includes/template-functions.php:166
msgid "The name printed on the front of your credit card."
msgstr ""
@@ -7520,7 +7537,7 @@ msgid "Billing zip/Postal code"
msgstr ""
#: includes/checkout/template.php:402
-#: includes/gateways/stripe/includes/template-functions.php:828
+#: includes/gateways/stripe/includes/template-functions.php:837
msgid "The zip or postal code for your billing address."
msgstr ""
@@ -7529,7 +7546,7 @@ msgid "Billing country"
msgstr ""
#: includes/checkout/template.php:412
-#: includes/gateways/stripe/includes/template-functions.php:804
+#: includes/gateways/stripe/includes/template-functions.php:813
msgid "The country for your billing address."
msgstr ""
@@ -7816,8 +7833,8 @@ msgstr ""
#. translators: %s: User login.
#: includes/class-edd-cli.php:315
-#: includes/user-functions.php:575
-#: includes/user-functions.php:587
+#: includes/user-functions.php:586
+#: includes/user-functions.php:598
#: includes/users/lost-password.php:169
msgid "Username: %s"
msgstr ""
@@ -8298,7 +8315,7 @@ msgid "Draft"
msgstr ""
#: includes/class-edd-discount.php:678
-#: includes/gateways/stripe/includes/template-functions.php:369
+#: includes/gateways/stripe/includes/template-functions.php:378
#: includes/misc-functions.php:1457
msgid "Expired"
msgstr ""
@@ -8416,15 +8433,14 @@ msgstr ""
msgid "Required"
msgstr ""
-#: includes/class-edd-license-handler.php:256
-msgid "Enter your extension license keys here to receive updates for purchased extensions. If your license key has expired, please %srenew your license%s."
+#. translators: 1. opening anchor tag; 2. closing anchor tag
+#: includes/class-edd-license-handler.php:299
+#: src/Extensions/Handler.php:263
+msgid "You have invalid or expired license keys for Easy Digital Downloads. %1$sActivate License(s)%2$s"
msgstr ""
-#: includes/class-edd-license-handler.php:353
-msgid "You have invalid or expired license keys for Easy Digital Downloads. Fix this "
-msgstr ""
-
-#: includes/class-edd-license-handler.php:382
+#: includes/class-edd-license-handler.php:321
+#: src/Extensions/Handler.php:282
msgid "Enter valid license key for automatic updates."
msgstr ""
@@ -8610,12 +8626,12 @@ msgid "Saturday"
msgstr ""
#: includes/class-stats.php:3206
-#: includes/emails/email-summary/class-edd-email-summary.php:330
+#: includes/emails/email-summary/class-edd-email-summary.php:329
msgid "No Change"
msgstr ""
#: includes/class-stats.php:3216
-#: includes/emails/email-summary/class-edd-email-summary.php:328
+#: includes/emails/email-summary/class-edd-email-summary.php:327
msgid "No data to compare"
msgstr ""
@@ -9033,7 +9049,7 @@ msgstr ""
msgid "Angolan Kwanza"
msgstr ""
-#: includes/customer-functions.php:334
+#: includes/customer-functions.php:292
#: includes/payments/class-payments-query.php:626
msgid "Do not use -1 to retrieve all results."
msgstr ""
@@ -9246,27 +9262,33 @@ msgstr ""
#. translators: the plugin name.
#: includes/EDD_SL_Plugin_Updater.php:224
+#: src/Extensions/Updater.php:243
msgid "There is a new version of %1$s available."
msgstr ""
#: includes/EDD_SL_Plugin_Updater.php:230
+#: src/Extensions/Updater.php:249
msgid "Contact your network administrator to install the update."
msgstr ""
#. translators: 1. opening anchor tag, do not translate 2. the new plugin version 3. closing anchor tag, do not translate.
#: includes/EDD_SL_Plugin_Updater.php:235
+#: src/Extensions/Updater.php:254
msgid "%1$sView version %2$s details%3$s."
msgstr ""
#: includes/EDD_SL_Plugin_Updater.php:243
+#: src/Extensions/Updater.php:262
msgid "%1$sView version %2$s details%3$s or %4$supdate now%5$s."
msgstr ""
#: includes/EDD_SL_Plugin_Updater.php:254
+#: src/Extensions/Updater.php:273
msgid "Update now."
msgstr ""
#: includes/EDD_SL_Plugin_Updater.php:486
+#: src/Extensions/Updater.php:480
msgid "You do not have permission to install plugin updates"
msgstr ""
@@ -9293,28 +9315,28 @@ msgid ""
msgstr ""
#. Translators: Site domain name
-#: includes/emails/email-summary/class-edd-email-summary.php:89
+#: includes/emails/email-summary/class-edd-email-summary.php:88
msgid "Easy Digital Downloads Summary - %s"
msgstr ""
-#: includes/emails/email-summary/class-edd-email-summary.php:121
+#: includes/emails/email-summary/class-edd-email-summary.php:120
msgid "Missing email recipients for Email Summary"
msgstr ""
-#: includes/emails/email-summary/class-edd-email-summary.php:373
+#: includes/emails/email-summary/class-edd-email-summary.php:372
msgid "month"
msgstr ""
-#: includes/emails/email-summary/class-edd-email-summary.php:373
+#: includes/emails/email-summary/class-edd-email-summary.php:372
msgid "week"
msgstr ""
#. Translators: period name (e.g. week)
-#: includes/emails/email-summary/class-edd-email-summary.php:375
+#: includes/emails/email-summary/class-edd-email-summary.php:374
msgid "vs previous %s"
msgstr ""
-#: includes/emails/email-summary/class-edd-email-summary.php:403
+#: includes/emails/email-summary/class-edd-email-summary.php:402
msgid "Email body for Email Summary was empty."
msgstr ""
@@ -9706,6 +9728,7 @@ msgstr ""
#: includes/gateways/manual.php:33
#: includes/gateways/paypal-standard.php:170
+#: includes/gateways/paypal/checkout-actions.php:114
msgid "Nonce verification has failed"
msgstr ""
@@ -9844,7 +9867,7 @@ msgstr ""
#. Translators: %s - transaction ID
#: includes/gateways/paypal-standard.php:692
-#: includes/gateways/paypal/checkout-actions.php:399
+#: includes/gateways/paypal/checkout-actions.php:404
msgid "PayPal Transaction ID: %s"
msgstr ""
@@ -10153,65 +10176,65 @@ msgid "PayPal requires an SSL certificate to accept payments. You can learn more
msgstr ""
#: includes/gateways/paypal/checkout-actions.php:56
-#: includes/gateways/paypal/checkout-actions.php:121
+#: includes/gateways/paypal/checkout-actions.php:126
msgid "Please connect your PayPal account in the gateway settings."
msgstr ""
#: includes/gateways/paypal/checkout-actions.php:57
-#: includes/gateways/paypal/checkout-actions.php:122
+#: includes/gateways/paypal/checkout-actions.php:127
msgid "Unexpected authentication error. Please contact a site administrator."
msgstr ""
-#: includes/gateways/paypal/checkout-actions.php:116
+#: includes/gateways/paypal/checkout-actions.php:121
#: includes/gateways/paypal/exceptions/class-gateway-exception.php:48
msgid "PayPal Gateway Error"
msgstr ""
-#: includes/gateways/paypal/checkout-actions.php:117
+#: includes/gateways/paypal/checkout-actions.php:122
msgid "Account not ready to accept payments."
msgstr ""
-#: includes/gateways/paypal/checkout-actions.php:148
-#: includes/gateways/paypal/checkout-actions.php:308
+#: includes/gateways/paypal/checkout-actions.php:153
+#: includes/gateways/paypal/checkout-actions.php:313
#: includes/gateways/paypal/scripts.php:115
msgid "An unexpected error occurred. Please try again."
msgstr ""
-#: includes/gateways/paypal/checkout-actions.php:201
+#: includes/gateways/paypal/checkout-actions.php:206
msgid "PayPal Gateway Warning"
msgstr ""
#. Translators: %s - Original order data sent to PayPal.
-#: includes/gateways/paypal/checkout-actions.php:204
+#: includes/gateways/paypal/checkout-actions.php:209
msgid "PayPal could not complete the transaction with the itemized breakdown. Original order data sent: %s"
msgstr ""
-#: includes/gateways/paypal/checkout-actions.php:223
-#: includes/gateways/paypal/checkout-actions.php:253
-#: includes/gateways/paypal/checkout-actions.php:420
+#: includes/gateways/paypal/checkout-actions.php:228
+#: includes/gateways/paypal/checkout-actions.php:258
+#: includes/gateways/paypal/checkout-actions.php:425
msgid "An error occurred while communicating with PayPal. Please try again."
msgstr ""
-#: includes/gateways/paypal/checkout-actions.php:251
-#: includes/gateways/paypal/checkout-actions.php:418
+#: includes/gateways/paypal/checkout-actions.php:256
+#: includes/gateways/paypal/checkout-actions.php:423
msgid "An authentication error occurred. Please try again."
msgstr ""
-#: includes/gateways/paypal/checkout-actions.php:285
-#: includes/gateways/paypal/checkout-actions.php:293
-#: includes/gateways/paypal/checkout-actions.php:300
+#: includes/gateways/paypal/checkout-actions.php:290
+#: includes/gateways/paypal/checkout-actions.php:298
+#: includes/gateways/paypal/checkout-actions.php:305
msgid "A validation error occurred. Please try again."
msgstr ""
-#: includes/gateways/paypal/checkout-actions.php:321
+#: includes/gateways/paypal/checkout-actions.php:326
msgid "Failed to process payment. Please try again."
msgstr ""
-#: includes/gateways/paypal/checkout-actions.php:330
+#: includes/gateways/paypal/checkout-actions.php:335
msgid "Unable to complete your order with your chosen payment method. Please choose a new funding source."
msgstr ""
-#: includes/gateways/paypal/checkout-actions.php:409
+#: includes/gateways/paypal/checkout-actions.php:414
msgid "Your payment was declined. Please try a new payment method."
msgstr ""
@@ -10864,8 +10887,14 @@ msgstr ""
msgid "Card successfully added."
msgstr ""
-#: includes/gateways/stripe/includes/class-edd-stripe.php:281
-#: includes/gateways/stripe/includes/template-functions.php:167
+#: includes/gateways/stripe/includes/class-edd-stripe-rate-limiting.php:430
+#: includes/gateways/stripe/includes/payment-actions/card-elements-actions.php:42
+#: includes/gateways/stripe/includes/template-functions.php:24
+msgid "We are unable to process your payment at this time, please try again later or contact support."
+msgstr ""
+
+#: includes/gateways/stripe/includes/class-edd-stripe.php:288
+#: includes/gateways/stripe/includes/template-functions.php:176
msgid "Credit Card"
msgstr ""
@@ -11052,12 +11081,6 @@ msgstr ""
msgid "No user records were found that needed to be migrated."
msgstr ""
-#: includes/gateways/stripe/includes/payment-actions/card-elements-actions.php:42
-#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:52
-#: includes/gateways/stripe/includes/template-functions.php:24
-msgid "We are unable to process your payment at this time, please try again later or contact support."
-msgstr ""
-
#: includes/gateways/stripe/includes/payment-actions/card-elements-actions.php:63
msgid "Unable to locate payment method. Please try again with a new payment method."
msgstr ""
@@ -11067,7 +11090,7 @@ msgid "Prepaid cards are not a valid payment method. Please try again with a new
msgstr ""
#: includes/gateways/stripe/includes/payment-actions/card-elements-actions.php:99
-#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:108
+#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:115
msgid "Unable to create customer. Please try again."
msgstr ""
@@ -11084,7 +11107,7 @@ msgstr ""
#: includes/gateways/stripe/includes/payment-actions/card-elements-actions.php:713
#: includes/gateways/stripe/includes/payment-actions/card-elements-actions.php:919
#: includes/gateways/stripe/includes/payment-actions/card-elements-actions.php:1056
-#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:657
+#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:703
msgid "Stripe Error"
msgstr ""
@@ -11127,43 +11150,43 @@ msgstr ""
msgid "Charge not refunded in Stripe, as checkbox was not selected."
msgstr ""
-#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:305
+#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:330
msgid "Stripe Error 002"
msgstr ""
-#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:307
+#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:332
msgid "There was an error while processing a Stripe payment. Order data: %s"
msgstr ""
-#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:323
+#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:348
msgid "Stripe Error 003"
msgstr ""
-#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:358
+#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:383
msgid "Error 1001: An error occurred, but your payment may have gone through. Please contact the site administrator."
msgstr ""
-#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:369
+#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:394
msgid "Error 1002: An error occurred, but your payment may have gone through. Please contact the site administrator."
msgstr ""
-#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:381
+#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:406
msgid "Error 1003: An error occurred, but your payment may have gone through. Please contact the site administrator."
msgstr ""
-#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:393
+#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:418
msgid "Error 1004: An error occurred, but your payment may have gone through. Please contact the site administrator."
msgstr ""
-#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:410
+#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:435
msgid "Error 1005: An error occurred, but your payment may have gone through. Please contact the site administrator."
msgstr ""
-#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:442
+#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:467
msgid "Error 1006: An error occurred, but your payment may have gone through. Please contact the site administrator."
msgstr ""
-#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:635
+#: includes/gateways/stripe/includes/payment-actions/payment-elements-actions.php:681
msgid "Error 1007: An error occurred completing the order, but your payment may have gone through. Please contact the site administrator."
msgstr ""
@@ -11285,96 +11308,100 @@ msgstr ""
msgid "Adding new payment methods is currently unavailable."
msgstr ""
-#: includes/gateways/stripe/includes/template-functions.php:165
+#: includes/gateways/stripe/includes/template-functions.php:174
msgid "Credit Card Number"
msgstr ""
-#: includes/gateways/stripe/includes/template-functions.php:191
+#: includes/gateways/stripe/includes/template-functions.php:200
msgid "Expiration"
msgstr ""
#. translators: %1$s Card type. %2$s Card last 4.
-#: includes/gateways/stripe/includes/template-functions.php:281
+#: includes/gateways/stripe/includes/template-functions.php:290
msgid "Update card billing address for %1$s •••• %2$s"
msgstr ""
-#: includes/gateways/stripe/includes/template-functions.php:309
+#: includes/gateways/stripe/includes/template-functions.php:318
msgid "We are unable to process your payment at this time, please try again later or contacts support."
msgstr ""
#. translators: %1$s Card type. %2$s Card last 4.
-#: includes/gateways/stripe/includes/template-functions.php:344
-#: includes/gateways/stripe/includes/template-functions.php:433
+#: includes/gateways/stripe/includes/template-functions.php:353
+#: includes/gateways/stripe/includes/template-functions.php:442
msgid "%1$s •••• %2$s"
msgstr ""
-#: includes/gateways/stripe/includes/template-functions.php:381
-#: includes/gateways/stripe/includes/template-functions.php:654
+#: includes/gateways/stripe/includes/template-functions.php:390
+#: includes/gateways/stripe/includes/template-functions.php:663
msgid "Add New Card"
msgstr ""
-#: includes/gateways/stripe/includes/template-functions.php:410
+#: includes/gateways/stripe/includes/template-functions.php:419
msgid "Payment method management is currently unavailable."
msgstr ""
-#: includes/gateways/stripe/includes/template-functions.php:423
+#: includes/gateways/stripe/includes/template-functions.php:432
msgid "Manage Payment Methods"
msgstr ""
-#: includes/gateways/stripe/includes/template-functions.php:452
+#: includes/gateways/stripe/includes/template-functions.php:461
msgid "Expires"
msgstr ""
-#: includes/gateways/stripe/includes/template-functions.php:474
+#: includes/gateways/stripe/includes/template-functions.php:483
msgid "Set as Default"
msgstr ""
-#: includes/gateways/stripe/includes/template-functions.php:492
-#: includes/gateways/stripe/includes/template-functions.php:796
+#: includes/gateways/stripe/includes/template-functions.php:501
+#: includes/gateways/stripe/includes/template-functions.php:805
msgid "Billing Details"
msgstr ""
-#: includes/gateways/stripe/includes/template-functions.php:542
+#: includes/gateways/stripe/includes/template-functions.php:551
msgid "ZIP Code"
msgstr ""
-#: includes/gateways/stripe/includes/template-functions.php:635
-#: includes/gateways/stripe/includes/template-functions.php:679
+#: includes/gateways/stripe/includes/template-functions.php:644
+#: includes/gateways/stripe/includes/template-functions.php:688
msgid "Please Wait…"
msgstr ""
-#: includes/gateways/stripe/includes/template-functions.php:636
-#: includes/gateways/stripe/includes/template-functions.php:637
+#: includes/gateways/stripe/includes/template-functions.php:645
+#: includes/gateways/stripe/includes/template-functions.php:646
msgid "Update Card"
msgstr ""
-#: includes/gateways/stripe/includes/template-functions.php:656
+#: includes/gateways/stripe/includes/template-functions.php:665
msgid "Credit Card Details"
msgstr ""
-#: includes/gateways/stripe/includes/template-functions.php:680
-#: includes/gateways/stripe/includes/template-functions.php:681
+#: includes/gateways/stripe/includes/template-functions.php:689
+#: includes/gateways/stripe/includes/template-functions.php:690
msgid "Add new card"
msgstr ""
-#: includes/gateways/stripe/includes/template-functions.php:799
+#: includes/gateways/stripe/includes/template-functions.php:808
msgid "Billing Country"
msgstr ""
-#: includes/gateways/stripe/includes/template-functions.php:823
+#: includes/gateways/stripe/includes/template-functions.php:832
msgid "Billing Zip / Postal Code"
msgstr ""
-#: includes/gateways/stripe/includes/template-functions.php:897
+#: includes/gateways/stripe/includes/template-functions.php:906
#: includes/process-purchase.php:487
msgid "Please enter your zip / postal code"
msgstr ""
-#: includes/gateways/stripe/includes/template-functions.php:902
+#: includes/gateways/stripe/includes/template-functions.php:911
#: includes/process-purchase.php:499
msgid "Please select your billing country"
msgstr ""
+#: includes/gateways/stripe/includes/utils/regional-support/class-edd-stripe-region-base.php:113
+msgid "Based on your store's base country of %s, it is recommended to set your Billing Address Display to use the \"Full Address\" option to ensure payments are completed successfully."
+msgstr ""
+
#: includes/gateways/stripe/includes/webhooks.php:27
msgid "Unable to find Event"
msgstr ""
@@ -11503,7 +11530,7 @@ msgstr ""
msgid "The maximum refund %s for the adjustment \"%s\" is %s."
msgstr ""
-#: includes/orders/functions/orders.php:673
+#: includes/orders/functions/orders.php:661
msgid "Payment recovery processed"
msgstr ""
@@ -11548,61 +11575,61 @@ msgstr ""
msgid "Invoices"
msgstr ""
-#: includes/payments/actions.php:277
+#: includes/payments/actions.php:274
msgid "After payment actions processed."
msgstr ""
-#: includes/payments/actions.php:353
-#: includes/payments/actions.php:414
+#: includes/payments/actions.php:350
+#: includes/payments/actions.php:411
msgid "Error resuming payment."
msgstr ""
-#: includes/payments/actions.php:357
+#: includes/payments/actions.php:354
msgid "Payment recovery triggered URL"
msgstr ""
-#: includes/payments/actions.php:435
-#: includes/payments/actions.php:469
+#: includes/payments/actions.php:432
+#: includes/payments/actions.php:466
msgid "To complete this payment, please login to your account."
msgstr ""
-#: includes/payments/actions.php:437
+#: includes/payments/actions.php:434
msgid "Lost Password"
msgstr ""
-#: includes/payments/class-edd-payment.php:1824
+#: includes/payments/class-edd-payment.php:1821
msgid "Array key \"post_status\" is no longer a supported attribute for the \"edd_update_payment_status_fields\" filter. Please use \"status\" instead."
msgstr ""
-#: includes/payments/functions.php:540
+#: includes/payments/functions.php:536
msgid "Processing"
msgstr ""
-#: includes/payments/functions.php:541
+#: includes/payments/functions.php:537
msgid "Completed"
msgstr ""
-#: includes/payments/functions.php:542
+#: includes/payments/functions.php:538
msgid "Refunded"
msgstr ""
-#: includes/payments/functions.php:543
+#: includes/payments/functions.php:539
msgid "Partially Refunded"
msgstr ""
-#: includes/payments/functions.php:544
+#: includes/payments/functions.php:540
msgid "Revoked"
msgstr ""
-#: includes/payments/functions.php:545
+#: includes/payments/functions.php:541
msgid "Failed"
msgstr ""
-#: includes/payments/functions.php:546
+#: includes/payments/functions.php:542
msgid "Abandoned"
msgstr ""
-#: includes/payments/functions.php:2012
+#: includes/payments/functions.php:2008
msgid "A store migration is in progress. Past orders will not appear in your purchase history until they have been updated."
msgstr ""
@@ -12394,7 +12421,7 @@ msgid "Global Rate"
msgstr ""
#: includes/reports/reports-functions.php:328
-#: includes/reports/reports-functions.php:1424
+#: includes/reports/reports-functions.php:1478
msgid "Exclude Taxes"
msgstr ""
@@ -12450,19 +12477,19 @@ msgstr ""
msgid "Previous year"
msgstr ""
-#: includes/reports/reports-functions.php:1229
+#: includes/reports/reports-functions.php:1283
msgid "Chart time zone: %s"
msgstr ""
-#: includes/reports/reports-functions.php:1330
+#: includes/reports/reports-functions.php:1384
msgid "compared to"
msgstr ""
-#: includes/reports/reports-functions.php:1593
+#: includes/reports/reports-functions.php:1647
msgid "%s - Converted"
msgstr ""
-#: includes/reports/reports-functions.php:1730
+#: includes/reports/reports-functions.php:1784
msgid "Try the Sales/Earnings iOS App!"
msgstr ""
@@ -12727,52 +12754,52 @@ msgstr ""
msgid "Plain Text"
msgstr ""
-#: includes/user-functions.php:573
+#: includes/user-functions.php:584
msgid "[%s] New User Registration"
msgstr ""
-#: includes/user-functions.php:574
+#: includes/user-functions.php:585
msgid "New user registration"
msgstr ""
-#: includes/user-functions.php:576
+#: includes/user-functions.php:587
msgid "E-mail: %s"
msgstr ""
-#: includes/user-functions.php:585
+#: includes/user-functions.php:596
msgid "[%s] Your username and password"
msgstr ""
-#: includes/user-functions.php:586
+#: includes/user-functions.php:597
msgid "Your account info"
msgstr ""
-#: includes/user-functions.php:590
+#: includes/user-functions.php:601
msgid "Password entered at checkout"
msgstr ""
-#: includes/user-functions.php:592
+#: includes/user-functions.php:603
msgid "Password entered at registration"
msgstr ""
-#: includes/user-functions.php:595
+#: includes/user-functions.php:606
msgid "Password: %s"
msgstr ""
-#: includes/user-functions.php:600
+#: includes/user-functions.php:611
msgid "Click here to log in"
msgstr ""
-#: includes/user-functions.php:604
+#: includes/user-functions.php:615
msgid "To log in, visit: %s"
msgstr ""
-#: includes/user-functions.php:758
-#: includes/user-functions.php:759
+#: includes/user-functions.php:769
+#: includes/user-functions.php:770
msgid "Verify your account"
msgstr ""
-#: includes/user-functions.php:761
+#: includes/user-functions.php:772
msgid ""
"Hello %1$s,\n"
"\n"
@@ -12781,35 +12808,35 @@ msgid ""
"\t\tLink missing? Visit the following URL: %3$s"
msgstr ""
-#: includes/user-functions.php:891
+#: includes/user-functions.php:902
msgid "Sorry but your account verification link has expired. Click here to request a new verification URL."
msgstr ""
-#: includes/user-functions.php:924
+#: includes/user-functions.php:935
msgid "You must be logged in to verify your account."
msgstr ""
-#: includes/user-functions.php:928
+#: includes/user-functions.php:939
msgid "Your account has already been verified."
msgstr ""
-#: includes/user-functions.php:972
+#: includes/user-functions.php:983
msgid "Invalid verification token provided."
msgstr ""
-#: includes/user-functions.php:1102
+#: includes/user-functions.php:1113
msgid "Public Key:"
msgstr ""
-#: includes/user-functions.php:1105
+#: includes/user-functions.php:1116
msgid "Secret Key:"
msgstr ""
-#: includes/user-functions.php:1129
+#: includes/user-functions.php:1140
msgid "Easy Digital Downloads iOS App "
msgstr ""
-#: includes/user-functions.php:1136
+#: includes/user-functions.php:1147
msgid "Add to iOS App"
msgstr ""
@@ -12853,25 +12880,27 @@ msgstr ""
msgid "Your password reset link has expired. Please request a new link below."
msgstr ""
-#: includes/users/lost-password.php:233
-msgid "Your password reset link appears to be invalid. Please request a new link below."
+#: includes/users/lost-password.php:253
+#: includes/users/lost-password.php:257
+#: includes/users/lost-password.php:263
+msgid "Invalid password reset request."
msgstr ""
-#: includes/users/lost-password.php:256
+#: includes/users/lost-password.php:272
#: includes/users/register.php:97
msgid "The password cannot be a space or all spaces."
msgstr ""
-#: includes/users/lost-password.php:261
+#: includes/users/lost-password.php:277
#: includes/users/register.php:102
msgid "The passwords do not match."
msgstr ""
-#: includes/users/lost-password.php:266
+#: includes/users/lost-password.php:282
msgid "Your password could not be reset."
msgstr ""
-#: includes/users/lost-password.php:273
+#: includes/users/lost-password.php:291
msgid "Your password was successfully reset."
msgstr ""
@@ -13640,8 +13669,8 @@ msgid "Run the WP Mail SMTP Setup Wizard"
msgstr ""
#: src/Licensing/Ajax.php:50
-#: src/Licensing/Ajax.php:134
-#: src/Licensing/Ajax.php:174
+#: src/Licensing/Ajax.php:135
+#: src/Licensing/Ajax.php:177
msgid "You do not have permission to manage this extension."
msgstr ""
@@ -13650,16 +13679,16 @@ msgstr ""
msgid "No key provided."
msgstr ""
-#: src/Licensing/Ajax.php:90
+#: src/Licensing/Ajax.php:91
msgid "Your license key could not be activated."
msgstr ""
-#: src/Licensing/Ajax.php:158
+#: src/Licensing/Ajax.php:161
#: src/Licensing/Messages.php:178
msgid "Your license key has been deactivated."
msgstr ""
-#: src/Licensing/Ajax.php:186
+#: src/Licensing/Ajax.php:189
msgid "License key deleted."
msgstr ""
@@ -13706,68 +13735,58 @@ msgstr ""
msgid "The key you entered belongs to a bundle, please use the product specific license key."
msgstr ""
-#: src/Licensing/Messages.php:190
-msgid "unknown_error"
-msgstr ""
-
-#. translators: 1. the error code; 2. opening link tag; 3. closing link tag.
-#: src/Licensing/Messages.php:193
-msgid "There was an error with this license key: %1$s. Please %2$scontact our support team%3$s."
-msgstr ""
-
-#. translators: the extension name.
-#: src/Licensing/Messages.php:201
+#: src/Licensing/Messages.php:189
msgid "Unlicensed: currently not receiving updates."
msgstr ""
-#: src/Licensing/Messages.php:218
+#: src/Licensing/Messages.php:204
msgid "License key never expires."
msgstr ""
#. translators: the license expiration date.
-#: src/Licensing/Messages.php:224
+#: src/Licensing/Messages.php:210
msgid "Your license key expires soon! It expires on %s."
msgstr ""
#. translators: the license expiration date.
-#: src/Licensing/Messages.php:231
+#: src/Licensing/Messages.php:217
msgid "Your license key expires on %s."
msgstr ""
-#: src/Licensing/Messages.php:244
+#: src/Licensing/Messages.php:230
msgid "Your license subscription is active and will automatically renew."
msgstr ""
#. translators: the license subscription status.
-#: src/Licensing/Messages.php:249
+#: src/Licensing/Messages.php:235
msgid "Your license subscription is %s and will not automatically renew."
msgstr ""
-#: src/Licensing/Messages.php:263
+#: src/Licensing/Messages.php:249
msgid "pending"
msgstr ""
-#: src/Licensing/Messages.php:264
+#: src/Licensing/Messages.php:250
msgid "active"
msgstr ""
-#: src/Licensing/Messages.php:265
+#: src/Licensing/Messages.php:251
msgid "cancelled"
msgstr ""
-#: src/Licensing/Messages.php:266
+#: src/Licensing/Messages.php:252
msgid "expired"
msgstr ""
-#: src/Licensing/Messages.php:267
+#: src/Licensing/Messages.php:253
msgid "trialling"
msgstr ""
-#: src/Licensing/Messages.php:268
+#: src/Licensing/Messages.php:254
msgid "failing"
msgstr ""
-#: src/Licensing/Messages.php:269
+#: src/Licensing/Messages.php:255
msgid "completed"
msgstr ""
@@ -13922,6 +13941,20 @@ msgstr ""
msgid "Select a Download"
msgstr ""
+#: includes/blocks/build/buy-button/index.js:1
+msgid "Current Download"
+msgstr ""
+
+#: includes/blocks/build/buy-button/index.js:1
+#: includes/blocks/build/downloads/index.js:1
+msgid "No Downloads Found"
+msgstr ""
+
+#: includes/blocks/build/buy-button/index.js:1
+#: includes/blocks/build/downloads/index.js:1
+msgid "Create Your First Download"
+msgstr ""
+
#: includes/blocks/build/buy-button/index.js:1
msgid "Select a Download:"
msgstr ""
@@ -13935,6 +13968,10 @@ msgstr ""
msgid "Show Price"
msgstr ""
+#: includes/blocks/build/buy-button/index.js:1
+msgid "Enable Buy Now to process a download order without going through the full checkout."
+msgstr ""
+
#: includes/blocks/build/cart/index.js:1
msgid "Mini Cart"
msgstr ""
diff --git a/wp-content/plugins/easy-digital-downloads/readme.txt b/wp-content/plugins/easy-digital-downloads/readme.txt
index 94d61471..2d7fdc66 100644
--- a/wp-content/plugins/easy-digital-downloads/readme.txt
+++ b/wp-content/plugins/easy-digital-downloads/readme.txt
@@ -6,7 +6,7 @@ Tags: ecommerce, payments, sell, digital store, stripe
Requires at least: 5.4
Tested up to: 6.2
Requires PHP: 7.1
-Stable Tag: 3.1.1.3
+Stable Tag: 3.1.1.4.2
License: GNU Version 2 or Any Later Version
Sell your digital products with the #1 eCommerce plugin written for digital creators by digital creators.
@@ -225,6 +225,34 @@ Yes, with an Extended Pass you get access to [Recurring Payments](https://easydi
8. Checkout - Default Theme
== Changelog ==
+= 3.1.1.4.2, May 1, 2023 =
+* Security: Improved validation for edd hooks.
+
+= 3.1.1.4.1, April 21, 2023 =
+* Fix - Blocks: Harden blocks loader to verify files exist before requiring them.
+
+= 3.1.1.4, April 20, 2023 =
+* Improvement: Removed a possible unsupported PHP configuration from the email summaries.
+* Improvement: The edd_get_users_purchases function has been updated to account for customer email address changes.
+* Improvement: Reports have been updated to more accurately account for timezones and date ranges.
+* Improvement: The onboarding wizard loading was not allowing a close and exit after the first step.
+* Improvement: License key handling for 3rd party extensions has been accounted for.
+* Improvement: When using sequential order numbers, searching has been updated to account for order number.
+* Improvement - Stripe: The Payment Element has been improved to handle failed 3DS challenges.
+* Improvement - Stripe: Failed payment attempts are now more reliably accounted for.
+* Improvement - Stripe: The Payment Element billing fields can now be filtered.
+* Improvement - Stripe: The Payment Element now supports mandates, improving multi-regional payments.
+* Improvement - Stripe: The 'Card Name' field is re-introduced for regions that require it.
+* Improvement - Blocks: Better support for custom fields with the Checkout Block.
+* Improvement - Blocks: Developers can now register custom columns for the User Downloads block.
+* Improvement - Blocks: The Buy Now button can now have its behavior defined as Add to Cart or Buy Now.
+* Fix: Discounts with high value amounts were not saving correctly.
+* Fix: Bulk Editing prices was not working with WordPress 6.1+.
+* Fix: Exporting product sales was not always respecting the date range filters.
+* Fix: Exports with date queries were not always accounting for timezones accurately.
+* Fix - Blocks: Cart section headings were not always displayed when reloading the section via AJAX.
+* Dev: New custom hooks in database row transitions have been added.
+
= 3.1.1.3, March 23, 2023 =
* Improvement: The orders list table in the admin now sorts orders by date as the default.
diff --git a/wp-content/plugins/easy-digital-downloads/src/Core.php b/wp-content/plugins/easy-digital-downloads/src/Core.php
index ac07ef26..9e6c2972 100644
--- a/wp-content/plugins/easy-digital-downloads/src/Core.php
+++ b/wp-content/plugins/easy-digital-downloads/src/Core.php
@@ -19,6 +19,7 @@ class Core extends EventManagement\Subscribers {
return array(
new Admin\PassHandler\Ajax( $this->pass_handler ),
new Admin\Extensions\Extension_Manager(),
+ new Customers\Recalculations(),
);
}
diff --git a/wp-content/plugins/easy-digital-downloads/src/Customers/Recalculations.php b/wp-content/plugins/easy-digital-downloads/src/Customers/Recalculations.php
new file mode 100644
index 00000000..d7a462ff
--- /dev/null
+++ b/wp-content/plugins/easy-digital-downloads/src/Customers/Recalculations.php
@@ -0,0 +1,123 @@
+ array( 'maybe_schedule_recalculation', 10, 2 ),
+ 'edd_order_updated' => array( 'maybe_schedule_recalculation', 10, 3 ),
+ 'edd_order_deleted' => 'maybe_schedule_recalculation',
+ 'edd_recalculate_customer_deferred' => 'recalculate',
+ );
+ }
+
+ /**
+ * When an order is added, updated, or changed, the customer stats may need to be recalculated.
+ *
+ * @param int $order_id The order ID.
+ * @param array $data The array of order data.
+ * @param bool|EDD\Orders|Order $previous_order The previous order object (when updating).
+ * @return void
+ */
+ public function maybe_schedule_recalculation( $order_id, $data = array(), $previous_order = false ) {
+
+ // Recalculations do not need to run when the order item is first being added to the database if it's pending.
+ if ( 'edd_order_added' === current_action() && ( empty( $data['status'] ) || 'pending' === $data['status'] ) ) {
+ return;
+ }
+
+ // If the order item data being updated doesn't affect sales/earnings, recalculations do not need to be run.
+ if ( $previous_order instanceof EDD\Orders\Order ) {
+ $columns_affecting_stats = array( 'status', 'total', 'subtotal', 'discount', 'tax', 'rate', 'customer_id' );
+
+ // If the data being updated isn't one of these columns then we don't need to recalculate.
+ if ( empty( array_intersect( array_keys( $data ), $columns_affecting_stats ) ) ) {
+ return;
+ }
+
+ // If the data exists but matches, we don't need to recalculate.
+ if (
+ ( empty( $data['status'] ) || $previous_order->status === $data['status'] ) &&
+ ( ! isset( $data['total'] ) || $previous_order->total == $data['total'] ) &&
+ ( ! isset( $data['subtotal'] ) || $previous_order->subtotal == $data['subtotal'] ) &&
+ ( ! isset( $data['discount'] ) || $previous_order->discount == $data['discount'] ) &&
+ ( ! isset( $data['tax'] ) || $previous_order->tax == $data['tax'] ) &&
+ ( ! isset( $data['rate'] ) || $previous_order->rate == $data['rate'] ) &&
+ ( empty( $data['customer_id'] ) || $previous_order->customer_id == $data['customer_id'] )
+ ) {
+ return;
+ }
+
+ // Recalculate the previous product values if the product ID has changed.
+ if ( ! empty( $data['customer_id'] ) && $previous_order->customer_id != $data['customer_id'] ) {
+ $this->schedule_recalculation( $previous_order->customer_id );
+ }
+ }
+
+ $order = edd_get_order( $order_id );
+ if ( empty( $order->customer_id ) ) {
+ return;
+ }
+
+ $this->schedule_recalculation( $order->customer_id );
+ }
+
+ /**
+ * Recalculate the value of a customer.
+ *
+ * @since 3.1.1.4
+ * @param int $customer_id
+ * @return void
+ */
+ public function recalculate( $customer_id ) {
+ $customer = edd_get_customer( $customer_id );
+ if ( ! $customer instanceof \EDD_Customer ) {
+ return;
+ }
+ $customer->recalculate_stats();
+ }
+
+ /**
+ * Maybe schedule the customer recalculation--it will be skipped if already scheduled.
+ *
+ * @since 3.1.1.4
+ * @param int $customer_id
+ * @return void
+ */
+ private function schedule_recalculation( $customer_id ) {
+ $is_scheduled = wp_next_scheduled( 'edd_recalculate_customer_deferred', array( $customer_id ) );
+ $bypass_cron = apply_filters( 'edd_recalculate_bypass_cron', false );
+
+ // Check if the recalculation has already been scheduled.
+ if ( $is_scheduled && ! $bypass_cron ) {
+ edd_debug_log( 'Recalculation is already scheduled for customer ' . $customer_id . ' at ' . edd_date_i18n( $is_scheduled, 'datetime' ) );
+ return;
+ }
+
+ // If we are intentionally bypassing cron somehow, recalculate now and return.
+ if ( $bypass_cron || ( defined( 'EDD_DOING_TESTS' ) && EDD_DOING_TESTS ) || ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON ) ) {
+ $this->recalculate( $customer_id );
+ return;
+ }
+
+ edd_debug_log( 'Scheduling recalculation for customer ' . $customer_id );
+ wp_schedule_single_event(
+ time() + ( 5 * MINUTE_IN_SECONDS ),
+ 'edd_recalculate_customer_deferred',
+ array( $customer_id )
+ );
+ }
+}
diff --git a/wp-content/plugins/easy-digital-downloads/includes/extensions/ExtensionRegistry.php b/wp-content/plugins/easy-digital-downloads/src/Extensions/ExtensionRegistry.php
similarity index 89%
rename from wp-content/plugins/easy-digital-downloads/includes/extensions/ExtensionRegistry.php
rename to wp-content/plugins/easy-digital-downloads/src/Extensions/ExtensionRegistry.php
index c9684cd8..17f9b51e 100644
--- a/wp-content/plugins/easy-digital-downloads/includes/extensions/ExtensionRegistry.php
+++ b/wp-content/plugins/easy-digital-downloads/src/Extensions/ExtensionRegistry.php
@@ -35,7 +35,7 @@ class ExtensionRegistry extends \ArrayObject {
$this->offsetSet(
$pluginId,
- new \EDD_License( $pluginFile, $pluginName, $currentVersion, 'Easy Digital Downloads', $optionName, null, $pluginId )
+ new Handler( $pluginFile, $pluginId, $pluginName, $currentVersion, $optionName )
);
}
@@ -46,8 +46,7 @@ class ExtensionRegistry extends \ArrayObject {
* flexibility to change exactly what it returns in the future.
*
* @since 2.11.4
- *
- * @return \EDD_License[]
+ * @return Handler[]
*/
private function getExtensions() {
return $this->getArrayCopy();
@@ -64,8 +63,8 @@ class ExtensionRegistry extends \ArrayObject {
* @return int
*/
public function countLicensedExtensions() {
- $licensedExtensions = array_filter( $this->getExtensions(), function ( \EDD_License $license ) {
- return ! empty( $license->license );
+ $licensedExtensions = array_filter( $this->getExtensions(), function ( Handler $license ) {
+ return ! empty( $license->license_key );
} );
return count( $licensedExtensions );
diff --git a/wp-content/plugins/easy-digital-downloads/src/Extensions/Handler.php b/wp-content/plugins/easy-digital-downloads/src/Extensions/Handler.php
new file mode 100644
index 00000000..bbbb349f
--- /dev/null
+++ b/wp-content/plugins/easy-digital-downloads/src/Extensions/Handler.php
@@ -0,0 +1,407 @@
+file = $_file;
+ $this->item_id = absint( $_item_id );
+ $this->item_name = $_item_name;
+ $this->item_shortname = $this->get_shortname();
+ $this->version = $_version;
+ $this->edd_license = new License( $this->item_name, $_optname );
+ if ( empty( $this->edd_license->key ) || empty( $this->edd_license->license ) ) {
+ $pro_license = new License( 'pro' );
+ if ( ! empty( $pro_license->key ) ) {
+ $this->is_pro_license = true;
+ $this->edd_license = $pro_license;
+ }
+ }
+ $this->license_key = $this->edd_license->key;
+ $this->pass_manager = new Pass_Manager();
+
+ $this->hooks();
+ $this->update_global();
+ }
+
+ /**
+ * Set up hooks.
+ *
+ * @access private
+ * @return void
+ */
+ private function hooks() {
+
+ // Register settings.
+ add_filter( 'edd_settings_licenses', array( $this, 'settings' ), 1 );
+
+ // Check that license is valid once per week.
+ if ( ! $this->is_pro_license || ! $this->is_included_in_pass() ) {
+ add_action( 'edd_weekly_scheduled_events', array( $this, 'weekly_license_check' ) );
+ }
+
+ // Updater.
+ add_action( 'init', array( $this, 'auto_updater' ) );
+
+ // Display notices to admins.
+ add_action( 'admin_notices', array( $this, 'notices' ) );
+ add_action( 'in_plugin_update_message-' . plugin_basename( $this->file ), array( $this, 'plugin_row_license_missing' ), 10, 2 );
+
+ // Register plugins for beta support.
+ add_filter( 'edd_beta_enabled_extensions', array( $this, 'register_beta_support' ) );
+ }
+
+ /**
+ * Auto updater
+ *
+ * @return void
+ */
+ public function auto_updater() {
+
+ if ( ! current_user_can( 'manage_options' ) && ! edd_doing_cron() ) {
+ return;
+ }
+
+ // Fall back to the highest license key if one is not saved for this extension or there isn't a pro license.
+ if ( empty( $this->license_key ) ) {
+ if ( $this->pass_manager->highest_license_key ) {
+ $this->license_key = $this->pass_manager->highest_license_key;
+ }
+ }
+
+ // Don't check for updates if there isn't a license key.
+ if ( empty( $this->license_key ) ) {
+ return;
+ }
+
+ $args = array(
+ 'version' => $this->version,
+ 'license' => $this->license_key,
+ 'item_id' => $this->item_id,
+ 'beta' => function_exists( 'edd_extension_has_beta_support' ) && edd_extension_has_beta_support( $this->item_shortname ),
+ );
+
+ // Set up the updater.
+ new Updater(
+ $this->file,
+ $args
+ );
+ }
+
+ /**
+ * Add license field to settings, unless the extension is included in the user's pass.
+ *
+ * @param array $settings
+ * @return array
+ */
+ public function settings( $settings ) {
+ if ( $this->is_pro_license && $this->is_included_in_pass() ) {
+ return $settings;
+ }
+
+ return array_merge(
+ $settings,
+ array(
+ array(
+ 'id' => "{$this->item_shortname}_license_key",
+ 'name' => $this->item_name,
+ 'type' => 'license_key',
+ 'options' => array(
+ 'is_valid_license_option' => "{$this->item_shortname}_license_active",
+ 'item_id' => $this->item_id,
+ ),
+ ),
+ )
+ );
+ }
+
+ /**
+ * Check if license key is valid once per week
+ *
+ * @since 2.5
+ * @return void
+ */
+ public function weekly_license_check() {
+
+ // Don't fire when saving settings.
+ if ( ! empty( $_POST['edd_settings'] ) ) {
+ return;
+ }
+
+ if ( empty( $this->license_key ) ) {
+ return;
+ }
+
+ if ( ! edd_doing_cron() ) {
+ return;
+ }
+
+ // data to send in our API request
+ $api_params = array(
+ 'edd_action' => 'check_license',
+ 'license' => $this->license_key,
+ 'item_name' => urlencode( $this->item_name ),
+ 'item_id' => $this->item_id,
+ );
+
+ $api_handler = new API();
+ $license_data = $api_handler->make_request( $api_params );
+ if ( ! $license_data ) {
+ return false;
+ }
+
+ $this->pass_manager->maybe_set_pass_flag( $this->license_key, $license_data );
+ $this->edd_license->save( $license_data );
+ }
+
+ /**
+ * Admin notices for errors.
+ *
+ * @return void
+ */
+ public function notices() {
+ if ( ! $this->should_show_error_notice() ) {
+ return;
+ }
+
+ EDD()->notices->add_notice(
+ array(
+ 'id' => 'edd-missing-license',
+ 'class' => "error {$this->item_shortname}-license-error",
+ 'message' => sprintf(
+ /* translators: 1. opening anchor tag; 2. closing anchor tag */
+ __( 'You have invalid or expired license keys for Easy Digital Downloads. %1$sActivate License(s)%2$s', 'easy-digital-downloads' ),
+ '',
+ ' '
+ ),
+ 'is_dismissible' => false,
+ )
+ );
+ }
+
+ /**
+ * Displays message inline on plugin row that the license key is missing
+ *
+ * @since 2.5
+ * @return void
+ */
+ public function plugin_row_license_missing( $plugin_data, $version_info ) {
+ static $showed_imissing_key_message = array();
+
+ if ( ! $this->is_license_valid() && empty( $showed_imissing_key_message[ $this->item_shortname ] ) ) {
+ echo ' ' . esc_html__( 'Enter valid license key for automatic updates.', 'easy-digital-downloads' ) . ' ',
+ $this->slug,
+ $file,
+ in_array( $this->name, $this->get_active_plugins(), true ) ? 'active' : 'inactive'
+ );
+
+ echo '';
+ echo '';
+
+ $changelog_link = '';
+ if ( ! empty( $update_cache->response[ $this->name ]->sections->changelog ) ) {
+ $changelog_link = add_query_arg(
+ array(
+ 'edd_sl_action' => 'view_plugin_changelog',
+ 'plugin' => urlencode( $this->name ),
+ 'slug' => urlencode( $this->slug ),
+ 'TB_iframe' => 'true',
+ 'width' => 77,
+ 'height' => 911,
+ ),
+ self_admin_url( 'index.php' )
+ );
+ }
+ $update_link = add_query_arg(
+ array(
+ 'action' => 'upgrade-plugin',
+ 'plugin' => urlencode( $this->name ),
+ ),
+ self_admin_url( 'update.php' )
+ );
+
+ printf(
+ /* translators: the plugin name. */
+ esc_html__( 'There is a new version of %1$s available.', 'easy-digital-downloads' ),
+ esc_html( $plugin['Name'] )
+ );
+
+ if ( ! current_user_can( 'update_plugins' ) ) {
+ echo ' ';
+ esc_html_e( 'Contact your network administrator to install the update.', 'easy-digital-downloads' );
+ } elseif ( empty( $update_cache->response[ $this->name ]->package ) && ! empty( $changelog_link ) ) {
+ echo ' ';
+ printf(
+ /* translators: 1. opening anchor tag, do not translate 2. the new plugin version 3. closing anchor tag, do not translate. */
+ __( '%1$sView version %2$s details%3$s.', 'easy-digital-downloads' ),
+ '',
+ esc_html( $update_cache->response[ $this->name ]->new_version ),
+ ' '
+ );
+ } elseif ( ! empty( $changelog_link ) ) {
+ echo ' ';
+ printf(
+ __( '%1$sView version %2$s details%3$s or %4$supdate now%5$s.', 'easy-digital-downloads' ),
+ '',
+ esc_html( $update_cache->response[ $this->name ]->new_version ),
+ ' ',
+ '',
+ ' '
+ );
+ } else {
+ printf(
+ ' %1$s%2$s%3$s',
+ '',
+ esc_html__( 'Update now.', 'easy-digital-downloads' ),
+ ' '
+ );
+ }
+
+ do_action( "in_plugin_update_message-{$file}", $plugin, $plugin );
+
+ echo '
';
+ }
+
+ /**
+ * Gets the plugins active in a multisite network.
+ *
+ * @return array
+ */
+ private function get_active_plugins() {
+ $active_plugins = (array) get_option( 'active_plugins' );
+ $active_network_plugins = (array) get_site_option( 'active_sitewide_plugins' );
+
+ return array_merge( $active_plugins, array_keys( $active_network_plugins ) );
+ }
+
+ /**
+ * Updates information on the "View version x.x details" page with custom data.
+ *
+ * @uses api_request()
+ *
+ * @param mixed $_data
+ * @param string $_action
+ * @param object $_args
+ * @return object $_data
+ */
+ public function plugins_api_filter( $_data, $_action = '', $_args = null ) {
+
+ if ( 'plugin_information' !== $_action ) {
+ return $_data;
+ }
+
+ if ( ! isset( $_args->slug ) || ( $_args->slug !== $this->slug ) ) {
+ return $_data;
+ }
+
+ $to_send = array(
+ 'slug' => $this->slug,
+ 'is_ssl' => is_ssl(),
+ 'fields' => array(
+ 'banners' => array(),
+ 'reviews' => false,
+ 'icons' => array(),
+ ),
+ );
+
+ // Get the transient where we store the api request for this plugin for 24 hours
+ $edd_api_request_transient = $this->get_cached_version_info();
+
+ //If we have no transient-saved value, run the API, set a fresh transient with the API value, and return that value too right now.
+ if ( empty( $edd_api_request_transient ) ) {
+
+ $api_response = $this->api_request( 'plugin_information', $to_send );
+
+ // Expires in 3 hours
+ $this->set_version_info_cache( $api_response );
+
+ if ( false !== $api_response ) {
+ $_data = $api_response;
+ }
+ } else {
+ $_data = $edd_api_request_transient;
+ }
+
+ // Convert sections into an associative array, since we're getting an object, but Core expects an array.
+ if ( isset( $_data->sections ) && ! is_array( $_data->sections ) ) {
+ $_data->sections = $this->convert_object_to_array( $_data->sections );
+ }
+
+ // Convert banners into an associative array, since we're getting an object, but Core expects an array.
+ if ( isset( $_data->banners ) && ! is_array( $_data->banners ) ) {
+ $_data->banners = $this->convert_object_to_array( $_data->banners );
+ }
+
+ // Convert icons into an associative array, since we're getting an object, but Core expects an array.
+ if ( isset( $_data->icons ) && ! is_array( $_data->icons ) ) {
+ $_data->icons = $this->convert_object_to_array( $_data->icons );
+ }
+
+ // Convert contributors into an associative array, since we're getting an object, but Core expects an array.
+ if ( isset( $_data->contributors ) && ! is_array( $_data->contributors ) ) {
+ $_data->contributors = $this->convert_object_to_array( $_data->contributors );
+ }
+
+ if ( ! isset( $_data->plugin ) ) {
+ $_data->plugin = $this->name;
+ }
+
+ return $_data;
+ }
+
+ /**
+ * Convert some objects to arrays when injecting data into the update API
+ *
+ * Some data like sections, banners, and icons are expected to be an associative array, however due to the JSON
+ * decoding, they are objects. This method allows us to pass in the object and return an associative array.
+ *
+ * @since 3.6.5
+ *
+ * @param stdClass $data
+ *
+ * @return array
+ */
+ private function convert_object_to_array( $data ) {
+ if ( ! is_array( $data ) && ! is_object( $data ) ) {
+ return array();
+ }
+ $new_data = array();
+ foreach ( $data as $key => $value ) {
+ $new_data[ $key ] = is_object( $value ) ? $this->convert_object_to_array( $value ) : $value;
+ }
+
+ return $new_data;
+ }
+
+ /**
+ * Calls the API and, if successfull, returns the object delivered by the API.
+ *
+ * @uses get_bloginfo()
+ * @uses wp_remote_get()
+ * @uses is_wp_error()
+ *
+ * @param string $_action The requested action.
+ * @param array $_data Parameters for the API action.
+ * @return false|object
+ */
+ private function api_request( $_action, $_data ) {
+ $data = array_merge( $this->api_data, $_data );
+
+ if ( $data['slug'] !== $this->slug ) {
+ return false;
+ }
+
+ if ( $this->request_recently_failed() ) {
+ return false;
+ }
+
+ return $this->get_version_from_remote();
+ }
+
+ /**
+ * Determines if a request has recently failed.
+ *
+ * @since 1.9.1
+ *
+ * @return bool
+ */
+ private function request_recently_failed() {
+ $failed_request_details = get_option( $this->failed_request_cache_key );
+
+ // Request has never failed.
+ if ( empty( $failed_request_details ) || ! is_numeric( $failed_request_details ) ) {
+ return false;
+ }
+
+ /*
+ * Request previously failed, but the timeout has expired.
+ * This means we're allowed to try again.
+ */
+ if ( time() > $failed_request_details ) {
+ delete_option( $this->failed_request_cache_key );
+
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Logs a failed HTTP request for this API URL.
+ * We set a timestamp for 1 hour from now. This prevents future API requests from being
+ * made to this domain for 1 hour. Once the timestamp is in the past, API requests
+ * will be allowed again. This way if the site is down for some reason we don't bombard
+ * it with failed API requests.
+ *
+ * @see EDD_SL_Plugin_Updater::request_recently_failed
+ *
+ * @since 1.9.1
+ */
+ private function log_failed_request() {
+ update_option( $this->failed_request_cache_key, strtotime( '+1 hour' ), false );
+ }
+
+ /**
+ * If available, show the changelog for sites in a multisite install.
+ */
+ public function show_changelog() {
+
+ if ( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' !== $_REQUEST['edd_sl_action'] ) {
+ return;
+ }
+
+ if ( empty( $_REQUEST['plugin'] ) ) {
+ return;
+ }
+
+ if ( empty( $_REQUEST['slug'] ) || $this->slug !== $_REQUEST['slug'] ) {
+ return;
+ }
+
+ if ( ! current_user_can( 'update_plugins' ) ) {
+ wp_die( esc_html__( 'You do not have permission to install plugin updates', 'easy-digital-downloads' ), esc_html__( 'Error', 'easy-digital-downloads' ), array( 'response' => 403 ) );
+ }
+
+ $version_info = $this->get_repo_api_data();
+ if ( isset( $version_info->sections ) ) {
+ $sections = $this->convert_object_to_array( $version_info->sections );
+ if ( ! empty( $sections['changelog'] ) ) {
+ echo '' . wp_kses_post( $sections['changelog'] ) . '
';
+ }
+ }
+
+ exit;
+ }
+
+ /**
+ * Gets the current version information from the remote site.
+ *
+ * @return array|false
+ */
+ private function get_version_from_remote() {
+
+ $request = $this->api_handler->make_request( $this->get_api_params() );
+
+ if ( $request && isset( $request->sections ) ) {
+ $request->sections = maybe_unserialize( $request->sections );
+ } else {
+ return false;
+ }
+
+ if ( isset( $request->banners ) ) {
+ $request->banners = maybe_unserialize( $request->banners );
+ }
+
+ if ( isset( $request->icons ) ) {
+ $request->icons = maybe_unserialize( $request->icons );
+ }
+
+ if ( ! empty( $request->sections ) ) {
+ foreach ( $request->sections as $key => $section ) {
+ $request->$key = (array) $section;
+ }
+ }
+
+ return $request;
+ }
+
+ /**
+ * Get the version info from the cache, if it exists.
+ *
+ * @param string $cache_key
+ * @return object
+ */
+ public function get_cached_version_info( $cache_key = '' ) {
+
+ if ( empty( $cache_key ) ) {
+ $cache_key = $this->get_cache_key();
+ }
+
+ $cache = get_option( $cache_key );
+
+ // Cache is expired
+ if ( empty( $cache['timeout'] ) || time() > $cache['timeout'] ) {
+ return false;
+ }
+
+ // We need to turn the icons into an array, thanks to WP Core forcing these into an object at some point.
+ $cache['value'] = json_decode( $cache['value'] );
+ if ( ! empty( $cache['value']->icons ) ) {
+ $cache['value']->icons = (array) $cache['value']->icons;
+ }
+
+ return $cache['value'];
+ }
+
+ /**
+ * Adds the plugin version information to the database.
+ *
+ * @param string $value
+ * @param string $cache_key
+ */
+ public function set_version_info_cache( $value = '', $cache_key = '' ) {
+
+ if ( empty( $cache_key ) ) {
+ $cache_key = $this->get_cache_key();
+ }
+
+ $data = array(
+ 'timeout' => strtotime( '+3 hours', time() ),
+ 'value' => wp_json_encode( $value ),
+ );
+
+ update_option( $cache_key, $data, false );
+ }
+
+ /**
+ * Gets the parameters for the API request.
+ *
+ * @since 3.1.1.4
+ * @return array
+ */
+ private function get_api_params() {
+ return array(
+ 'edd_action' => 'get_version',
+ 'license' => ! empty( $this->api_data['license'] ) ? $this->api_data['license'] : '',
+ 'item_id' => isset( $this->api_data['item_id'] ) ? $this->api_data['item_id'] : false,
+ 'version' => isset( $this->api_data['version'] ) ? $this->api_data['version'] : false,
+ 'slug' => $this->slug,
+ 'beta' => $this->beta,
+ 'php_version' => phpversion(),
+ 'wp_version' => get_bloginfo( 'version' ),
+ 'easy-digital-downloads_version' => EDD_VERSION,
+ );
+ }
+
+ /**
+ * Gets the unique key (option name) for a plugin.
+ *
+ * @since 1.9.0
+ * @return string
+ */
+ private function get_cache_key() {
+ $string = $this->slug . $this->api_data['license'] . $this->beta;
+
+ return 'edd_sl_' . md5( serialize( $string ) );
+ }
+}
diff --git a/wp-content/plugins/easy-digital-downloads/src/Licensing/API.php b/wp-content/plugins/easy-digital-downloads/src/Licensing/API.php
index eaa564d6..2ea5c58c 100644
--- a/wp-content/plugins/easy-digital-downloads/src/Licensing/API.php
+++ b/wp-content/plugins/easy-digital-downloads/src/Licensing/API.php
@@ -22,6 +22,18 @@ class API {
*/
private $api_url = 'https://easydigitaldownloads.com/edd-sl-api';
+ /**
+ * The class constructor.
+ *
+ * @since 3.1.1.4
+ * @param null|string $url Optional; used only for requests to non-EDD sites.
+ */
+ public function __construct( $url = null ) {
+ if ( ! empty( $url ) ) {
+ $this->api_url = $url;
+ }
+ }
+
/**
* Gets the API URL.
*
diff --git a/wp-content/plugins/easy-digital-downloads/src/Licensing/Ajax.php b/wp-content/plugins/easy-digital-downloads/src/Licensing/Ajax.php
index dce85f8e..826f7275 100644
--- a/wp-content/plugins/easy-digital-downloads/src/Licensing/Ajax.php
+++ b/wp-content/plugins/easy-digital-downloads/src/Licensing/Ajax.php
@@ -63,15 +63,16 @@ class Ajax implements SubscriberInterface {
);
}
- $this->name = filter_input( INPUT_POST, 'item_name', FILTER_SANITIZE_SPECIAL_CHARS );
- $api_params = array(
- 'edd_action' => 'activate_license',
- 'license' => $this->license_key,
- 'item_name' => $this->name,
- 'item_id' => filter_input( INPUT_POST, 'item_id', FILTER_SANITIZE_NUMBER_INT ),
+ $this->name = filter_input( INPUT_POST, 'item_name', FILTER_SANITIZE_SPECIAL_CHARS );
+ $api_params = array(
+ 'edd_action' => 'activate_license',
+ 'license' => $this->license_key,
+ 'item_name' => $this->name,
+ 'item_id' => filter_input( INPUT_POST, 'item_id', FILTER_SANITIZE_NUMBER_INT ),
+ 'environment' => function_exists( 'wp_get_environment_type' ) ? wp_get_environment_type() : 'production',
);
-
- $api = new API();
+ $custom_api = filter_input( INPUT_POST, 'api', FILTER_SANITIZE_URL );
+ $api = new API( $custom_api );
$license_data = $api->make_request( $api_params );
if ( empty( $license_data->success ) ) {
@@ -141,11 +142,13 @@ class Ajax implements SubscriberInterface {
$this->license = new License( $this->name );
$this->license_key = $this->license->key;
$api_params = array(
- 'edd_action' => 'deactivate_license',
- 'license' => $this->license_key,
- 'item_id' => urlencode( $item_id ),
+ 'edd_action' => 'deactivate_license',
+ 'license' => $this->license_key,
+ 'item_id' => urlencode( $item_id ),
+ 'environment' => function_exists( 'wp_get_environment_type' ) ? wp_get_environment_type() : 'production',
);
- $api = new API();
+ $custom_api = filter_input( INPUT_POST, 'api', FILTER_SANITIZE_URL );
+ $api = new API( $custom_api );
$license_data = $api->make_request( $api_params );
$this->license->save( $license_data );
diff --git a/wp-content/plugins/easy-digital-downloads/src/Licensing/Messages.php b/wp-content/plugins/easy-digital-downloads/src/Licensing/Messages.php
index 81a08cec..f50c8562 100644
--- a/wp-content/plugins/easy-digital-downloads/src/Licensing/Messages.php
+++ b/wp-content/plugins/easy-digital-downloads/src/Licensing/Messages.php
@@ -186,21 +186,7 @@ class Messages {
break;
default:
- if ( ! empty( $this->license_data['license_key'] ) ) {
- $error = ! empty( $this->license->error ) ? $this->license->error : __( 'unknown_error', 'easy-digital-downloads' );
- $message = sprintf(
- /* translators: 1. the error code; 2. opening link tag; 3. closing link tag. */
- __( 'There was an error with this license key: %1$s. Please %2$scontact our support team%3$s.', 'easy-digital-downloads' ),
- '' . $error . '',
- '',
- ' '
- );
- } else {
- $message = sprintf(
- /* translators: the extension name. */
- __( 'Unlicensed: currently not receiving updates.', 'easy-digital-downloads' )
- );
- }
+ $message = __( 'Unlicensed: currently not receiving updates.', 'easy-digital-downloads' );
break;
}
diff --git a/wp-content/plugins/easy-digital-downloads/src/Licensing/Settings.php b/wp-content/plugins/easy-digital-downloads/src/Licensing/Settings.php
index a51cf5cf..20adb766 100644
--- a/wp-content/plugins/easy-digital-downloads/src/Licensing/Settings.php
+++ b/wp-content/plugins/easy-digital-downloads/src/Licensing/Settings.php
@@ -89,8 +89,12 @@ class Settings {
data-name="args['name'] ); ?>"
data-key="args['id'] ); ?>"
/>
-
args['options']['api_url'] ) ) {
+ ?>
+
diff --git a/wp-content/plugins/easy-digital-downloads/src/Licensing/Traits/Controls.php b/wp-content/plugins/easy-digital-downloads/src/Licensing/Traits/Controls.php
index 3326e4d5..fe0db9b0 100644
--- a/wp-content/plugins/easy-digital-downloads/src/Licensing/Traits/Controls.php
+++ b/wp-content/plugins/easy-digital-downloads/src/Licensing/Traits/Controls.php
@@ -207,7 +207,7 @@ trait Controls {
private function is_included_in_pass() {
$pass_manager = $this->get_pass_manager();
// All Access and lifetime passes can access everything.
- if ( $pass_manager->hasAllAccessPass() ) {
+ if ( $pass_manager->hasAllAccessPass() && empty( $this->args['options']['api_url'] ) ) {
return true;
}
// If we don't know the item ID we can't assume anything.
diff --git a/wp-content/plugins/easy-digital-downloads/vendor/composer/ClassLoader.php b/wp-content/plugins/easy-digital-downloads/vendor/composer/ClassLoader.php
index fd56bd7d..a72151c7 100644
--- a/wp-content/plugins/easy-digital-downloads/vendor/composer/ClassLoader.php
+++ b/wp-content/plugins/easy-digital-downloads/vendor/composer/ClassLoader.php
@@ -429,7 +429,8 @@ class ClassLoader
public function loadClass($class)
{
if ($file = $this->findFile($class)) {
- (self::$includeFile)($file);
+ $includeFile = self::$includeFile;
+ $includeFile($file);
return true;
}
@@ -560,7 +561,10 @@ class ClassLoader
return false;
}
- private static function initializeIncludeClosure(): void
+ /**
+ * @return void
+ */
+ private static function initializeIncludeClosure()
{
if (self::$includeFile !== null) {
return;
@@ -574,8 +578,8 @@ class ClassLoader
* @param string $file
* @return void
*/
- self::$includeFile = static function($file) {
+ self::$includeFile = \Closure::bind(static function($file) {
include $file;
- };
+ }, null, null);
}
}
diff --git a/wp-content/plugins/easy-digital-downloads/vendor/composer/InstalledVersions.php b/wp-content/plugins/easy-digital-downloads/vendor/composer/InstalledVersions.php
index c6b54af7..51e734a7 100644
--- a/wp-content/plugins/easy-digital-downloads/vendor/composer/InstalledVersions.php
+++ b/wp-content/plugins/easy-digital-downloads/vendor/composer/InstalledVersions.php
@@ -98,7 +98,7 @@ class InstalledVersions
{
foreach (self::getInstalled() as $installed) {
if (isset($installed['versions'][$packageName])) {
- return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
+ return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
}
}
@@ -119,7 +119,7 @@ class InstalledVersions
*/
public static function satisfies(VersionParser $parser, $packageName, $constraint)
{
- $constraint = $parser->parseConstraints($constraint);
+ $constraint = $parser->parseConstraints((string) $constraint);
$provided = $parser->parseConstraints(self::getVersionRanges($packageName));
return $provided->matches($constraint);
@@ -328,7 +328,9 @@ class InstalledVersions
if (isset(self::$installedByVendor[$vendorDir])) {
$installed[] = self::$installedByVendor[$vendorDir];
} elseif (is_file($vendorDir.'/composer/installed.php')) {
- $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
+ /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array