Multi-step account forms + clearer balance editing (#2427)

* Initial multi-step property form

* Improve form structure, add optional tooltip help icons to form fields

* Add basic inline alert component

* Clean up and improve property form lifecycle

* Implement Account status concept

* Lint fixes

* Remove whitespace

* Balance editing, scope updates for account

* Passing tests

* Fix brakeman warning

* Remove stale columns

* data constraint tweaks

* Redundant property

app/controllers/accountable_sparklines_controller.rb

@@ -32,7 +32,7 @@ class AccountableSparklinesController < ApplicationController
     end
 
     def account_ids
-      family.accounts.active.where(accountable_type: accountable.name).pluck(:id)
+      family.accounts.visible.where(accountable_type: accountable.name).pluck(:id)
     end
 
     def cache_key

app/controllers/accounts_controller.rb

@@ -1,5 +1,5 @@
 class AccountsController < ApplicationController
-  before_action :set_account, only: %i[sync chart sparkline]
+  before_action :set_account, only: %i[sync chart sparkline toggle_active]
   include Periodable
 
   def index
@@ -33,6 +33,15 @@ class AccountsController < ApplicationController
     end
   end
 
+  def toggle_active
+    if @account.active?
+      @account.disable!
+    elsif @account.disabled?
+      @account.enable!
+    end
+    redirect_to accounts_path
+  end
+
   private
     def family
       Current.family

app/controllers/api/v1/accounts_controller.rb

@@ -9,7 +9,7 @@ class Api::V1::AccountsController < Api::V1::BaseController
   def index
     # Test with Pagy pagination
     family = current_resource_owner.family
-    accounts_query = family.accounts.active.alphabetically
+    accounts_query = family.accounts.visible.alphabetically
 
     # Handle pagination with Pagy
     @pagy, @accounts = pagy(

app/controllers/api/v1/transactions_controller.rb

@@ -10,7 +10,7 @@ class Api::V1::TransactionsController < Api::V1::BaseController
 
   def index
     family = current_resource_owner.family
-    transactions_query = family.transactions.active
+    transactions_query = family.transactions.visible
 
     # Apply filters
     transactions_query = apply_filters(transactions_query)

app/controllers/concerns/accountable_resource.rb

@@ -43,9 +43,25 @@ module AccountableResource
   end
 
   def update
-    @account.update_with_sync!(account_params.except(:return_to))
-    @account.lock_saved_attributes!
+    # Handle balance update if provided
+    if account_params[:balance].present?
+      result = @account.update_balance(balance: account_params[:balance], currency: account_params[:currency])
+      unless result.success?
+        @error_message = result.error_message
+        render :edit, status: :unprocessable_entity
+        return
+      end
+    end
 
+    # Update remaining account attributes
+    update_params = account_params.except(:return_to, :balance, :currency)
+    unless @account.update(update_params)
+      @error_message = @account.errors.full_messages.join(", ")
+      render :edit, status: :unprocessable_entity
+      return
+    end
+
+    @account.lock_saved_attributes!
     redirect_back_or_to @account, notice: t("accounts.update.success", type: accountable_type.name.underscore.humanize)
   end
 
@@ -74,7 +90,7 @@ module AccountableResource
 
     def account_params
       params.require(:account).permit(
-        :name, :is_active, :balance, :subtype, :currency, :accountable_type, :return_to,
+        :name, :balance, :subtype, :currency, :accountable_type, :return_to,
         accountable_attributes: self.class.permitted_accountable_attributes
       )
     end

app/controllers/pages_controller.rb

@@ -5,7 +5,7 @@ class PagesController < ApplicationController
 
   def dashboard
     @balance_sheet = Current.family.balance_sheet
-    @accounts = Current.family.accounts.active.with_attached_logo
+    @accounts = Current.family.accounts.visible.with_attached_logo
 
     period_param = params[:cashflow_period]
     @cashflow_period = if period_param.present?

app/controllers/properties_controller.rb

@@ -1,21 +1,99 @@
 class PropertiesController < ApplicationController
-  include AccountableResource
+  include AccountableResource, StreamExtensions
 
-  permitted_accountable_attributes(
-    :id, :year_built, :area_unit, :area_value,
-    address_attributes: [ :line1, :line2, :locality, :region, :country, :postal_code ]
-  )
+  before_action :set_property, only: [ :balances, :address, :update_balances, :update_address ]
 
   def new
-    @account = Current.family.accounts.build(
-      currency: Current.family.currency,
-      accountable: Property.new(
-        address: Address.new
-      )
+    @account = Current.family.accounts.build(accountable: Property.new)
+  end
+
+  def create
+    @account = Current.family.accounts.create!(
+      property_params.merge(currency: Current.family.currency, balance: 0, status: "draft")
     )
+
+    redirect_to balances_property_path(@account)
+  end
+
+  def update
+    if @account.update(property_params)
+      @success_message = "Property details updated successfully."
+
+      if @account.active?
+        render :edit
+      else
+        redirect_to balances_property_path(@account)
+      end
+    else
+      @error_message = "Unable to update property details."
+      render :edit, status: :unprocessable_entity
+    end
   end
 
   def edit
-    @account.accountable.address ||= Address.new
   end
+
+  def balances
+  end
+
+  def update_balances
+    result = @account.update_balance(balance: balance_params[:balance], currency: balance_params[:currency])
+
+    if result.success?
+      @success_message = result.updated? ? "Balance updated successfully." : "No changes made. Account is already up to date."
+
+      if @account.active?
+        render :balances
+      else
+        redirect_to address_property_path(@account)
+      end
+    else
+      @error_message = result.error_message
+      render :balances, status: :unprocessable_entity
+    end
+  end
+
+  def address
+    @property = @account.property
+    @property.address ||= Address.new
+  end
+
+  def update_address
+    if @account.property.update(address_params)
+      if @account.draft?
+        @account.activate!
+
+        respond_to do |format|
+          format.html { redirect_to account_path(@account) }
+          format.turbo_stream { stream_redirect_to account_path(@account) }
+        end
+      else
+        @success_message = "Address updated successfully."
+        render :address
+      end
+    else
+      @error_message = "Unable to update address. Please check the required fields."
+      render :address, status: :unprocessable_entity
+    end
+  end
+
+  private
+    def balance_params
+      params.require(:account).permit(:balance, :currency)
+    end
+
+    def address_params
+      params.require(:property)
+            .permit(address_attributes: [ :line1, :line2, :locality, :region, :country, :postal_code ])
+    end
+
+    def property_params
+      params.require(:account)
+            .permit(:name, :subtype, :accountable_type, accountable_attributes: [ :id, :year_built, :area_unit, :area_value ])
+    end
+
+    def set_property
+      @account = Current.family.accounts.find(params[:id])
+      @property = @account.property
+    end
 end

app/controllers/transfer_matches_controller.rb

@@ -2,7 +2,7 @@ class TransferMatchesController < ApplicationController
   before_action :set_entry
 
   def new
-    @accounts = Current.family.accounts.alphabetically.where.not(id: @entry.account_id)
+    @accounts = Current.family.accounts.visible.alphabetically.where.not(id: @entry.account_id)
     @transfer_match_candidates = @entry.transaction.transfer_match_candidates
   end
 

app/controllers/valuations_controller.rb

@@ -1,30 +1,42 @@
 class ValuationsController < ApplicationController
-  include EntryableResource
+  include EntryableResource, StreamExtensions
 
   def create
     account = Current.family.accounts.find(params.dig(:entry, :account_id))
-    @entry = account.entries.new(entry_params.merge(entryable: Valuation.new))
 
-    if @entry.save
-      @entry.sync_account_later
+    result = account.update_balance(
+      balance: entry_params[:amount],
+      date: entry_params[:date],
+      currency: entry_params[:currency],
+      notes: entry_params[:notes]
+    )
 
-      flash[:notice] = "Balance created"
+    if result.success?
+      @success_message = result.updated? ? "Balance updated" : "No changes made. Account is already up to date."
 
       respond_to do |format|
-        format.html { redirect_back_or_to account_path(@entry.account) }
-        format.turbo_stream { stream_redirect_back_or_to(account_path(@entry.account)) }
+        format.html { redirect_back_or_to account_path(account), notice: @success_message }
+        format.turbo_stream { stream_redirect_back_or_to(account_path(account), notice: @success_message) }
       end
     else
+      @error_message = result.error_message
       render :new, status: :unprocessable_entity
     end
   end
 
   def update
-    if @entry.update(entry_params)
-      @entry.sync_account_later
+    result = @entry.account.update_balance(
+      date: @entry.date,
+      balance: entry_params[:amount],
+      currency: entry_params[:currency],
+      notes: entry_params[:notes]
+    )
+
+    if result.success?
+      @entry.reload
 
       respond_to do |format|
-        format.html { redirect_back_or_to account_path(@entry.account), notice: "Balance updated" }
+        format.html { redirect_back_or_to account_path(@entry.account), notice: result.updated? ? "Balance updated" : "No changes made. Account is already up to date." }
         format.turbo_stream do
           render turbo_stream: [
             turbo_stream.replace(
@@ -37,6 +49,7 @@ class ValuationsController < ApplicationController
         end
       end
     else
+      @error_message = result.error_message
       render :show, status: :unprocessable_entity
     end
   end
@@ -44,6 +57,6 @@ class ValuationsController < ApplicationController
   private
     def entry_params
       params.require(:entry)
-            .permit(:name, :date, :amount, :currency, :notes)
+            .permit(:date, :amount, :currency, :notes)
     end
 end