From 338425535ec9b666700e4a91b9ba8e2ad271cee3c959fbe9884c2f135d45854c Mon Sep 17 00:00:00 2001
From: Abhishek Mali <maliabhi000@gmail.com>
Date: Tue, 23 Dec 2025 22:15:45 +0530
Subject: [PATCH] account

---
 resources/views/admin/account.blade.php | 127 +++++++++++-------------
 1 file changed, 59 insertions(+), 68 deletions(-)

diff --git a/resources/views/admin/account.blade.php b/resources/views/admin/account.blade.php
index ae55af8..14d0b08 100644
--- a/resources/views/admin/account.blade.php
+++ b/resources/views/admin/account.blade.php
@@ -2784,85 +2784,76 @@ async function submitEditEntry(e) {
 }
 
 
-function openEntryOrdersModal(entryNo) {
-  // header la entry no show kar
-  document.getElementById('entryOrdersEntryNo-span').textContent = `(${entryNo})`;
+    function openEntryOrdersModal(entryNo) {
+        document.getElementById('entryOrdersEntryNo-span').textContent = `(${entryNo})`;
 
-  // table clean / loading state
-  const tbody = document.getElementById('entryOrdersTableBody');
-  tbody.innerHTML = `
-    <tr>
-      <td colspan="7" class="empty-state">Loading orders...</td>
-    </tr>
-  `;
-
-  // API call: /admin/account/entry-orders/{entryno}
-  jsonFetch(`/admin/account/entry-orders/${encodeURIComponent(entryNo)}`, {
-    method: 'GET'
-  })
-    .then(res => {
-      if (!res.success) {
+        const tbody = document.getElementById('entryOrdersTableBody');
         tbody.innerHTML = `
-          <tr>
-            <td colspan="7" class="empty-state">Failed to load orders</td>
-          </tr>
+            <tr>
+                <td colspan="7" class="empty-state">Loading orders...</td>
+            </tr>
         `;
-        return;
-      }
 
-      const orders = res.orders || [];
-      if (!orders.length) {
-        tbody.innerHTML = `
-          <tr>
-            <td colspan="7" class="empty-state">No orders associated with this entry</td>
-          </tr>
-        `;
-        return;
-      }
+        jsonFetch(`/admin/account/entry-orders/${encodeURIComponent(entryNo)}`, {
+            method: 'GET'
+        })
+        .then(res => {
+            if (!res.success) {
+                tbody.innerHTML = `
+                    <tr>
+                        <td colspan="7" class="empty-state">Failed to load orders</td>
+                    </tr>
+                `;
+                return;
+            }
 
-      tbody.innerHTML = '';
-      orders.forEach(order => {
-  const tr = document.createElement('tr');
+            const orders = res.orders || [];
+            if (!orders.length) {
+                tbody.innerHTML = `
+                    <tr>
+                        <td colspan="7" class="empty-state">No orders associated with this entry</td>
+                    </tr>
+                `;
+                return;
+            }
 
-  const idString = (order.orderid ?? order.id ?? '').toString().trim();
-  const numericId = parseInt(idString, 10);
-  const formattedId = isNaN(numericId)
-    ? escapeHtml(idString)
-    : 'KNT-25-' + String(numericId).padStart(8, '0');
+            tbody.innerHTML = '';
 
-  // इथे वेगवेगळी शक्य keys try कर
-  const amountValue =
-      order.ttl_amount ??
-      order.ttlamount ??
-      order.total_amount ??
-      order.order_amount ??
-      order.amount ??
-      0;
+            orders.forEach(order => {
+                const tr = document.createElement('tr');
 
-  tr.innerHTML = `
-    <td>${formattedId}</td>
-    <td>${escapeHtml(order.markno ?? order.mark_no ?? '')}</td>
-    <td>${escapeHtml(order.origin ?? '')}</td>
-    <td>${escapeHtml(order.destination ?? '')}</td>
-    <td>${escapeHtml(order.ctn ?? '')}</td>
-    <td>${escapeHtml(order.qty ?? '')}</td>
-    <td>${formatCurrency(amountValue)}</td>
-  `;
-  tbody.appendChild(tr);
-});
+                const amountValue =
+                    order.ttl_amount ??
+                    order.ttlamount ??
+                    order.total_amount ??
+                    order.order_amount ??
+                    order.amount ??
+                    0;
 
+                tr.innerHTML = `
+                    <td>${escapeHtml(order.order_id)}</td>
+                    <td>${escapeHtml(order.mark_no ?? '')}</td>
+                    <td>${escapeHtml(order.origin ?? '')}</td>
+                    <td>${escapeHtml(order.destination ?? '')}</td>
+                    <td>${escapeHtml(order.ctn ?? '')}</td>
+                    <td>${escapeHtml(order.qty ?? '')}</td>
+                    <td>${formatCurrency(amountValue)}</td>
+                `;
 
-    })
-    .catch(() => {
-      tbody.innerHTML = `
-        <tr>
-          <td colspan="7" class="empty-state">Error loading orders</td>
-        </tr>
-      `;
-    });
+                tbody.appendChild(tr);
+            });
+        })
+        .catch(() => {
+            tbody.innerHTML = `
+                <tr>
+                    <td colspan="7" class="empty-state">Error loading orders</td>
+                </tr>
+            `;
+        });
+
+        document.getElementById('entryOrdersModal').classList.add('modal-open');
+    }
 
-  document.getElementById('entryOrdersModal').classList.add('modal-open');
-}
 
 function closeEntryOrdersModal() {
   document.getElementById('entryOrdersModal').classList.remove('modal-open');