From ff904eb29bc28f2ff07f286b5d9aa71fa58bbf07 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Sat, 25 Nov 2023 10:01:32 +0100 Subject: [PATCH 001/284] Create __init__.py --- payments/payment_gateways/doctype/mollie_settings/__init__.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 payments/payment_gateways/doctype/mollie_settings/__init__.py diff --git a/payments/payment_gateways/doctype/mollie_settings/__init__.py b/payments/payment_gateways/doctype/mollie_settings/__init__.py new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/payments/payment_gateways/doctype/mollie_settings/__init__.py @@ -0,0 +1 @@ + From abf45dc3dde343a8f26d6cc93b3ddc0180934a14 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Sat, 25 Nov 2023 10:01:53 +0100 Subject: [PATCH 002/284] Create mollie_settings.js --- .../doctype/mollie_settings/mollie_settings.js | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 payments/payment_gateways/doctype/mollie_settings/mollie_settings.js diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.js b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.js new file mode 100644 index 00000000..bb0899af --- /dev/null +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.js @@ -0,0 +1,5 @@ +frappe.ui.form.on('Mollie Settings', { + refresh: function(frm) { + + } +}); From 8d18b137c4bd7b9b75c19270b8df9994513a427a Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Sat, 25 Nov 2023 10:02:12 +0100 Subject: [PATCH 003/284] Create mollie_settings.json --- .../mollie_settings/mollie_settings.json | 315 ++++++++++++++++++ 1 file changed, 315 insertions(+) create mode 100644 payments/payment_gateways/doctype/mollie_settings/mollie_settings.json diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.json b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.json new file mode 100644 index 00000000..a6aa35eb --- /dev/null +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.json @@ -0,0 +1,315 @@ +{ + "allow_copy": 0, + "allow_guest_to_view": 0, + "allow_import": 0, + "allow_rename": 0, + "autoname": "field:gateway_name", + "beta": 0, + "creation": "2017-03-09 17:18:29.458397", + "custom": 0, + "docstatus": 0, + "doctype": "DocType", + "document_type": "", + "editable_grid": 1, + "engine": "InnoDB", + "fields": [ + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "gateway_name", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Payment Gateway Name", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "publishable_key", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Publishable Key", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_3", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "secret_key", + "fieldtype": "Password", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Secret Key", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "section_break_5", + "fieldtype": "Section Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "header_img", + "fieldtype": "Attach Image", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Header Image", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_7", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "redirect_url", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "label": "Redirect URL", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + } + ], + "has_web_view": 0, + "hide_heading": 0, + "hide_toolbar": 0, + "idx": 0, + "image_view": 0, + "in_create": 0, + "is_submittable": 0, + "issingle": 0, + "istable": 0, + "max_attachments": 0, + "modified": "2023-11-25 13:32:14.429916", + "modified_by": "Administrator", + "module": "Payment Gateways", + "name": "Mollie Settings", + "name_case": "", + "owner": "Administrator", + "permissions": [ + { + "amend": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 0, + "if_owner": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 0, + "role": "System Manager", + "set_user_permissions": 0, + "share": 1, + "submit": 0, + "write": 1 + } + ], + "quick_entry": 1, + "read_only": 0, + "read_only_onload": 0, + "show_name_in_global_search": 0, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 0, + "track_seen": 0 + } From 8ab742a7faac526fe5797c9509e83de24bb390ce Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Sat, 25 Nov 2023 10:02:29 +0100 Subject: [PATCH 004/284] Create mollie_settings.py --- .../mollie_settings/mollie_settings.py | 165 ++++++++++++++++++ 1 file changed, 165 insertions(+) create mode 100644 payments/payment_gateways/doctype/mollie_settings/mollie_settings.py diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py new file mode 100644 index 00000000..187a0ec4 --- /dev/null +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -0,0 +1,165 @@ +from urllib.parse import urlencode + +import frappe +from frappe import _ +from frappe.integrations.utils import create_request_log, make_get_request +from frappe.model.document import Document +from frappe.utils import call_hook_method, cint, flt, get_url +from payments.utils import create_payment_gateway + + +class MollieSettings(Document): + supported_currencies = [ + "AED", + "AUD", + "BGN", + "BRL", + "CAD", + "CHF", + "CZK", + "DKK", + "EUR", + "GBP", + "HKD", + "HUF", + "ILS", + "ISK", + "JPY", + "MXN", + "MYR", + "NOK", + "NZD", + "PHP", + "PLN", + "RON", + "RUB", + "SEK", + "SGD", + "THB", + "TWD", + "USD", + "ZAR", + ] + + def on_update(self): + create_payment_gateway( + "Mollie-" + self.gateway_name, + settings="Mollie Settings", + controller=self.gateway_name, + ) + call_hook_method("payment_gateway_enabled", gateway="Mollie-" + self.gateway_name) + if not self.flags.ignore_mandatory: + self.validate_mollie_credentials() + + def validate_mollie_credentials(self): + if self.publishable_key and self.secret_key: + header = { + "Authorization": "Bearer {}".format( + self.get_password(fieldname="secret_key", raise_exception=False) + ) + } + try: + make_get_request(url="https://api.mollie.com/v2/payments", headers=header) + except Exception: + frappe.throw(_("Seems Publishable Key or Secret Key is wrong !!!")) + + def validate_transaction_currency(self, currency): + if currency not in self.supported_currencies: + frappe.throw( + _( + "Please select another payment method. Mollie does not support transactions in currency '{0}'" + ).format(currency) + ) + + def get_payment_url(self, **kwargs): + return get_url(f"./mollie_checkout?{urlencode(kwargs)}") + + def create_request(self, data): + import mollie + + self.data = frappe._dict(data) + mollie.api_key = self.get_password(fieldname="secret_key", raise_exception=False) + mollie.default_http_client = mollie.http_client.RequestsClient() + + try: + self.integration_request = create_request_log(self.data, service_name="Mollie") + return self.create_charge_on_mollie() + + except Exception: + frappe.log_error(frappe.get_traceback()) + return { + "redirect_to": frappe.redirect_to_message( + _("Server Error"), + _( + "It seems that there is an issue with the server's Mollie configuration. In case of failure, the amount will get refunded to your account." + ), + ), + "status": 401, + } + + def create_charge_on_mollie(self): + import mollie + + try: + charge = mollie.Charge.create( + amount=cint(flt(self.data.amount) * 100), + currency=self.data.currency, + source=self.data.mollie_token_id, + description=self.data.description, + billingEmail=self.data.payer_email, + ) + + if charge.captured == True: + self.integration_request.db_set("status", "Completed", update_modified=False) + self.flags.status_changed_to = "Completed" + + else: + frappe.log_error(charge.failure_message, "Mollie Payment not completed") + + except Exception: + frappe.log_error(frappe.get_traceback()) + + return self.finalize_request() + + def finalize_request(self): + redirect_to = self.data.get("redirect_to") or None + redirect_message = self.data.get("redirect_message") or None + status = self.integration_request.status + + if self.flags.status_changed_to == "Completed": + if self.data.reference_doctype and self.data.reference_docname: + custom_redirect_to = None + try: + custom_redirect_to = frappe.get_doc( + self.data.reference_doctype, self.data.reference_docname + ).run_method("on_payment_authorized", self.flags.status_changed_to) + except Exception: + frappe.log_error(frappe.get_traceback()) + + if custom_redirect_to: + redirect_to = custom_redirect_to + + redirect_url = "payment-success?doctype={}&docname={}".format( + self.data.reference_doctype, self.data.reference_docname + ) + + if self.redirect_url: + redirect_url = self.redirect_url + redirect_to = None + else: + redirect_url = "payment-failed" + + if redirect_to: + redirect_url += "?" + urlencode({"redirect_to": redirect_to}) + if redirect_message: + redirect_url += "&" + urlencode({"redirect_message": redirect_message}) + + return {"redirect_to": redirect_url, "status": status} + + +def get_gateway_controller(doctype, docname): + reference_doc = frappe.get_doc(doctype, docname) + gateway_controller = frappe.db.get_value( + "Payment Gateway", reference_doc.payment_gateway, "gateway_controller" + ) + return gateway_controller From 7aabbe6a2892ee244080badb9801f3af9a9ae48c Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Sat, 25 Nov 2023 11:38:38 +0100 Subject: [PATCH 005/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 187a0ec4..7091db55 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -72,7 +72,7 @@ def validate_transaction_currency(self, currency): ) def get_payment_url(self, **kwargs): - return get_url(f"./mollie_checkout?{urlencode(kwargs)}") + return get_url(f"https://api.mollie.com/v2/payment-links/?{urlencode(kwargs)}") def create_request(self, data): import mollie From 9b919602161fa04e614c444b8f9fae701eb92eea Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Sat, 25 Nov 2023 13:47:14 +0100 Subject: [PATCH 006/284] Update mollie_settings.py --- .../mollie_settings/mollie_settings.py | 562 ++++++++++++++---- 1 file changed, 455 insertions(+), 107 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 7091db55..04943a5c 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -1,165 +1,513 @@ +# Copyright (c) 2015, Frappe Technologies and contributors +# License: MIT. See LICENSE + +""" +# Integrating PayPal + +### 1. Validate Currency Support + +Example: + + from payments.utils import get_payment_gateway_controller + + controller = get_payment_gateway_controller("PayPal") + controller().validate_transaction_currency(currency) + +### 2. Redirect for payment + +Example: + + payment_details = { + "amount": 600, + "title": "Payment for bill : 111", + "description": "payment via cart", + "reference_doctype": "Payment Request", + "reference_docname": "PR0001", + "payer_email": "NuranVerkleij@example.com", + "payer_name": "Nuran Verkleij", + "order_id": "111", + "currency": "USD", + "payment_gateway": "Razorpay", + "subscription_details": { + "plan_id": "plan_12313", # if Required + "start_date": "2018-08-30", + "billing_period": "Month" #(Day, Week, SemiMonth, Month, Year), + "billing_frequency": 1, + "customer_notify": 1, + "upfront_amount": 1000 + } + } + + # redirect the user to this url + url = controller().get_payment_url(**payment_details) + + +### 3. On Completion of Payment + +Write a method for `on_payment_authorized` in the reference doctype + +Example: + + def on_payment_authorized(payment_status): + # your code to handle callback + +##### Note: + +payment_status - payment gateway will put payment status on callback. +For paypal payment status parameter is one from: [Completed, Cancelled, Failed] + + +More Details: +
For details on how to get your API credentials, follow this link: https://developer.paypal.com/docs/classic/api/apiCredentials/
+ +""" + +import json from urllib.parse import urlencode import frappe +import pytz from frappe import _ -from frappe.integrations.utils import create_request_log, make_get_request +from frappe.integrations.utils import create_request_log, make_post_request from frappe.model.document import Document -from frappe.utils import call_hook_method, cint, flt, get_url +from frappe.utils import call_hook_method, cint, get_datetime, get_url +from frappe.utils.data import get_system_timezone + from payments.utils import create_payment_gateway +api_path = "/api/method/payments.payment_gateways.doctype.paypal_settings.paypal_settings" + -class MollieSettings(Document): +class PayPalSettings(Document): supported_currencies = [ - "AED", "AUD", - "BGN", "BRL", "CAD", - "CHF", "CZK", "DKK", "EUR", - "GBP", "HKD", "HUF", "ILS", - "ISK", "JPY", - "MXN", "MYR", - "NOK", + "MXN", + "TWD", "NZD", + "NOK", "PHP", "PLN", - "RON", + "GBP", "RUB", - "SEK", "SGD", + "SEK", + "CHF", "THB", - "TWD", + "TRY", "USD", - "ZAR", ] - def on_update(self): - create_payment_gateway( - "Mollie-" + self.gateway_name, - settings="Mollie Settings", - controller=self.gateway_name, - ) - call_hook_method("payment_gateway_enabled", gateway="Mollie-" + self.gateway_name) + def __setup__(self): + setattr(self, "use_sandbox", 0) + + def setup_sandbox_env(self, token): + data = json.loads(frappe.db.get_value("Integration Request", token, "data")) + setattr(self, "use_sandbox", cint(frappe._dict(data).use_sandbox) or 0) + + def validate(self): + create_payment_gateway("PayPal") + call_hook_method("payment_gateway_enabled", gateway="PayPal") if not self.flags.ignore_mandatory: - self.validate_mollie_credentials() - - def validate_mollie_credentials(self): - if self.publishable_key and self.secret_key: - header = { - "Authorization": "Bearer {}".format( - self.get_password(fieldname="secret_key", raise_exception=False) - ) - } - try: - make_get_request(url="https://api.mollie.com/v2/payments", headers=header) - except Exception: - frappe.throw(_("Seems Publishable Key or Secret Key is wrong !!!")) + self.validate_paypal_credentails() + + def on_update(self): + pass def validate_transaction_currency(self, currency): if currency not in self.supported_currencies: frappe.throw( _( - "Please select another payment method. Mollie does not support transactions in currency '{0}'" + "Please select another payment method. PayPal does not support transactions in currency '{0}'" ).format(currency) ) - def get_payment_url(self, **kwargs): - return get_url(f"https://api.mollie.com/v2/payment-links/?{urlencode(kwargs)}") + def get_paypal_params_and_url(self): + params = { + "USER": self.api_username, + "PWD": self.get_password(fieldname="api_password", raise_exception=False), + "SIGNATURE": self.signature, + "VERSION": "98", + "METHOD": "GetPalDetails", + } + + if hasattr(self, "use_sandbox") and self.use_sandbox: + params.update( + { + "USER": frappe.conf.sandbox_api_username, + "PWD": frappe.conf.sandbox_api_password, + "SIGNATURE": frappe.conf.sandbox_signature, + } + ) + + api_url = ( + "https://api-3t.sandbox.paypal.com/nvp" + if (self.paypal_sandbox or self.use_sandbox) + else "https://api-3t.paypal.com/nvp" + ) - def create_request(self, data): - import mollie + return params, api_url - self.data = frappe._dict(data) - mollie.api_key = self.get_password(fieldname="secret_key", raise_exception=False) - mollie.default_http_client = mollie.http_client.RequestsClient() + def validate_paypal_credentails(self): + params, url = self.get_paypal_params_and_url() + params = urlencode(params) try: - self.integration_request = create_request_log(self.data, service_name="Mollie") - return self.create_charge_on_mollie() + res = make_post_request(url=url, data=params.encode("utf-8")) + + if res["ACK"][0] == "Failure": + raise Exception except Exception: - frappe.log_error(frappe.get_traceback()) - return { - "redirect_to": frappe.redirect_to_message( - _("Server Error"), - _( - "It seems that there is an issue with the server's Mollie configuration. In case of failure, the amount will get refunded to your account." - ), - ), - "status": 401, + frappe.throw(_("Invalid payment gateway credentials")) + + def get_payment_url(self, **kwargs): + setattr(self, "use_sandbox", cint(kwargs.get("use_sandbox", 0))) + + response = self.execute_set_express_checkout(**kwargs) + + if self.paypal_sandbox or self.use_sandbox: + return_url = "https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token={0}" + else: + return_url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token={0}" + + kwargs.update( + { + "token": response.get("TOKEN")[0], + "correlation_id": response.get("CORRELATIONID")[0], } + ) - def create_charge_on_mollie(self): - import mollie + create_request_log(kwargs, service_name="PayPal", name=kwargs["token"]) - try: - charge = mollie.Charge.create( - amount=cint(flt(self.data.amount) * 100), - currency=self.data.currency, - source=self.data.mollie_token_id, - description=self.data.description, - billingEmail=self.data.payer_email, + return return_url.format(kwargs["token"]) + + def execute_set_express_checkout(self, **kwargs): + params, url = self.get_paypal_params_and_url() + + params.update( + { + "METHOD": "SetExpressCheckout", + "returnUrl": get_url(f"{api_path}.get_express_checkout_details"), + "cancelUrl": get_url("/payment-cancel"), + "PAYMENTREQUEST_0_PAYMENTACTION": "SALE", + "PAYMENTREQUEST_0_AMT": kwargs["amount"], + "PAYMENTREQUEST_0_CURRENCYCODE": kwargs["currency"].upper(), + } + ) + + if kwargs.get("subscription_details"): + self.configure_recurring_payments(params, kwargs) + + params = urlencode(params) + response = make_post_request(url, data=params.encode("utf-8")) + + if response.get("ACK")[0] != "Success": + frappe.throw(_("Looks like something is wrong with this site's Paypal configuration.")) + + return response + + def configure_recurring_payments(self, params, kwargs): + # removing the params as we have to setup rucurring payments + for param in ( + "PAYMENTREQUEST_0_PAYMENTACTION", + "PAYMENTREQUEST_0_AMT", + "PAYMENTREQUEST_0_CURRENCYCODE", + ): + del params[param] + + params.update( + { + "L_BILLINGTYPE0": "RecurringPayments", # The type of billing agreement + "L_BILLINGAGREEMENTDESCRIPTION0": kwargs["description"], + } + ) + + +def get_paypal_and_transaction_details(token): + doc = frappe.get_doc("PayPal Settings") + doc.setup_sandbox_env(token) + params, url = doc.get_paypal_params_and_url() + + integration_request = frappe.get_doc("Integration Request", token) + data = json.loads(integration_request.data) + + return data, params, url + + +def setup_redirect(data, redirect_url, custom_redirect_to=None, redirect=True): + redirect_to = data.get("redirect_to") or None + redirect_message = data.get("redirect_message") or None + + if custom_redirect_to: + redirect_to = custom_redirect_to + + if redirect_to: + redirect_url += "&" + urlencode({"redirect_to": redirect_to}) + if redirect_message: + redirect_url += "&" + urlencode({"redirect_message": redirect_message}) + + # this is done so that functions called via hooks can update flags.redirect_to + if redirect: + frappe.local.response["type"] = "redirect" + frappe.local.response["location"] = get_url(redirect_url) + + +@frappe.whitelist(allow_guest=True, xss_safe=True) +def get_express_checkout_details(token): + try: + doc = frappe.get_doc("PayPal Settings") + doc.setup_sandbox_env(token) + + params, url = doc.get_paypal_params_and_url() + params.update({"METHOD": "GetExpressCheckoutDetails", "TOKEN": token}) + + response = make_post_request(url, data=params) + + if response.get("ACK")[0] != "Success": + frappe.respond_as_web_page( + _("Something went wrong"), + _( + "Looks like something went wrong during the transaction. Since we haven't confirmed the payment, Paypal will automatically refund you this amount. If it doesn't, please send us an email and mention the Correlation ID: {0}." + ).format(response.get("CORRELATIONID", [None])[0]), + indicator_color="red", + http_status_code=frappe.ValidationError.http_status_code, ) - if charge.captured == True: - self.integration_request.db_set("status", "Completed", update_modified=False) - self.flags.status_changed_to = "Completed" + return - else: - frappe.log_error(charge.failure_message, "Mollie Payment not completed") + doc = frappe.get_doc("Integration Request", token) + update_integration_request_status( + token, + {"payerid": response.get("PAYERID")[0], "payer_email": response.get("EMAIL")[0]}, + "Authorized", + doc=doc, + ) - except Exception: - frappe.log_error(frappe.get_traceback()) - - return self.finalize_request() - - def finalize_request(self): - redirect_to = self.data.get("redirect_to") or None - redirect_message = self.data.get("redirect_message") or None - status = self.integration_request.status - - if self.flags.status_changed_to == "Completed": - if self.data.reference_doctype and self.data.reference_docname: - custom_redirect_to = None - try: - custom_redirect_to = frappe.get_doc( - self.data.reference_doctype, self.data.reference_docname - ).run_method("on_payment_authorized", self.flags.status_changed_to) - except Exception: - frappe.log_error(frappe.get_traceback()) - - if custom_redirect_to: - redirect_to = custom_redirect_to - - redirect_url = "payment-success?doctype={}&docname={}".format( - self.data.reference_doctype, self.data.reference_docname - ) - - if self.redirect_url: - redirect_url = self.redirect_url - redirect_to = None + frappe.local.response["type"] = "redirect" + frappe.local.response["location"] = get_redirect_uri(doc, token, response.get("PAYERID")[0]) + + except Exception: + frappe.log_error(frappe.get_traceback()) + + +@frappe.whitelist(allow_guest=True, xss_safe=True) +def confirm_payment(token): + try: + custom_redirect_to = None + data, params, url = get_paypal_and_transaction_details(token) + + params.update( + { + "METHOD": "DoExpressCheckoutPayment", + "PAYERID": data.get("payerid"), + "TOKEN": token, + "PAYMENTREQUEST_0_PAYMENTACTION": "SALE", + "PAYMENTREQUEST_0_AMT": data.get("amount"), + "PAYMENTREQUEST_0_CURRENCYCODE": data.get("currency").upper(), + } + ) + + response = make_post_request(url, data=params) + + if response.get("ACK")[0] == "Success": + update_integration_request_status( + token, + { + "transaction_id": response.get("PAYMENTINFO_0_TRANSACTIONID")[0], + "correlation_id": response.get("CORRELATIONID")[0], + }, + "Completed", + ) + + if data.get("reference_doctype") and data.get("reference_docname"): + custom_redirect_to = frappe.get_doc( + data.get("reference_doctype"), data.get("reference_docname") + ).run_method("on_payment_authorized", "Completed") + frappe.db.commit() + + redirect_url = "payment-success?doctype={}&docname={}".format( + data.get("reference_doctype"), data.get("reference_docname") + ) + else: + redirect_url = "payment-failed" + + setup_redirect(data, redirect_url, custom_redirect_to) + + except Exception: + frappe.log_error(frappe.get_traceback()) + + +@frappe.whitelist(allow_guest=True, xss_safe=True) +def create_recurring_profile(token, payerid): + try: + custom_redirect_to = None + updating = False + data, params, url = get_paypal_and_transaction_details(token) + + addons = data.get("addons") + subscription_details = data.get("subscription_details") + + if data.get("subscription_id"): + if addons: + updating = True + manage_recurring_payment_profile_status(data["subscription_id"], "Cancel", params, url) + + params.update( + { + "METHOD": "CreateRecurringPaymentsProfile", + "PAYERID": payerid, + "TOKEN": token, + "DESC": data.get("description"), + "BILLINGPERIOD": subscription_details.get("billing_period"), + "BILLINGFREQUENCY": subscription_details.get("billing_frequency"), + "AMT": data.get("subscription_amount"), + "CURRENCYCODE": data.get("currency").upper(), + "INITAMT": data.get("upfront_amount"), + } + ) + + 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(get_system_timezone())).astimezone(pytz.utc) + + # "PROFILESTARTDATE": datetime.utcfromtimestamp(get_timestamp(starts_at)).isoformat() + params.update({"PROFILESTARTDATE": starts_at.isoformat()}) + + response = make_post_request(url, data=params) + + if response.get("ACK")[0] == "Success": + update_integration_request_status( + token, + { + "profile_id": response.get("PROFILEID")[0], + }, + "Completed", + ) + + if data.get("reference_doctype") and data.get("reference_docname"): + data["subscription_id"] = response.get("PROFILEID")[0] + + frappe.flags.data = data + custom_redirect_to = frappe.get_doc( + data.get("reference_doctype"), data.get("reference_docname") + ).run_method("on_payment_authorized", status_changed_to) + frappe.db.commit() + + redirect_url = "payment-success?doctype={}&docname={}".format( + data.get("reference_doctype"), data.get("reference_docname") + ) else: redirect_url = "payment-failed" - if redirect_to: - redirect_url += "?" + urlencode({"redirect_to": redirect_to}) - if redirect_message: - redirect_url += "&" + urlencode({"redirect_message": redirect_message}) + setup_redirect(data, redirect_url, custom_redirect_to) + + except Exception: + frappe.log_error(frappe.get_traceback()) + + +def update_integration_request_status(token, data, status, error=False, doc=None): + if not doc: + doc = frappe.get_doc("Integration Request", token) + + doc.update_status(data, status) + + +def get_redirect_uri(doc, token, payerid): + data = json.loads(doc.data) + + if data.get("subscription_details"): + return get_url(f"{api_path}.create_recurring_profile?token={token}&payerid={payerid}") + else: + return get_url(f"{api_path}.confirm_payment?token={token}") + + +def manage_recurring_payment_profile_status(profile_id, action, args, url): + args.update( + { + "METHOD": "ManageRecurringPaymentsProfileStatus", + "PROFILEID": profile_id, + "ACTION": action, + } + ) + + response = make_post_request(url, data=args) + + # error code 11556 indicates profile is not in active state(or already cancelled) + # thus could not cancel the subscription. + # thus raise an exception only if the error code is not equal to 11556 + + if response.get("ACK")[0] != "Success" and response.get("L_ERRORCODE0", [])[0] != "11556": + frappe.throw(_("Failed while amending subscription")) + + +@frappe.whitelist(allow_guest=True) +def ipn_handler(): + try: + data = frappe.local.form_dict + + validate_ipn_request(data) + + data.update({"payment_gateway": "PayPal"}) + + doc = frappe.get_doc( + { + "data": json.dumps(frappe.local.form_dict), + "doctype": "Integration Request", + "request_description": "Subscription Notification", + "is_remote_request": 1, + "status": "Queued", + } + ).insert(ignore_permissions=True) + frappe.db.commit() + + frappe.enqueue( + method="payments.payment_gateways.doctype.paypal_settings.paypal_settings.handle_subscription_notification", + queue="long", + timeout=600, + is_async=True, + **{"doctype": "Integration Request", "docname": doc.name}, + ) + + except frappe.InvalidStatusError: + pass + except Exception as e: + frappe.log(frappe.log_error(title=e)) + + +def validate_ipn_request(data): + def _throw(): + frappe.throw(_("In Valid Request"), exc=frappe.InvalidStatusError) - return {"redirect_to": redirect_url, "status": status} + if not data.get("recurring_payment_id"): + _throw() + doc = frappe.get_doc("PayPal Settings") + params, url = doc.get_paypal_params_and_url() -def get_gateway_controller(doctype, docname): - reference_doc = frappe.get_doc(doctype, docname) - gateway_controller = frappe.db.get_value( - "Payment Gateway", reference_doc.payment_gateway, "gateway_controller" + params.update( + { + "METHOD": "GetRecurringPaymentsProfileDetails", + "PROFILEID": data.get("recurring_payment_id"), + } ) - return gateway_controller + + params = urlencode(params) + res = make_post_request(url=url, data=params.encode("utf-8")) + + if res["ACK"][0] != "Success": + _throw() + + +def handle_subscription_notification(doctype, docname): + call_hook_method("handle_subscription_notification", doctype=doctype, docname=docname) From b81ed53f5b8bf2c0022f04b7b355c3657607b62a Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Sat, 25 Nov 2023 13:59:33 +0100 Subject: [PATCH 007/284] Update mollie_settings.py --- .../mollie_settings/mollie_settings.py | 569 ++++-------------- 1 file changed, 111 insertions(+), 458 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 04943a5c..ae257594 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -1,513 +1,166 @@ -# Copyright (c) 2015, Frappe Technologies and contributors -# License: MIT. See LICENSE - -""" -# Integrating PayPal - -### 1. Validate Currency Support - -Example: - - from payments.utils import get_payment_gateway_controller - - controller = get_payment_gateway_controller("PayPal") - controller().validate_transaction_currency(currency) - -### 2. Redirect for payment - -Example: - - payment_details = { - "amount": 600, - "title": "Payment for bill : 111", - "description": "payment via cart", - "reference_doctype": "Payment Request", - "reference_docname": "PR0001", - "payer_email": "NuranVerkleij@example.com", - "payer_name": "Nuran Verkleij", - "order_id": "111", - "currency": "USD", - "payment_gateway": "Razorpay", - "subscription_details": { - "plan_id": "plan_12313", # if Required - "start_date": "2018-08-30", - "billing_period": "Month" #(Day, Week, SemiMonth, Month, Year), - "billing_frequency": 1, - "customer_notify": 1, - "upfront_amount": 1000 - } - } - - # redirect the user to this url - url = controller().get_payment_url(**payment_details) - - -### 3. On Completion of Payment - -Write a method for `on_payment_authorized` in the reference doctype - -Example: - - def on_payment_authorized(payment_status): - # your code to handle callback - -##### Note: - -payment_status - payment gateway will put payment status on callback. -For paypal payment status parameter is one from: [Completed, Cancelled, Failed] - - -More Details: -
For details on how to get your API credentials, follow this link: https://developer.paypal.com/docs/classic/api/apiCredentials/
- -""" - -import json from urllib.parse import urlencode import frappe -import pytz from frappe import _ -from frappe.integrations.utils import create_request_log, make_post_request +from frappe.integrations.utils import create_request_log, make_get_request from frappe.model.document import Document -from frappe.utils import call_hook_method, cint, get_datetime, get_url -from frappe.utils.data import get_system_timezone - +from frappe.utils import call_hook_method, cint, flt, get_url from payments.utils import create_payment_gateway -api_path = "/api/method/payments.payment_gateways.doctype.paypal_settings.paypal_settings" - -class PayPalSettings(Document): +class MollieSettings(Document): supported_currencies = [ + "AED", "AUD", + "BGN", "BRL", "CAD", + "CHF", "CZK", "DKK", "EUR", + "GBP", "HKD", "HUF", "ILS", + "ISK", "JPY", - "MYR", "MXN", - "TWD", - "NZD", + "MYR", "NOK", + "NZD", "PHP", "PLN", - "GBP", + "RON", "RUB", - "SGD", "SEK", - "CHF", + "SGD", "THB", - "TRY", + "TWD", "USD", + "ZAR", ] - def __setup__(self): - setattr(self, "use_sandbox", 0) - - def setup_sandbox_env(self, token): - data = json.loads(frappe.db.get_value("Integration Request", token, "data")) - setattr(self, "use_sandbox", cint(frappe._dict(data).use_sandbox) or 0) - - def validate(self): - create_payment_gateway("PayPal") - call_hook_method("payment_gateway_enabled", gateway="PayPal") - if not self.flags.ignore_mandatory: - self.validate_paypal_credentails() - def on_update(self): - pass + create_payment_gateway( + "Mollie-" + self.gateway_name, + settings="Mollie Settings", + controller=self.gateway_name, + ) + call_hook_method("payment_gateway_enabled", gateway="Mollie-" + self.gateway_name) + if not self.flags.ignore_mandatory: + self.validate_mollie_credentials() + + def validate_mollie_credentials(self): + if self.publishable_key and self.secret_key: + header = { + "Authorization": "Bearer {}".format( + self.get_password(fieldname="secret_key", raise_exception=False) + ) + } + try: + make_get_request(url="https://api.mollie.com/v2/payments", headers=header) + except Exception: + frappe.throw(_("Seems Publishable Key or Secret Key is wrong !!!")) def validate_transaction_currency(self, currency): if currency not in self.supported_currencies: frappe.throw( _( - "Please select another payment method. PayPal does not support transactions in currency '{0}'" + "Please select another payment method. Mollie does not support transactions in currency '{0}'" ).format(currency) ) - def get_paypal_params_and_url(self): - params = { - "USER": self.api_username, - "PWD": self.get_password(fieldname="api_password", raise_exception=False), - "SIGNATURE": self.signature, - "VERSION": "98", - "METHOD": "GetPalDetails", - } - - if hasattr(self, "use_sandbox") and self.use_sandbox: - params.update( - { - "USER": frappe.conf.sandbox_api_username, - "PWD": frappe.conf.sandbox_api_password, - "SIGNATURE": frappe.conf.sandbox_signature, - } - ) - - api_url = ( - "https://api-3t.sandbox.paypal.com/nvp" - if (self.paypal_sandbox or self.use_sandbox) - else "https://api-3t.paypal.com/nvp" - ) + def get_payment_url(self, **kwargs): + return get_url(charge.checkout_url) - return params, api_url + def create_request(self, data): + import mollie - def validate_paypal_credentails(self): - params, url = self.get_paypal_params_and_url() - params = urlencode(params) + self.data = frappe._dict(data) + mollie.api_key = self.get_password(fieldname="secret_key", raise_exception=False) + mollie.default_http_client = mollie.http_client.RequestsClient() try: - res = make_post_request(url=url, data=params.encode("utf-8")) - - if res["ACK"][0] == "Failure": - raise Exception + self.integration_request = create_request_log(self.data, service_name="Mollie") + return self.create_charge_on_mollie() except Exception: - frappe.throw(_("Invalid payment gateway credentials")) - - def get_payment_url(self, **kwargs): - setattr(self, "use_sandbox", cint(kwargs.get("use_sandbox", 0))) - - response = self.execute_set_express_checkout(**kwargs) - - if self.paypal_sandbox or self.use_sandbox: - return_url = "https://www.sandbox.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token={0}" - else: - return_url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token={0}" - - kwargs.update( - { - "token": response.get("TOKEN")[0], - "correlation_id": response.get("CORRELATIONID")[0], - } - ) - - create_request_log(kwargs, service_name="PayPal", name=kwargs["token"]) - - return return_url.format(kwargs["token"]) - - def execute_set_express_checkout(self, **kwargs): - params, url = self.get_paypal_params_and_url() - - params.update( - { - "METHOD": "SetExpressCheckout", - "returnUrl": get_url(f"{api_path}.get_express_checkout_details"), - "cancelUrl": get_url("/payment-cancel"), - "PAYMENTREQUEST_0_PAYMENTACTION": "SALE", - "PAYMENTREQUEST_0_AMT": kwargs["amount"], - "PAYMENTREQUEST_0_CURRENCYCODE": kwargs["currency"].upper(), - } - ) - - if kwargs.get("subscription_details"): - self.configure_recurring_payments(params, kwargs) - - params = urlencode(params) - response = make_post_request(url, data=params.encode("utf-8")) - - if response.get("ACK")[0] != "Success": - frappe.throw(_("Looks like something is wrong with this site's Paypal configuration.")) - - return response - - def configure_recurring_payments(self, params, kwargs): - # removing the params as we have to setup rucurring payments - for param in ( - "PAYMENTREQUEST_0_PAYMENTACTION", - "PAYMENTREQUEST_0_AMT", - "PAYMENTREQUEST_0_CURRENCYCODE", - ): - del params[param] - - params.update( - { - "L_BILLINGTYPE0": "RecurringPayments", # The type of billing agreement - "L_BILLINGAGREEMENTDESCRIPTION0": kwargs["description"], - } - ) - - -def get_paypal_and_transaction_details(token): - doc = frappe.get_doc("PayPal Settings") - doc.setup_sandbox_env(token) - params, url = doc.get_paypal_params_and_url() - - integration_request = frappe.get_doc("Integration Request", token) - data = json.loads(integration_request.data) - - return data, params, url - - -def setup_redirect(data, redirect_url, custom_redirect_to=None, redirect=True): - redirect_to = data.get("redirect_to") or None - redirect_message = data.get("redirect_message") or None - - if custom_redirect_to: - redirect_to = custom_redirect_to - - if redirect_to: - redirect_url += "&" + urlencode({"redirect_to": redirect_to}) - if redirect_message: - redirect_url += "&" + urlencode({"redirect_message": redirect_message}) - - # this is done so that functions called via hooks can update flags.redirect_to - if redirect: - frappe.local.response["type"] = "redirect" - frappe.local.response["location"] = get_url(redirect_url) - - -@frappe.whitelist(allow_guest=True, xss_safe=True) -def get_express_checkout_details(token): - try: - doc = frappe.get_doc("PayPal Settings") - doc.setup_sandbox_env(token) - - params, url = doc.get_paypal_params_and_url() - params.update({"METHOD": "GetExpressCheckoutDetails", "TOKEN": token}) - - response = make_post_request(url, data=params) - - if response.get("ACK")[0] != "Success": - frappe.respond_as_web_page( - _("Something went wrong"), - _( - "Looks like something went wrong during the transaction. Since we haven't confirmed the payment, Paypal will automatically refund you this amount. If it doesn't, please send us an email and mention the Correlation ID: {0}." - ).format(response.get("CORRELATIONID", [None])[0]), - indicator_color="red", - http_status_code=frappe.ValidationError.http_status_code, - ) - - return - - doc = frappe.get_doc("Integration Request", token) - update_integration_request_status( - token, - {"payerid": response.get("PAYERID")[0], "payer_email": response.get("EMAIL")[0]}, - "Authorized", - doc=doc, - ) - - frappe.local.response["type"] = "redirect" - frappe.local.response["location"] = get_redirect_uri(doc, token, response.get("PAYERID")[0]) - - except Exception: - frappe.log_error(frappe.get_traceback()) - - -@frappe.whitelist(allow_guest=True, xss_safe=True) -def confirm_payment(token): - try: - custom_redirect_to = None - data, params, url = get_paypal_and_transaction_details(token) - - params.update( - { - "METHOD": "DoExpressCheckoutPayment", - "PAYERID": data.get("payerid"), - "TOKEN": token, - "PAYMENTREQUEST_0_PAYMENTACTION": "SALE", - "PAYMENTREQUEST_0_AMT": data.get("amount"), - "PAYMENTREQUEST_0_CURRENCYCODE": data.get("currency").upper(), + frappe.log_error(frappe.get_traceback()) + return { + "redirect_to": frappe.redirect_to_message( + _("Server Error"), + _( + "It seems that there is an issue with the server's Mollie configuration. In case of failure, the amount will get refunded to your account." + ), + ), + "status": 401, } - ) - - response = make_post_request(url, data=params) - - if response.get("ACK")[0] == "Success": - update_integration_request_status( - token, - { - "transaction_id": response.get("PAYMENTINFO_0_TRANSACTIONID")[0], - "correlation_id": response.get("CORRELATIONID")[0], - }, - "Completed", - ) - - if data.get("reference_doctype") and data.get("reference_docname"): - custom_redirect_to = frappe.get_doc( - data.get("reference_doctype"), data.get("reference_docname") - ).run_method("on_payment_authorized", "Completed") - frappe.db.commit() - - redirect_url = "payment-success?doctype={}&docname={}".format( - data.get("reference_doctype"), data.get("reference_docname") - ) - else: - redirect_url = "payment-failed" - - setup_redirect(data, redirect_url, custom_redirect_to) - - except Exception: - frappe.log_error(frappe.get_traceback()) - - -@frappe.whitelist(allow_guest=True, xss_safe=True) -def create_recurring_profile(token, payerid): - try: - custom_redirect_to = None - updating = False - data, params, url = get_paypal_and_transaction_details(token) - - addons = data.get("addons") - subscription_details = data.get("subscription_details") - - if data.get("subscription_id"): - if addons: - updating = True - manage_recurring_payment_profile_status(data["subscription_id"], "Cancel", params, url) - - params.update( - { - "METHOD": "CreateRecurringPaymentsProfile", - "PAYERID": payerid, - "TOKEN": token, - "DESC": data.get("description"), - "BILLINGPERIOD": subscription_details.get("billing_period"), - "BILLINGFREQUENCY": subscription_details.get("billing_frequency"), - "AMT": data.get("subscription_amount"), - "CURRENCYCODE": data.get("currency").upper(), - "INITAMT": data.get("upfront_amount"), - } - ) - status_changed_to = "Completed" if data.get("starting_immediately") or updating else "Verified" + def create_charge_on_mollie(self): + from mollie.api.client import Client - starts_at = get_datetime(subscription_details.get("start_date")) or frappe.utils.now_datetime() - starts_at = starts_at.replace(tzinfo=pytz.timezone(get_system_timezone())).astimezone(pytz.utc) - - # "PROFILESTARTDATE": datetime.utcfromtimestamp(get_timestamp(starts_at)).isoformat() - params.update({"PROFILESTARTDATE": starts_at.isoformat()}) - - response = make_post_request(url, data=params) - - if response.get("ACK")[0] == "Success": - update_integration_request_status( - token, - { - "profile_id": response.get("PROFILEID")[0], - }, - "Completed", - ) - - if data.get("reference_doctype") and data.get("reference_docname"): - data["subscription_id"] = response.get("PROFILEID")[0] - - frappe.flags.data = data - custom_redirect_to = frappe.get_doc( - data.get("reference_doctype"), data.get("reference_docname") - ).run_method("on_payment_authorized", status_changed_to) - frappe.db.commit() + try: + charge = mollie_client.payments.create({ + "amount": { + "currency": self.data.currency, + "value": cint(flt(self.data.amount) * 100), + }, + "description": self.data.description, + "billingEmail": self.data.payer_email, + }) + + if charge.captured == True: + self.integration_request.db_set("status", "Completed", update_modified=False) + self.flags.status_changed_to = "Completed" + + else: + frappe.log_error(charge.failure_message, "Mollie Payment not completed") - redirect_url = "payment-success?doctype={}&docname={}".format( - data.get("reference_doctype"), data.get("reference_docname") - ) + except Exception: + frappe.log_error(frappe.get_traceback()) + + return self.finalize_request() + + def finalize_request(self): + redirect_to = self.data.get("redirect_to") or None + redirect_message = self.data.get("redirect_message") or None + status = self.integration_request.status + + if self.flags.status_changed_to == "Completed": + if self.data.reference_doctype and self.data.reference_docname: + custom_redirect_to = None + try: + custom_redirect_to = frappe.get_doc( + self.data.reference_doctype, self.data.reference_docname + ).run_method("on_payment_authorized", self.flags.status_changed_to) + except Exception: + frappe.log_error(frappe.get_traceback()) + + if custom_redirect_to: + redirect_to = custom_redirect_to + + redirect_url = "payment-success?doctype={}&docname={}".format( + self.data.reference_doctype, self.data.reference_docname + ) + + if self.redirect_url: + redirect_url = self.redirect_url + redirect_to = None else: redirect_url = "payment-failed" - setup_redirect(data, redirect_url, custom_redirect_to) - - except Exception: - frappe.log_error(frappe.get_traceback()) + if redirect_to: + redirect_url += "?" + urlencode({"redirect_to": redirect_to}) + if redirect_message: + redirect_url += "&" + urlencode({"redirect_message": redirect_message}) + return {"redirect_to": redirect_url, "status": status} -def update_integration_request_status(token, data, status, error=False, doc=None): - if not doc: - doc = frappe.get_doc("Integration Request", token) - doc.update_status(data, status) - - -def get_redirect_uri(doc, token, payerid): - data = json.loads(doc.data) - - if data.get("subscription_details"): - return get_url(f"{api_path}.create_recurring_profile?token={token}&payerid={payerid}") - else: - return get_url(f"{api_path}.confirm_payment?token={token}") - - -def manage_recurring_payment_profile_status(profile_id, action, args, url): - args.update( - { - "METHOD": "ManageRecurringPaymentsProfileStatus", - "PROFILEID": profile_id, - "ACTION": action, - } +def get_gateway_controller(doctype, docname): + reference_doc = frappe.get_doc(doctype, docname) + gateway_controller = frappe.db.get_value( + "Payment Gateway", reference_doc.payment_gateway, "gateway_controller" ) - - response = make_post_request(url, data=args) - - # error code 11556 indicates profile is not in active state(or already cancelled) - # thus could not cancel the subscription. - # thus raise an exception only if the error code is not equal to 11556 - - if response.get("ACK")[0] != "Success" and response.get("L_ERRORCODE0", [])[0] != "11556": - frappe.throw(_("Failed while amending subscription")) - - -@frappe.whitelist(allow_guest=True) -def ipn_handler(): - try: - data = frappe.local.form_dict - - validate_ipn_request(data) - - data.update({"payment_gateway": "PayPal"}) - - doc = frappe.get_doc( - { - "data": json.dumps(frappe.local.form_dict), - "doctype": "Integration Request", - "request_description": "Subscription Notification", - "is_remote_request": 1, - "status": "Queued", - } - ).insert(ignore_permissions=True) - frappe.db.commit() - - frappe.enqueue( - method="payments.payment_gateways.doctype.paypal_settings.paypal_settings.handle_subscription_notification", - queue="long", - timeout=600, - is_async=True, - **{"doctype": "Integration Request", "docname": doc.name}, - ) - - except frappe.InvalidStatusError: - pass - except Exception as e: - frappe.log(frappe.log_error(title=e)) - - -def validate_ipn_request(data): - def _throw(): - frappe.throw(_("In Valid Request"), exc=frappe.InvalidStatusError) - - if not data.get("recurring_payment_id"): - _throw() - - doc = frappe.get_doc("PayPal Settings") - params, url = doc.get_paypal_params_and_url() - - params.update( - { - "METHOD": "GetRecurringPaymentsProfileDetails", - "PROFILEID": data.get("recurring_payment_id"), - } - ) - - params = urlencode(params) - res = make_post_request(url=url, data=params.encode("utf-8")) - - if res["ACK"][0] != "Success": - _throw() - - -def handle_subscription_notification(doctype, docname): - call_hook_method("handle_subscription_notification", doctype=doctype, docname=docname) + return gateway_controller From 40543d3126ae6bec36e2091ec541314a9d11b4cc Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Sat, 25 Nov 2023 14:26:31 +0100 Subject: [PATCH 008/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index ae257594..a1517be5 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -6,6 +6,8 @@ from frappe.model.document import Document from frappe.utils import call_hook_method, cint, flt, get_url from payments.utils import create_payment_gateway +from mollie.api.client import Client +from mollie.api.error import Error class MollieSettings(Document): @@ -72,7 +74,7 @@ def validate_transaction_currency(self, currency): ) def get_payment_url(self, **kwargs): - return get_url(charge.checkout_url) + return return get_url(self.finalize_request(charge.checkout_url)) def create_request(self, data): import mollie From 06f2e6e10da30c9aae131c239ed5b6b947138a44 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Sat, 25 Nov 2023 14:37:43 +0100 Subject: [PATCH 009/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index a1517be5..d162c690 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -74,7 +74,7 @@ def validate_transaction_currency(self, currency): ) def get_payment_url(self, **kwargs): - return return get_url(self.finalize_request(charge.checkout_url)) + return get_url(charge.checkout_url) def create_request(self, data): import mollie From e40ad19cb0b9e47165736758890ab989673b518c Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Sat, 23 Dec 2023 09:57:31 +0100 Subject: [PATCH 010/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index d162c690..9142fbec 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -7,7 +7,6 @@ from frappe.utils import call_hook_method, cint, flt, get_url from payments.utils import create_payment_gateway from mollie.api.client import Client -from mollie.api.error import Error class MollieSettings(Document): @@ -77,11 +76,10 @@ def get_payment_url(self, **kwargs): return get_url(charge.checkout_url) def create_request(self, data): - import mollie - self.data = frappe._dict(data) - mollie.api_key = self.get_password(fieldname="secret_key", raise_exception=False) - mollie.default_http_client = mollie.http_client.RequestsClient() + mollie_client = Client() + mollie_client.set_api_key = self.get_password(fieldname="secret_key", raise_exception=False) + mollie_client.default_http_client = mollie_client.http_client.RequestsClient() try: self.integration_request = create_request_log(self.data, service_name="Mollie") @@ -100,14 +98,12 @@ def create_request(self, data): } def create_charge_on_mollie(self): - from mollie.api.client import Client - try: charge = mollie_client.payments.create({ "amount": { "currency": self.data.currency, - "value": cint(flt(self.data.amount) * 100), - }, + "value": cint(flt(self.data.amount) * 100), + }, "description": self.data.description, "billingEmail": self.data.payer_email, }) From 977714a7f9545d4141b28802f28b72bb31e11bac Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Sat, 23 Dec 2023 12:31:46 +0100 Subject: [PATCH 011/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 9142fbec..d162c690 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -7,6 +7,7 @@ from frappe.utils import call_hook_method, cint, flt, get_url from payments.utils import create_payment_gateway from mollie.api.client import Client +from mollie.api.error import Error class MollieSettings(Document): @@ -76,10 +77,11 @@ def get_payment_url(self, **kwargs): return get_url(charge.checkout_url) def create_request(self, data): + import mollie + self.data = frappe._dict(data) - mollie_client = Client() - mollie_client.set_api_key = self.get_password(fieldname="secret_key", raise_exception=False) - mollie_client.default_http_client = mollie_client.http_client.RequestsClient() + mollie.api_key = self.get_password(fieldname="secret_key", raise_exception=False) + mollie.default_http_client = mollie.http_client.RequestsClient() try: self.integration_request = create_request_log(self.data, service_name="Mollie") @@ -98,12 +100,14 @@ def create_request(self, data): } def create_charge_on_mollie(self): + from mollie.api.client import Client + try: charge = mollie_client.payments.create({ "amount": { "currency": self.data.currency, - "value": cint(flt(self.data.amount) * 100), - }, + "value": cint(flt(self.data.amount) * 100), + }, "description": self.data.description, "billingEmail": self.data.payer_email, }) From e8b0c4d6e4d23f660681b201598e1c52f2146554 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Sat, 23 Dec 2023 12:34:13 +0100 Subject: [PATCH 012/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index d162c690..9142fbec 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -7,7 +7,6 @@ from frappe.utils import call_hook_method, cint, flt, get_url from payments.utils import create_payment_gateway from mollie.api.client import Client -from mollie.api.error import Error class MollieSettings(Document): @@ -77,11 +76,10 @@ def get_payment_url(self, **kwargs): return get_url(charge.checkout_url) def create_request(self, data): - import mollie - self.data = frappe._dict(data) - mollie.api_key = self.get_password(fieldname="secret_key", raise_exception=False) - mollie.default_http_client = mollie.http_client.RequestsClient() + mollie_client = Client() + mollie_client.set_api_key = self.get_password(fieldname="secret_key", raise_exception=False) + mollie_client.default_http_client = mollie_client.http_client.RequestsClient() try: self.integration_request = create_request_log(self.data, service_name="Mollie") @@ -100,14 +98,12 @@ def create_request(self, data): } def create_charge_on_mollie(self): - from mollie.api.client import Client - try: charge = mollie_client.payments.create({ "amount": { "currency": self.data.currency, - "value": cint(flt(self.data.amount) * 100), - }, + "value": cint(flt(self.data.amount) * 100), + }, "description": self.data.description, "billingEmail": self.data.payer_email, }) From 8f44231b42693eee577563c7fa273b8deb521955 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Mon, 5 Feb 2024 14:13:09 +0800 Subject: [PATCH 013/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 9142fbec..55bc4d6f 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -148,8 +148,11 @@ def finalize_request(self): else: redirect_url = "payment-failed" - if redirect_to: + if redirect_to and "?" in redirect_url: + redirect_url += "&" + urlencode({"redirect_to": redirect_to}) + else: redirect_url += "?" + urlencode({"redirect_to": redirect_to}) + if redirect_message: redirect_url += "&" + urlencode({"redirect_message": redirect_message}) From 36865f8023d340de82bf9174005d23c37d402f1d Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Mon, 5 Feb 2024 14:20:54 +0800 Subject: [PATCH 014/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 55bc4d6f..c86ce543 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -54,10 +54,7 @@ def on_update(self): def validate_mollie_credentials(self): if self.publishable_key and self.secret_key: - header = { - "Authorization": "Bearer {}".format( - self.get_password(fieldname="secret_key", raise_exception=False) - ) + header = self.get_password(fieldname="secret_key", raise_exception=False) } try: make_get_request(url="https://api.mollie.com/v2/payments", headers=header) @@ -78,8 +75,7 @@ def get_payment_url(self, **kwargs): def create_request(self, data): self.data = frappe._dict(data) mollie_client = Client() - mollie_client.set_api_key = self.get_password(fieldname="secret_key", raise_exception=False) - mollie_client.default_http_client = mollie_client.http_client.RequestsClient() + api = mollie_client.set_api_key(self.get_password(fieldname="secret_key", raise_exception=False)) try: self.integration_request = create_request_log(self.data, service_name="Mollie") From d53b4c4254e6f1998646e4d70218b77f174422a2 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Tue, 6 Feb 2024 15:29:05 +0800 Subject: [PATCH 015/284] Include mollie api dep --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 1dbe5220..0ef7bfdf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,6 +14,7 @@ dependencies = [ "braintree~=4.20.0", "pycryptodome>=3.18.0,<4.0.0", "gocardless-pro~=1.22.0", + "mollie-api~=3.6.0", ] [build-system] From 816ea6b9b841da180911fdc8c65f3db5b32b0cf8 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Tue, 6 Feb 2024 15:31:44 +0800 Subject: [PATCH 016/284] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0ef7bfdf..7061b21d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ dependencies = [ "braintree~=4.20.0", "pycryptodome>=3.18.0,<4.0.0", "gocardless-pro~=1.22.0", - "mollie-api~=3.6.0", + "mollie-api-python~=3.6.0", ] [build-system] From e279e7dabdf9e74d18f7999b7afad066a974403c Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Tue, 6 Feb 2024 16:11:09 +0800 Subject: [PATCH 017/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index c86ce543..7e8e449d 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -95,14 +95,13 @@ def create_request(self, data): def create_charge_on_mollie(self): try: - charge = mollie_client.payments.create({ - "amount": { - "currency": self.data.currency, - "value": cint(flt(self.data.amount) * 100), - }, - "description": self.data.description, - "billingEmail": self.data.payer_email, - }) + charge = = mollie_client.payments.create( + { + "amount": {"currency": self.data.currency, "value": cint(flt(self.data.amount) * 100)}, + "description": self.data.description, + "billingEmail": self.data.payer_email, + } + ) if charge.captured == True: self.integration_request.db_set("status", "Completed", update_modified=False) From 5ecf128577b3e8268042bb547e4884c973fa9d4d Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Tue, 6 Feb 2024 16:54:53 +0800 Subject: [PATCH 018/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 7e8e449d..fba3016d 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -54,7 +54,10 @@ def on_update(self): def validate_mollie_credentials(self): if self.publishable_key and self.secret_key: - header = self.get_password(fieldname="secret_key", raise_exception=False) + header = { + "Authorization": "Bearer {}".format( + self.get_password(fieldname="secret_key", raise_exception=False) + ) } try: make_get_request(url="https://api.mollie.com/v2/payments", headers=header) From a34e77eb0e0885f86de7c79ba5148f3f573a3062 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Tue, 6 Feb 2024 16:56:57 +0800 Subject: [PATCH 019/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index fba3016d..1a405e2a 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -98,7 +98,7 @@ def create_request(self, data): def create_charge_on_mollie(self): try: - charge = = mollie_client.payments.create( + charge = mollie_client.payments.create( { "amount": {"currency": self.data.currency, "value": cint(flt(self.data.amount) * 100)}, "description": self.data.description, From 711f4ee2d5da13a193a9bf321141c888e69cb7a7 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 17:45:11 +0800 Subject: [PATCH 020/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 1a405e2a..429e12c4 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -53,7 +53,7 @@ def on_update(self): self.validate_mollie_credentials() def validate_mollie_credentials(self): - if self.publishable_key and self.secret_key: + if self.secret_key: header = { "Authorization": "Bearer {}".format( self.get_password(fieldname="secret_key", raise_exception=False) From 5d8a9f2171811a9cd9229324bcf9a8e613a75871 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 17:45:44 +0800 Subject: [PATCH 021/284] Update mollie_settings.json --- .../mollie_settings/mollie_settings.json | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.json b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.json index a6aa35eb..459d9d4a 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.json +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.json @@ -45,38 +45,6 @@ "translatable": 0, "unique": 0 }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "publishable_key", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Publishable Key", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, { "allow_bulk_edit": 0, "allow_in_quick_entry": 0, From 07e833ab8739ee6d5144c72e62a570f17231452e Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 18:18:21 +0800 Subject: [PATCH 022/284] Update mollie_settings.py --- .../mollie_settings/mollie_settings.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 429e12c4..747f2dff 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -73,7 +73,24 @@ def validate_transaction_currency(self, currency): ) def get_payment_url(self, **kwargs): - return get_url(charge.checkout_url) + mollie_client = Client() + api = mollie_client.set_api_key(self.get_password(fieldname="secret_key", raise_exception=False)) + + try: + self.integration_request = create_request_log(self.data, service_name="Mollie") + return self.create_charge_on_mollie() + + except Exception: + frappe.log_error(frappe.get_traceback()) + return { + "redirect_to": frappe.redirect_to_message( + _("Server Error"), + _( + "It seems that there is an issue with the server's Mollie configuration. In case of failure, the amount will get refunded to your account." + ), + ), + "status": 401, + } def create_request(self, data): self.data = frappe._dict(data) From 664fe90cb793c95ae688c5cc9351245877616aca Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 18:40:02 +0800 Subject: [PATCH 023/284] Update mollie_settings.py --- .../mollie_settings/mollie_settings.py | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 747f2dff..4cd9455c 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -73,24 +73,7 @@ def validate_transaction_currency(self, currency): ) def get_payment_url(self, **kwargs): - mollie_client = Client() - api = mollie_client.set_api_key(self.get_password(fieldname="secret_key", raise_exception=False)) - - try: - self.integration_request = create_request_log(self.data, service_name="Mollie") - return self.create_charge_on_mollie() - - except Exception: - frappe.log_error(frappe.get_traceback()) - return { - "redirect_to": frappe.redirect_to_message( - _("Server Error"), - _( - "It seems that there is an issue with the server's Mollie configuration. In case of failure, the amount will get refunded to your account." - ), - ), - "status": 401, - } + return get_url(f"mollie_checkout?{urlencode(kwargs)}") def create_request(self, data): self.data = frappe._dict(data) From 61f30c0ae33d3fb1a661074af189003b9fa55237 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 18:40:39 +0800 Subject: [PATCH 024/284] Create mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 1 + 1 file changed, 1 insertion(+) create mode 100644 payments/templates/includes/mollie_checkout.js diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/payments/templates/includes/mollie_checkout.js @@ -0,0 +1 @@ + From 8ada09295141c93dd644581789f92582b4b25e91 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 18:42:03 +0800 Subject: [PATCH 025/284] Update mollie_checkout.js --- .../templates/includes/mollie_checkout.js | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 8b137891..0a0aa706 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -1 +1,85 @@ +var stripe = Stripe("{{ publishable_key }}"); +var elements = stripe.elements(); + +var style = { + base: { + color: '#32325d', + lineHeight: '18px', + fontFamily: '"Helvetica Neue", Helvetica, sans-serif', + fontSmoothing: 'antialiased', + fontSize: '16px', + '::placeholder': { + color: '#aab7c4' + } + }, + invalid: { + color: '#fa755a', + iconColor: '#fa755a' + } +}; + +var card = elements.create('card', { + hidePostalCode: true, + style: style +}); + +card.mount('#card-element'); + +function setOutcome(result) { + + if (result.token) { + $('#submit').prop('disabled', true) + $('#submit').html(__('Processing...')) + frappe.call({ + method:"payments.templates.pages.stripe_checkout.make_payment", + freeze:true, + headers: {"X-Requested-With": "XMLHttpRequest"}, + args: { + "stripe_token_id": result.token.id, + "data": JSON.stringify({{ frappe.form_dict|json }}), + "reference_doctype": "{{ reference_doctype }}", + "reference_docname": "{{ reference_docname }}" + }, + callback: function(r) { + if (r.message.status == "Completed") { + $('#submit').hide() + $('.success').show() + setTimeout(function() { + window.location.href = r.message.redirect_to + }, 2000); + } else { + $('#submit').hide() + $('.error').show() + setTimeout(function() { + window.location.href = r.message.redirect_to + }, 2000); + } + } + }); + + } else if (result.error) { + $('.error').html(result.error.message); + $('.error').show() + } +} + +card.on('change', function(event) { + var displayError = document.getElementById('card-errors'); + if (event.error) { + displayError.textContent = event.error.message; + } else { + displayError.textContent = ''; + } +}); + +frappe.ready(function() { + $('#submit').off("click").on("click", function(e) { + e.preventDefault(); + var extraDetails = { + name: $('input[name=cardholder-name]').val(), + email: $('input[name=cardholder-email]').val() + } + stripe.createToken(card, extraDetails).then(setOutcome); + }) +}); From 3edb79266339a9eb196820bee86aaa4647a13774 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 18:42:33 +0800 Subject: [PATCH 026/284] Create mollie_checkout.css --- payments/templates/pages/mollie_checkout.css | 113 +++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 payments/templates/pages/mollie_checkout.css diff --git a/payments/templates/pages/mollie_checkout.css b/payments/templates/pages/mollie_checkout.css new file mode 100644 index 00000000..a42808aa --- /dev/null +++ b/payments/templates/pages/mollie_checkout.css @@ -0,0 +1,113 @@ +.StripeElement { + background-color: white; + height: 40px; + padding: 10px 12px; + border-radius: 4px; + border: 1px solid transparent; + box-shadow: 0 1px 3px 0 #e6ebf1; + -webkit-transition: box-shadow 150ms ease; + transition: box-shadow 150ms ease; +} + +.StripeElement--focus { + box-shadow: 0 1px 3px 0 #cfd7df; +} + +.StripeElement--invalid { + border-color: #fa755a; +} + +.StripeElement--webkit-autofill { + background-color: #fefde5; +} + +.stripe #payment-form { + margin-top: 80px; +} + +.stripe button { + float: right; + display: block; + background: #5e64ff; + color: white; + box-shadow: 0 7px 14px 0 rgba(49, 49, 93, 0.10), 0 3px 6px 0 rgba(0, 0, 0, 0.08); + border-radius: 4px; + border: 0; + margin-top: 20px; + font-size: 15px; + font-weight: 400; + max-width: 40%; + height: 40px; + line-height: 38px; + outline: none; +} + +.stripe button:hover, .stripe button:focus { + background: #2b33ff; + border-color: #0711ff; +} + +.stripe button:active { + background: #5e64ff; +} + +.stripe button:disabled { + background: #515e80; +} + +.stripe .group { + background: white; + box-shadow: 2px 7px 14px 2px rgba(49, 49, 93, 0.10), 0 3px 6px 0 rgba(0, 0, 0, 0.08); + border-radius: 4px; + margin-bottom: 20px; +} + +.stripe label { + position: relative; + color: #8898AA; + font-weight: 300; + height: 40px; + line-height: 40px; + margin-left: 20px; + display: block; +} + +.stripe .group label:not(:last-child) { + border-bottom: 1px solid #F0F5FA; +} + +.stripe label>span { + width: 20%; + text-align: right; + float: left; +} + +.current-card { + margin-left: 20px; +} + +.field { + background: transparent; + font-weight: 300; + border: 0; + color: #31325F; + outline: none; + padding-right: 10px; + padding-left: 10px; + cursor: text; + width: 70%; + height: 40px; + float: right; +} + +.field::-webkit-input-placeholder { + color: #CFD7E0; +} + +.field::-moz-placeholder { + color: #CFD7E0; +} + +.field:-ms-input-placeholder { + color: #CFD7E0; +} From afa61d4407688b52b72e24ae468048f755308caf Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 18:42:57 +0800 Subject: [PATCH 027/284] Create mollie_checkout.html --- payments/templates/pages/mollie_checkout.html | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 payments/templates/pages/mollie_checkout.html diff --git a/payments/templates/pages/mollie_checkout.html b/payments/templates/pages/mollie_checkout.html new file mode 100644 index 00000000..b038f6fd --- /dev/null +++ b/payments/templates/pages/mollie_checkout.html @@ -0,0 +1,58 @@ +{% extends "templates/web.html" %} + +{% block title %} Payment {% endblock %} + +{%- block header -%} +{% endblock %} + +{% block script %} + + +{% endblock %} + +{%- block page_content -%} + +
+
+ {% if image %} + + {% endif %} +

{{description}}

+
+
+
+
+ +
+
+
+
+ +
+
+
+ +
+ +
+ +
+ + +
+
+
+
+ + +{% endblock %} From 79b1c1722a12771d518159880508d90dc6f38d7b Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 18:43:31 +0800 Subject: [PATCH 028/284] Create mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 92 +++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 payments/templates/pages/mollie_checkout.py diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py new file mode 100644 index 00000000..cdefc8cd --- /dev/null +++ b/payments/templates/pages/mollie_checkout.py @@ -0,0 +1,92 @@ +import json + +import frappe +from frappe import _ +from frappe.utils import cint, fmt_money + +from payments.payment_gateways.doctype.stripe_settings.stripe_settings import ( + get_gateway_controller, +) + +no_cache = 1 + +expected_keys = ( + "amount", + "title", + "description", + "reference_doctype", + "reference_docname", + "payer_name", + "payer_email", + "order_id", + "currency", +) + + +def get_context(context): + context.no_cache = 1 + + # all these keys exist in form_dict + if not (set(expected_keys) - set(list(frappe.form_dict))): + for key in expected_keys: + context[key] = frappe.form_dict[key] + + gateway_controller = get_gateway_controller(context.reference_doctype, context.reference_docname) + context.publishable_key = get_api_key(context.reference_docname, gateway_controller) + context.image = get_header_image(context.reference_docname, gateway_controller) + + context["amount"] = fmt_money(amount=context["amount"], currency=context["currency"]) + + if is_a_subscription(context.reference_doctype, context.reference_docname): + payment_plan = frappe.db.get_value( + context.reference_doctype, context.reference_docname, "payment_plan" + ) + recurrence = frappe.db.get_value("Payment Plan", payment_plan, "recurrence") + + context["amount"] = context["amount"] + " " + _(recurrence) + + else: + frappe.redirect_to_message( + _("Some information is missing"), + _("Looks like someone sent you to an incomplete URL. Please ask them to look into it."), + ) + frappe.local.flags.redirect_location = frappe.local.response.location + raise frappe.Redirect + + +def get_api_key(doc, gateway_controller): + publishable_key = frappe.db.get_value("Stripe Settings", gateway_controller, "publishable_key") + if cint(frappe.form_dict.get("use_sandbox")): + publishable_key = frappe.conf.sandbox_publishable_key + + return publishable_key + + +def get_header_image(doc, gateway_controller): + header_image = frappe.db.get_value("Stripe Settings", gateway_controller, "header_img") + + return header_image + + +@frappe.whitelist(allow_guest=True) +def make_payment(stripe_token_id, data, reference_doctype=None, reference_docname=None): + data = json.loads(data) + + data.update({"stripe_token_id": stripe_token_id}) + + gateway_controller = get_gateway_controller(reference_doctype, reference_docname) + + if is_a_subscription(reference_doctype, reference_docname): + reference = frappe.get_doc(reference_doctype, reference_docname) + data = reference.create_subscription("stripe", gateway_controller, data) + else: + data = frappe.get_doc("Stripe Settings", gateway_controller).create_request(data) + + frappe.db.commit() + return data + + +def is_a_subscription(reference_doctype, reference_docname): + if not frappe.get_meta(reference_doctype).has_field("is_a_subscription"): + return False + return frappe.db.get_value(reference_doctype, reference_docname, "is_a_subscription") From f7719b6e6b79a387b3ad3def6414d97e0a98d815 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 18:45:04 +0800 Subject: [PATCH 029/284] Update mollie_checkout.css --- payments/templates/pages/mollie_checkout.css | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.css b/payments/templates/pages/mollie_checkout.css index a42808aa..aa7a1da4 100644 --- a/payments/templates/pages/mollie_checkout.css +++ b/payments/templates/pages/mollie_checkout.css @@ -1,4 +1,4 @@ -.StripeElement { +.MollieElement { background-color: white; height: 40px; padding: 10px 12px; @@ -9,23 +9,23 @@ transition: box-shadow 150ms ease; } -.StripeElement--focus { +.MollieElement--focus { box-shadow: 0 1px 3px 0 #cfd7df; } -.StripeElement--invalid { +.MollieElement--invalid { border-color: #fa755a; } -.StripeElement--webkit-autofill { +.MollieElement--webkit-autofill { background-color: #fefde5; } -.stripe #payment-form { +.mollie #payment-form { margin-top: 80px; } -.stripe button { +.mollie button { float: right; display: block; background: #5e64ff; @@ -42,27 +42,27 @@ outline: none; } -.stripe button:hover, .stripe button:focus { +.mollie button:hover, .mollie button:focus { background: #2b33ff; border-color: #0711ff; } -.stripe button:active { +.mollie button:active { background: #5e64ff; } -.stripe button:disabled { +.mollie button:disabled { background: #515e80; } -.stripe .group { +.mollie .group { background: white; box-shadow: 2px 7px 14px 2px rgba(49, 49, 93, 0.10), 0 3px 6px 0 rgba(0, 0, 0, 0.08); border-radius: 4px; margin-bottom: 20px; } -.stripe label { +.mollie label { position: relative; color: #8898AA; font-weight: 300; @@ -72,11 +72,11 @@ display: block; } -.stripe .group label:not(:last-child) { +.mollie .group label:not(:last-child) { border-bottom: 1px solid #F0F5FA; } -.stripe label>span { +.mollie label>span { width: 20%; text-align: right; float: left; From 976ef5efcc27b305b8f18bf4cdd7936a36db5e0d Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 18:45:55 +0800 Subject: [PATCH 030/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 0a0aa706..935a34b5 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -1,6 +1,6 @@ -var stripe = Stripe("{{ publishable_key }}"); +var mollie = Mollie("{{ publishable_key }}"); -var elements = stripe.elements(); +var elements = mollie.elements(); var style = { base: { @@ -32,11 +32,11 @@ function setOutcome(result) { $('#submit').prop('disabled', true) $('#submit').html(__('Processing...')) frappe.call({ - method:"payments.templates.pages.stripe_checkout.make_payment", + method:"payments.templates.pages.mollie_checkout.make_payment", freeze:true, headers: {"X-Requested-With": "XMLHttpRequest"}, args: { - "stripe_token_id": result.token.id, + "mollie_token_id": result.token.id, "data": JSON.stringify({{ frappe.form_dict|json }}), "reference_doctype": "{{ reference_doctype }}", "reference_docname": "{{ reference_docname }}" @@ -80,6 +80,6 @@ frappe.ready(function() { name: $('input[name=cardholder-name]').val(), email: $('input[name=cardholder-email]').val() } - stripe.createToken(card, extraDetails).then(setOutcome); + mollie.createToken(card, extraDetails).then(setOutcome); }) }); From 520839eaf300c46b1970a968175eeeb394ff994c Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 18:46:51 +0800 Subject: [PATCH 031/284] Update mollie_checkout.html --- payments/templates/pages/mollie_checkout.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.html b/payments/templates/pages/mollie_checkout.html index b038f6fd..b48da983 100644 --- a/payments/templates/pages/mollie_checkout.html +++ b/payments/templates/pages/mollie_checkout.html @@ -6,13 +6,13 @@ {% endblock %} {% block script %} - - + + {% endblock %} {%- block page_content -%} -
+
{% if image %} From 67a08e2d16a26e3658e87da9216224610a68a630 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 18:47:38 +0800 Subject: [PATCH 032/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index cdefc8cd..728d8681 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -4,7 +4,7 @@ from frappe import _ from frappe.utils import cint, fmt_money -from payments.payment_gateways.doctype.stripe_settings.stripe_settings import ( +from payments.payment_gateways.doctype.mollie_settings.mollie_settings import ( get_gateway_controller, ) @@ -55,7 +55,7 @@ def get_context(context): def get_api_key(doc, gateway_controller): - publishable_key = frappe.db.get_value("Stripe Settings", gateway_controller, "publishable_key") + publishable_key = frappe.db.get_value("Mollie Settings", gateway_controller, "publishable_key") if cint(frappe.form_dict.get("use_sandbox")): publishable_key = frappe.conf.sandbox_publishable_key @@ -63,24 +63,24 @@ def get_api_key(doc, gateway_controller): def get_header_image(doc, gateway_controller): - header_image = frappe.db.get_value("Stripe Settings", gateway_controller, "header_img") + header_image = frappe.db.get_value("Mollie Settings", gateway_controller, "header_img") return header_image @frappe.whitelist(allow_guest=True) -def make_payment(stripe_token_id, data, reference_doctype=None, reference_docname=None): +def make_payment(mollie_token_id, data, reference_doctype=None, reference_docname=None): data = json.loads(data) - data.update({"stripe_token_id": stripe_token_id}) + data.update({"mollie_token_id": mollie_token_id}) gateway_controller = get_gateway_controller(reference_doctype, reference_docname) if is_a_subscription(reference_doctype, reference_docname): reference = frappe.get_doc(reference_doctype, reference_docname) - data = reference.create_subscription("stripe", gateway_controller, data) + data = reference.create_subscription("mollie", gateway_controller, data) else: - data = frappe.get_doc("Stripe Settings", gateway_controller).create_request(data) + data = frappe.get_doc("Mollie Settings", gateway_controller).create_request(data) frappe.db.commit() return data From f529875d9fcce539a16dda51c3d47ad59485984f Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 19:59:04 +0800 Subject: [PATCH 033/284] Update mollie_checkout.html --- payments/templates/pages/mollie_checkout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.html b/payments/templates/pages/mollie_checkout.html index b48da983..65bd568b 100644 --- a/payments/templates/pages/mollie_checkout.html +++ b/payments/templates/pages/mollie_checkout.html @@ -6,7 +6,7 @@ {% endblock %} {% block script %} - + {% endblock %} From 9cc0724af3f792db233766f058f9dcad7f2baa82 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 19:59:22 +0800 Subject: [PATCH 034/284] Update mollie_checkout.js From 41d7455a7375f89a3b71be8f32205b3746ec8116 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 20:06:51 +0800 Subject: [PATCH 035/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 4cd9455c..023907fb 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -53,7 +53,7 @@ def on_update(self): self.validate_mollie_credentials() def validate_mollie_credentials(self): - if self.secret_key: + if self.profile_id and self.secret_key: header = { "Authorization": "Bearer {}".format( self.get_password(fieldname="secret_key", raise_exception=False) From 9cceb6b3230688529084199e0a7fd02d1e49ef0f Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 20:07:51 +0800 Subject: [PATCH 036/284] Update mollie_settings.json --- .../mollie_settings/mollie_settings.json | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.json b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.json index 459d9d4a..260817a9 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.json +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.json @@ -45,6 +45,38 @@ "translatable": 0, "unique": 0 }, + { + "allow_bulk_edit": 0, + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "profile_id", + "fieldtype": "Data", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 1, + "in_standard_filter": 0, + "label": "Profile ID", + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 1, + "search_index": 0, + "set_only_once": 0, + "translatable": 0, + "unique": 0 + }, { "allow_bulk_edit": 0, "allow_in_quick_entry": 0, From 2e7989d6aaadbf0c7ed96d0a120508ad29976826 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 20:08:20 +0800 Subject: [PATCH 037/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 935a34b5..252a38e7 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -1,4 +1,4 @@ -var mollie = Mollie("{{ publishable_key }}"); +var mollie = Mollie("{{ profile_id }}"); var elements = mollie.elements(); From c084701794e32be3428983a89110c792b3eefd95 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 20:13:19 +0800 Subject: [PATCH 038/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 728d8681..60e3e940 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -32,7 +32,7 @@ def get_context(context): context[key] = frappe.form_dict[key] gateway_controller = get_gateway_controller(context.reference_doctype, context.reference_docname) - context.publishable_key = get_api_key(context.reference_docname, gateway_controller) + context.profile_id = get_api_key(context.reference_docname, gateway_controller) context.image = get_header_image(context.reference_docname, gateway_controller) context["amount"] = fmt_money(amount=context["amount"], currency=context["currency"]) @@ -55,11 +55,11 @@ def get_context(context): def get_api_key(doc, gateway_controller): - publishable_key = frappe.db.get_value("Mollie Settings", gateway_controller, "publishable_key") + profile_id = frappe.db.get_value("Mollie Settings", gateway_controller, "profile_id") if cint(frappe.form_dict.get("use_sandbox")): - publishable_key = frappe.conf.sandbox_publishable_key + profile_id = frappe.conf.sandbox_profile_id - return publishable_key + return profile_id def get_header_image(doc, gateway_controller): From e1ada5b064ca25012b6cbc40c3b9e363891563cf Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 20:20:40 +0800 Subject: [PATCH 039/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 252a38e7..8b6b66a3 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -1,7 +1,5 @@ var mollie = Mollie("{{ profile_id }}"); -var elements = mollie.elements(); - var style = { base: { color: '#32325d', @@ -19,11 +17,7 @@ var style = { } }; -var card = elements.create('card', { - hidePostalCode: true, - style: style -}); - +var card = mollie.createComponent('card'); card.mount('#card-element'); function setOutcome(result) { From 04a0f657b3c653ecb3e30621d54f6ae9da069730 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 20:26:59 +0800 Subject: [PATCH 040/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 8b6b66a3..325a17e3 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -58,13 +58,14 @@ function setOutcome(result) { } } -card.on('change', function(event) { - var displayError = document.getElementById('card-errors'); +var displayError = document.getElementById('card-errors'); + +card.addEventListener('change', event => { if (event.error) { displayError.textContent = event.error.message; - } else { - displayError.textContent = ''; - } + } else { + isplayError.textContent = ''; + } }); frappe.ready(function() { From 26a0f124c1af555428d337ed866dd32b5c3a73f1 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 20:34:08 +0800 Subject: [PATCH 041/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 325a17e3..77100748 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -17,7 +17,7 @@ var style = { } }; -var card = mollie.createComponent('card'); +var card = mollie.createComponent('cardNumber'); card.mount('#card-element'); function setOutcome(result) { From 222db3ea70acfc302b52074c886db53466181377 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 20:35:52 +0800 Subject: [PATCH 042/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 77100748..fe396137 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -17,9 +17,6 @@ var style = { } }; -var card = mollie.createComponent('cardNumber'); -card.mount('#card-element'); - function setOutcome(result) { if (result.token) { @@ -58,16 +55,6 @@ function setOutcome(result) { } } -var displayError = document.getElementById('card-errors'); - -card.addEventListener('change', event => { - if (event.error) { - displayError.textContent = event.error.message; - } else { - isplayError.textContent = ''; - } -}); - frappe.ready(function() { $('#submit').off("click").on("click", function(e) { e.preventDefault(); From ca91121df95ccecd98ab738e3865382dd347fee0 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 20:42:50 +0800 Subject: [PATCH 043/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index fe396137..90a501ec 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -56,12 +56,17 @@ function setOutcome(result) { } frappe.ready(function() { - $('#submit').off("click").on("click", function(e) { + $('#submit').off("click").on("click", function(e) { e.preventDefault(); - var extraDetails = { - name: $('input[name=cardholder-name]').val(), - email: $('input[name=cardholder-email]').val() - } - mollie.createToken(card, extraDetails).then(setOutcome); + + var { token, error } = await mollie.createToken(); + + if (error) { + // Something wrong happened while creating the token. Handle this situation gracefully. + return; + } + + // Submit form to the server + form.addEventListener('submit', async e => { }) }); From 2e3b59c04a98c781d86a4c1eea77722856fe4144 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 20:48:11 +0800 Subject: [PATCH 044/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 90a501ec..a5e405c5 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -59,7 +59,7 @@ frappe.ready(function() { $('#submit').off("click").on("click", function(e) { e.preventDefault(); - var { token, error } = await mollie.createToken(); + mollie.createToken(); if (error) { // Something wrong happened while creating the token. Handle this situation gracefully. From 947f068df56c9b6ee0956b3823ea3bf0fe4106db Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 20:52:03 +0800 Subject: [PATCH 045/284] Update mollie_checkout.js From a001b3e6bb1ef167af3c54f329e1ee436fec3969 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 20:54:24 +0800 Subject: [PATCH 046/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index a5e405c5..5d7ec916 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -70,3 +70,19 @@ frappe.ready(function() { form.addEventListener('submit', async e => { }) }); + +frappe.ready(function() { + form.addEventListener('submit', async e => { + e.preventDefault(); + + var { token, error } = await mollie.createToken(); + + if (error) { + // Something wrong happened while creating the token. Handle this situation gracefully. + return; + } + + // Submit form to the server + form.submit(); + }); +}); From a6f5a5a05f11bc36f23ff8e576dfd4c72b871b9a Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 20:57:53 +0800 Subject: [PATCH 047/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 5d7ec916..b295ad3e 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -55,22 +55,6 @@ function setOutcome(result) { } } -frappe.ready(function() { - $('#submit').off("click").on("click", function(e) { - e.preventDefault(); - - mollie.createToken(); - - if (error) { - // Something wrong happened while creating the token. Handle this situation gracefully. - return; - } - - // Submit form to the server - form.addEventListener('submit', async e => { - }) -}); - frappe.ready(function() { form.addEventListener('submit', async e => { e.preventDefault(); From e1f6cc81c6cf384309b40c23be235d0a6a9404e3 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 21:04:27 +0800 Subject: [PATCH 048/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index b295ad3e..6b09013f 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -56,17 +56,8 @@ function setOutcome(result) { } frappe.ready(function() { - form.addEventListener('submit', async e => { - e.preventDefault(); - - var { token, error } = await mollie.createToken(); - - if (error) { - // Something wrong happened while creating the token. Handle this situation gracefully. - return; - } - - // Submit form to the server - form.submit(); - }); + $('#submit').off("click").on("click", function(e) { + e.preventDefault(); + mollie.createToken(); + }); }); From 83e92c6941c2c62c8018db26b9e632d44b65634a Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 21:10:18 +0800 Subject: [PATCH 049/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 6b09013f..3a9da63d 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -58,6 +58,6 @@ function setOutcome(result) { frappe.ready(function() { $('#submit').off("click").on("click", function(e) { e.preventDefault(); - mollie.createToken(); + mollie.createToken().then(setOutcome); }); }); From 3119268efe167ae0772974f8364269f55d5670cc Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 21:14:39 +0800 Subject: [PATCH 050/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 3a9da63d..129e2fa6 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -58,6 +58,8 @@ function setOutcome(result) { frappe.ready(function() { $('#submit').off("click").on("click", function(e) { e.preventDefault(); + console.log("Test voor mollie create token"); mollie.createToken().then(setOutcome); + console.log("Test daarna"); }); }); From ee3393af79c6c50c8b86f2d1cdf0caaf1cdfa69f Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 21:17:55 +0800 Subject: [PATCH 051/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 129e2fa6..73643d85 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -61,5 +61,5 @@ frappe.ready(function() { console.log("Test voor mollie create token"); mollie.createToken().then(setOutcome); console.log("Test daarna"); - }); + }) }); From 760d2ab703fcd9da9c2e782e4c7356ebe00ee440 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 21:26:03 +0800 Subject: [PATCH 052/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 73643d85..e91774b4 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -56,10 +56,11 @@ function setOutcome(result) { } frappe.ready(function() { - $('#submit').off("click").on("click", function(e) { - e.preventDefault(); - console.log("Test voor mollie create token"); - mollie.createToken().then(setOutcome); - console.log("Test daarna"); + form.addEventListener('submit', async e => { + e.preventDefault(); + console.log("Test voor mollie create token"); + var { result } = await mollie.createToken(); + setOutcome(result) + console.log("Test daarna"); }) }); From 664dd6847eb292659b19486af51adc2f7bff2755 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 21:31:43 +0800 Subject: [PATCH 053/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 1 + 1 file changed, 1 insertion(+) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index e91774b4..595d00e4 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -56,6 +56,7 @@ function setOutcome(result) { } frappe.ready(function() { + form = document.getElementById("submit"); form.addEventListener('submit', async e => { e.preventDefault(); console.log("Test voor mollie create token"); From 2023ac199199bd787abd169b0858cd32240c0651 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 21:39:49 +0800 Subject: [PATCH 054/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 595d00e4..dd6c0df9 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -58,10 +58,12 @@ function setOutcome(result) { frappe.ready(function() { form = document.getElementById("submit"); form.addEventListener('submit', async e => { - e.preventDefault(); - console.log("Test voor mollie create token"); - var { result } = await mollie.createToken(); - setOutcome(result) - console.log("Test daarna"); + e.preventDefault(); + var { token, error } = await mollie.createToken(); + if (error) { + console.log(error) + return; + } + setOutcome(token) }) }); From 5df219ee93c56bc00249ee59bab499793fd53c5a Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 21:45:12 +0800 Subject: [PATCH 055/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index dd6c0df9..4e587441 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -17,9 +17,9 @@ var style = { } }; -function setOutcome(result) { +function setOutcome(token) { - if (result.token) { + if (token) { $('#submit').prop('disabled', true) $('#submit').html(__('Processing...')) frappe.call({ @@ -27,7 +27,7 @@ function setOutcome(result) { freeze:true, headers: {"X-Requested-With": "XMLHttpRequest"}, args: { - "mollie_token_id": result.token.id, + "mollie_token_id": token.id, "data": JSON.stringify({{ frappe.form_dict|json }}), "reference_doctype": "{{ reference_doctype }}", "reference_docname": "{{ reference_docname }}" From ef86fa9448c5dee98449ba6716ebcc196dab0967 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 21:53:41 +0800 Subject: [PATCH 056/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 4e587441..71a49466 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -17,9 +17,9 @@ var style = { } }; -function setOutcome(token) { +function setOutcome(result.token) { - if (token) { + if (result.token) { $('#submit').prop('disabled', true) $('#submit').html(__('Processing...')) frappe.call({ @@ -27,7 +27,7 @@ function setOutcome(token) { freeze:true, headers: {"X-Requested-With": "XMLHttpRequest"}, args: { - "mollie_token_id": token.id, + "mollie_token_id": result.token.id, "data": JSON.stringify({{ frappe.form_dict|json }}), "reference_doctype": "{{ reference_doctype }}", "reference_docname": "{{ reference_docname }}" @@ -60,10 +60,12 @@ frappe.ready(function() { form.addEventListener('submit', async e => { e.preventDefault(); var { token, error } = await mollie.createToken(); + console.log(token) + console.log(error) if (error) { console.log(error) return; } - setOutcome(token) + }) }); From 5eb8f6527d52854b35273e810b33fb0366a07e1b Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 21:56:53 +0800 Subject: [PATCH 057/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 71a49466..e671e396 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -17,7 +17,7 @@ var style = { } }; -function setOutcome(result.token) { +function setOutcome(result) { if (result.token) { $('#submit').prop('disabled', true) From 98b53fc5c94a5530a3ae282c6471c0f9f24ab2aa Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 22:02:08 +0800 Subject: [PATCH 058/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index e671e396..de3f98d4 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -56,8 +56,7 @@ function setOutcome(result) { } frappe.ready(function() { - form = document.getElementById("submit"); - form.addEventListener('submit', async e => { + addEventListener('submit', async e => { e.preventDefault(); var { token, error } = await mollie.createToken(); console.log(token) @@ -66,6 +65,6 @@ frappe.ready(function() { console.log(error) return; } - + setOutcome(token) }) }); From a5ff7f18f872040524aec5bfb43adf623cae688c Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 22:15:24 +0800 Subject: [PATCH 059/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index de3f98d4..64b94be7 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -59,12 +59,11 @@ frappe.ready(function() { addEventListener('submit', async e => { e.preventDefault(); var { token, error } = await mollie.createToken(); - console.log(token) - console.log(error) if (error) { console.log(error) return; } + console.log(token) setOutcome(token) }) }); From 8edd6f74d46f05099a0740a9fa4f2b0b1601a486 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 22:18:31 +0800 Subject: [PATCH 060/284] Update mollie_checkout.js --- .../templates/includes/mollie_checkout.js | 112 ++++++++---------- 1 file changed, 48 insertions(+), 64 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 64b94be7..607a51a6 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -1,69 +1,53 @@ -var mollie = Mollie("{{ profile_id }}"); +$(document).ready(function(){ + (function(e){ + var options = { + "key": "{{ api_key }}", + "amount": cint({{ amount }} * 100), // 2000 paise = INR 20 + "currency": "{{ currency }}", + "name": "{{ title }}", + "description": "{{ description }}", + "subscription_id": "{{ subscription_id }}", + "handler": function (response){ + mollie.make_payment_log(response, options, "{{ reference_doctype }}", "{{ reference_docname }}", "{{ token }}"); + }, + "prefill": { + "name": "{{ payer_name }}", + "email": "{{ payer_email }}", + "order_id": "{{ order_id }}" + }, + "notes": {{ frappe.form_dict|json }} + }; -var style = { - base: { - color: '#32325d', - lineHeight: '18px', - fontFamily: '"Helvetica Neue", Helvetica, sans-serif', - fontSmoothing: 'antialiased', - fontSize: '16px', - '::placeholder': { - color: '#aab7c4' - } - }, - invalid: { - color: '#fa755a', - iconColor: '#fa755a' - } -}; + var rzp = new Mollie(options); + rzp.open(); + // e.preventDefault(); + })(); +}) -function setOutcome(result) { +frappe.provide('mollie'); - if (result.token) { - $('#submit').prop('disabled', true) - $('#submit').html(__('Processing...')) - frappe.call({ - method:"payments.templates.pages.mollie_checkout.make_payment", - freeze:true, - headers: {"X-Requested-With": "XMLHttpRequest"}, - args: { - "mollie_token_id": result.token.id, - "data": JSON.stringify({{ frappe.form_dict|json }}), - "reference_doctype": "{{ reference_doctype }}", - "reference_docname": "{{ reference_docname }}" - }, - callback: function(r) { - if (r.message.status == "Completed") { - $('#submit').hide() - $('.success').show() - setTimeout(function() { - window.location.href = r.message.redirect_to - }, 2000); - } else { - $('#submit').hide() - $('.error').show() - setTimeout(function() { - window.location.href = r.message.redirect_to - }, 2000); - } - } - }); +mollie.make_payment_log = function(response, options, doctype, docname, token){ + $('.mollie-loading').addClass('hidden'); + $('.mollie-confirming').removeClass('hidden'); - } else if (result.error) { - $('.error').html(result.error.message); - $('.error').show() - } -} - -frappe.ready(function() { - addEventListener('submit', async e => { - e.preventDefault(); - var { token, error } = await mollie.createToken(); - if (error) { - console.log(error) - return; - } - console.log(token) - setOutcome(token) + frappe.call({ + method:"payments.templates.pages.mollie_checkout.make_payment", + freeze:true, + headers: {"X-Requested-With": "XMLHttpRequest"}, + args: { + "mollie_payment_id": response.mollie_payment_id, + "options": options, + "reference_doctype": doctype, + "reference_docname": docname, + "token": token + }, + callback: function(r){ + if (r.message && r.message.status == 200) { + window.location.href = r.message.redirect_to + } + else if (r.message && ([401,400,500].indexOf(r.message.status) > -1)) { + window.location.href = r.message.redirect_to + } + } }) -}); +} From a6f8746b5acc8191504eb1bdce6fb17c9b6916c5 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 22:25:52 +0800 Subject: [PATCH 061/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 607a51a6..f83a3c66 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -2,7 +2,7 @@ $(document).ready(function(){ (function(e){ var options = { "key": "{{ api_key }}", - "amount": cint({{ amount }} * 100), // 2000 paise = INR 20 + "amount": cint({{ amount }}), "currency": "{{ currency }}", "name": "{{ title }}", "description": "{{ description }}", From caf5e516a3609dd58e49a6d68aa3534a48d4f584 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 22:27:31 +0800 Subject: [PATCH 062/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index f83a3c66..e9b36cc3 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -2,7 +2,7 @@ $(document).ready(function(){ (function(e){ var options = { "key": "{{ api_key }}", - "amount": cint({{ amount }}), + "amount": cint({{ amount.value }}), "currency": "{{ currency }}", "name": "{{ title }}", "description": "{{ description }}", From 7a1c8e9205fd89e3936c0f1416f06d988b75bf51 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 22:35:31 +0800 Subject: [PATCH 063/284] Update mollie_checkout.js --- .../templates/includes/mollie_checkout.js | 112 ++++++++++-------- 1 file changed, 64 insertions(+), 48 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index e9b36cc3..64b94be7 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -1,53 +1,69 @@ -$(document).ready(function(){ - (function(e){ - var options = { - "key": "{{ api_key }}", - "amount": cint({{ amount.value }}), - "currency": "{{ currency }}", - "name": "{{ title }}", - "description": "{{ description }}", - "subscription_id": "{{ subscription_id }}", - "handler": function (response){ - mollie.make_payment_log(response, options, "{{ reference_doctype }}", "{{ reference_docname }}", "{{ token }}"); - }, - "prefill": { - "name": "{{ payer_name }}", - "email": "{{ payer_email }}", - "order_id": "{{ order_id }}" - }, - "notes": {{ frappe.form_dict|json }} - }; - - var rzp = new Mollie(options); - rzp.open(); - // e.preventDefault(); - })(); -}) +var mollie = Mollie("{{ profile_id }}"); -frappe.provide('mollie'); +var style = { + base: { + color: '#32325d', + lineHeight: '18px', + fontFamily: '"Helvetica Neue", Helvetica, sans-serif', + fontSmoothing: 'antialiased', + fontSize: '16px', + '::placeholder': { + color: '#aab7c4' + } + }, + invalid: { + color: '#fa755a', + iconColor: '#fa755a' + } +}; -mollie.make_payment_log = function(response, options, doctype, docname, token){ - $('.mollie-loading').addClass('hidden'); - $('.mollie-confirming').removeClass('hidden'); +function setOutcome(result) { - frappe.call({ - method:"payments.templates.pages.mollie_checkout.make_payment", - freeze:true, - headers: {"X-Requested-With": "XMLHttpRequest"}, - args: { - "mollie_payment_id": response.mollie_payment_id, - "options": options, - "reference_doctype": doctype, - "reference_docname": docname, - "token": token - }, - callback: function(r){ - if (r.message && r.message.status == 200) { - window.location.href = r.message.redirect_to - } - else if (r.message && ([401,400,500].indexOf(r.message.status) > -1)) { - window.location.href = r.message.redirect_to + if (result.token) { + $('#submit').prop('disabled', true) + $('#submit').html(__('Processing...')) + frappe.call({ + method:"payments.templates.pages.mollie_checkout.make_payment", + freeze:true, + headers: {"X-Requested-With": "XMLHttpRequest"}, + args: { + "mollie_token_id": result.token.id, + "data": JSON.stringify({{ frappe.form_dict|json }}), + "reference_doctype": "{{ reference_doctype }}", + "reference_docname": "{{ reference_docname }}" + }, + callback: function(r) { + if (r.message.status == "Completed") { + $('#submit').hide() + $('.success').show() + setTimeout(function() { + window.location.href = r.message.redirect_to + }, 2000); + } else { + $('#submit').hide() + $('.error').show() + setTimeout(function() { + window.location.href = r.message.redirect_to + }, 2000); + } } - } - }) + }); + + } else if (result.error) { + $('.error').html(result.error.message); + $('.error').show() + } } + +frappe.ready(function() { + addEventListener('submit', async e => { + e.preventDefault(); + var { token, error } = await mollie.createToken(); + if (error) { + console.log(error) + return; + } + console.log(token) + setOutcome(token) + }) +}); From 4b9152b757f22e5ad21a8059cad6270aceecace6 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 22:45:57 +0800 Subject: [PATCH 064/284] Update stripe_checkout.js --- .../templates/includes/stripe_checkout.js | 103 ++++-------------- 1 file changed, 21 insertions(+), 82 deletions(-) diff --git a/payments/templates/includes/stripe_checkout.js b/payments/templates/includes/stripe_checkout.js index 0a0aa706..47dbf735 100644 --- a/payments/templates/includes/stripe_checkout.js +++ b/payments/templates/includes/stripe_checkout.js @@ -1,85 +1,24 @@ -var stripe = Stripe("{{ publishable_key }}"); - -var elements = stripe.elements(); - -var style = { - base: { - color: '#32325d', - lineHeight: '18px', - fontFamily: '"Helvetica Neue", Helvetica, sans-serif', - fontSmoothing: 'antialiased', - fontSize: '16px', - '::placeholder': { - color: '#aab7c4' - } - }, - invalid: { - color: '#fa755a', - iconColor: '#fa755a' - } -}; - -var card = elements.create('card', { - hidePostalCode: true, - style: style -}); - -card.mount('#card-element'); - -function setOutcome(result) { - - if (result.token) { - $('#submit').prop('disabled', true) - $('#submit').html(__('Processing...')) - frappe.call({ - method:"payments.templates.pages.stripe_checkout.make_payment", - freeze:true, - headers: {"X-Requested-With": "XMLHttpRequest"}, - args: { - "stripe_token_id": result.token.id, - "data": JSON.stringify({{ frappe.form_dict|json }}), - "reference_doctype": "{{ reference_doctype }}", - "reference_docname": "{{ reference_docname }}" - }, - callback: function(r) { - if (r.message.status == "Completed") { - $('#submit').hide() - $('.success').show() - setTimeout(function() { - window.location.href = r.message.redirect_to - }, 2000); - } else { - $('#submit').hide() - $('.error').show() - setTimeout(function() { - window.location.href = r.message.redirect_to - }, 2000); - } +$(document).ready(function() { + var data = {{ frappe.form_dict | json }}; + var doctype = "{{ reference_doctype }}" + var docname = "{{ reference_docname }}" + + frappe.call({ + method: "payments.templates.pages.mollie_checkout.check_mandate", + freeze: true, + headers: { + "X-Requested-With": "XMLHttpRequest" + }, + args: { + "data": JSON.stringify(data), + "reference_doctype": doctype, + "reference_docname": docname + }, + callback: function(r) { + if (r.message) { + window.location.href = r.message.redirect_to } - }); - - } else if (result.error) { - $('.error').html(result.error.message); - $('.error').show() - } -} - -card.on('change', function(event) { - var displayError = document.getElementById('card-errors'); - if (event.error) { - displayError.textContent = event.error.message; - } else { - displayError.textContent = ''; - } -}); - -frappe.ready(function() { - $('#submit').off("click").on("click", function(e) { - e.preventDefault(); - var extraDetails = { - name: $('input[name=cardholder-name]').val(), - email: $('input[name=cardholder-email]').val() } - stripe.createToken(card, extraDetails).then(setOutcome); }) -}); + +}) From 5968d8e9591e1f20f65cfc7238beab39e4d5f533 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 22:48:46 +0800 Subject: [PATCH 065/284] Update mollie_checkout.js --- .../templates/includes/mollie_checkout.js | 87 +++++-------------- 1 file changed, 21 insertions(+), 66 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 64b94be7..47dbf735 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -1,69 +1,24 @@ -var mollie = Mollie("{{ profile_id }}"); +$(document).ready(function() { + var data = {{ frappe.form_dict | json }}; + var doctype = "{{ reference_doctype }}" + var docname = "{{ reference_docname }}" -var style = { - base: { - color: '#32325d', - lineHeight: '18px', - fontFamily: '"Helvetica Neue", Helvetica, sans-serif', - fontSmoothing: 'antialiased', - fontSize: '16px', - '::placeholder': { - color: '#aab7c4' - } - }, - invalid: { - color: '#fa755a', - iconColor: '#fa755a' - } -}; - -function setOutcome(result) { - - if (result.token) { - $('#submit').prop('disabled', true) - $('#submit').html(__('Processing...')) - frappe.call({ - method:"payments.templates.pages.mollie_checkout.make_payment", - freeze:true, - headers: {"X-Requested-With": "XMLHttpRequest"}, - args: { - "mollie_token_id": result.token.id, - "data": JSON.stringify({{ frappe.form_dict|json }}), - "reference_doctype": "{{ reference_doctype }}", - "reference_docname": "{{ reference_docname }}" - }, - callback: function(r) { - if (r.message.status == "Completed") { - $('#submit').hide() - $('.success').show() - setTimeout(function() { - window.location.href = r.message.redirect_to - }, 2000); - } else { - $('#submit').hide() - $('.error').show() - setTimeout(function() { - window.location.href = r.message.redirect_to - }, 2000); - } + frappe.call({ + method: "payments.templates.pages.mollie_checkout.check_mandate", + freeze: true, + headers: { + "X-Requested-With": "XMLHttpRequest" + }, + args: { + "data": JSON.stringify(data), + "reference_doctype": doctype, + "reference_docname": docname + }, + callback: function(r) { + if (r.message) { + window.location.href = r.message.redirect_to } - }); - - } else if (result.error) { - $('.error').html(result.error.message); - $('.error').show() - } -} - -frappe.ready(function() { - addEventListener('submit', async e => { - e.preventDefault(); - var { token, error } = await mollie.createToken(); - if (error) { - console.log(error) - return; - } - console.log(token) - setOutcome(token) + } }) -}); + +}) From a4f60d25eae021e7fb55584da759b444b4140217 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 22:49:11 +0800 Subject: [PATCH 066/284] Update stripe_checkout.js --- .../templates/includes/stripe_checkout.js | 103 ++++++++++++++---- 1 file changed, 82 insertions(+), 21 deletions(-) diff --git a/payments/templates/includes/stripe_checkout.js b/payments/templates/includes/stripe_checkout.js index 47dbf735..0a0aa706 100644 --- a/payments/templates/includes/stripe_checkout.js +++ b/payments/templates/includes/stripe_checkout.js @@ -1,24 +1,85 @@ -$(document).ready(function() { - var data = {{ frappe.form_dict | json }}; - var doctype = "{{ reference_doctype }}" - var docname = "{{ reference_docname }}" - - frappe.call({ - method: "payments.templates.pages.mollie_checkout.check_mandate", - freeze: true, - headers: { - "X-Requested-With": "XMLHttpRequest" - }, - args: { - "data": JSON.stringify(data), - "reference_doctype": doctype, - "reference_docname": docname - }, - callback: function(r) { - if (r.message) { - window.location.href = r.message.redirect_to +var stripe = Stripe("{{ publishable_key }}"); + +var elements = stripe.elements(); + +var style = { + base: { + color: '#32325d', + lineHeight: '18px', + fontFamily: '"Helvetica Neue", Helvetica, sans-serif', + fontSmoothing: 'antialiased', + fontSize: '16px', + '::placeholder': { + color: '#aab7c4' + } + }, + invalid: { + color: '#fa755a', + iconColor: '#fa755a' + } +}; + +var card = elements.create('card', { + hidePostalCode: true, + style: style +}); + +card.mount('#card-element'); + +function setOutcome(result) { + + if (result.token) { + $('#submit').prop('disabled', true) + $('#submit').html(__('Processing...')) + frappe.call({ + method:"payments.templates.pages.stripe_checkout.make_payment", + freeze:true, + headers: {"X-Requested-With": "XMLHttpRequest"}, + args: { + "stripe_token_id": result.token.id, + "data": JSON.stringify({{ frappe.form_dict|json }}), + "reference_doctype": "{{ reference_doctype }}", + "reference_docname": "{{ reference_docname }}" + }, + callback: function(r) { + if (r.message.status == "Completed") { + $('#submit').hide() + $('.success').show() + setTimeout(function() { + window.location.href = r.message.redirect_to + }, 2000); + } else { + $('#submit').hide() + $('.error').show() + setTimeout(function() { + window.location.href = r.message.redirect_to + }, 2000); + } } + }); + + } else if (result.error) { + $('.error').html(result.error.message); + $('.error').show() + } +} + +card.on('change', function(event) { + var displayError = document.getElementById('card-errors'); + if (event.error) { + displayError.textContent = event.error.message; + } else { + displayError.textContent = ''; + } +}); + +frappe.ready(function() { + $('#submit').off("click").on("click", function(e) { + e.preventDefault(); + var extraDetails = { + name: $('input[name=cardholder-name]').val(), + email: $('input[name=cardholder-email]').val() } + stripe.createToken(card, extraDetails).then(setOutcome); }) - -}) +}); From 94e0aed59f2eb20aa55c72a2dfed4ebb7a6bbf15 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 22:55:49 +0800 Subject: [PATCH 067/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 47dbf735..3b676ac9 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -4,7 +4,7 @@ $(document).ready(function() { var docname = "{{ reference_docname }}" frappe.call({ - method: "payments.templates.pages.mollie_checkout.check_mandate", + method: "payments.templates.pages.mollie_checkout.make_payment", freeze: true, headers: { "X-Requested-With": "XMLHttpRequest" @@ -14,8 +14,11 @@ $(document).ready(function() { "reference_doctype": doctype, "reference_docname": docname }, - callback: function(r) { - if (r.message) { + callback: function(r){ + if (r.message && r.message.status == 200) { + window.location.href = r.message.redirect_to + } + else if (r.message && ([401,400,500].indexOf(r.message.status) > -1)) { window.location.href = r.message.redirect_to } } From 462dfd01fee64cebbec982221a14c9bd99aa66df Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 23:05:21 +0800 Subject: [PATCH 068/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 60e3e940..8b0545d7 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -72,8 +72,6 @@ def get_header_image(doc, gateway_controller): def make_payment(mollie_token_id, data, reference_doctype=None, reference_docname=None): data = json.loads(data) - data.update({"mollie_token_id": mollie_token_id}) - gateway_controller = get_gateway_controller(reference_doctype, reference_docname) if is_a_subscription(reference_doctype, reference_docname): From d8ce49865f95b4b108cec2f64b7110b9549c4862 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 23:08:34 +0800 Subject: [PATCH 069/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 8b0545d7..b98cfc08 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -69,7 +69,7 @@ def get_header_image(doc, gateway_controller): @frappe.whitelist(allow_guest=True) -def make_payment(mollie_token_id, data, reference_doctype=None, reference_docname=None): +def make_payment(data, reference_doctype=None, reference_docname=None): data = json.loads(data) gateway_controller = get_gateway_controller(reference_doctype, reference_docname) From 7f97af05f02c2325405eda78ba44418fb523fab7 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 23:10:46 +0800 Subject: [PATCH 070/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index b98cfc08..d213e407 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -69,21 +69,16 @@ def get_header_image(doc, gateway_controller): @frappe.whitelist(allow_guest=True) -def make_payment(data, reference_doctype=None, reference_docname=None): +def make_payment(data, reference_doctype, reference_docname): data = json.loads(data) gateway_controller = get_gateway_controller(reference_doctype, reference_docname) - - if is_a_subscription(reference_doctype, reference_docname): - reference = frappe.get_doc(reference_doctype, reference_docname) - data = reference.create_subscription("mollie", gateway_controller, data) - else: - data = frappe.get_doc("Mollie Settings", gateway_controller).create_request(data) + + data = frappe.get_doc("Mollie Settings", gateway_controller).create_request(data) frappe.db.commit() return data - def is_a_subscription(reference_doctype, reference_docname): if not frappe.get_meta(reference_doctype).has_field("is_a_subscription"): return False From 26c57acd97bb93d06183e57c827e9f8845fa949d Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 23:15:55 +0800 Subject: [PATCH 071/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 023907fb..0280755b 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -98,6 +98,7 @@ def create_request(self, data): def create_charge_on_mollie(self): try: + mollie_client = Client() charge = mollie_client.payments.create( { "amount": {"currency": self.data.currency, "value": cint(flt(self.data.amount) * 100)}, From 15360e050f06f5a1e22ec2382c3614b8093eafeb Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 23:24:51 +0800 Subject: [PATCH 072/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 0280755b..ab106a6e 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -96,9 +96,8 @@ def create_request(self, data): "status": 401, } - def create_charge_on_mollie(self): + def create_charge_on_mollie(self, api, mollie_client): try: - mollie_client = Client() charge = mollie_client.payments.create( { "amount": {"currency": self.data.currency, "value": cint(flt(self.data.amount) * 100)}, From e31bca43258e7d74cb56e9e5c06d6b41931a39bb Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 23:32:34 +0800 Subject: [PATCH 073/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index ab106a6e..2ecfb479 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -8,6 +8,7 @@ from payments.utils import create_payment_gateway from mollie.api.client import Client +mollie_client = Client() class MollieSettings(Document): supported_currencies = [ @@ -77,7 +78,6 @@ def get_payment_url(self, **kwargs): def create_request(self, data): self.data = frappe._dict(data) - mollie_client = Client() api = mollie_client.set_api_key(self.get_password(fieldname="secret_key", raise_exception=False)) try: @@ -96,7 +96,7 @@ def create_request(self, data): "status": 401, } - def create_charge_on_mollie(self, api, mollie_client): + def create_charge_on_mollie(self): try: charge = mollie_client.payments.create( { From 06bdd26540557ca533864c252bccabd37adce142 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 23:39:41 +0800 Subject: [PATCH 074/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 2ecfb479..418030ab 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -98,6 +98,8 @@ def create_request(self, data): def create_charge_on_mollie(self): try: + frappe.log_error(self.data.amount) + frappe.log_error(cint(flt(self.data.amount))) charge = mollie_client.payments.create( { "amount": {"currency": self.data.currency, "value": cint(flt(self.data.amount) * 100)}, From 62d8c61986634ca4aeaba007687564257a8ba314 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 23:43:05 +0800 Subject: [PATCH 075/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 418030ab..2ecfb479 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -98,8 +98,6 @@ def create_request(self, data): def create_charge_on_mollie(self): try: - frappe.log_error(self.data.amount) - frappe.log_error(cint(flt(self.data.amount))) charge = mollie_client.payments.create( { "amount": {"currency": self.data.currency, "value": cint(flt(self.data.amount) * 100)}, From 4f9ee99609ba09af8ca04ded7644becd42c919f9 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Wed, 7 Feb 2024 23:56:00 +0800 Subject: [PATCH 076/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 2ecfb479..31698b55 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -100,7 +100,7 @@ def create_charge_on_mollie(self): try: charge = mollie_client.payments.create( { - "amount": {"currency": self.data.currency, "value": cint(flt(self.data.amount) * 100)}, + "amount": {"currency": self.data.currency, "value": '10.00'}, "description": self.data.description, "billingEmail": self.data.payer_email, } From 1cd09403c2a0ca0fad28c042dba56b6fa2370801 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 00:06:48 +0800 Subject: [PATCH 077/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 31698b55..3134e38f 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -100,7 +100,7 @@ def create_charge_on_mollie(self): try: charge = mollie_client.payments.create( { - "amount": {"currency": self.data.currency, "value": '10.00'}, + "amount": {"currency": self.data.currency, "value": cint(flt(self.data.amount) * 100}, "description": self.data.description, "billingEmail": self.data.payer_email, } From 7524dc2750a1e03169baadc2f2999385ca53eba5 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 13:31:56 +0800 Subject: [PATCH 078/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 3134e38f..482a4762 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -100,7 +100,10 @@ def create_charge_on_mollie(self): try: charge = mollie_client.payments.create( { - "amount": {"currency": self.data.currency, "value": cint(flt(self.data.amount) * 100}, + "amount": { + "currency": self.data.currency, + "value": cint(flt(self.data.amount) * 100), + }, "description": self.data.description, "billingEmail": self.data.payer_email, } From cb7d8482b5c4d6e3f62377851e9c903aaa9a0d0d Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 13:34:14 +0800 Subject: [PATCH 079/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 482a4762..57abd752 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -109,7 +109,7 @@ def create_charge_on_mollie(self): } ) - if charge.captured == True: + if charge.is_paid():: self.integration_request.db_set("status", "Completed", update_modified=False) self.flags.status_changed_to = "Completed" From 09f48683999909263f51495c6600ece825556bba Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 13:39:32 +0800 Subject: [PATCH 080/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 57abd752..93a4096a 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -100,9 +100,9 @@ def create_charge_on_mollie(self): try: charge = mollie_client.payments.create( { - "amount": { - "currency": self.data.currency, - "value": cint(flt(self.data.amount) * 100), + 'amount': { + 'currency': self.data.currency, + 'value': cint(flt(self.data.amount) * 100), }, "description": self.data.description, "billingEmail": self.data.payer_email, From e36c181ba549234889e2c8d68c26ec2b7e40e8c8 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 13:43:29 +0800 Subject: [PATCH 081/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 93a4096a..675ba6bc 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -109,7 +109,7 @@ def create_charge_on_mollie(self): } ) - if charge.is_paid():: + if charge.is_paid(): self.integration_request.db_set("status", "Completed", update_modified=False) self.flags.status_changed_to = "Completed" From 06ff6952e5859a0b4d2b9904d9f77ec34c378514 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 13:49:22 +0800 Subject: [PATCH 082/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 675ba6bc..ec73c38e 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -102,7 +102,7 @@ def create_charge_on_mollie(self): { 'amount': { 'currency': self.data.currency, - 'value': cint(flt(self.data.amount) * 100), + 'value': cint(flt(self.data.amount) * 100) }, "description": self.data.description, "billingEmail": self.data.payer_email, From aa29d712164cd60ddfdec5853cfb3f1668a582dc Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 13:49:49 +0800 Subject: [PATCH 083/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index ec73c38e..702f8fcb 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -102,7 +102,7 @@ def create_charge_on_mollie(self): { 'amount': { 'currency': self.data.currency, - 'value': cint(flt(self.data.amount) * 100) + 'value': '10.00' }, "description": self.data.description, "billingEmail": self.data.payer_email, From e1aa98675efe725059b4f398b9127cc381f5b3d7 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 13:54:24 +0800 Subject: [PATCH 084/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 1 - 1 file changed, 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 702f8fcb..bfa38e07 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -105,7 +105,6 @@ def create_charge_on_mollie(self): 'value': '10.00' }, "description": self.data.description, - "billingEmail": self.data.payer_email, } ) From 141c7556de61b743321800025adbdac26b2d055a Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 13:59:01 +0800 Subject: [PATCH 085/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index bfa38e07..1021350b 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -105,6 +105,7 @@ def create_charge_on_mollie(self): 'value': '10.00' }, "description": self.data.description, + 'redirectUrl': self.finalize_request(), } ) From bc491bdb374482fdcf2d7905e0ead6da509e2e30 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 14:04:20 +0800 Subject: [PATCH 086/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index d213e407..c2a5b9fa 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -78,8 +78,3 @@ def make_payment(data, reference_doctype, reference_docname): frappe.db.commit() return data - -def is_a_subscription(reference_doctype, reference_docname): - if not frappe.get_meta(reference_doctype).has_field("is_a_subscription"): - return False - return frappe.db.get_value(reference_doctype, reference_docname, "is_a_subscription") From 4278b7258b950196604ec2564833b3101800c317 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 14:05:55 +0800 Subject: [PATCH 087/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 1021350b..262a5110 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -98,6 +98,7 @@ def create_request(self, data): def create_charge_on_mollie(self): try: + redirectUrl = self.finalize_request() charge = mollie_client.payments.create( { 'amount': { @@ -105,7 +106,7 @@ def create_charge_on_mollie(self): 'value': '10.00' }, "description": self.data.description, - 'redirectUrl': self.finalize_request(), + 'redirectUrl': redirectUrl, } ) From 36b5ca934a60fe3b4ec96600e4ec10c457d7b80c Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 14:10:44 +0800 Subject: [PATCH 088/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index c2a5b9fa..754523a9 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -37,15 +37,6 @@ def get_context(context): context["amount"] = fmt_money(amount=context["amount"], currency=context["currency"]) - if is_a_subscription(context.reference_doctype, context.reference_docname): - payment_plan = frappe.db.get_value( - context.reference_doctype, context.reference_docname, "payment_plan" - ) - recurrence = frappe.db.get_value("Payment Plan", payment_plan, "recurrence") - - context["amount"] = context["amount"] + " " + _(recurrence) - - else: frappe.redirect_to_message( _("Some information is missing"), _("Looks like someone sent you to an incomplete URL. Please ask them to look into it."), From 804597181442c0cad79a96ba1e4c2a3c3bae9c59 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 14:14:33 +0800 Subject: [PATCH 089/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 1 + 1 file changed, 1 insertion(+) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 754523a9..2dab8c25 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -37,6 +37,7 @@ def get_context(context): context["amount"] = fmt_money(amount=context["amount"], currency=context["currency"]) + else: frappe.redirect_to_message( _("Some information is missing"), _("Looks like someone sent you to an incomplete URL. Please ask them to look into it."), From b6f0fde50ce747afe90029701900c28d8bb84beb Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 14:20:11 +0800 Subject: [PATCH 090/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 262a5110..d13da0af 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -98,7 +98,9 @@ def create_request(self, data): def create_charge_on_mollie(self): try: - redirectUrl = self.finalize_request() + url = self.finalize_request() + redirectUrl = url.redirect_to + charge = mollie_client.payments.create( { 'amount': { From f15aa7d08804c64e9a31367d334f97e56ada6faa Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 14:25:07 +0800 Subject: [PATCH 091/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index d13da0af..47b5a11e 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -98,8 +98,7 @@ def create_request(self, data): def create_charge_on_mollie(self): try: - url = self.finalize_request() - redirectUrl = url.redirect_to + redirectUrl = self.finalize_request() charge = mollie_client.payments.create( { @@ -108,7 +107,7 @@ def create_charge_on_mollie(self): 'value': '10.00' }, "description": self.data.description, - 'redirectUrl': redirectUrl, + 'redirectUrl': redirectUrl['redirect_to'], } ) From 94c985b8a499b10c6f7a9c470d1caa7b2055bec3 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 14:34:27 +0800 Subject: [PATCH 092/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 47b5a11e..19eaa0f7 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -98,8 +98,6 @@ def create_request(self, data): def create_charge_on_mollie(self): try: - redirectUrl = self.finalize_request() - charge = mollie_client.payments.create( { 'amount': { @@ -107,7 +105,7 @@ def create_charge_on_mollie(self): 'value': '10.00' }, "description": self.data.description, - 'redirectUrl': redirectUrl['redirect_to'], + 'redirectUrl': self.data.get("redirect_to"), } ) From 3016852f679f1881a286d159574265fe44d39ce9 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 14:40:06 +0800 Subject: [PATCH 093/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 19eaa0f7..88fd5179 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -114,7 +114,7 @@ def create_charge_on_mollie(self): self.flags.status_changed_to = "Completed" else: - frappe.log_error(charge.failure_message, "Mollie Payment not completed") + frappe.log_error(charge.detail, "Mollie Payment not completed") except Exception: frappe.log_error(frappe.get_traceback()) From b27998a58c462fdadfed9053428499b1c32b2e73 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 14:50:11 +0800 Subject: [PATCH 094/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 88fd5179..1ad5596c 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -7,8 +7,10 @@ from frappe.utils import call_hook_method, cint, flt, get_url from payments.utils import create_payment_gateway from mollie.api.client import Client +from mollie.api.error import Error mollie_client = Client() +mollie_error = Error() class MollieSettings(Document): supported_currencies = [ @@ -114,9 +116,10 @@ def create_charge_on_mollie(self): self.flags.status_changed_to = "Completed" else: - frappe.log_error(charge.detail, "Mollie Payment not completed") + frappe.log_error(mollie_error, "Mollie Payment not completed") except Exception: + frappe.log_error(mollie_error) frappe.log_error(frappe.get_traceback()) return self.finalize_request() From 8e52c6299e392d5cf3bab653f52a696876628bec Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 14:53:44 +0800 Subject: [PATCH 095/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 1ad5596c..a126b12f 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -115,9 +115,6 @@ def create_charge_on_mollie(self): self.integration_request.db_set("status", "Completed", update_modified=False) self.flags.status_changed_to = "Completed" - else: - frappe.log_error(mollie_error, "Mollie Payment not completed") - except Exception: frappe.log_error(mollie_error) frappe.log_error(frappe.get_traceback()) From 66ecffa5f2eee3ea9ae5646948876d1c49b750fb Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 15:00:24 +0800 Subject: [PATCH 096/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 2dab8c25..925f123d 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -40,7 +40,7 @@ def get_context(context): else: frappe.redirect_to_message( _("Some information is missing"), - _("Looks like someone sent you to an incomplete URL. Please ask them to look into it."), + _("Looks like someone sent you to an incomplete URL. Please ask them to look into it." expected_keys), ) frappe.local.flags.redirect_location = frappe.local.response.location raise frappe.Redirect From 481e84ca18c136d976130c6fab55cf5ab7bf92b2 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 15:03:53 +0800 Subject: [PATCH 097/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 925f123d..e7ddf571 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -40,7 +40,7 @@ def get_context(context): else: frappe.redirect_to_message( _("Some information is missing"), - _("Looks like someone sent you to an incomplete URL. Please ask them to look into it." expected_keys), + _("Looks like someone sent you to an incomplete URL. Please ask them to look into it." frappe.form_dict), ) frappe.local.flags.redirect_location = frappe.local.response.location raise frappe.Redirect From a86ecd466fa37d74f2e3aed1445afc143136c1e3 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 15:08:18 +0800 Subject: [PATCH 098/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index e7ddf571..b56cdad0 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -40,8 +40,9 @@ def get_context(context): else: frappe.redirect_to_message( _("Some information is missing"), - _("Looks like someone sent you to an incomplete URL. Please ask them to look into it." frappe.form_dict), + _("Looks like someone sent you to an incomplete URL. Please ask them to look into it."), ) + frappe.log_error(frappe.form_dict, "Mollie Payment not completed") frappe.local.flags.redirect_location = frappe.local.response.location raise frappe.Redirect From 54b2b67d472441c2d3a7caf0cf6d853ce26dcb6d Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 15:20:27 +0800 Subject: [PATCH 099/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index b56cdad0..e8622c0e 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -38,13 +38,8 @@ def get_context(context): context["amount"] = fmt_money(amount=context["amount"], currency=context["currency"]) else: - frappe.redirect_to_message( - _("Some information is missing"), - _("Looks like someone sent you to an incomplete URL. Please ask them to look into it."), - ) frappe.log_error(frappe.form_dict, "Mollie Payment not completed") - frappe.local.flags.redirect_location = frappe.local.response.location - raise frappe.Redirect + def get_api_key(doc, gateway_controller): From 0a5f365175c17a571b838f4b64ea5c27ecf68fb1 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 15:26:35 +0800 Subject: [PATCH 100/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index e8622c0e..1bd728e5 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -38,7 +38,12 @@ def get_context(context): context["amount"] = fmt_money(amount=context["amount"], currency=context["currency"]) else: - frappe.log_error(frappe.form_dict, "Mollie Payment not completed") + frappe.redirect_to_message( + _("Some information is missing"), + frappe.form_dict, + ) + frappe.local.flags.redirect_location = frappe.local.response.location + raise frappe.Redirect From 56f4e611d9ae9703cd3e66c686f61b8014e80137 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 15:29:45 +0800 Subject: [PATCH 101/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 1bd728e5..7722ed19 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -40,7 +40,7 @@ def get_context(context): else: frappe.redirect_to_message( _("Some information is missing"), - frappe.form_dict, + _("Looks like someone sent you to an incomplete URL. Please ask them to look into it."), ) frappe.local.flags.redirect_location = frappe.local.response.location raise frappe.Redirect From 378cde350f06a10bac2cfd0e32e3dd77d5cb023f Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 15:31:39 +0800 Subject: [PATCH 102/284] Update mollie_checkout.html --- payments/templates/pages/mollie_checkout.html | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.html b/payments/templates/pages/mollie_checkout.html index 65bd568b..5d1202e6 100644 --- a/payments/templates/pages/mollie_checkout.html +++ b/payments/templates/pages/mollie_checkout.html @@ -21,12 +21,6 @@

{{description}}

-
- -
@@ -36,14 +30,6 @@

{{description}}

-
- -
-
From b1aba618d2d68a62c4130ffa50eb65f867eabe27 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 15:53:56 +0800 Subject: [PATCH 103/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 1 + 1 file changed, 1 insertion(+) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 7722ed19..bf22223b 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -38,6 +38,7 @@ def get_context(context): context["amount"] = fmt_money(amount=context["amount"], currency=context["currency"]) else: + frappe.log_error(frappe.form_dict, "Data is missing") frappe.redirect_to_message( _("Some information is missing"), _("Looks like someone sent you to an incomplete URL. Please ask them to look into it."), From 90986b009b71ea8463aa6775d46f6da1cdf0ad65 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 15:54:20 +0800 Subject: [PATCH 104/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index bf22223b..f8c3596c 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -38,7 +38,7 @@ def get_context(context): context["amount"] = fmt_money(amount=context["amount"], currency=context["currency"]) else: - frappe.log_error(frappe.form_dict, "Data is missing") + frappe.log_error(frappe.form_dict, "Data to complete the payment is missing") frappe.redirect_to_message( _("Some information is missing"), _("Looks like someone sent you to an incomplete URL. Please ask them to look into it."), From 3cf32fa14d896aa773b3b91d95198dbfe0eed955 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 16:00:19 +0800 Subject: [PATCH 105/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 1 + 1 file changed, 1 insertion(+) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index f8c3596c..095cf55d 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -39,6 +39,7 @@ def get_context(context): else: frappe.log_error(frappe.form_dict, "Data to complete the payment is missing") + frappe.log_error(expected_keys, "Data to complete the payment is missing") frappe.redirect_to_message( _("Some information is missing"), _("Looks like someone sent you to an incomplete URL. Please ask them to look into it."), From dd34dbed336e96886f66d649859c2edd5f458e57 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 16:04:28 +0800 Subject: [PATCH 106/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 1 - 1 file changed, 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 095cf55d..3b77d44b 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -38,7 +38,6 @@ def get_context(context): context["amount"] = fmt_money(amount=context["amount"], currency=context["currency"]) else: - frappe.log_error(frappe.form_dict, "Data to complete the payment is missing") frappe.log_error(expected_keys, "Data to complete the payment is missing") frappe.redirect_to_message( _("Some information is missing"), From 062722b5bd0bd151f46eee96a8e1e176ff776e18 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 16:08:41 +0800 Subject: [PATCH 107/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 3b77d44b..66fbcad1 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -38,7 +38,7 @@ def get_context(context): context["amount"] = fmt_money(amount=context["amount"], currency=context["currency"]) else: - frappe.log_error(expected_keys, "Data to complete the payment is missing") + frappe.log_error(set(expected_keys), "Data to complete the payment is missing") frappe.redirect_to_message( _("Some information is missing"), _("Looks like someone sent you to an incomplete URL. Please ask them to look into it."), From ce9536629a2d6c0b474290cf88626b65f1ef9392 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 16:18:03 +0800 Subject: [PATCH 108/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 66fbcad1..45b2ca6d 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -38,7 +38,7 @@ def get_context(context): context["amount"] = fmt_money(amount=context["amount"], currency=context["currency"]) else: - frappe.log_error(set(expected_keys), "Data to complete the payment is missing") + frappe.log_error(array(expected_keys), "Data to complete the payment is missing") frappe.redirect_to_message( _("Some information is missing"), _("Looks like someone sent you to an incomplete URL. Please ask them to look into it."), From cc2fc47c02e4224920d776ac186cb4f88075d0f2 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 16:22:02 +0800 Subject: [PATCH 109/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 45b2ca6d..6caa8447 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -38,7 +38,7 @@ def get_context(context): context["amount"] = fmt_money(amount=context["amount"], currency=context["currency"]) else: - frappe.log_error(array(expected_keys), "Data to complete the payment is missing") + frappe.log_error(print(expected_keys), "Data to complete the payment is missing") frappe.redirect_to_message( _("Some information is missing"), _("Looks like someone sent you to an incomplete URL. Please ask them to look into it."), From 46cb43948e949ad381dc153954954fc5f02d6745 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 16:25:18 +0800 Subject: [PATCH 110/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 1 - 1 file changed, 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 6caa8447..7722ed19 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -38,7 +38,6 @@ def get_context(context): context["amount"] = fmt_money(amount=context["amount"], currency=context["currency"]) else: - frappe.log_error(print(expected_keys), "Data to complete the payment is missing") frappe.redirect_to_message( _("Some information is missing"), _("Looks like someone sent you to an incomplete URL. Please ask them to look into it."), From 9c135ca22556a08c32c749d93120b6f8368661c4 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 16:31:48 +0800 Subject: [PATCH 111/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 7722ed19..3a10689c 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -38,6 +38,13 @@ def get_context(context): context["amount"] = fmt_money(amount=context["amount"], currency=context["currency"]) else: + if expected_keys is not None + for key in expected_keys: + frappe.log_error(key, "Data to complete the payment is missing") + else: + frappe.log_error("no expected keys", "Data to complete the payment is missing") + + frappe.redirect_to_message( _("Some information is missing"), _("Looks like someone sent you to an incomplete URL. Please ask them to look into it."), From 887ec3abd05b718a7fe3e49c6a00002a1f4d5190 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 16:34:47 +0800 Subject: [PATCH 112/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 3a10689c..70e8dff0 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -38,7 +38,7 @@ def get_context(context): context["amount"] = fmt_money(amount=context["amount"], currency=context["currency"]) else: - if expected_keys is not None + if expected_keys is not None: for key in expected_keys: frappe.log_error(key, "Data to complete the payment is missing") else: From c37f4ed2bb3ae9267a38554c33dd9d6cf3f5059a Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 16:51:04 +0800 Subject: [PATCH 113/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 70e8dff0..f8c3596c 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -38,13 +38,7 @@ def get_context(context): context["amount"] = fmt_money(amount=context["amount"], currency=context["currency"]) else: - if expected_keys is not None: - for key in expected_keys: - frappe.log_error(key, "Data to complete the payment is missing") - else: - frappe.log_error("no expected keys", "Data to complete the payment is missing") - - + frappe.log_error(frappe.form_dict, "Data to complete the payment is missing") frappe.redirect_to_message( _("Some information is missing"), _("Looks like someone sent you to an incomplete URL. Please ask them to look into it."), From 01ed180a0a5fcc8a71de2258f94b4f3a5c360f85 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 16:59:46 +0800 Subject: [PATCH 114/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index a126b12f..abd71121 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -114,6 +114,8 @@ def create_charge_on_mollie(self): if charge.is_paid(): self.integration_request.db_set("status", "Completed", update_modified=False) self.flags.status_changed_to = "Completed" + else: + frappe.log_error("Stripe Payment not completed") except Exception: frappe.log_error(mollie_error) From e5356b302fd5f3b235114753af8f80f3a23fb21c Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 17:03:32 +0800 Subject: [PATCH 115/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index abd71121..3002f459 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -115,7 +115,7 @@ def create_charge_on_mollie(self): self.integration_request.db_set("status", "Completed", update_modified=False) self.flags.status_changed_to = "Completed" else: - frappe.log_error("Stripe Payment not completed") + frappe.log_error("Mollie Payment not completed") except Exception: frappe.log_error(mollie_error) From bddec31104812b6d90c2fa9bddcb3b5e310bb1aa Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 18:14:52 +0800 Subject: [PATCH 116/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 3002f459..0e691060 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -115,7 +115,7 @@ def create_charge_on_mollie(self): self.integration_request.db_set("status", "Completed", update_modified=False) self.flags.status_changed_to = "Completed" else: - frappe.log_error("Mollie Payment not completed") + frappe.log_error(charge.status, "Mollie Payment not completed") except Exception: frappe.log_error(mollie_error) From c6d7a27f55747b367487ed6cf2a1c58c79d340b9 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 18:20:49 +0800 Subject: [PATCH 117/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 0e691060..c5562b7b 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -115,7 +115,7 @@ def create_charge_on_mollie(self): self.integration_request.db_set("status", "Completed", update_modified=False) self.flags.status_changed_to = "Completed" else: - frappe.log_error(charge.status, "Mollie Payment not completed") + frappe.log_error("Mollie Payment not completed", "status: " charge.status) except Exception: frappe.log_error(mollie_error) From e825b5fb34b2dbc8797daf5629e01499a57e4675 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 18:23:05 +0800 Subject: [PATCH 118/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index c5562b7b..5110c7b6 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -115,7 +115,7 @@ def create_charge_on_mollie(self): self.integration_request.db_set("status", "Completed", update_modified=False) self.flags.status_changed_to = "Completed" else: - frappe.log_error("Mollie Payment not completed", "status: " charge.status) + frappe.log_error("Mollie Payment not completed", "status: {err}" charge.status ) except Exception: frappe.log_error(mollie_error) From b463807adc5e890e0a131f6e1a0874335a20a878 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 18:23:56 +0800 Subject: [PATCH 119/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 5110c7b6..4448c170 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -115,7 +115,7 @@ def create_charge_on_mollie(self): self.integration_request.db_set("status", "Completed", update_modified=False) self.flags.status_changed_to = "Completed" else: - frappe.log_error("Mollie Payment not completed", "status: {err}" charge.status ) + frappe.log_error("Mollie Payment not completed", "status: {err}") except Exception: frappe.log_error(mollie_error) From c56718231e2bba14f437b196557100dcba616be6 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 18:28:00 +0800 Subject: [PATCH 120/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 4448c170..34406fbd 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -115,7 +115,7 @@ def create_charge_on_mollie(self): self.integration_request.db_set("status", "Completed", update_modified=False) self.flags.status_changed_to = "Completed" else: - frappe.log_error("Mollie Payment not completed", "status: {err}") + frappe.log_error("Mollie Payment not completed", "status: {Error}") except Exception: frappe.log_error(mollie_error) From 38f94ef91da69f201ac492f703056b5cf994bccd Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 18:30:59 +0800 Subject: [PATCH 121/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 34406fbd..493c31a2 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -115,7 +115,7 @@ def create_charge_on_mollie(self): self.integration_request.db_set("status", "Completed", update_modified=False) self.flags.status_changed_to = "Completed" else: - frappe.log_error("Mollie Payment not completed", "status: {Error}") + frappe.log_error("Mollie Payment not completed", charge.status) except Exception: frappe.log_error(mollie_error) From 0bfdf3127dec4f0ce88ce2e7f1cbb5c584d8a364 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 18:36:13 +0800 Subject: [PATCH 122/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index f8c3596c..eda1f6f5 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -38,7 +38,7 @@ def get_context(context): context["amount"] = fmt_money(amount=context["amount"], currency=context["currency"]) else: - frappe.log_error(frappe.form_dict, "Data to complete the payment is missing") + frappe.log_error("Data to complete the payment is missing", frappe.form_dict) frappe.redirect_to_message( _("Some information is missing"), _("Looks like someone sent you to an incomplete URL. Please ask them to look into it."), From 83c6e80c871417f7af4a4b3223c0e678e7cda89b Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 18:44:45 +0800 Subject: [PATCH 123/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 493c31a2..f2244206 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -115,7 +115,7 @@ def create_charge_on_mollie(self): self.integration_request.db_set("status", "Completed", update_modified=False) self.flags.status_changed_to = "Completed" else: - frappe.log_error("Mollie Payment not completed", charge.status) + frappe.log_error("Mollie Payment not completed", charge.id) except Exception: frappe.log_error(mollie_error) From 8d459d41ccad1f3b27f0a1f3d9a2001aca42d390 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 18:56:32 +0800 Subject: [PATCH 124/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index f2244206..493c31a2 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -115,7 +115,7 @@ def create_charge_on_mollie(self): self.integration_request.db_set("status", "Completed", update_modified=False) self.flags.status_changed_to = "Completed" else: - frappe.log_error("Mollie Payment not completed", charge.id) + frappe.log_error("Mollie Payment not completed", charge.status) except Exception: frappe.log_error(mollie_error) From ff21bf760f2da7d4ea0d6fcfe7387c69cd611959 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 19:41:32 +0800 Subject: [PATCH 125/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 493c31a2..2152782c 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -76,7 +76,7 @@ def validate_transaction_currency(self, currency): ) def get_payment_url(self, **kwargs): - return get_url(f"mollie_checkout?{urlencode(kwargs)}") + return get_url(f"home") def create_request(self, data): self.data = frappe._dict(data) From 4d2bb52391debab762f1e5c3a3a865a3289ff643 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 19:46:45 +0800 Subject: [PATCH 126/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 2152782c..493c31a2 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -76,7 +76,7 @@ def validate_transaction_currency(self, currency): ) def get_payment_url(self, **kwargs): - return get_url(f"home") + return get_url(f"mollie_checkout?{urlencode(kwargs)}") def create_request(self, data): self.data = frappe._dict(data) From d116eee718efeae07b5384fc1fbc222a8f667bd6 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 19:57:32 +0800 Subject: [PATCH 127/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 3b676ac9..9af7b259 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -15,11 +15,18 @@ $(document).ready(function() { "reference_docname": docname }, callback: function(r){ - if (r.message && r.message.status == 200) { - window.location.href = r.message.redirect_to - } - else if (r.message && ([401,400,500].indexOf(r.message.status) > -1)) { - window.location.href = r.message.redirect_to + if (r.message.status == "Completed") { + $('#submit').hide() + $('.success').show() + setTimeout(function() { + window.location.href = r.message.redirect_to + }, 2000); + } else { + $('#submit').hide() + $('.error').show() + setTimeout(function() { + window.location.href = r.message.redirect_to + }, 2000); } } }) From 8d66ba1c3ab07becbc7b3790dd814fbd7991e009 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 20:37:22 +0800 Subject: [PATCH 128/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index eda1f6f5..6f6a367d 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -67,8 +67,8 @@ def make_payment(data, reference_doctype, reference_docname): data = json.loads(data) gateway_controller = get_gateway_controller(reference_doctype, reference_docname) - + frappe.log_error("voor", data) data = frappe.get_doc("Mollie Settings", gateway_controller).create_request(data) - + frappe.log_error("na", data) frappe.db.commit() return data From 67c6ed5cad00c42e5bd745f05f8dd77c455641bc Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 20:42:19 +0800 Subject: [PATCH 129/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 6f6a367d..84abb2eb 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -67,8 +67,6 @@ def make_payment(data, reference_doctype, reference_docname): data = json.loads(data) gateway_controller = get_gateway_controller(reference_doctype, reference_docname) - frappe.log_error("voor", data) data = frappe.get_doc("Mollie Settings", gateway_controller).create_request(data) - frappe.log_error("na", data) frappe.db.commit() return data From 02d6467368fe82af2269658bbe5275ecc3609172 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 20:49:12 +0800 Subject: [PATCH 130/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 9af7b259..07ac8149 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -25,7 +25,7 @@ $(document).ready(function() { $('#submit').hide() $('.error').show() setTimeout(function() { - window.location.href = r.message.redirect_to + frappe.log_error("Not paid") }, 2000); } } From 8728236bac1d4e845c4e04d3ee899d4c3327eb09 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 20:52:53 +0800 Subject: [PATCH 131/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 07ac8149..58923961 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -21,13 +21,7 @@ $(document).ready(function() { setTimeout(function() { window.location.href = r.message.redirect_to }, 2000); - } else { - $('#submit').hide() - $('.error').show() - setTimeout(function() { - frappe.log_error("Not paid") - }, 2000); - } + } } }) From 0314fb6701e0657f9d560b882d390e4256c58c8d Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 20:56:03 +0800 Subject: [PATCH 132/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 58923961..3b676ac9 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -15,13 +15,12 @@ $(document).ready(function() { "reference_docname": docname }, callback: function(r){ - if (r.message.status == "Completed") { - $('#submit').hide() - $('.success').show() - setTimeout(function() { - window.location.href = r.message.redirect_to - }, 2000); - } + if (r.message && r.message.status == 200) { + window.location.href = r.message.redirect_to + } + else if (r.message && ([401,400,500].indexOf(r.message.status) > -1)) { + window.location.href = r.message.redirect_to + } } }) From 2631f21eab46fade82821756a62f66d1010cf2a7 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 21:10:59 +0800 Subject: [PATCH 133/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 493c31a2..efd1a781 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -104,7 +104,7 @@ def create_charge_on_mollie(self): { 'amount': { 'currency': self.data.currency, - 'value': '10.00' + 'value': '20.00' }, "description": self.data.description, 'redirectUrl': self.data.get("redirect_to"), From b00ff42140a81889a7c21026e4196fbdf76a2175 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 21:20:16 +0800 Subject: [PATCH 134/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index efd1a781..493c31a2 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -104,7 +104,7 @@ def create_charge_on_mollie(self): { 'amount': { 'currency': self.data.currency, - 'value': '20.00' + 'value': '10.00' }, "description": self.data.description, 'redirectUrl': self.data.get("redirect_to"), From a827aafdb6d6bc26bd6a3b21bfeb282225862dfb Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 21:21:19 +0800 Subject: [PATCH 135/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 3b676ac9..53cbce47 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -15,12 +15,18 @@ $(document).ready(function() { "reference_docname": docname }, callback: function(r){ - if (r.message && r.message.status == 200) { - window.location.href = r.message.redirect_to - } - else if (r.message && ([401,400,500].indexOf(r.message.status) > -1)) { - window.location.href = r.message.redirect_to - } + if (r.message.status == "Completed") { + $('#submit').hide() + $('.success').show() + setTimeout(function() { + window.location.href = r.message.redirect_to + }, 2000); + } else { + $('#submit').hide() + $('.error').show() + setTimeout(function() { + frappe.log_error("Niet betaald") + }, 2000); } }) From 323940d032eda856c152d3707b9c13a2375f8c62 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 21:21:59 +0800 Subject: [PATCH 136/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 84abb2eb..97147921 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -65,8 +65,10 @@ def get_header_image(doc, gateway_controller): @frappe.whitelist(allow_guest=True) def make_payment(data, reference_doctype, reference_docname): data = json.loads(data) - + gateway_controller = get_gateway_controller(reference_doctype, reference_docname) + frappe.log_error("voor", data) data = frappe.get_doc("Mollie Settings", gateway_controller).create_request(data) + frappe.log_error("na", data) frappe.db.commit() return data From 8447775ae2c6c4cc257e13e90a8d82043cf2ba6d Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 21:33:28 +0800 Subject: [PATCH 137/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 53cbce47..fe65560b 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -27,7 +27,9 @@ $(document).ready(function() { setTimeout(function() { frappe.log_error("Niet betaald") }, 2000); + } } + }) }) From 8978c658b2b5b85178b78cef9b9feb53fdf8af9e Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 21:36:57 +0800 Subject: [PATCH 138/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index fe65560b..96ac33ca 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -24,9 +24,6 @@ $(document).ready(function() { } else { $('#submit').hide() $('.error').show() - setTimeout(function() { - frappe.log_error("Niet betaald") - }, 2000); } } From 4117ef547c8d97f3f07af5306067ddccbc93e998 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 21:37:20 +0800 Subject: [PATCH 139/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 96ac33ca..12a9ef2d 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -22,8 +22,6 @@ $(document).ready(function() { window.location.href = r.message.redirect_to }, 2000); } else { - $('#submit').hide() - $('.error').show() } } From e5210d6d2271bee315d7a70f4706069b5d5d802c Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 21:49:29 +0800 Subject: [PATCH 140/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 493c31a2..131d9658 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -121,7 +121,10 @@ def create_charge_on_mollie(self): frappe.log_error(mollie_error) frappe.log_error(frappe.get_traceback()) - return self.finalize_request() + data2 = self.finalize_request() + data2.update(paymentID=payment.id) + + return data2 def finalize_request(self): redirect_to = self.data.get("redirect_to") or None From e48902404c6b0dc5a3bc68438ab9ff9d90f6ecb2 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 21:52:32 +0800 Subject: [PATCH 141/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 131d9658..0bf78b85 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -122,7 +122,7 @@ def create_charge_on_mollie(self): frappe.log_error(frappe.get_traceback()) data2 = self.finalize_request() - data2.update(paymentID=payment.id) + data2.update(paymentID=charge.id) return data2 From 077321aea0c1c3a5050e0a36ded512260afe2e49 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:07:52 +0800 Subject: [PATCH 142/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 0bf78b85..0d04e61a 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -123,6 +123,7 @@ def create_charge_on_mollie(self): data2 = self.finalize_request() data2.update(paymentID=charge.id) + data2.update(paymentUrl=charge.checkout_url) return data2 From f82d14148bdffd8e9a43c38bd75e571bf043bf62 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:13:33 +0800 Subject: [PATCH 143/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 12a9ef2d..7e1c6d9a 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -22,6 +22,15 @@ $(document).ready(function() { window.location.href = r.message.redirect_to }, 2000); } else { + }, + if (r.message.paymentUrl) { + $('#submit').hide() + $('.success').show() + setTimeout(function() { + window.location.href = r.message.redirect_to + window.open("https://www.educative.io/", "_blank"); + }, 2000); + } else { } } From 8c3ffde7b8e7404fc0fbb7ae8e61ae86d5e13716 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:13:52 +0800 Subject: [PATCH 144/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 7e1c6d9a..558bcbce 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -28,7 +28,7 @@ $(document).ready(function() { $('.success').show() setTimeout(function() { window.location.href = r.message.redirect_to - window.open("https://www.educative.io/", "_blank"); + window.open(r.message.paymentUrl, "_blank"); }, 2000); } else { } From a39c21e0dda4310e6f970f6b5136a71f0f333118 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:14:24 +0800 Subject: [PATCH 145/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 1 - 1 file changed, 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 558bcbce..01bd6d5d 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -25,7 +25,6 @@ $(document).ready(function() { }, if (r.message.paymentUrl) { $('#submit').hide() - $('.success').show() setTimeout(function() { window.location.href = r.message.redirect_to window.open(r.message.paymentUrl, "_blank"); From a92c36a977033dbf564a3232f802b432fc56668a Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:19:11 +0800 Subject: [PATCH 146/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 01bd6d5d..2286b219 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -22,7 +22,7 @@ $(document).ready(function() { window.location.href = r.message.redirect_to }, 2000); } else { - }, + } if (r.message.paymentUrl) { $('#submit').hide() setTimeout(function() { From 2303129e9e4ba3053e758ab13ab9fbdba9ca4241 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:25:10 +0800 Subject: [PATCH 147/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 1 - 1 file changed, 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 2286b219..5baf4b78 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -26,7 +26,6 @@ $(document).ready(function() { if (r.message.paymentUrl) { $('#submit').hide() setTimeout(function() { - window.location.href = r.message.redirect_to window.open(r.message.paymentUrl, "_blank"); }, 2000); } else { From 25625a73b8f1d6f3f402dce31fe38e93c1852d18 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:32:38 +0800 Subject: [PATCH 148/284] Update mollie_checkout.html --- payments/templates/pages/mollie_checkout.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.html b/payments/templates/pages/mollie_checkout.html index 5d1202e6..61fdf8c9 100644 --- a/payments/templates/pages/mollie_checkout.html +++ b/payments/templates/pages/mollie_checkout.html @@ -32,10 +32,7 @@

{{description}}

-
- - -
+
From 9b285d2faaa7f269ffb25fda03a16f5c9e40b1b2 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:33:35 +0800 Subject: [PATCH 149/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 5baf4b78..2d142c8b 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -17,7 +17,7 @@ $(document).ready(function() { callback: function(r){ if (r.message.status == "Completed") { $('#submit').hide() - $('.success').show() + $('#processing').hide() setTimeout(function() { window.location.href = r.message.redirect_to }, 2000); @@ -25,6 +25,7 @@ $(document).ready(function() { } if (r.message.paymentUrl) { $('#submit').hide() + $('#processing').show() setTimeout(function() { window.open(r.message.paymentUrl, "_blank"); }, 2000); From 5e19aff7c1eb1b0acde94f757f9007610feca3b2 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:34:03 +0800 Subject: [PATCH 150/284] Update mollie_checkout.html --- payments/templates/pages/mollie_checkout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.html b/payments/templates/pages/mollie_checkout.html index 61fdf8c9..4e7fd8e0 100644 --- a/payments/templates/pages/mollie_checkout.html +++ b/payments/templates/pages/mollie_checkout.html @@ -32,7 +32,7 @@

{{description}}

- + From 2c1ec1029236e61d2419865a1d0a5ba09b4baf5b Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:40:48 +0800 Subject: [PATCH 151/284] Update mollie_checkout.html --- payments/templates/pages/mollie_checkout.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.html b/payments/templates/pages/mollie_checkout.html index 4e7fd8e0..de21e413 100644 --- a/payments/templates/pages/mollie_checkout.html +++ b/payments/templates/pages/mollie_checkout.html @@ -25,8 +25,8 @@

{{description}}

From 7743f5401cee0d161011a6b6505a3a64f5544aa8 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:43:40 +0800 Subject: [PATCH 152/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 2d142c8b..b7b82586 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -1,4 +1,4 @@ -$(document).ready(function() { +$(document).addEventListener('submit', e => { var data = {{ frappe.form_dict | json }}; var doctype = "{{ reference_doctype }}" var docname = "{{ reference_docname }}" From 93f93a341d5afc3d65bf670f05303c4c72371dd0 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:45:05 +0800 Subject: [PATCH 153/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 1 + 1 file changed, 1 insertion(+) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index b7b82586..3f100c26 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -1,4 +1,5 @@ $(document).addEventListener('submit', e => { + e.preventDefault(); var data = {{ frappe.form_dict | json }}; var doctype = "{{ reference_doctype }}" var docname = "{{ reference_docname }}" From b7eee2cc0cb89dd81dacd7911500ea0a70fce616 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:48:15 +0800 Subject: [PATCH 154/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 3f100c26..70b72bf1 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -1,4 +1,4 @@ -$(document).addEventListener('submit', e => { +mollie.addEventListener('submit', e => { e.preventDefault(); var data = {{ frappe.form_dict | json }}; var doctype = "{{ reference_doctype }}" From 696dd62ec66985f6810d750ce7dd479b679ee2b1 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:51:55 +0800 Subject: [PATCH 155/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 70b72bf1..926f3f4e 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -1,4 +1,4 @@ -mollie.addEventListener('submit', e => { +addEventListener('submit', e => { e.preventDefault(); var data = {{ frappe.form_dict | json }}; var doctype = "{{ reference_doctype }}" From a1a01e2455d9a2342d99bdb9db81fe3cc6f5e7f3 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:54:45 +0800 Subject: [PATCH 156/284] Update mollie_checkout.js --- .../templates/includes/mollie_checkout.js | 74 ++++++++++--------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 926f3f4e..4a5a2bad 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -1,39 +1,41 @@ -addEventListener('submit', e => { - e.preventDefault(); - var data = {{ frappe.form_dict | json }}; - var doctype = "{{ reference_doctype }}" - var docname = "{{ reference_docname }}" - - frappe.call({ - method: "payments.templates.pages.mollie_checkout.make_payment", - freeze: true, - headers: { - "X-Requested-With": "XMLHttpRequest" - }, - args: { - "data": JSON.stringify(data), - "reference_doctype": doctype, - "reference_docname": docname - }, - callback: function(r){ - if (r.message.status == "Completed") { - $('#submit').hide() - $('#processing').hide() - setTimeout(function() { - window.location.href = r.message.redirect_to - }, 2000); - } else { +$(document).ready(function() { + var form = document.querySelector('#payment-form'); + form.addEventListener('submit', e => { + e.preventDefault(); + var data = {{ frappe.form_dict | json }}; + var doctype = "{{ reference_doctype }}" + var docname = "{{ reference_docname }}" + + frappe.call({ + method: "payments.templates.pages.mollie_checkout.make_payment", + freeze: true, + headers: { + "X-Requested-With": "XMLHttpRequest" + }, + args: { + "data": JSON.stringify(data), + "reference_doctype": doctype, + "reference_docname": docname + }, + callback: function(r){ + if (r.message.status == "Completed") { + $('#submit').hide() + $('#processing').hide() + setTimeout(function() { + window.location.href = r.message.redirect_to + }, 2000); + } else { + } + if (r.message.paymentUrl) { + $('#submit').hide() + $('#processing').show() + setTimeout(function() { + window.open(r.message.paymentUrl, "_blank"); + }, 2000); + } else { + } } - if (r.message.paymentUrl) { - $('#submit').hide() - $('#processing').show() - setTimeout(function() { - window.open(r.message.paymentUrl, "_blank"); - }, 2000); - } else { - } - } - + + }) }) - }) From ac625a9736109bc9880fff005d3ee5170a7ef011 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:55:29 +0800 Subject: [PATCH 157/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 4a5a2bad..baff6e05 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -31,7 +31,7 @@ $(document).ready(function() { $('#processing').show() setTimeout(function() { window.open(r.message.paymentUrl, "_blank"); - }, 2000); + }, 1000); } else { } } From a5a81546e052654dbdaac634ed6f654f3946b6db Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 22:58:34 +0800 Subject: [PATCH 158/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index baff6e05..716df1bc 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -28,7 +28,7 @@ $(document).ready(function() { } if (r.message.paymentUrl) { $('#submit').hide() - $('#processing').show() + $('#processing').css('visibility','visible'); setTimeout(function() { window.open(r.message.paymentUrl, "_blank"); }, 1000); From e11db092d98f06c0e675d5f2d3e655903897f22e Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 23:02:10 +0800 Subject: [PATCH 159/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 0d04e61a..23147799 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -114,8 +114,6 @@ def create_charge_on_mollie(self): if charge.is_paid(): self.integration_request.db_set("status", "Completed", update_modified=False) self.flags.status_changed_to = "Completed" - else: - frappe.log_error("Mollie Payment not completed", charge.status) except Exception: frappe.log_error(mollie_error) From 186f04c3de43187942af9b0ea0412ba515f180ce Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 23:28:37 +0800 Subject: [PATCH 160/284] Update mollie_checkout.js --- .../templates/includes/mollie_checkout.js | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 716df1bc..9fa6d7bf 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -1,41 +1,41 @@ $(document).ready(function() { var form = document.querySelector('#payment-form'); + var data = {{ frappe.form_dict | json }}; + var doctype = "{{ reference_doctype }}" + var docname = "{{ reference_docname }}" + frappe.call({ + method: "payments.templates.pages.mollie_checkout.make_payment", + freeze: true, + headers: { + "X-Requested-With": "XMLHttpRequest" + }, + args: { + "data": JSON.stringify(data), + "reference_doctype": doctype, + "reference_docname": docname + }, + callback: function(r){ + } + + }) + form.addEventListener('submit', e => { e.preventDefault(); - var data = {{ frappe.form_dict | json }}; - var doctype = "{{ reference_doctype }}" - var docname = "{{ reference_docname }}" - - frappe.call({ - method: "payments.templates.pages.mollie_checkout.make_payment", - freeze: true, - headers: { - "X-Requested-With": "XMLHttpRequest" - }, - args: { - "data": JSON.stringify(data), - "reference_doctype": doctype, - "reference_docname": docname - }, - callback: function(r){ - if (r.message.status == "Completed") { - $('#submit').hide() - $('#processing').hide() - setTimeout(function() { - window.location.href = r.message.redirect_to - }, 2000); - } else { - } - if (r.message.paymentUrl) { - $('#submit').hide() - $('#processing').css('visibility','visible'); - setTimeout(function() { - window.open(r.message.paymentUrl, "_blank"); - }, 1000); - } else { - } + if (r.message.status == "Completed") { + $('#submit').hide() + $('#processing').hide() + setTimeout(function() { + window.location.href = r.message.redirect_to + }, 2000); + } else { + } + if (r.message.paymentUrl) { + $('#submit').hide() + $('#processing').css('visibility','visible'); + setTimeout(function() { + window.open(r.message.paymentUrl, "_blank"); + }, 1000); + } else { } - - }) }) }) From 8996d0300fe1b9a3ea683ef493e570d99d168cb4 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 23:32:38 +0800 Subject: [PATCH 161/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 9fa6d7bf..162944c7 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -15,13 +15,14 @@ $(document).ready(function() { "reference_docname": docname }, callback: function(r){ + payment = r.message } }) form.addEventListener('submit', e => { e.preventDefault(); - if (r.message.status == "Completed") { + if (payment.status == "Completed") { $('#submit').hide() $('#processing').hide() setTimeout(function() { @@ -29,11 +30,11 @@ $(document).ready(function() { }, 2000); } else { } - if (r.message.paymentUrl) { + if (payment.paymentUrl) { $('#submit').hide() $('#processing').css('visibility','visible'); setTimeout(function() { - window.open(r.message.paymentUrl, "_blank"); + window.open(payment.paymentUrl, "_blank"); }, 1000); } else { } From 31cc727f1ea75d1a3c55ea302deeaaa6cad9a479 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 23:36:44 +0800 Subject: [PATCH 162/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 162944c7..fd50282e 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -24,15 +24,12 @@ $(document).ready(function() { e.preventDefault(); if (payment.status == "Completed") { $('#submit').hide() - $('#processing').hide() setTimeout(function() { window.location.href = r.message.redirect_to }, 2000); } else { } if (payment.paymentUrl) { - $('#submit').hide() - $('#processing').css('visibility','visible'); setTimeout(function() { window.open(payment.paymentUrl, "_blank"); }, 1000); From 7a1a01b0ccf2739d4f7c78efb45a99416d383207 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 23:37:28 +0800 Subject: [PATCH 163/284] Update mollie_checkout.html --- payments/templates/pages/mollie_checkout.html | 1 - 1 file changed, 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.html b/payments/templates/pages/mollie_checkout.html index de21e413..1df07268 100644 --- a/payments/templates/pages/mollie_checkout.html +++ b/payments/templates/pages/mollie_checkout.html @@ -32,7 +32,6 @@

{{description}}

- From 6848f3d649279d6816423a29240dbd8981c84610 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 23:40:19 +0800 Subject: [PATCH 164/284] Update mollie_checkout.html --- payments/templates/pages/mollie_checkout.html | 1 + 1 file changed, 1 insertion(+) diff --git a/payments/templates/pages/mollie_checkout.html b/payments/templates/pages/mollie_checkout.html index 1df07268..33230f22 100644 --- a/payments/templates/pages/mollie_checkout.html +++ b/payments/templates/pages/mollie_checkout.html @@ -27,6 +27,7 @@

{{description}}

From 993414cb6b0b21da2f92189f7f19c2560a33efa0 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 23:45:36 +0800 Subject: [PATCH 165/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 97147921..7015c55d 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -72,3 +72,20 @@ def make_payment(data, reference_doctype, reference_docname): frappe.log_error("na", data) frappe.db.commit() return data + + +def check_payment(paymentId) + try: + payment = mollie_client.payments.get(paymentId) + + if payment.is_paid(): + return "Paid" + elif payment.is_pending(): + return "Pending" + elif payment.is_open(): + return "Open" + else: + return "Cancelled" + + except Error as err: + return f"API call failed" From 6d4ac4ad9ca9394e784393a89b81cf207550ee49 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 23:46:26 +0800 Subject: [PATCH 166/284] Update mollie_checkout.html --- payments/templates/pages/mollie_checkout.html | 1 - 1 file changed, 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.html b/payments/templates/pages/mollie_checkout.html index 33230f22..86351556 100644 --- a/payments/templates/pages/mollie_checkout.html +++ b/payments/templates/pages/mollie_checkout.html @@ -26,7 +26,6 @@

{{description}}

From 3d139c4252a9e1dde8f3e79d81320a75324208bf Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 23:48:43 +0800 Subject: [PATCH 167/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 7015c55d..69725f59 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -74,7 +74,7 @@ def make_payment(data, reference_doctype, reference_docname): return data -def check_payment(paymentId) +def check_payment(paymentId): try: payment = mollie_client.payments.get(paymentId) From e84e7ac88c7b2ef8156292284c658d2c9e7daac0 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 23:52:15 +0800 Subject: [PATCH 168/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 69725f59..c84cd2ab 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -80,12 +80,12 @@ def check_payment(paymentId): if payment.is_paid(): return "Paid" - elif payment.is_pending(): - return "Pending" - elif payment.is_open(): - return "Open" - else: - return "Cancelled" + elif payment.is_pending(): + return "Pending" + elif payment.is_open(): + return "Open" + else: + return "Cancelled" except Error as err: return f"API call failed" From bc47fc994359f6e80a84021f203f33b04bacdf53 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 23:54:07 +0800 Subject: [PATCH 169/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index fd50282e..fec3b225 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -36,4 +36,21 @@ $(document).ready(function() { } else { } }) + + + var intervalId = window.setInterval(function(){ + frappe.call({ + method: "payments.templates.pages.mollie_checkout.check_payment", + freeze: true, + headers: { + "X-Requested-With": "XMLHttpRequest" + }, + args: { + "paymentID": payment.paymentID + }, + callback: function(r){ + + } + }) + }, 5000); }) From ac3a584f34af3a75e06be0843817af5befca9ae0 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 23:55:42 +0800 Subject: [PATCH 170/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index fec3b225..2df2a51c 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -49,7 +49,7 @@ $(document).ready(function() { "paymentID": payment.paymentID }, callback: function(r){ - + console.log(r.message) } }) }, 5000); From 85e0493a5d4f3bb054ace2539fba3758c52218f4 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 23:56:20 +0800 Subject: [PATCH 171/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index c84cd2ab..ca2b4cc7 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -74,9 +74,9 @@ def make_payment(data, reference_doctype, reference_docname): return data -def check_payment(paymentId): +def check_payment(paymentID): try: - payment = mollie_client.payments.get(paymentId) + payment = mollie_client.payments.get(paymentID) if payment.is_paid(): return "Paid" From 4942627575f7d85cc69051b3afc50036ceb46643 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Thu, 8 Feb 2024 23:58:21 +0800 Subject: [PATCH 172/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 1 + 1 file changed, 1 insertion(+) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index ca2b4cc7..d409a67a 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -74,6 +74,7 @@ def make_payment(data, reference_doctype, reference_docname): return data +@frappe.whitelist(allow_guest=True) def check_payment(paymentID): try: payment = mollie_client.payments.get(paymentID) From 3a14d9a5dfb5980dc9567bb72dbc238fbc883839 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 00:01:36 +0800 Subject: [PATCH 173/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index d409a67a..12f7c181 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -88,5 +88,5 @@ def check_payment(paymentID): else: return "Cancelled" - except Error as err: + except: return f"API call failed" From 66a40c2356e4b24d9c0ba612830e45942e28c821 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 00:12:48 +0800 Subject: [PATCH 174/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 12f7c181..e3266d7e 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -76,17 +76,7 @@ def make_payment(data, reference_doctype, reference_docname): @frappe.whitelist(allow_guest=True) def check_payment(paymentID): - try: - payment = mollie_client.payments.get(paymentID) - - if payment.is_paid(): - return "Paid" - elif payment.is_pending(): - return "Pending" - elif payment.is_open(): - return "Open" - else: - return "Cancelled" - - except: - return f"API call failed" + data = json.loads(data) + status = frappe.get_doc("Mollie Settings", gateway_controller).check_request2(data) + frappe.db.commit() + return status From 1939c8c7903769531541d2b2a0079f968cf13d8a Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 00:16:32 +0800 Subject: [PATCH 175/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index e3266d7e..80f5d786 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -79,4 +79,4 @@ def check_payment(paymentID): data = json.loads(data) status = frappe.get_doc("Mollie Settings", gateway_controller).check_request2(data) frappe.db.commit() - return status + return status From 601f8594693e1ffbda23c89500f7ccb0153cb01a Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 00:20:02 +0800 Subject: [PATCH 176/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 80f5d786..2ed7d7c5 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -75,7 +75,7 @@ def make_payment(data, reference_doctype, reference_docname): @frappe.whitelist(allow_guest=True) -def check_payment(paymentID): +def check_payment(data, paymentID): data = json.loads(data) status = frappe.get_doc("Mollie Settings", gateway_controller).check_request2(data) frappe.db.commit() From bb24fbd43f1e9315462e441b5979cc63718184e3 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 00:20:19 +0800 Subject: [PATCH 177/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 1 + 1 file changed, 1 insertion(+) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 2df2a51c..f6827cbf 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -46,6 +46,7 @@ $(document).ready(function() { "X-Requested-With": "XMLHttpRequest" }, args: { + "data": JSON.stringify(data), "paymentID": payment.paymentID }, callback: function(r){ From a86d73a5c1ac3a44289707fc49915c15387166c3 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 00:23:58 +0800 Subject: [PATCH 178/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 2ed7d7c5..a31a1034 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -75,8 +75,10 @@ def make_payment(data, reference_doctype, reference_docname): @frappe.whitelist(allow_guest=True) -def check_payment(data, paymentID): +def check_payment(data, paymentID, reference_doctype, reference_docname): data = json.loads(data) + + gateway_controller = get_gateway_controller(reference_doctype, reference_docname) status = frappe.get_doc("Mollie Settings", gateway_controller).check_request2(data) frappe.db.commit() return status From 33798c3e54b133cf8c65f11bd2c4ca94e94f6f1a Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 00:24:20 +0800 Subject: [PATCH 179/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index f6827cbf..c579682e 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -47,6 +47,8 @@ $(document).ready(function() { }, args: { "data": JSON.stringify(data), + "reference_doctype": doctype, + "reference_docname": docname, "paymentID": payment.paymentID }, callback: function(r){ From 60ea2e08b48c3a16a0d289bf8be2d56940c517aa Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 00:28:38 +0800 Subject: [PATCH 180/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 23147799..bfdddd2a 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -98,6 +98,23 @@ def create_request(self, data): "status": 401, } + def check_request2(self, data): + mollie_client.set_api_key(self.get_password(fieldname="secret_key", raise_exception=False)) + try: + payment = mollie_client.payments.get(paymentID) + + if payment.is_paid(): + return "Paid" + elif payment.is_pending(): + return "Pending" + elif payment.is_open(): + return "Open" + else: + return "Cancelled" + + except: + return f"API call failed" + def create_charge_on_mollie(self): try: charge = mollie_client.payments.create( From 78752d6fcde3904f3b064960683d3d5b2363cb1d Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 00:37:16 +0800 Subject: [PATCH 181/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index bfdddd2a..44ec1ef5 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -98,7 +98,7 @@ def create_request(self, data): "status": 401, } - def check_request2(self, data): + def check_request2(self, data, paymentID): mollie_client.set_api_key(self.get_password(fieldname="secret_key", raise_exception=False)) try: payment = mollie_client.payments.get(paymentID) From b9b74f9c0207d097d6c8239cfe04e7bcd11a5e45 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 00:37:31 +0800 Subject: [PATCH 182/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index a31a1034..7c9a57fe 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -79,6 +79,6 @@ def check_payment(data, paymentID, reference_doctype, reference_docname): data = json.loads(data) gateway_controller = get_gateway_controller(reference_doctype, reference_docname) - status = frappe.get_doc("Mollie Settings", gateway_controller).check_request2(data) + status = frappe.get_doc("Mollie Settings", gateway_controller).check_request2(data, paymentID) frappe.db.commit() return status From 55dccf915cd906af1c4e7b2988a1498d97afaa31 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 00:41:51 +0800 Subject: [PATCH 183/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 7c9a57fe..b8443668 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -67,9 +67,7 @@ def make_payment(data, reference_doctype, reference_docname): data = json.loads(data) gateway_controller = get_gateway_controller(reference_doctype, reference_docname) - frappe.log_error("voor", data) data = frappe.get_doc("Mollie Settings", gateway_controller).create_request(data) - frappe.log_error("na", data) frappe.db.commit() return data From 1ed33214eeb2971d64c8891a14757aa7cd472270 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 00:45:23 +0800 Subject: [PATCH 184/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 44ec1ef5..4cc09a37 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -104,7 +104,7 @@ def check_request2(self, data, paymentID): payment = mollie_client.payments.get(paymentID) if payment.is_paid(): - return "Paid" + return finalize_request() elif payment.is_pending(): return "Pending" elif payment.is_open(): From 7fff38115c7a69683284bc3ac3aa7bd3a0ac74bd Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 00:49:13 +0800 Subject: [PATCH 185/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 4cc09a37..fa4ca323 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -104,7 +104,7 @@ def check_request2(self, data, paymentID): payment = mollie_client.payments.get(paymentID) if payment.is_paid(): - return finalize_request() + return "Paid" elif payment.is_pending(): return "Pending" elif payment.is_open(): From 318adafe16c04e1696efd1fa8f9e6944821902cc Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:03:08 +0800 Subject: [PATCH 186/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index c579682e..e0d92871 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -29,12 +29,13 @@ $(document).ready(function() { }, 2000); } else { } - if (payment.paymentUrl) { - setTimeout(function() { - window.open(payment.paymentUrl, "_blank"); - }, 1000); - } else { - } + if (payment.paymentUrl) { + window.open(payment.paymentUrl, "_blank"); + $('#submit').disabled = true; + setTimeout(function() { + $('#submit').disabled = false; + }, 3000); + } }) From 6a6b995f65f1790261d1397e143664f7f1c5e57c Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:05:15 +0800 Subject: [PATCH 187/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index fa4ca323..d85aa71b 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -104,7 +104,7 @@ def check_request2(self, data, paymentID): payment = mollie_client.payments.get(paymentID) if payment.is_paid(): - return "Paid" + return "Completed" elif payment.is_pending(): return "Pending" elif payment.is_open(): From 5397aaf96303277fb7f12fbb855d8b9a03e51433 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:07:47 +0800 Subject: [PATCH 188/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 1 + 1 file changed, 1 insertion(+) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index e0d92871..740ebe20 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -54,6 +54,7 @@ $(document).ready(function() { }, callback: function(r){ console.log(r.message) + $('#submit').innerHTML = "Processed"; } }) }, 5000); From 08a223ffbc213dfa109f5f8bc641883b7280c026 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:08:56 +0800 Subject: [PATCH 189/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 740ebe20..29825de2 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -31,10 +31,6 @@ $(document).ready(function() { } if (payment.paymentUrl) { window.open(payment.paymentUrl, "_blank"); - $('#submit').disabled = true; - setTimeout(function() { - $('#submit').disabled = false; - }, 3000); } }) From f5bb8eb608779efc012d83e6c76cafb1b6ad1c75 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:09:52 +0800 Subject: [PATCH 190/284] Update mollie_checkout.html --- payments/templates/pages/mollie_checkout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.html b/payments/templates/pages/mollie_checkout.html index 86351556..08822ebe 100644 --- a/payments/templates/pages/mollie_checkout.html +++ b/payments/templates/pages/mollie_checkout.html @@ -26,7 +26,7 @@

{{description}}

From 7afb0a8d5bcd91865be7c9f2bb9d857417506825 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:10:45 +0800 Subject: [PATCH 191/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 29825de2..e1e50e23 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -50,7 +50,7 @@ $(document).ready(function() { }, callback: function(r){ console.log(r.message) - $('#submit').innerHTML = "Processed"; + $('#status').innerHTML = "Processed"; } }) }, 5000); From 769251ebd084fd285b65565e6ead579789e3b8e1 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:12:22 +0800 Subject: [PATCH 192/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index e1e50e23..2fe84638 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -50,7 +50,7 @@ $(document).ready(function() { }, callback: function(r){ console.log(r.message) - $('#status').innerHTML = "Processed"; + $('#status').innerHTML = r.message; } }) }, 5000); From 1369b8a51ff253d211ca71b1c4e4c8cee562c4e7 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:13:27 +0800 Subject: [PATCH 193/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 2fe84638..ae402bea 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -1,5 +1,6 @@ $(document).ready(function() { var form = document.querySelector('#payment-form'); + var status = document.querySelector('#status'); var data = {{ frappe.form_dict | json }}; var doctype = "{{ reference_doctype }}" var docname = "{{ reference_docname }}" @@ -50,7 +51,7 @@ $(document).ready(function() { }, callback: function(r){ console.log(r.message) - $('#status').innerHTML = r.message; + status.innerHTML = r.message; } }) }, 5000); From 65d0f499d9bebf2e72d92ee377cb2c16957bd25a Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:17:12 +0800 Subject: [PATCH 194/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index ae402bea..f195aec8 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -1,6 +1,5 @@ $(document).ready(function() { var form = document.querySelector('#payment-form'); - var status = document.querySelector('#status'); var data = {{ frappe.form_dict | json }}; var doctype = "{{ reference_doctype }}" var docname = "{{ reference_docname }}" @@ -51,7 +50,7 @@ $(document).ready(function() { }, callback: function(r){ console.log(r.message) - status.innerHTML = r.message; + document.getElementById("status").value = r.message; } }) }, 5000); From d6ec85f57bd64a7e20647071863a73392f9483fa Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:18:09 +0800 Subject: [PATCH 195/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index d85aa71b..d9770ef0 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -121,7 +121,7 @@ def create_charge_on_mollie(self): { 'amount': { 'currency': self.data.currency, - 'value': '10.00' + 'value': self.data.amount }, "description": self.data.description, 'redirectUrl': self.data.get("redirect_to"), From ca58824270ee893e5dcc5854ba132ee78a4fd87b Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:24:36 +0800 Subject: [PATCH 196/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index d9770ef0..bdcd9de4 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -121,7 +121,7 @@ def create_charge_on_mollie(self): { 'amount': { 'currency': self.data.currency, - 'value': self.data.amount + 'value': cint(flt(self.data.amount) * 100) }, "description": self.data.description, 'redirectUrl': self.data.get("redirect_to"), From 80fcd492bf6df0485f94cb78b7ebd27e591e62cc Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:28:19 +0800 Subject: [PATCH 197/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index bdcd9de4..bffef422 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -121,7 +121,7 @@ def create_charge_on_mollie(self): { 'amount': { 'currency': self.data.currency, - 'value': cint(flt(self.data.amount) * 100) + 'value': flt(self.data.amount)) }, "description": self.data.description, 'redirectUrl': self.data.get("redirect_to"), From 0115c1c7d402ba584c5ccff089961590c7bf31a2 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:31:03 +0800 Subject: [PATCH 198/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index bffef422..d93196a3 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -121,7 +121,7 @@ def create_charge_on_mollie(self): { 'amount': { 'currency': self.data.currency, - 'value': flt(self.data.amount)) + 'value': flt(self.data.amount) }, "description": self.data.description, 'redirectUrl': self.data.get("redirect_to"), From 322cdcad4de8d66bc539e3f363dd359ceb05afe9 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:41:11 +0800 Subject: [PATCH 199/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index d93196a3..9767af91 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -121,7 +121,7 @@ def create_charge_on_mollie(self): { 'amount': { 'currency': self.data.currency, - 'value': flt(self.data.amount) + 'value': flt(self.data.amount, 2) }, "description": self.data.description, 'redirectUrl': self.data.get("redirect_to"), From 2f514c79099a76be0645d4f73092cda6d4c57b46 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 12:21:05 +0800 Subject: [PATCH 200/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 9767af91..d93196a3 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -121,7 +121,7 @@ def create_charge_on_mollie(self): { 'amount': { 'currency': self.data.currency, - 'value': flt(self.data.amount, 2) + 'value': flt(self.data.amount) }, "description": self.data.description, 'redirectUrl': self.data.get("redirect_to"), From 100d26b2ae54836b7532a5752c599b9f893e541b Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 12:42:45 +0800 Subject: [PATCH 201/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index d93196a3..dbd6e467 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -121,7 +121,7 @@ def create_charge_on_mollie(self): { 'amount': { 'currency': self.data.currency, - 'value': flt(self.data.amount) + 'value': flt(self.data.amount,2) }, "description": self.data.description, 'redirectUrl': self.data.get("redirect_to"), From 243eb7e892d5c1b4063f92ebb401be11c36f5855 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 12:49:39 +0800 Subject: [PATCH 202/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index dbd6e467..59881890 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -121,7 +121,7 @@ def create_charge_on_mollie(self): { 'amount': { 'currency': self.data.currency, - 'value': flt(self.data.amount,2) + 'value': '10.0' }, "description": self.data.description, 'redirectUrl': self.data.get("redirect_to"), From 953bc1867e5bbda5177ae06681e8d06e938527f0 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 12:53:21 +0800 Subject: [PATCH 203/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 59881890..fc5242d1 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -121,7 +121,7 @@ def create_charge_on_mollie(self): { 'amount': { 'currency': self.data.currency, - 'value': '10.0' + 'value': '%.2f' % self.data.amount' }, "description": self.data.description, 'redirectUrl': self.data.get("redirect_to"), From e7acb686e3a70b2761af68a9687bf3c06affc79f Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 12:57:49 +0800 Subject: [PATCH 204/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index fc5242d1..4a5bd239 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -121,7 +121,7 @@ def create_charge_on_mollie(self): { 'amount': { 'currency': self.data.currency, - 'value': '%.2f' % self.data.amount' + 'value': '%.2f' % self.data.amount }, "description": self.data.description, 'redirectUrl': self.data.get("redirect_to"), From de619d113673fec6c8392a137f49f17a27943e78 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:01:33 +0800 Subject: [PATCH 205/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 4a5bd239..9b10482f 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -121,7 +121,7 @@ def create_charge_on_mollie(self): { 'amount': { 'currency': self.data.currency, - 'value': '%.2f' % self.data.amount + 'value': flt('%.2f' % self.data.amount) }, "description": self.data.description, 'redirectUrl': self.data.get("redirect_to"), From fbbde94a44e5936810c13063084d652cff1a242e Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:04:58 +0800 Subject: [PATCH 206/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 9b10482f..98e719ae 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -121,7 +121,7 @@ def create_charge_on_mollie(self): { 'amount': { 'currency': self.data.currency, - 'value': flt('%.2f' % self.data.amount) + 'value': float('%.2f' % self.data.amount) }, "description": self.data.description, 'redirectUrl': self.data.get("redirect_to"), From 869df17b1783007fb7dc30e97b2157dcf453b129 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:08:16 +0800 Subject: [PATCH 207/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 98e719ae..1cb5eac5 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -121,7 +121,7 @@ def create_charge_on_mollie(self): { 'amount': { 'currency': self.data.currency, - 'value': float('%.2f' % self.data.amount) + 'value': "{:.2f}".format(self.data.amount) }, "description": self.data.description, 'redirectUrl': self.data.get("redirect_to"), From 3fa461efaad667cf87bed4a29e3944bb31ccc2bc Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:15:47 +0800 Subject: [PATCH 208/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 1cb5eac5..a84d79a0 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -121,7 +121,7 @@ def create_charge_on_mollie(self): { 'amount': { 'currency': self.data.currency, - 'value': "{:.2f}".format(self.data.amount) + 'value': "{:.2f}".format(float(self.data.amount)) }, "description": self.data.description, 'redirectUrl': self.data.get("redirect_to"), From 4d3a060926b973a672931d9044700dd362a857b5 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:23:34 +0800 Subject: [PATCH 209/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 1 - 1 file changed, 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index f195aec8..f128d0cd 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -49,7 +49,6 @@ $(document).ready(function() { "paymentID": payment.paymentID }, callback: function(r){ - console.log(r.message) document.getElementById("status").value = r.message; } }) From 10ab0e9d22c32be9a2c2378615ab2213b08aee4b Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:23:53 +0800 Subject: [PATCH 210/284] Update mollie_checkout.html --- payments/templates/pages/mollie_checkout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.html b/payments/templates/pages/mollie_checkout.html index 08822ebe..cfdc17d0 100644 --- a/payments/templates/pages/mollie_checkout.html +++ b/payments/templates/pages/mollie_checkout.html @@ -26,7 +26,7 @@

{{description}}

From 119988908e34cb14de1829355b3baf25862c8566 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:44:16 +0800 Subject: [PATCH 211/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index a84d79a0..b872a0b1 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -104,6 +104,10 @@ def check_request2(self, data, paymentID): payment = mollie_client.payments.get(paymentID) if payment.is_paid(): + payment_status_field = frappe.db.get_value(self.data.reference_doctype, self.data.reference_docname, 'payment_status') + if payment_status_field: + frappe.db.set_value(self.data.reference_doctype, self.data.reference_docname, 'payment_status', 'Completed') + return "Completed" elif payment.is_pending(): return "Pending" From 0e1c0d0ec5b7e15f6c86cbfe32433a586274f5cd Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:44:43 +0800 Subject: [PATCH 212/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index b8443668..134b205b 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -77,6 +77,6 @@ def check_payment(data, paymentID, reference_doctype, reference_docname): data = json.loads(data) gateway_controller = get_gateway_controller(reference_doctype, reference_docname) - status = frappe.get_doc("Mollie Settings", gateway_controller).check_request2(data, paymentID) + status = frappe.get_doc("Mollie Settings", gateway_controller).check_request2(data, paymentID, reference_doctype, reference_docname) frappe.db.commit() return status From c6add485506185e46638cf816703632104972a11 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:48:03 +0800 Subject: [PATCH 213/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index b872a0b1..44b0451b 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -108,7 +108,7 @@ def check_request2(self, data, paymentID): if payment_status_field: frappe.db.set_value(self.data.reference_doctype, self.data.reference_docname, 'payment_status', 'Completed') - return "Completed" + return "Completed" elif payment.is_pending(): return "Pending" elif payment.is_open(): From 6f25cf0c9f8c4e363b029432f193fa9aaf55bc36 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:52:08 +0800 Subject: [PATCH 214/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 44b0451b..82c5f24a 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -98,7 +98,7 @@ def create_request(self, data): "status": 401, } - def check_request2(self, data, paymentID): + def check_request2(self, data, self.data.reference_doctype, self.data.reference_docname, paymentID): mollie_client.set_api_key(self.get_password(fieldname="secret_key", raise_exception=False)) try: payment = mollie_client.payments.get(paymentID) From 07ba8b2f42e406f2601a709f3620fcf9c16aa085 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:53:12 +0800 Subject: [PATCH 215/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 134b205b..31757fca 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -77,6 +77,6 @@ def check_payment(data, paymentID, reference_doctype, reference_docname): data = json.loads(data) gateway_controller = get_gateway_controller(reference_doctype, reference_docname) - status = frappe.get_doc("Mollie Settings", gateway_controller).check_request2(data, paymentID, reference_doctype, reference_docname) + status = frappe.get_doc("Mollie Settings", gateway_controller).check_request2(data, reference_doctype, reference_docname, paymentID) frappe.db.commit() return status From 649fe55bcf506ebb9ace913b8331437222870a48 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:57:08 +0800 Subject: [PATCH 216/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 82c5f24a..44b0451b 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -98,7 +98,7 @@ def create_request(self, data): "status": 401, } - def check_request2(self, data, self.data.reference_doctype, self.data.reference_docname, paymentID): + def check_request2(self, data, paymentID): mollie_client.set_api_key(self.get_password(fieldname="secret_key", raise_exception=False)) try: payment = mollie_client.payments.get(paymentID) From b6d23e6b222a93e0bbf85d9246de87a4551e116d Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:57:36 +0800 Subject: [PATCH 217/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 31757fca..b8443668 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -77,6 +77,6 @@ def check_payment(data, paymentID, reference_doctype, reference_docname): data = json.loads(data) gateway_controller = get_gateway_controller(reference_doctype, reference_docname) - status = frappe.get_doc("Mollie Settings", gateway_controller).check_request2(data, reference_doctype, reference_docname, paymentID) + status = frappe.get_doc("Mollie Settings", gateway_controller).check_request2(data, paymentID) frappe.db.commit() return status From 16efb6cfe2fb36cae94f30be62c79606633e8a18 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:02:20 +0800 Subject: [PATCH 218/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 44b0451b..ae672a21 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -104,8 +104,7 @@ def check_request2(self, data, paymentID): payment = mollie_client.payments.get(paymentID) if payment.is_paid(): - payment_status_field = frappe.db.get_value(self.data.reference_doctype, self.data.reference_docname, 'payment_status') - if payment_status_field: + if hasattr(self.data.reference_doctype, 'payment_status'):: frappe.db.set_value(self.data.reference_doctype, self.data.reference_docname, 'payment_status', 'Completed') return "Completed" From b80e2a0819eb5d2f5ad92811bf70d732ffeec40c Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:05:28 +0800 Subject: [PATCH 219/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index ae672a21..e0b2bfad 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -104,7 +104,7 @@ def check_request2(self, data, paymentID): payment = mollie_client.payments.get(paymentID) if payment.is_paid(): - if hasattr(self.data.reference_doctype, 'payment_status'):: + if hasattr(self.data.reference_doctype, 'payment_status'): frappe.db.set_value(self.data.reference_doctype, self.data.reference_docname, 'payment_status', 'Completed') return "Completed" From cb77a22fde5e0047f06635b0903d0e65858c5da2 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:13:09 +0800 Subject: [PATCH 220/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index e0b2bfad..9efec3ba 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -119,6 +119,20 @@ def check_request2(self, data, paymentID): return f"API call failed" def create_charge_on_mollie(self): + data_details = { + "amount": self.data.amount, + "title": f"Payment for {self.data.doctype} {self.data.name}", + "description": f"Payment for {self.data.doctype} {self.data.name}", + "reference_doctype": self.data.doctype, + "reference_docname": self.data.name, + "payer_email": frappe.session.user, + "payer_name": frappe.utils.get_fullname(frappe.session.user), + "order_id": self.data.name, + "currency": self.data.currency, + "redirect_to": self.data.get("redirect_to"), + } + + try: charge = mollie_client.payments.create( { From 183e6f4ad1fd1fec13a66cda144bd4a2ba08339d Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:14:37 +0800 Subject: [PATCH 221/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 9efec3ba..0deb4092 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -131,6 +131,7 @@ def create_charge_on_mollie(self): "currency": self.data.currency, "redirect_to": self.data.get("redirect_to"), } + redirect_url = get_payment_url(**data_details) try: @@ -141,7 +142,7 @@ def create_charge_on_mollie(self): 'value': "{:.2f}".format(float(self.data.amount)) }, "description": self.data.description, - 'redirectUrl': self.data.get("redirect_to"), + 'redirectUrl': redirect_url, } ) From e4c09a58f3622b91fe1ea9018c7157aa9eb137b5 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:21:54 +0800 Subject: [PATCH 222/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 0deb4092..530453cc 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -131,7 +131,7 @@ def create_charge_on_mollie(self): "currency": self.data.currency, "redirect_to": self.data.get("redirect_to"), } - redirect_url = get_payment_url(**data_details) + redirect_url = self.get_payment_url(**data_details) try: From ca5168f34a17619bf71104777463f1771318f987 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:29:42 +0800 Subject: [PATCH 223/284] Update mollie_settings.py --- .../mollie_settings/mollie_settings.py | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 530453cc..077d87c3 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -119,22 +119,21 @@ def check_request2(self, data, paymentID): return f"API call failed" def create_charge_on_mollie(self): - data_details = { - "amount": self.data.amount, - "title": f"Payment for {self.data.doctype} {self.data.name}", - "description": f"Payment for {self.data.doctype} {self.data.name}", - "reference_doctype": self.data.doctype, - "reference_docname": self.data.name, - "payer_email": frappe.session.user, - "payer_name": frappe.utils.get_fullname(frappe.session.user), - "order_id": self.data.name, - "currency": self.data.currency, - "redirect_to": self.data.get("redirect_to"), - } - redirect_url = self.get_payment_url(**data_details) - - try: + data_details = { + "amount": self.data.amount, + "title": f"Payment for {self.data.reference_doctype} {self.data.reference_docname}", + "description": f"Payment for {self.data.reference_doctype} {self.data.reference_docname}", + "reference_doctype": self.data.reference_doctype, + "reference_docname": self.data.reference_docname, + "payer_email": frappe.session.user, + "payer_name": frappe.utils.get_fullname(frappe.session.user), + "order_id": self.data.reference_docname, + "currency": self.data.currency, + "redirect_to": self.data.get("redirect_to"), + } + redirect_url = self.get_payment_url(**data_details) + charge = mollie_client.payments.create( { 'amount': { @@ -151,7 +150,9 @@ def create_charge_on_mollie(self): self.flags.status_changed_to = "Completed" except Exception: - frappe.log_error(mollie_error) + if mollie_error: + frappe.log_error(mollie_error) + frappe.log_error(frappe.get_traceback()) data2 = self.finalize_request() From 2b69e2e696b6eeed72f8b0c150fb43c3dcdf4994 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:40:10 +0800 Subject: [PATCH 224/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 077d87c3..5cbd9fdc 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -141,7 +141,7 @@ def create_charge_on_mollie(self): 'value': "{:.2f}".format(float(self.data.amount)) }, "description": self.data.description, - 'redirectUrl': redirect_url, + 'redirectUrl': redirect_url += "&" + urlencode({"status": charge.status}), } ) From 996072b327962ccbac69bbb5123eb50cdf45334b Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:47:26 +0800 Subject: [PATCH 225/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 5cbd9fdc..077d87c3 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -141,7 +141,7 @@ def create_charge_on_mollie(self): 'value': "{:.2f}".format(float(self.data.amount)) }, "description": self.data.description, - 'redirectUrl': redirect_url += "&" + urlencode({"status": charge.status}), + 'redirectUrl': redirect_url, } ) From 4b8a349e7388ce4d16e3c58ba9269829a05d3750 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:56:20 +0800 Subject: [PATCH 226/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 077d87c3..5119f0dd 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -145,10 +145,8 @@ def create_charge_on_mollie(self): } ) - if charge.is_paid(): - self.integration_request.db_set("status", "Completed", update_modified=False) - self.flags.status_changed_to = "Completed" - + frappe.db.set_value(self.data.reference_doctype, self.data.reference_docname, 'payment_id', charge.id) + except Exception: if mollie_error: frappe.log_error(mollie_error) From 564e44a5c1ef6d529529b237d578a20bc1e2851e Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:03:30 +0800 Subject: [PATCH 227/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 5119f0dd..6f8f9473 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -115,8 +115,9 @@ def check_request2(self, data, paymentID): else: return "Cancelled" - except: + except Exception: return f"API call failed" + frappe.log_error(frappe.get_traceback()) def create_charge_on_mollie(self): try: From ed44f48dc81cef7e45dfc640f2c2553b2d83636d Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:15:08 +0800 Subject: [PATCH 228/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index b8443668..104fcefd 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -75,8 +75,13 @@ def make_payment(data, reference_doctype, reference_docname): @frappe.whitelist(allow_guest=True) def check_payment(data, paymentID, reference_doctype, reference_docname): data = json.loads(data) - gateway_controller = get_gateway_controller(reference_doctype, reference_docname) + + paymentID = frappe.db.get_value(reference_doctype, reference_docname, 'payment_id') + if not paymentID: + payment = self.make_payment(data, reference_doctype, reference_docname) + paymentID = payment.status + status = frappe.get_doc("Mollie Settings", gateway_controller).check_request2(data, paymentID) frappe.db.commit() return status From 1a331a17433c257303542ea9d9dacd789cd75e46 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:15:59 +0800 Subject: [PATCH 229/284] Update mollie_checkout.js --- .../templates/includes/mollie_checkout.js | 48 ++++++------------- 1 file changed, 14 insertions(+), 34 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index f128d0cd..fd6aeb35 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -4,39 +4,6 @@ $(document).ready(function() { var doctype = "{{ reference_doctype }}" var docname = "{{ reference_docname }}" frappe.call({ - method: "payments.templates.pages.mollie_checkout.make_payment", - freeze: true, - headers: { - "X-Requested-With": "XMLHttpRequest" - }, - args: { - "data": JSON.stringify(data), - "reference_doctype": doctype, - "reference_docname": docname - }, - callback: function(r){ - payment = r.message - } - - }) - - form.addEventListener('submit', e => { - e.preventDefault(); - if (payment.status == "Completed") { - $('#submit').hide() - setTimeout(function() { - window.location.href = r.message.redirect_to - }, 2000); - } else { - } - if (payment.paymentUrl) { - window.open(payment.paymentUrl, "_blank"); - } - }) - - - var intervalId = window.setInterval(function(){ - frappe.call({ method: "payments.templates.pages.mollie_checkout.check_payment", freeze: true, headers: { @@ -52,5 +19,18 @@ $(document).ready(function() { document.getElementById("status").value = r.message; } }) - }, 5000); + + form.addEventListener('submit', e => { + e.preventDefault(); + if (payment.status == "Completed") { + $('#submit').hide() + setTimeout(function() { + window.location.href = r.message.redirect_to + }, 2000); + } else { + } + if (payment.paymentUrl) { + window.open(payment.paymentUrl, "_blank"); + } + }) }) From 85c9aedb3e44c0870574bea8049c47bcb7de1ba1 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:19:54 +0800 Subject: [PATCH 230/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 6f8f9473..47effbaf 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -116,8 +116,8 @@ def check_request2(self, data, paymentID): return "Cancelled" except Exception: - return f"API call failed" frappe.log_error(frappe.get_traceback()) + return f"API call failed" def create_charge_on_mollie(self): try: From b17894b38eddb74677d152aef82cfa1cdaa36545 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:22:57 +0800 Subject: [PATCH 231/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 47effbaf..b8927595 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -117,7 +117,7 @@ def check_request2(self, data, paymentID): except Exception: frappe.log_error(frappe.get_traceback()) - return f"API call failed" + return f"API call failed" def create_charge_on_mollie(self): try: From e28390927a438382757d14149c6beb84355013f0 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:26:42 +0800 Subject: [PATCH 232/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 1 - 1 file changed, 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index fd6aeb35..dcc91700 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -13,7 +13,6 @@ $(document).ready(function() { "data": JSON.stringify(data), "reference_doctype": doctype, "reference_docname": docname, - "paymentID": payment.paymentID }, callback: function(r){ document.getElementById("status").value = r.message; From 3a67358c7df4293b5870fd863abbc8472fc491da Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:26:58 +0800 Subject: [PATCH 233/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 104fcefd..68f60508 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -73,7 +73,7 @@ def make_payment(data, reference_doctype, reference_docname): @frappe.whitelist(allow_guest=True) -def check_payment(data, paymentID, reference_doctype, reference_docname): +def check_payment(data, reference_doctype, reference_docname): data = json.loads(data) gateway_controller = get_gateway_controller(reference_doctype, reference_docname) From 831039adc46aee70f65acea586203d809eea85f1 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:29:49 +0800 Subject: [PATCH 234/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 68f60508..9c5c9ed9 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -79,7 +79,7 @@ def check_payment(data, reference_doctype, reference_docname): paymentID = frappe.db.get_value(reference_doctype, reference_docname, 'payment_id') if not paymentID: - payment = self.make_payment(data, reference_doctype, reference_docname) + payment = make_payment(data, reference_doctype, reference_docname) paymentID = payment.status status = frappe.get_doc("Mollie Settings", gateway_controller).check_request2(data, paymentID) From 96729344c7cd8115e6f92469910839eda8e9a5dd Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:33:50 +0800 Subject: [PATCH 235/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 9c5c9ed9..08a7a125 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -63,10 +63,7 @@ def get_header_image(doc, gateway_controller): @frappe.whitelist(allow_guest=True) -def make_payment(data, reference_doctype, reference_docname): - data = json.loads(data) - - gateway_controller = get_gateway_controller(reference_doctype, reference_docname) +def make_payment(data, gateway_controller): data = frappe.get_doc("Mollie Settings", gateway_controller).create_request(data) frappe.db.commit() return data @@ -79,7 +76,7 @@ def check_payment(data, reference_doctype, reference_docname): paymentID = frappe.db.get_value(reference_doctype, reference_docname, 'payment_id') if not paymentID: - payment = make_payment(data, reference_doctype, reference_docname) + payment = make_payment(data, gateway_controller) paymentID = payment.status status = frappe.get_doc("Mollie Settings", gateway_controller).check_request2(data, paymentID) From e3df029130967932eea0b33f559c5758a5807152 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:39:07 +0800 Subject: [PATCH 236/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 08a7a125..18c6d5d4 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -63,22 +63,15 @@ def get_header_image(doc, gateway_controller): @frappe.whitelist(allow_guest=True) -def make_payment(data, gateway_controller): - data = frappe.get_doc("Mollie Settings", gateway_controller).create_request(data) - frappe.db.commit() - return data - - -@frappe.whitelist(allow_guest=True) -def check_payment(data, reference_doctype, reference_docname): +def make_payment(data, reference_doctype, reference_docname): data = json.loads(data) gateway_controller = get_gateway_controller(reference_doctype, reference_docname) paymentID = frappe.db.get_value(reference_doctype, reference_docname, 'payment_id') if not paymentID: - payment = make_payment(data, gateway_controller) - paymentID = payment.status + payment = frappe.get_doc("Mollie Settings", gateway_controller).create_request(data) + paymentID = payment.paymentID - status = frappe.get_doc("Mollie Settings", gateway_controller).check_request2(data, paymentID) + status = frappe.get_doc("Mollie Settings", gateway_controller).check_request(data, paymentID) frappe.db.commit() return status From 043ea262a59a21d2f1a4ff930744027e7383e833 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:39:33 +0800 Subject: [PATCH 237/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index dcc91700..ce4dad77 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -4,7 +4,7 @@ $(document).ready(function() { var doctype = "{{ reference_doctype }}" var docname = "{{ reference_docname }}" frappe.call({ - method: "payments.templates.pages.mollie_checkout.check_payment", + method: "payments.templates.pages.mollie_checkout.make_payment", freeze: true, headers: { "X-Requested-With": "XMLHttpRequest" From 2823478861fbb6e820f0fa0a08ac056a4a90c829 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:39:51 +0800 Subject: [PATCH 238/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index b8927595..5c0e1f1c 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -98,7 +98,7 @@ def create_request(self, data): "status": 401, } - def check_request2(self, data, paymentID): + def check_request(self, data, paymentID): mollie_client.set_api_key(self.get_password(fieldname="secret_key", raise_exception=False)) try: payment = mollie_client.payments.get(paymentID) From 942022d89ca848c79ab7536a3506e6bb42be687b Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:48:18 +0800 Subject: [PATCH 239/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 18c6d5d4..54361039 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -66,12 +66,14 @@ def get_header_image(doc, gateway_controller): def make_payment(data, reference_doctype, reference_docname): data = json.loads(data) gateway_controller = get_gateway_controller(reference_doctype, reference_docname) + data = frappe.get_doc("Mollie Settings", gateway_controller).create_request(data) paymentID = frappe.db.get_value(reference_doctype, reference_docname, 'payment_id') if not paymentID: - payment = frappe.get_doc("Mollie Settings", gateway_controller).create_request(data) - paymentID = payment.paymentID + paymentID = data.paymentID + + data.status = frappe.get_doc("Mollie Settings", gateway_controller).check_request(data, paymentID) + - status = frappe.get_doc("Mollie Settings", gateway_controller).check_request(data, paymentID) frappe.db.commit() - return status + return data From 2bc3296b09ad841134a48ff1389468897c09e7ea Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:48:45 +0800 Subject: [PATCH 240/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index ce4dad77..4e67fd85 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -15,7 +15,8 @@ $(document).ready(function() { "reference_docname": docname, }, callback: function(r){ - document.getElementById("status").value = r.message; + payment = r.message + document.getElementById("status").value = data.status; } }) From d864abbeff3fe08f8a533f9a51e8a8e76d5f1372 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:54:36 +0800 Subject: [PATCH 241/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 54361039..dd7823d0 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -72,8 +72,9 @@ def make_payment(data, reference_doctype, reference_docname): if not paymentID: paymentID = data.paymentID - data.status = frappe.get_doc("Mollie Settings", gateway_controller).check_request(data, paymentID) - + status = frappe.get_doc("Mollie Settings", gateway_controller).check_request(data, paymentID) + + data.status = status frappe.db.commit() return data From ca459fa7ebda2d8804229cf49164ca7cb918ac0d Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:58:33 +0800 Subject: [PATCH 242/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index dd7823d0..45bb8804 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -73,7 +73,7 @@ def make_payment(data, reference_doctype, reference_docname): paymentID = data.paymentID status = frappe.get_doc("Mollie Settings", gateway_controller).check_request(data, paymentID) - + frappe.log_error(data) data.status = status frappe.db.commit() From 21bb595b66ff8e10c497a5b194316c70742f6247 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:05:01 +0800 Subject: [PATCH 243/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 45bb8804..51372926 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -66,15 +66,14 @@ def get_header_image(doc, gateway_controller): def make_payment(data, reference_doctype, reference_docname): data = json.loads(data) gateway_controller = get_gateway_controller(reference_doctype, reference_docname) - data = frappe.get_doc("Mollie Settings", gateway_controller).create_request(data) - paymentID = frappe.db.get_value(reference_doctype, reference_docname, 'payment_id') + if not paymentID: + data = frappe.get_doc("Mollie Settings", gateway_controller).create_request(data) paymentID = data.paymentID status = frappe.get_doc("Mollie Settings", gateway_controller).check_request(data, paymentID) - frappe.log_error(data) - data.status = status + data["status"] = status frappe.db.commit() return data From 28edb592bce95f08e3402b75c8abd812daf9c1a2 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:09:11 +0800 Subject: [PATCH 244/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 4e67fd85..ecf0ec06 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -16,7 +16,8 @@ $(document).ready(function() { }, callback: function(r){ payment = r.message - document.getElementById("status").value = data.status; + document.getElementById("status").value = payment.status; + console.log(payment) } }) From 5b1029a154e74f23b9506d934e8ec51f4de5ea16 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:21:14 +0800 Subject: [PATCH 245/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 5c0e1f1c..a7d22b12 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -102,18 +102,20 @@ def check_request(self, data, paymentID): mollie_client.set_api_key(self.get_password(fieldname="secret_key", raise_exception=False)) try: payment = mollie_client.payments.get(paymentID) + paymentUrl = payment['_links']['checkout']['href'] if payment.is_paid(): if hasattr(self.data.reference_doctype, 'payment_status'): frappe.db.set_value(self.data.reference_doctype, self.data.reference_docname, 'payment_status', 'Completed') - - return "Completed" + status = "Completed" elif payment.is_pending(): - return "Pending" + status = "Pending" elif payment.is_open(): - return "Open" + status = "Open" else: - return "Cancelled" + status = "Cancelled" + + return paymentUrl, status except Exception: frappe.log_error(frappe.get_traceback()) From 49df48268dffa40b514834cb6bb1f96495576da3 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:27:56 +0800 Subject: [PATCH 246/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index a7d22b12..8a6b1274 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -102,7 +102,7 @@ def check_request(self, data, paymentID): mollie_client.set_api_key(self.get_password(fieldname="secret_key", raise_exception=False)) try: payment = mollie_client.payments.get(paymentID) - paymentUrl = payment['_links']['checkout']['href'] + paymentUrl = payment['_links'] if payment.is_paid(): if hasattr(self.data.reference_doctype, 'payment_status'): From bf180e95b321e7b362e32985f17b661b2a854a37 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:33:44 +0800 Subject: [PATCH 247/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 8a6b1274..ad02e909 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -102,16 +102,18 @@ def check_request(self, data, paymentID): mollie_client.set_api_key(self.get_password(fieldname="secret_key", raise_exception=False)) try: payment = mollie_client.payments.get(paymentID) - paymentUrl = payment['_links'] + paymentUrl = "Not available" if payment.is_paid(): + status = "Completed" if hasattr(self.data.reference_doctype, 'payment_status'): frappe.db.set_value(self.data.reference_doctype, self.data.reference_docname, 'payment_status', 'Completed') - status = "Completed" elif payment.is_pending(): status = "Pending" + paymentUrl = payment['_links']['_links']['checkout']['href'] elif payment.is_open(): status = "Open" + paymentUrl = payment['_links']['_links']['checkout']['href'] else: status = "Cancelled" From f7b5bf9ca932e7dee30376d60d4c6d9985bc97ce Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:35:53 +0800 Subject: [PATCH 248/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index ad02e909..3ccd94e0 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -117,7 +117,7 @@ def check_request(self, data, paymentID): else: status = "Cancelled" - return paymentUrl, status + return {"paymentUrl": paymentUrl, "status": status} except Exception: frappe.log_error(frappe.get_traceback()) From b0da55e49d8df1ddd8055899b97ac24816f526f1 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:39:10 +0800 Subject: [PATCH 249/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 51372926..d6ad1011 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -73,7 +73,8 @@ def make_payment(data, reference_doctype, reference_docname): paymentID = data.paymentID status = frappe.get_doc("Mollie Settings", gateway_controller).check_request(data, paymentID) - data["status"] = status + data["status"] = status["status"] + data["paymentUrl"] = status["paymentUrl"] frappe.db.commit() return data From 7acc1c1b1be00d9681c043be85e95894658cf7ed Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:40:11 +0800 Subject: [PATCH 250/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index ecf0ec06..672e0c20 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -26,7 +26,7 @@ $(document).ready(function() { if (payment.status == "Completed") { $('#submit').hide() setTimeout(function() { - window.location.href = r.message.redirect_to + window.location.href = payment.redirect_to }, 2000); } else { } From de0e1d357af580229994254f012b0f490e6ae030 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:41:15 +0800 Subject: [PATCH 251/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 672e0c20..ecf0ec06 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -26,7 +26,7 @@ $(document).ready(function() { if (payment.status == "Completed") { $('#submit').hide() setTimeout(function() { - window.location.href = payment.redirect_to + window.location.href = r.message.redirect_to }, 2000); } else { } From 62e785dfab0a6dc0229cff214cbc9aacbc2acec3 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:44:08 +0800 Subject: [PATCH 252/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 3ccd94e0..db3551dd 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -106,8 +106,6 @@ def check_request(self, data, paymentID): if payment.is_paid(): status = "Completed" - if hasattr(self.data.reference_doctype, 'payment_status'): - frappe.db.set_value(self.data.reference_doctype, self.data.reference_docname, 'payment_status', 'Completed') elif payment.is_pending(): status = "Pending" paymentUrl = payment['_links']['_links']['checkout']['href'] @@ -116,8 +114,11 @@ def check_request(self, data, paymentID): paymentUrl = payment['_links']['_links']['checkout']['href'] else: status = "Cancelled" - - return {"paymentUrl": paymentUrl, "status": status} + + if paymentUrl: + return {"paymentUrl": paymentUrl, "status": status} + else: + return {"status": status} except Exception: frappe.log_error(frappe.get_traceback()) From aae6c912223e1edc6fbfc2dd3e54f1cc3a350886 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:44:39 +0800 Subject: [PATCH 253/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index d6ad1011..da9b6323 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -74,7 +74,9 @@ def make_payment(data, reference_doctype, reference_docname): status = frappe.get_doc("Mollie Settings", gateway_controller).check_request(data, paymentID) data["status"] = status["status"] - data["paymentUrl"] = status["paymentUrl"] + + if status["paymentUrl"]: + data["paymentUrl"] = status["paymentUrl"] frappe.db.commit() return data From 53fbb5dcc54a24b427c0743b4227bf70a37817a7 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:49:18 +0800 Subject: [PATCH 254/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index da9b6323..913e5469 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -73,7 +73,13 @@ def make_payment(data, reference_doctype, reference_docname): paymentID = data.paymentID status = frappe.get_doc("Mollie Settings", gateway_controller).check_request(data, paymentID) - data["status"] = status["status"] + if status["status"] == "Cancelled": + data = frappe.get_doc("Mollie Settings", gateway_controller).create_request(data) + paymentID = data.paymentID + data["status"] = "Open" + else: + data["status"] = status["status"] + if status["paymentUrl"]: data["paymentUrl"] = status["paymentUrl"] From 70fab2d0d19a8bd5e674f218c7557cbf6157676a Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:52:58 +0800 Subject: [PATCH 255/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 913e5469..30d39569 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -83,6 +83,9 @@ def make_payment(data, reference_doctype, reference_docname): if status["paymentUrl"]: data["paymentUrl"] = status["paymentUrl"] + + if hasattr(reference_doctype, 'payment_status'): + frappe.db.set_value(reference_doctype, reference_docname, 'payment_status', status["status"]) frappe.db.commit() return data From 5cf167d9eb1ae2170c4c382b00aee2d02c3f79b5 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:57:33 +0800 Subject: [PATCH 256/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 30d39569..fb8d9c42 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -73,8 +73,10 @@ def make_payment(data, reference_doctype, reference_docname): paymentID = data.paymentID status = frappe.get_doc("Mollie Settings", gateway_controller).check_request(data, paymentID) + if status["status"] == "Cancelled": data = frappe.get_doc("Mollie Settings", gateway_controller).create_request(data) + frappe.log_error(data) paymentID = data.paymentID data["status"] = "Open" else: From 2aa42d0a5a4cce0110d729a65a938d5cdc784129 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:01:24 +0800 Subject: [PATCH 257/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 1 - 1 file changed, 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index fb8d9c42..d1279e67 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -76,7 +76,6 @@ def make_payment(data, reference_doctype, reference_docname): if status["status"] == "Cancelled": data = frappe.get_doc("Mollie Settings", gateway_controller).create_request(data) - frappe.log_error(data) paymentID = data.paymentID data["status"] = "Open" else: From 954ac2133b85fd53ff2e1bc6755ba3392e9c788f Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:01:57 +0800 Subject: [PATCH 258/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index d1279e67..b5df6022 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -70,13 +70,13 @@ def make_payment(data, reference_doctype, reference_docname): if not paymentID: data = frappe.get_doc("Mollie Settings", gateway_controller).create_request(data) - paymentID = data.paymentID + paymentID = data["paymentID"] status = frappe.get_doc("Mollie Settings", gateway_controller).check_request(data, paymentID) if status["status"] == "Cancelled": data = frappe.get_doc("Mollie Settings", gateway_controller).create_request(data) - paymentID = data.paymentID + paymentID = data["paymentID"] data["status"] = "Open" else: data["status"] = status["status"] From 694f91346af13272af512e28e1fdba476476f86a Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:05:27 +0800 Subject: [PATCH 259/284] Update mollie_settings.py --- .../payment_gateways/doctype/mollie_settings/mollie_settings.py | 1 - 1 file changed, 1 deletion(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index db3551dd..0d6e3064 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -102,7 +102,6 @@ def check_request(self, data, paymentID): mollie_client.set_api_key(self.get_password(fieldname="secret_key", raise_exception=False)) try: payment = mollie_client.payments.get(paymentID) - paymentUrl = "Not available" if payment.is_paid(): status = "Completed" From 3608d0eaa9ad2db536ff2caa58dcd60311d2b3f7 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:07:51 +0800 Subject: [PATCH 260/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index b5df6022..14761dae 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -73,17 +73,20 @@ def make_payment(data, reference_doctype, reference_docname): paymentID = data["paymentID"] status = frappe.get_doc("Mollie Settings", gateway_controller).check_request(data, paymentID) + + if status["paymentUrl"]: + data["paymentUrl"] = status["paymentUrl"] if status["status"] == "Cancelled": data = frappe.get_doc("Mollie Settings", gateway_controller).create_request(data) paymentID = data["paymentID"] data["status"] = "Open" + data["paymentUrl"] = data["paymentUrl"] else: data["status"] = status["status"] - if status["paymentUrl"]: - data["paymentUrl"] = status["paymentUrl"] + if hasattr(reference_doctype, 'payment_status'): frappe.db.set_value(reference_doctype, reference_docname, 'payment_status', status["status"]) From cb44cccb5bed1ad06ce5fd134ee735165649eab9 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:13:12 +0800 Subject: [PATCH 261/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index 0d6e3064..ab64e13e 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -107,10 +107,10 @@ def check_request(self, data, paymentID): status = "Completed" elif payment.is_pending(): status = "Pending" - paymentUrl = payment['_links']['_links']['checkout']['href'] + paymentUrl = payment['_links']['checkout']['href'] elif payment.is_open(): status = "Open" - paymentUrl = payment['_links']['_links']['checkout']['href'] + paymentUrl = payment['_links']['checkout']['href'] else: status = "Cancelled" From 103fb1d5667f8ec2f357781626fd6e071a3a365f Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:17:08 +0800 Subject: [PATCH 262/284] Update mollie_settings.py --- .../doctype/mollie_settings/mollie_settings.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py index ab64e13e..e10859b2 100644 --- a/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py +++ b/payments/payment_gateways/doctype/mollie_settings/mollie_settings.py @@ -102,6 +102,7 @@ def check_request(self, data, paymentID): mollie_client.set_api_key(self.get_password(fieldname="secret_key", raise_exception=False)) try: payment = mollie_client.payments.get(paymentID) + paymentUrl = "Unavailable" if payment.is_paid(): status = "Completed" @@ -114,10 +115,7 @@ def check_request(self, data, paymentID): else: status = "Cancelled" - if paymentUrl: - return {"paymentUrl": paymentUrl, "status": status} - else: - return {"status": status} + return {"paymentUrl": paymentUrl, "status": status} except Exception: frappe.log_error(frappe.get_traceback()) From 93b6c0cabf0a386584ac4251ed834f0bf67c3965 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:18:10 +0800 Subject: [PATCH 263/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index ecf0ec06..5ebd58f0 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -30,7 +30,7 @@ $(document).ready(function() { }, 2000); } else { } - if (payment.paymentUrl) { + if not payment.paymentUrl == "unavailable" { window.open(payment.paymentUrl, "_blank"); } }) From 695a9343a0c3494dd111d82fbd9cd987d08f6db8 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:19:05 +0800 Subject: [PATCH 264/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 14761dae..3aa16e32 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -73,9 +73,7 @@ def make_payment(data, reference_doctype, reference_docname): paymentID = data["paymentID"] status = frappe.get_doc("Mollie Settings", gateway_controller).check_request(data, paymentID) - - if status["paymentUrl"]: - data["paymentUrl"] = status["paymentUrl"] + data["paymentUrl"] = status["paymentUrl"] if status["status"] == "Cancelled": data = frappe.get_doc("Mollie Settings", gateway_controller).create_request(data) From 9a5d93670a83e05ad06e3b516bac345718bde56e Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:23:13 +0800 Subject: [PATCH 265/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 5ebd58f0..dfa68ce7 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -30,7 +30,7 @@ $(document).ready(function() { }, 2000); } else { } - if not payment.paymentUrl == "unavailable" { + if !(payment.paymentUrl == "unavailable") { window.open(payment.paymentUrl, "_blank"); } }) From 9a541c1e60bc1cfa885ba5647ec361de01d161df Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:30:29 +0800 Subject: [PATCH 266/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index dfa68ce7..eb5584a2 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -30,7 +30,10 @@ $(document).ready(function() { }, 2000); } else { } - if !(payment.paymentUrl == "unavailable") { + if (payment.paymentUrl == "unavailable") { + window.location.href = r.message.redirect_to + } + else { window.open(payment.paymentUrl, "_blank"); } }) From 002c681567cc8c0edd86b5cf19c073fbbee33d06 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:33:57 +0800 Subject: [PATCH 267/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index eb5584a2..8cba461d 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -1,4 +1,4 @@ -$(document).ready(function() { ++$(document).ready(function() { var form = document.querySelector('#payment-form'); var data = {{ frappe.form_dict | json }}; var doctype = "{{ reference_doctype }}" @@ -31,7 +31,7 @@ $(document).ready(function() { } else { } if (payment.paymentUrl == "unavailable") { - window.location.href = r.message.redirect_to + window.location.href = payment.redirect_to } else { window.open(payment.paymentUrl, "_blank"); From 0906355806003b42de69236b6f5a265516767cc9 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:37:06 +0800 Subject: [PATCH 268/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 8cba461d..b3dac877 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -18,18 +18,14 @@ payment = r.message document.getElementById("status").value = payment.status; console.log(payment) + if (payment.paymentUrl == "unavailable") { + document.getElementById("submit").hide(); + } } }) form.addEventListener('submit', e => { e.preventDefault(); - if (payment.status == "Completed") { - $('#submit').hide() - setTimeout(function() { - window.location.href = r.message.redirect_to - }, 2000); - } else { - } if (payment.paymentUrl == "unavailable") { window.location.href = payment.redirect_to } From 3e98061cf3b2754a3ccec09bcd39ab907180b423 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:40:05 +0800 Subject: [PATCH 269/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index b3dac877..773286e2 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -18,7 +18,7 @@ payment = r.message document.getElementById("status").value = payment.status; console.log(payment) - if (payment.paymentUrl == "unavailable") { + if (payment.paymentUrl == "Unavailable") { document.getElementById("submit").hide(); } } From 2b2f3dbad91d0054c8b47ca4b0a4b54d74fd216b Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:44:01 +0800 Subject: [PATCH 270/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 773286e2..a4da4ed4 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -19,7 +19,10 @@ document.getElementById("status").value = payment.status; console.log(payment) if (payment.paymentUrl == "Unavailable") { - document.getElementById("submit").hide(); + $('#submit').hide() + } + else { + $('#submit').show() } } }) From d3c2911071b1c7a6d0882bae36a560c7b055ba8f Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:47:33 +0800 Subject: [PATCH 271/284] Update mollie_checkout.html --- payments/templates/pages/mollie_checkout.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.html b/payments/templates/pages/mollie_checkout.html index cfdc17d0..bcf2ea35 100644 --- a/payments/templates/pages/mollie_checkout.html +++ b/payments/templates/pages/mollie_checkout.html @@ -26,12 +26,12 @@

{{description}}

- + From e0884a5268b59b63914b79dce6ed2d3f8397160a Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:52:36 +0800 Subject: [PATCH 272/284] Update mollie_checkout.html --- payments/templates/pages/mollie_checkout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.html b/payments/templates/pages/mollie_checkout.html index bcf2ea35..ccec06e0 100644 --- a/payments/templates/pages/mollie_checkout.html +++ b/payments/templates/pages/mollie_checkout.html @@ -26,7 +26,7 @@

{{description}}

From d087826fe4a24004d460f4c6dfdc5dc44b5187a3 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:55:07 +0800 Subject: [PATCH 273/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index a4da4ed4..60587259 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -17,19 +17,13 @@ callback: function(r){ payment = r.message document.getElementById("status").value = payment.status; - console.log(payment) - if (payment.paymentUrl == "Unavailable") { - $('#submit').hide() - } - else { - $('#submit').show() - } } }) form.addEventListener('submit', e => { e.preventDefault(); if (payment.paymentUrl == "unavailable") { + document.getElementById("submit").value = "{{_("To website")}}"; window.location.href = payment.redirect_to } else { From 24960a27efbd27be1dc7298b4c918f3eab8e95ce Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:55:28 +0800 Subject: [PATCH 274/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 60587259..c7301942 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -23,7 +23,7 @@ form.addEventListener('submit', e => { e.preventDefault(); if (payment.paymentUrl == "unavailable") { - document.getElementById("submit").value = "{{_("To website")}}"; + document.getElementById("submit").value = "{{_("Ready")}}"; window.location.href = payment.redirect_to } else { From 9bf931eb3f3430105e750295140b346a48f00df8 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:58:21 +0800 Subject: [PATCH 275/284] Update mollie_checkout.html --- payments/templates/pages/mollie_checkout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.html b/payments/templates/pages/mollie_checkout.html index ccec06e0..ee11c6a0 100644 --- a/payments/templates/pages/mollie_checkout.html +++ b/payments/templates/pages/mollie_checkout.html @@ -31,7 +31,7 @@

{{description}}

- + From c43935c65ab2a13269d33094509ec03e469bf775 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 18:04:41 +0800 Subject: [PATCH 276/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index c7301942..637e4024 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -27,7 +27,7 @@ window.location.href = payment.redirect_to } else { - window.open(payment.paymentUrl, "_blank"); + window.location.href = payment.paymentUrl } }) }) From 0548c903d7416a6a70f88789cc7944c4898a637b Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 18:05:44 +0800 Subject: [PATCH 277/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 637e4024..2088a873 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -23,7 +23,7 @@ form.addEventListener('submit', e => { e.preventDefault(); if (payment.paymentUrl == "unavailable") { - document.getElementById("submit").value = "{{_("Ready")}}"; + document.getElementById("submit").innerHTML = "{{_("Ready")}}"; window.location.href = payment.redirect_to } else { From 79d5e2d4b6da018977534a1557adac7c58df0dde Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 18:09:29 +0800 Subject: [PATCH 278/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 2088a873..19a74e6b 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -17,13 +17,17 @@ callback: function(r){ payment = r.message document.getElementById("status").value = payment.status; + if (payment.paymentUrl == "unavailable") { + document.getElementById("submit").innerHTML = "{{_("Ready")}}"; + } + else { + } } }) form.addEventListener('submit', e => { e.preventDefault(); - if (payment.paymentUrl == "unavailable") { - document.getElementById("submit").innerHTML = "{{_("Ready")}}"; + if (payment.paymentUrl == "Unavailable") { window.location.href = payment.redirect_to } else { From c7ce32f36f42ac67bb6e0db6054926c3634b4f6a Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 18:12:40 +0800 Subject: [PATCH 279/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index 19a74e6b..e708c3a7 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -17,7 +17,7 @@ callback: function(r){ payment = r.message document.getElementById("status").value = payment.status; - if (payment.paymentUrl == "unavailable") { + if (payment.paymentUrl == "Unavailable") { document.getElementById("submit").innerHTML = "{{_("Ready")}}"; } else { From 18a9968e708ed008294b6a54b6f4890c64d92eee Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 18:22:19 +0800 Subject: [PATCH 280/284] Update mollie_checkout.js --- payments/templates/includes/mollie_checkout.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/payments/templates/includes/mollie_checkout.js b/payments/templates/includes/mollie_checkout.js index e708c3a7..42b242f7 100644 --- a/payments/templates/includes/mollie_checkout.js +++ b/payments/templates/includes/mollie_checkout.js @@ -3,6 +3,8 @@ var data = {{ frappe.form_dict | json }}; var doctype = "{{ reference_doctype }}" var docname = "{{ reference_docname }}" + document.getElementById("submit").innerHTML = "{{_("Loading...")}}"; + document.getElementById("status").value = "{{_("Loading...")}}"; frappe.call({ method: "payments.templates.pages.mollie_checkout.make_payment", freeze: true, @@ -21,6 +23,7 @@ document.getElementById("submit").innerHTML = "{{_("Ready")}}"; } else { + document.getElementById("submit").innerHTML = "{{_('Pay')}} {{amount}}"; } } }) From 18ba10bf8dbed6f67f8fd197c1e0aed2111edc88 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Fri, 9 Feb 2024 18:24:23 +0800 Subject: [PATCH 281/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 3aa16e32..d81cdbaf 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -78,16 +78,18 @@ def make_payment(data, reference_doctype, reference_docname): if status["status"] == "Cancelled": data = frappe.get_doc("Mollie Settings", gateway_controller).create_request(data) paymentID = data["paymentID"] - data["status"] = "Open" + status = "Open" + data["status"] = status data["paymentUrl"] = data["paymentUrl"] else: - data["status"] = status["status"] + status = status["status"] + data["status"] = status if hasattr(reference_doctype, 'payment_status'): - frappe.db.set_value(reference_doctype, reference_docname, 'payment_status', status["status"]) + frappe.db.set_value(reference_doctype, reference_docname, 'payment_status', status) frappe.db.commit() return data From 02de8c9e52439b8620e94aa0c8ff9d5e5690a367 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Sat, 10 Feb 2024 11:36:10 +0800 Subject: [PATCH 282/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index d81cdbaf..f7220550 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -90,6 +90,8 @@ def make_payment(data, reference_doctype, reference_docname): if hasattr(reference_doctype, 'payment_status'): frappe.db.set_value(reference_doctype, reference_docname, 'payment_status', status) + else: + frappe.log_error("Doctype field payment_status not existent") frappe.db.commit() return data From 212d003d9604cca0489c2f0573cce0ac38c11308 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Sat, 10 Feb 2024 11:43:59 +0800 Subject: [PATCH 283/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index f7220550..9fe35a6a 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -91,7 +91,7 @@ def make_payment(data, reference_doctype, reference_docname): if hasattr(reference_doctype, 'payment_status'): frappe.db.set_value(reference_doctype, reference_docname, 'payment_status', status) else: - frappe.log_error("Doctype field payment_status not existent") + frappe.log_error("Doctype field payment_status not existent", reference_doctype) frappe.db.commit() return data From b2c15c0d9e847e9da8c70e08b216443f706b0c59 Mon Sep 17 00:00:00 2001 From: mrPauwHaan <120259765+mrPauwHaan@users.noreply.github.com> Date: Sat, 10 Feb 2024 11:51:54 +0800 Subject: [PATCH 284/284] Update mollie_checkout.py --- payments/templates/pages/mollie_checkout.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/payments/templates/pages/mollie_checkout.py b/payments/templates/pages/mollie_checkout.py index 9fe35a6a..808a6f62 100644 --- a/payments/templates/pages/mollie_checkout.py +++ b/payments/templates/pages/mollie_checkout.py @@ -85,13 +85,10 @@ def make_payment(data, reference_doctype, reference_docname): status = status["status"] data["status"] = status - - - - if hasattr(reference_doctype, 'payment_status'): + try: frappe.db.set_value(reference_doctype, reference_docname, 'payment_status', status) - else: - frappe.log_error("Doctype field payment_status not existent", reference_doctype) + except: + pass frappe.db.commit() return data