Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Mixin import issue, search error handling, shop-by-category slideshow

Browse Source
This commit is contained in:
marination 2021-06-08 14:47:11 +05:30
parent 0c73f688e9
commit 24ba06c37b
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/e_commerce/website_item_indexing.py
View File

@ -60,7 +60,8 @@ def create_website_items_index():
idx_fields = frappe.db.get_single_value( idx_fields = frappe.db.get_single_value(
'E Commerce Settings', 'E Commerce Settings',
'search_index_fields' 'search_index_fields'
).split(',') )
idx_fields = idx_fields.split(',') if idx_fields else []
if 'web_item_name' in idx_fields: if 'web_item_name' in idx_fields:
idx_fields.remove('web_item_name') idx_fields.remove('web_item_name')
@ -192,7 +193,8 @@ def get_fields_indexed():
fields_to_index = frappe.db.get_single_value( fields_to_index = frappe.db.get_single_value(
'E Commerce Settings', 'E Commerce Settings',
'search_index_fields' 'search_index_fields'
).split(',') )
fields_to_index = fields_to_index.split(',') if fields_to_index else []
mandatory_fields = ['name', 'web_item_name', 'route', 'thumbnail'] mandatory_fields = ['name', 'web_item_name', 'route', 'thumbnail']
fields_to_index = fields_to_index + mandatory_fields fields_to_index = fields_to_index + mandatory_fields

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

@ -486,7 +486,7 @@ body.product-page {
font-weight: 500; font-weight: 500;
display: none; display: none;
@include media-breakpoint-between(xs, md) { @media (max-width: 992px) {
display: unset !important; display: unset !important;
} }
} }
@ -510,14 +510,14 @@ body.product-page {
} }
.column-sm-view { .column-sm-view {
@include media-breakpoint-between(xs, md) { @media (max-width: 992px) {
display: none !important; display: none !important;
} }
} }
.item-column { .item-column {
width: 50%; width: 50%;
@include media-breakpoint-between(xs, md) { @media (max-width: 992px) {
width: 70%; width: 70%;
} }
} }
@ -539,7 +539,7 @@ body.product-page {
.totals { .totals {
padding-right: 4rem; padding-right: 4rem;
@include media-breakpoint-between(xs, md) { @media (max-width: 992px) {
padding-right: 1rem; padding-right: 1rem;
} }
} }

12
erpnext/www/shop-by-category/index.py
View File

@ -26,12 +26,12 @@ def get_slideshow(slideshow):
slideshow = frappe.get_cached_doc("Website Slideshow", slideshow) slideshow = frappe.get_cached_doc("Website Slideshow", slideshow)
slides = slideshow.get({"doctype": "Website Slideshow Item"}) slides = slideshow.get({"doctype": "Website Slideshow Item"})
for index, slide in enumerate(slides, start=1): for index, slide in enumerate(slides, start=1):
values[f"slide_{index + 1}_image"] = slide.image values[f"slide_{index}_image"] = slide.image
values[f"slide_{index + 1}_title"] = slide.heading values[f"slide_{index}_title"] = slide.heading
values[f"slide_{index + 1}_subtitle"] = slide.description values[f"slide_{index}_subtitle"] = slide.description
values[f"slide_{index + 1}_theme"] = slide.get("theme") or "Light" values[f"slide_{index}_theme"] = slide.get("theme") or "Light"
values[f"slide_{index + 1}_content_align"] = slide.get("content_align") or "Centre" values[f"slide_{index}_content_align"] = slide.get("content_align") or "Centre"
values[f"slide_{index + 1}_primary_action"] = slide.url values[f"slide_{index}_primary_action"] = slide.url
return values return values