SamProject/sam-manage
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fix: [tenant-console] 테넌트 콘솔 분리작업"

Browse Source 
This reverts commit 8da1702e
This commit is contained in:
권혁성
2026-03-13 21:24:18 +09:00
parent c3bc7912dd
commit 432888980b
70 changed files with 423 additions and 1173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/Http/Controllers/CommonCodeController.php
View File

@@ -2,7 +2,6 @@
namespace App\Http\Controllers;
use App\Helpers\TenantHelper;
use App\Models\Products\CommonCode;
use App\Models\Tenants\Tenant;
use App\Models\Tenants\TenantSetting;
@@ -22,10 +21,10 @@ public function index(Request $request): View|Response
{
// HTMX 요청 시 전체 페이지 리로드
if ($request->header('HX-Request')) {
return response('', 200)->header('HX-Redirect', TenantHelper::route('common-codes.index'));
return response('', 200)->header('HX-Redirect', route('common-codes.index'));
}
$tenantId = TenantHelper::getEffectiveTenantId();
$tenantId = session('selected_tenant_id');
$tenant = $tenantId ? Tenant::find($tenantId) : null;
$isHQ = $tenant?->tenant_type === 'HQ';
@@ -133,7 +132,7 @@ public function index(Request $request): View|Response
*/
private function getCustomGroupLabels(): array
{
$tenantId = TenantHelper::getEffectiveTenantId();
$tenantId = session('selected_tenant_id');
if (! $tenantId) {
return [];
}
@@ -152,7 +151,7 @@ private function getCustomGroupLabels(): array
*/
public function storeGroup(Request $request): RedirectResponse
{
$tenantId = TenantHelper::getEffectiveTenantId();
$tenantId = session('selected_tenant_id');
if (! $tenantId) {
return redirect()->back()->with('error', '테넌트를 먼저 선택해주세요.');
}
@@ -198,7 +197,7 @@ public function storeGroup(Request $request): RedirectResponse
);
return redirect()
->to(TenantHelper::route('common-codes.index', ['group' => $groupCode]))
->route('common-codes.index', ['group' => $groupCode])
->with('success', "'{$groupLabel}' 그룹이 추가되었습니다.");
}
@@ -207,7 +206,7 @@ public function storeGroup(Request $request): RedirectResponse
*/
public function store(Request $request): RedirectResponse
{
$tenantId = TenantHelper::getEffectiveTenantId();
$tenantId = session('selected_tenant_id');
$tenant = $tenantId ? Tenant::find($tenantId) : null;
if (! $tenantId) {
@@ -256,7 +255,7 @@ public function store(Request $request): RedirectResponse
]);
return redirect()
->to(TenantHelper::route('common-codes.index', ['group' => $validated['code_group']]))
->route('common-codes.index', ['group' => $validated['code_group']])
->with('success', '코드가 추가되었습니다.');
}
@@ -265,8 +264,7 @@ public function store(Request $request): RedirectResponse
*/
public function update(Request $request, int $id): RedirectResponse|JsonResponse
{
$id = (int) (request()->route('id') ?? $id);
$tenantId = TenantHelper::getEffectiveTenantId();
$tenantId = session('selected_tenant_id');
$tenant = $tenantId ? Tenant::find($tenantId) : null;
if (! $tenantId) {
@@ -339,7 +337,7 @@ public function update(Request $request, int $id): RedirectResponse|JsonResponse
}
return redirect()
->to(TenantHelper::route('common-codes.index', ['group' => $code->code_group]))
->route('common-codes.index', ['group' => $code->code_group])
->with('success', '코드가 수정되었습니다.');
}
@@ -348,8 +346,7 @@ public function update(Request $request, int $id): RedirectResponse|JsonResponse
*/
public function toggle(Request $request, int $id): JsonResponse
{
$id = (int) (request()->route('id') ?? $id);
$tenantId = TenantHelper::getEffectiveTenantId();
$tenantId = session('selected_tenant_id');
$tenant = $tenantId ? Tenant::find($tenantId) : null;
if (! $tenantId) {
@@ -391,7 +388,7 @@ public function toggle(Request $request, int $id): JsonResponse
*/
public function bulkPromoteToGlobal(Request $request): RedirectResponse|JsonResponse
{
$tenant = TenantHelper::getEffectiveTenantId() ? Tenant::find(TenantHelper::getEffectiveTenantId()) : null;
$tenant = session('selected_tenant_id') ? Tenant::find(session('selected_tenant_id')) : null;
$isHQ = $tenant?->tenant_type === 'HQ';
$isSuperAdmin = auth()->user()?->isSuperAdmin() ?? false;
@@ -465,7 +462,7 @@ public function bulkPromoteToGlobal(Request $request): RedirectResponse|JsonResp
}
return redirect()
->to(TenantHelper::route('common-codes.index', ['group' => $codeGroup ?? 'item_type']))
->route('common-codes.index', ['group' => $codeGroup ?? 'item_type'])
->with('success', $message);
}
@@ -474,8 +471,7 @@ public function bulkPromoteToGlobal(Request $request): RedirectResponse|JsonResp
*/
public function copy(Request $request, int $id): RedirectResponse|JsonResponse
{
$id = (int) (request()->route('id') ?? $id);
$tenantId = TenantHelper::getEffectiveTenantId();
$tenantId = session('selected_tenant_id');
if (! $tenantId) {
if ($request->ajax()) {
@@ -525,7 +521,7 @@ public function copy(Request $request, int $id): RedirectResponse|JsonResponse
}
return redirect()
->to(TenantHelper::route('common-codes.index', ['group' => $globalCode->code_group]))
->route('common-codes.index', ['group' => $globalCode->code_group])
->with('success', '글로벌 코드가 테넌트용으로 복사되었습니다.');
}
@@ -534,7 +530,7 @@ public function copy(Request $request, int $id): RedirectResponse|JsonResponse
*/
public function bulkCopy(Request $request): RedirectResponse|JsonResponse
{
$tenantId = TenantHelper::getEffectiveTenantId();
$tenantId = session('selected_tenant_id');
if (! $tenantId) {
if ($request->ajax()) {
@@ -623,7 +619,7 @@ public function bulkCopy(Request $request): RedirectResponse|JsonResponse
}
return redirect()
->to(TenantHelper::route('common-codes.index', ['group' => $codeGroup ?? 'item_type']))
->route('common-codes.index', ['group' => $codeGroup ?? 'item_type'])
->with('success', $message);
}
@@ -632,8 +628,7 @@ public function bulkCopy(Request $request): RedirectResponse|JsonResponse
*/
public function promoteToGlobal(Request $request, int $id): RedirectResponse|JsonResponse
{
$id = (int) (request()->route('id') ?? $id);
$tenantId = TenantHelper::getEffectiveTenantId();
$tenantId = session('selected_tenant_id');
$tenant = $tenantId ? Tenant::find($tenantId) : null;
$isHQ = $tenant?->tenant_type === 'HQ';
$isSuperAdmin = auth()->user()?->isSuperAdmin() ?? false;
@@ -685,7 +680,7 @@ public function promoteToGlobal(Request $request, int $id): RedirectResponse|Jso
}
return redirect()
->to(TenantHelper::route('common-codes.index', ['group' => $tenantCode->code_group]))
->route('common-codes.index', ['group' => $tenantCode->code_group])
->with('success', '테넌트 코드가 글로벌로 복사되었습니다.');
}
@@ -694,8 +689,7 @@ public function promoteToGlobal(Request $request, int $id): RedirectResponse|Jso
*/
public function destroy(Request $request, int $id): RedirectResponse|JsonResponse
{
$id = (int) (request()->route('id') ?? $id);
$tenantId = TenantHelper::getEffectiveTenantId();
$tenantId = session('selected_tenant_id');
$tenant = $tenantId ? Tenant::find($tenantId) : null;
if (! $tenantId) {
@@ -748,7 +742,7 @@ public function destroy(Request $request, int $id): RedirectResponse|JsonRespons
}
return redirect()
->to(TenantHelper::route('common-codes.index', ['group' => $codeGroup]))
->route('common-codes.index', ['group' => $codeGroup])
->with('success', '코드가 삭제되었습니다.');
}
}