Version Description
Fixed an issue with adding free shipping costs to feeds.
Download this release
Release Info
Developer | jorisverwater |
Plugin | Product Feed PRO for WooCommerce |
Version | 7.8.2 |
Comparing to | |
See all releases |
Code changes from version 7.8.1 to 7.8.2
- TODO.txt +1 -0
- classes/class-get-products.php +22 -15
- js/woosea_key.js +1 -1
- readme.txt +7 -1
- woocommerce-sea.php +3 -3
TODO.txt
CHANGED
@@ -5,6 +5,7 @@ Tutorial / Blog posts:
|
|
5 |
- Explain all the different fields/attributes that can be selected from the drop-downs
|
6 |
|
7 |
Priority issues:
|
|
|
8 |
- Add support for Polylang
|
9 |
- Make category path primary (Yoast) category
|
10 |
- Add possibility to copy feed configuration from one WooCommerce instance to the other instance
|
5 |
- Explain all the different fields/attributes that can be selected from the drop-downs
|
6 |
|
7 |
Priority issues:
|
8 |
+
- When free shipping remove other shipping costs and visa versa
|
9 |
- Add support for Polylang
|
10 |
- Make category path primary (Yoast) category
|
11 |
- Add possibility to copy feed configuration from one WooCommerce instance to the other instance
|
classes/class-get-products.php
CHANGED
@@ -785,7 +785,7 @@ class WooSEA_Get_Products {
|
|
785 |
|
786 |
// CLASS SHIPPING COSTS
|
787 |
if(isset($v->instance_settings[$class_cost_id])){
|
788 |
-
|
789 |
if (is_numeric($v->instance_settings[$class_cost_id])){
|
790 |
$shipping_cost = $v->instance_settings[$class_cost_id];
|
791 |
|
@@ -858,6 +858,7 @@ class WooSEA_Get_Products {
|
|
858 |
}
|
859 |
}
|
860 |
|
|
|
861 |
// FREE SHIPPING COSTS IF MINIMUM FEE REACHED
|
862 |
if($v->id == "free_shipping"){
|
863 |
$minimum_fee = $v->min_amount;
|
@@ -886,11 +887,13 @@ class WooSEA_Get_Products {
|
|
886 |
if ($price >= $minimum_fee){
|
887 |
$shipping_cost = 0;
|
888 |
$zone_details['price'] = trim($currency." ".$shipping_cost);
|
|
|
889 |
} else {
|
890 |
// There are no free shipping requirements
|
891 |
if($v->requires == ""){
|
892 |
$shipping_cost = 0;
|
893 |
$zone_details['price'] = trim($currency." ".$shipping_cost);
|
|
|
894 |
} else {
|
895 |
// No Free Shipping Allowed for this product
|
896 |
unset($zone_details);
|
@@ -951,24 +954,28 @@ class WooSEA_Get_Products {
|
|
951 |
}
|
952 |
|
953 |
// When Free shipping is allowed remove all other shipping costs
|
954 |
-
if(isset($currency)){
|
955 |
-
|
956 |
-
|
957 |
-
|
958 |
-
|
959 |
-
|
960 |
-
|
961 |
-
|
962 |
-
|
963 |
-
|
964 |
-
|
965 |
-
|
966 |
-
|
|
|
|
|
|
|
|
|
967 |
|
968 |
// Remove empty countries
|
969 |
foreach($shipping_arr as $k => $v){
|
970 |
if(empty($v['country'])){
|
971 |
-
|
972 |
}
|
973 |
}
|
974 |
return $shipping_arr;
|
785 |
|
786 |
// CLASS SHIPPING COSTS
|
787 |
if(isset($v->instance_settings[$class_cost_id])){
|
788 |
+
|
789 |
if (is_numeric($v->instance_settings[$class_cost_id])){
|
790 |
$shipping_cost = $v->instance_settings[$class_cost_id];
|
791 |
|
858 |
}
|
859 |
}
|
860 |
|
861 |
+
|
862 |
// FREE SHIPPING COSTS IF MINIMUM FEE REACHED
|
863 |
if($v->id == "free_shipping"){
|
864 |
$minimum_fee = $v->min_amount;
|
887 |
if ($price >= $minimum_fee){
|
888 |
$shipping_cost = 0;
|
889 |
$zone_details['price'] = trim($currency." ".$shipping_cost);
|
890 |
+
$zone_details['free'] = "yes";
|
891 |
} else {
|
892 |
// There are no free shipping requirements
|
893 |
if($v->requires == ""){
|
894 |
$shipping_cost = 0;
|
895 |
$zone_details['price'] = trim($currency." ".$shipping_cost);
|
896 |
+
$zone_details['free'] = "yes";
|
897 |
} else {
|
898 |
// No Free Shipping Allowed for this product
|
899 |
unset($zone_details);
|
954 |
}
|
955 |
|
956 |
// When Free shipping is allowed remove all other shipping costs
|
957 |
+
// if(isset($currency)){
|
958 |
+
// error_log("leeg maken!!");
|
959 |
+
// $free_check = $currency ." 0";
|
960 |
+
// } else {
|
961 |
+
// $free_check = "0";
|
962 |
+
// }
|
963 |
+
//
|
964 |
+
//
|
965 |
+
// //if(in_array($free_check, array_column($shipping_arr, 'price'))) { // search value in the array
|
966 |
+
// $free_check = "yes";
|
967 |
+
// if(in_array($free_check, array_column($shipping_arr, 'free'))) { // search value in the array
|
968 |
+
// foreach($shipping_arr as $k => $v) {
|
969 |
+
// if(!in_array($free_check, $v)){
|
970 |
+
// unset($shipping_arr[$k]);
|
971 |
+
// }
|
972 |
+
// }
|
973 |
+
// }
|
974 |
|
975 |
// Remove empty countries
|
976 |
foreach($shipping_arr as $k => $v){
|
977 |
if(empty($v['country'])){
|
978 |
+
unset($shipping_arr[$k]);
|
979 |
}
|
980 |
}
|
981 |
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=7.8.
|
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=7.8.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.3
|
8 |
-
Stable tag: 7.8.
|
9 |
|
10 |
== Description ==
|
11 |
|
@@ -312,6 +312,9 @@ Questions left or unanswered? Please do not hesitate to contact us at support@ad
|
|
312 |
|
313 |
=== Changelog ===
|
314 |
|
|
|
|
|
|
|
315 |
= 7.8.1 (2020-03-26) =
|
316 |
* Fixed an issue with category filters which occured after switching the filters and ruling order.
|
317 |
|
@@ -2486,6 +2489,9 @@ Questions left or unanswered? Please do not hesitate to contact us at support@ad
|
|
2486 |
|
2487 |
== Upgrade Notice ==
|
2488 |
|
|
|
|
|
|
|
2489 |
= 7.8.1 =
|
2490 |
Fixed an issue with category filters which occured after switching the filters and ruling order.
|
2491 |
|
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.3
|
8 |
+
Stable tag: 7.8.2
|
9 |
|
10 |
== Description ==
|
11 |
|
312 |
|
313 |
=== Changelog ===
|
314 |
|
315 |
+
= 7.8.2 (2020-03-29) =
|
316 |
+
* Fixed an issue with adding free shipping costs to feeds.
|
317 |
+
|
318 |
= 7.8.1 (2020-03-26) =
|
319 |
* Fixed an issue with category filters which occured after switching the filters and ruling order.
|
320 |
|
2489 |
|
2490 |
== Upgrade Notice ==
|
2491 |
|
2492 |
+
= 7.8.2 =
|
2493 |
+
Fixed an issue with adding free shipping costs to feeds.
|
2494 |
+
|
2495 |
= 7.8.1 =
|
2496 |
Fixed an issue with category filters which occured after switching the filters and ruling order.
|
2497 |
|
woocommerce-sea.php
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
* Plugin Name: Product Feed PRO for WooCommerce
|
4 |
-
* Version: 7.8.
|
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', '7.8.
|
52 |
define( 'WOOCOMMERCESEA_PLUGIN_NAME', 'woocommerce-product-feed-pro' );
|
53 |
define( 'WOOCOMMERCESEA_PLUGIN_NAME_SHORT', 'woo-product-feed-pro' );
|
54 |
|
@@ -4239,7 +4239,7 @@ function woosea_license_valid(){
|
|
4239 |
|
4240 |
if(!empty($license_information['license_key'])){
|
4241 |
$curl = curl_init();
|
4242 |
-
$url = "https://www.adtribes.io/check/license.php?key=$license_information[license_key]&email=$license_information[license_email]&domain=$domain&version=7.8.
|
4243 |
|
4244 |
curl_setopt_array($curl, array(
|
4245 |
CURLOPT_RETURNTRANSFER => 1,
|
1 |
<?php
|
2 |
/**
|
3 |
* Plugin Name: Product Feed PRO for WooCommerce
|
4 |
+
* Version: 7.8.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', '7.8.2' );
|
52 |
define( 'WOOCOMMERCESEA_PLUGIN_NAME', 'woocommerce-product-feed-pro' );
|
53 |
define( 'WOOCOMMERCESEA_PLUGIN_NAME_SHORT', 'woo-product-feed-pro' );
|
54 |
|
4239 |
|
4240 |
if(!empty($license_information['license_key'])){
|
4241 |
$curl = curl_init();
|
4242 |
+
$url = "https://www.adtribes.io/check/license.php?key=$license_information[license_key]&email=$license_information[license_email]&domain=$domain&version=7.8.2";
|
4243 |
|
4244 |
curl_setopt_array($curl, array(
|
4245 |
CURLOPT_RETURNTRANSFER => 1,
|