mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-06 13:49:13 +00:00
Merge pull request #19870 from nextchamp-saqib/website-hotfix
fix: website showing disabled items in product list
This commit is contained in:
@@ -302,6 +302,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 +339,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 = []
|
||||||
|
|||||||
Reference in New Issue
Block a user