From ad4701fe95a58be879bf065d1f0aa18d40371ac9 Mon Sep 17 00:00:00 2001
From: divyesh000 <divjok28@outlook.com>
Date: Fri, 17 May 2024 19:25:57 +0400
Subject: [PATCH 01/11] add reorder and cancel order functionality to Profile
 controller and view, and implemented deleteOrder method in Order model

---
 src/controllers/Profile.php | 59 +++++++++++++++++++++++++++++++++++++
 src/models/Order.php        | 27 +++++++++++++++++
 src/views/Profile.php       | 25 ++++++++++++++--
 3 files changed, 108 insertions(+), 3 deletions(-)

diff --git a/src/controllers/Profile.php b/src/controllers/Profile.php
index f7eca130..9dca239a 100644
--- a/src/controllers/Profile.php
+++ b/src/controllers/Profile.php
@@ -4,11 +4,14 @@
 
 namespace Steamy\Controller;
 
+use DateTime;
 use Steamy\Core\Controller;
 use Steamy\Core\Utility;
 use Steamy\Model\Client;
 use Steamy\Model\District;
 use Steamy\Model\Location;
+use Steamy\Model\Order;
+use Steamy\Model\OrderStatus;
 
 class Profile
 {
@@ -78,6 +81,62 @@ private function displayProfileDetails(Client $client, string $password = "", st
         );
     }
 
+    public function reorderOrder(): void
+    {
+        if ($_SERVER['REQUEST_METHOD'] !== 'POST' || !isset($_POST['order_id'])) {
+            // Handle invalid request
+            Utility::redirect('profile');
+        }
+
+        $order_id = (int)$_POST['order_id'];
+        $order = Order::getByID($order_id);
+
+        if (!$order || $order->getStatus() !== OrderStatus::COMPLETED) {
+            // Order doesn't exist or not completed
+            Utility::redirect('profile');
+        }
+
+        // Create a new order with the same details as the previous order
+        $new_order = new Order(
+            store_id: $order->getStoreID(),
+            client_id: $order->getClientID(),
+            line_items: $order->getLineItems(),
+            pickup_date: null, // or set pickup date as needed
+            status: OrderStatus::PENDING,
+            created_date: new DateTime()
+        );
+
+        // Save the new order
+        $new_order->save();
+
+        // Redirect back to the profile page
+        Utility::redirect('profile');
+        }
+
+
+    public function cancelOrder(): void
+    {
+        if ($_SERVER['REQUEST_METHOD'] !== 'POST' || !isset($_POST['order_id'])) {
+            // Handle invalid request
+            Utility::redirect('profile');
+        }
+
+        $order_id = (int)$_POST['order_id'];
+        $order = Order::getByID($order_id);
+
+        if (!$order || $order->getStatus() === OrderStatus::COMPLETED) {
+            // Order doesn't exist or already completed
+            Utility::redirect('profile');
+        }
+
+        // Cancel the order
+        $order->deleteOrder();
+
+        // Redirect back to the profile page
+        Utility::redirect('profile');
+    }
+
+
     private function handleProfileEditSubmission(): void
     {
         $form_data = (new Register())->getFormData();
diff --git a/src/models/Order.php b/src/models/Order.php
index 5a88b5d9..d2fcaf99 100644
--- a/src/models/Order.php
+++ b/src/models/Order.php
@@ -235,6 +235,33 @@ public static function getByID(int $order_id): ?Order
         );
     }
 
+    /**
+     * Deletes the order and associated line items from the database.
+     */
+    public function deleteOrder(): void
+    {
+        $conn = self::connect();
+        $conn->beginTransaction();
+
+        try {
+            // Delete line items first
+            $query = "DELETE FROM order_product WHERE order_id = :order_id";
+            $stm = $conn->prepare($query);
+            $stm->execute(['order_id' => $this->order_id]);
+
+            // Delete the order itself
+            $query = "DELETE FROM `order` WHERE order_id = :order_id";
+            $stm = $conn->prepare($query);
+            $stm->execute(['order_id' => $this->order_id]);
+
+            $conn->commit();
+        } catch (PDOException $e) {
+            $conn->rollBack();
+        } finally {
+            $conn = null;
+        }
+    }
+
     private static function getOrderProducts(int $order_id): array
     {
         $query = "SELECT *
diff --git a/src/views/Profile.php b/src/views/Profile.php
index 10d5ad12..95a61246 100644
--- a/src/views/Profile.php
+++ b/src/views/Profile.php
@@ -92,11 +92,22 @@
                 </tr>
 
                 <?php
+
+                // Sort the orders array by date in descending order
+                usort($orders, function($a, $b) {
+                    return strtotime($b->date) - strtotime($a->date);
+                });
+
                 foreach ($orders as $order) {
                     $date = htmlspecialchars($order->date);
                     $id = filter_var($order->id, FILTER_SANITIZE_NUMBER_INT);
                     $cost = filter_var($order->cost, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
                     $status = htmlspecialchars($order->status);
+
+                    // Determine button states
+                    $cancelDisabled = $status === 'Completed' ? 'disabled' : '';
+                    $reorderDisabled = $status !== 'Completed' ? 'disabled' : '';
+
                     echo <<< EOL
                     <tr>
                         <td>$date</td>
@@ -104,12 +115,20 @@
                         <td>$cost</td>
                         <td>$status</td>
                         <td class="grid">
-                            <button>cancel</button>
-                        </td>
+                            <form method="post" action="/profile/cancelOrder">
+                                <input type="hidden" name="order_id" value="$id">
+                                <button type="submit" $cancelDisabled>Cancel</button>
+                            </form>
+                            <form method="post" action="/profile/reorderOrder">
+                                <input type="hidden" name="order_id" value="$id">
+                                <button type="submit" $reorderDisabled>Reorder</button>
+                            </form>
+                    </td>
                     </tr>
-                EOL;
+                    EOL;
                 }
 
+
                 ?>
 
 

From 308f09894548d917d0285f7c4c1b2be69d06c463 Mon Sep 17 00:00:00 2001
From: divyesh000 <divjok28@outlook.com>
Date: Sun, 19 May 2024 17:53:06 +0400
Subject: [PATCH 02/11] remove order sorting code and update button state
 conditions

---
 src/views/Profile.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/views/Profile.php b/src/views/Profile.php
index 95a61246..cd144b7b 100644
--- a/src/views/Profile.php
+++ b/src/views/Profile.php
@@ -93,11 +93,6 @@
 
                 <?php
 
-                // Sort the orders array by date in descending order
-                usort($orders, function($a, $b) {
-                    return strtotime($b->date) - strtotime($a->date);
-                });
-
                 foreach ($orders as $order) {
                     $date = htmlspecialchars($order->date);
                     $id = filter_var($order->id, FILTER_SANITIZE_NUMBER_INT);
@@ -105,8 +100,8 @@
                     $status = htmlspecialchars($order->status);
 
                     // Determine button states
-                    $cancelDisabled = $status === 'Completed' ? 'disabled' : '';
-                    $reorderDisabled = $status !== 'Completed' ? 'disabled' : '';
+                    $cancelDisabled = $status === 'completed' ? 'disabled' : '';
+                    $reorderDisabled = $status !== 'completed' ? 'disabled' : '';
 
                     echo <<< EOL
                     <tr>

From 3528ca34df08a2aa263890de6a0350d247e548de Mon Sep 17 00:00:00 2001
From: divyesh000 <divjok28@outlook.com>
Date: Tue, 21 May 2024 20:45:25 +0400
Subject: [PATCH 03/11] add registration success flag and dialog to Register
 controller and view

---
 src/controllers/Register.php | 10 ++++++----
 src/views/Register.php       | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/controllers/Register.php b/src/controllers/Register.php
index 95d86fdc..99d2436f 100644
--- a/src/controllers/Register.php
+++ b/src/controllers/Register.php
@@ -34,6 +34,7 @@ public function __construct()
         $this->view_data['errors'] = [];
         $this->view_data['editMode'] = false;
         $this->view_data['form_submitted'] = false;
+        $this->view_data['$registration_is_successful'] = false;
 
         // get list of districts to be displayed on form
         $this->view_data['districts'] = District::getAll();
@@ -114,11 +115,12 @@ private function handleFormSubmission(): void
             $success = $client->save();
 
             if ($success) {
-                Utility::redirect('login');
+                $this->view_data['registration_is_successful'] = true;
+            } else {
+                (new Error())->handleUnknownError();
+                die();
             }
-
-            (new Error())->handleUnknownError();
-            die();
+            
         } else {
             $this->loadDataToForm($form_data);
         }
diff --git a/src/views/Register.php b/src/views/Register.php
index e26a6373..5f6b3100 100644
--- a/src/views/Register.php
+++ b/src/views/Register.php
@@ -19,6 +19,7 @@
  * @var string $defaultConfirmPassword
  * @var array $errors list of errors in form after submission
  * @var District[] $districts list of all district objects
+ * @var bool $registration_is_successful
  */
 
 
@@ -220,3 +221,18 @@ function togglePasswordVisibility() {
     }
   }
 </script>
+
+<dialog <?= $registration_is_successful ? "open" : "" ?>>
+    <article>
+        <h3>Successfully registered! 🎉</h3>
+        <p>Thank you for joining Steamy Sips. Your account has been successfully created.</p>
+        <footer>
+            <a href="/login"
+               role="button"
+               data-target="my-modal"
+            >
+                Return to sign in
+            </a>
+        </footer>
+    </article>
+</dialog>
\ No newline at end of file

From 8a357c38f1b43458107f8e5456a6c0cd1e17772a Mon Sep 17 00:00:00 2001
From: divyesh000 <divjok28@outlook.com>
Date: Wed, 22 May 2024 20:24:42 +0400
Subject: [PATCH 04/11] Refactore Profile controller and view to handle reorder
 and cancel order functionality, update error handling and form submission
 logic

---
 src/controllers/Profile.php | 92 +++++++++++++++++++------------------
 src/views/Profile.php       | 42 +++++++----------
 2 files changed, 65 insertions(+), 69 deletions(-)

diff --git a/src/controllers/Profile.php b/src/controllers/Profile.php
index e39d3da3..24272351 100644
--- a/src/controllers/Profile.php
+++ b/src/controllers/Profile.php
@@ -26,6 +26,7 @@ public function __construct()
         $this->view_data['errors'] = [];
         $this->view_data['client'] = null;
         $this->view_data['show_account_deletion_confirmation'] = false;
+        $this->view_data['reorder_cancel'] = false; 
     }
 
     private function handleLogOut(): void
