- {loading ? (
+ {isOrganizationLoading || isDateFormatsLoading ? (
) : (
diff --git a/client/src/containers/Setup/SetupOrganization.schema.js b/client/src/containers/Setup/SetupOrganization.schema.js
index 3517eb6a0..c3424f5b7 100644
--- a/client/src/containers/Setup/SetupOrganization.schema.js
+++ b/client/src/containers/Setup/SetupOrganization.schema.js
@@ -4,7 +4,7 @@ import intl from 'react-intl-universal';
// Retrieve the setup organization form validation.
export const getSetupOrganizationValidation = () =>
Yup.object().shape({
- organizationName: Yup.string()
+ name: Yup.string()
.required()
.label(intl.get('organization_name_')),
location: Yup.string()
diff --git a/client/src/containers/Setup/SetupOrganizationForm.js b/client/src/containers/Setup/SetupOrganizationForm.js
index e09501a03..b7b26e37c 100644
--- a/client/src/containers/Setup/SetupOrganizationForm.js
+++ b/client/src/containers/Setup/SetupOrganizationForm.js
@@ -36,13 +36,13 @@ export default function SetupOrganizationForm({ isSubmitting, values }) {
{/* ---------- Organization name ---------- */}
-
+
{({ form, field, meta: { error, touched } }) => (
}
className={'form-group--name'}
intent={inputIntent({ error, touched })}
- helperText={}
+ helperText={}
>
diff --git a/client/src/containers/Setup/SetupOrganizationPage.js b/client/src/containers/Setup/SetupOrganizationPage.js
index f81cb8173..2d16c0836 100644
--- a/client/src/containers/Setup/SetupOrganizationPage.js
+++ b/client/src/containers/Setup/SetupOrganizationPage.js
@@ -14,7 +14,7 @@ import { getSetupOrganizationValidation } from './SetupOrganization.schema';
// Initial values.
const defaultValues = {
- organizationName: '',
+ name: '',
location: 'libya',
baseCurrency: '',
language: 'en',
diff --git a/client/src/hooks/query/index.js b/client/src/hooks/query/index.js
index b959a5b93..6ed15f9e9 100644
--- a/client/src/hooks/query/index.js
+++ b/client/src/hooks/query/index.js
@@ -27,3 +27,4 @@ export * from './landedCost';
export * from './UniversalSearch/UniversalSearch';
export * from './GenericResource';
export * from './jobs';
+export * from './misc';
diff --git a/client/src/hooks/query/misc.js b/client/src/hooks/query/misc.js
new file mode 100644
index 000000000..a8cca62b8
--- /dev/null
+++ b/client/src/hooks/query/misc.js
@@ -0,0 +1,16 @@
+import { useRequestQuery } from '../useQueryRequest';
+
+/**
+ * Retrieve the job metadata.
+ */
+export function useDateFormats(props = {}) {
+ return useRequestQuery(
+ ['DATE_FORMATS'],
+ { method: 'get', url: `/date_formats` },
+ {
+ select: (res) => res.data.data,
+ defaultData: [],
+ ...props,
+ },
+ );
+}
diff --git a/client/src/hooks/query/organization.js b/client/src/hooks/query/organization.js
index 47824bad8..7145cd297 100644
--- a/client/src/hooks/query/organization.js
+++ b/client/src/hooks/query/organization.js
@@ -72,3 +72,22 @@ export function useOrganizationSetup() {
},
);
}
+
+/**
+ * Saves the settings.
+ */
+export function useUpdateOrganization(props) {
+ const queryClient = useQueryClient();
+ const apiRequest = useApiRequest();
+
+ return useMutation(
+ (information) => apiRequest.put('organization', information),
+ {
+ onSuccess: () => {
+ queryClient.invalidateQueries(t.ORGANIZATION_CURRENT);
+ queryClient.invalidateQueries(t.ORGANIZATIONS);
+ },
+ ...props,
+ },
+ );
+}
diff --git a/client/src/lang/en/index.json b/client/src/lang/en/index.json
index 32bca45cc..5f4b155a8 100644
--- a/client/src/lang/en/index.json
+++ b/client/src/lang/en/index.json
@@ -1249,5 +1249,6 @@
"billing.suspend_message.description": "Your account has been suspended due to the expiration of the subscription period. Please renew the subscription to activate the account.",
"dashboard.subscription_msg.period_over": "Subscription period is over",
"inventory_adjustment.details_drawer.title": "Inventory adjustment details",
- "setup.organization.location": "Location"
+ "setup.organization.location": "Location",
+ "preferences.general.success_message": "The general preferences has been saved."
}
\ No newline at end of file
diff --git a/client/src/store/authentication/authentication.selectors.js b/client/src/store/authentication/authentication.selectors.js
new file mode 100644
index 000000000..b7d06f030
--- /dev/null
+++ b/client/src/store/authentication/authentication.selectors.js
@@ -0,0 +1,24 @@
+import { defaultTo } from 'lodash';
+import { createSelector } from '@reduxjs/toolkit';
+
+const getCurrentOrganizationId = (state) => state.authentication.organization;
+const getCurrentTenantId = (state) => state.authentication.organizationId;
+const getOrganizationsMap = (state) => state.organizations.data;
+
+// Retrieve organization tenant id.
+export const getOrganizationTenantIdFactory = () =>
+ createSelector(getCurrentTenantId, (tenantId) => tenantId);
+
+// Retrieve organization id.
+export const getOrganizationIdFactory = () =>
+ createSelector(getCurrentOrganizationId, (tenantId) => tenantId);
+
+// Retrieve current organization meta object.
+export const getCurrentOrganizationFactory = () =>
+ createSelector(
+ getCurrentTenantId,
+ getOrganizationsMap,
+ (tenantId, organizationsMap) => {
+ return defaultTo(organizationsMap[tenantId], {});
+ },
+ );
diff --git a/client/src/store/organizations/organizations.reducers.js b/client/src/store/organizations/organizations.reducers.js
index 8e904b2b4..f192208a9 100644
--- a/client/src/store/organizations/organizations.reducers.js
+++ b/client/src/store/organizations/organizations.reducers.js
@@ -1,4 +1,5 @@
import { createReducer } from '@reduxjs/toolkit';
+import { omit } from 'lodash';
import t from 'store/types';
const initialState = {
@@ -16,7 +17,8 @@ const reducer = createReducer(initialState, {
organizations.forEach((organization) => {
_data[organization.id] = {
...state.data[organization.id],
- ...organization,
+ ...organization.metadata,
+ ...omit(organization, ['metadata']),
};
_dataByOrganizationId[organization.organization_id] = organization.id;
});
diff --git a/server/src/api/controllers/Miscellaneous/index.ts b/server/src/api/controllers/Miscellaneous/index.ts
new file mode 100644
index 000000000..8d7099a12
--- /dev/null
+++ b/server/src/api/controllers/Miscellaneous/index.ts
@@ -0,0 +1,41 @@
+import { Inject, Service } from 'typedi';
+import { Router, Request, Response, NextFunction } from 'express';
+import BaseController from 'api/controllers/BaseController';
+import MiscService from 'services/Miscellaneous/MiscService';
+import DateFormatsService from 'services/Miscellaneous/DateFormats';
+
+@Service()
+export default class MiscController extends BaseController {
+ @Inject()
+ dateFormatsService: DateFormatsService;
+
+ /**
+ * Express router.
+ */
+ router() {
+ const router = Router();
+
+ router.get(
+ '/date_formats',
+ this.validationResult,
+ this.asyncMiddleware(this.dateFormats.bind(this))
+ );
+ return router;
+ }
+
+ /**
+ * Retrieve date formats options.
+ * @param {Request} req
+ * @param {Response} res
+ * @param {NextFunction} next
+ */
+ dateFormats(req: Request, res: Response, next: NextFunction) {
+ try {
+ const dateFormats = this.dateFormatsService.getDateFormats();
+
+ return res.status(200).send({ data: dateFormats });
+ } catch (error) {
+ next(error);
+ }
+ }
+}
diff --git a/server/src/api/controllers/Organization.ts b/server/src/api/controllers/Organization.ts
index 933a4312f..71a3bd208 100644
--- a/server/src/api/controllers/Organization.ts
+++ b/server/src/api/controllers/Organization.ts
@@ -13,8 +13,8 @@ import {
ACCEPTED_CURRENCIES,
MONTHS,
ACCEPTED_LOCALES,
- DATE_FORMATS,
} from 'services/Organization/constants';
+import { DATE_FORMATS } from 'services/Miscellaneous/DateFormats/constants';
import { ServiceError } from 'exceptions';
import BaseController from 'api/controllers/BaseController';
@@ -64,7 +64,7 @@ export default class OrganizationController extends BaseController {
*/
private get buildValidationSchema(): ValidationChain[] {
return [
- check('organization_name').exists().trim(),
+ check('name').exists().trim(),
check('base_currency').exists().isIn(ACCEPTED_CURRENCIES),
check('timezone').exists().isIn(moment.tz.names()),
check('fiscal_year').exists().isIn(MONTHS),
diff --git a/server/src/api/index.ts b/server/src/api/index.ts
index 9505b049b..71dd5de54 100644
--- a/server/src/api/index.ts
+++ b/server/src/api/index.ts
@@ -42,6 +42,7 @@ import Licenses from 'api/controllers/Subscription/Licenses';
import InventoryAdjustments from 'api/controllers/Inventory/InventoryAdjustments';
import asyncRenderMiddleware from './middleware/AsyncRenderMiddleware';
import Jobs from './controllers/Jobs';
+import Miscellaneous from 'api/controllers/Miscellaneous';
export default () => {
const app = Router();
@@ -95,6 +96,8 @@ export default () => {
dashboard.use('/media', Container.get(Media).router());
dashboard.use('/inventory_adjustments', Container.get(InventoryAdjustments).router());
+ dashboard.use('/', Container.get(Miscellaneous).router());
+
app.use('/', dashboard);
return app;
diff --git a/server/src/services/Miscellaneous/DateFormats/constants.ts b/server/src/services/Miscellaneous/DateFormats/constants.ts
new file mode 100644
index 000000000..5ae4630c9
--- /dev/null
+++ b/server/src/services/Miscellaneous/DateFormats/constants.ts
@@ -0,0 +1,11 @@
+export const DATE_FORMATS = [
+ 'MM/DD/YY',
+ 'DD/MM/YY',
+ 'YY/MM/DD',
+ 'MM/DD/yyyy',
+ 'DD/MM/yyyy',
+ 'yyyy/MM/DD',
+ 'DD MMM YYYY',
+ 'DD MMMM YYYY',
+ 'MMMM DD, YYYY',
+];
diff --git a/server/src/services/Miscellaneous/DateFormats/index.ts b/server/src/services/Miscellaneous/DateFormats/index.ts
new file mode 100644
index 000000000..2a5bef6d3
--- /dev/null
+++ b/server/src/services/Miscellaneous/DateFormats/index.ts
@@ -0,0 +1,15 @@
+import moment from 'moment-timezone';
+import { Service } from 'typedi';
+import { DATE_FORMATS } from './constants';
+
+@Service()
+export default class DateFormatsService {
+ getDateFormats() {
+ return DATE_FORMATS.map((dateFormat) => {
+ return {
+ label: `${moment().format(dateFormat)} [${dateFormat}]`,
+ key: dateFormat,
+ };
+ });
+ }
+}
diff --git a/server/src/services/Miscellaneous/MiscService.ts b/server/src/services/Miscellaneous/MiscService.ts
new file mode 100644
index 000000000..e24a3b3d3
--- /dev/null
+++ b/server/src/services/Miscellaneous/MiscService.ts
@@ -0,0 +1,8 @@
+import { Service } from 'typedi';
+
+@Service()
+export default class MiscService {
+ getDateFormats() {
+ return [];
+ }
+}
diff --git a/server/src/services/Organization/index.ts b/server/src/services/Organization/index.ts
index 3e8e45ea6..e9a364abf 100644
--- a/server/src/services/Organization/index.ts
+++ b/server/src/services/Organization/index.ts
@@ -1,4 +1,5 @@
import { Service, Inject } from 'typedi';
+import { ObjectId } from 'mongodb';
import { ServiceError } from 'exceptions';
import {
IOrganizationBuildDTO,
@@ -12,7 +13,6 @@ import {
import events from 'subscribers/events';
import TenantsManager from 'services/Tenancy/TenantsManager';
import { Tenant } from 'system/models';
-import { ObjectId } from 'mongodb';
const ERRORS = {
TENANT_NOT_FOUND: 'tenant_not_found',
@@ -137,8 +137,8 @@ export default class OrganizationService {
/**
* Updates organization information.
- * @param {ITenant} tenantId
- * @param {IOrganizationUpdateDTO} organizationDTO
+ * @param {ITenant} tenantId
+ * @param {IOrganizationUpdateDTO} organizationDTO
*/
public async updateOrganization(
tenantId: number,
diff --git a/server/src/system/migrations/20200823235340_create_tenants_metadata_table.js b/server/src/system/migrations/20200823235340_create_tenants_metadata_table.js
index adbe4e774..c8f765b6a 100644
--- a/server/src/system/migrations/20200823235340_create_tenants_metadata_table.js
+++ b/server/src/system/migrations/20200823235340_create_tenants_metadata_table.js
@@ -3,8 +3,9 @@ exports.up = function (knex) {
table.bigIncrements();
table.integer('tenant_id').unsigned();
- table.string('organization_name');
+ table.string('name');
table.string('industry');
+ table.string('location');
table.string('base_currency');
table.string('language');
@@ -13,7 +14,6 @@ exports.up = function (knex) {
table.string('date_format');
table.string('fiscal_year');
- table.string('financial_start_date');
});
};