2026.3.7

app/models/customer.rb

@@ -19,6 +19,7 @@ class Customer < QboBaseModel
   validates_presence_of :name
   before_validation :normalize_phone_numbers
   self.primary_key = :id
+  qbo_sync push: true
   
   acts_as_searchable columns: %w[name phone_number mobile_phone_number ],
                      scope: ->(_context) { left_joins(:project) },

app/models/employee.rb

@@ -13,5 +13,6 @@ class Employee < QboBaseModel
   has_many :users
   validates_presence_of :id, :name
   self.primary_key = :id
+  qbo_sync push: false
   
 end

app/models/estimate.rb

@@ -14,6 +14,7 @@ class Estimate < QboBaseModel
   belongs_to :customer 
   validates_presence_of :doc_number, :id
   self.primary_key = :id
+  qbo_sync push: false
 
   # returns a human readable string
   def to_s

app/models/invoice.rb

@@ -15,6 +15,7 @@ class Invoice < QboBaseModel
   validates :id, presence: true, uniqueness: true
   validates :doc_number, :txn_date, presence: true
   self.primary_key = :id
+  qbo_sync push: false
 
   # Return the invoice's document number as its string representation
   def to_s

app/models/qbo_base_model.rb

@@ -14,6 +14,10 @@ class QboBaseModel < ActiveRecord::Base
 
   self.abstract_class = true
   validates_presence_of :id
+  class_attribute :qbo_push_enabled, default: true
+  attr_accessor :skip_qbo_push
+  before_validation :push_to_qbo, on: :create, if: :push_to_qbo?
+  after_commit :push_to_qbo, on: :update, if: :push_to_qbo?
 
   # Returns the details of the entity. 
   # If the details have already been fetched, it returns the cached version. 
@@ -24,8 +28,7 @@ class QboBaseModel < ActiveRecord::Base
       xml = Rails.cache.fetch(details_cache_key, expires_in: 10.minutes) do
         fetch_details.to_xml_ns
       end
-      model_class = "Quickbooks::Model::#{model_name.name}".constantize
-      model_class.from_xml(xml)
+      qbo_model_class.from_xml(xml)
     end
   end
 
@@ -34,7 +37,6 @@ class QboBaseModel < ActiveRecord::Base
     "#{model_name.name}:#{id}:qbo_details:#{updated_at.to_i}"
   end
 
-
   # Returns the last sync time formatted for display. 
   # If no sync has occurred, returns a default message.
   def self.last_sync
@@ -45,8 +47,7 @@ class QboBaseModel < ActiveRecord::Base
   # Magic Method
   # Maps Get/Set methods to QBO entity object
   def method_missing(method_name, *args, &block)
-    model_class = "Quickbooks::Model::#{model_name.name}".constantize
-    if model_class.method_defined?(method_name)
+    if qbo_model_class.method_defined?(method_name)
       details
       @details.public_send(method_name, *args, &block)
     else
@@ -54,11 +55,17 @@ class QboBaseModel < ActiveRecord::Base
     end
   end
 
-  # Repsonds to missing methods by delegating to the QBO customer details object if the method is defined there.
+  def push_to_qbo?
+    log "qbo_push_enabled #{self.class.qbo_push_enabled}"
+    log "skip_qbo_push #{skip_qbo_push}"
+
+    self.class.qbo_push_enabled && skip_qbo_push != true
+  end
+
+  # Repsonds to missing methods by delegating to the QBO entity calss if the method is defined there.
   # This allows for dynamic access to any attributes or methods of the QBO customer without having to explicitly define them in the Subclass model, providing flexibility and reducing boilerplate code.
   def respond_to_missing?(method_name, include_private = false)
-    model_class = "Quickbooks::Model::#{model_name.name}".constantize
-    model_class.method_defined?(method_name) || super
+    qbo_model_class.method_defined?(method_name) || super
   end
 
   # Sync all entities, typically triggered by a scheduled task or manual sync request
@@ -73,21 +80,19 @@ class QboBaseModel < ActiveRecord::Base
     job.perform_later(id: id)
   end
 
