Added accounts to allow for assinging income account to items, and selecting default income account. Also added item type selection

2026-04-02 07:01:59 -04:00 · 2026-03-16 22:59:54 -04:00
parent 7088550184
commit f81fe0ef87
13 changed files with 283 additions and 70 deletions
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -0,0 +1,22 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class AccountsController < ApplicationController
+  
+  def index
+    @accounts = Account.where(classification: 'Revenue').order(:name)
+  end
+
+  def set_default
+    account = Account.find(params[:default_account_id])
+    account.update(default: true)
+    redirect_to accounts_path, notice: "Default account updated."
+  end
+end
--- a/app/controllers/items_controller.rb
+++ b/app/controllers/items_controller.rb
@@ -33,6 +33,19 @@ class ItemsController < ApplicationController
    else
      render :new
    end
+  rescue => e
+    log "Unexpected error creating item: #{e.message}"
+
+    # Regex now matches across line breaks
+    existing_id = e.message[/Duplicate Name Exists Error:[\s\S]*Id=(\d+)/, 1]&.to_i
+
+    if existing_id
+      flash[:error] = "Name already exists. Redirecting to existing item."
+      redirect_to item_path(existing_id)
+    else
+      flash[:error] = e.message
+      redirect_to new_item_path
+    end
  end

  def destroy
@@ -41,6 +54,10 @@ class ItemsController < ApplicationController
  end

  def edit
+  rescue => e
+    log "Failed to edit item"
+    flash[:error] = e.message
+    render_404
  end

   def index
@@ -71,9 +88,20 @@ class ItemsController < ApplicationController

  def find_item
    @item = Item.find(params[:id])
+  rescue => e
+    log "Failed to find item"
+    flash[:error] = e.message
+    render_404
  end

  def item_params
-    params.require(:item).permit(:name, :description, :sku, :unit_price, :active)
+    params.require(:item).permit(:name, :description, :sku, :unit_price, :active, :account_id, :type)
  end
+
+  private 
+
+  def log(msg)
+    Rails.logger.info "[ItemsController] #{msg}"
+  end
+
 end
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -0,0 +1,37 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class Account < QboBaseModel
+  has_many :items
+  validates_presence_of :id, :name
+  self.primary_key = :id
+  qbo_sync push: false
+  before_save :clear_other_defaults, if: :default?
+
+  # Returns the account marked as default
+  def self.get_default
+    find_by(default: true)
+  end
+
+  # Returns QBO Refrence object for the account
+  def ref
+    r = Quickbooks::Model::BaseReference.new
+    r.value = id
+    r.name = name
+    return r
+  end
+
+  private
+
+  def clear_other_defaults
+    Account.where.not(id: id).update_all(default: false)
+  end
+
+end
--- a/app/models/item.rb
+++ b/app/models/item.rb
@@ -10,12 +10,20 @@

 class Item < QboBaseModel
  belongs_to :issue
-
+  belongs_to :account
+  
  validates_presence_of :id, :description
  validates :unit_price, numericality: { greater_than_or_equal_to: 0 }
  self.primary_key = :id
+  self.inheritance_column = :_type_disabled
  qbo_sync push: true

+  # Updates Both local & remote DB account ref
+  def account_id=(id)
+    details.income_account_ref = Account.find(id).ref
+    super
+  end
+
  # Updates Both local & remote DB description
  def description=(s)
    details.description = s
@@ -34,6 +42,12 @@ class Item < QboBaseModel
    super
  end

+  # Updates Both local & remote DB type
+  def type=(s)
+    details.type = s.to_s
+    super
+  end
+
   # Updates Both local & remote DB price
  def unit_price=(s)
    details.unit_price = s
--- a/app/services/account_sync_service.rb
+++ b/app/services/account_sync_service.rb
@@ -0,0 +1,23 @@
+#The MIT License (MIT)
+#
+#Copyright (c) 2026 rick barrette
+#
+#Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+#The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class AccountSyncService < SyncServiceBase
+
+  private
+
+  # Specify the local model this service syncs
+  def self.model_class
+    Account
+  end
+
+  map_attribute :active, :active?
+  map_attributes :classification, :description, :id, :name
+  
+end
--- a/app/services/item_service.rb
+++ b/app/services/item_service.rb
@@ -14,23 +14,7 @@ class ItemService < ServiceBase

  def build_qbo_remote
    log "Building new QBO Item"
