From 2f5f2ac4ba552673401221c76e27f6494ede8b1e Mon Sep 17 00:00:00 2001
From: batmnkh2344 <batmnkh2344@gmail.com>
Date: Thu, 2 Oct 2025 16:38:12 +0800
Subject: [PATCH 1/3] chore: add timezone selector on general settings

---
 .../modules/app/components/SettingsRoutes.tsx | 14 +++----
 .../src/modules/settings/constants/data.ts    | 11 ++---
 .../general/components/GeneralSettings.tsx    | 40 ++++++++++++-------
 .../general/components/SelectTimezone.tsx     | 25 ++++++++++++
 .../general/hooks/useGeneralSettingsForms.tsx |  8 ++--
 .../modules/settings/general/schema/index.ts  |  1 +
 .../src/modules/types/paths/SettingsPath.ts   |  2 +-
 .../workspace/GeneralSettingsPage.tsx         | 26 +++++++-----
 8 files changed, 85 insertions(+), 42 deletions(-)
 create mode 100644 frontend/core-ui/src/modules/settings/general/components/SelectTimezone.tsx

diff --git a/frontend/core-ui/src/modules/app/components/SettingsRoutes.tsx b/frontend/core-ui/src/modules/app/components/SettingsRoutes.tsx
index 5bcb8d7d95..995f3e5a69 100644
--- a/frontend/core-ui/src/modules/app/components/SettingsRoutes.tsx
+++ b/frontend/core-ui/src/modules/app/components/SettingsRoutes.tsx
@@ -32,11 +32,11 @@ const SettingsMailConfig = lazy(() =>
     default: module.MailConfigPage,
   })),
 );
