feature/gh-29

track/admin.py

@@ -4,15 +4,69 @@
 from django.urls import path
 import logging
 from track import orders
+from django.contrib import messages
+from track import gbf
+from track.log_manager import LogManager
 
 logger = logging.getLogger(__name__)
 
 
 # Register your models here.
 class OrderAdmin(admin.ModelAdmin):
     change_list_template = "track/check_orders.html"
+    list_display = [
+        "record_id", 
+        "order_number", 
+        "tracking_nrs", 
+        "return_tracking_nrs", 
+        "tube_serials", 
+        "order_status", 
+        "ship_date"
+    ]
+    actions = ["check_orders_status"]
 
-    list_display = ["record_id", "order_number", "tracking_nrs", "return_tracking_nrs", "tube_serials", "order_status", "ship_date"]
+    def get_actions(self, request):
+        actions = super().get_actions(request)
+        return actions
+
+    def check_orders_status(self, request, queryset):
+        """
+        Checks shipping status for the selected orders without forcing their
+        status to Order.INITIATED. Also logs the process using log_manager.
+        """
+        if not queryset:
+            self.message_user(request, "No orders selected to check status.", messages.WARNING)
+            return
+
+        log_manager = LogManager()
+        try:
+            order_numbers = list(queryset.values_list("order_number", flat=True))
+
+            # START LOG for each order before checking status
+            for order_number in order_numbers:
+                log_manager.start_order_log(order_number)
+
+            # retrieve shipping info from GBF
+            tracking_info = gbf.get_order_confirmations(order_numbers)
+            if tracking_info:
+                orders._update_orders_with_shipping_info(tracking_info)
+                message = f"Successfully checked shipping status for orders: {', '.join(order_numbers)}"
+                self.message_user(request, message, messages.SUCCESS)
+            else:
+                self.message_user(request, "No shipping information available for the selected orders.", messages.INFO)
+
+            # COMPLETE LOG for each order after processing
+            for order_number in order_numbers:
+                log_manager.complete_log(order_number)
+
+        except Exception as e:
+            logger.error(f"Error checking order status: {str(e)}")
+            self.message_user(request, f"Error checking order status: {str(e)}", messages.ERROR)
+
+            for order_number in order_numbers:
+                log_manager.append_to_gbf_log(LogManager.LEVEL_ERROR, f"Error checking order status: {str(e)}", order_number)
+
+    check_orders_status.short_description = "Check shipping status for selected orders"
 
 class ConfirmationCheckLogAdmin(admin.ModelAdmin):
     list_display = ["id", "job_id", "start_time", "end_time", "is_complete"]
@@ -21,12 +75,12 @@ class ConfirmationCheckLogAdmin(admin.ModelAdmin):
     def get_urls(self):
         urls = super().get_urls()
         my_urls = [
-            path('check_order_status/', self.call_check_order_status),
+            path("check_order_status/", self.call_check_order_status),
         ]
         return my_urls + urls
 
     def call_check_order_status(self, request):
-        logger.info("Initiatied check for tracking info") 
+        logger.info("Initiated check for tracking info")
         orders.check_orders_shipping_info()
         logger.info("Tracking info check completed.")
         return HttpResponseRedirect("../")