effective_qb_sync 1.3.6 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7661088e53e1d6c02bb8ce7ae766d2253e742cee52900ff1f88b5dda913cc81d
-  data.tar.gz: 9d34f24a3e7d7765012f38476771ce3ff5ef9767349e63e2c74e544be50fe1a9
+  metadata.gz: d57feb13b269e62b4c7756a455c73cd20d9f5ae9dd7086d4ee24be3c9bcda817
+  data.tar.gz: cd2daba55cd448f6b6c04c54f93bf17c5d143d1b30fbc3309825794ef48256f8
 SHA512:
-  metadata.gz: a939efae8b650ac173d0b7f5adaca44d6c23f2183faafae00df54775699744fe49db531393daf08f144a598879de956bc92c84076d666e13ccf48a5514a1fa02
-  data.tar.gz: 58cb299e4125fce20c337e25aa0e7339622f29ab1471caca5553c2be1bf135347ba711955f89aceebe8fd96ab5e091717e172732f82c519d55f1fec9d35c0532
+  metadata.gz: f357b73b508db96cce4dfdd29a925add3d9240ec531624a3d321b858e3e7f0b931d355ea301e5bb9bf453747c3d3d09bcb89c4c6f7fc157f8962718d88475a39
+  data.tar.gz: '03875a16f136ec46d7bbf469ebbbafae8c60107261a7c7881c79496b1550a049648af1133a87bc9e390b324622582022073bcb1c3336cd59bd20cac5bbec2541'

data/app/controllers/admin/qb_syncs_controller.rb

@@ -44,15 +44,15 @@ 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
       Effective::QbTicket.transaction do
         begin
-          Effective::QbTicket.set_all_orders_finished!
+          Effective::QbTicket.set_orders_finished!
 
           flash[:success] = 'Successfully set all orders finished'
         rescue => e
@@ -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

@@ -30,7 +30,7 @@ module Effective
 
     # creates (does not persist) QbRequests for outstanding orders.  The caller may choose to
     # persist a request when that request starts communicating with QuickBooks
-    def self.new_requests_for_unsynced_items(before: nil)
+    def self.new_requests_for_unsynced_items(before: nil, order_ids: nil)
       finished_order_ids = Effective::QbRequest.where(state: 'Finished').pluck(:order_id)
       finished_orders = Effective::Order.purchased.includes(order_items: [:purchasable, :qb_order_item]).where.not(id: finished_order_ids)
 
@@ -39,6 +39,10 @@ module Effective
         finished_orders = finished_orders.where('purchased_at < ?', before)
       end
 
+      if order_ids.present?
+        finished_orders = finished_orders.where(id: order_ids)
+      end
+
       finished_orders.map { |order| Effective::QbRequest.new(order: order) }
     end
 

data/app/models/effective/qb_ticket.rb

@@ -30,12 +30,12 @@ module Effective
 
     validates :state, inclusion: { in: STATES }
 
-    def self.set_all_orders_finished!(before: nil)
+    def self.set_orders_finished!(before: nil, order_ids: nil)
       qb_ticket = Effective::QbTicket.new(state: 'Finished')
       qb_ticket.qb_logs.build(message: 'Set all orders Finished')
       qb_ticket.save!
 
-      Effective::QbRequest.new_requests_for_unsynced_items(before: before).each do |qb_request|
+      Effective::QbRequest.new_requests_for_unsynced_items(before: before, order_ids: order_ids).each do |qb_request|
         qb_request.qb_ticket = qb_ticket
         qb_request.transition_to_finished
       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.6'.freeze
+  VERSION = '1.3.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_qb_sync
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2022-10-24 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