@@ -104,60 +105,62 @@ private function displayProfileDetails(Client $client, string $password = "", st
 
     public function reorderOrder(): void
     {
-        if ($_SERVER['REQUEST_METHOD'] !== 'POST' || !isset($_POST['order_id'])) {
-            // Handle invalid request
+        $this->view_data['reorder_cancel'] = true;
+        
+        if (isset($_POST['reorder'])){
+
+            $order_id = (int)$_POST['order_id'];
+            $order = Order::getByID($order_id);
+
+            // Create a new order with the same details as the previous order
+            $new_order = new Order(
+                store_id: $order->getStoreID(),
+                client_id: $order->getClientID(),
+                line_items: $order->getLineItems(),
+                pickup_date: null, // or set pickup date as needed
+                status: OrderStatus::PENDING,
+                created_date: new DateTime()
+            );
+
+            // Save the new order
+            $new_order->save();
+
+            // Redirect back to the profile page
             Utility::redirect('profile');
         }
 
-        $order_id = (int)$_POST['order_id'];
-        $order = Order::getByID($order_id);
-
-        if (!$order || $order->getStatus() !== OrderStatus::COMPLETED) {
-            // Order doesn't exist or not completed
-            Utility::redirect('profile');
-        }
-
-        // Create a new order with the same details as the previous order
-        $new_order = new Order(
-            store_id: $order->getStoreID(),
-            client_id: $order->getClientID(),
-            line_items: $order->getLineItems(),
-            pickup_date: null, // or set pickup date as needed
-            status: OrderStatus::PENDING,
-            created_date: new DateTime()
+        $this->view(
+            'Profile',
+            $this->view_data,
+            'Reorder',
+            enableIndexing: false
         );
-
-        // Save the new order
-        $new_order->save();
-
-        // Redirect back to the profile page
-        Utility::redirect('profile');
-        }
-
+    }
 
     public function cancelOrder(): void
     {
-        if ($_SERVER['REQUEST_METHOD'] !== 'POST' || !isset($_POST['order_id'])) {
-            // Handle invalid request
-            Utility::redirect('profile');
-        }
+        $this->view_data['reorder_cancel'] = true;
+        
+        if (isset($_POST['cancel'])){
 
-        $order_id = (int)$_POST['order_id'];
-        $order = Order::getByID($order_id);
+            $order_id = (int)$_POST['order_id'];
+            $order = Order::getByID($order_id);
 
-        if (!$order || $order->getStatus() === OrderStatus::COMPLETED) {
-            // Order doesn't exist or already completed
+            // Cancel the order
+            $order->deleteOrder();
+
+            // Redirect back to the profile page
             Utility::redirect('profile');
         }
 
-        // Cancel the order
-        $order->deleteOrder();
-
-        // Redirect back to the profile page
-        Utility::redirect('profile');
+        $this->view(
+            'Profile',
+            $this->view_data,
+            'Cancel',
+            enableIndexing: false
+        );
     }
 
-
     private function handleProfileEditSubmission(): void
     {
         $form_data = (new Register())->getFormData();
@@ -183,9 +186,7 @@ private function handleProfileEditSubmission(): void
         // check if user entered a new email
         if (!empty($form_data['email']) && $form_data['email'] !== $this->signed_client->getEmail()) {
             // check if a newly typed email already exists in database
-            if (!empty(
-            Client::getByEmail($updated_client->getEmail())
-            )) {
+            if (!empty(Client::getByEmail($updated_client->getEmail()))) {
                 $this->view_data['errors']['email'] = "Email already in use";
             }
         }
@@ -206,7 +207,6 @@ private function handleProfileEditSubmission(): void
             }
         }
 
-
         // if all data valid, update user record and redirect to login page
         if (empty($this->view_data['errors'])) {
             $success = $updated_client->updateUser($password_changed);
@@ -253,6 +253,10 @@ public function index(): void
             Utility::redirect('login');
         }
 
+        if (isset($_GET['reorder_cancel'])) {
+            $this->reorderOrder() || $this->cancelOrder();
+            return;
+        }
 
         // log out user if logout button clicked
         if (isset($_GET['logout_submit'])) {
diff --git a/src/views/Profile.php b/src/views/Profile.php
index d4e8feea..d4c8be9f 100644
--- a/src/views/Profile.php
+++ b/src/views/Profile.php
@@ -8,6 +8,7 @@
  * @var Client $client signed in client
  * @var Order[] $orders array of orders
  * @var bool $show_account_deletion_confirmation Whether to display a confirmation dialog for account deletion
+ * @var bool $reorder_cancel Whether to display reorder and cancel buttons
  */
 
 use Steamy\Model\Client;
@@ -15,11 +16,10 @@
 
 ?>
 
-<?php
-if ($show_account_deletion_confirmation) : ?>
+<?php if ($show_account_deletion_confirmation) : ?>
     <dialog open>
         <article>
-            <h3>Deleting your account! </h3>
+            <h3>Deleting your account!</h3>
             <p>Are you sure you want to delete your account? This action is irreversible.</p>
             <footer>
                 <form method="post" class="grid">
@@ -29,8 +29,7 @@
             </footer>
         </article>
     </dialog>
-<?php
-endif; ?>
+<?php endif; ?>
 
 <main class="container">
     <h1>My profile</h1>
@@ -49,13 +48,11 @@
                    disabled>
         </label>
 
-
         <label class="grid">
             Email
             <input value="<?= htmlspecialchars($client->getEmail()) ?>" type="email" disabled>
         </label>
 
-
         <label class="grid">
             Address
             <input value="<?= htmlspecialchars($client->getAddress()->getFormattedAddress()) ?>" type="text"
@@ -70,12 +67,9 @@
         <a href="/profile/edit">
             <button>Edit</button>
         </a>
-
     </div>
 
-
     <div id="Orders" class="tabcontent">
-
         <h2>Orders summary</h2>
 
         <figure>
@@ -108,26 +102,25 @@
                         <td>$date</td>
                         <td>$status</td>
                         <td>\$$totalPrice</td>
+                    EOL;
+
+                    if ($reorder_cancel) {
+                        echo <<< EOL
                         <td class="grid">
-                            <form method="post" action="/profile/cancelOrder">
+                            <form method="post" class="reorder_cancel">
+                                <input type="hidden" name="reorder_cancel">
                                 <input type="hidden" name="order_id" value="$id">
-                                <button type="submit" $cancelDisabled>Cancel</button>
+                                <button type="submit" name="reorder" $reorderDisabled>Reorder</button>
+                                <button type="submit" name="cancel" $cancelDisabled>Cancel</button>
                             </form>
-                            <form method="post" action="/profile/reorderOrder">
-                                <input type="hidden" name="order_id" value="$id">
-                                <button type="submit" $reorderDisabled>Reorder</button>
-                            </form>
-                    </td>
-                    </tr>
-                    EOL;
+                        </td>
+                        EOL;
+                    }
+                    echo "</tr>";
                 }
-
                 ?>
-
-
             </table>
         </figure>
-
     </div>
 
     <div id="Settings" class="tabcontent">
@@ -174,10 +167,9 @@
                 <form>
                     <button type="submit" name="account_delete_submit">Delete</button>
                 </form>
-
             </article>
         </div>
     </div>
 </main>
 
-<script src="/js/profile_view.bundle.js"></script>
\ No newline at end of file
+<script src="/js/profile_view.bundle.js"></script>

From 2d6e12bfbf48cb59c8ed448734f81e93cab1a9df Mon Sep 17 00:00:00 2001
From: divyesh000 <divjok28@outlook.com>
Date: Wed, 22 May 2024 20:42:26 +0400
Subject: [PATCH 05/11] refactore sendResetEmail method to use an HTML template
 for email content

---
 src/controllers/Password.php      | 22 +++++---
 src/views/mails/PasswordReset.php | 89 +++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+), 7 deletions(-)
 create mode 100644 src/views/mails/PasswordReset.php

diff --git a/src/controllers/Password.php b/src/controllers/Password.php
index 4f2298f6..3f0f728d 100644
--- a/src/controllers/Password.php
+++ b/src/controllers/Password.php
@@ -40,14 +40,22 @@ public function __construct()
      */
     private function sendResetEmail(string $email, string $resetLink): void
     {
-        //Implement logic to send reset email using Mailer class
-        $mailer = new Mailer();
-        $subject = "Reset Your Password | Steamy Sips";
-        $htmlMessage = "Click the link below to reset your password:<br><a href='$resetLink'>$resetLink</a>";
-        $plainMessage = "Click the link below to reset your password:\n$resetLink";
-        $mailer->sendMail($email, $subject, $htmlMessage, $plainMessage);
-    }
+    $subject = "Reset Your Password | Steamy Sips";
+
+    // Capture the HTML template content
+    ob_start();
+    $userEmail = $email;
+    require __DIR__ . '/../views/mails/PasswordReset.php';
+    $htmlMessage = ob_get_clean();
 
+    // Plain message as fallback
+    $plainMessage = "Click the link below to reset your password:\n$resetLink";
+
+    // Send the email
+    $mailer = new Mailer();
+    $mailer->sendMail($email, $subject, $htmlMessage, $plainMessage);
+    }
+  
     /**
      * Invoked when  user submits an email on form.
      * @throws Exception Email could not be sent
diff --git a/src/views/mails/PasswordReset.php b/src/views/mails/PasswordReset.php
new file mode 100644
index 00000000..2120f770
--- /dev/null
+++ b/src/views/mails/PasswordReset.php
@@ -0,0 +1,89 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file contains the template for the password reset email.
+ * It will be used by the sendResetEmail method in the Password controller.
+ *
+ * @var string $resetLink The link to reset the password.
+ * @var string $userEmail The email of the user receiving the reset link.
+ */
+
+?>
+
+<!doctype html>
+<html lang="en">
+<head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>Reset Your Password</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            background-color: #f7f7f7;
+            color: #333;
+            line-height: 1.6;
+            margin: 0;
+            padding: 0;
+        }
+        .container {
+            width: 100%;
+            max-width: 600px;
+            margin: 0 auto;
+            padding: 20px;
+            background-color: #fff;
+            border: 1px solid #ddd;
+        }
+        .header {
+            text-align: center;
+            padding: 10px 0;
+            border-bottom: 1px solid #ddd;
+        }
+        .header img {
+            max-width: 100px;
+        }
+        .content {
+            padding: 20px;
+        }
+        .footer {
+            text-align: center;
+            padding: 10px 0;
+            border-top: 1px solid #ddd;
+            font-size: 0.9em;
+            color: #999;
+        }
+        .button {
+            display: inline-block;
+            padding: 10px 20px;
+            margin: 20px 0;
+            font-size: 16px;
+            color: #fff;
+            background-color: #007bff;
+            text-decoration: none;
+            border-radius: 5px;
+        }
+        .button:hover {
+            background-color: #0056b3;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <div class="header">
+            <img src="cid:logo" alt="Steamy Sips Logo">
+        </div>
+        <div class="content">
+            <h1>Reset Your Password</h1>
+            <p>Hello,</p>
+            <p>We received a request to reset the password for the account associated with <?= htmlspecialchars($userEmail) ?>. Click the button below to reset your password:</p>
+            <p><a href="<?= htmlspecialchars($resetLink) ?>" class="button">Reset My Password</a></p>
+            <p>If you did not request a password reset, please ignore this email. This link will expire in 24 hours.</p>
+            <p>Thank you,<br>The Steamy Sips Team</p>
+        </div>
+        <div class="footer">
+            <p>&copy; <?= date('Y') ?> Steamy Sips. All rights reserved.</p>
+        </div>
+    </div>
+</body>
+</html>

From e21bf78583f006c9fdd1a36c0b44fa6eeed3d258 Mon Sep 17 00:00:00 2001
From: creme332 <65414576+creme332@users.noreply.github.com>
Date: Thu, 23 May 2024 16:11:44 +0400
Subject: [PATCH 06/11]  make getOrderProducts public

---
 src/models/Order.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/models/Order.php b/src/models/Order.php
index 46c51737..c20cd866 100644
--- a/src/models/Order.php
+++ b/src/models/Order.php
@@ -286,7 +286,11 @@ public function deleteOrder(): void
         }
     }
 
