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