Version Description
(2019-11-24) = * Fix: Hide google taxonomy dropdown if attribute selected * Fix: Autocomplete attribute value * Fix: PHP count() warning on feed edit page
Download this release
Release Info
Developer | wahid0003 |
Plugin | CTX Feed – WooCommerce Product Feed Manager Plugin |
Version | 3.1.52 |
Comparing to | |
See all releases |
Code changes from version 3.1.51 to 3.1.52
- README.txt +6 -1
- admin/partials/templates/custom_edit-feed.php +1 -1
- admin/partials/woo-feed-admin-display.php +1 -1
- admin/partials/woo-feed-edit-template.php +20 -41
- includes/helper.php +29 -13
- libs/WebAppick/AppServices/License.php +1 -1
- woo-feed.php +2 -2
README.txt
CHANGED
@@ -5,7 +5,7 @@ Tags:woocommerce,google product feed,facebook product feed,woocommerce product f
|
|
5 |
Requires at least: 3.6
|
6 |
Tested Up To: 5.4-alpha-46743
|
7 |
Requires PHP: 5.6
|
8 |
-
Stable tag: 3.1.
|
9 |
License: GPLv2 or later
|
10 |
License URI: http://www.gnu.org/licenses/gpl-2.0.html
|
11 |
|
@@ -305,6 +305,11 @@ Using pro version:
|
|
305 |
|
306 |
== Changelog ==
|
307 |
|
|
|
|
|
|
|
|
|
|
|
308 |
= 3.1.51 (2019-11-21) =
|
309 |
* Fix duplicate id cache
|
310 |
* Tweak connecxity feed class
|
5 |
Requires at least: 3.6
|
6 |
Tested Up To: 5.4-alpha-46743
|
7 |
Requires PHP: 5.6
|
8 |
+
Stable tag: 3.1.52
|
9 |
License: GPLv2 or later
|
10 |
License URI: http://www.gnu.org/licenses/gpl-2.0.html
|
11 |
|
305 |
|
306 |
== Changelog ==
|
307 |
|
308 |
+
= 3.1.52 (2019-11-24) =
|
309 |
+
* Fix: Hide google taxonomy dropdown if attribute selected
|
310 |
+
* Fix: Autocomplete attribute value
|
311 |
+
* Fix: PHP count() warning on feed edit page
|
312 |
+
|
313 |
= 3.1.51 (2019-11-21) =
|
314 |
* Fix duplicate id cache
|
315 |
* Tweak connecxity feed class
|
admin/partials/templates/custom_edit-feed.php
CHANGED
@@ -25,7 +25,7 @@ if(!isset($feedRules['ftporsftp'])){
|
|
25 |
</table>
|
26 |
<br/>
|
27 |
|
28 |
-
<form action="" name="feed" id="updatefeed" method="post" autocomplete="
|
29 |
<input type="hidden" name="feed_name" value="<?php echo $fname; ?>">
|
30 |
<input type="hidden" name="feed_id" value="<?php echo $feedId; ?>">
|
31 |
<?php wp_nonce_field('wf_edit_feed'); ?>
|
25 |
</table>
|
26 |
<br/>
|
27 |
|
28 |
+
<form action="" name="feed" id="updatefeed" method="post" autocomplete="off">
|
29 |
<input type="hidden" name="feed_name" value="<?php echo $fname; ?>">
|
30 |
<input type="hidden" name="feed_id" value="<?php echo $feedId; ?>">
|
31 |
<?php wp_nonce_field('wf_edit_feed'); ?>
|
admin/partials/woo-feed-admin-display.php
CHANGED
@@ -23,7 +23,7 @@ $product->load_attributes();
|
|
23 |
<h2><?php _e('WooCommerce Product Feed', 'woo-feed'); ?></h2>
|
24 |
<?php echo WPFFWMessage()->infoMessage1(); ?>
|
25 |
|
26 |
-
<form action="" id="generateFeed" class="generateFeed" method="post" autocomplete="
|
27 |
<?php wp_nonce_field('woo_feed_form_nonce'); ?>
|
28 |
<table class="widefat fixed">
|
29 |
<thead>
|
23 |
<h2><?php _e('WooCommerce Product Feed', 'woo-feed'); ?></h2>
|
24 |
<?php echo WPFFWMessage()->infoMessage1(); ?>
|
25 |
|
26 |
+
<form action="" id="generateFeed" class="generateFeed" method="post" autocomplete="off">
|
27 |
<?php wp_nonce_field('woo_feed_form_nonce'); ?>
|
28 |
<table class="widefat fixed">
|
29 |
<thead>
|
admin/partials/woo-feed-edit-template.php
CHANGED
@@ -32,7 +32,7 @@ $AttributesDropdown = $feedRules['provider'] . "AttributesDropdown";
|
|
32 |
<h2><?php _e('WooCommerce Product Feed', 'woo-feed'); ?></h2>
|
33 |
<?php echo WPFFWMessage()->infoMessage1(); ?>
|
34 |
|
35 |
-
<form action="" name="feed" method="post" id="updatefeed" autocomplete="
|
36 |
<input type="hidden" name="feed_name" value="<?php echo $fname; ?>">
|
37 |
<input type="hidden" name="feed_id" value="<?php echo $feedId; ?>">
|
38 |
<?php wp_nonce_field('wf_edit_feed'); ?>
|
@@ -194,15 +194,15 @@ $AttributesDropdown = $feedRules['provider'] . "AttributesDropdown";
|
|
194 |
</select>
|
195 |
</td>
|
196 |
<td>
|
197 |
-
<select <?php echo ($type[$merchant] == "attribute") ? '' : 'style=" display: none;"'; ?>
|
198 |
<?php echo $product->attributeDropdown(esc_attr($wooAttributes[$merchant])); ?>
|
199 |
</select>
|
200 |
<?php if( in_array( $feedRules['provider'], array( 'google', 'facebook', 'pinterest') ) && $mAttribute=="current_category") { ?>
|
201 |
-
<span class="wf_default wf_attributes">
|
202 |
-
|
203 |
-
|
204 |
-
|
205 |
-
|
206 |
<span style="font-size:x-small;"><a style="color: red" href="http://webappick.helpscoutdocs.com/article/19-how-to-map-store-category-with-merchant-category" target="_blank">Learn More..</a></span>
|
207 |
<?php }else{ ?>
|
208 |
<input <?php echo ($type[$merchant] == "pattern") ? '' : 'style=" display: none;"'; ?>autocomplete="off" class="wf_default wf_attributes " type="text" name="default[]" value="<?php echo esc_attr( $default[$merchant] ); ?>"/>
|
@@ -212,41 +212,20 @@ $AttributesDropdown = $feedRules['provider'] . "AttributesDropdown";
|
|
212 |
<input type="text" name="suffix[]" value="<?php echo stripslashes($suffix[$merchant]); ?>" autocomplete="off" class="wf_ps"/>
|
213 |
</td>
|
214 |
<td>
|
215 |
-
<select name="output_type[<?php echo $counter; ?>][]" class="outputType wfnoempty" <?php echo (count($outputType[$counter]) > 1) ? 'multiple="multiple"' : '';
|
216 |
-
|
217 |
-
|
218 |
-
|
219 |
-
|
220 |
-
|
221 |
-
|
222 |
-
|
223 |
-
|
224 |
-
|
225 |
-
|
226 |
-
|
227 |
-
</option>
|
228 |
-
<option <?php echo (in_array('5', $outputType[$counter])) ? 'selected="selected"' : ''; ?>
|
229 |
-
value="5">Integer
|
230 |
-
</option>
|
231 |
-
<option <?php echo (in_array('6', $outputType[$counter])) ? 'selected="selected"' : ''; ?>
|
232 |
-
value="6">Price
|
233 |
-
</option>
|
234 |
-
<option <?php echo (in_array('7', $outputType[$counter])) ? 'selected="selected"' : ''; ?>
|
235 |
-
value="7">Remove Space
|
236 |
-
</option>
|
237 |
-
<option <?php echo (in_array('10', $outputType[$counter])) ? 'selected="selected"' : ''; ?>
|
238 |
-
value="10">Remove ShortCodes
|
239 |
-
</option>
|
240 |
-
<option <?php echo (in_array('9', $outputType[$counter])) ? 'selected="selected"' : ''; ?>
|
241 |
-
value="9">Remove Special Character
|
242 |
-
</option>
|
243 |
-
<option <?php echo (in_array('8', $outputType[$counter])) ? 'selected="selected"' : ''; ?>
|
244 |
-
value="8">CDATA
|
245 |
-
</option>
|
246 |
-
</select>
|
247 |
<i class="dashicons dashicons-editor-expand expandType"></i>
|
248 |
-
<i style="display: none;"
|
249 |
-
class="dashicons dashicons-editor-contract contractType"></i>
|
250 |
</td>
|
251 |
<td>
|
252 |
<input type="text" name="limit[]" value="<?php echo esc_attr($limit[$merchant]); ?>" autocomplete="off" class="wf_ps"/>
|
32 |
<h2><?php _e('WooCommerce Product Feed', 'woo-feed'); ?></h2>
|
33 |
<?php echo WPFFWMessage()->infoMessage1(); ?>
|
34 |
|
35 |
+
<form action="" name="feed" method="post" id="updatefeed" autocomplete="off">
|
36 |
<input type="hidden" name="feed_name" value="<?php echo $fname; ?>">
|
37 |
<input type="hidden" name="feed_id" value="<?php echo $feedId; ?>">
|
38 |
<?php wp_nonce_field('wf_edit_feed'); ?>
|
194 |
</select>
|
195 |
</td>
|
196 |
<td>
|
197 |
+
<select <?php echo ($type[$merchant] == "attribute") ? '' : 'style=" display: none;" '; ?>name="attributes[]" class="wf_attr wf_attributes">
|
198 |
<?php echo $product->attributeDropdown(esc_attr($wooAttributes[$merchant])); ?>
|
199 |
</select>
|
200 |
<?php if( in_array( $feedRules['provider'], array( 'google', 'facebook', 'pinterest') ) && $mAttribute=="current_category") { ?>
|
201 |
+
<span <?php echo ($type[$merchant] == "pattern") ? '' : 'style=" display: none;"'; ?>class="wf_default wf_attributes">
|
202 |
+
<select name="default[]" id="googleTaxonomyId">
|
203 |
+
<?php echo $dropDown->googleTaxonomy( esc_attr($default[$merchant]) ); ?>
|
204 |
+
</select>
|
205 |
+
</span>
|
206 |
<span style="font-size:x-small;"><a style="color: red" href="http://webappick.helpscoutdocs.com/article/19-how-to-map-store-category-with-merchant-category" target="_blank">Learn More..</a></span>
|
207 |
<?php }else{ ?>
|
208 |
<input <?php echo ($type[$merchant] == "pattern") ? '' : 'style=" display: none;"'; ?>autocomplete="off" class="wf_default wf_attributes " type="text" name="default[]" value="<?php echo esc_attr( $default[$merchant] ); ?>"/>
|
212 |
<input type="text" name="suffix[]" value="<?php echo stripslashes($suffix[$merchant]); ?>" autocomplete="off" class="wf_ps"/>
|
213 |
</td>
|
214 |
<td>
|
215 |
+
<select name="output_type[<?php echo $counter; ?>][]" class="outputType wfnoempty" <?php echo (is_array( $outputType[$counter] ) && count($outputType[$counter]) > 1) ? 'multiple="multiple"' : ''; ?>><?php
|
216 |
+
foreach ( woo_feed_get_field_output_type_options() as $key => $option ) {
|
217 |
+
if ( isset( $outputType[$counter] ) ) {
|
218 |
+
if ( is_array( $outputType[$counter] ) ) {
|
219 |
+
$selected = selected( in_array( $key, $outputType[$counter] ), true, false );
|
220 |
+
} else {
|
221 |
+
$selected = selected( $outputType[$counter], $key, false );
|
222 |
+
}
|
223 |
+
} else $selected = selected( '1', $key, false );
|
224 |
+
printf( '<option value="%s"%s>%s</option>', $key, $selected, $option );
|
225 |
+
}
|
226 |
+
?></select>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
227 |
<i class="dashicons dashicons-editor-expand expandType"></i>
|
228 |
+
<i style="display: none;" class="dashicons dashicons-editor-contract contractType"></i>
|
|
|
229 |
</td>
|
230 |
<td>
|
231 |
<input type="text" name="limit[]" value="<?php echo esc_attr($limit[$merchant]); ?>" autocomplete="off" class="wf_ps"/>
|
includes/helper.php
CHANGED
@@ -3,7 +3,7 @@
|
|
3 |
* Helper Functions
|
4 |
* @package WooFeed
|
5 |
* @subpackage WooFeed_Helper_Functions
|
6 |
-
* @version 1.0.
|
7 |
* @since WooFeed 3.1.40
|
8 |
* @author KD <mhamudul.hk@gmail.com>
|
9 |
* @copyright WebAppick
|
@@ -80,9 +80,9 @@ if( ! function_exists( 'woo_feed_wc_version_check' ) ) {
|
|
80 |
*/
|
81 |
function woo_feed_wc_version_check( $version = '3.0' ) {
|
82 |
// calling this function too early (before wc loaded) will not give correct output
|
83 |
-
|
84 |
if ( array_key_exists('woocommerce/woocommerce.php',$plugins)) {
|
85 |
-
|
86 |
if ( version_compare( $currentVersion, $version, ">=" ) ) {
|
87 |
return true;
|
88 |
}
|
@@ -178,9 +178,9 @@ if( ! function_exists( 'woo_feed_get_variable_visibility_options' ) ) {
|
|
178 |
*/
|
179 |
function woo_feed_get_variable_visibility_options(){
|
180 |
return apply_filters( 'woo_feed_variable_visibility_options', [
|
181 |
-
'n'
|
182 |
-
'y'
|
183 |
-
'both'
|
184 |
] );
|
185 |
}
|
186 |
}
|
@@ -191,9 +191,9 @@ if( ! function_exists( 'woo_feed_get_variable_price_options' ) ) {
|
|
191 |
*/
|
192 |
function woo_feed_get_variable_price_options(){
|
193 |
return apply_filters( 'woo_feed_variable_price_options', [
|
194 |
-
'first' =>
|
195 |
-
'max' =>
|
196 |
-
'min' =>
|
197 |
] );
|
198 |
}
|
199 |
}
|
@@ -204,10 +204,26 @@ if( ! function_exists( 'woo_feed_get_variable_quantity_options' ) ) {
|
|
204 |
*/
|
205 |
function woo_feed_get_variable_quantity_options(){
|
206 |
return apply_filters( 'woo_feed_variable_quantity_options', [
|
207 |
-
'first' =>
|
208 |
-
'max' =>
|
209 |
-
'min' =>
|
210 |
-
'sum' =>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
211 |
] );
|
212 |
}
|
213 |
}
|
3 |
* Helper Functions
|
4 |
* @package WooFeed
|
5 |
* @subpackage WooFeed_Helper_Functions
|
6 |
+
* @version 1.0.1
|
7 |
* @since WooFeed 3.1.40
|
8 |
* @author KD <mhamudul.hk@gmail.com>
|
9 |
* @copyright WebAppick
|
80 |
*/
|
81 |
function woo_feed_wc_version_check( $version = '3.0' ) {
|
82 |
// calling this function too early (before wc loaded) will not give correct output
|
83 |
+
$plugins=get_plugins();
|
84 |
if ( array_key_exists('woocommerce/woocommerce.php',$plugins)) {
|
85 |
+
$currentVersion=$plugins['woocommerce/woocommerce.php']['Version'];
|
86 |
if ( version_compare( $currentVersion, $version, ">=" ) ) {
|
87 |
return true;
|
88 |
}
|
178 |
*/
|
179 |
function woo_feed_get_variable_visibility_options(){
|
180 |
return apply_filters( 'woo_feed_variable_visibility_options', [
|
181 |
+
'n' => esc_html__( 'Only Variable Products', 'woo-feed' ),
|
182 |
+
'y' => esc_html__( 'Only Product Variations', 'woo-feed' ),
|
183 |
+
'both' => esc_html__( 'Both Variable Products and Product Variations', 'woo-feed' ),
|
184 |
] );
|
185 |
}
|
186 |
}
|
191 |
*/
|
192 |
function woo_feed_get_variable_price_options(){
|
193 |
return apply_filters( 'woo_feed_variable_price_options', [
|
194 |
+
'first' => esc_html__( 'First Variation Price', 'woo-feed' ),
|
195 |
+
'max' => esc_html__( 'Max Variation Price', 'woo-feed' ),
|
196 |
+
'min' => esc_html__( 'Min Variation Price', 'woo-feed' ),
|
197 |
] );
|
198 |
}
|
199 |
}
|
204 |
*/
|
205 |
function woo_feed_get_variable_quantity_options(){
|
206 |
return apply_filters( 'woo_feed_variable_quantity_options', [
|
207 |
+
'first' => esc_html__( 'First Variation Quantity', 'woo-feed' ),
|
208 |
+
'max' => esc_html__( 'Max Variation Quantity', 'woo-feed' ),
|
209 |
+
'min' => esc_html__( 'Min Variation Quantity', 'woo-feed' ),
|
210 |
+
'sum' => esc_html__( 'Sum of Variation Quantity', 'woo-feed' ),
|
211 |
+
] );
|
212 |
+
}
|
213 |
+
}
|
214 |
+
if( ! function_exists( 'woo_feed_get_field_output_type_options' ) ) {
|
215 |
+
function woo_feed_get_field_output_type_options() {
|
216 |
+
return apply_filters( 'woo_feed_field_output_options', [
|
217 |
+
1 => esc_html__( 'Default', 'woo-feed' ),
|
218 |
+
2 => esc_html__( 'Strip Tags', 'woo-feed' ),
|
219 |
+
3 => esc_html__( 'UTF-8 Encode', 'woo-feed' ),
|
220 |
+
4 => esc_html__( 'htmlentities', 'woo-feed' ),
|
221 |
+
5 => esc_html__( 'Integer', 'woo-feed' ),
|
222 |
+
6 => esc_html__( 'Price', 'woo-feed' ),
|
223 |
+
7 => esc_html__( 'Remove Space', 'woo-feed' ),
|
224 |
+
8 => esc_html__( 'CDATA', 'woo-feed' ),
|
225 |
+
9 => esc_html__( 'Remove Special Character', 'woo-feed' ),
|
226 |
+
10 => esc_html__( 'Remove ShortCodes', 'woo-feed' ),
|
227 |
] );
|
228 |
}
|
229 |
}
|
libs/WebAppick/AppServices/License.php
CHANGED
@@ -209,7 +209,7 @@ class License {
|
|
209 |
<p><?php
|
210 |
printf( esc_html__( 'Active %s by your license key to get professional support and automatic update from your WordPress dashboard.', 'webappick' ), '<strong>'.$this->client->getName().'</strong>' );
|
211 |
?></p>
|
212 |
-
<form method="post" action="<?php $this->formActionUrl(); ?>" novalidate="novalidate" spellcheck="false">
|
213 |
<input type="hidden" name="_action" value="<?php echo $license['status']; ?>">
|
214 |
<div class="license-input-fields">
|
215 |
<div class="license-input-key">
|
209 |
<p><?php
|
210 |
printf( esc_html__( 'Active %s by your license key to get professional support and automatic update from your WordPress dashboard.', 'webappick' ), '<strong>'.$this->client->getName().'</strong>' );
|
211 |
?></p>
|
212 |
+
<form method="post" action="<?php $this->formActionUrl(); ?>" novalidate="novalidate" spellcheck="false" autocomplete="off">
|
213 |
<input type="hidden" name="_action" value="<?php echo $license['status']; ?>">
|
214 |
<div class="license-input-fields">
|
215 |
<div class="license-input-key">
|
woo-feed.php
CHANGED
@@ -15,7 +15,7 @@
|
|
15 |
* Plugin Name: WooCommerce Product Feed
|
16 |
* Plugin URI: https://webappick.com/
|
17 |
* Description: This plugin generate WooCommerce product feed for Shopping Engines like Google Shopping,Facebook Product Feed,eBay,Amazon,Idealo and many more..
|
18 |
-
* Version: 3.1.
|
19 |
* Author: WebAppick
|
20 |
* Author URI: https://webappick.com/
|
21 |
* License: GPL v2
|
@@ -41,7 +41,7 @@ if( ! defined( 'WOO_FEED_VERSION' ) ) {
|
|
41 |
* Plugin Version
|
42 |
* @var string
|
43 |
*/
|
44 |
-
define( 'WOO_FEED_VERSION', '3.1.
|
45 |
}
|
46 |
if( ! defined( 'WOO_FEED_FREE_FILE') ) {
|
47 |
/**
|
15 |
* Plugin Name: WooCommerce Product Feed
|
16 |
* Plugin URI: https://webappick.com/
|
17 |
* Description: This plugin generate WooCommerce product feed for Shopping Engines like Google Shopping,Facebook Product Feed,eBay,Amazon,Idealo and many more..
|
18 |
+
* Version: 3.1.52
|
19 |
* Author: WebAppick
|
20 |
* Author URI: https://webappick.com/
|
21 |
* License: GPL v2
|
41 |
* Plugin Version
|
42 |
* @var string
|
43 |
*/
|
44 |
+
define( 'WOO_FEED_VERSION', '3.1.52' );
|
45 |
}
|
46 |
if( ! defined( 'WOO_FEED_FREE_FILE') ) {
|
47 |
/**
|