Fix bug in result.php with merchant status
Fix function for getting order id in payment.php