Updates and bugfixes for QuickPay gateway

Replaces PR #1186