#1571 frontend

assets/admin/css/admin.css

@@ -5063,6 +5063,12 @@ a.disabled {
 }
 
 /** Migration Settings */
+#upgrade-in-progress,
+#upgrade-done {
+  margin-top: 1rem;
+  display: none;
+}
+
 #migration-in-progress,
 #migration-state,
 #migration-done {

assets/admin/js/admin.js

@@ -239,6 +239,30 @@
 (function($) {
     "use strict";
     $(function() {
+        $("#cmb2-metabox-migration #run-upgrade").on("click", function(event) {
+            event.preventDefault();
+            $("#upgrade-in-progress").show();
+            $("#run-upgrade").hide();
+            let data = {
+                task: 0,
+                "page:": 1
+            };
+            const runUpgrade = data => {
+                $.post(cb_ajax_run_upgrade.ajax_url, {
+                    _ajax_nonce: cb_ajax_run_upgrade.nonce,
+                    action: "cb_run_upgrade",
+                    data: data
+                }, function(data) {
+                    if (data.success) {
+                        $("#upgrade-in-progress").hide();
+                        $("#upgrade-done").show();
+                    } else {
+                        runUpgrade(data);
+                    }
+                });
+            };
+            runUpgrade(data);
+        });
         $("#cmb2-metabox-migration #migration-start").on("click", function(event) {
             event.preventDefault();
             $("#migration-state").show();

assets/admin/js/src/migration.js

@@ -1,6 +1,35 @@
 (function ($) {
     'use strict';
     $(function () {
+        $('#cmb2-metabox-migration #run-upgrade').on('click', function (event) {
+            event.preventDefault();
+            $('#upgrade-in-progress').show();
+            $('#run-upgrade').hide();
+            let data = {
+            'task': 0,
+            'page:': 1,
+            };
+
+            const runUpgrade = (data) => {
+                $.post(
+                    cb_ajax_run_upgrade.ajax_url,
+                    {
+                        _ajax_nonce: cb_ajax_run_upgrade.nonce,
+                        action: "cb_run_upgrade",
+                        data: data
+                    },
+                    function (data) {
+                        if (data.success) {
+                            $('#upgrade-in-progress').hide();
+                            $('#upgrade-done').show();
+                        } else {
+                            runUpgrade(data)
+                        }
+                    });
+            };
+            runUpgrade(data);
+        });
+
         $('#cmb2-metabox-migration #migration-start').on('click', function (event) {
             event.preventDefault();
             $('#migration-state').show();

assets/admin/sass/partials/_migration.scss

@@ -1,3 +1,10 @@
+#upgrade-in-progress,
+#upgrade-done,
+{
+    margin-top: 1rem;
+    display: none;
+}
+
 #migration-in-progress,
 #migration-state,
 #migration-done

includes/Admin.php

@@ -56,6 +56,16 @@ function commonsbooking_admin() {
 		)
 	);
 
+	// \CommonsBooking\Service\Upgrade Ajax tasks
+	wp_localize_script(
+		'cb-scripts-admin',
+		'cb_ajax_run_upgrade',
+		array(
+			'ajax_url' => admin_url( 'admin-ajax.php' ),
+			'nonce'    => wp_create_nonce( 'cb_run_upgrade' ),
+		)
+	);
+
 	// Additional info for CMB2 to handle booking rules
 	wp_add_inline_script(
 		'cb-scripts-admin',

includes/OptionsArray.php

@@ -916,6 +916,21 @@
 		'title'        => __( 'Migration', 'commonsbooking' ),
 		'id'           => 'migration',
 		'field_groups' => array(
+			'upgrade'           => array(
+				'title'  => esc_html__( 'Finish upgrade to latest version', 'commonsbooking' ),
+				'id'     => 'upgrade',
+				'desc'   => commonsbooking_sanitizeHTML( __( 'Click here to finish the upgrade to the latest version. <br> This needs to be done after updating the plugin to a new version. <br> If you do not do this, the plugin may not work correctly.', 'commonsbooking' ) ),
+				'fields' => [
+					array(
+						'name'          => commonsbooking_sanitizeHTML( __( 'Finish upgrade', 'commonsbooking' ) ),
+						'id'            => 'upgrade-custom-field',
+						'type'          => 'text',
+						'render_row_cb' => array( Migration::class, 'renderUpgradeForm' ),
+					)
+				],
+				'show_on_cb'  => array( \CommonsBooking\Service\Upgrade::class, 'isAJAXUpgrade' )
+			),
+			// migration cb1 -> cb2
 			'migration'         => array(
 				'title'  => esc_html__( 'Migrate from Commons Booking Version 0.X', 'commonsbooking' ),
 				'id'     => 'migration',

includes/Public.php

@@ -162,6 +162,7 @@ function commonsbooking_public() {
 if ( is_admin() ) {
 	add_action( 'wp_ajax_cb_start_migration', array( Migration::class, 'migrateAll' ) );
 	add_action( 'wp_ajax_cb_start_booking_migration', array( \CommonsBooking\Migration\Booking::class, 'ajaxMigrate' ) );
+	add_action( 'wp_ajax_cb_run_upgrade', array( \CommonsBooking\Service\Upgrade::class, 'runAJAXUpgradeTasks' ) );
 }
 
 // Map ajax

src/Service/Upgrade.php

@@ -2,6 +2,7 @@
 
 namespace CommonsBooking\Service;
 
+use CommonsBooking\Messages\AdminMessage;
 use CommonsBooking\Model\Timeframe;
 use CommonsBooking\Plugin;
 use CommonsBooking\Settings\Settings;
@@ -124,6 +125,15 @@ public function run(): bool {
 			}
 			//upgrade needs to be run in AJAX
 			if ( $this->getTasksForUpgrade( self::$ajaxUpgradeTasks ) ) {
+				new AdminMessage(
+					'<b>CommonsBooking:</b> ' .
+					__( 'There are some tasks that need to be run to complete the update process. <br> This needs to be done so that the plugin can function correctly.', 'commonsbooking' )
+					. '<br>'
+					. '<a href=' . esc_url( admin_url( 'admin.php?page=commonsbooking_options_migration' ) ) . '>'
+					. __( 'Click here to run the upgrade tasks.', 'commonsbooking' ) . '</a>',
+					'warning'
+				);
+
 				return false;
 			}
 		}

src/View/Migration.php

@@ -110,4 +110,24 @@ public static function renderBookingMigrationForm( array $field_args, CMB2_Field
         );
 	}
 
+	public static function renderUpgradeForm( array $field_args, CMB2_Field $field ) {
+		?>
+		<div class="cmb-row cmb-type-text">
+			<div id="upgrade-in-progress" class="blinking">
+				<strong style="color: red">
+				<?php echo esc_html__( 'upgrade in process .. please wait ...', 'commonsbooking' ); ?>
+				</strong>
+			</div>
+			<div id="upgrade-done">
+				<strong style="color: green">
+				<?php echo esc_html__( 'Upgrade finished', 'commonsbooking' ); ?>
+				</strong>
+			</div>
+			<a id="run-upgrade" class="button button-secondary" href="#">
+				<?php echo esc_html__( 'Start Upgrade', 'commonsbooking' ); ?>
+			</a>
+		</div>
+		<?php
+	}
+
 }