effective_qb_sync 1.3.8 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d57feb13b269e62b4c7756a455c73cd20d9f5ae9dd7086d4ee24be3c9bcda817
-  data.tar.gz: cd2daba55cd448f6b6c04c54f93bf17c5d143d1b30fbc3309825794ef48256f8
+  metadata.gz: 349c5cbc263f6553be07c308064427d01c9fd44f45e9e89b626852ff1daad271
+  data.tar.gz: 3d961d678553a5cea81250014b18256a10fee4334bd720a98b2ad3c2bcc85d1d
 SHA512:
-  metadata.gz: f357b73b508db96cce4dfdd29a925add3d9240ec531624a3d321b858e3e7f0b931d355ea301e5bb9bf453747c3d3d09bcb89c4c6f7fc157f8962718d88475a39
-  data.tar.gz: '03875a16f136ec46d7bbf469ebbbafae8c60107261a7c7881c79496b1550a049648af1133a87bc9e390b324622582022073bcb1c3336cd59bd20cac5bbec2541'
+  metadata.gz: ddc265acf4e19b8aeedc7fb6fe4a2d764e54c883818e5fc3e07ad08264bf874b387cd231a2e26c44533b38d3a1635a792964e6c90a6f33ec6c4c8d784772d0ed
+  data.tar.gz: 73a4419a4eea4ac12900d40e15869cad50ef8d5279d81a79dac1ffcb0958733804f02fec5773bc9a0889d60afe836deade1630e78ce8ef4dd9a0f7b7e9a00a82

data/app/models/effective/qb_request.rb

@@ -234,11 +234,24 @@ module Effective
               }
             end
 
-            if EffectiveQbSync.quickbooks_tax_name.present?
+            surcharge_name = EffectiveOrders.try(:credit_card_surcharge_qb_item_name)
+            tax_name = EffectiveQbSync.quickbooks_tax_name
+
+            if surcharge_name.present? && order.surcharge != 0
+              xml.SalesReceiptLineAdd {
+                xml.ItemRef { xml.FullName(surcharge_name) }
+                xml.Desc(surcharge_name)
+                xml.Amount(qb_amount(order.surcharge))
+              }
+            end
+
+            # This is manual tax mode. Add the Tax and Surcharge Tax as an item.
+            # When tax name is blank, this is handled automatically by QuickBooks
+            if tax_name.present? && (order.tax != 0 || order.try(:surcharge_tax).to_i != 0)
               xml.SalesReceiptLineAdd {
-                xml.ItemRef { xml.FullName(EffectiveQbSync.quickbooks_tax_name) }
-                xml.Desc(EffectiveQbSync.quickbooks_tax_name)
-                xml.Amount(qb_amount(order.tax))
+                xml.ItemRef { xml.FullName(tax_name) }
+                xml.Desc(tax_name)
+                xml.Amount(qb_amount(order.tax + order.try(:surcharge_tax).to_i))
               }
             end
           }

data/lib/effective_qb_sync/version.rb

@@ -1,3 +1,3 @@
 module EffectiveQbSync
-  VERSION = '1.3.8'.freeze
+  VERSION = '1.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_qb_sync
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.4.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails