effective_qb_sync 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd0557466e309a81b913eecd1970ef494d071c3c01d03e004a537ea466345fa9
-  data.tar.gz: 5c84e45ed198cf35fe3ac792fd4076efadb45d161803aedc12d6823118fb0a76
+  metadata.gz: 7661088e53e1d6c02bb8ce7ae766d2253e742cee52900ff1f88b5dda913cc81d
+  data.tar.gz: 9d34f24a3e7d7765012f38476771ce3ff5ef9767349e63e2c74e544be50fe1a9
 SHA512:
-  metadata.gz: 8ec10245d4723b3e6debaa9a3958094c45365a03c348a9fac7a2df9ccd1c4c49f9f8a45f0ffe53acc8d79eaacc1db51eb29616b1d7596f7346c244a139fb493f
-  data.tar.gz: ae9643278ae801730b9d2d7c21b3552eb9b7d1726a3ed54d298c56c3e69a8fcf2c2938cfcae7d36d2221a85cd22d92fd9d96cc79eeca55c58d23d478a4c57ad0
+  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/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

data/lib/effective_qb_sync/version.rb

@@ -1,3 +1,3 @@
 module EffectiveQbSync
-  VERSION = '1.3.5'.freeze
+  VERSION = '1.3.6'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_qb_sync
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Code and Effect