-  # Push the updates
-  def save_with_push
-    log "Starting push for #{model_name.name} ##{self.id}..."
-    qbo = QboConnectionService.current!
-    service = "#{model_name.name}Service".constantize
-    service.new(qbo: qbo, remote: self).push()
-    Rails.cache.delete(details_cache_key)
-    save_without_push
+  # Flag used to update local without pushing to QBO.
+  # This is used to prevent loops with the webhook
+  def skip_qbo_push?
+     !!skip_qbo_push
   end
 
-   alias_method :save_without_push, :save
-   alias_method :save, :save_with_push
+  def self.qbo_sync(push: true)
+    self.qbo_push_enabled = push
+  end
 
   private
   
+  # Log messages with a standarized prefix
   def log(msg)
     Rails.logger.info "[#{model_name.name}] #{msg}"
   end
@@ -96,8 +101,26 @@ class QboBaseModel < ActiveRecord::Base
   def fetch_details
     log "Fetching details for #{model_name.name} ##{id} from QBO..."
     qbo = QboConnectionService.current!
-    service_class = "#{model_name.name}Service".constantize
-    service_class.new(qbo: qbo, remote: self).pull()
+    service_class.new(qbo: qbo, local: self).pull()
+  end
+
+  # Pushs the entity's details from QuickBooks Online.
+  def push_to_qbo
+    log "Starting push for #{model_name.name} ##{id}..."
+    qbo = QboConnectionService.current!
+    reslut = service_class.new(qbo: qbo, local: self).push
+    Rails.cache.delete(details_cache_key)
+    return reslut
+  end
+
+  # Dynamically get the Quickbooks Model Class
+  def qbo_model_class
+    @qbo_model_class ||= "Quickbooks::Model::#{model_name.name}".constantize
+  end
+
+  # Dynamically get the Service Class
+  def service_class
+    @service_class ||= "#{model_name.name}Service".constantize
   end
 
 end

app/services/customer_sync_service.rb

@@ -17,16 +17,13 @@ class CustomerSyncService < SyncServiceBase
     Customer
   end
 
-  # Determine if the remote entity should be deleted locally (e.g. if it's marked inactive in QBO)
-  def destroy_remote?(remote)
+  # Determine if the local entity should be deleted (e.g. if it's marked inactive in QBO)
+  def destroy_local?(remote)
     !remote.active?
   end
 
-  # Map relevant attributes from the QBO Customer to the local Customer model
-  def process_attributes(local, remote)
-    local.name = remote.display_name
-    local.phone_number = remote.primary_phone&.free_form_number&.gsub(/\D/, '')
-    local.mobile_phone_number = remote.mobile_phone&.free_form_number&.gsub(/\D/, '')
-  end
+  map_attribute :name, :display_name
+  map_phone :phone_number, :primary_phone
+  map_phone :mobile_phone_number, :mobile_phone
 
 end

app/services/employee_sync_service.rb

@@ -17,14 +17,11 @@ class EmployeeSyncService < SyncServiceBase
     Employee
   end
 
-  # Determine if the remote entity should be deleted locally (e.g. if it's marked inactive in QBO)
-  def destroy_remote?(remote)
+  # Determine if the local entity should be deleted (e.g. if it's marked inactive in QBO)
+  def destroy_local?(remote)
     !remote.active?
   end
 
-  # Map relevant attributes from the QBO Employee to the local Employee model
-  def process_attributes(local, remote)
-    local.name = remote.display_name
-  end
+  map_attribute :name, ->(remote) { remote.display_name }
 
 end

app/services/estimate_sync_service.rb

@@ -17,11 +17,7 @@ class EstimateSyncService < SyncServiceBase
     Estimate
   end
 
-  # Map relevant attributes from the QBO Estimate to the local Estimate model
-  def process_attributes(local, remote)
-    local.doc_number = remote.doc_number
-    local.txn_date = remote.txn_date
-    local.customer = Customer.find_by(id: remote.customer_ref&.value)
-  end
+  map_attributes :doc_number, :txn_date
+  map_belongs_to :customer
 
 end

app/services/invoice_sync_service.rb

@@ -17,19 +17,14 @@ class InvoiceSyncService < SyncServiceBase
     Invoice
   end
 
-  # Map relevant attributes from the QBO Invoice to the local Invoice model
-  def process_attributes(local, remote)
-    local.doc_number      = remote.doc_number
-    local.txn_date        = remote.txn_date
-    local.due_date        = remote.due_date
-    local.total_amount    = remote.total
-    local.balance         = remote.balance
-    local.qbo_updated_at  = remote.meta_data&.last_updated_time
-    local.customer = Customer.find_by(id: remote.customer_ref&.value)
-  end
-
   # Attach QBO Invoices to the local Issues
   def attach_documents(local, remote)
     InvoiceAttachmentService.new(local, remote).attach
   end
