Updates and bugfixes for QuickPay gateway

Replaces PR #1186

No worries - thanks for the contribution! :dancers: