Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/events_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ def set_form_variables
@event.build_primary_asset if @event.primary_asset.blank?
@event.gallery_assets.build
@locations = Location.order(:city, :state)
@registration_forms = Form.standalone.where(role: [ nil, "", "registration" ]).order(:name)
@registration_forms = Form.standalone.where(role: "registration").order(:name)
@categories_grouped =
Category
.includes(:category_type)
Expand Down
5 changes: 3 additions & 2 deletions app/views/events/group_payments.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@
<div class="text-sm text-gray-900 w-28 shrink-0"><%= payment_method.presence || "—" %></div>
<div class="w-24 shrink-0">
<% if submission.payments.any? %>
<span class="inline-flex items-center gap-1 rounded-full bg-green-100 px-2.5 py-0.5 text-xs font-medium text-green-800">
<%= link_to payment_path(submission.payments.first),
class: "inline-flex items-center gap-1 rounded-full bg-green-100 px-2.5 py-0.5 text-xs font-medium text-green-800 hover:bg-green-200" do %>
<i class="fa-solid fa-circle-check text-green-500"></i> Paid
</span>
<% end %>
<% else %>
<span class="inline-flex items-center gap-1 rounded-full bg-amber-100 px-2.5 py-0.5 text-xs font-medium text-amber-800">
<i class="fa-solid fa-clock text-amber-500"></i> Pending
Expand Down
7 changes: 7 additions & 0 deletions db/migrate/20260608184843_add_metadata_to_payments.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
class AddMetadataToPayments < ActiveRecord::Migration[8.1]
def change
unless column_exists?(:payments, :metadata)
add_column :payments, :metadata, :json
end
end
end
2 changes: 1 addition & 1 deletion db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema[8.1].define(version: 2026_06_08_133158) do
ActiveRecord::Schema[8.1].define(version: 2026_06_08_184843) do
create_table "action_text_mentions", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
t.bigint "action_text_rich_text_id", null: false
t.datetime "created_at", null: false
Expand Down