Fix return order error.

Resolves issue https://github.com/ten24/Slatwall/issues/2371. Let me
know if this is not the best way to resolve this. Just trying to fix
what I can.
Add missing parenthesis to last commit.
more fixes

access CompanyPaymentMethodFlag directly from orderPayment.
Merge remote-tracking branch 'jsieber-aca/hotfix-bugFixreturnOrder' into hotfix