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

Resolve merge conflicts

Browse Source
This commit is contained in:
Utkarsh Khedkar
2026-02-17 14:44:47 +05:30
parent 94e211f87e 8b6d3d5fad
commit 33571a5fd7
84 changed files with 16116 additions and 5486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
routes/api.php
View File

@@ -12,12 +12,15 @@ use App\Http\Controllers\MarkListController;
use App\Http\Controllers\User\UserOrderController;
use App\Http\Controllers\User\UserProfileController;
use App\Http\Controllers\User\ChatController;
<<<<<<< HEAD
Broadcast::routes(['middleware' => ['auth:api']]);
=======
>>>>>>> 8b6d3d5fadadda310ef45ec03c879b900bff4cb025f45d1bb5d188761d53e043
//user send request
Route::post('/signup-request', [RequestController::class, 'usersignup']);
@@ -26,9 +29,10 @@ Route::post('/signup-request', [RequestController::class, 'usersignup']);
Route::post('/user/login', [UserAuthController::class, 'login']);
Route::post('/auth/refresh', [UserAuthController::class, 'refreshToken']);
Route::middleware(['auth:api'])->group(function () {
//Route::post('/user/refresh', [UserAuthController::class, 'refreshToken']);
Route::post('/user/logout', [UserAuthController::class, 'logout']);
@@ -43,9 +47,11 @@ Route::middleware(['auth:api'])->group(function () {
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']);
Route::post('/user/orders/{order_id}/confirm', [UserOrderController::class, 'confirmOrder']);
// Invoice List
Route::get('/user/invoice/{invoice_id}/details', [UserOrderController::class, 'invoiceDetails']);
Route::get('/user/invoices', [UserOrderController::class, 'allInvoices']);
Route::get('/user/invoice/{invoice_id}/installments', [UserOrderController::class, 'invoiceInstallmentsById']);
@@ -58,7 +64,11 @@ Route::middleware(['auth:api'])->group(function () {
// Route::post('/user/profile/update', [UserProfileController::class, 'updateProfile']);
<<<<<<< HEAD
// ===========================
=======
// ===========================
>>>>>>> 8b6d3d5fadadda310ef45ec03c879b900bff4cb025f45d1bb5d188761d53e043
// CHAT SUPPORT ROUTES
// ===========================
Route::get('/user/chat/start', [ChatController::class, 'startChat']);
@@ -69,6 +79,7 @@ Route::middleware(['auth:api'])->group(function () {
});
<<<<<<< HEAD
Route::post('/broadcasting/auth', function (Request $request) {
if (!auth()->check()) {
return response()->json(['message' => 'Unauthenticated'], 401);
@@ -76,3 +87,30 @@ Route::post('/broadcasting/auth', function (Request $request) {
return Broadcast::auth($request);
})->middleware('auth:api');
=======
Route::post('/broadcasting/auth', function (Request $request) {
$user = auth('api')->user(); // JWT user (Flutter)
if (! $user) {
\Log::warning('BROADCAST AUTH FAILED - NO USER');
return response()->json(['message' => 'Unauthorized'], 401);
}
\Log::info('BROADCAST AUTH OK', [
'user_id' => $user->id,
'channel' => $request->channel_name,
]);
return Broadcast::auth(
$request->setUserResolver(fn () => $user)
);
});
>>>>>>> 8b6d3d5fadadda310ef45ec03c879b900bff4cb025f45d1bb5d188761d53e043

2
routes/channels.php
View File

@@ -39,4 +39,4 @@ Broadcast::channel('ticket.{ticketId}', function ($user, $ticketId) {
\Log::warning('❌ Authorization failed');
return false;
});
});

56
routes/web.php
View File

@@ -12,8 +12,9 @@ use App\Http\Controllers\Admin\AdminAccountController;
use App\Http\Controllers\Admin\AdminReportController;
use App\Http\Controllers\Admin\AdminStaffController;
use App\Http\Controllers\Admin\AdminChatController;
use Illuminate\Support\Facades\Broadcast;
use App\Http\Controllers\ContainerController;
use Illuminate\Session\Middleware\StartSession;
use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken;
use Illuminate\Http\Request;
// ---------------------------
@@ -62,13 +63,18 @@ Route::post('/broadcasting/auth', function (\Illuminate\Http\Request $request) {
// ADMIN LOGIN ROUTES
// ---------------------------
// login routes (public)
Route::prefix('admin')->group(function () {
Route::prefix('admin')->middleware('web')->group(function () {
Route::get('/login', [AdminAuthController::class, 'showLoginForm'])->name('admin.login');
Route::post('/login', [AdminAuthController::class, 'login'])->name('admin.login.submit');
Route::post('/logout', [AdminAuthController::class, 'logout'])->name('admin.logout');
});
Route::get('/login', function () {
return redirect()->route('admin.login');
})->name('login');
//Broadcast::routes([
//'middleware' => ['web', 'auth:admin'],
@@ -79,7 +85,7 @@ Broadcast::routes(['middleware' => ['web']]);
// PROTECTED ADMIN ROUTES (session protected)
// ==========================================
Route::prefix('admin')
->middleware('auth:admin')
->middleware(['web', 'auth:admin'])
->group(function () {
// Dashboard
@@ -192,7 +198,15 @@ Route::prefix('admin')
Route::get('/orders/view/{id}', [AdminOrderController::class, 'popup'])
->name('admin.orders.popup');
Route::post('/admin/orders/temp/add', [AdminOrderController::class, 'addTempItem'])
->name('admin.orders.temp.add');
// Route::get('/orders/{id}', [AdminOrderController::class, 'view'])
// ->name('admin.orders.view');
Route::get('/orders/{order:order_id}/see', [AdminOrderController::class, 'see'])
->name('admin.orders.see');
// ---------------------------
// ORDERS (FIXED ROUTES)
// ---------------------------
@@ -211,6 +225,12 @@ Route::prefix('admin')
// Delete full order
Route::delete('/orders/{id}/delete', [AdminOrderController::class, 'destroy'])
->name('admin.orders.destroy');
Route::post('/orders/upload-excel-preview',
[AdminOrderController::class, 'uploadExcelPreview']
)->name('admin.orders.upload.excel.preview');
// ---------------------------
// SHIPMENTS (FIXED ROUTES)
@@ -239,11 +259,21 @@ Route::prefix('admin')
// Shipment Delete
Route::delete('/shipments/{id}', [ShipmentController::class, 'destroy'])
->name('admin.shipments.destroy');
Route::get('/shipment/dummy/{id}', [ShipmentController::class, 'dummy'])
->name('admin.shipments.dummy');
// web.php
Route::delete('/shipments/{shipment}/orders/{order}',
[ShipmentController::class, 'removeOrder']
)->name('admin.shipments.removeOrder');
Route::post('/shipments/{shipment}/add-orders',
[ShipmentController::class, 'addOrders']
)->name('admin.shipments.addOrders');
Route::get('/shipment/dummy/{id}', [ShipmentController::class, 'dummy'])
->name('admin.shipments.dummy');
// ---------------------------
// INVOICES
// ---------------------------
@@ -265,7 +295,11 @@ Route::prefix('admin')
Route::post('/invoices/{id}/installment', [AdminInvoiceController::class, 'storeInstallment'])
->name('admin.invoice.installment.store');
Route::get(
'/admin/invoices/{id}/download',
[AdminInvoiceController::class, 'downloadInvoice']
)->name('admin.invoices.download');
Route::delete('/installment/{id}', [AdminInvoiceController::class, 'deleteInstallment'])
->name('admin.invoice.installment.delete');
@@ -276,8 +310,8 @@ Route::prefix('admin')
//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');
// ---------------------------
@@ -316,7 +350,7 @@ Route::prefix('admin')
// ADMIN ACCOUNT (AJAX) ROUTES
// ==========================================
Route::prefix('admin/account')
->middleware('auth:admin')
->middleware(['web', 'auth:admin'])
->name('admin.account.')
->group(function () {
@@ -375,7 +409,7 @@ Route::prefix('admin')
->name('admin.orders.download.excel');
Route::prefix('admin/account')->middleware('auth:admin')->name('admin.account.')->group(function () {
Route::prefix('admin/account')->middleware(['web', 'auth:admin'])->name('admin.account.')->group(function () {
Route::post('/toggle-payment', [AdminAccountController::class, 'togglePayment'])->name('toggle');
});
@@ -383,7 +417,7 @@ Route::prefix('admin')
//Edit Button Route
//---------------------------
// protected admin routes
Route::middleware(['auth:admin'])
Route::middleware(['web', 'auth:admin'])
->prefix('admin')
->name('admin.')
->group(function () {