+ Add New Installment
-
+
Create a new processing entry for the remaining pending amount
@@ -453,6 +796,10 @@ let entries = [];
let availableOrders = [];
let currentEntry = null;
+/* Pagination state */
+let currentPage = 1;
+const ordersPerPage = 10;
+
/* small util */
function escapeHtml(s){ if(s === null || s === undefined) return ''; return String(s).replace(/[&<>"']/g, m => ({'&':'&','<':'<','>':'>','"':'"',"'":"'"}[m])); }
function formatCurrency(v){ return '₹' + Number(v || 0).toLocaleString(undefined, { minimumFractionDigits:0, maximumFractionDigits:2 }); }
@@ -471,17 +818,21 @@ function statusClass(status){
window.addEventListener('DOMContentLoaded', () => {
bindUI();
loadDashboard();
- loadAvailableOrders();
});
/* ---------- UI binding ---------- */
function bindUI(){
- document.getElementById('toggleCreateBtn').addEventListener('click', toggleCreateCard);
- document.getElementById('closeCreateInline').addEventListener('click', () => closeCreateCard());
- document.getElementById('cancelCreateInline').addEventListener('click', () => closeCreateCard());
+ // Create Order Modal
+ document.getElementById('openCreateModalBtn').addEventListener('click', openCreateOrderModal);
+ document.getElementById('closeCreateModal').addEventListener('click', closeCreateOrderModal);
+ document.getElementById('cancelCreateModal').addEventListener('click', closeCreateOrderModal);
document.getElementById('createOrderInlineForm').addEventListener('submit', submitCreateOrderInline);
- document.getElementById('refreshBtn').addEventListener('click', () => { loadDashboard(); loadAvailableOrders(); });
- document.getElementById('toggleConsolidatedBtn').addEventListener('click', toggleConsolidateVisibility);
+
+ // Pagination buttons
+ document.getElementById('prevPageBtn').addEventListener('click', goToPreviousPage);
+ document.getElementById('nextPageBtn').addEventListener('click', goToNextPage);
+
+ document.getElementById('refreshBtn').addEventListener('click', () => { loadDashboard(); });
document.getElementById('searchBtn').addEventListener('click', handleSearch);
document.getElementById('addInstallmentFromDetails').addEventListener('click', () => {
if(!currentEntry) return;
@@ -493,29 +844,100 @@ function bindUI(){
document.getElementById('installmentForm').addEventListener('submit', submitInstallment);
}
-/* ---------- Toggle create inline ---------------- */
-function toggleCreateCard(){
- const card = document.getElementById('createCard');
- const btn = document.getElementById('toggleCreateBtn');
- if(card.classList.contains('open')){
- closeCreateCard();
- } else {
- openCreateCard();
- }
+/* ---------- Pagination Functions ---------- */
+function goToPreviousPage() {
+ if (currentPage > 1) {
+ currentPage--;
+ renderConsolidateOrders(availableOrders);
+ updatePaginationControls();
+ }
}
-function openCreateCard(){
- const card = document.getElementById('createCard');
- card.classList.add('open');
- document.getElementById('toggleCreateBtn').setAttribute('aria-expanded','true');
- // refresh orders
+
+function goToNextPage() {
+ const totalPages = Math.ceil(availableOrders.length / ordersPerPage);
+ if (currentPage < totalPages) {
+ currentPage++;
+ renderConsolidateOrders(availableOrders);
+ updatePaginationControls();
+ }
+}
+
+function updatePaginationControls() {
+ const totalPages = Math.ceil(availableOrders.length / ordersPerPage);
+ const prevBtn = document.getElementById('prevPageBtn');
+ const nextBtn = document.getElementById('nextPageBtn');
+ const pageInfo = document.getElementById('pageInfo');
+ const paginationPages = document.getElementById('paginationPages');
+
+ prevBtn.disabled = currentPage === 1;
+ nextBtn.disabled = currentPage === totalPages || totalPages === 0;
+
+ // Update page info text
+ const startIndex = (currentPage - 1) * ordersPerPage + 1;
+ const endIndex = Math.min(currentPage * ordersPerPage, availableOrders.length);
+ pageInfo.textContent = `Showing ${startIndex} to ${endIndex} of ${availableOrders.length} entries`;
+
+ // Generate page numbers
+ paginationPages.innerHTML = '';
+
+ if (totalPages <= 7) {
+ // Show all pages
+ for (let i = 1; i <= totalPages; i++) {
+ addPageButton(i, paginationPages);
+ }
+ } else {
+ // Show first page, current page range, and last page
+ addPageButton(1, paginationPages);
+
+ if (currentPage > 3) {
+ paginationPages.innerHTML += '';
+ }
+
+ const start = Math.max(2, currentPage - 1);
+ const end = Math.min(totalPages - 1, currentPage + 1);
+
+ for (let i = start; i <= end; i++) {
+ addPageButton(i, paginationPages);
+ }
+
+ if (currentPage < totalPages - 2) {
+ paginationPages.innerHTML += '';
+ }
+
+ addPageButton(totalPages, paginationPages);
+ }
+}
+
+function addPageButton(pageNumber, container) {
+ const button = document.createElement('button');
+ button.className = 'pagination-page-btn';
+ if (pageNumber === currentPage) {
+ button.classList.add('active');
+ }
+ button.textContent = pageNumber;
+ button.addEventListener('click', () => {
+ currentPage = pageNumber;
+ renderConsolidateOrders(availableOrders);
+ updatePaginationControls();
+ });
+ container.appendChild(button);
+}
+
+/* ---------- Create Order Modal Functions ---------- */
+function openCreateOrderModal(){
+ const modal = document.getElementById('createOrderModal');
+ modal.classList.add('modal-open');
loadAvailableOrders();
// focus first input
setTimeout(()=> document.getElementById('inline_description').focus(), 220);
}
-function closeCreateCard(){
- const card = document.getElementById('createCard');
- card.classList.remove('open');
- document.getElementById('toggleCreateBtn').setAttribute('aria-expanded','false');
+
+function closeCreateOrderModal(){
+ const modal = document.getElementById('createOrderModal');
+ modal.classList.remove('modal-open');
+ // reset form and pagination
+ document.getElementById('createOrderInlineForm').reset();
+ currentPage = 1;
}
/* ---------- Loaders ---------- */
@@ -540,16 +962,19 @@ function loadDashboard(){
function loadAvailableOrders(){
const tbody = document.getElementById('consolidateOrdersBody');
- tbody.innerHTML = '
| Loading available orders... |
';
+ tbody.innerHTML = '
| Loading available orders... |
';
jsonFetch('/admin/account/available-orders')
.then(res => {
if(!res.success) throw new Error(res.message || 'Failed to load orders');
availableOrders = res.orders || [];
+ currentPage = 1; // Reset to first page when loading new orders
renderConsolidateOrders(availableOrders);
+ updatePaginationControls();
})
.catch(err => {
console.error(err);
- tbody.innerHTML = '
| Unable to load orders |
';
+ tbody.innerHTML = '
| Unable to load orders |
';
+ updatePaginationControls();
});
}
@@ -619,11 +1044,18 @@ function renderOrderTable(list){
function renderConsolidateOrders(list){
const body = document.getElementById('consolidateOrdersBody');
body.innerHTML = '';
+
if(!list || list.length === 0){
- body.innerHTML = '
| No available orders |
';
+ body.innerHTML = '
| No available orders |
';
return;
}
- list.forEach(order => {
+
+ // Calculate pagination
+ const startIndex = (currentPage - 1) * ordersPerPage;
+ const endIndex = startIndex + ordersPerPage;
+ const paginatedOrders = list.slice(startIndex, endIndex);
+
+ paginatedOrders.forEach(order => {
const tr = document.createElement('tr');
tr.innerHTML = `
|
@@ -639,13 +1071,11 @@ function renderConsolidateOrders(list){
${order.ttl_cbm ?? ''} |
${order.kg ?? ''} |
${order.ttl_kg ?? ''} |
-
`;
body.appendChild(tr);
});
}
-
function setToggleVisual(btn, pos) {
btn.classList.remove('mid', 'checked');
@@ -686,9 +1116,7 @@ function cycleToggle(btn) {
});
}
-
-
-/* ---------- Create Order Inline (Option D) ---------- */
+/* ---------- Create Order Inline (Now in Popup) ---------- */
async function submitCreateOrderInline(e){
e.preventDefault();
const form = e.target;
@@ -714,9 +1142,8 @@ async function submitCreateOrderInline(e){
if(!res.success) throw new Error(res.message || 'Create failed');
// success
form.reset();
- closeCreateCard();
+ closeCreateOrderModal();
loadDashboard();
- loadAvailableOrders();
} catch(err){
alert(err.message || 'Failed to create order');
console.error(err);
@@ -726,19 +1153,6 @@ async function submitCreateOrderInline(e){
}
}
-/* ---------- Consolidate toggle ---------- */
-function toggleConsolidateVisibility(){
- const btn = document.getElementById('toggleConsolidatedBtn');
- const area = document.getElementById('consolidateArea');
- if(btn.classList.contains('active')){
- btn.classList.remove('active'); btn.textContent = 'Show Orders';
- area.style.display = 'none';
- } else {
- btn.classList.add('active'); btn.textContent = 'Hide Orders';
- area.style.display = 'block';
- }
-}
-
/* ---------- Search ---------- */
function handleSearch(){
const q = document.getElementById('main-search').value.trim().toLowerCase();
@@ -810,8 +1224,6 @@ function closeEntryDetailsModal() {
document.getElementById('entryDetailsModal').classList.remove('modal-open');
}
-
-
async function updateInstallmentStatus(id, status) {
try {
const res = await jsonFetch('/admin/account/installment/update-status', {
@@ -833,7 +1245,6 @@ async function updateInstallmentStatus(id, status) {
}
}
-
/* ---------- Installment modal ---------- */
function openInstallmentModal(entryNo, desc, region, pending){
currentEntry = { entry_no: entryNo, description: desc, region: region, pending_amount: pending };
@@ -884,4 +1295,4 @@ async function submitInstallment(e){
document.addEventListener('DOMContentLoaded', () => { document.getElementById('consolidateArea').style.display = 'block'; });
-@endsection
+@endsection
\ No newline at end of file
diff --git a/resources/views/admin/customers.blade.php b/resources/views/admin/customers.blade.php
index f5a787e..dd20aef 100644
--- a/resources/views/admin/customers.blade.php
+++ b/resources/views/admin/customers.blade.php
@@ -55,6 +55,7 @@
padding: 8px 15px;
border: 1px solid rgba(0, 0, 0, 0.1);
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+ width: 100%;
}
.search-input {
@@ -105,7 +106,6 @@
border-radius: 10px;
overflow: hidden;
box-shadow: 0 4px 15px rgba(0, 0, 0, 0.05);
-
}
.table-header {
@@ -244,6 +244,66 @@
border-radius: 10px 10px 0 0;
overflow: hidden;
}
+
+ /* Remove horizontal scroll */
+ .table-responsive {
+ overflow-x: visible !important;
+ }
+
+ .container-fluid {
+ overflow-x: hidden;
+ }
+
+ /* Adjust table layout to fit without scroll */
+ .table {
+ width: 100%;
+ min-width: auto;
+ }
+
+ /* Ensure proper column sizing */
+ .table th,
+ .table td {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+
+ /* Fix for search and filter section */
+ .search-filter-container {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ flex-wrap: nowrap;
+ gap: 15px;
+ }
+
+ .search-section {
+ flex: 1;
+ min-width: 300px;
+ }
+
+ .filter-section {
+ display: flex;
+ align-items: center;
+ flex-wrap: nowrap;
+ gap: 8px;
+ }
+
+ @media (max-width: 768px) {
+ .search-filter-container {
+ flex-direction: column;
+ align-items: stretch;
+ }
+
+ .search-section {
+ min-width: auto;
+ }
+
+ .filter-section {
+ justify-content: center;
+ flex-wrap: wrap;
+ }
+ }
@@ -252,37 +312,55 @@
Customer List
-
+
-
{{ $totalCustomers ?? '1,247' }}
+
{{ $customers->count() }}
Total Customers
-
{{ $newThisMonth ?? '342' }}
+
+ @php
+ $newThisMonth = $customers->filter(function($customer) {
+ return $customer->created_at->format('Y-m') === now()->format('Y-m');
+ })->count();
+ @endphp
+ {{ $newThisMonth }}
+
New This Month
-
{{ $activeThisMonth ?? '123' }}
-
Active This Month
+
+ @php
+ $activeCustomers = $customers->where('status', 'active')->count();
+ @endphp
+ {{ $activeCustomers }}
+
+
Active Customers
-
{{ $premiumCount ?? '23' }}
+
+ @php
+ $premiumCount = $customers->where('customer_type', 'premium')->count();
+ @endphp
+ {{ $premiumCount }}
+
Premium Customers
-
+
-
-
+
+
+
-
+
+
+
@@ -321,98 +401,92 @@
-
-
-
Customer List
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- @forelse($customers as $c)
-
-
-
-
-
- {{ strtoupper(substr($c->customer_name,0,1)) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @forelse($customers as $c)
+
+
+
+
+
+ {{ strtoupper(substr($c->customer_name,0,1)) }}
+
+
+ {{ $c->customer_name }}
+ @if($c->customer_type == 'premium')
+ Premium Customer
+ @else
+ Regular Customer
+ @endif
+
+ {{ $c->email }}
+ {{ $c->mobile_no }}
-
- {{ $c->customer_name }}
- @if($c->customer_type == 'premium')
- Premium Customer
- @else
- Regular Customer
- @endif
-
- {{ $c->email }}
- {{ $c->mobile_no }}
-
-
- {{ $c->orders->count() }} orders • ₹{{ number_format($c->orders->sum('ttl_amount'), 2) }} total
-
+
+ {{ $c->orders->count() }} orders • ₹{{ number_format($c->orders->sum('ttl_amount'), 2) }} total
- |
+
+
-
-
- {{ $c->customer_id }}
- |
+
+
+ {{ $c->customer_id }}
+ |
-
-
- {{ $c->created_at ? $c->created_at->format('d-m-Y') : '-' }}
- |
+
+
+ {{ $c->created_at ? $c->created_at->format('d-m-Y') : '-' }}
+ |
-
-
- @if($c->status === 'active')
- Active
- @else
- Inactive
- @endif
- |
+
+
+ @if($c->status === 'active')
+ Active
+ @else
+ Inactive
+ @endif
+ |
-
-
- |
- @empty
-
- |
-
- No customers found.
- |
-
- @endforelse
-
-
-
+
+
+ |
+
+ @empty
+
+ |
+
+ No customers found.
+ |
+
+ @endforelse
+
+
diff --git a/resources/views/admin/invoice.blade.php b/resources/views/admin/invoice.blade.php
index 9bcc41c..f76d1eb 100644
--- a/resources/views/admin/invoice.blade.php
+++ b/resources/views/admin/invoice.blade.php
@@ -394,8 +394,8 @@
border-color: #8b5cf6 !important;
}
-/* Action Button - Centered */
-.btn-primary {
+/* Entry Button - Centered */
+.btn-entry {
background: linear-gradient(135deg, #3492f8 55%, #1256cc 110%);
border: none;
border-radius: 6px;
@@ -410,13 +410,15 @@
align-items: center;
justify-content: center;
gap: 4px;
+ text-decoration: none;
}
-.btn-primary:hover {
+.btn-entry:hover {
background: linear-gradient(135deg, #46b4fd 55%, #226ad6 110%);
transform: translateY(-1px);
box-shadow: 0 2px 8px rgba(52, 146, 248, 0.4);
color: white;
+ text-decoration: none;
}
/* Amount Styling - Centered */
@@ -593,7 +595,7 @@
justify-content: center;
}
-.table tbody tr td .btn-primary {
+.table tbody tr td .btn-entry {
margin: 0 auto;
}
@@ -729,7 +731,7 @@
border: 1px solid #2469d6;
}
-.mobile-action-btn.edit {
+.mobile-action-btn.entry {
background: linear-gradient(135deg, #3492f8 55%, #1256cc 110%);
color: white;
border: none;
@@ -785,7 +787,7 @@
font-size: 10px;
}
- .btn-primary {
+ .btn-entry {
padding: 4px 8px;
font-size: 11px;
}
@@ -987,8 +989,8 @@
- Edit
+ class="btn-entry">
+ Entry
|
@@ -1062,8 +1064,8 @@
-
- Edit
+
+ Entry
diff --git a/resources/views/admin/invoice_edit.blade.php b/resources/views/admin/invoice_edit.blade.php
index 0d9f9df..df6e3e4 100644
--- a/resources/views/admin/invoice_edit.blade.php
+++ b/resources/views/admin/invoice_edit.blade.php
@@ -3,388 +3,482 @@
@section('page-title', 'Edit Invoice')
@section('content')
-
-
-
-{{-- Invoice Preview Section --}}
-
-
-
-
- @include('admin.popup_invoice', [
- 'invoice' => $invoice,
- 'shipment' => $shipment,
- 'embedded' => true
- ])
-
-
-
-
-
-
-