@appcorp/fusion-storybook 0.3.31 → 0.3.32

package/base-modules/student-fee/context/use-student-fee-module.d.ts

@@ -20,7 +20,9 @@ export declare const useStudentFeeModule: () => {
     handleProceedMonthlyCreation: () => Promise<void>;
     handleSearch: (query: string) => void;
     handleSubmit: () => void;
-    handleSubmitSingleEntry: (fees: StudentFeeBE[]) => void;
+    handleSubmitSingleEntry: (fees: {
+        studentFees: StudentFeeBE[];
+    }, amountPaid: string, remarks: string) => Promise<void>;
     handleView: (row?: TableRow) => void;
     headerActions: {
         enabled: boolean;

package/base-modules/student-fee/context/use-student-fee-module.js

@@ -2,7 +2,7 @@
 import { useCallback, useEffect, useMemo, useRef } from "react";
 import { useTheme } from "next-themes";
 import { useTranslations } from "next-intl";
-import { validateForm, isCreatedOrUpdated, getStorageValue, } from "@react-pakistan/util-functions";
+import { validateForm, isCreatedOrUpdated, getStorageValue, API_METHODS, } from "@react-pakistan/util-functions";
 import { useModuleEntityV2, } from "@react-pakistan/util-functions/hooks/use-module-entity-v2";
 import { useDebounce } from "@react-pakistan/util-functions/hooks/use-debounce";
 import { generateThemeToast, TOAST_VARIANT, } from "@appcorp/shadcn/lib/toast-utils";
@@ -28,7 +28,7 @@ export const useStudentFeeModule = () => {
     // ============================================================================
     // 1.4.1 STATE & CORE HOOKS
     // ============================================================================
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const context = useStudentFeeContext();
     const { dispatch } = context;
     const state = context.state;
@@ -566,9 +566,44 @@ export const useStudentFeeModule = () => {
             },
         });
     }, [dispatch, updateParams, t, showToast, updateFetchNow]);
