This should fix the issue with calendar for collection with expiration day at the day of collection after the expiration day.
Previously, it was detecting that it is the current day after expiration and it started looking for the next collection. As a result, it was missing from the calendar. This should now be fixed. And it is also correctly showing these as non fill day events.
Hopefully, the error in #211 will not happen again. Please test.