diff --git a/resources/views/admin/requests.blade.php b/resources/views/admin/requests.blade.php index f71d3ff..fad909f 100644 --- a/resources/views/admin/requests.blade.php +++ b/resources/views/admin/requests.blade.php @@ -289,7 +289,22 @@ @endif - N/A + + @if($req->status == 'pending') + + Approve + + + + Reject + + @else + No Action + @endif + + @endforeach diff --git a/routes/api.php b/routes/api.php index cb77329..7be76a1 100644 --- a/routes/api.php +++ b/routes/api.php @@ -4,17 +4,39 @@ use Illuminate\Support\Facades\Route; use App\Http\Controllers\RequestController; use App\Http\Controllers\UserAuthController; use App\Http\Controllers\MarkListController; +use App\Http\Controllers\User\UserOrderController; +use App\Http\Controllers\User\UserProfileController; + //user send request Route::post('/signup-request', [RequestController::class, 'usersignup']); //login / logout Route::post('/user/login', [UserAuthController::class, 'login']); -Route::post('/user/logout', [UserAuthController::class, 'logout'])->middleware('auth:api'); - Route::middleware(['auth:api'])->group(function () { - Route::get('/show-mark-list', [MarkListController::class, 'showmarklist']); // Fetch all marks by user - Route::post('/add-mark-no', [MarkListController::class, 'addmarkno']); // Create new mark + + Route::post('/user/logout', [UserAuthController::class, 'logout']); + + // Marklist + Route::get('/show-mark-list', [MarkListController::class, 'showmarklist']); + Route::post('/add-mark-no', [MarkListController::class, 'addmarkno']); + + // Orders + Route::get('/user/order-summary', [UserOrderController::class, 'orderSummary']); + Route::get('/user/orders', [UserOrderController::class, 'allOrders']); + Route::get('/user/order/{order_id}/details', [UserOrderController::class, 'orderDetails']); + Route::get('/user/order/{order_id}/shipment', [UserOrderController::class, 'orderShipment']); + Route::get('/user/order/{order_id}/invoice', [UserOrderController::class, 'orderInvoice']); + Route::get('/user/order/{order_id}/track', [UserOrderController::class, 'trackOrder']); + Route::get('/user/invoice/{invoice_id}/details', [UserOrderController::class, 'invoiceDetails']); + + // Invoice List + Route::get('/user/invoices', [UserOrderController::class, 'allInvoices']); + Route::get('/user/invoice/{invoice_id}/installments', [UserOrderController::class, 'invoiceInstallmentsById']); + + // Profile + Route::get('/user/profile', [UserProfileController::class, 'profile']); + Route::post('/user/profile/update', [UserProfileController::class, 'updateProfile']); });