Merge branch 'develop' into ver/7.0.0

Author: petitphp

shoppingfeed.php

@@ -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(