Replace Cancel with Remove in print queue, remove canceled state, and implement Chrome-based printing

Author: AdityaPandey-DEV

src/app/admin/printer-monitor/page.tsx

@@ -172,8 +172,8 @@ function PrinterMonitorContent() {
     }
   };
 
-  const handleCancel = async (orderId: string) => {
-    if (!confirm(`Cancel order ${orderId}?`)) return;
+  const handleRemove = async (orderId: string) => {
+    if (!confirm(`Remove order ${orderId} from print queue?`)) return;
 
     try {
       const response = await fetch('/api/admin/print-actions', {
@@ -182,18 +182,18 @@ function PrinterMonitorContent() {
           'Content-Type': 'application/json',
           'x-admin-email': adminEmail,
         },
-        body: JSON.stringify({ orderId, reason: 'Admin cancelled order' }),
+        body: JSON.stringify({ orderId, reason: 'Admin removed from print queue' }),
       });
 
       const result = await response.json();
       if (result.success) {
-        showSuccess('Order cancelled');
+        showSuccess('Order removed from print queue');
         fetchData();
       } else {
-        showError(result.error || 'Failed to cancel order');
+        showError(result.error || 'Failed to remove order from queue');
       }
     } catch (error) {
-      showError('Error cancelling order');
+      showError('Error removing order from queue');
     }
   };
 
@@ -456,10 +456,11 @@ function PrinterMonitorContent() {
                           Reprint
                         </button>
                         <button
-                          onClick={() => handleCancel(order.orderId)}
+                          onClick={() => handleRemove(order.orderId)}
                           className="text-xs bg-red-600 text-white px-2 py-1 rounded hover:bg-red-700"
+                          title="Remove from print queue"
                         >
-                          Cancel
+                          Remove
                         </button>
                       </div>
                     </div>
@@ -580,7 +581,16 @@ function PrinterMonitorContent() {
                       </div>
                       <p className="text-sm text-gray-700 mb-1">{order.fileName}</p>
                       <p className="text-xs text-gray-500 mb-1">Printer: {order.printerName || 'N/A'}</p>
-                      <p className="text-xs text-gray-500">Completed: {formatDate(order.printCompletedAt)}</p>
+                      <p className="text-xs text-gray-500 mb-2">Completed: {formatDate(order.printCompletedAt)}</p>
+                      <div className="flex gap-2 mt-2">
+                        <button
+                          onClick={() => handleRemove(order.orderId)}
+                          className="text-xs bg-gray-600 text-white px-2 py-1 rounded hover:bg-gray-700"
+                          title="Remove from print queue (if printed manually)"
+                        >
+                          Remove
+                        </button>
+                      </div>
                     </div>
                   ))}
                 </div>

src/app/api/admin/print-actions/route.ts

@@ -162,8 +162,9 @@ export async function POST(request: NextRequest) {
 }
 
 /**
- * PUT /api/admin/print-actions/cancel
- * Cancel a pending order
+ * PUT /api/admin/print-actions/remove
+ * Remove order from print queue (doesn't cancel the order)
+ * Can be used for pending, printing, or printed orders
  */
 export async function PUT(request: NextRequest) {
   try {
@@ -200,33 +201,50 @@ export async function PUT(request: NextRequest) {
       );
     }
 
-    if (order.printStatus !== 'pending') {
+    // Check if payment is completed - cannot remove if payment completed
+    if (order.paymentStatus === 'completed') {
       return NextResponse.json(
-        { success: false, error: 'Only pending orders can be cancelled' },
+        { success: false, error: 'Cannot remove order from queue if payment is completed. Order must remain in system.' },
         { status: 400 }
       );
     }
 
     const previousStatus = order.printStatus;
+    const previousOrderStatus = order.orderStatus;
+    const previousMainStatus = order.status;
+
+    // Remove from print queue - doesn't cancel the order
+    // If order was previously cancelled, reset to pending
+    const newOrderStatus = previousOrderStatus === 'cancelled' ? 'pending' : previousOrderStatus;
+    const newMainStatus = previousMainStatus === 'cancelled' ? 'pending_payment' : previousMainStatus;
 
-    // Cancel order
     await Order.findByIdAndUpdate(order._id, {
+      $unset: {
+        printStatus: '',
+        printStartedAt: '',
+        printCompletedAt: '',
+        printerId: '',
+        printerName: '',
+        printingBy: '',
+        printJobId: '',
+        printingHeartbeatAt: '',
+        printError: '',
+      },
       $set: {
-        printStatus: undefined, // Remove print status
-        orderStatus: 'cancelled',
-        status: 'cancelled',
+        orderStatus: newOrderStatus,
+        status: newMainStatus,
       },
     });
 
     // Log action
-    await logAction('cancel', orderId, auth.adminEmail!, previousStatus, 'cancelled', reason, order.printJobId);
+    await logAction('remove_from_queue', orderId, auth.adminEmail!, previousStatus || 'none', 'removed', reason, order.printJobId);
 
     return NextResponse.json({
       success: true,
-      message: 'Order cancelled',
+      message: 'Order removed from print queue',
     });
   } catch (error) {
-    console.error('Error in cancel action:', error);
+    console.error('Error in remove action:', error);
     return NextResponse.json(
       {
         success: false,