Re-enabled some payment functions. Fixed payment checkout step.
Bring back ShopPayment
Restore shopPayment. Use omnipay api
further integration
Test config updated to include payment gateway conf