Resolve merge conflicts

resources/views/admin/popup_invoice.blade.php

@@ -9,6 +9,7 @@
           href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css">
 
     <style>
+        /* ALL YOUR EXISTING CSS STAYS HERE - EXCEPT GST TOTALS SECTION REMOVED */
         :root {
             --primary: #2c3e50;
             --secondary: #3498db;
@@ -69,6 +70,9 @@
             box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
             transition: all 0.3s ease;
             height: 100%;
+            display: flex;
+            align-items: center;
+            gap: 1rem;
         }
 
         .id-box:hover {
@@ -83,11 +87,10 @@
         .id-box-secondary {
             border-left: 4px solid var(--success);
         }
-
         .id-icon {
-            width: 36px;
-            height: 36px;
-            border-radius: 50%;
+            width: 48px;
+            height: 48px;
+            border-radius: var(--border-radius);
             display: flex;
             align-items: center;
             justify-content: center;
@@ -96,15 +99,14 @@
         }
 
         .id-icon-primary {
-            background: rgba(52, 152, 219, 0.1);
-            color: var(--secondary);
+            background: linear-gradient(135deg, #3498db 0%, #2980b9 100%);
+            color: white;
         }
 
         .id-icon-secondary {
-            background: rgba(39, 174, 96, 0.1);
-            color: var(--success);
+            background: linear-gradient(135deg, #27ae60 0%, #219653 100%);
+            color: white;
         }
-
         .id-label {
             font-size: 0.75rem;
             color: #6c757d;
@@ -119,6 +121,8 @@
             font-weight: 700;
             color: var(--primary);
             margin-bottom: 0;
+            word-break: break-word;
+            line-height: 1.3;
         }
 
         .date-container {
@@ -173,8 +177,7 @@
         .date-connector {
             display: flex;
             align-items: center;
-            justify-content: center;
-            height: 100%;
+            gap: 4px;
         }
 
         .date-connector i {
@@ -183,6 +186,7 @@
             border-radius: 50%;
             color: var(--secondary);
             border: 2px solid #e9ecef;
+            box-shadow: 0 2px 5px rgba(0,0,0,0.1);
         }
 
         .card {
@@ -220,17 +224,19 @@
         .table tbody tr:hover {
             background-color: rgba(52, 152, 219, 0.03);
         }
-
-        .summary-card {
-            background: var(--light);
-            border-left: 4px solid var(--secondary);
+        
+        /* Simplified Summary Section */
+        .summary-container {
+            margin: 2rem 0;
         }
-
-        .summary-header {
-            background: var(--primary);
-            color: #ffffff;
+        
+        .amount-row {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 0.75rem 0;
         }
-
+        
         .text-primary {
             color: var(--primary) !important;
         }
@@ -276,6 +282,66 @@
             .id-box {
                 margin-bottom: 1rem;
             }
+            
+            .date-status-row {
+                justify-content: flex-start;
+                margin-top: 0.5rem;
+            }
+            
+            .compact-header .col-md-6.text-end {
+                text-align: left !important;
+            }
+            
+            .date-badge {
+                min-width: 120px;
+            }
+            
+            .summary-container {
+                padding: 0 1rem;
+            }
+        }
+        
+        @media (max-width: 576px) {
+            .date-status-row {
+                flex-direction: column;
+                align-items: flex-start;
+                gap: 0.5rem;
+            }
+            
+            .date-separator {
+                display: none;
+            }
+            
+            .date-badge {
+                width: 100%;
+            }
+            
+            .id-box {
+                flex-direction: column;
+                text-align: center;
+                gap: 0.75rem;
+            }
+            
+            .id-icon {
+                width: 40px;
+                height: 40px;
+                font-size: 1rem;
+            }
+            
+            .table-responsive {
+                overflow-x: auto;
+            }
+        }
+        
+        @media print {
+            body {
+                background-color: white;
+            }
+            
+            .invoice-container {
+                box-shadow: none;
+                border: 1px solid #ddd;
+            }
         }
     </style>
 </head>
@@ -623,11 +689,12 @@
             url: "{{ asset($invoice->pdf_path) }}"
         };
 
-        if (navigator.share) {
-            navigator.share(shareData).catch(() => {});
-        } else {
-            navigator.clipboard.writeText(shareData.url);
-            alert("Link copied! Sharing not supported on this browser.");
+            if (navigator.share) {
+                navigator.share(shareData).catch(() => {});
+            } else {
+                navigator.clipboard.writeText(shareData.url);
+                alert("Link copied! Sharing not supported on this browser.");
+            }
         }
     }
 </script>