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

Merge pull request #26476 from 18alantom/fix-item-group-portal-issues

Browse Source 
fix: item group portal issues
This commit is contained in:
Marica 2021-07-14 17:49:27 +05:30 committed by GitHub
commit 30905e24e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@ import frappe
from frappe.utils import cint from frappe.utils import cint
from erpnext.portal.product_configurator.item_variants_cache import ItemVariantsCacheManager from erpnext.portal.product_configurator.item_variants_cache import ItemVariantsCacheManager
from erpnext.shopping_cart.product_info import get_product_info_for_website from erpnext.shopping_cart.product_info import get_product_info_for_website
from erpnext.setup.doctype.item_group.item_group import get_child_groups
def get_field_filter_data(): def get_field_filter_data():
product_settings = get_product_settings() product_settings = get_product_settings()
@ -89,6 +90,7 @@ def get_products_for_website(field_filters=None, attribute_filters=None, search=
def get_products_html_for_website(field_filters=None, attribute_filters=None): def get_products_html_for_website(field_filters=None, attribute_filters=None):
field_filters = frappe.parse_json(field_filters) field_filters = frappe.parse_json(field_filters)
attribute_filters = frappe.parse_json(attribute_filters) attribute_filters = frappe.parse_json(attribute_filters)
set_item_group_filters(field_filters)
items = get_products_for_website(field_filters, attribute_filters) items = get_products_for_website(field_filters, attribute_filters)
html = ''.join(get_html_for_items(items)) html = ''.join(get_html_for_items(items))
@ -98,6 +100,10 @@ def get_products_html_for_website(field_filters=None, attribute_filters=None):
return html return html
def set_item_group_filters(field_filters):
if 'item_group' in field_filters:
field_filters['item_group'] = [ig[0] for ig in get_child_groups(field_filters['item_group'])]
def get_item_codes_by_attributes(attribute_filters, template_item_code=None): def get_item_codes_by_attributes(attribute_filters, template_item_code=None):
items = [] items = []

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

@ -87,8 +87,8 @@ class ItemGroup(NestedSet, WebsiteGenerator):
if not field_filters: if not field_filters:
field_filters = {} field_filters = {}
# Ensure the query remains within current item group # Ensure the query remains within current item group & sub group
field_filters['item_group'] = self.name field_filters['item_group'] = [ig[0] for ig in get_child_groups(self.name)]
engine = ProductQuery() engine = ProductQuery()
context.items = engine.query(attribute_filters, field_filters, search, start, item_group=self.name) context.items = engine.query(attribute_filters, field_filters, search, start, item_group=self.name)

2
erpnext/templates/generators/item_group.html
View File

@ -9,7 +9,7 @@
{% endblock %} {% endblock %}
{% block page_content %} {% block page_content %}
<div class="item-group-content" itemscope itemtype="http://schema.org/Product"> <div class="item-group-content" itemscope itemtype="http://schema.org/Product" data-item-group="{{ name }}">
<div class="item-group-slideshow"> <div class="item-group-slideshow">
{% if slideshow %}<!-- slideshow --> {% if slideshow %}<!-- slideshow -->
{{ web_block( {{ web_block(

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

@ -124,6 +124,10 @@ $(() => {
attribute_filters: if_key_exists(attribute_filters) attribute_filters: if_key_exists(attribute_filters)
}; };
const item_group = $(".item-group-content").data('item-group');
if (item_group) {
Object.assign(field_filters, { item_group });
}
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
frappe.call('erpnext.portal.product_configurator.utils.get_products_html_for_website', args) frappe.call('erpnext.portal.product_configurator.utils.get_products_html_for_website', args)
.then(r => { .then(r => {