Add membership fee system with disability discount and fix document permissions
Features: - Implement two fee types: entrance fee and annual fee (both NT$1,000) - Add 50% discount for disability certificate holders - Add disability certificate upload in member profile - Integrate disability verification into cashier approval workflow - Add membership fee settings in system admin Document permissions: - Fix hard-coded role logic in Document model - Use permission-based authorization instead of role checks Additional features: - Add announcements, general ledger, and trial balance modules - Add income management and accounting entries - Add comprehensive test suite with factories - Update UI translations to Traditional Chinese 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
<x-app-layout>
|
||||
<x-slot name="header">
|
||||
<h2 class="text-xl font-semibold leading-tight text-gray-800 dark:text-gray-200">
|
||||
{{ __('Record Transaction') }} (¤)
|
||||
記錄交易
|
||||
</h2>
|
||||
</x-slot>
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
<!-- Transaction Type -->
|
||||
<div>
|
||||
<label for="transaction_type" class="block text-sm font-medium text-gray-700 dark:text-gray-300">
|
||||
{{ __('Transaction Type') }} <span class="text-red-500">*</span>
|
||||
交易類型 <span class="text-red-500">*</span>
|
||||
</label>
|
||||
<select name="transaction_type" id="transaction_type" required
|
||||
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm dark:bg-gray-700 dark:border-gray-600 dark:text-gray-100 @error('transaction_type') border-red-300 @enderror">
|
||||
<option value="">{{ __('Select type...') }}</option>
|
||||
<option value="income" @selected(old('transaction_type') === 'income')>{{ __('Income') }} (6e)</option>
|
||||
<option value="expense" @selected(old('transaction_type') === 'expense')>{{ __('Expense') }} (/ú)</option>
|
||||
<option value="">選擇類型...</option>
|
||||
<option value="income" @selected(old('transaction_type') === 'income')>收入</option>
|
||||
<option value="expense" @selected(old('transaction_type') === 'expense')>支出</option>
|
||||
</select>
|
||||
@error('transaction_type')<p class="mt-1 text-sm text-red-600 dark:text-red-400">{{ $message }}</p>@enderror
|
||||
</div>
|
||||
@@ -28,19 +28,19 @@
|
||||
<!-- Account -->
|
||||
<div>
|
||||
<label for="chart_of_account_id" class="block text-sm font-medium text-gray-700 dark:text-gray-300">
|
||||
{{ __('Account') }} <span class="text-red-500">*</span>
|
||||
帳戶 <span class="text-red-500">*</span>
|
||||
</label>
|
||||
<select name="chart_of_account_id" id="chart_of_account_id" required
|
||||
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm dark:bg-gray-700 dark:border-gray-600 dark:text-gray-100 @error('chart_of_account_id') border-red-300 @enderror">
|
||||
<option value="">{{ __('Select account...') }}</option>
|
||||
<optgroup label="{{ __('Income Accounts') }}">
|
||||
<option value="">選擇帳戶...</option>
|
||||
<optgroup label="收入帳戶">
|
||||
@foreach($incomeAccounts as $account)
|
||||
<option value="{{ $account->id }}" @selected(old('chart_of_account_id') == $account->id)>
|
||||
{{ $account->account_code }} - {{ $account->account_name_zh }}
|
||||
</option>
|
||||
@endforeach
|
||||
</optgroup>
|
||||
<optgroup label="{{ __('Expense Accounts') }}">
|
||||
<optgroup label="支出帳戶">
|
||||
@foreach($expenseAccounts as $account)
|
||||
<option value="{{ $account->id }}" @selected(old('chart_of_account_id') == $account->id)>
|
||||
{{ $account->account_code }} - {{ $account->account_name_zh }}
|
||||
@@ -54,7 +54,7 @@
|
||||
<!-- Transaction Date -->
|
||||
<div>
|
||||
<label for="transaction_date" class="block text-sm font-medium text-gray-700 dark:text-gray-300">
|
||||
{{ __('Transaction Date') }} <span class="text-red-500">*</span>
|
||||
交易日期 <span class="text-red-500">*</span>
|
||||
</label>
|
||||
<input type="date" name="transaction_date" id="transaction_date" value="{{ old('transaction_date', now()->format('Y-m-d')) }}" required
|
||||
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm dark:bg-gray-700 dark:border-gray-600 dark:text-gray-100 @error('transaction_date') border-red-300 @enderror">
|
||||
@@ -64,7 +64,7 @@
|
||||
<!-- Amount -->
|
||||
<div>
|
||||
<label for="amount" class="block text-sm font-medium text-gray-700 dark:text-gray-300">
|
||||
{{ __('Amount') }} (NT$) <span class="text-red-500">*</span>
|
||||
金額 (NT$) <span class="text-red-500">*</span>
|
||||
</label>
|
||||
<input type="number" name="amount" id="amount" value="{{ old('amount') }}" step="0.01" min="0.01" required
|
||||
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm dark:bg-gray-700 dark:border-gray-600 dark:text-gray-100 @error('amount') border-red-300 @enderror"
|
||||
@@ -75,33 +75,33 @@
|
||||
<!-- Description -->
|
||||
<div>
|
||||
<label for="description" class="block text-sm font-medium text-gray-700 dark:text-gray-300">
|
||||
{{ __('Description') }} <span class="text-red-500">*</span>
|
||||
描述 <span class="text-red-500">*</span>
|
||||
</label>
|
||||
<input type="text" name="description" id="description" value="{{ old('description') }}" required maxlength="255"
|
||||
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm dark:bg-gray-700 dark:border-gray-600 dark:text-gray-100 @error('description') border-red-300 @enderror"
|
||||
placeholder="{{ __('Brief description of the transaction') }}">
|
||||
placeholder="交易的簡要描述">
|
||||
@error('description')<p class="mt-1 text-sm text-red-600 dark:text-red-400">{{ $message }}</p>@enderror
|
||||
</div>
|
||||
|
||||
<!-- Reference Number -->
|
||||
<div>
|
||||
<label for="reference_number" class="block text-sm font-medium text-gray-700 dark:text-gray-300">
|
||||
{{ __('Reference Number') }}
|
||||
參考編號
|
||||
</label>
|
||||
<input type="text" name="reference_number" id="reference_number" value="{{ old('reference_number') }}" maxlength="255"
|
||||
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm dark:bg-gray-700 dark:border-gray-600 dark:text-gray-100"
|
||||
placeholder="{{ __('Receipt or invoice number (optional)') }}">
|
||||
<p class="mt-1 text-sm text-gray-500 dark:text-gray-400">{{ __('Optional reference or receipt number') }}</p>
|
||||
placeholder="收據或發票號碼（選填）">
|
||||
<p class="mt-1 text-sm text-gray-500 dark:text-gray-400">選填參考編號或收據號碼</p>
|
||||
</div>
|
||||
|
||||
<!-- Budget Item (Optional) -->
|
||||
<div>
|
||||
<label for="budget_item_id" class="block text-sm font-medium text-gray-700 dark:text-gray-300">
|
||||
{{ __('Link to Budget') }}
|
||||
連結至預算
|
||||
</label>
|
||||
<select name="budget_item_id" id="budget_item_id"
|
||||
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm dark:bg-gray-700 dark:border-gray-600 dark:text-gray-100">
|
||||
<option value="">{{ __('No budget link (standalone transaction)') }}</option>
|
||||
<option value="">不連結預算（獨立交易）</option>
|
||||
@foreach($budgets as $budget)
|
||||
<optgroup label="{{ $budget->name }} ({{ $budget->fiscal_year }})">
|
||||
@foreach($budget->budgetItems as $item)
|
||||
@@ -112,28 +112,28 @@
|
||||
</optgroup>
|
||||
@endforeach
|
||||
</select>
|
||||
<p class="mt-1 text-sm text-gray-500 dark:text-gray-400">{{ __('Link this transaction to a budget item to track actual vs budgeted amounts') }}</p>
|
||||
<p class="mt-1 text-sm text-gray-500 dark:text-gray-400">將此交易連結至預算項目以追蹤實際與預算金額</p>
|
||||
</div>
|
||||
|
||||
<!-- Notes -->
|
||||
<div>
|
||||
<label for="notes" class="block text-sm font-medium text-gray-700 dark:text-gray-300">
|
||||
{{ __('Notes') }}
|
||||
備註
|
||||
</label>
|
||||
<textarea name="notes" id="notes" rows="3"
|
||||
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm dark:bg-gray-700 dark:border-gray-600 dark:text-gray-100"
|
||||
placeholder="{{ __('Additional notes (optional)') }}">{{ old('notes') }}</textarea>
|
||||
placeholder="額外備註（選填）">{{ old('notes') }}</textarea>
|
||||
</div>
|
||||
|
||||
<!-- Actions -->
|
||||
<div class="flex items-center justify-end gap-x-4 border-t border-gray-200 pt-6 dark:border-gray-700">
|
||||
<a href="{{ route('admin.transactions.index') }}"
|
||||
class="rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 dark:bg-gray-700 dark:text-gray-100 dark:ring-gray-600 dark:hover:bg-gray-600">
|
||||
{{ __('Cancel') }}
|
||||
取消
|
||||
</a>
|
||||
<button type="submit"
|
||||
class="inline-flex justify-center rounded-md bg-indigo-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:bg-indigo-500 dark:hover:bg-indigo-400 dark:focus:ring-offset-gray-800">
|
||||
{{ __('Record Transaction') }}
|
||||
記錄交易
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
@@ -148,13 +148,13 @@
|
||||
</svg>
|
||||
</div>
|
||||
<div class="ml-3">
|
||||
<h3 class="text-sm font-medium text-blue-800 dark:text-blue-200">{{ __('Recording Transactions') }}</h3>
|
||||
<h3 class="text-sm font-medium text-blue-800 dark:text-blue-200">記錄交易</h3>
|
||||
<div class="mt-2 text-sm text-blue-700 dark:text-blue-300">
|
||||
<ul class="list-disc pl-5 space-y-1">
|
||||
<li>{{ __('Choose income or expense type based on money flow') }}</li>
|
||||
<li>{{ __('Select the appropriate chart of account for categorization') }}</li>
|
||||
<li>{{ __('Link to a budget item to automatically update budget vs actual tracking') }}</li>
|
||||
<li>{{ __('Add reference numbers for audit trails and reconciliation') }}</li>
|
||||
<li>根據資金流向選擇收入或支出類型</li>
|
||||
<li>選擇適當的會計科目進行分類</li>
|
||||
<li>連結至預算項目以自動更新預算與實際追蹤</li>
|
||||
<li>新增參考編號以供稽核追蹤和對帳</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@@ -162,4 +162,4 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</x-app-layout>
|
||||
</x-app-layout>
|
||||
Reference in New Issue
Block a user