schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #28098 from marination/so-quote-portal

Browse Source 
fix: SO/Quotation Portal Missing Images
This commit is contained in:
Marica
2021-10-28 00:16:07 +05:30
committed by GitHub
parent 5388ecf85e dd2dba6f01
commit a19f0f484c
3 changed files with 213 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -459,6 +459,7 @@ body.product-page {
min-height: 0px;
.r-item-image {
min-height: 100px;
width: 40%;
.r-product-image {
@@ -480,6 +481,7 @@ body.product-page {
.r-item-info {
font-size: 14px;
padding-right: 0;
padding-left: 10px;
width: 60%;
a {
@@ -672,18 +674,6 @@ body.product-page {
img {
max-height: 112px;
}
.no-image-cart-item {
max-height: 112px;
display: flex; justify-content: center;
background-color: var(--gray-200);
align-items: center;
color: var(--gray-400);
margin-top: .15rem;
border-radius: 6px;
height: 100%;
font-size: 24px;
}
}
.cart-items {
@@ -862,6 +852,18 @@ body.product-page {
}
}
.no-image-cart-item {
max-height: 112px;
display: flex; justify-content: center;
background-color: var(--gray-200);
align-items: center;
color: var(--gray-400);
margin-top: .15rem;
border-radius: 6px;
height: 100%;
font-size: 24px;
}
.cart-empty.frappe-card {
min-height: 76vh;
@include flex(flex, center, center, column);

10
erpnext/templates/includes/order/order_macros.html
View File

@@ -1,10 +1,16 @@
{% from "erpnext/templates/includes/macros.html" import product_image_square %}
{% from "erpnext/templates/includes/macros.html" import product_image %}
{% macro item_name_and_description(d) %}
<div class="row item_name_and_description">
<div class="col-xs-4 col-sm-2 order-image-col">
<div class="order-image">
{{ product_image_square(d.thumbnail or d.image) }}
{% if d.thumbnail or d.image %}
{{ product_image(d.thumbnail or d.image, no_border=True) }}
{% else %}
<div class="no-image-cart-item" style="min-height: 100px;">
{{ frappe.utils.get_abbr(d.item_name) or "NA" }}
</div>
{% endif %}
</div>
</div>
<div class="col-xs-8 col-sm-10">

56
erpnext/templates/pages/order.html
View File

@@ -12,9 +12,9 @@
{% endblock %}
{% block header_actions %}
<div class="dropdown">
<div class="dropdown">
<button class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<span>{{ _('Actions') }}</span>
<span class="font-md">{{ _('Actions') }}</span>
<b class="caret"></b>
</button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
@@ -26,15 +26,13 @@
{{ _("Print") }}
</a>
</ul>
</div>
</div>
{% endblock %}
{% block page_content %}
<div class="row transaction-subheading">
<div class="row transaction-subheading">
<div class="col-6">
<span class="indicator-pill {{ doc.indicator_color or ("blue" if doc.docstatus==1 else "darkgrey") }}">
<span class="font-md indicator-pill {{ doc.indicator_color or ("blue" if doc.docstatus==1 else "darkgrey") }}">
{% if doc.doctype == "Quotation" and not doc.docstatus %}
{{ _("Pending") }}
{% else %}
@@ -50,9 +48,9 @@
</p>
{% endif %}
</div>
</div>
</div>
<p class="small my-3">
<p class="small my-3">
{%- set party_name = doc.supplier_name if doc.doctype in ['Supplier Quotation', 'Purchase Invoice', 'Purchase Order'] else doc.customer_name %}
<b>{{ party_name }}</b>
@@ -60,13 +58,13 @@
<br>
{{ doc.contact_display }}
{% endif %}
</p>
</p>
{% if doc._header %}
{{ doc._header }}
{% endif %}
{% if doc._header %}
{{ doc._header }}
{% endif %}
<div class="order-container">
<div class="order-container">
<!-- items -->
<table class="order-item-table w-100 table">
<thead class="order-items order-item-header">
@@ -106,12 +104,11 @@
{% include "erpnext/templates/includes/order/order_taxes.html" %}
</table>
</div>
</div>
</div>
{% if enabled_checkout and ((doc.doctype=="Sales Order" and doc.per_billed <= 0)
{% if enabled_checkout and ((doc.doctype=="Sales Order" and doc.per_billed <= 0)
or (doc.doctype=="Sales Invoice" and doc.outstanding_amount > 0)) %}
<div class="panel panel-default">
<div class="panel panel-default">
<div class="panel-heading">
<div class="row">
<div class="form-column col-sm-6 address-title">
@@ -153,12 +150,12 @@
</div>
</div>
</div>
{% endif %}
</div>
{% endif %}
{% if attachments %}
<div class="order-item-table">
{% if attachments %}
<div class="order-item-table">
<div class="row order-items order-item-header text-muted">
<div class="col-sm-12 h6 text-uppercase">
{{ _("Attachments") }}
@@ -173,14 +170,15 @@
{% endfor %}
</div>
</div>
</div>
{% endif %}
</div>
{% if doc.terms %}
<div class="terms-and-condition text-muted small">
</div>
{% endif %}
</div>
{% if doc.terms %}
<div class="terms-and-condition text-muted small">
<hr><p>{{ doc.terms }}</p>
</div>
{% endif %}
</div>
{% endif %}
{% endblock %}
{% block script %}