effective_qb_sync 1.3.2 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2eef5621d3a64765720af65734b135ba35bf5433a509c1ad39510b374a4ff95c
-  data.tar.gz: 2f3c34d7e2b3dad8878666649d5e167f0433aedd26479e349a38edd0e304276b
+  metadata.gz: 7661088e53e1d6c02bb8ce7ae766d2253e742cee52900ff1f88b5dda913cc81d
+  data.tar.gz: 9d34f24a3e7d7765012f38476771ce3ff5ef9767349e63e2c74e544be50fe1a9
 SHA512:
-  metadata.gz: b9ff3bd819af28527bfa88b784d2bc4667e0057924da6627c1f67a136f7efb0dc412ffa675aa29ba67d2d66147ad12378a269f558ea1799f8d9b0362e919746b
-  data.tar.gz: cf82590efa8276942f285029fe46f45f04b90fa67aa951b05acc82c02bcb971a630c65439ce450515f63bc815e865003f4f8aabcefb08eac2623105c947daccf
+  metadata.gz: a939efae8b650ac173d0b7f5adaca44d6c23f2183faafae00df54775699744fe49db531393daf08f144a598879de956bc92c84076d666e13ccf48a5514a1fa02
+  data.tar.gz: 58cb299e4125fce20c337e25aa0e7339622f29ab1471caca5553c2be1bf135347ba711955f89aceebe8fd96ab5e091717e172732f82c519d55f1fec9d35c0532

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_all_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,16 @@ 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)
       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
+
+      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_all_orders_finished!(before: 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|
+        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
@@ -42,7 +55,7 @@ module Effective
         to: EffectiveQbSync.error_email,
         subject: "Quickbooks failed to synchronize order ##{qb_request.try(:order).try(:to_param) || 'unknown'}",
         template: 'qb_sync_error'
-      ).public_send(EffectiveOrders.mailer[:deliver_method])
+      ).deliver_now
 
       update!(atts.reverse_merge(last_error: error))
     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.2'.freeze
+  VERSION = '1.3.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_qb_sync
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails