mag/WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

M3 Integration fixes pass 27

Browse Source
This commit is contained in:
Mark Gregory
2026-09-23 09:29:12 +01:00
parent c5af9eb128
commit 5c6fb470ca
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Countries/Routes/web.php
+6 -6
View File
@@ -5,9 +5,9 @@ use Modules\Countries\Http\Controllers\CountriesController;
use Modules\Countries\Http\Controllers\CountrySyncController;
use Modules\Countries\Http\Controllers\ReferenceDataController;
const COUNTRY_ROUTE = '/{country}';
$countryRoute = '/{country}';
Route::prefix('countries')->name('countries.')->middleware(['web', 'auth'])->group(function (): void {
Route::prefix('countries')->name('countries.')->middleware(['web', 'auth'])->group(function () use ($countryRoute): void {
Route::get('/', CountriesController::class)->name('index');
Route::get('/create', [CountriesController::class, 'create'])->name('create');
Route::post('/', [CountriesController::class, 'store'])->name('store');
@@ -17,8 +17,8 @@ Route::prefix('countries')->name('countries.')->middleware(['web', 'auth'])->gro
Route::get('/reference/languages', [ReferenceDataController::class, 'languages'])->name('languages.index');
Route::get('/reference/scripts', [ReferenceDataController::class, 'scripts'])->name('scripts.index');
Route::get('/reference/locodes', [ReferenceDataController::class, 'locodes'])->name('locodes.index');
Route::get(COUNTRY_ROUTE, [CountriesController::class, 'show'])->name('show');
Route::get(COUNTRY_ROUTE . '/edit', [CountriesController::class, 'edit'])->name('edit');
Route::put(COUNTRY_ROUTE, [CountriesController::class, 'update'])->name('update');
Route::delete(COUNTRY_ROUTE, [CountriesController::class, 'destroy'])->name('destroy');
Route::get($countryRoute, [CountriesController::class, 'show'])->name('show');
Route::get($countryRoute . '/edit', [CountriesController::class, 'edit'])->name('edit');
Route::put($countryRoute, [CountriesController::class, 'update'])->name('update');
Route::delete($countryRoute, [CountriesController::class, 'destroy'])->name('destroy');
});
Modules/Documentation/Routes/web.php
+9 -9
View File
@@ -6,24 +6,24 @@ use Illuminate\Support\Facades\Route;
use Modules\Documentation\Http\Controllers\DocumentationCategoryController;
use Modules\Documentation\Http\Controllers\DocumentationController;
const DOCUMENT_ROUTE = '/documents/{document}';
$documentRoute = '/documents/{document}';
Route::middleware(['web', 'auth'])
->prefix('documentation')
->name('documentation.')
->group(function (): void {
->group(function () use ($documentRoute): void {
Route::get('/', [DocumentationController::class, 'index'])->name('index');
Route::get('/documents', [DocumentationController::class, 'index'])->name('documents.index');
Route::get('/documents/create', [DocumentationController::class, 'create'])->name('documents.create');
Route::post('/documents', [DocumentationController::class, 'store'])->name('documents.store');
Route::get(DOCUMENT_ROUTE, [DocumentationController::class, 'show'])->name('documents.show');
Route::get(DOCUMENT_ROUTE . '/edit', [DocumentationController::class, 'edit'])->name('documents.edit');
Route::put(DOCUMENT_ROUTE, [DocumentationController::class, 'update'])->name('documents.update');
Route::delete(DOCUMENT_ROUTE, [DocumentationController::class, 'destroy'])->name('documents.destroy');
Route::get(DOCUMENT_ROUTE . '/download', [DocumentationController::class, 'download'])->name('documents.download');
Route::get(DOCUMENT_ROUTE . '/attachments/{attachment}/download', [DocumentationController::class, 'downloadAttachment'])->name('documents.attachments.download');
Route::delete(DOCUMENT_ROUTE . '/attachments/{attachment}', [DocumentationController::class, 'destroyAttachment'])->name('documents.attachments.destroy');
Route::get($documentRoute, [DocumentationController::class, 'show'])->name('documents.show');
Route::get($documentRoute . '/edit', [DocumentationController::class, 'edit'])->name('documents.edit');
Route::put($documentRoute, [DocumentationController::class, 'update'])->name('documents.update');
Route::delete($documentRoute, [DocumentationController::class, 'destroy'])->name('documents.destroy');
Route::get($documentRoute . '/download', [DocumentationController::class, 'download'])->name('documents.download');
Route::get($documentRoute . '/attachments/{attachment}/download', [DocumentationController::class, 'downloadAttachment'])->name('documents.attachments.download');
Route::delete($documentRoute . '/attachments/{attachment}', [DocumentationController::class, 'destroyAttachment'])->name('documents.attachments.destroy');
Route::resource('categories', DocumentationCategoryController::class)->except(['show']);
});
routes/jetstream.php
+6 -6
View File
@@ -14,9 +14,9 @@ use Laravel\Jetstream\Http\Controllers\Inertia\UserProfileController;
use Laravel\Jetstream\Http\Controllers\TeamInvitationController;
use Laravel\Jetstream\Jetstream;
const TEAM_ROUTE = '/teams/{team}';
$teamRoute = '/teams/{team}';
Route::group(['middleware' => config('jetstream.middleware', ['web'])], function () {
Route::group(['middleware' => config('jetstream.middleware', ['web'])], function () use ($teamRoute) {
if (Jetstream::hasTermsAndPrivacyPolicyFeature()) {
Route::get('/terms-of-service', [TermsOfServiceController::class, 'show'])->name('terms.show');
Route::get('/privacy-policy', [PrivacyPolicyController::class, 'show'])->name('policy.show');
@@ -30,7 +30,7 @@ Route::group(['middleware' => config('jetstream.middleware', ['web'])], function
? config('jetstream.auth_session')
: null;
Route::group(['middleware' => array_values(array_filter([$authMiddleware, $authSessionMiddleware]))], function () {
Route::group(['middleware' => array_values(array_filter([$authMiddleware, $authSessionMiddleware]))], function () use ($teamRoute) {
// User & Profile...
Route::get('/user/profile', [UserProfileController::class, 'show'])
->name('profile.show');
@@ -59,9 +59,9 @@ Route::group(['middleware' => config('jetstream.middleware', ['web'])], function
if (Jetstream::hasTeamFeatures()) {
Route::get('/teams/create', [TeamController::class, 'create'])->name('teams.create');
Route::post('/teams', [TeamController::class, 'store'])->name('teams.store');
Route::get(TEAM_ROUTE, [TeamController::class, 'show'])->name('teams.show');
Route::put(TEAM_ROUTE, [TeamController::class, 'update'])->name('teams.update');
Route::delete(TEAM_ROUTE, [TeamController::class, 'destroy'])->name('teams.destroy');
Route::get($teamRoute, [TeamController::class, 'show'])->name('teams.show');
Route::put($teamRoute, [TeamController::class, 'update'])->name('teams.update');
Route::delete($teamRoute, [TeamController::class, 'destroy'])->name('teams.destroy');
Route::put('/current-team', [CurrentTeamController::class, 'update'])->name('current-team.update');
Route::post('/teams/{team}/members', [TeamMemberController::class, 'store'])->name('team-members.store');
Route::put('/teams/{team}/members/{user}', [TeamMemberController::class, 'update'])->name('team-members.update');