[Ledger] Add filters for merchants #11366
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
polypixeldev
changed the title
sampoder
reviewed
Aug 20, 2025
Comment on lines
115
to
119
| <div data-tabs-target="tab" id="merchant"> | ||
| <p class="italic text-center">Merchants are the company that charges a credit card. Non-card transactions will not be included when this filter is applied.</p> | ||
| <%= turbo_frame_tag :merchants_filter, src: event_merchants_filter_path(@event, merchant: @merchant), loading: :lazy, target: "event_#{@event.id}_ledger" %> | ||
| </div> | ||
| <div data-tabs-target="tab" id="receipts"> |
There was a problem hiding this comment.
Thank you for using a Turbo frame!
sampoder
reviewed
Aug 20, 2025
app/controllers/events_controller.rb
Outdated
Comment on lines
1221
to
1246
| def merchants_list | ||
| settled_merchants = @event.canonical_transactions.map do |ct| | ||
| rst = ct.raw_stripe_transaction | ||
|
|
||
| if rst.present? | ||
| merchant_data = rst.stripe_transaction["merchant_data"] | ||
| yp_merchant = YellowPages::Merchant.lookup(network_id: merchant_data["network_id"]) | ||
| { id: merchant_data["network_id"], name: yp_merchant.name || merchant_data["name"].titleize } | ||
| else | ||
| nil | ||
| end | ||
| end.select(&:present?) | ||
|
|
||
| pending_merchants = @event.canonical_pending_transactions.map do |cpt| | ||
| rpst = cpt.raw_pending_stripe_transaction | ||
|
|
||
| if rpst.present? | ||
| merchant_data = rpst.stripe_transaction["merchant_data"] | ||
| yp_merchant = YellowPages::Merchant.lookup(network_id: merchant_data["network_id"]) | ||
| { id: merchant_data["network_id"], name: yp_merchant.name || merchant_data["name"].titleize } | ||
| else | ||
| nil | ||
| end | ||
| end.select(&:present?) | ||
|
|
||
| settled_merchants.concat(pending_merchants) |
There was a problem hiding this comment.
I feel like this should belong in the model
sampoder
reviewed
Aug 20, 2025
| ActiveRecord::Base.sanitize_sql_array(["and raw_stripe_transactions.stripe_transaction->'merchant_data'->>'network_id' = ?", @merchant]) | ||
| end | ||
|
|
||
| def stripe_joins_for(type) |
There was a problem hiding this comment.
thank you! I like this naming scheme
sampoder
reviewed
Aug 20, 2025
sampoder
reviewed
Aug 20, 2025
I think we should cut this copy - it feels very long and clogs up the UI |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary of the problem
It'd be useful to be able to filter by merchant for card transactions on the ledger!
Closes #11330
Describe your changes
Modifies both
TransactionGroupingEngine::Transaction::AllandPendingTransactionEngine::PendingTransaction::Allto accept themerchantsfilter, which is applied using SQL.Merchants for the current event are loaded lazily with a Turbo frame since some events have very large lists of merchants that they've used.