nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 04:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: product query issues

Browse Source
This commit is contained in:
prssanna
2021-01-20 17:44:08 +05:30
parent 45a56288bb
commit 599322871a
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/setup/doctype/item_group/item_group.py
View File

@@ -77,10 +77,12 @@ class ItemGroup(NestedSet, WebsiteGenerator):
search = frappe.form_dict.search search = frappe.form_dict.search
field_filters = frappe.parse_json(frappe.form_dict.field_filters) field_filters = frappe.parse_json(frappe.form_dict.field_filters)
attribute_filters = frappe.parse_json(frappe.form_dict.attribute_filters) attribute_filters = frappe.parse_json(frappe.form_dict.attribute_filters)
start = frappe.parse_json(frappe.form_dict.start)
else: else:
search = None search = None
attribute_filters = None attribute_filters = None
field_filters = {} field_filters = {}
start = 0
if not field_filters: if not field_filters:
field_filters = {} field_filters = {}
@@ -89,7 +91,7 @@ class ItemGroup(NestedSet, WebsiteGenerator):
field_filters['item_group'] = self.name field_filters['item_group'] = self.name
engine = ProductQuery() engine = ProductQuery()
context.items = engine.query(attribute_filters, field_filters, search) context.items = engine.query(attribute_filters, field_filters, search, start)
filter_engine = ProductFiltersBuilder(self.name) filter_engine = ProductFiltersBuilder(self.name)

11
erpnext/shopping_cart/product_query.py
View File

@@ -2,6 +2,7 @@
# License: GNU General Public License v3. See license.txt # License: GNU General Public License v3. See license.txt
import frappe import frappe
from erpnext.shopping_cart.product_info import get_product_info_for_website
class ProductQuery: class ProductQuery:
"""Query engine for product listing """Query engine for product listing
@@ -21,7 +22,7 @@ class ProductQuery:
self.settings = frappe.get_doc("Products Settings") self.settings = frappe.get_doc("Products Settings")
self.cart_settings = frappe.get_doc("Shopping Cart Settings") self.cart_settings = frappe.get_doc("Shopping Cart Settings")
self.page_length = self.settings.products_per_page or 20 self.page_length = self.settings.products_per_page or 20
self.fields = ['name', 'item_name', 'website_image', 'variant_of', 'has_variants', 'item_group', 'image', 'web_long_description', 'description', 'route'] self.fields = ['name', 'item_name', 'item_code', 'website_image', 'variant_of', 'has_variants', 'item_group', 'image', 'web_long_description', 'description', 'route']
self.filters = [['show_in_website', '=', 1]] self.filters = [['show_in_website', '=', 1]]
self.or_filters = [] self.or_filters = []
@@ -57,6 +58,8 @@ class ProductQuery:
["Item Variant Attribute", "attribute_value", "in", values], ["Item Variant Attribute", "attribute_value", "in", values],
], ],
or_filters=self.or_filters, or_filters=self.or_filters,
start=start,
limit=self.page_length
) )
items_dict = {item.name: item for item in items} items_dict = {item.name: item for item in items}
@@ -66,7 +69,11 @@ class ProductQuery:
result = [items_dict.get(item) for item in list(set.intersection(*all_items))] result = [items_dict.get(item) for item in list(set.intersection(*all_items))]
else: else:
result = frappe.get_all("Item", fields=self.fields, filters=self.filters, or_filters=self.or_filters, limit=self.page_length) result = frappe.get_all("Item", fields=self.fields, filters=self.filters, or_filters=self.or_filters, start=start, limit=self.page_length)
for item in result:
product_info = get_product_info_for_website(item.item_code, skip_quotation_creation=True).get('product_info')
item.formatted_price = product_info['price'].get('formatted_price') if product_info['price'] else None
return result return result

4
erpnext/www/all-products/index.py
View File

@@ -12,11 +12,13 @@ def get_context(context):
search = frappe.form_dict.search search = frappe.form_dict.search
field_filters = frappe.parse_json(frappe.form_dict.field_filters) field_filters = frappe.parse_json(frappe.form_dict.field_filters)
attribute_filters = frappe.parse_json(frappe.form_dict.attribute_filters) attribute_filters = frappe.parse_json(frappe.form_dict.attribute_filters)
start = frappe.parse_json(frappe.form_dict.start)
else: else:
search = field_filters = attribute_filters = None search = field_filters = attribute_filters = None
start = 0
engine = ProductQuery() engine = ProductQuery()
context.items = engine.query(attribute_filters, field_filters, search) context.items = engine.query(attribute_filters, field_filters, search, start)
product_settings = get_product_settings() product_settings = get_product_settings()
filter_engine = ProductFiltersBuilder() filter_engine = ProductFiltersBuilder()