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
Merge branch 'hotfix'
Updated Version 3.4.019
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'develop' into develop-4

Conflicts:
	version.txt
Merge branch 'develop-4' of https://github.com/ten24/Slatwall.git into feature-4-productbundles
Testing includes of partials