diff --git a/payments/payment_gateways/doctype/braintree_settings/braintree_settings.py b/payments/payment_gateways/doctype/braintree_settings/braintree_settings.py index ca7ab0c..17330d7 100644 --- a/payments/payment_gateways/doctype/braintree_settings/braintree_settings.py +++ b/payments/payment_gateways/doctype/braintree_settings/braintree_settings.py @@ -190,7 +190,7 @@ class BraintreeSettings(Document): self.data = frappe._dict(data) 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() except Exception: diff --git a/payments/payment_gateways/doctype/paypal_settings/paypal_settings.py b/payments/payment_gateways/doctype/paypal_settings/paypal_settings.py index ab7512f..3568b77 100644 --- a/payments/payment_gateways/doctype/paypal_settings/paypal_settings.py +++ b/payments/payment_gateways/doctype/paypal_settings/paypal_settings.py @@ -182,9 +182,8 @@ class PayPalSettings(Document): kwargs.update( {"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"]) @@ -463,7 +462,8 @@ def ipn_handler(): { "data": json.dumps(frappe.local.form_dict), "doctype": "Integration Request", - "integration_type": "Subscription Notification", + "request_description": "Subscription Notification", + "is_remote_request": 1, "status": "Queued", } ).insert(ignore_permissions=True) diff --git a/payments/payment_gateways/doctype/paytm_settings/paytm_settings.py b/payments/payment_gateways/doctype/paytm_settings/paytm_settings.py index 0888fd3..d8c9159 100644 --- a/payments/payment_gateways/doctype/paytm_settings/paytm_settings.py +++ b/payments/payment_gateways/doctype/paytm_settings/paytm_settings.py @@ -34,7 +34,7 @@ class PaytmSettings(Document): def get_payment_url(self, **kwargs): """Return payment url with several params""" # 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)) return get_url("./integrations/paytm_checkout?{0}".format(urlencode(kwargs))) diff --git a/payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py b/payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py index cc620aa..b48d211 100644 --- a/payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py +++ b/payments/payment_gateways/doctype/razorpay_settings/razorpay_settings.py @@ -196,7 +196,7 @@ class RazorpaySettings(Document): return 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)) def create_order(self, **kwargs): @@ -206,7 +206,7 @@ class RazorpaySettings(Document): kwargs["amount"] *= 100 # Create integration log - integration_request = create_request_log(kwargs, "Host", "Razorpay") + integration_request = create_request_log(kwargs, service_name="Razorpay") # Setup payment options payment_options = { @@ -490,7 +490,8 @@ def razorpay_subscription_callback(): { "data": json.dumps(frappe.local.form_dict), "doctype": "Integration Request", - "integration_type": "Subscription Notification", + "request_description": "Subscription Notification", + "is_remote_request": 1, "status": "Queued", } ).insert(ignore_permissions=True) diff --git a/payments/payment_gateways/doctype/stripe_settings/stripe_settings.py b/payments/payment_gateways/doctype/stripe_settings/stripe_settings.py index 4ebf902..bc8b0df 100644 --- a/payments/payment_gateways/doctype/stripe_settings/stripe_settings.py +++ b/payments/payment_gateways/doctype/stripe_settings/stripe_settings.py @@ -200,7 +200,7 @@ class StripeSettings(Document): stripe.default_http_client = stripe.http_client.RequestsClient() 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() except Exception: