From a100671cc040f318c14d5ea1afe1f2632ac6cade Mon Sep 17 00:00:00 2001
From: Milos Holba <milosholba78@gmail.com>
Date: Mon, 4 Jan 2021 12:09:23 +0100
Subject: [PATCH] timezone change int do decimal fix set_time_by_user_timezone
 function

---
 app/Http/Helpers/helpers.php                  | 13 ++++--
 ...26_add_timezone_to_user_settings_table.php |  2 +-
 public/mix-manifest.json                      | 41 +++----------------
 resources/js/views/User/Settings.vue          | 10 +++--
 4 files changed, 22 insertions(+), 44 deletions(-)

diff --git a/app/Http/Helpers/helpers.php b/app/Http/Helpers/helpers.php
index df79d867..d6542705 100644
--- a/app/Http/Helpers/helpers.php
+++ b/app/Http/Helpers/helpers.php
@@ -778,8 +778,15 @@ function set_time_by_user_timezone($time)
 {
     $user = Auth::user();
 
-    // Get the value of timezone if user have some
-    $time_zone = intval($user->settings->timezone * 60 ?? null);
+    if($user) {
 
-    return Carbon::parse($time)->addMinutes($time_zone ?? null);
+        // Get the value of timezone if user have some
+        $time_zone = intval($user->settings->timezone * 60 ?? null);
+
+        return Carbon::parse($time)->addMinutes($time_zone ?? null);
+    }
+    if(! $user) {
+
+        return Carbon::parse($time);
+    }
 }
diff --git a/database/migrations/2021_01_03_164426_add_timezone_to_user_settings_table.php b/database/migrations/2021_01_03_164426_add_timezone_to_user_settings_table.php
index 06eb00e9..b9782a54 100644
--- a/database/migrations/2021_01_03_164426_add_timezone_to_user_settings_table.php
+++ b/database/migrations/2021_01_03_164426_add_timezone_to_user_settings_table.php
@@ -14,7 +14,7 @@ class AddTimezoneToUserSettingsTable extends Migration
     public function up()
     {
         Schema::table('user_settings', function (Blueprint $table) {
-            $table->integer('timezone')->after('billing_phone_number')->nullable();
+            $table->decimal('timezone', 10, 1)->after('billing_phone_number')->nullable();
         });
     }
 
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 14828e31..da3946c4 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -44,7 +44,7 @@
     "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=e608674e1719be65fe6f",
     "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=8655313c7b71b1019c8f",
     "/chunks/plans.js": "/chunks/plans.js?id=d6d92de642403caa999b",
-    "/chunks/profile.js": "/chunks/profile.js?id=abfb1dad3d8fdce92787",
+    "/chunks/profile.js": "/chunks/profile.js?id=23c87f7bf1499e72b353",
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=f9e2ea1515204b5c63b6",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=91a470e84a34587f3944",
     "/chunks/settings.js": "/chunks/settings.js?id=87d29c7fd4e0e6f1a3bd",
@@ -75,39 +75,8 @@
     "/chunks/user-storage.js": "/chunks/user-storage.js?id=5cfec8a8f8a8aef24ef2",
     "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=34603496ceacb8bd2da3",
     "/chunks/users.js": "/chunks/users.js?id=6e68cb068f69fba3199c",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.0d42e15c9fc9a17db140.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.0d42e15c9fc9a17db140.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.0d1d9e9d24b672e0eb4d.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.0d1d9e9d24b672e0eb4d.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.00d1c9d50337238888d6.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.00d1c9d50337238888d6.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.69875e53b11bb1bd4a9d.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.69875e53b11bb1bd4a9d.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.c4cded7f2584ba7f58ec.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.c4cded7f2584ba7f58ec.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.eb22772495bd39a4ca16.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.eb22772495bd39a4ca16.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.2d3b6de84e5ca46a2a3b.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.2d3b6de84e5ca46a2a3b.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.fb39421b71d4211adaf9.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.fb39421b71d4211adaf9.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.dfebbee6812986456b84.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.dfebbee6812986456b84.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.9a4b54ecb21b0e9e5d62.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.9a4b54ecb21b0e9e5d62.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.22ca8324730e2b3d844c.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.22ca8324730e2b3d844c.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.af3996aaf217a7e41cf9.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.af3996aaf217a7e41cf9.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.9ba89a575c6d5c664c26.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.9ba89a575c6d5c664c26.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.d9f1862daa9b39627335.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.d9f1862daa9b39627335.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.9c7c11a70f6ca143a73e.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.9c7c11a70f6ca143a73e.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.195fbecc5f0cddfead17.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.195fbecc5f0cddfead17.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.f8baf448ac3897f2a01d.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.f8baf448ac3897f2a01d.hot-update.js",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.a48e830506afe0f3db58.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.a48e830506afe0f3db58.hot-update.js",