-    const handleSubmitSingleEntry = useCallback((fees) => {
+    const handleSubmitSingleEntry = useCallback(async (fees, amountPaid, remarks) => {
+        var _a, _b;
         console.log("Submitting single entry fees:", fees);
-    }, []);
+        dispatch({
+            type: STUDENT_FEE_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
+            payload: { disabled: true },
+        });
+        try {
+            // const feeIds = fees.map((f) => f.id);
+            const res = await fetch(STUDENT_FEE_API_ROUTES.SINGLE_ENTRY, {
+                method: API_METHODS.POST,
+                headers: { "Content-Type": "application/json" },
+                body: JSON.stringify({
+                    studentFees: fees.studentFees,
+                    amountPaid: Number(amountPaid),
+                    remarks,
+                    schoolId: ((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id) || "",
+                }),
+            });
+            if (!res.ok) {
+                const err = await res.json().catch(() => ({}));
+                showToast(err.error || t("messagesNetworkError"), TOAST_VARIANT.ERROR);
+                return;
+            }
+            showToast(t("messagesStudentFeeUpdated"), TOAST_VARIANT.SUCCESS);
+            resetFormAndCloseDrawer();
+            (_b = listFetchNowRef.current) === null || _b === void 0 ? void 0 : _b.call(listFetchNowRef);
+        }
+        catch (_c) {
+            showToast(t("messagesNetworkError"), TOAST_VARIANT.ERROR);
+        }
+        finally {
+            dispatch({
+                type: STUDENT_FEE_ACTION_TYPES.SET_DISABLE_SAVE_BUTTON,
+                payload: { disabled: false },
+            });
+        }
+    }, [dispatch, showToast, t, (_f = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _f === void 0 ? void 0 : _f.id, resetFormAndCloseDrawer]);
     // ============================================================================
     // 1.4.8 HEADER & ROW ACTIONS
     // ============================================================================
@@ -643,7 +678,7 @@ export const useStudentFeeModule = () => {
         if (!((_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.id))
             return;
         (_b = listFetchNowRef.current) === null || _b === void 0 ? void 0 : _b.call(listFetchNowRef);
-    }, [dispatch, listParams, (_f = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _f === void 0 ? void 0 : _f.id, showToast, t]);
+    }, [dispatch, listParams, (_g = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _g === void 0 ? void 0 : _g.id, showToast, t]);
     // ============================================================================
     // 1.4.10 RETURN
     // ============================================================================

package/base-modules/student-fee/single-entry-form.d.ts

@@ -52,9 +52,13 @@ interface StudentFeeByCNResponse {
     studentFees: FeeRecordSummary[];
 }
 interface SingleEntryStudentFeeFormProps {
-    fetchByComputerNumber: (url: string | undefined, options: object) => void;
+    amountPaid: string;
     feeByComputerNumber: StudentFeeByCNResponse | null;
+    fetchByComputerNumber: (url: string | undefined, options: object) => void;
     fetchingByCN: boolean;
+    remarks: string;
+    setAmountPaid: (value: string) => void;
+    setRemarks: (value: string) => void;
 }
 export declare const SingleEntryStudentFeeForm: FC<SingleEntryStudentFeeFormProps>;
 export {};

package/base-modules/student-fee/single-entry-form.js

@@ -9,23 +9,16 @@ import { DISCOUNT_TYPE } from "../../type";
 import { useTranslations } from "next-intl";
 import { useDebounce } from "@react-pakistan/util-functions/hooks/use-debounce";
 import { Loader2 } from "lucide-react";
-export const SingleEntryStudentFeeForm = ({ fetchByComputerNumber, feeByComputerNumber, fetchingByCN, }) => {
+export const SingleEntryStudentFeeForm = ({ amountPaid, feeByComputerNumber, fetchByComputerNumber, fetchingByCN, remarks, setAmountPaid, setRemarks, }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     const { dispatch } = useStudentFeeModule();
     const workspace = getCachedWorkspaceSync();
     const currency = (_b = (_a = workspace === null || workspace === void 0 ? void 0 : workspace.school) === null || _a === void 0 ? void 0 : _a.currency) !== null && _b !== void 0 ? _b : "";
     const t = useTranslations("studentFee");
-    const [amountPaid, setAmountPaid] = useState("");
-    const [remarks, setRemarks] = useState("");
+    // const [amountPaid, setAmountPaid] = useState("");
+    // const [remarks, setRemarks] = useState("");
     const [computerNumber, setComputerNumber] = useState("");
     const debouncedComputerNumber = useDebounce(computerNumber, 800);
-    // const {
-    //   fetchNow: fetchByComputerNumber,
-    //   data: feeByComputerNumber,
-    //   loading: fetchingByCN,
-    // } = useFetch(STUDENT_FEE_API_ROUTES.BY_COMPUTER_NUMBER, {
-    //   method: API_METHODS.GET,
-    // });
     const fetchByCNRef = useRef(fetchByComputerNumber);
     useEffect(() => {
         fetchByCNRef.current = fetchByComputerNumber;
@@ -101,10 +94,9 @@ export const SingleEntryStudentFeeForm = ({ fetchByComputerNumber, feeByComputer
     };
     useEffect(() => {
         (async () => {
-            var _a;
-            setAmountPaid(String(((_a = fee === null || fee === void 0 ? void 0 : fee.amount) !== null && _a !== void 0 ? _a : 0) + (accumulatedFine !== null && accumulatedFine !== void 0 ? accumulatedFine : 0)));
+            setAmountPaid(String((accumulatedAmount !== null && accumulatedAmount !== void 0 ? accumulatedAmount : 0) + (accumulatedFine !== null && accumulatedFine !== void 0 ? accumulatedFine : 0)));
         })();
-    }, [fee, accumulatedFine]);
+    }, [fee, accumulatedFine, accumulatedAmount, setAmountPaid]);
     return (_jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedInput, { id: "computerNumber", info: t("formComputerNumberInfo"), label: t("formComputerNumberLabel"), onChange: (e) => setComputerNumber(e.target.value), placeholder: t("formComputerNumberPlaceholder"), type: "number", required: true, value: computerNumber }), fetchingByCN && debouncedComputerNumber ? (_jsx("div", { className: "flex items-center justify-center py-4", children: _jsx(Loader2, { className: "text-muted-foreground h-5 w-5 animate-spin" }) })) : null, fee && profile ? (_jsxs(_Fragment, { children: [_jsx(EnhancedInput, { readOnly: true, id: "studentProfileId-readonly", label: t("formStudentLabel"), value: studentName }), _jsx(EnhancedInput, { readOnly: true, id: "feeStructureId-readonly", label: t("formFeeStructureLabel"), value: feeStructureName }), _jsx(EnhancedInput, { readOnly: true, id: "discountCodeId-readonly", label: t("formDiscountCodeLabel"), value: discountCodeLabel }), _jsx(EnhancedInput, { readOnly: true, id: "discountAmount-readonly", label: t("formDiscountAmountLabel"), value: (_h = fee === null || fee === void 0 ? void 0 : fee.discountAmount) !== null && _h !== void 0 ? _h : 0, type: "number", step: "0.01" }), _jsx(EnhancedInput, { readOnly: true, id: "accumulatedFine-readonly", info: t("formAccumulatedFineInfo"), label: t("formAccumulatedFineLabel"), value: accumulatedFine, type: "number", step: "0.01" }), _jsx(EnhancedInput, { readOnly: true, id: "amount-readonly", info: t("formTotalAmountInfo"), label: t("formTotalAmountLabel"), value: accumulatedAmount + (accumulatedFine !== null && accumulatedFine !== void 0 ? accumulatedFine : 0), type: "number", step: "0.01" }), _jsx(EnhancedInput, { id: "amountPaid", info: t("formAmountPaidInfo"), label: t("formAmountPaidLabel"), value: accumulatedAmount + (accumulatedFine !== null && accumulatedFine !== void 0 ? accumulatedFine : 0) - fee.amountPaid || "0", onChange: (e) => handleUpdateAmountPaid(e.target.value), type: "number", step: "0.01" }), _jsx(EnhancedInput, { readOnly: true, id: "amountDue-readonly", info: t("formAmountDueInfo"), label: t("formAmountDueLabel"), value: Number(fee === null || fee === void 0 ? void 0 : fee.amountDue) +
                             (accumulatedFine !== null && accumulatedFine !== void 0 ? accumulatedFine : 0) -
                             parseFloat(amountPaid || "0"), type: "number", step: "0.01" }), _jsx(EnhancedInput, { readOnly: true, id: "dueDate-readonly", label: t("formDueDateLabel"), value: formatDisplayDate(fee === null || fee === void 0 ? void 0 : fee.dueDate), type: "date" }), _jsx(EnhancedInput, { readOnly: true, id: "status-readonly", label: t("formStatusLabel"), value: statusDisplay }), _jsx(EnhancedTextarea, { id: "remarks-readonly", label: t("formRemarksLabel"), value: remarks || "", onChange: (e) => setRemarks(e.target.value) })] })) : null] }));

package/base-modules/student-fee/single-entry.js

@@ -9,13 +9,16 @@ import { SingleEntryStudentFeeForm } from "./single-entry-form";
 import { useFetch } from "@react-pakistan/util-functions/hooks/use-fetch";
 import { STUDENT_FEE_API_ROUTES } from "../../constants";
 import { API_METHODS } from "@react-pakistan/util-functions";
+import { useState } from "storybook/internal/preview-api";
 export const StudentFeeSingleEntry = () => {
     const { closeDrawer, handleSubmitSingleEntry, state, updateLoading } = useStudentFeeModule();
+    const [amountPaid, setAmountPaid] = useState("");
+    const [remarks, setRemarks] = useState("");
     const t = useTranslations("studentFee");
     const { disableSaveButton, drawer, errors } = state;
     const isOpen = drawer === STUDENT_FEE_DRAWER.SINGLE_ENTRY_DRAWER;
     const { fetchNow: fetchByComputerNumber, data: feeByComputerNumber, loading: fetchingByCN, } = useFetch(STUDENT_FEE_API_ROUTES.BY_COMPUTER_NUMBER, {
         method: API_METHODS.GET,
     });
-    return (_jsx(DrawerGeneric, { filterDrawer: null, filterDrawerHeader: null, filterDrawerFooter: null, formDrawer: isOpen ? (_jsx(SingleEntryStudentFeeForm, { fetchByComputerNumber: fetchByComputerNumber, feeByComputerNumber: feeByComputerNumber, fetchingByCN: fetchingByCN })) : null, formDrawerHeader: isOpen ? (_jsx(EnhancedDrawerHeader, { title: t("drawerSingleEntryTitle"), description: t("drawerSingleEntryDescription") })) : null, formDrawerFooter: isOpen ? (_jsx(EnhancedDrawerFooter, { applyFilters: () => { }, clearFilters: () => { }, closeDrawer: closeDrawer, disableSaveButton: disableSaveButton, drawerType: DRAWER_FOOTER_COMPONENT_TYPE.FORM_DRAWER, errors: errors, handleSubmit: () => handleSubmitSingleEntry(feeByComputerNumber), updateLoading: updateLoading })) : null, viewDrawer: null, viewDrawerHeader: null, viewDrawerFooter: null, moreActionsDrawer: null, moreActionsDrawerHeader: null, moreActionsDrawerFooter: null, onOpenChange: (open) => !open && closeDrawer(), open: isOpen }));
+    return (_jsx(DrawerGeneric, { filterDrawer: null, filterDrawerHeader: null, filterDrawerFooter: null, formDrawer: isOpen ? (_jsx(SingleEntryStudentFeeForm, { amountPaid: amountPaid, feeByComputerNumber: feeByComputerNumber, fetchByComputerNumber: fetchByComputerNumber, fetchingByCN: fetchingByCN, remarks: remarks, setAmountPaid: setAmountPaid, setRemarks: setRemarks })) : null, formDrawerHeader: isOpen ? (_jsx(EnhancedDrawerHeader, { title: t("drawerSingleEntryTitle"), description: t("drawerSingleEntryDescription") })) : null, formDrawerFooter: isOpen ? (_jsx(EnhancedDrawerFooter, { applyFilters: () => { }, clearFilters: () => { }, closeDrawer: closeDrawer, disableSaveButton: disableSaveButton, drawerType: DRAWER_FOOTER_COMPONENT_TYPE.FORM_DRAWER, errors: errors, handleSubmit: () => handleSubmitSingleEntry(feeByComputerNumber, amountPaid, remarks), updateLoading: updateLoading })) : null, viewDrawer: null, viewDrawerHeader: null, viewDrawerFooter: null, moreActionsDrawer: null, moreActionsDrawerHeader: null, moreActionsDrawerFooter: null, onOpenChange: (open) => !open && closeDrawer(), open: isOpen }));
 };

package/constants.d.ts

@@ -75,6 +75,7 @@ export declare const STUDENT_FEE_API_ROUTES: {
     readonly BULK_STATUS: (jobId: string) => string;
     readonly CREATE_MONTHLY: "/api/v1/student-fee/create-monthly";
     readonly BY_COMPUTER_NUMBER: "/api/v1/student-fee-by-student-computer-number";
+    readonly SINGLE_ENTRY: "/api/v1/student-fee-single-entry";
 };
 export declare const STUDENT_PROFILE_API_ROUTES: {
     readonly LIST: "/api/v1/student-profile";

package/constants.js

@@ -86,6 +86,7 @@ export const STUDENT_FEE_API_ROUTES = {
     BULK_STATUS: (jobId) => `/api/v1/student-fee/bulk/${jobId}`,
     CREATE_MONTHLY: "/api/v1/student-fee/create-monthly",
     BY_COMPUTER_NUMBER: "/api/v1/student-fee-by-student-computer-number",
+    SINGLE_ENTRY: "/api/v1/student-fee-single-entry",
 };
 export const STUDENT_PROFILE_API_ROUTES = {
     LIST: "/api/v1/student-profile",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appcorp/fusion-storybook",
-  "version": "0.3.31",
+  "version": "0.3.32",
   "scripts": {
     "build-storybook": "storybook build",
     "build:next": "next build",