Merge pull request #296 from ury-erp/fix/pos-checklist

fix: remove the inner container in checklist dialog and call checklist only if configured in pos profile

Author: swafa-as

pos/src/components/ChecklistGateDialog.tsx

@@ -73,7 +73,13 @@ const ChecklistGateDialog = ({ posProfile, checklistType, onComplete }: Checklis
     setLoadError(null);
 
     try {
-      const { items, logName: fetchedLogName } = await getChecklist(posProfile, checklistType);
+      const { items, logName: fetchedLogName, logStatus } = await getChecklist(posProfile, checklistType);
+      
+      if (items.length === 0 || logStatus === 'Complete') {
+        onComplete();
+        return;
+      }
+
       setRows(toRowState(items));
       setLogName(fetchedLogName);
     } catch (error) {
@@ -82,7 +88,7 @@ const ChecklistGateDialog = ({ posProfile, checklistType, onComplete }: Checklis
     } finally {
       setIsLoading(false);
     }
-  }, [posProfile, checklistType]);
+  }, [posProfile, checklistType, onComplete]);
 
   useEffect(() => {
     loadChecklist();
@@ -149,7 +155,7 @@ const ChecklistGateDialog = ({ posProfile, checklistType, onComplete }: Checklis
           <>
             <div className="flex-1 overflow-y-auto space-y-4 mb-6 pr-1">
               {rows.map((row, index) => (
-                <div key={`${row.item_label}-${index}`} className="border border-gray-200 rounded-lg p-3">
+                <div key={`${row.item_label}-${index}`}>
                   <label className="flex items-start gap-3 cursor-pointer">
                     <input
                       type="checkbox"

pos/src/components/POSClosingDialog.tsx

@@ -15,6 +15,7 @@ import { usePOSStore } from '../store/pos-store';
 import { useRootStore } from '../store/root-store';
 import ClosingPaymentTable from './ClosingPaymentTable';
 import ChecklistGateDialog from './ChecklistGateDialog';
+import { getChecklist } from '../lib/checklist-api';
 import {
   getOpenPosOpeningEntries,
   getSubCashierPosInvoices,
@@ -413,7 +414,18 @@ const POSClosingDialog = ({ open, onOpenChange, onClosingSubmitted }: POSClosing
       // Close submission succeeded -- gate on the Closing checklist before
       // notifying the parent and dismissing the dialog.
       if (posProfile?.name) {
-        setShowClosingChecklist(true);
+        try {
+          const { logStatus } = await getChecklist(posProfile.name, 'Closing');
+          if (logStatus !== 'Complete') {
+            setShowClosingChecklist(true);
+          } else {
+            await onClosingSubmitted?.();
+            onOpenChange(false);
+          }
+        } catch (error) {
+          console.error('Failed to check closing checklist status:', error);
+          setShowClosingChecklist(true);
+        }
       } else {
         await onClosingSubmitted?.();
         onOpenChange(false);

pos/src/i18n/locales/en.json

@@ -180,7 +180,7 @@
     "title_closing": "Closing Checklist",
     "description": "Please complete the checklist below before you continue.",
     "loading": "Loading checklist...",
-    "remarks_placeholder": "Remarks (optional)",
+    "remarks_placeholder": "Remarks",
     "submit": "Submit Checklist",
     "submitting": "Submitting...",
     "load_failed": "Failed to load checklist",

ury/ury_pos/api.py

@@ -1333,6 +1333,14 @@ def _validate_checklist_branch(pos_profile):
 def get_checklist(pos_profile, checklist_type):
     _validate_checklist_branch(pos_profile)
 
+    has_checklist = frappe.db.exists("URY Checklist Item", {"parent": pos_profile})
+    if not has_checklist:
+        return {
+            "items": [],
+            "log_name": None,
+            "log_status": "Complete",
+        }
+
     configured_items = frappe.get_all(
         "URY Checklist Item",
         fields=["item_label", "applies_to", "is_mandatory"],
@@ -1356,6 +1364,8 @@ def get_checklist(pos_profile, checklist_type):
     if existing_log:
         log_name = existing_log[0].name
         log_status = existing_log[0].status
+    elif not configured_items:
+        log_status = "Complete"
 
     return {
         "items": configured_items,
@@ -1368,6 +1378,13 @@ def get_checklist(pos_profile, checklist_type):
 def submit_checklist(pos_profile, checklist_type, items, pos_opening_entry=None):
     _validate_checklist_branch(pos_profile)
 
+    has_checklist = frappe.db.exists("URY Checklist Item", {"parent": pos_profile})
+    if not has_checklist:
+        return {
+            "status": "Complete",
+            "name": None,
+        }
+
     items = json.loads(items)
 
     configured_items = frappe.get_all(
@@ -1376,6 +1393,12 @@ def submit_checklist(pos_profile, checklist_type, items, pos_opening_entry=None)
         filters={"parent": pos_profile, "applies_to": ["in", [checklist_type, "Both"]]},
         parent_doctype="POS Profile",
     )
+    
+    if not configured_items:
+        return {
+            "status": "Complete",
+            "name": None,
+        }
     mandatory_by_label = {row.item_label: row.is_mandatory for row in configured_items}
 
     existing_log = frappe.get_all(