+
+  map_attributes :balance, :doc_number, :due_date, :txn_date
+  map_attribute :total_amount, :total
+  map_attribute :qbo_updated_at, "meta_data.last_updated_time"
+  map_belongs_to :customer
+
 end

app/services/service_base.rb

@@ -10,22 +10,17 @@
 
 class ServiceBase
 
-  # Subclasses should Initializes the service with a QBO client and an optional remote record. 
+  # Subclasses should Initializes the service with a QBO client and a local record. 
   # The QBO client is used to communicate with QuickBooks Online, while the local record contains the data that needs to be pushed to QBO. 
-  # If no remote is provided, the service will not perform any operations.
-  def initialize(qbo:, remote: nil)
+  # If no local is provided, the service will not perform any operations.
+  def initialize(qbo:, local: nil)
+    @entity = local.class.name
     raise "No QBO configuration found" unless qbo
-    raise "#{@entity} record is required for push operation" unless remote
+    raise "#{@entity} record is required for push operation" unless local
     @qbo = qbo
-    @entity = remote.class.name
-    @remote = remote
+    @local = local
   end
 
-  # # Subclasses must implement this to specify which local model they sync (e.g. Customer, Invoice)
-  # def self.model_class
-  #   raise NotImplementedError
-  # end
-
   # Subclasses must implement this to build a new QBO entity if a remote is not found
   def build_qbo_remote
     raise NotImplementedError
@@ -33,50 +28,55 @@ class ServiceBase
 
   # Pulls the Item data from QuickBooks Online. 
   def pull
-    return build_qbo_remote unless @remote.present?
-    return build_qbo_remote unless @remote.id
-    log "Fetching details for #{@entity} ##{@remote.id} from QBO..."
-    qbo = QboConnectionService.current!
-    qbo.perform_authenticated_request do |access_token|
-      service_class = "Quickbooks::Service::#{@entity}".constantize
-      service = service_class.new(
-        company_id: qbo.realm_id,
-        access_token: access_token
-      )
-      service.fetch_by_id(@remote.id)
+    return build_qbo_remote unless @local.present?
+    return build_qbo_remote unless @local.id
+    log "Fetching details for #{@entity} ##{@local.id} from QBO..."
+    with_qbo_service do |service|
+      service.fetch_by_id(@local.id)
     end
   rescue => e
-    log "Fetch failed for #{@remote.id}: #{e.message}"
+    log "Fetch failed for #{@local.id}: #{e.message}"
     build_qbo_remote
   end
 
-   # Pushes the Item data to QuickBooks Online. This method handles the communication with QBO, including authentication and error handling. It uses the QBO client to send the remote data and logs the process for monitoring and debugging purposes. If the push is successful, it returns the remote record; otherwise, it logs the error and returns false.
+   # Pushes the Item data to QuickBooks Online. 
+   # This method handles the communication with QBO, including authentication and error handling. 
+   # It uses the QBO client to send the remote data and logs the process for monitoring and debugging purposes. 
+   # If the push is successful, it returns the remote record; otherwise, it logs the error and returns false.
   def push
-    log "Pushing #{@entity} ##{@remote.id} to QBO..."
-
-    remote = @qbo.perform_authenticated_request do |access_token|
-      service_class = "Quickbooks::Service::#{@entity}".constantize
-      service = service_class.new( 
-        company_id: @qbo.realm_id, 
-        access_token: access_token 
-      )
-      if @remote.id.present?
-        service.update(@remote.details)
+    log "Pushing #{@entity} ##{@local.id} to QBO..."
+    remote = with_qbo_service do |service|
+      if @local.id.present?
+        log "Updating #{@entity}"
+        service.update(@local.details)
       else
-        service.create(@remote.details)
+        log "Creating #{@entity}"
+        service.create(@local.details)
       end
     end
-
-    @remote.id = remote.id unless @remote.persisted?
-    log "Push for remote ##{@remote.id} completed."
-    return @remote
+    @local.id = remote.id unless @local.persisted?
+    log "Push for remote ##{@local.id} completed."
+    @local
   end
 
   private 
 
