diff --git a/app/Http/Controllers/Admin/AdminOrderController.php b/app/Http/Controllers/Admin/AdminOrderController.php
index f116b96..8d887ff 100644
--- a/app/Http/Controllers/Admin/AdminOrderController.php
+++ b/app/Http/Controllers/Admin/AdminOrderController.php
@@ -68,33 +68,42 @@ class AdminOrderController extends Controller
* ORDER ITEM MANAGEMENT (existing orders)
* ---------------------------*/
public function addItem(Request $request, $orderId)
- {
- $order = Order::findOrFail($orderId);
+{
+ $order = Order::findOrFail($orderId);
- $data = $request->validate([
- 'description' => 'required|string',
- 'ctn' => 'nullable|numeric',
- 'qty' => 'nullable|numeric',
- 'ttl_qty' => 'nullable|numeric',
- 'unit' => 'nullable|string',
- 'price' => 'nullable|numeric',
- 'ttl_amount' => 'nullable|numeric',
- 'cbm' => 'nullable|numeric',
- 'ttl_cbm' => 'nullable|numeric',
- 'kg' => 'nullable|numeric',
- 'ttl_kg' => 'nullable|numeric',
- 'shop_no' => 'nullable|string',
- ]);
+ $data = $request->validate([
+ 'description' => 'required|string',
+ 'ctn' => 'nullable|numeric',
+ 'qty' => 'nullable|numeric',
+ 'unit' => 'nullable|string',
+ 'price' => 'nullable|numeric',
+ 'cbm' => 'nullable|numeric',
+ 'kg' => 'nullable|numeric',
+ 'shop_no' => 'nullable|string',
+ ]);
- $data['order_id'] = $order->id;
+ // ✅ BACKEND CALCULATION
+ $ctn = (float) ($data['ctn'] ?? 0);
+ $qty = (float) ($data['qty'] ?? 0);
+ $price = (float) ($data['price'] ?? 0);
+ $cbm = (float) ($data['cbm'] ?? 0);
+ $kg = (float) ($data['kg'] ?? 0);
- OrderItem::create($data);
+ $data['ttl_qty'] = $ctn * $qty;
+ $data['ttl_amount'] = $data['ttl_qty'] * $price;
+ $data['ttl_cbm'] = $cbm * $ctn;
+ $data['ttl_kg'] = $ctn * $kg;
- $this->recalcTotals($order);
- $this->updateInvoiceFromOrder($order);
+ $data['order_id'] = $order->id;
+
+ OrderItem::create($data);
+
+ $this->recalcTotals($order);
+ $this->updateInvoiceFromOrder($order);
+
+ return redirect()->back()->with('success', 'Item added and totals updated.');
+}
- return redirect()->back()->with('success', 'Item added and totals updated.');
- }
public function deleteItem($id)
{
@@ -500,14 +509,14 @@ class AdminOrderController extends Controller
'items.*.description' => 'required|string',
'items.*.ctn' => 'nullable|numeric',
'items.*.qty' => 'nullable|numeric',
- 'items.*.ttl_qty' => 'nullable|numeric',
+
'items.*.unit' => 'nullable|string',
'items.*.price' => 'nullable|numeric',
- 'items.*.ttl_amount' => 'nullable|numeric',
+
'items.*.cbm' => 'nullable|numeric',
- 'items.*.ttl_cbm' => 'nullable|numeric',
+
'items.*.kg' => 'nullable|numeric',
- 'items.*.ttl_kg' => 'nullable|numeric',
+
'items.*.shop_no' => 'nullable|string',
])['items'];
@@ -520,6 +529,24 @@ class AdminOrderController extends Controller
return back()->with('error', 'Add at least one item.');
}
+ // ✅ BACKEND CALCULATION (DO NOT TRUST FRONTEND)
+ foreach ($items as &$item) {
+
+ $ctn = (float) ($item['ctn'] ?? 0);
+ $qty = (float) ($item['qty'] ?? 0);
+ $price = (float) ($item['price'] ?? 0);
+ $cbm = (float) ($item['cbm'] ?? 0);
+ $kg = (float) ($item['kg'] ?? 0);
+
+ // Calculated fields
+ $item['ttl_qty'] = $ctn * $qty;
+ $item['ttl_amount'] = $item['ttl_qty'] * $price;
+ $item['ttl_cbm'] = $cbm * $ctn;
+ $item['ttl_kg'] = $ctn * $kg;
+ }
+ unset($item); // VERY IMPORTANT
+
+
// 3) totals
$total_ctn = array_sum(array_column($items, 'ctn'));
$total_qty = array_sum(array_column($items, 'qty'));
@@ -631,30 +658,49 @@ class AdminOrderController extends Controller
* UPDATE ORDER ITEM (existing orders)
* ---------------------------*/
public function updateItem(Request $request, $id)
- {
- $item = OrderItem::findOrFail($id);
- $order = $item->order;
+{
+ $item = OrderItem::findOrFail($id);
+ $order = $item->order;
- $item->update([
- 'description' => $request->description,
- 'ctn' => $request->ctn,
- 'qty' => $request->qty,
- 'ttl_qty' => $request->ttl_qty,
- 'unit' => $request->unit,
- 'price' => $request->price,
- 'ttl_amount' => $request->ttl_amount,
- 'cbm' => $request->cbm,
- 'ttl_cbm' => $request->ttl_cbm,
- 'kg' => $request->kg,
- 'ttl_kg' => $request->ttl_kg,
- 'shop_no' => $request->shop_no,
- ]);
+ $request->validate([
+ 'description' => 'required|string',
+ 'ctn' => 'nullable|numeric',
+ 'qty' => 'nullable|numeric',
+ 'unit' => 'nullable|string',
+ 'price' => 'nullable|numeric',
+ 'cbm' => 'nullable|numeric',
+ 'kg' => 'nullable|numeric',
+ 'shop_no' => 'nullable|string',
+ ]);
- $this->recalcTotals($order);
- $this->updateInvoiceFromOrder($order);
+ // ✅ BACKEND CALCULATION
+ $ctn = (float) ($request->ctn ?? 0);
+ $qty = (float) ($request->qty ?? 0);
+ $price = (float) ($request->price ?? 0);
+ $cbm = (float) ($request->cbm ?? 0);
+ $kg = (float) ($request->kg ?? 0);
+
+ $item->update([
+ 'description' => $request->description,
+ 'ctn' => $ctn,
+ 'qty' => $qty,
+ 'ttl_qty' => $ctn * $qty,
+ 'unit' => $request->unit,
+ 'price' => $price,
+ 'ttl_amount' => ($ctn * $qty) * $price,
+ 'cbm' => $cbm,
+ 'ttl_cbm' => $cbm * $ctn,
+ 'kg' => $kg,
+ 'ttl_kg' => $ctn * $kg,
+ 'shop_no' => $request->shop_no,
+ ]);
+
+ $this->recalcTotals($order);
+ $this->updateInvoiceFromOrder($order);
+
+ return back()->with('success', 'Item updated successfully');
+}
- return back()->with('success', 'Item updated successfully');
- }
private function updateInvoiceFromOrder(Order $order)
{
diff --git a/public/invoices/invoice-INV-2025-000048.pdf b/public/invoices/invoice-INV-2025-000048.pdf
new file mode 100644
index 0000000..6bce3a0
Binary files /dev/null and b/public/invoices/invoice-INV-2025-000048.pdf differ
diff --git a/public/invoices/invoice-INV-2025-000051.pdf b/public/invoices/invoice-INV-2025-000051.pdf
new file mode 100644
index 0000000..82b3fa7
Binary files /dev/null and b/public/invoices/invoice-INV-2025-000051.pdf differ
diff --git a/resources/views/admin/account.blade.php b/resources/views/admin/account.blade.php
index 5446a56..c5f765d 100644
--- a/resources/views/admin/account.blade.php
+++ b/resources/views/admin/account.blade.php
@@ -315,15 +315,6 @@ tr:hover td{ background:#fbfdff; }
border-top: 1px solid #eef3fb;
/* 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 {
font-size: 13px;
@@ -2793,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 = `
-
- | Loading orders... |
-
- `;
-
- // 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 = `
-
- | Failed to load orders |
-
+
+ | Loading orders... |
+
`;
- return;
- }
- const orders = res.orders || [];
- if (!orders.length) {
- tbody.innerHTML = `
-
- | No orders associated with this entry |
-
- `;
- return;
- }
+ jsonFetch(`/admin/account/entry-orders/${encodeURIComponent(entryNo)}`, {
+ method: 'GET'
+ })
+ .then(res => {
+ if (!res.success) {
+ tbody.innerHTML = `
+
+ | Failed to load orders |
+
+ `;
+ return;
+ }
- tbody.innerHTML = '';
- orders.forEach(order => {
- const tr = document.createElement('tr');
+ const orders = res.orders || [];
+ if (!orders.length) {
+ tbody.innerHTML = `
+
+ | No orders associated with this entry |
+
+ `;
+ 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 = `
- ${formattedId} |
- ${escapeHtml(order.markno ?? order.mark_no ?? '')} |
- ${escapeHtml(order.origin ?? '')} |
- ${escapeHtml(order.destination ?? '')} |
- ${escapeHtml(order.ctn ?? '')} |
- ${escapeHtml(order.qty ?? '')} |
- ${formatCurrency(amountValue)} |
- `;
- tbody.appendChild(tr);
-});
+ const amountValue =
+ order.ttl_amount ??
+ order.ttlamount ??
+ order.total_amount ??
+ order.order_amount ??
+ order.amount ??
+ 0;
+ tr.innerHTML = `
+ ${escapeHtml(order.order_id)} |
+ ${escapeHtml(order.mark_no ?? '')} |
+ ${escapeHtml(order.origin ?? '')} |
+ ${escapeHtml(order.destination ?? '')} |
+ ${escapeHtml(order.ctn ?? '')} |
+ ${escapeHtml(order.qty ?? '')} |
+ ${formatCurrency(amountValue)} |
+ `;
- })
- .catch(() => {
- tbody.innerHTML = `
-
- | Error loading orders |
-
- `;
- });
+ tbody.appendChild(tr);
+ });
+ })
+ .catch(() => {
+ tbody.innerHTML = `
+
+ | Error loading orders |
+
+ `;
+ });
+
+ document.getElementById('entryOrdersModal').classList.add('modal-open');
+ }
- document.getElementById('entryOrdersModal').classList.add('modal-open');
-}
function closeEntryOrdersModal() {
document.getElementById('entryOrdersModal').classList.remove('modal-open');
diff --git a/resources/views/admin/customers_add.blade.php b/resources/views/admin/customers_add.blade.php
index 27c0169..5fad95e 100644
--- a/resources/views/admin/customers_add.blade.php
+++ b/resources/views/admin/customers_add.blade.php
@@ -5,7 +5,42 @@
@section('content')
-