effective_qb_sync 1.3.8 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d57feb13b269e62b4c7756a455c73cd20d9f5ae9dd7086d4ee24be3c9bcda817
-  data.tar.gz: cd2daba55cd448f6b6c04c54f93bf17c5d143d1b30fbc3309825794ef48256f8
+  metadata.gz: e55d82b7d35e1ca6e2b388b26e81d411ce8dd9c159d124f6b7e6bcf4e51862b5
+  data.tar.gz: 2154ab9a976283f25e51d041893b70e5dae4fe231d88fa4499f72d8cf80a5274
 SHA512:
-  metadata.gz: f357b73b508db96cce4dfdd29a925add3d9240ec531624a3d321b858e3e7f0b931d355ea301e5bb9bf453747c3d3d09bcb89c4c6f7fc157f8962718d88475a39
-  data.tar.gz: '03875a16f136ec46d7bbf469ebbbafae8c60107261a7c7881c79496b1550a049648af1133a87bc9e390b324622582022073bcb1c3336cd59bd20cac5bbec2541'
+  metadata.gz: '09049ae10bf2573d8b9f0b2f078cd953fbaa402e13a93991a3b527ef740672d441a3e9e0c286b85abd216d6a82df423ce84d76ddc76e8a85aec13bcd0ab516ca'
+  data.tar.gz: 45fab0de80049b54ab0bf6f4f88341b66d3327de9256da51c9cfcbc68e57e0a5647aac71d597e917c3dcddea597a90aaae00f3cd37902c6273804d77c357f980

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2021 Code and Effect Inc.
+Copyright 2023 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

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/config/effective_qb_sync.rb

@@ -1,10 +1,4 @@
 EffectiveQbSync.setup do |config|
-  # Configure Database Tables
-  config.qb_requests_table_name = :qb_requests
-  config.qb_tickets_table_name = :qb_tickets
-  config.qb_logs_table_name = :qb_logs
-  config.qb_order_items_table_name = :qb_order_items
-
   # Layout Settings
   # config.layout = { admin: 'admin' }
 

data/db/migrate/{01_create_effective_qb_sync.rb.erb → 101_create_effective_qb_sync.rb}

@@ -1,6 +1,6 @@
-class CreateEffectiveQbSync < ActiveRecord::Migration[4.2]
-  def self.up
-    create_table <%= @qb_requests_table_name %> do |t|
+class CreateEffectiveQbSync < ActiveRecord::Migration[6.0]
+  def change
+    create_table :qb_requests do |t|
       t.integer   :order_id
       t.integer   :qb_ticket_id
 
@@ -16,9 +16,9 @@ class CreateEffectiveQbSync < ActiveRecord::Migration[4.2]
 
       t.timestamps
     end
-    add_index <%= @qb_requests_table_name %>, :order_id
+    add_index :qb_requests, :order_id
 
-    create_table <%= @qb_tickets_table_name %> do |t|
+    create_table :qb_tickets do |t|
       t.integer   :qb_request_id
 
       t.string    :username
@@ -37,32 +37,23 @@ class CreateEffectiveQbSync < ActiveRecord::Migration[4.2]
 
       t.timestamps
     end
-    add_index <%= @qb_tickets_table_name %>, :qb_request_id
+    add_index :qb_tickets, :qb_request_id
 
-    create_table <%= @qb_logs_table_name %> do |t|
+    create_table :qb_logs do |t|
       t.integer   :qb_ticket_id
-
       t.text      :message
 
       t.timestamps
     end
-    add_index <%= @qb_logs_table_name %>, :qb_ticket_id
+    add_index :qb_logs, :qb_ticket_id
 
-    create_table <%= @qb_order_items_table_name %> do |t|
+    create_table :qb_order_items do |t|
       t.integer    :order_item_id
-
       t.string     :name
 
       t.timestamps
     end
-    add_index <%= @qb_order_items_table_name %>, :order_item_id
-
-  end
+    add_index :qb_order_items, :order_item_id
 
-  def self.down
-    drop_table <%= @qb_requests_table_name %>
-    drop_table <%= @qb_tickets_table_name %>
-    drop_table <%= @qb_logs_table_name %>
-    drop_table <%= @qb_order_items_table_name %>
   end
 end

data/lib/effective_qb_sync/version.rb

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

data/lib/generators/effective_qb_sync/install_generator.rb

@@ -30,12 +30,7 @@ module EffectiveQbSync
       end
 
       def create_migration_file
-        @qb_requests_table_name = ':' + EffectiveQbSync.qb_requests_table_name.to_s
-        @qb_tickets_table_name = ':' + EffectiveQbSync.qb_tickets_table_name.to_s
-        @qb_logs_table_name = ':' + EffectiveQbSync.qb_logs_table_name.to_s
-        @qb_order_items_table_name = ':' + EffectiveQbSync.qb_order_items_table_name.to_s
-
-        migration_template ('../' * 3) + 'db/migrate/01_create_effective_qb_sync.rb.erb', 'db/migrate/create_effective_qb_sync.rb'
+        migration_template ('../' * 3) + 'db/migrate/101_create_effective_qb_sync.rb', 'db/migrate/create_effective_qb_sync.rb'
       end
 
     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.5.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2023-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -116,7 +116,7 @@ files:
 - app/views/effective/qb_web_connector/quickbooks.html.erb
 - config/effective_qb_sync.rb
 - config/routes.rb
-- db/migrate/01_create_effective_qb_sync.rb.erb
+- db/migrate/101_create_effective_qb_sync.rb
 - lib/effective_qb_sync.rb
 - lib/effective_qb_sync/engine.rb
 - lib/effective_qb_sync/version.rb
@@ -193,59 +193,59 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Synchronize EffectiveOrders with QuickBooks Web Connector.
 test_files:
-- spec/spec_helper.rb
+- spec/dummy/README.rdoc
+- spec/dummy/Rakefile
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/product.rb
 - spec/dummy/app/models/product_with_float_price.rb
 - spec/dummy/app/models/user.rb
-- spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/bin/rake
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
-- spec/dummy/config/secrets.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/environment.rb
+- spec/dummy/bin/rake
 - spec/dummy/config/application.rb
-- spec/dummy/config/database.yml
 - spec/dummy/config/boot.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/effective_addresses.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/effective_qb_sync.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/devise.rb
+- spec/dummy/config/initializers/effective_addresses.rb
 - spec/dummy/config/initializers/effective_orders.rb
-- spec/dummy/config/initializers/simple_form.rb
+- spec/dummy/config/initializers/effective_qb_sync.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/simple_form.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config/secrets.yml
 - spec/dummy/config.ru
-- spec/dummy/Rakefile
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/404.html
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
-- spec/dummy/README.rdoc
+- spec/dummy/public/404.html
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/favicon.ico
+- spec/fixtures/qbxml_response_error.xml
+- spec/fixtures/qbxml_response_success.xml
+- spec/models/acts_as_purchasable_spec.rb
+- spec/models/factories_spec.rb
+- spec/models/qb_machine_spec.rb
 - spec/models/qb_request_spec.rb
 - spec/models/qb_ticket_spec.rb
-- spec/models/qb_machine_spec.rb
-- spec/models/factories_spec.rb
-- spec/models/acts_as_purchasable_spec.rb
+- spec/spec_helper.rb
 - spec/support/factories.rb
-- spec/fixtures/qbxml_response_success.xml
-- spec/fixtures/qbxml_response_error.xml