Fix problem with missing expiry_date

• We'll need to update this based on recurring billing
• Use DateTime to calculate time intervals instead of raw seconds.