From 53bd732abae7fd16a02b7c300a52608a0bb5220c Mon Sep 17 00:00:00 2001
From: Aliyu Abubakar <a.aleeyu@yahoo.com>
Date: Tue, 9 Jan 2024 20:54:59 +0000
Subject: [PATCH 1/7] Add delivery_date column to orders in app.py and update
 order.html form

---
 app.py                | 5 ++++-
 templates/orders.html | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app.py b/app.py
index 50f4e29d..6fc83f96 100644
--- a/app.py
+++ b/app.py
@@ -46,6 +46,7 @@ class Order(Base):
     product_quantity = Column('Product Quantity', Integer)
     order_date = Column('Order Date', DateTime)
     shipping_date = Column('Shipping Date', DateTime)
+    delivery_date = Column('Delivery Date', DateTime) 
 
 # define routes
 # route to display orders
@@ -85,6 +86,7 @@ def add_order():
     product_quantity = request.form.get('product_quantity')
     order_date = request.form.get('order_date')
     shipping_date = request.form.get('shipping_date')
+    delivery_date = request.form['delivery_date']
     
     # Create a session to interact with the database
     session = Session()
@@ -98,7 +100,8 @@ def add_order():
         product_code=product_code,
         product_quantity=product_quantity,
         order_date=order_date,
-        shipping_date=shipping_date
+        shipping_date=shipping_date,
+        delivery_date=delivery_date
     )
 
     # Add the new order to the session and commit to the database
diff --git a/templates/orders.html b/templates/orders.html
index 9372e2d0..2afdb041 100644
--- a/templates/orders.html
+++ b/templates/orders.html
@@ -27,6 +27,7 @@ <h2 class="tab-title">Order List</h2>
                         <th>Product Quantity</th>
                         <th>Order Date</th>
                         <th>Shipping Date</th>
+                        <th>Delivery Date</th> 
                     </tr>
                 </thead>
                 <tbody>
@@ -40,6 +41,7 @@ <h2 class="tab-title">Order List</h2>
                             <td>{{ order.product_quantity }}</td>
                             <td>{{ order.order_date }}</td>
                             <td>{{ order.shipping_date }}</td>
+                            <td>{{ order.delivery_date }}</td> 
                         </tr>
                     {% endfor %}
                 </tbody>
@@ -73,6 +75,8 @@ <h2 class="tab-title">Add New Order</h2>
                 <input type="text" id="order_date" name="order_date" required><br>
                 <label for="shipping_date">Shipping Date:</label>
                 <input type="text" id="shipping_date" name="shipping_date" required><br>
+                <label for="delivery_date">Delivery Date:</label> 
+                <input type="date" id="delivery_date" name="delivery_date"><br><br>
                 <input type="submit" value="Add Order">
             </form>
         </div>

From 3fc414c72a82acad4d64917018a4264d59f0f682 Mon Sep 17 00:00:00 2001
From: Aliyu Abubakar <a.aleeyu@yahoo.com>
Date: Tue, 9 Jan 2024 22:48:03 +0000
Subject: [PATCH 2/7] Resolved merge conflict by incorporating both suggestions

---
 app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.py b/app.py
index 50f4e29d..10ca9ab3 100644
--- a/app.py
+++ b/app.py
@@ -98,7 +98,7 @@ def add_order():
         product_code=product_code,
         product_quantity=product_quantity,
         order_date=order_date,
-        shipping_date=shipping_date
+        shipping_date=shipping_date,
     )
 
     # Add the new order to the session and commit to the database

From 71dbd78c6901fe4e1b5dd9252ce031aea915ef65 Mon Sep 17 00:00:00 2001
From: Aliyu Abubakar <a.aleeyu@yahoo.com>
Date: Tue, 9 Jan 2024 23:00:13 +0000
Subject: [PATCH 3/7] Resolved merge conflict in app.py

---
 app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.py b/app.py
index 6fc83f96..1811a9a8 100644
--- a/app.py
+++ b/app.py
@@ -100,7 +100,7 @@ def add_order():
         product_code=product_code,
         product_quantity=product_quantity,
         order_date=order_date,
-        shipping_date=shipping_date,
+        shipping_date=shipping_date
         delivery_date=delivery_date
     )
 

From 860148b3148e737b47216bb07092dc7d9483f2f1 Mon Sep 17 00:00:00 2001
From: Aliyu Abubakar <a.aleeyu@yahoo.com>
Date: Tue, 9 Jan 2024 23:02:23 +0000
Subject: [PATCH 4/7] Resolved merge conflict in app.py

---
 app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.py b/app.py
index 1811a9a8..964d35c2 100644
--- a/app.py
+++ b/app.py
@@ -86,7 +86,7 @@ def add_order():
     product_quantity = request.form.get('product_quantity')
     order_date = request.form.get('order_date')
     shipping_date = request.form.get('shipping_date')
-    delivery_date = request.form['delivery_date']
+    delivery_date = request.form.get['delivery_date']
     
     # Create a session to interact with the database
     session = Session()

From 1ffa7f56b42b653c294817b9acfda705337b5545 Mon Sep 17 00:00:00 2001
From: Aliyu Abubakar <a.aleeyu@yahoo.com>
Date: Tue, 9 Jan 2024 23:05:21 +0000
Subject: [PATCH 5/7] Resolved merge conflict in app.py

---
 app.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app.py b/app.py
index 964d35c2..264a3ea8 100644
--- a/app.py
+++ b/app.py
@@ -85,7 +85,7 @@ def add_order():
     product_code = request.form.get('product_code')
     product_quantity = request.form.get('product_quantity')
     order_date = request.form.get('order_date')
-    shipping_date = request.form.get('shipping_date')
+    # shipping_date = request.form.get('shipping_date')
     delivery_date = request.form.get['delivery_date']
     
     # Create a session to interact with the database
@@ -100,7 +100,7 @@ def add_order():
         product_code=product_code,
         product_quantity=product_quantity,
         order_date=order_date,
-        shipping_date=shipping_date
+        shipping_date=shipping_date,
         delivery_date=delivery_date
     )
 

From 97b511617cf960206eb274f50b6030a3c413c2c2 Mon Sep 17 00:00:00 2001
From: Aliyu Abubakar <a.aleeyu@yahoo.com>
Date: Tue, 9 Jan 2024 23:08:32 +0000
Subject: [PATCH 6/7] Resolved merge conflict in app.py

---
 app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.py b/app.py
index 264a3ea8..319b2649 100644
--- a/app.py
+++ b/app.py
@@ -85,7 +85,7 @@ def add_order():
     product_code = request.form.get('product_code')
     product_quantity = request.form.get('product_quantity')
     order_date = request.form.get('order_date')
-    # shipping_date = request.form.get('shipping_date')
+    shipping_date = request.form.get('shipping_date')
     delivery_date = request.form.get['delivery_date']
     
     # Create a session to interact with the database

From 4481b0e82fde6921cb8253e97e699e34a01e427c Mon Sep 17 00:00:00 2001
From: Aliyu Abubakar <a.aleeyu@yahoo.com>
Date: Wed, 10 Jan 2024 19:04:01 +0000
Subject: [PATCH 7/7] Revert "Resolved merge conflict by incorporating both
 suggestions"

This reverts commit 3fc414c72a82acad4d64917018a4264d59f0f682.
---
 app.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app.py b/app.py
index 319b2649..cd9ee281 100644
--- a/app.py
+++ b/app.py
@@ -100,8 +100,7 @@ def add_order():
         product_code=product_code,
         product_quantity=product_quantity,
         order_date=order_date,
-        shipping_date=shipping_date,
-        delivery_date=delivery_date
+    
     )
 
     # Add the new order to the session and commit to the database