fix: Issues related to RFQ and Supplier Quotation on Portal (#37565)
fix: RFQ and Supplier Quotation for Portal
diff --git a/erpnext/templates/pages/order.html b/erpnext/templates/pages/order.html
index bc34ad5..97bf487 100644
--- a/erpnext/templates/pages/order.html
+++ b/erpnext/templates/pages/order.html
@@ -1,5 +1,5 @@
{% extends "templates/web.html" %}
-{% from "erpnext/templates/includes/order/order_macros.html" import item_name_and_description %}
+{% from "erpnext/templates/includes/macros.html" import product_image %}
{% block breadcrumbs %}
{% include "templates/includes/breadcrumbs.html" %}
@@ -34,18 +34,6 @@
</a>
</ul>
</div>
- {% if show_pay_button %}
- <div class="form-column col-sm-6">
- <div class="page-header-actions-block" data-html-block="header-actions">
- <p>
- <a href="/api/method/erpnext.accounts.doctype.payment_request.payment_request.make_payment_request?dn={{ doc.name }}&dt={{ doc.doctype }}&submit_doc=1&order_type=Shopping Cart"
- class="btn btn-primary btn-sm" id="pay-for-order">
- {{ _("Pay") }} {{doc.get_formatted("grand_total") }}
- </a>
- </p>
- </div>
- </div>
- {% endif %}
</div>
{% endblock %}
@@ -130,42 +118,6 @@
</div>
</div>
- {% 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-collapse">
- <div class="panel-body text-muted small">
- <div class="row">
- <div class="form-column col-sm-6">
- {% if available_loyalty_points %}
- <div class="panel-heading">
- <div class="row">
- <div class="form-column col-sm-6 address-title">
- <strong>Loyalty Points</strong>
- </div>
- </div>
- </div>
-
- <div class="form-group">
- <div class="h6">Enter Loyalty Points</div>
- <div class="control-input-wrapper">
- <div class="control-input">
- <input class="form-control" type="number" min="0"
- max="{{ available_loyalty_points }}" id="loyalty-point-to-redeem">
- </div>
- <p class="help-box small text-muted d-none d-sm-block"> Available Points: {{
- available_loyalty_points }} </p>
- </div>
- </div>
- {% endif %}
- </div>
- </div>
- </div>
- </div>
- </div>
- {% endif %}
-
-
{% if attachments %}
<div class="order-item-table">
<div class="row order-items order-item-header text-muted">
@@ -193,15 +145,27 @@
{% endif %}
{% endblock %}
-{% block script %}
- <script> {% include "templates/pages/order.js" %}</script>
- <script>
- window.doc_info = {
- customer: '{{doc.customer}}',
- doctype: '{{ doc.doctype }}',
- doctype_name: '{{ doc.name }}',
- grand_total: '{{ doc.grand_total }}',
- currency: '{{ doc.currency }}'
- }
- </script>
-{% endblock %}
\ No newline at end of file
+{% 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 h-100">
+ {% 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">
+ {{ d.item_code }}
+ <div class="text-muted small item-description">
+ {{ html2text(d.description) | truncate(140) }}
+ </div>
+ <span class="text-muted mt-2 d-l-n order-qty">
+ {{ _("Qty ") }}({{ d.get_formatted("qty") }})
+ </span>
+ </div>
+ </div>
+{% endmacro %}
\ No newline at end of file