Skip to content

Commit f23ce48

Browse files
authored
Merge pull request #156 from BeAPI/ver/7.0.0
Release 7.0.0
2 parents 4ea9943 + 5a478e0 commit f23ce48

23 files changed

+1382
-800
lines changed

.plugin-data

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"version": "6.12.0",
2+
"version": "7.0.0",
33
"slug": "shopping-feed"
44
}

readme.md

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* Contributors: ShoppingFeed, BeAPI
44
* Tags: shoppingfeed, marketplace, woocommerce, products feed, import orders
55
* Description: WordPress connection Controller Plugin for ShoppingFeed – Sell on Amazon, Ebay, Google, and 1000’s of international marketplaces
6-
* Stable tag: 6.12.0
7-
* Version: 6.12.0
6+
* Stable tag: 7.0.0
7+
* Version: 7.0.0
88
* Requires PHP: 7.3
99
* Requires at least: 5.7
1010
* Tested up to: 6.7
@@ -18,6 +18,24 @@
1818
> 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
1919
2020
## Changelog
21+
22+
### 7.0.0
23+
24+
Adds support for multilingual product feeds.
25+
26+
When a multilingual plugin is detected (WPML or Polylang are currently supported), the plugin automatically generates a feed for each existing language.
27+
28+
#### Update notice
29+
30+
After the update, please refresh the permalinks and check the feed generation frequency and feed's categories options.
31+
32+
#### Enhancements
33+
34+
* **Feed** : Adds support for multilingual product feeds.
35+
* **Order** : Add an option to disable order import/export.
36+
37+
### Earlier versions
38+
2139
* 6.12.0
2240
* 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.
2341
* Shipping (woocommerce-gls) : Show GLS shipping methods in the shipping matching selector.

readme.txt

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
Contributors: ShoppingFeed, BeAPI
33
Tags: shoppingfeed, marketplace, woocommerce, products feed, import orders
44
Description: WordPress connection Controller Plugin for ShoppingFeed – Sell on Amazon, Ebay, Google, and 1000’s of international marketplaces
5-
Stable tag: 6.12.0
6-
Version: 6.12.0
5+
Stable tag: 7.0.0
6+
Version: 7.0.0
77
Requires PHP: 7.3
88
Requires at least: 5.7
99
Tested up to: 6.7
@@ -16,6 +16,24 @@ License URI: https://www.gnu.org/licenses/gpl-2.0.html
1616
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
1717

1818
== Changelog ==
19+
20+
= 7.0.0 =
21+
22+
Adds support for multilingual product feeds.
23+
24+
When a multilingual plugin is detected (WPML or Polylang are currently supported), the plugin automatically generates a feed for each existing language.
25+
26+
#### Update notice
27+
28+
After the update, please refresh the permalinks and check the feed generation frequency and feed's categories options.
29+
30+
#### Enhancements
31+
32+
* **Feed** : Adds support for multilingual product feeds.
33+
* **Order** : Add an option to disable order import/export.
34+
35+
= Earlier versions =
36+
1937
* 6.12.0
2038
* 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.
2139
* Shipping (woocommerce-gls) : Show GLS shipping methods in the shipping matching selector.

shoppingfeed.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Author URI: https://www.shopping-feed.com/
88
* Text Domain: shopping-feed
99
* Domain Path: /languages
10-
* Version: 6.12.0
10+
* Version: 7.0.0
1111
* Requires at least: 5.7
1212
* Requires PHP: 7.3
1313
* WC requires at least: 5.1.0
@@ -26,7 +26,7 @@
2626
require_once plugin_dir_path( __FILE__ ) . '/vendor/autoload.php';
2727
}
2828

29-
define( 'SF_VERSION', '6.12.0' );
29+
define( 'SF_VERSION', '7.0.0' );
3030
define( 'SF_DB_VERSION_SLUG', 'SF_DB_VERSION' );
3131
define( 'SF_DB_VERSION', '1.0.0' );
3232
define( 'SF_UPGRADE_RUNNING', 'SF_UPGRADE_RUNNING' );
@@ -44,8 +44,6 @@
4444
* Plugin bootstrap function.shopping-feed/src/ShoppingFeed.php
4545
*/
4646
function init() {
47-
load_plugin_textdomain( 'shopping-feed', false, plugin_basename( dirname( __FILE__ ) ) . '/languages' );
48-
4947
ShoppingFeed::get_instance();
5048

5149
if ( ! defined( 'WP_CLI' ) ) {
@@ -58,6 +56,16 @@ function init() {
5856

5957
\add_action( 'plugins_loaded', __NAMESPACE__ . '\\init', 100 );
6058

59+
/**
60+
* Load plugin translations.
61+
*
62+
* @return void
63+
*/
64+
function load_translations(): void {
65+
load_plugin_textdomain( 'shopping-feed', false, plugin_basename( dirname( __FILE__ ) ) . '/languages' );
66+
}
67+
\add_action( 'init', __NAMESPACE__ . '\\load_translations' );
68+
6169
// Declare the plugin compatibility with High Performance Order Storage
6270
\add_action(
6371
'before_woocommerce_init',

src/Actions/Actions.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ class Actions {
2424
* Register new action to generate feed
2525
*/
2626
public static function register_feed_generation() {
27+
if ( as_has_scheduled_action( 'sf_generate_feed_action', array(), self::FEED_GROUP ) ) {
28+
as_unschedule_action( 'sf_generate_feed_action', array(), self::FEED_GROUP );
29+
}
30+
2731
as_schedule_recurring_action(
2832
time() + 60,
2933
ShoppingFeedHelper::get_sf_feed_generation_frequency(),
@@ -37,6 +41,10 @@ public static function register_feed_generation() {
3741
* Register new action to get orders
3842
*/
3943
public static function register_get_orders() {
44+
if ( ShoppingFeedHelper::is_order_import_disable() ) {
45+
return;
46+
}
47+
4048
$sf_accounts = ShoppingFeedHelper::get_sf_account_options();
4149
if ( empty( $sf_accounts ) ) {
4250
ShoppingFeedHelper::get_logger()->error(

0 commit comments

Comments
 (0)