Shipment dashboard changes

2025-12-03 15:36:04 +05:30
parent 3845972c5c
commit 340c2b2132
15 changed files with 2706 additions and 756 deletions
--- a/routes/web.php
+++ b/routes/web.php
@@ -66,207 +66,211 @@ Route::prefix('admin')
        // ---------------------------
        // USER REQUESTS
        // ---------------------------
-        Route::get('/requests', [UserRequestController::class, 'index'])
-            ->name('admin.requests');
+            Route::get('/requests', [UserRequestController::class, 'index'])
+                ->name('admin.requests');

-        Route::get('/requests/approve/{id}', [UserRequestController::class, 'approve'])
-            ->name('admin.requests.approve');
+            Route::get('/requests/approve/{id}', [UserRequestController::class, 'approve'])
+                ->name('admin.requests.approve');

-        Route::get('/requests/reject/{id}', [UserRequestController::class, 'reject'])
-            ->name('admin.requests.reject');
+            Route::get('/requests/reject/{id}', [UserRequestController::class, 'reject'])
+                ->name('admin.requests.reject');


        // ---------------------------
        // MARK LIST
        // ---------------------------
-        Route::get('/mark-list', [AdminMarkListController::class, 'index'])
-            ->name('admin.marklist.index');
+            Route::get('/mark-list', [AdminMarkListController::class, 'index'])
+                ->name('admin.marklist.index');

-        Route::get('/mark-list/status/{id}', [AdminMarkListController::class, 'toggleStatus'])
-            ->name('admin.marklist.toggle');
+            Route::get('/mark-list/status/{id}', [AdminMarkListController::class, 'toggleStatus'])
+                ->name('admin.marklist.toggle');


        // ---------------------------
        // ORDERS
        // ---------------------------
-        Route::get('/orders', [AdminOrderController::class, 'orderShow'])
-            ->name('admin.orders');
+            Route::get('/orders', [AdminOrderController::class, 'orderShow'])
+                ->name('admin.orders');


-        Route::get('/orders/list', [AdminOrderController::class, 'index'])
-            ->name('admin.orders.index');
+            Route::get('/orders/list', [AdminOrderController::class, 'index'])
+                ->name('admin.orders.index');

-        Route::get('/orders/{id}', [AdminOrderController::class, 'show'])
-            ->name('admin.orders.show');
+            Route::get('/orders/{id}', [AdminOrderController::class, 'show'])
+                ->name('admin.orders.show');

-        Route::post('/orders/temp/add', [AdminOrderController::class, 'addTempItem'])
-            ->name('admin.orders.temp.add');
+            Route::post('/orders/temp/add', [AdminOrderController::class, 'addTempItem'])
+                ->name('admin.orders.temp.add');

-        Route::post('/orders/temp/delete', [AdminOrderController::class, 'deleteTempItem'])
-            ->name('admin.orders.temp.delete');
+            Route::post('/orders/temp/delete', [AdminOrderController::class, 'deleteTempItem'])
+                ->name('admin.orders.temp.delete');

-        Route::post('/orders/temp/reset', [AdminOrderController::class, 'resetTemp'])
-            ->name('admin.orders.temp.reset');
+            Route::post('/orders/temp/reset', [AdminOrderController::class, 'resetTemp'])
+                ->name('admin.orders.temp.reset');

-        Route::post('/orders/finish', [AdminOrderController::class, 'finishOrder'])
-            ->name('admin.orders.finish');
+            Route::post('/orders/finish', [AdminOrderController::class, 'finishOrder'])
+                ->name('admin.orders.finish');

-        Route::get('/orders/view/{id}', [AdminOrderController::class, 'popup'])
-            ->name('admin.orders.popup');
+            Route::get('/orders/view/{id}', [AdminOrderController::class, 'popup'])
+                ->name('admin.orders.popup');
            
        // ---------------------------
-            // ORDERS (FIXED ROUTES)
-            // ---------------------------
-
+        // ORDERS (FIXED ROUTES)
+        // ---------------------------
            // Add item to order
            Route::post('/orders/{order}/item', [AdminOrderController::class, 'addItem'])
                ->name('admin.orders.addItem');
