', - '', - '
', - '', - '
', - '' . wp_kses( $affected_subscription_events, array( 'a' => array( 'href' => array() ) ) ) . '',
- 'failed-scheduled-actions',
- '',
- ''
- );?>
-
- ', + '', + '»' + ), + ); + } - if ( $valid_for_use && 'yes' == WCS_PayPal::get_option( 'enabled' ) && ! has_action( 'admin_notices', 'WC_Subscriptions_Admin::admin_installed_notice' ) && current_user_can( 'manage_options' ) ) { + if ( isset( $_GET['wcs_paypal'] ) && 'rt_enabled' === $_GET['wcs_paypal'] ) { + $notices[] = array( + 'type' => 'confirmation', + // translators: placeholders are opening and closing strong tags. + 'text' => sprintf( esc_html__( '%1$sPayPal Reference Transactions are enabled on your account%2$s. All subscription management features are now enabled. Happy selling!', 'woocommerce-subscriptions' ), + '', + '' + ), + ); + } - if ( ! WCS_PayPal::are_credentials_set() ) { + if ( false !== get_option( 'wcs_paypal_credentials_error' ) ) { + $notices[] = array( + 'type' => 'error', + // translators: placeholders are link opening and closing tags. 1$-2$: to gateway settings, 3$-4$: support docs on woocommerce.com + 'text' => sprintf( esc_html__( 'There is a problem with PayPal. Your API credentials may be incorrect. Please update your %1$sAPI credentials%2$s. %3$sLearn more%4$s.', 'woocommerce-subscriptions' ), + '', + '', + '', + '' + ), + ); + } - $notices[] = array( - 'type' => 'warning', - // translators: placeholders are opening and closing link tags. 1$-2$: to docs on woocommerce, 3$-4$ to gateway settings on the site - 'text' => sprintf( esc_html__( 'PayPal is inactive for subscription transactions. Please %1$sset up the PayPal IPN%2$s and %3$senter your API credentials%4$s to enable PayPal for Subscriptions.', 'woocommerce-subscriptions' ), - '', - '', - '', - '' - ), - ); + if ( 'yes' == get_option( 'wcs_paypal_invalid_profile_id' ) ) { + $notices[] = array( + 'type' => 'error', + // translators: placeholders are opening and closing link tags. 1$-2$: docs on woocommerce, 3$-4$: dismiss link + 'text' => sprintf( esc_html__( 'There is a problem with PayPal. Your PayPal account is issuing out-of-date subscription IDs. %1$sLearn more%2$s. %3$sDismiss%4$s.', 'woocommerce-subscriptions' ), + '', + '', + '', + '' + ), + ); + } - } elseif ( 'woocommerce_page_wc-settings' === get_current_screen()->base && isset( $_GET['tab'] ) && in_array( $_GET['tab'], array( 'subscriptions', 'checkout' ) ) && ! WCS_PayPal::are_reference_transactions_enabled() ) { + $last_ipn_error = get_option( 'wcs_fatal_error_handling_ipn', '' ); + $failed_ipn_log_handle = 'wcs-ipn-failures'; - $notices[] = array( - 'type' => 'warning', - // translators: placeholders are opening and closing strong and link tags. 1$-2$: strong tags, 3$-8$ link to docs on woocommerce - 'text' => sprintf( esc_html__( '%1$sPayPal Reference Transactions are not enabled on your account%2$s, some subscription management features are not enabled. Please contact PayPal and request they %3$senable PayPal Reference Transactions%4$s on your account. %5$sCheck PayPal Account%6$s %3$sLearn more %7$s', 'woocommerce-subscriptions' ), - '', - '', - '', - '', - '
', - '', - '»' - ), - ); + if ( ! empty( $last_ipn_error ) && ( false == get_option( 'wcs_fatal_error_handling_ipn_ignored', false ) || isset( $_GET['wcs_reveal_your_ipn_secrets'] ) ) ) { + $notice = new WCS_Admin_Notice( 'error' ); + $notice->set_content_template( 'html-ipn-failure-notice.php', dirname( __FILE__ ) . '/../templates/', array( + 'failed_ipn_log_handle' => $failed_ipn_log_handle, + 'last_ipn_error' => $last_ipn_error, + 'log_file_url' => admin_url( sprintf( 'admin.php?page=wc-status&tab=logs&log_file=%s-%s-log', $failed_ipn_log_handle, sanitize_file_name( wp_hash( $failed_ipn_log_handle ) ) ) ), + ) ); - } + $notice->set_actions( array( + array( + 'name' => __( 'Ignore this error (not recommended)', 'woocommerce-subscriptions' ), + 'url' => wp_nonce_url( add_query_arg( 'wcs_ipn_error_notice', 'ignore' ), 'wcs_ipn_error_notice', '_wcsnonce' ), + 'class' => 'button', + ), + array( + 'name' => __( 'Open a ticket', 'woocommerce-subscriptions' ), + 'url' => 'https://woocommerce.com/my-account/marketplace-ticket-form/', + 'class' => 'button button-primary', + ), + ) ); - if ( isset( $_GET['wcs_paypal'] ) && 'rt_enabled' === $_GET['wcs_paypal'] ) { - $notices[] = array( - 'type' => 'confirmation', - // translators: placeholders are opening and closing strong tags. - 'text' => sprintf( esc_html__( '%1$sPayPal Reference Transactions are enabled on your account%2$s. All subscription management features are now enabled. Happy selling!', 'woocommerce-subscriptions' ), - '', - '' - ), - ); - } - - if ( false !== get_option( 'wcs_paypal_credentials_error' ) ) { - $notices[] = array( - 'type' => 'error', - // translators: placeholders are link opening and closing tags. 1$-2$: to gateway settings, 3$-4$: support docs on woocommerce.com - 'text' => sprintf( esc_html__( 'There is a problem with PayPal. Your API credentials may be incorrect. Please update your %1$sAPI credentials%2$s. %3$sLearn more%4$s.', 'woocommerce-subscriptions' ), - '', - '', - '', - '' - ), - ); - } - - if ( 'yes' == get_option( 'wcs_paypal_invalid_profile_id' ) ) { - $notices[] = array( - 'type' => 'error', - // translators: placeholders are opening and closing link tags. 1$-2$: docs on woocommerce, 3$-4$: dismiss link - 'text' => sprintf( esc_html__( 'There is a problem with PayPal. Your PayPal account is issuing out-of-date subscription IDs. %1$sLearn more%2$s. %3$sDismiss%4$s.', 'woocommerce-subscriptions' ), - '', - '', - '', - '' - ), - ); - } - - $last_ipn_error = get_option( 'wcs_fatal_error_handling_ipn', '' ); - $failed_ipn_log_handle = 'wcs-ipn-failures'; - - if ( ! empty( $last_ipn_error ) && ( false == get_option( 'wcs_fatal_error_handling_ipn_ignored', false ) || isset( $_GET['wcs_reveal_your_ipn_secrets'] ) ) ) { - $notices[] = array( - 'type' => 'error', - 'text' => sprintf( esc_html__( '%sA fatal error has occurred when processing a recent subscription payment with PayPal. Please %sopen a new ticket at WooCommerce Support%s immediately to get this resolved.%sIn order to get the quickest possible response please attach a %sTemporary Admin Login%s and a copy of your PHP error logs to your support ticket.%sLast recorded error: %sTo see the full error, view the %s log file from the %sWooCommerce logs screen.%s', 'woocommerce-subscriptions' ), - '
',
- '',
- '',
- '
',
- '',
- '',
- '
' . esc_html( $last_ipn_error ) . '',
- '' . $failed_ipn_log_handle . '',
- '',
- '
', + '', + '' + );?> +
+', + '' + );?> +
+ +
+
+' . esc_html( $failed_ipn_log_handle ) . '', + '', + '' + );?> +
+ + diff --git a/includes/gateways/paypal/includes/wcs-paypal-functions.php b/includes/gateways/paypal/includes/wcs-paypal-functions.php old mode 100755 new mode 100644 diff --git a/includes/interfaces/interface-wcs-cache-updater.php b/includes/interfaces/interface-wcs-cache-updater.php old mode 100755 new mode 100644 diff --git a/includes/legacy/class-wc-product-subscription-legacy.php b/includes/legacy/class-wc-product-subscription-legacy.php old mode 100755 new mode 100644 diff --git a/includes/legacy/class-wc-product-subscription-variation-legacy.php b/includes/legacy/class-wc-product-subscription-variation-legacy.php old mode 100755 new mode 100644 diff --git a/includes/legacy/class-wc-product-variable-subscription-legacy.php b/includes/legacy/class-wc-product-variable-subscription-legacy.php old mode 100755 new mode 100644 diff --git a/includes/legacy/class-wc-subscription-legacy.php b/includes/legacy/class-wc-subscription-legacy.php old mode 100755 new mode 100644 index 5392c61..9a4e4f7 --- a/includes/legacy/class-wc-subscription-legacy.php +++ b/includes/legacy/class-wc-subscription-legacy.php @@ -425,23 +425,26 @@ class WC_Subscription_Legacy extends WC_Subscription { $sign_up_fee = $original_order_item['line_total'] / $original_order_item['qty']; } elseif ( isset( $original_order_item['item_meta']['_synced_sign_up_fee'] ) ) { $sign_up_fee = $original_order_item['item_meta']['_synced_sign_up_fee'] / $original_order_item['qty']; + + // The synced sign up fee meta contains the raw product sign up fee, if the subscription totals are inclusive of tax, we need to adjust the synced sign up fee to match tax inclusivity. + if ( $this->get_prices_include_tax() ) { + $line_item_total = $original_order_item['line_total'] + $original_order_item['line_tax']; + $signup_fee_portion = $sign_up_fee / $line_item_total; + $sign_up_fee = $original_order_item['line_total'] * $signup_fee_portion; + } } else { // Sign-up fee is any amount on top of recurring amount $sign_up_fee = max( $original_order_item['line_total'] / $original_order_item['qty'] - $line_item['line_total'] / $line_item['qty'], 0 ); } - if ( ! empty( $original_order_item ) && ! empty( $sign_up_fee ) ) { + // If prices don't inc tax, ensure that the sign up fee amount includes the tax. + if ( 'inclusive_of_tax' === $tax_inclusive_or_exclusive && ! empty( $original_order_item ) && ! empty( $sign_up_fee ) ) { $sign_up_fee_proportion = $sign_up_fee / ( $original_order_item['line_total'] / $original_order_item['qty'] ); - $sign_up_fee_tax = wc_round_tax_total( $original_order_item['line_tax'] * $sign_up_fee_proportion ); + $sign_up_fee_tax = $original_order_item['line_tax'] * $sign_up_fee_proportion; - // If prices don't inc tax, ensure that the sign up fee amount includes the tax. - if ( 'inclusive_of_tax' === $tax_inclusive_or_exclusive && ! $this->get_prices_include_tax() ) { - $sign_up_fee += $sign_up_fee_tax; - // If prices inc tax and the request is for prices exclusive of tax, remove the taxes. - } elseif ( 'inclusive_of_tax' !== $tax_inclusive_or_exclusive && $this->get_prices_include_tax() ) { - $sign_up_fee -= $sign_up_fee_tax; - } + $sign_up_fee += $sign_up_fee_tax; + $sign_up_fee = wc_format_decimal( $sign_up_fee, wc_get_price_decimals() ); } } diff --git a/includes/legacy/class-wcs-array-property-post-meta-black-magic.php b/includes/legacy/class-wcs-array-property-post-meta-black-magic.php old mode 100755 new mode 100644 diff --git a/includes/legacy/class-wcs-product-legacy.php b/includes/legacy/class-wcs-product-legacy.php old mode 100755 new mode 100644 index 80ff38f..d762201 --- a/includes/legacy/class-wcs-product-legacy.php +++ b/includes/legacy/class-wcs-product-legacy.php @@ -39,4 +39,3 @@ class WCS_Product_Legacy { } } -WCS_Product_Legacy::init(); diff --git a/includes/libraries/action-scheduler/.github/release-drafter.yml b/includes/libraries/action-scheduler/.github/release-drafter.yml new file mode 100644 index 0000000..702a690 --- /dev/null +++ b/includes/libraries/action-scheduler/.github/release-drafter.yml @@ -0,0 +1,15 @@ +template: | + ## next release – date + + + + $CHANGES + + **Added** + **Changed** + **Deprecated** + **Removed** + **Fixed** + **Security** + +change-template: '* $TITLE (PR #$NUMBER)' diff --git a/includes/libraries/action-scheduler/action-scheduler.php b/includes/libraries/action-scheduler/action-scheduler.php old mode 100755 new mode 100644 index 96595cd..28b37f1 --- a/includes/libraries/action-scheduler/action-scheduler.php +++ b/includes/libraries/action-scheduler/action-scheduler.php @@ -5,7 +5,7 @@ * Description: A robust scheduling library for use in WordPress plugins. * Author: Prospress * Author URI: http://prospress.com/ - * Version: 2.0.0 + * Version: 2.1.1 * License: GPLv3 * * Copyright 2018 Prospress, Inc. (email : freedoms@prospress.com) @@ -25,21 +25,21 @@ * */ -if ( ! function_exists( 'action_scheduler_register_2_dot_0_dot_0' ) ) { +if ( ! function_exists( 'action_scheduler_register_2_dot_1_dot_1' ) ) { if ( ! class_exists( 'ActionScheduler_Versions' ) ) { require_once( 'classes/ActionScheduler_Versions.php' ); add_action( 'plugins_loaded', array( 'ActionScheduler_Versions', 'initialize_latest_version' ), 1, 0 ); } - add_action( 'plugins_loaded', 'action_scheduler_register_2_dot_0_dot_0', 0, 0 ); + add_action( 'plugins_loaded', 'action_scheduler_register_2_dot_1_dot_1', 0, 0 ); - function action_scheduler_register_2_dot_0_dot_0() { + function action_scheduler_register_2_dot_1_dot_1() { $versions = ActionScheduler_Versions::instance(); - $versions->register( '2.0.0', 'action_scheduler_initialize_2_dot_0_dot_0' ); + $versions->register( '2.1.1', 'action_scheduler_initialize_2_dot_1_dot_1' ); } - function action_scheduler_initialize_2_dot_0_dot_0() { + function action_scheduler_initialize_2_dot_1_dot_1() { require_once( 'classes/ActionScheduler.php' ); ActionScheduler::init( __FILE__ ); } diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler.php b/includes/libraries/action-scheduler/classes/ActionScheduler.php old mode 100755 new mode 100644 index 5e1ad36..51af2b5 --- a/includes/libraries/action-scheduler/classes/ActionScheduler.php +++ b/includes/libraries/action-scheduler/classes/ActionScheduler.php @@ -59,7 +59,9 @@ abstract class ActionScheduler { public static function autoload( $class ) { $d = DIRECTORY_SEPARATOR; - if ( strpos( $class, 'ActionScheduler' ) === 0 ) { + if ( 'Deprecated' === substr( $class, -10 ) ) { + $dir = self::plugin_path('deprecated'.$d); + } elseif ( strpos( $class, 'ActionScheduler' ) === 0 ) { $dir = self::plugin_path('classes'.$d); } elseif ( strpos( $class, 'CronExpression' ) === 0 ) { $dir = self::plugin_path('lib'.$d.'cron-expression'.$d); @@ -67,8 +69,8 @@ abstract class ActionScheduler { return; } - if ( file_exists( $dir.$class.'.php' ) ) { - include( $dir.$class.'.php' ); + if ( file_exists( "{$dir}{$class}.php" ) ) { + include( "{$dir}{$class}.php" ); return; } } @@ -97,6 +99,10 @@ abstract class ActionScheduler { require_once( self::plugin_path('functions.php') ); + if ( apply_filters( 'action_scheduler_load_deprecated_functions', true ) ) { + require_once( self::plugin_path('deprecated/functions.php') ); + } + if ( defined( 'WP_CLI' ) && WP_CLI ) { WP_CLI::add_command( 'action-scheduler', 'ActionScheduler_WPCLI_Scheduler_command' ); } diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_Abstract_ListTable.php b/includes/libraries/action-scheduler/classes/ActionScheduler_Abstract_ListTable.php old mode 100755 new mode 100644 index de47067..6af17b9 --- a/includes/libraries/action-scheduler/classes/ActionScheduler_Abstract_ListTable.php +++ b/includes/libraries/action-scheduler/classes/ActionScheduler_Abstract_ListTable.php @@ -275,7 +275,7 @@ abstract class ActionScheduler_Abstract_ListTable extends WP_List_Table { $valid_sortable_columns = array_values( $this->sort_by ); if ( ! empty( $_GET['orderby'] ) && in_array( $_GET['orderby'], $valid_sortable_columns ) ) { - $orderby = wc_clean( $_GET['orderby'] ); + $orderby = sanitize_text_field( $_GET['orderby'] ); } else { $orderby = $valid_sortable_columns[0]; } diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_Abstract_QueueRunner.php b/includes/libraries/action-scheduler/classes/ActionScheduler_Abstract_QueueRunner.php old mode 100755 new mode 100644 index 21f9ee0..5259797 --- a/includes/libraries/action-scheduler/classes/ActionScheduler_Abstract_QueueRunner.php +++ b/includes/libraries/action-scheduler/classes/ActionScheduler_Abstract_QueueRunner.php @@ -3,7 +3,7 @@ /** * Abstract class with common Queue Cleaner functionality. */ -abstract class ActionScheduler_Abstract_QueueRunner { +abstract class ActionScheduler_Abstract_QueueRunner extends ActionScheduler_Abstract_QueueRunner_Deprecated { /** @var ActionScheduler_QueueCleaner */ protected $cleaner; @@ -14,6 +14,16 @@ abstract class ActionScheduler_Abstract_QueueRunner { /** @var ActionScheduler_Store */ protected $store; + /** + * The created time. + * + * Represents when the queue runner was constructed and used when calculating how long a PHP request has been running. + * For this reason it should be as close as possible to the PHP request start time. + * + * @var int + */ + private $created_time; + /** * ActionScheduler_Abstract_QueueRunner constructor. * @@ -22,6 +32,9 @@ abstract class ActionScheduler_Abstract_QueueRunner { * @param ActionScheduler_QueueCleaner $cleaner */ public function __construct( ActionScheduler_Store $store = null, ActionScheduler_FatalErrorMonitor $monitor = null, ActionScheduler_QueueCleaner $cleaner = null ) { + + $this->created_time = microtime( true ); + $this->store = $store ? $store : ActionScheduler_Store::instance(); $this->monitor = $monitor ? $monitor : new ActionScheduler_FatalErrorMonitor( $this->store ); $this->cleaner = $cleaner ? $cleaner : new ActionScheduler_QueueCleaner( $this->store ); @@ -35,6 +48,12 @@ abstract class ActionScheduler_Abstract_QueueRunner { public function process_action( $action_id ) { try { do_action( 'action_scheduler_before_execute', $action_id ); + + if ( ActionScheduler_Store::STATUS_PENDING !== $this->store->get_status( $action_id ) ) { + do_action( 'action_scheduler_execution_ignored', $action_id ); + return; + } + $action = $this->store->fetch_action( $action_id ); $this->store->log_execution( $action_id ); $action->execute(); @@ -79,6 +98,114 @@ abstract class ActionScheduler_Abstract_QueueRunner { return apply_filters( 'action_scheduler_queue_runner_concurrent_batches', 5 ); } + /** + * Get the maximum number of seconds a batch can run for. + * + * @return int The number of seconds. + */ + protected function get_time_limit() { + + $time_limit = 30; + + // Apply deprecated filter from deprecated get_maximum_execution_time() method + if ( has_filter( 'action_scheduler_maximum_execution_time' ) ) { + _deprecated_function( 'action_scheduler_maximum_execution_time', '2.1.1', 'action_scheduler_queue_runner_time_limit' ); + $time_limit = apply_filters( 'action_scheduler_maximum_execution_time', $time_limit ); + } + + return absint( apply_filters( 'action_scheduler_queue_runner_time_limit', $time_limit ) ); + } + + /** + * Get the number of seconds the process has been running. + * + * @return int The number of seconds. + */ + protected function get_execution_time() { + $execution_time = microtime( true ) - $this->created_time; + + // Get the CPU time if the hosting environment uses it rather than wall-clock time to calculate a process's execution time. + if ( function_exists( 'getrusage' ) && apply_filters( 'action_scheduler_use_cpu_execution_time', defined( 'PANTHEON_ENVIRONMENT' ) ) ) { + $resource_usages = getrusage(); + + if ( isset( $resource_usages['ru_stime.tv_usec'], $resource_usages['ru_stime.tv_usec'] ) ) { + $execution_time = $resource_usages['ru_stime.tv_sec'] + ( $resource_usages['ru_stime.tv_usec'] / 1000000 ); + } + } + + return $execution_time; + } + + /** + * Check if the host's max execution time is (likely) to be exceeded if processing more actions. + * + * @param int $processed_actions The number of actions processed so far - used to determine the likelihood of exceeding the time limit if processing another action + * @return bool + */ + protected function time_likely_to_be_exceeded( $processed_actions ) { + + $execution_time = $this->get_execution_time(); + $max_execution_time = $this->get_time_limit(); + $time_per_action = $execution_time / $processed_actions; + $estimated_time = $execution_time + ( $time_per_action * 3 ); + $likely_to_be_exceeded = $estimated_time > $max_execution_time; + + return apply_filters( 'action_scheduler_maximum_execution_time_likely_to_be_exceeded', $likely_to_be_exceeded, $this, $processed_actions, $execution_time, $max_execution_time ); + } + + /** + * Get memory limit + * + * Based on WP_Background_Process::get_memory_limit() + * + * @return int + */ + protected function get_memory_limit() { + if ( function_exists( 'ini_get' ) ) { + $memory_limit = ini_get( 'memory_limit' ); + } else { + $memory_limit = '128M'; // Sensible default, and minimum required by WooCommerce + } + + if ( ! $memory_limit || -1 === $memory_limit || '-1' === $memory_limit ) { + // Unlimited, set to 32GB. + $memory_limit = '32G'; + } + + return ActionScheduler_Compatibility::convert_hr_to_bytes( $memory_limit ); + } + + /** + * Memory exceeded + * + * Ensures the batch process never exceeds 90% of the maximum WordPress memory. + * + * Based on WP_Background_Process::memory_exceeded() + * + * @return bool + */ + protected function memory_exceeded() { + + $memory_limit = $this->get_memory_limit() * 0.90; + $current_memory = memory_get_usage( true ); + $memory_exceeded = $current_memory >= $memory_limit; + + return apply_filters( 'action_scheduler_memory_exceeded', $memory_exceeded, $this ); + } + + /** + * See if the batch limits have been exceeded, which is when memory usage is almost at + * the maximum limit, or the time to process more actions will exceed the max time limit. + * + * Based on WC_Background_Process::batch_limits_exceeded() + * + * @param int $processed_actions The number of actions processed so far - used to determine the likelihood of exceeding the time limit if processing another action + * @return bool + */ + protected function batch_limits_exceeded( $processed_actions ) { + return $this->memory_exceeded() || $this->time_likely_to_be_exceeded( $processed_actions ); + } + /** * Process actions in the queue. * diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_Action.php b/includes/libraries/action-scheduler/classes/ActionScheduler_Action.php old mode 100755 new mode 100644 diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_ActionClaim.php b/includes/libraries/action-scheduler/classes/ActionScheduler_ActionClaim.php old mode 100755 new mode 100644 diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_ActionFactory.php b/includes/libraries/action-scheduler/classes/ActionScheduler_ActionFactory.php old mode 100755 new mode 100644 diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_AdminView.php b/includes/libraries/action-scheduler/classes/ActionScheduler_AdminView.php old mode 100755 new mode 100644 diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_CanceledAction.php b/includes/libraries/action-scheduler/classes/ActionScheduler_CanceledAction.php old mode 100755 new mode 100644 diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_Compatibility.php b/includes/libraries/action-scheduler/classes/ActionScheduler_Compatibility.php new file mode 100644 index 0000000..c06e5a4 --- /dev/null +++ b/includes/libraries/action-scheduler/classes/ActionScheduler_Compatibility.php @@ -0,0 +1,99 @@ + $wp_max_limit_int && $filtered_limit_int > $current_limit_int ) ) { + if ( false !== @ini_set( 'memory_limit', $filtered_limit ) ) { + return $filtered_limit; + } else { + return false; + } + } elseif ( -1 === $wp_max_limit_int || $wp_max_limit_int > $current_limit_int ) { + if ( false !== @ini_set( 'memory_limit', $wp_max_limit ) ) { + return $wp_max_limit; + } else { + return false; + } + } + return false; + } + + /** + * Attempts to raise the PHP timeout for time intensive processes. + * + * Only allows raising the existing limit and prevents lowering it. Wrapper for wc_set_time_limit(), when available. + * + * @param int The time limit in seconds. + */ + public static function raise_time_limit( $limit = 0 ) { + if ( $limit < ini_get( 'max_execution_time' ) ) { + return; + } + + if ( function_exists( 'wc_set_time_limit' ) ) { + wc_set_time_limit( $limit ); + } elseif ( function_exists( 'set_time_limit' ) && false === strpos( ini_get( 'disable_functions' ), 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) { + @set_time_limit( $limit ); + } + } +} diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_CronSchedule.php b/includes/libraries/action-scheduler/classes/ActionScheduler_CronSchedule.php old mode 100755 new mode 100644 diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_DateTime.php b/includes/libraries/action-scheduler/classes/ActionScheduler_DateTime.php old mode 100755 new mode 100644 index 13d8c27..5e8743c --- a/includes/libraries/action-scheduler/classes/ActionScheduler_DateTime.php +++ b/includes/libraries/action-scheduler/classes/ActionScheduler_DateTime.php @@ -7,6 +7,16 @@ */ class ActionScheduler_DateTime extends DateTime { + /** + * UTC offset. + * + * Only used when a timezone is not set. When a timezone string is + * used, this will be set to 0. + * + * @var int + */ + protected $utcOffset = 0; + /** * Get the unix timestamp of the current object. * @@ -17,4 +27,50 @@ class ActionScheduler_DateTime extends DateTime { public function getTimestamp() { return method_exists( 'DateTime', 'getTimestamp' ) ? parent::getTimestamp() : $this->format( 'U' ); } + + /** + * Set the UTC offset. + * + * This represents a fixed offset instead of a timezone setting. + * + * @param $offset + */ + public function setUtcOffset( $offset ) { + $this->utcOffset = intval( $offset ); + } + + /** + * Returns the timezone offset. + * + * @return int + * @link http://php.net/manual/en/datetime.getoffset.php + */ + public function getOffset() { + return $this->utcOffset ? $this->utcOffset : parent::getOffset(); + } + + /** + * Set the TimeZone associated with the DateTime + * + * @param DateTimeZone $timezone + * + * @return static + * @link http://php.net/manual/en/datetime.settimezone.php + */ + public function setTimezone( $timezone ) { + $this->utcOffset = 0; + parent::setTimezone( $timezone ); + + return $this; + } + + /** + * Get the timestamp with the WordPress timezone offset added or subtracted. + * + * @since 3.0.0 + * @return int + */ + public function getOffsetTimestamp() { + return $this->getTimestamp() + $this->getOffset(); + } } diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_Exception.php b/includes/libraries/action-scheduler/classes/ActionScheduler_Exception.php new file mode 100644 index 0000000..9ec713f --- /dev/null +++ b/includes/libraries/action-scheduler/classes/ActionScheduler_Exception.php @@ -0,0 +1,11 @@ +claim = NULL; $this->untrack_action(); remove_action( 'shutdown', array( $this, 'handle_unexpected_shutdown' ) ); - remove_action( 'action_scheduler_before_execute', array( $this, 'track_current_action' ), 0, 1 ); - remove_action( 'action_scheduler_after_execute', array( $this, 'untrack_action' ), 0, 0 ); - remove_action( 'action_scheduler_failed_execution', array( $this, 'untrack_action' ), 0, 0 ); + remove_action( 'action_scheduler_before_execute', array( $this, 'track_current_action' ), 0 ); + remove_action( 'action_scheduler_after_execute', array( $this, 'untrack_action' ), 0 ); + remove_action( 'action_scheduler_execution_ignored', array( $this, 'untrack_action' ), 0 ); + remove_action( 'action_scheduler_failed_execution', array( $this, 'untrack_action' ), 0 ); } public function track_current_action( $action_id ) { @@ -51,4 +53,3 @@ class ActionScheduler_FatalErrorMonitor { } } } - \ No newline at end of file diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_FinishedAction.php b/includes/libraries/action-scheduler/classes/ActionScheduler_FinishedAction.php old mode 100755 new mode 100644 diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_IntervalSchedule.php b/includes/libraries/action-scheduler/classes/ActionScheduler_IntervalSchedule.php old mode 100755 new mode 100644 diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_InvalidActionException.php b/includes/libraries/action-scheduler/classes/ActionScheduler_InvalidActionException.php new file mode 100644 index 0000000..a7decdc --- /dev/null +++ b/includes/libraries/action-scheduler/classes/ActionScheduler_InvalidActionException.php @@ -0,0 +1,28 @@ +'; foreach ( $row['args'] as $key => $value ) { - $row_html .= sprintf( '%s => %s%s => %s' . self::$active_version . '',
'' . WC_Subscriptions::$version . '',
- '', ''
+ '', '',
+ '', ''
) );
$admin_notice->display();
@@ -834,19 +826,35 @@ class WC_Subscriptions_Upgrader {
}
}
+ /**
+ * Handles the WC 3.5.0 upgrade routine that moves customer IDs from post metadata to the 'post_author' column.
+ *
+ * @since 2.4.0
+ */
+ public static function maybe_update_subscription_post_author() {
+ if ( version_compare( WC()->version, '3.5.0', '<' ) ) {
+ return;
+ }
+
+ // If WC hasn't run the update routine yet we can hook into theirs to update subscriptions, otherwise we'll need to schedule our own update.
+ if ( version_compare( get_option( 'woocommerce_db_version' ), '3.5.0', '<' ) ) {
+ self::$background_updaters['2.4']['subscription_post_author']->hook_into_wc_350_update();
+ } else if ( version_compare( self::$active_version, '2.4.0', '<' ) ) {
+ self::$background_updaters['2.4']['subscription_post_author']->schedule_repair();
+ }
+ }
+
/**
* Load and initialise the background updaters.
*
- * @since 2.3.0
+ * @since 2.4.0
*/
public static function initialise_background_updaters() {
$logger = new WC_logger();
-
- include_once( dirname( __FILE__ ) . '/class-wcs-repair-suspended-paypal-subscriptions.php' );
- include_once( dirname( __FILE__ ) . '/class-wcs-repair-subscription-address-indexes.php' );
-
self::$background_updaters['2.3']['suspended_paypal_repair'] = new WCS_Repair_Suspended_PayPal_Subscriptions( $logger );
self::$background_updaters['2.3']['address_indexes_repair'] = new WCS_Repair_Subscription_Address_Indexes( $logger );
+ self::$background_updaters['2.4']['start_date_metadata'] = new WCS_Repair_Start_Date_Metadata( $logger );
+ self::$background_updaters['2.4']['subscription_post_author'] = new WCS_Upgrade_Subscription_Post_Author( $logger );
// Init the updaters
foreach ( self::$background_updaters as $version => $updaters ) {
@@ -908,4 +916,3 @@ class WC_Subscriptions_Upgrader {
return WCS_Upgrade_1_4::is_user_upgraded( $user_id );
}
}
-add_action( 'after_setup_theme', 'WC_Subscriptions_Upgrader::init', 11 );
diff --git a/includes/upgrades/class-wcs-repair-2-0-2.php b/includes/upgrades/class-wcs-repair-2-0-2.php
old mode 100755
new mode 100644
diff --git a/includes/upgrades/class-wcs-repair-2-0.php b/includes/upgrades/class-wcs-repair-2-0.php
old mode 100755
new mode 100644
index e236296..3892a08
--- a/includes/upgrades/class-wcs-repair-2-0.php
+++ b/includes/upgrades/class-wcs-repair-2-0.php
@@ -595,7 +595,7 @@ class WCS_Repair_2_0 {
WCS_Upgrade_Logger::add( sprintf( '-- For order %d: Repairing date type "%s" from action scheduler...', $subscription['order_id'], $type ) );
WCS_Upgrade_Logger::add( '-- This is the arguments: ' . PHP_EOL . print_r( array( $action_args, 'hook' => $type ), true ) . PHP_EOL );
- $next_date_timestamp = wc_next_scheduled_action( $type, $action_args );
+ $next_date_timestamp = as_next_scheduled_action( $type, $action_args );
if ( false === $next_date_timestamp ) {
// set it to 0 as default
diff --git a/includes/upgrades/class-wcs-repair-start-date-metadata.php b/includes/upgrades/class-wcs-repair-start-date-metadata.php
new file mode 100644
index 0000000..42af3d0
--- /dev/null
+++ b/includes/upgrades/class-wcs-repair-start-date-metadata.php
@@ -0,0 +1,70 @@
+scheduled_hook = 'wcs_add_start_date_metadata';
+ $this->log_handle = 'wcs-add-start-date-metadata';
+ $this->logger = $logger;
+ }
+
+ /**
+ * Update a subscription, saving its start date as metadata.
+ *
+ * @since 2.4.0
+ */
+ protected function update_item( $subscription_id ) {
+ try {
+ $subscription = wcs_get_subscription( $subscription_id );
+
+ if ( false === $subscription ) {
+ throw new Exception( 'Failed to instantiate subscription object' );
+ }
+
+ // Saving the subscription is enough to save the start date.
+ $subscription->save();
+
+ $this->log( sprintf( 'Subscription ID %d start date metadata added.', $subscription_id ) );
+ } catch ( Exception $e ) {
+ $this->log( sprintf( '--- Exception caught adding start date metadata to subscription %d - exception message: %s ---', $subscription_id, $e->getMessage() ) );
+ }
+ }
+
+ /**
+ * Get a batch of subscriptions to repair.
+ *
+ * @since 2.4.0
+ * @return array A list of subscription ids which may need to be repaired.
+ */
+ protected function get_items_to_update() {
+ global $wpdb;
+
+ return $wpdb->get_col(
+ "SELECT ID FROM {$wpdb->posts} WHERE post_type = 'shop_subscription'
+ AND post_status NOT IN ( 'trash', 'auto-draft' )
+ AND ID NOT IN ( SELECT post_id FROM {$wpdb->postmeta} WHERE meta_key = '_schedule_start' )
+ LIMIT 20"
+ );
+ }
+
+}
diff --git a/includes/upgrades/class-wcs-repair-subscription-address-indexes.php b/includes/upgrades/class-wcs-repair-subscription-address-indexes.php
old mode 100755
new mode 100644
index 8c21059..5527026
--- a/includes/upgrades/class-wcs-repair-subscription-address-indexes.php
+++ b/includes/upgrades/class-wcs-repair-subscription-address-indexes.php
@@ -21,10 +21,11 @@ class WCS_Repair_Subscription_Address_Indexes extends WCS_Background_Upgrader {
/**
* Constructor
*
- * @param WC_Logger $logger The WC_Logger instance.
+ * @param WC_Logger_Interface $logger The WC_Logger instance.
+ *
* @since 2.3.0
*/
- public function __construct( WC_Logger $logger ) {
+ public function __construct( WC_Logger_Interface $logger ) {
$this->scheduled_hook = 'wcs_add_missing_subscription_address_indexes';
$this->log_handle = 'wcs-add-subscription-address-indexes';
$this->logger = $logger;
diff --git a/includes/upgrades/class-wcs-repair-suspended-paypal-subscriptions.php b/includes/upgrades/class-wcs-repair-suspended-paypal-subscriptions.php
old mode 100755
new mode 100644
index e9b1631..a3f6255
--- a/includes/upgrades/class-wcs-repair-suspended-paypal-subscriptions.php
+++ b/includes/upgrades/class-wcs-repair-suspended-paypal-subscriptions.php
@@ -24,11 +24,11 @@ class WCS_Repair_Suspended_PayPal_Subscriptions extends WCS_Background_Upgrader
/**
* Constructor.
*
- * @param WC_Logger $logger The WC Logger instance.
+ * @param WC_Logger_Interface $logger The WC Logger instance.
*
* @since 2.3.0
*/
- public function __construct( WC_Logger $logger ) {
+ public function __construct( WC_Logger_Interface $logger ) {
$this->scheduled_hook = 'wcs_repair_subscriptions_suspended_paypal_not_woocommerce';
$this->log_handle = 'wcs-upgrade-subscriptions-paypal-suspended';
$this->logger = $logger;
diff --git a/includes/upgrades/class-wcs-upgrade-1-2.php b/includes/upgrades/class-wcs-upgrade-1-2.php
old mode 100755
new mode 100644
index 84829fd..643d8fc
--- a/includes/upgrades/class-wcs-upgrade-1-2.php
+++ b/includes/upgrades/class-wcs-upgrade-1-2.php
@@ -22,7 +22,7 @@ if ( ! defined( 'ABSPATH' ) ) {
class WCS_Upgrade_1_2 {
- public function init() {
+ public static function init() {
global $wpdb;
// Get IDs only and use a direct DB query for efficiency
@@ -276,4 +276,3 @@ class WCS_Upgrade_1_2 {
}
}
}
-WCS_Upgrade_1_2::init();
diff --git a/includes/upgrades/class-wcs-upgrade-1-3.php b/includes/upgrades/class-wcs-upgrade-1-3.php
old mode 100755
new mode 100644
index b3036dd..7c25bc6
--- a/includes/upgrades/class-wcs-upgrade-1-3.php
+++ b/includes/upgrades/class-wcs-upgrade-1-3.php
@@ -17,7 +17,7 @@ if ( ! defined( 'ABSPATH' ) ) {
class WCS_Upgrade_1_3 {
- public function init() {
+ public static function init() {
global $wpdb;
// Change transient timeout entries to be a vanilla option
@@ -36,4 +36,3 @@ class WCS_Upgrade_1_3 {
OR option_name LIKE '_transient_block_scheduled_subscription_payments_%'" );
}
}
-WCS_Upgrade_1_3::init();
diff --git a/includes/upgrades/class-wcs-upgrade-1-4.php b/includes/upgrades/class-wcs-upgrade-1-4.php
old mode 100755
new mode 100644
index df0ee2f..679fd1a
--- a/includes/upgrades/class-wcs-upgrade-1-4.php
+++ b/includes/upgrades/class-wcs-upgrade-1-4.php
@@ -18,7 +18,7 @@ class WCS_Upgrade_1_4 {
private static $last_upgraded_user_id = false;
- public function init() {
+ public static function init() {
global $wpdb;
@@ -177,4 +177,3 @@ class WCS_Upgrade_1_4 {
return $user_id > self::$last_upgraded_user_id;
}
}
-WCS_Upgrade_1_4::init();
diff --git a/includes/upgrades/class-wcs-upgrade-1-5.php b/includes/upgrades/class-wcs-upgrade-1-5.php
old mode 100755
new mode 100644
index d855b57..5eb8aec
--- a/includes/upgrades/class-wcs-upgrade-1-5.php
+++ b/includes/upgrades/class-wcs-upgrade-1-5.php
@@ -67,8 +67,8 @@ class WCS_Upgrade_1_5 {
if ( 'scheduled_subscription_payment' == $hook || 'scheduled_subscription_expiration' == $hook || 'scheduled_subscription_end_of_prepaid_term' == $hook || 'scheduled_subscription_trial_end' == $hook || 'paypal_check_subscription_payment' == $hook ) {
foreach ( $details as $hook_key => $values ) {
- if ( ! wc_next_scheduled_action( $hook, $values['args'] ) ) {
- wc_schedule_single_action( $timestamp, $hook, $values['args'] );
+ if ( ! as_next_scheduled_action( $hook, $values['args'] ) ) {
+ as_schedule_single_action( $timestamp, $hook, $values['args'] );
unset( $cron[ $timestamp ][ $hook ][ $hook_key ] );
$counter++;
}
diff --git a/includes/upgrades/class-wcs-upgrade-2-0.php b/includes/upgrades/class-wcs-upgrade-2-0.php
old mode 100755
new mode 100644
index e865410..a23fdcd
--- a/includes/upgrades/class-wcs-upgrade-2-0.php
+++ b/includes/upgrades/class-wcs-upgrade-2-0.php
@@ -68,7 +68,7 @@ class WCS_Upgrade_2_0 {
$original_order = wc_get_order( $old_subscription['order_id'] );
// If we're still in a prepaid term, the new subscription has the new pending cancellation status
- if ( 'cancelled' == $old_subscription['status'] && false != wc_next_scheduled_action( 'scheduled_subscription_end_of_prepaid_term', array( 'user_id' => $old_subscription['user_id'], 'subscription_key' => $old_subscription['subscription_key'] ) ) ) {
+ if ( 'cancelled' == $old_subscription['status'] && false != as_next_scheduled_action( 'scheduled_subscription_end_of_prepaid_term', array( 'user_id' => $old_subscription['user_id'], 'subscription_key' => $old_subscription['subscription_key'] ) ) ) {
$subscription_status = 'pending-cancel';
} elseif ( 'trash' == $old_subscription['status'] ) {
$subscription_status = 'cancelled'; // we'll trash it properly after migrating it
@@ -501,12 +501,12 @@ class WCS_Upgrade_2_0 {
} elseif ( ! empty( $old_keys['old_scheduled_hook'] ) ) {
// Now check if there is a scheduled date, this is for next payment and end of prepaid term dates
- $next_scheduled = wc_next_scheduled_action( $old_keys['old_scheduled_hook'], $old_hook_args );
+ $next_scheduled = as_next_scheduled_action( $old_keys['old_scheduled_hook'], $old_hook_args );
if ( $next_scheduled > 0 ) {
if ( 'end_of_prepaid_term' == $new_key ) {
- wc_schedule_single_action( $next_scheduled, 'woocommerce_scheduled_subscription_end_of_prepaid_term', array( 'subscription_id' => $new_subscription->get_id() ) );
+ as_schedule_single_action( $next_scheduled, 'woocommerce_scheduled_subscription_end_of_prepaid_term', array( 'subscription_id' => $new_subscription->get_id() ) );
} else {
$dates_to_update[ $new_key ] = gmdate( 'Y-m-d H:i:s', $next_scheduled );
}
diff --git a/includes/upgrades/class-wcs-upgrade-2-1.php b/includes/upgrades/class-wcs-upgrade-2-1.php
old mode 100755
new mode 100644
diff --git a/includes/upgrades/class-wcs-upgrade-2-2-7.php b/includes/upgrades/class-wcs-upgrade-2-2-7.php
old mode 100755
new mode 100644
index 0d808e7..0761806
--- a/includes/upgrades/class-wcs-upgrade-2-2-7.php
+++ b/includes/upgrades/class-wcs-upgrade-2-2-7.php
@@ -60,12 +60,12 @@ class WCS_Upgrade_2_2_7 {
$subscription->update_status( 'cancelled', __( 'Subscription end date in the past', 'woocommerce-subscriptions' ) );
} else {
$action_args = array( 'subscription_id' => $subscription_id );
- $scheduled_action = wc_next_scheduled_action( $end_of_prepaid_term_hook, $action_args );
+ $scheduled_action = as_next_scheduled_action( $end_of_prepaid_term_hook, $action_args );
// If there isn't a scheduled end of prepaid term, schedule one now.
if ( false == $scheduled_action ) {
self::log( sprintf( 'Subscription %d missing scheduled end of prepaid term action - scheduled new action (end timestamp: %d)', $subscription_id, $end_time ) );
- wc_schedule_single_action( $end_time, $end_of_prepaid_term_hook, $action_args );
+ as_schedule_single_action( $end_time, $end_of_prepaid_term_hook, $action_args );
} else {
self::log( sprintf( 'Subscription %d has a scheduled end of prepaid term action - there\'s nothing to do here', $subscription_id ) );
}
diff --git a/includes/upgrades/class-wcs-upgrade-2-2-9.php b/includes/upgrades/class-wcs-upgrade-2-2-9.php
old mode 100755
new mode 100644
diff --git a/includes/upgrades/class-wcs-upgrade-logger.php b/includes/upgrades/class-wcs-upgrade-logger.php
old mode 100755
new mode 100644
index 872bb17..61132fd
--- a/includes/upgrades/class-wcs-upgrade-logger.php
+++ b/includes/upgrades/class-wcs-upgrade-logger.php
@@ -14,7 +14,7 @@ if ( ! defined( 'ABSPATH' ) ) {
class WCS_Upgrade_Logger {
- /** @var WC_Logger instance */
+ /** @var WC_Logger_Interface instance */
protected static $log = false;
/** @var string File handle */
@@ -71,4 +71,3 @@ class WCS_Upgrade_Logger {
self::add( sprintf( '%s upgrade complete from Subscriptions v%s while WooCommerce WC_VERSION %s and database version %s was active.', $current_version, $old_version, $wc_version, get_option( 'woocommerce_db_version' ) ) );
}
}
-WCS_Upgrade_Logger::init();
diff --git a/includes/upgrades/class-wcs-upgrade-notice-manager.php b/includes/upgrades/class-wcs-upgrade-notice-manager.php
old mode 100755
new mode 100644
diff --git a/includes/upgrades/class-wcs-upgrade-subscription-post-author.php b/includes/upgrades/class-wcs-upgrade-subscription-post-author.php
new file mode 100644
index 0000000..89c3a9c
--- /dev/null
+++ b/includes/upgrades/class-wcs-upgrade-subscription-post-author.php
@@ -0,0 +1,165 @@
+scheduled_hook = 'wcs_upgrade_subscription_post_author';
+ $this->log_handle = 'wcs-upgrade-subscription-post-author';
+ $this->logger = $logger;
+ }
+
+ /**
+ * Update a subscription, setting its post_author to its customer ID.
+ *
+ * @since 2.4.0
+ */
+ protected function update_item( $subscription_id ) {
+ global $wpdb;
+
+ try {
+ $wpdb->query(
+ $wpdb->prepare(
+ "UPDATE {$wpdb->posts} p
+ INNER JOIN {$wpdb->postmeta} pm ON p.ID = pm.post_id
+ SET p.post_author = pm.meta_value WHERE p.ID = %d AND pm.meta_key = '_customer_user'",
+ $subscription_id
+ )
+ );
+
+ if ( 0 === $wpdb->rows_affected ) {
+ if ( '1' === get_post_meta( $subscription_id, '_customer_user', true ) && is_a( WCS_Customer_Store::instance(), 'WCS_Customer_Store_Cached_CPT' ) ) {
+ // Admin's subscription cache seems to be corrupt, force a refresh.
+ WCS_Customer_Store::instance()->delete_cache_for_user( 1 );
+ }
+
+ throw new Exception( 'post_author wasn\'t updated, it was already set to 1' );
+ }
+
+ $this->log( sprintf( 'Subscription ID %d post_author updated.', $subscription_id ) );
+ } catch ( Exception $e ) {
+ $this->log( sprintf( '--- Exception caught repairing subscription %d - exception message: %s ---', $subscription_id, $e->getMessage() ) );
+
+ // Ignore this subscription the next time around.
+ $this->add_subscription_to_ignore_list( $subscription_id );
+ }
+ }
+
+
+ /**
+ * Get a batch of subscriptions which need to be updated.
+ *
+ * @since 2.4.0
+ * @return array A list of subscription ids which need to be updated.
+ */
+ protected function get_items_to_update() {
+ return get_posts( array(
+ 'post_type' => 'shop_subscription',
+ 'posts_per_page' => 20,
+ 'author' => '1',
+ 'post_status' => 'any',
+ 'post__not_in' => $this->get_subscriptions_to_ignore(),
+ 'fields' => 'ids',
+ ) );
+ }
+
+ /**
+ * Schedule the instance's hook to run in $this->time_limit seconds, if it's not already scheduled.
+ */
+ protected function schedule_background_update() {
+ parent::schedule_background_update();
+
+ update_option( 'wcs_subscription_post_author_upgrade_is_scheduled', true );
+ }
+
+ /**
+ * Unschedule the instance's hook in Action Scheduler
+ */
+ protected function unschedule_background_updates() {
+ parent::unschedule_background_updates();
+
+ delete_option( 'wcs_subscription_post_author_upgrade_is_scheduled' );
+ delete_option( 'wcs_post_author_upgrade_other_subscriptions_to_ignore' );
+ }
+
+ /**
+ * Returns the list of admin subscription IDs to ignore during this upgrade routine.
+ *
+ * @return array
+ */
+ private function get_subscriptions_to_ignore() {
+ $subscriptions_to_ignore = WCS_Customer_Store::instance()->get_users_subscription_ids( 1 );
+ $other_subscriptions_to_ignore = get_option( 'wcs_post_author_upgrade_other_subscriptions_to_ignore', array() );
+
+ if ( is_array( $other_subscriptions_to_ignore ) && ! empty( $other_subscriptions_to_ignore ) ) {
+ $subscriptions_to_ignore = array_unique( array_merge( $subscriptions_to_ignore, $other_subscriptions_to_ignore ) );
+ }
+
+ return $subscriptions_to_ignore;
+ }
+
+ /**
+ * Adds a subscription ID to the ignore list for this upgrade routine.
+ *
+ * @param int $subscription_id
+ */
+ private function add_subscription_to_ignore_list( $subscription_id ) {
+ $subscription_id = absint( $subscription_id );
+ if ( ! $subscription_id ) {
+ return;
+ }
+
+ $subscriptions_to_ignore = get_option( 'wcs_post_author_upgrade_other_subscriptions_to_ignore', array() );
+ $subscriptions_to_ignore = is_array( $subscriptions_to_ignore ) ? $subscriptions_to_ignore : array();
+
+ if ( ! in_array( $subscription_id, $subscriptions_to_ignore ) ) {
+ $subscriptions_to_ignore[] = $subscription_id;
+ }
+
+ update_option( 'wcs_post_author_upgrade_other_subscriptions_to_ignore', $subscriptions_to_ignore );
+ }
+
+ /**
+ * Hooks into WC's 3.5 update routine to add the subscription post type to the list of post types affected by this update.
+ *
+ * @since 2.4.0
+ */
+ public static function hook_into_wc_350_update() {
+ add_filter( 'woocommerce_update_350_order_customer_id_post_types', array( __CLASS__, 'add_post_type_to_wc_350_update' ) );
+ }
+
+ /**
+ * Callback for the `woocommerce_update_350_order_customer_id_post_types` hook. Makes sure `shop_subscription` is
+ * included in the post types array.
+ *
+ * @param array $post_types
+ * @return array
+ * @since 2.4.0
+ */
+ public static function add_post_type_to_wc_350_update( $post_types = array() ) {
+ if ( ! in_array( 'shop_subscription', $post_types ) ) {
+ $post_types[] = 'shop_subscription';
+ }
+
+ return $post_types;
+ }
+
+}
+
diff --git a/includes/upgrades/templates/update-welcome-notice.php b/includes/upgrades/templates/update-welcome-notice.php
old mode 100755
new mode 100644
diff --git a/includes/upgrades/templates/wcs-about-2-0.php b/includes/upgrades/templates/wcs-about-2-0.php
old mode 100755
new mode 100644
diff --git a/includes/upgrades/templates/wcs-about.php b/includes/upgrades/templates/wcs-about.php
old mode 100755
new mode 100644
diff --git a/includes/upgrades/templates/wcs-upgrade-in-progress.php b/includes/upgrades/templates/wcs-upgrade-in-progress.php
old mode 100755
new mode 100644
diff --git a/includes/upgrades/templates/wcs-upgrade.php b/includes/upgrades/templates/wcs-upgrade.php
old mode 100755
new mode 100644
diff --git a/includes/wcs-cart-functions.php b/includes/wcs-cart-functions.php
old mode 100755
new mode 100644
index 279494b..f263017
--- a/includes/wcs-cart-functions.php
+++ b/includes/wcs-cart-functions.php
@@ -382,3 +382,21 @@ function wcs_get_cart_item_name( $cart_item, $include = array() ) {
return $cart_item_name;
}
+
+/**
+ * Allows protected products to be renewed.
+ *
+ * @since 2.4.0
+ */
+function wcs_allow_protected_products_to_renew() {
+ remove_filter( 'woocommerce_add_to_cart_validation', 'wc_protected_product_add_to_cart' );
+}
+
+/**
+ * Restores protected products from being added to the cart.
+ * @see wcs_allow_protected_products_to_renew
+ * @since 2.4.0
+ */
+function wcs_disallow_protected_product_add_to_cart_validation() {
+ add_filter( 'woocommerce_add_to_cart_validation', 'wc_protected_product_add_to_cart', 10, 2 );
+}
diff --git a/includes/wcs-compatibility-functions.php b/includes/wcs-compatibility-functions.php
old mode 100755
new mode 100644
diff --git a/includes/wcs-conditional-functions.php b/includes/wcs-conditional-functions.php
old mode 100755
new mode 100644
diff --git a/includes/wcs-deprecated-functions.php b/includes/wcs-deprecated-functions.php
old mode 100755
new mode 100644
index 9dc2dc2..6a0a7ec
--- a/includes/wcs-deprecated-functions.php
+++ b/includes/wcs-deprecated-functions.php
@@ -237,7 +237,7 @@ function wcs_get_subscription_in_deprecated_structure( WC_Subscription $subscrip
'length' => wcs_estimate_periods_between( ( 0 == $subscription->get_time( 'trial_end' ) ) ? $subscription->get_time( 'date_created' ) : $subscription->get_time( 'trial_end' ), $subscription->get_time( 'end' ) + 120, $subscription->get_billing_period(), 'floor' ) / $subscription->get_billing_interval(), // Since subscriptions no longer have a length, we need to calculate the length given the start and end dates and the period.
// Subscription dates
- 'start_date' => $subscription->get_date( 'date_created' ),
+ 'start_date' => $subscription->get_date( 'start' ),
'expiry_date' => $subscription->get_date( 'end' ),
'end_date' => $subscription->has_status( wcs_get_subscription_ended_statuses() ) ? $subscription->get_date( 'end' ) : 0,
'trial_expiry_date' => $subscription->get_date( 'trial_end' ),
diff --git a/includes/wcs-formatting-functions.php b/includes/wcs-formatting-functions.php
old mode 100755
new mode 100644
diff --git a/includes/wcs-helper-functions.php b/includes/wcs-helper-functions.php
old mode 100755
new mode 100644
diff --git a/includes/wcs-limit-functions.php b/includes/wcs-limit-functions.php
old mode 100755
new mode 100644
diff --git a/includes/wcs-order-functions.php b/includes/wcs-order-functions.php
old mode 100755
new mode 100644
index 105cfef..e4c4259
--- a/includes/wcs-order-functions.php
+++ b/includes/wcs-order-functions.php
@@ -540,13 +540,16 @@ function wcs_get_subscription_orders( $return_fields = 'ids', $order_type = 'par
}
/**
- * A wrapper for getting a specific item from a subscription.
+ * A wrapper for getting a specific item from an order or subscription.
*
* WooCommerce has a wc_add_order_item() function, wc_update_order_item() function and wc_delete_order_item() function,
* but no `wc_get_order_item()` function, so we need to add our own (for now).
*
- * @param int $item_id The ID of an order item
- * @return WC_Subscription Subscription details in post_id => WC_Subscription form.
+ * @param int $item_id The ID of an order item
+ * @param WC_Order|WC_Subscription $order The order or order object the item belongs to.
+ *
+ * @return WC_Order_Item|array The order item object or an empty array if the item doesn't exist.
+ *
* @since 2.0
*/
function wcs_get_order_item( $item_id, $order ) {
@@ -818,3 +821,48 @@ function wcs_copy_order_item( $from_item, &$to_item ) {
break;
}
}
+
+/**
+ * Checks an order to see if it contains a manual subscription.
+ *
+ * @since 2.4.3
+ * @param WC_Order|int $order The WC_Order object or ID to get related subscriptions from.
+ * @param string|array $order_type The order relationship type(s). Can be single string or an array of order types. Optional. Default is 'any'.
+ * @return bool
+ */
+function wcs_order_contains_manual_subscription( $order, $order_type = 'any' ) {
+ $subscriptions = wcs_get_subscriptions_for_order( $order, array( 'order_type' => $order_type ) );
+ $contains_manual_subscription = false;
+
+ foreach ( $subscriptions as $subscription ) {
+ if ( $subscription->is_manual() ) {
+ $contains_manual_subscription = true;
+ break;
+ }
+ }
+
+ return $contains_manual_subscription;
+}
+
+/**
+ * Copy payment method from a subscription to an order.
+ *
+ * @since 2.4.3
+ * @param WC_Subscription $subscription
+ * @param WC_Order $order
+ */
+function wcs_copy_payment_method_to_order( $subscription, $order ) {
+ // Set the order's payment method to match the subscription.
+ if ( $order->get_payment_method() !== $subscription->get_payment_method() ) {
+ $order->set_payment_method( $subscription->get_payment_method() );
+ }
+
+ // We only need to copy the subscription's post meta to the order. All other payment related meta should already exist.
+ // Both post_meta and postmeta keys are supported by wcs_set_payment_meta().
+ $payment_meta = array_intersect_key( $subscription->get_payment_method_meta(), array_flip( array( 'post_meta', 'postmeta' ) ) );
+ $payment_meta = (array) apply_filters( 'wcs_copy_payment_meta_to_order', $payment_meta, $order, $subscription );
+
+ if ( ! empty( $payment_meta ) ) {
+ wcs_set_payment_meta( $order, $payment_meta );
+ }
+}
diff --git a/includes/wcs-product-functions.php b/includes/wcs-product-functions.php
old mode 100755
new mode 100644
index 7e12038..b132128
--- a/includes/wcs-product-functions.php
+++ b/includes/wcs-product-functions.php
@@ -169,7 +169,7 @@ function wcs_calculate_min_max_variations( $variations_data ) {
$is_max = $is_min = false;
- if ( '' === $variation_data['price'] && '' === $variation_data['subscription']['sign_up_fee'] ) {
+ if ( '' === $variation_data['price'] && empty( $variation_data['subscription']['sign_up_fee'] ) ) {
continue;
}
@@ -194,7 +194,7 @@ function wcs_calculate_min_max_variations( $variations_data ) {
$initial_period = $variation_data['subscription']['trial_period'];
$initial_interval = $variation_data['subscription']['trial_length'];
} else {
- $initial_amount = $variation_data['price'] + $variation_data['subscription']['sign_up_fee'];
+ $initial_amount = (float) $variation_data['price'] + (float) $variation_data['subscription']['sign_up_fee'];
$initial_period = $variation_data['subscription']['period'];
$initial_interval = $variation_data['subscription']['interval'];
}
diff --git a/includes/wcs-renewal-functions.php b/includes/wcs-renewal-functions.php
old mode 100755
new mode 100644
index 4692926..8c0ea0c
--- a/includes/wcs-renewal-functions.php
+++ b/includes/wcs-renewal-functions.php
@@ -87,8 +87,7 @@ function wcs_cart_contains_renewal() {
/**
* Checks the cart to see if it contains a subscription product renewal for a failed renewal payment.
*
- * @param bool | Array The cart item containing the renewal, else false.
- * @return string
+ * @return bool|array The cart item containing the renewal, else false.
* @since 2.0
*/
function wcs_cart_contains_failed_renewal_order_payment() {
diff --git a/includes/wcs-resubscribe-functions.php b/includes/wcs-resubscribe-functions.php
old mode 100755
new mode 100644
diff --git a/includes/wcs-switch-functions.php b/includes/wcs-switch-functions.php
old mode 100755
new mode 100644
diff --git a/includes/wcs-time-functions.php b/includes/wcs-time-functions.php
old mode 100755
new mode 100644
index 883d45f..fb6e42b
--- a/includes/wcs-time-functions.php
+++ b/includes/wcs-time-functions.php
@@ -705,63 +705,76 @@ function wcs_get_days_in_cycle( $period, $interval ) {
}
/**
- * Get an instance of the site's timezone.
+ * Set a DateTime's timezone to the WordPress site's timezone, or a UTC offset
+ * if no timezone string is available.
*
- * @return DateTimeZone Timezone object for the timezone the site is using.
+ * @since 2.4.2
+ * @param WC_DateTime $date
+ * @return WC_DateTime
*/
-function wcs_get_sites_timezone() {
-
- if ( class_exists( 'ActionScheduler_TimezoneHelper' ) ) {
-
- // Use Action Scheduler's version when possible as it caches the data
- $local_timezone = ActionScheduler_TimezoneHelper::get_local_timezone();
+function wcs_set_local_timezone( WC_DateTime $date ) {
+ if ( get_option( 'timezone_string' ) ) {
+ $date->setTimezone( new DateTimeZone( wc_timezone_string() ) );
} else {
-
- $tzstring = get_option( 'timezone_string' );
-
- if ( empty( $tzstring ) ) {
-
- $gmt_offset = get_option( 'gmt_offset' );
-
- if ( 0 == $gmt_offset ) {
-
- $tzstring = 'UTC';
-
- } else {
-
- $gmt_offset *= HOUR_IN_SECONDS;
- $tzstring = timezone_name_from_abbr( '', $gmt_offset );
-
- if ( false === $tzstring ) {
-
- $is_dst = date( 'I' );
-
- foreach ( timezone_abbreviations_list() as $abbr ) {
-
- foreach ( $abbr as $city ) {
- if ( $city['dst'] == $is_dst && $city['offset'] == $gmt_offset ) {
- $tzstring = $city['timezone_id'];
- break 2;
- }
- }
- }
- }
-
- if ( false === $tzstring ) {
- $tzstring = 'UTC';
- }
- }
- }
-
- $local_timezone = new DateTimeZone( $tzstring );
+ $date->set_utc_offset( wc_timezone_offset() );
}
- return $local_timezone;
+ return $date;
}
/* Deprecated Functions */
+/**
+ * Get an instance of the site's timezone.
+ *
+ * @return DateTimeZone Timezone object for the timezone the site is using.
+ * @deprecated 2.4.2
+ */
+function wcs_get_sites_timezone() {
+ _deprecated_function( __FUNCTION__, '2.4.2' );
+
+ $tzstring = get_option( 'timezone_string' );
+
+ if ( empty( $tzstring ) ) {
+
+ $gmt_offset = get_option( 'gmt_offset' );
+
+ if ( 0 == $gmt_offset ) {
+
+ $tzstring = 'UTC';
+
+ } else {
+
+ $gmt_offset *= HOUR_IN_SECONDS;
+ $tzstring = timezone_name_from_abbr( '', $gmt_offset );
+
+ if ( false === $tzstring ) {
+
+ $is_dst = date( 'I' );
+
+ foreach ( timezone_abbreviations_list() as $abbr ) {
+
+ foreach ( $abbr as $city ) {
+ if ( $city['dst'] == $is_dst && $city['offset'] == $gmt_offset ) {
+ $tzstring = $city['timezone_id'];
+ break 2;
+ }
+ }
+ }
+ }
+
+ if ( false === $tzstring ) {
+ $tzstring = 'UTC';
+ }
+ }
+ }
+
+ $local_timezone = new DateTimeZone( $tzstring );
+
+ return $local_timezone;
+}
+
/**
* Returns an array of subscription lengths.
*
diff --git a/includes/wcs-user-functions.php b/includes/wcs-user-functions.php
old mode 100755
new mode 100644
diff --git a/languages/woocommerce-subscriptions.pot b/languages/woocommerce-subscriptions.pot
old mode 100755
new mode 100644
index 0f25b84..1de3422
--- a/languages/woocommerce-subscriptions.pot
+++ b/languages/woocommerce-subscriptions.pot
@@ -2,10 +2,10 @@
# This file is distributed under the same license as the WooCommerce Subscriptions package.
msgid ""
msgstr ""
-"Project-Id-Version: WooCommerce Subscriptions 2.3.7\n"
+"Project-Id-Version: WooCommerce Subscriptions 2.4.5\n"
"Report-Msgid-Bugs-To: "
"https://github.com/Prospress/woocommerce-subscriptions/issues\n"
-"POT-Creation-Date: 2018-09-25 00:57:34+00:00\n"
+"POT-Creation-Date: 2018-11-28 06:13:23+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -19,74 +19,74 @@ msgstr ""
msgid "Invalid relation type: %s. Order relationship type must be one of: %s."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:181
+#: includes/admin/class-wc-subscriptions-admin.php:185
msgid "Simple subscription"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:182
+#: includes/admin/class-wc-subscriptions-admin.php:186
msgid "Variable subscription"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:200
+#: includes/admin/class-wc-subscriptions-admin.php:204
msgid "Choose the subscription price, billing interval and period."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:213
+#: includes/admin/class-wc-subscriptions-admin.php:217
#: templates/admin/html-variation-price.php:44
#. translators: placeholder is a currency symbol / code
msgid "Subscription price (%s)"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:216
+#: includes/admin/class-wc-subscriptions-admin.php:220
msgid "Subscription interval"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:222
-#: includes/admin/class-wc-subscriptions-admin.php:358
+#: includes/admin/class-wc-subscriptions-admin.php:226
+#: includes/admin/class-wc-subscriptions-admin.php:362
msgid "Subscription period"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:236
-#: includes/admin/class-wc-subscriptions-admin.php:359
+#: includes/admin/class-wc-subscriptions-admin.php:240
+#: includes/admin/class-wc-subscriptions-admin.php:363
#: templates/admin/html-variation-price.php:66
msgid "Expire after"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:239
+#: includes/admin/class-wc-subscriptions-admin.php:243
msgid ""
"Automatically expire the subscription after this length of time. This "
"length is in addition to any free trial or amount of time provided before a "
"synchronised first renewal date."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:248
+#: includes/admin/class-wc-subscriptions-admin.php:252
#: templates/admin/html-variation-price.php:20
#. translators: %s is a currency symbol / code
msgid "Sign-up fee (%s)"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:250
+#: includes/admin/class-wc-subscriptions-admin.php:254
msgid ""
"Optionally include an amount to be charged at the outset of the "
"subscription. The sign-up fee will be charged immediately, even if the "
"product has a free trial or the payment dates are synced."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:262
+#: includes/admin/class-wc-subscriptions-admin.php:266
#: templates/admin/html-variation-price.php:25
msgid "Free trial"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:265
+#: includes/admin/class-wc-subscriptions-admin.php:269
#: templates/admin/deprecated/html-variation-price.php:115
msgid "Subscription Trial Period"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:297
+#: includes/admin/class-wc-subscriptions-admin.php:301
msgid "One time shipping"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:298
+#: includes/admin/class-wc-subscriptions-admin.php:302
msgid ""
"Shipping for subscription products is normally charged on the initial order "
"and all renewal orders. Enable this to only charge shipping once on the "
@@ -94,63 +94,63 @@ msgid ""
"not have a free trial or a synced renewal date."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:355
+#: includes/admin/class-wc-subscriptions-admin.php:359
msgid "Subscription pricing"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:356
+#: includes/admin/class-wc-subscriptions-admin.php:360
msgid "Subscription sign-up fee"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:357
+#: includes/admin/class-wc-subscriptions-admin.php:361
msgid "Subscription billing interval"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:360
+#: includes/admin/class-wc-subscriptions-admin.php:364
msgid "Free trial length"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:361
+#: includes/admin/class-wc-subscriptions-admin.php:365
msgid "Free trial period"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:682
+#: includes/admin/class-wc-subscriptions-admin.php:686
msgid ""
"Unable to change subscription status to \"%s\". Please assign a customer to "
"the subscription to activate it."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:724
+#: includes/admin/class-wc-subscriptions-admin.php:728
msgid ""
"Trashing this order will also trash the subscriptions purchased with the "
"order."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:737
+#: includes/admin/class-wc-subscriptions-admin.php:741
msgid "Enter the new period, either day, week, month or year:"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:738
+#: includes/admin/class-wc-subscriptions-admin.php:742
msgid "Enter a new length (e.g. 5):"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:739
+#: includes/admin/class-wc-subscriptions-admin.php:743
msgid ""
"Enter a new interval as a single number (e.g. to charge every 2nd month, "
"enter 2):"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:740
+#: includes/admin/class-wc-subscriptions-admin.php:744
msgid "Delete all variations without a subscription"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:743
+#: includes/admin/class-wc-subscriptions-admin.php:747
msgid ""
"Product type can not be changed because this product is associated with "
"active subscriptions"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:747
+#: includes/admin/class-wc-subscriptions-admin.php:751
msgid ""
"You are about to trash one or more orders which contain a subscription.\n"
"\n"
@@ -158,7 +158,7 @@ msgid ""
"orders."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:760
+#: includes/admin/class-wc-subscriptions-admin.php:764
msgid ""
"WARNING: Bad things are about to happen!\n"
"\n"
@@ -170,13 +170,13 @@ msgid ""
"gateway."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:761
+#: includes/admin/class-wc-subscriptions-admin.php:765
msgid ""
"You are deleting a subscription item. You will also need to manually cancel "
"and trash the subscription on the Manage Subscriptions screen."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:768
+#: includes/admin/class-wc-subscriptions-admin.php:772
msgid ""
"Warning: Deleting a user will also delete the user's subscriptions. The "
"user's orders will remain but be reassigned to the 'Guest' user.\n"
@@ -185,63 +185,63 @@ msgid ""
"subscriptions?"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:831
+#: includes/admin/class-wc-subscriptions-admin.php:835
msgid "Active subscriber?"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:874
+#: includes/admin/class-wc-subscriptions-admin.php:878
msgid "Manage Subscriptions"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:878
-#: woocommerce-subscriptions.php:314
+#: includes/admin/class-wc-subscriptions-admin.php:882
+#: woocommerce-subscriptions.php:262
msgid "Search Subscriptions"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:898
-#: includes/admin/class-wc-subscriptions-admin.php:1018
-#: includes/admin/class-wcs-admin-reports.php:51
-#: includes/admin/class-wcs-admin-system-status.php:55
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:687
+#: includes/admin/class-wc-subscriptions-admin.php:902
+#: includes/admin/class-wc-subscriptions-admin.php:1017
+#: includes/admin/class-wcs-admin-reports.php:46
+#: includes/admin/class-wcs-admin-system-status.php:56
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:688
#: includes/class-wcs-query.php:108 includes/class-wcs-query.php:129
#: includes/class-wcs-query.php:248
#: includes/privacy/class-wcs-privacy-exporters.php:51
-#: woocommerce-subscriptions.php:305 woocommerce-subscriptions.php:318
+#: woocommerce-subscriptions.php:253 woocommerce-subscriptions.php:266
msgid "Subscriptions"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1058
+#: includes/admin/class-wc-subscriptions-admin.php:1057
msgid "Button Text"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1065
+#: includes/admin/class-wc-subscriptions-admin.php:1064
msgid "Add to Cart Button Text"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1066
+#: includes/admin/class-wc-subscriptions-admin.php:1065
msgid ""
"A product displays a button with the text \"Add to Cart\". By default, a "
"subscription changes this to \"Sign Up Now\". You can customise the button "
"text for subscriptions here."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1070
-#: includes/admin/class-wc-subscriptions-admin.php:1073
-#: includes/admin/class-wc-subscriptions-admin.php:1082
-#: includes/admin/class-wc-subscriptions-admin.php:1085
+#: includes/admin/class-wc-subscriptions-admin.php:1069
+#: includes/admin/class-wc-subscriptions-admin.php:1072
+#: includes/admin/class-wc-subscriptions-admin.php:1081
+#: includes/admin/class-wc-subscriptions-admin.php:1084
#: includes/class-wc-product-subscription-variation.php:98
#: includes/class-wc-product-subscription.php:72
#: includes/class-wc-product-variable-subscription.php:73
#: includes/class-wc-subscriptions-product.php:99
-#: woocommerce-subscriptions.php:610
+#: woocommerce-subscriptions.php:560
msgid "Sign Up Now"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1077
+#: includes/admin/class-wc-subscriptions-admin.php:1076
msgid "Place Order Button Text"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1078
+#: includes/admin/class-wc-subscriptions-admin.php:1077
msgid ""
"Use this field to customise the text displayed on the checkout button when "
"an order contains a subscription. Normally the checkout submission button "
@@ -249,11 +249,11 @@ msgid ""
"changed to \"Sign Up Now\"."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1091
+#: includes/admin/class-wc-subscriptions-admin.php:1090
msgid "Roles"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1094
+#: includes/admin/class-wc-subscriptions-admin.php:1093
#. translators: placeholders are tags
msgid ""
"Choose the default roles to assign to active and inactive subscribers. For "
@@ -262,46 +262,46 @@ msgid ""
"allocated these roles to prevent locking out administrators."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1099
+#: includes/admin/class-wc-subscriptions-admin.php:1098
msgid "Subscriber Default Role"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1100
+#: includes/admin/class-wc-subscriptions-admin.php:1099
msgid ""
"When a subscription is activated, either manually or after a successful "
"purchase, new users will be assigned this role."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1111
+#: includes/admin/class-wc-subscriptions-admin.php:1110
msgid "Inactive Subscriber Role"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1112
+#: includes/admin/class-wc-subscriptions-admin.php:1111
msgid ""
"If a subscriber's subscription is manually cancelled or expires, she will "
"be assigned this role."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1132
+#: includes/admin/class-wc-subscriptions-admin.php:1131
msgid "Manual Renewal Payments"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1133
+#: includes/admin/class-wc-subscriptions-admin.php:1132
msgid "Accept Manual Renewals"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1138
+#: includes/admin/class-wc-subscriptions-admin.php:1137
#. translators: placeholders are opening and closing link tags
msgid ""
"With manual renewals, a customer's subscription is put on-hold until they "
"login and pay to renew it. %sLearn more%s."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1144
+#: includes/admin/class-wc-subscriptions-admin.php:1143
msgid "Turn off Automatic Payments"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1149
+#: includes/admin/class-wc-subscriptions-admin.php:1148
#. translators: placeholders are opening and closing link tags
msgid ""
"If you don't want new subscription purchases to automatically charge "
@@ -310,11 +310,11 @@ msgid ""
"more%s."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1164
+#: includes/admin/class-wc-subscriptions-admin.php:1163
msgid "Customer Suspensions"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1171
+#: includes/admin/class-wc-subscriptions-admin.php:1170
msgid ""
"Set a maximum number of times a customer can suspend their account for each "
"billing period. For example, for a value of 3 and a subscription billed "
@@ -324,30 +324,30 @@ msgid ""
"this to 0 to turn off the customer suspension feature completely."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1175
+#: includes/admin/class-wc-subscriptions-admin.php:1174
msgid "Mixed Checkout"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1176
+#: includes/admin/class-wc-subscriptions-admin.php:1175
msgid "Allow multiple subscriptions and products to be purchased simultaneously."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1180
+#: includes/admin/class-wc-subscriptions-admin.php:1179
msgid ""
"Allow a subscription product to be purchased with other products and "
"subscriptions in the same transaction."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1184
+#: includes/admin/class-wc-subscriptions-admin.php:1183
#: includes/upgrades/templates/wcs-about-2-0.php:108
msgid "Drip Downloadable Content"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1185
+#: includes/admin/class-wc-subscriptions-admin.php:1184
msgid "Enable dripping for downloadable content on subscription products."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1189
+#: includes/admin/class-wc-subscriptions-admin.php:1188
msgid ""
"Enabling this grants access to new downloadable files added to a product "
"only after the next renewal is processed.%sBy default, access to new "
@@ -355,7 +355,7 @@ msgid ""
"customer that has an active subscription with that product."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1225
+#: includes/admin/class-wc-subscriptions-admin.php:1224
#. translators: $1-$2: opening and closing tags, $3-$4: opening and
#. closing tags
msgid ""
@@ -363,73 +363,73 @@ msgid ""
"start selling subscriptions!%4$s"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1230
+#: includes/admin/class-wc-subscriptions-admin.php:1229
msgid "Add a Subscription Product"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1231
+#: includes/admin/class-wc-subscriptions-admin.php:1230
#: includes/upgrades/templates/wcs-about-2-0.php:35
#: includes/upgrades/templates/wcs-about.php:34
-#: woocommerce-subscriptions.php:1196
+#: woocommerce-subscriptions.php:1091
msgid "Settings"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1317
+#: includes/admin/class-wc-subscriptions-admin.php:1316
#. translators: placeholder is a number
msgid "We can't find a subscription with ID #%d. Perhaps it was deleted?"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1350
-#: includes/admin/class-wc-subscriptions-admin.php:1355
+#: includes/admin/class-wc-subscriptions-admin.php:1349
+#: includes/admin/class-wc-subscriptions-admin.php:1354
#. translators: placeholders are opening link tag, ID of sub, and closing link
#. tag
msgid "Showing orders for %sSubscription %s%s"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1379
+#: includes/admin/class-wc-subscriptions-admin.php:1378
#. translators: number of 1$: days, 2$: weeks, 3$: months, 4$: years
msgid "The trial period can not exceed: %1s, %2s, %3s or %4s."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1384
+#: includes/admin/class-wc-subscriptions-admin.php:1383
#. translators: placeholder is a time period (e.g. "4 weeks")
msgid "The trial period can not exceed %s."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1447
-#: includes/admin/class-wc-subscriptions-admin.php:1500
-#: includes/admin/class-wcs-admin-system-status.php:94
-#: includes/admin/reports/class-wcs-report-cache-manager.php:341
+#: includes/admin/class-wc-subscriptions-admin.php:1446
+#: includes/admin/class-wc-subscriptions-admin.php:1499
+#: includes/admin/class-wcs-admin-system-status.php:95
+#: includes/admin/reports/class-wcs-report-cache-manager.php:328
msgid "Yes"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1447
-#: includes/admin/class-wcs-admin-system-status.php:94
-#: includes/admin/reports/class-wcs-report-cache-manager.php:341
+#: includes/admin/class-wc-subscriptions-admin.php:1446
+#: includes/admin/class-wcs-admin-system-status.php:95
+#: includes/admin/reports/class-wcs-report-cache-manager.php:328
msgid "No"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1483
+#: includes/admin/class-wc-subscriptions-admin.php:1482
msgid "Automatic Recurring Payments"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1500
+#: includes/admin/class-wc-subscriptions-admin.php:1499
msgid ""
"Supports automatic renewal payments with the WooCommerce Subscriptions "
"extension."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1580
+#: includes/admin/class-wc-subscriptions-admin.php:1579
msgid "Subscription items can no longer be edited."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1584
+#: includes/admin/class-wc-subscriptions-admin.php:1583
msgid ""
"This subscription is no longer editable because the payment gateway does "
"not allow modification of recurring amounts."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1603
+#: includes/admin/class-wc-subscriptions-admin.php:1602
#. translators: $1-2: opening and closing tags of a link that takes to Woo
#. marketplace / Stripe product page
msgid ""
@@ -438,18 +438,18 @@ msgid ""
"the %1$sfree Stripe extension%2$s."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1608
+#: includes/admin/class-wc-subscriptions-admin.php:1607
msgid "Recurring Payments"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1616
+#: includes/admin/class-wc-subscriptions-admin.php:1615
#. translators: placeholders are opening and closing link tags
msgid ""
"Payment gateways which don't support automatic recurring payments can be "
"used to process %smanual subscription renewal payments%s."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1623
+#: includes/admin/class-wc-subscriptions-admin.php:1622
#. translators: $1-$2: opening and closing tags. Link to documents->payment
#. gateways, 3$-4$: opening and closing tags. Link to WooCommerce extensions
#. shop page
@@ -458,7 +458,7 @@ msgid ""
"the official %3$sWooCommerce Marketplace%4$s."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1725
+#: includes/admin/class-wc-subscriptions-admin.php:1724
msgid "Note that purchasing a subscription still requires an account."
msgstr ""
@@ -576,7 +576,7 @@ msgstr ""
#: templates/emails/subscription-info.php:18
#: templates/myaccount/my-subscriptions.php:25
#: templates/myaccount/related-subscriptions.php:20
-#: woocommerce-subscriptions.php:306
+#: woocommerce-subscriptions.php:254
msgid "Subscription"
msgstr ""
@@ -687,117 +687,117 @@ msgid ""
"this subscription controls when payments are processed."
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:873
-#: includes/admin/class-wcs-admin-post-types.php:876
-#: includes/admin/class-wcs-admin-post-types.php:879
+#: includes/admin/class-wcs-admin-post-types.php:884
+#: includes/admin/class-wcs-admin-post-types.php:887
+#: includes/admin/class-wcs-admin-post-types.php:890
msgid "Subscription updated."
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:874
+#: includes/admin/class-wcs-admin-post-types.php:885
msgid "Custom field updated."
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:875
+#: includes/admin/class-wcs-admin-post-types.php:886
msgid "Custom field deleted."
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:880
+#: includes/admin/class-wcs-admin-post-types.php:891
msgid "Subscription saved."
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:881
+#: includes/admin/class-wcs-admin-post-types.php:892
msgid "Subscription submitted."
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:883
+#: includes/admin/class-wcs-admin-post-types.php:894
#. translators: php date string
msgid "Subscription scheduled for: %1$s."
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:884
+#: includes/admin/class-wcs-admin-post-types.php:895
msgid "Subscription draft updated."
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:920
+#: includes/admin/class-wcs-admin-post-types.php:931
msgid "Any Payment Method"
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:921
+#: includes/admin/class-wcs-admin-post-types.php:932
msgid "None"
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:1114
+#: includes/admin/class-wcs-admin-post-types.php:1125
#. translators: 1: user display name 2: user ID 3: user email
msgid "%1$s (#%2$s – %3$s)"
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:1121
+#: includes/admin/class-wcs-admin-post-types.php:1132
#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:84
msgid "Search for a customer…"
msgstr ""
-#: includes/admin/class-wcs-admin-reports.php:54
+#: includes/admin/class-wcs-admin-reports.php:49
msgid "Subscription Events by Date"
msgstr ""
-#: includes/admin/class-wcs-admin-reports.php:60
+#: includes/admin/class-wcs-admin-reports.php:55
msgid "Upcoming Recurring Revenue"
msgstr ""
-#: includes/admin/class-wcs-admin-reports.php:66
+#: includes/admin/class-wcs-admin-reports.php:61
msgid "Retention Rate"
msgstr ""
-#: includes/admin/class-wcs-admin-reports.php:72
+#: includes/admin/class-wcs-admin-reports.php:67
msgid "Subscriptions by Product"
msgstr ""
-#: includes/admin/class-wcs-admin-reports.php:78
+#: includes/admin/class-wcs-admin-reports.php:73
msgid "Subscriptions by Customer"
msgstr ""
-#: includes/admin/class-wcs-admin-reports.php:88
+#: includes/admin/class-wcs-admin-reports.php:83
msgid "Failed Payment Retries"
msgstr ""
-#: includes/admin/class-wcs-admin-reports.php:128
-#: includes/admin/reports/class-wcs-report-cache-manager.php:287
+#: includes/admin/class-wcs-admin-reports.php:104
+#: includes/admin/reports/class-wcs-report-cache-manager.php:274
msgid "WooCommerce"
msgstr ""
-#: includes/admin/class-wcs-admin-system-status.php:56
+#: includes/admin/class-wcs-admin-system-status.php:57
msgid "This section shows any information about Subscriptions."
msgstr ""
-#: includes/admin/class-wcs-admin-system-status.php:60
+#: includes/admin/class-wcs-admin-system-status.php:61
msgid "Store Setup"
msgstr ""
-#: includes/admin/class-wcs-admin-system-status.php:61
+#: includes/admin/class-wcs-admin-system-status.php:62
msgid "This section shows general information about the store."
msgstr ""
-#: includes/admin/class-wcs-admin-system-status.php:65
+#: includes/admin/class-wcs-admin-system-status.php:66
msgid "Subscriptions by Payment Gateway"
msgstr ""
-#: includes/admin/class-wcs-admin-system-status.php:66
+#: includes/admin/class-wcs-admin-system-status.php:67
msgid "This section shows information about Subscription payment methods."
msgstr ""
-#: includes/admin/class-wcs-admin-system-status.php:70
+#: includes/admin/class-wcs-admin-system-status.php:71
msgid "Payment Gateway Support"
msgstr ""
-#: includes/admin/class-wcs-admin-system-status.php:71
+#: includes/admin/class-wcs-admin-system-status.php:72
msgid "This section shows information about payment gateway feature support."
msgstr ""
-#: includes/admin/class-wcs-admin-system-status.php:128
+#: includes/admin/class-wcs-admin-system-status.php:144
msgid "%sLearn how to update%s"
msgstr ""
-#: includes/admin/class-wcs-admin-system-status.php:174
+#: includes/admin/class-wcs-admin-system-status.php:190
#. translators: %1$s is the file version, %2$s is the core version
msgid "version %1$s is out of date. The core version is %2$s"
msgstr ""
@@ -911,9 +911,9 @@ msgid "Relationship"
msgstr ""
#: includes/admin/meta-boxes/views/html-related-orders-table.php:19
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:548
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:549
#: includes/admin/reports/class-wcs-report-subscription-payment-retry.php:173
-#: includes/admin/reports/class-wcs-report-upcoming-recurring-revenue.php:205
+#: includes/admin/reports/class-wcs-report-upcoming-recurring-revenue.php:204
#: templates/myaccount/related-orders.php:23
#: templates/myaccount/related-orders.php:42
msgid "Date"
@@ -986,18 +986,18 @@ msgstr ""
msgid "Error: unable to find timezone of your browser."
msgstr ""
-#: includes/admin/reports/class-wcs-report-cache-manager.php:290
+#: includes/admin/reports/class-wcs-report-cache-manager.php:277
msgid ""
"Please note: data for this report is cached. The data displayed may be out "
"of date by up to 24 hours. The cache is updated each morning at 4am in your "
"site's timezone."
msgstr ""
-#: includes/admin/reports/class-wcs-report-cache-manager.php:345
+#: includes/admin/reports/class-wcs-report-cache-manager.php:332
msgid "Cache Update Failures"
msgstr ""
-#: includes/admin/reports/class-wcs-report-cache-manager.php:348
+#: includes/admin/reports/class-wcs-report-cache-manager.php:335
#. translators: %d refers to the number of times we have detected cache update
#. failures
msgid "%d failures"
@@ -1143,185 +1143,185 @@ msgstr ""
msgid "subscriptions"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:397
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:398
msgid "%s signup revenue in this period"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:398
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:399
msgid ""
"The sum of all subscription parent orders, including other items, fees, tax "
"and shipping."
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:404
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:405
msgid "%s renewal revenue in this period"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:405
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:406
msgid "The sum of all renewal orders including tax and shipping."
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:411
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:412
msgid "%s resubscribe revenue in this period"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:412
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:413
msgid "The sum of all resubscribe orders including tax and shipping."
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:418
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:419
msgid "%s new subscriptions"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:419
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:420
msgid ""
"The number of subscriptions created during this period, either by being "
"manually created, imported or a customer placing an order."
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:425
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:426
msgid "%s subscription signups"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:426
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:427
msgid ""
"The number of subscription parent orders created during this period. This "
"represents the new subscriptions created by customers placing an order via "
"checkout."
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:432
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:433
msgid "%s subscription resubscribes"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:433
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:434
msgid "The number of resubscribe orders processed during this period."
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:439
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:440
msgid "%s subscription renewals"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:440
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:441
msgid "The number of renewal orders processed during this period."
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:446
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:447
msgid "%s subscription switches"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:447
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:448
msgid ""
"The number of subscriptions upgraded, downgraded or cross-graded during "
"this period."
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:453
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:454
msgid "%s subscription cancellations"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:454
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:455
msgid ""
"The number of subscriptions cancelled by the customer or store manager "
"during this period. The pre-paid term may not yet have ended during this "
"period."
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:460
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:461
msgid "%s subscriptions ended"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:461
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:462
msgid ""
"The number of subscriptions which have either expired or reached the end of "
"the prepaid term if it was previously cancelled."
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:467
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:468
msgid "%s current subscriptions"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:468
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:469
msgid ""
"The number of subscriptions during this period with an end date in the "
"future and a status other than pending."
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:484
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:485
msgid "%s net subscription gain"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:486
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:487
msgid "%s net subscription loss"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:491
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:492
msgid "Change in subscriptions between the start and end of the period."
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:505
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:506
#: includes/admin/reports/class-wcs-report-subscription-payment-retry.php:137
msgid "Year"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:506
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:507
#: includes/admin/reports/class-wcs-report-subscription-payment-retry.php:138
msgid "Last Month"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:507
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:508
#: includes/admin/reports/class-wcs-report-subscription-payment-retry.php:139
msgid "This Month"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:508
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:509
#: includes/admin/reports/class-wcs-report-subscription-payment-retry.php:140
msgid "Last 7 Days"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:552
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:553
#: includes/admin/reports/class-wcs-report-subscription-payment-retry.php:177
-#: includes/admin/reports/class-wcs-report-upcoming-recurring-revenue.php:209
+#: includes/admin/reports/class-wcs-report-upcoming-recurring-revenue.php:208
msgid "Export CSV"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:609
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:610
msgid "Switched subscriptions"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:625
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:626
msgid "New Subscriptions"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:641
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:642
msgid "Subscriptions signups"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:656
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:657
msgid "Number of resubscribes"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:671
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:672
msgid "Number of renewals"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:703
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:704
msgid "Subscriptions Ended"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:719
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:720
msgid "Cancellations"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:734
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:735
msgid "Signup Totals"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:754
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:755
msgid "Resubscribe Totals"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:774
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:775
msgid "Renewal Totals"
msgstr ""
@@ -1398,40 +1398,40 @@ msgstr ""
msgid "%s average renewal amount"
msgstr ""
-#: includes/admin/reports/class-wcs-report-upcoming-recurring-revenue.php:175
+#: includes/admin/reports/class-wcs-report-upcoming-recurring-revenue.php:174
msgid "Next 12 Months"
msgstr ""
-#: includes/admin/reports/class-wcs-report-upcoming-recurring-revenue.php:176
+#: includes/admin/reports/class-wcs-report-upcoming-recurring-revenue.php:175
msgid "Next 30 Days"
msgstr ""
-#: includes/admin/reports/class-wcs-report-upcoming-recurring-revenue.php:177
+#: includes/admin/reports/class-wcs-report-upcoming-recurring-revenue.php:176
msgid "Next Month"
msgstr ""
-#: includes/admin/reports/class-wcs-report-upcoming-recurring-revenue.php:178
+#: includes/admin/reports/class-wcs-report-upcoming-recurring-revenue.php:177
msgid "Next 7 Days"
msgstr ""
-#: includes/admin/reports/class-wcs-report-upcoming-recurring-revenue.php:243
+#: includes/admin/reports/class-wcs-report-upcoming-recurring-revenue.php:242
msgid "Renewals count"
msgstr ""
-#: includes/admin/reports/class-wcs-report-upcoming-recurring-revenue.php:252
+#: includes/admin/reports/class-wcs-report-upcoming-recurring-revenue.php:251
msgid "Renewals amount"
msgstr ""
-#: includes/api/class-wc-rest-subscriptions-controller.php:118
+#: includes/api/class-wc-rest-subscriptions-controller.php:116
msgid "Customer ID is invalid."
msgstr ""
-#: includes/api/class-wc-rest-subscriptions-controller.php:223
+#: includes/api/class-wc-rest-subscriptions-controller.php:221
#: includes/api/legacy/class-wc-rest-subscriptions-controller.php:171
msgid "Invalid subscription id."
msgstr ""
-#: includes/api/class-wc-rest-subscriptions-controller.php:294
+#: includes/api/class-wc-rest-subscriptions-controller.php:292
#: includes/api/legacy/class-wc-api-subscriptions.php:307
#: includes/api/legacy/class-wc-rest-subscriptions-controller.php:303
msgid ""
@@ -1439,7 +1439,7 @@ msgid ""
"Subscription."
msgstr ""
-#: includes/api/class-wc-rest-subscriptions-controller.php:325
+#: includes/api/class-wc-rest-subscriptions-controller.php:330
#: includes/api/legacy/class-wc-rest-subscriptions-controller.php:333
#. translators: 1$: gateway id, 2$: error message
msgid ""
@@ -1447,71 +1447,71 @@ msgid ""
"%2$s"
msgstr ""
-#: includes/api/class-wc-rest-subscriptions-controller.php:392
-#: includes/api/class-wc-rest-subscriptions-controller.php:558
+#: includes/api/class-wc-rest-subscriptions-controller.php:396
+#: includes/api/class-wc-rest-subscriptions-controller.php:562
#: includes/api/legacy/class-wc-rest-subscriptions-controller.php:284
msgid "Updating subscription dates errored with message: %s"
msgstr ""
-#: includes/api/class-wc-rest-subscriptions-controller.php:417
+#: includes/api/class-wc-rest-subscriptions-controller.php:421
#: includes/api/legacy/class-wc-rest-subscriptions-controller.php:347
msgid "The number of billing periods between subscription renewals."
msgstr ""
-#: includes/api/class-wc-rest-subscriptions-controller.php:422
+#: includes/api/class-wc-rest-subscriptions-controller.php:426
#: includes/api/legacy/class-wc-rest-subscriptions-controller.php:352
msgid "Billing period for the subscription."
msgstr ""
-#: includes/api/class-wc-rest-subscriptions-controller.php:428
+#: includes/api/class-wc-rest-subscriptions-controller.php:432
#: includes/api/legacy/class-wc-rest-subscriptions-controller.php:358
msgid "Subscription payment details."
msgstr ""
-#: includes/api/class-wc-rest-subscriptions-controller.php:433
+#: includes/api/class-wc-rest-subscriptions-controller.php:437
#: includes/api/legacy/class-wc-rest-subscriptions-controller.php:363
msgid "Payment gateway ID."
msgstr ""
-#: includes/api/class-wc-rest-subscriptions-controller.php:440
+#: includes/api/class-wc-rest-subscriptions-controller.php:444
#: includes/api/legacy/class-wc-rest-subscriptions-controller.php:370
msgid "The subscription's start date."
msgstr ""
-#: includes/api/class-wc-rest-subscriptions-controller.php:445
+#: includes/api/class-wc-rest-subscriptions-controller.php:449
#: includes/api/legacy/class-wc-rest-subscriptions-controller.php:375
msgid "The subscription's trial date"
msgstr ""
-#: includes/api/class-wc-rest-subscriptions-controller.php:450
+#: includes/api/class-wc-rest-subscriptions-controller.php:454
#: includes/api/legacy/class-wc-rest-subscriptions-controller.php:380
msgid "The subscription's next payment date."
msgstr ""
-#: includes/api/class-wc-rest-subscriptions-controller.php:455
+#: includes/api/class-wc-rest-subscriptions-controller.php:459
#: includes/api/legacy/class-wc-rest-subscriptions-controller.php:385
msgid "The subscription's end date."
msgstr ""
-#: includes/api/class-wc-rest-subscriptions-controller.php:460
+#: includes/api/class-wc-rest-subscriptions-controller.php:464
msgid ""
"The subscription's original subscription ID if this is a resubscribed "
"subscription."
msgstr ""
-#: includes/api/class-wc-rest-subscriptions-controller.php:466
+#: includes/api/class-wc-rest-subscriptions-controller.php:470
msgid "The subscription's resubscribed subscription ID."
msgstr ""
-#: includes/api/class-wc-rest-subscriptions-controller.php:472
+#: includes/api/class-wc-rest-subscriptions-controller.php:476
msgid "The date the subscription's latest order was completed, in GMT."
msgstr ""
-#: includes/api/class-wc-rest-subscriptions-controller.php:478
+#: includes/api/class-wc-rest-subscriptions-controller.php:482
msgid "The date the subscription's latest order was paid, in GMT."
msgstr ""
-#: includes/api/legacy/class-wc-api-subscriptions.php:102 wcs-functions.php:172
+#: includes/api/legacy/class-wc-api-subscriptions.php:102 wcs-functions.php:178
msgid "Invalid subscription status given."
msgstr ""
@@ -1534,13 +1534,13 @@ msgid ""
"manual with error message: %2$s"
msgstr ""
-#: includes/api/legacy/class-wc-api-subscriptions.php:380 wcs-functions.php:146
+#: includes/api/legacy/class-wc-api-subscriptions.php:380 wcs-functions.php:152
msgid ""
"Invalid subscription billing interval given. Must be an integer greater "
"than 0."
msgstr ""
-#: includes/api/legacy/class-wc-api-subscriptions.php:391 wcs-functions.php:141
+#: includes/api/legacy/class-wc-api-subscriptions.php:391 wcs-functions.php:147
msgid "Invalid subscription billing period given."
msgstr ""
@@ -1548,71 +1548,75 @@ msgstr ""
msgid "Cannot create subscription: %s."
msgstr ""
-#: includes/class-wc-subscription.php:398
+#: includes/class-wc-subscription.php:413
msgid "Unable to change subscription status to \"%s\"."
msgstr ""
-#: includes/class-wc-subscription.php:500
+#: includes/class-wc-subscription.php:515
msgid "Unable to change subscription status to \"%s\". Exception: %s"
msgstr ""
-#: includes/class-wc-subscription.php:522
+#: includes/class-wc-subscription.php:537
#. translators: 1: old subscription status 2: new subscription status
msgid "Status changed from %1$s to %2$s."
msgstr ""
-#: includes/class-wc-subscription.php:534
+#: includes/class-wc-subscription.php:549
#. translators: %s: new order status
msgid "Status set to %s."
msgstr ""
-#: includes/class-wc-subscription.php:1085
+#: includes/class-wc-subscription.php:1100
#: includes/class-wc-subscriptions-manager.php:2279
#: includes/wcs-formatting-functions.php:228
#. translators: placeholder is human time diff (e.g. "3 weeks")
msgid "In %s"
msgstr ""
-#: includes/class-wc-subscription.php:1088
+#: includes/class-wc-subscription.php:1103
#: includes/wcs-formatting-functions.php:231
#. translators: placeholder is human time diff (e.g. "3 weeks")
msgid "%s ago"
msgstr ""
-#: includes/class-wc-subscription.php:1095
+#: includes/class-wc-subscription.php:1110
msgid "Not yet ended"
msgstr ""
-#: includes/class-wc-subscription.php:1098
+#: includes/class-wc-subscription.php:1113
msgid "Not cancelled"
msgstr ""
-#: includes/class-wc-subscription.php:1213
+#: includes/class-wc-subscription.php:1228
+msgid "The creation date of a subscription can not be deleted, only updated."
+msgstr ""
+
+#: includes/class-wc-subscription.php:1231
msgid "The start date of a subscription can not be deleted, only updated."
msgstr ""
-#: includes/class-wc-subscription.php:1217
+#: includes/class-wc-subscription.php:1235
msgid "The %s date of a subscription can not be deleted. You must delete the order."
msgstr ""
-#: includes/class-wc-subscription.php:1225
-#: includes/class-wc-subscription.php:2301
+#: includes/class-wc-subscription.php:1243
+#: includes/class-wc-subscription.php:2302
msgid "Subscription #%d: "
msgstr ""
-#: includes/class-wc-subscription.php:1631
+#: includes/class-wc-subscription.php:1650
msgid "Payment status marked complete."
msgstr ""
-#: includes/class-wc-subscription.php:1659
+#: includes/class-wc-subscription.php:1678
msgid "Payment failed."
msgstr ""
-#: includes/class-wc-subscription.php:1664
+#: includes/class-wc-subscription.php:1683
msgid "Subscription Cancelled: maximum number of failed payments reached."
msgstr ""
-#: includes/class-wc-subscription.php:1774
+#: includes/class-wc-subscription.php:1793
msgid ""
"The \"all\" value for $order_type parameter is deprecated. It was a "
"misnomer, as it did not return resubscribe orders. It was also inconsistent "
@@ -1622,155 +1626,155 @@ msgid ""
"resubscribe."
msgstr ""
-#: includes/class-wc-subscription.php:1876
+#: includes/class-wc-subscription.php:1895
#: includes/class-wcs-change-payment-method-admin.php:155
msgid "Manual Renewal"
msgstr ""
-#: includes/class-wc-subscription.php:1955
+#: includes/class-wc-subscription.php:1974 wcs-functions.php:794
msgid "Payment method meta must be an array."
msgstr ""
-#: includes/class-wc-subscription.php:2199
+#: includes/class-wc-subscription.php:2200
msgid "Invalid format. First parameter needs to be an array."
msgstr ""
-#: includes/class-wc-subscription.php:2203
+#: includes/class-wc-subscription.php:2204
msgid "Invalid data. First parameter was empty when passed to update_dates()."
msgstr ""
-#: includes/class-wc-subscription.php:2210
+#: includes/class-wc-subscription.php:2211
msgid ""
"Invalid data. First parameter has a date that is not in the registered date "
"types."
msgstr ""
-#: includes/class-wc-subscription.php:2274
+#: includes/class-wc-subscription.php:2275
msgid "The %s date must occur after the cancellation date."
msgstr ""
-#: includes/class-wc-subscription.php:2279
+#: includes/class-wc-subscription.php:2280
msgid "The %s date must occur after the last payment date."
msgstr ""
-#: includes/class-wc-subscription.php:2283
+#: includes/class-wc-subscription.php:2284
msgid "The %s date must occur after the next payment date."
msgstr ""
-#: includes/class-wc-subscription.php:2288
+#: includes/class-wc-subscription.php:2289
msgid "The %s date must occur after the trial end date."
msgstr ""
-#: includes/class-wc-subscription.php:2292
+#: includes/class-wc-subscription.php:2293
msgid "The %s date must occur after the start date."
msgstr ""
-#: includes/class-wc-subscription.php:2321
+#: includes/class-wc-subscription.php:2322
#: includes/class-wc-subscriptions-checkout.php:325
#: includes/wcs-order-functions.php:305
msgid "Backordered"
msgstr ""
-#: includes/class-wc-subscriptions-addresses.php:46
+#: includes/class-wc-subscriptions-addresses.php:47
msgid "Change Address"
msgstr ""
-#: includes/class-wc-subscriptions-addresses.php:70
+#: includes/class-wc-subscriptions-addresses.php:71
msgid ""
"Both the shipping address used for the subscription and your default "
"shipping address for future purchases will be updated."
msgstr ""
-#: includes/class-wc-subscriptions-addresses.php:83
+#: includes/class-wc-subscriptions-addresses.php:84
#. translators: $1: address type (Shipping Address / Billing Address), $2:
#. opening tag, $3: closing tag
msgid "Update the %1$s used for %2$sall%3$s of my active subscriptions"
msgstr ""
-#: includes/class-wc-subscriptions-cart.php:902
+#: includes/class-wc-subscriptions-cart.php:912
msgid "Please enter a valid postcode/ZIP."
msgstr ""
-#: includes/class-wc-subscriptions-cart.php:1073
+#: includes/class-wc-subscriptions-cart.php:1083
msgid ""
"That subscription product can not be added to your cart as it already "
"contains a subscription renewal."
msgstr ""
-#: includes/class-wc-subscriptions-cart.php:1161
+#: includes/class-wc-subscriptions-cart.php:1171
msgid "Invalid recurring shipping method."
msgstr ""
-#: includes/class-wc-subscriptions-cart.php:1984
+#: includes/class-wc-subscriptions-cart.php:1994
msgid "now"
msgstr ""
-#: includes/class-wc-subscriptions-change-payment-gateway.php:160
+#: includes/class-wc-subscriptions-change-payment-gateway.php:175
#: templates/emails/plain/email-order-details.php:19
#. translators: placeholder is the subscription order number wrapped in
#. tags
msgid "Subscription Number: %s"
msgstr ""
-#: includes/class-wc-subscriptions-change-payment-gateway.php:166
+#: includes/class-wc-subscriptions-change-payment-gateway.php:181
#. translators: placeholder is the subscription's next payment date (either
#. human readable or normal date) wrapped in tags
msgid "Next Payment Date: %s"
msgstr ""
-#: includes/class-wc-subscriptions-change-payment-gateway.php:172
+#: includes/class-wc-subscriptions-change-payment-gateway.php:187
#. translators: placeholder is the formatted total to be paid for the
#. subscription wrapped in tags
msgid "Total: %s"
msgstr ""
-#: includes/class-wc-subscriptions-change-payment-gateway.php:179
+#: includes/class-wc-subscriptions-change-payment-gateway.php:194
#. translators: placeholder is the display name of the payment method
msgid "Payment Method: %s"
msgstr ""
-#: includes/class-wc-subscriptions-change-payment-gateway.php:191
+#: includes/class-wc-subscriptions-change-payment-gateway.php:206
msgid ""
"Sorry, this subscription change payment method request is invalid and "
"cannot be processed."
msgstr ""
-#: includes/class-wc-subscriptions-change-payment-gateway.php:223
+#: includes/class-wc-subscriptions-change-payment-gateway.php:238
msgid "There was an error with your request. Please try again."
msgstr ""
-#: includes/class-wc-subscriptions-change-payment-gateway.php:227
+#: includes/class-wc-subscriptions-change-payment-gateway.php:242
#: templates/myaccount/view-subscription.php:20
msgid "Invalid Subscription."
msgstr ""
-#: includes/class-wc-subscriptions-change-payment-gateway.php:231
+#: includes/class-wc-subscriptions-change-payment-gateway.php:246
#: includes/class-wcs-cart-resubscribe.php:78
#: includes/class-wcs-cart-resubscribe.php:129
#: includes/class-wcs-user-change-status-handler.php:103
-#: includes/early-renewal/class-wcs-cart-early-renewal.php:96
+#: includes/early-renewal/class-wcs-cart-early-renewal.php:94
msgid "That doesn't appear to be one of your subscriptions."
msgstr ""
-#: includes/class-wc-subscriptions-change-payment-gateway.php:235
+#: includes/class-wc-subscriptions-change-payment-gateway.php:250
msgid "The payment method can not be changed for that subscription."
msgstr ""
-#: includes/class-wc-subscriptions-change-payment-gateway.php:241
+#: includes/class-wc-subscriptions-change-payment-gateway.php:256
#. translators: placeholder is next payment's date
msgid " Next payment is due %s."
msgstr ""
-#: includes/class-wc-subscriptions-change-payment-gateway.php:247
+#: includes/class-wc-subscriptions-change-payment-gateway.php:262
#. translators: placeholder is either empty or "Next payment is due..."
msgid "Choose a new payment method.%s"
msgstr ""
-#: includes/class-wc-subscriptions-change-payment-gateway.php:276
+#: includes/class-wc-subscriptions-change-payment-gateway.php:291
msgid "Invalid order."
msgstr ""
-#: includes/class-wc-subscriptions-change-payment-gateway.php:378
+#: includes/class-wc-subscriptions-change-payment-gateway.php:393
msgid "Payment method updated."
msgstr ""
@@ -1845,7 +1849,7 @@ msgid ""
msgstr ""
#: includes/class-wc-subscriptions-coupon.php:499
-msgid "Sorry, only recurring coupons can only be applied to subscriptions."
+msgid "Sorry, only recurring coupons can be applied to subscriptions."
msgstr ""
#: includes/class-wc-subscriptions-coupon.php:681
@@ -1860,40 +1864,48 @@ msgstr ""
msgid "Renewal cart discount"
msgstr ""
-#: includes/class-wc-subscriptions-coupon.php:700
+#: includes/class-wc-subscriptions-coupon.php:684
+msgid "Initial payment discount"
+msgstr ""
+
+#: includes/class-wc-subscriptions-coupon.php:701
msgid "Renewal Discount"
msgstr ""
-#: includes/class-wc-subscriptions-coupon.php:915
+#: includes/class-wc-subscriptions-coupon.php:704
+msgid "Discount"
+msgstr ""
+
+#: includes/class-wc-subscriptions-coupon.php:920
msgid ""
"Sorry, it seems there are no available payment methods which support the "
"recurring coupon you are using. Please contact us if you require assistance "
"or wish to make alternate arrangements."
msgstr ""
-#: includes/class-wc-subscriptions-coupon.php:930
+#: includes/class-wc-subscriptions-coupon.php:935
msgid "Active for x payments"
msgstr ""
-#: includes/class-wc-subscriptions-coupon.php:931
+#: includes/class-wc-subscriptions-coupon.php:936
msgid "Unlimited payments"
msgstr ""
-#: includes/class-wc-subscriptions-coupon.php:932
+#: includes/class-wc-subscriptions-coupon.php:937
msgid ""
"Coupon will be limited to the given number of payments. It will then be "
"automatically removed from the subscription. \"Payments\" also includes the "
"initial subscription payment."
msgstr ""
-#: includes/class-wc-subscriptions-coupon.php:1064
+#: includes/class-wc-subscriptions-coupon.php:1069
#. translators: %d refers to the number of payments the coupon can be used for.
msgid "Active for %d payment"
msgid_plural "Active for %d payments"
msgstr[0] ""
msgstr[1] ""
-#: includes/class-wc-subscriptions-coupon.php:1068
+#: includes/class-wc-subscriptions-coupon.php:1073
msgid "Active for unlimited payments"
msgstr ""
@@ -1902,7 +1914,7 @@ msgid "Error: Unable to create renewal order with note \"%s\""
msgstr ""
#: includes/class-wc-subscriptions-manager.php:168
-#: includes/gateways/class-wc-subscriptions-payment-gateways.php:210
+#: includes/gateways/class-wc-subscriptions-payment-gateways.php:209
msgid "Subscription doesn't exist in scheduled action: %d"
msgstr ""
@@ -2094,7 +2106,7 @@ msgstr ""
#. translators: 1$: recurring amount, 2$: subscription period (e.g. "month" or
#. "3 months") (e.g. "$15 / month" or "$15 every 2nd month")
msgid "%1$s / %2$s"
-msgid_plural " %1$s every %2$s"
+msgid_plural "%1$s every %2$s"
msgstr[0] ""
msgstr[1] ""
@@ -2242,7 +2254,7 @@ msgstr ""
#: includes/class-wc-subscriptions-switcher.php:421
#: includes/class-wc-subscriptions-switcher.php:447
-#: includes/class-wc-subscriptions-switcher.php:2446
+#: includes/class-wc-subscriptions-switcher.php:2363
msgid "Upgrade or Downgrade"
msgstr ""
@@ -2280,19 +2292,20 @@ msgstr ""
msgid "There was an error locating the switch details."
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:1896
-#: includes/class-wc-subscriptions-switcher.php:2240
+#: includes/class-wc-subscriptions-switcher.php:1413
+msgid ""
+"Invalid switch type \"%s\". Switch must be one of: \"upgrade\", "
+"\"downgrade\" or \"crossgrade\"."
+msgstr ""
+
+#: includes/class-wc-subscriptions-switcher.php:1907
msgid "The original subscription item being switched cannot be found."
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:1898
+#: includes/class-wc-subscriptions-switcher.php:1909
msgid "The item on the switch order cannot be found."
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:2277
-msgid "Failed to update the subscription shipping method."
-msgstr ""
-
#: includes/class-wc-subscriptions-synchroniser.php:48
msgid "Synchronise renewals"
msgstr ""
@@ -2381,55 +2394,55 @@ msgstr ""
msgid "View and manage subscriptions"
msgstr ""
-#: includes/class-wcs-cached-data-manager.php:76
+#: includes/class-wcs-cached-data-manager.php:79
msgid "Related order caching is now handled by %1$s."
msgstr ""
-#: includes/class-wcs-cached-data-manager.php:83
+#: includes/class-wcs-cached-data-manager.php:86
msgid "Customer subscription caching is now handled by %1$s."
msgstr ""
-#: includes/class-wcs-cached-data-manager.php:107
-#: includes/class-wcs-cached-data-manager.php:237
+#: includes/class-wcs-cached-data-manager.php:110
+#: includes/class-wcs-cached-data-manager.php:240
msgid "Customer subscription caching is now handled by %1$s and %2$s."
msgstr ""
-#: includes/class-wcs-cached-data-manager.php:124
+#: includes/class-wcs-cached-data-manager.php:127
msgid "new related order methods in WCS_Related_Order_Store"
msgstr ""
-#: includes/class-wcs-cached-data-manager.php:222
+#: includes/class-wcs-cached-data-manager.php:225
msgid "Weekly"
msgstr ""
#: includes/class-wcs-cart-initial-payment.php:59
-#: includes/class-wcs-cart-renewal.php:182
+#: includes/class-wcs-cart-renewal.php:188
msgid "That doesn't appear to be your order."
msgstr ""
-#: includes/class-wcs-cart-renewal.php:198
+#: includes/class-wcs-cart-renewal.php:204
msgid ""
"This order can no longer be paid because the corresponding subscription "
"does not require payment at this time."
msgstr ""
-#: includes/class-wcs-cart-renewal.php:215
+#: includes/class-wcs-cart-renewal.php:221
msgid "Complete checkout to renew your subscription."
msgstr ""
-#: includes/class-wcs-cart-renewal.php:296
+#: includes/class-wcs-cart-renewal.php:302
#. translators: placeholder is an item name
msgid ""
"The %s product has been deleted and can no longer be renewed. Please choose "
"a new product or contact us for assistance."
msgstr ""
-#: includes/class-wcs-cart-renewal.php:330
+#: includes/class-wcs-cart-renewal.php:336
#. translators: %s is subscription's number
msgid "Subscription #%s has not been added to the cart."
msgstr ""
-#: includes/class-wcs-cart-renewal.php:459
+#: includes/class-wcs-cart-renewal.php:371
msgid ""
"We couldn't find the original subscription for an item in your cart. The "
"item was removed."
@@ -2439,7 +2452,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: includes/class-wcs-cart-renewal.php:466
+#: includes/class-wcs-cart-renewal.php:378
msgid ""
"We couldn't find the original renewal order for an item in your cart. The "
"item was removed."
@@ -2449,7 +2462,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: includes/class-wcs-cart-renewal.php:741
+#: includes/class-wcs-cart-renewal.php:653
msgid "All linked subscription items have been removed from the cart."
msgstr ""
@@ -2458,7 +2471,7 @@ msgid "There was an error with your request to resubscribe. Please try again."
msgstr ""
#: includes/class-wcs-cart-resubscribe.php:74
-#: includes/early-renewal/class-wcs-cart-early-renewal.php:92
+#: includes/early-renewal/class-wcs-cart-early-renewal.php:90
msgid "That subscription does not exist. Has it been deleted?"
msgstr ""
@@ -2481,33 +2494,14 @@ msgstr ""
msgid "Please choose a valid payment gateway to change to."
msgstr ""
-#: includes/class-wcs-failed-scheduled-action-manager.php:128
-#. translators: $1: Opening previously translated sentence $2,$5,$9 opening
-#. link tags $3 closing link tag $4 opening paragraph tag $6 closing paragraph
-#. tag $7 list of affected actions wrapped in code tags $8 the log file name
-#. $10 div containing a group of buttons/links
-msgid ""
-"%1$s Please %2$sopen a new ticket at WooCommerce Support%3$s immediately to "
-"get this resolved.%4$sTo resolve this error a quickly as possible, please "
-"include login details for a %5$stemporary administrator "
-"account%3$s.%6$sAffected events: %7$s%4$sTo see further details, view the "
-"%8$s log file from the %9$sWooCommerce logs screen.%3$s%6$s%10$s"
+#: includes/class-wcs-failed-scheduled-action-manager.php:134
+#: includes/gateways/paypal/includes/admin/class-wcs-paypal-admin.php:178
+msgid "Ignore this error (not recommended)"
msgstr ""
-#: includes/class-wcs-failed-scheduled-action-manager.php:129
-msgid "An error has occurred while processing a recent subscription related event."
-msgid_plural "An error has occurred while processing recent subscription related events."
-msgstr[0] ""
-msgstr[1] ""
-
-#: includes/class-wcs-failed-scheduled-action-manager.php:138
-#: includes/gateways/paypal/includes/admin/class-wcs-paypal-admin.php:190
-msgid "Ignore this error (not recommended!)"
-msgstr ""
-
-#: includes/class-wcs-failed-scheduled-action-manager.php:138
-#: includes/gateways/paypal/includes/admin/class-wcs-paypal-admin.php:190
-msgid "Open up a ticket now!"
+#: includes/class-wcs-failed-scheduled-action-manager.php:139
+#: includes/gateways/paypal/includes/admin/class-wcs-paypal-admin.php:183
+msgid "Open a ticket"
msgstr ""
#: includes/class-wcs-limiter.php:45
@@ -2616,6 +2610,12 @@ msgid ""
"not support removing an item."
msgstr ""
+#: includes/class-wcs-retry-manager.php:316
+msgid ""
+"Payment retry attempted on renewal order with multiple related "
+"subscriptions with no payment method in common."
+msgstr ""
+
#: includes/class-wcs-staging.php:37
msgid ""
"Payment processing skipped - renewal order created on %sstaging site%s "
@@ -2713,15 +2713,11 @@ msgid ""
"related order queries are run."
msgstr ""
-#: includes/early-renewal/class-wcs-cart-early-renewal.php:66
+#: includes/early-renewal/class-wcs-cart-early-renewal.php:70
msgid "Renew Now"
msgstr ""
-#: includes/early-renewal/class-wcs-cart-early-renewal.php:88
-msgid "There was an error with your request to renew. Please try again."
-msgstr ""
-
-#: includes/early-renewal/class-wcs-cart-early-renewal.php:100
+#: includes/early-renewal/class-wcs-cart-early-renewal.php:98
msgid ""
"You can not renew this subscription early. Please contact us if you need "
"assistance."
@@ -2731,23 +2727,23 @@ msgstr ""
msgid "Complete checkout to renew now."
msgstr ""
-#: includes/early-renewal/class-wcs-cart-early-renewal.php:224
+#: includes/early-renewal/class-wcs-cart-early-renewal.php:226
#. translators: placeholder contains a link to the order's edit screen.
msgid "Customer successfully renewed early with order %s."
msgstr ""
-#: includes/early-renewal/class-wcs-cart-early-renewal.php:227
+#: includes/early-renewal/class-wcs-cart-early-renewal.php:229
#. translators: placeholder contains a link to the order's edit screen.
msgid ""
"Failed to update subscription dates after customer renewed early with order "
"%s."
msgstr ""
-#: includes/early-renewal/class-wcs-cart-early-renewal.php:315
+#: includes/early-renewal/class-wcs-cart-early-renewal.php:317
msgid "Order %s created to record early renewal."
msgstr ""
-#: includes/early-renewal/class-wcs-cart-early-renewal.php:370
+#: includes/early-renewal/class-wcs-cart-early-renewal.php:372
msgid "Cancel"
msgstr ""
@@ -2766,92 +2762,92 @@ msgid ""
"the next payment date."
msgstr ""
-#: includes/emails/class-wcs-email-cancelled-subscription.php:27
+#: includes/emails/class-wcs-email-cancelled-subscription.php:26
msgid "Cancelled Subscription"
msgstr ""
-#: includes/emails/class-wcs-email-cancelled-subscription.php:28
+#: includes/emails/class-wcs-email-cancelled-subscription.php:27
msgid ""
"Cancelled Subscription emails are sent when a customer's subscription is "
"cancelled (either by a store manager, or the customer)."
msgstr ""
-#: includes/emails/class-wcs-email-cancelled-subscription.php:30
+#: includes/emails/class-wcs-email-cancelled-subscription.php:29
msgid "Subscription Cancelled"
msgstr ""
-#: includes/emails/class-wcs-email-cancelled-subscription.php:128
+#: includes/emails/class-wcs-email-cancelled-subscription.php:127
#: includes/emails/class-wcs-email-customer-renewal-invoice.php:192
-#: includes/emails/class-wcs-email-expired-subscription.php:126
-#: includes/emails/class-wcs-email-on-hold-subscription.php:126
+#: includes/emails/class-wcs-email-expired-subscription.php:125
+#: includes/emails/class-wcs-email-on-hold-subscription.php:125
msgid "Enable this email notification"
msgstr ""
-#: includes/emails/class-wcs-email-cancelled-subscription.php:135
-#: includes/emails/class-wcs-email-expired-subscription.php:133
-#: includes/emails/class-wcs-email-on-hold-subscription.php:133
+#: includes/emails/class-wcs-email-cancelled-subscription.php:134
+#: includes/emails/class-wcs-email-expired-subscription.php:132
+#: includes/emails/class-wcs-email-on-hold-subscription.php:132
#. translators: placeholder is admin email
msgid ""
"Enter recipients (comma separated) for this email. Defaults to "
"%s."
msgstr ""
-#: includes/emails/class-wcs-email-cancelled-subscription.php:142
-#: includes/emails/class-wcs-email-expired-subscription.php:140
-#: includes/emails/class-wcs-email-on-hold-subscription.php:140
+#: includes/emails/class-wcs-email-cancelled-subscription.php:141
+#: includes/emails/class-wcs-email-expired-subscription.php:139
+#: includes/emails/class-wcs-email-on-hold-subscription.php:139
msgid ""
"This controls the email subject line. Leave blank to use the default "
"subject: %s."
msgstr ""
-#: includes/emails/class-wcs-email-cancelled-subscription.php:149
-#: includes/emails/class-wcs-email-expired-subscription.php:147
-#: includes/emails/class-wcs-email-on-hold-subscription.php:147
+#: includes/emails/class-wcs-email-cancelled-subscription.php:148
+#: includes/emails/class-wcs-email-expired-subscription.php:146
+#: includes/emails/class-wcs-email-on-hold-subscription.php:146
msgid ""
"This controls the main heading contained within the email notification. "
"Leave blank to use the default heading: %s."
msgstr ""
-#: includes/emails/class-wcs-email-cancelled-subscription.php:156
-#: includes/emails/class-wcs-email-expired-subscription.php:154
-#: includes/emails/class-wcs-email-on-hold-subscription.php:154
+#: includes/emails/class-wcs-email-cancelled-subscription.php:155
+#: includes/emails/class-wcs-email-expired-subscription.php:153
+#: includes/emails/class-wcs-email-on-hold-subscription.php:153
msgid "Choose which format of email to send."
msgstr ""
-#: includes/emails/class-wcs-email-customer-completed-renewal-order.php:25
+#: includes/emails/class-wcs-email-completed-renewal-order.php:25
msgid "Completed Renewal Order"
msgstr ""
-#: includes/emails/class-wcs-email-customer-completed-renewal-order.php:26
+#: includes/emails/class-wcs-email-completed-renewal-order.php:26
msgid ""
"Renewal order complete emails are sent to the customer when a subscription "
"renewal order is marked complete and usually indicates that the item for "
"that renewal period has been shipped."
msgstr ""
-#: includes/emails/class-wcs-email-customer-completed-switch-order.php:26
+#: includes/emails/class-wcs-email-completed-switch-order.php:26
msgid "Subscription Switch Complete"
msgstr ""
-#: includes/emails/class-wcs-email-customer-completed-switch-order.php:27
+#: includes/emails/class-wcs-email-completed-switch-order.php:27
msgid ""
"Subscription switch complete emails are sent to the customer when a "
"subscription is switched successfully."
msgstr ""
-#: includes/emails/class-wcs-email-customer-completed-switch-order.php:30
+#: includes/emails/class-wcs-email-completed-switch-order.php:30
msgid "Your subscription change is complete"
msgstr ""
-#: includes/emails/class-wcs-email-customer-completed-switch-order.php:31
+#: includes/emails/class-wcs-email-completed-switch-order.php:31
msgid "Your {blogname} subscription change from {order_date} is complete"
msgstr ""
-#: includes/emails/class-wcs-email-customer-completed-switch-order.php:38
+#: includes/emails/class-wcs-email-completed-switch-order.php:38
msgid "Your subscription change is complete - download your files"
msgstr ""
-#: includes/emails/class-wcs-email-customer-completed-switch-order.php:39
+#: includes/emails/class-wcs-email-completed-switch-order.php:39
msgid ""
"Your {blogname} subscription change from {order_date} is complete - "
"download your files"
@@ -2878,25 +2874,6 @@ msgstr ""
msgid "Automatic payment failed for order {order_number}"
msgstr ""
-#: includes/emails/class-wcs-email-customer-processing-renewal-order.php:24
-msgid "Processing Renewal order"
-msgstr ""
-
-#: includes/emails/class-wcs-email-customer-processing-renewal-order.php:25
-msgid ""
-"This is an order notification sent to the customer after payment for a "
-"subscription renewal order is completed. It contains the renewal order "
-"details."
-msgstr ""
-
-#: includes/emails/class-wcs-email-customer-processing-renewal-order.php:28
-msgid "Thank you for your order"
-msgstr ""
-
-#: includes/emails/class-wcs-email-customer-processing-renewal-order.php:29
-msgid "Your {blogname} renewal order receipt from {order_date}"
-msgstr ""
-
#: includes/emails/class-wcs-email-customer-renewal-invoice.php:40
msgid "Customer Renewal Invoice"
msgstr ""
@@ -2918,20 +2895,20 @@ msgstr ""
msgid "Invoice for renewal order {order_number}"
msgstr ""
-#: includes/emails/class-wcs-email-expired-subscription.php:27
+#: includes/emails/class-wcs-email-expired-subscription.php:26
msgid "Expired Subscription"
msgstr ""
-#: includes/emails/class-wcs-email-expired-subscription.php:28
+#: includes/emails/class-wcs-email-expired-subscription.php:27
msgid "Expired Subscription emails are sent when a customer's subscription expires."
msgstr ""
-#: includes/emails/class-wcs-email-expired-subscription.php:30
+#: includes/emails/class-wcs-email-expired-subscription.php:29
msgid "Subscription Expired"
msgstr ""
-#: includes/emails/class-wcs-email-expired-subscription.php:59
-#: includes/emails/class-wcs-email-on-hold-subscription.php:59
+#: includes/emails/class-wcs-email-expired-subscription.php:58
+#: includes/emails/class-wcs-email-on-hold-subscription.php:58
msgid "Subscription argument passed in is not an object."
msgstr ""
@@ -2968,17 +2945,17 @@ msgstr ""
msgid "[{blogname}] Subscription Switched ({order_number}) - {order_date}"
msgstr ""
-#: includes/emails/class-wcs-email-on-hold-subscription.php:27
+#: includes/emails/class-wcs-email-on-hold-subscription.php:26
msgid "Suspended Subscription"
msgstr ""
-#: includes/emails/class-wcs-email-on-hold-subscription.php:28
+#: includes/emails/class-wcs-email-on-hold-subscription.php:27
msgid ""
"Suspended Subscription emails are sent when a customer manually suspends "
"their subscription."
msgstr ""
-#: includes/emails/class-wcs-email-on-hold-subscription.php:30
+#: includes/emails/class-wcs-email-on-hold-subscription.php:29
msgid "Subscription Suspended"
msgstr ""
@@ -3003,42 +2980,61 @@ msgid ""
"to run {retry_time}"
msgstr ""
-#: includes/gateways/class-wc-subscriptions-payment-gateways.php:132
+#: includes/emails/class-wcs-email-processing-renewal-order.php:24
+msgid "Processing Renewal order"
+msgstr ""
+
+#: includes/emails/class-wcs-email-processing-renewal-order.php:25
+msgid ""
+"This is an order notification sent to the customer after payment for a "
+"subscription renewal order is completed. It contains the renewal order "
+"details."
+msgstr ""
+
+#: includes/emails/class-wcs-email-processing-renewal-order.php:28
+msgid "Thank you for your order"
+msgstr ""
+
+#: includes/emails/class-wcs-email-processing-renewal-order.php:29
+msgid "Your {blogname} renewal order receipt from {order_date}"
+msgstr ""
+
+#: includes/gateways/class-wc-subscriptions-payment-gateways.php:131
msgid ""
"Sorry, it seems there are no available payment methods which support "
"subscriptions. Please contact us if you require assistance or wish to make "
"alternate arrangements."
msgstr ""
-#: includes/gateways/paypal/class-wcs-paypal.php:210
+#: includes/gateways/paypal/class-wcs-paypal.php:199
msgid "Unable to find order for PayPal billing agreement."
msgstr ""
-#: includes/gateways/paypal/class-wcs-paypal.php:267
+#: includes/gateways/paypal/class-wcs-paypal.php:256
msgid "An error occurred, please try again or try an alternate form of payment."
msgstr ""
-#: includes/gateways/paypal/class-wcs-paypal.php:374
+#: includes/gateways/paypal/class-wcs-paypal.php:360
#. translators: placeholders are PayPal API error code and PayPal API error
#. message
msgid "PayPal API error: (%d) %s"
msgstr ""
-#: includes/gateways/paypal/class-wcs-paypal.php:379
+#: includes/gateways/paypal/class-wcs-paypal.php:365
#. translators: placeholder is PayPal transaction status message
msgid "PayPal Transaction Held: %s"
msgstr ""
-#: includes/gateways/paypal/class-wcs-paypal.php:391
+#: includes/gateways/paypal/class-wcs-paypal.php:377
#. translators: placeholder is PayPal transaction status message
msgid "PayPal payment declined: %s"
msgstr ""
-#: includes/gateways/paypal/class-wcs-paypal.php:395
+#: includes/gateways/paypal/class-wcs-paypal.php:381
msgid "PayPal payment approved (ID: %s)"
msgstr ""
-#: includes/gateways/paypal/class-wcs-paypal.php:448
+#: includes/gateways/paypal/class-wcs-paypal.php:434
msgid ""
"Are you sure you want to change the payment method from PayPal standard?\n"
"\n"
@@ -3052,7 +3048,7 @@ msgid ""
"break existing subscriptions."
msgstr ""
-#: includes/gateways/paypal/includes/admin/class-wcs-paypal-admin.php:110
+#: includes/gateways/paypal/includes/admin/class-wcs-paypal-admin.php:105
#. translators: placeholders are opening and closing link tags. 1$-2$: to docs
#. on woocommerce, 3$-4$ to gateway settings on the site
msgid ""
@@ -3061,7 +3057,7 @@ msgid ""
"Subscriptions."
msgstr ""
-#: includes/gateways/paypal/includes/admin/class-wcs-paypal-admin.php:123
+#: includes/gateways/paypal/includes/admin/class-wcs-paypal-admin.php:116
#. translators: placeholders are opening and closing strong and link tags.
#. 1$-2$: strong tags, 3$-8$ link to docs on woocommerce
msgid ""
@@ -3071,14 +3067,14 @@ msgid ""
"%5$sCheck PayPal Account%6$s %3$sLearn more %7$s"
msgstr ""
-#: includes/gateways/paypal/includes/admin/class-wcs-paypal-admin.php:140
+#: includes/gateways/paypal/includes/admin/class-wcs-paypal-admin.php:132
#. translators: placeholders are opening and closing strong tags.
msgid ""
"%1$sPayPal Reference Transactions are enabled on your account%2$s. All "
"subscription management features are now enabled. Happy selling!"
msgstr ""
-#: includes/gateways/paypal/includes/admin/class-wcs-paypal-admin.php:151
+#: includes/gateways/paypal/includes/admin/class-wcs-paypal-admin.php:143
#. translators: placeholders are link opening and closing tags. 1$-2$: to
#. gateway settings, 3$-4$: support docs on woocommerce.com
msgid ""
@@ -3086,7 +3082,7 @@ msgid ""
"Please update your %1$sAPI credentials%2$s. %3$sLearn more%4$s."
msgstr ""
-#: includes/gateways/paypal/includes/admin/class-wcs-paypal-admin.php:164
+#: includes/gateways/paypal/includes/admin/class-wcs-paypal-admin.php:156
#. translators: placeholders are opening and closing link tags. 1$-2$: docs on
#. woocommerce, 3$-4$: dismiss link
msgid ""
@@ -3094,17 +3090,7 @@ msgid ""
"subscription IDs. %1$sLearn more%2$s. %3$sDismiss%4$s."
msgstr ""
-#: includes/gateways/paypal/includes/admin/class-wcs-paypal-admin.php:179
-msgid ""
-"%sA fatal error has occurred when processing a recent subscription payment "
-"with PayPal. Please %sopen a new ticket at WooCommerce Support%s "
-"immediately to get this resolved.%sIn order to get the quickest possible "
-"response please attach a %sTemporary Admin Login%s and a copy of your PHP "
-"error logs to your support ticket.%sLast recorded error: %sTo see the full "
-"error, view the %s log file from the %sWooCommerce logs screen.%s"
-msgstr ""
-
-#: includes/gateways/paypal/includes/admin/class-wcs-paypal-admin.php:269
+#: includes/gateways/paypal/includes/admin/class-wcs-paypal-admin.php:265
msgid "PayPal Subscription ID:"
msgstr ""
@@ -3134,28 +3120,28 @@ msgstr ""
msgid "IPN subscription sign up completed."
msgstr ""
-#: includes/gateways/paypal/includes/class-wcs-paypal-standard-ipn-handler.php:321
-#: includes/gateways/paypal/includes/class-wcs-paypal-standard-ipn-handler.php:398
+#: includes/gateways/paypal/includes/class-wcs-paypal-standard-ipn-handler.php:332
+#: includes/gateways/paypal/includes/class-wcs-paypal-standard-ipn-handler.php:415
msgid "IPN subscription payment completed."
msgstr ""
-#: includes/gateways/paypal/includes/class-wcs-paypal-standard-ipn-handler.php:360
+#: includes/gateways/paypal/includes/class-wcs-paypal-standard-ipn-handler.php:377
msgid "IPN subscription failing payment method changed."
msgstr ""
-#: includes/gateways/paypal/includes/class-wcs-paypal-standard-ipn-handler.php:450
+#: includes/gateways/paypal/includes/class-wcs-paypal-standard-ipn-handler.php:467
msgid "IPN subscription suspended."
msgstr ""
-#: includes/gateways/paypal/includes/class-wcs-paypal-standard-ipn-handler.php:473
+#: includes/gateways/paypal/includes/class-wcs-paypal-standard-ipn-handler.php:490
msgid "IPN subscription cancelled."
msgstr ""
-#: includes/gateways/paypal/includes/class-wcs-paypal-standard-ipn-handler.php:489
+#: includes/gateways/paypal/includes/class-wcs-paypal-standard-ipn-handler.php:506
msgid "IPN subscription payment failure."
msgstr ""
-#: includes/gateways/paypal/includes/class-wcs-paypal-standard-ipn-handler.php:627
+#: includes/gateways/paypal/includes/class-wcs-paypal-standard-ipn-handler.php:644
msgid "Invalid PayPal IPN Payload: unable to find matching subscription."
msgstr ""
@@ -3175,7 +3161,34 @@ msgstr ""
msgid "PayPal API error - credentials are incorrect."
msgstr ""
-#: includes/payment-retry/class-wcs-retry-admin.php:48
+#: includes/gateways/paypal/includes/templates/html-ipn-failure-notice.php:15
+#. translators: $1 and $2 are opening link tags, $3 is a closing link tag.
+msgid ""
+"A fatal error has occurred while processing a recent subscription payment "
+"with PayPal. Please %1$sopen a new ticket at WooCommerce Support%3$s "
+"immediately to get this resolved. %2$sLearn more »%3$s"
+msgstr ""
+
+#: includes/gateways/paypal/includes/templates/html-ipn-failure-notice.php:24
+#. translators: $1 and $2 are opening and closing link tags, respectively.
+msgid ""
+"To resolve this as quickly as possible, please create a %1$stemporary "
+"administrator account%2$s with the user email support@prospress.com."
+msgstr ""
+
+#: includes/gateways/paypal/includes/templates/html-ipn-failure-notice.php:29
+msgid "Last recorded error:"
+msgstr ""
+
+#: includes/gateways/paypal/includes/templates/html-ipn-failure-notice.php:36
+#. translators: $1 is the log file name. $2 and $3 are opening and closing link
+#. tags, respectively.
+msgid ""
+"To see the full error, view the %1$s log file from the %2$sWooCommerce logs "
+"screen.%3$s."
+msgstr ""
+
+#: includes/payment-retry/class-wcs-retry-admin.php:46
msgid "Automatic Failed Payment Retries"
msgstr ""
@@ -3209,15 +3222,15 @@ msgid_plural "%d Cancelled Payment Retries"
msgstr[0] ""
msgstr[1] ""
-#: includes/payment-retry/class-wcs-retry-admin.php:135
+#: includes/payment-retry/class-wcs-retry-admin.php:139
msgid "Retry Failed Payments"
msgstr ""
-#: includes/payment-retry/class-wcs-retry-admin.php:136
+#: includes/payment-retry/class-wcs-retry-admin.php:140
msgid "Enable automatic retry of failed recurring payments"
msgstr ""
-#: includes/payment-retry/class-wcs-retry-admin.php:140
+#: includes/payment-retry/class-wcs-retry-admin.php:144
msgid ""
"Attempt to recover recurring revenue that would otherwise be lost due to "
"payment methods being declined only temporarily. %sLearn more%s."
@@ -3306,11 +3319,11 @@ msgstr ""
msgid "Browser User Agent"
msgstr ""
-#: includes/privacy/class-wcs-privacy-exporters.php:83 wcs-functions.php:274
+#: includes/privacy/class-wcs-privacy-exporters.php:83 wcs-functions.php:282
msgid "Billing Address"
msgstr ""
-#: includes/privacy/class-wcs-privacy-exporters.php:84 wcs-functions.php:273
+#: includes/privacy/class-wcs-privacy-exporters.php:84 wcs-functions.php:281
msgid "Shipping Address"
msgstr ""
@@ -3326,12 +3339,12 @@ msgstr ""
msgid "WooCommerce Subscriptions"
msgstr ""
-#: includes/privacy/class-wcs-privacy.php:46
-#: includes/privacy/class-wcs-privacy.php:47
+#: includes/privacy/class-wcs-privacy.php:43
+#: includes/privacy/class-wcs-privacy.php:44
msgid "Subscriptions Data"
msgstr ""
-#: includes/privacy/class-wcs-privacy.php:95
+#: includes/privacy/class-wcs-privacy.php:92
msgid ""
"By using WooCommerce Subscriptions, you may be storing personal data and "
"depending on which third-party payment processors you’re using to take "
@@ -3339,24 +3352,24 @@ msgid ""
"sources."
msgstr ""
-#: includes/privacy/class-wcs-privacy.php:97
+#: includes/privacy/class-wcs-privacy.php:94
#. translators: placeholders are opening and closing link tags, linking to
#. additional privacy policy documentation.
msgid "What we collect and store"
msgstr ""
-#: includes/privacy/class-wcs-privacy.php:98
+#: includes/privacy/class-wcs-privacy.php:95
msgid ""
"For the purposes of processing recurring subscription payments, we store "
"the customer's name, billing address, shipping address, email address, "
"phone number and credit card/payment details."
msgstr ""
-#: includes/privacy/class-wcs-privacy.php:99
+#: includes/privacy/class-wcs-privacy.php:96
msgid "What we share with others"
msgstr ""
-#: includes/privacy/class-wcs-privacy.php:100
+#: includes/privacy/class-wcs-privacy.php:97
msgid ""
"What personal information your store shares with external sources depends "
"on which third-party payment processor plugins you are using to collect "
@@ -3364,7 +3377,7 @@ msgid ""
"policies to inform this section of your privacy policy."
msgstr ""
-#: includes/privacy/class-wcs-privacy.php:102
+#: includes/privacy/class-wcs-privacy.php:99
#. translators: placeholders are opening and closing link tags, linking to
#. additional privacy policy documentation.
msgid ""
@@ -3372,60 +3385,63 @@ msgid ""
"see the %sPayPal Privacy Policy%s for more details."
msgstr ""
-#: includes/privacy/class-wcs-privacy.php:112
+#: includes/privacy/class-wcs-privacy.php:109
msgid "Cancel and remove personal data"
msgstr ""
-#: includes/privacy/class-wcs-privacy.php:178
+#: includes/privacy/class-wcs-privacy.php:175
msgid "Removed personal data from %d subscription."
msgid_plural "Removed personal data from %d subscriptions."
msgstr[0] ""
msgstr[1] ""
-#: includes/privacy/class-wcs-privacy.php:197
+#: includes/privacy/class-wcs-privacy.php:194
#. translators: placeholders are opening and closing tags.
msgid ""
"%sNote:%s Orders which are related to subscriptions will not be included in "
"the orders affected by these settings."
msgstr ""
-#: includes/privacy/class-wcs-privacy.php:218
-msgid "Remove personal data from subscriptions"
+#: includes/privacy/class-wcs-privacy.php:214
+msgid "account erasure request"
msgstr ""
#: includes/privacy/class-wcs-privacy.php:220
-#. Translators: placeholders are opening and closing link tags linking to the
-#. erasure request screen.
-msgid ""
-"When handling an %saccount erasure request%s, should personal data within "
-"subscriptions be retained or removed?"
+msgid "Remove personal data from subscriptions"
msgstr ""
-#: includes/privacy/class-wcs-privacy.php:229
+#: includes/privacy/class-wcs-privacy.php:222
+#. Translators: %s URL to erasure request screen.
+msgid ""
+"When handling an %s, should personal data within subscriptions be retained "
+"or removed?"
+msgstr ""
+
+#: includes/privacy/class-wcs-privacy.php:231
msgid "Retain ended subscriptions"
msgstr ""
-#: includes/privacy/class-wcs-privacy.php:230
+#: includes/privacy/class-wcs-privacy.php:232
msgid ""
"Retain ended subscriptions and their related orders for a specified "
"duration before anonymizing the personal data within them."
msgstr ""
-#: includes/privacy/class-wcs-privacy.php:233
+#: includes/privacy/class-wcs-privacy.php:235
msgid "N/A"
msgstr ""
-#: includes/privacy/class-wcs-privacy.php:274
+#: includes/privacy/class-wcs-privacy.php:276
msgid "Customers with a subscription are excluded from this setting."
msgstr ""
-#: includes/upgrades/class-wc-subscriptions-upgrader.php:323
+#: includes/upgrades/class-wc-subscriptions-upgrader.php:330
#. translators: placeholder is a list of version numbers (e.g. "1.3 & 1.4 &
#. 1.5")
msgid "Database updated to version %s"
msgstr ""
-#: includes/upgrades/class-wc-subscriptions-upgrader.php:346
+#: includes/upgrades/class-wc-subscriptions-upgrader.php:347
#. translators: 1$: number of action scheduler hooks upgraded, 2$:
#. "{execution_time}", will be replaced on front end with actual time
msgid ""
@@ -3433,36 +3449,36 @@ msgid ""
"seconds)."
msgstr ""
-#: includes/upgrades/class-wc-subscriptions-upgrader.php:362
+#: includes/upgrades/class-wc-subscriptions-upgrader.php:359
#. translators: 1$: number of subscriptions upgraded, 2$: "{execution_time}",
#. will be replaced on front end with actual time it took
msgid "Migrated %1$s subscriptions to the new structure (in %2$s seconds)."
msgstr ""
-#: includes/upgrades/class-wc-subscriptions-upgrader.php:375
+#: includes/upgrades/class-wc-subscriptions-upgrader.php:372
#. translators: 1$: error message, 2$: opening link tag, 3$: closing link tag
msgid ""
"Unable to upgrade subscriptions.", 4$: "", 5$: "", 6$: "", 7$: "", 8$: #. "
" @@ -4867,7 +4919,7 @@ msgid "" "%6$sVariable subscription%7$s.%8$s" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:788 +#: includes/admin/class-wc-subscriptions-admin.php:792 #. translators: placeholders are for HTML tags. They are 1$: "", 4$: "
" msgctxt "used in admin pointer script params in javascript as price pointer content" @@ -4877,17 +4929,17 @@ msgid "" "sign-up fee and free trial.%4$s" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:1125 +#: includes/admin/class-wc-subscriptions-admin.php:1124 msgctxt "option section heading" msgid "Renewals" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:1157 +#: includes/admin/class-wc-subscriptions-admin.php:1156 msgctxt "options section heading" msgid "Miscellaneous" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:1165 +#: includes/admin/class-wc-subscriptions-admin.php:1164 msgctxt "there's a number immediately in front of this text" msgid "suspensions per billing period." msgstr "" @@ -4897,26 +4949,26 @@ msgctxt "there's a number immediately in front of this text" msgid "days prior to Renewal Day" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:1446 -#: includes/admin/class-wcs-admin-system-status.php:92 +#: includes/admin/class-wc-subscriptions-admin.php:1445 +#: includes/admin/class-wcs-admin-system-status.php:93 msgctxt "label that indicates whether debugging is turned on for the plugin" msgid "WCS_DEBUG" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:1452 -#: includes/admin/class-wcs-admin-system-status.php:104 +#: includes/admin/class-wc-subscriptions-admin.php:1451 +#: includes/admin/class-wcs-admin-system-status.php:107 msgctxt "Live or Staging, Label on WooCommerce -> System Status page" msgid "Subscriptions Mode" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:1453 -#: includes/admin/class-wcs-admin-system-status.php:106 +#: includes/admin/class-wc-subscriptions-admin.php:1452 +#: includes/admin/class-wcs-admin-system-status.php:109 msgctxt "refers to staging site" msgid "Staging" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:1453 -#: includes/admin/class-wcs-admin-system-status.php:106 +#: includes/admin/class-wc-subscriptions-admin.php:1452 +#: includes/admin/class-wcs-admin-system-status.php:109 msgctxt "refers to live site" msgid "Live" msgstr "" @@ -4972,72 +5024,82 @@ msgctxt "Subscription title on admin table. (e.g.: #211 for John Doe)" msgid "%1$s#%2$s%3$s for %4$s" msgstr "" -#: includes/admin/class-wcs-admin-post-types.php:878 +#: includes/admin/class-wcs-admin-post-types.php:889 #. translators: placeholder is previous post title msgctxt "used in post updated messages" msgid "Subscription restored to revision from %s" msgstr "" -#: includes/admin/class-wcs-admin-post-types.php:883 +#: includes/admin/class-wcs-admin-post-types.php:894 msgctxt "used in \"Subscription scheduled for', + '' + );?> +
+', + '' + );?> +
+ + array( 'href' => array() ) ) ); ?>
+
+failed-scheduled-actions', + '', + '' + );?> +
+ diff --git a/templates/admin/html-variation-price.php b/templates/admin/html-variation-price.php old mode 100755 new mode 100644 index a860283..02f8268 --- a/templates/admin/html-variation-price.php +++ b/templates/admin/html-variation-price.php @@ -28,7 +28,7 @@ if ( ! defined( 'ABSPATH' ) ) { - +