DHL Modul v0.5 Shipping Label ok
This commit is contained in:
Kevin Adametz
parent
480fdc65ed
commit
8fdaa0ba1d
122 changed files with 17938 additions and 2239 deletions
|
|
@ -11,8 +11,8 @@
|
|||
/* ROUTING FOR CRM my.mivita / CMS*/
|
||||
Route::domain(config('app.pre_url_crm') . config('app.domain') . config('app.tld_care'))->group(function () {
|
||||
|
||||
Route::get('/cron/jobs/action/{action}/{key}', 'CronController@action')->name('cron_jobs_action');
|
||||
Route::get('/cron/jobs/run/{key}', 'CronController@runCron')->name('cron_jobs_run');
|
||||
// Route::get('/cron/jobs/action/{action}/{key}', 'CronController@action')->name('cron_jobs_action');
|
||||
// Route::get('/cron/jobs/run/{key}', 'CronController@runCron')->name('cron_jobs_run');
|
||||
|
||||
|
||||
Auth::routes();
|
||||
|
|
@ -38,8 +38,6 @@ Route::domain(config('app.pre_url_crm') . config('app.domain') . config('app.tld
|
|||
Route::get('/user/update_email_confirm/{token}', 'UserUpdateEmailController@activateMail')->name('user_update_email_confirm');
|
||||
Route::post('/user/check/mail', 'HomeController@checkMail')->name('user_check_mail');
|
||||
|
||||
Route::get('/register/verify/{confirmationCode}', 'HomeController@verify')->name('register_verify');
|
||||
|
||||
Route::get('/status/register', 'HomeController@statusRegister')->name('status_register');
|
||||
Route::get('/status/verify', 'HomeController@statusVerify')->name('status_verify');
|
||||
Route::get('/status/error', 'HomeController@statusError')->name('status_error');
|
||||
|
|
@ -65,24 +63,14 @@ Route::domain(config('app.pre_url_crm') . config('app.domain') . config('app.tld
|
|||
|
||||
Route::get('/wizard/delete/file/{id}/{relation}', 'WizardController@delete')->name('wizard_delete_file');
|
||||
|
||||
Route::get('/storage/file/{id}/{disk}', function ($id = null, $disk = null) {
|
||||
// Prüfe ob der Disk existiert und nur 'public' erlaubt ist
|
||||
if($disk != 'public' || !config("filesystems.disks.{$disk}")){
|
||||
abort(404);
|
||||
}
|
||||
$file = \App\Models\File::findOrFail($id);
|
||||
$path = Storage::disk($disk)->path($file->dir . $file->filename);
|
||||
if (file_exists($path)) {
|
||||
return Response::file($path);
|
||||
}
|
||||
})->name('storage_file');
|
||||
|
||||
Route::get('/storage/file/{id}/{from}/{do?}', 'FileController@show')->name('storage_file');
|
||||
// storage_file Route wurde nach common.php verschoben für domain-übergreifende Nutzung
|
||||
});
|
||||
|
||||
|
||||
Route::group(['middleware' => ['auth:user']], function () {
|
||||
Route::get('storage/{type?}/{file?}', function ($type = null, $file = null) {
|
||||
$path = "";
|
||||
$filename = "";
|
||||
if ($type == 'xls') {
|
||||
$path = storage_path("app/export/");
|
||||
$filename = $file . '.xls';
|
||||
|
|
@ -124,6 +112,7 @@ Route::domain(config('app.pre_url_crm') . config('app.domain') . config('app.tld
|
|||
Route::post('/user/shop/store', 'UserShopController@store')->name('user_shop_store');
|
||||
Route::post('/user/shop/register/form', 'UserShopController@userShopRegisterForm')->name('user_shop_register_form');
|
||||
Route::post('/user/shop/name/check', 'UserShopController@checkUserShopName')->name('user_shop_name_check');
|
||||
Route::get('/user/shop/name/edit', 'UserShopController@editName')->name('user_shop_name_edit');
|
||||
Route::get('/user/shop/translate', 'UserShopController@translate')->name('user_shop_translate');
|
||||
Route::post('/user/shop/translate/store', 'UserShopController@translateStore')->name('user_shop_tanslate_store');
|
||||
Route::post('/user/shop/upload/image', 'UserShopController@uploadImage')->name('user_shop_upload_image');
|
||||
|
|
@ -278,8 +267,21 @@ Route::domain(config('app.pre_url_crm') . config('app.domain') . config('app.tld
|
|||
//products images
|
||||
Route::post('/admin/product/category/image/upload', 'CategoryController@imageUpload')->name('admin_product_category_image_upload');
|
||||
Route::get('/admin/product/category/image/delete{image_id}/{category_id}', 'CategoryController@imageDelete')->name('admin_product_category_image_delete');
|
||||
Route::get('/admin/product/category/image/attribute/{image_id}/{attr}/{val}', 'CategoryController@imageAttribute')->name('admin_product_category_image_attribute');
|
||||
|
||||
// DHL Shipping Routes
|
||||
Route::prefix('admin/dhl')->group(function () {
|
||||
Route::get('/', 'DhlShipmentController@index')->name('admin.dhl.cockpit');
|
||||
Route::post('/datatable', 'DhlShipmentController@datatable')->name('admin.dhl.datatable');
|
||||
Route::get('/shipment/{shipment}', 'DhlShipmentController@show')->name('admin.dhl.show');
|
||||
Route::post('/shipment', 'DhlShipmentController@store')->name('admin.dhl.store');
|
||||
Route::delete('/shipment/{shipment}/cancel', 'DhlShipmentController@cancel')->name('admin.dhl.cancel');
|
||||
Route::post('/shipment/{shipment}/return-label', 'DhlShipmentController@createReturnLabel')->name('admin.dhl.create-return');
|
||||
Route::post('/shipment/{shipment}/update-tracking', 'DhlShipmentController@updateTracking')->name('admin.dhl.update-tracking');
|
||||
Route::get('/shipment/{shipment}/download-label', 'DhlShipmentController@downloadLabel')->name('admin.dhl.download-label');
|
||||
Route::post('/batch-action', 'DhlShipmentController@batchAction')->name('admin.dhl.batch-action');
|
||||
Route::post('/test-login', 'DhlShipmentController@testLogin')->name('admin.dhl.test_login');
|
||||
Route::get('/public/track', 'DhlShipmentController@track')->name('public.tracking');
|
||||
});
|
||||
|
||||
//products attributes
|
||||
Route::get('/admin/product/attributes', 'AttributeController@index')->name('admin_product_attributes');
|
||||
|
|
@ -438,7 +440,6 @@ Route::domain(config('app.pre_url_crm') . config('app.domain') . config('app.tld
|
|||
|
||||
Route::get('/admin/settings', 'SettingController@index')->name('admin_settings');
|
||||
Route::post('/admin/setting/store', 'SettingController@store')->name('admin_setting_store');
|
||||
|
||||
});
|
||||
|
||||
//login pages for sysadmin
|
||||
|
|
|
|||
|
|
@ -17,10 +17,15 @@ Route::get('/agb', 'HomeController@legalAGB')->name('agb');
|
|||
Route::get('/kontakt', 'Web\ContactController@create')->name('contact_create');
|
||||
Route::post('/kontakt', 'Web\ContactController@store')->name('contact_store');
|
||||
|
||||
Route::get('/registrierung', 'Web\RegisterController@index')->name('register_user');
|
||||
Route::get('/reg/{member_id?}', 'Web\RegisterController@member')->name('register_user_member');
|
||||
Route::post('/registrierung', 'Web\RegisterController@register')->name('register_user');
|
||||
Route::get('/registrierung/finish', 'Web\RegisterController@finish')->name('register_user_finish');
|
||||
// Public DHL Tracking
|
||||
Route::get('/tracking', 'DhlShipmentController@track')->name('public.tracking');
|
||||
Route::post('/tracking', 'DhlShipmentController@track')->name('public.tracking.check');
|
||||
|
||||
Route::get('/registrierung', 'Web\RegisterController@index')->name('main.register_user');
|
||||
Route::get('/reg/{member_id?}', 'Web\RegisterController@member')->name('main.register_user_member');
|
||||
Route::post('/registrierung', 'Web\RegisterController@register')->name('main.register_user_post');
|
||||
Route::get('/registrierung/finish', 'Web\RegisterController@finish')->name('main.register_user_finish');
|
||||
|
||||
Route::get('/', 'Web\SiteController@index')->name('/');
|
||||
Route::get('/{site}/{subsite?}/{product_slug?}', 'Web\SiteController@site')->name('base.site');
|
||||
|
||||
|
|
|
|||
|
|
@ -6,11 +6,12 @@
|
|||
|--------------------------------------------------------------------------
|
||||
|
|
||||
*/
|
||||
use App\Http\Controllers\Portal\AboController;
|
||||
use App\Http\Controllers\Portal\Auth\LoginController;
|
||||
use App\Http\Controllers\Portal\CustomerController;
|
||||
use App\Http\Controllers\FileController;
|
||||
use App\Http\Controllers\Portal\InController;
|
||||
use App\Http\Controllers\Portal\AboController;
|
||||
use App\Http\Controllers\Portal\OrderController;
|
||||
use App\Http\Controllers\Portal\CustomerController;
|
||||
use App\Http\Controllers\Portal\Auth\LoginController;
|
||||
|
||||
|
||||
|
||||
|
|
@ -37,6 +38,7 @@ Route::domain(config('app.pre_url_portal') . config('app.domain') . config('app.
|
|||
|
||||
// Geschützte Kunden-Routen
|
||||
Route::middleware('auth:customers')->group(function () {
|
||||
|
||||
Route::get('portal/dashboard', [InController::class, 'dashboard'])->name('portal.dashboard');
|
||||
//Route::get('portal/go-to-shop', [InController::class, 'goToShop'])->name('portal.go_to_shop');
|
||||
Route::get('portal/my-data/edit', [CustomerController::class, 'myDataEdit'])->name('portal.my_data.edit');
|
||||
|
|
|
|||
|
|
@ -16,37 +16,37 @@ if ($context->type === 'checkout') {
|
|||
// Für Checkout-Domain: Umleitung zur Shop-Domain
|
||||
Route::get('/datenschutz', function () {
|
||||
$domainService = app(\App\Services\DomainService::class);
|
||||
$shopUrl = $domainService->buildUrl('main-shop', '/datenschutz');
|
||||
$shopUrl = $domainService->buildUrl('shop', '/datenschutz');
|
||||
return redirect()->away($shopUrl);
|
||||
})->name('legal.data-protected');
|
||||
|
||||
Route::get('/impressum', function () {
|
||||
$domainService = app(\App\Services\DomainService::class);
|
||||
$shopUrl = $domainService->buildUrl('main-shop', '/impressum');
|
||||
$shopUrl = $domainService->buildUrl('shop', '/impressum');
|
||||
return redirect()->away($shopUrl);
|
||||
})->name('legal.imprint');
|
||||
|
||||
Route::get('/agb', function () {
|
||||
$domainService = app(\App\Services\DomainService::class);
|
||||
$shopUrl = $domainService->buildUrl('main-shop', '/agb');
|
||||
$shopUrl = $domainService->buildUrl('shop', '/agb');
|
||||
return redirect()->away($shopUrl);
|
||||
})->name('legal.agb');
|
||||
|
||||
Route::get('/kontakt', function () {
|
||||
$domainService = app(\App\Services\DomainService::class);
|
||||
$shopUrl = $domainService->buildUrl('main-shop', '/kontakt');
|
||||
$shopUrl = $domainService->buildUrl('shop', '/kontakt');
|
||||
return redirect()->away($shopUrl);
|
||||
})->name('contact.create');
|
||||
|
||||
Route::get('/zahlungsarten', function () {
|
||||
$domainService = app(\App\Services\DomainService::class);
|
||||
$shopUrl = $domainService->buildUrl('main-shop', '/zahlungsarten');
|
||||
$shopUrl = $domainService->buildUrl('shop', '/zahlungsarten');
|
||||
return redirect()->away($shopUrl);
|
||||
})->name('zahlungsarten');
|
||||
|
||||
Route::get('/versandkosten', function () {
|
||||
$domainService = app(\App\Services\DomainService::class);
|
||||
$shopUrl = $domainService->buildUrl('main-shop', '/versandkosten');
|
||||
$shopUrl = $domainService->buildUrl('shop', '/versandkosten');
|
||||
return redirect()->away($shopUrl);
|
||||
})->name('versandkosten');
|
||||
} else {
|
||||
|
|
@ -59,37 +59,10 @@ if ($context->type === 'checkout') {
|
|||
Route::get('/zahlungsarten', 'HomeController@zahlungsarten')->name('zahlungsarten');
|
||||
Route::get('/versandkosten', 'HomeController@versandkosten')->name('versandkosten');
|
||||
}
|
||||
//debug subdomain
|
||||
Route::get('/debug-subdomain', function () {
|
||||
$domainContext = app(\App\Domain\DomainContext::class);
|
||||
$domainService = app(\App\Services\DomainService::class);
|
||||
|
||||
return response()->json([
|
||||
'host' => request()->getHost(),
|
||||
'headers' => [
|
||||
'X-Forwarded-Host' => request()->header('X-Forwarded-Host'),
|
||||
'X-Subdomain' => request()->header('X-Subdomain'),
|
||||
'Host' => request()->header('Host'),
|
||||
],
|
||||
'url' => request()->url(),
|
||||
'full_url' => request()->fullUrl(),
|
||||
'server' => [
|
||||
'HTTP_HOST' => $_SERVER['HTTP_HOST'] ?? 'not set',
|
||||
'SERVER_NAME' => $_SERVER['SERVER_NAME'] ?? 'not set',
|
||||
],
|
||||
'domain_context' => [
|
||||
'type' => $domainContext->type,
|
||||
'host' => $domainContext->host,
|
||||
'subdomain' => $domainContext->subdomain,
|
||||
'cloudflare_subdomain' => $domainContext->cloudflareSubdomain,
|
||||
'effective_subdomain' => $domainContext->getEffectiveSubdomain(),
|
||||
'is_cloudflare' => $domainContext->isCloudflareSubdomain(),
|
||||
'is_user_shop' => $domainContext->isUserShop(),
|
||||
'user_shop_slug' => $domainContext->getUserShopSlug(),
|
||||
],
|
||||
'parsed_domain' => $domainService->parseDomain(request()->getHost(), request()->header('X-Subdomain'))
|
||||
]);
|
||||
});
|
||||
|
||||
// File storage route für alle Domains (Rechnungen, Downloads, etc.)
|
||||
// Auth-Prüfung erfolgt im FileController selbst je nach Kontext
|
||||
Route::get('/storage/file/{id}/{from}/{do?}', 'FileController@show')->name('storage_file');
|
||||
|
||||
// Sprachwechsler
|
||||
Route::post('/change_website_lang', 'Web\SiteController@changeLang')->name('language.change');
|
||||
|
|
@ -199,3 +172,6 @@ if ($context->type !== 'checkout') {
|
|||
}
|
||||
|
||||
|
||||
Route::get('/register/verify/{confirmationCode}', 'HomeController@verify')->name('register_verify');
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue