Changes Updated for days until expiry
This commit is contained in:
parent
4385d4579d
commit
f1976f12b6
@ -465,17 +465,11 @@ async function calculateDaysUntilExpiry(
|
|||||||
);
|
);
|
||||||
|
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
const today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
|
|
||||||
const expiryDateOnly = new Date(
|
|
||||||
expiryDate.getFullYear(),
|
|
||||||
expiryDate.getMonth(),
|
|
||||||
expiryDate.getDate()
|
|
||||||
);
|
|
||||||
|
|
||||||
const timeDiff = expiryDateOnly.getTime() - today.getTime();
|
const timeDiff = expiryDate.getTime() - now.getTime();
|
||||||
const daysUntilExpiry = Math.ceil(timeDiff / (1000 * 3600 * 24));
|
const daysUntilExpiry = Math.floor(timeDiff / (1000 * 3600 * 24));
|
||||||
|
|
||||||
return daysUntilExpiry;
|
return Math.max(0, daysUntilExpiry);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.error(
|
logger.error(
|
||||||
`Error calculating daysUntilExpiry for membership ${membershipId}:`,
|
`Error calculating daysUntilExpiry for membership ${membershipId}:`,
|
||||||
@ -679,7 +673,7 @@ async function sendTrainerNotifications(
|
|||||||
if (notificationType === "expiring") {
|
if (notificationType === "expiring") {
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
const timeDiff = expiryDate.getTime() - now.getTime();
|
const timeDiff = expiryDate.getTime() - now.getTime();
|
||||||
daysUntilExpiry = Math.ceil(timeDiff / (1000 * 3600 * 24));
|
daysUntilExpiry = Math.floor(timeDiff / (1000 * 3600 * 24));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -869,7 +863,7 @@ async function sendPlanExpiringNotification(
|
|||||||
|
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
const timeDiff = expiryDate.getTime() - now.getTime();
|
const timeDiff = expiryDate.getTime() - now.getTime();
|
||||||
daysUntilExpiry = Math.ceil(timeDiff / (1000 * 3600 * 24));
|
daysUntilExpiry = Math.floor(timeDiff / (1000 * 3600 * 24));
|
||||||
}
|
}
|
||||||
|
|
||||||
const existing = await app
|
const existing = await app
|
||||||
@ -929,7 +923,6 @@ async function sendPlanExpiringNotification(
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getClientName(
|
async function getClientName(
|
||||||
membershipId: string,
|
membershipId: string,
|
||||||
clientId: string
|
clientId: string
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user