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

[fix] cart and general leger report

Browse Source
This commit is contained in:
Rushabh Mehta
2015-07-10 10:11:07 +05:30
parent ccb9117ba5
commit fc3d87181a
3 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
{% block title %} {{ "Shopping Cart" }} {% endblock %}
{% block header %}<h2><i class="icon-shopping-cart"></i> Shopping Cart</h2>{% endblock %}
{% block header %}<h2>{{ _("My Cart") }}</h2>{% endblock %}
{% block script %}{% include "templates/includes/cart.js" %}{% endblock %}
@@ -8,17 +8,18 @@
<div class="cart-content">
<div class="text-muted progress">{{ _("Loading") }}...</div>
<div id="cart-container" class="hide">
<p class="pull-right"><button class="btn btn-success btn-place-order" type="button">Place Order</button></p>
<p class="pull-right"><button class="btn btn-success btn-place-order" type="button">
{{ _("Place Order") }}</button></p>
<div class="clearfix"></div>
<div id="cart-error" class="alert alert-danger" style="display: none;"></div>
<hr>
<div class="row">
<div class="col-md-9 col-sm-9">
<div class="row">
<div class="col-md-9 col-md-offset-3"><h4>Item Details</h4></div>
<div class="col-md-9 col-md-offset-3"><h4>{{ _("Item Details") }}</h4></div>
</div>
</div>
<div class="col-md-3 col-sm-3 text-right"><h4>Qty, Amount</h4></div>
<div class="col-md-3 col-sm-3 text-right"><h4>{{ _("Qty, Amount") }}</h4></div>
</div><hr>
<div id="cart-items">
</div>
@@ -30,26 +31,26 @@
<div id="cart-addresses">
<div class="row">
<div class="col-md-6">
<h4>Shipping Address</h4>
<h4>{{ _("Shipping Address") }}</h4>
<div id="cart-shipping-address" class="panel-group"
data-fieldname="shipping_address_name"></div>
<button class="btn btn-default" type="button" id="cart-add-shipping-address">
<span class="icon icon-plus"></span> New Shipping Address</button>
<span class="icon icon-plus"></span> {{ _("New Shipping Address") }}</button>
</div>
<div class="col-md-6">
<h4>Billing Address</h4>
<div id="cart-billing-address" class="panel-group"
data-fieldname="customer_address"></div>
<button class="btn btn-default" type="button" id="cart-add-billing-address">
<span class="icon icon-plus"></span> New Billing Address</button>
<span class="icon icon-plus"></span> {{ _("New Billing Address") }}</button>
</div>
</div>
<hr>
</div>
<p class="pull-right"><button class="btn btn-success btn-place-order" type="button">Place Order</button></p>
<p class="pull-right"><button class="btn btn-success btn-place-order" type="button">
{{ _("Place Order") }}</button></p>
</div>
</div>
<!-- no-sidebar -->
{% endblock %}