+  # Performs authenticaed requests with QBO service
+  def with_qbo_service
+    @qbo.perform_authenticated_request do |access_token|
+      service = service_class.new( company_id: @qbo.realm_id, access_token: access_token )
+      yield service
+    end
+  end
+
   # Log messages with the entity type for better traceability
   def log(msg)
     Rails.logger.info "[#{@entity}Service] #{msg}"
   end
 
+  # Dynamically get the Quickbooks Service Class
+  def service_class
+    @service_class ||= "Quickbooks::Service::#{@entity}".constantize
+  end
+
 end

app/services/sync_service_base.rb

@@ -32,17 +32,11 @@ class SyncServiceBase
   # Sync all entities, or only those updated since the last sync
   def sync(full_sync: false)
     log "Starting #{full_sync ? 'full' : 'incremental'} #{@entity.name} sync with page size of: #{@page_size}"
-
-    @qbo.perform_authenticated_request do |access_token|
-      service_class = "Quickbooks::Service::#{@entity.name}".constantize
-      service = service_class.new(company_id: @qbo.realm_id, access_token: access_token)
-
+    with_qbo_service do |service|
       query = build_query(full_sync)  
-
       service.query_in_batches(query, per_page: @page_size) do |batch|
         entries = Array(batch)
         log "Processing batch of #{entries.size} #{@entity.name}"
-
         entries.each do |remote|
           persist(remote)
         end
@@ -55,11 +49,7 @@ class SyncServiceBase
   # Sync a single entity by its QBO ID (webhook usage)
   def sync_by_id(id)
     log "Syncing #{@entity.name} with ID #{id}"
-
-    @qbo.perform_authenticated_request do |access_token|
-      service_class = "Quickbooks::Service::#{@entity.name}".constantize
-      service = service_class.new(company_id: @qbo.realm_id, access_token: access_token)
-
+    with_qbo_service do |service|
       remote = service.fetch_by_id(id)
       persist(remote)
     end
@@ -67,6 +57,10 @@ class SyncServiceBase
 
   private
 
+  def attach_documents(local, remote)
+    # Override in subclasses if the entity has attachments (e.g. Invoice)
+  end
+
   # Builds a QBO query for retrieving entities
   def build_query(full_sync)
     if full_sync
@@ -82,13 +76,125 @@ class SyncServiceBase
     end
   end
 
-  def attach_documents(local, remote)
-    # Override in subclasses if the entity has attachments (e.g. Invoice)
+  # Determine if a remote entity should be deleted locally (e.g. if it's marked inactive in QBO)
+  def destroy_local?(remote)
+    false
   end
 
