This commit is contained in:
Abhishek Mali
2025-11-14 14:06:23 +05:30
parent e071a082e0
commit 2f7eaf88a2

View File

@@ -78,9 +78,6 @@ Route::prefix('admin')->middleware('auth:admin')->group(function () {
Route::post('/orders/temp/reset', [AdminOrderController::class, 'resetTemp']) Route::post('/orders/temp/reset', [AdminOrderController::class, 'resetTemp'])
->name('admin.orders.temp.reset'); ->name('admin.orders.temp.reset');
<<<<<<< HEAD
Route::get('/shipments', [ShipmentController::class, 'index']) Route::get('/shipments', [ShipmentController::class, 'index'])
->name('admin.shipments'); ->name('admin.shipments');
@@ -92,7 +89,5 @@ Route::prefix('admin')->middleware('auth:admin')->group(function () {
Route::get('/shipments/{id}', [ShipmentController::class, 'show']) Route::get('/shipments/{id}', [ShipmentController::class, 'show'])
->name('admin.shipments.show'); ->name('admin.shipments.show');
=======
>>>>>>> 2c5d19779b747ce1d7f0bc8978d8c417b374849f3b9023bf30ac502d14d9650d
}); });