gbanyan/usher-manage-stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add phone login support and member import functionality

Browse Source 
Features:
- Support login via phone number or email (LoginRequest)
- Add members:import-roster command for Excel roster import
- Merge survey emails with roster data

Code Quality (Phase 1-4):
- Add database locking for balance calculation
- Add self-approval checks for finance workflow
- Create service layer (FinanceDocumentApprovalService, PaymentVerificationService)
- Add HasAccountingEntries and HasApprovalWorkflow traits
- Create FormRequest classes for validation
- Add status-badge component
- Define authorization gates in AuthServiceProvider
- Add accounting config file

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
gbanyan
2026-01-25 03:08:06 +08:00
parent ed7169b64e
commit 42099759e8
66 changed files with 3492 additions and 3803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
tests/Traits/CreatesFinanceData.php
View File

@@ -11,7 +11,7 @@ use App\Models\FinanceDocument;
use App\Models\PaymentOrder;
use App\Models\User;
use Illuminate\Http\UploadedFile;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Facades\DB;
trait CreatesFinanceData
{
@@ -34,6 +34,7 @@ trait CreatesFinanceData
// Verify it's small amount
assert($doc->determineAmountTier() === FinanceDocument::AMOUNT_TIER_SMALL);
return $doc;
}
@@ -48,6 +49,7 @@ trait CreatesFinanceData
// Verify it's medium amount
assert($doc->determineAmountTier() === FinanceDocument::AMOUNT_TIER_MEDIUM);
return $doc;
}
@@ -62,19 +64,20 @@ trait CreatesFinanceData
// Verify it's large amount
assert($doc->determineAmountTier() === FinanceDocument::AMOUNT_TIER_LARGE);
return $doc;
}
/**
* Create a finance document at specific approval stage
* Create a finance document at specific approval stage (new workflow)
*/
protected function createDocumentAtStage(string $stage, array $attributes = []): FinanceDocument
{
$statusMap = [
'pending' => FinanceDocument::STATUS_PENDING,
'cashier_approved' => FinanceDocument::STATUS_APPROVED_CASHIER,
'accountant_approved' => FinanceDocument::STATUS_APPROVED_ACCOUNTANT,
'secretary_approved' => FinanceDocument::STATUS_APPROVED_SECRETARY,
'chair_approved' => FinanceDocument::STATUS_APPROVED_CHAIR,
'board_approved' => FinanceDocument::STATUS_APPROVED_BOARD,
'rejected' => FinanceDocument::STATUS_REJECTED,
];
@@ -88,8 +91,8 @@ trait CreatesFinanceData
*/
protected function createPaymentOrder(array $attributes = []): PaymentOrder
{
if (!isset($attributes['finance_document_id'])) {
$document = $this->createDocumentAtStage('chair_approved');
if (! isset($attributes['finance_document_id'])) {
$document = $this->createDocumentAtStage('secretary_approved', ['amount' => 3000]);
$attributes['finance_document_id'] = $document->id;
}
@@ -121,17 +124,19 @@ trait CreatesFinanceData
{
$cashier = $attributes['recorded_by_cashier_id'] ?? User::factory()->create()->id;
return CashierLedgerEntry::create(array_merge([
'entry_type' => 'receipt',
'entry_date' => now(),
'amount' => 10000,
'payment_method' => 'bank_transfer',
'bank_account' => 'Test Bank Account',
'balance_before' => 0,
'balance_after' => 10000,
'recorded_by_cashier_id' => $cashier,
'recorded_at' => now(),
], $attributes));
return DB::transaction(function () use ($attributes, $cashier) {
return CashierLedgerEntry::create(array_merge([
'entry_type' => 'receipt',
'entry_date' => now(),
'amount' => 10000,
'payment_method' => 'bank_transfer',
'bank_account' => 'Test Bank Account',
'balance_before' => 0,
'balance_after' => 10000,
'recorded_by_cashier_id' => $cashier,
'recorded_at' => now(),
], $attributes));
});
}
/**
@@ -139,15 +144,17 @@ trait CreatesFinanceData
*/
protected function createReceiptEntry(int $amount, string $bankAccount = 'Test Account', array $attributes = []): CashierLedgerEntry
{
$latestBalance = CashierLedgerEntry::getLatestBalance($bankAccount);
return DB::transaction(function () use ($amount, $bankAccount, $attributes) {
$latestBalance = CashierLedgerEntry::getLatestBalance($bankAccount);
return $this->createCashierLedgerEntry(array_merge([
'entry_type' => 'receipt',
'amount' => $amount,
'bank_account' => $bankAccount,
'balance_before' => $latestBalance,
'balance_after' => $latestBalance + $amount,
], $attributes));
return $this->createCashierLedgerEntry(array_merge([
'entry_type' => 'receipt',
'amount' => $amount,
'bank_account' => $bankAccount,
'balance_before' => $latestBalance,
'balance_after' => $latestBalance + $amount,
], $attributes));
});
}
/**
@@ -155,15 +162,17 @@ trait CreatesFinanceData
*/
protected function createPaymentEntry(int $amount, string $bankAccount = 'Test Account', array $attributes = []): CashierLedgerEntry
{
$latestBalance = CashierLedgerEntry::getLatestBalance($bankAccount);
return DB::transaction(function () use ($amount, $bankAccount, $attributes) {
$latestBalance = CashierLedgerEntry::getLatestBalance($bankAccount);
return $this->createCashierLedgerEntry(array_merge([
'entry_type' => 'payment',
'amount' => $amount,
'bank_account' => $bankAccount,
'balance_before' => $latestBalance,
'balance_after' => $latestBalance - $amount,
], $attributes));
return $this->createCashierLedgerEntry(array_merge([
'entry_type' => 'payment',
'amount' => $amount,
'bank_account' => $bankAccount,
'balance_before' => $latestBalance,
'balance_after' => $latestBalance - $amount,
], $attributes));
});
}
/**
@@ -265,7 +274,6 @@ trait CreatesFinanceData
'title' => 'Test Finance Document',
'description' => 'Test description',
'amount' => 10000,
'request_type' => FinanceDocument::REQUEST_TYPE_EXPENSE_REIMBURSEMENT,
'payee_name' => 'Test Payee',
'notes' => 'Test notes',
], $overrides);

42
tests/Traits/SeedsRolesAndPermissions.php
View File

@@ -23,6 +23,7 @@ trait SeedsRolesAndPermissions
{
$user = User::factory()->create($attributes);
$user->assignRole($role);
return $user;
}
@@ -34,6 +35,14 @@ trait SeedsRolesAndPermissions
return $this->createUserWithRole('admin', $attributes);
}
/**
* Create a secretary general user (first approval stage in new workflow)
*/
protected function createSecretary(array $attributes = []): User
{
return $this->createUserWithRole('secretary_general', $attributes);
}
/**
* Create a finance cashier user
*/
@@ -74,6 +83,32 @@ trait SeedsRolesAndPermissions
return $this->createUserWithRole('membership_manager', $attributes);
}
/**
* Create a super admin user (with all permissions)
*/
protected function createSuperAdmin(array $attributes = []): User
{
// Create super_admin role if it doesn't exist
Role::firstOrCreate(['name' => 'super_admin', 'guard_name' => 'web']);
// Grant all permissions to super_admin
$superAdminRole = Role::findByName('super_admin');
$superAdminRole->syncPermissions(Permission::all());
return $this->createUserWithRole('super_admin', $attributes);
}
/**
* Create a member role user (non-admin member)
*/
protected function createMemberUser(array $attributes = []): User
{
// Create member role if it doesn't exist
Role::firstOrCreate(['name' => 'member', 'guard_name' => 'web']);
return $this->createUserWithRole('member', $attributes);
}
/**
* Create a user with specific permissions
*/
@@ -84,18 +119,21 @@ trait SeedsRolesAndPermissions
Permission::findOrCreate($permission, 'web');
$user->givePermissionTo($permission);
}
return $user;
}
/**
* Get all finance approval users (cashier, accountant, chair)
* Get all finance approval users for new workflow (secretary, chair, board)
*/
protected function createFinanceApprovalTeam(): array
{
return [
'secretary' => $this->createSecretary(['email' => 'secretary@test.com']),
'chair' => $this->createChair(['email' => 'chair@test.com']),
'board_member' => $this->createBoardMember(['email' => 'board@test.com']),
'cashier' => $this->createCashier(['email' => 'cashier@test.com']),
'accountant' => $this->createAccountant(['email' => 'accountant@test.com']),
'chair' => $this->createChair(['email' => 'chair@test.com']),
];
}
}