effective_qb_online 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75771c9516b5fe376e0cdb1f577fd1ad18d0b01713d33d4c3ee8d4f9abdaa505
-  data.tar.gz: f5da5a644230433085f74d75570277a68e5b583f765d5874ceaebc78145c4e0a
+  metadata.gz: 0d74eeb04010b63b0d3b0976c78db7c0b13ba3ffc969fdfdf705cf3f9fed4933
+  data.tar.gz: 1ba505826f03c8bbb869f052a47e0949b272d88db2062db6fe696917529b06ae
 SHA512:
-  metadata.gz: 1abb41cb0fdc235b2c01c510f2b2d2a18cd53016616c941eb9e82881c0e9d11e6051aa443b07d62d682028e69552d0a32fc61e30994d5cd51d709832bde28264
-  data.tar.gz: 6154e81962928f2bde3d96fe229a2930ad063db1ddfa8cd5eb57d70a37715eff1607c2822f08afeae09aa0ea946e0b2ca1b1f1e6fb283fc66426ae891cec8479
+  metadata.gz: 66e0323b49c7fb87b570486573b36f1201410e40f55f9958f74a7b87ff9126500c2afa5467383add5a227cb5d7a8040c5f2f03e348ab43fb34031e904190853d
+  data.tar.gz: 2488ffb00abdbddf95e94cc80dad7bb302ba0e1eef98cc581790abe87fc40b380681b90c65707c4491312571a7cf501084146ba3c09e3e3b1eab4ad181cfd0ee

data/app/datatables/admin/effective_qb_receipts_datatable.rb

@@ -10,6 +10,7 @@ module Admin
       col :updated_at
 
       col :order, search: :string
+      col 'order.purchased_at'
 
       col :sales_receipt_id, label: 'QB Sales Receipt' do |receipt|
         if receipt.sales_receipt_id.present?
@@ -37,7 +38,7 @@ module Admin
     end
 
     collection do
-      Effective::QbReceipt.deep.all
+      Effective::QbReceipt.deep.all.joins(:order)
     end
 
     def api

data/app/models/effective/qb_sales_receipt.rb

@@ -24,6 +24,7 @@ module Effective
       items = api.items()
 
       # Credit card surcharge item
+      # Add Credit Card Surcharge if we collect it ourselves. This does not add a Helcim Convenience Fee
       surcharge_item = if EffectiveOrders.try(:credit_card_surcharge_qb_item_name).present?
         name = EffectiveOrders.credit_card_surcharge_qb_item_name
 
@@ -112,8 +113,8 @@ module Effective
         sales_receipt.line_items << line_item
       end
 
-      # Add Credit Card Surcharge
-      if order.try(:surcharge).to_i != 0
+      # 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
         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')

data/lib/effective_qb_online/version.rb

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

metadata

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