Merge pull request #204 from onepercentclub/order-and-payment-flow-fixes

Order and payment flow fixes
Merge branch 'master' into voucher-thanks