diff --git a/erpnext/e_commerce/doctype/website_item/website_item.py b/erpnext/e_commerce/doctype/website_item/website_item.py index 475744ad989..bb5149c622f 100644 --- a/erpnext/e_commerce/doctype/website_item/website_item.py +++ b/erpnext/e_commerce/doctype/website_item/website_item.py @@ -11,13 +11,18 @@ from frappe.website.website_generator import WebsiteGenerator from frappe.utils import cstr, random_string, cint, flt from frappe.website.doctype.website_slideshow.website_slideshow import get_slideshow -from erpnext.setup.doctype.item_group.item_group import (get_parent_item_groups, invalidate_cache_for) from erpnext.e_commerce.doctype.item_review.item_review import get_item_reviews from erpnext.e_commerce.redisearch import ( insert_item_to_index, update_index_for_item, delete_item_from_index ) +from erpnext.e_commerce.shopping_cart.cart import _set_price_list +from erpnext.setup.doctype.item_group.item_group import ( + get_parent_item_groups, + invalidate_cache_for +) +from erpnext.utilities.product import get_price class WebsiteItem(WebsiteGenerator): website = frappe._dict( diff --git a/erpnext/e_commerce/product_ui/views.js b/erpnext/e_commerce/product_ui/views.js index 99b91afac17..1b5c44038f3 100644 --- a/erpnext/e_commerce/product_ui/views.js +++ b/erpnext/e_commerce/product_ui/views.js @@ -24,9 +24,7 @@ erpnext.ProductView = class { this.prepare_search(); this.prepare_view_toggler(); - frappe.require('/assets/js/e-commerce.min.js', function() { - new erpnext.ProductSearch(); - }); + new erpnext.ProductSearch(); } prepare_view_toggler() { @@ -103,13 +101,11 @@ erpnext.ProductView = class { let me = this; this.prepare_product_area_wrapper("grid"); - frappe.require('/assets/js/e-commerce.min.js', function() { - new erpnext.ProductGrid({ - items: items, - products_section: $("#products-grid-area"), - settings: settings, - preference: me.preference - }); + new erpnext.ProductGrid({ + items: items, + products_section: $("#products-grid-area"), + settings: settings, + preference: me.preference }); } @@ -117,13 +113,11 @@ erpnext.ProductView = class { let me = this; this.prepare_product_area_wrapper("list"); - frappe.require('/assets/js/e-commerce.min.js', function() { - new erpnext.ProductList({ - items: items, - products_section: $("#products-list-area"), - settings: settings, - preference: me.preference - }); + new erpnext.ProductList({ + items: items, + products_section: $("#products-list-area"), + settings: settings, + preference: me.preference }); } diff --git a/erpnext/public/js/erpnext-web.bundle.js b/erpnext/public/js/erpnext-web.bundle.js index 7db69679236..a40a70cfb59 100644 --- a/erpnext/public/js/erpnext-web.bundle.js +++ b/erpnext/public/js/erpnext-web.bundle.js @@ -1,2 +1,7 @@ import "./website_utils"; import "./shopping_cart"; +import "./wishlist"; +import "../../e_commerce/product_ui/list"; +import "../../e_commerce/product_ui/views"; +import "../../e_commerce/product_ui/grid"; +import "../../e_commerce/product_ui/search"; \ No newline at end of file diff --git a/erpnext/public/scss/shopping_cart.scss b/erpnext/public/scss/shopping_cart.scss index 429f4ca35df..a6e8db6b0bc 100644 --- a/erpnext/public/scss/shopping_cart.scss +++ b/erpnext/public/scss/shopping_cart.scss @@ -244,7 +244,7 @@ body.product-page { } [data-doctype="Item Group"], -#page-all-products { +#page-index { .page-header { font-size: 20px; font-weight: 700; diff --git a/erpnext/templates/generators/item/item.html b/erpnext/templates/generators/item/item.html index e19cfb0b462..4070d40d47e 100644 --- a/erpnext/templates/generators/item/item.html +++ b/erpnext/templates/generators/item/item.html @@ -73,6 +73,7 @@ {% block base_scripts %} + {{ include_script("frappe-web.bundle.js") }} {{ include_script("controls.bundle.js") }} {{ include_script("dialog.bundle.js") }} diff --git a/erpnext/www/all-products/index.js b/erpnext/www/all-products/index.js index 7653bd5c96b..98a84415252 100644 --- a/erpnext/www/all-products/index.js +++ b/erpnext/www/all-products/index.js @@ -8,12 +8,10 @@ $(() => { let view_type = localStorage.getItem("product_view") || "List View"; // Render Product Views, Filters & Search - frappe.require('/assets/js/e-commerce.min.js', function() { - new erpnext.ProductView({ - view_type: view_type, - products_section: $('#product-listing'), - item_group: me.item_group - }); + new erpnext.ProductView({ + view_type: view_type, + products_section: $('#product-listing'), + item_group: me.item_group }); this.bind_card_actions();