mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-05-16 18:25:01 +00:00
- added it_test_user_timezone
- refactored set_time_by_user_timezone
This commit is contained in:
@@ -121,8 +121,7 @@ class Folder extends Model
|
||||
public function getCreatedAtAttribute(): string
|
||||
{
|
||||
return format_date(
|
||||
set_time_by_user_timezone($this->attributes['created_at']),
|
||||
__t('time')
|
||||
set_time_by_user_timezone($this->attributes['created_at']), __t('time')
|
||||
);
|
||||
}
|
||||
|
||||
@@ -136,8 +135,7 @@ class Folder extends Model
|
||||
}
|
||||
|
||||
return format_date(
|
||||
set_time_by_user_timezone($this->attributes['deleted_at']),
|
||||
__t('time')
|
||||
set_time_by_user_timezone($this->attributes['deleted_at']), __t('time')
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
* @method static find(array|string $setting)
|
||||
* @property string value
|
||||
* @property string name
|
||||
* @property mixed timezone
|
||||
*/
|
||||
class Setting extends Model
|
||||
{
|
||||
|
||||
@@ -926,21 +926,18 @@ if (! function_exists('get_files_for_zip')) {
|
||||
if (! function_exists('set_time_by_user_timezone')) {
|
||||
/**
|
||||
* Set time by user timezone GMT
|
||||
*
|
||||
* @param $time
|
||||
* @return Carbon
|
||||
*/
|
||||
function set_time_by_user_timezone($time)
|
||||
function set_time_by_user_timezone(string $time): string|Carbon
|
||||
{
|
||||
$user = Auth::user();
|
||||
|
||||
if ($user) {
|
||||
$time_zone = intval($user->settings->timezone * 60 ?? null);
|
||||
$time_zone = $user->settings->timezone ?? 0;
|
||||
|
||||
return Carbon::parse($time)->addMinutes($time_zone ?? 0);
|
||||
return Carbon::parse($time)->addMinutes($time_zone * 60);
|
||||
}
|
||||
|
||||
return Carbon::parse($time);
|
||||
return $time;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user