Merge pull request #136 from BeAPI/ver/6.10.0

Release 6.10.0

Author: petitphp

.gitignore

@@ -9,7 +9,7 @@ Desktop.ini
 $RECYCLE.BIN/
 
 # Mac
-.DS_Store
+*.DS_Store
 
 # Sublime
 *.sublime-project
@@ -36,4 +36,4 @@ vendor
 
 # Project
 wordpress/
-app
+app

.lando.dist.yml

@@ -17,6 +17,11 @@ services:
       user: wordpress-test
       password: wordpress-test
       database: wordpress-test
+  mailcatcher:
+    type: mailhog
+    hogfrom:
+      - appserver
+    portforward: true
 tooling:
   setup-env:
     service: appserver
@@ -32,20 +37,27 @@ tooling:
       - wp config create --dbname=wordpress --dbuser=wordpress --dbpass=wordpress --dbhost=database --path=/app/wordpress
       - echo "➡️ Install WP"
       - wp core install --url="https://shoppingfeed-for-woocommerce.lndo.site" --title="Test" --admin_user=admin --admin_password=password [email protected] --skip-email
+      - wp rewrite structure "/%postname%/"
       - echo "➡️ Install Woocommerce"
       - wp plugin install --activate woocommerce
       - echo "➡️ Install Storefront"
       - wp theme install storefront --activate
       - echo "➡️ Install WordPress importer"
       - wp plugin install wordpress-importer --activate
-      - echo "➡️ Install Woocommerce"
+      - echo "➡️ Configure Woocommerce"
       - wp option set woocommerce_store_address "Example Address Line 1"
       - wp option set woocommerce_store_address_2 "Example Address Line 2"
       - wp option set woocommerce_store_city "Example City"
       - wp option set woocommerce_default_country "US:CA"
       - wp option set woocommerce_store_postcode "94110"
       - wp option set woocommerce_currency "EUR"
       - wp option set woocommerce_product_type "both"
+      - wp option set woocommerce_calc_taxes "yes"
+      - wp option set woocommerce_prices_include_tax "yes"
+      - wp option set woocommerce_tax_display_shop "incl"
+      - wp option set woocommerce_tax_display_cart "incl"
+      - wp wc tax create --country=FR --rate=20 --user=admin
+      - wp wc tax create --country=FR --rate=5.5 --class=reduced-rate --user=admin
       - wp option set woocommerce_allow_tracking "no"
       - wp option set woocommerce_enable_checkout_login_reminder "yes"
       - wp option set --format=json woocommerce_cod_settings '{"enabled":"yes"}'

.plugin-data

@@ -1,4 +1,4 @@
 {
-    "version": "6.9.0",
+    "version": "6.10.0",
     "slug": "shopping-feed"
 }

composer.json

@@ -59,7 +59,7 @@
     "codeception/module-filesystem": "^1.0",
     "codeception/module-cli": "^1.0",
     "codeception/util-universalframework": "^1.0",
-    "roots/wordpress": "^6.2",
+    "roots/wordpress": "^6.7",
     "wp-cli/wp-cli-bundle": "^2.7",
     "coenjacobs/mozart": "^0.7.1",
     "shoppingfeed/php-sdk": "^0.7.0"

composer.lock

@@ -2,19 +2,22 @@
 
 * Contributors: ShoppingFeed, BeAPI
 * Tags: shoppingfeed, marketplace, woocommerce, woocommerce shoppingfeed, create woocommerce products shoppingfeed, products feed, generate shoppingfeed, amazon, Jet, Walmart, many marketplace, import orders
-* Stable tag: 6.9.0
-* Version: 6.9.0
+* Stable tag: 6.10.0
+* Version: 6.10.0
 * Requires PHP: 7.3
 * Requires at least: 5.7
 * Tested up to: 6.7
 * WC requires at least: 5.1.0
-* WC tested up to: 9.4.3
+* WC tested up to: 9.6.0
 
 ## Upgrade Notice
 
 > 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
+* 6.10.0
+  * Orders : Redesigned the shipment tracking system.
+  * Orders (beta) : Add option to include VAT when importing orders.
 * 6.9.0
   * Feed : Fix attributes not use in variations missing in the feed.
   * Feed : Dimension data are correctly included in the feed.

readme.md

@@ -1,18 +1,21 @@
 ## ShoppingFeed
 Contributors: ShoppingFeed, BeAPI
 Tags: shoppingfeed, marketplace, woocommerce, woocommerce shoppingfeed, create woocommerce products shoppingfeed, products feed, generate shoppingfeed, amazon, Jet, Walmart, many marketplace, import orders
-Stable tag: 6.9.0
-Version: 6.9.0
+Stable tag: 6.10.0
+Version: 6.10.0
 Requires PHP: 7.3
 Requires at least: 5.7
 Tested up to: 6.7
 WC requires at least: 5.1.0
-WC tested up to: 9.4.3
+WC tested up to: 9.6.0
 
 == Upgrade Notice ==
 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 ==
+* 6.10.0
+  * Orders : Redesigned the shipment tracking system.
+  * Orders (beta) : Add option to include VAT when importing orders.
 * 6.9.0
   * Feed : Fix attributes not use in variations missing in the feed.
   * Feed : Dimension data are correctly included in the feed.

readme.txt

@@ -7,11 +7,11 @@
  * Author URI:           https://www.shopping-feed.com/
  * Text Domain:          shopping-feed
  * Domain Path:          /languages
- * Version:              6.9.0
+ * Version:              6.10.0
  * Requires at least:    5.7
  * Requires PHP:         7.3
  * WC requires at least: 5.1.0
- * WC tested up to:      8.8
+ * WC tested up to:      9.6.0
  * License:              GPLv3 or later
  * License URI:          https://www.gnu.org/licenses/gpl-3.0.html
  */
@@ -26,7 +26,7 @@
 	require_once plugin_dir_path( __FILE__ ) . '/vendor/autoload.php';
 }
 
-define( 'SF_VERSION', '6.9.0' );
+define( 'SF_VERSION', '6.10.0' );
 define( 'SF_DB_VERSION_SLUG', 'SF_DB_VERSION' );
 define( 'SF_DB_VERSION', '1.0.0' );
 define( 'SF_UPGRADE_RUNNING', 'SF_UPGRADE_RUNNING' );

shoppingfeed.php

@@ -36,22 +36,10 @@ class Addons {
 	 */
 	private $chained_products_plugin;
 
-	/**
-	 * @var ASTPlugin
-	 */
-	private $ast_plugin;
-
-	/**
-	 * @var PhWoocommerceShipmentTrackingProPlugin
-	 */
-	private $woocommerce_shipment_tracking_pro;
-
 	public function __construct() {
 		$this->shipping                          = new Shipping();
 		$this->inventory                         = new Inventory();
 		$this->marketplaces                      = new Marketplaces();
 		$this->chained_products_plugin           = new ChainedProducts();
-		$this->ast_plugin                        = new ASTPlugin();
-		$this->woocommerce_shipment_tracking_pro = new PhWoocommerceShipmentTrackingProPlugin();
 	}
 }