chore: Adjust to ESbuild and missing imports

- update erpnext web bundle and tweak to fit new build system
- change page id in scss due to change in v14 router
- add missing imports
This commit is contained in:
marination 2022-02-01 00:03:08 +05:30
parent bba31a37f4
commit b2b827f50f
6 changed files with 28 additions and 25 deletions

View File

@ -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(

View File

@ -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();
});
}
prepare_view_toggler() {
@ -103,28 +101,24 @@ 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
});
});
}
render_list_view(items, settings) {
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
});
});
}
prepare_product_area_wrapper(view) {

View File

@ -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";

View File

@ -244,7 +244,7 @@ body.product-page {
}
[data-doctype="Item Group"],
#page-all-products {
#page-index {
.page-header {
font-size: 20px;
font-weight: 700;

View File

@ -73,6 +73,7 @@
{% block base_scripts %}
<!-- js should be loaded in body! -->
<script type="text/javascript" src="/assets/frappe/js/lib/jquery/jquery.min.js"></script>
{{ include_script("frappe-web.bundle.js") }}
{{ include_script("controls.bundle.js") }}
{{ include_script("dialog.bundle.js") }}

View File

@ -8,13 +8,11 @@ $(() => {
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
});
});
this.bind_card_actions();
}