more fixes

access CompanyPaymentMethodFlag directly from orderPayment.