Merge pull request #42 from xylusthemes/non_repeat_listed

Non-repeating schedules listed
xylusthemes · Jan 19, 2024 · 48e32c9 · 48e32c9
2 parents cf5b805 + cb82387
commit 48e32c9
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git 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
@@ -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',

diff --git a/languages/wp-bulk-delete.pot b/languages/wp-bulk-delete.pot
@@ -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 ""