account

resources/views/admin/account.blade.php

@@ -2785,10 +2785,8 @@ async function submitEditEntry(e) {
 
 
     function openEntryOrdersModal(entryNo) {
-  // header la entry no show kar
         document.getElementById('entryOrdersEntryNo-span').textContent = `(${entryNo})`;
 
-  // table clean / loading state
         const tbody = document.getElementById('entryOrdersTableBody');
         tbody.innerHTML = `
             <tr>
@@ -2796,7 +2794,6 @@ function openEntryOrdersModal(entryNo) {
             </tr>
         `;
 
-  // API call: /admin/account/entry-orders/{entryno}
         jsonFetch(`/admin/account/entry-orders/${encodeURIComponent(entryNo)}`, {
             method: 'GET'
         })
@@ -2821,16 +2818,10 @@ function openEntryOrdersModal(entryNo) {
             }
 
             tbody.innerHTML = '';
+
             orders.forEach(order => {
                 const tr = document.createElement('tr');
 
-  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');
-
-  // इथे वेगवेगळी शक्य keys try कर
                 const amountValue =
                     order.ttl_amount ??
                     order.ttlamount ??
@@ -2840,18 +2831,17 @@ function openEntryOrdersModal(entryNo) {
                     0;
 
                 tr.innerHTML = `
-    <td>${formattedId}</td>
-    <td>${escapeHtml(order.markno ?? order.mark_no ?? '')}</td>
+                    <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>
                 `;
+
                 tbody.appendChild(tr);
             });
-
-
         })
         .catch(() => {
             tbody.innerHTML = `
@@ -2864,6 +2854,7 @@ function openEntryOrdersModal(entryNo) {
         document.getElementById('entryOrdersModal').classList.add('modal-open');
     }
 
+
 function closeEntryOrdersModal() {
   document.getElementById('entryOrdersModal').classList.remove('modal-open');
 }