-
            // Delete item from order
            Route::delete('/orders/item/{id}', [AdminOrderController::class, 'deleteItem'])
                ->name('admin.orders.deleteItem');
-
            // Restore deleted item
            Route::post('/orders/item/{id}/restore', [AdminOrderController::class, 'restoreItem'])
                ->name('admin.orders.restoreItem');
-
            // Update main order fields
-            Route::post('/orders/{id}/update', [AdminOrderController::class, 'update'])
-                ->name('admin.orders.update');
-
+            Route::put('/admin/orders/item/update/{id}', [AdminOrderController::class, 'updateItem'])
+            ->name('admin.orders.updateItem');
            // Delete full order
            Route::delete('/orders/{id}/delete', [AdminOrderController::class, 'destroy'])
                ->name('admin.orders.destroy');
-                
+                    
        // ---------------------------
        // SHIPMENTS (FIXED ROUTES)
        // ---------------------------
-        Route::get('/shipments', [ShipmentController::class, 'index'])
-            ->name('admin.shipments');

-        Route::post('/shipments', [ShipmentController::class, 'store'])
-            ->name('admin.shipments.store');
+           // View shipment MUST be before /shipments/{id}
+            Route::get('/shipments/view/{id}', [ShipmentController::class, 'show'])
+                ->name('admin.shipments.view');

-        Route::post('/shipments/update-status', [ShipmentController::class, 'updateStatus'])
-            ->name('admin.shipments.updateStatus');
+            // List shipments
+            Route::get('/shipments', [ShipmentController::class, 'index'])
+                ->name('admin.shipments');

-        // Get shipment orders for modal (AJAX)
-        Route::get('/shipments/{id}/orders', [ShipmentController::class, 'getShipmentOrders'])
-            ->name('admin.shipments.orders');
+            // Create shipment
+            Route::post('/shipments', [ShipmentController::class, 'store'])
+                ->name('admin.shipments.store');

-        // Get shipment details for edit (AJAX)
-        Route::get('/shipments/{id}', [ShipmentController::class, 'show'])
-            ->name('admin.shipments.show');
+            // Update status
+            Route::post('/shipments/update-status', [ShipmentController::class, 'updateStatus'])
+                ->name('admin.shipments.updateStatus');

-        // Shipment Update
-        Route::put('/shipments/{id}', [ShipmentController::class, 'update'])
-            ->name('admin.shipments.update');
+            // Shipment orders (AJAX)
+            Route::get('/shipments/{id}/orders', [ShipmentController::class, 'getShipmentOrders'])
+                ->name('admin.shipments.orders');

-        // Shipment Delete
-        Route::delete('/shipments/{id}', [ShipmentController::class, 'destroy'])
-            ->name('admin.shipments.destroy');
+            // Shipment update
+            Route::put('/shipments/{id}', [ShipmentController::class, 'update'])
+                ->name('admin.shipments.update');

+            // Shipment delete
+            Route::delete('/shipments/{id}', [ShipmentController::class, 'destroy'])
+                ->name('admin.shipments.destroy');

+            // Remove order
+            Route::post('/shipments/remove-order', [ShipmentController::class, 'removeOrder'])
+                ->name('admin.shipments.removeOrder');
+
+            Route::post('/shipments/add-order', [ShipmentController::class, 'addOrder'])
+                ->name('admin.shipments.addOrder');
+
+                Route::post('/shipments/{id}/add-orders', [ShipmentController::class, 'addOrders'])
+    ->name('admin.shipments.addOrders');
        // ---------------------------
        // INVOICES
        // ---------------------------
-        Route::get('/invoices', [AdminInvoiceController::class, 'index'])
-            ->name('admin.invoices.index');
+            Route::get('/invoices', [AdminInvoiceController::class, 'index'])
+                ->name('admin.invoices.index');

