commit 3d76686b82e49b35456fdf825781c3d80a1ccdeb
author Rushabh Mehta <rmehta@gmail.com> Wed Sep 16 18:52:52 2015 +0530
committer Rushabh Mehta <rmehta@gmail.com> Wed Sep 23 12:49:16 2015 +0530
tree 2598946ef681b928563d2ec7b95f9b118354d147
parent 156ce607e2a4051ddd47b603204a10574103c55f

[shopping-cart] cart via Jinja WIP

erpnext/templates/pages/order.html

diff --git a/erpnext/templates/pages/order.html b/erpnext/templates/pages/order.html
index c3bca5b..7376392 100644
--- a/erpnext/templates/pages/order.html
+++ b/erpnext/templates/pages/order.html
@@ -3,11 +3,11 @@
 <!-- <h6 class="text-muted">{{ doc._title or doc.doctype }}</h6> -->
 {% endblock %}
 
-{% block style %}{% include "templates/includes/order.css" %}{% endblock %}
+{% block style %}{% include "templates/includes/order/order.css" %}{% endblock %}
 
 {% block content %}
 
-{% from "erpnext/templates/includes/macros.html" import item_name_and_description %}
+{% from "erpnext/templates/includes/order/order_macros.html" import item_name_and_description %}
 
 <div class="row">
     <div class="col-xs-6">
@@ -64,25 +64,7 @@
     <div class="order-taxes row small">
         <div class="col-sm-8"><!-- empty --></div>
         <div class="col-sm-4">
-            {% if doc.taxes %}
-            <div class="row">
-                <div class="col-xs-6 text-right">{{ _("Net Total") }}</div>
-                <div class="col-xs-6 text-right">
-                    {{ doc.get_formatted("net_total") }}</div>
-            </div>
-            {% endif %}
-            {% for d in doc.taxes %}
-            <div class="row">
-                <div class="col-xs-6 text-right">{{ d.description }}</div>
-                <div class="col-xs-6 text-right">
-                    {{ d.get_formatted("total") }}</div>
-            </div>
-            {% endfor %}
-            <div class="row">
-                <div class="col-xs-6 text-right">{{ _("Grand Total") }}</div>
-                <div class="col-xs-6 text-right">
-                    {{ doc.get_formatted("grand_total") }}</div>
-            </div>
+            {% include "erpnext/templates/includes/order/order_taxes.html" %}
         </div>
     </div>
 </div>