effective_qb_online 0.9.8 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c795cfdd9e5caa950820b5e5dc0757ee4b3fe583dd635baed5bcf37b08271206
-  data.tar.gz: 8ad4fec36e7d4fd79ff82036030f95c43cf5ef7ba0e776fa27a9780155bbae4c
+  metadata.gz: e6a3e221e9f86bab6fec4bbdf698d486a12924850960c797e897a79a9dde137e
+  data.tar.gz: eceb1df9ab98fd686e43e23572ef6be5ace97720bddaf35df4878dee8c5fafbe
 SHA512:
-  metadata.gz: a4b15a1601cc2cf2e7dc9de3ea14b8f8402aefa0ac0eb755a270ab0796c5860dbefc249559fc3ec968196049776e57869e38dde5983541dcf025a60237affbe4
-  data.tar.gz: 5415027204b5a1deb9d3d0ce48ec2601da0d4ed2e928f39d421079389def6d72a87bfb3cdd1862c368fcf128d4cc0b5003bd74f4433698d77d4d7bbdb97941f2
+  metadata.gz: 481a68ddeda1c7dd2fc07f6c5a44758df77f7bed84a84313f8f33850c3b061a59444c5f3f9654e35f114677752e12b750909f0fb45e5298a8d6a7282e59a19ab
+  data.tar.gz: 6840d8757d7d237283957334a868f447348395972f42e09c036bd6b6f16ac6e7baf5b84dea43419d9653e2e9968527c8dfba2a10424ee4d41f87978c1800fa2c

data/app/models/effective/qb_receipt.rb

@@ -66,6 +66,12 @@ module Effective
         sales_receipt = Effective::QbSalesReceipt.build_from_receipt!(self, api: api)
         sales_receipt = api.create_sales_receipt(sales_receipt: sales_receipt)
 
+        # The SalesReceipt now exists in QuickBooks. Persist its id immediately so a
+        # later failure (e.g. the total sanity checks below) doesn't orphan it. Without
+        # this, a re-sync would try to create it again and QuickBooks rejects the
+        # reused DocNumber with a Duplicate Document Number Error.
+        update_column(:sales_receipt_id, sales_receipt.id)
+
         # Sanity check
         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

data/app/models/effective/qb_sales_receipt.rb

@@ -38,8 +38,11 @@ module Effective
       end
 
       receipt.qb_receipt_items.each do |receipt_item|
+        # The purchasable may have been deleted. When it's missing we can't auto-match
+        # the QuickBooks item from its qb_item_id/qb_item_name, so we fall back to the
+        # QbReceiptItem's item_id (mapped manually in the admin). The SalesReceipt line
+        # items are built from the OrderItem, so a missing purchasable is not fatal.
         purchasable = receipt_item.order_item.purchasable
-        raise("Expected a purchasable for Effective::OrderItem #{receipt_item.order_item.id}") unless purchasable.present?
 
         # Either of these could match
         purchasable_id_name = [
@@ -59,7 +62,7 @@ module Effective
 
         if item.blank?
           purchasable_id_name = [purchasable.try(:qb_item_id), purchasable.try(:qb_item_name)].compact
-          raise("Unknown Item #{purchasable_id_name.join(' or ')} from #{purchasable} (#{purchasable.class.name} ##{purchasable.id})")
+          raise("Unknown Item #{purchasable_id_name.join(' or ')} from #{purchasable} (#{purchasable.class.name} ##{purchasable&.id})")
         end
 
         receipt_item.update!(item_id: item.id)
@@ -100,7 +103,7 @@ module Effective
 
       receipt.qb_receipt_items.each do |receipt_item|
         order_item = receipt_item.order_item
-        line_item = Quickbooks::Model::Line.new(amount: api.price_to_amount(order_item.subtotal), description: order_item.name)
+        line_item = Quickbooks::Model::Line.new(amount: api.price_to_amount(order_item.subtotal), description: strip_html(order_item.name))
 
         line_item.sales_item! do |line|
           line.item_id = receipt_item.item_id
@@ -161,5 +164,15 @@ module Effective
       value.to_s.downcase.strip
     end
 
+    # Order item names may contain HTML (e.g. an EventRegistrant's "Member" badge).
+    # QuickBooks line item descriptions are plain text, so strip the markup while keeping
+    # the badge text. Convert line breaks to spaces first so adjacent text doesn't run together.
+    def self.strip_html(value)
+      return value if value.blank?
+
+      text = value.to_s.gsub(/<br\s*\/?>/i, ' ')
+      ActionView::Base.full_sanitizer.sanitize(text).squish
+    end
+
   end
 end

data/app/views/admin/qb_receipts/_form.html.haml

@@ -28,7 +28,7 @@
         = f.fields_for :qb_receipt_items do |fi|
           %tr
             %td= fi.object.order_item_id
-            %td= fi.object.order_item
+            %td= fi.object.order_item.to_s.html_safe
             %td
               - if fi.object.item_id.present?
                 - existing = items.find { |(name, id)| id == fi.object.item_id }&.first

data/app/views/effective/qb_online_mailer/sync_error.html.haml

@@ -12,7 +12,7 @@
   = @order.billing_name
 %p
   - @order.order_items.each do |oi|
-    = "#{oi.name} (#{oi.try(:qb_item_name)})"
+    = oi.to_s.html_safe
     %br
 
 %p

data/lib/effective_qb_online/version.rb

@@ -1,3 +1,3 @@
 module EffectiveQbOnline
-  VERSION = '0.9.8'.freeze
+  VERSION = '0.9.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_qb_online
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-12 00:00:00.000000000 Z
+date: 2026-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails