merge Conflict

2025-12-01 11:49:24 +05:30
parent ec2a0baceb 68bfd180ed
commit 64d8939208
23 changed files with 8554 additions and 2743 deletions
--- a/routes/web.php
+++ b/routes/web.php
@@ -32,6 +32,8 @@ Route::prefix('admin')->group(function () {

    Route::post('/logout', [AdminAuthController::class, 'logout'])
        ->name('admin.logout');
+
+    
 });


@@ -111,23 +113,59 @@ Route::prefix('admin')

        Route::get('/orders/view/{id}', [AdminOrderController::class, 'popup'])
            ->name('admin.orders.popup');
-
-
+            
        // ---------------------------
-        // SHIPMENTS
+            // 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');
+
+            // 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/store', [ShipmentController::class, 'store'])
+        Route::post('/shipments', [ShipmentController::class, 'store'])
            ->name('admin.shipments.store');

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

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

+        // 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');
+

        // ---------------------------
        // INVOICES
@@ -180,36 +218,67 @@ Route::prefix('admin')
            ->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');
-    });
+    // ==========================================
+    // 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::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');
+
+            
+        });
+
+   
+
+
+        // ---------------------------
+        // 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');
+
+        //---------------------------
+          //Edit Button Route
+        //---------------------------
+