From 860b59e5185d677daaea14931caf9415632d81b1 Mon Sep 17 00:00:00 2001
From: Linkon Miyan <rudlinkon@gmail.com>
Date: Thu, 5 Aug 2021 20:00:33 +0600
Subject: [PATCH 01/22] Added elementor update button sub menu and tab and ajax
 trigger.

---
 assets/js/elementor-editor.js | 26 ++++++++++++++++++
 includes/Admin.php            | 50 +++++++++++++++++++++++++++++++++++
 includes/Assets.php           |  4 +++
 3 files changed, 80 insertions(+)
 create mode 100644 assets/js/elementor-editor.js

diff --git a/assets/js/elementor-editor.js b/assets/js/elementor-editor.js
new file mode 100644
index 00000000..7ae0b5f8
--- /dev/null
+++ b/assets/js/elementor-editor.js
@@ -0,0 +1,26 @@
+(function ($) {
+    var wpsp_menu = $('#elementor-panel-footer-sub-menu-item-wpsp'),
+        modal = $('#schedulepress-elementor-modal');
+
+    $(window).on('load', function () {
+        $('.elementor-panel-footer-sub-menu-wrapper .elementor-panel-footer-sub-menu').append(wpsp_menu);
+    });
+
+    $(document).on('click', '#elementor-panel-footer-sub-menu-item-wpsp', function (e) {
+        e.preventDefault();
+        modal.fadeIn();
+    }).on('click', '.elementor-templates-modal__header__close > i, #schedulepress-elementor-modal', function (e) {
+        e.preventDefault();
+        if (e.target === this) {
+            modal.fadeOut();
+        }
+    }).on('click', 'button.wpsp-el-form-submit', function (e) {
+        e.preventDefault();
+        var $form = modal.find('form'),
+            url = $form.attr('action'),
+            data = $form.serialize()
+        $.post(url, data, function (data) {
+            $(".wpsp-el-result").html(data);
+        });
+    })
+})(jQuery);
\ No newline at end of file
diff --git a/includes/Admin.php b/includes/Admin.php
index cc02192d..e024e032 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -16,6 +16,8 @@ public function __construct()
         $this->usage_tracker();
         $this->load_dashboard_widgets();
         $this->load_settings();
+
+        add_action('elementor/editor/footer', [$this, 'schedulepress_el_tab'], 100 );
     }
     public function load_plugin_menu_pages()
     {
@@ -185,4 +187,52 @@ public function load_settings()
     {
         new Admin\Settings(WPSP_SETTINGS_SLUG, WPSP_SETTINGS_NAME);
     }
+
+    public function schedulepress_el_tab () { ?>
+	    <div class="dialog-widget dialog-lightbox-widget dialog-type-buttons dialog-type-lightbox elementor-templates-modal"
+		    id="schedulepress-elementor-modal" style="display: none;">
+		    <div class="dialog-widget-content dialog-lightbox-widget-content"
+		         style="top: 50%;left: 50%;transform: translate(-50%, -50%);">
+			    <div class="dialog-header dialog-lightbox-header">
+				    <div class="elementor-templates-modal__header">
+					    <div class="elementor-templates-modal__header__logo-area">
+						    <div class="elementor-templates-modal__header__logo">
+								<span class="elementor-templates-modal__header__logo__icon-wrapper e-logo-wrapper">
+									<i class="eicon-elementor"></i>
+								</span>
+							    <span class="elementor-templates-modal__header__logo__title"><?php esc_html_e( 'SchedulePress', 'wp-scheduled-posts' ); ?></span>
+						    </div>
+					    </div>
+					    <div class="elementor-templates-modal__header__menu-area"></div>
+					    <div class="elementor-templates-modal__header__items-area">
+						    <div class="elementor-templates-modal__header__close elementor-templates-modal__header__close--normal elementor-templates-modal__header__item">
+							    <i class="eicon-close" aria-hidden="true" title="Close"></i>
+							    <span class="elementor-screen-only"><?php esc_html_e( 'Close', 'wp-scheduled-posts' ); ?></span>
+						    </div>
+						    <div id="elementor-template-library-header-tools"></div>
+					    </div>
+				    </div>
+			    </div>
+			    <div class="dialog-message dialog-lightbox-message">
+				    <div class="dialog-content dialog-lightbox-content">
+                        <form action="<?php echo admin_url( 'admin-ajax.php' ); ?>" method="post">
+	                        <?php wp_nonce_field( 'wpsp-el-editor', 'wpsp-el-editor' ); ?>
+                            <input type="hidden" name="action" value="wpsp-el-form">
+                            <input type="text" name="text">
+                        </form>
+                        <div class="wpsp-el-result"></div>
+                    </div>
+				    <div class="dialog-loading dialog-lightbox-loading"></div>
+			    </div>
+			    <div class="dialog-buttons-wrapper dialog-lightbox-buttons-wrapper" style="display: flex;">
+				    <button class="elementor-button elementor-button-success dialog-button wpsp-el-form-submit"><?php esc_html_e( 'Apply', 'wp-scheduled-posts' ); ?></button>
+			    </div>
+		    </div>
+	    </div>
+        <div id="elementor-panel-footer-sub-menu-item-wpsp" class="elementor-panel-footer-sub-menu-item">
+            <i class="elementor-icon eicon-folder" aria-hidden="true"></i>
+            <span class="elementor-title"><?php esc_html_e( 'WPSP', 'wp-scheduled-posts' ); ?></span>
+        </div>
+<?php
+    }
 }
diff --git a/includes/Assets.php b/includes/Assets.php
index 2de23341..06a9903c 100644
--- a/includes/Assets.php
+++ b/includes/Assets.php
@@ -12,6 +12,10 @@ public function __construct()
         // adminbar enqueue
         add_action('admin_enqueue_scripts', [$this, 'adminbar_script']);
         add_action('wp_enqueue_scripts', [$this, 'adminbar_script']);
