From 6aef726beb4d42cecc4abd4446f212b18848d206 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 29 Nov 2018 01:18:04 +0530 Subject: [PATCH 01/16] fix: check if key exists (with python3 support) (#6557) https://stackoverflow.com/a/1323426/5955589 --- frappe/email/doctype/auto_email_report/auto_email_report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/email/doctype/auto_email_report/auto_email_report.py b/frappe/email/doctype/auto_email_report/auto_email_report.py index 37a5e247d0..3f09cd3cfb 100644 --- a/frappe/email/doctype/auto_email_report/auto_email_report.py +++ b/frappe/email/doctype/auto_email_report/auto_email_report.py @@ -111,7 +111,7 @@ class AutoEmailReport(Document): new_row = [] out.append(new_row) for df in columns: - if not row.has_key(df.fieldname): continue + if df.fieldname not in row: continue new_row.append(frappe.format(row[df.fieldname], df, row)) return out From 6f550c5c1ede6dc9f3ea8071d2f05669290b57de Mon Sep 17 00:00:00 2001 From: Shreya Shah Date: Thu, 29 Nov 2018 09:07:21 +0530 Subject: [PATCH 02/16] fix: Hide print for single doctypes (#6553) --- frappe/public/js/frappe/form/toolbar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js index 89ec11cbfd..99d913f1cd 100644 --- a/frappe/public/js/frappe/form/toolbar.js +++ b/frappe/public/js/frappe/form/toolbar.js @@ -107,7 +107,7 @@ frappe.ui.form.Toolbar = Class.extend({ var p = this.frm.perm[0]; var docstatus = cint(this.frm.doc.docstatus); var is_submittable = frappe.model.is_submittable(this.frm.doc.doctype) - + var issingle = this.frm.meta.issingle; var print_settings = frappe.model.get_doc(":Print Settings", "Print Settings") var allow_print_for_draft = cint(print_settings.allow_print_for_draft); var allow_print_for_cancelled = cint(print_settings.allow_print_for_cancelled); @@ -116,7 +116,7 @@ frappe.ui.form.Toolbar = Class.extend({ if(!is_submittable || docstatus == 1 || (allow_print_for_cancelled && docstatus == 2)|| (allow_print_for_draft && docstatus == 0)) { - if(frappe.model.can_print(null, me.frm)) { + if(frappe.model.can_print(null, me.frm) && !issingle) { this.page.add_menu_item(__("Print"), function() { me.frm.print_doc();}, true); this.print_icon = this.page.add_action_icon("fa fa-print", function() { From 087e401c78b196e24af9dac24e5a20adefa86f17 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 29 Nov 2018 09:07:38 +0530 Subject: [PATCH 03/16] Customize payment success message (#6460) * Provision to set custom payment success message * typo fix * Fix formatting --- .../doctype/paypal_settings/paypal_settings.py | 6 +++--- .../razorpay_settings/razorpay_settings.py | 4 ++-- .../pages/integrations/payment-success.html | 15 +++++++++++---- .../pages/integrations/payment_success.py | 8 +++++++- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/frappe/integrations/doctype/paypal_settings/paypal_settings.py b/frappe/integrations/doctype/paypal_settings/paypal_settings.py index 3d4be38467..83a1cb0aab 100644 --- a/frappe/integrations/doctype/paypal_settings/paypal_settings.py +++ b/frappe/integrations/doctype/paypal_settings/paypal_settings.py @@ -203,7 +203,7 @@ def setup_redirect(data, redirect_url, custom_redirect_to=None, redirect=True): redirect_to = custom_redirect_to if redirect_to: - redirect_url += '?' + urlencode({'redirect_to': redirect_to}) + redirect_url += '&' + urlencode({'redirect_to': redirect_to}) if redirect_message: redirect_url += '&' + urlencode({'redirect_message': redirect_message}) @@ -274,7 +274,7 @@ def confirm_payment(token): data.get("reference_docname")).run_method("on_payment_authorized", "Completed") frappe.db.commit() - redirect_url = '/integrations/payment-success' + redirect_url = '/integrations/payment-success?doctype={0}&docname={1}'.format(data.get("reference_doctype"), data.get("reference_docname")) else: redirect_url = "/integrations/payment-failed" @@ -332,7 +332,7 @@ def create_recurring_profile(token, payerid): data.get("reference_docname")).run_method("on_payment_authorized", status_changed_to) frappe.db.commit() - redirect_url = '/integrations/payment-success' + redirect_url = '/integrations/payment-success?doctype={0}&docname={1}'.format(data.get("reference_doctype"), data.get("reference_docname")) else: redirect_url = "/integrations/payment-failed" diff --git a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py index bca9291f54..cb66ed7f2a 100644 --- a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py +++ b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py @@ -255,12 +255,12 @@ class RazorpaySettings(Document): if custom_redirect_to: redirect_to = custom_redirect_to - redirect_url = 'payment-success' + redirect_url = 'payment-success?doctype={0}&docname={1}'.format(self.data.reference_doctype, self.data.reference_docname) else: redirect_url = 'payment-failed' if redirect_to: - redirect_url += '?' + urlencode({'redirect_to': redirect_to}) + redirect_url += '&' + urlencode({'redirect_to': redirect_to}) if redirect_message: redirect_url += '&' + urlencode({'redirect_message': redirect_message}) diff --git a/frappe/templates/pages/integrations/payment-success.html b/frappe/templates/pages/integrations/payment-success.html index ce382cd5e1..45bc303a75 100644 --- a/frappe/templates/pages/integrations/payment-success.html +++ b/frappe/templates/pages/integrations/payment-success.html @@ -8,9 +8,16 @@ {{ _("Success") }} -

{{ _("Your payment was successfully accepted") }}

-
- {{ _("Continue") }}
+

{{ payment_message or _("Your payment was successfully accepted") }}

+ {% if not payment_message %} +
+ + {{ _("Continue") }} + +
+ {% endif %}