effective_qb_online 0.8.2 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d74eeb04010b63b0d3b0976c78db7c0b13ba3ffc969fdfdf705cf3f9fed4933
-  data.tar.gz: 1ba505826f03c8bbb869f052a47e0949b272d88db2062db6fe696917529b06ae
+  metadata.gz: e4a6e26114f3805b82bdbcbc34318059adb74df98bb512ae0615e007afbd51ea
+  data.tar.gz: f53a3c1ce92f2c00173b9c6f546f73c857aee00727804cd58e92dcfef51b6f2f
 SHA512:
-  metadata.gz: 66e0323b49c7fb87b570486573b36f1201410e40f55f9958f74a7b87ff9126500c2afa5467383add5a227cb5d7a8040c5f2f03e348ab43fb34031e904190853d
-  data.tar.gz: 2488ffb00abdbddf95e94cc80dad7bb302ba0e1eef98cc581790abe87fc40b380681b90c65707c4491312571a7cf501084146ba3c09e3e3b1eab4ad181cfd0ee
+  metadata.gz: 87d0bebfa848203a06341107077234f66d1c3a54aa749c210c270770af4d42d2e66b258c181dc33cc142e3441e6fab7aab32c938317266f16f1725f8f95d84ee
+  data.tar.gz: 6470e477febff32df0df7a648df3521f6ea65f1433f244f99ce095a56c1f76f1e1d68ed58b2abd32ad8a3a00f98980cdeb8c459bf751359b1f50a307c111758f

data/app/models/effective/qb_api.rb

@@ -105,7 +105,25 @@ module Effective
       raise('expected an Effective::Order') unless order.kind_of?(Effective::Order)
 
       with_service('Customer') do |service|
-        service.find_by(:display_name, scrub(order.billing_name))&.first
+        util = Quickbooks::Util::QueryBuilder.new
+
+        # Find by display name
+        customer = service.find_by(:display_name, scrub(order.qb_online_customer_display_name))&.first
+
+        # Find by email
+        customer ||= if order.email.present?
+          email = util.clause("PrimaryEmailAddr", "LIKE", order.email)
+          service.query("SELECT * FROM Customer WHERE #{email}")&.first
+        end
+
+        # Find by first name and last name
+        customer ||= if order.billing_first_name.present? && order.billing_last_name.present?
+          first_name = util.clause("GivenName", "LIKE", order.billing_first_name)
+          last_name = util.clause("FamilyName", "LIKE", order.billing_last_name)
+          service.query("SELECT * FROM Customer WHERE #{first_name} AND #{last_name}")&.first
+        end
+
+        customer
       end
     end
 
@@ -116,7 +134,7 @@ module Effective
       with_service('Customer') do |service|
         customer = Quickbooks::Model::Customer.new(
           primary_email_address: Quickbooks::Model::EmailAddress.new(order.email),
-          display_name: scrub(order.billing_name)
+          display_name: scrub(order.qb_online_customer_display_name)
         )
 
         service.create(customer)

data/app/models/effective/qb_receipt.rb

@@ -67,8 +67,16 @@ module Effective
         sales_receipt = api.create_sales_receipt(sales_receipt: sales_receipt)
 
         # Sanity check
-        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")
+        if EffectiveOrders.try(:credit_card_surcharge_qb_item_name).present?
+          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).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")
+          end
         end
 
         assign_attributes(result: 'completed successfully', sales_receipt_id: sales_receipt.id)

data/lib/effective_qb_online/version.rb

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

metadata

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