Compare commits

...

4 Commits

4 changed files with 71 additions and 28 deletions
@@ -1,8 +1,12 @@
<% if @issue.line_items.any? %> <% if @issue.line_items.any? || @issue.descendant_line_items_total > 0%>
<hr/> <hr/>
<div> <div>
<p><strong><%= t :label_line_items %></strong></p> <p><strong><%= t :label_line_items %></strong></p>
<% total = 0 %>
<% if @issue.line_items.any?%>
<table class="list line-items-table"> <table class="list line-items-table">
<thead> <thead>
<tr> <tr>
@@ -14,7 +18,6 @@
</thead> </thead>
<tbody> <tbody>
<% total = 0 %>
<% @issue.line_items.each do |item| %> <% @issue.line_items.each do |item| %>
<% line_total = item.quantity.to_f * item.unit_price.to_f %> <% line_total = item.quantity.to_f * item.unit_price.to_f %>
@@ -29,11 +32,26 @@
<% end %> <% end %>
</tbody> </tbody>
<% end %>
<tfoot> <tfoot>
<% if @issue.line_items.any?%>
<tr> <tr>
<td colspan="3" style="text-align:right;"><strong><%= t :label_total %></strong></td> <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> </tr>
<% end %>
<% if @issue.descendant_line_items_total > 0 %>
<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> </tfoot>
</table> </table>
</div> </div>
+1
View File
@@ -33,6 +33,7 @@ en:
label_no: "No" label_no: "No"
label_qty: "Quantity" label_qty: "Quantity"
label_remove: "Remove" label_remove: "Remove"
label_running_total: "Running Total"
label_sync_now_accounts: "Sync Accounts" label_sync_now_accounts: "Sync Accounts"
label_sync_now_items: "Sync Items" label_sync_now_items: "Sync Items"
label_type: "Type" label_type: "Type"
+1 -1
View File
@@ -14,7 +14,7 @@ Redmine::Plugin.register :redmine_qbo_lineitems do
name 'Redmine QBO Line Items plugin' name 'Redmine QBO Line Items plugin'
author 'Rick Barrette' 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' 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.4.0' version '2026.4.2'
url 'https://github.com/rickbarrette/redmine_qbo_lineitems' url 'https://github.com/rickbarrette/redmine_qbo_lineitems'
author_url 'https://barrettefabrication.com' author_url 'https://barrettefabrication.com'
requires_redmine version_or_higher: '6.1.0' requires_redmine version_or_higher: '6.1.0'
+24
View File
@@ -16,6 +16,30 @@ module LineItems
has_many :line_items, dependent: :destroy 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) def line_items_attributes=(attrs)
attrs = attrs.stringify_keys attrs = attrs.stringify_keys