[#79509] No cancellation confirmation when Reservation cost present

Also some refactoring/cleanup of cancelation fee

Closes #226