Version Description
- Fixed an issue with German free shipping zones not showing in Google Shopping feeds
Download this release
Release Info
Developer | jorisverwater |
Plugin | Product Feed PRO for WooCommerce |
Version | 8.4.2 |
Comparing to | |
See all releases |
Code changes from version 8.4.1 to 8.4.2
- classes/class-get-products.php +11 -9
- js/woosea_key.js +1 -1
- readme.txt +7 -1
- woocommerce-sea.php +2 -2
classes/class-get-products.php
CHANGED
@@ -673,7 +673,7 @@ class WooSEA_Get_Products {
|
|
673 |
|
674 |
// Only add shipping zones to the feed for specific feed country
|
675 |
$ship_found = strpos($zone_type->code, $code_from_config);
|
676 |
-
|
677 |
if(($ship_found !== false) OR ($add_all_shipping == "yes")){
|
678 |
if ($zone_type->type == "country"){
|
679 |
// This is a country shipping zone
|
@@ -697,7 +697,6 @@ class WooSEA_Get_Products {
|
|
697 |
} else {
|
698 |
// Unknown shipping zone type
|
699 |
}
|
700 |
-
|
701 |
// Get the g:services and g:prices, because there could be multiple services the $shipping_arr could multiply again
|
702 |
// g:service = "Method title - Shipping class costs"
|
703 |
// for example, g:service = "Estimated Shipping - Heavy shipping". g:price would be 180
|
@@ -893,7 +892,7 @@ class WooSEA_Get_Products {
|
|
893 |
settype($price, "double");
|
894 |
settype($minimum_fee, "double");
|
895 |
|
896 |
-
// Only Free Shipping when
|
897 |
if ($price >= $minimum_fee){
|
898 |
$shipping_cost = 0;
|
899 |
$zone_details['price'] = trim($currency." ".$shipping_cost);
|
@@ -927,7 +926,7 @@ class WooSEA_Get_Products {
|
|
927 |
}
|
928 |
}
|
929 |
}
|
930 |
-
|
931 |
if(strlen($shipping_cost) > 0){
|
932 |
if($project_config['ship_suffix'] == "false"){
|
933 |
$zone_details['price'] = trim($currency." ".$shipping_cost);
|
@@ -935,8 +934,11 @@ class WooSEA_Get_Products {
|
|
935 |
$zone_details['price'] = trim($shipping_cost);
|
936 |
}
|
937 |
} else {
|
938 |
-
|
939 |
-
|
|
|
|
|
|
|
940 |
}
|
941 |
}
|
942 |
|
@@ -964,8 +966,8 @@ class WooSEA_Get_Products {
|
|
964 |
}
|
965 |
|
966 |
// Remove other shipping classes when free shipping is relevant
|
967 |
-
$free_check = "
|
968 |
-
|
969 |
|
970 |
if(in_array($free_check, array_column($shipping_arr, 'free'))) { // search value in the array
|
971 |
foreach($shipping_arr as $k => $v) {
|
@@ -978,7 +980,7 @@ class WooSEA_Get_Products {
|
|
978 |
// Remove empty countries
|
979 |
foreach($shipping_arr as $k => $v){
|
980 |
if(empty($v['country'])){
|
981 |
-
|
982 |
}
|
983 |
}
|
984 |
return $shipping_arr;
|
673 |
|
674 |
// Only add shipping zones to the feed for specific feed country
|
675 |
$ship_found = strpos($zone_type->code, $code_from_config);
|
676 |
+
|
677 |
if(($ship_found !== false) OR ($add_all_shipping == "yes")){
|
678 |
if ($zone_type->type == "country"){
|
679 |
// This is a country shipping zone
|
697 |
} else {
|
698 |
// Unknown shipping zone type
|
699 |
}
|
|
|
700 |
// Get the g:services and g:prices, because there could be multiple services the $shipping_arr could multiply again
|
701 |
// g:service = "Method title - Shipping class costs"
|
702 |
// for example, g:service = "Estimated Shipping - Heavy shipping". g:price would be 180
|
892 |
settype($price, "double");
|
893 |
settype($minimum_fee, "double");
|
894 |
|
895 |
+
// Only Free Shipping when product price is over or equal to minimum order fee
|
896 |
if ($price >= $minimum_fee){
|
897 |
$shipping_cost = 0;
|
898 |
$zone_details['price'] = trim($currency." ".$shipping_cost);
|
926 |
}
|
927 |
}
|
928 |
}
|
929 |
+
|
930 |
if(strlen($shipping_cost) > 0){
|
931 |
if($project_config['ship_suffix'] == "false"){
|
932 |
$zone_details['price'] = trim($currency." ".$shipping_cost);
|
934 |
$zone_details['price'] = trim($shipping_cost);
|
935 |
}
|
936 |
} else {
|
937 |
+
$shipping_cost = 0;
|
938 |
+
$zone_details['price'] = trim($currency." ".$shipping_cost);
|
939 |
+
|
940 |
+
//unset($zone_details);
|
941 |
+
//unset($shipping_cost);
|
942 |
}
|
943 |
}
|
944 |
|
966 |
}
|
967 |
|
968 |
// Remove other shipping classes when free shipping is relevant
|
969 |
+
$free_check = "yes";
|
970 |
+
//$free_check = get_option ('free_shipping');
|
971 |
|
972 |
if(in_array($free_check, array_column($shipping_arr, 'free'))) { // search value in the array
|
973 |
foreach($shipping_arr as $k => $v) {
|
980 |
// Remove empty countries
|
981 |
foreach($shipping_arr as $k => $v){
|
982 |
if(empty($v['country'])){
|
983 |
+
unset($shipping_arr[$k]);
|
984 |
}
|
985 |
}
|
986 |
return $shipping_arr;
|
js/woosea_key.js
CHANGED
@@ -27,7 +27,7 @@ jQuery(document).ready(function($) {
|
|
27 |
var license_key = $('#license-key').val();
|
28 |
|
29 |
jQuery.ajax({
|
30 |
-
url: 'https://www.adtribes.io/check/license.php?key=' + license_key + '&email=' + license_email + '&domain=' + root_domain + '&version=8.4.
|
31 |
jsonp: 'callback',
|
32 |
dataType: 'jsonp',
|
33 |
type: 'GET',
|
27 |
var license_key = $('#license-key').val();
|
28 |
|
29 |
jQuery.ajax({
|
30 |
+
url: 'https://www.adtribes.io/check/license.php?key=' + license_key + '&email=' + license_email + '&domain=' + root_domain + '&version=8.4.2',
|
31 |
jsonp: 'callback',
|
32 |
dataType: 'jsonp',
|
33 |
type: 'GET',
|
readme.txt
CHANGED
@@ -5,7 +5,7 @@ License URI: http://www.gnu.org/licenses/gpl.html
|
|
5 |
Tags: Product Feed, Google Shopping, Google Shopping Feed, WooCommerce Product Feed, WooCommerce Product Feed PRO, Bing Shopping, Bing product feed, Bing remarking, Google Merchant Feed, Google DRM Feed, Google Dynamic Remarketing Feed, Facebook feed, Google feed, Bing feed, Facebook Product Feed, Facebook Dynamic remarketing, Data Feed, WooCommerce Feed, XML product feed, CSV product feed, TSV, TXT product feed, comparison shopping engines, comparison shopping websites, vergelijk.nl, vergelijk.be, vertaa.fi, beslist.nl, kieskeurig.nl, bol.com, raketten, pricerunner, pricegrabber, Buy, leGuide, Kelkoo, Twenga, Yandex, Etsy, Dealtime, Shopzilla, Billiger, Google Product Review feed
|
6 |
Requires at least: 4.5
|
7 |
Tested up to: 5.4
|
8 |
-
Stable tag: 8.4.
|
9 |
|
10 |
== Description ==
|
11 |
|
@@ -313,6 +313,9 @@ Questions left or unanswered? Please do not hesitate to contact us at support@ad
|
|
313 |
|
314 |
=== Changelog ===
|
315 |
|
|
|
|
|
|
|
316 |
= 8.4.1 (2020-07-07) =
|
317 |
* Added two new Google Shopping fields to the template: productdetail and producthighlight
|
318 |
|
@@ -2675,6 +2678,9 @@ Questions left or unanswered? Please do not hesitate to contact us at support@ad
|
|
2675 |
|
2676 |
== Upgrade Notice ==
|
2677 |
|
|
|
|
|
|
|
2678 |
= 8.4.1 =
|
2679 |
Added two new Google Shopping fields to the template: productdetail and producthighlight
|
2680 |
|
5 |
Tags: Product Feed, Google Shopping, Google Shopping Feed, WooCommerce Product Feed, WooCommerce Product Feed PRO, Bing Shopping, Bing product feed, Bing remarking, Google Merchant Feed, Google DRM Feed, Google Dynamic Remarketing Feed, Facebook feed, Google feed, Bing feed, Facebook Product Feed, Facebook Dynamic remarketing, Data Feed, WooCommerce Feed, XML product feed, CSV product feed, TSV, TXT product feed, comparison shopping engines, comparison shopping websites, vergelijk.nl, vergelijk.be, vertaa.fi, beslist.nl, kieskeurig.nl, bol.com, raketten, pricerunner, pricegrabber, Buy, leGuide, Kelkoo, Twenga, Yandex, Etsy, Dealtime, Shopzilla, Billiger, Google Product Review feed
|
6 |
Requires at least: 4.5
|
7 |
Tested up to: 5.4
|
8 |
+
Stable tag: 8.4.2
|
9 |
|
10 |
== Description ==
|
11 |
|
313 |
|
314 |
=== Changelog ===
|
315 |
|
316 |
+
= 8.4.2 (2020-07-08) =
|
317 |
+
* Fixed an issue with German free shipping zones not showing in Google Shopping feeds
|
318 |
+
|
319 |
= 8.4.1 (2020-07-07) =
|
320 |
* Added two new Google Shopping fields to the template: productdetail and producthighlight
|
321 |
|
2678 |
|
2679 |
== Upgrade Notice ==
|
2680 |
|
2681 |
+
= 8.4.2 =
|
2682 |
+
* Fixed an issue with German free shipping zones not showing in Google Shopping feeds
|
2683 |
+
|
2684 |
= 8.4.1 =
|
2685 |
Added two new Google Shopping fields to the template: productdetail and producthighlight
|
2686 |
|
woocommerce-sea.php
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
* Plugin Name: Product Feed PRO for WooCommerce
|
4 |
-
* Version: 8.4.
|
5 |
* Plugin URI: https://www.adtribes.io/support/?utm_source=wpadmin&utm_medium=plugin&utm_campaign=woosea_product_feed_pro
|
6 |
* Description: Configure and maintain your WooCommerce product feeds for Google Shopping, Facebook, Remarketing, Bing, Yandex, Comparison shopping websites and over a 100 channels more.
|
7 |
* Author: AdTribes.io
|
@@ -48,7 +48,7 @@ if (!defined('ABSPATH')) {
|
|
48 |
* Plugin versionnumber, please do not override.
|
49 |
* Define some constants
|
50 |
*/
|
51 |
-
define( 'WOOCOMMERCESEA_PLUGIN_VERSION', '8.4.
|
52 |
define( 'WOOCOMMERCESEA_PLUGIN_NAME', 'woocommerce-product-feed-pro' );
|
53 |
define( 'WOOCOMMERCESEA_PLUGIN_NAME_SHORT', 'woo-product-feed-pro' );
|
54 |
|
1 |
<?php
|
2 |
/**
|
3 |
* Plugin Name: Product Feed PRO for WooCommerce
|
4 |
+
* Version: 8.4.2
|
5 |
* Plugin URI: https://www.adtribes.io/support/?utm_source=wpadmin&utm_medium=plugin&utm_campaign=woosea_product_feed_pro
|
6 |
* Description: Configure and maintain your WooCommerce product feeds for Google Shopping, Facebook, Remarketing, Bing, Yandex, Comparison shopping websites and over a 100 channels more.
|
7 |
* Author: AdTribes.io
|
48 |
* Plugin versionnumber, please do not override.
|
49 |
* Define some constants
|
50 |
*/
|
51 |
+
define( 'WOOCOMMERCESEA_PLUGIN_VERSION', '8.4.2' );
|
52 |
define( 'WOOCOMMERCESEA_PLUGIN_NAME', 'woocommerce-product-feed-pro' );
|
53 |
define( 'WOOCOMMERCESEA_PLUGIN_NAME_SHORT', 'woo-product-feed-pro' );
|
54 |
|