@@ -190,7 +190,7 @@ class BraintreeSettings(Document): | |||||
self.data = frappe._dict(data) | self.data = frappe._dict(data) | ||||
try: | try: | ||||
self.integration_request = create_request_log(self.data, "Host", "Braintree") | |||||
self.integration_request = create_request_log(self.data, service_name="Braintree") | |||||
return self.create_charge_on_braintree() | return self.create_charge_on_braintree() | ||||
except Exception: | except Exception: | ||||
@@ -182,9 +182,8 @@ class PayPalSettings(Document): | |||||
kwargs.update( | kwargs.update( | ||||
{"token": response.get("TOKEN")[0], "correlation_id": response.get("CORRELATIONID")[0]} | {"token": response.get("TOKEN")[0], "correlation_id": response.get("CORRELATIONID")[0]} | ||||
) | ) | ||||
self.integration_request = create_request_log( | |||||
kwargs, "Remote", "PayPal", response.get("TOKEN")[0] | |||||
) | |||||
create_request_log(kwargs, service_name="PayPal", name=kwargs["token"]) | |||||
return return_url.format(kwargs["token"]) | return return_url.format(kwargs["token"]) | ||||
@@ -463,7 +462,8 @@ def ipn_handler(): | |||||
{ | { | ||||
"data": json.dumps(frappe.local.form_dict), | "data": json.dumps(frappe.local.form_dict), | ||||
"doctype": "Integration Request", | "doctype": "Integration Request", | ||||
"integration_type": "Subscription Notification", | |||||
"request_description": "Subscription Notification", | |||||
"is_remote_request": 1, | |||||
"status": "Queued", | "status": "Queued", | ||||
} | } | ||||
).insert(ignore_permissions=True) | ).insert(ignore_permissions=True) | ||||
@@ -34,7 +34,7 @@ class PaytmSettings(Document): | |||||
def get_payment_url(self, **kwargs): | def get_payment_url(self, **kwargs): | ||||
"""Return payment url with several params""" | """Return payment url with several params""" | ||||
# create unique order id by making it equal to the integration request | # create unique order id by making it equal to the integration request | ||||
integration_request = create_request_log(kwargs, "Host", "Paytm") | |||||
integration_request = create_request_log(kwargs, service_name="Paytm") | |||||
kwargs.update(dict(order_id=integration_request.name)) | kwargs.update(dict(order_id=integration_request.name)) | ||||
return get_url("./integrations/paytm_checkout?{0}".format(urlencode(kwargs))) | return get_url("./integrations/paytm_checkout?{0}".format(urlencode(kwargs))) | ||||
@@ -196,7 +196,7 @@ class RazorpaySettings(Document): | |||||
return kwargs | return kwargs | ||||
def get_payment_url(self, **kwargs): | def get_payment_url(self, **kwargs): | ||||
integration_request = create_request_log(kwargs, "Host", "Razorpay") | |||||
integration_request = create_request_log(kwargs, service_name="Razorpay") | |||||
return get_url("./integrations/razorpay_checkout?token={0}".format(integration_request.name)) | return get_url("./integrations/razorpay_checkout?token={0}".format(integration_request.name)) | ||||
def create_order(self, **kwargs): | def create_order(self, **kwargs): | ||||
@@ -206,7 +206,7 @@ class RazorpaySettings(Document): | |||||
kwargs["amount"] *= 100 | kwargs["amount"] *= 100 | ||||
# Create integration log | # Create integration log | ||||
integration_request = create_request_log(kwargs, "Host", "Razorpay") | |||||
integration_request = create_request_log(kwargs, service_name="Razorpay") | |||||
# Setup payment options | # Setup payment options | ||||
payment_options = { | payment_options = { | ||||
@@ -490,7 +490,8 @@ def razorpay_subscription_callback(): | |||||
{ | { | ||||
"data": json.dumps(frappe.local.form_dict), | "data": json.dumps(frappe.local.form_dict), | ||||
"doctype": "Integration Request", | "doctype": "Integration Request", | ||||
"integration_type": "Subscription Notification", | |||||
"request_description": "Subscription Notification", | |||||
"is_remote_request": 1, | |||||
"status": "Queued", | "status": "Queued", | ||||
} | } | ||||
).insert(ignore_permissions=True) | ).insert(ignore_permissions=True) | ||||
@@ -200,7 +200,7 @@ class StripeSettings(Document): | |||||
stripe.default_http_client = stripe.http_client.RequestsClient() | stripe.default_http_client = stripe.http_client.RequestsClient() | ||||
try: | try: | ||||
self.integration_request = create_request_log(self.data, "Host", "Stripe") | |||||
self.integration_request = create_request_log(self.data, service_name="Stripe") | |||||
return self.create_charge_on_stripe() | return self.create_charge_on_stripe() | ||||
except Exception: | except Exception: | ||||