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

fix(shopping cart): UX Improvements (#21034)

Browse Source 
* fix: nontype error for resolved and moved place order button at bottom left

* fix: removed inline style

* fix: Request for quotation move to lower right

* fix: move buttons

Co-authored-by: Naren <patilnarendra3@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
This commit is contained in:
Vishal Dhayagude 2020-04-07 12:18:47 +05:30 committed by GitHub
parent 24a2c9b978
commit 24e79b14e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/public/scss/website.scss
View File

@ -78,3 +78,7 @@
z-index: 0; z-index: 0;
} }
} }
.place-order-container {
text-align: right;
}

20
erpnext/templates/includes/order/order_taxes.html
View File

@ -10,16 +10,16 @@
{% endif %} {% endif %}
{% for d in doc.taxes %} {% for d in doc.taxes %}
{% if d.base_tax_amount > 0 %} {% if d.base_tax_amount %}
<tr> <tr>
<td class="text-right" colspan="2"> <td class="text-right" colspan="2">
{{ d.description }} {{ d.description }}
</td> </td>
<td class="text-right"> <td class="text-right">
{{ d.get_formatted("base_tax_amount") }} {{ d.get_formatted("base_tax_amount") }}
</td> </td>
</tr> </tr>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% if doc.doctype == 'Quotation' %} {% if doc.doctype == 'Quotation' %}

24
erpnext/templates/pages/cart.html
View File

@ -12,16 +12,6 @@
{% block header_actions %} {% block header_actions %}
{% if doc.items and cart_settings.enable_checkout %}
<button class="btn btn-primary btn-place-order" type="button">
{{ _("Place Order") }}
</button>
{% endif %}
{% if doc.items and not cart_settings.enable_checkout %}
<button class="btn btn-primary btn-request-for-quotation" type="button">
{{ _("Request for Quotation") }}
</button>
{% endif %}
{% endblock %} {% endblock %}
{% block page_content %} {% block page_content %}
@ -55,6 +45,20 @@
<p class="text-muted">{{ _('Your cart is Empty') }}</p> <p class="text-muted">{{ _('Your cart is Empty') }}</p>
{% endif %} {% endif %}
{% if doc.items %}
<div class="place-order-container">
{% if cart_settings.enable_checkout %}
<button class="btn btn-primary btn-place-order" type="button">
{{ _("Place Order") }}
</button>
{% else %}
<button class="btn btn-primary btn-request-for-quotation" type="button">
{{ _("Request for Quotation") }}
</button>
{% endif %}
</div>
{% endif %}
{% if doc.items %} {% if doc.items %}
{% if doc.tc_name %} {% if doc.tc_name %}
<div class="terms-and-conditions-link"> <div class="terms-and-conditions-link">