Skip to content

Allowed more option in feedzy free #1143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Soare-Robert-Daniel merged 8 commits into from
Aug 19, 2025
Merged

Allowed more option in feedzy free #1143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
748e878
feat: allow more option in feedzy free
girishpanchal30 Aug 14, 2025
76f8b29
add popup for filter condition upsell
girishpanchal30 Aug 14, 2025
493daae
fix: js lint
girishpanchal30 Aug 14, 2025
88829a7
fix: feed filter condition
girishpanchal30 Aug 18, 2025
1b58327
fix:e2e
girishpanchal30 Aug 18, 2025
40da05b
disabled pro options
girishpanchal30 Aug 19, 2025
703a2c5
fix: override styles added by #poststuff
Soare-Robert-Daniel Aug 19, 2025
d39a54f
chore: formatting
Soare-Robert-Daniel Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion css/settings.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2512,7 +2512,7 @@ li.draggable-item .components-panel__body-toggle.components-button{
padding: 24px 0;
}

.fz-condition-control.is-upsell {
.is-upsell {
opacity: 0.6;
}

Expand Down
5 changes: 4 additions & 1 deletion includes/admin/feedzy-rss-feeds-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,7 @@ function closeModal(e) {
jQuery(document).on('keyup', function (e) {
if (e.key === "Escape") closeModal();
});

});
</script>
<div id="feedzy-add-new-import" class="wp-core-ui feedzy-modal" style="display:none;">
Expand Down Expand Up @@ -726,8 +727,10 @@ class="button button-primary button-large"
font-weight: 500;
}

.feedzy-modal .modal-header h2 {
:is( .feedzy-modal, #poststuff ) .modal-header h2 {
font-size: 20px;
margin: 0;
padding: 0;
}

.feedzy-modal .close-modal {
Expand Down
7 changes: 3 additions & 4 deletions includes/admin/feedzy-rss-feeds-import.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,12 +563,11 @@ public function feedzy_import_feed_options() {
$inherited_thumbnail_id = ! empty( $this->free_settings['general']['default-thumbnail-id'] ) ? (int) $this->free_settings['general']['default-thumbnail-id'] : 0;
if ( feedzy_is_pro() ) {
$default_thumbnail_id = get_post_meta( $post->ID, 'default_thumbnail_id', true );
$import_schedule = array(
'fz_cron_schedule' => ! empty( $this->free_settings['general']['fz_cron_schedule'] ) ? $this->free_settings['general']['fz_cron_schedule'] : '',
);
}

$import_schedule = array(
'fz_cron_schedule' => ! empty( $this->free_settings['general']['fz_cron_schedule'] ) ? $this->free_settings['general']['fz_cron_schedule'] : '',
);

$fz_cron_schedule = get_post_meta( $post->ID, 'fz_cron_schedule', true );
if ( ! empty( $fz_cron_schedule ) ) {
$import_schedule['fz_cron_schedule'] = $fz_cron_schedule;
Expand Down
4 changes: 0 additions & 4 deletions includes/util/feedzy-rss-feeds-conditions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,10 +247,6 @@ public function is_condition_met( $condition, $value ): bool {
* @return bool True if the conditions are met, false otherwise.
*/
public function evaluate_conditions( $default_value, $attrs, $item, $feed_url, $index ): bool {
if ( feedzy_is_new() && ! feedzy_is_pro() ) {
return $default_value;
}

if ( ! isset( $attrs['filters'] ) || empty( $attrs['filters'] ) ) {
return $default_value;
}
Expand Down
20 changes: 8 additions & 12 deletions includes/views/import-metabox-edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@ class="dashicons dashicons-arrow-down-alt2"></span>
</div>
<!-- Sources configuration Step End -->
<!-- Filters Step Start -->
<div class="feedzy-accordion-item <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
<div class="feedzy-accordion-item">
<div class="feedzy-accordion-item__title" id="fz-import-filters">
<button type="button" class="feedzy-accordion-item__button">
<div class="feedzy-accordion__step-number help-text"><?php esc_html_e( 'Step 2', 'feedzy-rss-feeds' ); ?></div>
<div class="feedzy-accordion__step-title h2"><?php esc_html_e( 'Filters', 'feedzy-rss-feeds' ); ?><?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></div>
<div class="feedzy-accordion__step-title h2"><?php esc_html_e( 'Filters', 'feedzy-rss-feeds' ); ?></div>
<div class="feedzy-accordion__icon"><span class="dashicons dashicons-arrow-down-alt2"></span></div>
</button>
</div>
Expand All @@ -119,9 +119,6 @@ class="dashicons dashicons-arrow-down-alt2"></span>

<input type="hidden" name="feedzy_meta_data[filter_conditions]" id="feed-post-filters-conditions" value="<?php echo esc_attr( $filter_conditions ); ?>">
<div class="fz-conditions" id="fz-conditions"></div>
<?php if ( ! feedzy_is_pro() ) : ?>
<div class="fdz-upgrade-link"><span class="dashicons dashicons-lock"></span> <a href="<?php echo esc_url( feedzy_upgrade_link( 'filters', 'import' ) ); ?>" target="_blank"><?php _e( 'Upgrade to Unlock Advanced Filtering', 'feedzy-rss-feeds' ); ?> </a></div>
<?php endif; ?>
</div>
</div>
</div>
Expand Down Expand Up @@ -630,15 +627,14 @@ class="fz-switch-toggle" type="checkbox" value="yes"
</div>
</div>

<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'schedule-import-job', 'import' ) ); ?>
<div class="form-block form-block-two-column">
<div class="fz-left">
<h4 class="h4"><?php esc_html_e( 'Schedule', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
<h4 class="h4"><?php esc_html_e( 'Schedule', 'feedzy-rss-feeds' ); ?></h4>
</div>
<div class="fz-right">
<div class="fz-form-group">
<label class="form-label"><?php esc_html_e( 'Import schedule', 'feedzy-rss-feeds' ); ?></label>
<select id="fz-event-schedule" class="form-control fz-select-control" name="feedzy_meta_data[fz_cron_schedule]"<?php disabled( true, ! feedzy_is_pro() ); ?>>
<select id="fz-event-schedule" class="form-control fz-select-control" name="feedzy_meta_data[fz_cron_schedule]">
<?php
$save_schedule = ! empty( $import_schedule['fz_cron_schedule'] ) ? $import_schedule['fz_cron_schedule'] : '';

Expand All @@ -662,6 +658,7 @@ class="fz-switch-toggle" type="checkbox" value="yes"
}
?>
<option data-slug="<?php echo esc_attr( $slug ); ?>" value="<?php echo esc_attr( $slug ); ?>"<?php selected( $save_schedule, $slug ); ?>
<?php disabled( ! feedzy_is_pro() && 'daily' !== $slug ); ?>
>
<?php echo esc_html( $display_text ); ?>
</option>
Expand All @@ -674,11 +671,10 @@ class="fz-switch-toggle" type="checkbox" value="yes"
</div>
</div>

<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'fallback-image', 'import' ) ); ?>
<div class="form-block form-block-two-column">
<div class="fz-left">
<h4 class="h4">
<?php esc_html_e( 'Fallback Image', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?>
<?php esc_html_e( 'Fallback Image', 'feedzy-rss-feeds' ); ?>
</h4>
</div>
<div class="fz-right">
Expand Down
Loading
Loading