From de87786db4f742c807edc84a586e467895bd827b Mon Sep 17 00:00:00 2001 From: Sabu Siyad Date: Sat, 11 Feb 2023 12:28:42 +0530 Subject: [PATCH 1/2] fix(ecommerce): throw invalid doctype error in shop by category (#33901) Co-authored-by: Deepesh Garg (cherry picked from commit 0df28c71743e2e91924e2c5062778e2e2e680666) # Conflicts: # erpnext/www/shop-by-category/index.py --- erpnext/www/shop-by-category/index.py | 33 +++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/erpnext/www/shop-by-category/index.py b/erpnext/www/shop-by-category/index.py index 7b493c3c288..cf439c98922 100644 --- a/erpnext/www/shop-by-category/index.py +++ b/erpnext/www/shop-by-category/index.py @@ -51,8 +51,9 @@ def get_tabs(categories): return tab_values -def get_category_records(categories): +def get_category_records(categories: list): categorical_data = {} +<<<<<<< HEAD for category in categories: if category == "item_group": categorical_data["item_group"] = frappe.db.sql( @@ -66,13 +67,28 @@ def get_category_records(categories): and show_in_website = 1 """, as_dict=1, +======= + + for c in categories: + if c == "item_group": + categorical_data["item_group"] = frappe.db.get_all( + "Item Group", + filters={"parent_item_group": "All Item Groups", "show_in_website": 1}, + fields=["name", "parent_item_group", "is_group", "image", "route"], +>>>>>>> 0df28c7174 (fix(ecommerce): throw invalid doctype error in shop by category (#33901)) ) - else: - doctype = frappe.unscrub(category) - fields = ["name"] - if frappe.get_meta(doctype, cached=True).get_field("image"): + + continue + + doctype = frappe.unscrub(c) + fields = ["name"] + + try: + meta = frappe.get_meta(doctype, cached=True) + if meta.get_field("image"): fields += ["image"] +<<<<<<< HEAD categorical_data[category] = frappe.db.sql( f""" Select @@ -82,5 +98,12 @@ def get_category_records(categories): """, as_dict=1, ) +======= + data = frappe.db.get_all(doctype, fields=fields) + categorical_data[c] = data + except BaseException: + frappe.throw(_("DocType {} not found").format(doctype)) + continue +>>>>>>> 0df28c7174 (fix(ecommerce): throw invalid doctype error in shop by category (#33901)) return categorical_data From 6ae1cc020a0a5555ab5dd5e7fbc26bd74222e6ab Mon Sep 17 00:00:00 2001 From: Sabu Siyad Date: Tue, 14 Feb 2023 19:34:39 +0530 Subject: [PATCH 2/2] resolve conflicts --- erpnext/www/shop-by-category/index.py | 28 --------------------------- 1 file changed, 28 deletions(-) diff --git a/erpnext/www/shop-by-category/index.py b/erpnext/www/shop-by-category/index.py index cf439c98922..219747c9f8a 100644 --- a/erpnext/www/shop-by-category/index.py +++ b/erpnext/www/shop-by-category/index.py @@ -53,21 +53,6 @@ def get_tabs(categories): def get_category_records(categories: list): categorical_data = {} -<<<<<<< HEAD - for category in categories: - if category == "item_group": - categorical_data["item_group"] = frappe.db.sql( - """ - Select - name, parent_item_group, is_group, image, route - from - `tabItem Group` - where - parent_item_group = 'All Item Groups' - and show_in_website = 1 - """, - as_dict=1, -======= for c in categories: if c == "item_group": @@ -75,7 +60,6 @@ def get_category_records(categories: list): "Item Group", filters={"parent_item_group": "All Item Groups", "show_in_website": 1}, fields=["name", "parent_item_group", "is_group", "image", "route"], ->>>>>>> 0df28c7174 (fix(ecommerce): throw invalid doctype error in shop by category (#33901)) ) continue @@ -88,22 +72,10 @@ def get_category_records(categories: list): if meta.get_field("image"): fields += ["image"] -<<<<<<< HEAD - categorical_data[category] = frappe.db.sql( - f""" - Select - {",".join(fields)} - from - `tab{doctype}` - """, - as_dict=1, - ) -======= data = frappe.db.get_all(doctype, fields=fields) categorical_data[c] = data except BaseException: frappe.throw(_("DocType {} not found").format(doctype)) continue ->>>>>>> 0df28c7174 (fix(ecommerce): throw invalid doctype error in shop by category (#33901)) return categorical_data