From 8fc33131dd10e88c0201ef00ede6b8fc48ff8041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= <imacat@mail.imacat.idv.tw>
Date: Thu, 9 Mar 2023 06:51:14 +0800
Subject: [PATCH] Changed the transaction operation to return to the default
 journal instead of the transaction list.  The transaction list is to be
 removed.  There is no link to the transaction list at all, and it's layout is
 undecided.

---
 .../templates/accounting/transaction/expense/create.html  | 2 +-
 .../templates/accounting/transaction/include/detail.html  | 2 +-
 .../templates/accounting/transaction/income/create.html   | 2 +-
 src/accounting/templates/accounting/transaction/list.html | 4 ++--
 .../templates/accounting/transaction/order.html           | 2 +-
 .../templates/accounting/transaction/transfer/create.html | 2 +-
 src/accounting/transaction/views.py                       | 6 +++---
 tests/test_transaction.py                                 | 8 +++++---
 8 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/accounting/templates/accounting/transaction/expense/create.html b/src/accounting/templates/accounting/transaction/expense/create.html
index e9c56ef..858572a 100644
--- a/src/accounting/templates/accounting/transaction/expense/create.html
+++ b/src/accounting/templates/accounting/transaction/expense/create.html
@@ -23,6 +23,6 @@ First written: 2023/2/25
 
 {% block header %}{% block title %}{{ A_("Add a New Cash Expense Transaction") }}{% endblock %}{% endblock %}
 
-{% block back_url %}{{ request.args.get("next") or url_for("accounting.transaction.list") }}{% endblock %}
+{% block back_url %}{{ request.args.get("next") or url_for("accounting.report.journal-default") }}{% endblock %}
 
 {% block action_url %}{{ url_for("accounting.transaction.store", txn_type=txn_type) }}{% endblock %}
diff --git a/src/accounting/templates/accounting/transaction/include/detail.html b/src/accounting/templates/accounting/transaction/include/detail.html
index 1a424b9..58d78b8 100644
--- a/src/accounting/templates/accounting/transaction/include/detail.html
+++ b/src/accounting/templates/accounting/transaction/include/detail.html
@@ -26,7 +26,7 @@ First written: 2023/2/26
 {% block content %}
 
 <div class="btn-group mb-3">
-  <a class="btn btn-primary" href="{{ url_for("accounting.transaction.list")|accounting_or_next }}">
+  <a class="btn btn-primary" href="{{ url_for("accounting.report.journal-default")|accounting_or_next }}">
     <i class="fa-solid fa-circle-chevron-left"></i>
     {{ A_("Back") }}
   </a>
diff --git a/src/accounting/templates/accounting/transaction/income/create.html b/src/accounting/templates/accounting/transaction/income/create.html
index 1ef9868..48c5d50 100644
--- a/src/accounting/templates/accounting/transaction/income/create.html
+++ b/src/accounting/templates/accounting/transaction/income/create.html
@@ -23,6 +23,6 @@ First written: 2023/2/25
 
 {% block header %}{% block title %}{{ A_("Add a New Cash Income Transaction") }}{% endblock %}{% endblock %}
 
-{% block back_url %}{{ request.args.get("next") or url_for("accounting.transaction.list") }}{% endblock %}
+{% block back_url %}{{ request.args.get("next") or url_for("accounting.report.journal-default") }}{% endblock %}
 
 {% block action_url %}{{ url_for("accounting.transaction.store", txn_type=txn_type) }}{% endblock %}
diff --git a/src/accounting/templates/accounting/transaction/list.html b/src/accounting/templates/accounting/transaction/list.html
index f29a2c8..3fb142c 100644
--- a/src/accounting/templates/accounting/transaction/list.html
+++ b/src/accounting/templates/accounting/transaction/list.html
@@ -54,7 +54,7 @@ First written: 2023/2/18
       </ul>
     </div>
   {% endif %}
-  <form class="btn btn-primary d-flex input-group accounting-search-desktop-form" action="{{ url_for("accounting.transaction.list") }}" method="get" role="search" aria-label="{{ A_("Search for Desktop") }}">
+  <form class="btn btn-primary d-flex input-group accounting-search-desktop-form" action="{{ url_for("accounting.report.search") }}" method="get" role="search" aria-label="{{ A_("Search for Desktop") }}">
     <input id="accounting-search-desktop" class="form-control form-control-sm accounting-search-input" type="search" name="q" value="{{ request.args.q }}" placeholder=" " required="required">
     <label for="accounting-search-desktop" class="accounting-search-label">
       <button type="submit">
@@ -66,7 +66,7 @@ First written: 2023/2/18
 </div>
 
 <div class="btn-group mb-2 d-md-none">
-  <form class="btn btn-primary d-flex input-group" action="{{ url_for("accounting.transaction.list") }}" method="get" role="search" aria-label="{{ A_("Search for Mobile") }}">
+  <form class="btn btn-primary d-flex input-group" action="{{ url_for("accounting.report.search") }}" method="get" role="search" aria-label="{{ A_("Search for Mobile") }}">
     <input id="accounting-search-mobile" class="form-control form-control-sm accounting-search-input" type="search" name="q" value="{{ request.args.q }}" placeholder=" " required="required">
     <label for="accounting-search-mobile" class="accounting-search-label">
       <button type="submit">
