effective_qb_online 0.8.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4a6e26114f3805b82bdbcbc34318059adb74df98bb512ae0615e007afbd51ea
-  data.tar.gz: f53a3c1ce92f2c00173b9c6f546f73c857aee00727804cd58e92dcfef51b6f2f
+  metadata.gz: 53c398fd9e21d6dcb8c277ad502a76da91dabc6df2ee6b0a38c1322b3403e507
+  data.tar.gz: 50db2f4854ca87c45e1f035285345b0888fe0257e6fdee1ef8d3bd245262bf4a
 SHA512:
-  metadata.gz: 87d0bebfa848203a06341107077234f66d1c3a54aa749c210c270770af4d42d2e66b258c181dc33cc142e3441e6fab7aab32c938317266f16f1725f8f95d84ee
-  data.tar.gz: 6470e477febff32df0df7a648df3521f6ea65f1433f244f99ce095a56c1f76f1e1d68ed58b2abd32ad8a3a00f98980cdeb8c459bf751359b1f50a307c111758f
+  metadata.gz: dd41e817c114d6604feaa1428b76e912b0ce314fc464dbd6fd696a45f70a256f29cfcbbf2fb0bec6c4df070c74e2eb0dbd599f20a6f0bf8b6aafc8ae3a6909b7
+  data.tar.gz: cb2aea9a98f24849cfad8e0b8f91c080ac4947fbbe351690571809ef005963ee01c826016cedb270647b27df8d402b8b0b8d8cd8f9c4ecc9e2cb038a49c8f7af

data/app/datatables/admin/effective_qb_receipts_datatable.rb

@@ -3,7 +3,6 @@ module Admin
     datatable do
       order :updated_at
 
-      col :updated_at, visible: false
       col :created_at, visible: false
       col :id, visible: false
 

data/app/mailers/effective/qb_online_mailer.rb

@@ -9,10 +9,12 @@ module Effective
       @order = resource.order
 
       to = EffectiveOrders.qb_online_sync_error_recipients.presence || EffectiveOrders.mailer_admin
+      cc = EffectiveQbOnline.sync_error_cc_recipients.presence
+
       subject = subject_for(__method__, "Quickbooks Sync Error - Order ##{@order.to_param}", resource, opts)
       headers = headers_for(resource, opts)
 
-      mail(to: to, subject: subject, **headers)
+      mail(to: to, cc: cc, subject: subject, **headers)
     end
 
   end

data/app/models/effective/qb_api.rb

@@ -36,7 +36,7 @@ module Effective
         line3: address.try(:address3),
         city: address.city,
         country: address.country,
-        country_sub_division_code: address.country_code,
+        country_sub_division_code: address.state_code,
         postal_code: address.postal_code
       )
     end
@@ -185,7 +185,7 @@ module Effective
         [rate.rate_value.to_s, code] if rate && (exempt.blank? || rate.rate_value.to_f > 0.0)
       end
 
-      (Array(exempt) + tax_codes.uniq { |key, _| key }.compact).to_h
+      (Array(exempt) + tax_codes.compact.uniq { |key, _| key }).to_h
     end
 
     def with_service(name, &block)

data/app/models/effective/qb_receipt.rb

@@ -67,12 +67,18 @@ module Effective
         sales_receipt = api.create_sales_receipt(sales_receipt: sales_receipt)
 
         # Sanity check
-        if EffectiveOrders.try(:credit_card_surcharge_qb_item_name).present?
+        if EffectiveOrders.try(:credit_card_surcharge_qb_item_name).present? && !EffectiveOrders.try(:fee_saver?)
           if (expected = api.price_to_amount(order.total)) != sales_receipt.total
             raise("A QuickBooks Online Sales Receipt has been created with an unexpected total. QuickBooks total is #{sales_receipt.total} but we expected #{expected}. Please adjust the Sales Receipt on QuickBooks")
           end
         end
 
