Loading plans...
- {currentPlan && (
+ {currentPlan && (
+
-
+
- {currentPlan.badge && (
-
- {currentPlan.badge}
-
- )}
-
+
-
{currentPlan.name}
+
{currentPlan.planName}
{currentPlan.description}
+ {currentPlan.currency?.symbol}
{currentPlan.price}{" "}
- {currentPlan.per}
+ /{selectedBilling?.label.toLowerCase()}
- {currentPlan.subText &&
{currentPlan.subText}
}
- {currentPlan.features.map((feat, i) => (
- -
-
- {feat}
-
- ))}
+ -
+
+ Max Users: {currentPlan.maxUser}
+
+ -
+
+ Storage: {currentPlan.maxStorage} MB
+
+ -
+
+ Trial Days: {currentPlan.trialDays}
+
-
+
- )}
-
-
- {/* Moved the Organization Size dropdown to appear after the details section */}
+
+ )}
+
-
-
@@ -356,4 +136,4 @@ const TenantSubscription = () => {
);
};
-export default TenantSubscription;
\ No newline at end of file
+export default TenantSubscription;
diff --git a/src/components/Tenant/apiTenant.jsx b/src/components/Tenant/apiTenant.jsx
index 130388bd..b2a1b63a 100644
--- a/src/components/Tenant/apiTenant.jsx
+++ b/src/components/Tenant/apiTenant.jsx
@@ -8,4 +8,8 @@ export const apiTenant = {
createTenant: (data) => api.post("api/tenant/create", data),
+ getSubscriptionPlansTenant: (frequency) => api.get(`api/tenant/list/subscription-plan?frequency=${frequency}`),
+
+ createSubscriptionTenant: (data) => api.post("api/tenant/add-subscription", data),
+
};
diff --git a/src/components/Tenant/useTenants.js b/src/components/Tenant/useTenants.js
index 2b9815aa..547edcf9 100644
--- a/src/components/Tenant/useTenants.js
+++ b/src/components/Tenant/useTenants.js
@@ -1,5 +1,10 @@
import { useCallback, useEffect, useState } from "react";
import { apiTenant } from "./apiTenant";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { useDispatch } from "react-redux";
+import { setCurrentTenant } from "../../slices/globalVariablesSlice";
+import showToast from "../../services/toastService";
+import { useNavigate } from "react-router-dom";
export const useTenants = (page = 1, pageSize = 20) => {
const [tenants, setTenants] = useState([]);
@@ -28,33 +33,106 @@ export const useTenants = (page = 1, pageSize = 20) => {
};
-export const useCreateTenant = () => {
- const [loading, setLoading] = useState(false);
- const [data, setData] = useState(null);
- const [error, setError] = useState(null);
- const [success, setSuccess] = useState(false);
+// export const useCreateTenant = () => {
+// const [loading, setLoading] = useState(false);
+// const [data, setData] = useState(null);
+// const [error, setError] = useState(null);
+// const [success, setSuccess] = useState(false);
- const createTenant = useCallback(async (tenantData) => {
- setLoading(true);
- setError(null);
- setData(null);
- setSuccess(false);
+// const createTenant = useCallback(async (tenantData) => {
+// setLoading(true);
+// setError(null);
+// setData(null);
+// setSuccess(false);
- try {
- const res = await apiTenant.createTenant(tenantData);
- setData(res.data);
- setSuccess(true);
- console.log("Tenant created successfully:", res.data);
+// try {
+// const res = await apiTenant.createTenant(tenantData);
+// setData(res.data);
+// setSuccess(true);
+// console.log("Tenant created successfully:", res.data);
+// return res.data;
+// } catch (err) {
+// console.error("Failed to create tenant:", err);
+// setError(err);
+// setSuccess(false);
+// return null;
+// } finally {
+// setLoading(false);
+// }
+// }, []);
+
+// return { createTenant, loading, data, error, success };
+// };
+
+
+export const useCreateTenant = ()=>{
+ const queryClient = useQueryClient();
+ const dispatch = useDispatch();
+ const navigate = useNavigate();
+
+ return useMutation({
+ mutationFn: async (tenantPayload) => {
+ const res = await apiTenant.createTenant(tenantPayload);
return res.data;
- } catch (err) {
- console.error("Failed to create tenant:", err);
- setError(err);
- setSuccess(false);
- return null;
- } finally {
- setLoading(false);
- }
- }, []);
+ },
+ onSuccess:(data,variables)=>{
+ dispatch(setCurrentTenant(data));
+ showToast("Tenant created successfully","sucess");
+ navigate("/tenant/profile/viewtenant", { state: { formData: result } });
+ },
+ onError: (error) => {
+ showToast(error.message || "Failed to mark Tenant", "error");
+ },
+ })
+}
+
+export const createSubscriptionTenant = ()=>{
+ const queryClient = useQueryClient();
+
+ return useMutation({
+ mutationFn: async (subscriptionPayload) => {
+ const res = await apiTenant.createSubscriptionTenant(subscriptionPayload);
+ return res.data;
+ },
+ onSuccess:(data,variables)=>{
+ dispatch(setCurrentTenant(data));
+ showToast("Tenant created successfully","sucess");
+ },
+ onError: (error) => {
+ showToast(error.message || "Failed to mark Tenant", "error");
+ },
+ })
+}
+
+export const useSubscriptionPlans = (frequency) => {
+ const [plans, setPlans] = useState([]);
+ const [loading, setLoading] = useState(false);
+ const [error, setError] = useState(null);
+
+ useEffect(() => {
+ if (!frequency) return;
+
+ const fetchPlans = async () => {
+ setLoading(true);
+ setError(null);
+
+ try {
+ const response = await apiTenant.getSubscriptionPlansTenant(frequency);
+ if (response?.data) {
+ setPlans(response.data);
+ } else {
+ setError("Failed to fetch plans.");
+ }
+ } catch (err) {
+ setError(err.message || "Something went wrong.");
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ fetchPlans();
+ }, [frequency]);
+
+ return { plans, loading, error };
+};
- return { createTenant, loading, data, error, success };
-};
\ No newline at end of file
diff --git a/src/hooks/useAttendance.js b/src/hooks/useAttendance.js
index 05937aa6..8badbba5 100644
--- a/src/hooks/useAttendance.js
+++ b/src/hooks/useAttendance.js
@@ -286,6 +286,7 @@ export const useMarkAttendance = () => {
if(variables.forWhichTab !== 3) showToast("Attendance marked successfully", "success");
},
+
onError: (error) => {
showToast(error.message || "Failed to mark attendance", "error");
},
diff --git a/src/slices/globalVariablesSlice.jsx b/src/slices/globalVariablesSlice.jsx
index 4e14191d..fb985b42 100644
--- a/src/slices/globalVariablesSlice.jsx
+++ b/src/slices/globalVariablesSlice.jsx
@@ -1,9 +1,10 @@
-import { createSlice } from "@reduxjs/toolkit";
+import { createSlice, current } from "@reduxjs/toolkit";
const globalVariablesSlice = createSlice({
name: "globalVariables",
initialState: {
- loginUser:null
+ loginUser:null,
+ currentTenant:null
},
reducers: {
setGlobalVariable: (state, action) => {
@@ -13,9 +14,14 @@ const globalVariablesSlice = createSlice({
setLoginUserPermmisions: ( state, action ) =>
{
state.loginUser = action.payload
+ },
+ setCurrentTenant:(state, action)=>
+ {
+ state.currentTenant = action.payload;
+ localStorage.setItem("currentTenant",state.currentTenant.id);
}
},
});
-export const { setGlobalVariable,setLoginUserPermmisions } = globalVariablesSlice.actions;
+export const { setGlobalVariable,setLoginUserPermmisions,setCurrentTenant } = globalVariablesSlice.actions;
export default globalVariablesSlice.reducer;