Merged two window actions in CheckoutController