element above the able.
+ */
+ protected $table_header;
+
+ /**
+ * Enables bulk actions. It must be an array where the key is the action name
+ * and the value is the label (which is translated automatically). It is important
+ * to notice that it will check that the method exists (`bulk_$name`) and will throw
+ * an exception if it does not exists.
+ *
+ * This class will automatically check if the current request has a bulk action, will do the
+ * validations and afterwards will execute the bulk method, with two arguments. The first argument
+ * is the array with primary keys, the second argument is a string with a list of the primary keys,
+ * escaped and ready to use (with `IN`).
+ */
+ protected $bulk_actions = array();
+
+ /**
+ * Makes translation easier, it basically just wraps
+ * `_x` with some default (the package name)
+ */
+ protected function translate( $text, $context = '' ) {
+ return _x( $text, $context, $this->package );
+ }
+
+ /**
+ * Reads `$this->bulk_actions` and returns an array that WP_List_Table understands. It
+ * also validates that the bulk method handler exists. It throws an exception because
+ * this is a library meant for developers and missing a bulk method is a development-time error.
+ */
+ protected function get_bulk_actions() {
+ $actions = array();
+
+ foreach ( $this->bulk_actions as $action => $label ) {
+ if ( ! is_callable( array( $this, 'bulk_' . $action ) ) ) {
+ throw new RuntimeException( "The bulk action $action does not have a callback method" );
+ }
+
+ $actions[ $action ] = $this->translate( $label );
+ }
+
+ return $actions;
+ }
+
+ /**
+ * Checks if the current request has a bulk action. If that is the case it will validate and will
+ * execute the bulk method handler. Regardless if the action is valid or not it will redirect to
+ * the previous page removing the current arguments that makes this request a bulk action.
+ */
+ protected function process_bulk_action() {
+ global $wpdb;
+ // Detect when a bulk action is being triggered.
+ $action = $this->current_action();
+
+ if ( ! $action ) {
+ return;
+ }
+
+ check_admin_referer( 'bulk-' . $this->_args['plural'] );
+
+ $method = 'bulk_' . $action;
+ if ( array_key_exists( $action, $this->bulk_actions ) && is_callable( array( $this, $method ) ) && ! empty( $_GET['ID'] ) && is_array( $_GET['ID'] ) ) {
+ $ids_sql = '(' . implode( ',', array_fill( 0, count( $_GET['ID'] ), '%s' ) ) . ')';
+ $this->$method( $_GET['ID'], $wpdb->prepare( $ids_sql, $_GET['ID'] ) );
+ }
+
+ wp_redirect( remove_query_arg(
+ array( '_wp_http_referer', '_wpnonce', 'ID', 'action', 'action2' ),
+ wp_unslash( $_SERVER['REQUEST_URI'] )
+ ) );
+ exit;
+ }
+
+ /**
+ * Default code for deleting entries. We trust ids_sql because it is
+ * validated already by process_bulk_action()
+ */
+ protected function bulk_delete( array $ids, $ids_sql ) {
+ global $wpdb;
+
+ $wpdb->query( "DELETE FROM {$this->table_name} WHERE {$this->ID} IN $ids_sql" );
+ }
+
+ /**
+ * Prepares the _column_headers property which is used by WP_Table_List at rendering.
+ * It merges the columns and the sortable columns.
+ */
+ protected function prepare_column_headers() {
+ $this->_column_headers = array(
+ $this->get_columns(),
+ array(),
+ $this->get_sortable_columns(),
+ );
+ }
+
+ /**
+ * Reads $this->sort_by and returns the columns name in a format that WP_Table_List
+ * expects
+ */
+ public function get_sortable_columns() {
+ $sort_by = array();
+ foreach ( $this->sort_by as $column ) {
+ $sort_by[ $column ] = array( $column, true );
+ }
+ return $sort_by;
+ }
+
+ /**
+ * Returns the columns names for rendering. It adds a checkbox for selecting everything
+ * as the first column
+ */
+ public function get_columns() {
+ $columns = array_merge(
+ array( 'cb' => '' ),
+ array_map( array( $this, 'translate' ), $this->columns )
+ );
+
+ return $columns;
+ }
+
+ /**
+ * Get prepared LIMIT clause for items query
+ *
+ * @global wpdb $wpdb
+ *
+ * @return string Prepared LIMIT clause for items query.
+ */
+ protected function get_items_query_limit() {
+ global $wpdb;
+
+ $per_page = $this->get_items_per_page( $this->package . '_items_per_page', $this->items_per_page );
+ return $wpdb->prepare( 'LIMIT %d', $per_page );
+ }
+
+ /**
+ * Returns the number of items to offset/skip for this current view.
+ *
+ * @return int
+ */
+ protected function get_items_offset() {
+ $per_page = $this->get_items_per_page( $this->package . '_items_per_page', $this->items_per_page );
+ $current_page = $this->get_pagenum();
+ if ( 1 < $current_page ) {
+ $offset = $per_page * ( $current_page - 1 );
+ } else {
+ $offset = 0;
+ }
+
+ return $offset;
+ }
+
+ /**
+ * Get prepared OFFSET clause for items query
+ *
+ * @global wpdb $wpdb
+ *
+ * @return string Prepared OFFSET clause for items query.
+ */
+ protected function get_items_query_offset() {
+ global $wpdb;
+
+ return $wpdb->prepare( 'OFFSET %d', $this->get_items_offset() );
+ }
+
+ /**
+ * Prepares the ORDER BY sql statement. It uses `$this->sort_by` to know which
+ * columns are sortable. This requests validates the orderby $_GET parameter is a valid
+ * column and sortable. It will also use order (ASC|DESC) using DESC by default.
+ */
+ protected function get_items_query_order() {
+ if ( empty( $this->sort_by ) ) {
+ return '';
+ }
+
+ $orderby = esc_sql( $this->get_request_orderby() );
+ $order = esc_sql( $this->get_request_order() );
+
+ return "ORDER BY {$orderby} {$order}";
+ }
+
+ /**
+ * Return the sortable column specified for this request to order the results by, if any.
+ *
+ * @return string
+ */
+ protected function get_request_orderby() {
+
+ $valid_sortable_columns = array_values( $this->sort_by );
+
+ if ( ! empty( $_GET['orderby'] ) && in_array( $_GET['orderby'], $valid_sortable_columns ) ) {
+ $orderby = wc_clean( $_GET['orderby'] );
+ } else {
+ $orderby = $valid_sortable_columns[0];
+ }
+
+ return $orderby;
+ }
+
+ /**
+ * Return the sortable column order specified for this request.
+ *
+ * @return string
+ */
+ protected function get_request_order() {
+
+ if ( ! empty( $_GET['order'] ) && 'desc' === strtolower( $_GET['order'] ) ) {
+ $order = 'DESC';
+ } else {
+ $order = 'ASC';
+ }
+
+ return $order;
+ }
+
+ /**
+ * Return the status filter for this request, if any.
+ *
+ * @return string
+ */
+ protected function get_request_status() {
+ $status = ( ! empty( $_GET['status'] ) ) ? $_GET['status'] : '';
+ return $status;
+ }
+
+ /**
+ * Return the search filter for this request, if any.
+ *
+ * @return string
+ */
+ protected function get_request_search_query() {
+ $search_query = ( ! empty( $_GET['s'] ) ) ? $_GET['s'] : '';
+ return $search_query;
+ }
+
+ /**
+ * Process and return the columns name. This is meant for using with SQL, this means it
+ * always includes the primary key.
+ *
+ * @return array
+ */
+ protected function get_table_columns() {
+ $columns = array_keys( $this->columns );
+ if ( ! in_array( $this->ID, $columns ) ) {
+ $columns[] = $this->ID;
+ }
+
+ return $columns;
+ }
+
+ /**
+ * Check if the current request is doing a "full text" search. If that is the case
+ * prepares the SQL to search texts using LIKE.
+ *
+ * If the current request does not have any search or if this list table does not support
+ * that feature it will return an empty string.
+ *
+ * TODO:
+ * - Improve search doing LIKE by word rather than by phrases.
+ *
+ * @return string
+ */
+ protected function get_items_query_search() {
+ global $wpdb;
+
+ if ( empty( $_GET['s'] ) || empty( $this->search_by ) ) {
+ return '';
+ }
+
+ $filter = array();
+ foreach ( $this->search_by as $column ) {
+ $filter[] = '`' . $column . '` like "%' . $wpdb->esc_like( $_GET['s'] ) . '%"';
+ }
+ return implode( ' OR ', $filter );
+ }
+
+ /**
+ * Prepares the SQL to filter rows by the options defined at `$this->filter_by`. Before trusting
+ * any data sent by the user it validates that it is a valid option.
+ */
+ protected function get_items_query_filters() {
+ global $wpdb;
+
+ if ( ! $this->filter_by || empty( $_GET['filter_by'] ) || ! is_array( $_GET['filter_by'] ) ) {
+ return '';
+ }
+
+ $filter = array();
+
+ foreach ( $this->filter_by as $column => $options ) {
+ if ( empty( $_GET['filter_by'][ $column ] ) || empty( $options[ $_GET['filter_by'][ $column ] ] ) ) {
+ continue;
+ }
+
+ $filter[] = $wpdb->prepare( "`$column` = %s", $_GET['filter_by'][ $column ] );
+ }
+
+ return implode( ' AND ', $filter );
+
+ }
+
+ /**
+ * Prepares the data to feed WP_Table_List.
+ *
+ * This has the core for selecting, sorting and filting data. To keep the code simple
+ * its logic is split among many methods (get_items_query_*).
+ *
+ * Beside populating the items this function will also count all the records that matches
+ * the filtering criteria and will do fill the pagination variables.
+ */
+ public function prepare_items() {
+ global $wpdb;
+
+ $this->process_bulk_action();
+
+ $this->process_row_actions();
+
+ if ( ! empty( $_REQUEST['_wp_http_referer'] ) ) {
+ // _wp_http_referer is used only on bulk actions, we remove it to keep the $_GET shorter
+ wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+ exit;
+ }
+
+ $this->prepare_column_headers();
+
+ $limit = $this->get_items_query_limit();
+ $offset = $this->get_items_query_offset();
+ $order = $this->get_items_query_order();
+ $where = array_filter(array(
+ $this->get_items_query_search(),
+ $this->get_items_query_filters(),
+ ));
+ $columns = '`' . implode( '`, `', $this->get_table_columns() ) . '`';
+
+ if ( ! empty( $where ) ) {
+ $where = 'WHERE ('. implode( ') AND (', $where ) . ')';
+ } else {
+ $where = '';
+ }
+
+ $sql = "SELECT $columns FROM {$this->table_name} {$where} {$order} {$limit} {$offset}";
+
+ $this->set_items( $wpdb->get_results( $sql, ARRAY_A ) );
+
+ $query_count = "SELECT COUNT({$this->ID}) FROM {$this->table_name} {$where}";
+ $total_items = $wpdb->get_var( $query_count );
+ $per_page = $this->get_items_per_page( $this->package . '_items_per_page', $this->items_per_page );
+ $this->set_pagination_args( array(
+ 'total_items' => $total_items,
+ 'per_page' => $per_page,
+ 'total_pages' => ceil( $total_items / $per_page ),
+ ) );
+ }
+
+ public function extra_tablenav( $which ) {
+ if ( ! $this->filter_by || 'top' !== $which ) {
+ return;
+ }
+
+ echo '';
+
+ foreach ( $this->filter_by as $id => $options ) {
+ $default = ! empty( $_GET['filter_by'][ $id ] ) ? $_GET['filter_by'][ $id ] : '';
+ if ( empty( $options[ $default ] ) ) {
+ $default = '';
+ }
+
+ echo '';
+ }
+
+ submit_button( $this->translate( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+ echo '';
+ }
+
+ /**
+ * Set the data for displaying. It will attempt to unserialize (There is a chance that some columns
+ * are serialized). This can be override in child classes for futher data transformation.
+ */
+ protected function set_items( array $items ) {
+ $this->items = array();
+ foreach ( $items as $item ) {
+ $this->items[ $item[ $this->ID ] ] = array_map( 'maybe_unserialize', $item );
+ }
+ }
+
+ /**
+ * Renders the checkbox for each row, this is the first column and it is named ID regardless
+ * of how the primary key is named (to keep the code simpler). The bulk actions will do the proper
+ * name transformation though using `$this->ID`.
+ */
+ public function column_cb( $row ) {
+ return '';
+ }
+
+ /**
+ * Renders the row-actions.
+ *
+ * This method renders the action menu, it reads the definition from the $row_actions property,
+ * and it checks that the row action method exists before rendering it.
+ *
+ * @param array $row Row to render
+ * @param $column_name Current row
+ * @return
+ */
+ protected function maybe_render_actions( $row, $column_name ) {
+ if ( empty( $this->row_actions[ $column_name ] ) ) {
+ return;
+ }
+
+ $row_id = $row[ $this->ID ];
+
+ $actions = '';
+ $action_count = 0;
+ foreach ( $this->row_actions[ $column_name ] as $action_key => $action ) {
+
+ $action_count++;
+
+ if ( ! method_exists( $this, 'row_action_' . $action_key ) ) {
+ continue;
+ }
+
+ $action_link = ! empty( $action['link'] ) ? $action['link'] : add_query_arg( array( 'row_action' => $action_key, 'row_id' => $row_id, 'nonce' => wp_create_nonce( $action_key . '::' . $row_id ) ) );
+ $span_class = ! empty( $action['class'] ) ? $action['class'] : $action_key;
+ $separator = ( $action_count < count( $this->row_actions[ $column_name ] ) ) ? ' | ' : '';
+
+ $actions .= sprintf( '', esc_attr( $span_class ) );
+ $actions .= sprintf( '%3$s', esc_url( $action_link ), esc_attr( $action['desc'] ), esc_html( $action['name'] ) );
+ $actions .= sprintf( '%s', $separator );
+ }
+ $actions .= '';
+ return $actions;
+ }
+
+ protected function process_row_actions() {
+ $parameters = array( 'row_action', 'row_id', 'nonce' );
+ foreach ( $parameters as $parameter ) {
+ if ( empty( $_REQUEST[ $parameter ] ) ) {
+ return;
+ }
+ }
+
+ $method = 'row_action_' . $_REQUEST['row_action'];
+
+ if ( $_REQUEST['nonce'] === wp_create_nonce( $_REQUEST[ 'row_action' ] . '::' . $_REQUEST[ 'row_id' ] ) && method_exists( $this, $method ) ) {
+ $this->$method( $_REQUEST['row_id'] );
+ }
+
+ wp_redirect( remove_query_arg(
+ array( 'row_id', 'row_action', 'nonce' ),
+ wp_unslash( $_SERVER['REQUEST_URI'] )
+ ) );
+ exit;
+ }
+
+ /**
+ * Default column formatting, it will escape everythig for security.
+ */
+ public function column_default( $item, $column_name ) {
+ $column_html = esc_html( $item[ $column_name ] );
+ $column_html .= $this->maybe_render_actions( $item, $column_name );
+ return $column_html;
+ }
+
+ /**
+ * Display the table heading and search query, if any
+ */
+ protected function display_header() {
+ echo '' . esc_attr( $this->table_header ) . '
';
+ if ( $this->get_request_search_query() ) {
+ echo '' . esc_attr( $this->translate( sprintf( 'Search results for "%s"', $this->get_request_search_query() ) ) ) . '';
+ }
+ echo '
';
+ }
+
+ /**
+ * Display the table heading and search query, if any
+ */
+ protected function display_admin_notices() {
+ foreach ( $this->admin_notices as $notice ) {
+ echo '';
+ echo ' ' . wp_kses_post( $notice['message'] ) . '
';
+ echo '';
+ }
+ }
+
+ /**
+ * Prints the available statuses so the user can click to filter.
+ */
+ protected function display_filter_by_status() {
+
+ $status_list_items = array();
+ $request_status = $this->get_request_status();
+
+ // Helper to set 'all' filter when not set on status counts passed in
+ if ( ! isset( $this->status_counts['all'] ) ) {
+ $this->status_counts = array( 'all' => array_sum( $this->status_counts ) ) + $this->status_counts;
+ }
+
+ foreach ( $this->status_counts as $status_name => $count ) {
+
+ if ( 0 === $count ) {
+ continue;
+ }
+
+ if ( $status_name === $request_status || ( empty( $request_status ) && 'all' === $status_name ) ) {
+ $status_list_item = '
' . wp_kses_post( $notice['message'] ) . '
'; + echo '- ';
+ echo implode( " | \n", $status_list_items );
+ echo '
';
+ $this->display_header();
+ $this->display_admin_notices();
+ $this->display_filter_by_status();
+ $this->display_table();
+ echo '
';
+ }
+
+ /**
+ * Get the text to display in the search box on the list table.
+ */
+ protected function get_search_box_placeholder() {
+ return $this->translate( 'Search' );
+ }
+}
diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_Abstract_QueueRunner.php b/includes/libraries/action-scheduler/classes/ActionScheduler_Abstract_QueueRunner.php
new file mode 100755
index 0000000..21f9ee0
--- /dev/null
+++ b/includes/libraries/action-scheduler/classes/ActionScheduler_Abstract_QueueRunner.php
@@ -0,0 +1,89 @@
+store = $store ? $store : ActionScheduler_Store::instance();
+ $this->monitor = $monitor ? $monitor : new ActionScheduler_FatalErrorMonitor( $this->store );
+ $this->cleaner = $cleaner ? $cleaner : new ActionScheduler_QueueCleaner( $this->store );
+ }
+
+ /**
+ * Process an individual action.
+ *
+ * @param int $action_id The action ID to process.
+ */
+ public function process_action( $action_id ) {
+ try {
+ do_action( 'action_scheduler_before_execute', $action_id );
+ $action = $this->store->fetch_action( $action_id );
+ $this->store->log_execution( $action_id );
+ $action->execute();
+ do_action( 'action_scheduler_after_execute', $action_id );
+ $this->store->mark_complete( $action_id );
+ } catch ( Exception $e ) {
+ $this->store->mark_failure( $action_id );
+ do_action( 'action_scheduler_failed_execution', $action_id, $e );
+ }
+ $this->schedule_next_instance( $action );
+ }
+
+ /**
+ * Schedule the next instance of the action if necessary.
+ *
+ * @param ActionScheduler_Action $action
+ */
+ protected function schedule_next_instance( ActionScheduler_Action $action ) {
+ $schedule = $action->get_schedule();
+ $next = $schedule->next( as_get_datetime_object() );
+
+ if ( ! is_null( $next ) && $schedule->is_recurring() ) {
+ $this->store->save_action( $action, $next );
+ }
+ }
+
+ /**
+ * Run the queue cleaner.
+ *
+ * @author Jeremy Pry
+ */
+ protected function run_cleanup() {
+ $this->cleaner->clean();
+ }
+
+ /**
+ * Get the number of concurrent batches a runner allows.
+ *
+ * @return int
+ */
+ public function get_allowed_concurrent_batches() {
+ return apply_filters( 'action_scheduler_queue_runner_concurrent_batches', 5 );
+ }
+
+ /**
+ * Process actions in the queue.
+ *
+ * @author Jeremy Pry
+ * @return int The number of actions processed.
+ */
+ abstract public function run();
+}
diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_Action.php b/includes/libraries/action-scheduler/classes/ActionScheduler_Action.php
index 18ceb27..6258ba1 100755
--- a/includes/libraries/action-scheduler/classes/ActionScheduler_Action.php
+++ b/includes/libraries/action-scheduler/classes/ActionScheduler_Action.php
@@ -24,7 +24,6 @@ class ActionScheduler_Action {
/**
* @param string $hook
- * @return void
*/
protected function set_hook( $hook ) {
$this->hook = $hook;
@@ -74,4 +73,3 @@ class ActionScheduler_Action {
return FALSE;
}
}
-
\ No newline at end of file
diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_ActionFactory.php b/includes/libraries/action-scheduler/classes/ActionScheduler_ActionFactory.php
index f61ba48..8d97417 100755
--- a/includes/libraries/action-scheduler/classes/ActionScheduler_ActionFactory.php
+++ b/includes/libraries/action-scheduler/classes/ActionScheduler_ActionFactory.php
@@ -4,6 +4,46 @@
* Class ActionScheduler_ActionFactory
*/
class ActionScheduler_ActionFactory {
+
+ /**
+ * @param string $status The action's status in the data store
+ * @param string $hook The hook to trigger when this action runs
+ * @param array $args Args to pass to callbacks when the hook is triggered
+ * @param ActionScheduler_Schedule $schedule The action's schedule
+ * @param string $group A group to put the action in
+ *
+ * @return ActionScheduler_Action An instance of the stored action
+ */
+ public function get_stored_action( $status, $hook, array $args = array(), ActionScheduler_Schedule $schedule = null, $group = '' ) {
+
+ switch ( $status ) {
+ case ActionScheduler_Store::STATUS_PENDING :
+ $action_class = 'ActionScheduler_Action';
+ break;
+ case ActionScheduler_Store::STATUS_CANCELED :
+ $action_class = 'ActionScheduler_CanceledAction';
+ break;
+ default :
+ $action_class = 'ActionScheduler_FinishedAction';
+ break;
+ }
+
+ $action_class = apply_filters( 'action_scheduler_stored_action_class', $action_class, $status, $hook, $args, $schedule, $group );
+
+ $action = new $action_class( $hook, $args, $schedule, $group );
+
+ /**
+ * Allow 3rd party code to change the instantiated action for a given hook, args, schedule and group.
+ *
+ * @param ActionScheduler_Action $action The instantiated action.
+ * @param string $hook The instantiated action's hook.
+ * @param array $args The instantiated action's args.
+ * @param ActionScheduler_Schedule $schedule The instantiated action's schedule.
+ * @param string $group The instantiated action's group.
+ */
+ return apply_filters( 'action_scheduler_stored_action_instance', $action, $hook, $args, $schedule, $group );
+ }
+
/**
* @param string $hook The hook to trigger when this action runs
* @param array $args Args to pass when the hook is triggered
@@ -12,7 +52,7 @@ class ActionScheduler_ActionFactory {
*
* @return string The ID of the stored action
*/
- public function single( $hook, $args = array(), $when = NULL, $group = '' ) {
+ public function single( $hook, $args = array(), $when = null, $group = '' ) {
$date = as_get_datetime_object( $when );
$schedule = new ActionScheduler_SimpleSchedule( $date );
$action = new ActionScheduler_Action( $hook, $args, $schedule, $group );
@@ -28,7 +68,7 @@ class ActionScheduler_ActionFactory {
*
* @return string The ID of the stored action
*/
- public function recurring( $hook, $args = array(), $first = NULL, $interval = NULL, $group = '' ) {
+ public function recurring( $hook, $args = array(), $first = null, $interval = null, $group = '' ) {
if ( empty($interval) ) {
return $this->single( $hook, $args, $first, $group );
}
@@ -48,7 +88,7 @@ class ActionScheduler_ActionFactory {
*
* @return string The ID of the stored action
*/
- public function cron( $hook, $args = array(), $first = NULL, $schedule = NULL, $group = '' ) {
+ public function cron( $hook, $args = array(), $first = null, $schedule = null, $group = '' ) {
if ( empty($schedule) ) {
return $this->single( $hook, $args, $first, $group );
}
@@ -69,4 +109,3 @@ class ActionScheduler_ActionFactory {
return $store->save_action( $action );
}
}
-
\ No newline at end of file
diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_AdminView.php b/includes/libraries/action-scheduler/classes/ActionScheduler_AdminView.php
index fdfec0a..b1abf12 100755
--- a/includes/libraries/action-scheduler/classes/ActionScheduler_AdminView.php
+++ b/includes/libraries/action-scheduler/classes/ActionScheduler_AdminView.php
@@ -4,12 +4,10 @@
* Class ActionScheduler_AdminView
* @codeCoverageIgnore
*/
-class ActionScheduler_AdminView {
+class ActionScheduler_AdminView extends ActionScheduler_AdminView_Deprecated {
private static $admin_view = NULL;
- private static $admin_url;
-
/**
* @return ActionScheduler_QueueRunner
* @codeCoverageIgnore
@@ -28,452 +26,53 @@ class ActionScheduler_AdminView {
* @codeCoverageIgnore
*/
public function init() {
-
if ( is_admin() && ( ! defined( 'DOING_AJAX' ) || false == DOING_AJAX ) ) {
- add_filter( 'action_scheduler_post_type_args', array( self::instance(), 'action_scheduler_post_type_args' ) );
- }
- self::$admin_url = admin_url( 'edit.php?post_type=' . ActionScheduler_wpPostStore::POST_TYPE );
-
- add_filter( 'views_edit-' . ActionScheduler_wpPostStore::POST_TYPE, array( self::instance(), 'list_table_views' ) );
-
- add_filter( 'bulk_actions-edit-' . ActionScheduler_wpPostStore::POST_TYPE, array( self::instance(), 'bulk_actions' ) );
-
- add_filter( 'manage_' . ActionScheduler_wpPostStore::POST_TYPE . '_posts_columns', array( self::instance(), 'list_table_columns' ), 1 );
-
- add_filter( 'manage_edit-' . ActionScheduler_wpPostStore::POST_TYPE . '_sortable_columns', array( self::instance(), 'list_table_sortable_columns' ) );
-
- add_filter( 'manage_' . ActionScheduler_wpPostStore::POST_TYPE . '_posts_custom_column', array( self::instance(), 'list_table_column_content' ), 10, 2 );
-
- add_filter( 'post_row_actions', array( self::instance(), 'row_actions' ), 10, 2 );
-
- add_action( 'admin_init', array( self::instance(), 'maybe_execute_action' ), 20 );
-
- add_action( 'admin_notices', array( self::instance(), 'admin_notices' ) );
-
- add_filter( 'post_updated_messages', array( self::instance(), 'post_updated_messages' ) );
-
- add_filter( 'posts_orderby', array( self::instance(), 'custom_orderby' ), 10, 2 );
-
- add_filter( 'posts_search', array( self::instance(), 'search_post_password' ), 10, 2 );
- }
-
- public function action_scheduler_post_type_args( $args ) {
- return array_merge( $args, array(
- 'show_ui' => true,
- 'show_in_menu' => 'tools.php',
- 'show_in_admin_bar' => false,
- ) );
- }
-
- /**
- * Customise the post status related views displayed on the Scheduled Actions administration screen.
- *
- * @param array $views An associative array of views and view labels which can be used to filter the 'scheduled-action' posts displayed on the Scheduled Actions administration screen.
- * @return array $views An associative array of views and view labels which can be used to filter the 'scheduled-action' posts displayed on the Scheduled Actions administration screen.
- */
- public function list_table_views( $views ) {
-
- foreach ( $views as $view_key => $view ) {
- if ( 'publish' == $view_key ) {
- $views[ $view_key ] = str_replace( __( 'Published', 'action-scheduler' ), __( 'Complete', 'action-scheduler' ), $view );
- break;
+ if ( class_exists( 'WooCommerce' ) ) {
+ add_action( 'woocommerce_admin_status_content_action-scheduler', array( $this, 'render_admin_ui' ) );
+ add_filter( 'woocommerce_admin_status_tabs', array( $this, 'register_system_status_tab' ) );
}
- }
- return $views;
+ add_action( 'admin_menu', array( $this, 'register_menu' ) );
+ }
+ }
+
+
+ /**
+ * Registers action-scheduler into WooCommerce > System status.
+ *
+ * @param array $tabs An associative array of tab key => label.
+ * @return array $tabs An associative array of tab key => label, including Action Scheduler's tabs
+ */
+ public function register_system_status_tab( array $tabs ) {
+ $tabs['action-scheduler'] = __( 'Scheduled Actions', 'action-scheduler' );
+
+ return $tabs;
}
/**
- * Do not include the "Edit" action for the Scheduled Actions administration screen.
+ * Include Action Scheduler's administration under the Tools menu.
*
- * Hooked to the 'bulk_actions-edit-action-scheduler' filter.
- *
- * @param array $actions An associative array of actions which can be performed on the 'scheduled-action' post type.
- * @return array $actions An associative array of actions which can be performed on the 'scheduled-action' post type.
+ * A menu under the Tools menu is important for backward compatibility (as that's
+ * where it started), and also provides more convenient access than the WooCommerce
+ * System Status page, and for sites where WooCommerce isn't active.
*/
- public function bulk_actions( $actions ) {
-
- if ( isset( $actions['edit'] ) ) {
- unset( $actions['edit'] );
- }
-
- return $actions;
- }
-
- /**
- * Completely customer the columns displayed on the Scheduled Actions administration screen.
- *
- * Because we can't filter the content of the default title and date columns, we need to recreate our own
- * custom columns for displaying those post fields. For the column content, @see self::list_table_column_content().
- *
- * @param array $columns An associative array of columns that are use for the table on the Scheduled Actions administration screen.
- * @return array $columns An associative array of columns that are use for the table on the Scheduled Actions administration screen.
- */
- public function list_table_columns( $columns ) {
-
- $custom_columns = array(
- 'cb' => $columns['cb'],
- 'hook' => __( 'Hook', 'action-scheduler' ), // because we want to customise the inline actions
- 'status' => __( 'Status', 'action-scheduler' ),
- 'args' => __( 'Arguments', 'action-scheduler' ),
- 'taxonomy-action-group' => __( 'Group', 'action-scheduler' ),
- 'recurrence' => __( 'Recurrence', 'action-scheduler' ),
- 'scheduled' => __( 'Scheduled Date', 'action-scheduler' ), // because we want to customise how the date is displayed
+ public function register_menu() {
+ add_submenu_page(
+ 'tools.php',
+ __( 'Scheduled Actions', 'action-scheduler' ),
+ __( 'Scheduled Actions', 'action-scheduler' ),
+ 'manage_options',
+ 'action-scheduler',
+ array( $this, 'render_admin_ui' )
);
-
- if ( isset( $_REQUEST['post_status'] ) ) {
- if ( in_array( $_REQUEST['post_status'], array( 'failed', 'in-progress' ) ) ) {
- $custom_columns['modified'] = __( 'Started', 'action-scheduler' );
- } elseif ( 'publish' == $_REQUEST['post_status'] ) {
- $custom_columns['modified'] = __( 'Completed', 'action-scheduler' );
- }
- }
-
- $custom_columns['claim'] = __( 'Claim ID', 'action-scheduler' );
- $custom_columns['comments'] = __( 'Log', 'action-scheduler' );
-
- return $custom_columns;
}
/**
- * Make our custom title & date columns use defaulting title & date sorting.
- *
- * @param array $columns An associative array of columns that can be used to sort the table on the Scheduled Actions administration screen.
- * @return array $columns An associative array of columns that can be used to sort the table on the Scheduled Actions administration screen.
+ * Renders the Admin UI
*/
- public static function list_table_sortable_columns( $columns ) {
-
- $columns['hook'] = 'title';
- $columns['scheduled'] = array( 'date', true );
- $columns['modified'] = 'modified';
- $columns['claim'] = 'post_password';
-
- return $columns;
+ public function render_admin_ui() {
+ $table = new ActionScheduler_ListTable( ActionScheduler::store(), ActionScheduler::logger(), ActionScheduler::runner() );
+ $table->display_page();
}
-
- /**
- * Print the content for our custom columns.
- *
- * @param string $column_name The key for the column for which we should output our content.
- * @param int $post_id The ID of the 'scheduled-action' post for which this row relates.
- * @return void
- */
- public static function list_table_column_content( $column_name, $post_id ) {
- global $post;
-
- $action = ActionScheduler::store()->fetch_action( $post_id );
-
- $action_title = ( 'trash' == $post->post_status ) ? $post->post_title : $action->get_hook();
- $recurrence = ( 'trash' == $post->post_status ) ? 0 : $action->get_schedule();
- $next_timestamp = as_get_datetime_object( $post->post_date_gmt )->format( 'U' );
- $status = get_post_status( $post_id );
-
- switch ( $column_name ) {
- case 'hook':
- echo $action_title;
- break;
- case 'status':
- if ( 'publish' == $status ) {
- _e( 'Complete', 'action-scheduler' );
- } else {
- echo ucfirst( $status );
- }
- break;
- case 'args':
- $action_args = ( 'trash' == $post->post_status ) ? $post->post_content : $action->get_args();
- if ( is_array( $action_args ) ) {
- foreach( $action_args as $key => $value ) {
- printf( "%s => %s", $key, $value ); - } - } - break; - case 'recurrence': - if ( method_exists( $recurrence, 'interval_in_seconds' ) ) { - echo self::human_interval( $recurrence->interval_in_seconds() ); - } else { - _e( 'Non-repeating', 'action-scheduler' ); - } - break; - case 'scheduled': - echo get_date_from_gmt( gmdate( 'Y-m-d H:i:s', $next_timestamp ), 'Y-m-d H:i:s' ); - if ( gmdate( 'U' ) > $next_timestamp ) { - printf( __( ' (%s ago)', 'action-scheduler' ), human_time_diff( gmdate( 'U' ), $next_timestamp ) ); - } else { - echo ' (' . human_time_diff( gmdate( 'U' ), $next_timestamp ) . ')'; - } - break; - case 'modified': - echo get_post_modified_time( 'Y-m-d H:i:s' ); - $modified_timestamp = get_post_modified_time( 'U', true ); - if ( gmdate( 'U' ) > $modified_timestamp ) { - printf( __( ' (%s ago)', 'action-scheduler' ), human_time_diff( gmdate( 'U' ), $modified_timestamp ) ); - } else { - echo ' (' . human_time_diff( gmdate( 'U' ), $modified_timestamp ) . ')'; - } - break; - case 'claim': - echo $post->post_password; - break; - } - } - - /** - * Hide the inline "Edit" action for all 'scheduled-action' posts. - * - * Hooked to the 'post_row_actions' filter. - * - * @param array $actions An associative array of actions which can be performed on the 'scheduled-action' post type. - * @return array $actions An associative array of actions which can be performed on the 'scheduled-action' post type. - */ - public static function row_actions( $actions, $post ) { - - if ( ActionScheduler_wpPostStore::POST_TYPE == $post->post_type ) { - - if ( isset( $actions['edit'] ) ) { - unset( $actions['edit'] ); - } - - if ( isset( $actions['inline hide-if-no-js'] ) ) { - unset( $actions['inline hide-if-no-js'] ); - } - - if ( current_user_can( 'edit_post', $post->ID ) && ! in_array( $post->post_status, array( 'publish', 'in-progress', 'trash' ) ) ) { - $actions['process'] = "" . __( 'Run', 'action-scheduler' ) . ""; - } - - ksort( $actions ); - } - - return $actions; - } - - /** - * Retrieve a URI to execute a scheduled action. - * - * @param int $action_id The ID for a 'scheduled-action' post. - * @param string $operation To run the action (including trigger before/after hooks), log the execution and update the action's status, use 'process', to simply trigger the action, use 'execute'. Default 'execute'. - * @return string The URL for running the action. - */ - private static function get_run_action_link( $action_id, $operation = 'process' ) { - - if ( !$post = get_post( $action_id ) ) - return; - - $post_type_object = get_post_type_object( $post->post_type ); - - if ( ! $post_type_object ) - return; - - if ( ! current_user_can( 'edit_post', $post->ID ) ) - return; - - $execute_link = add_query_arg( array( 'action' => $operation, 'post_id' => $post->ID ), self::$admin_url ); - - return wp_nonce_url( $execute_link, "{$operation}-action_{$post->ID}" ); - } - - /** - * Run an action when triggered from the Action Scheduler administration screen. - * - * @codeCoverageIgnore - */ - public static function maybe_execute_action() { - - if ( ! isset( $_GET['action'] ) || 'process' != $_GET['action'] || ! isset( $_GET['post_id'] ) ){ - return; - } - - $action_id = absint( $_GET['post_id'] ); - - check_admin_referer( $_GET['action'] . '-action_' . $action_id ); - - try { - ActionScheduler::runner()->process_action( $action_id ); - $success = 1; - } catch ( Exception $e ) { - $success = 0; - } - - wp_redirect( add_query_arg( array( 'executed' => $success, 'ids' => $action_id ), self::$admin_url ) ); - exit(); - } - - /** - * Convert an interval of seconds into a two part human friendly string. - * - * The WordPress human_time_diff() function only calculates the time difference to one degree, meaning - * even if an action is 1 day and 11 hours away, it will display "1 day". This funciton goes one step - * further to display two degrees of accuracy. - * - * Based on Crontrol::interval() funciton by Edward Dale: https://wordpress.org/plugins/wp-crontrol/ - * - * @param int $interval A interval in seconds. - * @return string A human friendly string representation of the interval. - */ - public static function admin_notices() { - - if ( self::is_admin_page() ) { - - if ( ActionScheduler_Store::instance()->get_claim_count() >= apply_filters( 'action_scheduler_queue_runner_concurrent_batches', 5 ) ) : ?> -
-
- fetch_action( $_GET['ids'] );
- $action_hook_html = '' . $action->get_hook() . '';
- if ( 1 == $_GET['executed'] ) : ?>
-get_claim_count() ); ?>
-
-
-
-
-
-
-
- query['orderby'] ) && 'post_password' == $query->query['orderby'] ) {
- $orderby = "$wpdb->posts.post_password " . $query->query['order'];
- }
-
- return $orderby;
- }
-
- /**
- * Filter search queries to allow searching by Claim ID (i.e. post_password).
- *
- * @param string $search MySQL search string.
- * @param WP_Query $query Instance of a WP_Query object
- * @return string MySQL search string.
- */
- public function search_post_password( $search, $query ) {
- global $wpdb;
-
- if ( self::is_admin_page() && ! empty( $search ) ) {
-
- $search = '';
-
- $searchand = '';
- $n = ! empty( $query->query_vars['exact'] ) ? '' : '%';
- foreach ( $query->query_vars['search_terms'] as $term ) {
- $term = $wpdb->esc_like( esc_sql( $term ) );
- $search .= "{$searchand}(($wpdb->posts.post_title LIKE '{$n}{$term}{$n}') OR ($wpdb->posts.post_content LIKE '{$n}{$term}{$n}') OR ($wpdb->posts.post_password LIKE '{$n}{$term}{$n}'))";
- $searchand = ' AND ';
- }
-
- if ( ! empty( $search ) ) {
- $search = " AND ({$search}) ";
- }
-
- }
-
- return $search;
- }
-
- /**
- * Change messages when a scheduled action is updated.
- *
- * @param array $messages
- * @return array
- */
- public function post_updated_messages( $messages ) {
- global $post, $post_ID;
-
- $messages[ ActionScheduler_wpPostStore::POST_TYPE ] = array(
- 0 => '', // Unused. Messages start at index 1.
- 1 => __( 'Action updated.', 'action-scheduler' ),
- 2 => __( 'Custom field updated.', 'action-scheduler' ),
- 3 => __( 'Custom field deleted.', 'action-scheduler' ),
- 4 => __( 'Action updated.', 'action-scheduler' ),
- 5 => isset( $_GET['revision'] ) ? sprintf( __( 'Action restored to revision from %s', 'action-scheduler' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
- 6 => __( 'Action scheduled.', 'action-scheduler' ),
- 7 => __( 'Action saved.', 'action-scheduler' ),
- 8 => __( 'Action submitted.', 'action-scheduler' ),
- 9 => sprintf( __( 'Action scheduled for: %1$s', 'action-scheduler' ), date_i18n( __( 'M j, Y @ G:i', 'action-scheduler' ), strtotime( $post->post_date ) ) ),
- 10 => __( 'Action draft updated.', 'action-scheduler' ),
- );
-
- return $messages;
- }
-
- /**
- * Check if the current request is for the Schedul Actions administration screen.
- *
- * @return bool
- */
- private static function is_admin_page() {
- if ( is_admin() && isset( $_GET['post_type'] ) && $_GET['post_type'] == ActionScheduler_wpPostStore::POST_TYPE ) {
- return true;
- } else {
- return false;
- }
- }
-}
\ No newline at end of file
+}
diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_AdminView_Deprecated.php b/includes/libraries/action-scheduler/classes/ActionScheduler_AdminView_Deprecated.php
new file mode 100755
index 0000000..69b46d7
--- /dev/null
+++ b/includes/libraries/action-scheduler/classes/ActionScheduler_AdminView_Deprecated.php
@@ -0,0 +1,147 @@
+set_schedule( new ActionScheduler_NullSchedule() );
+ }
+}
diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_CronSchedule.php b/includes/libraries/action-scheduler/classes/ActionScheduler_CronSchedule.php
index 029c0d5..3e7db8b 100755
--- a/includes/libraries/action-scheduler/classes/ActionScheduler_CronSchedule.php
+++ b/includes/libraries/action-scheduler/classes/ActionScheduler_CronSchedule.php
@@ -36,7 +36,7 @@ class ActionScheduler_CronSchedule implements ActionScheduler_Schedule {
* @return array
*/
public function __sleep() {
- $this->start_timestamp = $this->start->format('U');
+ $this->start_timestamp = $this->start->getTimestamp();
return array(
'start_timestamp',
'cron'
diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_DateTime.php b/includes/libraries/action-scheduler/classes/ActionScheduler_DateTime.php
new file mode 100755
index 0000000..13d8c27
--- /dev/null
+++ b/includes/libraries/action-scheduler/classes/ActionScheduler_DateTime.php
@@ -0,0 +1,20 @@
+format( 'U' );
+ }
+}
diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_IntervalSchedule.php b/includes/libraries/action-scheduler/classes/ActionScheduler_IntervalSchedule.php
index eb68a96..76068e1 100755
--- a/includes/libraries/action-scheduler/classes/ActionScheduler_IntervalSchedule.php
+++ b/includes/libraries/action-scheduler/classes/ActionScheduler_IntervalSchedule.php
@@ -49,7 +49,7 @@ class ActionScheduler_IntervalSchedule implements ActionScheduler_Schedule {
* @return array
*/
public function __sleep() {
- $this->start_timestamp = $this->start->format('U');
+ $this->start_timestamp = $this->start->getTimestamp();
return array(
'start_timestamp',
'interval_in_seconds'
@@ -60,4 +60,3 @@ class ActionScheduler_IntervalSchedule implements ActionScheduler_Schedule {
$this->start = as_get_datetime_object($this->start_timestamp);
}
}
-
\ No newline at end of file
diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_ListTable.php b/includes/libraries/action-scheduler/classes/ActionScheduler_ListTable.php
new file mode 100755
index 0000000..69dea5b
--- /dev/null
+++ b/includes/libraries/action-scheduler/classes/ActionScheduler_ListTable.php
@@ -0,0 +1,526 @@
+ label).
+ *
+ * @var array
+ */
+ protected $columns = array();
+
+ /**
+ * Actions (name => label).
+ *
+ * @var array
+ */
+ protected $row_actions = array();
+
+ /**
+ * The active data stores
+ *
+ * @var ActionScheduler_Store
+ */
+ protected $store;
+
+ /**
+ * A logger to use for getting action logs to display
+ *
+ * @var ActionScheduler_Logger
+ */
+ protected $logger;
+
+ /**
+ * A ActionScheduler_QueueRunner runner instance (or child class)
+ *
+ * @var ActionScheduler_QueueRunner
+ */
+ protected $runner;
+
+ /**
+ * Bulk actions. The key of the array is the method name of the implementation:
+ *
+ * bulk_- ';
+ foreach ( $row['args'] as $key => $value ) {
+ $row_html .= sprintf( '
%s => %s', esc_html( $key ), esc_html( $value ) );
+ }
+ $row_html .= '
- ';
+
+ $timezone = new DateTimezone( 'UTC' );
+
+ foreach ( $row['log_entries'] as $log_entry ) {
+ $log_entries_html .= $this->get_log_entry_html( $log_entry, $timezone );
+ }
+
+ $log_entries_html .= '
%s
' . $action->get_hook() . '';
+ if ( 1 == $notification['success'] ) {
+ $class = 'updated';
+ switch ( $notification['row_action_type'] ) {
+ case 'run' :
+ $action_message_html = sprintf( __( 'Successfully executed action: %s', 'action-scheduler' ), $action_hook_html );
+ break;
+ case 'cancel' :
+ $action_message_html = sprintf( __( 'Successfully canceled action: %s', 'action-scheduler' ), $action_hook_html );
+ break;
+ default :
+ $action_message_html = sprintf( __( 'Successfully processed change for action: %s', 'action-scheduler' ), $action_hook_html );
+ break;
+ }
+ } else {
+ $class = 'error';
+ $action_message_html = sprintf( __( 'Could not process change for action: "%s" (ID: %d). Error: %s', 'action-scheduler' ), $action_hook_html, esc_html( $notification['action_id'] ), esc_html( $notification['error_message'] ) );
+ }
+
+ $action_message_html = apply_filters( 'action_scheduler_admin_notice_html', $action_message_html, $action, $notification );
+
+ $this->admin_notices[] = array(
+ 'class' => $class,
+ 'message' => $action_message_html,
+ );
+ }
+
+ parent::display_admin_notices();
+ }
+
+ /**
+ * Prints the scheduled date in a human friendly format.
+ *
+ * @param array $row The array representation of the current row of the table
+ *
+ * @return string
+ */
+ public function column_schedule( $row ) {
+ return $this->get_schedule_display_string( $row['schedule'] );
+ }
+
+ /**
+ * Get the scheduled date in a human friendly format.
+ *
+ * @param ActionScheduler_Schedule $schedule
+ * @return string
+ */
+ protected function get_schedule_display_string( ActionScheduler_Schedule $schedule ) {
+
+ $schedule_display_string = '';
+
+ if ( ! $schedule->next() ) {
+ return $schedule_display_string;
+ }
+
+ $next_timestamp = $schedule->next()->getTimestamp();
+
+ $schedule_display_string .= $schedule->next()->format( 'Y-m-d H:i:s e' );
+ $schedule_display_string .= ''; + + if ( gmdate( 'U' ) > $next_timestamp ) { + $schedule_display_string .= sprintf( __( ' (%s ago)', 'action-scheduler' ), self::human_interval( gmdate( 'U' ) - $next_timestamp ) ); + } else { + $schedule_display_string .= sprintf( __( ' (%s)', 'action-scheduler' ), self::human_interval( $next_timestamp - gmdate( 'U' ) ) ); + } + + return $schedule_display_string; + } + + /** + * Bulk delete + * + * Deletes actions based on their ID. This is the handler for the bulk delete. It assumes the data + * properly validated by the callee and it will delete the actions without any extra validation. + * + * @param array $ids + * @param string $ids_sql Inherited and unused + */ + protected function bulk_delete( array $ids, $ids_sql ) { + foreach ( $ids as $id ) { + $this->store->delete_action( $id ); + } + } + + /** + * Implements the logic behind running an action. ActionScheduler_Abstract_ListTable validates the request and their + * parameters are valid. + * + * @param int $action_id + */ + protected function row_action_cancel( $action_id ) { + $this->process_row_action( $action_id, 'cancel' ); + } + + /** + * Implements the logic behind running an action. ActionScheduler_Abstract_ListTable validates the request and their + * parameters are valid. + * + * @param int $action_id + */ + protected function row_action_run( $action_id ) { + $this->process_row_action( $action_id, 'run' ); + } + + /** + * Implements the logic behind processing an action once an action link is clicked on the list table. + * + * @param int $action_id + * @param string $row_action_type The type of action to perform on the action. + */ + protected function process_row_action( $action_id, $row_action_type ) { + try { + switch ( $row_action_type ) { + case 'run' : + $this->runner->process_action( $action_id ); + break; + case 'cancel' : + $this->store->cancel_action( $action_id ); + break; + } + $success = 1; + $error_message = ''; + } catch ( Exception $e ) { + $success = 0; + $error_message = $e->getMessage(); + } + + set_transient( 'action_scheduler_admin_notice', compact( 'action_id', 'success', 'error_message', 'row_action_type' ), 30 ); + } + + /** + * {@inheritDoc} + */ + public function prepare_items() { + $this->process_bulk_action(); + + $this->process_row_actions(); + + if ( ! empty( $_REQUEST['_wp_http_referer'] ) ) { + // _wp_http_referer is used only on bulk actions, we remove it to keep the $_GET shorter + wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ); + exit; + } + + $this->prepare_column_headers(); + + $per_page = $this->get_items_per_page( $this->package . '_items_per_page', $this->items_per_page ); + $query = array( + 'per_page' => $per_page, + 'offset' => $this->get_items_offset(), + 'status' => $this->get_request_status(), + 'orderby' => $this->get_request_orderby(), + 'order' => $this->get_request_order(), + 'search' => $this->get_request_search_query(), + ); + + $this->items = array(); + + $total_items = $this->store->query_actions( $query, 'count' ); + + $status_labels = $this->store->get_status_labels(); + + foreach ( $this->store->query_actions( $query ) as $action_id ) { + try { + $action = $this->store->fetch_action( $action_id ); + } catch ( Exception $e ) { + continue; + } + $this->items[ $action_id ] = array( + 'ID' => $action_id, + 'hook' => $action->get_hook(), + 'status' => $status_labels[ $this->store->get_status( $action_id ) ], + 'args' => $action->get_args(), + 'group' => $action->get_group(), + 'log_entries' => $this->logger->get_logs( $action_id ), + 'claim_id' => $this->store->get_claim_id( $action_id ), + 'recurrence' => $this->get_recurrence( $action ), + 'schedule' => $action->get_schedule(), + ); + } + + $this->set_pagination_args( array( + 'total_items' => $total_items, + 'per_page' => $per_page, + 'total_pages' => ceil( $total_items / $per_page ), + ) ); + } + + /** + * Prints the available statuses so the user can click to filter. + */ + protected function display_filter_by_status() { + $this->status_counts = $this->store->action_counts(); + parent::display_filter_by_status(); + } + + /** + * Get the text to display in the search box on the list table. + */ + protected function get_search_box_button_text() { + return __( 'Search hook, args and claim ID', 'action-scheduler' ); + } +} diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_LogEntry.php b/includes/libraries/action-scheduler/classes/ActionScheduler_LogEntry.php index 755cd6d..649636d 100755 --- a/includes/libraries/action-scheduler/classes/ActionScheduler_LogEntry.php +++ b/includes/libraries/action-scheduler/classes/ActionScheduler_LogEntry.php @@ -4,12 +4,56 @@ * Class ActionScheduler_LogEntry */ class ActionScheduler_LogEntry { - protected $action_id = ''; - protected $message = ''; - public function __construct( $action_id, $message ) { + /** + * @var int $action_id + */ + protected $action_id = ''; + + /** + * @var string $message + */ + protected $message = ''; + + /** + * @var Datetime $date + */ + protected $date; + + /** + * Constructor + * + * @param mixed $action_id Action ID + * @param string $message Message + * @param Datetime $date Datetime object with the time when this log entry was created. If this parameter is + * not provided a new Datetime object (with current time) will be created. + */ + public function __construct( $action_id, $message, $date = null ) { + + /* + * ActionScheduler_wpCommentLogger::get_entry() previously passed a 3rd param of $comment->comment_type + * to ActionScheduler_LogEntry::__construct(), goodness knows why, and the Follow-up Emails plugin + * hard-codes loading its own version of ActionScheduler_wpCommentLogger with that out-dated method, + * goodness knows why, so we need to guard against that here instead of using a DateTime type declaration + * for the constructor's 3rd param of $date and causing a fatal error with older versions of FUE. + */ + if ( null !== $date && ! is_a( $date, 'DateTime' ) ) { + _doing_it_wrong( __METHOD__, 'The third parameter must be a valid DateTime instance, or null.', '2.0.0' ); + $date = null; + } + $this->action_id = $action_id; - $this->message = $message; + $this->message = $message; + $this->date = $date ? $date : new Datetime; + } + + /** + * Returns the date when this log entry was created + * + * @return Datetime + */ + public function get_date() { + return $this->date; } public function get_action_id() { @@ -20,4 +64,4 @@ class ActionScheduler_LogEntry { return $this->message; } } - \ No newline at end of file + diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_QueueCleaner.php b/includes/libraries/action-scheduler/classes/ActionScheduler_QueueCleaner.php index cfcfa4b..5daf11b 100755 --- a/includes/libraries/action-scheduler/classes/ActionScheduler_QueueCleaner.php +++ b/includes/libraries/action-scheduler/classes/ActionScheduler_QueueCleaner.php @@ -4,29 +4,76 @@ * Class ActionScheduler_QueueCleaner */ class ActionScheduler_QueueCleaner { - /** @var ActionScheduler_Store */ - private $store = NULL; - private $month_in_seconds = 2678400; // 31 days + /** @var int */ + protected $batch_size; + + /** @var ActionScheduler_Store */ + private $store = null; + + /** + * 31 days in seconds. + * + * @var int + */ + private $month_in_seconds = 2678400; + + /** + * Five minutes in seconds + * + * @var int + */ private $five_minutes = 300; - public function __construct( ActionScheduler_Store $store = NULL ) { + /** + * ActionScheduler_QueueCleaner constructor. + * + * @param ActionScheduler_Store $store The store instance. + * @param int $batch_size The batch size. + */ + public function __construct( ActionScheduler_Store $store = null, $batch_size = 20 ) { $this->store = $store ? $store : ActionScheduler_Store::instance(); + $this->batch_size = $batch_size; } public function delete_old_actions() { $lifespan = apply_filters( 'action_scheduler_retention_period', $this->month_in_seconds ); $cutoff = as_get_datetime_object($lifespan.' seconds ago'); - $actions_to_delete = $this->store->query_actions( array( - 'status' => ActionScheduler_Store::STATUS_COMPLETE, - 'modified' => $cutoff, - 'modified_compare' => '<=', - 'per_page' => apply_filters( 'action_scheduler_cleanup_batch_size', 20 ), - ) ); + $statuses_to_purge = array( + ActionScheduler_Store::STATUS_COMPLETE, + ActionScheduler_Store::STATUS_CANCELED, + ); - foreach ( $actions_to_delete as $action_id ) { - $this->store->delete_action( $action_id ); + foreach ( $statuses_to_purge as $status ) { + $actions_to_delete = $this->store->query_actions( array( + 'status' => $status, + 'modified' => $cutoff, + 'modified_compare' => '<=', + 'per_page' => $this->get_batch_size(), + ) ); + + foreach ( $actions_to_delete as $action_id ) { + try { + $this->store->delete_action( $action_id ); + } catch ( Exception $e ) { + + /** + * Notify 3rd party code of exceptions when deleting a completed action older than the retention period + * + * This hook provides a way for 3rd party code to log or otherwise handle exceptions relating to their + * actions. + * + * @since 2.0.0 + * + * @param int $action_id The scheduled actions ID in the data store + * @param Exception $e The exception thrown when attempting to delete the action from the data store + * @param int $lifespan The retention period, in seconds, for old actions + * @param int $count_of_actions_to_delete The number of old actions being deleted in this batch + */ + do_action( 'action_scheduler_failed_old_action_deletion', $action_id, $e, $lifespan, count( $actions_to_delete ) ); + } + } } } @@ -37,11 +84,11 @@ class ActionScheduler_QueueCleaner { } $cutoff = as_get_datetime_object($timeout.' seconds ago'); $actions_to_reset = $this->store->query_actions( array( - 'status' => ActionScheduler_Store::STATUS_PENDING, - 'modified' => $cutoff, + 'status' => ActionScheduler_Store::STATUS_PENDING, + 'modified' => $cutoff, 'modified_compare' => '<=', - 'claimed' => TRUE, - 'per_page' => apply_filters( 'action_scheduler_cleanup_batch_size', 20 ), + 'claimed' => true, + 'per_page' => $this->get_batch_size(), ) ); foreach ( $actions_to_reset as $action_id ) { @@ -57,10 +104,10 @@ class ActionScheduler_QueueCleaner { } $cutoff = as_get_datetime_object($timeout.' seconds ago'); $actions_to_reset = $this->store->query_actions( array( - 'status' => ActionScheduler_Store::STATUS_RUNNING, - 'modified' => $cutoff, + 'status' => ActionScheduler_Store::STATUS_RUNNING, + 'modified' => $cutoff, 'modified_compare' => '<=', - 'per_page' => apply_filters( 'action_scheduler_cleanup_batch_size', 20 ), + 'per_page' => $this->get_batch_size(), ) ); foreach ( $actions_to_reset as $action_id ) { @@ -68,5 +115,30 @@ class ActionScheduler_QueueCleaner { do_action( 'action_scheduler_failed_action', $action_id, $timeout ); } } + + /** + * Do all of the cleaning actions. + * + * @author Jeremy Pry + */ + public function clean() { + $this->delete_old_actions(); + $this->reset_timeouts(); + $this->mark_failures(); + } + + /** + * Get the batch size for cleaning the queue. + * + * @author Jeremy Pry + * @return int + */ + protected function get_batch_size() { + /** + * Filter the batch size when cleaning the queue. + * + * @param int $batch_size The number of actions to clean in one batch. + */ + return absint( apply_filters( 'action_scheduler_cleanup_batch_size', $this->batch_size ) ); + } } - \ No newline at end of file diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_QueueRunner.php b/includes/libraries/action-scheduler/classes/ActionScheduler_QueueRunner.php index 99e8f06..387bb51 100755 --- a/includes/libraries/action-scheduler/classes/ActionScheduler_QueueRunner.php +++ b/includes/libraries/action-scheduler/classes/ActionScheduler_QueueRunner.php @@ -3,18 +3,23 @@ /** * Class ActionScheduler_QueueRunner */ -class ActionScheduler_QueueRunner { +class ActionScheduler_QueueRunner extends ActionScheduler_Abstract_QueueRunner { const WP_CRON_HOOK = 'action_scheduler_run_queue'; const WP_CRON_SCHEDULE = 'every_minute'; /** @var ActionScheduler_QueueRunner */ - private static $runner = NULL; - /** @var ActionScheduler_Store */ - private $store = NULL; + private static $runner = null; - /** @var ActionScheduler_FatalErrorMonitor */ - private $monitor = NULL; + /** + * 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; /** * @return ActionScheduler_QueueRunner @@ -28,8 +33,16 @@ class ActionScheduler_QueueRunner { return self::$runner; } - public function __construct( ActionScheduler_Store $store = NULL ) { - $this->store = $store ? $store : ActionScheduler_Store::instance(); + /** + * ActionScheduler_QueueRunner constructor. + * + * @param ActionScheduler_Store $store + * @param ActionScheduler_FatalErrorMonitor $monitor + * @param ActionScheduler_QueueCleaner $cleaner + */ + public function __construct( ActionScheduler_Store $store = null, ActionScheduler_FatalErrorMonitor $monitor = null, ActionScheduler_QueueCleaner $cleaner = null ) { + parent::__construct( $store, $monitor, $cleaner ); + $this->created_time = microtime( true ); } /** @@ -53,29 +66,32 @@ class ActionScheduler_QueueRunner { do_action( 'action_scheduler_before_process_queue' ); $this->run_cleanup(); $count = 0; - if ( $this->store->get_claim_count() < apply_filters( 'action_scheduler_queue_runner_concurrent_batches', 5 ) ) { + if ( $this->store->get_claim_count() < $this->get_allowed_concurrent_batches() ) { $batch_size = apply_filters( 'action_scheduler_queue_runner_batch_size', 25 ); - $this->monitor = new ActionScheduler_FatalErrorMonitor( $this->store ); $count = $this->do_batch( $batch_size ); - unset( $this->monitor ); } do_action( 'action_scheduler_after_process_queue' ); return $count; } - protected function run_cleanup() { - $cleaner = new ActionScheduler_QueueCleaner( $this->store ); - $cleaner->delete_old_actions(); - $cleaner->reset_timeouts(); - $cleaner->mark_failures(); - } - protected function do_batch( $size = 100 ) { $claim = $this->store->stake_claim($size); $this->monitor->attach($claim); - $processed_actions = 0; + $processed_actions = 0; + $maximum_execution_time = $this->get_maximum_execution_time(); + foreach ( $claim->get_actions() as $action_id ) { + if ( 0 !== $processed_actions ) { + $time_elapsed = $this->get_execution_time(); + $average_processing_time = $time_elapsed / $processed_actions; + + // Bail early if the time it has taken to process this batch is approaching the maximum execution time. + if ( $time_elapsed + ( $average_processing_time * 2 ) > $maximum_execution_time ) { + break; + } + } + // bail if we lost the claim if ( ! in_array( $action_id, $this->store->find_actions_by_claim_id( $claim->get_id() ) ) ) { break; @@ -89,31 +105,6 @@ class ActionScheduler_QueueRunner { return $processed_actions; } - public function process_action( $action_id ) { - try { - do_action( 'action_scheduler_before_execute', $action_id ); - $action = $this->store->fetch_action( $action_id ); - $this->store->log_execution( $action_id ); - $action->execute(); - do_action( 'action_scheduler_after_execute', $action_id ); - $this->store->mark_complete( $action_id ); - } catch ( Exception $e ) { - $this->store->mark_failure( $action_id ); - do_action( 'action_scheduler_failed_execution', $action_id, $e ); - } - $this->schedule_next_instance( $action ); - } - - protected function schedule_next_instance( ActionScheduler_Action $action ) { - - $schedule = $action->get_schedule(); - $next = $schedule->next( as_get_datetime_object() ); - - if ( ! is_null( $next ) && $schedule->is_recurring() ) { - $this->store->save_action( $action, $next ); - } - } - /** * Running large batches can eat up memory, as WP adds data to its object cache. * @@ -121,8 +112,6 @@ class ActionScheduler_QueueRunner { * as well, so this is disabled by default. To enable: * * add_filter( 'action_scheduler_queue_runner_flush_cache', '__return_true' ); - * - * @return void */ protected function clear_caches() { if ( ! wp_using_ext_object_cache() || apply_filters( 'action_scheduler_queue_runner_flush_cache', false ) ) { @@ -138,5 +127,43 @@ class ActionScheduler_QueueRunner { return $schedules; } + + /** + * Get the maximum number of seconds a batch can run for. + * + * @return int The number of seconds. + */ + protected function get_maximum_execution_time() { + + // There are known hosts with a strict 60 second execution time. + if ( defined( 'WPENGINE_ACCOUNT' ) || defined( 'PANTHEON_ENVIRONMENT' ) ) { + $maximum_execution_time = 60; + } elseif ( false !== strpos( getenv( 'HOSTNAME' ), '.siteground.' ) ) { + $maximum_execution_time = 120; + } else { + $maximum_execution_time = ini_get( 'max_execution_time' ); + } + + return absint( apply_filters( 'action_scheduler_maximum_execution_time', $maximum_execution_time ) ); + } + + /** + * Get the number of seconds a batch has run for. + * + * @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; + } } - \ No newline at end of file diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_SimpleSchedule.php b/includes/libraries/action-scheduler/classes/ActionScheduler_SimpleSchedule.php index 8f621e1..42f789f 100755 --- a/includes/libraries/action-scheduler/classes/ActionScheduler_SimpleSchedule.php +++ b/includes/libraries/action-scheduler/classes/ActionScheduler_SimpleSchedule.php @@ -32,7 +32,7 @@ class ActionScheduler_SimpleSchedule implements ActionScheduler_Schedule { * @return array */ public function __sleep() { - $this->timestamp = $this->date->format('U'); + $this->timestamp = $this->date->getTimestamp(); return array( 'timestamp', ); @@ -42,4 +42,3 @@ class ActionScheduler_SimpleSchedule implements ActionScheduler_Schedule { $this->date = as_get_datetime_object($this->timestamp); } } - \ No newline at end of file diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_Store.php b/includes/libraries/action-scheduler/classes/ActionScheduler_Store.php index 2d4b973..d967b59 100755 --- a/includes/libraries/action-scheduler/classes/ActionScheduler_Store.php +++ b/includes/libraries/action-scheduler/classes/ActionScheduler_Store.php @@ -6,22 +6,23 @@ */ abstract class ActionScheduler_Store { const STATUS_COMPLETE = 'complete'; - const STATUS_PENDING = 'pending'; - const STATUS_RUNNING = 'in-progress'; - const STATUS_FAILED = 'failed'; + const STATUS_PENDING = 'pending'; + const STATUS_RUNNING = 'in-progress'; + const STATUS_FAILED = 'failed'; + const STATUS_CANCELED = 'canceled'; /** @var ActionScheduler_Store */ private static $store = NULL; /** * @param ActionScheduler_Action $action - * @param DateTime $date Optional date of the first instance + * @param DateTime $scheduled_date Optional Date of the first instance * to store. Otherwise uses the first date of the action's * schedule. * * @return string The action ID */ - abstract public function save_action( ActionScheduler_Action $action, DateTime $date = NULL ); + abstract public function save_action( ActionScheduler_Action $action, DateTime $scheduled_date = NULL ); /** * @param string $action_id @@ -44,16 +45,19 @@ abstract class ActionScheduler_Store { abstract public function query_actions( $query = array() ); /** - * @param string $action_id + * Get a count of all actions in the store, grouped by status * - * @return void + * @return array + */ + abstract public function action_counts(); + + /** + * @param string $action_id */ abstract public function cancel_action( $action_id ); /** * @param string $action_id - * - * @return void */ abstract public function delete_action( $action_id ); @@ -66,12 +70,14 @@ abstract class ActionScheduler_Store { /** - * @param int $max_actions + * @param int $max_actions * @param DateTime $before_date Claim only actions schedule before the given date. Defaults to now. + * @param array $hooks Claim only actions with a hook or hooks. + * @param string $group Claim only actions in the given group. * * @return ActionScheduler_ActionClaim */ - abstract public function stake_claim( $max_actions = 10, DateTime $before_date = NULL ); + abstract public function stake_claim( $max_actions = 10, DateTime $before_date = null, $hooks = array(), $group = '' ); /** * @return int @@ -80,38 +86,115 @@ abstract class ActionScheduler_Store { /** * @param ActionScheduler_ActionClaim $claim - * - * @return void */ abstract public function release_claim( ActionScheduler_ActionClaim $claim ); /** * @param string $action_id - * - * @return void */ abstract public function unclaim_action( $action_id ); /** * @param string $action_id - * - * @return void */ abstract public function mark_failure( $action_id ); /** * @param string $action_id - * @return void */ abstract public function log_execution( $action_id ); /** * @param string $action_id - * - * @return void */ abstract public function mark_complete( $action_id ); + /** + * @param string $action_id + * + * @return string + */ + abstract public function get_status( $action_id ); + + /** + * @param string $action_id + * @return mixed + */ + abstract public function get_claim_id( $action_id ); + + /** + * @param string $claim_id + * @return array + */ + abstract public function find_actions_by_claim_id( $claim_id ); + + /** + * @param string $comparison_operator + * @return string + */ + protected function validate_sql_comparator( $comparison_operator ) { + if ( in_array( $comparison_operator, array('!=', '>', '>=', '<', '<=', '=') ) ) { + return $comparison_operator; + } + return '='; + } + + /** + * Get the time MySQL formated date/time string for an action's (next) scheduled date. + * + * @param ActionScheduler_Action $action + * @param DateTime $scheduled_date (optional) + * @return string + */ + protected function get_scheduled_date_string( ActionScheduler_Action $action, DateTime $scheduled_date = NULL ) { + $next = null === $scheduled_date ? $action->get_schedule()->next() : $scheduled_date; + if ( ! $next ) { + throw new InvalidArgumentException( __( 'Invalid schedule. Cannot save action.', 'action-scheduler' ) ); + } + $next->setTimezone( new DateTimeZone( 'UTC' ) ); + + return $next->format( 'Y-m-d H:i:s' ); + } + + /** + * Get the time MySQL formated date/time string for an action's (next) scheduled date. + * + * @param ActionScheduler_Action $action + * @param DateTime $scheduled_date (optional) + * @return string + */ + protected function get_scheduled_date_string_local( ActionScheduler_Action $action, DateTime $scheduled_date = NULL ) { + $next = null === $scheduled_date ? $action->get_schedule()->next() : $scheduled_date; + if ( ! $next ) { + throw new InvalidArgumentException( __( 'Invalid schedule. Cannot save action.', 'action-scheduler' ) ); + } + $next->setTimezone( $this->get_local_timezone() ); + + return $next->format( 'Y-m-d H:i:s' ); + } + + /** + * Get the site's local time. Wrapper for ActionScheduler_TimezoneHelper::get_local_timezone(). + * + * @return DateTimeZone + */ + protected function get_local_timezone() { + return ActionScheduler_TimezoneHelper::get_local_timezone(); + } + + /** + * @return array + */ + public function get_status_labels() { + return array( + self::STATUS_COMPLETE => __( 'Complete', 'action-scheduler' ), + self::STATUS_PENDING => __( 'Pending', 'action-scheduler' ), + self::STATUS_RUNNING => __( 'In-progress', 'action-scheduler' ), + self::STATUS_FAILED => __( 'Failed', 'action-scheduler' ), + self::STATUS_CANCELED => __( 'Canceled', 'action-scheduler' ), + ); + } + public function init() {} /** @@ -125,4 +208,3 @@ abstract class ActionScheduler_Store { return self::$store; } } - \ No newline at end of file diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_WPCLI_QueueRunner.php b/includes/libraries/action-scheduler/classes/ActionScheduler_WPCLI_QueueRunner.php new file mode 100755 index 0000000..b3f1730 --- /dev/null +++ b/includes/libraries/action-scheduler/classes/ActionScheduler_WPCLI_QueueRunner.php @@ -0,0 +1,204 @@ +run_cleanup(); + $this->add_hooks(); + + // Check to make sure there aren't too many concurrent processes running. + $claim_count = $this->store->get_claim_count(); + $too_many = $claim_count >= $this->get_allowed_concurrent_batches(); + if ( $too_many ) { + if ( $force ) { + WP_CLI::warning( __( 'There are too many concurrent batches, but the run is forced to continue.', 'action-scheduler' ) ); + } else { + WP_CLI::error( __( 'There are too many concurrent batches.', 'action-scheduler' ) ); + } + } + + // Stake a claim and store it. + $this->claim = $this->store->stake_claim( $batch_size, null, $hooks, $group ); + $this->monitor->attach( $this->claim ); + $this->actions = $this->claim->get_actions(); + + return count( $this->actions ); + } + + /** + * Add our hooks to the appropriate actions. + * + * @author Jeremy Pry + */ + protected function add_hooks() { + add_action( 'action_scheduler_before_execute', array( $this, 'before_execute' ) ); + add_action( 'action_scheduler_after_execute', array( $this, 'after_execute' ) ); + add_action( 'action_scheduler_failed_execution', array( $this, 'action_failed' ), 10, 2 ); + } + + /** + * Set up the WP CLI progress bar. + * + * @author Jeremy Pry + */ + protected function setup_progress_bar() { + $count = count( $this->actions ); + $this->progress_bar = \WP_CLI\Utils\make_progress_bar( + sprintf( _n( 'Running %d action', 'Running %d actions', $count, 'action-scheduler' ), number_format_i18n( $count ) ), + $count + ); + } + + /** + * Process actions in the queue. + * + * @author Jeremy Pry + * @return int The number of actions processed. + */ + public function run() { + do_action( 'action_scheduler_before_process_queue' ); + $this->setup_progress_bar(); + foreach ( $this->actions as $action_id ) { + // Error if we lost the claim. + if ( ! in_array( $action_id, $this->store->find_actions_by_claim_id( $this->claim->get_id() ) ) ) { + WP_CLI::warning( __( 'The claim has been lost. Aborting current batch.', 'action-scheduler' ) ); + break; + } + + $this->process_action( $action_id ); + $this->progress_bar->tick(); + + // Free up memory after every 50 items + if ( 0 === $this->progress_bar->current() % 50 ) { + $this->stop_the_insanity(); + } + } + + $completed = $this->progress_bar->current(); + $this->progress_bar->finish(); + $this->store->release_claim( $this->claim ); + do_action( 'action_scheduler_after_process_queue' ); + + return $completed; + } + + /** + * Handle WP CLI message when the action is starting. + * + * @author Jeremy Pry + * + * @param $action_id + */ + public function before_execute( $action_id ) { + /* translators: %s refers to the action ID */ + WP_CLI::log( sprintf( __( 'Started processing action %s', 'action-scheduler' ), $action_id ) ); + } + + /** + * Handle WP CLI message when the action has completed. + * + * @author Jeremy Pry + * + * @param $action_id + */ + public function after_execute( $action_id ) { + /* translators: %s refers to the action ID */ + WP_CLI::log( sprintf( __( 'Completed processing action %s', 'action-scheduler' ), $action_id ) ); + } + + /** + * Handle WP CLI message when the action has failed. + * + * @author Jeremy Pry + * + * @param int $action_id + * @param Exception $exception + * @throws \WP_CLI\ExitException With failure message. + */ + public function action_failed( $action_id, $exception ) { + WP_CLI::error( + /* translators: %1$s refers to the action ID, %2$s refers to the Exception message */ + sprintf( __( 'Error processing action %1$s: %2$s', 'action-scheduler' ), $action_id, $exception->getMessage() ), + false + ); + } + + /** + * Sleep and help avoid hitting memory limit + * + * @param int $sleep_time Amount of seconds to sleep + */ + protected function stop_the_insanity( $sleep_time = 0 ) { + if ( 0 < $sleep_time ) { + WP_CLI::warning( sprintf( 'Stopped the insanity for %d %s', $sleep_time, _n( 'second', 'seconds', $sleep_time ) ) ); + sleep( $sleep_time ); + } + + WP_CLI::warning( __( 'Attempting to reduce used memory...', 'action-scheduler' ) ); + + /** + * @var $wpdb \wpdb + * @var $wp_object_cache \WP_Object_Cache + */ + global $wpdb, $wp_object_cache; + + $wpdb->queries = array(); + + if ( ! is_object( $wp_object_cache ) ) { + return; + } + + $wp_object_cache->group_ops = array(); + $wp_object_cache->stats = array(); + $wp_object_cache->memcache_debug = array(); + $wp_object_cache->cache = array(); + + if ( is_callable( array( $wp_object_cache, '__remoteset' ) ) ) { + call_user_func( array( $wp_object_cache, '__remoteset' ) ); // important + } + } +} diff --git a/includes/libraries/action-scheduler/classes/ActionScheduler_WPCLI_Scheduler_command.php b/includes/libraries/action-scheduler/classes/ActionScheduler_WPCLI_Scheduler_command.php new file mode 100755 index 0000000..30d0974 --- /dev/null +++ b/includes/libraries/action-scheduler/classes/ActionScheduler_WPCLI_Scheduler_command.php @@ -0,0 +1,145 @@ +] + * : The maximum number of actions to run. Defaults to 100. + * + * [--batches=
' . self::$active_version . '',
+ '' . WC_Subscriptions::$version . '',
+ '', ''
+ ) );
+
+ $admin_notice->display();
+ }
+
+ /**
+ * When updating WC to a version after 3.0 from a version prior to 3.0, schedule the repair script to add address indexes.
+ *
+ * @since 2.3.0
+ */
+ public static function maybe_add_subscription_address_indexes() {
+ $woocommerce_active_version = WC()->version;
+ $woocommerce_database_version = get_option( 'woocommerce_version' );
+
+ if ( $woocommerce_active_version !== $woocommerce_database_version && version_compare( $woocommerce_active_version, '3.0', '>=' ) && version_compare( $woocommerce_database_version, '3.0', '<' ) ) {
+ self::$background_updaters['2.3']['address_indexes_repair']->schedule_repair();
+ }
+ }
+
+ /**
+ * Load and initialise the background updaters.
+ *
+ * @since 2.3.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 );
+
+ // Init the updaters
+ foreach ( self::$background_updaters as $version => $updaters ) {
+ foreach ( $updaters as $updater ) {
+ $updater->init();
+ }
+ }
+ }
+
/**
* Used to check if a user ID is greater than the last user upgraded to version 1.4.
*
diff --git a/includes/upgrades/class-wcs-repair-subscription-address-indexes.php b/includes/upgrades/class-wcs-repair-subscription-address-indexes.php
new file mode 100755
index 0000000..8c21059
--- /dev/null
+++ b/includes/upgrades/class-wcs-repair-subscription-address-indexes.php
@@ -0,0 +1,75 @@
+scheduled_hook = 'wcs_add_missing_subscription_address_indexes';
+ $this->log_handle = 'wcs-add-subscription-address-indexes';
+ $this->logger = $logger;
+ }
+
+ /**
+ * Update a subscription, setting its address indexes.
+ *
+ * @since 2.3.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 sets the address indexes if they don't exist.
+ $subscription->save();
+
+ $this->log( sprintf( 'Subscription ID %d address index(es) added.', $subscription_id ) );
+ } catch ( Exception $e ) {
+ $this->log( sprintf( '--- Exception caught repairing subscription %d - exception message: %s ---', $subscription_id, $e->getMessage() ) );
+ }
+ }
+
+ /**
+ * Get a batch of subscriptions which need address indexes.
+ *
+ * @since 2.3.0
+ * @return array A list of subscription ids which need address indexes.
+ */
+ protected function get_items_to_update() {
+ return get_posts( array(
+ 'post_type' => 'shop_subscription',
+ 'posts_per_page' => 20,
+ 'post_status' => 'any',
+ 'fields' => 'ids',
+ 'meta_query' => array(
+ array(
+ 'key' => '_billing_address_index',
+ 'compare' => 'NOT EXISTS',
+ ),
+ ),
+ ) );
+ }
+}
diff --git a/includes/upgrades/class-wcs-repair-suspended-paypal-subscriptions.php b/includes/upgrades/class-wcs-repair-suspended-paypal-subscriptions.php
new file mode 100755
index 0000000..bb149cc
--- /dev/null
+++ b/includes/upgrades/class-wcs-repair-suspended-paypal-subscriptions.php
@@ -0,0 +1,88 @@
+scheduled_hook = 'wcs_repair_subscriptions_suspended_paypal_not_woocommerce';
+ $this->log_handle = 'wcs-upgrade-subscriptions-paypal-suspended';
+ $this->logger = $logger;
+ }
+
+ /**
+ * Repair a subscription that was suspended in PayPal, but not suspended in WooCommerce.
+ *
+ * @param int $subscription_id The ID of a shop_subscription/WC_Subscription object.
+ */
+ protected function update_item( $subscription_id ) {
+ try {
+ $subscription = wcs_get_subscription( $subscription_id );
+
+ if ( ! $subscription ) {
+ throw new Exception( 'Failed to instantiate subscription object' );
+ }
+
+ $subscription->update_status( 'on-hold', __( 'Subscription suspended by Database repair script. This subscription was suspended via PayPal.', 'woocommerce-subscriptions' ) );
+
+ $this->log( sprintf( 'Subscription ID %d suspended from 2.3.0 PayPal database repair script.', $subscription_id ) );
+ } catch ( Exception $e ) {
+ $this->log( sprintf( '--- Exception caught repairing subscription %d - exception message: %s ---', $subscription_id, $e->getMessage() ) );
+ }
+ }
+
+ /**
+ * Get a list of subscriptions to repair.
+ *
+ * @since 2.3.0
+ * @return array A list of subscription ids which may need to be repaired.
+ */
+ protected function get_items_to_update() {
+ return get_posts( array(
+ 'posts_per_page' => 20,
+ 'post_type' => 'shop_subscription',
+ 'post_status' => wcs_sanitize_subscription_status_key( 'active' ),
+ 'fields' => 'ids',
+ 'meta_query' => array(
+ array(
+ 'key' => '_schedule_next_payment',
+ 'value' => date( 'Y-m-d H:i:s', wcs_strtotime_dark_knight( '-3 days' ) ),
+ 'compare' => '<=',
+ 'type' => 'DATETIME',
+ ),
+ array(
+ 'key' => '_payment_method',
+ 'value' => 'paypal',
+ ),
+ array(
+ 'key' => '_paypal_subscription_id',
+ 'value' => 'B-%',
+ 'compare' => 'NOT LIKE',
+ ),
+ ),
+ ) );
+ }
+}
diff --git a/includes/upgrades/class-wcs-upgrade-2-0.php b/includes/upgrades/class-wcs-upgrade-2-0.php
index b5c74b2..e865410 100755
--- a/includes/upgrades/class-wcs-upgrade-2-0.php
+++ b/includes/upgrades/class-wcs-upgrade-2-0.php
@@ -116,10 +116,10 @@ class WCS_Upgrade_2_0 {
self::migrate_order_items( $new_subscription->get_id(), wcs_get_objects_property( $original_order, 'id' ) );
// Update renewal orders to link via post meta key instead of post_parent column
- self::migrate_renewal_orders( $new_subscription->get_id(), wcs_get_objects_property( $original_order, 'id' ) );
+ self::migrate_renewal_orders( $new_subscription, wcs_get_objects_property( $original_order, 'id' ) );
// Make sure the resubscribe meta data is migrated to use the new subscription ID + meta key
- self::migrate_resubscribe_orders( $new_subscription->get_id(), wcs_get_objects_property( $original_order, 'id' ) );
+ self::migrate_resubscribe_orders( $new_subscription, $original_order );
// If the order for this subscription contains a switch, make sure the switch meta data is migrated to use the new subscription ID + meta key
self::migrate_switch_meta( $new_subscription, $original_order, $subscription_item_id );
@@ -223,7 +223,7 @@ class WCS_Upgrade_2_0 {
}
$meta_key = str_replace( '_subscription', '', $raw_subscription->meta_key );
- $meta_key = substr( $meta_key, 0, 1 ) == '_' ? substr( $meta_key, 1 ) : $meta_key;
+ $meta_key = wcs_maybe_unprefix_key( $meta_key );
if ( 'product_id' === $meta_key ) {
$subscriptions[ $raw_subscription->order_item_id ]['subscription_key'] = $subscriptions[ $raw_subscription->order_item_id ]['order_id'] . '_' . $raw_subscription->meta_value;
@@ -758,12 +758,12 @@ class WCS_Upgrade_2_0 {
* order's ID, to 0, and then the new subscription's ID should be set as the '_subscription_renewal' post meta value on
* the renewal order.
*
- * @param int $subscription_id The ID of a 'shop_subscription' post type
+ * @param WC_Subscription $subscription An instance of a 'shop_subscription' post type
* @param int $order_id The ID of a 'shop_order' which created this susbcription
* @return null
* @since 2.0
*/
- private static function migrate_renewal_orders( $subscription_id, $order_id ) {
+ private static function migrate_renewal_orders( $subscription, $order_id ) {
global $wpdb;
// Get the renewal order IDs
@@ -777,10 +777,10 @@ class WCS_Upgrade_2_0 {
// Set the post meta
foreach ( $renewal_order_ids as $renewal_order_id ) {
- wcs_set_objects_property( wc_get_order( $renewal_order_id ), 'subscription_renewal', $subscription_id );
+ WCS_Related_Order_Store::instance()->add_relation( wc_get_order( $renewal_order_id ), $subscription, 'renewal' );
}
- WCS_Upgrade_Logger::add( sprintf( 'For subscription %d: migrated data for renewal orders %s', $subscription_id, implode( ', ', $renewal_order_ids ) ) );
+ WCS_Upgrade_Logger::add( sprintf( 'For subscription %d: migrated data for renewal orders %s', $subscription->get_id(), implode( ', ', $renewal_order_ids ) ) );
$rows_affected = $wpdb->update(
$wpdb->posts,
@@ -795,7 +795,7 @@ class WCS_Upgrade_2_0 {
array( '%d', '%s' )
);
- WCS_Upgrade_Logger::add( sprintf( 'For subscription %d: %d rows of renewal order post_parent values changed', $subscription_id, count( $renewal_order_ids ) ) );
+ WCS_Upgrade_Logger::add( sprintf( 'For subscription %d: %d rows of renewal order post_parent values changed', $subscription->get_id(), count( $renewal_order_ids ) ) );
}
/**
@@ -804,21 +804,24 @@ class WCS_Upgrade_2_0 {
* original order's ID, to 0, and then the new subscription's ID should be set as the '_subscription_resubscribe' post meta value
* on the resubscribe order.
*
- * @param int $subscription_id The ID of a 'shop_subscription' post type
- * @param int $resubscribe_order_id The ID of a 'shop_order' which created this susbcription
+ * @param WC_Subscription $new_subscription An instance of a 'shop_subscription' post type
+ * @param WC_Order $resubscribe_order An instance of a 'shop_order' post type which created this subscription
* @return null
* @since 2.0
*/
- private static function migrate_resubscribe_orders( $new_subscription_id, $resubscribe_order_id ) {
+ private static function migrate_resubscribe_orders( $new_subscription, $resubscribe_order ) {
global $wpdb;
+ $resubscribe_order_id = wcs_get_objects_property( $resubscribe_order, 'id' );
+ $new_subscription_id = wcs_get_objects_property( $new_subscription, 'id' );
+
// Set the post meta on the new subscription and old order
foreach ( get_post_meta( $resubscribe_order_id, '_original_order', false ) as $original_order_id ) {
// Because self::get_subscriptions() orders by order ID, it's safe to use wcs_get_subscriptions_for_order() here because the subscription in the new format will have been created for the original order (because its ID will be < the resubscribe order's ID)
foreach ( wcs_get_subscriptions_for_order( $original_order_id ) as $old_subscription ) {
- update_post_meta( $resubscribe_order_id, '_subscription_resubscribe', $old_subscription->get_id(), true );
- update_post_meta( $new_subscription_id, '_subscription_resubscribe', $old_subscription->get_id(), true );
+ WCS_Related_Order_Store::instance()->add_relation( $resubscribe_order, $old_subscription, 'resubscribe' );
+ WCS_Related_Order_Store::instance()->add_relation( $new_subscription, $old_subscription, 'resubscribe' );
}
$wpdb->query( $wpdb->prepare(
@@ -891,7 +894,8 @@ class WCS_Upgrade_2_0 {
if ( wcs_is_subscription( $old_subscription ) ) {
// Link the old subscription's ID to the switch order using the new switch meta key
- wcs_set_objects_property( $switch_order, 'subscription_switch', $old_subscription->get_id() );
+
+ WCS_Related_Order_Store::instance()->add_relation( $switch_order, $old_subscription, 'switch' );
// Now store the new/old item IDs for record keeping
foreach ( $old_subscription->get_items() as $item_id => $item ) {
diff --git a/includes/upgrades/class-wcs-upgrade-notice-manager.php b/includes/upgrades/class-wcs-upgrade-notice-manager.php
new file mode 100755
index 0000000..cdcd5b5
--- /dev/null
+++ b/includes/upgrades/class-wcs-upgrade-notice-manager.php
@@ -0,0 +1,157 @@
+=' ) ) {
+ update_option( self::$option_name, array(
+ 'version' => self::$version,
+ 'display_count' => 0,
+ ) );
+ }
+ }
+
+ /**
+ * Display the upgrade notice including details about the update if it hasn't been dismissed.
+ *
+ * @since 2.3.0
+ */
+ public static function maybe_show_admin_notice() {
+
+ if ( isset( $_GET['_wcsnonce'] ) && wp_verify_nonce( $_GET['_wcsnonce'], 'dismiss_upgrade_notice' ) && ! empty( $_GET['dismiss_upgrade_notice'] ) && self::$version === $_GET['dismiss_upgrade_notice'] ) {
+ delete_option( self::$option_name );
+ return;
+ }
+
+ if ( ! self::display_notice() ) {
+ return;
+ }
+
+ $version = _x( '2.3', 'plugin version number used in admin notice', 'woocommerce-subscriptions' );
+ $dismiss_url = wp_nonce_url( add_query_arg( 'dismiss_upgrade_notice', self::$version ), 'dismiss_upgrade_notice', '_wcsnonce' );
+ $notice = new WCS_Admin_Notice( 'notice notice-info', array(), $dismiss_url );
+ $features = array(
+ array(
+ 'title' => __( 'New Subscription Coupon Features', 'woocommerce-subscriptions' ),
+ 'description' => __( 'Want to offer customers coupons which apply for 6 months? You can now define the number of cycles discounts would be applied.', 'woocommerce-subscriptions' ),
+ ),
+ array(
+ 'title' => __( 'New Signup Pricing Options for Synchronized Subscriptions', 'woocommerce-subscriptions' ),
+ 'description' => __( 'Charge the full recurring price at the time of sign up for synchronized subscriptions. Your customers can now receive their products straight away.', 'woocommerce-subscriptions' ),
+ ),
+ array(
+ 'title' => __( 'Link Parent Orders to Subscriptions', 'woocommerce-subscriptions' ),
+ // translators: placeholders are opening and closing tags linking to documentation.
+ 'description' => sprintf( __( 'For subscriptions with no parent order, shop managers can now choose a parent order via the Edit Subscription screen. This makes it possible to set a parent order on %smanually created subscriptions%s. The order can also be sent to customers to act as an invoice that needs to be paid to activate the subscription.', 'woocommerce-subscriptions' ), '', '' ),
+ ),
+ array(
+ 'title' => __( 'Early Renewal', 'woocommerce-subscriptions' ),
+ 'description' => __( 'Customers can now renew their subscriptions before the scheduled next payment date. Why not use this to email your customers a coupon a month before their annual subscription renewals to get access to that revenue sooner?', 'woocommerce-subscriptions' ),
+ ),
+ );
+
+ // translators: placeholder is Subscription version string ('2.3')
+ $notice->set_heading( sprintf( __( 'Welcome to Subscriptions %s', 'woocommerce-subscriptions' ), $version ) );
+ $notice->set_content_template( 'update-welcome-notice.php', plugin_dir_path( WC_Subscriptions::$plugin_file ) . 'includes/upgrades/templates/', array(
+ 'version' => $version,
+ 'features' => $features,
+ ) );
+ $notice->set_actions( array(
+ array(
+ 'name' => __( 'Learn More', 'woocommerce-subscriptions' ),
+ 'url' => 'https://docs.woocommerce.com/document/subscriptions/version-2-3/',
+ ),
+ ) );
+
+ $notice->display();
+ self::increment_display_count();
+ }
+
+ /**
+ * Determine if this admin notice should be displayed.
+ *
+ * @return bool Whether this admin notice should be displayed.
+ * @since 2.3.0
+ */
+ protected static function display_notice() {
+ $option = get_option( self::$option_name );
+ $display_notice = false;
+
+ if ( isset( $option['version'] ) ) {
+ $display_notice = $option['version'] === self::$version;
+ }
+
+ return $display_notice;
+ }
+
+ /**
+ * Increment the notice display counter signalling the notice has been displayed.
+ *
+ * The option triggering this notice will be deleted if the display count has been reached.
+ *
+ * @since 2.3.0
+ */
+ protected static function increment_display_count() {
+ $option = get_option( self::$option_name );
+ $count = isset( $option['display_count'] ) ? (int) $option['display_count'] : 0;
+ $count++;
+
+ // If we've reached the display count, delete the option so the notice isn't displayed again.
+ if ( $count >= self::$display_count ) {
+ delete_option( self::$option_name );
+ } else {
+ $option['display_count'] = $count;
+ update_option( self::$option_name, $option );
+ }
+ }
+}
diff --git a/includes/upgrades/templates/update-welcome-notice.php b/includes/upgrades/templates/update-welcome-notice.php
new file mode 100755
index 0000000..d380317
--- /dev/null
+++ b/includes/upgrades/templates/update-welcome-notice.php
@@ -0,0 +1,16 @@
+
+
++ tags ?> + ', '' ) ); ?> + +
+ +-
+
+
- – + +
+ + diff --git a/includes/upgrades/templates/wcs-about.php b/includes/upgrades/templates/wcs-about.php index 74260e5..83e7e5d 100755 --- a/includes/upgrades/templates/wcs-about.php +++ b/includes/upgrades/templates/wcs-about.php @@ -106,7 +106,7 @@ if ( ! defined( 'ABSPATH' ) ) {
-
+
on the, 2$: day of every, 3$:
#. month (e.g. "$10 on the 23rd day of every 2nd month")
@@ -1916,7 +2043,7 @@ msgstr ""
msgid "%1$s on the %2$s day of every %3$s month"
msgstr ""
-#: includes/class-wc-subscriptions-product.php:347
+#: includes/class-wc-subscriptions-product.php:355
#: includes/wcs-formatting-functions.php:164
#. translators: 1$: on, 2$: , 3$: each year (e.g. "$15 on
#. March 15th each year")
@@ -1925,14 +2052,14 @@ msgstr ""
msgid "%1$s on %2$s %3$s each year"
msgstr ""
-#: includes/class-wc-subscriptions-product.php:350
+#: includes/class-wc-subscriptions-product.php:358
#: includes/wcs-formatting-functions.php:173
#. translators: 1$: recurring amount, 2$: month (e.g. "March"), 3$: day of the
#. month (e.g. "23rd") (e.g. "$15 on March 15th every 3rd year")
msgid "%1$s on %2$s %3$s every %4$s year"
msgstr ""
-#: includes/class-wc-subscriptions-product.php:356
+#: includes/class-wc-subscriptions-product.php:364
#: includes/wcs-formatting-functions.php:184
#. translators: 1$: recurring amount, 2$: subscription period (e.g. "month" or
#. "3 months") (e.g. "$15 / month" or "$15 every 2nd month")
@@ -1941,32 +2068,32 @@ msgid_plural " %1$s every %2$s"
msgstr[0] ""
msgstr[1] ""
-#: includes/class-wc-subscriptions-product.php:362
+#: includes/class-wc-subscriptions-product.php:370
#. translators: billing period (e.g. "every week")
msgid "every %s"
msgstr ""
-#: includes/class-wc-subscriptions-product.php:370
+#: includes/class-wc-subscriptions-product.php:378
#: includes/wcs-formatting-functions.php:194
#. translators: 1$: subscription string (e.g. "$10 up front then $5 on March
#. 23rd every 3rd year"), 2$: length (e.g. "4 years")
msgid "%1$s for %2$s"
msgstr ""
-#: includes/class-wc-subscriptions-product.php:376
+#: includes/class-wc-subscriptions-product.php:384
#. translators: 1$: subscription string (e.g. "$15 on March 15th every 3 years
#. for 6 years"), 2$: trial length (e.g.: "with 4 months free trial")
msgid "%1$s with %2$s free trial"
msgstr ""
-#: includes/class-wc-subscriptions-product.php:381
+#: includes/class-wc-subscriptions-product.php:389
#. translators: 1$: subscription string (e.g. "$15 on March 15th every 3 years
#. for 6 years with 2 months free trial"), 2$: signup fee price (e.g. "and a
#. $30 sign-up fee")
msgid "%1$s and a %2$s sign-up fee"
msgstr ""
-#: includes/class-wc-subscriptions-product.php:923
+#: includes/class-wc-subscriptions-product.php:952
msgid ""
"This variation can not be removed because it is associated with active "
"subscriptions. To remove this variation, please cancel and delete the "
@@ -1982,18 +2109,18 @@ msgstr ""
msgid "Subscription renewal orders cannot be cancelled."
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:174
+#: includes/class-wc-subscriptions-switcher.php:171
msgid ""
"You have a subscription to this product. Choosing a new subscription will "
"replace your existing subscription."
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:176
+#: includes/class-wc-subscriptions-switcher.php:173
msgid "Choose a new subscription."
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:198
-#: includes/class-wc-subscriptions-switcher.php:1009
+#: includes/class-wc-subscriptions-switcher.php:195
+#: includes/class-wc-subscriptions-switcher.php:1006
msgid ""
"Your cart contained an invalid subscription switch request. It has been "
"removed."
@@ -2003,13 +2130,13 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: includes/class-wc-subscriptions-switcher.php:240
+#: includes/class-wc-subscriptions-switcher.php:237
msgid ""
"You have already subscribed to this product and it is limited to one per "
"customer. You can not purchase the product again."
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:249
+#: includes/class-wc-subscriptions-switcher.php:246
#. translators: 1$: is the "You have already subscribed to this product"
#. notice, 2$-4$: opening/closing link tags, 3$: an order number
msgid ""
@@ -2017,186 +2144,197 @@ msgid ""
"subscription."
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:344
+#: includes/class-wc-subscriptions-switcher.php:341
msgid "Switching"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:347
+#: includes/class-wc-subscriptions-switcher.php:344
#. translators: placeholders are opening and closing link tags
msgid ""
"Allow subscribers to switch (upgrade or downgrade) between different "
"subscriptions. %sLearn more%s."
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:352
+#: includes/class-wc-subscriptions-switcher.php:349
msgid "Allow Switching"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:353
+#: includes/class-wc-subscriptions-switcher.php:350
msgid ""
"Allow subscribers to switch between subscriptions combined in a grouped "
"product, different variations of a Variable subscription or don't allow "
"switching."
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:369
+#: includes/class-wc-subscriptions-switcher.php:366
msgid "Prorate Recurring Payment"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:370
+#: includes/class-wc-subscriptions-switcher.php:367
msgid ""
"When switching to a subscription with a different recurring payment or "
"billing period, should the price paid for the existing billing period be "
"prorated when switching to the new subscription?"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:387
+#: includes/class-wc-subscriptions-switcher.php:384
msgid "Prorate Sign up Fee"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:388
+#: includes/class-wc-subscriptions-switcher.php:385
msgid ""
"When switching to a subscription with a sign up fee, you can require the "
"customer pay only the gap between the existing subscription's sign up fee "
"and the new subscription's sign up fee (if any)."
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:403
+#: includes/class-wc-subscriptions-switcher.php:400
msgid "Prorate Subscription Length"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:404
+#: includes/class-wc-subscriptions-switcher.php:401
msgid ""
"When switching to a subscription with a length, you can take into account "
"the payments already completed by the customer when determining how many "
"payments the subscriber needs to make for the new subscription."
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:419
+#: includes/class-wc-subscriptions-switcher.php:416
msgid "Switch Button Text"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:420
+#: includes/class-wc-subscriptions-switcher.php:417
msgid ""
"Customise the text displayed on the button next to the subscription on the "
"subscriber's account page. The default is \"Switch Subscription\", but you "
"may wish to change this to \"Upgrade\" or \"Change Subscription\"."
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:424
-#: includes/class-wc-subscriptions-switcher.php:450
-#: includes/class-wc-subscriptions-switcher.php:2470
+#: includes/class-wc-subscriptions-switcher.php:421
+#: includes/class-wc-subscriptions-switcher.php:447
+#: includes/class-wc-subscriptions-switcher.php:2439
msgid "Upgrade or Downgrade"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:874
+#: includes/class-wc-subscriptions-switcher.php:871
msgid "Switch order cancelled due to a new switch order being created #%s."
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:961
+#: includes/class-wc-subscriptions-switcher.php:958
msgid "Switch Order"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:976
+#: includes/class-wc-subscriptions-switcher.php:973
msgid "Switched Subscription"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:1081
+#: includes/class-wc-subscriptions-switcher.php:1078
msgid "You can only switch to a subscription product."
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:1087
+#: includes/class-wc-subscriptions-switcher.php:1084
msgid "We can not find your old subscription item."
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:1109
+#: includes/class-wc-subscriptions-switcher.php:1106
msgid "You can not switch to the same subscription."
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:1156
+#: includes/class-wc-subscriptions-switcher.php:1153
msgid ""
"You can not switch this subscription. It appears you do not own the "
"subscription."
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:1197
+#: includes/class-wc-subscriptions-switcher.php:1194
msgid "There was an error locating the switch details."
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:1918
-#: includes/class-wc-subscriptions-switcher.php:2262
+#: includes/class-wc-subscriptions-switcher.php:1889
+#: includes/class-wc-subscriptions-switcher.php:2233
msgid "The original subscription item being switched cannot be found."
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:1920
+#: includes/class-wc-subscriptions-switcher.php:1891
msgid "The item on the switch order cannot be found."
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:2299
+#: includes/class-wc-subscriptions-switcher.php:2270
msgid "Failed to update the subscription shipping method."
msgstr ""
-#: includes/class-wc-subscriptions-synchroniser.php:47
+#: includes/class-wc-subscriptions-synchroniser.php:48
msgid "Synchronise renewals"
msgstr ""
-#: includes/class-wc-subscriptions-synchroniser.php:48
+#: includes/class-wc-subscriptions-synchroniser.php:49
msgid ""
"Align the payment date for all customers who purchase this subscription to "
"a specific day of the week or month."
msgstr ""
-#: includes/class-wc-subscriptions-synchroniser.php:151
+#: includes/class-wc-subscriptions-synchroniser.php:207
msgid "Synchronisation"
msgstr ""
-#: includes/class-wc-subscriptions-synchroniser.php:160
+#: includes/class-wc-subscriptions-synchroniser.php:216
msgid "Align Subscription Renewal Day"
msgstr ""
-#: includes/class-wc-subscriptions-synchroniser.php:167
-msgid "Prorate First Payment"
+#: includes/class-wc-subscriptions-synchroniser.php:223
+msgid "Prorate First Renewal"
msgstr ""
-#: includes/class-wc-subscriptions-synchroniser.php:168
+#: includes/class-wc-subscriptions-synchroniser.php:224
msgid ""
"If a subscription is synchronised to a specific day of the week, month or "
"year, charge a prorated amount for the subscription at the time of sign up."
msgstr ""
#: includes/class-wc-subscriptions-synchroniser.php:239
+msgid "Sign-up grace period"
+msgstr ""
+
+#: includes/class-wc-subscriptions-synchroniser.php:244
+msgid ""
+"Subscriptions created within this many days prior to the Renewal Day will "
+"not be charged at sign-up. Set to zero for all new Subscriptions to be "
+"charged the full recurring amount. Must be a positive number."
+msgstr ""
+
+#: includes/class-wc-subscriptions-synchroniser.php:305
msgid "Month for Synchronisation"
msgstr ""
-#: includes/class-wc-subscriptions-synchroniser.php:596
+#: includes/class-wc-subscriptions-synchroniser.php:725
msgid "Do not synchronise"
msgstr ""
-#: includes/class-wc-subscriptions-synchroniser.php:604
+#: includes/class-wc-subscriptions-synchroniser.php:733
#. translators: placeholder is a day of the week
msgid "%s each week"
msgstr ""
-#: includes/class-wc-subscriptions-synchroniser.php:610
+#: includes/class-wc-subscriptions-synchroniser.php:739
#. translators: placeholder is a number of day with language specific suffix
#. applied (e.g. "1st", "3rd", "5th", etc...)
msgid "%s day of the month"
msgstr ""
-#: includes/class-wc-subscriptions-synchroniser.php:612
+#: includes/class-wc-subscriptions-synchroniser.php:741
msgid "Last day of the month"
msgstr ""
-#: includes/class-wc-subscriptions-synchroniser.php:660
+#: includes/class-wc-subscriptions-synchroniser.php:789
msgid "Today!"
msgstr ""
-#: includes/class-wc-subscriptions-synchroniser.php:667
+#: includes/class-wc-subscriptions-synchroniser.php:796
#. translators: placeholder is a date
msgid "First payment prorated. Next payment: %s"
msgstr ""
-#: includes/class-wc-subscriptions-synchroniser.php:670
+#: includes/class-wc-subscriptions-synchroniser.php:799
#. translators: placeholder is a date
msgid "First payment: %s"
msgstr ""
@@ -2213,32 +2351,49 @@ msgstr ""
msgid "View and manage subscriptions"
msgstr ""
-#: includes/class-wcs-cached-data-manager.php:241
+#: includes/class-wcs-cached-data-manager.php:76
+msgid "Related order caching is now handled by %1$s."
+msgstr ""
+
+#: includes/class-wcs-cached-data-manager.php:83
+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
+msgid "Customer subscription caching is now handled by %1$s and %2$s."
+msgstr ""
+
+#: includes/class-wcs-cached-data-manager.php:124
+msgid "new related order methods in WCS_Related_Order_Store"
+msgstr ""
+
+#: includes/class-wcs-cached-data-manager.php:222
msgid "Weekly"
msgstr ""
-#: includes/class-wcs-cart-initial-payment.php:56
-#: includes/class-wcs-cart-renewal.php:176
+#: includes/class-wcs-cart-initial-payment.php:59
+#: includes/class-wcs-cart-renewal.php:179
msgid "That doesn't appear to be your order."
msgstr ""
-#: includes/class-wcs-cart-renewal.php:204
+#: includes/class-wcs-cart-renewal.php:207
msgid "Complete checkout to renew your subscription."
msgstr ""
-#: includes/class-wcs-cart-renewal.php:285
+#: includes/class-wcs-cart-renewal.php:288
#. 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:319
+#: includes/class-wcs-cart-renewal.php:322
#. translators: %s is subscription's number
msgid "Subscription #%s has not been added to the cart."
msgstr ""
-#: includes/class-wcs-cart-renewal.php:450
+#: includes/class-wcs-cart-renewal.php:455
msgid ""
"We couldn't find the original subscription for an item in your cart. The "
"item was removed."
@@ -2248,7 +2403,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: includes/class-wcs-cart-renewal.php:457
+#: includes/class-wcs-cart-renewal.php:462
msgid ""
"We couldn't find the original renewal order for an item in your cart. The "
"item was removed."
@@ -2258,7 +2413,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: includes/class-wcs-cart-renewal.php:732
+#: includes/class-wcs-cart-renewal.php:737
msgid "All linked subscription items have been removed from the cart."
msgstr ""
@@ -2267,6 +2422,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
msgid "That subscription does not exist. Has it been deleted?"
msgstr ""
@@ -2363,23 +2519,29 @@ msgstr ""
msgid "%s ending in %s"
msgstr ""
-#: includes/class-wcs-query.php:100
+#: includes/class-wcs-post-meta-cache-manager.php:198
+msgid ""
+"Invalid update type: %s. Post update types supported are \"add\" or "
+"\"delete\". Updates are done on post meta directly."
+msgstr ""
+
+#: includes/class-wcs-query.php:106
msgid "Subscriptions (page %d)"
msgstr ""
-#: includes/class-wcs-query.php:121
+#: includes/class-wcs-query.php:127
msgid "My Subscription"
msgstr ""
-#: includes/class-wcs-query.php:245
+#: includes/class-wcs-query.php:249
msgid "Endpoint for the My Account → Subscriptions page"
msgstr ""
-#: includes/class-wcs-query.php:253
+#: includes/class-wcs-query.php:257
msgid "View subscription"
msgstr ""
-#: includes/class-wcs-query.php:254
+#: includes/class-wcs-query.php:258
msgid "Endpoint for the My Account → View Subscription page"
msgstr ""
@@ -2412,6 +2574,14 @@ msgid ""
"not support removing an item."
msgstr ""
+#: includes/class-wcs-staging.php:34
+msgid "Payment processing skipped - renewal order created under staging site lock."
+msgstr ""
+
+#: includes/class-wcs-staging.php:47
+msgid "staging"
+msgstr ""
+
#: includes/class-wcs-user-change-status-handler.php:60
msgid ""
"You can not reactivate that subscription until paying to renew it. Please "
@@ -2451,6 +2621,107 @@ msgstr ""
msgid " Subscription Switched"
msgstr ""
+#: includes/data-stores/class-wcs-customer-store-cached-cpt.php:54
+msgid "Generate Customer Subscription Cache"
+msgstr ""
+
+#: includes/data-stores/class-wcs-customer-store-cached-cpt.php:54
+msgid ""
+"This will generate the persistent cache for linking users with "
+"subscriptions. The caches will be generated overtime in the background (via "
+"Action Scheduler)."
+msgstr ""
+
+#: includes/data-stores/class-wcs-customer-store-cached-cpt.php:55
+msgid "Delete Customer Subscription Cache"
+msgstr ""
+
+#: includes/data-stores/class-wcs-customer-store-cached-cpt.php:55
+msgid ""
+"This will clear the persistent cache of all of subscriptions stored against "
+"users in your store. Expect slower performance of checkout, renewal and "
+"other subscription related functions after taking this action. The caches "
+"will be regenerated overtime as queries to find a given user's "
+"subscriptions are run."
+msgstr ""
+
+#: includes/data-stores/class-wcs-related-order-store-cached-cpt.php:69
+msgid "Generate Related Order Cache"
+msgstr ""
+
+#: includes/data-stores/class-wcs-related-order-store-cached-cpt.php:69
+msgid ""
+"This will generate the persistent cache of all renewal, switch, resubscribe "
+"and other order types for all subscriptions in your store. The caches will "
+"be generated overtime in the background (via Action Scheduler)."
+msgstr ""
+
+#: includes/data-stores/class-wcs-related-order-store-cached-cpt.php:70
+msgid "Delete Related Order Cache"
+msgstr ""
+
+#: includes/data-stores/class-wcs-related-order-store-cached-cpt.php:70
+msgid ""
+"This will clear the persistent cache of all renewal, switch, resubscribe "
+"and other order types for all subscriptions in your store. Expect slower "
+"performance of checkout, renewal and other subscription related functions "
+"after taking this action. The caches will be regenerated overtime as "
+"related order queries are run."
+msgstr ""
+
+#: includes/early-renewal/class-wcs-cart-early-renewal.php:66
+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
+msgid ""
+"You can not renew this subscription early. Please contact us if you need "
+"assistance."
+msgstr ""
+
+#: includes/early-renewal/class-wcs-cart-early-renewal.php:104
+msgid "Complete checkout to renew now."
+msgstr ""
+
+#: includes/early-renewal/class-wcs-cart-early-renewal.php:224
+#. 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
+#. 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
+msgid "Order %s created to record early renewal."
+msgstr ""
+
+#: includes/early-renewal/class-wcs-cart-early-renewal.php:370
+msgid "Cancel"
+msgstr ""
+
+#: includes/early-renewal/class-wcs-early-renewal-manager.php:44
+#: includes/upgrades/class-wcs-upgrade-notice-manager.php:98
+msgid "Early Renewal"
+msgstr ""
+
+#: includes/early-renewal/class-wcs-early-renewal-manager.php:45
+msgid "Accept Early Renewal Payments"
+msgstr ""
+
+#: includes/early-renewal/class-wcs-early-renewal-manager.php:46
+msgid ""
+"With early renewals enabled, customers can renew their subscriptions before "
+"the next payment date."
+msgstr ""
+
#: includes/emails/class-wcs-email-cancelled-subscription.php:27
msgid "Cancelled Subscription"
msgstr ""
@@ -2860,49 +3131,49 @@ msgstr ""
msgid "PayPal API error - credentials are incorrect."
msgstr ""
-#: includes/payment-retry/class-wcs-retry-admin.php:46
+#: includes/payment-retry/class-wcs-retry-admin.php:48
msgid "Automatic Failed Payment Retries"
msgstr ""
-#: includes/payment-retry/class-wcs-retry-admin.php:97
+#: includes/payment-retry/class-wcs-retry-admin.php:99
msgid "%d Pending Payment Retry"
msgid_plural "%d Pending Payment Retries"
msgstr[0] ""
msgstr[1] ""
-#: includes/payment-retry/class-wcs-retry-admin.php:100
+#: includes/payment-retry/class-wcs-retry-admin.php:102
msgid "%d Processing Payment Retry"
msgid_plural "%d Processing Payment Retries"
msgstr[0] ""
msgstr[1] ""
-#: includes/payment-retry/class-wcs-retry-admin.php:103
+#: includes/payment-retry/class-wcs-retry-admin.php:105
msgid "%d Failed Payment Retry"
msgid_plural "%d Failed Payment Retries"
msgstr[0] ""
msgstr[1] ""
-#: includes/payment-retry/class-wcs-retry-admin.php:106
+#: includes/payment-retry/class-wcs-retry-admin.php:108
msgid "%d Successful Payment Retry"
msgid_plural "%d Successful Payment Retries"
msgstr[0] ""
msgstr[1] ""
-#: includes/payment-retry/class-wcs-retry-admin.php:109
+#: includes/payment-retry/class-wcs-retry-admin.php:111
msgid "%d Cancelled Payment Retry"
msgid_plural "%d Cancelled Payment Retries"
msgstr[0] ""
msgstr[1] ""
-#: includes/payment-retry/class-wcs-retry-admin.php:133
+#: includes/payment-retry/class-wcs-retry-admin.php:135
msgid "Retry Failed Payments"
msgstr ""
-#: includes/payment-retry/class-wcs-retry-admin.php:134
+#: includes/payment-retry/class-wcs-retry-admin.php:136
msgid "Enable automatic retry of failed recurring payments"
msgstr ""
-#: includes/payment-retry/class-wcs-retry-admin.php:138
+#: includes/payment-retry/class-wcs-retry-admin.php:140
msgid ""
"Attempt to recover recurring revenue that would otherwise be lost due to "
"payment methods being declined only temporarily. %sLearn more%s."
@@ -2974,8 +3245,8 @@ msgid "Created Date"
msgstr ""
#: includes/privacy/class-wcs-privacy-exporters.php:79
-#: templates/checkout/recurring-totals.php:122
#: templates/checkout/recurring-totals.php:123
+#: templates/checkout/recurring-totals.php:124
msgid "Recurring Total"
msgstr ""
@@ -2991,11 +3262,11 @@ msgstr ""
msgid "Browser User Agent"
msgstr ""
-#: includes/privacy/class-wcs-privacy-exporters.php:83 wcs-functions.php:258
+#: includes/privacy/class-wcs-privacy-exporters.php:83 wcs-functions.php:274
msgid "Billing Address"
msgstr ""
-#: includes/privacy/class-wcs-privacy-exporters.php:84 wcs-functions.php:257
+#: includes/privacy/class-wcs-privacy-exporters.php:84 wcs-functions.php:273
msgid "Shipping Address"
msgstr ""
@@ -3100,13 +3371,13 @@ msgstr ""
msgid "N/A"
msgstr ""
-#: includes/upgrades/class-wc-subscriptions-upgrader.php:292
+#: includes/upgrades/class-wc-subscriptions-upgrader.php:314
#. 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:315
+#: includes/upgrades/class-wc-subscriptions-upgrader.php:337
#. translators: 1$: number of action scheduler hooks upgraded, 2$:
#. "{execution_time}", will be replaced on front end with actual time
msgid ""
@@ -3114,51 +3385,137 @@ msgid ""
"seconds)."
msgstr ""
-#: includes/upgrades/class-wc-subscriptions-upgrader.php:331
+#: includes/upgrades/class-wc-subscriptions-upgrader.php:353
#. 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:344
+#: includes/upgrades/class-wc-subscriptions-upgrader.php:366
#. translators: 1$: error message, 2$: opening link tag, 3$: closing link tag
msgid ""
"Unable to upgrade subscriptions.
Error: %1$s
Please refresh the " "page and try again. If problem persists, %2$scontact support%3$s." msgstr "" -#: includes/upgrades/class-wc-subscriptions-upgrader.php:599 +#: includes/upgrades/class-wc-subscriptions-upgrader.php:621 msgid "Welcome to WooCommerce Subscriptions 2.1" msgstr "" -#: includes/upgrades/class-wc-subscriptions-upgrader.php:599 +#: includes/upgrades/class-wc-subscriptions-upgrader.php:621 msgid "About WooCommerce Subscriptions" msgstr "" +#: includes/upgrades/class-wc-subscriptions-upgrader.php:804 +msgid "" +"%1$sWarning!%2$s It appears that you have downgraded %1$sWooCommerce " +"Subscriptions%2$s from %3$s to %4$s. Downgrading the plugin in this way may " +"cause issues. Please update to %3$s or higher, or %5$sopen a new support " +"ticket%6$s for further assistance." +msgstr "" + +#: includes/upgrades/class-wcs-repair-suspended-paypal-subscriptions.php:49 +msgid "" +"Subscription suspended by Database repair script. This subscription was " +"suspended via PayPal." +msgstr "" + #: includes/upgrades/class-wcs-upgrade-2-2-7.php:60 msgid "Subscription end date in the past" msgstr "" -#: includes/upgrades/templates/wcs-about-2-0.php:20 -msgid "Welcome to Subscriptions 2.0" +#: includes/upgrades/class-wcs-upgrade-notice-manager.php:85 +msgid "New Subscription Coupon Features" msgstr "" +#: includes/upgrades/class-wcs-upgrade-notice-manager.php:86 +msgid "" +"Want to offer customers coupons which apply for 6 months? You can now " +"define the number of cycles discounts would be applied." +msgstr "" + +#: includes/upgrades/class-wcs-upgrade-notice-manager.php:89 +msgid "New Signup Pricing Options for Synchronized Subscriptions" +msgstr "" + +#: includes/upgrades/class-wcs-upgrade-notice-manager.php:90 +msgid "" +"Charge the full recurring price at the time of sign up for synchronized " +"subscriptions. Your customers can now receive their products straight away." +msgstr "" + +#: includes/upgrades/class-wcs-upgrade-notice-manager.php:93 +msgid "Link Parent Orders to Subscriptions" +msgstr "" + +#: includes/upgrades/class-wcs-upgrade-notice-manager.php:95 +#. translators: placeholders are opening and closing tags linking to +#. documentation. +msgid "" +"For subscriptions with no parent order, shop managers can now choose a " +"parent order via the Edit Subscription screen. This makes it possible to " +"set a parent order on %smanually created subscriptions%s. The order can " +"also be sent to customers to act as an invoice that needs to be paid to " +"activate the subscription." +msgstr "" + +#: includes/upgrades/class-wcs-upgrade-notice-manager.php:99 +msgid "" +"Customers can now renew their subscriptions before the scheduled next " +"payment date. Why not use this to email your customers a coupon a month " +"before their annual subscription renewals to get access to that revenue " +"sooner?" +msgstr "" + +#: includes/upgrades/class-wcs-upgrade-notice-manager.php:104 +#. translators: placeholder is Subscription version string ('2.3') +msgid "Welcome to Subscriptions %s" +msgstr "" + +#: includes/upgrades/class-wcs-upgrade-notice-manager.php:111 +msgid "Learn More" +msgstr "" + +#: includes/upgrades/templates/update-welcome-notice.php:2 #: includes/upgrades/templates/wcs-about-2-0.php:23 #: includes/upgrades/templates/wcs-about.php:22 +#. translators: placeholder is Subscription version string ('2.3') msgid "Thank you for updating to the latest version of WooCommerce Subscriptions." msgstr "" +#: includes/upgrades/templates/update-welcome-notice.php:5 +#. translators: placeholder $1 is the Subscription version string ('2.3'), $2-3 +#. are opening and closing tags +msgid "" +"Version %1$s brings some great new features requested by store managers " +"just like you (and possibly even by %2$syou%3$s)." +msgstr "" + +#: includes/upgrades/templates/update-welcome-notice.php:6 +#: includes/upgrades/templates/wcs-about-2-0.php:25 +#: includes/upgrades/templates/wcs-about.php:24 +msgid "We hope you enjoy it!" +msgstr "" + +#: includes/upgrades/templates/update-welcome-notice.php:8 +msgid "What's New?" +msgstr "" + +#: includes/upgrades/templates/update-welcome-notice.php:16 +#. translators: placeholder is Subscription version string ('2.3') +msgid "Want to know more about %s and these new features?" +msgstr "" + +#: includes/upgrades/templates/wcs-about-2-0.php:20 +msgid "Welcome to Subscriptions 2.0" +msgstr "" + #: includes/upgrades/templates/wcs-about-2-0.php:24 msgid "" "Version 2.0 has been in development for more than a year. We've reinvented " "the extension to take into account 3 years of feedback from store managers." msgstr "" -#: includes/upgrades/templates/wcs-about-2-0.php:25 -#: includes/upgrades/templates/wcs-about.php:24 -msgid "We hope you enjoy it!" -msgstr "" - #: includes/upgrades/templates/wcs-about-2-0.php:31 #: includes/upgrades/templates/wcs-about.php:30 #. translators: placeholder is version number @@ -3486,8 +3843,8 @@ msgstr "" #: includes/upgrades/templates/wcs-about.php:109 msgid "" "That's not all we've working on for the last 12 months when it comes to " -"Subscriptions. We've also released free mini-extensions to help you get the " -"most from your subscription store." +"Subscriptions. We've also released mini-extensions to help you get the most " +"from your subscription store." msgstr "" #: includes/upgrades/templates/wcs-about.php:115 @@ -3502,7 +3859,7 @@ msgstr "" #: includes/upgrades/templates/wcs-about.php:117 msgid "" -"The free Gifting extension makes it possible for one person to purchase a " +"The Gifting extension makes it possible for one person to purchase a " "subscription product for someone else. It then shares control of the " "subscription between the purchaser and recipient, allowing both to manage " "the subscription over its lifecycle." @@ -3772,11 +4129,15 @@ msgid_plural "Shipping %d" msgstr[0] "" msgstr[1] "" -#: includes/wcs-cart-functions.php:235 +#: includes/wcs-cart-functions.php:217 +msgid "[Remove]" +msgstr "" + +#: includes/wcs-cart-functions.php:247 msgid "Free shipping coupon" msgstr "" -#: includes/wcs-cart-functions.php:340 +#: includes/wcs-cart-functions.php:352 #. translators: placeholder is a date msgid "First renewal: %s" msgstr "" @@ -3886,27 +4247,27 @@ msgstr "" msgid "MM" msgstr "" -#: includes/wcs-order-functions.php:327 +#: includes/wcs-order-functions.php:344 msgid "Subscription Renewal Order – %s" msgstr "" -#: includes/wcs-order-functions.php:330 +#: includes/wcs-order-functions.php:347 msgid "Resubscribe Order – %s" msgstr "" -#: includes/wcs-order-functions.php:349 +#: includes/wcs-order-functions.php:366 msgid "$type passed to the function was not a string." msgstr "" -#: includes/wcs-order-functions.php:354 +#: includes/wcs-order-functions.php:370 msgid "\"%s\" is not a valid new order type." msgstr "" -#: includes/wcs-order-functions.php:541 +#: includes/wcs-order-functions.php:557 msgid "Invalid data. No valid subscription / order was passed in." msgstr "" -#: includes/wcs-order-functions.php:545 +#: includes/wcs-order-functions.php:561 msgid "Invalid data. No valid item id was passed in." msgstr "" @@ -3934,7 +4295,7 @@ msgid_plural "a %s-year" msgstr[0] "" msgstr[1] "" -#: includes/wcs-user-functions.php:350 +#: includes/wcs-user-functions.php:336 #: templates/single-product/add-to-cart/subscription.php:43 #: templates/single-product/add-to-cart/variable-subscription.php:29 msgid "Resubscribe" @@ -4000,19 +4361,6 @@ msgstr "" msgid "Billing Period:" msgstr "" -#: templates/admin/status.php:22 -msgid "This section shows any information about Subscriptions." -msgstr "" - -#: templates/admin/status.php:74 -#. 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 "" - -#: templates/admin/status.php:87 -msgid "Learn how to update" -msgstr "" - #: templates/cart/cart-recurring-shipping.php:19 msgid "Recurring shipping options can be selected on checkout." msgstr "" @@ -4242,87 +4590,87 @@ msgstr "" msgid "Clear" msgstr "" -#: wcs-functions.php:230 +#: wcs-functions.php:246 msgid "Can not get status name. Status is not a string." msgstr "" -#: wcs-functions.php:253 +#: wcs-functions.php:269 msgid "Can not get address type display name. Address type is not a string." msgstr "" -#: wcs-functions.php:316 +#: wcs-functions.php:332 msgid "Date type is not a string." msgstr "" -#: wcs-functions.php:318 +#: wcs-functions.php:334 msgid "Date type can not be an empty string." msgstr "" -#: woocommerce-subscriptions.php:246 +#: woocommerce-subscriptions.php:318 msgid "This is where subscriptions are stored." msgstr "" -#: woocommerce-subscriptions.php:291 +#: woocommerce-subscriptions.php:363 msgid "No Subscriptions found" msgstr "" -#: woocommerce-subscriptions.php:293 +#: woocommerce-subscriptions.php:365 msgid "" "Subscriptions will appear here for you to view and manage once purchased by " "a customer." msgstr "" -#: woocommerce-subscriptions.php:295 +#: woocommerce-subscriptions.php:367 #. translators: placeholders are opening and closing link tags msgid "%sLearn more about managing subscriptions »%s" msgstr "" -#: woocommerce-subscriptions.php:297 +#: woocommerce-subscriptions.php:369 #. translators: placeholders are opening and closing link tags msgid "%sAdd a subscription product »%s" msgstr "" -#: woocommerce-subscriptions.php:425 +#: woocommerce-subscriptions.php:523 msgid "" "A subscription renewal has been removed from your cart. Multiple " "subscriptions can not be purchased at the same time." msgstr "" -#: woocommerce-subscriptions.php:431 +#: woocommerce-subscriptions.php:529 msgid "" "A subscription has been removed from your cart. Due to payment gateway " "restrictions, different subscription products can not be purchased at the " "same time." msgstr "" -#: woocommerce-subscriptions.php:437 +#: woocommerce-subscriptions.php:535 msgid "" "A subscription has been removed from your cart. Products and subscriptions " "can not be purchased at the same time." msgstr "" -#: woocommerce-subscriptions.php:585 woocommerce-subscriptions.php:602 +#: woocommerce-subscriptions.php:683 woocommerce-subscriptions.php:700 #. translators: placeholder is a number, this is for the teens #. translators: placeholder is a number, numbers ending in 4-9, 0 msgid "%sth" msgstr "" -#: woocommerce-subscriptions.php:590 +#: woocommerce-subscriptions.php:688 #. translators: placeholder is a number, numbers ending in 1 msgid "%sst" msgstr "" -#: woocommerce-subscriptions.php:594 +#: woocommerce-subscriptions.php:692 #. translators: placeholder is a number, numbers ending in 2 msgid "%snd" msgstr "" -#: woocommerce-subscriptions.php:598 +#: woocommerce-subscriptions.php:696 #. translators: placeholder is a number, numbers ending in 3 msgid "%srd" msgstr "" -#: woocommerce-subscriptions.php:628 +#: woocommerce-subscriptions.php:726 #. translators: 1$-2$: opening and closing tags, 3$-4$: link tags, #. takes to woocommerce plugin on wp.org, 5$-6$: opening and closing link tags, #. leads to plugins.php in admin @@ -4332,7 +4680,7 @@ msgid "" "%5$sinstall & activate WooCommerce »%6$s" msgstr "" -#: woocommerce-subscriptions.php:635 +#: woocommerce-subscriptions.php:733 #. translators: 1$-2$: opening and closing tags, 3$-4$: opening and #. closing link tags, leads to plugin admin msgid "" @@ -4341,11 +4689,24 @@ msgid "" "WooCommerce to version 2.4 or newer »%4$s" msgstr "" -#: woocommerce-subscriptions.php:661 +#: woocommerce-subscriptions.php:759 msgid "Variable Subscription" msgstr "" -#: woocommerce-subscriptions.php:857 +#: woocommerce-subscriptions.php:902 +msgid "" +"%1$sWarning!%2$s We can see the %1$sWooCommerce Subscriptions Early " +"Renewal%2$s plugin is active. Version %3$s of %1$sWooCommerce " +"Subscriptions%2$s comes with that plugin's functionality packaged into the " +"core plugin. Please deactivate WooCommerce Subscriptions Early Renewal to " +"avoid any conflicts." +msgstr "" + +#: woocommerce-subscriptions.php:905 +msgid "Installed Plugins" +msgstr "" + +#: woocommerce-subscriptions.php:978 #. translators: 1$-2$: opening and closing tags, 3$-4$: opening and #. closing link tags. Leads to duplicate site article on docs msgid "" @@ -4355,19 +4716,19 @@ msgid "" "environment. %3$sLearn more »%4$s." msgstr "" -#: woocommerce-subscriptions.php:859 +#: woocommerce-subscriptions.php:980 msgid "Quit nagging me (but don't enable automatic payments)" msgstr "" -#: woocommerce-subscriptions.php:860 +#: woocommerce-subscriptions.php:981 msgid "Enable automatic payments" msgstr "" -#: woocommerce-subscriptions.php:1066 +#: woocommerce-subscriptions.php:1187 msgid "Support" msgstr "" -#: woocommerce-subscriptions.php:1151 +#: woocommerce-subscriptions.php:1272 #. translators: placeholders are opening and closing tags. Leads to docs on #. version 2 msgid "" @@ -4378,14 +4739,14 @@ msgid "" "2.0 »%s" msgstr "" -#: woocommerce-subscriptions.php:1166 +#: woocommerce-subscriptions.php:1287 msgid "" "Warning! You are running version %s of WooCommerce Subscriptions plugin " "code but your database has been upgraded to Subscriptions version 2.0. This " "will cause major problems on your store." msgstr "" -#: woocommerce-subscriptions.php:1167 +#: woocommerce-subscriptions.php:1288 msgid "" "Please upgrade the WooCommerce Subscriptions plugin to version 2.0 or newer " "immediately. If you need assistance, after upgrading to Subscriptions v2.0, " @@ -4410,7 +4771,7 @@ msgstr "" msgid "http://prospress.com/" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:200 +#: includes/admin/class-wc-subscriptions-admin.php:202 #. translators: placeholder is trial period validation message if passed an #. invalid value (e.g. "Trial period can not exceed 4 weeks") msgctxt "Trial period field tooltip on Edit Product administration screen" @@ -4420,12 +4781,12 @@ msgid "" "subscription. %s" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:213 +#: includes/admin/class-wc-subscriptions-admin.php:215 msgctxt "example price" msgid "e.g. 5.90" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:247 +#: includes/admin/class-wc-subscriptions-admin.php:249 #: templates/admin/deprecated/html-variation-price.php:31 #: templates/admin/deprecated/html-variation-price.php:86 #: templates/admin/html-variation-price.php:21 @@ -4434,7 +4795,7 @@ msgctxt "example price" msgid "e.g. 9.90" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:781 +#: includes/admin/class-wc-subscriptions-admin.php:784 #. translators: placeholders are for HTML tags. They are 1$: "\""
msgid "M j, Y @ G:i"
msgstr ""
-#: includes/admin/meta-boxes/class-wcs-meta-box-related-orders.php:84
+#: includes/admin/class-wcs-admin-system-status.php:119
+msgctxt "label for the system status page"
+msgid "Subscriptions Template Theme Overrides"
+msgstr ""
+
+#: includes/admin/class-wcs-admin-system-status.php:204
+msgctxt "label for the system status page"
+msgid "Subscription Statuses"
+msgstr ""
+
+#: includes/admin/class-wcs-admin-system-status.php:225
+msgctxt "label for the system status page"
+msgid "WooCommerce Account Connected"
+msgstr ""
+
+#: includes/admin/class-wcs-admin-system-status.php:248
+msgctxt "label for the system status page"
+msgid "Active Product Key"
+msgstr ""
+
+#: includes/admin/class-wcs-admin-system-status.php:278
+msgctxt "label for the system status page"
+msgid "Other"
+msgstr ""
+
+#: includes/admin/class-wcs-admin-system-status.php:312
+msgctxt "label for the system status page"
+msgid "PayPal Reference Transactions Enabled"
+msgstr ""
+
+#: includes/admin/class-wcs-admin-system-status.php:340
+msgctxt "label for the system status page"
+msgid "Country / State"
+msgstr ""
+
+#: includes/payment-retry/class-wcs-retry-admin.php:160
+msgctxt "label for the system status page"
+msgid "Custom Retry Rules"
+msgstr ""
+
+#: includes/payment-retry/class-wcs-retry-admin.php:168
+msgctxt "label for the system status page"
+msgid "Custom Retry Rule Class"
+msgstr ""
+
+#: includes/payment-retry/class-wcs-retry-admin.php:176
+msgctxt "label for the system status page"
+msgid "Custom Raw Retry Rule"
+msgstr ""
+
+#: includes/payment-retry/class-wcs-retry-admin.php:184
+msgctxt "label for the system status page"
+msgid "Custom Retry Rule"
+msgstr ""
+
+#: includes/admin/meta-boxes/class-wcs-meta-box-related-orders.php:78
msgctxt "relation to order"
msgid "Resubscribed Subscription"
msgstr ""
-#: includes/admin/meta-boxes/class-wcs-meta-box-related-orders.php:92
+#: includes/admin/meta-boxes/class-wcs-meta-box-related-orders.php:78
+msgctxt "relation to order"
+msgid "Resubscribe Order"
+msgstr ""
+
+#: includes/admin/meta-boxes/class-wcs-meta-box-related-orders.php:87
msgctxt "relation to order"
msgid "Initial Subscription"
msgstr ""
-#: includes/admin/meta-boxes/class-wcs-meta-box-related-orders.php:101
+#: includes/admin/meta-boxes/class-wcs-meta-box-related-orders.php:96
msgctxt "relation to order"
msgid "Parent Order"
msgstr ""
-#: includes/admin/meta-boxes/class-wcs-meta-box-related-orders.php:111
+#: includes/admin/meta-boxes/class-wcs-meta-box-related-orders.php:106
msgctxt "relation to order"
msgid "Renewal Order"
msgstr ""
@@ -4587,7 +5008,7 @@ msgctxt "edit subscription header"
msgid "Subscription #%s details"
msgstr ""
-#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:141
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:163
#: includes/class-wcs-change-payment-method-admin.php:52
msgctxt ""
"The gateway ID displayed on the Edit Subscriptions screen when editing "
@@ -4595,8 +5016,15 @@ msgctxt ""
msgid "Gateway ID: [%s]"
msgstr ""
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:336
+msgctxt "subscription note after linking to a parent order"
+msgid "Subscription linked to parent order %s via admin."
+msgstr ""
+
#: includes/admin/meta-boxes/views/html-related-orders-row.php:19
#: includes/class-wc-subscriptions-renewal-order.php:157
+#: includes/early-renewal/class-wcs-cart-early-renewal.php:217
+#: includes/early-renewal/class-wcs-cart-early-renewal.php:314
#: templates/myaccount/my-subscriptions.php:38
#: templates/myaccount/related-orders.php:39
#: templates/myaccount/related-subscriptions.php:32
@@ -4604,7 +5032,7 @@ msgctxt "hash before order number"
msgid "#%s"
msgstr ""
-#: includes/class-wcs-query.php:96
+#: includes/class-wcs-query.php:102
msgctxt "hash before order number"
msgid "Subscription #%s"
msgstr ""
@@ -4632,19 +5060,19 @@ msgstr ""
#: templates/emails/cancelled-subscription.php:28
#: templates/emails/expired-subscription.php:28
-#: templates/emails/on-hold-subscription.php:28 wcs-functions.php:279
+#: templates/emails/on-hold-subscription.php:28 wcs-functions.php:295
msgctxt "table heading"
msgid "Last Order Date"
msgstr ""
#: templates/emails/subscription-info.php:19
-#: templates/myaccount/subscription-details.php:22 wcs-functions.php:276
+#: templates/myaccount/subscription-details.php:22 wcs-functions.php:292
msgctxt "table heading"
msgid "Start Date"
msgstr ""
#: templates/emails/subscription-info.php:20
-#: templates/myaccount/subscription-details.php:28 wcs-functions.php:281
+#: templates/myaccount/subscription-details.php:28 wcs-functions.php:297
msgctxt "table heading"
msgid "End Date"
msgstr ""
@@ -4657,17 +5085,17 @@ msgstr ""
#: templates/myaccount/my-subscriptions.php:27
#: templates/myaccount/my-subscriptions.php:44
#: templates/myaccount/related-subscriptions.php:22
-#: templates/myaccount/related-subscriptions.php:38 wcs-functions.php:278
+#: templates/myaccount/related-subscriptions.php:38 wcs-functions.php:294
msgctxt "table heading"
msgid "Next Payment"
msgstr ""
-#: wcs-functions.php:277
+#: wcs-functions.php:293
msgctxt "table heading"
msgid "Trial End"
msgstr ""
-#: wcs-functions.php:280
+#: wcs-functions.php:296
msgctxt "table heading"
msgid "Cancelled Date"
msgstr ""
@@ -4703,12 +5131,12 @@ msgctxt "API response confirming order note deleted from a subscription"
msgid "Permanently deleted subscription note"
msgstr ""
-#: includes/class-wc-subscription.php:1166
+#: includes/class-wc-subscription.php:1103
msgctxt "original denotes there is no date to display"
msgid "-"
msgstr ""
-#: includes/class-wc-subscription.php:2289
+#: includes/class-wc-subscription.php:2237
#. translators: placeholder is date type (e.g. "end", "next_payment"...)
msgctxt "appears in an error message if date is wrong format"
msgid "Invalid %s date. The date must be of the format: \"Y-m-d H:i:s\"."
@@ -4743,22 +5171,28 @@ msgctxt "used in order note as reason for why subscription status changed"
msgid "Subscription renewal payment retry:"
msgstr ""
-#: includes/class-wc-subscriptions-manager.php:1040 wcs-functions.php:209
+#: includes/early-renewal/class-wcs-cart-early-renewal.php:147
+#: includes/early-renewal/class-wcs-cart-early-renewal.php:174
+msgctxt "used in order note as reason for why subscription status changed"
+msgid "Customer requested to renew early:"
+msgstr ""
+
+#: includes/class-wc-subscriptions-manager.php:1040 wcs-functions.php:225
msgctxt "Subscription status"
msgid "Active"
msgstr ""
-#: includes/class-wc-subscriptions-manager.php:1043 wcs-functions.php:211
+#: includes/class-wc-subscriptions-manager.php:1043 wcs-functions.php:227
msgctxt "Subscription status"
msgid "Cancelled"
msgstr ""
-#: includes/class-wc-subscriptions-manager.php:1046 wcs-functions.php:213
+#: includes/class-wc-subscriptions-manager.php:1046 wcs-functions.php:229
msgctxt "Subscription status"
msgid "Expired"
msgstr ""
-#: includes/class-wc-subscriptions-manager.php:1049 wcs-functions.php:208
+#: includes/class-wc-subscriptions-manager.php:1049 wcs-functions.php:224
msgctxt "Subscription status"
msgid "Pending"
msgstr ""
@@ -4773,17 +5207,17 @@ msgctxt "Subscription status"
msgid "On-hold"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:2611 wcs-functions.php:212
+#: includes/class-wc-subscriptions-switcher.php:2580 wcs-functions.php:228
msgctxt "Subscription status"
msgid "Switched"
msgstr ""
-#: wcs-functions.php:210
+#: wcs-functions.php:226
msgctxt "Subscription status"
msgid "On hold"
msgstr ""
-#: wcs-functions.php:214
+#: wcs-functions.php:230
msgctxt "Subscription status"
msgid "Pending Cancellation"
msgstr ""
@@ -4825,106 +5259,115 @@ msgctxt "An order type"
msgid "Non-subscription"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:360
-#: includes/class-wc-subscriptions-switcher.php:377
-#: includes/class-wc-subscriptions-switcher.php:411
-#: includes/class-wc-subscriptions-synchroniser.php:174
+#: includes/class-wc-subscriptions-switcher.php:357
+#: includes/class-wc-subscriptions-switcher.php:374
+#: includes/class-wc-subscriptions-switcher.php:408
msgctxt "when to allow a setting"
msgid "Never"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:361
+#: includes/class-wc-subscriptions-switcher.php:358
msgctxt "when to allow switching"
msgid "Between Subscription Variations"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:362
+#: includes/class-wc-subscriptions-switcher.php:359
msgctxt "when to allow switching"
msgid "Between Grouped Subscriptions"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:363
+#: includes/class-wc-subscriptions-switcher.php:360
msgctxt "when to allow switching"
msgid "Between Both Variations & Grouped Subscriptions"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:378
+#: includes/class-wc-subscriptions-switcher.php:375
msgctxt "when to prorate recurring fee when switching"
msgid "For Upgrades of Virtual Subscription Products Only"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:379
+#: includes/class-wc-subscriptions-switcher.php:376
msgctxt "when to prorate recurring fee when switching"
msgid "For Upgrades of All Subscription Products"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:380
+#: includes/class-wc-subscriptions-switcher.php:377
msgctxt "when to prorate recurring fee when switching"
msgid "For Upgrades & Downgrades of Virtual Subscription Products Only"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:381
+#: includes/class-wc-subscriptions-switcher.php:378
msgctxt "when to prorate recurring fee when switching"
msgid "For Upgrades & Downgrades of All Subscription Products"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:395
+#: includes/class-wc-subscriptions-switcher.php:392
msgctxt "when to prorate signup fee when switching"
msgid "Never (do not charge a sign up fee)"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:396
+#: includes/class-wc-subscriptions-switcher.php:393
msgctxt "when to prorate signup fee when switching"
msgid "Never (charge the full sign up fee)"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:397
+#: includes/class-wc-subscriptions-switcher.php:394
msgctxt "when to prorate signup fee when switching"
msgid "Always"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:412
-#: includes/class-wc-subscriptions-synchroniser.php:175
+#: includes/class-wc-subscriptions-switcher.php:409
+#: includes/class-wc-subscriptions-synchroniser.php:232
msgctxt "when to prorate first payment / subscription length"
msgid "For Virtual Subscription Products Only"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:413
-#: includes/class-wc-subscriptions-synchroniser.php:176
+#: includes/class-wc-subscriptions-switcher.php:410
+#: includes/class-wc-subscriptions-synchroniser.php:233
msgctxt "when to prorate first payment / subscription length"
msgid "For All Subscription Products"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:1804
+#: includes/class-wc-subscriptions-synchroniser.php:230
+msgctxt "when to prorate first payment / subscription length"
+msgid "Never (do not charge any recurring amount)"
+msgstr ""
+
+#: includes/class-wc-subscriptions-synchroniser.php:231
+msgctxt "when to prorate first payment / subscription length"
+msgid "Never (charge the full recurring amount at sign-up)"
+msgstr ""
+
+#: includes/class-wc-subscriptions-switcher.php:1775
msgctxt "a switch order"
msgid "Downgrade"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:1807
+#: includes/class-wc-subscriptions-switcher.php:1778
msgctxt "a switch order"
msgid "Upgrade"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:1810
+#: includes/class-wc-subscriptions-switcher.php:1781
msgctxt "a switch order"
msgid "Crossgrade"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:1815
+#: includes/class-wc-subscriptions-switcher.php:1786
#. translators: %1: product subtotal, %2: HTML span tag, %3: direction
#. (upgrade, downgrade, crossgrade), %4: closing HTML span tag
msgctxt "product subtotal string"
msgid "%1$s %2$s(%3$s)%4$s"
msgstr ""
-#: includes/class-wc-subscriptions-switcher.php:1931
-#: includes/class-wc-subscriptions-switcher.php:2273
+#: includes/class-wc-subscriptions-switcher.php:1902
+#: includes/class-wc-subscriptions-switcher.php:2244
#. translators: 1$: old item, 2$: new item when switching
msgctxt "used in order notes"
msgid "Customer switched from: %1$s to %2$s."
msgstr ""
-#: includes/class-wc-subscriptions-synchroniser.php:50
+#: includes/class-wc-subscriptions-synchroniser.php:51
#. translators: placeholder is a year (e.g. "2016")
msgctxt "used in subscription product edit screen"
msgid ""
@@ -4934,7 +5377,7 @@ msgid ""
"product."
msgstr ""
-#: includes/class-wc-subscriptions-synchroniser.php:154
+#: includes/class-wc-subscriptions-synchroniser.php:210
#. translators: placeholders are opening and closing link tags
msgctxt "used in the general subscription options page"
msgid ""
@@ -4942,14 +5385,14 @@ msgid ""
"For example, the first day of the month. %sLearn more%s."
msgstr ""
-#: includes/class-wc-subscriptions-synchroniser.php:237
+#: includes/class-wc-subscriptions-synchroniser.php:303
#: templates/admin/deprecated/html-variation-synchronisation.php:36
#: templates/admin/html-variation-synchronisation.php:36
msgctxt "input field placeholder for day field for annual subscriptions"
msgid "Day"
msgstr ""
-#: includes/class-wcs-cart-renewal.php:761
+#: includes/class-wcs-cart-renewal.php:766
msgctxt ""
"Used in WooCommerce by removed item notification: \"_All linked "
"subscription items were_ removed. Undo?\" Filter for item title."
@@ -5221,21 +5664,21 @@ msgctxt "Admin menu name"
msgid "Renewal Payment Retries"
msgstr ""
-#: includes/upgrades/class-wc-subscriptions-upgrader.php:303
+#: includes/upgrades/class-wc-subscriptions-upgrader.php:325
#. translators: placeholder is number of upgraded subscriptions
msgctxt "used in the subscriptions upgrader"
msgid "Marked %s subscription products as \"sold individually\"."
msgstr ""
-#: includes/upgrades/class-wc-subscriptions-upgrader.php:334
-#: includes/upgrades/class-wc-subscriptions-upgrader.php:384
+#: includes/upgrades/class-wc-subscriptions-upgrader.php:356
+#: includes/upgrades/class-wc-subscriptions-upgrader.php:406
#. translators: placeholder is "{time_left}", will be replaced on front end
#. with actual time
msgctxt "Message that gets sent to front end."
msgid "Estimated time left (minutes:seconds): %s"
msgstr ""
-#: includes/upgrades/class-wc-subscriptions-upgrader.php:363
+#: includes/upgrades/class-wc-subscriptions-upgrader.php:385
#. translators: placeholder is the number of subscriptions repaired
msgctxt "Repair message that gets sent to front end."
msgid ""
@@ -5243,7 +5686,7 @@ msgid ""
"customer notes."
msgstr ""
-#: includes/upgrades/class-wc-subscriptions-upgrader.php:369
+#: includes/upgrades/class-wc-subscriptions-upgrader.php:391
#. translators: placeholder is number of subscriptions that were checked and
#. did not need repairs. There's a space at the beginning!
msgctxt "Repair message that gets sent to front end."
@@ -5252,14 +5695,14 @@ msgid_plural "%d other subscriptions were checked and did not need any repairs."
msgstr[0] ""
msgstr[1] ""
-#: includes/upgrades/class-wc-subscriptions-upgrader.php:373
+#: includes/upgrades/class-wc-subscriptions-upgrader.php:395
#. translators: placeholder is "{execution_time}", which will be replaced on
#. front end with actual time
msgctxt "Repair message that gets sent to front end."
msgid "(in %s seconds)"
msgstr ""
-#: includes/upgrades/class-wc-subscriptions-upgrader.php:376
+#: includes/upgrades/class-wc-subscriptions-upgrader.php:398
#. translators: $1: "Repaired x subs with incorrect dates...", $2: "X others
#. were checked and no repair needed", $3: "(in X seconds)". Ordering for RTL
#. languages.
@@ -5267,7 +5710,7 @@ msgctxt "The assembled repair message that gets sent to front end."
msgid "%1$s%2$s %3$s"
msgstr ""
-#: includes/upgrades/class-wc-subscriptions-upgrader.php:395
+#: includes/upgrades/class-wc-subscriptions-upgrader.php:417
#. translators: 1$: error message, 2$: opening link tag, 3$: closing link tag
msgctxt "Error message that gets sent to front end when upgrading Subscriptions"
msgid ""
@@ -5275,8 +5718,13 @@ msgid ""
"and try again. If problem persists, %2$scontact support%3$s."
msgstr ""
+#: includes/upgrades/class-wcs-upgrade-notice-manager.php:80
+msgctxt "plugin version number used in admin notice"
+msgid "2.3"
+msgstr ""
+
#: includes/upgrades/templates/wcs-about-2-0.php:36
-#: woocommerce-subscriptions.php:1065
+#: woocommerce-subscriptions.php:1186
msgctxt "short for documents"
msgid "Docs"
msgstr ""
@@ -5321,7 +5769,7 @@ msgctxt "shipping method price"
msgid "Free"
msgstr ""
-#: includes/wcs-cart-functions.php:271
+#: includes/wcs-cart-functions.php:283
#. translators: placeholder is price string, denotes tax included in cart/order
#. total
msgctxt "includes tax"
@@ -5333,21 +5781,21 @@ msgctxt "initial payment on a subscription"
msgid "up front"
msgstr ""
-#: includes/wcs-order-functions.php:135
+#: includes/wcs-order-functions.php:146
msgctxt ""
"In wcs_copy_order_meta error message. Refers to origin and target order "
"objects."
msgid "Invalid data. Orders expected aren't orders."
msgstr ""
-#: includes/wcs-order-functions.php:139
+#: includes/wcs-order-functions.php:150
msgctxt ""
"Refers to the type of the copy being performed: \"copy_order\", "
"\"subscription\", \"renewal_order\", \"resubscribe_order\""
msgid "Invalid data. Type of copy is not a string."
msgstr ""
-#: includes/wcs-order-functions.php:323 wcs-functions.php:155
+#: includes/wcs-order-functions.php:340 wcs-functions.php:155
#. translators: Order date parsed by strftime
msgctxt "Used in subscription post title. \"Subscription renewal order - \""
msgid "%b %d, %Y @ %I:%M %p"
@@ -5702,7 +6150,7 @@ msgid "Total"
msgstr ""
#: templates/myaccount/my-subscriptions.php:59
-#: templates/myaccount/related-orders.php:73
+#: templates/myaccount/related-orders.php:79
#: templates/myaccount/related-subscriptions.php:45
msgctxt "view a subscription"
msgid "View"
@@ -5754,68 +6202,68 @@ msgctxt "The post title for the new subscription"
msgid "Subscription – %s"
msgstr ""
-#: woocommerce-subscriptions.php:233
+#: woocommerce-subscriptions.php:305
msgctxt "custom post type setting"
msgid "Add Subscription"
msgstr ""
-#: woocommerce-subscriptions.php:234
+#: woocommerce-subscriptions.php:306
msgctxt "custom post type setting"
msgid "Add New Subscription"
msgstr ""
-#: woocommerce-subscriptions.php:235
+#: woocommerce-subscriptions.php:307
msgctxt "custom post type setting"
msgid "Edit"
msgstr ""
-#: woocommerce-subscriptions.php:236
+#: woocommerce-subscriptions.php:308
msgctxt "custom post type setting"
msgid "Edit Subscription"
msgstr ""
-#: woocommerce-subscriptions.php:237
+#: woocommerce-subscriptions.php:309
msgctxt "custom post type setting"
msgid "New Subscription"
msgstr ""
-#: woocommerce-subscriptions.php:238 woocommerce-subscriptions.php:239
+#: woocommerce-subscriptions.php:310 woocommerce-subscriptions.php:311
msgctxt "custom post type setting"
msgid "View Subscription"
msgstr ""
-#: woocommerce-subscriptions.php:242
+#: woocommerce-subscriptions.php:314
msgctxt "custom post type setting"
msgid "No Subscriptions found in trash"
msgstr ""
-#: woocommerce-subscriptions.php:243
+#: woocommerce-subscriptions.php:315
msgctxt "custom post type setting"
msgid "Parent Subscriptions"
msgstr ""
-#: woocommerce-subscriptions.php:311
+#: woocommerce-subscriptions.php:383
msgctxt "post status label including post count"
msgid "Active (%s)"
msgid_plural "Active (%s)"
msgstr[0] ""
msgstr[1] ""
-#: woocommerce-subscriptions.php:312
+#: woocommerce-subscriptions.php:384
msgctxt "post status label including post count"
msgid "Switched (%s)"
msgid_plural "Switched (%s)"
msgstr[0] ""
msgstr[1] ""
-#: woocommerce-subscriptions.php:313
+#: woocommerce-subscriptions.php:385
msgctxt "post status label including post count"
msgid "Expired (%s)"
msgid_plural "Expired (%s)"
msgstr[0] ""
msgstr[1] ""
-#: woocommerce-subscriptions.php:314
+#: woocommerce-subscriptions.php:386
msgctxt "post status label including post count"
msgid "Pending Cancellation (%s)"
msgid_plural "Pending Cancellation (%s)"
diff --git a/readme.txt b/readme.txt
index a1926ba..d763d26 100755
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,8 @@
Contributors: prospress, jconroy, mattallan, thenbrent
Tags: woocommerce, subscriptions, ecommerce, e-commerce, commerce, wordpress ecommerce
Requires at least: 4.0
-Tested up to: 4.5
+Tested up to: 4.8
+Requires PHP: 5.6
License: GPLv3
License URI: http://www.gnu.org/licenses/gpl-3.0.html
WC requires at least: 2.5
diff --git a/templates/admin/html-admin-notice.php b/templates/admin/html-admin-notice.php
new file mode 100755
index 0000000..3149748
--- /dev/null
+++ b/templates/admin/html-admin-notice.php
@@ -0,0 +1,29 @@
+
+
@@ -114,10 +114,10 @@ if ( ! defined( 'ABSPATH' ) ) {
 ); ?>)
-
+
diff --git a/includes/wcs-cart-functions.php b/includes/wcs-cart-functions.php
index 1d4b01c..c7d4e85 100755
--- a/includes/wcs-cart-functions.php
+++ b/includes/wcs-cart-functions.php
@@ -70,7 +70,7 @@ function wcs_cart_totals_shipping_html() {
} elseif ( in_array( $chosen_initial_method, $package['rates'] ) ) {
$chosen_recurring_method = $chosen_initial_method;
} else {
- $chosen_recurring_method = current( $package['rates'] )->id;
+ $chosen_recurring_method = empty( $package['rates'] ) ? '' : current( $package['rates'] )->id;
}
$shipping_selection_displayed = false;
@@ -206,6 +206,18 @@ function wcs_cart_totals_taxes_total_html( $cart ) {
echo wp_kses_post( apply_filters( 'wcs_cart_totals_taxes_total_html', wcs_cart_price_string( $value, $cart ), $cart ) );
}
+/**
+ * Display the remove link for a coupon.
+ *
+ * @access public
+ *
+ * @param WC_Coupon $coupon
+ */
+function wcs_cart_coupon_remove_link_html( $coupon ) {
+ $html = '' . __( '[Remove]', 'woocommerce-subscriptions' ) . '';
+ echo wp_kses( $html, array_replace_recursive( wp_kses_allowed_html( 'post' ), array( 'a' => array( 'data-coupon' => true ) ) ) );
+}
+
/**
* Display a recurring coupon's value.
*
diff --git a/includes/wcs-deprecated-functions.php b/includes/wcs-deprecated-functions.php
index efbc9cf..9dc2dc2 100755
--- a/includes/wcs-deprecated-functions.php
+++ b/includes/wcs-deprecated-functions.php
@@ -206,27 +206,16 @@ function wcs_get_subscription_in_deprecated_structure( WC_Subscription $subscrip
}
}
- $paid_renewal_order_ids = get_posts( array(
- 'posts_per_page' => -1,
- 'post_status' => $subscription->get_paid_order_statuses(),
- 'post_type' => 'shop_order',
- 'orderby' => 'date',
- 'order' => 'desc',
- 'fields' => 'ids',
- 'meta_query' => array(
- array(
- 'key' => '_subscription_renewal',
- 'compare' => '=',
- 'value' => $subscription->get_id(),
- 'type' => 'numeric',
- ),
- ),
- ) );
+ foreach ( $subscription->get_related_orders( 'all', 'renewal' ) as $renewal_order ) {
- foreach ( $paid_renewal_order_ids as $paid_renewal_order_id ) {
- $date_created = wcs_get_objects_property( wc_get_order( $paid_renewal_order_id ), 'date_created' );
- if ( ! is_null( $date_created ) ) {
- $completed_payments[] = wcs_get_datetime_utc_string( $date_created );
+ // Not all gateways would call $order->payment_complete() with WC < 3.0, so we need to find renewal orders with a paid status or a paid date (WC 3.0+ takes care of setting the paid date when payment_complete() wasn't called)
+ if ( null !== wcs_get_objects_property( $renewal_order, 'date_paid' ) || $renewal_order->has_status( $subscription->get_paid_order_statuses() ) ) {
+
+ $date_created = wcs_get_objects_property( $renewal_order, 'date_created' );
+
+ if ( ! is_null( $date_created ) ) {
+ $completed_payments[] = wcs_get_datetime_utc_string( $date_created );
+ }
}
}
}
diff --git a/includes/wcs-helper-functions.php b/includes/wcs-helper-functions.php
index 85798b2..7a3bebc 100755
--- a/includes/wcs-helper-functions.php
+++ b/includes/wcs-helper-functions.php
@@ -171,6 +171,18 @@ function wcs_maybe_prefix_key( $key, $prefix = '_' ) {
return ( substr( $key, 0, strlen( $prefix ) ) != $prefix ) ? $prefix . $key : $key;
}
+/**
+ * Remove a prefix from a string if has it
+ *
+ * @param string $key
+ * @param string $prefix
+ * @since 2.2.0
+ * @return string
+ */
+function wcs_maybe_unprefix_key( $key, $prefix = '_' ) {
+ return ( substr( $key, 0, strlen( $prefix ) ) === $prefix ) ? substr( $key, strlen( $prefix ) ) : $key;
+}
+
/**
* Find the name of the function which called the function which called this function.
*
@@ -186,3 +198,36 @@ function wcs_get_calling_function_name() {
return $calling_function;
}
+
+/**
+ * Get the value of a transient, even if it has expired.
+ *
+ * Handy when data cached in a transient will be valid even if the transient has expired.
+ *
+ * @param string $transient_key The key used to set/get the transient via get_transient()/set_transient()
+ * @return mixed If data exists in a transient, the value of the transient, else boolean false.
+ */
+function wcs_get_transient_even_if_expired( $transient_key ) {
+
+ // First, check if the transient exists via the Options API to access the value in the database without WordPress checking the transient's expiration time (and returning false if it's < now)
+ $transient_value = get_option( sprintf( '_transient_%s', $transient_key ) );
+
+ if ( false === $transient_value ) {
+ $transient_value = get_transient( $transient_key );
+ }
+
+ return $transient_value;
+}
+
+/**
+ * Get a minor version string from a full version string.
+ *
+ * @param string $version Version string (eg 1.0.1).
+ * @return string The minor release version string (eg 1.0).
+ * @since 2.3.0
+ */
+function wcs_get_minor_version_string( $version ) {
+ $version_parts = array_pad( array_map( 'intval', explode( '.', $version ) ), 2, 0 );
+
+ return $version_parts[0] . '.' . $version_parts[1];
+}
diff --git a/includes/wcs-limit-functions.php b/includes/wcs-limit-functions.php
index 67db4af..9c9339d 100755
--- a/includes/wcs-limit-functions.php
+++ b/includes/wcs-limit-functions.php
@@ -24,7 +24,13 @@ function wcs_get_product_limitation( $product ) {
$product = wc_get_product( $product );
}
- return apply_filters( 'woocommerce_subscriptions_product_limitation', WC_Subscriptions_Product::get_meta_data( $product, 'subscription_limit', 'no', 'use_default_value' ), $product );
+ if ( $product->is_type( 'variation' ) ) {
+ $parent_product = wc_get_product( $product->get_parent_id() );
+ } else {
+ $parent_product = $product;
+ }
+
+ return apply_filters( 'woocommerce_subscriptions_product_limitation', WC_Subscriptions_Product::get_meta_data( $parent_product, 'subscription_limit', 'no', 'use_default_value' ), $product );
}
/**
diff --git a/includes/wcs-order-functions.php b/includes/wcs-order-functions.php
index 0e04c7e..9612ea1 100755
--- a/includes/wcs-order-functions.php
+++ b/includes/wcs-order-functions.php
@@ -13,9 +13,9 @@ if ( ! defined( 'ABSPATH' ) ) {
}
/**
- * A wrapper for @see wcs_get_subscriptions() which accepts simply an order ID
+ * Get the subscription related to an order, if any.
*
- * @param int|WC_Order $order_id The post_id of a shop_order post or an instance of a WC_Order object
+ * @param WC_Order|int $order An instance of a WC_Order object or the ID of an order
* @param array $args A set of name value pairs to filter the returned value.
* 'subscriptions_per_page' The number of subscriptions to return. Default set to -1 to return all.
* 'offset' An optional number of subscription to displace or pass over. Default 0.
@@ -29,14 +29,19 @@ if ( ! defined( 'ABSPATH' ) ) {
* @return array Subscription details in post_id => WC_Subscription form.
* @since 2.0
*/
-function wcs_get_subscriptions_for_order( $order_id, $args = array() ) {
+function wcs_get_subscriptions_for_order( $order, $args = array() ) {
- if ( is_object( $order_id ) ) {
- $order_id = wcs_get_objects_property( $order_id, 'id' );
+ $subscriptions = array();
+
+ if ( ! is_a( $order, 'WC_Abstract_Order' ) ) {
+ $order = wc_get_order( $order );
+ }
+
+ if ( ! is_a( $order, 'WC_Abstract_Order' ) ) {
+ return $subscriptions;
}
$args = wp_parse_args( $args, array(
- 'order_id' => $order_id,
'subscriptions_per_page' => -1,
'order_type' => array( 'parent', 'switch' ),
)
@@ -47,23 +52,29 @@ function wcs_get_subscriptions_for_order( $order_id, $args = array() ) {
$args['order_type'] = array( $args['order_type'] );
}
- $subscriptions = array();
- $get_all = ( in_array( 'any', $args['order_type'] ) ) ? true : false;
+ $get_all = ( in_array( 'any', $args['order_type'] ) ) ? true : false;
- if ( $order_id && in_array( 'parent', $args['order_type'] ) || $get_all ) {
- $subscriptions = wcs_get_subscriptions( $args );
+ if ( $get_all || in_array( 'parent', $args['order_type'] ) ) {
+
+ $get_subscriptions_args = array_merge( $args, array(
+ 'order_id' => wcs_get_objects_property( $order, 'id' ),
+ ) );
+
+ $subscriptions = wcs_get_subscriptions( $get_subscriptions_args );
}
- if ( ( in_array( 'resubscribe', $args['order_type'] ) || $get_all ) && wcs_order_contains_resubscribe( $order_id ) ) {
- $subscriptions += wcs_get_subscriptions_for_resubscribe_order( $order_id );
- }
+ $all_relation_types = WCS_Related_Order_Store::instance()->get_relation_types();
+ $relation_types = $get_all ? $all_relation_types : array_intersect( $all_relation_types, $args['order_type'] );
- if ( ( in_array( 'renewal', $args['order_type'] ) || $get_all ) && wcs_order_contains_renewal( $order_id ) ) {
- $subscriptions += wcs_get_subscriptions_for_renewal_order( $order_id );
- }
+ foreach ( $relation_types as $relation_type ) {
- if ( ( in_array( 'switch', $args['order_type'] ) || $get_all ) && wcs_order_contains_switch( $order_id ) ) {
- $subscriptions += wcs_get_subscriptions_for_switch_order( $order_id );
+ $subscription_ids = WCS_Related_Order_Store::instance()->get_related_subscription_ids( $order, $relation_type );
+
+ foreach ( $subscription_ids as $subscription_id ) {
+ if ( wcs_is_subscription( $subscription_id ) ) {
+ $subscriptions[ $subscription_id ] = wcs_get_subscription( $subscription_id );
+ }
+ }
}
return $subscriptions;
@@ -139,7 +150,7 @@ function wcs_copy_order_meta( $from_order, $to_order, $type = 'subscription' ) {
throw new InvalidArgumentException( _x( 'Invalid data. Type of copy is not a string.', 'Refers to the type of the copy being performed: "copy_order", "subscription", "renewal_order", "resubscribe_order"', 'woocommerce-subscriptions' ) );
}
- if ( ! in_array( $type, array( 'subscription', 'renewal_order', 'resubscribe_order' ) ) ) {
+ if ( ! in_array( $type, array( 'subscription', 'parent', 'renewal_order', 'resubscribe_order' ) ) ) {
$type = 'copy_order';
}
@@ -165,7 +176,12 @@ function wcs_copy_order_meta( $from_order, $to_order, $type = 'subscription' ) {
'_subscription_renewal',
'_subscription_switch',
'_payment_method',
- '_payment_method_title'
+ '_payment_method_title',
+ '_suspension_count',
+ '_requires_manual_renewal',
+ '_cancelled_email_sent',
+ '_trial_period',
+ '_created_via'
)",
wcs_get_objects_property( $from_order, 'id' )
);
@@ -197,7 +213,7 @@ function wcs_copy_order_meta( $from_order, $to_order, $type = 'subscription' ) {
*
* @param WC_Subscription|int $subscription Subscription we're basing the order off of
* @param string $type Type of new order. Default values are 'renewal_order'|'resubscribe_order'
- * @return WC_Order New order
+ * @return WC_Order|WP_Error New order or error object.
*/
function wcs_create_order_from_subscription( $subscription, $type ) {
@@ -220,18 +236,19 @@ function wcs_create_order_from_subscription( $subscription, $type ) {
$new_order = wc_create_order( array(
'customer_id' => $subscription->get_user_id(),
'customer_note' => $subscription->get_customer_note(),
+ 'created_via' => 'subscription',
) );
wcs_copy_order_meta( $subscription, $new_order, $type );
// Copy over line items and allow extensions to add/remove items or item meta
$items = apply_filters( 'wcs_new_order_items', $subscription->get_items( array( 'line_item', 'fee', 'shipping', 'tax', 'coupon' ) ), $new_order, $subscription );
- $items = apply_filters( 'wcs_' . $type . '_items', $items, $new_order, $subscription );
+ $items = apply_filters( "wcs_{$type}_items", $items, $new_order, $subscription );
foreach ( $items as $item_index => $item ) {
$item_name = apply_filters( 'wcs_new_order_item_name', $item['name'], $item, $subscription );
- $item_name = apply_filters( 'wcs_' . $type . '_item_name', $item_name, $item, $subscription );
+ $item_name = apply_filters( "wcs_{$type}_item_name", $item_name, $item, $subscription );
// Create order line item on the renewal order
$order_item_id = wc_add_order_item( wcs_get_objects_property( $new_order, 'id' ), array(
@@ -342,15 +359,14 @@ function wcs_get_new_order_title( $type ) {
* if not actually string.
*
* @param string $type type of new order
- * @return string the same type thing if no problems are found
+ * @return string|WP_Error the same type thing if no problems are found, or WP_Error.
*/
function wcs_validate_new_order_type( $type ) {
if ( ! is_string( $type ) ) {
return new WP_Error( 'order_from_subscription_type_type', sprintf( __( '$type passed to the function was not a string.', 'woocommerce-subscriptions' ), $type ) );
-
}
- if ( ! in_array( $type, apply_filters( 'wcs_new_order_types', array( 'renewal_order', 'resubscribe_order' ) ) ) ) {
+ if ( ! in_array( $type, apply_filters( 'wcs_new_order_types', array( 'renewal_order', 'resubscribe_order', 'parent' ) ) ) ) {
return new WP_Error( 'order_from_subscription_type', sprintf( __( '"%s" is not a valid new order type.', 'woocommerce-subscriptions' ), $type ) );
}
@@ -739,9 +755,8 @@ function wcs_display_item_downloads( $item, $order ) {
* Copy the order item data and meta data from one item to another.
*
* @since 2.2.0
- * @param WC_Order_Item The order item to copy data from
- * @param WC_Order_Item The order item to copy data to
- * @return void
+ * @param WC_Order_Item $from_item The order item to copy data from
+ * @param WC_Order_Item $to_item The order item to copy data to
*/
function wcs_copy_order_item( $from_item, &$to_item ) {
@@ -756,6 +771,7 @@ function wcs_copy_order_item( $from_item, &$to_item ) {
switch ( $from_item->get_type() ) {
case 'line_item':
+ /** @var WC_Order_Item_Product $from_item */
$to_item->set_props( array(
'product_id' => $from_item->get_product_id(),
'variation_id' => $from_item->get_variation_id(),
@@ -767,6 +783,7 @@ function wcs_copy_order_item( $from_item, &$to_item ) {
) );
break;
case 'shipping':
+ /** @var WC_Order_Item_Shipping $from_item */
$to_item->set_props( array(
'method_id' => $from_item->get_method_id(),
'total' => $from_item->get_total(),
@@ -774,6 +791,7 @@ function wcs_copy_order_item( $from_item, &$to_item ) {
) );
break;
case 'tax':
+ /** @var WC_Order_Item_Tax $from_item */
$to_item->set_props( array(
'rate_id' => $from_item->get_rate_id(),
'label' => $from_item->get_label(),
@@ -783,6 +801,7 @@ function wcs_copy_order_item( $from_item, &$to_item ) {
) );
break;
case 'fee':
+ /** @var WC_Order_Item_Fee $from_item */
$to_item->set_props( array(
'tax_class' => $from_item->get_tax_class(),
'tax_status' => $from_item->get_tax_status(),
@@ -791,6 +810,7 @@ function wcs_copy_order_item( $from_item, &$to_item ) {
) );
break;
case 'coupon':
+ /** @var WC_Order_Item_Coupon $from_item */
$to_item->set_props( array(
'discount' => $from_item->get_discount(),
'discount_tax' => $from_item->get_discount_tax(),
diff --git a/includes/wcs-product-functions.php b/includes/wcs-product-functions.php
index f9afa9a..d37dda4 100755
--- a/includes/wcs-product-functions.php
+++ b/includes/wcs-product-functions.php
@@ -94,7 +94,7 @@ function wcs_get_variation_prices( $variation, $variable_product ) {
* Get an array of the minimum and maximum priced variations based on subscription billing terms.
*
* @param array $child_variation_ids the IDs of product variation children ids
- * @return array() Array containing the min and max variation prices and billing data
+ * @return array Array containing the min and max variation prices and billing data
* @since 2.2.0
*/
function wcs_get_min_max_variation_data( $variable_product, $child_variation_ids = array() ) {
diff --git a/includes/wcs-renewal-functions.php b/includes/wcs-renewal-functions.php
index caaabea..4692926 100755
--- a/includes/wcs-renewal-functions.php
+++ b/includes/wcs-renewal-functions.php
@@ -33,7 +33,7 @@ function wcs_create_renewal_order( $subscription ) {
return new WP_Error( 'renewal-order-error', $renewal_order->get_error_message() );
}
- wcs_set_objects_property( $renewal_order, 'subscription_renewal', $subscription->get_id(), 'save' );
+ WCS_Related_Order_Store::instance()->add_relation( $renewal_order, $subscription, 'renewal' );
return apply_filters( 'wcs_renewal_order_created', $renewal_order, $subscription );
}
@@ -50,7 +50,9 @@ function wcs_order_contains_renewal( $order ) {
$order = wc_get_order( $order );
}
- if ( wcs_is_order( $order ) && wcs_get_objects_property( $order, 'subscription_renewal' ) ) {
+ $related_subscriptions = wcs_get_subscriptions_for_renewal_order( $order );
+
+ if ( wcs_is_order( $order ) && ! empty( $related_subscriptions ) ) {
$is_renewal = true;
} else {
$is_renewal = false;
@@ -107,29 +109,11 @@ function wcs_cart_contains_failed_renewal_order_payment() {
}
/**
- * Get the subscription to which a renewal order relates.
+ * Get the subscription/s to which a resubscribe order relates.
*
* @param WC_Order|int $order The WC_Order object or ID of a WC_Order order.
* @since 2.0
*/
function wcs_get_subscriptions_for_renewal_order( $order ) {
-
- if ( ! is_a( $order, 'WC_Abstract_Order' ) ) {
- $order = wc_get_order( $order );
- }
-
- $subscriptions = array();
-
- // Only use the order if we actually found a valid order object
- if ( is_a( $order, 'WC_Abstract_Order' ) ) {
- $subscription_ids = wcs_get_objects_property( $order, 'subscription_renewal', 'multiple' );
-
- foreach ( $subscription_ids as $subscription_id ) {
- if ( wcs_is_subscription( $subscription_id ) ) {
- $subscriptions[ $subscription_id ] = wcs_get_subscription( $subscription_id );
- }
- }
- }
-
- return apply_filters( 'wcs_subscriptions_for_renewal_order', $subscriptions, $order );
+ return wcs_get_subscriptions_for_order( $order, array( 'order_type' => 'renewal' ) );
}
diff --git a/includes/wcs-resubscribe-functions.php b/includes/wcs-resubscribe-functions.php
index a0dbd7d..70e6d71 100755
--- a/includes/wcs-resubscribe-functions.php
+++ b/includes/wcs-resubscribe-functions.php
@@ -26,7 +26,9 @@ function wcs_order_contains_resubscribe( $order ) {
$order = wc_get_order( $order );
}
- if ( wcs_get_objects_property( $order, 'subscription_resubscribe' ) ) {
+ $related_subscriptions = wcs_get_subscriptions_for_resubscribe_order( $order );
+
+ if ( wcs_is_order( $order ) && ! empty( $related_subscriptions ) ) {
$is_resubscribe_order = true;
} else {
$is_resubscribe_order = false;
@@ -54,8 +56,7 @@ function wcs_create_resubscribe_order( $subscription ) {
return new WP_Error( 'resubscribe-order-error', $resubscribe_order->get_error_message() );
}
- // Keep a record of the original subscription's ID on the new order
- wcs_set_objects_property( $resubscribe_order, 'subscription_resubscribe', $subscription->get_id(), true );
+ WCS_Related_Order_Store::instance()->add_relation( $resubscribe_order, $subscription, 'resubscribe' );
do_action( 'wcs_resubscribe_order_created', $resubscribe_order, $subscription );
@@ -137,21 +138,7 @@ function wcs_cart_contains_resubscribe( $cart = '' ) {
* @since 2.0
*/
function wcs_get_subscriptions_for_resubscribe_order( $order ) {
-
- if ( ! is_a( $order, 'WC_Abstract_Order' ) ) {
- $order = wc_get_order( $order );
- }
-
- $subscriptions = array();
- $subscription_ids = wcs_get_objects_property( $order, 'subscription_resubscribe', 'multiple' );
-
- foreach ( $subscription_ids as $subscription_id ) {
- if ( wcs_is_subscription( $subscription_id ) ) {
- $subscriptions[ $subscription_id ] = wcs_get_subscription( $subscription_id );
- }
- }
-
- return apply_filters( 'wcs_subscriptions_for_resubscribe_order', $subscriptions, $order );
+ return wcs_get_subscriptions_for_order( $order, array( 'order_type' => 'resubscribe' ) );
}
/**
@@ -201,18 +188,7 @@ function wcs_can_user_resubscribe_to( $subscription, $user_id = '' ) {
} else {
- $resubscribe_orders = get_posts( array(
- 'meta_query' => array(
- array(
- 'key' => '_subscription_resubscribe',
- 'compare' => '=',
- 'value' => $subscription->get_id(),
- 'type' => 'numeric',
- ),
- ),
- 'post_type' => 'shop_order',
- 'post_status' => 'any',
- ) );
+ $resubscribe_order_ids = $subscription->get_related_orders( 'ids', 'resubscribe' );
// Make sure all line items still exist
$all_line_items_exist = true;
@@ -229,13 +205,21 @@ function wcs_can_user_resubscribe_to( $subscription, $user_id = '' ) {
break;
}
- if ( 'active' == wcs_get_product_limitation( $product ) && ( wcs_user_has_subscription( $user_id, $product->get_id(), 'on-hold' ) || wcs_user_has_subscription( $user_id, $product->get_id(), 'active' ) ) ) {
- $has_active_limited_subscription = true;
- break;
+ if ( 'active' === wcs_get_product_limitation( $product ) ) {
+ if ( $product->is_type( 'variation' ) ) {
+ $limited_product_id = $product->get_parent_id();
+ } else {
+ $limited_product_id = $product->get_id();
+ }
+
+ if ( wcs_user_has_subscription( $user_id, $limited_product_id, 'on-hold' ) || wcs_user_has_subscription( $user_id, $limited_product_id, 'active' ) ) {
+ $has_active_limited_subscription = true;
+ break;
+ }
}
}
- if ( empty( $resubscribe_orders ) && $subscription->get_completed_payment_count() > 0 && true === $all_line_items_exist && false === $has_active_limited_subscription ) {
+ if ( empty( $resubscribe_order_ids ) && $subscription->get_completed_payment_count() > 0 && true === $all_line_items_exist && false === $has_active_limited_subscription ) {
$can_user_resubscribe = true;
} else {
$can_user_resubscribe = false;
diff --git a/includes/wcs-switch-functions.php b/includes/wcs-switch-functions.php
index 9ffae0d..48d61e4 100755
--- a/includes/wcs-switch-functions.php
+++ b/includes/wcs-switch-functions.php
@@ -50,24 +50,7 @@ function wcs_order_contains_switch( $order ) {
* @since 2.0
*/
function wcs_get_subscriptions_for_switch_order( $order ) {
-
- if ( ! is_a( $order, 'WC_Abstract_Order' ) ) {
- $order = wc_get_order( $order );
- }
-
- $subscriptions = array();
- $subscription_ids = wcs_get_objects_property( $order, 'subscription_switch', 'multiple' );
-
- foreach ( $subscription_ids as $subscription_id ) {
-
- $subscription = wcs_get_subscription( $subscription_id );
-
- if ( $subscription ) {
- $subscriptions[ $subscription_id ] = $subscription;
- }
- }
-
- return $subscriptions;
+ return wcs_get_subscriptions_for_order( $order, array( 'order_type' => 'switch' ) );
}
/**
@@ -78,28 +61,8 @@ function wcs_get_subscriptions_for_switch_order( $order ) {
* @since 2.0
*/
function wcs_get_switch_orders_for_subscription( $subscription_id ) {
-
- $orders = array();
-
- // Select the orders which switched item/s from this subscription
- $order_ids = get_posts( array(
- 'post_type' => 'shop_order',
- 'post_status' => 'any',
- 'fields' => 'ids',
- 'posts_per_page' => -1,
- 'meta_query' => array(
- array(
- 'key' => '_subscription_switch',
- 'value' => $subscription_id,
- ),
- ),
- ) );
-
- foreach ( $order_ids as $order_id ) {
- $orders[ $order_id ] = wc_get_order( $order_id );
- }
-
- return $orders;
+ $subscription = wcs_get_subscription( $subscription_id );
+ return $subscription->get_related_orders( 'all', 'switch' );
}
/**
@@ -124,24 +87,22 @@ function wcs_is_product_switchable_type( $product ) {
} else {
// back compat for parent products
- $parent_id = wcs_get_objects_property( $product, 'parent_id' );
-
- if ( $product->is_type( 'subscription_variation' ) && ! empty( $parent_id ) ) {
+ if ( $product->is_type( 'subscription_variation' ) && $product->get_parent_id() ) {
$variation = $product;
- $product = wc_get_product( $parent_id );;
+ $product = wc_get_product( $product->get_parent_id() );
}
$allow_switching = get_option( WC_Subscriptions_Admin::$option_prefix . '_allow_switching', 'no' );
switch ( $allow_switching ) {
case 'variable' :
- $is_product_switchable = ( $product->is_type( array( 'variable-subscription', 'subscription_variation' ) ) ) ? true : false;
+ $is_product_switchable = $product->is_type( array( 'variable-subscription', 'subscription_variation' ) ) && 'publish' === wcs_get_objects_property( $product, 'post_status' );
break;
case 'grouped' :
- $is_product_switchable = ( WC_Subscriptions_Product::get_parent_ids( $product ) ) ? true : false;
+ $is_product_switchable = (bool) WC_Subscriptions_Product::get_visible_grouped_parent_product_ids( $product );
break;
case 'variable_grouped' :
- $is_product_switchable = ( $product->is_type( array( 'variable-subscription', 'subscription_variation' ) ) || WC_Subscriptions_Product::get_parent_ids( $product ) ) ? true : false;
+ $is_product_switchable = ( $product->is_type( array( 'variable-subscription', 'subscription_variation' ) ) && 'publish' === wcs_get_objects_property( $product, 'post_status' ) ) || WC_Subscriptions_Product::get_visible_grouped_parent_product_ids( $product );
break;
case 'no' :
default:
diff --git a/includes/wcs-time-functions.php b/includes/wcs-time-functions.php
index 60d7fe6..1b54c3e 100755
--- a/includes/wcs-time-functions.php
+++ b/includes/wcs-time-functions.php
@@ -266,8 +266,8 @@ function wcs_add_months( $from_timestamp, $months_to_add ) {
*
* @param int $start_timestamp A Unix timestamp
* @param int $end_timestamp A Unix timestamp at some time in the future
- * @param string $end_timestamp A unit of time, either day, week month or year.
- * @param string $unit_of_time A rounding method, either ceil (default) or floor for anything else
+ * @param string $unit_of_time A unit of time, either day, week month or year.
+ * @param string $rounding_method A rounding method, either ceil (default) or floor for anything else
* @since 2.0
*/
function wcs_estimate_periods_between( $start_timestamp, $end_timestamp, $unit_of_time = 'month', $rounding_method = 'ceil' ) {
diff --git a/includes/wcs-user-functions.php b/includes/wcs-user-functions.php
index 0249f99..93d3e3e 100755
--- a/includes/wcs-user-functions.php
+++ b/includes/wcs-user-functions.php
@@ -174,16 +174,21 @@ function wcs_get_users_subscriptions( $user_id = 0 ) {
$user_id = get_current_user_id();
}
- $subscriptions = apply_filters( 'wcs_pre_get_users_subscriptions', array(), $user_id );
+ $subscriptions = array();
+
+ if ( has_filter( 'wcs_pre_get_users_subscriptions' ) ) {
+ wcs_deprecated_function( 'The "wcs_pre_get_users_subscriptions" hook should no longer be used. A persistent caching layer is now in place. Because of this, "wcs_pre_get_users_subscriptions"', '2.3.0' );
+ $subscriptions = apply_filters( 'wcs_pre_get_users_subscriptions', $subscriptions, $user_id );
+ }
if ( empty( $subscriptions ) && 0 !== $user_id && ! empty( $user_id ) ) {
- $post_ids = wcs_get_cached_user_subscription_ids( $user_id );
+ $subscription_ids = WCS_Customer_Store::instance()->get_users_subscription_ids( $user_id );
- foreach ( $post_ids as $post_id ) {
- $subscription = wcs_get_subscription( $post_id );
+ foreach ( $subscription_ids as $subscription_id ) {
+ $subscription = wcs_get_subscription( $subscription_id );
if ( $subscription ) {
- $subscriptions[ $post_id ] = $subscription;
+ $subscriptions[ $subscription_id ] = $subscription;
}
}
}
@@ -201,24 +206,8 @@ function wcs_get_users_subscriptions( $user_id = 0 ) {
* @return array Array of Subscription IDs.
*/
function wcs_get_users_subscription_ids( $user_id ) {
- $query = new WP_Query();
-
- return $query->query( array(
- 'post_type' => 'shop_subscription',
- 'posts_per_page' => -1,
- 'post_status' => 'any',
- 'orderby' => 'date',
- 'order' => 'desc',
- 'fields' => 'ids',
- 'no_found_rows' => true,
- 'ignore_sticky_posts' => true,
- 'meta_query' => array(
- array(
- 'key' => '_customer_user',
- 'value' => $user_id,
- ),
- ),
- ) );
+ wcs_deprecated_function( __FUNCTION__, '2.3.0', 'WCS_Customer_Store::instance()->get_users_subscription_ids()' );
+ return WCS_Customer_Store::instance()->get_users_subscription_ids( $user_id );
}
/**
@@ -231,23 +220,15 @@ function wcs_get_users_subscription_ids( $user_id ) {
* @return array Array of subscription IDs.
*/
function wcs_get_cached_user_subscription_ids( $user_id = 0 ) {
+ wcs_deprecated_function( __FUNCTION__, '2.3.0', 'WCS_Customer_Store::instance()->get_users_subscription_ids()' );
+
$user_id = absint( $user_id );
+
if ( 0 === $user_id ) {
$user_id = get_current_user_id();
}
- // If the user ID is still zero, bail early.
- if ( 0 === $user_id ) {
- return apply_filters( 'wcs_get_cached_users_subscription_ids', array(), $user_id );
- }
-
- $subscription_ids = WC_Subscriptions::$cache->cache_and_get(
- "wcs_user_subscriptions_{$user_id}",
- 'wcs_get_users_subscription_ids',
- array( $user_id )
- );
-
- return apply_filters( 'wcs_get_cached_users_subscription_ids', $subscription_ids, $user_id );
+ return WCS_Customer_Store::instance()->get_users_subscription_ids( $user_id );
}
/**
@@ -322,6 +303,11 @@ function wcs_can_user_put_subscription_on_hold( $subscription, $user = '' ) {
* Retrieve available actions that a user can perform on the subscription
*
* @since 2.0
+ *
+ * @param WC_Subscription $subscription The subscription.
+ * @param int $user_id The user.
+ *
+ * @return array
*/
function wcs_get_all_user_actions_for_subscription( $subscription, $user_id ) {
diff --git a/languages/woocommerce-subscriptions.pot b/languages/woocommerce-subscriptions.pot
index 8ebd434..e951398 100755
--- 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.2.21\n"
+"Project-Id-Version: WooCommerce Subscriptions 2.3.2\n"
"Report-Msgid-Bugs-To: "
"https://github.com/Prospress/woocommerce-subscriptions/issues\n"
-"POT-Creation-Date: 2018-05-30 06:00:10+00:00\n"
+"POT-Creation-Date: 2018-07-10 05:08:52+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -15,74 +15,78 @@ msgstr ""
"X-Generator: grunt-wp-i18n 0.5.4\n"
"Language: en_US\n"
-#: includes/admin/class-wc-subscriptions-admin.php:179
+#: includes/abstracts/abstract-wcs-related-order-store.php:138
+msgid "Invalid relation type: %s. Order relationship type must be one of: %s."
+msgstr ""
+
+#: includes/admin/class-wc-subscriptions-admin.php:181
msgid "Simple subscription"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:180
+#: includes/admin/class-wc-subscriptions-admin.php:182
msgid "Variable subscription"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:198
+#: includes/admin/class-wc-subscriptions-admin.php:200
msgid "Choose the subscription price, billing interval and period."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:211
+#: includes/admin/class-wc-subscriptions-admin.php:213
#: 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:214
+#: includes/admin/class-wc-subscriptions-admin.php:216
msgid "Subscription interval"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:220
-#: includes/admin/class-wc-subscriptions-admin.php:356
+#: includes/admin/class-wc-subscriptions-admin.php:222
+#: includes/admin/class-wc-subscriptions-admin.php:358
msgid "Subscription period"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:234
-#: includes/admin/class-wc-subscriptions-admin.php:357
+#: includes/admin/class-wc-subscriptions-admin.php:236
+#: includes/admin/class-wc-subscriptions-admin.php:359
#: templates/admin/html-variation-price.php:66
msgid "Expire after"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:237
+#: includes/admin/class-wc-subscriptions-admin.php:239
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:246
+#: includes/admin/class-wc-subscriptions-admin.php:248
#: 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:248
+#: includes/admin/class-wc-subscriptions-admin.php:250
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:260
+#: includes/admin/class-wc-subscriptions-admin.php:262
#: templates/admin/html-variation-price.php:25
msgid "Free trial"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:263
+#: includes/admin/class-wc-subscriptions-admin.php:265
#: templates/admin/deprecated/html-variation-price.php:115
msgid "Subscription Trial Period"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:295
+#: includes/admin/class-wc-subscriptions-admin.php:297
msgid "One time shipping"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:296
+#: includes/admin/class-wc-subscriptions-admin.php:298
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 "
@@ -90,53 +94,57 @@ msgid ""
"not have a free trial or a synced renewal date."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:353
+#: includes/admin/class-wc-subscriptions-admin.php:355
msgid "Subscription pricing"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:354
+#: includes/admin/class-wc-subscriptions-admin.php:356
msgid "Subscription sign-up fee"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:355
+#: includes/admin/class-wc-subscriptions-admin.php:357
msgid "Subscription billing interval"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:358
+#: includes/admin/class-wc-subscriptions-admin.php:360
msgid "Free trial length"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:359
+#: includes/admin/class-wc-subscriptions-admin.php:361
msgid "Free trial period"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:680
+#: includes/admin/class-wc-subscriptions-admin.php:682
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:722
+#: includes/admin/class-wc-subscriptions-admin.php:724
msgid ""
"Trashing this order will also trash the subscriptions purchased with the "
"order."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:735
+#: includes/admin/class-wc-subscriptions-admin.php:737
msgid "Enter the new period, either day, week, month or year:"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:736
+#: includes/admin/class-wc-subscriptions-admin.php:738
msgid "Enter a new length (e.g. 5):"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:737
+#: includes/admin/class-wc-subscriptions-admin.php:739
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:742
+#: includes/admin/class-wc-subscriptions-admin.php:740
+msgid "Delete all variations without a subscription"
+msgstr ""
+
+#: includes/admin/class-wc-subscriptions-admin.php:745
msgid ""
"You are about to trash one or more orders which contain a subscription.\n"
"\n"
@@ -144,7 +152,7 @@ msgid ""
"orders."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:755
+#: includes/admin/class-wc-subscriptions-admin.php:758
msgid ""
"WARNING: Bad things are about to happen!\n"
"\n"
@@ -156,13 +164,13 @@ msgid ""
"gateway."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:756
+#: includes/admin/class-wc-subscriptions-admin.php:759
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:763
+#: includes/admin/class-wc-subscriptions-admin.php:766
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"
@@ -171,61 +179,61 @@ msgid ""
"subscriptions?"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:826
+#: includes/admin/class-wc-subscriptions-admin.php:829
msgid "Active subscriber?"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:869
+#: includes/admin/class-wc-subscriptions-admin.php:872
msgid "Manage Subscriptions"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:873
-#: woocommerce-subscriptions.php:240
+#: includes/admin/class-wc-subscriptions-admin.php:876
+#: woocommerce-subscriptions.php:312
msgid "Search Subscriptions"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:893
-#: includes/admin/class-wc-subscriptions-admin.php:989
+#: includes/admin/class-wc-subscriptions-admin.php:896
+#: includes/admin/class-wc-subscriptions-admin.php:992
#: includes/admin/class-wcs-admin-reports.php:51
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:658
-#: includes/class-wcs-query.php:102 includes/class-wcs-query.php:123
-#: includes/class-wcs-query.php:244
+#: includes/admin/class-wcs-admin-system-status.php:55
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:689
+#: 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
-#: templates/admin/status.php:21 woocommerce-subscriptions.php:231
-#: woocommerce-subscriptions.php:244
+#: woocommerce-subscriptions.php:303 woocommerce-subscriptions.php:316
msgid "Subscriptions"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1029
+#: includes/admin/class-wc-subscriptions-admin.php:1032
msgid "Button Text"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1036
+#: includes/admin/class-wc-subscriptions-admin.php:1039
msgid "Add to Cart Button Text"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1037
+#: includes/admin/class-wc-subscriptions-admin.php:1040
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:1041
-#: includes/admin/class-wc-subscriptions-admin.php:1052
+#: includes/admin/class-wc-subscriptions-admin.php:1044
+#: includes/admin/class-wc-subscriptions-admin.php:1055
#: includes/class-wc-product-subscription-variation.php:98
#: includes/class-wc-product-subscription.php:72
-#: includes/class-wc-product-variable-subscription.php:63
+#: includes/class-wc-product-variable-subscription.php:73
#: includes/class-wc-subscriptions-product.php:99
-#: woocommerce-subscriptions.php:516
+#: woocommerce-subscriptions.php:614
msgid "Sign Up Now"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1047
+#: includes/admin/class-wc-subscriptions-admin.php:1050
msgid "Place Order Button Text"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1048
+#: includes/admin/class-wc-subscriptions-admin.php:1051
msgid ""
"Use this field to customise the text displayed on the checkout button when "
"an order contains a subscription. Normally the checkout submission button "
@@ -233,11 +241,11 @@ msgid ""
"changed to \"Sign Up Now\"."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1060
+#: includes/admin/class-wc-subscriptions-admin.php:1063
msgid "Roles"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1063
+#: includes/admin/class-wc-subscriptions-admin.php:1066
#. translators: placeholders are tags
msgid ""
"Choose the default roles to assign to active and inactive subscribers. For "
@@ -246,46 +254,46 @@ msgid ""
"allocated these roles to prevent locking out administrators."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1068
+#: includes/admin/class-wc-subscriptions-admin.php:1071
msgid "Subscriber Default Role"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1069
+#: includes/admin/class-wc-subscriptions-admin.php:1072
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:1080
+#: includes/admin/class-wc-subscriptions-admin.php:1083
msgid "Inactive Subscriber Role"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1081
+#: includes/admin/class-wc-subscriptions-admin.php:1084
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:1101
+#: includes/admin/class-wc-subscriptions-admin.php:1104
msgid "Manual Renewal Payments"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1102
+#: includes/admin/class-wc-subscriptions-admin.php:1105
msgid "Accept Manual Renewals"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1107
+#: includes/admin/class-wc-subscriptions-admin.php:1110
#. 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:1113
+#: includes/admin/class-wc-subscriptions-admin.php:1116
msgid "Turn off Automatic Payments"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1118
+#: includes/admin/class-wc-subscriptions-admin.php:1121
#. translators: placeholders are opening and closing link tags
msgid ""
"If you don't want new subscription purchases to automatically charge "
@@ -294,11 +302,11 @@ msgid ""
"more%s."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1133
+#: includes/admin/class-wc-subscriptions-admin.php:1136
msgid "Customer Suspensions"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1140
+#: includes/admin/class-wc-subscriptions-admin.php:1143
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 "
@@ -308,30 +316,30 @@ msgid ""
"this to 0 to turn off the customer suspension feature completely."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1144
+#: includes/admin/class-wc-subscriptions-admin.php:1147
msgid "Mixed Checkout"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1145
+#: includes/admin/class-wc-subscriptions-admin.php:1148
msgid "Allow multiple subscriptions and products to be purchased simultaneously."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1149
+#: includes/admin/class-wc-subscriptions-admin.php:1152
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:1153
+#: includes/admin/class-wc-subscriptions-admin.php:1156
#: includes/upgrades/templates/wcs-about-2-0.php:108
msgid "Drip Downloadable Content"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1154
+#: includes/admin/class-wc-subscriptions-admin.php:1157
msgid "Enable dripping for downloadable content on subscription products."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1158
+#: includes/admin/class-wc-subscriptions-admin.php:1161
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 "
@@ -339,7 +347,7 @@ msgid ""
"customer that has an active subscription with that product."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1194
+#: includes/admin/class-wc-subscriptions-admin.php:1197
#. translators: $1-$2: opening and closing tags, $3-$4: opening and
#. closing tags
msgid ""
@@ -347,73 +355,73 @@ msgid ""
"start selling subscriptions!%4$s"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1199
+#: includes/admin/class-wc-subscriptions-admin.php:1202
msgid "Add a Subscription Product"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1200
+#: includes/admin/class-wc-subscriptions-admin.php:1203
#: includes/upgrades/templates/wcs-about-2-0.php:35
#: includes/upgrades/templates/wcs-about.php:34
-#: woocommerce-subscriptions.php:1064
+#: woocommerce-subscriptions.php:1185
msgid "Settings"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1286
+#: includes/admin/class-wc-subscriptions-admin.php:1289
#. 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:1319
-#: includes/admin/class-wc-subscriptions-admin.php:1324
+#: includes/admin/class-wc-subscriptions-admin.php:1322
+#: includes/admin/class-wc-subscriptions-admin.php:1327
#. 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:1348
+#: includes/admin/class-wc-subscriptions-admin.php:1351
#. 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:1353
+#: includes/admin/class-wc-subscriptions-admin.php:1356
#. 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:1412
-#: includes/admin/class-wc-subscriptions-admin.php:1448
-#: includes/admin/class-wc-subscriptions-admin.php:1501
-#: includes/admin/reports/class-wcs-report-cache-manager.php:340
+#: includes/admin/class-wc-subscriptions-admin.php:1419
+#: includes/admin/class-wc-subscriptions-admin.php:1472
+#: includes/admin/class-wcs-admin-system-status.php:94
+#: includes/admin/reports/class-wcs-report-cache-manager.php:341
msgid "Yes"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1412
-#: includes/admin/class-wc-subscriptions-admin.php:1448
-#: includes/admin/reports/class-wcs-report-cache-manager.php:340
+#: includes/admin/class-wc-subscriptions-admin.php:1419
+#: includes/admin/class-wcs-admin-system-status.php:94
+#: includes/admin/reports/class-wcs-report-cache-manager.php:341
msgid "No"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1484
+#: includes/admin/class-wc-subscriptions-admin.php:1455
msgid "Automatic Recurring Payments"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1501
+#: includes/admin/class-wc-subscriptions-admin.php:1472
msgid ""
"Supports automatic renewal payments with the WooCommerce Subscriptions "
"extension."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1581
+#: includes/admin/class-wc-subscriptions-admin.php:1552
msgid "Subscription items can no longer be edited."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1585
+#: includes/admin/class-wc-subscriptions-admin.php:1556
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:1604
+#: includes/admin/class-wc-subscriptions-admin.php:1575
#. translators: $1-2: opening and closing tags of a link that takes to Woo
#. marketplace / Stripe product page
msgid ""
@@ -422,18 +430,18 @@ msgid ""
"the %1$sfree Stripe extension%2$s."
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1609
+#: includes/admin/class-wc-subscriptions-admin.php:1580
msgid "Recurring Payments"
msgstr ""
-#: includes/admin/class-wc-subscriptions-admin.php:1617
+#: includes/admin/class-wc-subscriptions-admin.php:1588
#. 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:1624
+#: includes/admin/class-wc-subscriptions-admin.php:1595
#. translators: $1-$2: opening and closing tags. Link to documents->payment
#. gateways, 3$-4$: opening and closing tags. Link to WooCommerce extensions
#. shop page
@@ -442,38 +450,42 @@ msgid ""
"the official %3$sWooCommerce Marketplace%4$s."
msgstr ""
-#: includes/admin/class-wcs-admin-meta-boxes.php:62
-#: includes/admin/class-wcs-admin-meta-boxes.php:66
+#: includes/admin/class-wc-subscriptions-admin.php:1697
+msgid "Note that purchasing a subscription still requires an account."
+msgstr ""
+
+#: includes/admin/class-wcs-admin-meta-boxes.php:63
+#: includes/admin/class-wcs-admin-meta-boxes.php:67
#: templates/myaccount/related-orders.php:15
msgid "Related Orders"
msgstr ""
-#: includes/admin/class-wcs-admin-meta-boxes.php:105
+#: includes/admin/class-wcs-admin-meta-boxes.php:107
msgid "Please enter a start date in the past."
msgstr ""
-#: includes/admin/class-wcs-admin-meta-boxes.php:106
+#: includes/admin/class-wcs-admin-meta-boxes.php:108
msgid "Please enter a date at least one hour into the future."
msgstr ""
-#: includes/admin/class-wcs-admin-meta-boxes.php:107
+#: includes/admin/class-wcs-admin-meta-boxes.php:109
msgid "Please enter a date after the trial end."
msgstr ""
-#: includes/admin/class-wcs-admin-meta-boxes.php:108
-#: includes/admin/class-wcs-admin-meta-boxes.php:109
+#: includes/admin/class-wcs-admin-meta-boxes.php:110
+#: includes/admin/class-wcs-admin-meta-boxes.php:111
msgid "Please enter a date after the start date."
msgstr ""
-#: includes/admin/class-wcs-admin-meta-boxes.php:110
+#: includes/admin/class-wcs-admin-meta-boxes.php:112
msgid "Please enter a date before the next payment."
msgstr ""
-#: includes/admin/class-wcs-admin-meta-boxes.php:111
+#: includes/admin/class-wcs-admin-meta-boxes.php:113
msgid "Please enter a date after the next payment."
msgstr ""
-#: includes/admin/class-wcs-admin-meta-boxes.php:112
+#: includes/admin/class-wcs-admin-meta-boxes.php:114
msgid ""
"Are you sure you want to process a renewal?\n"
"\n"
@@ -481,7 +493,7 @@ msgid ""
"are enabled)."
msgstr ""
-#: includes/admin/class-wcs-admin-meta-boxes.php:121
+#: includes/admin/class-wcs-admin-meta-boxes.php:124
msgid ""
"Are you sure you want to retry payment for this renewal order?\n"
"\n"
@@ -489,26 +501,34 @@ msgid ""
"emails are enabled)."
msgstr ""
-#: includes/admin/class-wcs-admin-meta-boxes.php:140
+#: includes/admin/class-wcs-admin-meta-boxes.php:153
msgid "Process renewal"
msgstr ""
-#: includes/admin/class-wcs-admin-meta-boxes.php:143
+#: includes/admin/class-wcs-admin-meta-boxes.php:157
msgid "Create pending renewal order"
msgstr ""
-#: includes/admin/class-wcs-admin-meta-boxes.php:146
+#: includes/admin/class-wcs-admin-meta-boxes.php:159
+msgid "Create pending parent order"
+msgstr ""
+
+#: includes/admin/class-wcs-admin-meta-boxes.php:162
msgid "Retry Renewal Payment"
msgstr ""
-#: includes/admin/class-wcs-admin-meta-boxes.php:160
+#: includes/admin/class-wcs-admin-meta-boxes.php:176
msgid "Process renewal order action requested by admin."
msgstr ""
-#: includes/admin/class-wcs-admin-meta-boxes.php:179
+#: includes/admin/class-wcs-admin-meta-boxes.php:200
msgid "Create pending renewal order requested by admin action."
msgstr ""
+#: includes/admin/class-wcs-admin-meta-boxes.php:229
+msgid "Create pending parent order requested by admin action."
+msgstr ""
+
#: includes/admin/class-wcs-admin-post-types.php:201
msgid "Search for a product…"
msgstr ""
@@ -548,7 +568,7 @@ msgstr ""
#: templates/emails/subscription-info.php:18
#: templates/myaccount/my-subscriptions.php:25
#: templates/myaccount/related-subscriptions.php:20
-#: woocommerce-subscriptions.php:232
+#: woocommerce-subscriptions.php:304
msgid "Subscription"
msgstr ""
@@ -581,12 +601,12 @@ msgid "End Date"
msgstr ""
#: includes/admin/class-wcs-admin-post-types.php:458
-#: includes/wcs-user-functions.php:343
+#: includes/wcs-user-functions.php:329
msgid "Reactivate"
msgstr ""
#: includes/admin/class-wcs-admin-post-types.php:459
-#: includes/wcs-user-functions.php:338
+#: includes/wcs-user-functions.php:324
msgid "Suspend"
msgstr ""
@@ -601,12 +621,12 @@ msgid "Delete Permanently"
msgstr ""
#: includes/admin/class-wcs-admin-post-types.php:474
-#: includes/class-wc-subscriptions-product.php:738
+#: includes/class-wc-subscriptions-product.php:746
msgid "Restore this item from the Trash"
msgstr ""
#: includes/admin/class-wcs-admin-post-types.php:474
-#: includes/class-wc-subscriptions-product.php:739
+#: includes/class-wc-subscriptions-product.php:747
msgid "Restore"
msgstr ""
@@ -649,61 +669,61 @@ msgstr[1] ""
msgid "Via %s"
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:602
+#: includes/admin/class-wcs-admin-post-types.php:624
msgid "Y/m/d g:i:s A"
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:605
+#: includes/admin/class-wcs-admin-post-types.php:627
msgid ""
"This date should be treated as an estimate only. The payment gateway for "
"this subscription controls when payments are processed."
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:878
-#: includes/admin/class-wcs-admin-post-types.php:881
-#: includes/admin/class-wcs-admin-post-types.php:884
+#: includes/admin/class-wcs-admin-post-types.php:830
+#: includes/admin/class-wcs-admin-post-types.php:833
+#: includes/admin/class-wcs-admin-post-types.php:836
msgid "Subscription updated."
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:879
+#: includes/admin/class-wcs-admin-post-types.php:831
msgid "Custom field updated."
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:880
+#: includes/admin/class-wcs-admin-post-types.php:832
msgid "Custom field deleted."
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:885
+#: includes/admin/class-wcs-admin-post-types.php:837
msgid "Subscription saved."
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:886
+#: includes/admin/class-wcs-admin-post-types.php:838
msgid "Subscription submitted."
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:888
+#: includes/admin/class-wcs-admin-post-types.php:840
#. translators: php date string
msgid "Subscription scheduled for: %1$s."
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:889
+#: includes/admin/class-wcs-admin-post-types.php:841
msgid "Subscription draft updated."
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:925
+#: includes/admin/class-wcs-admin-post-types.php:877
msgid "Any Payment Method"
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:926
+#: includes/admin/class-wcs-admin-post-types.php:878
msgid "None"
msgstr ""
-#: includes/admin/class-wcs-admin-post-types.php:1119
+#: includes/admin/class-wcs-admin-post-types.php:1071
#. 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:1126
+#: includes/admin/class-wcs-admin-post-types.php:1078
#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:79
msgid "Search for a customer…"
msgstr ""
@@ -737,6 +757,43 @@ msgstr ""
msgid "WooCommerce"
msgstr ""
+#: includes/admin/class-wcs-admin-system-status.php:56
+msgid "This section shows any information about Subscriptions."
+msgstr ""
+
+#: includes/admin/class-wcs-admin-system-status.php:60
+msgid "Store Setup"
+msgstr ""
+
+#: includes/admin/class-wcs-admin-system-status.php:61
+msgid "This section shows general information about the store."
+msgstr ""
+
+#: includes/admin/class-wcs-admin-system-status.php:65
+msgid "Subscriptions by Payment Gateway"
+msgstr ""
+
+#: includes/admin/class-wcs-admin-system-status.php:66
+msgid "This section shows information about Subscription payment methods."
+msgstr ""
+
+#: includes/admin/class-wcs-admin-system-status.php:70
+msgid "Payment Gateway Support"
+msgstr ""
+
+#: includes/admin/class-wcs-admin-system-status.php:71
+msgid "This section shows information about payment gateway feature support."
+msgstr ""
+
+#: includes/admin/class-wcs-admin-system-status.php:128
+msgid "%sLearn how to update%s"
+msgstr ""
+
+#: includes/admin/class-wcs-admin-system-status.php:174
+#. 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 ""
+
#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:54
msgid "Customer:"
msgstr ""
@@ -749,63 +806,79 @@ msgstr ""
msgid "Subscription status:"
msgstr ""
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:104
+msgid "Parent order: "
+msgstr ""
+
#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:106
+msgid "#%1$s"
+msgstr ""
+
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:112
+msgid "Parent order:"
+msgstr ""
+
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:118
+msgid "Select an order…"
+msgstr ""
+
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:128
msgid "Billing Details"
msgstr ""
-#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:107
-#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:179
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:129
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:201
#: includes/payment-retry/class-wcs-retry-post-store.php:38
msgid "Edit"
msgstr ""
-#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:108
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:130
msgid "Load billing address"
msgstr ""
-#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:115
-#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:117
-#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:188
-#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:190
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:137
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:139
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:210
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:212
msgid "Address"
msgstr ""
-#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:117
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:139
msgid "No billing address set."
msgstr ""
-#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:137
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:159
#: includes/class-wcs-change-payment-method-admin.php:38
#: includes/class-wcs-change-payment-method-admin.php:51
msgid "Payment Method"
msgstr ""
-#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:178
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:200
msgid "Shipping Details"
msgstr ""
-#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:180
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:202
msgid "Copy from billing"
msgstr ""
-#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:181
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:203
msgid "Load shipping address"
msgstr ""
-#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:190
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:212
msgid "No shipping address set."
msgstr ""
-#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:212
-#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:242
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:234
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:264
msgid "Customer Provided Note"
msgstr ""
-#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:243
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:265
msgid "Customer's notes about the order"
msgstr ""
-#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:315
+#: includes/admin/meta-boxes/class-wcs-meta-box-subscription-data.php:350
#. translators: placeholder is error message from the payment gateway or
#. subscriptions when updating the status
msgid "Error updating some information: %s"
@@ -826,7 +899,7 @@ 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:519
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:550
#: includes/admin/reports/class-wcs-report-subscription-payment-retry.php:173
#: includes/admin/reports/class-wcs-report-upcoming-recurring-revenue.php:205
#: templates/myaccount/related-orders.php:23
@@ -881,8 +954,7 @@ msgid ""
msgstr ""
#: includes/admin/meta-boxes/views/html-subscription-schedule.php:22
-#: includes/admin/meta-boxes/views/html-subscription-schedule.php:41
-msgid "Recurring:"
+msgid "Payment:"
msgstr ""
#: includes/admin/meta-boxes/views/html-subscription-schedule.php:32
@@ -890,6 +962,10 @@ msgstr ""
msgid "Billing Period"
msgstr ""
+#: includes/admin/meta-boxes/views/html-subscription-schedule.php:41
+msgid "Recurring:"
+msgstr ""
+
#: includes/admin/meta-boxes/views/html-subscription-schedule.php:61
msgid "Timezone:"
msgstr ""
@@ -905,11 +981,11 @@ msgid ""
"site's timezone."
msgstr ""
-#: includes/admin/reports/class-wcs-report-cache-manager.php:344
+#: includes/admin/reports/class-wcs-report-cache-manager.php:345
msgid "Cache Update Failures"
msgstr ""
-#: includes/admin/reports/class-wcs-report-cache-manager.php:346
+#: includes/admin/reports/class-wcs-report-cache-manager.php:348
#. translators: %d refers to the number of times we have detected cache update
#. failures
msgid "%d failures"
@@ -1020,219 +1096,220 @@ msgstr ""
msgid "No products found."
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-by-product.php:84
+#: includes/admin/reports/class-wcs-report-subscription-by-product.php:89
msgid "Subscription Product"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-by-product.php:85
+#: includes/admin/reports/class-wcs-report-subscription-by-product.php:90
msgid "Subscription Count %s"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-by-product.php:85
+#: includes/admin/reports/class-wcs-report-subscription-by-product.php:90
msgid ""
"The number of subscriptions that include this product as a line item and "
"have a status other than pending or trashed."
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-by-product.php:86
+#: includes/admin/reports/class-wcs-report-subscription-by-product.php:91
msgid "Average Recurring Line Total %s"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-by-product.php:86
+#: includes/admin/reports/class-wcs-report-subscription-by-product.php:91
msgid "The average line total for this product on each subscription."
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-by-product.php:87
+#: includes/admin/reports/class-wcs-report-subscription-by-product.php:92
msgid "Average Lifetime Value %s"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-by-product.php:87
+#: includes/admin/reports/class-wcs-report-subscription-by-product.php:92
msgid "The average line total on all orders for this product line item."
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-by-product.php:246
+#: includes/admin/reports/class-wcs-report-subscription-by-product.php:297
+#: includes/admin/reports/class-wcs-report-subscription-by-product.php:337
msgid "subscriptions"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:368
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:399
msgid "%s signup revenue in this period"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:369
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:400
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:375
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:406
msgid "%s renewal revenue in this period"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:376
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:407
msgid "The sum of all renewal orders including tax and shipping."
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:382
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:413
msgid "%s resubscribe revenue in this period"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:383
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:414
msgid "The sum of all resubscribe orders including tax and shipping."
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:389
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:420
msgid "%s new subscriptions"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:390
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:421
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:396
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:427
msgid "%s subscription signups"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:397
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:428
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:403
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:434
msgid "%s subscription resubscribes"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:404
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:435
msgid "The number of resubscribe orders processed during this period."
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:410
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:441
msgid "%s subscription renewals"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:411
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:442
msgid "The number of renewal orders processed during this period."
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:417
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:448
msgid "%s subscription switches"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:418
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:449
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:424
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:455
msgid "%s subscription cancellations"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:425
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:456
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:431
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:462
msgid "%s subscriptions ended"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:432
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:463
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:438
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:469
msgid "%s current subscriptions"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:439
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:470
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:455
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:486
msgid "%s net subscription gain"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:457
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:488
msgid "%s net subscription loss"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:462
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:493
msgid "Change in subscriptions between the start and end of the period."
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:476
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:507
#: 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:477
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:508
#: 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:478
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:509
#: 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:479
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:510
#: 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:523
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:554
#: includes/admin/reports/class-wcs-report-subscription-payment-retry.php:177
#: includes/admin/reports/class-wcs-report-upcoming-recurring-revenue.php:209
msgid "Export CSV"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:580
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:611
msgid "Switched subscriptions"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:596
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:627
msgid "New Subscriptions"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:612
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:643
msgid "Subscriptions signups"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:627
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:658
msgid "Number of resubscribes"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:642
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:673
msgid "Number of renewals"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:674
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:705
msgid "Subscriptions Ended"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:690
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:721
msgid "Cancellations"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:705
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:736
msgid "Signup Totals"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:725
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:756
msgid "Resubscribe Totals"
msgstr ""
-#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:745
+#: includes/admin/reports/class-wcs-report-subscription-events-by-date.php:776
msgid "Renewal Totals"
msgstr ""
@@ -1441,116 +1518,126 @@ msgstr ""
msgid "Cannot create subscription: %s."
msgstr ""
-#: includes/class-wc-subscription.php:418
+#: includes/class-wc-subscription.php:398
msgid "Unable to change subscription status to \"%s\"."
msgstr ""
-#: includes/class-wc-subscription.php:520
+#: includes/class-wc-subscription.php:500
msgid "Unable to change subscription status to \"%s\". Exception: %s"
msgstr ""
-#: includes/class-wc-subscription.php:542
+#: includes/class-wc-subscription.php:522
#. translators: 1: old subscription status 2: new subscription status
msgid "Status changed from %1$s to %2$s."
msgstr ""
-#: includes/class-wc-subscription.php:554
+#: includes/class-wc-subscription.php:534
#. translators: %s: new order status
msgid "Status set to %s."
msgstr ""
-#: includes/class-wc-subscription.php:1148
+#: includes/class-wc-subscription.php:1085
#: 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:1151
+#: includes/class-wc-subscription.php:1088
#: 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:1158
+#: includes/class-wc-subscription.php:1095
msgid "Not yet ended"
msgstr ""
-#: includes/class-wc-subscription.php:1161
+#: includes/class-wc-subscription.php:1098
msgid "Not cancelled"
msgstr ""
-#: includes/class-wc-subscription.php:1276
+#: includes/class-wc-subscription.php:1213
msgid "The start date of a subscription can not be deleted, only updated."
msgstr ""
-#: includes/class-wc-subscription.php:1280
+#: includes/class-wc-subscription.php:1217
msgid "The %s date of a subscription can not be deleted. You must delete the order."
msgstr ""
-#: includes/class-wc-subscription.php:1288
-#: includes/class-wc-subscription.php:2353
+#: includes/class-wc-subscription.php:1225
+#: includes/class-wc-subscription.php:2301
msgid "Subscription #%d: "
msgstr ""
-#: includes/class-wc-subscription.php:1694
+#: includes/class-wc-subscription.php:1631
msgid "Payment status marked complete."
msgstr ""
-#: includes/class-wc-subscription.php:1722
+#: includes/class-wc-subscription.php:1659
msgid "Payment failed."
msgstr ""
-#: includes/class-wc-subscription.php:1727
+#: includes/class-wc-subscription.php:1664
msgid "Subscription Cancelled: maximum number of failed payments reached."
msgstr ""
-#: includes/class-wc-subscription.php:1936
+#: includes/class-wc-subscription.php:1774
+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 "
+"with order type values accepted by wcs_get_subscription_orders(). Use "
+"array( \"parent\", \"renewal\", \"switch\" ) to maintain previous "
+"behaviour, or \"any\" to receive all order types, including switch and "
+"resubscribe."
+msgstr ""
+
+#: includes/class-wc-subscription.php:1876
#: includes/class-wcs-change-payment-method-admin.php:155
msgid "Manual Renewal"
msgstr ""
-#: includes/class-wc-subscription.php:2015
+#: includes/class-wc-subscription.php:1955
msgid "Payment method meta must be an array."
msgstr ""
-#: includes/class-wc-subscription.php:2251
+#: includes/class-wc-subscription.php:2199
msgid "Invalid format. First parameter needs to be an array."
msgstr ""
-#: includes/class-wc-subscription.php:2255
+#: includes/class-wc-subscription.php:2203
msgid "Invalid data. First parameter was empty when passed to update_dates()."
msgstr ""
-#: includes/class-wc-subscription.php:2262
+#: includes/class-wc-subscription.php:2210
msgid ""
"Invalid data. First parameter has a date that is not in the registered date "
"types."
msgstr ""
-#: includes/class-wc-subscription.php:2326
+#: includes/class-wc-subscription.php:2274
msgid "The %s date must occur after the cancellation date."
msgstr ""
-#: includes/class-wc-subscription.php:2331
+#: includes/class-wc-subscription.php:2279
msgid "The %s date must occur after the last payment date."
msgstr ""
-#: includes/class-wc-subscription.php:2335
+#: includes/class-wc-subscription.php:2283
msgid "The %s date must occur after the next payment date."
msgstr ""
-#: includes/class-wc-subscription.php:2340
+#: includes/class-wc-subscription.php:2288
msgid "The %s date must occur after the trial end date."
msgstr ""
-#: includes/class-wc-subscription.php:2344
+#: includes/class-wc-subscription.php:2292
msgid "The %s date must occur after the start date."
msgstr ""
-#: includes/class-wc-subscription.php:2373
+#: includes/class-wc-subscription.php:2321
#: includes/class-wc-subscriptions-checkout.php:325
-#: includes/wcs-order-functions.php:288
+#: includes/wcs-order-functions.php:305
msgid "Backordered"
msgstr ""
@@ -1570,21 +1657,21 @@ msgstr ""
msgid "Update the %1$s used for %2$sall%3$s of my active subscriptions"
msgstr ""
-#: includes/class-wc-subscriptions-cart.php:899
+#: includes/class-wc-subscriptions-cart.php:901
msgid "Please enter a valid postcode/ZIP."
msgstr ""
-#: includes/class-wc-subscriptions-cart.php:1070
+#: includes/class-wc-subscriptions-cart.php:1072
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:1158
+#: includes/class-wc-subscriptions-cart.php:1160
msgid "Invalid recurring shipping method."
msgstr ""
-#: includes/class-wc-subscriptions-cart.php:1947
+#: includes/class-wc-subscriptions-cart.php:1983
msgid "now"
msgstr ""
@@ -1631,6 +1718,7 @@ msgstr ""
#: 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
msgid "That doesn't appear to be one of your subscriptions."
msgstr ""
@@ -1672,80 +1760,113 @@ msgstr ""
msgid "Error %d: Unable to create order. Please try again."
msgstr ""
-#: includes/class-wc-subscriptions-coupon.php:65
+#: includes/class-wc-subscriptions-coupon.php:151
msgid "Sign Up Fee Discount"
msgstr ""
-#: includes/class-wc-subscriptions-coupon.php:66
+#: includes/class-wc-subscriptions-coupon.php:152
msgid "Sign Up Fee % Discount"
msgstr ""
-#: includes/class-wc-subscriptions-coupon.php:67
+#: includes/class-wc-subscriptions-coupon.php:153
msgid "Recurring Product Discount"
msgstr ""
-#: includes/class-wc-subscriptions-coupon.php:68
+#: includes/class-wc-subscriptions-coupon.php:154
msgid "Recurring Product % Discount"
msgstr ""
-#: includes/class-wc-subscriptions-coupon.php:358
+#: includes/class-wc-subscriptions-coupon.php:444
msgid ""
"Sorry, this coupon is only valid for an initial payment and the cart does "
"not require an initial payment."
msgstr ""
-#: includes/class-wc-subscriptions-coupon.php:364
+#: includes/class-wc-subscriptions-coupon.php:450
msgid "Sorry, this coupon is only valid for new subscriptions."
msgstr ""
-#: includes/class-wc-subscriptions-coupon.php:369
+#: includes/class-wc-subscriptions-coupon.php:455
msgid "Sorry, this coupon is only valid for subscription products."
msgstr ""
-#: includes/class-wc-subscriptions-coupon.php:375
+#: includes/class-wc-subscriptions-coupon.php:461
#. translators: 1$: coupon code that is being removed
msgid "Sorry, the \"%1$s\" coupon is only valid for renewals."
msgstr ""
-#: includes/class-wc-subscriptions-coupon.php:380
+#: includes/class-wc-subscriptions-coupon.php:466
msgid ""
"Sorry, this coupon is only valid for subscription products with a sign-up "
"fee."
msgstr ""
-#: includes/class-wc-subscriptions-coupon.php:406
+#: includes/class-wc-subscriptions-coupon.php:492
msgid ""
"Sorry, recurring coupons can only be applied to subscriptions or "
"subscription orders."
msgstr ""
-#: includes/class-wc-subscriptions-coupon.php:410
+#: includes/class-wc-subscriptions-coupon.php:496
#. translators: placeholder is coupon code
msgid ""
"Sorry, \"%s\" can only be applied to subscription parent orders which "
"contain a product with signup fees."
msgstr ""
-#: includes/class-wc-subscriptions-coupon.php:413
+#: includes/class-wc-subscriptions-coupon.php:499
msgid "Sorry, only recurring coupons can only be applied to subscriptions."
msgstr ""
-#: includes/class-wc-subscriptions-coupon.php:636
+#: includes/class-wc-subscriptions-coupon.php:669
msgid "Renewal % discount"
msgstr ""
-#: includes/class-wc-subscriptions-coupon.php:637
+#: includes/class-wc-subscriptions-coupon.php:670
msgid "Renewal product discount"
msgstr ""
-#: includes/class-wc-subscriptions-coupon.php:638
+#: includes/class-wc-subscriptions-coupon.php:671
msgid "Renewal cart discount"
msgstr ""
-#: includes/class-wc-subscriptions-coupon.php:655
+#: includes/class-wc-subscriptions-coupon.php:688
msgid "Renewal Discount"
msgstr ""
+#: includes/class-wc-subscriptions-coupon.php:866
+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:881
+msgid "Active for x payments"
+msgstr ""
+
+#: includes/class-wc-subscriptions-coupon.php:882
+msgid "Unlimited payments"
+msgstr ""
+
+#: includes/class-wc-subscriptions-coupon.php:883
+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:1015
+#. 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:1019
+msgid "Active for unlimited payments"
+msgstr ""
+
#: includes/class-wc-subscriptions-manager.php:123
msgid "Error: Unable to create renewal order with note \"%s\""
msgstr ""
@@ -1867,12 +1988,18 @@ msgstr ""
msgid "All orders types"
msgstr ""
-#: includes/class-wc-subscriptions-order.php:965
+#: includes/class-wc-subscriptions-order.php:972
#. translators: $1: opening link tag, $2: order number, $3: closing link tag
msgid "Subscription cancelled for refunded order %1$s#%2$s%3$s."
msgstr ""
-#: includes/class-wc-subscriptions-product.php:319
+#: includes/class-wc-subscriptions-product.php:318
+#. translators: %1$s refers to the price. This string is meant to prefix
+#. another string below, e.g. "$5 now, and $5 on March 15th each year"
+msgid "%1$s now, and "
+msgstr ""
+
+#: includes/class-wc-subscriptions-product.php:327
#: includes/wcs-formatting-functions.php:102
#: includes/wcs-formatting-functions.php:186
#. translators: 1$: recurring amount string, 2$: day of the week (e.g. "$10
@@ -1880,34 +2007,34 @@ msgstr ""
msgid "%1$s every %2$s"
msgstr ""
-#: includes/class-wc-subscriptions-product.php:322
+#: includes/class-wc-subscriptions-product.php:330
#: includes/wcs-formatting-functions.php:111
#. translators: 1$: recurring amount string, 2$: period, 3$: day of the week
#. (e.g. "$10 every 2nd week on Wednesday")
msgid "%1$s every %2$s on %3$s"
msgstr ""
-#: includes/class-wc-subscriptions-product.php:329
+#: includes/class-wc-subscriptions-product.php:337
#: includes/wcs-formatting-functions.php:129
#. translators: placeholder is recurring amount
msgid "%s on the last day of each month"
msgstr ""
-#: includes/class-wc-subscriptions-product.php:332
+#: includes/class-wc-subscriptions-product.php:340
#: includes/wcs-formatting-functions.php:132
#. translators: 1$: recurring amount, 2$: day of the month (e.g. "23rd") (e.g.
#. "$5 every 23rd of each month")
msgid "%1$s on the %2$s of each month"
msgstr ""
-#: includes/class-wc-subscriptions-product.php:337
+#: includes/class-wc-subscriptions-product.php:345
#: includes/wcs-formatting-functions.php:148
#. translators: 1$: recurring amount, 2$: interval (e.g. "3rd") (e.g. "$10 on
#. the last day of every 3rd month")
msgid "%1$s on the last day of every %2$s month"
msgstr ""
-#: includes/class-wc-subscriptions-product.php:340
+#: includes/class-wc-subscriptions-product.php:348
#: includes/wcs-formatting-functions.php:151
#. translators: 1$:
-
+
) tags - printf( esc_html__( '%sLearn more »%s', 'woocommerce-subscriptions' ), '', '' ); ?> + printf( esc_html__( '%sLearn more »%s', 'woocommerce-subscriptions' ), '', '' ); ?>
Error: %1$s
Please refresh the " "page and try again. If problem persists, %2$scontact support%3$s." msgstr "" -#: includes/upgrades/class-wc-subscriptions-upgrader.php:599 +#: includes/upgrades/class-wc-subscriptions-upgrader.php:621 msgid "Welcome to WooCommerce Subscriptions 2.1" msgstr "" -#: includes/upgrades/class-wc-subscriptions-upgrader.php:599 +#: includes/upgrades/class-wc-subscriptions-upgrader.php:621 msgid "About WooCommerce Subscriptions" msgstr "" +#: includes/upgrades/class-wc-subscriptions-upgrader.php:804 +msgid "" +"%1$sWarning!%2$s It appears that you have downgraded %1$sWooCommerce " +"Subscriptions%2$s from %3$s to %4$s. Downgrading the plugin in this way may " +"cause issues. Please update to %3$s or higher, or %5$sopen a new support " +"ticket%6$s for further assistance." +msgstr "" + +#: includes/upgrades/class-wcs-repair-suspended-paypal-subscriptions.php:49 +msgid "" +"Subscription suspended by Database repair script. This subscription was " +"suspended via PayPal." +msgstr "" + #: includes/upgrades/class-wcs-upgrade-2-2-7.php:60 msgid "Subscription end date in the past" msgstr "" -#: includes/upgrades/templates/wcs-about-2-0.php:20 -msgid "Welcome to Subscriptions 2.0" +#: includes/upgrades/class-wcs-upgrade-notice-manager.php:85 +msgid "New Subscription Coupon Features" msgstr "" +#: includes/upgrades/class-wcs-upgrade-notice-manager.php:86 +msgid "" +"Want to offer customers coupons which apply for 6 months? You can now " +"define the number of cycles discounts would be applied." +msgstr "" + +#: includes/upgrades/class-wcs-upgrade-notice-manager.php:89 +msgid "New Signup Pricing Options for Synchronized Subscriptions" +msgstr "" + +#: includes/upgrades/class-wcs-upgrade-notice-manager.php:90 +msgid "" +"Charge the full recurring price at the time of sign up for synchronized " +"subscriptions. Your customers can now receive their products straight away." +msgstr "" + +#: includes/upgrades/class-wcs-upgrade-notice-manager.php:93 +msgid "Link Parent Orders to Subscriptions" +msgstr "" + +#: includes/upgrades/class-wcs-upgrade-notice-manager.php:95 +#. translators: placeholders are opening and closing tags linking to +#. documentation. +msgid "" +"For subscriptions with no parent order, shop managers can now choose a " +"parent order via the Edit Subscription screen. This makes it possible to " +"set a parent order on %smanually created subscriptions%s. The order can " +"also be sent to customers to act as an invoice that needs to be paid to " +"activate the subscription." +msgstr "" + +#: includes/upgrades/class-wcs-upgrade-notice-manager.php:99 +msgid "" +"Customers can now renew their subscriptions before the scheduled next " +"payment date. Why not use this to email your customers a coupon a month " +"before their annual subscription renewals to get access to that revenue " +"sooner?" +msgstr "" + +#: includes/upgrades/class-wcs-upgrade-notice-manager.php:104 +#. translators: placeholder is Subscription version string ('2.3') +msgid "Welcome to Subscriptions %s" +msgstr "" + +#: includes/upgrades/class-wcs-upgrade-notice-manager.php:111 +msgid "Learn More" +msgstr "" + +#: includes/upgrades/templates/update-welcome-notice.php:2 #: includes/upgrades/templates/wcs-about-2-0.php:23 #: includes/upgrades/templates/wcs-about.php:22 +#. translators: placeholder is Subscription version string ('2.3') msgid "Thank you for updating to the latest version of WooCommerce Subscriptions." msgstr "" +#: includes/upgrades/templates/update-welcome-notice.php:5 +#. translators: placeholder $1 is the Subscription version string ('2.3'), $2-3 +#. are opening and closing tags +msgid "" +"Version %1$s brings some great new features requested by store managers " +"just like you (and possibly even by %2$syou%3$s)." +msgstr "" + +#: includes/upgrades/templates/update-welcome-notice.php:6 +#: includes/upgrades/templates/wcs-about-2-0.php:25 +#: includes/upgrades/templates/wcs-about.php:24 +msgid "We hope you enjoy it!" +msgstr "" + +#: includes/upgrades/templates/update-welcome-notice.php:8 +msgid "What's New?" +msgstr "" + +#: includes/upgrades/templates/update-welcome-notice.php:16 +#. translators: placeholder is Subscription version string ('2.3') +msgid "Want to know more about %s and these new features?" +msgstr "" + +#: includes/upgrades/templates/wcs-about-2-0.php:20 +msgid "Welcome to Subscriptions 2.0" +msgstr "" + #: includes/upgrades/templates/wcs-about-2-0.php:24 msgid "" "Version 2.0 has been in development for more than a year. We've reinvented " "the extension to take into account 3 years of feedback from store managers." msgstr "" -#: includes/upgrades/templates/wcs-about-2-0.php:25 -#: includes/upgrades/templates/wcs-about.php:24 -msgid "We hope you enjoy it!" -msgstr "" - #: includes/upgrades/templates/wcs-about-2-0.php:31 #: includes/upgrades/templates/wcs-about.php:30 #. translators: placeholder is version number @@ -3486,8 +3843,8 @@ msgstr "" #: includes/upgrades/templates/wcs-about.php:109 msgid "" "That's not all we've working on for the last 12 months when it comes to " -"Subscriptions. We've also released free mini-extensions to help you get the " -"most from your subscription store." +"Subscriptions. We've also released mini-extensions to help you get the most " +"from your subscription store." msgstr "" #: includes/upgrades/templates/wcs-about.php:115 @@ -3502,7 +3859,7 @@ msgstr "" #: includes/upgrades/templates/wcs-about.php:117 msgid "" -"The free Gifting extension makes it possible for one person to purchase a " +"The Gifting extension makes it possible for one person to purchase a " "subscription product for someone else. It then shares control of the " "subscription between the purchaser and recipient, allowing both to manage " "the subscription over its lifecycle." @@ -3772,11 +4129,15 @@ msgid_plural "Shipping %d" msgstr[0] "" msgstr[1] "" -#: includes/wcs-cart-functions.php:235 +#: includes/wcs-cart-functions.php:217 +msgid "[Remove]" +msgstr "" + +#: includes/wcs-cart-functions.php:247 msgid "Free shipping coupon" msgstr "" -#: includes/wcs-cart-functions.php:340 +#: includes/wcs-cart-functions.php:352 #. translators: placeholder is a date msgid "First renewal: %s" msgstr "" @@ -3886,27 +4247,27 @@ msgstr "" msgid "MM" msgstr "" -#: includes/wcs-order-functions.php:327 +#: includes/wcs-order-functions.php:344 msgid "Subscription Renewal Order – %s" msgstr "" -#: includes/wcs-order-functions.php:330 +#: includes/wcs-order-functions.php:347 msgid "Resubscribe Order – %s" msgstr "" -#: includes/wcs-order-functions.php:349 +#: includes/wcs-order-functions.php:366 msgid "$type passed to the function was not a string." msgstr "" -#: includes/wcs-order-functions.php:354 +#: includes/wcs-order-functions.php:370 msgid "\"%s\" is not a valid new order type." msgstr "" -#: includes/wcs-order-functions.php:541 +#: includes/wcs-order-functions.php:557 msgid "Invalid data. No valid subscription / order was passed in." msgstr "" -#: includes/wcs-order-functions.php:545 +#: includes/wcs-order-functions.php:561 msgid "Invalid data. No valid item id was passed in." msgstr "" @@ -3934,7 +4295,7 @@ msgid_plural "a %s-year" msgstr[0] "" msgstr[1] "" -#: includes/wcs-user-functions.php:350 +#: includes/wcs-user-functions.php:336 #: templates/single-product/add-to-cart/subscription.php:43 #: templates/single-product/add-to-cart/variable-subscription.php:29 msgid "Resubscribe" @@ -4000,19 +4361,6 @@ msgstr "" msgid "Billing Period:" msgstr "" -#: templates/admin/status.php:22 -msgid "This section shows any information about Subscriptions." -msgstr "" - -#: templates/admin/status.php:74 -#. 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 "" - -#: templates/admin/status.php:87 -msgid "Learn how to update" -msgstr "" - #: templates/cart/cart-recurring-shipping.php:19 msgid "Recurring shipping options can be selected on checkout." msgstr "" @@ -4242,87 +4590,87 @@ msgstr "" msgid "Clear" msgstr "" -#: wcs-functions.php:230 +#: wcs-functions.php:246 msgid "Can not get status name. Status is not a string." msgstr "" -#: wcs-functions.php:253 +#: wcs-functions.php:269 msgid "Can not get address type display name. Address type is not a string." msgstr "" -#: wcs-functions.php:316 +#: wcs-functions.php:332 msgid "Date type is not a string." msgstr "" -#: wcs-functions.php:318 +#: wcs-functions.php:334 msgid "Date type can not be an empty string." msgstr "" -#: woocommerce-subscriptions.php:246 +#: woocommerce-subscriptions.php:318 msgid "This is where subscriptions are stored." msgstr "" -#: woocommerce-subscriptions.php:291 +#: woocommerce-subscriptions.php:363 msgid "No Subscriptions found" msgstr "" -#: woocommerce-subscriptions.php:293 +#: woocommerce-subscriptions.php:365 msgid "" "Subscriptions will appear here for you to view and manage once purchased by " "a customer." msgstr "" -#: woocommerce-subscriptions.php:295 +#: woocommerce-subscriptions.php:367 #. translators: placeholders are opening and closing link tags msgid "%sLearn more about managing subscriptions »%s" msgstr "" -#: woocommerce-subscriptions.php:297 +#: woocommerce-subscriptions.php:369 #. translators: placeholders are opening and closing link tags msgid "%sAdd a subscription product »%s" msgstr "" -#: woocommerce-subscriptions.php:425 +#: woocommerce-subscriptions.php:523 msgid "" "A subscription renewal has been removed from your cart. Multiple " "subscriptions can not be purchased at the same time." msgstr "" -#: woocommerce-subscriptions.php:431 +#: woocommerce-subscriptions.php:529 msgid "" "A subscription has been removed from your cart. Due to payment gateway " "restrictions, different subscription products can not be purchased at the " "same time." msgstr "" -#: woocommerce-subscriptions.php:437 +#: woocommerce-subscriptions.php:535 msgid "" "A subscription has been removed from your cart. Products and subscriptions " "can not be purchased at the same time." msgstr "" -#: woocommerce-subscriptions.php:585 woocommerce-subscriptions.php:602 +#: woocommerce-subscriptions.php:683 woocommerce-subscriptions.php:700 #. translators: placeholder is a number, this is for the teens #. translators: placeholder is a number, numbers ending in 4-9, 0 msgid "%sth" msgstr "" -#: woocommerce-subscriptions.php:590 +#: woocommerce-subscriptions.php:688 #. translators: placeholder is a number, numbers ending in 1 msgid "%sst" msgstr "" -#: woocommerce-subscriptions.php:594 +#: woocommerce-subscriptions.php:692 #. translators: placeholder is a number, numbers ending in 2 msgid "%snd" msgstr "" -#: woocommerce-subscriptions.php:598 +#: woocommerce-subscriptions.php:696 #. translators: placeholder is a number, numbers ending in 3 msgid "%srd" msgstr "" -#: woocommerce-subscriptions.php:628 +#: woocommerce-subscriptions.php:726 #. translators: 1$-2$: opening and closing tags, 3$-4$: link tags, #. takes to woocommerce plugin on wp.org, 5$-6$: opening and closing link tags, #. leads to plugins.php in admin @@ -4332,7 +4680,7 @@ msgid "" "%5$sinstall & activate WooCommerce »%6$s" msgstr "" -#: woocommerce-subscriptions.php:635 +#: woocommerce-subscriptions.php:733 #. translators: 1$-2$: opening and closing tags, 3$-4$: opening and #. closing link tags, leads to plugin admin msgid "" @@ -4341,11 +4689,24 @@ msgid "" "WooCommerce to version 2.4 or newer »%4$s" msgstr "" -#: woocommerce-subscriptions.php:661 +#: woocommerce-subscriptions.php:759 msgid "Variable Subscription" msgstr "" -#: woocommerce-subscriptions.php:857 +#: woocommerce-subscriptions.php:902 +msgid "" +"%1$sWarning!%2$s We can see the %1$sWooCommerce Subscriptions Early " +"Renewal%2$s plugin is active. Version %3$s of %1$sWooCommerce " +"Subscriptions%2$s comes with that plugin's functionality packaged into the " +"core plugin. Please deactivate WooCommerce Subscriptions Early Renewal to " +"avoid any conflicts." +msgstr "" + +#: woocommerce-subscriptions.php:905 +msgid "Installed Plugins" +msgstr "" + +#: woocommerce-subscriptions.php:978 #. translators: 1$-2$: opening and closing tags, 3$-4$: opening and #. closing link tags. Leads to duplicate site article on docs msgid "" @@ -4355,19 +4716,19 @@ msgid "" "environment. %3$sLearn more »%4$s." msgstr "" -#: woocommerce-subscriptions.php:859 +#: woocommerce-subscriptions.php:980 msgid "Quit nagging me (but don't enable automatic payments)" msgstr "" -#: woocommerce-subscriptions.php:860 +#: woocommerce-subscriptions.php:981 msgid "Enable automatic payments" msgstr "" -#: woocommerce-subscriptions.php:1066 +#: woocommerce-subscriptions.php:1187 msgid "Support" msgstr "" -#: woocommerce-subscriptions.php:1151 +#: woocommerce-subscriptions.php:1272 #. translators: placeholders are opening and closing tags. Leads to docs on #. version 2 msgid "" @@ -4378,14 +4739,14 @@ msgid "" "2.0 »%s" msgstr "" -#: woocommerce-subscriptions.php:1166 +#: woocommerce-subscriptions.php:1287 msgid "" "Warning! You are running version %s of WooCommerce Subscriptions plugin " "code but your database has been upgraded to Subscriptions version 2.0. This " "will cause major problems on your store." msgstr "" -#: woocommerce-subscriptions.php:1167 +#: woocommerce-subscriptions.php:1288 msgid "" "Please upgrade the WooCommerce Subscriptions plugin to version 2.0 or newer " "immediately. If you need assistance, after upgrading to Subscriptions v2.0, " @@ -4410,7 +4771,7 @@ msgstr "" msgid "http://prospress.com/" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:200 +#: includes/admin/class-wc-subscriptions-admin.php:202 #. translators: placeholder is trial period validation message if passed an #. invalid value (e.g. "Trial period can not exceed 4 weeks") msgctxt "Trial period field tooltip on Edit Product administration screen" @@ -4420,12 +4781,12 @@ msgid "" "subscription. %s" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:213 +#: includes/admin/class-wc-subscriptions-admin.php:215 msgctxt "example price" msgid "e.g. 5.90" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:247 +#: includes/admin/class-wc-subscriptions-admin.php:249 #: templates/admin/deprecated/html-variation-price.php:31 #: templates/admin/deprecated/html-variation-price.php:86 #: templates/admin/html-variation-price.php:21 @@ -4434,7 +4795,7 @@ msgctxt "example price" msgid "e.g. 9.90" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:781 +#: includes/admin/class-wc-subscriptions-admin.php:784 #. translators: placeholders are for HTML tags. They are 1$: "
", 2$: #. "
", 3$: "", 4$: "", 5$: "", 6$: "", 7$: "", 8$: #. "
" @@ -4445,7 +4806,7 @@ msgid "" "%6$sVariable subscription%7$s.%8$s" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:783 +#: includes/admin/class-wc-subscriptions-admin.php:786 #. translators: placeholders are for HTML tags. They are 1$: "", 2$: #. "
", 3$: "", 4$: "
" msgctxt "used in admin pointer script params in javascript as price pointer content" @@ -4455,58 +4816,58 @@ msgid "" "sign-up fee and free trial.%4$s" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:1094 +#: includes/admin/class-wc-subscriptions-admin.php:1097 msgctxt "option section heading" msgid "Renewals" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:1126 +#: includes/admin/class-wc-subscriptions-admin.php:1129 msgctxt "options section heading" msgid "Miscellaneous" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:1134 +#: includes/admin/class-wc-subscriptions-admin.php:1137 msgctxt "there's a number immediately in front of this text" msgid "suspensions per billing period." msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:1411 -#: includes/admin/class-wc-subscriptions-admin.php:1447 +#: includes/class-wc-subscriptions-synchroniser.php:240 +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:1418 +#: includes/admin/class-wcs-admin-system-status.php:92 msgctxt "label that indicates whether debugging is turned on for the plugin" msgid "WCS_DEBUG" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:1417 -#: includes/admin/class-wc-subscriptions-admin.php:1453 +#: includes/admin/class-wc-subscriptions-admin.php:1424 +#: includes/admin/class-wcs-admin-system-status.php:104 msgctxt "Live or Staging, Label on WooCommerce -> System Status page" msgid "Subscriptions Mode" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:1418 -#: includes/admin/class-wc-subscriptions-admin.php:1454 +#: includes/admin/class-wc-subscriptions-admin.php:1425 +#: includes/admin/class-wcs-admin-system-status.php:106 msgctxt "refers to staging site" msgid "Staging" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:1418 -#: includes/admin/class-wc-subscriptions-admin.php:1454 +#: includes/admin/class-wc-subscriptions-admin.php:1425 +#: includes/admin/class-wcs-admin-system-status.php:106 msgctxt "refers to live site" msgid "Live" msgstr "" -#: includes/admin/class-wc-subscriptions-admin.php:1424 -msgctxt "label for the system status page" -msgid "Subscriptions Template Theme Overrides" -msgstr "" - -#: includes/admin/class-wcs-admin-meta-boxes.php:56 +#: includes/admin/class-wcs-admin-meta-boxes.php:57 msgctxt "meta box title" msgid "Subscription Data" msgstr "" -#: includes/admin/class-wcs-admin-meta-boxes.php:58 +#: includes/admin/class-wcs-admin-meta-boxes.php:59 msgctxt "meta box title" -msgid "Billing Schedule" +msgid "Schedule" msgstr "" #: includes/admin/class-wcs-admin-post-types.php:245 @@ -4522,8 +4883,8 @@ msgstr "" #: includes/admin/class-wcs-admin-post-types.php:247 #: includes/admin/class-wcs-admin-post-types.php:460 #: includes/class-wc-subscriptions-manager.php:1829 -#: includes/wcs-user-functions.php:359 -#: templates/myaccount/related-orders.php:67 +#: includes/wcs-user-functions.php:345 +#: templates/myaccount/related-orders.php:73 msgctxt "an action on a subscription" msgid "Cancel" msgstr "" @@ -4550,33 +4911,93 @@ 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:883 +#: includes/admin/class-wcs-admin-post-types.php:835 #. 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:888 +#: includes/admin/class-wcs-admin-post-types.php:840 msgctxt "used in \"Subscription scheduled forprint_attributes(); ?>>
+ has_heading() ) : ?>
+
diff --git a/templates/admin/status.php b/templates/admin/status.php
index 1dd5aa6..1b35da7 100755
--- a/templates/admin/status.php
+++ b/templates/admin/status.php
@@ -2,7 +2,7 @@
/**
* Outputs the Status section for Subscriptions.
*
- * @version 2.2.17
+ * @version 2.3.0
*/
if ( ! defined( 'ABSPATH' ) ) {
@@ -17,9 +17,9 @@ if ( ! isset( $debug_data ) || ! is_array( $debug_data ) ) {
print_heading(); ?>
+ + + print_content(); ?> + + has_actions() ) : ?> +get_actions() as $action ) { ?> + + +
+ + + is_dismissible() ) : ?> + + +
-
-
+ + | |||||
|---|---|---|---|---|---|
| : | +: |
-
-
-
-
- %s ', esc_html( $override['file'] ) );
- if ( $override['is_outdated'] ) {
- printf(
- /* translators: %1$s is the file version, %2$s is the core version */
- esc_html__( 'version %1$s is out of date. The core version is %2$s', 'woocommerce-subscriptions' ),
- '' . esc_html( $override['version'] ) . '',
- '' . esc_html( $override['core_version'] ) . ''
- );
+ if ( empty( $data['data'] ) ) {
+ echo '–';
+ continue;
}
- echo ' '; - } - if ( $data['data']['has_outdated_templates'] ) { - ?> - - - - - - '; + $row_number--; + } + } + if ( isset( $data['note'] ) ) { + if ( empty( $mark ) ) { + echo wp_kses_post( $data['note'] ); + } else { ?> + '; + } + echo wp_kses_post( $data['note'] );?> + |
|||
| - | + | + | diff --git a/templates/myaccount/related-orders.php b/templates/myaccount/related-orders.php index 344ff27..48c7592 100755 --- a/templates/myaccount/related-orders.php +++ b/templates/myaccount/related-orders.php @@ -62,8 +62,14 @@ if ( ! defined( 'ABSPATH' ) ) { } if ( in_array( $order->get_status(), apply_filters( 'woocommerce_valid_order_statuses_for_cancel', array( 'pending', 'failed' ), $order ) ) ) { + $redirect = wc_get_page_permalink( 'myaccount' ); + + if ( wcs_is_view_subscription_page() ) { + $redirect = $subscription->get_view_order_url(); + } + $actions['cancel'] = array( - 'url' => $order->get_cancel_order_url( wc_get_page_permalink( 'myaccount' ) ), + 'url' => $order->get_cancel_order_url( $redirect ), 'name' => esc_html_x( 'Cancel', 'an action on a subscription', 'woocommerce-subscriptions' ), ); } diff --git a/templates/single-product/add-to-cart/variable-subscription.php b/templates/single-product/add-to-cart/variable-subscription.php index 856dca3..bb77575 100755 --- a/templates/single-product/add-to-cart/variable-subscription.php +++ b/templates/single-product/add-to-cart/variable-subscription.php @@ -79,7 +79,14 @@ do_action( 'woocommerce_before_add_to_cart_form' ); ?> ?> - + diff --git a/wcs-functions.php b/wcs-functions.php index e3aad98..7cae7f2 100755 --- a/wcs-functions.php +++ b/wcs-functions.php @@ -193,7 +193,23 @@ function wcs_create_subscription( $args = array() ) { update_post_meta( $subscription_id, '_customer_user', $args['customer_id'] ); update_post_meta( $subscription_id, '_order_version', $args['order_version'] ); - return wcs_get_subscription( $subscription_id ); + /** + * Filter the newly created subscription object. + * + * @since 2.2.22 + * @param WC_Subscription $subscription + */ + $subscription = apply_filters( 'wcs_created_subscription', wcs_get_subscription( $subscription_id ) ); + + /** + * Triggered after a new subscription is created. + * + * @since 2.2.22 + * @param WC_Subscription $subscription + */ + do_action( 'wcs_create_subscription', $subscription ); + + return $subscription; } /** @@ -674,3 +690,91 @@ function wcs_is_view_subscription_page() { function wcs_get_image_asset_url( $file_name ) { return plugins_url( "/assets/images/{$file_name}", WC_Subscriptions::$plugin_file ); } + +/** + * Search subscriptions + * + * @param string $term Term to search + * @return array of subscription ids + * @since 2.3.0 + */ +function wcs_subscription_search( $term ) { + global $wpdb; + + $subscription_ids = array(); + + if ( ! WC_Subscriptions::is_woocommerce_pre( '3.0' ) ) { + + $data_store = WC_Data_Store::load( 'subscription' ); + $subscription_ids = $data_store->search_subscriptions( str_replace( 'Order #', '', wc_clean( $term ) ) ); + + } else { + + $search_order_id = str_replace( 'Order #', '', $term ); + if ( ! is_numeric( $search_order_id ) ) { + $search_order_id = 0; + } + + $search_fields = array_map( 'wc_clean', apply_filters( 'woocommerce_shop_subscription_search_fields', array( + '_order_key', + '_billing_company', + '_billing_address_1', + '_billing_address_2', + '_billing_city', + '_billing_postcode', + '_billing_country', + '_billing_state', + '_billing_email', + '_billing_phone', + '_shipping_address_1', + '_shipping_address_2', + '_shipping_city', + '_shipping_postcode', + '_shipping_country', + '_shipping_state', + ) ) ); + + $subscription_ids = array_unique( array_merge( + $wpdb->get_col( + $wpdb->prepare( " + SELECT p1.post_id + FROM {$wpdb->postmeta} p1 + INNER JOIN {$wpdb->postmeta} p2 ON p1.post_id = p2.post_id + WHERE + ( p1.meta_key = '_billing_first_name' AND p2.meta_key = '_billing_last_name' AND CONCAT(p1.meta_value, ' ', p2.meta_value) LIKE '%%%s%%' ) + OR + ( p1.meta_key = '_shipping_first_name' AND p2.meta_key = '_shipping_last_name' AND CONCAT(p1.meta_value, ' ', p2.meta_value) LIKE '%%%s%%' ) + OR + ( p1.meta_key IN ('" . implode( "','", esc_sql( $search_fields ) ) . "') AND p1.meta_value LIKE '%%%s%%' ) + ", + esc_attr( $term ), esc_attr( $term ), esc_attr( $term ) + ) + ), + $wpdb->get_col( + $wpdb->prepare( " + SELECT order_id + FROM {$wpdb->prefix}woocommerce_order_items as order_items + WHERE order_item_name LIKE '%%%s%%' + ", + esc_attr( $term ) + ) + ), + $wpdb->get_col( + $wpdb->prepare( " + SELECT p1.ID + FROM {$wpdb->posts} p1 + INNER JOIN {$wpdb->postmeta} p2 ON p1.ID = p2.post_id + INNER JOIN {$wpdb->users} u ON p2.meta_value = u.ID + WHERE u.user_email LIKE '%%%s%%' + AND p2.meta_key = '_customer_user' + AND p1.post_type = 'shop_subscription' + ", + esc_attr( $term ) + ) + ), + array( $search_order_id ) + ) ); + } + + return $subscription_ids; +} diff --git a/woocommerce-subscriptions.php b/woocommerce-subscriptions.php index ea483c6..d0959a7 100755 --- a/woocommerce-subscriptions.php +++ b/woocommerce-subscriptions.php @@ -5,9 +5,9 @@ * Description: Sell products and services with recurring payments in your WooCommerce Store. * Author: Prospress Inc. * Author URI: http://prospress.com/ - * Version: 2.2.21 + * Version: 2.3.2 * - * WC requires at least: 2.5 + * WC requires at least: 2.6 * WC tested up to: 3.4 * Woo: 27147:6115e6d7e297b623a169fdcf5728b224 * @@ -48,11 +48,13 @@ woothemes_queue_update( plugin_basename( __FILE__ ), '6115e6d7e297b623a169fdcf57 * * @since 1.0 */ -if ( ! is_woocommerce_active() || version_compare( get_option( 'woocommerce_db_version' ), '2.5', '<' ) ) { +if ( ! is_woocommerce_active() || version_compare( get_option( 'woocommerce_db_version' ), '2.6', '<' ) ) { add_action( 'admin_notices', 'WC_Subscriptions::woocommerce_inactive_notice' ); return; } +define( 'WCS_INIT_TIMESTAMP', gmdate( 'U' ) ); + require_once( 'wcs-functions.php' ); require_once( 'includes/class-wc-subscriptions-coupon.php' ); @@ -89,8 +91,6 @@ require_once( 'includes/upgrades/class-wc-subscriptions-upgrader.php' ); require_once( 'includes/upgrades/class-wcs-upgrade-logger.php' ); -require_once( 'includes/libraries/tlc-transients/tlc-transients.php' ); - require_once( 'includes/libraries/action-scheduler/action-scheduler.php' ); require_once( 'includes/abstracts/abstract-wcs-scheduler.php' ); @@ -101,6 +101,10 @@ require_once( 'includes/abstracts/abstract-wcs-cache-manager.php' ); require_once( 'includes/class-wcs-cached-data-manager.php' ); +require_once( 'includes/class-wcs-post-meta-cache-manager.php' ); + +require_once( 'includes/class-wcs-post-meta-cache-manager-many-to-one.php' ); + require_once( 'includes/class-wcs-cart-renewal.php' ); require_once( 'includes/class-wcs-cart-resubscribe.php' ); @@ -115,10 +119,44 @@ require_once( 'includes/class-wcs-cart-switch.php' ); require_once( 'includes/class-wcs-limiter.php' ); +require_once( 'includes/interfaces/interface-wcs-cache-updater.php' ); + +require_once( 'includes/abstracts/abstract-wcs-related-order-store.php' ); + +require_once( 'includes/data-stores/class-wcs-related-order-store-cpt.php' ); + +require_once( 'includes/data-stores/class-wcs-related-order-store-cached-cpt.php' ); + +require_once( 'includes/abstracts/abstract-wcs-customer-store.php' ); + +require_once( 'includes/data-stores/class-wcs-customer-store-cpt.php' ); + +require_once( 'includes/data-stores/class-wcs-customer-store-cached-cpt.php' ); + require_once( 'includes/legacy/class-wcs-array-property-post-meta-black-magic.php' ); require_once( 'includes/class-wcs-failed-scheduled-action-manager.php' ); +require_once( dirname( __FILE__ ) . '/includes/admin/class-wcs-admin-system-status.php' ); + +require_once( 'includes/abstracts/abstract-wcs-debug-tool.php' ); + +require_once( 'includes/abstracts/abstract-wcs-background-updater.php' ); + +require_once( 'includes/admin/debug-tools/class-wcs-debug-tool-factory.php' ); + +require_once( 'includes/admin/class-wcs-admin-notice.php' ); + +require_once( 'includes/upgrades/class-wcs-upgrade-notice-manager.php' ); + +require_once( 'includes/abstracts/abstract-wcs-background-upgrader.php' ); + +require_once( 'includes/class-wcs-staging.php' ); + +WCS_Admin_System_Status::init(); +WCS_Upgrade_Notice_Manager::init(); +WCS_Staging::init(); + /** * The main subscriptions class. * @@ -132,7 +170,7 @@ class WC_Subscriptions { public static $plugin_file = __FILE__; - public static $version = '2.2.21'; + public static $version = '2.3.2'; private static $total_subscription_count = null; @@ -175,12 +213,21 @@ class WC_Subscriptions { // Load translation files add_action( 'init', __CLASS__ . '::load_plugin_textdomain', 3 ); + // Load frontend scripts + add_action( 'wp_enqueue_scripts', __CLASS__ . '::enqueue_frontend_scripts', 3 ); + // Load dependent files add_action( 'plugins_loaded', __CLASS__ . '::load_dependant_classes' ); // Attach hooks which depend on WooCommerce constants add_action( 'plugins_loaded', __CLASS__ . '::attach_dependant_hooks' ); + // Make sure the related order data store instance is loaded and initialised so that cache management will function + add_action( 'plugins_loaded', 'WCS_Related_Order_Store::instance' ); + + // Make sure the related order data store instance is loaded and initialised so that cache management will function + add_action( 'plugins_loaded', 'WCS_Customer_Store::instance' ); + // Staging site or site migration notice add_action( 'admin_notices', __CLASS__ . '::woocommerce_site_change_notice' ); @@ -191,6 +238,9 @@ class WC_Subscriptions { add_action( 'in_plugin_update_message-' . plugin_basename( __FILE__ ), __CLASS__ . '::update_notice', 10, 2 ); + // get details of orders of a customer + add_action( 'wp_ajax_wcs_get_customer_orders', __CLASS__ . '::get_customer_orders' ); + self::$cache = WCS_Cache_Manager::get_instance(); $scheduler_class = apply_filters( 'woocommerce_subscriptions_scheduler', 'WCS_Action_Scheduler' ); @@ -198,18 +248,40 @@ class WC_Subscriptions { self::$scheduler = new $scheduler_class(); } + /** + * Get customer's order details via ajax. + */ + public static function get_customer_orders() { + check_ajax_referer( 'get-customer-orders', 'security' ); + + if ( ! current_user_can( 'edit_shop_orders' ) ) { + wp_die( -1 ); + } + + $user_id = absint( $_POST['user_id'] ); + + $orders = wc_get_orders( array( 'customer' => $user_id, 'post_type' => 'shop_order', 'posts_per_page' => '-1' ) ); + + $customer_orders = array(); + foreach ( $orders as $order ) { + $customer_orders[ wcs_get_objects_property( $order, 'id' ) ] = $order->get_order_number(); + } + + wp_send_json( $customer_orders ); + } + /** * Register data stores for WooCommerce 3.0+ * * @since 2.2.0 */ public static function add_data_stores( $data_stores ) { - + // Our custom data stores. $data_stores['subscription'] = 'WCS_Subscription_Data_Store_CPT'; + $data_stores['product-variable-subscription'] = 'WCS_Product_Variable_Data_Store_CPT'; - // Use WC core data stores for our products - $data_stores['product-variable-subscription'] = 'WC_Product_Variable_Data_Store_CPT'; - $data_stores['product-subscription_variation'] = 'WC_Product_Variation_Data_Store_CPT'; + // Use WC core data stores for our products. + $data_stores['product-subscription_variation'] = 'WC_Product_Variation_Data_Store_CPT'; $data_stores['order-item-line_item_pending_switch'] = 'WC_Order_Item_Product_Data_Store'; return $data_stores; @@ -330,6 +402,19 @@ class WC_Subscriptions { } } + /** + * Enqueues scripts for frontend + * + * @since 2.3 + */ + public static function enqueue_frontend_scripts() { + $dependencies = array( 'jquery' ); + + if ( is_cart() || is_checkout() ) { + wp_enqueue_script( 'wcs-cart', plugin_dir_url( WC_Subscriptions::$plugin_file ) . 'assets/js/frontend/wcs-cart.js', $dependencies, WC_Subscriptions::$version, true ); + } + } + /** * Enqueues stylesheet for the My Subscriptions table on the My Account page. * @@ -383,12 +468,25 @@ class WC_Subscriptions { */ public static function redirect_ajax_add_to_cart( $fragments ) { - $data = array( - 'error' => true, - 'product_url' => wc_get_cart_url(), - ); + $fragments['error'] = true; + $fragments['product_url'] = wc_get_cart_url(); - return $data; + # Force error on add_to_cart() to redirect + add_filter( 'woocommerce_add_to_cart_validation', '__return_false', 10 ); + add_filter( 'woocommerce_cart_redirect_after_error', __CLASS__ . '::redirect_to_cart', 10, 2 ); + do_action( 'wc_ajax_add_to_cart' ); + + return $fragments; + } + + /** + * Return a url for cart redirect. + * + * @since 2.3.0 + */ + public static function redirect_to_cart( $permalink, $product_id ) { + + return wc_get_cart_url(); } /** @@ -436,8 +534,8 @@ class WC_Subscriptions { wc_add_notice( __( 'A subscription has been removed from your cart. Products and subscriptions can not be purchased at the same time.', 'woocommerce-subscriptions' ), 'notice' ); - if ( WC_Subscriptions::is_woocommerce_pre( '3.0.8' ) ) { - // Redirect to cart page to remove subscription & notify shopper + // Redirect to cart page to remove subscription & notify shopper + if ( self::is_woocommerce_pre( '3.0.8' ) ) { add_filter( 'add_to_cart_fragments', __CLASS__ . '::redirect_ajax_add_to_cart' ); } else { add_filter( 'woocommerce_add_to_cart_fragments', __CLASS__ . '::redirect_ajax_add_to_cart' ); @@ -777,10 +875,9 @@ class WC_Subscriptions { } } else { require_once( 'includes/class-wc-order-item-pending-switch.php' ); - require_once( 'includes/data-stores/class-wcs-subscription-data-store-cpt.php' ); - require_once( 'includes/deprecated/class-wcs-deprecated-filter-hooks.php' ); + require_once( 'includes/data-stores/class-wcs-product-variable-data-store-cpt.php' ); } // Provide a hook to enable running deprecation handling for stores that might want to check for deprecated code @@ -799,6 +896,30 @@ class WC_Subscriptions { require_once( 'includes/deprecated/class-wcs-dynamic-filter-deprecator.php' ); } + if ( class_exists( 'WCS_Early_Renewal' ) ) { + $notice = new WCS_Admin_Notice( 'error' ); + + $notice->set_simple_content( sprintf( __( '%1$sWarning!%2$s We can see the %1$sWooCommerce Subscriptions Early Renewal%2$s plugin is active. Version %3$s of %1$sWooCommerce Subscriptions%2$s comes with that plugin\'s functionality packaged into the core plugin. Please deactivate WooCommerce Subscriptions Early Renewal to avoid any conflicts.', 'woocommerce-subscriptions' ), '', '', self::$version ) ); + $notice->set_actions( array( + array( + 'name' => __( 'Installed Plugins', 'woocommerce-subscriptions' ), + 'url' => admin_url( 'plugins.php' ), + ), + ) ); + + $notice->display(); + } else { + require_once( dirname( __FILE__ ) . '/includes/early-renewal/class-wcs-early-renewal-manager.php' ); + WCS_Early_Renewal_Manager::init(); + + if ( WCS_Early_Renewal_Manager::is_early_renewal_enabled() ) { + require_once( dirname( __FILE__ ) . '/includes/early-renewal/class-wcs-cart-early-renewal.php' ); + require_once( dirname( __FILE__ ) . '/includes/early-renewal/wcs-early-renewal-functions.php' ); + + new WCS_Cart_Early_Renewal(); + } + } + $failed_scheduled_action_manager = new WCS_Failed_Scheduled_Action_Manager( new WC_Logger() ); $failed_scheduled_action_manager->init(); | ||