From fb940f669abdf7f47eb3628d4d134a13f4d3c6ba Mon Sep 17 00:00:00 2001 From: Rajat Patel Date: Tue, 28 Nov 2023 18:34:57 +0530 Subject: [PATCH 1/2] Non-repeating schedules listed --- assets/js/wp-bulk-delete-admin.js | 9 +-------- includes/common-functions.php | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/assets/js/wp-bulk-delete-admin.js b/assets/js/wp-bulk-delete-admin.js index 730c42d..9e6100b 100644 --- a/assets/js/wp-bulk-delete-admin.js +++ b/assets/js/wp-bulk-delete-admin.js @@ -312,14 +312,7 @@ } }); - jQuery('.delete_frequency').on( 'change', function() { - var date_type = jQuery(this).val(); - if(date_type === 'not_repeat'){ - jQuery(".wpbd_schedule_name_wrap").hide(); - }else{ - jQuery(".wpbd_schedule_name_wrap").show(); - } - }); + jQuery(".wpbd_schedule_name_wrap").show(); }); jQuery(document).ready(function(){ diff --git a/includes/common-functions.php b/includes/common-functions.php index 4d2080c..5a61eee 100644 --- a/includes/common-functions.php +++ b/includes/common-functions.php @@ -160,10 +160,26 @@ function wpbd_save_scheduled_delete($data){ $delete_datetime = ( $data['delete_datetime'] ) ? $data['delete_datetime'] : ''; $delete_frequency = ( $data['delete_frequency'] ) ? $data['delete_frequency'] : 'not_repeat'; $cron_time = strtotime($delete_datetime) - (int) ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ); + $title = !empty( $data['schedule_name'] ) ? $data['schedule_name'] : __( 'Scheduled Delete - ', 'wp-bulk-delete' ) . ucfirst($data['delete_entity']); + if( $delete_frequency === 'not_repeat' ){ - $scheduled = wp_schedule_single_event( $cron_time, 'wpbd_run_scheduled_delete', array($data)); + $insert_args = array( + 'post_type' => 'wpbd_scheduled', + 'post_status' => 'publish', + 'post_title' => $title, + ); + + $insert = wp_insert_post( $insert_args, true ); + if ( is_wp_error( $insert ) ) { + return array( + 'status' => 0, + 'messages' => array( esc_html__( 'Something went wrong when saving scheduled delete.', 'wp-bulk-delete' ) ), + ); + } + $data['wpbd_scheduled_id'] = $insert; + update_post_meta( $insert, 'delete_options', $data ); + $scheduled = wp_schedule_single_event($cron_time, 'wpbd_run_scheduled_delete', array('post_id' => $insert ) ); } else { - $title = !empty( $data['schedule_name'] ) ? $data['schedule_name'] : __( 'Scheduled Delete - ', 'wp-bulk-delete' ) . ucfirst($data['delete_entity']); $insert_args = array( 'post_type' => 'wpbd_scheduled', 'post_status' => 'publish', From d4da0e76660b525e9d74dd25eae739cc9ebc7f78 Mon Sep 17 00:00:00 2001 From: "WordPress .pot File Generator" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 28 Nov 2023 13:09:56 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=94=84=20Generated=20POT=20File?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- languages/wp-bulk-delete.pot | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/languages/wp-bulk-delete.pot b/languages/wp-bulk-delete.pot index 14738b1..32cfd8c 100644 --- a/languages/wp-bulk-delete.pot +++ b/languages/wp-bulk-delete.pot @@ -9,7 +9,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2023-11-06T07:19:22+00:00\n" +"POT-Creation-Date: 2023-11-28T13:09:56+00:00\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "X-Generator: WP-CLI 2.9.0\n" "X-Domain: wp-bulk-delete\n" @@ -471,19 +471,20 @@ msgstr "" msgid "Attention: The server PHP timeout limit is set to " msgstr "" -#: includes/common-functions.php:166 +#: includes/common-functions.php:163 msgid "Scheduled Delete - " msgstr "" -#: includes/common-functions.php:177 +#: includes/common-functions.php:176 +#: includes/common-functions.php:193 msgid "Something went wrong when saving scheduled delete." msgstr "" -#: includes/common-functions.php:187 +#: includes/common-functions.php:203 msgid "Delete scheduled successfully." msgstr "" -#: includes/common-functions.php:192 +#: includes/common-functions.php:208 msgid "Error in scheduled delete." msgstr ""