[minor] [customer login] removed messages, fixes in sale, ticket
diff --git a/website/templates/pages/account.html b/website/templates/pages/account.html
index 9d29589..2a5acf6 100644
--- a/website/templates/pages/account.html
+++ b/website/templates/pages/account.html
@@ -19,7 +19,6 @@
<li style="border-top: 1px solid #ddd"></li>
<li><a href="invoices"><i class="icon-file-text icon-fixed-width"></i> Invoices</a></li>
<li><a href="shipments"><i class="icon-truck icon-fixed-width"></i> Shipments</a></li>
- <li><a href="messages"><i class="icon-comments icon-fixed-width"></i> Messages</a></li>
<li style="border-top: 1px solid #ddd"></li>
<li><a href="server.py?cmd=web_logout"><i class="icon-signout icon-fixed-width"></i>
Logout</a></li>
diff --git a/website/templates/pages/sale.html b/website/templates/pages/sale.html
index c70dcb1..669a380 100644
--- a/website/templates/pages/sale.html
+++ b/website/templates/pages/sale.html
@@ -7,19 +7,18 @@
<ul class="breadcrumb">
<li><a href="index">Home</a></li>
<li><a href="account">My Account</a></li>
- <li><a href="orders">My Orders</a></li>
+ <li><a href="{{ parent_link }}">{{ parent_title }}</a></li>
<li class="active"><i class="icon-file icon-fixed-width"></i> {{ doc.name }}</li>
</ul>
<h3><i class="icon-file icon-fixed-width"></i> {{ doc.name }}</h3>
<hr>
- {%- if doc.status -%}
- <div style="font-size: 13px;">
+ <div>
<div class="row">
- <div class="col-md-2">
- <div class="label">{{ doc.status }}</div>
+ <div class="col-xs-6">
+ {% if doc.status -%}<div class="label label-default">{{ doc.status }}</div>{%- endif %}
</div>
- <div class="col-md-4">
- {{ utils.formatdate(doc.transaction_date) }}
+ <div class="col-xs-6">
+ <span class="pull-right">{{ utils.formatdate(doc.posting_date or doc.transaction_date) }}</span>
</div>
</div>
<br>
@@ -36,7 +35,7 @@
<th>Basic Rate</th>
<th>Amount</th>
</tr>
- {%- for row in doclist.get({"doctype":"Sales Order Item"}) %}
+ {%- for row in doclist.get({"doctype": doc.doctype + " Item"}) %}
<tr>
<td style="width: 3%;">{{ row.idx }}</td>
<td style="width: 20%;">{{ row.item_name }}</td>
@@ -83,6 +82,5 @@
</div>
</div>
</div>
- {%- endif -%}
</div>
{% endblock %}
\ No newline at end of file
diff --git a/website/templates/pages/ticket.html b/website/templates/pages/ticket.html
index 2f85ac0..eeb485a 100644
--- a/website/templates/pages/ticket.html
+++ b/website/templates/pages/ticket.html
@@ -2,6 +2,12 @@
{% set title=doc.name %}
+{% set status_label = {
+ "Open": "label-success",
+ "To Reply": "label-danger",
+ "Closed": "label-default"
+} %}
+
{% block content %}
<div class="col-md-12">
<ul class="breadcrumb">
@@ -13,28 +19,35 @@
<h3><i class="icon-ticket icon-fixed-width"></i> {{ doc.name }}</h3>
<hr>
{%- if doc.status -%}
+ {% if doc.status == "Waiting for Customer" -%}
+ {% set status = "To Reply" %}
+ {% else %}
+ {% set status = doc.status %}
+ {%- endif -%}
<div class="row">
- <div class="col-md-2">
- <div class="label">{{ doc.status }}</div>
+ <div class="col-md-2" style="margin-bottom: 7px;">
+ <span class="label {{ status_label.get(status) or 'label-default' }}">{{ status }}</span>
</div>
- <div class="col-md-7">
- {{ doc.subject }}
+ <div class="col-md-8">
+ <div class="row col-md-12">{{ doc.subject }}</div>
</div>
- <div class="col-md-3">
- {{ utils.formatdate(doc.transaction_date) }}
+ <div class="col-md-2 pull-right">
+ <span class="text-muted">{{ utils.formatdate(doc.creation) }}</span>
</div>
</div>
<br>
<h4>Messages</h4>
{%- if doclist.get({"doctype":"Communication"}) -%}
- <div style="font-size: 13px;">
+ <div>
<table class="table table-bordered table-striped">
<tbody>
{%- for comm in doclist.get({"doctype":"Communication"}) %}
<tr>
<td>
- <h5>{{ comm.sender }} on {{ utils.formatdate(doc.modified) }}</h5>
- <p>{{ comm.content }}</p>
+ <h5 style="text-transform: none">
+ {{ comm.sender }} on {{ utils.formatdate(doc.modified) }}</h5>
+ <p>{{ webnotes.utils.is_html(comm.content) and comm.content or
+ comm.content.replace("\n", "<br>")}}</p>
</td>
</tr>
{% endfor -%}
diff --git a/website/templates/pages/tickets.html b/website/templates/pages/tickets.html
index 248384d..166dbcd 100644
--- a/website/templates/pages/tickets.html
+++ b/website/templates/pages/tickets.html
@@ -16,18 +16,14 @@
$(repl('<a href="{{ page }}?name=%(name)s" class="list-group-item">\
<div class="row">\
+ <div class="col-md-2" style="margin-bottom: 7px;"><span class="label %(label_class)s">\
+ %(status)s</span></div>\
<div class="col-md-8">\
<div class="row col-md-12">%(name)s</div>\
<div class="row col-md-12 text-muted">%(subject)s</div>\
</div>\
- <div class="col-md-4">\
- <div class="pull-left">\
- <span class="label %(label_class)s" \
- style="padding-top: 0.3em; margin-right: 5px;">%(status)s</span>\
- </div>\
- <div class="pull-right">\
- <span class="text-muted">%(creation)s</span>\
- </div>\
+ <div class="col-md-2 pull-right">\
+ <span class="text-muted">%(creation)s</span>\
</div>\
</div>\
</a>', doc)).appendTo($list);