effective_qb_sync 1.3.3 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df7032f4abbef9c241bd2eebf383aecfc6c6c918d006d60046799e90a200d294
-  data.tar.gz: ccdfce8884cda0205388fc28f8d4d39da869d2556bb449eff7932552745cf0bd
+  metadata.gz: 5e1b10dc71838c8390bd6baff5fa2bcec970c0be67d3a799967b17cbb1e8490d
+  data.tar.gz: 38cea0b7beb53c3ebfcddda052ea3970514a3c9bfbc4d31d17b9e27194f0db26
 SHA512:
-  metadata.gz: 9851e05ca234f5ed7d569d58534e1293a07142cbbfc5623da0a9451aec18691cd583094dab6071adcac2321055c7ad09820582e55e6010496114b03433a2a45b
-  data.tar.gz: 550920e68a8d65c7a2aa22b75b618d3e472bdc288c885da6d2f125e1aee924873be7719ee3be1a1d9b4fdc1e1463df56ed11eef6d30c8bc6704f7847eaa0a946
+  metadata.gz: 653e25f22cd61bac1119dc50cf0abbc29109906ee8de741db7c75527f60db2f5278567d18a9e3fa70df376a042672487ddfeec0d262e6fbe0ed088367a212464
+  data.tar.gz: '019270eb08c5b8267676b7f94d01ae15150a7c3f34d643aa762a0c726833d5192a5ba791a352d550571d73d3510756c8d4eee6d6e79fe1526776473e5e66df3d'

data/app/controllers/admin/qb_syncs_controller.rb

@@ -52,14 +52,7 @@ module Admin
     def set_all_orders_finished
       Effective::QbTicket.transaction do
         begin
-          @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.each do |qb_request|
-            qb_request.qb_ticket = @qb_ticket
-            qb_request.transition_to_finished
-          end
+          Effective::QbTicket.set_orders_finished!
 
           flash[:success] = 'Successfully set all orders finished'
         rescue => e

data/app/datatables/effective_qb_sync_datatable.rb

@@ -9,20 +9,7 @@ class EffectiveQbSyncDatatable < Effective::Datatable
       qb_ticket.qb_requests.length
     end
 
-    val :orders, sort: false, as: :obfuscated_id do |qb_ticket|
-      qb_ticket.qb_requests.select { |qb_request| qb_request.order.present? }
-    end.format do |requests|
-      requests.map { |qb_request| link_to "##{qb_request.order.to_param}", effective_orders.admin_order_path(qb_request.order) }
-      .join('<br>').html_safe
-    end.search do |collection, term, column, sql_column|
-      order = Effective::Order.where(id: search_term).first
-
-      if order.present?
-        collection.where(id: Effective::QbRequest.where(order_id: order.id).pluck(:qb_ticket_id))
-      else
-        collection.none
-      end
-    end
+    col :orders
 
     actions_col do |qb_ticket|
       dropdown_link_to 'Show', effective_qb_sync.admin_qb_sync_path(qb_ticket)
@@ -31,7 +18,7 @@ class EffectiveQbSyncDatatable < Effective::Datatable
   end
 
   collection do
-    Effective::QbTicket.deep.all
+    Effective::QbTicket.deep.includes(:orders).all
   end
 
 end

data/app/models/effective/qb_request.rb

@@ -30,10 +30,20 @@ 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
+    def self.new_requests_for_unsynced_items(before: nil, order_ids: nil)
       finished_order_ids = Effective::QbRequest.where(state: 'Finished').pluck(:order_id)
-      Effective::Order.purchased.includes(order_items: [:purchasable, :qb_order_item])
-        .where.not(id: finished_order_ids).map { |order| Effective::QbRequest.new(order: order) }
+      finished_orders = Effective::Order.purchased.includes(order_items: [:purchasable, :qb_order_item]).where.not(id: finished_order_ids)
+
+      if before.present?
+        raise('expected before to be a date') unless before.respond_to?(:strftime)
+        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
 
     # Finds a QbRequest using response qb_xml.  If the response could not be parsed, or if there was no

data/app/models/effective/qb_ticket.rb

@@ -30,6 +30,19 @@ module Effective
 
     validates :state, inclusion: { in: STATES }
 
+    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, order_ids: order_ids).each do |qb_request|
+        qb_request.qb_ticket = qb_ticket
+        qb_request.transition_to_finished
+      end
+
+      true
+    end
+
     def request_error!(error, atts={})
       self.error!(error, atts.reverse_merge(state: 'RequestError'))
     end

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

@@ -15,11 +15,16 @@
         %strong= Array(EffectiveQbSync.quickbooks_username).join('</strong> or <strong>').html_safe
         and password:
         %strong= Array(EffectiveQbSync.quickbooks_password).join('</strong> or <strong>').html_safe
+    - elsif EffectiveQbSync.quickbooks_username.blank? && EffectiveQbSync.quickbooks_password.present?
+      %li
+        Add a Quickbooks user any username, and password:
+        %strong= Array(EffectiveQbSync.quickbooks_password).join('</strong> or <strong>').html_safe
     - else
       %li
         (developer) Add a quickbooks_username and quickbooks_password to the config/initializers/effective_qb_sync.rb file
         %ul
           %li Add a Quickbooks user with that same username and password
+
     %li Access for user: "Selected areas of Quickbooks"
     %li Sales and Accounts Receivable "Selective Access - Create transactions only"
     %li Purchases and Accounts Payable "No Access"

data/lib/effective_qb_sync/version.rb

@@ -1,3 +1,3 @@
 module EffectiveQbSync
-  VERSION = '1.3.3'.freeze
+  VERSION = '1.3.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_qb_sync
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails