From 410738459d79f2115e0e0da696b30abcd8ccd47e Mon Sep 17 00:00:00 2001
From: Dylan Wright <buster_dylan@protonmail.com>
Date: Thu, 5 Jun 2025 17:43:55 +1000
Subject: [PATCH] feat: allow final destination to mark DO as completed

---
 .idea/discord.xml           | 14 ++++++++++++++
 .idea/workspace.xml         | 36 +++++++++++++++++++++++++-----------
 app/routes.py               | 16 ++++++++++++++++
 app/templates/track_do.html |  5 +++++
 4 files changed, 60 insertions(+), 11 deletions(-)
 create mode 100644 .idea/discord.xml

diff --git a/.idea/discord.xml b/.idea/discord.xml
new file mode 100644
index 0000000..baf5572
--- /dev/null
+++ b/.idea/discord.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DiscordProjectSettings">
+    <option name="show" value="PROJECT" />
+    <option name="description" value="" />
+    <option name="applicationTheme" value="default" />
+    <option name="iconsTheme" value="default" />
+    <option name="button1Title" value="" />
+    <option name="button1Url" value="" />
+    <option name="button2Title" value="" />
+    <option name="button2Url" value="" />
+    <option name="customApplicationId" value="" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dacb5a3..50dbb99 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,12 +4,8 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="5112d569-3a3f-4a44-9bd9-2c9295e7fe64" name="Changes" comment="Login and Dashboard added">
-      <change afterPath="$PROJECT_DIR$/app/templates/do_entry.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/templates/move_do.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/templates/track_do.html" afterDir="false" />
+    <list default="true" id="5112d569-3a3f-4a44-9bd9-2c9295e7fe64" name="Changes" comment="added readme">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/routes.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/routes.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -34,9 +30,9 @@
   <component name="HighlightingSettingsPerFile">
     <setting file="file://$PROJECT_DIR$/run.py" root0="FORCE_HIGHLIGHTING" />
   </component>
-  <component name="ProjectColorInfo"><![CDATA[{
-  "associatedIndex": 2
-}]]></component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 2
+}</component>
   <component name="ProjectId" id="2xzZKYTQ3ONQyWMQvvsDEzRY2pu" />
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="2" id="Add" />
@@ -52,7 +48,7 @@
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "RunOnceActivity.git.unshallow": "true",
     "git-widget-placeholder": "main",
-    "settings.editor.selected.configurable": "preferences.lookFeel"
+    "settings.editor.selected.configurable": "discord-application"
   }
 }]]></component>
   <component name="TaskManager">
@@ -103,7 +99,23 @@
       <option name="project" value="LOCAL" />
       <updated>1748944937448</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="Tracking DOs and other stuff added">
+      <option name="closed" value="true" />
+      <created>1748945875048</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1748945875048</updated>
+    </task>
+    <task id="LOCAL-00007" summary="added readme">
+      <option name="closed" value="true" />
+      <created>1748946041819</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1748946041819</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -148,6 +160,8 @@
     <MESSAGE value="First Commit" />
     <MESSAGE value="Web front enabled basic flask setup" />
     <MESSAGE value="Login and Dashboard added" />
-    <option name="LAST_COMMIT_MESSAGE" value="Login and Dashboard added" />
+    <MESSAGE value="Tracking DOs and other stuff added" />
+    <MESSAGE value="added readme" />
+    <option name="LAST_COMMIT_MESSAGE" value="added readme" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/routes.py b/app/routes.py
index 5e15e44..92b2d3e 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -134,3 +134,19 @@ def move_do():
         return redirect(url_for('main.track_do'))
 
     return render_template("move_do.html")
+@main.route('/store/complete/<int:do_id>', methods=['POST'])
+def mark_completed(do_id):
+    if 'store_id' not in session:
+        return redirect(url_for('auth.login'))
+
+    do = DeliveryOrder.query.get_or_404(do_id)
+
+    # Ensure only the final destination can mark complete
+    if session['store_id'] != do.final_location:
+        flash("You are not authorized to mark this DO as completed.", "danger")
+        return redirect(url_for('main.track_do'))
+
+    do.status = "Completed"
+    db.session.commit()
+    flash("DO marked as completed.", "success")
+    return redirect(url_for('main.track_do'))
diff --git a/app/templates/track_do.html b/app/templates/track_do.html
index ab4beda..b17fe31 100644
--- a/app/templates/track_do.html
+++ b/app/templates/track_do.html
@@ -19,6 +19,11 @@
         <p>Final Destination: {{ do.final_location }}</p>
         <p>Collected By: {{ do.collected_by if do.collected_by else "Not collected yet" }}</p>
         <p>Created: {{ do.created_at }}</p>
+{% if do.status != "Completed" and session['store_id'] == do.final_location %}
+    <form action="/store/complete/{{ do.id }}" method="POST">
+        <button type="submit">✅ Mark as Delivered</button>
+    </form>
+{% endif %}
 
         <h3>Movement History:</h3>
         {% if movements %}