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:
parent
bba31a37f4
commit
b2b827f50f
@ -11,13 +11,18 @@ from frappe.website.website_generator import WebsiteGenerator
|
|||||||
from frappe.utils import cstr, random_string, cint, flt
|
from frappe.utils import cstr, random_string, cint, flt
|
||||||
from frappe.website.doctype.website_slideshow.website_slideshow import get_slideshow
|
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.doctype.item_review.item_review import get_item_reviews
|
||||||
from erpnext.e_commerce.redisearch import (
|
from erpnext.e_commerce.redisearch import (
|
||||||
insert_item_to_index,
|
insert_item_to_index,
|
||||||
update_index_for_item,
|
update_index_for_item,
|
||||||
delete_item_from_index
|
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):
|
class WebsiteItem(WebsiteGenerator):
|
||||||
website = frappe._dict(
|
website = frappe._dict(
|
||||||
|
@ -24,9 +24,7 @@ erpnext.ProductView = class {
|
|||||||
this.prepare_search();
|
this.prepare_search();
|
||||||
this.prepare_view_toggler();
|
this.prepare_view_toggler();
|
||||||
|
|
||||||
frappe.require('/assets/js/e-commerce.min.js', function() {
|
new erpnext.ProductSearch();
|
||||||
new erpnext.ProductSearch();
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
prepare_view_toggler() {
|
prepare_view_toggler() {
|
||||||
@ -103,13 +101,11 @@ erpnext.ProductView = class {
|
|||||||
let me = this;
|
let me = this;
|
||||||
this.prepare_product_area_wrapper("grid");
|
this.prepare_product_area_wrapper("grid");
|
||||||
|
|
||||||
frappe.require('/assets/js/e-commerce.min.js', function() {
|
new erpnext.ProductGrid({
|
||||||
new erpnext.ProductGrid({
|
items: items,
|
||||||
items: items,
|
products_section: $("#products-grid-area"),
|
||||||
products_section: $("#products-grid-area"),
|
settings: settings,
|
||||||
settings: settings,
|
preference: me.preference
|
||||||
preference: me.preference
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -117,13 +113,11 @@ erpnext.ProductView = class {
|
|||||||
let me = this;
|
let me = this;
|
||||||
this.prepare_product_area_wrapper("list");
|
this.prepare_product_area_wrapper("list");
|
||||||
|
|
||||||
frappe.require('/assets/js/e-commerce.min.js', function() {
|
new erpnext.ProductList({
|
||||||
new erpnext.ProductList({
|
items: items,
|
||||||
items: items,
|
products_section: $("#products-list-area"),
|
||||||
products_section: $("#products-list-area"),
|
settings: settings,
|
||||||
settings: settings,
|
preference: me.preference
|
||||||
preference: me.preference
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,2 +1,7 @@
|
|||||||
import "./website_utils";
|
import "./website_utils";
|
||||||
import "./shopping_cart";
|
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";
|
@ -244,7 +244,7 @@ body.product-page {
|
|||||||
}
|
}
|
||||||
|
|
||||||
[data-doctype="Item Group"],
|
[data-doctype="Item Group"],
|
||||||
#page-all-products {
|
#page-index {
|
||||||
.page-header {
|
.page-header {
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
|
@ -73,6 +73,7 @@
|
|||||||
|
|
||||||
{% block base_scripts %}
|
{% block base_scripts %}
|
||||||
<!-- js should be loaded in body! -->
|
<!-- 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("frappe-web.bundle.js") }}
|
||||||
{{ include_script("controls.bundle.js") }}
|
{{ include_script("controls.bundle.js") }}
|
||||||
{{ include_script("dialog.bundle.js") }}
|
{{ include_script("dialog.bundle.js") }}
|
||||||
|
@ -8,12 +8,10 @@ $(() => {
|
|||||||
let view_type = localStorage.getItem("product_view") || "List View";
|
let view_type = localStorage.getItem("product_view") || "List View";
|
||||||
|
|
||||||
// Render Product Views, Filters & Search
|
// Render Product Views, Filters & Search
|
||||||
frappe.require('/assets/js/e-commerce.min.js', function() {
|
new erpnext.ProductView({
|
||||||
new erpnext.ProductView({
|
view_type: view_type,
|
||||||
view_type: view_type,
|
products_section: $('#product-listing'),
|
||||||
products_section: $('#product-listing'),
|
item_group: me.item_group
|
||||||
item_group: me.item_group
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
this.bind_card_actions();
|
this.bind_card_actions();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user