Version Description
Checked for compatibility with WooCommerce 4.0 Fixed a shipping issue for shipping zones with postcodes
Download this release
Release Info
Developer | jorisverwater |
Plugin | Product Feed PRO for WooCommerce |
Version | 7.7.2 |
Comparing to | |
See all releases |
Code changes from version 7.7.1 to 7.7.2
- classes/class-get-products.php +27 -20
- js/woosea_key.js +1 -1
- readme.txt +9 -1
- woocommerce-sea.php +4 -4
classes/class-get-products.php
CHANGED
@@ -674,10 +674,9 @@ class WooSEA_Get_Products {
|
|
674 |
|
675 |
// Only add shipping zones to the feed for specific feed country
|
676 |
$ship_found = strpos($zone_type->code, $code_from_config);
|
677 |
-
|
678 |
-
if($ship_found !== false){
|
679 |
//if($code_from_config == $zone_type->code){
|
680 |
-
|
681 |
if ($zone_type->type == "country"){
|
682 |
// This is a country shipping zone
|
683 |
$zone_details['country'] = $zone_type->code;
|
@@ -722,8 +721,8 @@ class WooSEA_Get_Products {
|
|
722 |
if(!$shipping_cost){
|
723 |
$shipping_cost = 0;
|
724 |
}
|
725 |
-
|
726 |
-
|
727 |
if((isset($project_config['AELIA'])) AND (!empty($GLOBALS['woocommerce-aelia-currencyswitcher'])) AND (get_option ('add_aelia_support') == "yes")){
|
728 |
|
729 |
if(!array_key_exists('base_currency', $project_config)){
|
@@ -787,7 +786,7 @@ class WooSEA_Get_Products {
|
|
787 |
|
788 |
// CLASS SHIPPING COSTS
|
789 |
if(isset($v->instance_settings[$class_cost_id])){
|
790 |
-
|
791 |
if (is_numeric($v->instance_settings[$class_cost_id])){
|
792 |
$shipping_cost = $v->instance_settings[$class_cost_id];
|
793 |
|
@@ -863,7 +862,7 @@ class WooSEA_Get_Products {
|
|
863 |
// FREE SHIPPING COSTS IF MINIMUM FEE REACHED
|
864 |
if($v->id == "free_shipping"){
|
865 |
$minimum_fee = $v->min_amount;
|
866 |
-
|
867 |
if(!array_key_exists('base_currency', $project_config)){
|
868 |
$currency = get_woocommerce_currency();
|
869 |
} else {
|
@@ -948,24 +947,32 @@ class WooSEA_Get_Products {
|
|
948 |
}
|
949 |
}
|
950 |
}
|
951 |
-
}
|
952 |
}
|
953 |
}
|
954 |
|
955 |
// When Free shipping is allowed remove all other shipping costs
|
956 |
-
if(isset($currency)){
|
957 |
-
$free_check = $currency ." 0";
|
958 |
-
} else {
|
959 |
-
$free_check = "0";
|
960 |
-
}
|
961 |
-
|
962 |
-
if(in_array($free_check, array_column($shipping_arr, 'price'))) { // search value in the array
|
963 |
-
foreach($shipping_arr as $k => $v) {
|
964 |
-
|
965 |
-
unset($shipping_arr[$k]);
|
966 |
-
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
967 |
}
|
968 |
-
}
|
|
|
969 |
return $shipping_arr;
|
970 |
}
|
971 |
|
674 |
|
675 |
// Only add shipping zones to the feed for specific feed country
|
676 |
$ship_found = strpos($zone_type->code, $code_from_config);
|
677 |
+
|
678 |
+
// if($ship_found !== false){
|
679 |
//if($code_from_config == $zone_type->code){
|
|
|
680 |
if ($zone_type->type == "country"){
|
681 |
// This is a country shipping zone
|
682 |
$zone_details['country'] = $zone_type->code;
|
721 |
if(!$shipping_cost){
|
722 |
$shipping_cost = 0;
|
723 |
}
|
724 |
+
|
725 |
+
// Do we need to convert the shipping costs with the Aelia Currency Switcher
|
726 |
if((isset($project_config['AELIA'])) AND (!empty($GLOBALS['woocommerce-aelia-currencyswitcher'])) AND (get_option ('add_aelia_support') == "yes")){
|
727 |
|
728 |
if(!array_key_exists('base_currency', $project_config)){
|
786 |
|
787 |
// CLASS SHIPPING COSTS
|
788 |
if(isset($v->instance_settings[$class_cost_id])){
|
789 |
+
|
790 |
if (is_numeric($v->instance_settings[$class_cost_id])){
|
791 |
$shipping_cost = $v->instance_settings[$class_cost_id];
|
792 |
|
862 |
// FREE SHIPPING COSTS IF MINIMUM FEE REACHED
|
863 |
if($v->id == "free_shipping"){
|
864 |
$minimum_fee = $v->min_amount;
|
865 |
+
|
866 |
if(!array_key_exists('base_currency', $project_config)){
|
867 |
$currency = get_woocommerce_currency();
|
868 |
} else {
|
947 |
}
|
948 |
}
|
949 |
}
|
950 |
+
// }
|
951 |
}
|
952 |
}
|
953 |
|
954 |
// When Free shipping is allowed remove all other shipping costs
|
955 |
+
// if(isset($currency)){
|
956 |
+
// $free_check = $currency ." 0";
|
957 |
+
// } else {
|
958 |
+
// $free_check = "0";
|
959 |
+
// }
|
960 |
+
//
|
961 |
+
// if(in_array($free_check, array_column($shipping_arr, 'price'))) { // search value in the array
|
962 |
+
// foreach($shipping_arr as $k => $v) {
|
963 |
+
// if(!in_array($free_check, $v)){
|
964 |
+
// unset($shipping_arr[$k]);
|
965 |
+
// }
|
966 |
+
// }
|
967 |
+
// }
|
968 |
+
|
969 |
+
// Remove empty countries
|
970 |
+
foreach($shipping_arr as $k => $v){
|
971 |
+
if(empty($v['country'])){
|
972 |
+
unset($shipping_arr[$k]);
|
973 |
}
|
974 |
+
}
|
975 |
+
|
976 |
return $shipping_arr;
|
977 |
}
|
978 |
|
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.7.
|
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.7.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.7.
|
9 |
|
10 |
== Description ==
|
11 |
|
@@ -312,6 +312,10 @@ Questions left or unanswered? Please do not hesitate to contact us at support@ad
|
|
312 |
|
313 |
=== Changelog ===
|
314 |
|
|
|
|
|
|
|
|
|
315 |
= 7.7.1 (2020-03-10) =
|
316 |
* Added support for filters and rules on product review title's
|
317 |
|
@@ -2455,6 +2459,10 @@ Questions left or unanswered? Please do not hesitate to contact us at support@ad
|
|
2455 |
|
2456 |
== Upgrade Notice ==
|
2457 |
|
|
|
|
|
|
|
|
|
2458 |
= 7.7.1 =
|
2459 |
Added support for filters and rules on product review title's
|
2460 |
|
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.7.2
|
9 |
|
10 |
== Description ==
|
11 |
|
312 |
|
313 |
=== Changelog ===
|
314 |
|
315 |
+
= 7.7.2 (2020-03-11) =
|
316 |
+
* Checked for compatibility with WooCommerce 4.0
|
317 |
+
* Fixed a shipping issue for shipping zones with postcodes
|
318 |
+
|
319 |
= 7.7.1 (2020-03-10) =
|
320 |
* Added support for filters and rules on product review title's
|
321 |
|
2459 |
|
2460 |
== Upgrade Notice ==
|
2461 |
|
2462 |
+
= 7.7.2 =
|
2463 |
+
Checked for compatibility with WooCommerce 4.0
|
2464 |
+
Fixed a shipping issue for shipping zones with postcodes
|
2465 |
+
|
2466 |
= 7.7.1 =
|
2467 |
Added support for filters and rules on product review title's
|
2468 |
|
woocommerce-sea.php
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
* Plugin Name: Product Feed PRO for WooCommerce
|
4 |
-
* Version: 7.7.
|
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
|
@@ -17,7 +17,7 @@
|
|
17 |
* Domain Path: /languages
|
18 |
*
|
19 |
* WC requires at least: 3.0
|
20 |
-
* WC tested up to:
|
21 |
*
|
22 |
* Product Feed PRO for WooCommerce is free software: you can redistribute it and/or modify
|
23 |
* it under the terms of the GNU General Public License as published by
|
@@ -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.7.
|
52 |
define( 'WOOCOMMERCESEA_PLUGIN_NAME', 'woocommerce-product-feed-pro' );
|
53 |
define( 'WOOCOMMERCESEA_PLUGIN_NAME_SHORT', 'woo-product-feed-pro' );
|
54 |
|
@@ -4215,7 +4215,7 @@ function woosea_license_valid(){
|
|
4215 |
|
4216 |
if(!empty($license_information['license_key'])){
|
4217 |
$curl = curl_init();
|
4218 |
-
$url = "https://www.adtribes.io/check/license.php?key=$license_information[license_key]&email=$license_information[license_email]&domain=$domain&version=7.7.
|
4219 |
|
4220 |
curl_setopt_array($curl, array(
|
4221 |
CURLOPT_RETURNTRANSFER => 1,
|
1 |
<?php
|
2 |
/**
|
3 |
* Plugin Name: Product Feed PRO for WooCommerce
|
4 |
+
* Version: 7.7.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
|
17 |
* Domain Path: /languages
|
18 |
*
|
19 |
* WC requires at least: 3.0
|
20 |
+
* WC tested up to: 4.0
|
21 |
*
|
22 |
* Product Feed PRO for WooCommerce is free software: you can redistribute it and/or modify
|
23 |
* it under the terms of the GNU General Public License as published by
|
48 |
* Plugin versionnumber, please do not override.
|
49 |
* Define some constants
|
50 |
*/
|
51 |
+
define( 'WOOCOMMERCESEA_PLUGIN_VERSION', '7.7.2' );
|
52 |
define( 'WOOCOMMERCESEA_PLUGIN_NAME', 'woocommerce-product-feed-pro' );
|
53 |
define( 'WOOCOMMERCESEA_PLUGIN_NAME_SHORT', 'woo-product-feed-pro' );
|
54 |
|
4215 |
|
4216 |
if(!empty($license_information['license_key'])){
|
4217 |
$curl = curl_init();
|
4218 |
+
$url = "https://www.adtribes.io/check/license.php?key=$license_information[license_key]&email=$license_information[license_email]&domain=$domain&version=7.7.2";
|
4219 |
|
4220 |
curl_setopt_array($curl, array(
|
4221 |
CURLOPT_RETURNTRANSFER => 1,
|