Changes for Rollup (#12924)
* Changes for rollup
* remove variables.less
diff --git a/erpnext/public/build.json b/erpnext/public/build.json
index 21cd289..0ce5c75 100644
--- a/erpnext/public/build.json
+++ b/erpnext/public/build.json
@@ -1,6 +1,6 @@
{
"css/erpnext.css": [
- "public/css/erpnext.css"
+ "public/less/erpnext.less"
],
"js/erpnext-web.min.js": [
"public/js/website_utils.js",
diff --git a/erpnext/public/js/shopping_cart.js b/erpnext/public/js/shopping_cart.js
index 0a3e0af..7755141 100644
--- a/erpnext/public/js/shopping_cart.js
+++ b/erpnext/public/js/shopping_cart.js
@@ -64,7 +64,7 @@
},
set_cart_count: function() {
- var cart_count = getCookie("cart_count");
+ var cart_count = frappe.get_cookie("cart_count");
if(frappe.session.user==="Guest") {
cart_count = 0;
}
diff --git a/erpnext/public/less/erpnext.less b/erpnext/public/less/erpnext.less
index 262b0c3..711a40a 100644
--- a/erpnext/public/less/erpnext.less
+++ b/erpnext/public/less/erpnext.less
@@ -1,4 +1,4 @@
-@import "../../../../frappe/frappe/public/less/variables.less";
+@import "variables.less";
.erpnext-footer {
margin: 11px auto;
diff --git a/erpnext/templates/includes/projects/project_search_box.html b/erpnext/templates/includes/projects/project_search_box.html
index 96eb10c..6f53bae 100644
--- a/erpnext/templates/includes/projects/project_search_box.html
+++ b/erpnext/templates/includes/projects/project_search_box.html
@@ -11,8 +11,8 @@
<script>
frappe.ready(function() {
- if(get_url_arg("q")){
- var txt = get_url_arg("q");
+ if(frappe.utils.get_url_arg("q")){
+ var txt = frappe.utils.get_url_arg("q");
$(".project-search-results").html("Search results for : " + encodeURIComponent(txt));
$(".clear").toggle(true);
}
diff --git a/erpnext/templates/pages/product_search.html b/erpnext/templates/pages/product_search.html
index d00f535..fe0d7aa 100644
--- a/erpnext/templates/pages/product_search.html
+++ b/erpnext/templates/pages/product_search.html
@@ -9,7 +9,7 @@
<script>
frappe.ready(function() {
- var txt = get_url_arg("search");
+ var txt = frappe.utils.get_url_arg("search");
$(".search-results").html("{{ _('Search results for') }}: " + encodeURIComponent(txt));
window.search = txt;
window.start = 0;