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

15
app/Http/Controllers/System/HolidayController.php
View File

@@ -2,7 +2,6 @@
namespace App\Http\Controllers\System;
use App\Helpers\TenantHelper;
use App\Http\Controllers\Controller;
use App\Models\System\Holiday;
use Illuminate\Http\JsonResponse;
@@ -15,7 +14,7 @@ class HolidayController extends Controller
public function index(Request $request): View|Response
{
if ($request->header('HX-Request')) {
return response('', 200)->header('HX-Redirect', TenantHelper::route('system.holidays.index'));
return response('', 200)->header('HX-Redirect', route('system.holidays.index'));
}
return view('system.holidays.index');
@@ -23,7 +22,7 @@ public function index(Request $request): View|Response
public function list(Request $request): JsonResponse
{
$tenantId = TenantHelper::getEffectiveTenantId(1);
$tenantId = session('selected_tenant_id', 1);
$year = $request->input('year', now()->year);
$holidays = Holiday::forTenant($tenantId)
@@ -60,7 +59,7 @@ public function store(Request $request): JsonResponse
'memo' => 'nullable|string|max:500',
]);
$tenantId = TenantHelper::getEffectiveTenantId(1);
$tenantId = session('selected_tenant_id', 1);
// 중복 체크: 같은 날짜 + 같은 이름
$exists = Holiday::forTenant($tenantId)
@@ -95,7 +94,7 @@ public function store(Request $request): JsonResponse
public function update(Request $request, int $id): JsonResponse
{
$tenantId = TenantHelper::getEffectiveTenantId(1);
$tenantId = session('selected_tenant_id', 1);
$holiday = Holiday::forTenant($tenantId)->findOrFail($id);
$request->validate([
@@ -124,7 +123,7 @@ public function update(Request $request, int $id): JsonResponse
public function destroy(int $id): JsonResponse
{
$tenantId = TenantHelper::getEffectiveTenantId(1);
$tenantId = session('selected_tenant_id', 1);
$holiday = Holiday::forTenant($tenantId)->findOrFail($id);
$holiday->delete();
@@ -145,7 +144,7 @@ public function bulkStore(Request $request): JsonResponse
'holidays.*.isRecurring' => 'boolean',
]);
$tenantId = TenantHelper::getEffectiveTenantId(1);
$tenantId = session('selected_tenant_id', 1);
$count = 0;
$skipped = 0;
@@ -195,7 +194,7 @@ public function destroyByYear(Request $request): JsonResponse
'year' => 'required|integer|min:2000|max:2100',
]);
$tenantId = TenantHelper::getEffectiveTenantId(1);
$tenantId = session('selected_tenant_id', 1);
$year = $request->input('year');
$count = Holiday::forTenant($tenantId)