nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 12:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Suraj Shetty
2021-02-01 19:52:12 +05:30
parent 1ab79da7d1 ba54c4f1b3
commit 8fef3a3814
8 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js
View File

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

2
erpnext/public/scss/shopping_cart.scss
View File

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

3
erpnext/shopping_cart/search.py
View File

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

4
erpnext/templates/includes/cart.js
View File

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