Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19869 from nextchamp-saqib/website-fix

Browse Source 
fix: website showing disabled items in list of products
This commit is contained in:
Deepesh Garg 2019-12-20 12:14:12 +05:30 committed by GitHub
commit 7043bbd19e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/portal/product_configurator/utils.py
View File

@ -52,7 +52,6 @@ def get_attribute_filter_data():
def get_products_for_website(field_filters=None, attribute_filters=None, search=None): def get_products_for_website(field_filters=None, attribute_filters=None, search=None):
if attribute_filters: if attribute_filters:
item_codes = get_item_codes_by_attributes(attribute_filters) item_codes = get_item_codes_by_attributes(attribute_filters)
items_by_attributes = get_items([['name', 'in', item_codes]]) items_by_attributes = get_items([['name', 'in', item_codes]])
@ -302,6 +301,8 @@ def get_items(filters=None, search=None):
if isinstance(filters, dict): if isinstance(filters, dict):
filters = [['Item', fieldname, '=', value] for fieldname, value in filters.items()] filters = [['Item', fieldname, '=', value] for fieldname, value in filters.items()]
enabled_items_filter = get_conditions({ 'disabled': 0 }, 'and')
show_in_website_condition = '' show_in_website_condition = ''
if products_settings.hide_variants: if products_settings.hide_variants:
show_in_website_condition = get_conditions({'show_in_website': 1 }, 'and') show_in_website_condition = get_conditions({'show_in_website': 1 }, 'and')
@ -337,7 +338,8 @@ def get_items(filters=None, search=None):
filter_condition = get_conditions(filters, 'and') filter_condition = get_conditions(filters, 'and')
where_conditions = ' and '.join( where_conditions = ' and '.join(
[condition for condition in [show_in_website_condition, search_condition, filter_condition] if condition] [condition for condition in [enabled_items_filter, show_in_website_condition, \
search_condition, filter_condition] if condition]
) )
left_joins = [] left_joins = []