-    account = default_income_account
-    log "Account: #{account.id} - #{account.name}"
-    income = Quickbooks::Model::BaseReference.new
-    income.value = account.id
-    income.name  = account.name
-
-    Quickbooks::Model::Item.new(
-      type: Quickbooks::Model::Item::NON_INVENTORY_TYPE,
-      income_account_ref: income
-    )
-  end
-
-  def default_income_account
-    log "Looking up sales income account"
-    QboConnectionService.with_qbo_service(entity: Invoice) do |service|
-      service.query("SELECT * FROM Account WHERE AccountType='Income' AND Name LIKE '%Sales%'").first
-    end
+    Quickbooks::Model::Item.new(type: Account.get_default&.ref)
  end

 end
--- a/app/services/item_sync_service.rb
+++ b/app/services/item_sync_service.rb
@@ -23,6 +23,6 @@ class ItemSyncService < SyncServiceBase
  end

  map_attribute :active, :active?
-  map_attributes :description, :id, :name, :sku, :unit_price
+  map_attributes :description, :id, :name, :sku, :type, :unit_price
  
 end
--- a/app/views/accounts/index.html.erb
+++ b/app/views/accounts/index.html.erb
@@ -0,0 +1,39 @@
+<h1>Accounts</h1>
+
+<%= form_with url: set_default_accounts_path, method: :patch, local: true do %>
+  <table style="width:100%; border-collapse: collapse; margin-bottom: 1em;">
+    <thead style="background-color: #f2f2f2;">
+      <tr>
+        <th style="padding: 8px; border: 1px solid #ddd;">Default</th>
+        <th style="padding: 8px; border: 1px solid #ddd;">Name</th>
+        <th style="padding: 8px; border: 1px solid #ddd;">Description</th>
+        <th style="padding: 8px; border: 1px solid #ddd;">Classification</th>
+        <th style="padding: 8px; border: 1px solid #ddd;">Active</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% @accounts.each_with_index do |account, index| %>
+        <tr style="background-color: <%= index.even? ? '#ffffff' : '#f9f9f9' %>;">
+          <td style="text-align: center; border: 1px solid #ddd; padding: 8px;">
+            <%= radio_button_tag "default_account_id", account.id, account.default %>
+          </td>
+          <td style="border: 1px solid #ddd; padding: 8px;"><%= account.name %></td>
+          <td style="border: 1px solid #ddd; padding: 8px;"><%= account.description %></td>
+          <td style="border: 1px solid #ddd; padding: 8px;"><%= account.classification %></td>
+          <td style="text-align: center; border: 1px solid #ddd; padding: 8px;">
+            <%= account.active ? "Yes" : "No" %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+
+    <tfoot>
+      <tr>
+        <td colspan="5" style="padding: 8px; text-align: right;">
+          <%= submit_tag "Save Default Account", style: "padding: 6px 12px; font-weight: bold;" %>
+        </td>
+      </tr>
+    </tfoot>
+  </table>
+<% end %>
--- a/app/views/items/_form.html.erb
+++ b/app/views/items/_form.html.erb
@@ -1,8 +1,8 @@
 <%= form_with model: @item, local: true do |f| %>

  <% if @item.errors.any? %>
-    <div id="errorExplanation">
-      <h2><%= pluralize(@item.errors.count, "error") %></h2>
+    <div id="errorExplanation" style="border: 1px solid #f00; padding: 10px; background-color: #fee; margin-bottom: 1em;">
+      <h2 style="color: #900;"><%= pluralize(@item.errors.count, "error") %> prohibited this item from being saved:</h2>
      <ul>
        <% @item.errors.full_messages.each do |msg| %>
          <li><%= msg %></li>
@@ -11,33 +11,59 @@
    </div>
  <% end %>

-  <p>
-    <%= f.label :name %><br>
-    <%= f.text_field :name, required: true %>
-  </p>
+  <table style="width: 100%; border-collapse: collapse;">
+    <tbody>
+      <tr>
+        <td style="padding: 8px; vertical-align: top;"><%= f.label :name %></td>
+        <td style="padding: 8px;"><%= f.text_field :name, required: true, style: "width: 100%;" %></td>
+      </tr>

-  <p>
-    <%= f.label :sku %><br>
-    <%= f.text_field :sku %>
-  </p>
+      <tr>
+        <td style="padding: 8px; vertical-align: top;"><%= f.label :sku %></td>
+        <td style="padding: 8px;"><%= f.text_field :sku, style: "width: 100%;" %></td>
+      </tr>

-  <p>
-    <%= f.label :description %><br>
-    <%= f.text_area :description, rows: 3 %>
-  </p>
+      <tr>
+        <td style="padding: 8px; vertical-align: top;"><%= f.label :description %></td>
+        <td style="padding: 8px;"><%= f.text_area :description, rows: 3, style: "width: 100%;" %></td>
+      </tr>

