fix: hide used or expired items that were shared

Author: l4rm4nd

myapp/templates/sharing_center.html

@@ -51,12 +51,29 @@ <h6>{{ entry.item.name }}</h6>
               {% endif %}
             </div>
             <div class="item-details">
+              {% if preferences.show_issue_date %}
               <div class="detail-item default-tile" style="background-color: {{ entry.item.tile_color|default:'#placeholder'|darken }}">
                 <i class="bi bi-calendar text-muted"></i> <span><b>{% trans "Issue Date" %}:</b> {{ entry.item.issue_date }}</span>
               </div>
+              {% endif %}
+              {% if preferences.show_expiry_date %}
               <div class="detail-item default-tile" style="background-color: {{ entry.item.tile_color|default:'#placeholder'|darken }}">
                 <i class="bi bi-calendar-x text-muted"></i> <span><b>{% trans "Expiry Date" %}:</b> {{ entry.item.expiry_date }}</span>
               </div>
+              {% endif %}
+              {% if entry.item.type != "loyaltycard" %}
+              {% if preferences.show_value %}
+              <div class="detail-item default-tile" style="background-color: {{ entry.item.tile_color|default:'#placeholder'|darken }}">
+                {% if entry.item.value_type == "percentage" %}
+                <i class="bi bi-percent text-muted"></i> <span><b>{% trans "Percentage" %}:</b> {{ entry.current_value|floatformat:2 }}</span>
+                {% elif entry.item.value_type == "money" %}
+                <i class="bi bi-cash text-muted"></i> <span><b>{% trans "Value" %}:</b> {{ entry.current_value|floatformat:2 }}</span>
+                {% elif entry.item.value_type == "multiplier" %}
+                <i class="bi bi-dice-5 text-muted"></i> <span><b>{% trans "Multiplier" %}:</b> {{ entry.current_value|floatformat:2 }}</span>
+                {% endif %}
+              </div>
+              {% endif %}
+              {% endif %}
               <div class="detail-item default-tile" style="background-color: {{ entry.item.tile_color|default:'#placeholder'|darken }}">
                 <i class="bi bi-people text-muted"></i> 
                 <span>

myapp/views.py

@@ -544,6 +544,10 @@ def verify_apprise_urls(request):
 @login_required
 def sharing_center(request):
     current_user = request.user
+    today = now().date()
+
+    # Retrieve or create user preferences
+    preferences, _ = UserPreference.objects.get_or_create(user=current_user)
 
     shares = ItemShare.objects.filter(
         Q(shared_with_user=current_user) | Q(shared_by=current_user)
@@ -555,27 +559,32 @@ def sharing_center(request):
     for share in shares:
         item = share.item
         if item.id not in unique_items:
-            if share.shared_with_user == current_user:
+            transactions_sum = Transaction.objects.filter(item=item).aggregate(Sum('value'))['value__sum'] or 0
+            current_value = item.value + transactions_sum            
+            if share.shared_with_user == current_user and not item.is_used and item.expiry_date >= today:
                 # You are the receiver
                 unique_items[item.id] = {
                     'item': item,
                     'qr_code_base64': item.qr_code_base64,
                     'shared_by': share.shared_by,
-                    'shared_with_me': True
+                    'shared_with_me': True,
+                    'current_value': current_value
                 }
             elif share.shared_by == current_user:
                 # You are the sender
                 unique_items[item.id] = {
                     'item': item,
                     'qr_code_base64': item.qr_code_base64,
-                    'shared_with_me': False
+                    'shared_with_me': False,
+                    'current_value': current_value
                 }
 
     shared_items = list(unique_items.values())
 
     return render(request, 'sharing_center.html', {
         'shared_items': shared_items,
         'current_date': timezone.now(),
+        'preferences': preferences,
     })
 
 @login_required