-    "/chunks/profile.9bbd067322086f669c7f.hot-update.js": "/chunks/profile.9bbd067322086f669c7f.hot-update.js",
-    "/chunks/profile.5caad98642a195d5c402.hot-update.js": "/chunks/profile.5caad98642a195d5c402.hot-update.js",
-    "/chunks/profile.16965358d677097b2876.hot-update.js": "/chunks/profile.16965358d677097b2876.hot-update.js",
-    "/chunks/profile.6757cd9355c2ae37fa81.hot-update.js": "/chunks/profile.6757cd9355c2ae37fa81.hot-update.js",
-    "/chunks/profile.58467e9a426eb06fe7e8.hot-update.js": "/chunks/profile.58467e9a426eb06fe7e8.hot-update.js",
-    "/chunks/profile.0e178ae895ce6f15a656.hot-update.js": "/chunks/profile.0e178ae895ce6f15a656.hot-update.js",
-    "/chunks/profile.9e8431547a69ee335a52.hot-update.js": "/chunks/profile.9e8431547a69ee335a52.hot-update.js",
-    "/chunks/profile.8b872787490512864078.hot-update.js": "/chunks/profile.8b872787490512864078.hot-update.js",
-    "/js/main.914e014ba4448b5fd12c.hot-update.js": "/js/main.914e014ba4448b5fd12c.hot-update.js",
-    "/js/main.b6937cd8d5084f9cdee9.hot-update.js": "/js/main.b6937cd8d5084f9cdee9.hot-update.js",
-    "/chunks/profile.b72bfd249a1398fa9112.hot-update.js": "/chunks/profile.b72bfd249a1398fa9112.hot-update.js",
-    "/chunks/profile.930b438250c236f4503d.hot-update.js": "/chunks/profile.930b438250c236f4503d.hot-update.js",
-    "/chunks/profile.97fa89c4a4697afec88b.hot-update.js": "/chunks/profile.97fa89c4a4697afec88b.hot-update.js",
-    "/chunks/profile.b1f78aeb1e02d400b21f.hot-update.js": "/chunks/profile.b1f78aeb1e02d400b21f.hot-update.js",
-    "/chunks/profile.ac7401c63080dabe647a.hot-update.js": "/chunks/profile.ac7401c63080dabe647a.hot-update.js",
-    "/chunks/profile.9e5657a7d7234d922466.hot-update.js": "/chunks/profile.9e5657a7d7234d922466.hot-update.js",
-    "/chunks/profile.cc7877e8ededddef67ca.hot-update.js": "/chunks/profile.cc7877e8ededddef67ca.hot-update.js"
+    "/chunks/profile.bbedc649c9557c611540.hot-update.js": "/chunks/profile.bbedc649c9557c611540.hot-update.js",
+    "/chunks/profile.f7f0ad1144c4a00d179b.hot-update.js": "/chunks/profile.f7f0ad1144c4a00d179b.hot-update.js",
+    "/chunks/profile.b44a1841612eeeeddbbb.hot-update.js": "/chunks/profile.b44a1841612eeeeddbbb.hot-update.js",
+    "/chunks/profile.262502d6c340ecff7f8b.hot-update.js": "/chunks/profile.262502d6c340ecff7f8b.hot-update.js"
 }
diff --git a/resources/js/views/User/Settings.vue b/resources/js/views/User/Settings.vue
index 71b98710..6560f4e6 100644
--- a/resources/js/views/User/Settings.vue
+++ b/resources/js/views/User/Settings.vue
@@ -108,14 +108,16 @@
 
          <PageTabGroup v-if="userInfo">
             <div class="form block-form">
-                <FormLabel>User Timezone</FormLabel>
+                <FormLabel>Timezone</FormLabel>
                 <div class="block-wrapper">
-                    <label>Timezone</label>
+                    <label>GMT:</label>
                     <div class="input-wrapper">
                         <input @change="$updateText('/user/relationships/settings', 'timezone', userTimezone)"
                                 v-model="userTimezone"
-                               placeholder="Type your timezone"
-                               type="number"
+                                placeholder="Type your GMT"
+                                type="number"
+                                max='30'
+                                min='-30'
                         />
                         <small class="input-help">
                             Set your timezone by type the hours of your GMT : 1, -5, 1.5