Docker/Maybe
Docker/Maybe
1
0
Fork 0
mirror of https://github.com/maybe-finance/maybe.git synced 2025-07-25 08:09:38 +02:00
Code Issues Releases Activity Actions 2

Fix merchant editing (#2349)

Browse source
This commit is contained in:
Zach Gollwitzer 2025-06-09 10:50:56 -04:00 • committed by GitHub
parent 0063921de9
commit 9afc50a146
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 12 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/controllers/family_merchants_controller.rb
View file

@ -4,19 +4,19 @@ class FamilyMerchantsController < ApplicationController
def index
@breadcrumbs = [ [ "Home", root_path ], [ "Merchants", nil ] ]
@merchants = Current.family.merchants.alphabetically
@family_merchants = Current.family.merchants.alphabetically
render layout: "settings"
end
def new
@merchant = FamilyMerchant.new(family: Current.family)
@family_merchant = FamilyMerchant.new(family: Current.family)
end
def create
@merchant = FamilyMerchant.new(merchant_params.merge(family: Current.family))
@family_merchant = FamilyMerchant.new(merchant_params.merge(family: Current.family))
if @merchant.save
if @family_merchant.save
respond_to do |format|
format.html { redirect_to family_merchants_path, notice: t(".success") }
format.turbo_stream { render turbo_stream: turbo_stream.action(:redirect, family_merchants_path) }
@ -30,7 +30,7 @@ class FamilyMerchantsController < ApplicationController
end
def update
@merchant.update!(merchant_params)
@family_merchant.update!(merchant_params)
respond_to do |format|
format.html { redirect_to family_merchants_path, notice: t(".success") }
format.turbo_stream { render turbo_stream: turbo_stream.action(:redirect, family_merchants_path) }
@ -38,14 +38,13 @@ class FamilyMerchantsController < ApplicationController
end
def destroy
@merchant.destroy!
@family_merchant.destroy!
redirect_to family_merchants_path, notice: t(".success")
end
private
def set_merchant
@merchant = Current.family.merchants.find(params[:id])
@family_merchant = Current.family.merchants.find(params[:id])
end
def merchant_params