updated plugin Easy Digital Downloads
version 3.1.4
This commit is contained in:
@ -66,12 +66,14 @@ function edd_edit_customer( $args = array() ) {
|
||||
|
||||
// Make sure we don't already have this user attached to a customer
|
||||
if ( ! empty( $customer_info['user_id'] ) && false !== edd_get_customer_by( 'user_id', $customer_info['user_id'] ) ) {
|
||||
/* translators: %d: user ID */
|
||||
edd_set_error( 'edd-invalid-customer-user_id', sprintf( __( 'The User ID %d is already associated with a different customer.', 'easy-digital-downloads' ), $customer_info['user_id'] ) );
|
||||
}
|
||||
|
||||
// Make sure it's actually a user
|
||||
$user = get_user_by( 'id', $customer_info['user_id'] );
|
||||
if ( ! empty( $customer_info['user_id'] ) && false === $user ) {
|
||||
/* translators: %d: user ID */
|
||||
edd_set_error( 'edd-invalid-user_id', sprintf( __( 'The User ID %d does not exist. Please assign an existing user.', 'easy-digital-downloads' ), $customer_info['user_id'] ) );
|
||||
}
|
||||
}
|
||||
@ -98,6 +100,7 @@ function edd_edit_customer( $args = array() ) {
|
||||
if ( $user ) {
|
||||
$user_id = $user->ID;
|
||||
} else {
|
||||
/* translators: %s: user login or email address */
|
||||
edd_set_error( 'edd-invalid-user-string', sprintf( __( 'Failed to attach user. The login or email address %s was not found.', 'easy-digital-downloads' ), $customer_info['user_login'] ) );
|
||||
}
|
||||
}
|
||||
@ -259,13 +262,15 @@ function edd_add_customer_email( $args = array() ) {
|
||||
'redirect' => $redirect . '#edd_general_emails',
|
||||
);
|
||||
|
||||
$user = wp_get_current_user();
|
||||
$user_login = ! empty( $user->user_login ) ? $user->user_login : edd_get_bot_name();
|
||||
$customer_note = sprintf( __( 'Email address %s added by %s', 'easy-digital-downloads' ), $email, $user_login );
|
||||
$user = wp_get_current_user();
|
||||
$user_login = ! empty( $user->user_login ) ? $user->user_login : edd_get_bot_name();
|
||||
/* translators: 1. email address; 2. username */
|
||||
$customer_note = sprintf( __( 'Email address %1$s added by %2$s', 'easy-digital-downloads' ), $email, $user_login );
|
||||
$customer->add_note( $customer_note );
|
||||
|
||||
if ( $primary ) {
|
||||
$customer_note = sprintf( __( 'Email address %s set as primary by %s', 'easy-digital-downloads' ), $email, $user_login );
|
||||
/* translators: 1. email address; 2. username */
|
||||
$customer_note = sprintf( __( 'Email address %1$s set as primary by %2$s', 'easy-digital-downloads' ), $email, $user_login );
|
||||
$customer->add_note( $customer_note );
|
||||
}
|
||||
}
|
||||
@ -320,9 +325,10 @@ function edd_remove_customer_email() {
|
||||
'edd-message' => 'email-removed',
|
||||
)
|
||||
);
|
||||
$user = wp_get_current_user();
|
||||
$user_login = ! empty( $user->user_login ) ? $user->user_login : edd_get_bot_name();
|
||||
$customer_note = sprintf( __( 'Email address %s removed by %s', 'easy-digital-downloads' ), sanitize_email( $_GET['email'] ), $user_login );
|
||||
$user = wp_get_current_user();
|
||||
$user_login = ! empty( $user->user_login ) ? $user->user_login : edd_get_bot_name();
|
||||
/* translators: 1. email address; 2. username */
|
||||
$customer_note = sprintf( __( 'Email address %1$s removed by %2$s', 'easy-digital-downloads' ), sanitize_email( $_GET['email'] ), $user_login );
|
||||
$customer->add_note( $customer_note );
|
||||
|
||||
} else {
|
||||
|
@ -104,8 +104,9 @@ function edd_maybe_remove_menu_profile_links() {
|
||||
|
||||
if ( edd_user_pending_verification() ) {
|
||||
|
||||
if( defined( 'IS_PROFILE_PAGE' ) && true === IS_PROFILE_PAGE ) {
|
||||
$url = esc_url( edd_get_user_verification_request_url() );
|
||||
if ( defined( 'IS_PROFILE_PAGE' ) && true === IS_PROFILE_PAGE ) {
|
||||
$url = esc_url( edd_get_user_verification_request_url() );
|
||||
/* translators: link to send an email */
|
||||
$message = sprintf( __( 'Your account is pending verification. Please click the link in your email to activate your account. No email? <a href="%s">Click here</a> to send a new activation code.', 'easy-digital-downloads' ), esc_url( $url ) );
|
||||
$title = __( 'Account Pending Verification', 'easy-digital-downloads' );
|
||||
$args = array(
|
||||
|
@ -256,6 +256,7 @@ function edd_customers_list( $active_tab = 'customers' ) {
|
||||
<form id="edd-customers-filter" method="get" action="<?php echo esc_url( $action_url ); ?>">
|
||||
<?php
|
||||
$customers_table->views();
|
||||
/* translators: the active screen, eg "Search Customers" or "Search Customer Email Addresses" */
|
||||
$customers_table->search_box( sprintf( __( 'Search %s', 'easy-digital-downloads' ), $name ), 'edd-customers' );
|
||||
$customers_table->display();
|
||||
?>
|
||||
@ -560,6 +561,7 @@ function edd_customers_view( $customer = null ) {
|
||||
|
||||
<span data-key="user_id">
|
||||
<?php if ( empty( $user_login ) ) :
|
||||
/* translators: %s: user id */
|
||||
printf( __( 'User %s missing', 'easy-digital-downloads' ), '<code>' . esc_html( $user_id ) . '</code>');
|
||||
endif; ?>
|
||||
<a href="<?php echo esc_url( admin_url( 'user-edit.php?user_id=' . absint( $user_id ) ) ); ?>"><?php echo esc_html( $user_login ); ?></a>
|
||||
@ -776,7 +778,12 @@ function edd_customers_view( $customer = null ) {
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<h3><?php printf( __( 'Purchased %s', 'easy-digital-downloads' ), edd_get_label_plural() ); ?></h3>
|
||||
<h3>
|
||||
<?php
|
||||
/* translators: %s: plural downloads label */
|
||||
printf( esc_html__( 'Purchased %s', 'easy-digital-downloads' ), esc_html( edd_get_label_plural() ) );
|
||||
?>
|
||||
</h3>
|
||||
<table class="wp-list-table widefat striped customer-downloads">
|
||||
<thead>
|
||||
<tr>
|
||||
@ -796,7 +803,12 @@ function edd_customers_view( $customer = null ) {
|
||||
|
||||
<?php else: ?>
|
||||
|
||||
<tr><td class="no-items"><?php printf( __( 'No %s Found', 'easy-digital-downloads' ), edd_get_label_plural() ); ?></td></tr>
|
||||
<tr><td class="no-items">
|
||||
<?php
|
||||
/* translators: %s: plural downloads label */
|
||||
printf( esc_html__( 'No %s Found', 'easy-digital-downloads' ), esc_html( edd_get_label_plural() ) );
|
||||
?>
|
||||
</td></tr>
|
||||
|
||||
<?php endif; ?>
|
||||
</tbody>
|
||||
|
Reference in New Issue
Block a user