diff --git a/frontend/src/pages/NewInvoice.vue b/frontend/src/pages/NewInvoice.vue index b01669d..beab55c 100644 --- a/frontend/src/pages/NewInvoice.vue +++ b/frontend/src/pages/NewInvoice.vue @@ -571,7 +571,7 @@ const saveInvoice = () => { }) } const portalSuppliers = createListResource({ - doctype: 'Portal Supplier', + doctype: 'Supplier', fields: ['name as value', 'company_name as label'], orderBy: 'creation desc', }) diff --git a/suppliers_portal/hooks.py b/suppliers_portal/hooks.py index 986f6f4..8e64274 100644 --- a/suppliers_portal/hooks.py +++ b/suppliers_portal/hooks.py @@ -245,5 +245,11 @@ app_license = "mit" website_route_rules = [ {"from_route": "/erpnext", "to_route": "/login"}, - {"from_route": "/frontend/", "to_route": "frontend"}, + {"from_route": "/frontend/", "to_route": "/frontend"}, + {"from_route": "/supplier-portal/frontend", "to_route": "/frontend"}, +] + + +website_redirects = [ + {"source": "/supplier-portal/frontend", "target": "/frontend"}, ] diff --git a/suppliers_portal/suppliers_portal/api.py b/suppliers_portal/suppliers_portal/api.py index 33e642f..93294ae 100644 --- a/suppliers_portal/suppliers_portal/api.py +++ b/suppliers_portal/suppliers_portal/api.py @@ -3,9 +3,9 @@ import frappe @frappe.whitelist(allow_guest=True) def validate_supplier_id(supplier_id: str) -> dict: - if frappe.db.exists("Portal Supplier", {"name": supplier_id}): + if frappe.db.exists("Supplier", {"name": supplier_id}): user = frappe.get_doc("User", f"{supplier_id}@supplier-portal.com") - portal_supplier = frappe.get_doc("Portal Supplier", supplier_id) + portal_supplier = frappe.get_doc("Supplier", supplier_id) # login user frappe.local.login_manager.user = user.name frappe.local.login_manager.post_login() diff --git a/suppliers_portal/suppliers_portal/doctype/portal_supplier/__init__.py b/suppliers_portal/suppliers_portal/doctype/supplier/__init__.py similarity index 100% rename from suppliers_portal/suppliers_portal/doctype/portal_supplier/__init__.py rename to suppliers_portal/suppliers_portal/doctype/supplier/__init__.py diff --git a/suppliers_portal/suppliers_portal/doctype/portal_supplier/portal_supplier.js b/suppliers_portal/suppliers_portal/doctype/supplier/supplier.js similarity index 77% rename from suppliers_portal/suppliers_portal/doctype/portal_supplier/portal_supplier.js rename to suppliers_portal/suppliers_portal/doctype/supplier/supplier.js index 8eaefbc..be91dd9 100644 --- a/suppliers_portal/suppliers_portal/doctype/portal_supplier/portal_supplier.js +++ b/suppliers_portal/suppliers_portal/doctype/supplier/supplier.js @@ -1,7 +1,7 @@ // Copyright (c) 2024, jeowsome15@gmail.com and contributors // For license information, please see license.txt -// frappe.ui.form.on("Portal Supplier", { +// frappe.ui.form.on("Supplier", { // refresh(frm) { // }, diff --git a/suppliers_portal/suppliers_portal/doctype/portal_supplier/portal_supplier.json b/suppliers_portal/suppliers_portal/doctype/supplier/supplier.json similarity index 98% rename from suppliers_portal/suppliers_portal/doctype/portal_supplier/portal_supplier.json rename to suppliers_portal/suppliers_portal/doctype/supplier/supplier.json index e503f38..8c606bf 100644 --- a/suppliers_portal/suppliers_portal/doctype/portal_supplier/portal_supplier.json +++ b/suppliers_portal/suppliers_portal/doctype/supplier/supplier.json @@ -62,7 +62,7 @@ "modified": "2024-09-28 02:13:04.095973", "modified_by": "Administrator", "module": "Suppliers Portal", - "name": "Portal Supplier", + "name": "Supplier", "owner": "Administrator", "permissions": [ { diff --git a/suppliers_portal/suppliers_portal/doctype/portal_supplier/portal_supplier.py b/suppliers_portal/suppliers_portal/doctype/supplier/supplier.py similarity index 90% rename from suppliers_portal/suppliers_portal/doctype/portal_supplier/portal_supplier.py rename to suppliers_portal/suppliers_portal/doctype/supplier/supplier.py index d4de5ae..0da8034 100644 --- a/suppliers_portal/suppliers_portal/doctype/portal_supplier/portal_supplier.py +++ b/suppliers_portal/suppliers_portal/doctype/supplier/supplier.py @@ -7,12 +7,12 @@ import frappe from frappe.model.document import Document -class PortalSupplier(Document): +class Supplier(Document): def generate_supplier_id(self, length: int = 8) -> str: # generate unique supplier integer id based on length supplier_id = random.randint(10 ** (length - 1), 10**length - 1) - while frappe.db.exists("Portal Supplier", {"supplier_id": supplier_id}): + while frappe.db.exists("Supplier", {"supplier_id": supplier_id}): supplier_id = random.randint(10 ** (length - 1), 10**length - 1) return str(supplier_id) diff --git a/suppliers_portal/suppliers_portal/doctype/portal_supplier/templates/portal_supplier.html b/suppliers_portal/suppliers_portal/doctype/supplier/templates/portal_supplier.html similarity index 100% rename from suppliers_portal/suppliers_portal/doctype/portal_supplier/templates/portal_supplier.html rename to suppliers_portal/suppliers_portal/doctype/supplier/templates/portal_supplier.html diff --git a/suppliers_portal/suppliers_portal/doctype/portal_supplier/templates/portal_supplier_row.html b/suppliers_portal/suppliers_portal/doctype/supplier/templates/portal_supplier_row.html similarity index 100% rename from suppliers_portal/suppliers_portal/doctype/portal_supplier/templates/portal_supplier_row.html rename to suppliers_portal/suppliers_portal/doctype/supplier/templates/portal_supplier_row.html diff --git a/suppliers_portal/suppliers_portal/doctype/portal_supplier/test_portal_supplier.py b/suppliers_portal/suppliers_portal/doctype/supplier/test_supplier.py similarity index 78% rename from suppliers_portal/suppliers_portal/doctype/portal_supplier/test_portal_supplier.py rename to suppliers_portal/suppliers_portal/doctype/supplier/test_supplier.py index 5a11b09..03d842c 100644 --- a/suppliers_portal/suppliers_portal/doctype/portal_supplier/test_portal_supplier.py +++ b/suppliers_portal/suppliers_portal/doctype/supplier/test_supplier.py @@ -5,5 +5,5 @@ from frappe.tests.utils import FrappeTestCase -class TestPortalSupplier(FrappeTestCase): +class TestSupplier(FrappeTestCase): pass diff --git a/suppliers_portal/suppliers_portal/doctype/supplier_portal_invoices/supplier_portal_invoices.json b/suppliers_portal/suppliers_portal/doctype/supplier_portal_invoices/supplier_portal_invoices.json index 9760c2e..465f78c 100644 --- a/suppliers_portal/suppliers_portal/doctype/supplier_portal_invoices/supplier_portal_invoices.json +++ b/suppliers_portal/suppliers_portal/doctype/supplier_portal_invoices/supplier_portal_invoices.json @@ -36,7 +36,7 @@ "fieldname": "supplier", "fieldtype": "Link", "label": "Supplier ID", - "options": "Portal Supplier" + "options": "Supplier" }, { "fieldname": "supplier_invoice_number", @@ -168,7 +168,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2024-10-02 16:26:51.407319", + "modified": "2024-10-05 02:26:32.725807", "modified_by": "Administrator", "module": "Suppliers Portal", "name": "Supplier Portal Invoices", diff --git a/suppliers_portal/suppliers_portal/workspace/suppliers_portal/suppliers_portal.json b/suppliers_portal/suppliers_portal/workspace/suppliers_portal/suppliers_portal.json index 2021335..13b5f18 100644 --- a/suppliers_portal/suppliers_portal/workspace/suppliers_portal/suppliers_portal.json +++ b/suppliers_portal/suppliers_portal/workspace/suppliers_portal/suppliers_portal.json @@ -1,7 +1,7 @@ { "app": "Suppliers Portal", "charts": [], - "content": "[{\"id\":\"Lix3qbsE_H\",\"type\":\"header\",\"data\":{\"text\":\"Suppliers Portal\",\"col\":12}},{\"id\":\"OdX-YH0tro\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Portal Supplier\",\"col\":4}},{\"id\":\"_vl927eRbo\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Supplier Portal Invoices\",\"col\":4}}]", + "content": "[{\"id\":\"Lix3qbsE_H\",\"type\":\"header\",\"data\":{\"text\":\"Suppliers Portal\",\"col\":12}},{\"id\":\"OdX-YH0tro\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Supplier\",\"col\":4}},{\"id\":\"_vl927eRbo\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Supplier Portal Invoices\",\"col\":4}}]", "creation": "2024-10-02 17:23:06.804441", "custom_blocks": [], "docstatus": 0, @@ -29,8 +29,8 @@ { "color": "Grey", "doc_view": "List", - "label": "Portal Supplier", - "link_to": "Portal Supplier", + "label": "Supplier", + "link_to": "Supplier", "stats_filter": "[]", "type": "DocType" }, diff --git a/suppliers_portal/utils.py b/suppliers_portal/utils.py new file mode 100644 index 0000000..7a82d40 --- /dev/null +++ b/suppliers_portal/utils.py @@ -0,0 +1,6 @@ +def before_request(request, method, url, headers): + print("Before Request") + print(request) + print(method) + print(url) + print(headers)