effective_qb_sync 1.3.7 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e1b10dc71838c8390bd6baff5fa2bcec970c0be67d3a799967b17cbb1e8490d
-  data.tar.gz: 38cea0b7beb53c3ebfcddda052ea3970514a3c9bfbc4d31d17b9e27194f0db26
+  metadata.gz: 349c5cbc263f6553be07c308064427d01c9fd44f45e9e89b626852ff1daad271
+  data.tar.gz: 3d961d678553a5cea81250014b18256a10fee4334bd720a98b2ad3c2bcc85d1d
 SHA512:
-  metadata.gz: 653e25f22cd61bac1119dc50cf0abbc29109906ee8de741db7c75527f60db2f5278567d18a9e3fa70df376a042672487ddfeec0d262e6fbe0ed088367a212464
-  data.tar.gz: '019270eb08c5b8267676b7f94d01ae15150a7c3f34d643aa762a0c726833d5192a5ba791a352d550571d73d3510756c8d4eee6d6e79fe1526776473e5e66df3d'
+  metadata.gz: ddc265acf4e19b8aeedc7fb6fe4a2d764e54c883818e5fc3e07ad08264bf874b387cd231a2e26c44533b38d3a1635a792964e6c90a6f33ec6c4c8d784772d0ed
+  data.tar.gz: 73a4419a4eea4ac12900d40e15869cad50ef8d5279d81a79dac1ffcb0958733804f02fec5773bc9a0889d60afe836deade1630e78ce8ef4dd9a0f7b7e9a00a82

data/app/controllers/admin/qb_syncs_controller.rb

@@ -44,9 +44,9 @@ module Admin
     def qwc
       @filename = EffectiveQbSync.qwc_name.parameterize + '.qwc'
 
-      response.headers['Content-Disposition'] = "attachment; filename=\"#{@filename}\""
+      data = render_to_string('effective/qb_web_connector/quickbooks', layout: false)
 
-      render '/effective/qb_web_connector/quickbooks.qwc', layout: false
+      send_data(data, filename: 'quickbooks.qwc', disposition: 'attachment')
     end
 
     def set_all_orders_finished
@@ -67,9 +67,7 @@ module Admin
     private
 
     def permitted_params
-      params.require(:effective_qb_order_items_form).permit(
-        :id, qb_order_items_attributes: [:name, :id, :order_item_id]
-      )
+      params.require(:effective_qb_order_items_form).permit!
     end
 
   end

data/app/models/effective/qb_order_item.rb

@@ -7,7 +7,6 @@ module Effective
       timestamps
     end
 
-    validates :order_item, presence: true
     validates :name, presence: true
   end
 end

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/app/views/admin/qb_syncs/_form.html.haml

@@ -14,6 +14,6 @@
             %td
               = f.fields_for :qb_order_items, order_item.qb_order_item do |foi|
                 = foi.hidden_field :order_item_id, value: order_item.id
-                = foi.text_field :name, label: false, required: false
+                = foi.text_field :name, label: false, required: true
 
   = f.submit 'Save QuickBooks Item Names'

data/app/views/admin/qb_syncs/instructions.html.haml

@@ -98,7 +98,7 @@
 
 %ul
   %li
-    Download the #{link_to 'quickbooks web connector .qwc file', (effective_qb_sync.qwc_admin_qb_syncs_path)} and put it somewhere safe
+    Download the #{link_to 'quickbooks web connector .qwc file', (effective_qb_sync.qwc_admin_qb_syncs_path), target: '_blank'} and put it somewhere safe
   %li
     Open the Quickbooks Web Connector program from the Start menu
     %ul
@@ -117,7 +117,7 @@
             url that ends with
             %strong= effective_qb_sync.qb_sync_path
             such as
-            %strong https://myapp.herokuapp.com#{effective_qb_sync.qb_sync_path}
+            %strong https://mysite.com#{effective_qb_sync.qb_sync_path}
           %li The AppSupport url doesn't matter
           %li The UserName must be present and match an existing user
           %li The OwnerID and FileID values must also be unique between all other .qwc files
@@ -135,7 +135,7 @@
   %li (optional) or enable Auto-Run
   %li
     If any synchronization errors occur,
-    %strong= EffectiveQbSync.error_email || EffectiveOrders.mailer[:admin_email]
+    %strong= EffectiveQbSync.error_email || EffectiveOrders.mailer_admin
     will receive an email with instructions on how to fix the error
 
 %h3 6. Troubleshooting
@@ -149,4 +149,3 @@
   %li You might need a developer's help to undo this.
   - unsynced = Effective::QbRequest.new_requests_for_unsynced_items.length
   %li= link_to "Mark all #{unsynced} unsynced orders as already synchronized", effective_qb_sync.set_all_orders_finished_admin_qb_syncs_path, 'data-method': :post, 'data-confirm': 'Are you sure?'
-

data/lib/effective_qb_sync/version.rb

@@ -1,3 +1,3 @@
 module EffectiveQbSync
-  VERSION = '1.3.7'.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.7
+  version: 1.4.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-13 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -113,7 +113,7 @@ files:
 - app/views/effective/qb_sync/receiveResponseXML.erb
 - app/views/effective/qb_sync/sendRequestXML.erb
 - app/views/effective/qb_sync/serverVersion.erb
-- app/views/effective/qb_web_connector/quickbooks.qwc.erb
+- 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