From 30d884169494861914bfea38d15df614616f8c3f Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 18 Dec 2018 23:12:47 +0530 Subject: [PATCH 1/2] [fix] setup subscription datetime in utc format --- .../integrations/doctype/paypal_settings/paypal_settings.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/integrations/doctype/paypal_settings/paypal_settings.py b/frappe/integrations/doctype/paypal_settings/paypal_settings.py index 83a1cb0aab..5b72275814 100644 --- a/frappe/integrations/doctype/paypal_settings/paypal_settings.py +++ b/frappe/integrations/doctype/paypal_settings/paypal_settings.py @@ -66,6 +66,7 @@ More Details: from __future__ import unicode_literals import frappe import json +import pytz from frappe import _ from datetime import datetime from six.moves.urllib.parse import urlencode @@ -309,9 +310,11 @@ def create_recurring_profile(token, payerid): "INITAMT": data.get("upfront_amount") }) - starts_at = get_datetime(subscription_details.get("start_date")) or frappe.utils.now_datetime() status_changed_to = 'Completed' if data.get("starting_immediately") or updating else 'Verified' + starts_at = get_datetime(subscription_details.get("start_date")) or frappe.utils.now_datetime() + starts_at = starts_at.replace(tzinfo=pytz.timezone(frappe.utils.get_time_zone())).astimezone(pytz.utc) + #"PROFILESTARTDATE": datetime.utcfromtimestamp(get_timestamp(starts_at)).isoformat() params.update({ "PROFILESTARTDATE": starts_at.isoformat() From dcdc66b4593e514b1d135483ecda36bb5fb0c090 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 18 Dec 2018 23:15:39 +0530 Subject: [PATCH 2/2] [fix] remove unwanted imports --- frappe/integrations/doctype/paypal_settings/paypal_settings.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/integrations/doctype/paypal_settings/paypal_settings.py b/frappe/integrations/doctype/paypal_settings/paypal_settings.py index 5b72275814..62e0555437 100644 --- a/frappe/integrations/doctype/paypal_settings/paypal_settings.py +++ b/frappe/integrations/doctype/paypal_settings/paypal_settings.py @@ -68,11 +68,10 @@ import frappe import json import pytz from frappe import _ -from datetime import datetime from six.moves.urllib.parse import urlencode from frappe.model.document import Document from frappe.integrations.utils import create_request_log, make_post_request, create_payment_gateway -from frappe.utils import get_url, call_hook_method, cint, get_timestamp, cstr, now, date_diff, get_datetime +from frappe.utils import get_url, call_hook_method, cint, get_datetime api_path = '/api/method/frappe.integrations.doctype.paypal_settings.paypal_settings'