fixed Some issues related to payment gateway