Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8f813ed7c4 | |||
| d76011d301 |
@@ -189,15 +189,7 @@ export const getDoctorsByDepartmentId = async (req, res) => {
|
|||||||
doctor: {isActive: true},
|
doctor: {isActive: true},
|
||||||
},
|
},
|
||||||
include: {
|
include: {
|
||||||
doctor: {
|
doctor: true,
|
||||||
include: {
|
|
||||||
seo: {
|
|
||||||
select: {
|
|
||||||
slug: true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
orderBy: {sortOrder: "asc"},
|
orderBy: {sortOrder: "asc"},
|
||||||
});
|
});
|
||||||
@@ -208,7 +200,6 @@ export const getDoctorsByDepartmentId = async (req, res) => {
|
|||||||
image: d.doctor.image ?? "",
|
image: d.doctor.image ?? "",
|
||||||
designation: d.doctor.designation,
|
designation: d.doctor.designation,
|
||||||
hierarchyOrder: d.sortOrder,
|
hierarchyOrder: d.sortOrder,
|
||||||
slug: d.doctor.seo?.slug ?? "",
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
res.status(200).json({
|
res.status(200).json({
|
||||||
|
|||||||
@@ -94,8 +94,8 @@ export default function HealthPackagePage() {
|
|||||||
slug: "",
|
slug: "",
|
||||||
description: "",
|
description: "",
|
||||||
image: "",
|
image: "",
|
||||||
price: 0,
|
price: undefined,
|
||||||
discountedPrice: 0,
|
discountedPrice: undefined,
|
||||||
categoryId: 0,
|
categoryId: 0,
|
||||||
isActive: true,
|
isActive: true,
|
||||||
sortOrder: 1000,
|
sortOrder: 1000,
|
||||||
@@ -204,8 +204,8 @@ export default function HealthPackagePage() {
|
|||||||
slug: "",
|
slug: "",
|
||||||
description: "",
|
description: "",
|
||||||
image: "",
|
image: "",
|
||||||
price: 0,
|
price: undefined,
|
||||||
discountedPrice: 0,
|
discountedPrice: undefined,
|
||||||
categoryId: categories[0]?.id || 0,
|
categoryId: categories[0]?.id || 0,
|
||||||
isActive: true,
|
isActive: true,
|
||||||
sortOrder: 1000,
|
sortOrder: 1000,
|
||||||
@@ -300,13 +300,16 @@ export default function HealthPackagePage() {
|
|||||||
inclusions: parsedInclusions,
|
inclusions: parsedInclusions,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!finalData.price) {
|
finalData.price =
|
||||||
delete finalData.price;
|
finalData.price !== undefined && finalData.price !== null
|
||||||
}
|
? Number(finalData.price)
|
||||||
|
: null;
|
||||||
|
|
||||||
if (!finalData.discountedPrice) {
|
finalData.discountedPrice =
|
||||||
delete finalData.discountedPrice;
|
finalData.discountedPrice !== undefined &&
|
||||||
}
|
finalData.discountedPrice !== null
|
||||||
|
? Number(finalData.discountedPrice)
|
||||||
|
: null;
|
||||||
if (editingPackage?.id) {
|
if (editingPackage?.id) {
|
||||||
const changedFields: Record<string, any> = {};
|
const changedFields: Record<string, any> = {};
|
||||||
Object.keys(finalData).forEach((key) => {
|
Object.keys(finalData).forEach((key) => {
|
||||||
@@ -327,10 +330,8 @@ export default function HealthPackagePage() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
await updateHealthPackageApi(editingPackage.id, changedFields);
|
await updateHealthPackageApi(editingPackage.id, changedFields);
|
||||||
toast.success("Package updated successfully!");
|
|
||||||
} else {
|
} else {
|
||||||
await createHealthPackageApi(finalData);
|
await createHealthPackageApi(finalData);
|
||||||
toast.success("Package created successfully!");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
setPackageModal(false);
|
setPackageModal(false);
|
||||||
@@ -369,10 +370,8 @@ export default function HealthPackagePage() {
|
|||||||
editingCategory.id,
|
editingCategory.id,
|
||||||
changedFields as Partial<HealthCategory>,
|
changedFields as Partial<HealthCategory>,
|
||||||
);
|
);
|
||||||
toast.success("Category updated successfully!");
|
|
||||||
} else {
|
} else {
|
||||||
await createCategoryApi(catForm as any);
|
await createCategoryApi(catForm as any);
|
||||||
toast.success("Category created successfully!");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
setCategoryModal(false);
|
setCategoryModal(false);
|
||||||
@@ -523,9 +522,15 @@ export default function HealthPackagePage() {
|
|||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell>
|
<TableCell>
|
||||||
<div className="font-semibold">
|
<div className="font-semibold">
|
||||||
₹{pkg.discountedPrice || pkg.price}
|
{pkg.discountedPrice != null
|
||||||
|
? `₹${pkg.discountedPrice}`
|
||||||
|
: pkg.price != null
|
||||||
|
? `₹${pkg.price}`
|
||||||
|
: "Not Entered"}
|
||||||
</div>
|
</div>
|
||||||
{pkg.discountedPrice &&
|
|
||||||
|
{pkg.discountedPrice != null &&
|
||||||
|
pkg.price != null &&
|
||||||
pkg.discountedPrice < pkg.price && (
|
pkg.discountedPrice < pkg.price && (
|
||||||
<div className="text-xs text-muted-foreground line-through">
|
<div className="text-xs text-muted-foreground line-through">
|
||||||
₹{pkg.price}
|
₹{pkg.price}
|
||||||
@@ -839,14 +844,19 @@ export default function HealthPackagePage() {
|
|||||||
<Input
|
<Input
|
||||||
type="number"
|
type="number"
|
||||||
value={pkgForm.price || ""}
|
value={pkgForm.price || ""}
|
||||||
onChange={(e) =>
|
onChange={(e) => {
|
||||||
|
const value = e.target.value
|
||||||
|
? Number(e.target.value)
|
||||||
|
: undefined;
|
||||||
|
|
||||||
setPkgForm({
|
setPkgForm({
|
||||||
...pkgForm,
|
...pkgForm,
|
||||||
price: e.target.value
|
price: value,
|
||||||
? Number(e.target.value)
|
discountedPrice: value
|
||||||
|
? pkgForm.discountedPrice
|
||||||
: undefined,
|
: undefined,
|
||||||
})
|
});
|
||||||
}
|
}}
|
||||||
className="text-base"
|
className="text-base"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -856,6 +866,7 @@ export default function HealthPackagePage() {
|
|||||||
</Label>
|
</Label>
|
||||||
<Input
|
<Input
|
||||||
type="number"
|
type="number"
|
||||||
|
disabled={!pkgForm.price}
|
||||||
value={pkgForm.discountedPrice || ""}
|
value={pkgForm.discountedPrice || ""}
|
||||||
onChange={(e) =>
|
onChange={(e) =>
|
||||||
setPkgForm({
|
setPkgForm({
|
||||||
@@ -1065,7 +1076,11 @@ export default function HealthPackagePage() {
|
|||||||
Pricing
|
Pricing
|
||||||
</p>
|
</p>
|
||||||
<p className="text-xl font-bold">
|
<p className="text-xl font-bold">
|
||||||
₹{selectedPackage?.discountedPrice || selectedPackage?.price}
|
{selectedPackage?.discountedPrice != null
|
||||||
|
? `₹${selectedPackage.discountedPrice}`
|
||||||
|
: selectedPackage?.price != null
|
||||||
|
? `₹${selectedPackage.price}`
|
||||||
|
: "Not Entered"}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user