-        Route::get('/invoices/{id}/popup', [AdminInvoiceController::class, 'popup'])
-            ->name('admin.invoices.popup');
+            Route::get('/invoices/{id}/popup', [AdminInvoiceController::class, 'popup'])
+                ->name('admin.invoices.popup');

-        Route::get('/invoices/{id}/edit', [AdminInvoiceController::class, 'edit'])
-            ->name('admin.invoices.edit');
+            Route::get('/invoices/{id}/edit', [AdminInvoiceController::class, 'edit'])
+                ->name('admin.invoices.edit');

-        Route::post('/invoices/{id}/update', [AdminInvoiceController::class, 'update'])
-            ->name('admin.invoices.update');
+            Route::post('/invoices/{id}/update', [AdminInvoiceController::class, 'update'])
+                ->name('admin.invoices.update');

-        Route::post('/invoices/{invoice}/installments', [AdminInvoiceController::class, 'storeInstallment'])
+            Route::post('/invoices/{invoice}/installments', [AdminInvoiceController::class, 'storeInstallment'])
+                ->name('admin.invoice.installment.store');
+
+            Route::post('/invoices/{id}/installment', [AdminInvoiceController::class, 'storeInstallment'])
            ->name('admin.invoice.installment.store');

-        Route::post('/invoices/{id}/installment', [AdminInvoiceController::class, 'storeInstallment'])
-        ->name('admin.invoice.installment.store');
-
-        Route::delete('/installment/{id}', [AdminInvoiceController::class, 'deleteInstallment'])
-        ->name('admin.invoice.installment.delete');
+            Route::delete('/installment/{id}', [AdminInvoiceController::class, 'deleteInstallment'])
+            ->name('admin.invoice.installment.delete');


-
-
-            //Add New Invoice
-        Route::get('/admin/invoices/create', [InvoiceController::class, 'create'])->name('admin.invoices.create');
-    
-
+                //Add New Invoice
+            Route::get('/admin/invoices/create', [InvoiceController::class, 'create'])->name('admin.invoices.create');
+        

        // ---------------------------
        // CUSTOMERS
        // ---------------------------
-        Route::get('/customers', [AdminCustomerController::class, 'index'])
-            ->name('admin.customers.index');
+            Route::get('/customers', [AdminCustomerController::class, 'index'])
+                ->name('admin.customers.index');

-        Route::get('/customers/add', [AdminCustomerController::class, 'create'])
-            ->name('admin.customers.add');
+            Route::get('/customers/add', [AdminCustomerController::class, 'create'])
+                ->name('admin.customers.add');

-        Route::post('/customers/store', [AdminCustomerController::class, 'store'])
-            ->name('admin.customers.store');
+            Route::post('/customers/store', [AdminCustomerController::class, 'store'])
+                ->name('admin.customers.store');

-        Route::get('/customers/{id}/view', [AdminCustomerController::class, 'view'])
-            ->name('admin.customers.view');
+            Route::get('/customers/{id}/view', [AdminCustomerController::class, 'view'])
+                ->name('admin.customers.view');

-        Route::post('/customers/{id}/status', [AdminCustomerController::class, 'toggleStatus'])
-            ->name('admin.customers.status');
-    });
+            Route::post('/customers/{id}/status', [AdminCustomerController::class, 'toggleStatus'])
+                ->name('admin.customers.status');
+        });

    // ==========================================
    // ADMIN ACCOUNT (AJAX) ROUTES
    // ==========================================