-  # Determine if a remote entity should be deleted locally (e.g. if it's marked inactive in QBO)
-  def destroy_remote?(remote)
-    false
+  def extract_value(remote, remote_attr)
+    case remote_attr
+    when Proc
+      remote_attr.call(remote)
+    else
+      remote.public_send(remote_attr)
+    end
+  end
+
+  # Attribute Mapping DSL
+  #
+  # This DSL defines how attributes from a QuickBooks Online (QBO) entity
+  # are mapped onto a local ActiveRecord model during synchronization.
+  #
+  # Each mapping registers a lambda in `attribute_map`. When a remote QBO
+  # object is processed, the lambda is executed to extract and transform
+  # the value that will be assigned to the local model attribute.
+  #
+  # The DSL supports several mapping patterns:
+  #
+  # 1. Direct attribute mapping (same name)
+  #
+  #      map_attribute :doc_number
+  #
+  #    Equivalent to:
+  #
+  #      local.doc_number = remote.doc_number
+  #
+  # 2. Renamed attribute mapping
+  #
+  #      map_attribute :total_amount, :total
+  #
+  #    Equivalent to:
+  #
+  #      local.total_amount = remote.total
+  #
+  # 3. Custom transformation logic
+  #
+  #      map_attribute :qbo_updated_at do |remote|
+  #        remote.meta_data&.last_updated_time
+  #      end
+  #
+  #    Useful for nested fields or computed values.
+  #
+  # 4. Bulk attribute mapping
+  #
+  #      map_attributes :doc_number, :txn_date, :due_date
+  #
+  #    Convenience helper that maps multiple attributes with identical names.
+  #
+  # 5. Foreign key / reference mapping
+  #
+  #      map_belongs_to :customer
+  #
+  #    Resolves a QBO reference object (e.g. `customer_ref.value`) and finds
+  #    the associated local ActiveRecord model.
+  #
+  # 6. Specialized helpers
+  #
+  #      map_phone :phone_number, :primary_phone
+  #
+  #    Extracts and normalizes phone numbers by stripping non-digit characters.
+  #
+  # Internally, the mappings are stored in `attribute_map` and executed by the
+  # SyncService during `process_attributes`, which iterates through each mapping
+  # and assigns the computed value to the local record.
+  #
+  # This design keeps synchronization services declarative, readable, and easy
+  # to extend while centralizing transformation logic in a single DSL.
+  class << self
+
+    def map_attributes(*attrs)
+      attrs.each do |attr|
+        map_attribute(attr)
+      end
+    end
+
+
+    def map_attribute(local_attr, remote_attr = nil, &block)
+      attribute_map[local_attr] =
+        if block_given?
+          block
+        elsif remote_attr
+          ->(remote) do
+            remote_attr.to_s.split('.').reduce(remote) do |obj, method|
+              obj&.public_send(method)
+            end
+          end
+        else
+          ->(remote) { remote.public_send(local_attr) }
+        end
+    end
+
+    def attribute_map
+      @attribute_map ||= {}
+    end
+
+    def map_belongs_to(local_attr, ref: nil, model: nil)
+      ref ||= "#{local_attr}_ref"
+      model ||= local_attr.to_s.classify.constantize
+
+      attribute_map[local_attr] = lambda do |remote|
+        ref_obj = remote.public_send(ref)
+        id = ref_obj&.value
+        id ? model.find_by(id: id) : nil
+      end
+    end
+
+    def map_phone(local_attr, remote_attr)
+      attribute_map[local_attr] = lambda do |remote|
+        phone = remote.public_send(remote_attr)
+        phone&.free_form_number&.gsub(/\D/, '')
+      end
+    end
   end
 
   # Log messages with the entity type for better traceability
@@ -100,7 +206,7 @@ class SyncServiceBase
   def persist(remote)
     local = @entity.find_or_initialize_by(id: remote.id)
     
-    if destroy_remote?(remote)
+    if destroy_local?(remote)
       if local.persisted?
         local.destroy
         log "Deleted #{@entity.name} #{remote.id}"
@@ -110,9 +216,11 @@ class SyncServiceBase
 
     process_attributes(local, remote)
     
-    if local.changed?
+    if local.new_record? || local.changed?
+      was_new = local.new_record?
+      local.skip_qbo_push = true
       local.save!
-      log "Updated #{@entity.name} #{remote.id}"
+      log "#{was_new ? 'Created' : 'Updated'} #{@entity.name} #{remote.id}"
       attach_documents(local, remote)
     end
 
@@ -120,8 +228,29 @@ class SyncServiceBase
     log "Failed to sync #{@entity.name} #{remote.id}: #{e.message}"
   end
 
-  # This method should be implemented in subclasses to map remote attributes to local model
+  # Maps remote attributes to local model
   def process_attributes(local, remote)
-    raise NotImplementedError, "Subclasses must implement process_attributes"
+    log "Processing #{@entity} ##{remote.id}"
+
+    self.class.attribute_map.each do |local_attr, mapper|
+      value = mapper.call(remote)
+
+      if local.public_send(local_attr) != value
+        local.public_send("#{local_attr}=", value)
+      end
+    end
+  end
+
+  # Dynamically get the Quickbooks Service Class
+  def service_class
+    @service_class ||= "Quickbooks::Service::#{@entity}".constantize
+  end
+
+  # Performs authenticaed requests with QBO service
+  def with_qbo_service
+    @qbo.perform_authenticated_request do |access_token|
+      service = service_class.new( company_id: @qbo.realm_id, access_token: access_token )
+      yield service
+    end
   end
 end

init.rb

@@ -14,7 +14,7 @@ Redmine::Plugin.register :redmine_qbo do
   name 'Redmine QBO plugin'
   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'
-  version '2026.3.6'
+  version '2026.3.7'
   url 'https://github.com/rickbarrette/redmine_qbo'
   author_url 'https://barrettefabrication.com'
   settings default: {empty: true}, partial: 'qbo/settings'