mirror of
https://framagit.org/la-chariotte/la-chariotte.git
synced 2025-05-04 21:02:01 +02:00
Merge branch 'fix/192/remove-order_name-from-order-emails-CSV' into 'develop'
[192] Problème dans les "emails en csv" See merge request la-chariotte/la_chariotte!113
This commit is contained in:
commit
8fca682aa8
2 changed files with 2 additions and 4 deletions
|
@ -345,9 +345,8 @@ class ExportGroupOrderEmailAdressesToDownloadView(UserPassesTestMixin, generic.V
|
||||||
filename = f"commande _{grouped_order.name.replace(' ', '_')}"
|
filename = f"commande _{grouped_order.name.replace(' ', '_')}"
|
||||||
response["Content-Disposition"] = f'attachment; filename="{filename}.csv"'
|
response["Content-Disposition"] = f'attachment; filename="{filename}.csv"'
|
||||||
writer = csv.writer(response)
|
writer = csv.writer(response)
|
||||||
writer.writerow(["order_name", "email"])
|
|
||||||
for email in email_list:
|
for email in email_list:
|
||||||
writer.writerow([grouped_order.name, email])
|
writer.writerow([email])
|
||||||
return response
|
return response
|
||||||
else:
|
else:
|
||||||
email_list = ";\n".join(email_list)
|
email_list = ";\n".join(email_list)
|
||||||
|
|
|
@ -1521,8 +1521,7 @@ class TestExportGroupOrderEmailAdressesToDownloadView:
|
||||||
assert response.status_code == 200
|
assert response.status_code == 200
|
||||||
assert response["Content-Type"] == "text/csv"
|
assert response["Content-Type"] == "text/csv"
|
||||||
content = response.content.decode()
|
content = response.content.decode()
|
||||||
assert "order_name,email" in content
|
assert "test@mail.fr\r\n" in content
|
||||||
assert "order_name,email\r\ngr order test,test@mail.fr\r\n" in content
|
|
||||||
|
|
||||||
def test_export_format_default(self, client_log):
|
def test_export_format_default(self, client_log):
|
||||||
grouped_order = create_grouped_order(
|
grouped_order = create_grouped_order(
|
||||||
|
|
Loading…
Reference in a new issue