-// const GeneralSettings = lazy(() =>
-//   import('~/pages/settings/workspace/GeneralSettingsPage').then((module) => ({
-//     default: module.GeneralSettingsPage,
-//   })),
-// );
+const GeneralSettings = lazy(() =>
+  import('~/pages/settings/workspace/GeneralSettingsPage').then((module) => ({
+    default: module.GeneralSettingsPage,
+  })),
+);
 const TeamMemberSettings = lazy(() =>
   import('~/pages/settings/workspace/TeamMemberPage').then((module) => ({
     default: module.TeamMemberPage,
@@ -123,10 +123,10 @@ export function SettingsRoutes() {
           path={SettingsWorkspacePath.MailConfig}
           element={<SettingsMailConfig />}
         />
-        {/* <Route
+        <Route
           path={SettingsWorkspacePath.General}
           element={<GeneralSettings />}
-        /> */}
+        />
         <Route
           path={SettingsWorkspacePath.TeamMember}
           element={<TeamMemberSettings />}
diff --git a/frontend/core-ui/src/modules/settings/constants/data.ts b/frontend/core-ui/src/modules/settings/constants/data.ts
index fa0ca57122..0967362026 100644
--- a/frontend/core-ui/src/modules/settings/constants/data.ts
+++ b/frontend/core-ui/src/modules/settings/constants/data.ts
@@ -4,6 +4,7 @@ import {
   TSettingPath,
 } from '@/types/paths/SettingsPath';
 import {
+  IconAdjustmentsAlt,
   IconChessKnight,
   IconFile,
   IconMail,
@@ -120,6 +121,11 @@ export const SETTINGS_PATH_DATA: { [key: string]: TSettingPath[] } = {
     // },
   ],
   nav: [
+    {
+      name: 'General',
+      icon: IconAdjustmentsAlt,
+      path: SettingsWorkspacePath.General,
+    },
     {
       name: 'Team member',
       icon: IconUsersGroup,
@@ -130,11 +136,6 @@ export const SETTINGS_PATH_DATA: { [key: string]: TSettingPath[] } = {
       icon: IconUserCog,
       path: SettingsWorkspacePath.Permissions,
     },
-    // {
-    //   name: 'General',
-    //   icon: IconAdjustmentsAlt,
-    //   path: SettingsWorkspacePath.General,
-    // },
     {
       name: 'File upload',
       icon: IconFile,
diff --git a/frontend/core-ui/src/modules/settings/general/components/GeneralSettings.tsx b/frontend/core-ui/src/modules/settings/general/components/GeneralSettings.tsx
index 3390db129b..adbc100e49 100644
--- a/frontend/core-ui/src/modules/settings/general/components/GeneralSettings.tsx
+++ b/frontend/core-ui/src/modules/settings/general/components/GeneralSettings.tsx
@@ -1,16 +1,17 @@
-import { useEffect } from 'react';
-import { useSwitchLanguage } from '~/i18n';
-import { SubmitHandler } from 'react-hook-form';
-import { Button, Form, Spinner, useToast } from 'erxes-ui';
 import { useConfig } from '@/settings/file-upload/hook/useConfigs';
-import { SelectCurrency } from '@/settings/general/components/SelectCurrency';
-import { TGeneralSettingsProps } from '@/settings/general/types';
 import { TConfig } from '@/settings/file-upload/types';
 import { GeneralSettingsSkeleton } from '@/settings/general/components/GeneralSettingsSkeleton';
-import { useGeneralSettingsForms } from '@/settings/general/hooks/useGeneralSettingsForms';
 import SelectControl from '@/settings/general/components/SelectControl';
-import { LANGUAGES } from '@/settings/general/constants/data';
+import { SelectCurrency } from '@/settings/general/components/SelectCurrency';
 import { SelectMainCurrency } from '@/settings/general/components/SelectMainCurrency';
+import { SelectTimezone } from '@/settings/general/components/SelectTimezone';
+import { LANGUAGES } from '@/settings/general/constants/data';
+import { useGeneralSettingsForms } from '@/settings/general/hooks/useGeneralSettingsForms';
+import { TGeneralSettingsProps } from '@/settings/general/types';
+import { Button, Form, Spinner, useToast } from 'erxes-ui';
+import { useEffect } from 'react';
+import { SubmitHandler } from 'react-hook-form';
+import { useSwitchLanguage } from '~/i18n';
 
 const GeneralSettings = () => {
   const { languages } = useSwitchLanguage();
@@ -23,19 +24,22 @@ const GeneralSettings = () => {
   const { configs, updateConfig, loading, isLoading } = useConfig();
 
   const updateCurrency = (data: TGeneralSettingsProps) => {
-    const updatedConfigs = configs.reduce(
-      (acc: Record<string, any>, config: TConfig) => {
-        const key = config.code as keyof TGeneralSettingsProps;
-        acc[config.code] = key in data ? data[key] : config.value;
+    const updatedConfigs = {
+      // start with all existing configs
+      ...configs.reduce((acc: Record<string, any>, config: TConfig) => {
+        acc[config.code] = config.value;
         return acc;
-      },
-      {} as Record<string, any>,
-    );
+      }, {} as Record<string, any>),
+      // override/add with new data
+      ...data,
+    };
+
     updateConfig(updatedConfigs);
   };
 
   const submitHandler: SubmitHandler<TGeneralSettingsProps> = (data) => {
     updateCurrency(data);
+
     handleLanguage(data.languageCode).then(() => {
       toast({
         title: 'Updated successfully',
@@ -52,8 +56,13 @@ const GeneralSettings = () => {
       const mainCurrency = configs?.find(
         (data: any) => data.code === 'mainCurrency',
       );
+
+      const timezone = configs?.find((data: any) => data.code === 'TIMEZONE');
+
       methods.setValue('dealCurrency', currencies?.value);
       methods.setValue('mainCurrency', mainCurrency?.value);
+
+      timezone && methods.setValue('TIMEZONE', timezone?.value);
     }
   }, [configs, methods]);
 
@@ -78,6 +87,7 @@ const GeneralSettings = () => {
         />
         <SelectMainCurrency />
         <SelectCurrency />
+        <SelectTimezone />
         <Button disabled={isLoading} type="submit" className="w-1/4 ml-auto">
           {isLoading ? (
             <Spinner className="stroke-white/90 w-4 h-4" />
diff --git a/frontend/core-ui/src/modules/settings/general/components/SelectTimezone.tsx b/frontend/core-ui/src/modules/settings/general/components/SelectTimezone.tsx
new file mode 100644
index 0000000000..44a576fa9f
--- /dev/null
+++ b/frontend/core-ui/src/modules/settings/general/components/SelectTimezone.tsx
@@ -0,0 +1,25 @@
+import { Form, TimezoneSelect } from 'erxes-ui';
+import { useFormContext } from 'react-hook-form';
+import { TGeneralSettingsProps } from '../types';
+
+export function SelectTimezone() {
+  const form = useFormContext<TGeneralSettingsProps>();
+
+  return (
+    <Form.Field
+      control={form.control}
+      name="TIMEZONE"
+      render={({ field }) => (
+        <Form.Item>
+          <Form.Label>Timezone</Form.Label>
+          <Form.Control>
+            <TimezoneSelect
+              value={field.value}
+              onValueChange={field.onChange}
+            />
+          </Form.Control>
+        </Form.Item>
+      )}
+    />
+  );
+}
diff --git a/frontend/core-ui/src/modules/settings/general/hooks/useGeneralSettingsForms.tsx b/frontend/core-ui/src/modules/settings/general/hooks/useGeneralSettingsForms.tsx
index 37f8e3ae1c..185ced4c8b 100644
--- a/frontend/core-ui/src/modules/settings/general/hooks/useGeneralSettingsForms.tsx
+++ b/frontend/core-ui/src/modules/settings/general/hooks/useGeneralSettingsForms.tsx
@@ -1,8 +1,9 @@
-import { useForm } from 'react-hook-form';
-import { TGeneralSettingsProps } from '../types';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { generalSettingsSchema } from '../schema';
+import { detectTimeZone } from 'erxes-ui/utils/localization/detectTimeZone';
+import { useForm } from 'react-hook-form';
 import { AvailableLanguage, useSwitchLanguage } from '~/i18n';
+import { generalSettingsSchema } from '../schema';
+import { TGeneralSettingsProps } from '../types';
 
 const useGeneralSettingsForms = () => {
   const { currentLanguage, switchLanguage } = useSwitchLanguage();
@@ -14,6 +15,7 @@ const useGeneralSettingsForms = () => {
       CHECK_TEAM_MEMBER_SHOWN: false,
       BRANCHES_MASTER_TEAM_MEMBERS_IDS: [],
       DEPARTMENTS_MASTER_TEAM_MEMBERS_IDS: [],
+      TIMEZONE: detectTimeZone(),
     },
     resolver: zodResolver(generalSettingsSchema),
   });
diff --git a/frontend/core-ui/src/modules/settings/general/schema/index.ts b/frontend/core-ui/src/modules/settings/general/schema/index.ts
index ef4e77e80a..aa96f9d056 100644
--- a/frontend/core-ui/src/modules/settings/general/schema/index.ts
+++ b/frontend/core-ui/src/modules/settings/general/schema/index.ts
@@ -10,6 +10,7 @@ const generalSettingsSchema = z.object({
   CHECK_TEAM_MEMBER_SHOWN: z.boolean(),
   BRANCHES_MASTER_TEAM_MEMBERS_IDS: z.string().array(),
   DEPARTMENTS_MASTER_TEAM_MEMBERS_IDS: z.string().array(),
+  TIMEZONE: z.string(),
 });
 
 export { generalSettingsSchema };
diff --git a/frontend/core-ui/src/modules/types/paths/SettingsPath.ts b/frontend/core-ui/src/modules/types/paths/SettingsPath.ts
index 24419ff1f1..5a8c6cf6ce 100644
--- a/frontend/core-ui/src/modules/types/paths/SettingsPath.ts
+++ b/frontend/core-ui/src/modules/types/paths/SettingsPath.ts
@@ -8,7 +8,7 @@ export enum SettingsPath {
 }
 
 export enum SettingsWorkspacePath {
-  // General = 'general',
+  General = 'general',
   FileUpload = 'file-upload',
   MailConfig = 'mail-config',
   Apps = 'apps',
diff --git a/frontend/core-ui/src/pages/settings/workspace/GeneralSettingsPage.tsx b/frontend/core-ui/src/pages/settings/workspace/GeneralSettingsPage.tsx
index bddb3df6c8..e088d0b707 100644
--- a/frontend/core-ui/src/pages/settings/workspace/GeneralSettingsPage.tsx
+++ b/frontend/core-ui/src/pages/settings/workspace/GeneralSettingsPage.tsx
@@ -1,18 +1,22 @@
 import { SettingsBreadcrumbs } from '@/settings/components/SettingsBreadcrumbs';
 import { GeneralSettings } from '@/settings/general/components/GeneralSettings';
+import { PageContainer, ScrollArea } from 'erxes-ui';
 
 export function GeneralSettingsPage() {
   return (
-    <section className="mx-auto max-w-2xl w-full relative">
-      <div className="px-4 h-16 flex items-center">
-        <SettingsBreadcrumbs />
-      </div>
-      <h2 className="font-semibold text-lg mt-4 mb-12 px-4">
-        General settings
-      </h2>
-      <div className="flex flex-col gap-8 px-4 w-full">
-        <GeneralSettings />
-      </div>
-    </section>
+    <PageContainer>
+      <SettingsBreadcrumbs />
+      <ScrollArea>
+        <section className="mx-auto max-w-2xl w-full relative">
+          <h2 className="font-semibold text-lg mt-4 mb-12 px-4">
+            General settings
+          </h2>
+          <div className="flex flex-col gap-8 px-4 w-full h-auto">
+            <GeneralSettings />
+          </div>
+        </section>
+        <ScrollArea.Bar />
+      </ScrollArea>
+    </PageContainer>
   );
 }

From 3f5ec1b339128230ab3c8642a349465d1e640a0d Mon Sep 17 00:00:00 2001
From: batmnkh2344 <batmnkh2344@gmail.com>
Date: Mon, 6 Oct 2025 12:24:25 +0800
Subject: [PATCH 2/3] chore: operation cycle

---
 .../operation_api/src/modules/cycle/utils.ts  | 36 ++++++++------
 .../src/modules/project/utils/charUtils.ts    |  7 +--
 .../src/worker/dailyCheckCycles.ts            | 49 +++++++++++++------
 .../plugins/operation_api/src/worker/index.ts |  2 +-
 .../components/detail/CycleProgressChart.tsx  |  2 +
 5 files changed, 62 insertions(+), 34 deletions(-)

diff --git a/backend/plugins/operation_api/src/modules/cycle/utils.ts b/backend/plugins/operation_api/src/modules/cycle/utils.ts
index f68a15c996..906eb75044 100644
--- a/backend/plugins/operation_api/src/modules/cycle/utils.ts
+++ b/backend/plugins/operation_api/src/modules/cycle/utils.ts
@@ -1,6 +1,7 @@
 import { fillMissingDays } from '@/project/utils/charUtils';
 import { STATUS_TYPES } from '@/status/constants/types';
-import { differenceInCalendarDays, startOfDay } from 'date-fns';
+import { sendTRPCMessage } from 'erxes-api-shared/utils';
+import { tz } from 'moment-timezone';
 import { Types } from 'mongoose';
 import { IModels } from '~/connectionResolvers';
 
@@ -130,6 +131,17 @@ export const getCycleProgressChart = async (
     return [];
   }
 
+  const timezone = await sendTRPCMessage({
+    pluginName: 'core',
+    method: 'query',
+    module: 'configs',
+    action: 'getConfig',
+    input: {
+      code: 'TIMEZONE',
+    },
+    defaultValue: 'UTC',
+  });
+
   const [totalScopeResult] = await models.Task.aggregate([
     {
       $match: { ...filter },
@@ -177,10 +189,10 @@ export const getCycleProgressChart = async (
     {
       $addFields: {
         dayDate: {
-          $dateFromParts: {
-            year: { $year: '$statusChangedDate' },
-            month: { $month: '$statusChangedDate' },
-            day: { $dayOfMonth: '$statusChangedDate' },
+          $dateToString: {
+            format: '%Y-%m-%d',
+            date: '$statusChangedDate',
+            timezone,
           },
         },
         isStarted: { $eq: ['$statusType', STATUS_TYPES.STARTED] },
@@ -210,7 +222,7 @@ export const getCycleProgressChart = async (
     {
       $project: {
         _id: 0,
-        date: { $dateToString: { format: '%Y-%m-%d', date: '$_id' } },
+        date: '$_id',
         started: 1,
         completed: 1,
       },
@@ -238,16 +250,12 @@ export const getCycleProgressChart = async (
     chartData: [],
   };
 
-  const start = startOfDay(new Date(cycle.startDate));
-  const end = startOfDay(new Date(cycle.endDate));
+  const start = tz(new Date(cycle.startDate), timezone);
+  const end = tz(new Date(cycle.endDate), timezone);
 
-  const days = differenceInCalendarDays(end, start) + 1;
+  const days = end.diff(start, 'days') + 1;
 
-  chartData.chartData = fillMissingDays(
-    chartDataAggregation,
-    cycle.startDate,
-    days,
-  );
+  chartData.chartData = fillMissingDays(chartDataAggregation, start, days);
 
   return chartData;
 };
diff --git a/backend/plugins/operation_api/src/modules/project/utils/charUtils.ts b/backend/plugins/operation_api/src/modules/project/utils/charUtils.ts
index a47296212f..0f1b1da1ab 100644
--- a/backend/plugins/operation_api/src/modules/project/utils/charUtils.ts
+++ b/backend/plugins/operation_api/src/modules/project/utils/charUtils.ts
@@ -1,4 +1,5 @@
 import { addDays, differenceInCalendarDays, format } from 'date-fns';
+import { Moment } from 'moment-timezone';
 
 export const fillUntilTargetDate = (
   data: { date: string; started: number; completed: number }[],
@@ -24,7 +25,7 @@ export const fillUntilTargetDate = (
 
 export const fillMissingDays = (
   data: { date: string; started: number; completed: number }[],
-  baseDate: Date,
+  baseDate: Moment,
   totalDays = 7,
 ) => {
   const filledData: { date: string; started: number; completed: number }[] = [];
@@ -32,8 +33,8 @@ export const fillMissingDays = (
   const mapDateToData = new Map(data.map((item) => [item.date, item]));
 
   for (let i = 0; i < totalDays; i++) {
-    const date = addDays(baseDate, i);
-    const key = format(date, 'yyyy-MM-dd');
+    const date = baseDate.clone().add(i, 'days');
+    const key = date.format('YYYY-MM-DD');
     const item = mapDateToData.get(key);
 
     if (item) {
diff --git a/backend/plugins/operation_api/src/worker/dailyCheckCycles.ts b/backend/plugins/operation_api/src/worker/dailyCheckCycles.ts
index a0eaaa8d09..cdfed657b1 100644
--- a/backend/plugins/operation_api/src/worker/dailyCheckCycles.ts
+++ b/backend/plugins/operation_api/src/worker/dailyCheckCycles.ts
@@ -1,48 +1,67 @@
 import { Job } from 'bullmq';
-import { endOfDay } from 'date-fns'; // эсвэл өөр utility
 import {
   getEnv,
-  getSaasOrganizations,
+  getSaasOrganizationsByFilter,
+  sendTRPCMessage,
   sendWorkerQueue,
 } from 'erxes-api-shared/utils';
+import { tz } from 'moment-timezone';
 import { generateModels } from '~/connectionResolvers';
 
 export const dailyCheckCycles = async () => {
   const VERSION = getEnv({ name: 'VERSION' });
 
+  const timezone = await sendTRPCMessage({
+    pluginName: 'core',
+    method: 'query',
+    module: 'configs',
+    action: 'getConfig',
+    input: {
+      code: 'TIMEZONE',
+    },
+    defaultValue: 'UTC',
+  });
+
   if (VERSION && VERSION === 'saas') {
-    const orgs = await getSaasOrganizations();
+    const orgs = await getSaasOrganizationsByFilter({
+      cycleEnabled: true,
+    });
 
     for (const org of orgs) {
-      if (org.enabledcycles) {
-        sendWorkerQueue('operations', 'checkCycle').add('checkCycle', {
-          subdomain: org.subdomain,
-        });
-      }
+      sendWorkerQueue('operations', 'checkCycle').add('checkCycle', {
+        subdomain: org.subdomain,
+        timezone,
+      });
     }
 
     return 'success';
   } else {
     sendWorkerQueue('operations', 'checkCycle').add('checkCycle', {
       subdomain: 'os',
+      timezone,
     });
     return 'success';
   }
 };
 
 export const checkCycle = async (job: Job) => {
-  const { subdomain } = job?.data ?? {};
+  const { subdomain, timezone = 'UTC' } = job?.data ?? {};
+
+  const tzToday = tz(new Date(), timezone);
+
+  if (tzToday.hour() !== 0) {
+    return;
+  }
 
   const models = await generateModels(subdomain);
 
-  const today = new Date();
+  const utcStart = tzToday.startOf('day').toDate();
+  const utcEnd = tzToday.endOf('day').toDate();
 
   const endCycles = await models.Cycle.find({
     isActive: true,
     isCompleted: false,
-    endDate: {
-      $lte: endOfDay(today),
-    },
+    endDate: { $gte: utcStart, $lte: utcEnd },
   });
 
   if (endCycles?.length) {
@@ -54,9 +73,7 @@ export const checkCycle = async (job: Job) => {
   const startCycles = await models.Cycle.find({
     isActive: false,
     isCompleted: false,
-    startDate: {
-      $lte: endOfDay(today),
-    },
+    startDate: { $gte: utcStart, $lte: utcEnd },
   });
 
   if (startCycles?.length) {
diff --git a/backend/plugins/operation_api/src/worker/index.ts b/backend/plugins/operation_api/src/worker/index.ts
index 239fa85ffc..e426175130 100644
--- a/backend/plugins/operation_api/src/worker/index.ts
+++ b/backend/plugins/operation_api/src/worker/index.ts
@@ -10,7 +10,7 @@ export const initMQWorkers = async (redis: any) => {
   await myQueue.upsertJobScheduler(
     'operations-daily-cycles-check',
     {
-      pattern: '0 0 * * *',
+      pattern: '0 * * * *',
       tz: 'UTC',
     },
     {
diff --git a/frontend/plugins/operation_ui/src/modules/cycle/components/detail/CycleProgressChart.tsx b/frontend/plugins/operation_ui/src/modules/cycle/components/detail/CycleProgressChart.tsx
index df0e16de32..c00d45982b 100644
--- a/frontend/plugins/operation_ui/src/modules/cycle/components/detail/CycleProgressChart.tsx
+++ b/frontend/plugins/operation_ui/src/modules/cycle/components/detail/CycleProgressChart.tsx
@@ -107,6 +107,7 @@ export const CycleProgressChart = ({
             dot={false}
             connectNulls={true}
             strokeLinecap="round"
+            activeDot={{ fill: STATUS_COLORS.started, r: 4 }}
           />
           <Area
             dataKey="completed"
@@ -117,6 +118,7 @@ export const CycleProgressChart = ({
             dot={false}
             connectNulls={true}
             strokeLinecap="round"
+            activeDot={{ fill: STATUS_COLORS.completed, r: 4 }}
           />
         </AreaChart>
       </ChartContainer>

From 1db30ac1e3efc0673ab939234436032d53ea9ade Mon Sep 17 00:00:00 2001
From: batmnkh2344 <batmnkh2344@gmail.com>
Date: Mon, 6 Oct 2025 20:16:18 +0800
Subject: [PATCH 3/3] chore: get timezone from org

---
 .../src/worker/dailyCheckCycles.ts            | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/backend/plugins/operation_api/src/worker/dailyCheckCycles.ts b/backend/plugins/operation_api/src/worker/dailyCheckCycles.ts
index cdfed657b1..ffb0da47c2 100644
--- a/backend/plugins/operation_api/src/worker/dailyCheckCycles.ts
+++ b/backend/plugins/operation_api/src/worker/dailyCheckCycles.ts
@@ -1,7 +1,7 @@
 import { Job } from 'bullmq';
 import {
   getEnv,
-  getSaasOrganizationsByFilter,
+  getSaasOrganizations,
   sendTRPCMessage,
   sendWorkerQueue,
 } from 'erxes-api-shared/utils';
@@ -11,31 +11,29 @@ import { generateModels } from '~/connectionResolvers';
 export const dailyCheckCycles = async () => {
   const VERSION = getEnv({ name: 'VERSION' });
 
-  const timezone = await sendTRPCMessage({
-    pluginName: 'core',
-    method: 'query',
-    module: 'configs',
-    action: 'getConfig',
-    input: {
-      code: 'TIMEZONE',
-    },
-    defaultValue: 'UTC',
-  });
-
   if (VERSION && VERSION === 'saas') {
-    const orgs = await getSaasOrganizationsByFilter({
-      cycleEnabled: true,
-    });
+    const orgs = await getSaasOrganizations();
 
     for (const org of orgs) {
       sendWorkerQueue('operations', 'checkCycle').add('checkCycle', {
         subdomain: org.subdomain,
-        timezone,
+        timezone: org.timezone,
       });
     }
 
     return 'success';
   } else {
+    const timezone = await sendTRPCMessage({
+      pluginName: 'core',
+      method: 'query',
+      module: 'configs',
+      action: 'getConfig',
+      input: {
+        code: 'TIMEZONE',
+      },
+      defaultValue: 'UTC',
+    });
+
     sendWorkerQueue('operations', 'checkCycle').add('checkCycle', {
       subdomain: 'os',
       timezone,