Compare commits

...
10 Commits
10 changed files with 65 additions and 52 deletions
+2
View File
@@ -108,6 +108,8 @@ Available hooks:
|Type|Hook|Note |Type|Hook|Note
|--|--|--| |--|--|--|
View Hook|:customer_actions_top, { customer: @customer }| Used to add action links to customer view
View Hook|:customer_actions_bottom, { customer: @customer} | Used to add action links to customer view
View Hook|:pdf_left, { issue: issue } | Used to add text to left side of PDF View Hook|:pdf_left, { issue: issue } | Used to add text to left side of PDF
View Hook|:pdf_right, { issue: issue } | Used to add text to right side of PDF View Hook|:pdf_right, { issue: issue } | Used to add text to right side of PDF
View Hook|:show_customer_view_right, { customer: customer } | Used to show partials on right side of customer view View Hook|:show_customer_view_right, { customer: customer } | Used to show partials on right side of customer view
+6 -2
View File
@@ -20,6 +20,9 @@ class Customer < QboBaseModel
before_validation :normalize_phone_numbers before_validation :normalize_phone_numbers
self.primary_key = :id self.primary_key = :id
qbo_sync push: true qbo_sync push: true
# Normalize the local database column :name
normalizes :name, with: ->(name) { name.to_s.strip.titleize }
acts_as_searchable columns: %w[name phone_number mobile_phone_number ], acts_as_searchable columns: %w[name phone_number mobile_phone_number ],
scope: ->(_context) { left_joins(:project) }, scope: ->(_context) { left_joins(:project) },
@@ -61,8 +64,9 @@ class Customer < QboBaseModel
# Updates Both local DB name & QBO display_name # Updates Both local DB name & QBO display_name
def name=(s) def name=(s)
details.display_name = s super(s)
super # Write the normalized value from Active Record to QBO details
details.display_name = self.name
end end
# Normalizes phone numbers by removing non-digit characters. This method is called before validation to ensure that phone numbers are stored in a consistent format, which can help with searching and integration with external systems like QuickBooks Online. # Normalizes phone numbers by removing non-digit characters. This method is called before validation to ensure that phone numbers are stored in a consistent format, which can help with searching and integration with external systems like QuickBooks Online.
+1 -1
View File
@@ -10,7 +10,7 @@
class Estimate < QboBaseModel class Estimate < QboBaseModel
has_and_belongs_to_many :issues has_many :issues
belongs_to :customer belongs_to :customer
validates_presence_of :doc_number, :id validates_presence_of :doc_number, :id
self.primary_key = :id self.primary_key = :id
+13
View File
@@ -0,0 +1,13 @@
#The MIT License (MIT)
#
#Copyright (c) 2016 - 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 EstimateService < ServiceBase
end
+3 -4
View File
@@ -1,7 +1,4 @@
<%= link_to t(:label_appointment), "https://calendar.google.com/calendar/render?action=TEMPLATE&text=#{@customer.name}+-&details=#{ link_to t(:customer_details), "https://#{Setting.host_name}#{customer_path @customer.id}"}%0A#{@customer.primary_phone}%3Cbr/%3E+&dates=#{Time.now.strftime("%Y%m%d")}T090000/#{Time.now.strftime("%Y%m%d")}T170000", target: :_blank, id: :appointment_link %> <%= call_hook :customer_actions_top, { customer: @customer } %>
<br/>
<br/>
<%= link_to t(:label_create_estimate), "https://qbo.intuit.com/app/estimate?nameId=#{@customer.id}", target: :_blank %> <%= link_to t(:label_create_estimate), "https://qbo.intuit.com/app/estimate?nameId=#{@customer.id}", target: :_blank %>
@@ -13,4 +10,6 @@
<br/> <br/>
<br/> <br/>
<%= call_hook :customer_actions_bottom, { customer: @customer } %>
<%= button_to t(:label_edit_customer), edit_customer_path(@customer), method: :get%> <%= button_to t(:label_edit_customer), edit_customer_path(@customer), method: :get%>
+25 -29
View File
@@ -2,59 +2,55 @@
<tbody> <tbody>
<tr> <tr>
<th><%=t(:label_name)%></th> <th><%= t(:label_name) %></th>
<td><%= customer.name %></td> <td><%= customer.name %></td>
</tr> </tr>
<tr> <tr>
<th><%=t(:label_email)%></th> <th><%= t(:label_email) %></th>
<td><%= customer.email %></td> <td><%= customer.email %></td>
</tr> </tr>
<tr> <tr>
<th><%=t(:label_primary_phone)%></th> <th><%= t(:label_primary_phone) %></th>
<td><%= number_to_phone(customer&.primary_phone&.gsub(/[^\d]/, '').to_i, area_code: true) %></td> <td><%= number_to_phone(customer&.primary_phone&.gsub(/[^\d]/, '').to_i, area_code: true) %></td>
</tr> </tr>
<tr> <tr>
<th><%=t(:label_mobile_phone)%></th> <th><%= t(:label_mobile_phone) %></th>
<td><%= number_to_phone(customer&.mobile_phone&.gsub(/[^\d]/, '').to_i, area_code: true) %></td> <td><%= number_to_phone(customer&.mobile_phone&.gsub(/[^\d]/, '').to_i, area_code: true) %></td>
</tr> </tr>
<tr> <tr>
<th><%=t(:label_billing_address)%></th> <th><%= t(:label_billing_address) %></th>
<td><pre><%= @billing_address %></pre></td> <td><pre><%= @billing_address %></pre></td>
</tr>
<tr>
<th><%=t(:label_shipping_address)%></th>
<td><pre><%= @shipping_address %></pre></td>
</tr> </tr>
<tr> <tr>
<th><%=t(:label_account_balance)%></th> <th><%= t(:label_shipping_address) %></th>
<td>$<%= customer.balance %></td> <td><pre><%= @shipping_address %></pre></td>
</tr> </tr>
<tr> <tr>
<th colspan="2"><h4><%=t(:field_notes)%></hr></th> <th><%= t(:label_account_balance) %></th>
<td>$<%= customer.balance %></td>
</tr> </tr>
<% if customer.notes.present? %>
<tr>
<th colspan="2"><h4><%= t(:field_notes) %></h4></th>
</tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<pre id="note-display" style="text-align: left; white-space: pre-wrap; font-family: inherit;"> <div class="wiki">
<%= customer.notes %> <%= textilizable(customer, :notes) %>
</pre> </div>
</td> </td>
</tr> </tr>
<% end %>
<script>
const preElement = document.getElementById('note-display');
// This takes the text, trims the edges, and puts it back
preElement.textContent = preElement.textContent.trim();
</script>
</tbody> </tbody>
</table> </table>
<br/> <br/>
<br/> <br/>
+9 -12
View File
@@ -32,20 +32,17 @@
</div> </div>
</div> </div>
<div class="clearfix"> <div class="clearfix">
<%=t(:field_notes)%>: <%=t(:field_notes)%>:
<div class="input"> <div class="input">
<p> <p>
<%= content_tag :span, id: "issue_description_and_toolbar" do %> <%= f.text_area :notes,
<%= f.text_area :notes, rows: 8,
cols: 60, class: 'wiki-edit',
rows: 10, style: 'width: 95%;',
accesskey: accesskey(:edit), id: 'customer_appointment_description' %>
class: 'wiki-edit', <%= wikitoolbar_for 'customer_appointment_description' %>
no_label: true %> </p>
<% end %>
</p>
<%= wikitoolbar_for :issue_description %>
</div> </div>
</div> </div>
+2
View File
@@ -37,6 +37,7 @@ en:
label_create_payment: "Create Payment" label_create_payment: "Create Payment"
label_customer_count: "Customer Count" label_customer_count: "Customer Count"
label_customer_link_expires: "This customer link expires in" label_customer_link_expires: "This customer link expires in"
label_customer: "Customer"
label_customers: "Customers" label_customers: "Customers"
label_delete: "Delete" label_delete: "Delete"
label_deposit_into: "Deposit to Account" label_deposit_into: "Deposit to Account"
@@ -50,6 +51,7 @@ en:
label_error: "Error" label_error: "Error"
label_estimate_404: "Estimate not found" label_estimate_404: "Estimate not found"
label_estimate_count: "Estimate Count" label_estimate_count: "Estimate Count"
label_estimate: "Estimate"
label_estimates: "Estimates" label_estimates: "Estimates"
label_hours: "Hours" label_hours: "Hours"
label_invoice_404: "Invoice not found" label_invoice_404: "Invoice not found"
+1 -1
View File
@@ -14,7 +14,7 @@ Redmine::Plugin.register :redmine_qbo do
name 'Redmine QBO plugin' name 'Redmine QBO plugin'
author 'Rick Barrette' author 'Rick Barrette'
description 'A pluging for Redmine to connect with QuickBooks Online to create Time Activity Entries for billable hours logged when an Issue is closed' description 'A pluging for Redmine to connect with QuickBooks Online to create Time Activity Entries for billable hours logged when an Issue is closed'
version '2026.3.17' version '2026.8.1'
url 'https://github.com/rickbarrette/redmine_qbo' url 'https://github.com/rickbarrette/redmine_qbo'
author_url 'https://barrettefabrication.com' author_url 'https://barrettefabrication.com'
settings default: {empty: true}, partial: 'qbo/settings' settings default: {empty: true}, partial: 'qbo/settings'
+3 -3
View File
@@ -14,9 +14,9 @@ module RedmineQbo
extend ActiveSupport::Concern extend ActiveSupport::Concern
prepended do prepended do
belongs_to :customer, class_name: 'Customer', foreign_key: :customer_id, optional: true belongs_to :customer
belongs_to :customer_token, primary_key: :id, optional: true belongs_to :customer_token
belongs_to :estimate, primary_key: :id, optional: true belongs_to :estimate
has_and_belongs_to_many :invoices has_and_belongs_to_many :invoices
before_save :titlize_subject before_save :titlize_subject