Add the remaining days of the current subscription when upgrading from monthly to annual.
This MR takes care of adding the remaining days of a monthly paid subscription in case a user upgrades to annual before the current active subscription finishes.