mirror of
https://github.com/rickbarrette/redmine_qbo_lineitems.git
synced 2026-07-02 09:01:08 -04:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3ca45a457f | |||
| c9d2a47a92 | |||
| b939d834e9 | |||
| 9b9a5c3505 | |||
| da49b996da | |||
| 50a02cc497 |
@@ -100,8 +100,6 @@ class ItemsController < ApplicationController
|
||||
params.require(:item).permit(:name, :description, :sku, :unit_price, :active, :account_id, :type, :taxable)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def log(msg)
|
||||
Rails.logger.info "[ItemsController] #{msg}"
|
||||
end
|
||||
|
||||
@@ -32,8 +32,18 @@
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td colspan="3" style="text-align:right;"><strong><%= t :label_total %></strong></td>
|
||||
<td><strong><%= number_to_currency(total) %></strong></td>
|
||||
<td>
|
||||
<strong><%= number_to_currency(total) %></strong>
|
||||
</td>
|
||||
</tr>
|
||||
<% if @issue.children? %>
|
||||
<tr>
|
||||
<td colspan="3" style="text-align:right;"><strong><%= t :label_running_total %></strong></td>
|
||||
<td>
|
||||
<strong>(<%= number_to_currency(@issue.descendant_line_items_total + total) %>)</strong>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
@@ -33,6 +33,7 @@ en:
|
||||
label_no: "No"
|
||||
label_qty: "Quantity"
|
||||
label_remove: "Remove"
|
||||
label_running_total: "Running Total"
|
||||
label_sync_now_accounts: "Sync Accounts"
|
||||
label_sync_now_items: "Sync Items"
|
||||
label_type: "Type"
|
||||
|
||||
@@ -14,7 +14,7 @@ Redmine::Plugin.register :redmine_qbo_lineitems do
|
||||
name 'Redmine QBO Line Items plugin'
|
||||
author 'Rick Barrette'
|
||||
description 'A plugin for Redmine to extend the capabilitys of the Redmine QuickBooks Online plugin to attach billable line items to an isuue'
|
||||
version '2026.3.11'
|
||||
version '2026.4.1'
|
||||
url 'https://github.com/rickbarrette/redmine_qbo_lineitems'
|
||||
author_url 'https://barrettefabrication.com'
|
||||
requires_redmine version_or_higher: '6.1.0'
|
||||
|
||||
@@ -10,14 +10,65 @@
|
||||
|
||||
module LineItems
|
||||
module Patches
|
||||
module IssuePatch
|
||||
extend ActiveSupport::Concern
|
||||
module IssuePatch extend ActiveSupport::Concern
|
||||
|
||||
prepended do
|
||||
has_many :line_items, dependent: :destroy
|
||||
accepts_nested_attributes_for :line_items,
|
||||
allow_destroy: true,
|
||||
reject_if: proc { |attrs| attrs['description'].blank? }
|
||||
accepts_nested_attributes_for :line_items, allow_destroy: true, reject_if: proc { |attrs| attrs['description'].blank? }
|
||||
|
||||
# Returns line items for immediate children
|
||||
def children_line_items
|
||||
LineItem.where(issue_id: self.children.pluck(:id))
|
||||
end
|
||||
|
||||
# Calculates the total value of all child line items
|
||||
def children_line_items_total
|
||||
children_line_items.sum(:line_total)
|
||||
end
|
||||
|
||||
# Returns line items for the entire tree below this issue
|
||||
def descendant_line_items
|
||||
LineItem.where(issue_id: self.descendants.pluck(:id))
|
||||
end
|
||||
|
||||
# Calculates the total value of entire tree below this issue
|
||||
def descendant_line_items_total
|
||||
descendant_line_items.sum(:line_total)
|
||||
end
|
||||
|
||||
def line_items_total
|
||||
line_items.sum(:line_total)
|
||||
end
|
||||
|
||||
def line_items_attributes=(attrs)
|
||||
attrs = attrs.stringify_keys
|
||||
|
||||
# IDs submitted in the form
|
||||
submitted_ids = attrs.values.map { |a| a['id'] }.compact.map(&:to_s)
|
||||
|
||||
# Existing IDs in DB
|
||||
existing_ids = line_items.pluck(:id).map(&:to_s)
|
||||
|
||||
# Find missing ones (these would be implicitly deleted by Rails)
|
||||
missing_ids = existing_ids - submitted_ids
|
||||
|
||||
# Re-add missing records so Rails doesn't delete them
|
||||
missing_ids.each do |id|
|
||||
attrs["preserve_#{id}"] = { 'id' => id }
|
||||
end
|
||||
|
||||
# Only allow explicit deletes or valid updates/creates
|
||||
filtered = attrs.select do |_, item_attrs|
|
||||
item_attrs['_destroy'] == '1' ||
|
||||
item_attrs['id'].present? ||
|
||||
item_attrs['description'].present?
|
||||
end
|
||||
|
||||
super(filtered)
|
||||
rescue => e
|
||||
logger.error "Error processing line items attributes: #{e.message}"
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user