Skip to content

Default invoice notes #603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tomas-goncalves wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Default invoice notes #603

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a22a63
Feat: Invoice Labor notes default
tomas-goncalves Sep 23, 2025
94df67b
Make sure this only happens with quotes
tomas-goncalves Sep 23, 2025
9a20258
improve functions names and parameters
tomas-goncalves Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions app/models/invoice_line.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,16 @@ def <=> (il)
return -1 if Invoice_Categories.find_index(il.category).nil?
return Invoice_Categories.find_index(category) <=> Invoice_Categories.find_index(il.category)
end

def get_notes_with_defaults(status)
Comment thread
tomas-goncalves marked this conversation as resolved.
Outdated
Comment thread
tomas-goncalves marked this conversation as resolved.
Outdated
if not self.notes.empty?
self.notes
else
if category == "Labor" and status == "Quote"
"Labor hours are estimates; Actual hours will be billed."
else
nil
end
end
end
end
4 changes: 2 additions & 2 deletions app/views/invoices/prettyView.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,10 @@
<td><%=line.category %></td>
<td>
<%=line.memo %>
<% if line.notes.to_s.length > 0 then %>
<% if line.get_notes_with_defaults(@invoice.status).to_s.length > 0 then %>
<br>
<div class="pdf-line-notes">
<%= simple_format line.notes %>
<%= simple_format line.get_notes_with_defaults(@invoice.status) %>
</div>
<% end %>
</td>
Expand Down
4 changes: 2 additions & 2 deletions app/views/invoices/show.html.erb
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
<td><%= line.category %></td>
<td>
<%= line.memo %>
<% if line.notes and not line.notes.empty? %>
<%= simple_format line.notes %>
<% if line.get_notes_with_defaults(@invoice.status) and not line.get_notes_with_defaults(@invoice.status).empty? %>
<%= simple_format line.get_notes_with_defaults(@invoice.status) %>
<% end %>
</td>
<% if can? :readprice, @invoice %>
Expand Down