Updated to work with latest CGPaymentGatewayBase and Orders