updates to controller and gateway for checkout model changes