Merge pull request #115 from JumboCode/37-will

37 will

Author: hkittelberger

frontend/src/app/components/ReturnPopup.jsx

@@ -28,85 +28,6 @@ const ReturnPopup = ({ units = [], onSuccess, onClose }) => {
     }, [units, currentPage]);
 
     const handleReturn = async () => {
-        //try {
-
-        //EMAIL FOR RETURN ITEMS BELOW
-
-        //const itemNames = units.map(item => item.name);
-
-        // // Fetch the borrower's ID based on the first selected item
-        // const borrowerID = await fetch (`/api/fetchBorrowerId?id=${units[0].id}`);
-        // if (!borrowerId.ok) {
-        //     throw new Error(`Failed to fetch borrower ID: ${borrowerId.status}`);
-        // }
-        // const { borrower_id: borrowerId } = await borrowerID.json();
-
-        // // Fetch the borrower's email using the first item's borrower_id
-        // console.log("Borrower id:" + borrower_id);
-        // const borrowerEmailResponse = await fetch(`/api/fetchBorrowerEmail?id=${borrower_id}`);
-        // if (!borrowerEmailResponse.ok) {
-        //     throw new Error(`Failed to fetch borrower email: ${borrowerEmailResponse.status}`);
-        // }
-        // const { borrower_email: borrowerEmail } = await borrowerEmailResponse.json();
-
-        // const borrowerNameResponse = await fetch(`/api/fetchBorrowerName?id=${borrowerId}`);
-        // if (!borrowerNameResponse.ok) {
-        //     throw new Error(`Failed to fetch borrower name: ${borrowerNameResponse.status}`);
-        // }
-        // const { borrower_first_name: borrowerFirstName, borrower_last_name: borrowerLastName } = await borrowerNameResponse.json();
-
-        // Step 2: Call the groupReturnsByBorrowerHandler API
-
-        ////////////////////////////////////////////////////
-
-        // try {
-        //     const response = await fetch('/api/borrowManagement?action=groupReturnsByBorrower', {
-        //       method: 'POST',
-        //       headers: { 'Content-Type': 'application/json' },
-        //       body: JSON.stringify({ returnedItems: units.map(item => item.id) }),
-        //     });
-        
-        //     if (!response.ok) {
-        //       throw new Error(`Group API error: ${response.status} - ${response.statusText}`);
-        //     }
-        
-        //     const result = await response.json();
-        //     console.log(result.message); // Should log: Emails sent to all borrowers.
-        
-        //     if (onSuccess) onSuccess();
-        
-        //     location.reload();
-        
-        // } catch (error) {
-        //     console.error("Error returning data:", error);
-        // }
-
-        // try {
-        //     const response = await fetch('../../api/borrowManagement?action=return', {   
-        //         method: 'PUT',
-        //         headers: { 'Content-Type': 'application/json' },
-        //         body: JSON.stringify({ 
-        //             selectedItems: units.map(item => item.id),
-        //             notes_id: Object.keys(notes),
-        //             notes_content: Object.values(notes)
-        //         })
-        //     });
-            
-        //     if (!response.ok) {
-        //         throw new Error(`Fetch error: ${response.status} - ${response.statusText}`);
-        //     }
-
-        //     const result = await response.json(); 
-        //     if (result.message) alert(result.message);
-        //     if (onSuccess) onSuccess(); 
-
-        //     location.reload(); 
-        // } catch (error) {
-        //     console.error("Error returning data:", error);
-        // }
-        // if (selectedUnits == 0) {
-        //   alert('No items selected.'); 
-        // } else {
 
           try {
             // 1. Send Emails first

frontend/src/app/inventory/15Tablecomp/PrePopup.jsx

@@ -12,8 +12,53 @@ export default function PrePopup({ unit, onClose, onOptionSelect, position, stat
         onOptionSelect("expand"); 
     };
 
-    const handleFoundClick = () => {
+    const handleFoundClick = async() => {
         onOptionSelect("Available"); 
+
+        try {
+            // 1. Send Emails first
+            const emailResponse = await fetch('/api/borrowManagement?action=groupReturnsByBorrower', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ returnedItems: [unit.id] }),
+            });
+        
+            if (!emailResponse.ok) {
+                throw new Error(`Group API error: ${emailResponse.status} - ${emailResponse.statusText}`);
+            }
+        
+            const emailResult = await emailResponse.json();
+            console.log(emailResult.message);  // Should log: Emails sent to all borrowers.
+        
+            // 2. THEN update DB
+            const returnResponse = await fetch('/api/borrowManagement?action=return', {
+                method: 'PUT',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({
+                    selectedItems: [unit.id],
+                    notes_id: [],
+                    notes_content: [],
+                }),
+            });
+        
+            if (!returnResponse.ok) {
+                throw new Error(`Fetch error: ${returnResponse.status} - ${returnResponse.statusText}`);
+            }
+        
+            const returnResult = await returnResponse.json();
+            
+            // Show success popup instead of alert
+            setIsSuccessPopupVisible(true);
+            
+            // Don't immediately reload - this will happen when user confirms in popup
+        
+        }    catch (error) {
+                if (error.message.includes("404") || error.message.includes("No borrower")) {
+                    console.info("No borrower to notify — skipping email step.");
+                } else {
+                    console.error("Unexpected error:", error);
+                }
+            }
     };
 
     const handleMissingClick = () => {