Compare commits

...

4 Commits

Author SHA1 Message Date
Kailasdevdas 8f813ed7c4 fix: handle empty package pricing fields correctly 2026-05-25 12:59:44 +05:30
Kailasdevdas d76011d301 fix: remove duplicate toasts 2026-05-25 12:19:09 +05:30
Kailasdevdas cefaf3a850 fix: optional price fields 2026-05-25 11:37:51 +05:30
kailasdevdas 120ff12fef Merge pull request 'fix: add toggle action update controller' (#38) from fix/doc-update-controller into dev
Reviewed-on: #38
2026-05-22 11:40:52 +00:00
2 changed files with 47 additions and 22 deletions
+1 -1
View File
@@ -6,7 +6,7 @@ export interface HealthPackage {
name: string; name: string;
slug: string; slug: string;
description?: string; description?: string;
price: number; price?: number;
image?: string; image?: string;
discountedPrice?: number; discountedPrice?: number;
inclusions: Record<string, string[]>; inclusions: Record<string, string[]>;
+46 -21
View File
@@ -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,
@@ -270,10 +270,6 @@ export default function HealthPackagePage() {
if (!pkgForm.slug?.trim()) return toast.error("URL Slug is required."); if (!pkgForm.slug?.trim()) return toast.error("URL Slug is required.");
if (!pkgForm.categoryId) if (!pkgForm.categoryId)
return toast.error("Please select a valid category."); return toast.error("Please select a valid category.");
if (pkgForm.price === undefined || pkgForm.price <= 0)
return toast.error(
"Regular Price must be a valid amount greater than 0.",
);
if (!pkgForm.description?.trim()) if (!pkgForm.description?.trim())
return toast.error("Description is required."); return toast.error("Description is required.");
@@ -299,8 +295,21 @@ export default function HealthPackagePage() {
} }
}); });
const finalData = { ...pkgForm, inclusions: parsedInclusions }; const finalData: Partial<HealthPackage> = {
...pkgForm,
inclusions: parsedInclusions,
};
finalData.price =
finalData.price !== undefined && finalData.price !== null
? Number(finalData.price)
: null;
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) => {
@@ -321,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);
@@ -363,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);
@@ -517,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}
@@ -833,12 +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: Number(e.target.value), price: value,
}) discountedPrice: value
} ? pkgForm.discountedPrice
: undefined,
});
}}
className="text-base" className="text-base"
/> />
</div> </div>
@@ -848,11 +866,14 @@ 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({
...pkgForm, ...pkgForm,
discountedPrice: Number(e.target.value), discountedPrice: e.target.value
? Number(e.target.value)
: undefined,
}) })
} }
className="text-base" className="text-base"
@@ -1055,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>