Selaa lähdekoodia

[design] Redesign, cleanup Login, Message pages (#2564)

* [cleanup] login, message pages

* [style] cleanups

* [cleanup]

* [cleanup] update password

* [fix] name for web form (fixes edit-profile)
pull/2/head
Rushabh Mehta 8 vuotta sitten
committed by GitHub
vanhempi
commit
5d3be2c77d
2 muutettua tiedostoa jossa 4 lisäystä ja 4 poistoa
  1. +2
    -2
      payments/payment_gateways/doctype/paypal_settings/paypal_settings.py
  2. +2
    -2
      payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py

+ 2
- 2
payments/payment_gateways/doctype/paypal_settings/paypal_settings.py Näytä tiedosto

@@ -217,7 +217,7 @@ def get_express_checkout_details(token):
if response.get("ACK")[0] != "Success": if response.get("ACK")[0] != "Success":
frappe.respond_as_web_page(_("Something went wrong"), frappe.respond_as_web_page(_("Something went wrong"),
_("Looks like something went wrong during the transaction. Since we haven't confirmed the payment, Paypal will automatically refund you this amount. If it doesn't, please send us an email and mention the Correlation ID: {0}.").format(response.get("CORRELATIONID", [None])[0]), _("Looks like something went wrong during the transaction. Since we haven't confirmed the payment, Paypal will automatically refund you this amount. If it doesn't, please send us an email and mention the Correlation ID: {0}.").format(response.get("CORRELATIONID", [None])[0]),
success=False,
indicator_color='red',
http_status_code=frappe.ValidationError.http_status_code) http_status_code=frappe.ValidationError.http_status_code)


return return
@@ -300,5 +300,5 @@ def get_checkout_url(**kwargs):
except Exception: except Exception:
frappe.respond_as_web_page(_("Something went wrong"), frappe.respond_as_web_page(_("Something went wrong"),
_("Looks like something is wrong with this site's Paypal configuration. Don't worry! No payment has been made from your Paypal account."), _("Looks like something is wrong with this site's Paypal configuration. Don't worry! No payment has been made from your Paypal account."),
success=False,
indicator_color='red',
http_status_code=frappe.ValidationError.http_status_code) http_status_code=frappe.ValidationError.http_status_code)

+ 2
- 2
payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py Näytä tiedosto

@@ -219,8 +219,8 @@ def get_checkout_url(**kwargs):
return frappe.get_doc("Razorpay Settings").get_payment_url(**kwargs) return frappe.get_doc("Razorpay Settings").get_payment_url(**kwargs)
except Exception: except Exception:
frappe.respond_as_web_page(_("Something went wrong"), frappe.respond_as_web_page(_("Something went wrong"),
_("Looks like something is wrong with this site's Razorpay configuration. Don't worry! No payment has been made."),
success=False,
_("Looks like something is wrong with this site's Razorpay configuration. No payment has been made."),
indicator_color='red',
http_status_code=frappe.ValidationError.http_status_code) http_status_code=frappe.ValidationError.http_status_code)


@frappe.whitelist() @frappe.whitelist()


Ladataan…
Peruuta
Tallenna