use provided timezone for delay due

laravel · Feb 20, 2020 · aa69357 · aa69357
1 parent 42f5656
commit aa69357
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/public/app.js b/public/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=a1d687fa187d60549f6a",
+    "/app.js": "/app.js?id=d0c3a4150154ed18692d",
     "/app.css": "/app.css?id=81fbc8fec874ad3203d7",
     "/app-dark.css": "/app-dark.css?id=3d68663a6ab8e86cb5dc"
 }
diff --git a/resources/js/screens/recentJobs/job.vue b/resources/js/screens/recentJobs/job.vue
@@ -103,8 +103,12 @@
             },
 
             delayed() {
-                if(this.unserialized && this.unserialized.delay){
-                    return moment.utc(this.unserialized.delay.date).local().format('YYYY-MM-DD HH:mm:ss');
+                let unserialized = phpunserialize(this.job.payload.data.command);
+
+                if (unserialized && unserialized.delay) {
+                    return moment.tz(unserialized.delay.date, unserialized.delay.timezone)
+                        .local()
+                        .format('YYYY-MM-DD HH:mm:ss');
                 }
 
                 return null;