+
+        add_action( 'elementor/editor/after_enqueue_scripts', function () {
+	        wp_enqueue_script('wpscp-el-editor', WPSP_ASSETS_URI . 'js/elementor-editor.js', array('jquery'), time(), true);
+        });
     }
 
     /**

From b40d50295da0a483fbebf7f693c835f33f1e1e52 Mon Sep 17 00:00:00 2001
From: Linkon Miyan <rudlinkon@gmail.com>
Date: Sun, 8 Aug 2021 19:12:34 +0600
Subject: [PATCH 02/22] Added Form fields and process schedule post action
 handler.

---
 assets/js/elementor-editor.js |  14 ++++-
 includes/Admin.php            | 106 +++++++++++++++++++++++++++++++---
 includes/Assets.php           |   6 +-
 3 files changed, 112 insertions(+), 14 deletions(-)

diff --git a/assets/js/elementor-editor.js b/assets/js/elementor-editor.js
index 7ae0b5f8..23b6b9da 100644
--- a/assets/js/elementor-editor.js
+++ b/assets/js/elementor-editor.js
@@ -4,6 +4,12 @@
 
     $(window).on('load', function () {
         $('.elementor-panel-footer-sub-menu-wrapper .elementor-panel-footer-sub-menu').append(wpsp_menu);
+        $("#wpsp-schedule-datetime").flatpickr({
+            enableTime: true,
+            dateFormat: "Y-m-dTH:i:S",
+            altInput: true,
+            altFormat: "F j, Y h:i K",
+        });
     });
 
     $(document).on('click', '#elementor-panel-footer-sub-menu-item-wpsp', function (e) {
@@ -18,9 +24,13 @@
         e.preventDefault();
         var $form = modal.find('form'),
             url = $form.attr('action'),
-            data = $form.serialize()
+            data = $form.serialize(),
+            wpsp_submit_button = $('.wpsp-el-form-submit');
+
+        wpsp_submit_button.addClass('elementor-button-state');
         $.post(url, data, function (data) {
             $(".wpsp-el-result").html(data);
+            wpsp_submit_button.removeClass('elementor-button-state');
         });
-    })
+    });
 })(jQuery);
\ No newline at end of file
diff --git a/includes/Admin.php b/includes/Admin.php
index e024e032..2b4fbf80 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -17,7 +17,8 @@ public function __construct()
         $this->load_dashboard_widgets();
         $this->load_settings();
 
-        add_action('elementor/editor/footer', [$this, 'schedulepress_el_tab'], 100 );
+	    add_action( 'elementor/editor/footer', [ $this, 'schedulepress_el_tab' ], 100 );
+	    add_action( 'wp_ajax_wpsp_el_editor_form', [ $this, 'wpsp_el_tab_action' ] );
     }
     public function load_plugin_menu_pages()
     {
@@ -189,10 +190,56 @@ public function load_settings()
     }
 
     public function schedulepress_el_tab () { ?>
+        <style>
+            #schedulepress-elementor-modal.elementor-templates-modal .dialog-message {
+                max-height: 50vh;
+            }
+
+            @media (max-width: 1439px) {
+                #schedulepress-elementor-modal.elementor-templates-modal .dialog-widget-content {
+                    max-width: 500px;
+                }
+            }
+
+            @media (min-width: 1440px) {
+                #schedulepress-elementor-modal.elementor-templates-modal .dialog-widget-content {
+                    max-width: 500px;
+                }
+            }
+
+            #schedulepress-elementor-modal form label {
+                display: flex;
+                align-items: center;
+                text-align: left;
+            }
+
+            #schedulepress-elementor-modal form label input {
+                background: #fff;
+            }
+
+            #schedulepress-elementor-modal form label + label {
+                margin-top: 15px;
+                cursor: no-drop;
+                opacity: .5;
+            }
+
+            #schedulepress-elementor-modal form label + label input {
+                cursor: no-drop;
+            }
+
+            #schedulepress-elementor-modal form label > span {
+                white-space: nowrap;
+                width: 120px;
+                font-weight: 700;
+            }
+
+            .wpsp-el-form-submit.elementor-button-state > .elementor-state-icon + span {
+                display: none;
+            }
+        </style>
 	    <div class="dialog-widget dialog-lightbox-widget dialog-type-buttons dialog-type-lightbox elementor-templates-modal"
 		    id="schedulepress-elementor-modal" style="display: none;">
-		    <div class="dialog-widget-content dialog-lightbox-widget-content"
-		         style="top: 50%;left: 50%;transform: translate(-50%, -50%);">
+		    <div class="dialog-widget-content dialog-lightbox-widget-content" style="top: 50%;left: 50%;transform: translate(-50%, -50%);">
 			    <div class="dialog-header dialog-lightbox-header">
 				    <div class="elementor-templates-modal__header">
 					    <div class="elementor-templates-modal__header__logo-area">
@@ -216,17 +263,39 @@ public function schedulepress_el_tab () { ?>
 			    <div class="dialog-message dialog-lightbox-message">
 				    <div class="dialog-content dialog-lightbox-content">
                         <form action="<?php echo admin_url( 'admin-ajax.php' ); ?>" method="post">
-	                        <?php wp_nonce_field( 'wpsp-el-editor', 'wpsp-el-editor' ); ?>
-                            <input type="hidden" name="action" value="wpsp-el-form">
-                            <input type="text" name="text">
+						    <?php
+						    wp_nonce_field( 'wpsp-el-editor', 'wpsp-el-editor' );
+						    $post_id = get_the_ID();
+						    $post    = get_post( $post_id );
+						    ?>
+                            <input type="hidden" name="action" value="wpsp_el_editor_form">
+                            <input type="hidden" name="id" value="<?php echo $post_id; ?>">
+
+                            <label>
+                                <span><?php esc_html_e( 'Publish On', 'wp-scheduled-posts' ); ?></span>
+                                <input id="wpsp-schedule-datetime" type="text" name="date" value="<?php echo esc_attr( $post->post_date ) ?>" readonly>
+                            </label>
+                            <label title="<?php esc_html_e( 'Pro Feature', 'wp-scheduled-posts' ); ?>">
+                                <span><?php esc_html_e( 'Republish On', 'wp-scheduled-posts' ); ?></span>
+                                <input type="text" disabled>
+                            </label>
+                            <label title="<?php esc_html_e( 'Pro Feature', 'wp-scheduled-posts' ); ?>">
+                                <span><?php esc_html_e( 'Unpublish On', 'wp-scheduled-posts' ); ?></span>
+                                <input type="text" disabled>
+                            </label>
                         </form>
                         <div class="wpsp-el-result"></div>
                     </div>
 				    <div class="dialog-loading dialog-lightbox-loading"></div>
 			    </div>
-			    <div class="dialog-buttons-wrapper dialog-lightbox-buttons-wrapper" style="display: flex;">
-				    <button class="elementor-button elementor-button-success dialog-button wpsp-el-form-submit"><?php esc_html_e( 'Apply', 'wp-scheduled-posts' ); ?></button>
-			    </div>
+                <div class="dialog-buttons-wrapper dialog-lightbox-buttons-wrapper" style="display: flex;">
+                    <button class="elementor-button elementor-button-success dialog-button wpsp-el-form-submit">
+                        <span class="elementor-state-icon">
+                            <i class="eicon-loading eicon-animation-spin" aria-hidden="true"></i>
+                        </span>
+                        <span><?php esc_html_e( 'Apply', 'wp-scheduled-posts' ); ?></span>
+                    </button>
+                </div>
 		    </div>
 	    </div>
         <div id="elementor-panel-footer-sub-menu-item-wpsp" class="elementor-panel-footer-sub-menu-item">
@@ -235,4 +304,23 @@ public function schedulepress_el_tab () { ?>
         </div>
 <?php
     }
+
+	public function wpsp_el_tab_action() {
+		if ( check_ajax_referer( 'wpsp-el-editor', 'wpsp-el-editor' ) ) {
+			$args = wp_parse_args( $_POST, [
+				'id'          => 0,
+				'date'        => '',
+				'post_status' => 'future'
+			] );
+
+			$updated = wp_update_post( [
+				'ID'            => absint( $args['id'] ),
+				'post_date'     => $args['date'],
+				'post_date_gmt' => $args['date'],
+				'post_status'   => $args['post_status']
+			] );
+
+			wp_send_json_success( $updated );
+		}
+	}
 }
diff --git a/includes/Assets.php b/includes/Assets.php
index 06a9903c..2425be9c 100644
--- a/includes/Assets.php
+++ b/includes/Assets.php
@@ -13,9 +13,9 @@ public function __construct()
         add_action('admin_enqueue_scripts', [$this, 'adminbar_script']);
         add_action('wp_enqueue_scripts', [$this, 'adminbar_script']);
 
-        add_action( 'elementor/editor/after_enqueue_scripts', function () {
-	        wp_enqueue_script('wpscp-el-editor', WPSP_ASSETS_URI . 'js/elementor-editor.js', array('jquery'), time(), true);
-        });
+	    add_action( 'elementor/editor/after_enqueue_scripts', function () {
+		    wp_enqueue_script( 'wpscp-el-editor', WPSP_ASSETS_URI . 'js/elementor-editor.js', array( 'jquery' ), time(), true );
+	    } );
     }
 
     /**

From 3822c717b103567973479093dca93cea19f62a77 Mon Sep 17 00:00:00 2001
From: Linkon Miyan <rudlinkon@gmail.com>
Date: Mon, 9 Aug 2021 11:16:28 +0600
Subject: [PATCH 03/22] Added quick button on elementor editor footer panel

---
 assets/js/elementor-editor.js | 6 ++++--
 includes/Admin.php            | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/assets/js/elementor-editor.js b/assets/js/elementor-editor.js
index 23b6b9da..87c61c9a 100644
--- a/assets/js/elementor-editor.js
+++ b/assets/js/elementor-editor.js
@@ -1,9 +1,11 @@
 (function ($) {
     var wpsp_menu = $('#elementor-panel-footer-sub-menu-item-wpsp'),
-        modal = $('#schedulepress-elementor-modal');
+        modal = $('#schedulepress-elementor-modal'),
+        wpsp_quick_button = $('#elementor-panel-footer-wpsp-modal');
 
     $(window).on('load', function () {
         $('.elementor-panel-footer-sub-menu-wrapper .elementor-panel-footer-sub-menu').append(wpsp_menu);
+        wpsp_quick_button.insertAfter('#elementor-panel-footer-saver-preview');
         $("#wpsp-schedule-datetime").flatpickr({
             enableTime: true,
             dateFormat: "Y-m-dTH:i:S",
@@ -12,7 +14,7 @@
         });
     });
 
-    $(document).on('click', '#elementor-panel-footer-sub-menu-item-wpsp', function (e) {
+    $(document).on('click', '#elementor-panel-footer-sub-menu-item-wpsp, #elementor-panel-footer-wpsp-modal', function (e) {
         e.preventDefault();
         modal.fadeIn();
     }).on('click', '.elementor-templates-modal__header__close > i, #schedulepress-elementor-modal', function (e) {
diff --git a/includes/Admin.php b/includes/Admin.php
index 2b4fbf80..58831b64 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -302,6 +302,12 @@ public function schedulepress_el_tab () { ?>
             <i class="elementor-icon eicon-folder" aria-hidden="true"></i>
             <span class="elementor-title"><?php esc_html_e( 'WPSP', 'wp-scheduled-posts' ); ?></span>
         </div>
+        <div id="elementor-panel-footer-wpsp-modal" class="elementor-panel-footer-tool tooltip-target" data-tooltip="<?php esc_attr_e( 'SchedulePress', 'wp-scheduled-posts' ); ?>">
+            <span id="elementor-panel-footer-wpsp-modal-label">
+                <i class="eicon-preview-medium" aria-hidden="true"></i>
+                <span class="elementor-screen-only"><?php echo __( 'SchedulePress', 'wp-scheduled-posts' ); ?></span>
+            </span>
+        </div>
 <?php
     }
 

From 5c748203fe983571359a9ec430a4bd27eb199fee Mon Sep 17 00:00:00 2001
From: Linkon Miyan <rudlinkon@gmail.com>
Date: Mon, 9 Aug 2021 18:40:58 +0600
Subject: [PATCH 04/22] update mini icon

---
 includes/Admin.php | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/includes/Admin.php b/includes/Admin.php
index 58831b64..76d39ca3 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -304,7 +304,38 @@ public function schedulepress_el_tab () { ?>
         </div>
         <div id="elementor-panel-footer-wpsp-modal" class="elementor-panel-footer-tool tooltip-target" data-tooltip="<?php esc_attr_e( 'SchedulePress', 'wp-scheduled-posts' ); ?>">
             <span id="elementor-panel-footer-wpsp-modal-label">
-                <i class="eicon-preview-medium" aria-hidden="true"></i>
+                <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+                     viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;display:block;width:13px;margin:0 auto;" xml:space="preserve">
+                <style type="text/css">
+                    .st0{fill:#A4AFB7;}
+                    #elementor-panel-footer-wpsp-modal:hover .st0{fill:#d5dadf;}
+                </style>
+                <g>
+                    <g>
+                        <path class="st0" d="M212.3,462.4C95,462.4-0.4,366.9-0.4,249.7S95,37,212.3,37c37,0,73.2,9.6,105.1,27.9
+                            c9.8,5.7,13.2,18.1,7.5,27.7c-5.7,9.8-18.1,13.2-27.7,7.5c-25.6-14.7-55.1-22.5-84.9-22.5c-94.7,0-171.8,77.1-171.8,171.8
+                            s77.1,171.8,171.8,171.8c48.1,0,92.6-19.4,125.5-54.3c7.8-8.3,20.7-8.5,28.7-1c8.3,7.8,8.5,20.7,1,28.7
+                            C327.4,437.8,271,462.4,212.3,462.4z"/>
+                    </g>
+                    <path class="st0" d="M186.1,208.3l-43.2-39.3c-8.3-7.5-21.2-7-28.7,1.3c-7.5,8.3-7,21.2,1.3,28.7l46.8,42.4
+                        C165.9,227.7,174.5,215.8,186.1,208.3z"/>
+                    <path class="st0" d="M445.4,81.7c-7-8.8-19.9-10.4-28.7-3.4L250,210.1c11.1,8.3,19.1,20.4,21.7,34.7L442,110.2
+                        C451.1,103.2,452.4,90.5,445.4,81.7z"/>
+                    <path class="st0" d="M234.3,222.8c-5.2-2.8-11.1-4.4-17.3-4.4c-5.7,0-10.9,1.3-15.5,3.4c-12.7,6-21.2,18.6-21.2,33.4
+                        c0,0.8,0,1.6,0,2.3c1.3,19.1,17.1,34.4,36.7,34.4c18.9,0,34.4-14.2,36.5-32.6c0.3-1.3,0.3-2.8,0.3-4.4
+                        C253.7,241.1,245.9,229,234.3,222.8z"/>
+                    <path class="st0" d="M493.8,202.6h-51.2c-3.4,0-6.2,2.8-6.2,6.2v45.5c0,3.4,2.8,6.2,6.2,6.2h51.2c3.4,0,6.2-2.8,6.2-6.2v-45.5
+                        C500,205.4,497.2,202.6,493.8,202.6z"/>
+                    <g>
+                        <path class="st0" d="M410,202.6h-51.2c-3.4,0-6.2,2.8-6.2,6.2v45.5c0,3.4,2.8,6.2,6.2,6.2H410c3.4,0,6.2-2.8,6.2-6.2v-45.5
+                            C416.4,205.4,413.6,202.6,410,202.6z"/>
+                        <path class="st0" d="M410,277.6h-51.2c-3.4,0-6.2,2.8-6.2,6.2v45.5c0,3.4,2.8,6.2,6.2,6.2H410c3.4,0,6.2-2.8,6.2-6.2v-45.5
+                            C416.4,280.2,413.6,277.6,410,277.6z"/>
+                        <path class="st0" d="M493.8,277.6h-51.2c-3.4,0-6.2,2.8-6.2,6.2v45.5c0,3.4,2.8,6.2,6.2,6.2h51.2c3.4,0,6.2-2.8,6.2-6.2v-45.5
+                            C500,280.2,497.2,277.6,493.8,277.6z"/>
+                    </g>
+                </g>
+                </svg>
                 <span class="elementor-screen-only"><?php echo __( 'SchedulePress', 'wp-scheduled-posts' ); ?></span>
             </span>
         </div>

From c17ae013fc347e52022e375e7c869aaddb95ff64 Mon Sep 17 00:00:00 2001
From: Linkon Miyan <rudlinkon@gmail.com>
Date: Tue, 10 Aug 2021 19:14:13 +0600
Subject: [PATCH 05/22] Added immediately publish functionality, action status
 message and UI improvement.

---
 assets/images/wpsp-el-editor-modal-logo.png | Bin 0 -> 3566 bytes
 assets/js/elementor-editor.js               |  32 +++-
 includes/Admin.php                          | 190 ++++++++++++++++----
 3 files changed, 183 insertions(+), 39 deletions(-)
 create mode 100644 assets/images/wpsp-el-editor-modal-logo.png

diff --git a/assets/images/wpsp-el-editor-modal-logo.png b/assets/images/wpsp-el-editor-modal-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..979f7415636768c4483e4f849a1e02a6de4723cd
GIT binary patch
literal 3566
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

literal 0
HcmV?d00001

diff --git a/assets/js/elementor-editor.js b/assets/js/elementor-editor.js
index 87c61c9a..361b2e54 100644
--- a/assets/js/elementor-editor.js
+++ b/assets/js/elementor-editor.js
@@ -1,12 +1,13 @@
 (function ($) {
     var wpsp_menu = $('#elementor-panel-footer-sub-menu-item-wpsp'),
         modal = $('#schedulepress-elementor-modal'),
-        wpsp_quick_button = $('#elementor-panel-footer-wpsp-modal');
+        wpsp_quick_button = $('#elementor-panel-footer-wpsp-modal'),
+        wpsp_date;
 
     $(window).on('load', function () {
         $('.elementor-panel-footer-sub-menu-wrapper .elementor-panel-footer-sub-menu').append(wpsp_menu);
         wpsp_quick_button.insertAfter('#elementor-panel-footer-saver-preview');
-        $("#wpsp-schedule-datetime").flatpickr({
+        wpsp_date = flatpickr("#wpsp-schedule-datetime", {
             enableTime: true,
             dateFormat: "Y-m-dTH:i:S",
             altInput: true,
@@ -17,22 +18,41 @@
     $(document).on('click', '#elementor-panel-footer-sub-menu-item-wpsp, #elementor-panel-footer-wpsp-modal', function (e) {
         e.preventDefault();
         modal.fadeIn();
-    }).on('click', '.elementor-templates-modal__header__close > i, #schedulepress-elementor-modal', function (e) {
+    }).on('click', '.elementor-templates-modal__header__close > svg, .elementor-templates-modal__header__close > svg *, #schedulepress-elementor-modal', function (e) {
         e.preventDefault();
         if (e.target === this) {
             modal.fadeOut();
         }
+    }).on('click', '.wpsp-immediately-publish', function (e) {
+        e.preventDefault();
+        wpsp_date.clear();
     }).on('click', 'button.wpsp-el-form-submit', function (e) {
         e.preventDefault();
         var $form = modal.find('form'),
             url = $form.attr('action'),
             data = $form.serialize(),
-            wpsp_submit_button = $('.wpsp-el-form-submit');
+            wpsp_submit_button = $('.wpsp-el-form-submit'),
+            wpsp_el_result = $(".wpsp-el-result");
 
         wpsp_submit_button.addClass('elementor-button-state');
         $.post(url, data, function (data) {
-            $(".wpsp-el-result").html(data);
-            wpsp_submit_button.removeClass('elementor-button-state');
+            wpsp_el_result.html(data.data.msg).slideDown();
+
+            if (data.success) {
+                var immediately_btn = $('.wpsp-immediately-publish');
+                wpsp_submit_button.removeClass('elementor-button-state');
+                wpsp_el_result.addClass('wpsp-msg-success');
+
+                if (data.data.status === 'future') {
+                    immediately_btn.show();
+                } else {
+                    immediately_btn.hide();
+                }
+            }
+
+            setTimeout(function () {
+                wpsp_el_result.slideUp().html('').removeClass('wpsp-msg-success');
+            }, 3000);
         });
     });
 })(jQuery);
\ No newline at end of file
diff --git a/includes/Admin.php b/includes/Admin.php
index 76d39ca3..31d5e457 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -191,8 +191,40 @@ public function load_settings()
 
     public function schedulepress_el_tab () { ?>
         <style>
+            #schedulepress-elementor-modal.elementor-templates-modal .dialog-widget-content {
+                background: #f5f7fd;
+            }
+
+            #schedulepress-elementor-modal.elementor-templates-modal .dialog-header {
+                background: #fff;
+                box-shadow: none;
+            }
+
+            #schedulepress-elementor-modal .elementor-templates-modal__header__close--normal {
+                border-left: none;
+            }
+
+            #schedulepress-elementor-modal .elementor-templates-modal__header__close--normal svg {
+                cursor: pointer;
+                transition: .3s;
+            }
+
+            #schedulepress-elementor-modal .elementor-templates-modal__header__close--normal svg:hover {
+                transform: scale(1.3);
+            }
+
+            #schedulepress-elementor-modal .dialog-widget-content {
+                border-radius: 10px;
+            }
+
+            #schedulepress-elementor-modal.elementor-templates-modal .dialog-buttons-wrapper {
+                background: transparent;
+                box-shadow: none;
+            }
+
             #schedulepress-elementor-modal.elementor-templates-modal .dialog-message {
-                max-height: 50vh;
+                height: auto;
+                padding-bottom: 20px;
             }
 
             @media (max-width: 1439px) {
@@ -208,32 +240,92 @@ public function schedulepress_el_tab () { ?>
             }
 
             #schedulepress-elementor-modal form label {
-                display: flex;
-                align-items: center;
+                display: block;
                 text-align: left;
             }
 
             #schedulepress-elementor-modal form label input {
-                background: #fff;
+                background-color: #e6eaf8;
+                background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' viewBox='0 0 200 200' style='enable-background:new 0 0 200 200;' width='10' xml:space='preserve'%3E%3Cstyle type='text/css'%3E .st0%7Bfill:%239E9ED8;%7D%0A%3C/style%3E%3Cpath class='st0' d='M175,24.7h-8.3V8.1c0-4.6-3.7-8.3-8.3-8.3H150c-4.6,0-8.3,3.7-8.3,8.3v16.7H58.3V8.1c0-4.6-3.7-8.3-8.3-8.3 h-8.3c-4.6,0-8.3,3.7-8.3,8.3v16.7H25c-13.8,0-25,11.2-25,25v125c0,13.8,11.2,25,25,25h150c13.8,0,25-11.2,25-25v-125 C200,36,188.8,24.7,175,24.7z M183.3,174.7c0,4.6-3.7,8.3-8.3,8.3H25c-4.6,0-8.3-3.7-8.3-8.3V83.4h166.7V174.7z'/%3E%3C/svg%3E%0A");
+                background-repeat: no-repeat;
+                background-position: calc(100% - 15px) center;
+                border: none;
+                border-radius: 5px;
+                height: 35px;
+                padding: 0 15px;
+                color: #303042;
             }
 
             #schedulepress-elementor-modal form label + label {
                 margin-top: 15px;
-                cursor: no-drop;
+            }
+
+            #schedulepress-elementor-modal form label > span {
+                display: block;
+                color: #303042;
+                font-weight: 700;
+                margin-bottom: 5px;
+            }
+
+            #schedulepress-elementor-modal .wpsp-pro-fields label {
+                margin-top: 15px;
+            }
+
+            #schedulepress-elementor-modal .wpsp-pro-fields label > span {
+                color: #9696af;
+            }
+
+            #schedulepress-elementor-modal .wpsp-pro-fields label > span > span {
+                background: #6d64ff;
+                border-radius: 5px;
+                line-height: 10px;
+                display: inline-block;
+                font-size: 8px;
+                padding: 0 4px;
+                margin-left: 5px;
+                color: #f5f7fd;
+                transform: translateY(-1px);
+            }
+
+            #schedulepress-elementor-modal form .wpsp-pro-fields label input {
                 opacity: .5;
             }
 
-            #schedulepress-elementor-modal form label + label input {
-                cursor: no-drop;
+            #schedulepress-elementor-modal .elementor-button {
+                color: #6d64ff;
+                background: rgba(109, 100, 255, .2);
+                height: 35px;
+                font-size: 15px;
+                padding: 0 25px;
+                border-radius: 18px;
+                font-weight: 400;
+                text-transform: initial;
             }
 
-            #schedulepress-elementor-modal form label > span {
-                white-space: nowrap;
-                width: 120px;
-                font-weight: 700;
+            #schedulepress-elementor-modal .elementor-button.wpsp-el-form-submit {
+                background: rgba(109, 100, 255, 1);
+                color: #fff;
+            }
+
+            #schedulepress-elementor-modal .elementor-button + .elementor-button {
+                margin-left: 15px;
             }
 
-            .wpsp-el-form-submit.elementor-button-state > .elementor-state-icon + span {
+            #schedulepress-elementor-modal.elementor-templates-modal .dialog-buttons-wrapper {
+                padding: 0 30px 30px;
+            }
+
+            #schedulepress-elementor-modal .wpsp-el-result {
+                text-align: left;
+                color: red;
+                padding-top: 10px;
+            }
+
+            #schedulepress-elementor-modal .wpsp-el-result.wpsp-msg-success {
+                color: green;
+            }
+
+            #schedulepress-elementor-modal .wpsp-el-form-submit.elementor-button-state > .elementor-state-icon + span {
                 display: none;
             }
         </style>
@@ -244,17 +336,23 @@ public function schedulepress_el_tab () { ?>
 				    <div class="elementor-templates-modal__header">
 					    <div class="elementor-templates-modal__header__logo-area">
 						    <div class="elementor-templates-modal__header__logo">
-								<span class="elementor-templates-modal__header__logo__icon-wrapper e-logo-wrapper">
-									<i class="eicon-elementor"></i>
-								</span>
-							    <span class="elementor-templates-modal__header__logo__title"><?php esc_html_e( 'SchedulePress', 'wp-scheduled-posts' ); ?></span>
+                                <img src="<?php echo plugins_url( 'assets/images/wpsp-el-editor-modal-logo.png', WPSP_PLUGIN_BASENAME ); ?>" alt="<?php esc_html_e( 'WPSP Logo', 'wp-scheduled-posts' ); ?>">
 						    </div>
 					    </div>
 					    <div class="elementor-templates-modal__header__menu-area"></div>
 					    <div class="elementor-templates-modal__header__items-area">
 						    <div class="elementor-templates-modal__header__close elementor-templates-modal__header__close--normal elementor-templates-modal__header__item">
-							    <i class="eicon-close" aria-hidden="true" title="Close"></i>
-							    <span class="elementor-screen-only"><?php esc_html_e( 'Close', 'wp-scheduled-posts' ); ?></span>
+                                <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+                                     viewBox="0 0 200 200" style="enable-background:new 0 0 200 200; width: 11px;" xml:space="preserve">
+                                    <g>
+                                        <path style="fill: #303042;" d="M10.3,199.8c-2.6,0-5.3-1-7.3-3c-4-4-4-10.5,0-14.6L182.4,2.8c4-4,10.5-4,14.6,0c4,4,4,10.5,0,14.6L17.6,196.8
+        C15.6,198.8,12.9,199.8,10.3,199.8z"/>
+                                        <path style="fill: #303042;" d="M189.9,199.8c-2.6,0-5.2-1-7.2-3L6,20.1c-4-4-4-10.4,0-14.3s10.4-4,14.3,0L197,182.5c4,4,4,10.4,0,14.3
+        C195,198.8,192.5,199.8,189.9,199.8z"/>
+                                    </g>
+                                </svg>
+
+                                <span class="elementor-screen-only"><?php esc_html_e( 'Close', 'wp-scheduled-posts' ); ?></span>
 						    </div>
 						    <div id="elementor-template-library-header-tools"></div>
 					    </div>
@@ -265,8 +363,9 @@ public function schedulepress_el_tab () { ?>
                         <form action="<?php echo admin_url( 'admin-ajax.php' ); ?>" method="post">
 						    <?php
 						    wp_nonce_field( 'wpsp-el-editor', 'wpsp-el-editor' );
-						    $post_id = get_the_ID();
-						    $post    = get_post( $post_id );
+						    $post_id   = get_the_ID();
+						    $post      = get_post( $post_id );
+						    $is_future = get_post_status( $post_id ) === 'future';
 						    ?>
                             <input type="hidden" name="action" value="wpsp_el_editor_form">
                             <input type="hidden" name="id" value="<?php echo $post_id; ?>">
@@ -275,21 +374,26 @@ public function schedulepress_el_tab () { ?>
                                 <span><?php esc_html_e( 'Publish On', 'wp-scheduled-posts' ); ?></span>
                                 <input id="wpsp-schedule-datetime" type="text" name="date" value="<?php echo esc_attr( $post->post_date ) ?>" readonly>
                             </label>
-                            <label title="<?php esc_html_e( 'Pro Feature', 'wp-scheduled-posts' ); ?>">
-                                <span><?php esc_html_e( 'Republish On', 'wp-scheduled-posts' ); ?></span>
-                                <input type="text" disabled>
-                            </label>
-                            <label title="<?php esc_html_e( 'Pro Feature', 'wp-scheduled-posts' ); ?>">
-                                <span><?php esc_html_e( 'Unpublish On', 'wp-scheduled-posts' ); ?></span>
-                                <input type="text" disabled>
-                            </label>
+                            <div class="wpsp-pro-fields">
+                                <label title="<?php esc_html_e( 'Pro Feature', 'wp-scheduled-posts' ); ?>">
+                                    <span><?php esc_html_e( 'Republish On', 'wp-scheduled-posts' ); ?><span><?php esc_html_e( 'PRO', 'wp-scheduled-posts' ); ?></span></span>
+                                    <input type="text" disabled>
+                                </label>
+                                <label title="<?php esc_html_e( 'Pro Feature', 'wp-scheduled-posts' ); ?>">
+                                    <span><?php esc_html_e( 'Unpublish On', 'wp-scheduled-posts' ); ?><span><?php esc_html_e( 'PRO', 'wp-scheduled-posts' ); ?></span></span>
+                                    <input type="text" disabled>
+                                </label>
+                            </div>
                         </form>
-                        <div class="wpsp-el-result"></div>
+                        <div class="wpsp-el-result" style="display: none;"></div>
                     </div>
 				    <div class="dialog-loading dialog-lightbox-loading"></div>
 			    </div>
                 <div class="dialog-buttons-wrapper dialog-lightbox-buttons-wrapper" style="display: flex;">
-                    <button class="elementor-button elementor-button-success dialog-button wpsp-el-form-submit">
+                    <button class="elementor-button wpsp-immediately-publish" style="<?php if ( ! $is_future ) { echo 'display: none;'; } ?>">
+                        <?php esc_html_e( 'Publish Post Immediately', 'wp-scheduled-posts' ); ?>
+                    </button>
+                    <button class="elementor-button wpsp-el-form-submit">
                         <span class="elementor-state-icon">
                             <i class="eicon-loading eicon-animation-spin" aria-hidden="true"></i>
                         </span>
@@ -298,10 +402,12 @@ public function schedulepress_el_tab () { ?>
                 </div>
 		    </div>
 	    </div>
+
         <div id="elementor-panel-footer-sub-menu-item-wpsp" class="elementor-panel-footer-sub-menu-item">
             <i class="elementor-icon eicon-folder" aria-hidden="true"></i>
-            <span class="elementor-title"><?php esc_html_e( 'WPSP', 'wp-scheduled-posts' ); ?></span>
+            <span class="elementor-title"><?php esc_html_e( 'SchedulePress', 'wp-scheduled-posts' ); ?></span>
         </div>
+
         <div id="elementor-panel-footer-wpsp-modal" class="elementor-panel-footer-tool tooltip-target" data-tooltip="<?php esc_attr_e( 'SchedulePress', 'wp-scheduled-posts' ); ?>">
             <span id="elementor-panel-footer-wpsp-modal-label">
                 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
@@ -350,14 +456,32 @@ public function wpsp_el_tab_action() {
 				'post_status' => 'future'
 			] );
 
-			$updated = wp_update_post( [
+			if ( empty( $args['id'] ) ) {
+				wp_send_json_error( [
+					'msg' => __( 'Your post id is empty', 'wp-scheduled-posts' )
+				] );
+			}
+
+			$id = wp_update_post( [
 				'ID'            => absint( $args['id'] ),
 				'post_date'     => $args['date'],
 				'post_date_gmt' => $args['date'],
 				'post_status'   => $args['post_status']
 			] );
 
-			wp_send_json_success( $updated );
+			$status = get_post_status( $id );
+
+			if ( $status === 'future' ) {
+				$msg = __( 'Your post successfully scheduled', 'wp-scheduled-posts' );
+			} else {
+				$msg = __( 'Your post successfully published', 'wp-scheduled-posts' );
+            }
+
+			wp_send_json_success( [
+				'id'     => $id,
+				'status' => $status,
+				'msg'    => $msg
+			] );
 		}
 	}
 }

From a629b65d4576adf8decfd2e8d63fbd04b3fd3e66 Mon Sep 17 00:00:00 2001
From: Linkon Miyan <rudlinkon@gmail.com>
Date: Tue, 24 Aug 2021 18:25:27 +0600
Subject: [PATCH 06/22] Elementor Editor integration (Pro Feature)

---
 assets/js/elementor-editor.js | 11 ++++++-
 includes/Admin.php            | 62 ++++++++++++++++++++++++++---------
 2 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/assets/js/elementor-editor.js b/assets/js/elementor-editor.js
index 361b2e54..f5e1cc9e 100644
--- a/assets/js/elementor-editor.js
+++ b/assets/js/elementor-editor.js
@@ -9,10 +9,19 @@
         wpsp_quick_button.insertAfter('#elementor-panel-footer-saver-preview');
         wpsp_date = flatpickr("#wpsp-schedule-datetime", {
             enableTime: true,
-            dateFormat: "Y-m-dTH:i:S",
+            dateFormat: "Y-m-d H:i:S",
             altInput: true,
             altFormat: "F j, Y h:i K",
         });
+
+        if ($('.wpsp-pro-fields.wpsp-pro-activated label input').length) {
+            flatpickr(".wpsp-pro-fields.wpsp-pro-activated label input", {
+                enableTime: true,
+                dateFormat: "Y/m/d H:i",
+                altInput: true,
+                altFormat: "F j, Y h:i K",
+            });
+        }
     });
 
     $(document).on('click', '#elementor-panel-footer-sub-menu-item-wpsp, #elementor-panel-footer-wpsp-modal', function (e) {
diff --git a/includes/Admin.php b/includes/Admin.php
index 31d5e457..1ab43ff7 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -17,6 +17,9 @@ public function __construct()
         $this->load_dashboard_widgets();
         $this->load_settings();
 
+	    if ( ! $this->pro_enabled ) {
+		    add_action( 'wpsp_el_modal_pro_fields', [ $this, 'wpsp_el_modal_pro_fields' ] );
+	    }
 	    add_action( 'elementor/editor/footer', [ $this, 'schedulepress_el_tab' ], 100 );
 	    add_action( 'wp_ajax_wpsp_el_editor_form', [ $this, 'wpsp_el_tab_action' ] );
     }
@@ -287,7 +290,7 @@ public function schedulepress_el_tab () { ?>
                 transform: translateY(-1px);
             }
 
-            #schedulepress-elementor-modal form .wpsp-pro-fields label input {
+            #schedulepress-elementor-modal form .wpsp-pro-fields:not(.wpsp-pro-activated) label input {
                 opacity: .5;
             }
 
@@ -374,16 +377,7 @@ public function schedulepress_el_tab () { ?>
                                 <span><?php esc_html_e( 'Publish On', 'wp-scheduled-posts' ); ?></span>
                                 <input id="wpsp-schedule-datetime" type="text" name="date" value="<?php echo esc_attr( $post->post_date ) ?>" readonly>
                             </label>
-                            <div class="wpsp-pro-fields">
-                                <label title="<?php esc_html_e( 'Pro Feature', 'wp-scheduled-posts' ); ?>">
-                                    <span><?php esc_html_e( 'Republish On', 'wp-scheduled-posts' ); ?><span><?php esc_html_e( 'PRO', 'wp-scheduled-posts' ); ?></span></span>
-                                    <input type="text" disabled>
-                                </label>
-                                <label title="<?php esc_html_e( 'Pro Feature', 'wp-scheduled-posts' ); ?>">
-                                    <span><?php esc_html_e( 'Unpublish On', 'wp-scheduled-posts' ); ?><span><?php esc_html_e( 'PRO', 'wp-scheduled-posts' ); ?></span></span>
-                                    <input type="text" disabled>
-                                </label>
-                            </div>
+	                        <?php do_action( 'wpsp_el_modal_pro_fields', $post_id ); ?>
                         </form>
                         <div class="wpsp-el-result" style="display: none;"></div>
                     </div>
@@ -448,14 +442,38 @@ public function schedulepress_el_tab () { ?>
 <?php
     }
 
+    public function wpsp_el_modal_pro_fields( $post_id ) { ?>
+        <div class="wpsp-pro-fields">
+            <label title="<?php esc_html_e( 'Pro Feature', 'wp-scheduled-posts' ); ?>">
+                <span><?php esc_html_e( 'Republish On', 'wp-scheduled-posts' ); ?><span><?php esc_html_e( 'PRO', 'wp-scheduled-posts' ); ?></span></span>
+                <input type="text" disabled>
+            </label>
+            <label title="<?php esc_html_e( 'Pro Feature', 'wp-scheduled-posts' ); ?>">
+                <span><?php esc_html_e( 'Unpublish On', 'wp-scheduled-posts' ); ?><span><?php esc_html_e( 'PRO', 'wp-scheduled-posts' ); ?></span></span>
+                <input type="text" disabled>
+            </label>
+        </div>
+        <?php
+    }
+
 	public function wpsp_el_tab_action() {
 		if ( check_ajax_referer( 'wpsp-el-editor', 'wpsp-el-editor' ) ) {
-			$args = wp_parse_args( $_POST, [
-				'id'          => 0,
-				'date'        => '',
-				'post_status' => 'future'
+			$offset = get_option( 'gmt_offset' );
+			$offset = $offset == 0 ? 0 : ( 0 - $offset );
+			$args   = wp_parse_args( $_POST, [
+				'id'                 => 0,
+				'date'               => '',
+				'republish_datetime' => '',
+				'unpublish_datetime' => '',
+				'post_status'        => 'future'
 			] );
 
+			if ( $offset !== 0 ) {
+				$date_gmt = date( "Y-m-d H:i:s", strtotime( $args['date'] ) + $offset * HOUR_IN_SECONDS );
+			} else {
+				$date_gmt = $args['date'];
+			}
+
 			if ( empty( $args['id'] ) ) {
 				wp_send_json_error( [
 					'msg' => __( 'Your post id is empty', 'wp-scheduled-posts' )
@@ -465,10 +483,20 @@ public function wpsp_el_tab_action() {
 			$id = wp_update_post( [
 				'ID'            => absint( $args['id'] ),
 				'post_date'     => $args['date'],
-				'post_date_gmt' => $args['date'],
+				'post_date_gmt' => $date_gmt,
 				'post_status'   => $args['post_status']
 			] );
 
+			if ( $this->pro_enabled ) {
+				if ( ! empty( $args['republish_datetime'] ) ) {
+					update_post_meta( $args['id'], '_wpscp_schedule_republish_date', sanitize_text_field( $args['republish_datetime'] ) );
+				}
+
+				if ( ! empty( $args['unpublish_datetime'] ) ) {
+					update_post_meta( $args['id'], '_wpscp_schedule_draft_date', sanitize_text_field( $args['unpublish_datetime'] ) );
+				}
+			}
+
 			$status = get_post_status( $id );
 
 			if ( $status === 'future' ) {
@@ -477,6 +505,8 @@ public function wpsp_el_tab_action() {
 				$msg = __( 'Your post successfully published', 'wp-scheduled-posts' );
             }
 
+			do_action( 'wpsp_el_action', absint( $args['id'] ), null, null );
+
 			wp_send_json_success( [
 				'id'     => $id,
 				'status' => $status,

From 45d864af8850473437a5571366665e7e6b7a9c7b Mon Sep 17 00:00:00 2001
From: Linkon Miyan <rudlinkon@gmail.com>
Date: Wed, 25 Aug 2021 17:01:57 +0600
Subject: [PATCH 07/22] Fix Label color of 'Republish On' and 'Unpublish On'

---
 includes/Admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/Admin.php b/includes/Admin.php
index 1ab43ff7..9ecc6dc6 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -274,7 +274,7 @@ public function schedulepress_el_tab () { ?>
                 margin-top: 15px;
             }
 
-            #schedulepress-elementor-modal .wpsp-pro-fields label > span {
+            #schedulepress-elementor-modal .wpsp-pro-fields:not(.wpsp-pro-activated) label > span {
                 color: #9696af;
             }
 

From 5e6fe1f404427895dd6bc32d864d157f08eca4c4 Mon Sep 17 00:00:00 2001
From: Linkon Miyan <rudlinkon@gmail.com>
Date: Wed, 25 Aug 2021 17:12:43 +0600
Subject: [PATCH 08/22] Fixed -- When published a post by clicking "Publish
 future post immediately" the becomes "1970/01/01 at 12:00 am"

---
 includes/Admin.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/includes/Admin.php b/includes/Admin.php
index 9ecc6dc6..b61cf47e 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -468,6 +468,10 @@ public function wpsp_el_tab_action() {
 				'post_status'        => 'future'
 			] );
 
+			if ( empty( $args['date'] ) ) {
+				$args['date'] = date( 'Y-m-d H:i:s', current_time( 'U' ) );
+			}
+
 			if ( $offset !== 0 ) {
 				$date_gmt = date( "Y-m-d H:i:s", strtotime( $args['date'] ) + $offset * HOUR_IN_SECONDS );
 			} else {

From dd926938c7279d1fbe646b18e8dc162a602a7412 Mon Sep 17 00:00:00 2001
From: Linkon Miyan <rudlinkon@gmail.com>
Date: Wed, 25 Aug 2021 17:24:06 +0600
Subject: [PATCH 09/22] Fixed -- If a page is published via SchedulePress the
 page content doesn't save. It publishes a blank page. Same goes for if user
 changes something and publish/schedule it via SchedulePress it doesn't save
 the changes.

---
 assets/js/elementor-editor.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/assets/js/elementor-editor.js b/assets/js/elementor-editor.js
index f5e1cc9e..e25c5294 100644
--- a/assets/js/elementor-editor.js
+++ b/assets/js/elementor-editor.js
@@ -43,6 +43,8 @@
             wpsp_submit_button = $('.wpsp-el-form-submit'),
             wpsp_el_result = $(".wpsp-el-result");
 
+        $('#elementor-panel-saver-button-publish').trigger('click');
+
         wpsp_submit_button.addClass('elementor-button-state');
         $.post(url, data, function (data) {
             wpsp_el_result.html(data.data.msg).slideDown();

From b6db89b4639f99f347b3ff4ed82e82ff5ac484b8 Mon Sep 17 00:00:00 2001
From: Linkon Miyan <rudlinkon@gmail.com>
Date: Wed, 25 Aug 2021 17:45:48 +0600
Subject: [PATCH 10/22] Fixed -- Show Time Picker for 'Republish On' and
 'Unpublish On' before picking any date like 'Publish On'. Otherwise, user
 will get confused

---
 includes/Admin.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/includes/Admin.php b/includes/Admin.php
index b61cf47e..ee2da40e 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -366,16 +366,18 @@ public function schedulepress_el_tab () { ?>
                         <form action="<?php echo admin_url( 'admin-ajax.php' ); ?>" method="post">
 						    <?php
 						    wp_nonce_field( 'wpsp-el-editor', 'wpsp-el-editor' );
-						    $post_id   = get_the_ID();
-						    $post      = get_post( $post_id );
-						    $is_future = get_post_status( $post_id ) === 'future';
+						    $post_id     = get_the_ID();
+						    $post        = get_post( $post_id );
+						    $is_future   = get_post_status( $post_id ) === 'future';
+						    $placeholder = date( 'F j, Y h:i A', current_time( 'U' ) );
 						    ?>
                             <input type="hidden" name="action" value="wpsp_el_editor_form">
                             <input type="hidden" name="id" value="<?php echo $post_id; ?>">
 
                             <label>
                                 <span><?php esc_html_e( 'Publish On', 'wp-scheduled-posts' ); ?></span>
-                                <input id="wpsp-schedule-datetime" type="text" name="date" value="<?php echo esc_attr( $post->post_date ) ?>" readonly>
+                                <input id="wpsp-schedule-datetime" type="text" name="date" value="<?php echo esc_attr( $post->post_date ) ?>"
+                                       placeholder="<?php echo esc_attr( $placeholder ); ?>" readonly>
                             </label>
 	                        <?php do_action( 'wpsp_el_modal_pro_fields', $post_id ); ?>
                         </form>

From e84efaadd5aaa044b69fc73298be35f5db961a50 Mon Sep 17 00:00:00 2001
From: Linkon Miyan <rudlinkon@gmail.com>
Date: Wed, 25 Aug 2021 18:17:50 +0600
Subject: [PATCH 11/22] Fixed -- 'Republish On' Time Picker going out of the
 screen for some devices

---
 includes/Admin.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/includes/Admin.php b/includes/Admin.php
index ee2da40e..8b0498b7 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -196,6 +196,8 @@ public function schedulepress_el_tab () { ?>
         <style>
             #schedulepress-elementor-modal.elementor-templates-modal .dialog-widget-content {
                 background: #f5f7fd;
+                top: 50px !important;
+                transform: translateX(-50%) !important;
             }
 
             #schedulepress-elementor-modal.elementor-templates-modal .dialog-header {

From 5bd4b8eb2bfe191ecce19e108a8399765ca5cb6d Mon Sep 17 00:00:00 2001
From: Linkon Miyan <rudlinkon@gmail.com>
Date: Wed, 25 Aug 2021 19:43:23 +0600
Subject: [PATCH 12/22] Fixed -- 'Republish On' Time Picker going out of the
 screen for some devices

---
 assets/js/elementor-editor.js |  2 ++
 includes/Admin.php            | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/assets/js/elementor-editor.js b/assets/js/elementor-editor.js
index e25c5294..c8fdf56d 100644
--- a/assets/js/elementor-editor.js
+++ b/assets/js/elementor-editor.js
@@ -12,6 +12,7 @@
             dateFormat: "Y-m-d H:i:S",
             altInput: true,
             altFormat: "F j, Y h:i K",
+            appendTo: window.document.querySelector('.wpsp-el-modal-date-picker'),
         });
 
         if ($('.wpsp-pro-fields.wpsp-pro-activated label input').length) {
@@ -20,6 +21,7 @@
                 dateFormat: "Y/m/d H:i",
                 altInput: true,
                 altFormat: "F j, Y h:i K",
+                appendTo: window.document.querySelector('.wpsp-el-modal-date-picker'),
             });
         }
     });
diff --git a/includes/Admin.php b/includes/Admin.php
index 8b0498b7..cb871800 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -196,8 +196,13 @@ public function schedulepress_el_tab () { ?>
         <style>
             #schedulepress-elementor-modal.elementor-templates-modal .dialog-widget-content {
                 background: #f5f7fd;
-                top: 50px !important;
-                transform: translateX(-50%) !important;
+            }
+
+            .wpsp-el-modal-date-picker .flatpickr-calendar {
+                left: 50% !important;
+                top: 50% !important;
+                transform: translate(-50%, -50%);
+                animation: none !important;
             }
 
             #schedulepress-elementor-modal.elementor-templates-modal .dialog-header {
@@ -398,6 +403,7 @@ public function schedulepress_el_tab () { ?>
                         <span><?php esc_html_e( 'Apply', 'wp-scheduled-posts' ); ?></span>
                     </button>
                 </div>
+                <div class="wpsp-el-modal-date-picker"></div>
 		    </div>
 	    </div>
 

From cc4be3a0a68fcea3ce6af5ca381de11b9dd9ba95 Mon Sep 17 00:00:00 2001
From: Linkon Miyan <rudlinkon@gmail.com>
Date: Wed, 25 Aug 2021 20:02:40 +0600
Subject: [PATCH 13/22] Fixed --  When Clicking on "Publish future post
 immediately" Change the button text again to "Publish"

---
 assets/js/elementor-editor.js |  1 +
 includes/Admin.php            | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/assets/js/elementor-editor.js b/assets/js/elementor-editor.js
index c8fdf56d..aeab910a 100644
--- a/assets/js/elementor-editor.js
+++ b/assets/js/elementor-editor.js
@@ -37,6 +37,7 @@
     }).on('click', '.wpsp-immediately-publish', function (e) {
         e.preventDefault();
         wpsp_date.clear();
+        $('.wpsp-el-form-submit span:nth-child(2)').text('Publish');
     }).on('click', 'button.wpsp-el-form-submit', function (e) {
         e.preventDefault();
         var $form = modal.find('form'),
diff --git a/includes/Admin.php b/includes/Admin.php
index cb871800..bf9b405f 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -400,7 +400,15 @@ public function schedulepress_el_tab () { ?>
                         <span class="elementor-state-icon">
                             <i class="eicon-loading eicon-animation-spin" aria-hidden="true"></i>
                         </span>
-                        <span><?php esc_html_e( 'Apply', 'wp-scheduled-posts' ); ?></span>
+                        <span>
+                        <?php
+                        if ( $is_future ) {
+	                        esc_html_e( 'Schedule', 'wp-scheduled-posts' );
+                        } else {
+	                        esc_html_e( 'Publish', 'wp-scheduled-posts' );
+                        }
+                        ?>
+                        </span>
                     </button>
                 </div>
                 <div class="wpsp-el-modal-date-picker"></div>

From 2a297efaef656338e08ad8abf3559e13e6df251a Mon Sep 17 00:00:00 2001
From: Linkon Miyan <rudlinkon@gmail.com>
Date: Wed, 25 Aug 2021 23:34:10 +0600
Subject: [PATCH 14/22] Fixed --  After publishing a post, change the button
 text to 'Update'

---
 assets/js/elementor-editor.js | 11 ++++++++++-
 includes/Admin.php            |  4 +++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/assets/js/elementor-editor.js b/assets/js/elementor-editor.js
index aeab910a..b38d39fd 100644
--- a/assets/js/elementor-editor.js
+++ b/assets/js/elementor-editor.js
@@ -36,14 +36,21 @@
         }
     }).on('click', '.wpsp-immediately-publish', function (e) {
         e.preventDefault();
+        var wpsp_submit_button = $('.wpsp-el-form-submit'),
+            wpsp_submit_button_text = $('span:nth-child(2)', wpsp_submit_button),
+            label_publish = wpsp_submit_button.data('label-publish');
+
         wpsp_date.clear();
-        $('.wpsp-el-form-submit span:nth-child(2)').text('Publish');
+        wpsp_submit_button_text.text(label_publish);
     }).on('click', 'button.wpsp-el-form-submit', function (e) {
         e.preventDefault();
         var $form = modal.find('form'),
             url = $form.attr('action'),
             data = $form.serialize(),
             wpsp_submit_button = $('.wpsp-el-form-submit'),
+            wpsp_submit_button_text = $('span:nth-child(2)', wpsp_submit_button),
+            label_schedule = wpsp_submit_button.data('label-schedule'),
+            label_update = wpsp_submit_button.data('label-update'),
             wpsp_el_result = $(".wpsp-el-result");
 
         $('#elementor-panel-saver-button-publish').trigger('click');
@@ -59,8 +66,10 @@
 
                 if (data.data.status === 'future') {
                     immediately_btn.show();
+                    wpsp_submit_button_text.text(label_schedule);
                 } else {
                     immediately_btn.hide();
+                    wpsp_submit_button_text.text(label_update);
                 }
             }
 
diff --git a/includes/Admin.php b/includes/Admin.php
index bf9b405f..c5fdd2a8 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -396,7 +396,9 @@ public function schedulepress_el_tab () { ?>
                     <button class="elementor-button wpsp-immediately-publish" style="<?php if ( ! $is_future ) { echo 'display: none;'; } ?>">
                         <?php esc_html_e( 'Publish Post Immediately', 'wp-scheduled-posts' ); ?>
                     </button>
-                    <button class="elementor-button wpsp-el-form-submit">
+                    <button class="elementor-button wpsp-el-form-submit" data-label-schedule="<?php esc_html_e( 'Schedule', 'wp-scheduled-posts' ); ?>"
+                            data-label-publish="<?php esc_html_e( 'Publish', 'wp-scheduled-posts' ); ?>"
+                            data-label-update="<?php esc_html_e( 'Update', 'wp-scheduled-posts' ); ?>">
                         <span class="elementor-state-icon">
                             <i class="eicon-loading eicon-animation-spin" aria-hidden="true"></i>
                         </span>

From 18ab196930fe3b113fcec08c032f17845c4e8336 Mon Sep 17 00:00:00 2001
From: Linkon Miyan <rudlinkon@gmail.com>
Date: Thu, 26 Aug 2021 00:13:06 +0600
Subject: [PATCH 15/22] Fixed --  When the user chooses a future date change
 the button text to 'Schedule'

---
 assets/js/elementor-editor.js | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/assets/js/elementor-editor.js b/assets/js/elementor-editor.js
index b38d39fd..a335bbc7 100644
--- a/assets/js/elementor-editor.js
+++ b/assets/js/elementor-editor.js
@@ -2,6 +2,11 @@
     var wpsp_menu = $('#elementor-panel-footer-sub-menu-item-wpsp'),
         modal = $('#schedulepress-elementor-modal'),
         wpsp_quick_button = $('#elementor-panel-footer-wpsp-modal'),
+        wpsp_submit_button = $('.wpsp-el-form-submit'),
+        wpsp_submit_button_text = $('span:nth-child(2)', wpsp_submit_button),
+        label_schedule = wpsp_submit_button.data('label-schedule'),
+        label_publish = wpsp_submit_button.data('label-publish'),
+        label_update = wpsp_submit_button.data('label-update'),
         wpsp_date;
 
     $(window).on('load', function () {
@@ -13,6 +18,16 @@
             altInput: true,
             altFormat: "F j, Y h:i K",
             appendTo: window.document.querySelector('.wpsp-el-modal-date-picker'),
+            onChange: function(selectedDates, dateStr, instance) {
+                var current_time = new Date(),
+                    selected_time = new Date(dateStr);
+
+                if (current_time.getTime() < selected_time.getTime()) {
+                    wpsp_submit_button_text.text(label_schedule)
+                } else {
+                    wpsp_submit_button_text.text(label_publish)
+                }
+            }
         });
 
         if ($('.wpsp-pro-fields.wpsp-pro-activated label input').length) {
@@ -36,10 +51,6 @@
         }
     }).on('click', '.wpsp-immediately-publish', function (e) {
         e.preventDefault();
-        var wpsp_submit_button = $('.wpsp-el-form-submit'),
-            wpsp_submit_button_text = $('span:nth-child(2)', wpsp_submit_button),
-            label_publish = wpsp_submit_button.data('label-publish');
-
         wpsp_date.clear();
         wpsp_submit_button_text.text(label_publish);
     }).on('click', 'button.wpsp-el-form-submit', function (e) {
@@ -47,10 +58,6 @@
         var $form = modal.find('form'),
             url = $form.attr('action'),
             data = $form.serialize(),
-            wpsp_submit_button = $('.wpsp-el-form-submit'),
-            wpsp_submit_button_text = $('span:nth-child(2)', wpsp_submit_button),
-            label_schedule = wpsp_submit_button.data('label-schedule'),
-            label_update = wpsp_submit_button.data('label-update'),
             wpsp_el_result = $(".wpsp-el-result");
 
         $('#elementor-panel-saver-button-publish').trigger('click');

From 97dae4baeabd151bdfcdbcce02cda84481d72786 Mon Sep 17 00:00:00 2001
From: Linkon Miyan <rudlinkon@gmail.com>
Date: Thu, 26 Aug 2021 00:29:38 +0600
Subject: [PATCH 16/22] Fixed --  When Clicking on "Publish future post
 immediately" Change button background green

---
 assets/js/elementor-editor.js | 3 ++-
 includes/Admin.php            | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/assets/js/elementor-editor.js b/assets/js/elementor-editor.js
index a335bbc7..cd5e2ec0 100644
--- a/assets/js/elementor-editor.js
+++ b/assets/js/elementor-editor.js
@@ -53,6 +53,7 @@
         e.preventDefault();
         wpsp_date.clear();
         wpsp_submit_button_text.text(label_publish);
+        $(this).addClass('active');
     }).on('click', 'button.wpsp-el-form-submit', function (e) {
         e.preventDefault();
         var $form = modal.find('form'),
@@ -75,7 +76,7 @@
                     immediately_btn.show();
                     wpsp_submit_button_text.text(label_schedule);
                 } else {
-                    immediately_btn.hide();
+                    immediately_btn.hide().removeClass('active');
                     wpsp_submit_button_text.text(label_update);
                 }
             }
diff --git a/includes/Admin.php b/includes/Admin.php
index c5fdd2a8..6a46cb5e 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -317,6 +317,11 @@ public function schedulepress_el_tab () { ?>
                 color: #fff;
             }
 
+            #schedulepress-elementor-modal .elementor-button.wpsp-immediately-publish.active {
+                background: #00cc76;
+                color: #fff;
+            }
+
             #schedulepress-elementor-modal .elementor-button + .elementor-button {
                 margin-left: 15px;
             }

From bb4afe122bd5111f3324cb48ed134158f4ba1869 Mon Sep 17 00:00:00 2001
From: Linkon Miyan <rudlinkon@gmail.com>
Date: Thu, 26 Aug 2021 13:02:58 +0600
Subject: [PATCH 17/22] Fixed --  When creating a new page schedule not
 happening

---
 includes/Admin.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/includes/Admin.php b/includes/Admin.php
index 6a46cb5e..592650f9 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -493,8 +493,11 @@ public function wpsp_el_tab_action() {
 				'post_status'        => 'future'
 			] );
 
+			$is_future = true;
+
 			if ( empty( $args['date'] ) ) {
 				$args['date'] = date( 'Y-m-d H:i:s', current_time( 'U' ) );
+				$is_future = false;
 			}
 
 			if ( $offset !== 0 ) {
@@ -516,6 +519,15 @@ public function wpsp_el_tab_action() {
 				'post_status'   => $args['post_status']
 			] );
 
+			if ( $is_future && get_post_status( $id ) !== 'future' ) {
+				$id = wp_update_post( [
+					'ID'            => absint( $args['id'] ),
+					'post_date'     => $args['date'],
+					'post_date_gmt' => $date_gmt,
+					'post_status'   => $args['post_status']
+				] );
+			}
+
 			if ( $this->pro_enabled ) {
 				if ( ! empty( $args['republish_datetime'] ) ) {
 					update_post_meta( $args['id'], '_wpscp_schedule_republish_date', sanitize_text_field( $args['republish_datetime'] ) );

From 15989301ba58344337877afbba7c21ad4a134ab3 Mon Sep 17 00:00:00 2001
From: Linkon Miyan <rudlinkon@gmail.com>
Date: Thu, 26 Aug 2021 13:11:32 +0600
Subject: [PATCH 18/22] Remove Placeholder

---
 includes/Admin.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/includes/Admin.php b/includes/Admin.php
index 592650f9..c28c8988 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -378,18 +378,16 @@ public function schedulepress_el_tab () { ?>
                         <form action="<?php echo admin_url( 'admin-ajax.php' ); ?>" method="post">
 						    <?php
 						    wp_nonce_field( 'wpsp-el-editor', 'wpsp-el-editor' );
-						    $post_id     = get_the_ID();
-						    $post        = get_post( $post_id );
-						    $is_future   = get_post_status( $post_id ) === 'future';
-						    $placeholder = date( 'F j, Y h:i A', current_time( 'U' ) );
+						    $post_id   = get_the_ID();
+						    $post      = get_post( $post_id );
+						    $is_future = get_post_status( $post_id ) === 'future';
 						    ?>
                             <input type="hidden" name="action" value="wpsp_el_editor_form">
                             <input type="hidden" name="id" value="<?php echo $post_id; ?>">
 
                             <label>
                                 <span><?php esc_html_e( 'Publish On', 'wp-scheduled-posts' ); ?></span>
-                                <input id="wpsp-schedule-datetime" type="text" name="date" value="<?php echo esc_attr( $post->post_date ) ?>"
-                                       placeholder="<?php echo esc_attr( $placeholder ); ?>" readonly>
+                                <input id="wpsp-schedule-datetime" type="text" name="date" value="<?php echo esc_attr( $post->post_date ) ?>" readonly>
                             </label>
 	                        <?php do_action( 'wpsp_el_modal_pro_fields', $post_id ); ?>
                         </form>

From d3d96850190e1b5e5f4a48fe3c9d9c64dca5db02 Mon Sep 17 00:00:00 2001
From: Linkon Miyan <rudlinkon@gmail.com>
Date: Thu, 26 Aug 2021 13:52:37 +0600
Subject: [PATCH 19/22] Immediately publish the post when click immediately
 publish button and set post time to date picker also update notification text

---
 assets/js/elementor-editor.js |  2 ++
 includes/Admin.php            | 16 +++++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/assets/js/elementor-editor.js b/assets/js/elementor-editor.js
index cd5e2ec0..37db79b9 100644
--- a/assets/js/elementor-editor.js
+++ b/assets/js/elementor-editor.js
@@ -54,6 +54,7 @@
         wpsp_date.clear();
         wpsp_submit_button_text.text(label_publish);
         $(this).addClass('active');
+        wpsp_submit_button_text.trigger('click');
     }).on('click', 'button.wpsp-el-form-submit', function (e) {
         e.preventDefault();
         var $form = modal.find('form'),
@@ -71,6 +72,7 @@
                 var immediately_btn = $('.wpsp-immediately-publish');
                 wpsp_submit_button.removeClass('elementor-button-state');
                 wpsp_el_result.addClass('wpsp-msg-success');
+                wpsp_date.setDate(data.data.post_time);
 
                 if (data.data.status === 'future') {
                     immediately_btn.show();
diff --git a/includes/Admin.php b/includes/Admin.php
index c28c8988..5af54305 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -493,9 +493,12 @@ public function wpsp_el_tab_action() {
 
 			$is_future = true;
 
+			$msg = __( 'Your post successfully updated', 'wp-scheduled-posts' );
+
 			if ( empty( $args['date'] ) ) {
 				$args['date'] = date( 'Y-m-d H:i:s', current_time( 'U' ) );
-				$is_future = false;
+				$is_future    = false;
+				$msg          = __( 'Your post successfully published', 'wp-scheduled-posts' );
 			}
 
 			if ( $offset !== 0 ) {
@@ -540,16 +543,15 @@ public function wpsp_el_tab_action() {
 
 			if ( $status === 'future' ) {
 				$msg = __( 'Your post successfully scheduled', 'wp-scheduled-posts' );
-			} else {
-				$msg = __( 'Your post successfully published', 'wp-scheduled-posts' );
-            }
+			}
 
 			do_action( 'wpsp_el_action', absint( $args['id'] ), null, null );
 
 			wp_send_json_success( [
-				'id'     => $id,
-				'status' => $status,
-				'msg'    => $msg
+				'id'        => $id,
+				'status'    => $status,
+				'post_time' => $args['date'],
+				'msg'       => $msg
 			] );
 		}
 	}

From c19f2025b0471a5c4e6d9c96f3fd02b6fb9ae47f Mon Sep 17 00:00:00 2001
From: Linkon Miyan <rudlinkon@gmail.com>
Date: Thu, 26 Aug 2021 14:07:09 +0600
Subject: [PATCH 20/22] Button text updated with condition

---
 includes/Admin.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/includes/Admin.php b/includes/Admin.php
index 5af54305..8c06d1e1 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -380,7 +380,8 @@ public function schedulepress_el_tab () { ?>
 						    wp_nonce_field( 'wpsp-el-editor', 'wpsp-el-editor' );
 						    $post_id   = get_the_ID();
 						    $post      = get_post( $post_id );
-						    $is_future = get_post_status( $post_id ) === 'future';
+						    $status    = get_post_status( $post_id );
+						    $is_future = $status === 'future';
 						    ?>
                             <input type="hidden" name="action" value="wpsp_el_editor_form">
                             <input type="hidden" name="id" value="<?php echo $post_id; ?>">
@@ -409,6 +410,8 @@ public function schedulepress_el_tab () { ?>
                         <?php
                         if ( $is_future ) {
 	                        esc_html_e( 'Schedule', 'wp-scheduled-posts' );
+                        } elseif( $status == 'publish') {
+	                        esc_html_e( 'Update', 'wp-scheduled-posts' );
                         } else {
 	                        esc_html_e( 'Publish', 'wp-scheduled-posts' );
                         }

From 2b41f02e667bad9f7cca2495313252c6a3472b49 Mon Sep 17 00:00:00 2001
From: Nahid Hasan Tushar <tusharhasan08@gmail.com>
Date: Sun, 29 Aug 2021 12:37:30 +0600
Subject: [PATCH 21/22] readme updated

---
 readme.txt             | 8 ++++++--
 wp-scheduled-posts.php | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/readme.txt b/readme.txt
index ca44b0eb..ea872382 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,9 +2,9 @@
 Contributors: wpdevteam, Asif2BD, re_enter_rupok, priyomukul, shajalal, tusharimran
 Tags: post schedule, editor calendar, schedule-calendar, editorial calendar, social share, auto share, facebook, twitter, pinterest, linkedin, schedule bar, scheduled posts, schedule, SchedulePress, schedule widget, scheduler, schedule menu bar, admin bar, dashboard widget, missed scheduled, calendar, missed schedule, future post, schedule issue, post later, admin bar, admin, multi author, auto publish, inbound marketing, content marketing, auto post, post publish, social media automation, automation, marketing, content editing, post alert, facebook marketing, auto sharing, content calendar
 Requires at least: 4.0
-Tested up to: 5.7
+Tested up to: 5.8
 Requires PHP: 5.4
-Stable tag: 4.0.4
+Stable tag: 4.1.0
 License: GPLv3 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -187,6 +187,10 @@ Contact at WPDeveloper.net [Support Page](https://wpdeveloper.net/support)
 
 == Changelog ==
 
+= 4.1.0 - 2021-08-29 =
+* Added: Scheduling feature in Elementor editor.
+* Fixed: Few minor bug fix & improvements
+
 = 4.0.4 - 2021-06-30 =
 * Removed: WPDeveloper Feed Widget 
 * Updated: Default data saving fallback logic in the Settings Page 
diff --git a/wp-scheduled-posts.php b/wp-scheduled-posts.php
index a0033a3d..9d870367 100644
--- a/wp-scheduled-posts.php
+++ b/wp-scheduled-posts.php
@@ -2,7 +2,7 @@
 /*
  * Plugin Name: SchedulePress (Formerly Known as WP Scheduled Posts)
  * Description: Automate your content workflow with SchedulePress. Take a quick glance at your content planning with Schedule Calendar, Dashboard widget & Sitewide admin bar. Instantly share your posts on social media platforms such as Facebook, Twitter & many more.
- * Version: 4.0.4
+ * Version: 4.1.0
  * Author: WPDeveloper
  * Author URI: https://wpdeveloper.net
  * Text Domain: wp-scheduled-posts
@@ -46,7 +46,7 @@ public function define_constants()
 		/**
 		 * Defines CONSTANTS for Whole plugins.
 		 */