-    private static function getOrderProducts(int $order_id): array
+    /**
+     * @param int $order_id
+     * @return OrderProduct[] An array of line items for current order
+     */
+    public static function getOrderProducts(int $order_id): array
     {
         $query = "SELECT *
                   FROM order_product

From ad3926a30e3d94fbec29016dc308e44b82ced6ac Mon Sep 17 00:00:00 2001
From: creme332 <65414576+creme332@users.noreply.github.com>
Date: Thu, 23 May 2024 16:12:38 +0400
Subject: [PATCH 07/11] fix bugs with order and reorder

---
 src/controllers/Profile.php | 84 ++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 47 deletions(-)

diff --git a/src/controllers/Profile.php b/src/controllers/Profile.php
index 24272351..f6c78928 100644
--- a/src/controllers/Profile.php
+++ b/src/controllers/Profile.php
@@ -4,7 +4,7 @@
 
 namespace Steamy\Controller;
 
-use DateTime;
+use Exception;
 use Steamy\Core\Controller;
 use Steamy\Core\Utility;
 use Steamy\Model\Client;
@@ -25,8 +25,9 @@ public function __construct()
         $this->signed_client = null;
         $this->view_data['errors'] = [];
         $this->view_data['client'] = null;
+        $this->view_data["orders"] = [];
+        $this->view_data['order_action_error'] = "";
         $this->view_data['show_account_deletion_confirmation'] = false;
-        $this->view_data['reorder_cancel'] = false; 
     }
 
     private function handleLogOut(): void
