Docker/Maybe
Docker/Maybe
1
0
Fork 0
mirror of https://github.com/maybe-finance/maybe.git synced 2025-07-30 10:39:40 +02:00
Code Issues Releases Activity Actions

Show onboarding unless invitation present

Browse source 
Fixes #1421
This commit is contained in:
Zach Gollwitzer 2024-11-05 19:08:45 -05:00
parent f2739b79fb
commit 455257bf51
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/onboardings_controller.rb
View file

@ -19,6 +19,6 @@ class OnboardingsController < ApplicationController
end end
def load_invitation def load_invitation
@invitation = Invitation.accepted.most_recent_for_email(Current.user.email) @invitation = Current.family.invitations.accepted.find_by(email: Current.user.email)
end end
end end

1
app/models/invitation.rb
View file

@ -12,7 +12,6 @@ class Invitation < ApplicationRecord
scope :pending, -> { where(accepted_at: nil).where("expires_at > ?", Time.current) } scope :pending, -> { where(accepted_at: nil).where("expires_at > ?", Time.current) }
scope :accepted, -> { where.not(accepted_at: nil) } scope :accepted, -> { where.not(accepted_at: nil) }
scope :most_recent_for_email, ->(email) { where(email: email).order(accepted_at: :desc).first }
def pending? def pending?
accepted_at.nil? && expires_at > Time.current accepted_at.nil? && expires_at > Time.current

6
test/system/transactions_test.rb
View file

@ -183,8 +183,10 @@ class TransactionsTest < ApplicationSystemTestCase
investment_account.entries.create!(name: "Investment account", date: Date.current, amount: 1000, currency: "USD", entryable: Account::Transaction.new) investment_account.entries.create!(name: "Investment account", date: Date.current, amount: 1000, currency: "USD", entryable: Account::Transaction.new)
transfer_date = Date.current transfer_date = Date.current
visit account_url(investment_account) visit account_url(investment_account)
click_on "New" within "[data-testid='activity-menu']" do
click_on "New transaction" click_on "New"
click_on "New transaction"
end
select "Deposit", from: "Type" select "Deposit", from: "Type"
fill_in "Date", with: transfer_date fill_in "Date", with: transfer_date
fill_in "account_entry[amount]", with: 175.25 fill_in "account_entry[amount]", with: 175.25