Add phone login support and member import functionality

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:
2026-01-25 03:08:06 +08:00
parent ed7169b64e
commit 42099759e8
66 changed files with 3492 additions and 3803 deletions

View File

@@ -1,5 +1,5 @@
CREATE TABLE IF NOT EXISTS "migrations" ("id" integer primary key autoincrement not null, "migration" varchar not null, "batch" integer not null);
CREATE TABLE IF NOT EXISTS "users" ("id" integer primary key autoincrement not null, "name" varchar not null, "email" varchar not null, "email_verified_at" datetime, "password" varchar not null, "remember_token" varchar, "created_at" datetime, "updated_at" datetime, "is_admin" tinyint(1) not null default '0', "profile_photo_path" varchar);
CREATE TABLE IF NOT EXISTS "users" ("id" integer primary key autoincrement not null, "name" varchar not null, "email" varchar not null, "email_verified_at" datetime, "password" varchar not null, "remember_token" varchar, "created_at" datetime, "updated_at" datetime, "profile_photo_path" varchar);
CREATE UNIQUE INDEX "users_email_unique" on "users" ("email");
CREATE TABLE IF NOT EXISTS "password_reset_tokens" ("email" varchar not null, "token" varchar not null, "created_at" datetime, primary key ("email"));
CREATE TABLE IF NOT EXISTS "failed_jobs" ("id" integer primary key autoincrement not null, "uuid" varchar not null, "connection" text not null, "queue" text not null, "payload" text not null, "exception" text not null, "failed_at" datetime not null default CURRENT_TIMESTAMP);
@@ -27,10 +27,10 @@ CREATE INDEX "document_access_logs_document_id_index" on "document_access_logs"
CREATE INDEX "document_access_logs_user_id_index" on "document_access_logs" ("user_id");
CREATE INDEX "document_access_logs_action_index" on "document_access_logs" ("action");
CREATE INDEX "document_access_logs_accessed_at_index" on "document_access_logs" ("accessed_at");
CREATE TABLE IF NOT EXISTS "members" ("id" integer primary key autoincrement not null, "user_id" integer, "full_name" varchar not null, "email" varchar not null, "phone" varchar, "national_id_encrypted" varchar, "national_id_hash" varchar, "membership_started_at" date, "membership_expires_at" date, "created_at" datetime, "updated_at" datetime, "last_expiry_reminder_sent_at" datetime, "address_line_1" varchar, "address_line_2" varchar, "city" varchar, "postal_code" varchar, "emergency_contact_name" varchar, "emergency_contact_phone" varchar, "membership_status" varchar check ("membership_status" in ('pending', 'active', 'expired', 'suspended')) not null default 'pending', "membership_type" varchar check ("membership_type" in ('regular', 'honorary', 'lifetime', 'student')) not null default 'regular', foreign key("user_id") references "users"("id") on delete set null);
CREATE TABLE IF NOT EXISTS "members" ("id" integer primary key autoincrement not null, "user_id" integer, "full_name" varchar not null, "email" varchar not null, "phone" varchar, "national_id_encrypted" varchar, "national_id_hash" varchar, "membership_started_at" date, "membership_expires_at" date, "created_at" datetime, "updated_at" datetime, "last_expiry_reminder_sent_at" datetime, "address_line_1" varchar, "address_line_2" varchar, "city" varchar, "postal_code" varchar, "emergency_contact_name" varchar, "emergency_contact_phone" varchar, "membership_status" varchar check ("membership_status" in ('pending', 'active', 'expired', 'suspended')) not null default 'pending', "membership_type" varchar check ("membership_type" in ('regular', 'honorary', 'lifetime', 'student')) not null default 'regular', "disability_certificate_path" varchar, "disability_certificate_status" varchar, "disability_verified_by" integer, "disability_verified_at" datetime, "disability_rejection_reason" text, foreign key("user_id") references "users"("id") on delete set null);
CREATE INDEX "members_email_index" on "members" ("email");
CREATE INDEX "members_national_id_hash_index" on "members" ("national_id_hash");
CREATE TABLE IF NOT EXISTS "membership_payments" ("id" integer primary key autoincrement not null, "member_id" integer not null, "paid_at" date not null, "amount" numeric not null, "method" varchar, "reference" varchar, "created_at" datetime, "updated_at" datetime, "status" varchar check ("status" in ('pending', 'approved_cashier', 'approved_accountant', 'approved_chair', 'rejected')) not null default 'pending', "payment_method" varchar check ("payment_method" in ('bank_transfer', 'convenience_store', 'cash', 'credit_card')), "receipt_path" varchar, "submitted_by_user_id" integer, "verified_by_cashier_id" integer, "cashier_verified_at" datetime, "verified_by_accountant_id" integer, "accountant_verified_at" datetime, "verified_by_chair_id" integer, "chair_verified_at" datetime, "rejected_by_user_id" integer, "rejected_at" datetime, "rejection_reason" text, "notes" text, foreign key("member_id") references "members"("id") on delete cascade);
CREATE TABLE IF NOT EXISTS "membership_payments" ("id" integer primary key autoincrement not null, "member_id" integer not null, "paid_at" date not null, "amount" numeric not null, "method" varchar, "reference" varchar, "created_at" datetime, "updated_at" datetime, "status" varchar check ("status" in ('pending', 'approved_cashier', 'approved_accountant', 'approved_chair', 'rejected')) not null default 'pending', "payment_method" varchar check ("payment_method" in ('bank_transfer', 'convenience_store', 'cash', 'credit_card')), "receipt_path" varchar, "submitted_by_user_id" integer, "verified_by_cashier_id" integer, "cashier_verified_at" datetime, "verified_by_accountant_id" integer, "accountant_verified_at" datetime, "verified_by_chair_id" integer, "chair_verified_at" datetime, "rejected_by_user_id" integer, "rejected_at" datetime, "rejection_reason" text, "notes" text, "fee_type" varchar not null default 'entrance_fee', "base_amount" numeric, "discount_amount" numeric not null default '0', "final_amount" numeric, "disability_discount" tinyint(1) not null default '0', foreign key("member_id") references "members"("id") on delete cascade);
CREATE TABLE IF NOT EXISTS "permissions" ("id" integer primary key autoincrement not null, "name" varchar not null, "guard_name" varchar not null, "created_at" datetime, "updated_at" datetime);
CREATE UNIQUE INDEX "permissions_name_guard_name_unique" on "permissions" ("name", "guard_name");
CREATE TABLE IF NOT EXISTS "roles" ("id" integer primary key autoincrement not null, "name" varchar not null, "guard_name" varchar not null, "created_at" datetime, "updated_at" datetime, "description" varchar);
@@ -40,8 +40,8 @@ CREATE INDEX "model_has_permissions_model_id_model_type_index" on "model_has_per
CREATE TABLE IF NOT EXISTS "model_has_roles" ("role_id" integer not null, "model_type" varchar not null, "model_id" integer not null, foreign key("role_id") references "roles"("id") on delete cascade, primary key ("role_id", "model_id", "model_type"));
CREATE INDEX "model_has_roles_model_id_model_type_index" on "model_has_roles" ("model_id", "model_type");
CREATE TABLE IF NOT EXISTS "role_has_permissions" ("permission_id" integer not null, "role_id" integer not null, foreign key("permission_id") references "permissions"("id") on delete cascade, foreign key("role_id") references "roles"("id") on delete cascade, primary key ("permission_id", "role_id"));
CREATE TABLE IF NOT EXISTS "audit_logs" ("id" integer primary key autoincrement not null, "user_id" integer, "action" varchar not null, "auditable_type" varchar, "auditable_id" integer, "metadata" text, "created_at" datetime, "updated_at" datetime, foreign key("user_id") references "users"("id") on delete set null);
CREATE TABLE IF NOT EXISTS "finance_documents" ("id" integer primary key autoincrement not null, "member_id" integer, "submitted_by_user_id" integer, "title" varchar not null, "amount" numeric, "status" varchar not null default 'pending', "description" text, "submitted_at" datetime, "created_at" datetime, "updated_at" datetime, "attachment_path" varchar, "approved_by_cashier_id" integer, "cashier_approved_at" datetime, "approved_by_accountant_id" integer, "accountant_approved_at" datetime, "approved_by_chair_id" integer, "chair_approved_at" datetime, "rejected_by_user_id" integer, "rejected_at" datetime, "rejection_reason" text, "submitted_by_id" integer, "request_type" varchar check ("request_type" in ('expense_reimbursement', 'advance_payment', 'purchase_request', 'petty_cash')) not null default 'expense_reimbursement', "amount_tier" varchar check ("amount_tier" in ('small', 'medium', 'large')), "chart_of_account_id" integer, "budget_item_id" integer, "requires_board_meeting" tinyint(1) not null default '0', "board_meeting_date" date, "board_meeting_decision" text, "approved_by_board_meeting_id" integer, "board_meeting_approved_at" datetime, "payment_order_created_by_accountant_id" integer, "payment_order_created_at" datetime, "payment_method" varchar check ("payment_method" in ('bank_transfer', 'check', 'cash')), "payee_name" varchar, "payee_bank_code" varchar, "payee_account_number" varchar, "payee_bank_name" varchar, "payment_notes" text, "payment_verified_by_cashier_id" integer, "payment_verified_at" datetime, "payment_verification_notes" text, "payment_executed_by_cashier_id" integer, "payment_executed_at" datetime, "payment_transaction_id" varchar, "payment_receipt_path" varchar, "actual_payment_amount" numeric, "cashier_ledger_entry_id" integer, "cashier_recorded_at" datetime, "accounting_transaction_id" integer, "accountant_recorded_at" datetime, "bank_reconciliation_id" integer, "reconciliation_status" varchar check ("reconciliation_status" in ('pending', 'matched', 'discrepancy', 'resolved')) not null default 'pending', "reconciliation_notes" text, "reconciled_at" datetime, "reconciled_by_user_id" integer, foreign key("member_id") references "members"("id") on delete set null, foreign key("submitted_by_user_id") references "users"("id") on delete set null);
CREATE TABLE IF NOT EXISTS "audit_logs" ("id" integer primary key autoincrement not null, "user_id" integer, "action" varchar not null, "auditable_type" varchar, "auditable_id" integer, "metadata" text, "created_at" datetime, "updated_at" datetime, "description" text, "ip_address" varchar, foreign key("user_id") references "users"("id") on delete set null);
CREATE TABLE IF NOT EXISTS "finance_documents" ("id" integer primary key autoincrement not null, "member_id" integer, "submitted_by_user_id" integer, "title" varchar not null, "amount" numeric, "status" varchar not null default 'pending', "description" text, "submitted_at" datetime, "created_at" datetime, "updated_at" datetime, "attachment_path" varchar, "approved_by_cashier_id" integer, "cashier_approved_at" datetime, "approved_by_accountant_id" integer, "accountant_approved_at" datetime, "approved_by_chair_id" integer, "chair_approved_at" datetime, "rejected_by_user_id" integer, "rejected_at" datetime, "rejection_reason" text, "submitted_by_id" integer, "amount_tier" varchar check ("amount_tier" in ('small', 'medium', 'large')), "chart_of_account_id" integer, "budget_item_id" integer, "requires_board_meeting" tinyint(1) not null default '0', "board_meeting_date" date, "board_meeting_decision" text, "approved_by_board_meeting_id" integer, "board_meeting_approved_at" datetime, "payment_order_created_by_accountant_id" integer, "payment_order_created_at" datetime, "payment_method" varchar check ("payment_method" in ('bank_transfer', 'check', 'cash')), "payee_name" varchar, "payee_bank_code" varchar, "payee_account_number" varchar, "payee_bank_name" varchar, "payment_notes" text, "payment_verified_by_cashier_id" integer, "payment_verified_at" datetime, "payment_verification_notes" text, "payment_executed_by_cashier_id" integer, "payment_executed_at" datetime, "payment_transaction_id" varchar, "payment_receipt_path" varchar, "actual_payment_amount" numeric, "cashier_ledger_entry_id" integer, "cashier_recorded_at" datetime, "accounting_transaction_id" integer, "accountant_recorded_at" datetime, "bank_reconciliation_id" integer, "reconciliation_status" varchar check ("reconciliation_status" in ('pending', 'matched', 'discrepancy', 'resolved')) not null default 'pending', "reconciliation_notes" text, "reconciled_at" datetime, "reconciled_by_user_id" integer, "approved_by_secretary_id" integer, "secretary_approved_at" datetime, "disbursement_status" varchar, "requester_confirmed_at" datetime, "requester_confirmed_by_id" integer, "cashier_confirmed_at" datetime, "cashier_confirmed_by_id" integer, "recording_status" varchar, "accountant_recorded_by_id" integer, foreign key("member_id") references "members"("id") on delete set null, foreign key("submitted_by_user_id") references "users"("id") on delete set null);
CREATE TABLE IF NOT EXISTS "chart_of_accounts" ("id" integer primary key autoincrement not null, "account_code" varchar not null, "account_name_zh" varchar not null, "account_name_en" varchar, "account_type" varchar check ("account_type" in ('asset', 'liability', 'net_asset', 'income', 'expense')) not null, "category" varchar, "parent_account_id" integer, "is_active" tinyint(1) not null default '1', "display_order" integer not null default '0', "description" text, "created_at" datetime, "updated_at" datetime, foreign key("parent_account_id") references "chart_of_accounts"("id") on delete set null);
CREATE INDEX "chart_of_accounts_account_type_index" on "chart_of_accounts" ("account_type");
CREATE INDEX "chart_of_accounts_is_active_index" on "chart_of_accounts" ("is_active");
@@ -108,6 +108,22 @@ CREATE INDEX "cashier_ledger_entries_recorded_by_cashier_id_index" on "cashier_l
CREATE TABLE IF NOT EXISTS "bank_reconciliations" ("id" integer primary key autoincrement not null, "reconciliation_month" date not null, "bank_statement_balance" numeric not null, "bank_statement_date" date not null, "bank_statement_file_path" varchar, "system_book_balance" numeric not null, "outstanding_checks" text, "deposits_in_transit" text, "bank_charges" text, "adjusted_balance" numeric not null, "discrepancy_amount" numeric not null default '0', "reconciliation_status" varchar check ("reconciliation_status" in ('pending', 'completed', 'discrepancy')) not null default 'pending', "prepared_by_cashier_id" integer not null, "reviewed_by_accountant_id" integer, "approved_by_manager_id" integer, "prepared_at" datetime not null default CURRENT_TIMESTAMP, "reviewed_at" datetime, "approved_at" datetime, "notes" text, "created_at" datetime, "updated_at" datetime, foreign key("prepared_by_cashier_id") references "users"("id") on delete cascade, foreign key("reviewed_by_accountant_id") references "users"("id") on delete set null, foreign key("approved_by_manager_id") references "users"("id") on delete set null);
CREATE INDEX "bank_reconciliations_reconciliation_month_index" on "bank_reconciliations" ("reconciliation_month");
CREATE INDEX "bank_reconciliations_reconciliation_status_index" on "bank_reconciliations" ("reconciliation_status");
CREATE TABLE IF NOT EXISTS "announcements" ("id" integer primary key autoincrement not null, "title" varchar not null, "content" text not null, "status" varchar check ("status" in ('draft', 'published', 'archived')) not null default 'draft', "is_pinned" tinyint(1) not null default '0', "display_order" integer not null default '0', "access_level" varchar check ("access_level" in ('public', 'members', 'board', 'admin')) not null default 'members', "published_at" datetime, "expires_at" datetime, "archived_at" datetime, "view_count" integer not null default '0', "created_by_user_id" integer not null, "last_updated_by_user_id" integer, "created_at" datetime, "updated_at" datetime, "deleted_at" datetime, foreign key("created_by_user_id") references "users"("id") on delete cascade, foreign key("last_updated_by_user_id") references "users"("id") on delete set null);
CREATE INDEX "announcements_status_index" on "announcements" ("status");
CREATE INDEX "announcements_access_level_index" on "announcements" ("access_level");
CREATE INDEX "announcements_published_at_index" on "announcements" ("published_at");
CREATE INDEX "announcements_expires_at_index" on "announcements" ("expires_at");
CREATE INDEX "announcements_is_pinned_display_order_index" on "announcements" ("is_pinned", "display_order");
CREATE TABLE IF NOT EXISTS "accounting_entries" ("id" integer primary key autoincrement not null, "finance_document_id" integer not null, "chart_of_account_id" integer not null, "entry_type" varchar check ("entry_type" in ('debit', 'credit')) not null, "amount" numeric not null, "entry_date" date not null, "description" text, "created_at" datetime, "updated_at" datetime, "income_id" integer, foreign key("finance_document_id") references "finance_documents"("id") on delete cascade, foreign key("chart_of_account_id") references "chart_of_accounts"("id"));
CREATE INDEX "accounting_entries_finance_document_id_entry_type_index" on "accounting_entries" ("finance_document_id", "entry_type");
CREATE INDEX "accounting_entries_chart_of_account_id_entry_date_index" on "accounting_entries" ("chart_of_account_id", "entry_date");
CREATE TABLE IF NOT EXISTS "board_meetings" ("id" integer primary key autoincrement not null, "meeting_date" date not null, "title" varchar not null, "notes" text, "status" varchar check ("status" in ('scheduled', 'completed', 'cancelled')) not null default 'scheduled', "created_at" datetime, "updated_at" datetime);
CREATE TABLE IF NOT EXISTS "incomes" ("id" integer primary key autoincrement not null, "income_number" varchar not null, "title" varchar not null, "description" text, "income_date" date not null, "amount" numeric not null, "income_type" varchar not null, "chart_of_account_id" integer not null, "payment_method" varchar not null, "bank_account" varchar, "payer_name" varchar, "receipt_number" varchar, "transaction_reference" varchar, "attachment_path" varchar, "member_id" integer, "status" varchar not null default 'pending', "recorded_by_cashier_id" integer not null, "recorded_at" datetime not null, "confirmed_by_accountant_id" integer, "confirmed_at" datetime, "cashier_ledger_entry_id" integer, "notes" text, "created_at" datetime, "updated_at" datetime, foreign key("chart_of_account_id") references "chart_of_accounts"("id"), foreign key("member_id") references "members"("id") on delete set null, foreign key("recorded_by_cashier_id") references "users"("id"), foreign key("confirmed_by_accountant_id") references "users"("id"), foreign key("cashier_ledger_entry_id") references "cashier_ledger_entries"("id") on delete set null);
CREATE INDEX "incomes_income_date_index" on "incomes" ("income_date");
CREATE INDEX "incomes_income_type_index" on "incomes" ("income_type");
CREATE INDEX "incomes_status_index" on "incomes" ("status");
CREATE INDEX "incomes_member_id_income_type_index" on "incomes" ("member_id", "income_type");
CREATE UNIQUE INDEX "incomes_income_number_unique" on "incomes" ("income_number");
INSERT INTO migrations VALUES(1,'2014_10_12_000000_create_users_table',1);
INSERT INTO migrations VALUES(2,'2014_10_12_100000_create_password_reset_tokens_table',1);
INSERT INTO migrations VALUES(3,'2019_08_19_000000_create_failed_jobs_table',1);
@@ -154,3 +170,15 @@ INSERT INTO migrations VALUES(43,'2025_11_20_125121_add_payment_stage_fields_to_
INSERT INTO migrations VALUES(44,'2025_11_20_125246_create_payment_orders_table',1);
INSERT INTO migrations VALUES(45,'2025_11_20_125247_create_cashier_ledger_entries_table',1);
INSERT INTO migrations VALUES(46,'2025_11_20_125249_create_bank_reconciliations_table',1);
INSERT INTO migrations VALUES(47,'2025_11_28_182012_remove_is_admin_from_users_table',2);
INSERT INTO migrations VALUES(48,'2025_11_28_231917_create_cashier_ledger_entries_table',3);
INSERT INTO migrations VALUES(49,'2025_11_29_003312_create_announcements_table',4);
INSERT INTO migrations VALUES(50,'2025_11_29_010220_add_description_and_ip_address_to_audit_logs_table',5);
INSERT INTO migrations VALUES(51,'2025_11_30_153609_create_accounting_entries_table',6);
INSERT INTO migrations VALUES(52,'2025_11_30_163310_create_board_meetings_table',7);
INSERT INTO migrations VALUES(53,'2025_11_30_171203_add_new_workflow_fields_to_finance_documents',8);
INSERT INTO migrations VALUES(54,'2025_11_30_175637_remove_request_type_from_finance_documents',9);
INSERT INTO migrations VALUES(55,'2025_11_30_182639_create_incomes_table',10);
INSERT INTO migrations VALUES(56,'2025_11_30_212201_add_disability_fields_to_members_table',11);
INSERT INTO migrations VALUES(57,'2025_11_30_212227_add_fee_type_to_membership_payments_table',11);
INSERT INTO migrations VALUES(58,'2026_01_24_091609_add_secretary_approval_fields_to_finance_documents',12);