Merge branch 'develop' into fix-web-portal
diff --git a/erpnext/public/js/erpnext-web.bundle.js b/erpnext/public/js/erpnext-web.bundle.js
index 576abd2..cbe899d 100644
--- a/erpnext/public/js/erpnext-web.bundle.js
+++ b/erpnext/public/js/erpnext-web.bundle.js
@@ -1,7 +1,6 @@
import "./website_utils";
import "./wishlist";
import "./shopping_cart";
-import "./cart";
import "./customer_reviews";
import "../../e_commerce/product_ui/list";
import "../../e_commerce/product_ui/views";
diff --git a/erpnext/public/js/cart.js b/erpnext/templates/pages/cart.js
similarity index 99%
rename from erpnext/public/js/cart.js
rename to erpnext/templates/pages/cart.js
index 69357ee..fb2d159 100644
--- a/erpnext/public/js/cart.js
+++ b/erpnext/templates/pages/cart.js
@@ -1,9 +1,7 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-// js inside blog page
-
-// shopping cart
+// JS exclusive to /cart page
frappe.provide("erpnext.e_commerce.shopping_cart");
var shopping_cart = erpnext.e_commerce.shopping_cart;