[5.x] Fix delayed until on pending jobs screen (#907)

laravel · Oct 9, 2020 · d6d65a8 · d6d65a8
1 parent 8fbe705
commit d6d65a8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/resources/js/screens/recentJobs/job-row.vue b/resources/js/screens/recentJobs/job-row.vue
@@ -58,9 +58,12 @@
             },
 
             delayed() {
-                if (this.unserialized && this.unserialized.delay) {
+                if (this.unserialized && this.unserialized.delay && this.unserialized.delay.date) {
                     return moment.tz(this.unserialized.delay.date, this.unserialized.delay.timezone)
                         .fromNow(true);
+                } else if (this.unserialized && this.unserialized.delay) {
+                    return this.formatDate(this.job.payload.pushedAt).add(this.unserialized.delay, 'seconds')
+                        .fromNow(true);
                 }
 
                 return null;

diff --git a/resources/js/screens/recentJobs/job.vue b/resources/js/screens/recentJobs/job.vue
@@ -120,10 +120,14 @@
                     //
                 }
 
-                if (unserialized && unserialized.delay) {
+                if (unserialized && unserialized.delay && unserialized.delay.date) {
                     return moment.tz(unserialized.delay.date, unserialized.delay.timezone)
                         .local()
                         .format('YYYY-MM-DD HH:mm:ss');
+                } else if (unserialized && unserialized.delay) {
+                    return this.formatDate(this.job.payload.pushedAt).add(unserialized.delay, 'seconds')
+                        .local()
+                        .format('YYYY-MM-DD HH:mm:ss');
                 }
 
                 return null;