Canceled subscription should not be in the grace period

[zakiroof]

Grace days should not affect expired and canceled subscriptions. Why a user should be given grace days if he canceled his subscription? I don't think it's supposed to work that way.

Perhaps the expired method should take into account the canceled_at column.