diff --git a/src/accounting/templates/accounting/transaction/order.html b/src/accounting/templates/accounting/transaction/order.html
index c23048b..c6633b6 100644
--- a/src/accounting/templates/accounting/transaction/order.html
+++ b/src/accounting/templates/accounting/transaction/order.html
@@ -31,7 +31,7 @@ First written: 2023/2/26
 {% block content %}
 
 <div class="btn-group mb-3">
-  <a class="btn btn-primary" href="{{ url_for("accounting.transaction.list")|accounting_or_next }}">
+  <a class="btn btn-primary" href="{{ url_for("accounting.report.journal-default")|accounting_or_next }}">
     <i class="fa-solid fa-circle-chevron-left"></i>
     {{ A_("Back") }}
   </a>
diff --git a/src/accounting/templates/accounting/transaction/transfer/create.html b/src/accounting/templates/accounting/transaction/transfer/create.html
index 4376e68..6cb47c1 100644
--- a/src/accounting/templates/accounting/transaction/transfer/create.html
+++ b/src/accounting/templates/accounting/transaction/transfer/create.html
@@ -23,6 +23,6 @@ First written: 2023/2/25
 
 {% block header %}{% block title %}{{ A_("Add a New Transfer Transaction") }}{% endblock %}{% endblock %}
 
-{% block back_url %}{{ request.args.get("next") or url_for("accounting.transaction.list") }}{% endblock %}
+{% block back_url %}{{ request.args.get("next") or url_for("accounting.report.journal-default") }}{% endblock %}
 
 {% block action_url %}{{ url_for("accounting.transaction.store", txn_type=txn_type) }}{% endblock %}
diff --git a/src/accounting/transaction/views.py b/src/accounting/transaction/views.py
index a888199..385013b 100644
--- a/src/accounting/transaction/views.py
+++ b/src/accounting/transaction/views.py
@@ -179,7 +179,7 @@ def delete_transaction(txn: Transaction) -> redirect:
     sort_transactions_in(txn.date, txn.id)
     db.session.commit()
     flash(lazy_gettext("The transaction is deleted successfully."), "success")
-    return redirect(or_next(url_for("accounting.transaction.list")))
+    return redirect(or_next(url_for("accounting.report.journal-default")))
 
 
 @bp.get("/dates/<date:txn_date>", endpoint="order")
@@ -210,10 +210,10 @@ def sort_transactions(txn_date: date) -> redirect:
     form.save_order()
     if not form.is_modified:
         flash(lazy_gettext("The order was not modified."), "success")
-        return redirect(or_next(url_for("accounting.transaction.list")))
+        return redirect(or_next(url_for("accounting.report.journal-default")))
     db.session.commit()
     flash(lazy_gettext("The order is updated successfully."), "success")
-    return redirect(or_next(url_for("accounting.transaction.list")))
+    return redirect(or_next(url_for("accounting.report.journal-default")))
 
 
 def __get_detail_uri(txn: Transaction) -> str:
diff --git a/tests/test_transaction.py b/tests/test_transaction.py
index 0f613ee..5e61c19 100644
--- a/tests/test_transaction.py
+++ b/tests/test_transaction.py
@@ -35,6 +35,8 @@ from testlib_txn import Accounts, get_add_form, get_unchanged_update_form, \
 
 PREFIX: str = "/accounting/transactions"
 """The URL prefix for the transaction management."""
+RETURN_TO_URI: str = "/accounting/reports/journal"
+"""The URL to return to after the operation."""
 
 
 class CashIncomeTransactionTestCase(unittest.TestCase):
@@ -175,7 +177,7 @@ class CashIncomeTransactionTestCase(unittest.TestCase):
         response = self.client.post(f"{PREFIX}/{txn_id}/delete",
                                     data={"csrf_token": self.csrf_token})
         self.assertEqual(response.status_code, 302)
-        self.assertEqual(response.headers["Location"], PREFIX)
+        self.assertEqual(response.headers["Location"], RETURN_TO_URI)
 
     def test_add(self) -> None:
         """Tests to add the transactions.
@@ -736,7 +738,7 @@ class CashExpenseTransactionTestCase(unittest.TestCase):
         response = self.client.post(f"{PREFIX}/{txn_id}/delete",
                                     data={"csrf_token": self.csrf_token})
         self.assertEqual(response.status_code, 302)
-        self.assertEqual(response.headers["Location"], PREFIX)
+        self.assertEqual(response.headers["Location"], RETURN_TO_URI)
 
     def test_add(self) -> None:
         """Tests to add the transactions.
@@ -1304,7 +1306,7 @@ class TransferTransactionTestCase(unittest.TestCase):
         response = self.client.post(f"{PREFIX}/{txn_id}/delete",
                                     data={"csrf_token": self.csrf_token})
         self.assertEqual(response.status_code, 302)
-        self.assertEqual(response.headers["Location"], PREFIX)
+        self.assertEqual(response.headers["Location"], RETURN_TO_URI)
 
     def test_add(self) -> None:
         """Tests to add the transactions.