joshuacoles/wallos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix statistics calculation for weekly subscriptions

Browse Source
This commit is contained in:
ellite 2023-11-11 16:51:31 +01:00
parent ff2f2635df
commit 4e75456b16
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
stats.php
View File

@ -92,14 +92,14 @@ if ($result) {
if ($nextPaymentDate >= $tomorrow && $nextPaymentDate <= $endOfMonth) { if ($nextPaymentDate >= $tomorrow && $nextPaymentDate <= $endOfMonth) {
$timesToPay = 1; $timesToPay = 1;
$daysInMonth = $endOfMonth->diff($tomorrow)->days + 1;
$daysRemaining = $endOfMonth->diff($nextPaymentDate)->days + 1;
if ($cycle == 1) { if ($cycle == 1) {
$daysInMonth = $endOfMonth->diff($tomorrow)->days + 1;
$daysRemaining = $endOfMonth->diff($nextPaymentDate)->days + 1;
$timesToPay = $daysRemaining / $frequency; $timesToPay = $daysRemaining / $frequency;
} }
if ($cycle == 2) { if ($cycle == 2) {
$weeksInMonth = $endOfMonth->diff($tomorrow)->weeks + 1; $weeksInMonth = ceil($daysInMonth / 7);
$weeksRemaining = $endOfMonth->diff($nextPaymentDate)->weeks + 1; $weeksRemaining = ceil($daysRemaining / 7);
$timesToPay = $weeksRemaining / $frequency; $timesToPay = $weeksRemaining / $frequency;
} }
$amountDueThisMonth += $originalSubscriptionPrice * $timesToPay; $amountDueThisMonth += $originalSubscriptionPrice * $timesToPay;
@ -126,6 +126,9 @@ if ($result) {
} }
} }
// Calculate cost per household member
?> ?>
<section class="contain"> <section class="contain">
<div class="statistics"> <div class="statistics">