effective_qb_sync 1.3.1 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 319c4615761c91d7f339bc221173660689d618c93d31a97eb0fda7c0fd1c4119
-  data.tar.gz: bb82bd7bfdaf8e996f901c96e682a3e03be6da829fd85f298365f9632cdc27bc
+  metadata.gz: bd0557466e309a81b913eecd1970ef494d071c3c01d03e004a537ea466345fa9
+  data.tar.gz: 5c84e45ed198cf35fe3ac792fd4076efadb45d161803aedc12d6823118fb0a76
 SHA512:
-  metadata.gz: dddb2b8fdd4a0087891534bdf96adff2e40c3020661051dc86c46da444b502d8ceae333f517ae356928e3ec22dc4e91067312b23cd04c70e5a4a5ce245911357
-  data.tar.gz: 3a749c4afe9031557d936c5f76aedf40a7331098bbd16d3a9ab0271043bb1bfc89dd3a1e662dd14a26a7e7f503d8029c88c5127759862486d6bdb280060cf3bd
+  metadata.gz: 8ec10245d4723b3e6debaa9a3958094c45365a03c348a9fac7a2df9ccd1c4c49f9f8a45f0ffe53acc8d79eaacc1db51eb29616b1d7596f7346c244a139fb493f
+  data.tar.gz: ae9643278ae801730b9d2d7c21b3552eb9b7d1726a3ed54d298c56c3e69a8fcf2c2938cfcae7d36d2221a85cd22d92fd9d96cc79eeca55c58d23d478a4c57ad0

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_machine.rb

@@ -27,17 +27,17 @@ module Effective
 
       unless authentication_valid?(username, password)
         log "Authentication failed for user #{username}"
-        @ticket.update_attributes!(username: username, state: 'Finished', last_error: @last_log_message)
+        @ticket.update!(username: username, state: 'Finished', last_error: @last_log_message)
         return 'nvu' # not valid user
       end
 
       if has_work?
         log "Authentication successful. Reporting to QuickBooks that there is work to be done."
-        @ticket.update_attributes!(username: username, state: 'Authenticated')
+        @ticket.update!(username: username, state: 'Authenticated')
         ''  # "Any other string value = use this name for company file"
       else
         log "Authentication successful, but there is no work to be done"
-        @ticket.update_attributes!(username: username, state: 'Finished')
+        @ticket.update!(username: username, state: 'Finished')
         'none'
       end
     end
@@ -58,7 +58,7 @@ module Effective
       return '' unless valid?
 
       # update the ticket with the metadata sent at the first request for XML (i.e. if not blank)
