Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Webform checkout #12756

Merged
merged 6 commits into from Apr 8, 2021
Merged

fix: Webform checkout #12756

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fc3938d
fix: fix webform checkout
hasnain2808 Apr 1, 2021
d110f61
Update frappe/website/doctype/web_form/web_form.py
hasnain2808 Apr 4, 2021
ef5ccc2
Update frappe/website/doctype/web_form/web_form.py
hasnain2808 Apr 4, 2021
9770a0d
Update frappe/website/doctype/web_form/web_form.py
hasnain2808 Apr 4, 2021
f88b897
refactor: move conditions to function
hasnain2808 Apr 4, 2021
2458845
Merge branch 'fix-payment-in-webform' of https://github.com/hasnain28…
hasnain2808 Apr 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions frappe/templates/pages/integrations/stripe_checkout.py
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@ def get_context(context):

context['amount'] = fmt_money(amount=context['amount'], currency=context['currency'])

if frappe.db.get_value(context.reference_doctype, context.reference_docname, "is_a_subscription"):
if frappe.get_meta(context.reference_doctype).has_field('is_a_subscription') and frappe.db.get_value(context.reference_doctype, context.reference_docname, "is_a_subscription"):
hasnain2808 marked this conversation as resolved.
Show resolved Hide resolved
payment_plan = frappe.db.get_value(context.reference_doctype, context.reference_docname, "payment_plan")
recurrence = frappe.db.get_value("Payment Plan", payment_plan, "recurrence")

Expand Down Expand Up @@ -60,7 +60,7 @@ def make_payment(stripe_token_id, data, reference_doctype=None, reference_docnam

gateway_controller = get_gateway_controller(reference_doctype,reference_docname)

if frappe.db.get_value(reference_doctype, reference_docname, 'is_a_subscription'):
if frappe.get_meta(reference_doctype).has_field('is_a_subscription') and frappe.db.get_value(reference_doctype, reference_docname, 'is_a_subscription'):
reference = frappe.get_doc(reference_doctype, reference_docname)
data = reference.create_subscription("stripe", gateway_controller, data)
else:
Expand Down
8 changes: 4 additions & 4 deletions frappe/website/doctype/web_form/web_form.py
View file
Open in desktop
Expand Up @@ -207,7 +207,7 @@ def load_document(self, context):
context.comment_list = get_comment_list(context.doc.doctype,
context.doc.name)

def get_payment_gateway_url(self, doc):
def get_payment_gateway_url(self, doc, webform):
hasnain2808 marked this conversation as resolved.
Show resolved Hide resolved
if self.accept_payment:
controller = get_payment_gateway_controller(self.payment_gateway)

Expand All @@ -219,8 +219,8 @@ def get_payment_gateway_url(self, doc):
"amount": amount,
"title": title,
"description": title,
"reference_doctype": doc.doctype,
"reference_docname": doc.name,
"reference_doctype": "Web Form",
"reference_docname": webform.name,
hasnain2808 marked this conversation as resolved.
Show resolved Hide resolved
"payer_email": frappe.session.user,
"payer_name": frappe.utils.get_fullname(frappe.session.user),
"order_id": doc.name,
Expand Down Expand Up @@ -463,7 +463,7 @@ def accept(web_form, data, docname=None, for_payment=False):
frappe.flags.web_form_doc = doc

if for_payment:
return web_form.get_payment_gateway_url(doc)
return web_form.get_payment_gateway_url(doc, web_form)
hasnain2808 marked this conversation as resolved.
Show resolved Hide resolved
else:
return doc

Expand Down