diff --git a/resources/views/admin/account.blade.php b/resources/views/admin/account.blade.php index 4ffeedd..5446a56 100644 --- a/resources/views/admin/account.blade.php +++ b/resources/views/admin/account.blade.php @@ -48,7 +48,7 @@ body { /* top actions row */ .top-actions { - display:flex; align-items:center; justify-content:space-between; + align-items:center; justify-content:space-between; gap:12px; margin:16px 0 20px 0; flex-wrap:wrap; } .top-actions .left { @@ -67,7 +67,7 @@ body { cursor:pointer; transition: transform .15s ease, box-shadow .15s; } .btn.ghost { background: transparent; color:var(--primary-1); border:1.5px solid #dbe4f5; box-shadow:none; } -.btn:hover{ transform: translateY(-3px); box-shadow: 0 8px 26px rgba(36,58,114,0.12); } +.btn:hover{ transform: translateY(-3px); box-shadow: 0 8px 26px rgba(227, 229, 234, 0.12); } /* account panels */ .account-panels { @@ -89,12 +89,12 @@ body { background: var(--card-bg); border-radius:12px; box-shadow:0 8px 20px rgba(25,40,80,0.06); - padding:22px; + padding:20px; /* 005 */ box-sizing:border-box; overflow-x:auto; transition: transform .12s, box-shadow .12s; min-height: 520px; - display: flex; + /* display: flex; */ /* 005 */ flex-direction: column; flex: 1; height: 100%; @@ -205,8 +205,8 @@ tr:hover td{ background:#fbfdff; } .toggle-switch-btn { appearance:none; -webkit-appearance:none; - width:60px; - height:24px; + width:64px; + height:26.5px; /* 005 */ background:#f25b5b; border:2px solid #f25b5b; border-radius:999px; @@ -313,7 +313,16 @@ tr:hover td{ background:#fbfdff; } margin-top: 15px; padding: 12px 0; border-top: 1px solid #eef3fb; - margin-right:550px; + /* margin-right:550px; */ +} +.pagination-container { + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 15px; + padding: 12px 0; + border-top: 1px solid #eef3fb; + margin-right:550px; } .pagination-info { @@ -326,14 +335,15 @@ tr:hover td{ background:#fbfdff; } display: flex; align-items: center; gap: 8px; - margin-right:-1050px; + position: absolute; + right: 16px; /* 005 */ } .pagination-controls1 { display: flex; align-items: center; gap: 8px; - margin-right:-550px; + /* margin-right:-550px; */ } @@ -563,7 +573,7 @@ tr:hover td{ background:#fbfdff; } /* Combined filters row styling */ .combined-filters-row { - display: flex; + display: ruby; /* 005 */ gap: 12px; align-items: center; margin-bottom: 16px; @@ -576,8 +586,8 @@ tr:hover td{ background:#fbfdff; } } .right{ - margin-left:auto; - margin-top:-16px; + /* margin-left:auto; + margin-top:-16px; */ /* 005 */ } .filter-group1 { @@ -953,6 +963,15 @@ tr:hover td{ background:#fbfdff; } transition: background 0.2s; } +.combined-top-row .btn:hover { + color: #ffffff !important; + background-color: inherit !important; + border-color: inherit !important; + transform: none !important; + box-shadow: none !important; +} + + .remove-order-btn:hover { background: #d42c3f; } @@ -1314,7 +1333,7 @@ html, body {
-
Create New Installment
+
Create New Installment
@@ -1375,7 +1394,7 @@ html, body {
-
+
Showing 0 entries
- - {{ $order->mark_no }} - {{ $order->origin }} - {{ $order->destination }} - {{ $order->ctn }} - {{ $order->qty }} - {{ $order->ttl_qty }} - ₹{{ number_format($order->ttl_amount, 2) }} - {{ $order->cbm }} - {{ $order->ttl_cbm }} - {{ $order->kg }} - {{ $order->ttl_kg }} - - @php - // Badge color mapping - $badgeMap = [ - 'order_placed' => 'secondary', - 'order_confirmed' => 'info', - 'supplier_warehouse' => 'warning', - 'consolidate_warehouse' => 'warning', - 'export_custom' => 'primary', - 'international_transit' => 'primary', - 'arrived_india' => 'info', - 'import_custom' => 'info', - 'warehouse' => 'dark', - 'domestic_distribution' => 'primary', - 'out_for_delivery' => 'success', - 'delivered' => 'success', - ]; - - // Icon mapping - $iconMap = [ - 'order_placed' => 'bi-clock-fill', - 'order_confirmed' => 'bi-check-circle', - 'supplier_warehouse' => 'bi-box-seam', - 'consolidate_warehouse' => 'bi-boxes', - 'export_custom' => 'bi-upload', - 'international_transit' => 'bi-truck', - 'arrived_india' => 'bi-geo-alt', - 'import_custom' => 'bi-download', - 'warehouse' => 'bi-building', - 'domestic_distribution' => 'bi-diagram-3', - 'out_for_delivery' => 'bi-truck-flatbed', - 'delivered' => 'bi-check-circle-fill', - ]; - - $badgeClass = $badgeMap[$order->status] ?? 'secondary'; - $iconClass = $iconMap[$order->status] ?? 'bi-info-circle'; - @endphp - - - - {{ $order->status_label }} - - - - {{ $order->created_at->format('d-m-Y') }} - - - View - - - - @empty - - No orders found - - @endforelse - - +
+
+ Showing 1 to {{ min($orders->count(), 10) }} of {{ $orders->count() }} entries
-
@@ -1923,6 +1909,7 @@ document.addEventListener('DOMContentLoaded', function() { ${order.mark_no || ''} + ${new Date(order.created_at).toLocaleDateString('en-GB')} ${order.origin || ''} ${order.destination || ''} ${order.ctn || ''} @@ -1934,15 +1921,11 @@ document.addEventListener('DOMContentLoaded', function() { ${order.kg || ''} ${order.ttl_kg || ''} - - ${order.status === 'pending' ? '' : ''} - ${order.status === 'in_transit' ? '' : ''} - ${order.status === 'dispatched' ? '' : ''} - ${order.status === 'delivered' ? '' : ''} - ${order.status ? order.status.charAt(0).toUpperCase() + order.status.slice(1).replace('_', ' ') : ''} + + + ${order.status_label || order.status} - ${new Date(order.created_at).toLocaleDateString('en-GB')} View @@ -1976,6 +1959,50 @@ document.addEventListener('DOMContentLoaded', function() { }); } + function getBadgeClass(status) { + const badgeMap = { + 'order_placed': 'secondary', + 'order_confirmed': 'info', + 'supplier_warehouse': 'warning', + 'consolidate_warehouse': 'warning', + 'export_custom': 'primary', + 'international_transit': 'primary', + 'arrived_india': 'info', + 'import_custom': 'info', + 'warehouse': 'dark', + 'domestic_distribution': 'primary', + 'out_for_delivery': 'success', + 'delivered': 'success', + 'pending': 'warning', + 'in_transit': 'info', + 'dispatched': 'primary', + 'delivered': 'success' + }; + return badgeMap[status] || 'secondary'; + } + + function getIconClass(status) { + const iconMap = { + 'order_placed': 'bi-clock-fill', + 'order_confirmed': 'bi-check-circle', + 'supplier_warehouse': 'bi-box-seam', + 'consolidate_warehouse': 'bi-boxes', + 'export_custom': 'bi-upload', + 'international_transit': 'bi-truck', + 'arrived_india': 'bi-geo-alt', + 'import_custom': 'bi-download', + 'warehouse': 'bi-building', + 'domestic_distribution': 'bi-diagram-3', + 'out_for_delivery': 'bi-truck-flatbed', + 'delivered': 'bi-check-circle-fill', + 'pending': 'bi-clock-fill', + 'in_transit': 'bi-truck', + 'dispatched': 'bi-box-seam', + 'delivered': 'bi-check-circle-fill' + }; + return iconMap[status] || 'bi-info-circle'; + } + itemsTableBody.addEventListener('keydown', function(e) { if (e.key !== 'Enter' || e.target.tagName !== 'INPUT') return; e.preventDefault(); @@ -2024,74 +2051,72 @@ document.addEventListener('DOMContentLoaded', function() { reindexRows(); }); -// ===== EXCEL UPLOAD LOGIC ===== -const uploadExcelBtn = document.getElementById('uploadExcelBtn'); -const excelInput = document.getElementById('excelInput'); + // ===== EXCEL UPLOAD LOGIC ===== + const uploadExcelBtn = document.getElementById('uploadExcelBtn'); + const excelInput = document.getElementById('excelInput'); -if (uploadExcelBtn && excelInput) { + if (uploadExcelBtn && excelInput) { + uploadExcelBtn.addEventListener('click', () => excelInput.click()); - uploadExcelBtn.addEventListener('click', () => excelInput.click()); + excelInput.addEventListener('change', function () { + const file = this.files[0]; + if (!file) return; - excelInput.addEventListener('change', function () { - const file = this.files[0]; - if (!file) return; + const formData = new FormData(); + formData.append('excel', file); + formData.append('_token', '{{ csrf_token() }}'); - const formData = new FormData(); - formData.append('excel', file); - formData.append('_token', '{{ csrf_token() }}'); - - fetch('{{ route("admin.orders.upload.excel.preview") }}', { - method: 'POST', - body: formData, - headers: { - 'Accept': 'application/json' - } - }) - .then(async res => { - if (!res.ok) { - const text = await res.text(); - throw new Error(text); - } - return res.json(); - }) - .then(res => { - if (!res.success) { - alert('Invalid Excel file'); - return; - } - populateItemsTable(res.items); - }) - .catch(err => { - console.error(err); - alert('Excel upload failed'); + fetch('{{ route("admin.orders.upload.excel.preview") }}', { + method: 'POST', + body: formData, + headers: { + 'Accept': 'application/json' + } + }) + .then(async res => { + if (!res.ok) { + const text = await res.text(); + throw new Error(text); + } + return res.json(); + }) + .then(res => { + if (!res.success) { + alert('Invalid Excel file'); + return; + } + populateItemsTable(res.items); + }) + .catch(err => { + console.error(err); + alert('Excel upload failed'); + }); }); - }); + } -} + function populateItemsTable(items) { + itemsTableBody.innerHTML = ''; -function populateItemsTable(items) { - itemsTableBody.innerHTML = ''; + items.forEach((item, index) => { + addRow(index); + const row = itemsTableBody.children[index]; - items.forEach((item, index) => { - addRow(index); - const row = itemsTableBody.children[index]; + row.querySelector('[data-field="description"]').value = item.description ?? ''; + row.querySelector('[data-field="ctn"]').value = item.ctn ?? ''; + row.querySelector('[data-field="qty"]').value = item.qty ?? ''; + row.querySelector('[data-field="ttl_qty"]').value = item.ttl_qty ?? ''; + row.querySelector('[data-field="unit"]').value = item.unit ?? ''; + row.querySelector('[data-field="price"]').value = item.price ?? ''; + row.querySelector('[data-field="ttl_amount"]').value = item.ttl_amount ?? ''; + row.querySelector('[data-field="cbm"]').value = item.cbm ?? ''; + row.querySelector('[data-field="ttl_cbm"]').value = item.ttl_cbm ?? ''; + row.querySelector('[data-field="kg"]').value = item.kg ?? ''; + row.querySelector('[data-field="ttl_kg"]').value = item.ttl_kg ?? ''; + row.querySelector('[data-field="shop_no"]').value = item.shop_no ?? ''; + }); - row.querySelector('[data-field="description"]').value = item.description ?? ''; - row.querySelector('[data-field="ctn"]').value = item.ctn ?? ''; - row.querySelector('[data-field="qty"]').value = item.qty ?? ''; - row.querySelector('[data-field="ttl_qty"]').value = item.ttl_qty ?? ''; - row.querySelector('[data-field="unit"]').value = item.unit ?? ''; - row.querySelector('[data-field="price"]').value = item.price ?? ''; - row.querySelector('[data-field="ttl_amount"]').value = item.ttl_amount ?? ''; - row.querySelector('[data-field="cbm"]').value = item.cbm ?? ''; - row.querySelector('[data-field="ttl_cbm"]').value = item.ttl_cbm ?? ''; - row.querySelector('[data-field="kg"]').value = item.kg ?? ''; - row.querySelector('[data-field="ttl_kg"]').value = item.ttl_kg ?? ''; - row.querySelector('[data-field="shop_no"]').value = item.shop_no ?? ''; - }); - - reindexRows(); -} + reindexRows(); + } }); @@ -2103,4 +2128,4 @@ document.addEventListener("hidden.bs.modal", function () { }); -@endsection +@endsection \ No newline at end of file diff --git a/resources/views/admin/shipments.blade.php b/resources/views/admin/shipments.blade.php index c0bb32d..c3ff02a 100644 --- a/resources/views/admin/shipments.blade.php +++ b/resources/views/admin/shipments.blade.php @@ -4,48 +4,82 @@ @section('content') @@ -1333,7 +1761,6 @@ -
- - - {{ $order->order_id }} - - {{ $order->origin }} - {{ $order->destination }} - {{ $order->ctn }} - {{ $order->qty }} - {{ $order->ttl_qty }} - {{ $order->cbm }} - {{ $order->ttl_cbm }} - {{ $order->kg }} - {{ $order->ttl_kg }} - ₹{{ number_format($order->ttl_amount, 2) }} - - @empty - - No available orders to add to shipment - - @endforelse + +
+ + +
+ +
+ + + +
+
@@ -1609,6 +2045,30 @@ const itemsPerPage = 10; let allShipments = @json($shipments); let filteredShipments = [...allShipments]; +// Modal pagination state +let modalCurrentPage = 1; +const modalItemsPerPage = 10; + +// IMPORTANT: सर्व orders एकाच decending order मध्ये +// प्रथम सर्व orders ला एकत्रित decending order मध्ये sort करा +let allAvailableOrders = @json($availableOrders); + +// Sort all orders in descending order by order_id (newest first) +// Order ID च्या क्रमाने sort करा (KNT-25-00000041, KNT-25-00000040, etc.) +allAvailableOrders.sort((a, b) => { + // Extract the number from order_id (e.g., "KNT-25-00000041" -> 41) + const extractNumber = (orderId) => { + const match = orderId.match(/\d+$/); + return match ? parseInt(match[0]) : 0; + }; + + const numA = extractNumber(a.order_id); + const numB = extractNumber(b.order_id); + + // Descending order (highest number first) + return numB - numA; +}); + // Initialize pagination on page load document.addEventListener('DOMContentLoaded', function() { renderTable(); @@ -1664,11 +2124,163 @@ document.addEventListener('DOMContentLoaded', function() { searchInput.addEventListener('input', filterShipments); carrierFilter.addEventListener('change', filterShipments); + // Update status filter appearance based on selection + statusFilter.addEventListener('change', function() { + // Update data-status attribute for CSS styling + if (this.value === 'all') { + this.removeAttribute('data-status'); + } else { + this.setAttribute('data-status', this.value); + } + }); + // Initialize filter on page load filterShipments(); + + // Modal pagination initialization + initModalPagination(); }); -// Pagination Functions +// Modal Pagination Functions +function initModalPagination() { + renderModalTable(); + updateModalPaginationControls(); + + // Bind modal pagination events + document.getElementById('modalPrevPageBtn').addEventListener('click', goToModalPreviousPage); + document.getElementById('modalNextPageBtn').addEventListener('click', goToModalNextPage); +} + +function goToModalPreviousPage() { + if (modalCurrentPage > 1) { + modalCurrentPage--; + renderModalTable(); + updateModalPaginationControls(); + } +} + +function goToModalNextPage() { + const totalPages = Math.ceil(allAvailableOrders.length / modalItemsPerPage); + if (modalCurrentPage < totalPages) { + modalCurrentPage++; + renderModalTable(); + updateModalPaginationControls(); + } +} + +function updateModalPaginationControls() { + const totalPages = Math.ceil(allAvailableOrders.length / modalItemsPerPage); + const prevBtn = document.getElementById('modalPrevPageBtn'); + const nextBtn = document.getElementById('modalNextPageBtn'); + const pageInfo = document.getElementById('modalPageInfo'); + const paginationPages = document.getElementById('modalPaginationPages'); + + prevBtn.disabled = modalCurrentPage === 1; + nextBtn.disabled = modalCurrentPage === totalPages || totalPages === 0; + + // Update page info text + const startIndex = (modalCurrentPage - 1) * modalItemsPerPage + 1; + const endIndex = Math.min(modalCurrentPage * modalItemsPerPage, allAvailableOrders.length); + pageInfo.textContent = `Showing ${startIndex} to ${endIndex} of ${allAvailableOrders.length} entries`; + + // Generate page numbers + paginationPages.innerHTML = ''; + + if (totalPages <= 7) { + // Show all pages + for (let i = 1; i <= totalPages; i++) { + addModalPageButton(i, paginationPages); + } + } else { + // Show first page, current page range, and last page + addModalPageButton(1, paginationPages); + + if (modalCurrentPage > 3) { + paginationPages.innerHTML += '...'; + } + + const start = Math.max(2, modalCurrentPage - 1); + const end = Math.min(totalPages - 1, modalCurrentPage + 1); + + for (let i = start; i <= end; i++) { + addModalPageButton(i, paginationPages); + } + + if (modalCurrentPage < totalPages - 2) { + paginationPages.innerHTML += '...'; + } + + addModalPageButton(totalPages, paginationPages); + } +} + +function addModalPageButton(pageNumber, container) { + const button = document.createElement('button'); + button.className = 'modal-pagination-page-btn'; + if (pageNumber === modalCurrentPage) { + button.classList.add('active'); + } + button.textContent = pageNumber; + button.addEventListener('click', () => { + modalCurrentPage = pageNumber; + renderModalTable(); + updateModalPaginationControls(); + }); + container.appendChild(button); +} + +function renderModalTable() { + const tbody = document.getElementById('modalOrdersTableBody'); + + if (allAvailableOrders.length === 0) { + tbody.innerHTML = ` + + + + No available orders to add to shipment + + + `; + return; + } + + // Calculate pagination - पेजवर दाखवायचे orders + const startIndex = (modalCurrentPage - 1) * modalItemsPerPage; + const endIndex = startIndex + modalItemsPerPage; + + // IMPORTANT: सर्व orders आधीच sorted आहेत (descending order मध्ये) + // फक्त current page चे orders घ्या + const paginatedItems = allAvailableOrders.slice(startIndex, endIndex); + + // Render table rows + tbody.innerHTML = ''; + paginatedItems.forEach((order, index) => { + const globalIndex = startIndex + index + 1; + const row = document.createElement('tr'); + + row.innerHTML = ` + + + + + ${order.order_id} + + ${order.origin} + ${order.destination} + ${order.ctn} + ${order.qty} + ${order.ttl_qty} + ${order.cbm} + ${order.ttl_cbm} + ${order.kg} + ${order.ttl_kg} + ₹${parseFloat(order.ttl_amount).toLocaleString('en-IN', {minimumFractionDigits: 2, maximumFractionDigits: 2})} + `; + tbody.appendChild(row); + }); +} + +// Main Pagination Functions function goToPreviousPage() { if (currentPage > 1) { currentPage--; @@ -1768,7 +2380,7 @@ function renderTable() { const endIndex = startIndex + itemsPerPage; const paginatedItems = filteredShipments.slice(startIndex, endIndex); - // Sort by creation date (newest first) + // Sort by creation date (newest first) - descending order const sortedItems = [...paginatedItems].sort((a, b) => new Date(b.created_at) - new Date(a.created_at)); // Render table rows @@ -2086,8 +2698,6 @@ document.addEventListener('DOMContentLoaded', function() { }); }); - - function openShipmentOrderDetails(orderId) { const modal = new bootstrap.Modal( document.getElementById('shipmentOrderDetailsModal') @@ -2109,6 +2719,19 @@ function openShipmentOrderDetails(orderId) { }); } +// Reset modal pagination when modal is shown +document.addEventListener('DOMContentLoaded', function() { + const createShipmentModal = document.getElementById('createShipmentModal'); + if (createShipmentModal) { + createShipmentModal.addEventListener('show.bs.modal', function() { + // Reset to first page + modalCurrentPage = 1; + renderModalTable(); + updateModalPaginationControls(); + }); + } +}); +