effective_qb_online 0.8.5 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00ddf30ebad25aed4701012dc46d99f3b058b0923667d92f2133e388f37d91f9
-  data.tar.gz: 1e1f8ee36db0242718778a44380dcb96f39dd388d74b77aec23288ef0423c876
+  metadata.gz: 53c398fd9e21d6dcb8c277ad502a76da91dabc6df2ee6b0a38c1322b3403e507
+  data.tar.gz: 50db2f4854ca87c45e1f035285345b0888fe0257e6fdee1ef8d3bd245262bf4a
 SHA512:
-  metadata.gz: d152cbc83ed643d51f03d01a43deb684cb0fecc07ce9519a3ceb7254868986b9ccef55fd6aaf389092d7256b83718edb613a252abe013c3c39dd59e560e09291
-  data.tar.gz: 28b6f1227299d67063c0d5a1a28fbf4345a7e017378e17dd49c7f04287224c9504e2f2b4f4a3d6526dd92b7e6f6970367b5b056008f8ba51790ac0705e6648a7
+  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/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/lib/effective_qb_online/version.rb

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

metadata

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