Fix profile and store templates

boodlesite/templates/profile.html

@@ -39,14 +39,40 @@
     </div>
 </div>
 
+<!-- Purchase History -->
+<div class="header-container">    
+    <h2> Purchase History </h2>
+</div>
+<div class="event-container">
+    {% if won_auctions %}
+    {% for item in won_items %}
+    <div class="event">
+        <img src="https://www.kurin.com/wp-content/uploads/placeholder-square.jpg">
+        <div class="event-text">
+            <h3>{{ item.itemname }}</h3>
+            <p>Sold for: ₱ {{item.sellprice}}</p>
 
+            {% for wonauc in won_auctions %}
+            {% if wonauc.itemid == item %}
+                <p>{{ wonauc.auctionend }}</p>
+            {% endif %}
+            {% endfor %}
+        </div> 
+    </div>
+    {% endfor %}
+
+    {% else %}
+        <h4> {{displayname}} has not won any bids.</h4>
+    {% endif %}
+    </div>
+</div>
 
 <!--Change auctions_now, auction to like favorites, favorite-->
 <div class="header-container">    
     <h2> Current Biddings</h2>
 </div>
 <div class="event-container">
-    {% if auctions_of_user %}
+    {% if bidsByUser %}
     {% for id in ids_of_auction %} 
         <div class="event">
             <img src="https://www.kurin.com/wp-content/uploads/placeholder-square.jpg">
@@ -56,7 +82,7 @@
                 </a>
                 <p>{{ id.auctionend }}</p>
             </div> 
-                </div>
+        </div>
     {% endfor %}
     
     {% else %}

boodlesite/templates/profile.html.orig

@@ -63,14 +63,8 @@
     <h2> Current Biddings</h2>
 </div>
 <div class="event-container">
-<<<<<<< HEAD
     {% if auctions_of_user %}
     {% for id in ids_of_auction %} 
-=======
-    {% if auctionsOfUser %}
-    {% for id in idsOfAuction %} 
-        {% if id.auctionend > currentdate %}
->>>>>>> origin/xtine
         <div class="event">
             <img src="http://via.placeholder.com/640x360" alt="">
             <div class="event-text">

boodlesite/templates/store.html

@@ -89,15 +89,13 @@
                     </div>
                 </div>
 
-
-
             </div>
-        </div>
+        
         {% endfor %}
         {% else %}
         <h4 text-align="center"> Your Inventory is empty. </h4>
         {% endif %}
-       
+       </div>
 
 
 

main/migrations/0001_initial.py

-# Generated by Django 4.0.3 on 2022-05-18 03:50
+# Generated by Django 4.0.3 on 2022-03-12 07:26
 
 from django.db import migrations, models
 

main/migrations/0005_delete_boodleuser.py

-# Generated by Django 3.2.12 on 2022-05-18 09:48
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('main', '0004_delete_userfavorites'),
-    ]
-
-    operations = [
-        migrations.DeleteModel(
-            name='Boodleuser',
-        ),
-    ]

main/views.py

@@ -317,9 +317,9 @@ def profile(request, pk):
         if auctionend < current_date:
             
             bids = AuctionBid.objects.filter(auctionid=aucid).order_by('-bidtime')
-            highest_bidder = bids[0].boodleuserid
+            highest_bidder = bids[0].userid
 
-            if highest_bidder.userid == current_user.userid:
+            if highest_bidder.id == current_user.id:
                 itemid = aucid.itemid
                 itemid.sellprice = bids[0].amount
                 won_auctions.append(aucid)
@@ -351,6 +351,8 @@ def profile(request, pk):
         'store': current_storeid,
         'bidsByUser' : bids_by_user,
         'auctions_of_user': auctions_of_user,
+        'won_items': won_itemids,
+        'won_auctions': won_auctions,
         'auctions': auctions,
         'ids_of_auction': ids_of_auction,
         'createStoreForm': form