+
@@ -2784,76 +3056,98 @@ async function submitEditEntry(e) {
}
- function openEntryOrdersModal(entryNo) {
- document.getElementById('entryOrdersEntryNo-span').textContent = `(${entryNo})`;
+function openEntryOrdersModal(entryNo) {
+ // Set entry number in header
+ document.getElementById('entryOrdersEntryNo-span').textContent = `(${entryNo})`;
- const tbody = document.getElementById('entryOrdersTableBody');
+ // Reset summary values
+ document.getElementById('ordersTotalCount').textContent = '0';
+ document.getElementById('ordersTotalQuantity').textContent = '0';
+ document.getElementById('ordersTotalAmount').textContent = '₹0';
+
+ // table loading state
+ const tbody = document.getElementById('entryOrdersTableBody');
+ tbody.innerHTML = `
+
+ | Loading orders... |
+
+ `;
+
+ // API call: /admin/account/entry-orders/{entryno}
+ jsonFetch(`/admin/account/entry-orders/${encodeURIComponent(entryNo)}`, {
+ method: 'GET'
+ })
+ .then(res => {
+ if (!res.success) {
tbody.innerHTML = `
-
- | Loading orders... |
-
+
+ | Failed to load orders |
+
`;
+ return;
+ }
- jsonFetch(`/admin/account/entry-orders/${encodeURIComponent(entryNo)}`, {
- method: 'GET'
- })
- .then(res => {
- if (!res.success) {
- tbody.innerHTML = `
-
- | Failed to load orders |
-
- `;
- return;
- }
+ const orders = res.orders || [];
+ if (!orders.length) {
+ tbody.innerHTML = `
+
+ | No orders associated with this entry |
+
+ `;
+ return;
+ }
- const orders = res.orders || [];
- if (!orders.length) {
- tbody.innerHTML = `
-
- | No orders associated with this entry |
-
- `;
- return;
- }
+ tbody.innerHTML = '';
+
+ let totalQuantity = 0;
+ let totalAmount = 0;
- tbody.innerHTML = '';
+ orders.forEach(order => {
+ const tr = document.createElement('tr');
- 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');
- const amountValue =
- order.ttl_amount ??
- order.ttlamount ??
- order.total_amount ??
- order.order_amount ??
- order.amount ??
- 0;
+ // Calculate values for summary
+ const quantity = Number(order.qty || order.order_qty || 0);
+ const amountValue = Number(order.ttl_amount ?? order.ttlamount ?? order.total_amount ?? order.order_amount ?? order.amount ?? 0);
+
+ totalQuantity += quantity;
+ totalAmount += amountValue;
- tr.innerHTML = `
-
${escapeHtml(order.order_id)} |
-
${escapeHtml(order.mark_no ?? '')} |
-
${escapeHtml(order.origin ?? '')} |
-
${escapeHtml(order.destination ?? '')} |
-
${escapeHtml(order.ctn ?? '')} |
-
${escapeHtml(order.qty ?? '')} |
-
${formatCurrency(amountValue)} |
- `;
+ tr.innerHTML = `
+
+ ${formattedId}
+ |
+
${escapeHtml(order.markno ?? order.mark_no ?? '')} |
+
${escapeHtml(order.origin ?? '')} |
+
${escapeHtml(order.destination ?? '')} |
+
${escapeHtml(order.ctn ?? '')} |
+
${quantity} |
+
${formatCurrency(amountValue)} |
+ `;
+ tbody.appendChild(tr);
+ });
- tbody.appendChild(tr);
- });
- })
- .catch(() => {
- tbody.innerHTML = `
-
- | Error loading orders |
-
- `;
- });
+ // Update summary
+ document.getElementById('ordersTotalCount').textContent = orders.length;
+ document.getElementById('ordersTotalQuantity').textContent = totalQuantity.toLocaleString();
+ document.getElementById('ordersTotalAmount').textContent = formatCurrency(totalAmount);
- document.getElementById('entryOrdersModal').classList.add('modal-open');
- }
+ })
+ .catch(() => {
+ tbody.innerHTML = `
+
+ | Error loading orders |
+
+ `;
+ });
+ document.getElementById('entryOrdersModal').classList.add('modal-open');
+}
function closeEntryOrdersModal() {
document.getElementById('entryOrdersModal').classList.remove('modal-open');
@@ -2989,7 +3283,7 @@ function handleSearch(){
updatePaginationControls();
}
-/* ---------- Entry details & installments ---------- */
+/* ---------- Entry details & installments (Enhanced) ---------- */
async function openEntryDetailsModal(entryNo) {
try {
const res = await jsonFetch('/admin/account/entry/' + encodeURIComponent(entryNo));
@@ -2999,58 +3293,109 @@ async function openEntryDetailsModal(entryNo) {
const entry = res.entry;
currentEntry = entry;
+ // Set header info
document.getElementById('entryDetailsId').textContent = entry.entry_no;
- document.getElementById('originalAmount').textContent = formatCurrency(entry.amount);
-
- const totalProcessed = Number(entry.amount) - Number(entry.pending_amount);
+
+ // Calculate values
+ const originalAmount = Number(entry.amount || 0);
+ const pendingAmount = Number(entry.pending_amount || 0);
+ const totalProcessed = originalAmount - pendingAmount;
+
+ // Update summary cards
+ document.getElementById('originalAmount').textContent = formatCurrency(originalAmount);
document.getElementById('totalProcessed').textContent = formatCurrency(totalProcessed);
+ document.getElementById('pendingBalance').textContent = formatCurrency(pendingAmount);
+ document.getElementById('totalInstallments').textContent = entry.installments?.length || 0;
- document.getElementById('pendingBalance').textContent = formatCurrency(entry.pending_amount);
- document.getElementById('totalInstallments').textContent = entry.installments.length;
-
+ // Render installments table
const tbody = document.getElementById('installmentsTableBody');
tbody.innerHTML = '';
- entry.installments.forEach((ins, idx) => {
- const tr = document.createElement('tr');
- tr.innerHTML = `
-
${idx === 0 ? 'Original Entry' : 'Installment ' + idx} |
-
${escapeHtml(ins.proc_date)} |
-
${escapeHtml(ins.description)} |
-
${escapeHtml(ins.region)} |
-
${formatCurrency(ins.amount)} |
-
-
-
-
- |
+ if (!entry.installments || entry.installments.length === 0) {
+ tbody.innerHTML = `
+
+
+
+ 📋
+
+ No installments found for this entry
+
+
+ Add your first installment to get started
+
+ |
+
`;
- tbody.appendChild(tr);
- });
+ } else {
+ entry.installments.forEach((ins, idx) => {
+ const tr = document.createElement('tr');
+
+ // Determine installment label
+ let installmentLabel = 'Original Entry';
+ if (idx > 0) {
+ installmentLabel = `Installment ${idx}`;
+ }
+
+ // Status dropdown options with colors
+ const statusOptions = [
+ { value: 'Pending', label: '⏳ Pending', color: '#f59e0b' },
+ { value: 'Loading', label: '📦 Loading', color: '#3b82f6' },
+ { value: 'Packed', label: '📦 Packed', color: '#8b5cf6' },
+ { value: 'Dispatched', label: '🚚 Dispatched', color: '#10b981' },
+ { value: 'Delivered', label: '✅ Delivered', color: '#0c6b2e' }
+ ];
+
+ let statusOptionsHtml = '';
+ statusOptions.forEach(opt => {
+ const selected = ins.status === opt.value ? 'selected' : '';
+ statusOptionsHtml += `
`;
+ });
+ tr.innerHTML = `
+
+
+
+ ${idx + 1}
+
+ ${installmentLabel}
+ |
+
+
+
+ ${escapeHtml(ins.proc_date || ins.date || '')}
+
+ |
+
${escapeHtml(ins.description || '')} |
+
+
+ ${escapeHtml(ins.region || '')}
+
+ |
+
+
+ ${formatCurrency(ins.amount || 0)}
+
+ |
+
+
+ |
+ `;
+ tbody.appendChild(tr);
+ });
+ }
+
+ // Show modal
document.getElementById('entryDetailsModal').classList.add('modal-open');
} catch (err) {
diff --git a/resources/views/admin/container.blade.php b/resources/views/admin/container.blade.php
new file mode 100644
index 0000000..53f3cc2
--- /dev/null
+++ b/resources/views/admin/container.blade.php
@@ -0,0 +1,802 @@
+@extends('admin.layouts.app')
+
+@section('page-title', 'Containers')
+
+@section('content')
+
+
+
+
+
+ @if(session('success'))
+
+
+ {{ session('success') }}
+
+ @endif
+
+
+
+
+ Filter Containers
+
+
+
+
+
+
+
+ @if($containers->isEmpty())
+
+
+
+
+
No containers found
+
Get started by creating your first container
+
+ @else
+ @foreach($containers as $container)
+ @php
+ $status = $container->status;
+ $statusClass = match ($status) {
+ 'completed' => 'status-completed',
+ 'in-progress' => 'status-in-progress',
+ 'cancelled' => 'status-cancelled',
+ default => 'status-pending',
+ };
+ @endphp
+
+
+
+
+
+
+
+
{{ number_format($container->summary['total_ctn'], 1) }}
+
Total CTN
+
+
+
{{ number_format($container->summary['total_qty'], 0) }}
+
Total QTY
+
+
+
{{ number_format($container->summary['total_cbm'], 3) }}
+
Total CBM
+
+
+
{{ number_format($container->summary['total_kg'], 1) }}
+
Total KG
+
+
+
+ @endforeach
+ @endif
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@endsection
diff --git a/resources/views/admin/container_create.blade.php b/resources/views/admin/container_create.blade.php
new file mode 100644
index 0000000..f947a4d
--- /dev/null
+++ b/resources/views/admin/container_create.blade.php
@@ -0,0 +1,325 @@
+@extends('admin.layouts.app')
+
+@section('page-title', 'Add Container')
+
+@section('content')
+
+
+
+
+
+
+
+
+
+
+ {{-- SUCCESS --}}
+ @if (session('success'))
+
+ {{ session('success') }}
+
+ @endif
+
+ {{-- VALIDATION --}}
+ @if ($errors->any())
+
+
+ @foreach ($errors->all() as $error)
+ - {{ $error }}
+ @endforeach
+
+
+ @endif
+
+ {{-- COMBINED ERROR PANEL (summary text) --}}
+ @if(session('formula_errors') || session('mark_errors'))
+
+
+
+
+
+ Some rows in your Excel file have formula or mark issues.
+ See the table below, and detailed messages after the table.
+
+
+
+
+ {{-- 1) Excel-style table at top --}}
+ @php
+ $formulaErrors = session('formula_errors') ?? [];
+ $markErrors = session('mark_errors') ?? [];
+
+ $allRowsData = [];
+
+ foreach ($formulaErrors as $fe) {
+ if (!empty($fe['data'] ?? null)) {
+ $allRowsData[] = $fe['data'];
+ }
+ }
+
+ foreach ($markErrors as $me) {
+ if (!empty($me['data'] ?? null)) {
+ $allRowsData[] = $me['data'];
+ }
+ }
+
+ $headings = [];
+ if (!empty($allRowsData)) {
+ $headings = array_keys($allRowsData[0]);
+ }
+ @endphp
+
+ @if(!empty($headings))
+
+
+
+
+
+
+
+ | Excel Row |
+ Mark No |
+ @foreach($headings as $head)
+ {{ $head }} |
+ @endforeach
+
+
+
+ {{-- Formula error rows --}}
+ @foreach($formulaErrors as $fe)
+ @php
+ $rowData = $fe['data'] ?? [];
+ @endphp
+ @if(!empty($rowData))
+
+ | {{ $fe['excel_row'] }} |
+ {{ $fe['mark_no'] }} |
+ @foreach($headings as $head)
+ {{ $rowData[$head] ?? '' }} |
+ @endforeach
+
+ @endif
+ @endforeach
+
+ {{-- Mark error rows --}}
+ @foreach($markErrors as $me)
+ @php
+ $rowData = $me['data'] ?? [];
+ @endphp
+ @if(!empty($rowData))
+
+ | {{ $me['excel_row'] }} |
+ {{ $me['mark_no'] }} |
+ @foreach($headings as $head)
+ {{ $rowData[$head] ?? '' }} |
+ @endforeach
+
+ @endif
+ @endforeach
+
+
+
+
+
+ @endif
+
+ {{-- 2) Detailed per-row error boxes BELOW the table --}}
+
+
+
+
+ {{-- Formula Errors (detailed) --}}
+ @if(session('formula_errors'))
+ @foreach(session('formula_errors') as $fe)
+
+
+ Row {{ $fe['excel_row'] }}
+ @if($fe['mark_no']) | Mark: {{ $fe['mark_no'] }} @endif
+ @if($fe['description']) | {{ $fe['description'] }} @endif
+
+
+ @foreach($fe['errors'] as $field => $detail)
+
+ ❌ {{ $field }} →
+ Expected: {{ number_format($detail['expected'],4) }}
+ | Got: {{ number_format($detail['actual'],4) }}
+
+ @endforeach
+
+ @endforeach
+ @endif
+
+ {{-- Mark Errors (detailed) --}}
+ @if(session('mark_errors'))
+ @foreach(session('mark_errors') as $me)
+
+
+ Row {{ $me['excel_row'] }}
+
+
+ ❌ Mark {{ $me['mark_no'] }} not found in database
+
+
+ @endforeach
+ @endif
+
+
+
+
+ @endif
+
+ {{-- FORM --}}
+ @if (!session('formula_errors') && !session('mark_errors'))
+
+ @endif
+
+
+
+
+@endsection
diff --git a/resources/views/admin/container_show.blade.php b/resources/views/admin/container_show.blade.php
new file mode 100644
index 0000000..2010f18
--- /dev/null
+++ b/resources/views/admin/container_show.blade.php
@@ -0,0 +1,413 @@
+@extends('admin.layouts.app')
+
+@section('page-title', 'Container Details')
+
+@section('content')
+
+
+
+
+ {{-- TOP GRADIENT HEADER --}}
+
+
+ {{-- MAIN CARD --}}
+
+
+
+
+ {{-- INFO STRIP --}}
+
+
+
Container
+
{{ $container->container_name }}
+
+
+
Date
+
{{ $container->container_date?->format('d-m-Y') }}
+
+
+
Excel File
+ @if($container->excel_file)
+
+ @else
+
Not uploaded
+ @endif
+
+
+
+ @if($container->rows->isEmpty())
+
No entries found for this container.
+ @else
+ @php
+ $allHeadings = [];
+ foreach ($container->rows as $row) {
+ if (is_array($row->data)) {
+ $allHeadings = array_unique(array_merge($allHeadings, array_keys($row->data)));
+ }
+ }
+ @endphp
+
+ {{-- FILTER BAR --}}
+
+
+ Total rows: {{ $container->rows->count() }} • Edit cells then click "Save Changes"
+
+
+
+
+ {{-- EDITABLE TABLE FORM --}}
+
+ @endif
+
+
+
+
+
+@endsection
diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php
index b3a7eed..41ae9c7 100644
--- a/resources/views/admin/dashboard.blade.php
+++ b/resources/views/admin/dashboard.blade.php
@@ -27,1527 +27,1635 @@
@endphp
@section('content')
-
-
-
-
Admin Dashboard
-
Monitor operations and manage system
-
-
-
-
-
-
📦Total Shipments
{{ $totalShipments }}
-
👥Active Customers
{{ $activeCustomers }}
-
💰Total Revenue
₹{{ number_format($totalRevenue, 2) }}
-
⏳Pending Order
{{ $pendingOrders }}
+
+
+
Admin Dashboard
+
Monitor operations and manage system
-
-
📦Total Orders
{{ $totalOrders }}
-
🧑💼Total Staff
{{ $totalStaff }}
-
📦Total Items
{{ $totalItems }}
-
⛔Inactive Customers
{{ $inactiveCustomers }}
-
-
-
-
-
- Order Management
- @can('order.create')
-
- @endcan
-
-
-
-
-
-
-
-
-
-
-
- | # |
- Order ID |
- Mark No |
- Date |
- Origin |
- Destination |
- Total CTN |
- Total QTY |
- Total TTL/QTY |
- Total Amount (₹) |
- Total CBM |
- Total TTL CBM |
- Total KG |
- Total TTL KG |
- Status |
- Actions |
-
-
-
- @forelse($orders as $order)
-
- | {{ $order->id }} |
-
-
- {{ $order->order_id }}
-
- |
-
- {{ $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
-
-
-
-
-
-
-
-
-
-
- @if(session('success'))
-
- {{ session('success') }}
-
+
+
- @endif
+
+ @if(session('success'))
+
+ {{ session('success') }}
+
+
+ @endif
-
-
+ {{-- RESET ORDER BUTTON --}}
+ @if(session('temp_order_items'))
+
+
+
+ @endif
- {{-- RESET ORDER BUTTON --}}
- @if(session('temp_order_items'))
-
-
-
- @endif
-
- {{-- TEMPORARY ITEMS TABLE --}}
- @if(session('temp_order_items') && count(session('temp_order_items')) > 0)
-
-
Temporary Items ({{ count(session('temp_order_items')) }} items)
-
-
-
-
- | # |
- Description |
- CTN |
- QTY |
- TTL/QTY |
- Unit |
- Price |
- TTL Amount |
- CBM |
- TTL CBM |
- KG |
- TTL KG |
- Shop No |
- Remove |
-
-
-
- @foreach(session('temp_order_items') as $index => $item)
-
- | {{ $index + 1 }} |
- {{ $item['description'] }} |
- {{ $item['ctn'] }} |
- {{ $item['qty'] }} |
- {{ $item['ttl_qty'] }} |
- {{ $item['unit'] }} |
- {{ $item['price'] }} |
- {{ $item['ttl_amount'] }} |
- {{ $item['cbm'] }} |
- {{ $item['ttl_cbm'] }} |
- {{ $item['kg'] }} |
- {{ $item['ttl_kg'] }} |
- {{ $item['shop_no'] }} |
-
- |
-
- @endforeach
-
-
+
+ @endif
-
-
-
- @endif
-
-
-
-@endsection
+@endsection
\ No newline at end of file
diff --git a/resources/views/admin/invoice.blade.php b/resources/views/admin/invoice.blade.php
index 84aa37a..31683a7 100644
--- a/resources/views/admin/invoice.blade.php
+++ b/resources/views/admin/invoice.blade.php
@@ -27,7 +27,7 @@
justify-content: space-between;
align-items: center;
border-radius: 17px 17px 0 0;
- background: #fceeb8ff;
+ background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
min-height: 54px;
padding: 15px 26px 10px 22px;
border-bottom: 1.4px solid #e8e2cf;
@@ -37,7 +37,7 @@
.invoice-management-title {
font-size: 1.32rem;
font-weight: 800;
- color: #2451af;
+ color: #ffffffff;
letter-spacing: .08em;
display: flex;
align-items: center;
@@ -223,7 +223,7 @@
/* Center all table content */
.table thead tr {
- background: #feebbe !important;
+ background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
}
.table thead th:first-child {
@@ -237,7 +237,7 @@
background: transparent !important;
border: none;
font-weight: 700;
- color: #343535;
+ color: #ffffffff;
letter-spacing: 0.02em;
font-size: 14px;
padding: 20px 15px;
@@ -258,25 +258,33 @@
/* Soft blue background for ALL table rows */
.table-striped tbody tr {
- background: #f0f8ff !important;
- transition: all 0.2s ease;
- border-radius: 12px;
- box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
- }
+ background: #f0f8ff !important;
+ transition: all 0.15s ease;
+
+
+ border-radius: 6px;
+ box-shadow: 0 1px 4px rgba(0,0,0,0.05);
+}
+
+
+.table-striped tbody tr td {
+ padding: 6px 10px;
+ font-size: 14px;
+}
+
+.table-striped tbody tr:hover {
+ background: #e6f3ff !important;
+ box-shadow: 0 2px 6px rgba(0,0,0,0.08);
+ transform: translateY(-0.5px);
+}
- .table-striped tbody tr:hover {
- background: #e6f3ff !important;
- box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
- transform: translateY(-1px);
- }
- /* Remove striped pattern - all rows same soft blue */
.table-striped tbody tr:nth-of-type(odd),
.table-striped tbody tr:nth-of-type(even) {
background: #f0f8ff !important;
}
- /* Center all table cells with proper spacing */
+
.table td {
padding: 18px 15px;
border: none;
@@ -291,7 +299,7 @@
font-weight: 400;
}
- /* First and last cell rounded corners */
+
.table td:first-child {
padding-left: 30px;
font-weight: 600;
@@ -587,7 +595,7 @@
}
.date-separator {
- color: #64748b;
+ color: #000000ff;
font-weight: 500;
font-family: 'Inter', sans-serif;
}
@@ -1091,31 +1099,48 @@