-      @ticket.update_attributes!(
+      @ticket.update!(
         hpc_response: (@ticket.hpc_response || params[:hcpresponse]),
         company_file_name: (@ticket.company_file_name || params[:company]),
         country: (@ticket.country || params[:country]),
@@ -82,13 +82,13 @@ module Effective
       # if we don't have a request, then we are done.
       unless request
         log "There is no more work to be done. Marking ticket state as finished"
-        @ticket.update_attributes!(state: 'Finished')
+        @ticket.update!(state: 'Finished')
         return ''
       end
 
-      request.update_attributes!(qb_ticket: @ticket, request_sent_at: Time.zone.now)
+      request.update!(qb_ticket: @ticket, request_sent_at: Time.zone.now)
       qb_xml = request.to_qb_xml
-      request.update_attributes!(request_qbxml: qb_xml)
+      request.update!(request_qbxml: qb_xml)
 
       # set the ticket into a Processing state
       @ticket.state = 'Processing'
@@ -134,7 +134,7 @@ module Effective
 
         # also update the request if it is able to be found
         request = find_outstanding_request(responseXML)
-        request.update_attributes!(response_qbxml: responseXML, state: 'Error') if request
+        request.update!(response_qbxml: responseXML, state: 'Error') if request
 
         return -1
       end
@@ -161,12 +161,12 @@ module Effective
       unless request.consume_response_xml(responseXML)
         # this request for some reason did not succeeed. Update the request and the ticket
         log "Request [#{request.state}] could not process the QuickBooks response: #{request.error}"
-        request.update_attributes!(response_qbxml: responseXML, state: 'Error')
+        request.update!(response_qbxml: responseXML, state: 'Error')
         @ticket.error! @last_log_message
         return -1
       end
 
-      request.update_attributes!(response_qbxml: responseXML) # This was changed for effective_qb_sync
+      request.update!(response_qbxml: responseXML) # This was changed for effective_qb_sync
 
       # the request has processed the response XML. if it does not have any more work to do, then detach it
 
@@ -174,7 +174,7 @@ module Effective
         log "Request [#{request.state}] has more work to do on the next request"
       else
         # detach the current request
-        @ticket.update_attributes!(qb_request: nil)
+        @ticket.update!(qb_request: nil)
         log "Request [#{request.state}] has completed its work"
       end
 
@@ -214,7 +214,7 @@ module Effective
     def op_close_connection
       return 'Close error: invalid ticket' unless valid?
 
-      @ticket.update_attributes!(state: 'Finished') unless ['ConnectionError', 'RequestError'].include?(@ticket.state)
+      @ticket.update!(state: 'Finished') unless ['ConnectionError', 'RequestError'].include?(@ticket.state)
       log "Closed connection with QuickBooks"
 
       'OK'

data/app/models/effective/qb_request.rb

@@ -63,7 +63,7 @@ module Effective
     # parses the response XML and processes it.
     # returns true if the  responseXML indicates success, false otherwise
     def consume_response_xml(xml)
-      update_attributes!(response_qbxml: xml)
+      update!(response_qbxml: xml)
       handle_response_xml(xml)
     end
 
@@ -116,7 +116,7 @@ module Effective
     # transitions the request state and also outputs a log statement
     def transition_state(state)
       old_state = self.state
-      update_attributes!(state: state)
+      update!(state: state)
       log "Transitioned request state from [#{old_state}] to [#{state}]"
     end
 

data/app/models/effective/qb_ticket.rb

@@ -1,6 +1,6 @@
 module Effective
   class QbTicket < ActiveRecord::Base
-    belongs_to :qb_request # the current request
+    belongs_to :qb_request, optional: true # the current request. Only optional when set_all_orders_finished
     has_many :qb_requests
     has_many :orders, through: :qb_requests
     has_many :qb_logs
@@ -15,7 +15,7 @@ module Effective
       qbxml_major_version       :string
       qbxml_minor_version       :string
 
-      state                     :string, default: 'Ready'
+      state                     :string   # , default: 'Ready'
       percent                   :integer
 
       hpc_response              :text
@@ -31,7 +31,7 @@ module Effective
     validates :state, inclusion: { in: STATES }
 
     def request_error!(error, atts={})
-      self.error!(error, atts.reverse_merge({state: 'RequestError'}))
+      self.error!(error, atts.reverse_merge(state: 'RequestError'))
     end
 
     # This is the entry point for a standard error.
@@ -42,9 +42,9 @@ 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
 
-      self.update_attributes!(atts.reverse_merge({last_error: error}))
+      update!(atts.reverse_merge(last_error: error))
     end
 
     # persists a new log message to this ticket

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.1'.freeze
+  VERSION = '1.3.5'.freeze
 end

data/spec/models/qb_machine_spec.rb

@@ -209,7 +209,7 @@ describe Effective::QbMachine, "Sending Request qbXML to QuickBooks (op_send_req
   end
 
   it "should transition ticket to the RequestError state if the ticket is not in the Authenticated or Processing states" do
-    @qb_machine.ticket.update_attributes!(state: 'Finished')
+    @qb_machine.ticket.update!(state: 'Finished')
     @qb_machine.op_send_request_xml(@default_request_params)
     @qb_machine.ticket.state.should eql('RequestError')
   end
@@ -314,25 +314,25 @@ describe Effective::QbMachine, "Receiving response qbXML from QuickBooks (op_rec
   end
 
   it "should return -1 to indicate error if the ticket state is not in the Processing state" do
-    @qb_machine.ticket.update_attributes! :state=>'Finished'
+    @qb_machine.ticket.update! :state=>'Finished'
     result = @qb_machine.op_receive_response_xml(@default_response_params)
     result.should eql(-1)
   end
 
   it "should set the ticket state to RequestError if the ticket state was previously Authenticated" do
-    @qb_machine.ticket.update_attributes! :state=>'Authenticated'
+    @qb_machine.ticket.update! :state=>'Authenticated'
     @qb_machine.op_receive_response_xml(@default_response_params)
     @qb_machine.ticket.state.should eql('RequestError')
   end
 
   it "should set the ticket state to RequestError if the ticket state was previously Ready" do
-    @qb_machine.ticket.update_attributes! :state=>'Ready'
+    @qb_machine.ticket.update! :state=>'Ready'
     @qb_machine.op_receive_response_xml(@default_response_params)
     @qb_machine.ticket.state.should eql('RequestError')
   end
 
   it "should set the ticket state to RequestError if the ticket state was previously Finished" do
-    @qb_machine.ticket.update_attributes! :state=>'Finished'
+    @qb_machine.ticket.update! :state=>'Finished'
     @qb_machine.op_receive_response_xml(@default_response_params)
     @qb_machine.ticket.state.should eql('RequestError')
   end
@@ -487,7 +487,7 @@ describe Effective::QbMachine, "Receiving a request from the QBWC to provide the
   before :each do
     @qb_machine = Effective::QbMachine.new
     @last_error = 'What?'
-    @qb_machine.ticket.update_attributes! :last_error=>@last_error
+    @qb_machine.ticket.update! :last_error=>@last_error
   end
 
   it "should return the last error" do
@@ -495,11 +495,11 @@ describe Effective::QbMachine, "Receiving a request from the QBWC to provide the
   end
 
   it "should return '' if the last error is blank" do
-    @qb_machine.ticket.update_attributes! :last_error=>nil
+    @qb_machine.ticket.update! :last_error=>nil
     error = @qb_machine.op_last_error
     error.should eql('')
 
-    @qb_machine.ticket.update_attributes! :last_error=>''
+    @qb_machine.ticket.update! :last_error=>''
     error = @qb_machine.op_last_error
     error.should eql('')
   end
@@ -513,42 +513,40 @@ describe Effective::QbMachine, "Closing the connection (op_close_connection)" do
   end
 
   it "should not transition ticket state on close_connection if state is Finished" do
-    @qb_machine.ticket.update_attributes! :state=>'Finished'
+    @qb_machine.ticket.update! :state=>'Finished'
     @qb_machine.op_close_connection
     @qb_machine.ticket.state.should eql('Finished')
   end
 
   it "should not transition ticket state on close_connection if state is ConnectionError" do
-    @qb_machine.ticket.update_attributes! :state=>'ConnectionError'
+    @qb_machine.ticket.update! :state=>'ConnectionError'
     @qb_machine.op_close_connection
     @qb_machine.ticket.state.should eql('ConnectionError')
   end
 
   it "should not transition ticket state on close_connection if state is RequestError" do
-    @qb_machine.ticket.update_attributes! :state=>'RequestError'
+    @qb_machine.ticket.update! :state=>'RequestError'
     @qb_machine.op_close_connection
     @qb_machine.ticket.state.should eql('RequestError')
   end
 
   it "should transition ticket state to Finished if state is Ready " do
-    @qb_machine.ticket.update_attributes! :state=>'Ready'
+    @qb_machine.ticket.update! :state=>'Ready'
     @qb_machine.op_close_connection
     @qb_machine.ticket.state.should eql('Finished')
   end
 
   it "should transition ticket state to Finished if state is Authenticated" do
-    @qb_machine.ticket.update_attributes! :state=>'Authenticated'
+    @qb_machine.ticket.update! :state=>'Authenticated'
     @qb_machine.op_close_connection
     @qb_machine.ticket.state.should eql('Finished')
   end
 
   it "should transition ticket state to Finished if state is Processing" do
-    @qb_machine.ticket.update_attributes! :state=>'Processing'
+    @qb_machine.ticket.update! :state=>'Processing'
     @qb_machine.op_close_connection
     @qb_machine.ticket.state.should eql('Finished')
   end
 
 
 end
-
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_qb_sync
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.5
 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