-    Route::prefix('admin/account')
-        ->middleware('auth:admin')
-        ->name('admin.account.')
-        ->group(function () {
-    
-            Route::get('/dashboard', [AdminAccountController::class, 'getDashboardData'])
-                ->name('dashboard');
-    
-            Route::get('/available-orders', [AdminAccountController::class, 'getAvailableOrders'])
-                ->name('orders.available');
-    
-            Route::post('/create-order', [AdminAccountController::class, 'accountCreateOrder'])
-                ->name('create');
-    
-            Route::post('/toggle-payment', [AdminAccountController::class, 'togglePayment'])
-                ->name('toggle');
-    
-            Route::post('/installment/create', [AdminAccountController::class, 'addInstallment'])
-                ->name('installment.create');
-    
-            Route::post('/installment/update-status', [AdminAccountController::class, 'updateInstallmentStatus'])
-                ->name('installment.update');
-    
-            Route::get('/entry/{entry_no}', [AdminAccountController::class, 'getEntryDetails'])
-                ->name('entry.details');
-    
-            // ⬇⬇ NEW ROUTES FOR EDIT + DELETE ⬇⬇
-            Route::post('/update-entry', [AdminAccountController::class, 'updateEntry'])
-                ->name('update.entry');
-    
-            Route::post('/delete-entry', [AdminAccountController::class, 'deleteEntry'])
-                ->name('delete.entry');
-
-
-                // ===== Associated Orders Routes (EDIT MODAL साठी) =====
-                Route::post('/add-orders-to-entry', [AdminAccountController::class, 'addOrdersToEntry'])
-                    ->name('add.orders.to.entry');
+        Route::prefix('admin/account')
+            ->middleware('auth:admin')
+            ->name('admin.account.')
+            ->group(function () {
        
-                Route::get('/entry-orders/{entry_no}', [AdminAccountController::class, 'getEntryOrders'])
-                    ->name('entry.orders');
+                Route::get('/dashboard', [AdminAccountController::class, 'getDashboardData'])
+                    ->name('dashboard');
        
-                Route::post('/remove-order-from-entry', [AdminAccountController::class, 'removeOrderFromEntry'])
-                    ->name('remove.order.from.entry');
+                Route::get('/available-orders', [AdminAccountController::class, 'getAvailableOrders'])
+                    ->name('orders.available');
+        
+                Route::post('/create-order', [AdminAccountController::class, 'accountCreateOrder'])
+                    ->name('create');
+        
+                Route::post('/toggle-payment', [AdminAccountController::class, 'togglePayment'])
+                    ->name('toggle');
+        
+                Route::post('/installment/create', [AdminAccountController::class, 'addInstallment'])
+                    ->name('installment.create');
+        
+                Route::post('/installment/update-status', [AdminAccountController::class, 'updateInstallmentStatus'])
+                    ->name('installment.update');
+        
+                Route::get('/entry/{entry_no}', [AdminAccountController::class, 'getEntryDetails'])
+                    ->name('entry.details');
+        
+                // ⬇⬇ NEW ROUTES FOR EDIT + DELETE ⬇⬇
+                Route::post('/update-entry', [AdminAccountController::class, 'updateEntry'])
+                    ->name('update.entry');
+        
+                Route::post('/delete-entry', [AdminAccountController::class, 'deleteEntry'])
+                    ->name('delete.entry');

+
+                    // ===== Associated Orders Routes (EDIT MODAL साठी) =====
+                    Route::post('/add-orders-to-entry', [AdminAccountController::class, 'addOrdersToEntry'])
+                        ->name('add.orders.to.entry');
            
-        });
+                    Route::get('/entry-orders/{entry_no}', [AdminAccountController::class, 'getEntryOrders'])
+                        ->name('entry.orders');
+            
+                    Route::post('/remove-order-from-entry', [AdminAccountController::class, 'removeOrderFromEntry'])
+                        ->name('remove.order.from.entry');
+
+                
+            });

   

@@ -274,11 +278,10 @@ Route::prefix('admin')
        // ---------------------------
        // REPORTS DOWNLOAD ROUTES
        // ---------------------------
-        Route::get('/admin/orders/download/pdf', [OrderController::class, 'downloadPdf'])->name('admin.orders.download.pdf');
-        Route::get('/admin/orders/download/excel', [OrderController::class, 'downloadExcel'])->name('admin.orders.download.excel');
+            Route::get('/admin/orders/download/pdf', [OrderController::class, 'downloadPdf'])->name('admin.orders.download.pdf');
+            Route::get('/admin/orders/download/excel', [OrderController::class, 'downloadExcel'])->name('admin.orders.download.excel');

        //---------------------------
          //Edit Button Route
        //---------------------------
        
-