Compare commits

...

2 Commits

15 changed files with 864 additions and 351 deletions

View File

@ -11,6 +11,18 @@
top: var(--sticky-top, 0px) !important; top: var(--sticky-top, 0px) !important;
z-index: 1025; z-index: 1025;
} }
.form-control-md {
min-height: calc(1.6em + 0.65rem + calc(var(--bs-border-width) * 2));
padding: 0.18rem 0.60rem;
font-size: 0.875rem; /* ~14px */
border-radius: var(--bs-border-radius);
}
.form-control-md::file-selector-button {
padding: 0.32rem 0.75rem;
margin: -0.32rem -0.75rem;
margin-inline-end: 0.75rem;
}
/* ===========================% Background_Colors %========================================================== */ /* ===========================% Background_Colors %========================================================== */

View File

@ -200,7 +200,9 @@ export const SelectProjectField = ({
isFullObject = false, isFullObject = false,
isMultiple = false, isMultiple = false,
isAllProject = false, isAllProject = false,
disabled disabled,
className,
errors,
}) => { }) => {
const [searchText, setSearchText] = useState(""); const [searchText, setSearchText] = useState("");
const debounce = useDebounce(searchText, 300); const debounce = useDebounce(searchText, 300);
@ -303,7 +305,10 @@ export const SelectProjectField = ({
</span> </span>
</button> </button>
{/* DROPDOWN */} {errors?.projectId && (
<div className="danger-text">{errors.projectId.message}</div>
)}
{open && ( {open && (
<ul <ul
className="dropdown-menu w-100 shadow-sm show animate__fadeIn h-64 overflow-auto rounded" className="dropdown-menu w-100 shadow-sm show animate__fadeIn h-64 overflow-auto rounded"
@ -326,6 +331,7 @@ export const SelectProjectField = ({
placeholder="Search..." placeholder="Search..."
/> />
</div> </div>
<div className="overflow-auto px-1" style={{ maxHeight: "200px" }}>
{isLoading && ( {isLoading && (
<li className="dropdown-item text-muted text-center">Loading...</li> <li className="dropdown-item text-muted text-center">Loading...</li>
@ -358,6 +364,7 @@ export const SelectProjectField = ({
</li> </li>
); );
})} })}
</div>
</ul> </ul>
)} )}
</div> </div>
@ -366,7 +373,7 @@ export const SelectProjectField = ({
export const SelectFieldSearch = ({ export const SelectFieldSearch = ({
label = "Select", label = "Select",
placeholder = "Select ", placeholder = "Select",
required = false, required = false,
value = null, value = null,
onChange, onChange,
@ -377,6 +384,7 @@ export const SelectFieldSearch = ({
isMultiple = false, isMultiple = false,
hookParams, hookParams,
useFetchHook, useFetchHook,
errors = null,
}) => { }) => {
const [searchText, setSearchText] = useState(""); const [searchText, setSearchText] = useState("");
const debounce = useDebounce(searchText, 300); const debounce = useDebounce(searchText, 300);
@ -386,108 +394,75 @@ export const SelectFieldSearch = ({
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const dropdownRef = useRef(null); const dropdownRef = useRef(null);
const getDisplayName = (entity) => { const getDisplayName = (entity) =>
if (!entity) return ""; entity ? `${entity[labelKey] || ""}`.trim() : "";
return `${entity[labelKey] || ""}`.trim();
};
/** ----------------------------- /** ----------------------------- SELECTED OPTION ----------------------------- */
* SELECTED OPTION (SINGLE)
* ----------------------------- */
let selectedSingle = null; let selectedSingle = null;
if (!isMultiple) { if (!isMultiple) {
if (isFullObject && value) selectedSingle = value; if (isFullObject && value) selectedSingle = value;
else if (!isFullObject && value) else if (!isFullObject && value)
selectedSingle = options.find((o) => o[valueKey] === value); selectedSingle = options.find((o) => o[valueKey] === value);
} }
/** -----------------------------
* SELECTED OPTION (MULTIPLE)
* ----------------------------- */
let selectedList = []; let selectedList = [];
if (isMultiple && Array.isArray(value)) { if (isMultiple && Array.isArray(value)) {
if (isFullObject) selectedList = value; selectedList = isFullObject
else { ? value
selectedList = options.filter((opt) => value.includes(opt[valueKey])); : options.filter((opt) => value.includes(opt[valueKey]));
}
} }
/** Main button label */
const displayText = !isMultiple const displayText = !isMultiple
? getDisplayName(selectedSingle) || placeholder ? getDisplayName(selectedSingle) || placeholder
: selectedList.length > 0 : selectedList.length
? selectedList.map((e) => getDisplayName(e)).join(", ") ? selectedList.map((e) => getDisplayName(e)).join(", ")
: placeholder; : placeholder;
/** ----------------------------- /** ----------------------------- OUTSIDE CLICK ----------------------------- */
* HANDLE OUTSIDE CLICK
* ----------------------------- */
useEffect(() => { useEffect(() => {
const handleClickOutside = (e) => { const handleClickOutside = (e) => {
if (dropdownRef.current && !dropdownRef.current.contains(e.target)) { if (dropdownRef.current && !dropdownRef.current.contains(e.target))
setOpen(false); setOpen(false);
}
}; };
document.addEventListener("mousedown", handleClickOutside); document.addEventListener("mousedown", handleClickOutside);
return () => document.removeEventListener("mousedown", handleClickOutside); return () => document.removeEventListener("mousedown", handleClickOutside);
}, []); }, []);
// MERGED OPTIONS TO ENSURE SELECTED VALUE APPEARS EVEN IF NOT IN SEARCH RESULT /** ----------------------------- MERGED OPTIONS ----------------------------- */
const [mergedOptions, setMergedOptions] = useState([]); const [mergedOptions, setMergedOptions] = useState(options);
useEffect(() => { useEffect(() => {
let finalList = [...options]; let finalList = [...options];
if (!isMultiple && value && !isFullObject) { if (!isMultiple && value && !isFullObject && typeof value === "object") {
// already selected option inside options? const exists = options.some((o) => o[valueKey] === value[valueKey]);
const exists = options.some((o) => o[valueKey] === value); if (!exists) finalList.unshift(value);
// if selected item not found, try to get from props (value) as fallback
if (!exists && typeof value === "object") {
finalList.unshift(value);
}
} }
if (isMultiple && Array.isArray(value)) { if (isMultiple && Array.isArray(value)) {
value.forEach((val) => { value.forEach((val) => {
const id = isFullObject ? val[valueKey] : val; const id = isFullObject ? val[valueKey] : val;
const exists = options.some((o) => o[valueKey] === id); const exists = options.some((o) => o[valueKey] === id);
if (!exists && typeof val === "object") finalList.unshift(val);
if (!exists && typeof val === "object") {
finalList.unshift(val);
}
}); });
} }
setMergedOptions(finalList); // Only update if different to avoid infinite loop
}, [options, value]); const oldKeys = mergedOptions.map((o) => o[valueKey]).join(",");
const newKeys = finalList.map((o) => o[valueKey]).join(",");
if (oldKeys !== newKeys) setMergedOptions(finalList);
}, [options, value, isMultiple, isFullObject, valueKey, mergedOptions]);
/** ----------------------------- /** ----------------------------- HANDLE SELECT ----------------------------- */
* HANDLE SELECT
* ----------------------------- */
const handleSelect = (option) => { const handleSelect = (option) => {
if (!isMultiple) { if (!isMultiple) {
// SINGLE SELECT onChange(isFullObject ? option : option[valueKey]);
if (isFullObject) onChange(option);
else onChange(option[valueKey]);
} else { } else {
// MULTIPLE SELECT
let updated = [];
const exists = selectedList.some((e) => e[valueKey] === option[valueKey]); const exists = selectedList.some((e) => e[valueKey] === option[valueKey]);
const updated = exists
if (exists) { ? selectedList.filter((e) => e[valueKey] !== option[valueKey])
// remove : [...selectedList, option];
updated = selectedList.filter((e) => e[valueKey] !== option[valueKey]); onChange(isFullObject ? updated : updated.map((x) => x[valueKey]));
} else {
// add
updated = [...selectedList, option];
}
if (isFullObject) onChange(updated);
else onChange(updated.map((x) => x[valueKey]));
} }
}; };
@ -499,10 +474,9 @@ export const SelectFieldSearch = ({
</Label> </Label>
)} )}
{/* MAIN BUTTON */}
<button <button
type="button" type="button"
className={`select2-icons form-select d-flex align-items-center justify-content-between ${ className={`select2-icons form-select d-flex align-items-center justify-content-between ${
open ? "show" : "" open ? "show" : ""
}`} }`}
disabled={disabled} disabled={disabled}
@ -513,17 +487,17 @@ export const SelectFieldSearch = ({
</span> </span>
</button> </button>
{/* DROPDOWN */} {errors && <div className="danger-text">{errors.message}</div>}
{open && ( {open && (
<ul <ul
className="dropdown-menu w-100 shadow-sm show animate__fadeIn h-64 overflow-auto rounded overflow-x-hidden" className="dropdown-menu w-100 shadow-sm show animate__fadeIn h-64 overflow-auto rounded rounded-top-0 overflow-x-hidden"
style={{ style={{
position: "absolute", position: "absolute",
top: "100%", top: "100%",
left: 0, left: 0,
zIndex: 1050, zIndex: 1050,
marginTop: "2px", marginTop: "1px",
borderRadius: "0.375rem",
overflow: "hidden", overflow: "hidden",
}} }}
> >
@ -537,36 +511,40 @@ export const SelectFieldSearch = ({
disabled={disabled} disabled={disabled}
/> />
</div> </div>
<div className="overflow-auto px-1" style={{ maxHeight: "200px" }}>
{isLoading && (
<li className="dropdown-item text-muted text-center">
Loading...
</li>
)}
{!isLoading && mergedOptions.length === 0 && (
<li className="dropdown-item text-muted text-center">
No results found
</li>
)}
{isLoading && ( {!isLoading &&
<li className="dropdown-item text-muted text-center">Loading...</li> mergedOptions.map((option) => {
)} const isActive = isMultiple
? selectedList.some((x) => x[valueKey] === option[valueKey])
: selectedSingle &&
selectedSingle[valueKey] === option[valueKey];
{!isLoading && options.length === 0 && ( return (
<li className="dropdown-item text-muted text-center"> <li key={option[valueKey]}>
No results found <button
</li> type="button"
)} className={`dropdown-item rounded ${
isActive ? "active" : ""
{!isLoading && }`}
options.map((option) => { onClick={() => handleSelect(option)}
const isActive = isMultiple >
? selectedList.some((x) => x[valueKey] === option[valueKey]) {getDisplayName(option)}
: selectedSingle && </button>
selectedSingle[valueKey] === option[valueKey]; </li>
);
return ( })}
<li key={option[valueKey]}> </div>
<button
type="button"
className={`dropdown-item ${isActive ? "active" : ""}`}
onClick={() => handleSelect(option)}
>
{getDisplayName(option)}
</button>
</li>
);
})}
</ul> </ul>
)} )}
</div> </div>

View File

@ -50,7 +50,6 @@ const InputSuggestions = ({
{filteredList.map((org) => ( {filteredList.map((org) => (
<li <li
key={org} key={org}
className="ropdown-item"
style={{ style={{
cursor: "pointer", cursor: "pointer",
padding: "5px 12px", padding: "5px 12px",

View File

@ -6,47 +6,49 @@ import {
PurchaseSchema, PurchaseSchema,
getStepFields, getStepFields,
} from "./PurchaseSchema"; } from "./PurchaseSchema";
import { defaultJobValue } from "../ServiceProject/ServiceProjectSchema";
import PurchasePartyDetails from "./PurchasePartyDetails"; import PurchasePartyDetails from "./PurchasePartyDetails";
import PurchaseTransportDetails from "./PurchaseTransportDetails";
import PurchasePaymentDetails from "./PurchasePaymentDetails";
import { useCreatePurchaseInvoice } from "../../hooks/usePurchase";
const ManagePurchase = () => { const ManagePurchase = ({ onClose }) => {
const [activeTab, setActiveTab] = useState(0); const [activeTab, setActiveTab] = useState(0);
const [completedTabs, setCompletedTabs] = useState([]); const [completedTabs, setCompletedTabs] = useState([]);
const newTenantConfig = [ const stepsConfig = [
{ {
name: "Contact Info", name: "Party Details",
icon: "bx bx-user bx-md", icon: "bx bx-user bx-md",
subtitle: "Provide Contact Details", subtitle: "Supplier & project information",
component: <PurchasePartyDetails />, component: <PurchasePartyDetails />,
}, },
{ {
name: "Organization", name: "Invoice & Transport",
icon: "bx bx-buildings bx-md", icon: "bx bx-receipt bx-md",
subtitle: "Organization Details", subtitle: "Invoice, eWay bill & transport info",
component: <div>Invoice & Transport Details</div>, component: <PurchaseTransportDetails />,
}, },
{ {
name: "SubScription", name: "Payment Details",
icon: "bx bx-star bx-md", icon: "bx bx-credit-card bx-md",
component: <div>Payment & Financials</div>, subtitle: "Amount, tax & due date",
component: <PurchasePaymentDetails />,
}, },
]; ];
const purchaseOrder = useAppForm({ const purchaseOrder = useAppForm({
resolver: zodResolver(PurchaseSchema), resolver: zodResolver(PurchaseSchema),
defaultJobValue: defaultPurchaseValue, defaultValues: defaultPurchaseValue,
mode: "onChange",
}); });
const getCurrentTrigger = () =>
activeTab === 2 ? subscriptionForm.trigger : tenantForm.trigger;
const handleNext = async () => { const handleNext = async () => {
const currentStepFields = getStepFields(activeTab); const currentStepFields = getStepFields(activeTab);
const trigger = getCurrentTrigger(); const valid = await purchaseOrder.trigger(currentStepFields);
const valid = await trigger(currentStepFields);
if (valid) { if (valid) {
setCompletedTabs((prev) => [...new Set([...prev, activeTab])]); setCompletedTabs((prev) => [...new Set([...prev, activeTab])]);
setActiveTab((prev) => Math.min(prev + 1, newTenantConfig.length - 1)); setActiveTab((prev) => Math.min(prev + 1, stepsConfig.length - 1));
} }
}; };
@ -54,59 +56,89 @@ const ManagePurchase = () => {
setActiveTab((prev) => Math.max(prev - 1, 0)); setActiveTab((prev) => Math.max(prev - 1, 0));
}; };
const onsubmit = (formData) => {}; const { mutate: CreateInvoice, isPending } = useCreatePurchaseInvoice(() => {
onClose?.();
});
const onSubmit = (formData) => {
console.log("PURCHASE DATA:", formData);
let payload = formData;
CreateInvoice(payload);
};
return ( return (
<div <div
id="wizard-property-listing" id="wizard-property-listing"
className="bs-stepper horizontically mt-2 b-secondry px-1 shadow-none border-0" className="bs-stepper horizontically mt-2 b-secondry px-1 py-1 shadow-none border-0"
> >
{/* <span className="fs-5">New Parchase</span> */} {/* Header */}
<div className="bs-stepper-header text-start px-0"> <div className="bs-stepper-header text-start px-0 py-1">
{newTenantConfig {stepsConfig.map((step, index) => {
.filter((step) => step.name.toLowerCase() !== "congratulation") const isActive = activeTab === index;
.map((step, index) => { const isCompleted = completedTabs.includes(index);
const isActive = activeTab === index;
const isCompleted = completedTabs.includes(index);
return ( return (
<React.Fragment key={step.name}> <React.Fragment key={step.name}>
<div <div
className={`step ${isActive ? "active" : ""} ${ className={`step ${isActive ? "active" : ""} ${
isCompleted ? "crossed" : "" isCompleted ? "crossed" : ""
}`} }`}
data-target={`#step-${index}`} >
> <button type="button" className="step-trigger">
<span className="bs-stepper-circle">
{isCompleted ? (
<i className="bx bx-check"></i>
) : (
<i className={step.icon}></i>
)}
</span>
<span className="bs-stepper-label">
<span className="bs-stepper-title">{step.name}</span>
<span className="bs-stepper-subtitle">{step.subtitle}</span>
</span>
</button>
</div>
{index < stepsConfig.length - 1 && (
<div className="line text-primary"></div>
)}
</React.Fragment>
);
})}
</div>
{/* Content */}
<div className="bs-stepper-content py-2">
<AppFormProvider {...purchaseOrder}>
<form onSubmit={purchaseOrder.handleSubmit(onSubmit)}>
{stepsConfig[activeTab].component}
<div className="d-flex justify-content-between mt-4">
<button
type="button"
className="btn btn-sm btn-outline-secondary"
onClick={handlePrev}
disabled={activeTab === 0}
>
Previous
</button>
<di>
{activeTab < stepsConfig.length - 1 ? (
<button <button
type="button" type="button"
className={`step-trigger ${isActive ? "active" : ""}`} className="btn btn-sm btn-primary"
// onClick={() => setActiveTab(index)} // optional onClick={handleNext}
> >
<span className="bs-stepper-circle"> Next <i className="bx bx-sm bx-right-arrow"></i>
{isCompleted ? ( </button>
<i className="bx bx-check"></i> ) : (
) : ( <button type="submit" className="btn btn-sm btn-primary">
<i className={step.icon}></i> {isPending ? "Please Wait" : "SUbmit"}
)}
</span>
<span className="bs-stepper-label">
<span className="bs-stepper-title">{step.name}</span>
<span className="bs-stepper-subtitle">
{step.subtitle}
</span>
</span>
</button> </button>
</div>
{index < newTenantConfig.length - 1 && (
<div className="line text-primary"></div>
)} )}
</React.Fragment> </di>
); </div>
})}
</div>
<div className="bs-stepper-content py-2">
<AppFormProvider>
<form onSubmit={purchaseOrder.handleSubmit(onsubmit)}>
{newTenantConfig[activeTab].component}
</form> </form>
</AppFormProvider> </AppFormProvider>
</div> </div>

View File

@ -1,31 +1,242 @@
import React from "react"; import React from "react";
import { useAppFormContext } from "../../hooks/appHooks/useAppForm"; import { AppFormController, useAppFormContext } from "../../hooks/appHooks/useAppForm";
import Label from "../common/Label";
import DatePicker from "../common/DatePicker";
import {
SelectFieldSearch,
SelectProjectField,
} from "../common/Forms/SelectFieldServerSide";
import { useGlobaleOrganizations, useOrganization, useOrganizationsList } from "../../hooks/useOrganization";
import { ITEMS_PER_PAGE } from "../../utils/constants";
const PurchasePartyDetails = ({ onNext }) => { const PurchasePartyDetails = () => {
const { const {
register, register,
control, control,
trigger, setValue,
watch,
formState: { errors }, formState: { errors },
} = useAppFormContext(); } = useAppFormContext();
const handleNext = async () => {
const valid = await trigger([ return (
"title", <div className="row g-2 text-start">
"projectId", {/* Title */}
"organizationId", <div className="col-12 col-md-6">
"supplier", <Label htmlFor="title" required>
"billingAddress", Title
"shippingAddress", </Label>
"purchaseOrderNumber",
"purchaseOrderDate", <input
"porformaInvoiceNo", id="title"
]); type="text"
if (valid) { className={`form-control form-control-md ${
onNext(); errors?.title ? "is-invalid" : ""
} }`}
}; {...register("title")}
return <div className="row"></div>; />
{errors?.title && (
<div className="danger-text">{errors.title.message}</div>
)}
</div>
{/* Project ID */}
<div className="col-12 col-md-6">
<SelectProjectField
className={`form-control form-control-md ${
errors?.projectId ? "is-invalid" : ""
}`}
label="Project"
required
placeholder="Select Project"
value={watch("projectId")}
onChange={(val) =>
setValue("projectId", val, {
shouldDirty: true,
shouldValidate: true,
})
}
errors={errors}
/>
</div>
{/* Organization */}
<div className="col-12 col-md-6">
{/* <input
id="organizationId"
type="text"
className={`form-control form-control-md `}
{...register("organizationId")}
/> */}
<AppFormController
name="organizationId"
control={control}
render={({ field }) => (
<SelectFieldSearch
label="Organization"
placeholder="Select Organization"
required
value={field.value}
onChange={field.onChange}
valueKey="id"
labelKey="name"
useFetchHook={useGlobaleOrganizations}
hookParams={[ITEMS_PER_PAGE,1]}
errors={errors?.organizationId}
/>
)}
/>
</div>
{/* Supplier */}
<div className="col-12 col-md-6">
<AppFormController
name="supplierId"
control={control}
render={({ field }) => (
<SelectFieldSearch
label="Supplier"
placeholder="Select Organization"
required
value={field.value}
onChange={field.onChange}
valueKey="id"
labelKey="name"
useFetchHook={useGlobaleOrganizations}
hookParams={[ITEMS_PER_PAGE,1]}
errors={errors?.organizationId}
/>
)}
/>
{errors?.supplierId && (
<div className="danger-text">{errors.supplierId.message}</div>
)}
</div>
{/* Billing Address */}
<div className="col-12 col-md-6">
<Label htmlFor="billingAddress">Billing Address</Label>
<textarea
id="billingAddress"
rows="2"
className={`form-control form-control-md `}
{...register("billingAddress")}
/>
{errors?.billingAddress && (
<div className="danger-text">{errors.billingAddress.message}</div>
)}
</div>
<div className="col-12 col-md-6">
<Label htmlFor="shippingAddress">Shipping Address</Label>
<textarea
id="shippingAddress"
rows="2"
className={`form-control form-control-md `}
{...register("shippingAddress")}
/>
{errors?.shippingAddress && (
<div className="danger-text">{errors.shippingAddress.message}</div>
)}
</div>
{/* Purchase Order Number */}
<div className="col-12 col-md-6">
<Label htmlFor="purchaseOrderNumber" required>
Purchase Order Number
</Label>
<input
id="purchaseOrderNumber"
type="text"
className={`form-control form-control-md `}
{...register("purchaseOrderNumber")}
/>
{errors?.purchaseOrderNumber && (
<div className="danger-text">
{errors.purchaseOrderNumber.message}
</div>
)}
</div>
{/* Purchase Order Date */}
<div className="col-12 col-md-6">
<Label htmlFor="purchaseOrderDate" required>
Purchase Order Date
</Label>
<DatePicker
control={control}
name="purchaseOrderDate"
className={` w-full ${
errors?.purchaseOrderDate ? "is-invalid" : ""
}`}
/>
{errors?.purchaseOrderDate && (
<div className="danger-text">{errors.purchaseOrderDate.message}</div>
)}
</div>
{/* Proforma Invoice */}
<div className="col-12 col-md-6">
<Label htmlFor="proformaInvoiceNumber">Proforma Invoice Number</Label>
<input
id="proformaInvoiceNumber"
type="text"
className={`form-control `}
{...register("proformaInvoiceNumber")}
/>
{errors?.proformaInvoiceNumber && (
<div className="danger-text">
{errors.proformaInvoiceNumber.message}
</div>
)}
</div>
<div className="col-12 col-md-6">
<Label htmlFor="proformaInvoiceAmountt">Proforma Amount</Label>
<input
id="proformaInvoiceAmount"
type="text"
className={`form-control `}
{...register("proformaInvoiceAmount")}
/>
{errors?.proformaInvoiceAmountt && (
<div className="danger-text">
{errors.proformaInvoiceAmount.message}
</div>
)}
</div>
<div className="col-12 col-md-6">
<Label htmlFor="proformaInvoiceDate">Proforma Date</Label>
<DatePicker
control={control}
name="proformaInvoiceDate"
className="w-full"
/>
{errors?.proformaInvoiceDate && (
<div className="danger-text">
{errors.proformaInvoiceDate.message}
</div>
)}
</div>
</div>
);
}; };
export default PurchasePartyDetails; export default PurchasePartyDetails;

View File

@ -1,11 +1,145 @@
import React from 'react' import React, { useEffect } from "react";
import Label from "../common/Label";
import { useAppFormContext } from "../../hooks/appHooks/useAppForm";
import DatePicker from "../common/DatePicker";
import { useInvoiceAttachmentTypes } from "../../hooks/masterHook/useMaster";
const PurchasePaymentDetails = () => { const PurchasePaymentDetails = () => {
return ( const { data, isLoading, error, isError } = useInvoiceAttachmentTypes();
<div> console.log(data);
const {
</div> register,
) watch,
} setValue,
control,
formState: { errors },
} = useAppFormContext();
export default PurchasePaymentDetails const baseAmount = watch("baseAmount");
const taxAmount = watch("taxAmount");
useEffect(() => {
const base = parseFloat(baseAmount) || 0;
const tax = parseFloat(taxAmount) || 0;
if (base || tax) {
setValue("totalAmount", (base + tax).toFixed(2));
}
}, [baseAmount, taxAmount, setValue]);
return (
<div className="row g-2 text-start">
<div className="col-12 col-md-4">
<Label htmlFor="baseAmount" required>
Base Amount
</Label>
<input
id="baseAmount"
type="number"
className="form-control form-control-md"
{...register("baseAmount")}
/>
{errors?.baseAmount && (
<div className="small danger-text mt-1">
{errors.baseAmount.message}
</div>
)}
</div>
<div className="col-12 col-md-4">
<Label htmlFor="taxAmount" required>
Tax Amount
</Label>
<input
id="taxAmount"
type="number"
className="form-control form-control-md"
{...register("taxAmount")}
/>
{errors?.taxAmount && (
<div className="small danger-text mt-1">
{errors.taxAmount.message}
</div>
)}
</div>
<div className="col-12 col-md-4">
<Label htmlFor="totalAmount" required>
Total Amount
</Label>
<input
id="totalAmount"
type="number"
className="form-control form-control-md"
{...register("totalAmount")}
readOnly
/>
{errors?.totalAmount && (
<div className="small danger-text mt-1">
{errors.totalAmount.message}
</div>
)}
</div>
<div className="col-12 col-md-6">
<Label htmlFor="transportCharges">Transport Charges</Label>
<input
id="transportCharges"
type="number"
className="form-control form-control-md"
{...register("transportCharges")}
/>
{errors?.transportCharges && (
<div className="small danger-text mt-1">
{errors.transportCharges.message}
</div>
)}
</div>
<div className="col-12 col-md-6">
<Label htmlFor="paymentDueDate">Payment Due Date</Label>
<DatePicker
name={"paymentDueDate"}
control={control}
className="w-full"
/>
{errors?.paymentDueDate && (
<div className="small danger-text mt-1">
{errors.paymentDueDate.message}
</div>
)}
</div>
<div className="col-12">
<Label htmlFor="description" required>
Description
</Label>
<textarea
id="description"
rows="3"
className="form-control form-control-md"
{...register("description")}
/>
{errors?.description && (
<div className="small danger-text mt-1">
{errors.description.message}
</div>
)}
</div>
</div>
);
};
export default PurchasePaymentDetails;

View File

@ -1,4 +1,5 @@
import { z } from "zod"; import { z } from "zod";
import { normalizeAllowedContentTypes } from "../../utils/appUtils";
export const AttachmentSchema = (allowedContentType, maxSizeAllowedInMB) => { export const AttachmentSchema = (allowedContentType, maxSizeAllowedInMB) => {
const allowedTypes = normalizeAllowedContentTypes(allowedContentType); const allowedTypes = normalizeAllowedContentTypes(allowedContentType);
@ -6,6 +7,10 @@ export const AttachmentSchema = (allowedContentType, maxSizeAllowedInMB) => {
return z.object({ return z.object({
fileName: z.string().min(1, { message: "File name is required" }), fileName: z.string().min(1, { message: "File name is required" }),
base64Data: z.string().min(1, { message: "File data is required" }), base64Data: z.string().min(1, { message: "File data is required" }),
invoiceAttachmentTypeId: z
.string()
.min(1, { message: "File data is required" }),
contentType: z contentType: z
.string() .string()
.min(1, { message: "MIME type is required" }) .min(1, { message: "MIME type is required" })
@ -15,6 +20,7 @@ export const AttachmentSchema = (allowedContentType, maxSizeAllowedInMB) => {
message: `File type must be one of: ${allowedTypes.join(", ")}`, message: `File type must be one of: ${allowedTypes.join(", ")}`,
} }
), ),
fileSize: z fileSize: z
.number() .number()
.int() .int()
@ -23,6 +29,7 @@ export const AttachmentSchema = (allowedContentType, maxSizeAllowedInMB) => {
(maxSizeAllowedInMB ?? 25) * 1024 * 1024, (maxSizeAllowedInMB ?? 25) * 1024 * 1024,
`fileSize must be ≤ ${maxSizeAllowedInMB ?? 25}MB` `fileSize must be ≤ ${maxSizeAllowedInMB ?? 25}MB`
), ),
description: z.string().optional().default(""), description: z.string().optional().default(""),
isActive: z.boolean(), isActive: z.boolean(),
}); });
@ -34,27 +41,32 @@ export const PurchaseSchema = z.object({
organizationId: z.string().min(1, { message: "Organization is required" }), organizationId: z.string().min(1, { message: "Organization is required" }),
billingAddress: z.string().min(1, { message: "Address is required" }), billingAddress: z.string().min(1, { message: "Address is required" }),
shippingAddress: z.string().min(1, { message: "Address is required" }), shippingAddress: z.string().min(1, { message: "Address is required" }),
purchaseOrderNumber: z.string().nullable(), purchaseOrderNumber: z.string().nullable(),
purchaseOrderDate: z.string().nullable(), purchaseOrderDate: z.coerce.date().nullable(),
supplier: z.string().min(1, { message: "Supplier is required" }),
porformaInvoiceNo: z.string().nullable(),
// Supplier Details
invoiceNo: z.string().min(1, { message: "Invoice No is required" }), supplierId: z.string().min(1, { message: "Supplier is required" }),
invoiceDate: z.string().min(1, { message: "Date is required" }),
ewayBillNo: z.string().min(1, { message: "E-Way Bill No is required" }), proformaInvoiceNumber: z.string().nullable(),
ewayBillDate: z.string().min(1, { message: "E-Way Bill Date is required" }), proformaInvoiceDate: z.coerce.date().nullable(),
irnNo: z.string().min(1, { message: "IRN is required" }), proformaInvoiceAmount: z.string().nullable(),
ackDate: z.string().min(1, { message: "Date is required" }),
ackNo: z.string().min(1, { message: "acknowledgement No is required" }), invoiceNumber: z.string().nullable(),
invoiceDate: z.coerce.date().nullable(),
eWayBillNumber: z.string().nullable(),
eWayBillDate: z.coerce.date().nullable(),
invoiceReferenceNumber: z.string().nullable(),
acknowledgmentDate: z.coerce.date().nullable(),
acknowledgmentNumber: z.string().nullable(),
// Payment Detail
baseAmount: z.string().min(1, { message: "Base amount is required" }), baseAmount: z.string().min(1, { message: "Base amount is required" }),
taxAmount: z.string().min(1, { message: "Tax amount is required" }), taxAmount: z.string().min(1, { message: "Tax amount is required" }),
totalAmount: z.string().min(1, { message: "Total amount is required" }), totalAmount: z.string().min(1, { message: "Total amount is required" }),
paymentDueDate: z.string().nullable(), paymentDueDate: z.coerce.date().nullable(),
TransportCharges: z.string().nullable(), transportCharges: z.string().nullable(),
description: z.string().min(1, { message: "description is required" }), description: z.string().min(1, { message: "Description is required" }),
attachments: z.array(AttachmentSchema([], 25)).optional(),
}); });
// deliveryChallanNo: z // deliveryChallanNo: z
@ -64,30 +76,36 @@ export const PurchaseSchema = z.object({
// shippingAddress: z.string().min(1, { message: "Delevery Date is required" }), // shippingAddress: z.string().min(1, { message: "Delevery Date is required" }),
export const defaultPurchaseValue = { export const defaultPurchaseValue = {
title: null, title: "",
projectId: null, projectId: "",
organizationId: null, organizationId: "",
billingAddress: null, billingAddress: "",
shippingAddress: null, shippingAddress: "",
purchaseOrderNumber: null, purchaseOrderNumber: null,
purchaseOrderDate: null, purchaseOrderDate: null,
supplier: null,
porformaInvoiceNo: null,
invoiceNo: null, supplierId: "",
proformaInvoiceNumber: null,
proformaInvoiceDate: null,
proformaInvoiceAmount: null,
invoiceNumber: null,
invoiceDate: null, invoiceDate: null,
ewayBillNo: null, eWayBillNumber: null,
ewayBillDate: null, eWayBillDate: null,
irnNo: null, invoiceReferenceNumber: null,
ackDate: null, acknowledgmentNumber: null,
ackNo: null, acknowledgmentDate: null,
baseAmount: null, baseAmount: "",
taxAmount: null, taxAmount: "",
totalAmount: null, totalAmount: "",
paymentDueDate: null, paymentDueDate: null,
TransportCharges: null, transportCharges: null,
description: null, description: "",
attachments: [],
}; };
export const getStepFields = (stepIndex) => { export const getStepFields = (stepIndex) => {
@ -96,28 +114,29 @@ export const getStepFields = (stepIndex) => {
"title", "title",
"projectId", "projectId",
"organizationId", "organizationId",
"supplier", "supplierId",
"billingAddress", "billingAddress",
"shippingAddress", "shippingAddress",
"purchaseOrderNumber", "purchaseOrderNumber",
"purchaseOrderDate", "purchaseOrderDate",
"porformaInvoiceNo", "proformaInvoiceNumber",
"proformaInvoiceDate",
"proformaInvoiceAmount",
], ],
1: [ 1: [
"invoiceNo", "invoiceNumber",
"invoiceDate", "invoiceDate",
"ewayBillNo", "eWayBillNumber",
"ewayBillDate", "eWayBillDate",
"irnNo", "invoiceReferenceNumber",
"ackNo", "acknowledgmentNumber",
"taxId", "acknowledgmentDate",
"ackDate",
], ],
2: [ 2: [
"baseAmount", "baseAmount",
"taxAmount", "taxAmount",
"totalAmount", "totalAmount",
"TransportCharges", "transportCharges",
"paymentDueDate", "paymentDueDate",
"description", "description",
], ],

View File

@ -1,11 +0,0 @@
import React from 'react'
const PurchaseTansportDetails = () => {
return (
<div>
</div>
)
}
export default PurchaseTansportDetails

View File

@ -0,0 +1,131 @@
import React from "react";
import { useAppFormContext } from "../../hooks/appHooks/useAppForm";
import DatePicker from "../common/DatePicker";
import Label from "../common/Label";
const PurchaseTransportDetails = () => {
const {
register,control,
formState: { errors },
} = useAppFormContext();
return (
<div className="row g-2 text-start">
{/* Invoice Number */}
<div className="col-12 col-md-6">
<Label htmlFor="invoiceNumber" required>
Invoice Number
</Label>
<input
id="invoiceNumber"
type="text"
className="form-control form-control-md"
{...register("invoiceNumber")}
/>
{errors?.invoiceNumber && (
<div className="small text-danger mt-1">
{errors.invoiceNumber.message}
</div>
)}
</div>
{/* Invoice Date */}
<div className="col-12 col-md-6">
<Label htmlFor="invoiceDate">Invoice Date</Label>
<DatePicker control={control} name="invoiceDate" className="w-full"/>
{errors?.invoiceDate && (
<div className="small text-danger mt-1">
{errors.invoiceDate.message}
</div>
)}
</div>
{/* E-Way Bill Number */}
<div className="col-12 col-md-6">
<Label htmlFor="eWayBillNumber">E-Way Bill Number</Label>
<input
id="eWayBillNumber"
type="text"
className="form-control form-control-md"
{...register("eWayBillNumber")}
/>
{errors?.eWayBillNumber && (
<div className="small text-danger mt-1">
{errors.eWayBillNumber.message}
</div>
)}
</div>
{/* E-Way Bill Date */}
<div className="col-12 col-md-6">
<Label htmlFor="eWayBillDate">E-Way Bill Date</Label>
<DatePicker control={control} name="eWayBillDate" className="w-full"/>
{errors?.eWayBillDate && (
<div className="small text-danger mt-1">
{errors.eWayBillDate.message}
</div>
)}
</div>
{/* Invoice Reference Number */}
<div className="col-12 col-md-6">
<Label htmlFor="invoiceReferenceNumber">Invoice Reference Number</Label>
<input
id="invoiceReferenceNumber"
type="text"
className="form-control form-control-md"
{...register("invoiceReferenceNumber")}
/>
{errors?.invoiceReferenceNumber && (
<div className="small text-danger mt-1">
{errors.invoiceReferenceNumber.message}
</div>
)}
</div>
{/* Acknowledgment Number */}
<div className="col-12 col-md-6">
<Label htmlFor="acknowledgmentNumber">Acknowledgment Number</Label>
<input
id="acknowledgmentNumber"
type="text"
className="form-control form-control-md"
{...register("acknowledgmentNumber")}
/>
{errors?.acknowledgmentNumber && (
<div className="small text-danger mt-1">
{errors.acknowledgmentNumber.message}
</div>
)}
</div>
<div className="col-12 col-md-6">
<Label htmlFor="acknowledgmentDate">Acknowledgment Date</Label>
<DatePicker control={control} name="acknowledgmentDate" className="w-full"/>
{errors?.acknowledgmentDate && (
<div className="small text-danger mt-1">
{errors.acknowledgmentDate.message}
</div>
)}
</div>
</div>
);
};
export default PurchaseTransportDetails;

View File

@ -10,16 +10,25 @@ import {
} from "@tanstack/react-query"; } from "@tanstack/react-query";
import showToast from "../../services/toastService"; import showToast from "../../services/toastService";
export const useInvoiceAttachmentTypes = () => {
export const useRecurringStatus = ()=>{
return useQuery({ return useQuery({
queryKey:["RecurringStatus"], queryKey: ["invoiceAttachmentType"],
queryFn:async()=>{ queryFn: async () => {
const resp = await MasterRespository.getInvoiceAttachmentTypes();
return resp.data;
},
});
};
export const useRecurringStatus = () => {
return useQuery({
queryKey: ["RecurringStatus"],
queryFn: async () => {
const resp = await MasterRespository.getRecurringStatus(); const resp = await MasterRespository.getRecurringStatus();
return resp.data return resp.data;
} },
}) });
} };
export const useCurrencies = () => { export const useCurrencies = () => {
return useQuery({ return useQuery({
queryKey: ["currencies"], queryKey: ["currencies"],
@ -31,10 +40,10 @@ export const useCurrencies = () => {
}; };
export const usePaymentAjustmentHead = (isActive) => { export const usePaymentAjustmentHead = (isActive) => {
return useQuery({ return useQuery({
queryKey: ["paymentType",isActive], queryKey: ["paymentType", isActive],
queryFn: async () => await MasterRespository.getPaymentAdjustmentHead(isActive), queryFn: async () =>
await MasterRespository.getPaymentAdjustmentHead(isActive),
}); });
}; };
@ -296,26 +305,26 @@ export const useOrganizationType = () => {
}); });
}; };
export const useJobStatus=(statusId,projectId)=>{ export const useJobStatus = (statusId, projectId) => {
return useQuery({ return useQuery({
queryKey:["Job_Staus",statusId,projectId], queryKey: ["Job_Staus", statusId, projectId],
queryFn:async()=>{ queryFn: async () => {
const resp = await MasterRespository.getJobStatus(statusId,projectId); const resp = await MasterRespository.getJobStatus(statusId, projectId);
return resp.data; return resp.data;
}, },
enabled:!!statusId && !!projectId enabled: !!statusId && !!projectId,
}) });
} };
export const useTeamRole=()=>{ export const useTeamRole = () => {
return useQuery({ return useQuery({
queryKey:["Team_Role"], queryKey: ["Team_Role"],
queryFn:async()=>{ queryFn: async () => {
const resp = await MasterRespository.getTeamRole(); const resp = await MasterRespository.getTeamRole();
return resp.data; return resp.data;
} },
}) });
} };
//#region ==Get Masters== //#region ==Get Masters==
const fetchMasterData = async (masterType) => { const fetchMasterData = async (masterType) => {
switch (masterType) { switch (masterType) {
@ -405,8 +414,6 @@ const useMaster = () => {
export default useMaster; export default useMaster;
//#endregion //#endregion
// ================================Mutation==================================== // ================================Mutation====================================
//#region Job Role //#region Job Role
@ -456,10 +463,6 @@ export const useCreateJobRole = (onSuccessCallback) => {
}; };
//#endregion Job Role //#endregion Job Role
//#region Application Role //#region Application Role
export const useCreateApplicationRole = (onSuccessCallback) => { export const useCreateApplicationRole = (onSuccessCallback) => {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
@ -505,10 +508,6 @@ export const useUpdateApplicationRole = (onSuccessCallback) => {
}; };
//#endregion //#endregion
//#region Create work Category //#region Create work Category
export const useCreateWorkCategory = (onSuccessCallback) => { export const useCreateWorkCategory = (onSuccessCallback) => {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
@ -554,11 +553,6 @@ export const useUpdateWorkCategory = (onSuccessCallback) => {
}; };
//#endregion //#endregion
//#region Contact Category //#region Contact Category
export const useCreateContactCategory = (onSuccessCallback) => { export const useCreateContactCategory = (onSuccessCallback) => {
@ -609,10 +603,6 @@ export const useUpdateContactCategory = (onSuccessCallback) => {
//#endregion //#endregion
//#region Contact Tag //#region Contact Tag
export const useCreateContactTag = (onSuccessCallback) => { export const useCreateContactTag = (onSuccessCallback) => {
@ -659,10 +649,6 @@ export const useUpdateContactTag = (onSuccessCallback) => {
}; };
//#endregion //#endregion
//#region Expense Category //#region Expense Category
export const useCreateExpenseCategory = (onSuccessCallback) => { export const useCreateExpenseCategory = (onSuccessCallback) => {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
@ -689,7 +675,10 @@ export const useUpdateExpenseCategory = (onSuccessCallback) => {
return useMutation({ return useMutation({
mutationFn: async ({ id, payload }) => { mutationFn: async ({ id, payload }) => {
const response = await MasterRespository.updateExpenseCategory(id, payload); const response = await MasterRespository.updateExpenseCategory(
id,
payload
);
return response.data; return response.data;
}, },
onSuccess: (data, variables) => { onSuccess: (data, variables) => {
@ -708,11 +697,6 @@ export const useUpdateExpenseCategory = (onSuccessCallback) => {
//#endregion //#endregion
//#region Payment Mode //#region Payment Mode
export const useCreatePaymentMode = (onSuccessCallback) => { export const useCreatePaymentMode = (onSuccessCallback) => {
@ -759,10 +743,6 @@ export const useUpdatePaymentMode = (onSuccessCallback) => {
//#endregion //#endregion
// Services------------------------------- // Services-------------------------------
// export const useCreateService = (onSuccessCallback) => { // export const useCreateService = (onSuccessCallback) => {
@ -844,10 +824,6 @@ export const useUpdateService = (onSuccessCallback) => {
//#endregion //#endregion
//#region Activity Grouph //#region Activity Grouph
export const useCreateActivityGroup = (onSuccessCallback) => { export const useCreateActivityGroup = (onSuccessCallback) => {
@ -912,10 +888,6 @@ export const useUpdateActivityGroup = (onSuccessCallback) => {
//#endregion //#endregion
//#region Activities //#region Activities
export const useCreateActivity = (onSuccessCallback) => { export const useCreateActivity = (onSuccessCallback) => {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
@ -970,11 +942,6 @@ export const useUpdateActivity = (onSuccessCallback) => {
//#endregion //#endregion
//#region Expense Status //#region Expense Status
export const useCreateExpenseStatus = (onSuccessCallback) => { export const useCreateExpenseStatus = (onSuccessCallback) => {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
@ -1018,10 +985,6 @@ export const useUpdateExpenseStatus = (onSuccessCallback) => {
}; };
//#endregion //#endregion
//#region Document-Category //#region Document-Category
export const useCreateDocumentCatgory = (onSuccessCallback) => { export const useCreateDocumentCatgory = (onSuccessCallback) => {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
@ -1068,11 +1031,6 @@ export const useUpdateDocumentCategory = (onSuccessCallback) => {
}; };
//#endregion //#endregion
//#region Document-Type //#region Document-Type
export const useCreateDocumentType = (onSuccessCallback) => { export const useCreateDocumentType = (onSuccessCallback) => {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
@ -1117,10 +1075,6 @@ export const useUpdateDocumentType = (onSuccessCallback) => {
}; };
//#endregion //#endregion
//#region Payment Adjustment Head //#region Payment Adjustment Head
export const useCreatePaymentAjustmentHead = (onSuccessCallback) => { export const useCreatePaymentAjustmentHead = (onSuccessCallback) => {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
@ -1147,7 +1101,10 @@ export const useUpdatePaymentAjustmentHead = (onSuccessCallback) => {
return useMutation({ return useMutation({
mutationFn: async ({ id, payload }) => { mutationFn: async ({ id, payload }) => {
const resp = await MasterRespository.updatePaymentAjustmentHead(id, payload); const resp = await MasterRespository.updatePaymentAjustmentHead(
id,
payload
);
return resp.data; return resp.data;
}, },
onSuccess: (data) => { onSuccess: (data) => {
@ -1164,10 +1121,6 @@ export const useUpdatePaymentAjustmentHead = (onSuccessCallback) => {
}; };
//#endregion //#endregion
//#region ==Delete Master== //#region ==Delete Master==
export const useDeleteMasterItem = () => { export const useDeleteMasterItem = () => {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
@ -1203,8 +1156,6 @@ export const useDeleteMasterItem = () => {
//#endregion //#endregion
export const useDeleteServiceGroup = () => { export const useDeleteServiceGroup = () => {
const queryClient = useQueryClient(); const queryClient = useQueryClient();

View File

@ -24,7 +24,9 @@ export const useOrganizationModal = () => {
dispatch( dispatch(
openOrgModal({ openOrgModal({
isOpen: true, isOpen: true,
orgData: options.hasOwnProperty("orgData") ? options.orgData : orgData, orgData: options.hasOwnProperty("orgData")
? options.orgData
: orgData,
startStep: options.startStep ?? startStep ?? 1, startStep: options.startStep ?? startStep ?? 1,
prevStep: options.prevStep ?? prevStep ?? 1, prevStep: options.prevStep ?? prevStep ?? 1,
flowType: options.flowType ?? flowType ?? "default", flowType: options.flowType ?? flowType ?? "default",
@ -37,16 +39,30 @@ export const useOrganizationModal = () => {
// ================================Query============================================================= // ================================Query=============================================================
export const useOrganization=(id)=>{ export const useGlobaleOrganizations = (pageSize, pageNumber, searchString) => {
return useQuery({ return useQuery({
queryKey:["organization",id], queryKey: ["global_organization",pageSize, pageNumber, searchString],
queryFn:async()=> { queryFn: async () => {
const resp = await await OrganizationRepository.getOrganizaion(id); const resp = await OrganizationRepository.getGlobalOrganization(
return resp.data pageSize,
}, pageNumber,
enabled:!!id searchString
}) );
} return resp.data;
},
});
};
export const useOrganization = (id) => {
return useQuery({
queryKey: ["organization", id],
queryFn: async () => {
const resp = await await OrganizationRepository.getOrganizaion(id);
return resp.data;
},
enabled: !!id,
});
};
export const useOrganizationBySPRID = (sprid) => { export const useOrganizationBySPRID = (sprid) => {
return useQuery({ return useQuery({
queryKey: ["organization by", sprid], queryKey: ["organization by", sprid],
@ -101,7 +117,7 @@ export const useOrganizationEmployees = (
organizationId, organizationId,
searchString searchString
), ),
enabled: !!projectId , enabled: !!projectId,
}); });
}; };
@ -138,10 +154,10 @@ export const useAssignOrgToProject = (onSuccessCallback) => {
useClient.invalidateQueries({ useClient.invalidateQueries({
queryKey: ["projectAssignedOrganiztions"], queryKey: ["projectAssignedOrganiztions"],
}); });
useClient.invalidateQueries({ useClient.invalidateQueries({
queryKey: ["projectAssignedOrganiztionsName"], queryKey: ["projectAssignedOrganiztionsName"],
}); });
useClient.invalidateQueries({ useClient.invalidateQueries({
queryKey: ["projectAssignedServices", projectId], queryKey: ["projectAssignedServices", projectId],
}); });
@ -181,12 +197,14 @@ export const useAssignOrgToTenant = (onSuccessCallback) => {
export const useUpdateOrganization = (onSuccessCallback) => { export const useUpdateOrganization = (onSuccessCallback) => {
const useClient = useQueryClient(); const useClient = useQueryClient();
return useMutation({ return useMutation({
mutationFn: async ({orgId,payload}) => mutationFn: async ({ orgId, payload }) =>
await OrganizationRepository.updateOrganizaion(orgId,payload), await OrganizationRepository.updateOrganizaion(orgId, payload),
onSuccess: (_, variables) => { onSuccess: (_, variables) => {
useClient.invalidateQueries({ queryKey: ["organizationList"] }); useClient.invalidateQueries({ queryKey: ["organizationList"] });
useClient.invalidateQueries({ queryKey: ["projectAssignedOrganiztionsName"] }); useClient.invalidateQueries({
queryKey: ["projectAssignedOrganiztionsName"],
});
showToast("Organization Updated successfully", "success"); showToast("Organization Updated successfully", "success");
if (onSuccessCallback) onSuccessCallback(); if (onSuccessCallback) onSuccessCallback();
}, },

25
src/hooks/usePurchase.jsx Normal file
View File

@ -0,0 +1,25 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { PurchaseRepository } from "../repositories/PurchaseRepository";
export const useCreatePurchaseInvoice = (onSuccessCallback) => {
const queryClient = useQueryClient();
return useMutation({
mutationFn: async (payload) =>
await PurchaseRepository.CreatePurchase(payload),
onSuccess: (data, variables) => {
showToast("Purchase Invoice Created successfully", "success");
if (onSuccessCallback) onSuccessCallback();
},
onError: (error) => {
showToast(
error?.response?.data?.message ||
error.message ||
"Failed to create invoice",
"error"
);
},
});
};

View File

@ -157,4 +157,7 @@ export const MasterRespository = {
), ),
getTeamRole: () => api.get(`/api/Master/team-roles/list`), getTeamRole: () => api.get(`/api/Master/team-roles/list`),
getInvoiceAttachmentTypes:()=>api.get("/api/Master/invoice-attachment-type/list")
}; };

View File

@ -2,8 +2,9 @@ import { api } from "../utils/axiosClient";
const OrganizationRepository = { const OrganizationRepository = {
createOrganization: (data) => api.post("/api/Organization/create", data), createOrganization: (data) => api.post("/api/Organization/create", data),
updateOrganizaion:(id,data)=>api.put(`/api/Organization/edit/${id}`,data), updateOrganizaion: (id, data) =>
getOrganizaion:(id)=>api.get(`/api/Organization/details/${id}`), api.put(`/api/Organization/edit/${id}`, data),
getOrganizaion: (id) => api.get(`/api/Organization/details/${id}`),
getOrganizationList: (pageSize, pageNumber, active, sprid, searchString) => { getOrganizationList: (pageSize, pageNumber, active, sprid, searchString) => {
return api.get( return api.get(
`/api/Organization/list?pageSize=${pageSize}&pageNumber=${pageNumber}&active=${active}&${ `/api/Organization/list?pageSize=${pageSize}&pageNumber=${pageNumber}&active=${active}&${
@ -39,6 +40,11 @@ const OrganizationRepository = {
return api.get(url); return api.get(url);
}, },
getGlobalOrganization: (pageSize, pageNumber, searchString) =>
api.get(
`/api/Organization/list/basic?pageSize=${pageSize}&pageNumber=${pageNumber}&searchString=${searchString}`
),
}; };
export default OrganizationRepository; export default OrganizationRepository;

View File

@ -0,0 +1,5 @@
import { api } from "../utils/axiosClient";
export const PurchaseRepository = {
CreatePurchase: (data) => api.post("/api/PurchaseInvoice/create", data),
};