-  <p>
-    <%= f.label :unit_price %><br>
-    <%= f.number_field :unit_price, step: 0.01 %>
-  </p>
+      <tr>
+        <td style="padding: 8px; vertical-align: top;"><%= f.label :unit_price %></td>
+        <td style="padding: 8px;"><%= f.number_field :unit_price, step: 0.01, style: "width: 100%;" %></td>
+      </tr>

-  <p>
-    <%= f.label :active %>
-    <%= f.check_box :active %>
-  </p>
+      <tr>
+        <td style="padding: 8px; vertical-align: top;"><%= f.label :account %></td>
+        <td style="padding: 8px;">
+          <%= f.collection_select :account_id,
+                Account.where(classification: 'Revenue').order(:name),
+                :id,
+                :name,
+                { selected: @item.account_id || Account.get_default&.id },
+                { include_blank: true, style: "width: 100%;" } %>
+        </td>
+      </tr>

-  <p>
-    <%= f.submit %>
+      <tr>
+        <td style="padding: 8px; vertical-align: top;"><%= f.label :type %></td>
+        <td style="padding: 8px;">
+          <%= f.select :type,
+                Quickbooks::Model::Item::ITEM_TYPES.map { |t| [t, t] },
+                { selected: @item.type || Quickbooks::Model::Item::NON_INVENTORY_TYPE },
+                { style: "width: 100%;" } %>
+        </td>
+      </tr>
+
+      <tr>
+        <td style="padding: 8px; vertical-align: middle;"><%= f.label :active %></td>
+        <td style="padding: 8px; vertical-align: middle;"><%= f.check_box :active %></td>
+      </tr>
+    </tbody>
+  </table>
+
+  <p style="text-align: right; margin-top: 1em;">
+    <%= f.submit "Save Item", style: "padding: 6px 12px; font-weight: bold;" %>
  </p>

 <% end %>
--- a/app/views/items/show.html.erb
+++ b/app/views/items/show.html.erb
@@ -1,26 +1,35 @@
-<h2><%= @item.name %></h2>
+<h2 style="margin-bottom: 1em; border-bottom: 2px solid #ccc; padding-bottom: 4px;"><%= @item.name %></h2>

-<p>
-  <strong>SKU:</strong>
-  <%= @item.sku %>
-</p>
+<table style="width: 100%; border-collapse: collapse; margin-bottom: 1.5em;">
+  <tbody>
+    <tr style="background-color: #f9f9f9;">
+      <td style="padding: 8px; font-weight: bold; width: 150px;">SKU:</td>
+      <td style="padding: 8px;"><%= @item.sku.presence || "-" %></td>
+    </tr>
+    <tr>
+      <td style="padding: 8px; font-weight: bold;">Description:</td>
+      <td style="padding: 8px;"><%= @item.description.presence || "-" %></td>
+    </tr>
+    <tr style="background-color: #f9f9f9;">
+      <td style="padding: 8px; font-weight: bold;">Unit Price:</td>
+      <td style="padding: 8px;"><%= number_to_currency(@item.unit_price) %></td>
+    </tr>
+    <tr>
+      <td style="padding: 8px; font-weight: bold;">Type:</td>
+      <td style="padding: 8px;"><%= @item.type.presence || "-" %></td>
+    </tr>
+    <tr style="background-color: #f9f9f9;">
+      <td style="padding: 8px; font-weight: bold;">Account:</td>
+      <td style="padding: 8px;"><%= @item.account&.name || "-" %></td>
+    </tr>
+    <tr>
+      <td style="padding: 8px; font-weight: bold;">Active:</td>
+      <td style="padding: 8px;"><%= @item.active ? "Yes" : "No" %></td>
+    </tr>
+  </tbody>
+</table>

-<p>
-  <strong>Description:</strong>
-  <%= @item.description %>
-</p>
-
-<p>
-  <strong>Unit Price:</strong>
-  <%= number_to_currency(@item.unit_price) %>
-</p>
-
-<p>
-  <strong>Active:</strong>
-  <%= @item.active ? "Yes" : "No" %>
-</p>
-
-<p>
-  <%= link_to "Edit", edit_item_path(@item), class: "icon icon-edit" %>
-  <%= link_to "Back", items_path %>
-</p>
+<div style="margin-top: 1em;">
+  <%= link_to "Edit", edit_item_path(@item), class: "btn btn-primary", style: "margin-right: 8px;" %>
+  <%= link_to "Back", items_path, class: "btn btn-secondary" %>
+</div>