+        if EffectiveOrders.try(:credit_card_surcharge_qb_item_name).present? && EffectiveOrders.try(:fee_saver?)
+          if (expected = api.price_to_amount(order.amount_owing) - order.surcharge.to_i) != sales_receipt.total
+            raise("A QuickBooks Online Sales Receipt has been created with an unexpected total. QuickBooks total is #{sales_receipt.total} but we expected #{expected}. Please adjust the Sales Receipt on QuickBooks")
+          end
+        end
+
         if EffectiveOrders.try(:credit_card_surcharge_qb_item_name).blank?
           if (expected = api.price_to_amount(order.amount_owing)) != sales_receipt.total
             raise("A QuickBooks Online Sales Receipt has been created with an unexpected total. QuickBooks total is #{sales_receipt.total} but we expected #{expected}. Please adjust the Sales Receipt on QuickBooks")

data/app/models/effective/qb_sales_receipt.rb

@@ -114,7 +114,7 @@ module Effective
       end
 
       # Add Credit Card Surcharge if we collect it ourselves. This does not add a Helcim Convenience Fee
-      if EffectiveOrders.try(:credit_card_surcharge_qb_item_name).present? && order.try(:surcharge).to_i != 0
+      if !EffectiveOrders.try(:fee_saver?) && EffectiveOrders.try(:credit_card_surcharge_qb_item_name).present? && order.try(:surcharge).to_i != 0
         raise("Expected a Credit Card Surcharge QuickBooks item to exist for Effective::Order #{order.id} with non-zero surcharge amount. Please check your configuration.") unless surcharge_item.present?
 
         line_item = Quickbooks::Model::Line.new(amount: api.price_to_amount(order.surcharge), description: 'Credit Card Surcharge')
@@ -130,6 +130,26 @@ module Effective
         sales_receipt.line_items << line_item
       end
 
+      # Add negative Convenience Fee line item when Helcim fee saver is enabled
+      # The payment processor adds the convenience fee, so we record a negative amount to offset it in QuickBooks
+      if EffectiveOrders.try(:fee_saver?) && EffectiveOrders.try(:credit_card_surcharge_qb_item_name).present? && order.try(:surcharge).to_i != 0
+        raise("Expected a Credit Card Surcharge QuickBooks item to exist for Effective::Order #{order.id} with non-zero surcharge amount. Please check your configuration.") unless surcharge_item.present?
+
+        amount = api.price_to_amount(order.surcharge * -1)
+
+        line_item = Quickbooks::Model::Line.new(amount: amount, description: 'Helcim Convenience Fee')
+
+        line_item.sales_item! do |line|
+          line.item_id = surcharge_item.id
+          line.tax_code_id = tax_exempt.id  # Convenience fee is not taxed
+
+          line.unit_price = amount
+          line.quantity = 1
+        end
+
+        sales_receipt.line_items << line_item
+      end
+
       # Double check
       raise("Invalid SalesReceipt generated for Effective::Order #{order.id}") unless sales_receipt.valid?
 
@@ -137,8 +157,6 @@ module Effective
       sales_receipt
     end
 
-    private
-
     def self.scrub(value)
       value.to_s.downcase.strip
     end

data/config/effective_qb_online.rb

@@ -12,6 +12,12 @@ EffectiveQbOnline.setup do |config|
   # https://github.com/ruckus/quickbooks-ruby
   Quickbooks.sandbox_mode = (ENV['QUICKBOOKS_ONLINE_SANDBOX'].to_s == 'true')
 
+  # Sync Error Email
+  # When a sync error occurs, an email is sent to the following addresses:
+  # EffectiveOrders.qb_online_sync_error_recipients or EffectiveOrders.mailer_admin
+  # You can also specify a list of additional recipients to be cc'd on the email by setting:
+  # config.sync_error_cc_recipients = ['"Errors" <errors@example.com>']
+
   # Mailer Settings
   # Please see config/initializers/effective_resources.rb for default effective_* gem mailer settings
   #

data/lib/effective_qb_online/version.rb

@@ -1,3 +1,3 @@
 module EffectiveQbOnline
-  VERSION = '0.8.4'.freeze
+  VERSION = '0.9.0'.freeze
 end

data/lib/effective_qb_online.rb

@@ -10,7 +10,7 @@ module EffectiveQbOnline
       :qb_realms_table_name, :qb_receipts_table_name, :qb_receipt_items_table_name,
       :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject,
       :oauth_client_id, :oauth_client_secret,
-      :layout
+      :layout, :sync_error_cc_recipients
     ]
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_qb_online
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-09 00:00:00.000000000 Z
+date: 2026-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails