diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
new file mode 100755
index 0000000..b25b4ce
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -0,0 +1,30 @@
+---
+name: "Bug report"
+about: Report a bug if something isn't working as expected in Subscriptions
+
+---
+
+### Describe the bug
+
+
+### To reproduce
+
+1.
+1.
+1.
+
+**Screenshots**
+
+
+### Expected behavior
+
+
+### Additional details
+
+
+System status
+
+ ```
+
+ ```
+',
''
);?>
diff --git a/includes/libraries/readme.md b/includes/libraries/readme.md
new file mode 100755
index 0000000..7a0e5f2
--- /dev/null
+++ b/includes/libraries/readme.md
@@ -0,0 +1,31 @@
+# 3rd-Party Libraries
+
+Code in this directory is pulled in from other sources. It is also used *instead of* a `vendor/` directory with Composer.
+
+The libraries and files that should be tracked in Git are the following:
+
+* `action-scheduler/` – Links to Prospress/action-scheduler
+* `class-wc-datetime.php` – A copy of the `WC_DateTime`, for compatibility reasons.
+
+## Action Scheduler
+
+The Action scheduler library has been incorporated into WooCommerce Subscriptions as a Git Subtree.
+
+### Setup
+
+To set up Action Scheduler as a subtree in your local copy of Subscriptions, run the following command from the root of the Subscriptions directory:
+
+```bash
+git remote add subtree-action-scheduler https://github.com/Prospress/action-scheduler.git
+```
+
+### Updating
+
+Whenever Action Scheduler is updated, the updated version will need to be pulled into Subscriptions. This can be done with the following two commands:
+
+```bash
+git fetch subtree-action-scheduler
+git subtree pull --prefix includes/libraries/action-scheduler subtree-action-scheduler --squash
+```
+
+In the command above, `` should be replaced with either `master`, or a tag representing the latest release.
diff --git a/includes/wcs-compatibility-functions.php b/includes/wcs-compatibility-functions.php
index 353bbed..3ff1b97 100755
--- a/includes/wcs-compatibility-functions.php
+++ b/includes/wcs-compatibility-functions.php
@@ -485,3 +485,52 @@ function wcs_update_settings_option( $settings_api, $key, $value ) {
return update_option( $settings_api->get_option_key(), apply_filters( 'woocommerce_settings_api_sanitized_fields_' . $settings_api->id, $settings_api->settings ), 'yes' );
}
}
+
+/**
+ * Determines if the request is a non-legacy REST API request.
+ *
+ * This function is a compatibility wrapper for WC()->is_rest_api_request() which was introduced in WC 3.6.
+ *
+ * @since 2.5.7
+ *
+ * @return bool True if it's a REST API request, false otherwise.
+ */
+function wcs_is_rest_api_request() {
+
+ if ( function_exists( 'WC' ) && is_callable( array( WC(), 'is_rest_api_request' ) ) ) {
+ return WC()->is_rest_api_request();
+ }
+
+ if ( empty( $_SERVER['REQUEST_URI'] ) ) {
+ return false;
+ }
+
+ $rest_prefix = trailingslashit( rest_get_url_prefix() );
+ $is_rest_api_request = ( false !== strpos( $_SERVER['REQUEST_URI'], $rest_prefix ) );
+
+ return apply_filters( 'woocommerce_is_rest_api_request', $is_rest_api_request );
+}
+
+/**
+ * Determines whether the current request is a WordPress cron request.
+ *
+ * This function is a compatibility wrapper for wp_doing_cron() which was introduced in WP 4.8.
+ *
+ * @since 2.5.7
+ *
+ * @return bool True if it's a WordPress cron request, false otherwise.
+ */
+function wcs_doing_cron() {
+ return function_exists( 'wp_doing_cron' ) ? wp_doing_cron() : defined( 'DOING_CRON' ) && DOING_CRON;
+}
+
+/**
+ * Determines whether the current request is a WordPress Ajax request.
+ *
+ * @since 2.5.7
+ *
+ * @return bool True if it's a WordPress Ajax request, false otherwise.
+ */
+function wcs_doing_ajax() {
+ return function_exists( 'wp_doing_ajax' ) ? wp_doing_ajax() : defined( 'DOING_AJAX' ) && DOING_AJAX;
+}
diff --git a/includes/wcs-helper-functions.php b/includes/wcs-helper-functions.php
index f61c5b5..9448d1d 100755
--- a/includes/wcs-helper-functions.php
+++ b/includes/wcs-helper-functions.php
@@ -232,3 +232,16 @@ function wcs_get_minor_version_string( $version ) {
return $version_parts[0] . '.' . $version_parts[1];
}
+
+/**
+ * Determines if the current request is for the frontend.
+ *
+ * The logic in this function is based off WooCommerce::is_request( 'frontend' ).
+ *
+ * @since 2.5.7
+ *
+ * @return bool True if it's a frontend request, false otherwise.
+ */
+function wcs_is_frontend_request() {
+ return ( ! is_admin() || wcs_doing_ajax() ) && ! wcs_doing_cron() && ! wcs_is_rest_api_request();
+}
diff --git a/languages/woocommerce-subscriptions.pot b/languages/woocommerce-subscriptions.pot
index 5d532cf..40c2e60 100755
--- a/languages/woocommerce-subscriptions.pot
+++ b/languages/woocommerce-subscriptions.pot
@@ -1,11 +1,11 @@
-# Copyright (C) 2019 Prospress Inc.
+# Copyright (C) 2019 Automattic
# This file is distributed under the same license as the WooCommerce Subscriptions package.
msgid ""
msgstr ""
-"Project-Id-Version: WooCommerce Subscriptions 2.5.6\n"
+"Project-Id-Version: WooCommerce Subscriptions 2.5.7\n"
"Report-Msgid-Bugs-To: "
"https://github.com/Prospress/woocommerce-subscriptions/issues\n"
-"POT-Creation-Date: 2019-05-30 20:02:46+00:00\n"
+"POT-Creation-Date: 2019-07-04 13:25:48+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -1792,21 +1792,21 @@ msgstr ""
msgid "Update the %1$s used for %2$sall%3$s of my active subscriptions"
msgstr ""
-#: includes/class-wc-subscriptions-cart.php:932
+#: includes/class-wc-subscriptions-cart.php:944
msgid "Please enter a valid postcode/ZIP."
msgstr ""
-#: includes/class-wc-subscriptions-cart.php:1090
+#: includes/class-wc-subscriptions-cart.php:1102
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:1178
+#: includes/class-wc-subscriptions-cart.php:1190
msgid "Invalid recurring shipping method."
msgstr ""
-#: includes/class-wc-subscriptions-cart.php:2016
+#: includes/class-wc-subscriptions-cart.php:2069
msgid "now"
msgstr ""
@@ -3359,7 +3359,7 @@ msgstr ""
#. translators: $1 and $2 are opening and closing link tags, respectively.
msgid ""
"To resolve this as quickly as possible, please create a %1$stemporary "
-"administrator account%2$s with the user email support@prospress.com."
+"administrator account%2$s with the user email woologin@woocommerce.com."
msgstr ""
#: includes/gateways/paypal/includes/templates/html-ipn-failure-notice.php:29
@@ -5087,11 +5087,11 @@ msgid ""
msgstr ""
#. Author of the plugin/theme
-msgid "Prospress Inc."
+msgid "Automattic"
msgstr ""
#. Author URI of the plugin/theme
-msgid "https://prospress.com/"
+msgid "https://woocommerce.com/"
msgstr ""
#: includes/admin/class-wc-subscriptions-admin.php:280
diff --git a/woocommerce-subscriptions.php b/woocommerce-subscriptions.php
index af4e0ec..8265518 100755
--- a/woocommerce-subscriptions.php
+++ b/woocommerce-subscriptions.php
@@ -3,15 +3,15 @@
* Plugin Name: WooCommerce Subscriptions
* Plugin URI: https://www.woocommerce.com/products/woocommerce-subscriptions/
* Description: Sell products and services with recurring payments in your WooCommerce Store.
- * Author: Prospress Inc.
- * Author URI: https://prospress.com/
- * Version: 2.5.6
+ * Author: Automattic
+ * Author URI: https://woocommerce.com/
+ * Version: 2.5.7
*
* WC requires at least: 3.0
* WC tested up to: 3.6
* Woo: 27147:6115e6d7e297b623a169fdcf5728b224
*
- * Copyright 2017 Prospress, Inc. (email : freedoms@prospress.com)
+ * Copyright 2019 WooCommerce
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
* along with this program. If not, see .
*
* @package WooCommerce Subscriptions
- * @author Prospress Inc.
+ * @author Automattic.
* @since 1.0
*/
@@ -113,7 +113,7 @@ class WC_Subscriptions {
public static $plugin_file = __FILE__;
- public static $version = '2.5.6';
+ public static $version = '2.5.7';
public static $wc_minimum_supported_version = '3.0';
diff --git a/wpml-config.xml b/wpml-config.xml
new file mode 100755
index 0000000..91a5495
--- /dev/null
+++ b/wpml-config.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+