Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui

erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js

@@ -24,8 +24,8 @@ frappe.ui.form.on('Course Scheduling Tool', {
 							<caption>${__('Following course schedules were created')}</caption>
 							<thead><tr><th>${__("Course")}</th><th>${__("Date")}</th></tr></thead>
 							<tbody>
-								${course_schedules.map(
-									c => `<tr><td><a href="/app/course-schedule/${c.name}">${c.name}</a></td>
+								${course_schedules.map(c =>
+									`<tr><td><a href="/app/course-schedule/${c.name}">${c.name}</a></td>
 									<td>${c.schedule_date}</td></tr>`
 								).join('')}
 							</tbody>

erpnext/public/scss/shopping_cart.scss

@@ -58,7 +58,7 @@ body.product-page {
 	.card-grid {
 		display: grid;
 		grid-gap: 15px;
-		grid-template-columns: repeat(auto-fit, minmax(120px, 1fr));;
+		grid-template-columns: repeat(auto-fit, minmax(120px, 1fr));
 	}
 }
 

erpnext/shopping_cart/search.py

@@ -1,7 +1,6 @@
 import frappe
 from frappe.search.full_text_search import FullTextSearch
 from whoosh.fields import TEXT, ID, KEYWORD, Schema
-from frappe.website.render import render_page
 from frappe.utils import strip_html_tags
 from whoosh.qparser import MultifieldParser, FieldsPlugin, WildcardPlugin
 from whoosh.analysis import StemmingAnalyzer
@@ -52,7 +51,7 @@ class ProductSearch(FullTextSearch):
 
 			if item.web_long_description:
 				content = strip_html_tags(item.web_long_description)
-			elif description:
+			elif item.description:
 				content = strip_html_tags(item.description)
 
 			return frappe._dict(

erpnext/templates/includes/cart.js

@@ -35,7 +35,7 @@ $.extend(shopping_cart, {
 	},
 
 	get_update_address_dialog() {
-		return new frappe.ui.Dialog({
+		let d = new frappe.ui.Dialog({
 			title: "Select Address",
 			fields: [{
 				'fieldtype': 'HTML',
@@ -66,6 +66,8 @@ $.extend(shopping_cart, {
 				});
 			}
 		});
+
+		return d;
 	},
 
 	get_address_template(type) {