From 07601a7130bccfee255d6a24f357b997ec5bdcac Mon Sep 17 00:00:00 2001
From: Mohit Panjwani <mohit.panjvani@gmail.com>
Date: Sat, 23 Nov 2019 13:15:58 +0530
Subject: [PATCH] refactor update listener and reload browser window on update
 success

---
 app/Listeners/Updates/Listener.php               | 4 ++--
 app/Listeners/Updates/v1/Version110.php          | 2 +-
 resources/assets/js/plugins/en.js                | 2 +-
 resources/assets/js/plugins/es.js                | 2 +-
 resources/assets/js/plugins/fr.js                | 2 +-
 resources/assets/js/views/settings/UpdateApp.vue | 4 ++++
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/Listeners/Updates/Listener.php b/app/Listeners/Updates/Listener.php
index 4e44d98c..3bb0f650 100644
--- a/app/Listeners/Updates/Listener.php
+++ b/app/Listeners/Updates/Listener.php
@@ -12,10 +12,10 @@ class Listener
      * @param  $event
      * @return boolean
      */
-    protected function check($event)
+    protected function isListenerFired($event)
     {
         // Do not apply to the same or newer versions
-        if (version_compare(static::VERSION, $event->old, '>')) {
+        if (version_compare(static::VERSION, $event->old, '<')) {
             return true;
         }
 
diff --git a/app/Listeners/Updates/v1/Version110.php b/app/Listeners/Updates/v1/Version110.php
index 1dc39c26..ca949346 100644
--- a/app/Listeners/Updates/v1/Version110.php
+++ b/app/Listeners/Updates/v1/Version110.php
@@ -29,7 +29,7 @@ class Version110
      */
     public function handle(UpdateFinished $event)
     {
-        if (!$this->check($event)) {
+        if ($this->isListenerFired($event)) {
             return;
         }
 
diff --git a/resources/assets/js/plugins/en.js b/resources/assets/js/plugins/en.js
index 1fedaff4..50b9fc77 100644
--- a/resources/assets/js/plugins/en.js
+++ b/resources/assets/js/plugins/en.js
@@ -689,7 +689,7 @@ export default {
       update: 'Update Now',
       update_progress: 'Update in progress...',
       progress_text: 'It will just take a few minutes. Please do not refresh the screen or close the window before the update finishes',
-      update_success: 'App has been updated successfully',
+      update_success: 'App has been updated! Please wait while your browser window gets reloaded automatically.',
       latest_message: 'No update available! You are on the latest version.',
       current_version: 'Current Version'
     }
diff --git a/resources/assets/js/plugins/es.js b/resources/assets/js/plugins/es.js
index 17ad6295..294dc25b 100644
--- a/resources/assets/js/plugins/es.js
+++ b/resources/assets/js/plugins/es.js
@@ -685,7 +685,7 @@ export default {
       update: 'Actualizar',
       update_progress: 'Actualización en progreso...',
       progress_text: 'Solo tomará unos minutos. No actualice la pantalla ni cierre la ventana antes de que finalice la actualización.',
-      update_success: 'La aplicación se actualizó correctamente',
+      update_success: '¡La aplicación ha sido actualizada! Espere mientras la ventana de su navegador se vuelve a cargar automáticamente.',
       latest_message: '¡Actualización no disponible! Estás en la última versión.',
       current_version: 'Versión actual'
     }
diff --git a/resources/assets/js/plugins/fr.js b/resources/assets/js/plugins/fr.js
index 3d7aa91a..ca072ca2 100644
--- a/resources/assets/js/plugins/fr.js
+++ b/resources/assets/js/plugins/fr.js
@@ -688,7 +688,7 @@ export default {
       update: 'Mettre à jour maintenant',
       update_progress: 'Mise à jour en cours...',
       progress_text: "Cela ne prendra que quelques minutes. S'il vous plaît ne pas actualiser l'écran ou fermer la fenêtre avant la fin de la mise à jour",
-      update_success: "L'application a été mise à jour avec succès",
+      update_success: 'App a été mis à jour! Veuillez patienter pendant le rechargement automatique de la fenêtre de votre navigateur.',
       latest_message: 'Pas de mise a jour disponible! Vous êtes sur la dernière version.',
       current_version: 'Version actuelle'
     }
diff --git a/resources/assets/js/views/settings/UpdateApp.vue b/resources/assets/js/views/settings/UpdateApp.vue
index 58e301e5..e3b2beb2 100644
--- a/resources/assets/js/views/settings/UpdateApp.vue
+++ b/resources/assets/js/views/settings/UpdateApp.vue
@@ -73,6 +73,10 @@ export default {
           this.isUpdateAvailable = false
           window.toastr['success'](this.$t('settings.update_app.update_success'))
           this.currentVersion = this.updateData.version
+
+          setTimeout(() => {
+            location.reload()
+          }, 2000)
         } else {
           console.log(res.data)
           window.toastr['error'](res.data.error)