kent-logistics/Kent-logistics-Laravel
SHA256
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conflict resolve

Browse Source
This commit is contained in:
divya abdar
2025-12-03 16:13:37 +05:30
parent 340c2b2132 44b8299b0e
commit 0afcb23511
23 changed files with 1634 additions and 629 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
routes/api.php
View File

@@ -15,7 +15,9 @@ Route::post('/signup-request', [RequestController::class, 'usersignup']);
Route::post('/user/login', [UserAuthController::class, 'login']);
Route::middleware(['auth:api'])->group(function () {
//Route::post('/user/refresh', [UserAuthController::class, 'refreshToken']);
Route::post('/user/logout', [UserAuthController::class, 'logout']);
@@ -37,6 +39,11 @@ Route::middleware(['auth:api'])->group(function () {
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']);
Route::post('/user/profile-image', [UserProfileController::class, 'updateProfileImage']);
Route::post('/user/profile-update-request', [UserProfileController::class, 'updateProfileRequest']);
// Route::post('/user/profile/update', [UserProfileController::class, 'updateProfile']);
});

30
routes/web.php
View File

@@ -75,6 +75,20 @@ Route::prefix('admin')
Route::get('/requests/reject/{id}', [UserRequestController::class, 'reject'])
->name('admin.requests.reject');
// PROFILE UPDATE REQUESTS
Route::get('/profile-update-requests',
[UserRequestController::class, 'profileUpdateRequests']
)->name('admin.profile.requests');
Route::get('/profile-update/approve/{id}',
[UserRequestController::class, 'approveProfileUpdate']
)->name('admin.profile.approve');
Route::get('/profile-update/reject/{id}',
[UserRequestController::class, 'rejectProfileUpdate']
)->name('admin.profile.reject');
// ---------------------------
// MARK LIST
@@ -173,7 +187,8 @@ Route::prefix('admin')
->name('admin.shipments.addOrder');
Route::post('/shipments/{id}/add-orders', [ShipmentController::class, 'addOrders'])
->name('admin.shipments.addOrders');
->name('admin.shipments.addOrders');
// ---------------------------
// INVOICES
// ---------------------------
@@ -195,8 +210,10 @@ Route::prefix('admin')
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
@@ -278,8 +295,11 @@ 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', [AdminOrderController::class, 'downloadPdf'])
->name('admin.orders.download.pdf');
Route::get('/admin/orders/download/excel', [AdminOrderController::class, 'downloadExcel'])
->name('admin.orders.download.excel');
//---------------------------
//Edit Button Route