-		define('WPSP_VERSION', '4.0.4');
+		define('WPSP_VERSION', '4.1.0');
 		define('WPSP_SETTINGS_NAME', 'wpsp_settings');
 		define('WPSP_PLUGIN_FILE', __FILE__);
 		define('WPSP_PLUGIN_BASENAME', plugin_basename(__FILE__));

From b9da40b0383f7e7a378faea00c72bad54729d05e Mon Sep 17 00:00:00 2001
From: M Asif Rahman <asif2bd@gmail.com>
Date: Sun, 29 Aug 2021 13:54:01 +0600
Subject: [PATCH 22/22] readme update for 4.1.0

---
 readme.txt | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/readme.txt b/readme.txt
index ea872382..4b702cfd 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
-=== SchedulePress (a.k.a. WP Scheduled Posts) - Missed Schedule, Auto Social Share & Best Editorial Calendar ===
-Contributors: wpdevteam, Asif2BD, re_enter_rupok, priyomukul, shajalal, tusharimran
-Tags: post schedule, editor calendar, schedule-calendar, editorial calendar, social share, auto share, facebook, twitter, pinterest, linkedin, schedule bar, scheduled posts, schedule, SchedulePress, schedule widget, scheduler, schedule menu bar, admin bar, dashboard widget, missed scheduled, calendar, missed schedule, future post, schedule issue, post later, admin bar, admin, multi author, auto publish, inbound marketing, content marketing, auto post, post publish, social media automation, automation, marketing, content editing, post alert, facebook marketing, auto sharing, content calendar
+=== SchedulePress - Best Editorial Calendar, Missed Schedule & Auto Social Share to Facebook, Twitter  ===
+Contributors: wpdevteam, Asif2BD, re_enter_rupok, priyomukul, shajalal, tusharimran, rudlinkon
+Tags: post schedule, editor calendar, schedule-calendar, editorial calendar, social share, auto share, facebook, twitter, pinterest, linkedin, schedule bar, scheduled posts, schedule, SchedulePress, schedule widget, scheduler, Elementor schedule, admin bar, dashboard widget, missed scheduled, calendar, missed schedule, future post, schedule issue, post later, admin bar, admin, multi author, auto publish, inbound marketing, content marketing, auto post, post publish, social media automation, automation, marketing, content editing, post alert, auto sharing, content calendar
 Requires at least: 4.0
 Tested up to: 5.8
 Requires PHP: 5.4
@@ -42,6 +42,7 @@ https://youtu.be/oBD7MbtWvcQ
 <li>Auto publish missed schedule posts [PRO]</li>
 <li>Automatically share on selected dates regularly [PRO]</li>
 <li>Auto share blogs on multi social profiles [PRO]</li>
+<li><strong>[New] Full Scheduling feature in Elementor</strong></li>
 </ul>
 
 
@@ -430,5 +431,5 @@ Contact at WPDeveloper.net [Support Page](https://wpdeveloper.net/support)
 
 
 == Upgrade Notice ==
-= 4.0.4 - 2021-06-30 =
-* Minor Update.
\ No newline at end of file
+= 4.1.0 - 2021-08-29 =
+* Major Update: Elementor Integration
\ No newline at end of file