@@ -52,9 +52,11 @@ def send_rating_mails(request):
to = shop.get_notification_emails()
bcc = []
else:
- to = ["usenet@diefenba.ch"]
- # to = [order.customer.customer_email]
- bcc = shop.get_notification_emails()
+ to = [order.customer.customer_email]
+ if request.POST.get("bcc"):
+ bcc = shop.get_notification_emails()
+ else:
+ bcc = []
OrderRatingMail.objects.create(order=order)
# text
@@ -77,10 +79,7 @@ def send_rating_mails(request):
mail.attach_alternative(html, "text/html")
# mail.send()
- response = render_to_response("manage/marketing/rating_mails.html", RequestContext(request, {
+ return render_to_response("manage/marketing/rating_mails.html", RequestContext(request, {
"display_orders_sent" : True,
"orders_sent" : orders_sent
- }))
-
- return lfs.core.utils.set_message_to(response, _(u"Rating mails has been sent."))
-
+ }))
\ No newline at end of file
manage/views/marketing/rating_mails.py
@@ -82,6 +82,14 @@ table.lfs-manage-table th {
background-color: #ede9e8;
}
+.padding-top {
+ margin-top: 10px;
+}
+
+.padding-top-large {
+ margin-top: 20px;
+}
+
.middle {
margin-top: 10px;
}
static/css/lfs.manage.css
@@ -3,6 +3,7 @@
{% load lfs_manage_tags %}
{% load lfs_tags %}
+{% block section %}send-rating-mails{% endblock %}
{% block left-slot-wrapper %}{% endblock %}
{% block content %}
@@ -10,17 +11,24 @@
<form action="{% url lfs_send_rating_mails %}"
method="post">
- <input type="checkbox"
- name="test"
- checked = "checked"><label>{% trans "Test" %} ({% trans "The mails will get to the shop notification email adresses" %})</label>
<div>
+ <input type="checkbox"
+ name="test"
+ checked = "checked"><label>{% trans "Test" %} - {% trans "The mails will get to the shop notification email adresses" %}</label>
+ </div>
+ <div>
+ <input type="checkbox"
+ name="bcc"
+ checked = "checked"><label>{% trans "Send copy" %} - {% trans "The mails will also send to the shop notification email adresses (if not in test mode)" %}</label>
+ </div>
+ <div class="padding-top">
<input type="submit"
value='{% trans "Send rating mails" %}' />
</div>
</form>
{% if display_orders_sent %}
- <h2 class="middle">{% trans "Rating mails sent" %}</h2>
+ <h2 class="padding-top-large">{% trans "Rating mails sent" %}</h2>
{% if orders_sent %}
<table class="lfs-manage-table">
<tr>
@@ -78,7 +86,7 @@
{% endfor %}
</table>
{% else %}
- {% trans "No orders have been sent" %}
+ {% trans "No e-mails have been sent" %}
{% endif %}
{% endif %}
templates/manage/marketing/rating_mails.html
@@ -139,7 +139,7 @@
{% trans 'State' %}:
</td>
<td>
- {{current_order.get_state_display}} ({{ current_order.state_modified|date:_("DATETIME_FORMAT") }})
+ {{current_order.get_state_display}} {% if current_order.state_modified %}({{ current_order.state_modified|date:_("DATETIME_FORMAT") }}){% endif %}
</td>
</tr>
<tr>
templates/manage/order/order_inline.html
efa7f51131eacf5446490d28ba7d9a013340b1ae
kai.diefenbach@gmail.com
kai.diefenbach@gmail.com@70813176-cce2-11dd-87b6-9d1a99559f42
http://github.com/django-lfs/lfs/commit/685533a20b1ddaed134bca18ea6bc277901e43d7
685533a20b1ddaed134bca18ea6bc277901e43d7
2009-10-04T00:16:51-07:00
2009-10-04T00:16:51-07:00
Several clean ups for rating mails.
git-svn-id: http://django-lfs.googlecode.com/svn/lfs/trunk@883 70813176-cce2-11dd-87b6-9d1a99559f42
8daf3f186a33e071555ee6c5f6ae8fb5e7d7bf61
kai.diefenbach@gmail.com
kai.diefenbach@gmail.com@70813176-cce2-11dd-87b6-9d1a99559f42