Merge pull request #156 from BeAPI/ver/7.0.0

Release 7.0.0

Author: petitphp

.plugin-data

@@ -1,4 +1,4 @@
 {
-    "version": "6.12.0",
+    "version": "7.0.0",
     "slug": "shopping-feed"
 }

readme.md

@@ -3,8 +3,8 @@
 * Contributors: ShoppingFeed, BeAPI
 * Tags: shoppingfeed, marketplace, woocommerce, products feed, import orders
 * Description: WordPress connection Controller Plugin for ShoppingFeed – Sell on Amazon, Ebay, Google, and 1000’s of international marketplaces
-* Stable tag: 6.12.0
-* Version: 6.12.0
+* Stable tag: 7.0.0
+* Version: 7.0.0
 * Requires PHP: 7.3
 * Requires at least: 5.7
 * Tested up to: 6.7
@@ -18,6 +18,24 @@
 > Version 6.0.0 is a major version, there are several changes and improvements which affect the architecture of the plugin. You will have to re-configure the plugin, all the previous settings will be lost
 
 ## Changelog
+
+### 7.0.0
+
+Adds support for multilingual product feeds.
+
+When a multilingual plugin is detected (WPML or Polylang are currently supported), the plugin automatically generates a feed for each existing language.
+
+#### Update notice
+
+After the update, please refresh the permalinks and check the feed generation frequency and feed's categories options.
+
+#### Enhancements
+
+* **Feed** : Adds support for multilingual product feeds.
+* **Order** : Add an option to disable order import/export.
+
+### Earlier versions
+
 * 6.12.0
   * Shipping (mondialrelay-wordpress) : Support the MondialRelay plugin for orders imported from the API if the carrier is matched with one of the plugin's shipping methods.
   * Shipping (woocommerce-gls) : Show GLS shipping methods in the shipping matching selector.

readme.txt

@@ -2,8 +2,8 @@
 Contributors: ShoppingFeed, BeAPI
 Tags: shoppingfeed, marketplace, woocommerce, products feed, import orders
 Description: WordPress connection Controller Plugin for ShoppingFeed – Sell on Amazon, Ebay, Google, and 1000’s of international marketplaces
-Stable tag: 6.12.0
-Version: 6.12.0
+Stable tag: 7.0.0
+Version: 7.0.0
 Requires PHP: 7.3
 Requires at least: 5.7
 Tested up to: 6.7
@@ -16,6 +16,24 @@ License URI: https://www.gnu.org/licenses/gpl-2.0.html
 Version 6.0.0 is a major version, there are several changes and improvements which affect the architecture of the plugin. You will have to re-configure the plugin, all the previous settings will be lost
 
 == Changelog ==
+
+= 7.0.0 =
+
+Adds support for multilingual product feeds.
+
+When a multilingual plugin is detected (WPML or Polylang are currently supported), the plugin automatically generates a feed for each existing language.
+
+#### Update notice
+
+After the update, please refresh the permalinks and check the feed generation frequency and feed's categories options.
+
+#### Enhancements
+
+* **Feed** : Adds support for multilingual product feeds.
+* **Order** : Add an option to disable order import/export.
+
+= Earlier versions =
+
 * 6.12.0
   * Shipping (mondialrelay-wordpress) : Support the MondialRelay plugin for orders imported from the API if the carrier is matched with one of the plugin's shipping methods.
   * Shipping (woocommerce-gls) : Show GLS shipping methods in the shipping matching selector.

shoppingfeed.php

@@ -7,7 +7,7 @@
  * Author URI:           https://www.shopping-feed.com/
  * Text Domain:          shopping-feed
  * Domain Path:          /languages
- * Version:              6.12.0
+ * Version:              7.0.0
  * Requires at least:    5.7
  * Requires PHP:         7.3
  * WC requires at least: 5.1.0
@@ -26,7 +26,7 @@
 	require_once plugin_dir_path( __FILE__ ) . '/vendor/autoload.php';
 }
 
-define( 'SF_VERSION', '6.12.0' );
+define( 'SF_VERSION', '7.0.0' );
 define( 'SF_DB_VERSION_SLUG', 'SF_DB_VERSION' );
 define( 'SF_DB_VERSION', '1.0.0' );
 define( 'SF_UPGRADE_RUNNING', 'SF_UPGRADE_RUNNING' );
@@ -44,8 +44,6 @@
  * Plugin bootstrap function.shopping-feed/src/ShoppingFeed.php
  */
 function init() {
-	load_plugin_textdomain( 'shopping-feed', false, plugin_basename( dirname( __FILE__ ) ) . '/languages' );
-
 	ShoppingFeed::get_instance();
 
 	if ( ! defined( 'WP_CLI' ) ) {
@@ -58,6 +56,16 @@ function init() {
 
 \add_action( 'plugins_loaded', __NAMESPACE__ . '\\init', 100 );
 
+/**
+ * Load plugin translations.
+ *
+ * @return void
+ */
+function load_translations(): void {
+	load_plugin_textdomain( 'shopping-feed', false, plugin_basename( dirname( __FILE__ ) ) . '/languages' );
+}
+\add_action( 'init', __NAMESPACE__ . '\\load_translations' );
+
 // Declare the plugin compatibility with High Performance Order Storage
 \add_action(
 	'before_woocommerce_init',

src/Actions/Actions.php

@@ -24,6 +24,10 @@ class Actions {
 	 * Register new action to generate feed
 	 */
 	public static function register_feed_generation() {
+		if ( as_has_scheduled_action( 'sf_generate_feed_action', array(), self::FEED_GROUP ) ) {
+			as_unschedule_action( 'sf_generate_feed_action', array(), self::FEED_GROUP );
+		}
+
 		as_schedule_recurring_action(
 			time() + 60,
 			ShoppingFeedHelper::get_sf_feed_generation_frequency(),
@@ -37,6 +41,10 @@ public static function register_feed_generation() {
 	 * Register new action to get orders
 	 */
 	public static function register_get_orders() {
+		if ( ShoppingFeedHelper::is_order_import_disable() ) {
+			return;
+		}
+
 		$sf_accounts = ShoppingFeedHelper::get_sf_account_options();
 		if ( empty( $sf_accounts ) ) {
 			ShoppingFeedHelper::get_logger()->error(