Compare commits

..

2 Commits

Author SHA1 Message Date
rishalkv 6d5e243e06 feat: add dynamic slug 2026-05-25 12:04:14 +05:30
kailasdevdas 9210621d67 Merge pull request 'fix: optional price fields' (#39) from fix/optional-pricing into dev
Reviewed-on: #39
2026-05-25 06:11:31 +00:00
2 changed files with 32 additions and 38 deletions
+10 -1
View File
@@ -189,7 +189,15 @@ export const getDoctorsByDepartmentId = async (req, res) => {
doctor: {isActive: true}, doctor: {isActive: true},
}, },
include: { include: {
doctor: true, doctor: {
include: {
seo: {
select: {
slug: true,
},
},
},
},
}, },
orderBy: {sortOrder: "asc"}, orderBy: {sortOrder: "asc"},
}); });
@@ -200,6 +208,7 @@ 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({
+22 -37
View File
@@ -94,8 +94,8 @@ export default function HealthPackagePage() {
slug: "", slug: "",
description: "", description: "",
image: "", image: "",
price: undefined, price: 0,
discountedPrice: undefined, discountedPrice: 0,
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: undefined, price: 0,
discountedPrice: undefined, discountedPrice: 0,
categoryId: categories[0]?.id || 0, categoryId: categories[0]?.id || 0,
isActive: true, isActive: true,
sortOrder: 1000, sortOrder: 1000,
@@ -300,16 +300,13 @@ export default function HealthPackagePage() {
inclusions: parsedInclusions, inclusions: parsedInclusions,
}; };
finalData.price = if (!finalData.price) {
finalData.price !== undefined && finalData.price !== null delete finalData.price;
? Number(finalData.price) }
: null;
finalData.discountedPrice = if (!finalData.discountedPrice) {
finalData.discountedPrice !== undefined && delete finalData.discountedPrice;
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) => {
@@ -330,8 +327,10 @@ 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);
@@ -370,8 +369,10 @@ 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);
@@ -522,15 +523,9 @@ export default function HealthPackagePage() {
</TableCell> </TableCell>
<TableCell> <TableCell>
<div className="font-semibold"> <div className="font-semibold">
{pkg.discountedPrice != null {pkg.discountedPrice || pkg.price}
? `${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}
@@ -844,19 +839,14 @@ 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: value, price: e.target.value
discountedPrice: value ? Number(e.target.value)
? pkgForm.discountedPrice
: undefined, : undefined,
}); })
}} }
className="text-base" className="text-base"
/> />
</div> </div>
@@ -866,7 +856,6 @@ 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({
@@ -1076,11 +1065,7 @@ export default function HealthPackagePage() {
Pricing Pricing
</p> </p>
<p className="text-xl font-bold"> <p className="text-xl font-bold">
{selectedPackage?.discountedPrice != null {selectedPackage?.discountedPrice || selectedPackage?.price}
? `${selectedPackage.discountedPrice}`
: selectedPackage?.price != null
? `${selectedPackage.price}`
: "Not Entered"}
</p> </p>
</div> </div>
</div> </div>