@@ -105,60 +106,46 @@ private function displayProfileDetails(Client $client, string $password = "", st
 
     public function reorderOrder(): void
     {
-        $this->view_data['reorder_cancel'] = true;
-        
-        if (isset($_POST['reorder'])){
-
-            $order_id = (int)$_POST['order_id'];
-            $order = Order::getByID($order_id);
-
-            // Create a new order with the same details as the previous order
-            $new_order = new Order(
-                store_id: $order->getStoreID(),
-                client_id: $order->getClientID(),
-                line_items: $order->getLineItems(),
-                pickup_date: null, // or set pickup date as needed
-                status: OrderStatus::PENDING,
-                created_date: new DateTime()
-            );
-
-            // Save the new order
-            $new_order->save();
+        $order_id = (int)($_POST['order_id'] ?? -1);
+        $order = Order::getByID($order_id);
 
-            // Redirect back to the profile page
-            Utility::redirect('profile');
+        if (empty($order)) {
+            $this->view_data['order_action_error'] = 'Invalid order ID';
+            return;
         }
 
-        $this->view(
-            'Profile',
-            $this->view_data,
-            'Reorder',
-            enableIndexing: false
+        // Create a new order with the same details as the previous order
+        $new_order = new Order(
+            store_id: $order->getStoreID(),
+            client_id: $order->getClientID(),
+            line_items: Order::getOrderProducts($order_id),
         );
+
+        // Save the new order
+        try {
+            $new_order->save();
+        } catch (Exception $e) {
+            $this->view_data['order_action_error'] = $e->getMessage();
+        }
     }
 
     public function cancelOrder(): void
     {
-        $this->view_data['reorder_cancel'] = true;
-        
-        if (isset($_POST['cancel'])){
-
-            $order_id = (int)$_POST['order_id'];
-            $order = Order::getByID($order_id);
+        $order_id = (int)($_POST['order_id'] ?? -1);
+        $order = Order::getByID($order_id);
 
-            // Cancel the order
-            $order->deleteOrder();
+        if (empty($order)) {
+            $this->view_data['order_action_error'] = 'Invalid order ID';
+            return;
+        }
 
-            // Redirect back to the profile page
-            Utility::redirect('profile');
+        if ($order->getStatus() === OrderStatus::COMPLETED) {
+            $this->view_data['order_action_error'] = 'Cannot cancel an order which is complete';
+            return;
         }
 
-        $this->view(
-            'Profile',
-            $this->view_data,
-            'Cancel',
-            enableIndexing: false
-        );
+        // Cancel the order
+        $order->deleteOrder();
     }
 
     private function handleProfileEditSubmission(): void
@@ -253,9 +240,12 @@ public function index(): void
             Utility::redirect('login');
         }
 
-        if (isset($_GET['reorder_cancel'])) {
-            $this->reorderOrder() || $this->cancelOrder();
-            return;
+        if (isset($_POST['reorder'])) {
+            $this->reorderOrder();
+        }
+
+        if (isset($_POST['cancel_order'])) {
+            $this->cancelOrder();
         }
 
         // log out user if logout button clicked

From 90677aab99212e96617ba50271a6a5d49238cbf2 Mon Sep 17 00:00:00 2001
From: creme332 <65414576+creme332@users.noreply.github.com>
Date: Thu, 23 May 2024 16:16:43 +0400
Subject: [PATCH 08/11] refactor code for cancel/reorder, display error message
 for cancel/reorder

---
 src/views/Profile.php | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/views/Profile.php b/src/views/Profile.php
index d4c8be9f..09fd6834 100644
--- a/src/views/Profile.php
+++ b/src/views/Profile.php
@@ -8,7 +8,7 @@
  * @var Client $client signed in client
  * @var Order[] $orders array of orders
  * @var bool $show_account_deletion_confirmation Whether to display a confirmation dialog for account deletion
- * @var bool $reorder_cancel Whether to display reorder and cancel buttons
+ * @var string $order_action_error Error when user performed action on orders tab
  */
 
 use Steamy\Model\Client;
@@ -16,7 +16,8 @@
 
 ?>
 
-<?php if ($show_account_deletion_confirmation) : ?>
+<?php
+if ($show_account_deletion_confirmation) : ?>
     <dialog open>
         <article>
             <h3>Deleting your account!</h3>
@@ -29,7 +30,8 @@
             </footer>
         </article>
     </dialog>
-<?php endif; ?>
+<?php
+endif; ?>
 
 <main class="container">
     <h1>My profile</h1>
@@ -72,6 +74,12 @@
     <div id="Orders" class="tabcontent">
         <h2>Orders summary</h2>
 
+        <?php
+        if (!empty($order_action_error)): ?>
+            <blockquote><strong> ERROR 🔺: <?= $order_action_error ?>.</strong></blockquote>
+        <?php
+        endif ?>
+
         <figure>
             <table>
                 <tr>
@@ -87,36 +95,30 @@
                 foreach ($orders as $order) {
                     $date = htmlspecialchars($order->getCreatedDate()->format('Y-m-d H:i:s'));
                     $id = filter_var($order->getOrderID(), FILTER_SANITIZE_NUMBER_INT);
-                    $storeid = filter_var($order->getStoreID(), FILTER_SANITIZE_NUMBER_INT);
+                    $store_id = filter_var($order->getStoreID(), FILTER_SANITIZE_NUMBER_INT);
                     $status = htmlspecialchars(ucfirst($order->getStatus()->value));
                     $totalPrice = htmlspecialchars(number_format($order->calculateTotalPrice(), 2));
 
                     // Determine button states
-                    $cancelDisabled = $status === 'completed' ? 'disabled' : '';
-                    $reorderDisabled = $status !== 'completed' ? 'disabled' : '';
+                    $cancelDisabled = $order->getStatus()->value === 'completed' ? 'disabled' : '';
 
                     echo <<< EOL
                     <tr>
                         <td>$id</td>
-                        <td>$storeid</td>
+                        <td>$store_id</td>
                         <td>$date</td>
                         <td>$status</td>
                         <td>\$$totalPrice</td>
-                    EOL;
 
-                    if ($reorder_cancel) {
-                        echo <<< EOL
-                        <td class="grid">
-                            <form method="post" class="reorder_cancel">
-                                <input type="hidden" name="reorder_cancel">
+                        <td>
+                            <form style="display: flex; gap:1em;" method="post">
                                 <input type="hidden" name="order_id" value="$id">
-                                <button type="submit" name="reorder" $reorderDisabled>Reorder</button>
-                                <button type="submit" name="cancel" $cancelDisabled>Cancel</button>
+                                <button type="submit" name="cancel_order" $cancelDisabled>Cancel</button>
+                                <button type="submit" name="reorder">Reorder</button>
                             </form>
                         </td>
-                        EOL;
-                    }
-                    echo "</tr>";
+                    </tr>
+                    EOL;
                 }
                 ?>
             </table>

From afd6f145b21ea602c5fa530d3de9f3ff18288de1 Mon Sep 17 00:00:00 2001
From: creme332 <65414576+creme332@users.noreply.github.com>
Date: Fri, 24 May 2024 21:19:16 +0400
Subject: [PATCH 09/11] format files

---
 src/controllers/Password.php      |  24 +++---
 src/views/mails/PasswordReset.php | 133 ++++++++++++++++--------------
 2 files changed, 83 insertions(+), 74 deletions(-)

diff --git a/src/controllers/Password.php b/src/controllers/Password.php
index 3f0f728d..03de1de4 100644
--- a/src/controllers/Password.php
+++ b/src/controllers/Password.php
@@ -40,22 +40,22 @@ public function __construct()
      */
     private function sendResetEmail(string $email, string $resetLink): void
     {
-    $subject = "Reset Your Password | Steamy Sips";
+        $subject = "Reset Your Password | Steamy Sips";
 
-    // Capture the HTML template content
-    ob_start();
-    $userEmail = $email;
-    require __DIR__ . '/../views/mails/PasswordReset.php';
-    $htmlMessage = ob_get_clean();
+        // Capture the HTML template content
+        ob_start();
+        $userEmail = $email;
+        require __DIR__ . '/../views/mails/PasswordReset.php';
+        $htmlMessage = ob_get_clean();
 
-    // Plain message as fallback
-    $plainMessage = "Click the link below to reset your password:\n$resetLink";
+        // Plain message as fallback
+        $plainMessage = "Click the link below to reset your password:\n$resetLink";
 
-    // Send the email
-    $mailer = new Mailer();
-    $mailer->sendMail($email, $subject, $htmlMessage, $plainMessage);
+        // Send the email
+        $mailer = new Mailer();
+        $mailer->sendMail($email, $subject, $htmlMessage, $plainMessage);
     }
-  
+
     /**
      * Invoked when  user submits an email on form.
      * @throws Exception Email could not be sent
diff --git a/src/views/mails/PasswordReset.php b/src/views/mails/PasswordReset.php
index 2120f770..9cddb85a 100644
--- a/src/views/mails/PasswordReset.php
+++ b/src/views/mails/PasswordReset.php
@@ -19,71 +19,80 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Reset Your Password</title>
     <style>
-        body {
-            font-family: Arial, sans-serif;
-            background-color: #f7f7f7;
-            color: #333;
-            line-height: 1.6;
-            margin: 0;
-            padding: 0;
-        }
-        .container {
-            width: 100%;
-            max-width: 600px;
-            margin: 0 auto;
-            padding: 20px;
-            background-color: #fff;
-            border: 1px solid #ddd;
-        }
-        .header {
-            text-align: center;
-            padding: 10px 0;
-            border-bottom: 1px solid #ddd;
-        }
-        .header img {
-            max-width: 100px;
-        }
-        .content {
-            padding: 20px;
-        }
-        .footer {
-            text-align: center;
-            padding: 10px 0;
-            border-top: 1px solid #ddd;
-            font-size: 0.9em;
-            color: #999;
-        }
-        .button {
-            display: inline-block;
-            padding: 10px 20px;
-            margin: 20px 0;
-            font-size: 16px;
-            color: #fff;
-            background-color: #007bff;
-            text-decoration: none;
-            border-radius: 5px;
-        }
-        .button:hover {
-            background-color: #0056b3;
-        }
+      body {
+        font-family: Arial, sans-serif;
+        background-color: #f7f7f7;
+        color: #333;
+        line-height: 1.6;
+        margin: 0;
+        padding: 0;
+      }
+
+      .container {
+        width: 100%;
+        max-width: 600px;
+        margin: 0 auto;
+        padding: 20px;
+        background-color: #fff;
+        border: 1px solid #ddd;
+      }
+
+      .header {
+        text-align: center;
+        padding: 10px 0;
+        border-bottom: 1px solid #ddd;
+      }
+
+      .header img {
+        max-width: 100px;
+      }
+
+      .content {
+        padding: 20px;
+      }
+
+      .footer {
+        text-align: center;
+        padding: 10px 0;
+        border-top: 1px solid #ddd;
+        font-size: 0.9em;
+        color: #999;
+      }
+
+      .button {
+        display: inline-block;
+        padding: 10px 20px;
+        margin: 20px 0;
+        font-size: 16px;
+        color: #fff;
+        background-color: #007bff;
+        text-decoration: none;
+        border-radius: 5px;
+      }
+
+      .button:hover {
+        background-color: #0056b3;
+      }
     </style>
 </head>
 <body>
-    <div class="container">
-        <div class="header">
-            <img src="cid:logo" alt="Steamy Sips Logo">
-        </div>
-        <div class="content">
-            <h1>Reset Your Password</h1>
-            <p>Hello,</p>
-            <p>We received a request to reset the password for the account associated with <?= htmlspecialchars($userEmail) ?>. Click the button below to reset your password:</p>
-            <p><a href="<?= htmlspecialchars($resetLink) ?>" class="button">Reset My Password</a></p>
-            <p>If you did not request a password reset, please ignore this email. This link will expire in 24 hours.</p>
-            <p>Thank you,<br>The Steamy Sips Team</p>
-        </div>
-        <div class="footer">
-            <p>&copy; <?= date('Y') ?> Steamy Sips. All rights reserved.</p>
-        </div>
+<div class="container">
+    <div class="header">
+        <img src="cid:logo" alt="Steamy Sips Logo">
+    </div>
+    <div class="content">
+        <h1>Reset Your Password</h1>
+        <p>Hello,</p>
+        <p>We received a request to reset the password for the account associated with <?= htmlspecialchars(
+                $userEmail
+            ) ?>. Click the button below to reset your password:</p>
+        <p><a href="<?= htmlspecialchars($resetLink) ?>" class="button">Reset My Password</a></p>
+        <p>If you did not request a password reset, please ignore this email. This link will expire in 24 hours.</p>
+        <p>Thank you,<br>The Steamy Sips Team</p>
+    </div>
+    <div class="footer">
+        <p>&copy; <?= date('Y') ?> Steamy Sips. All rights reserved.</p>
     </div>
+</div>
 </body>
 </html>

From 74a0af5a68f3e8113e4dfe0bb8c7254f0c183b8a Mon Sep 17 00:00:00 2001
From: creme332 <65414576+creme332@users.noreply.github.com>
Date: Fri, 24 May 2024 21:42:09 +0400
Subject: [PATCH 10/11] remove data-target from dialog

---
 src/views/Register.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/Register.php b/src/views/Register.php
index 5f6b3100..c0cef260 100644
--- a/src/views/Register.php
+++ b/src/views/Register.php
@@ -229,7 +229,6 @@ function togglePasswordVisibility() {
         <footer>
             <a href="/login"
                role="button"
-               data-target="my-modal"
             >
                 Return to sign in
             </a>

From 02b685c6beca1628d06abd816482ea1111da9bad Mon Sep 17 00:00:00 2001
From: creme332 <65414576+creme332@users.noreply.github.com>
Date: Fri, 24 May 2024 21:42:52 +0400
Subject: [PATCH 11/11] fix wrong view_data array key in constructor

---
 src/controllers/Register.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/controllers/Register.php b/src/controllers/Register.php
index 99d2436f..2fdf8e40 100644
--- a/src/controllers/Register.php
+++ b/src/controllers/Register.php
@@ -34,7 +34,7 @@ public function __construct()
         $this->view_data['errors'] = [];
         $this->view_data['editMode'] = false;
         $this->view_data['form_submitted'] = false;
-        $this->view_data['$registration_is_successful'] = false;
+        $this->view_data['registration_is_successful'] = false;
 
         // get list of districts to be displayed on form
         $this->view_data['districts'] = District::getAll();
@@ -120,7 +120,6 @@ private function handleFormSubmission(): void
                 (new Error())->handleUnknownError();
                 die();
             }
-            
         } else {
             $this->loadDataToForm($form_data);
         }