effective_qb_sync 1.2.3 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7543d83614acebbe2181194f5f2d266e6047b558
-  data.tar.gz: 0ad410df6ccad75fd1aab5ed24c01d2c0cb44f6d
+SHA256:
+  metadata.gz: 2eef5621d3a64765720af65734b135ba35bf5433a509c1ad39510b374a4ff95c
+  data.tar.gz: 2f3c34d7e2b3dad8878666649d5e167f0433aedd26479e349a38edd0e304276b
 SHA512:
-  metadata.gz: 825d0a99fdc088cc4dca33c49908091daedf59b5cdd8d2814992e1b5a0bba7bd04fdec70503122133e4be0b89f4c098ce96d3029f7571a9e7fba476806b61f68
-  data.tar.gz: ce1056f9b670169a7e3a865a3d158aec055ce5f9759c1031b630f97771167ac2e3a552fe60750279cd25768b61521f00b360785bd7709c0d3281444210fb11cc
+  metadata.gz: b9ff3bd819af28527bfa88b784d2bc4667e0057924da6627c1f67a136f7efb0dc412ffa675aa29ba67d2d66147ad12378a269f558ea1799f8d9b0362e919746b
+  data.tar.gz: cf82590efa8276942f285029fe46f45f04b90fa67aa951b05acc82c02bcb971a630c65439ce450515f63bc815e865003f4f8aabcefb08eac2623105c947daccf

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2018 Code and Effect Inc.
+Copyright 2021 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/controllers/admin/qb_syncs_controller.rb

@@ -1,13 +1,16 @@
 module Admin
   class QbSyncsController < ApplicationController
-    before_action :authenticate_user!
-    before_action :restrict_access
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_qb_sync) }
 
-    layout (EffectiveQbSync.layout.kind_of?(Hash) ? EffectiveQbSync.layout[:admin_qb_tickets] : EffectiveQbSync.layout)
+    include Effective::CrudController
+
+    if (config = EffectiveQbSync.layout)
+      layout(config.kind_of?(Hash) ? config[:admin] : config)
+    end
 
     def index
       @datatable = EffectiveQbSyncDatatable.new(self)
-
       @page_title = 'Quickbooks Synchronizations'
     end
 
@@ -23,7 +26,7 @@ module Admin
       @page_title = "Quickbooks Sync ##{@qb_ticket.id}"
 
       @qb_order_items_form = Effective::QbOrderItemsForm.new(id: @qb_ticket.id, orders: @qb_ticket.orders)
-      @qb_order_items_form.qb_order_items_attributes = permitted_qb_order_items_params[:qb_order_items_attributes].values
+      @qb_order_items_form.qb_order_items_attributes = permitted_params[:qb_order_items_attributes].values
 
       if @qb_order_items_form.save
         flash[:success] = 'Successfully updated Quickbooks item names'
@@ -39,7 +42,7 @@ module Admin
     end
 
     def qwc
-      @filename = Rails.application.class.parent_name.downcase + '.qwc'
+      @filename = EffectiveQbSync.qwc_name.parameterize + '.qwc'
 
       response.headers['Content-Disposition'] = "attachment; filename=\"#{@filename}\""
 
@@ -70,12 +73,11 @@ module Admin
 
     private
 
-    def restrict_access
-      EffectiveQbSync.authorize!(self, :admin, :effective_qb_sync)
+    def permitted_params
+      params.require(:effective_qb_order_items_form).permit(
+        :id, qb_order_items_attributes: [:name, :id, :order_item_id]
+      )
     end
 
-    def permitted_qb_order_items_params
-      params.require(:effective_qb_order_items_form).permit(:id, qb_order_items_attributes: [:name, :id, :order_item_id])
-    end
   end
 end

data/app/controllers/effective/qb_sync_controller.rb

@@ -5,7 +5,7 @@ module Effective
 
     def api
       # respond successfully to a GET which some versions of the Web Connector send to verify the url
-      (render(nothing: true) and return) if request.get?
+      (render(body: '') and return) if request.get?
 
       # Examine raw post and determine which API call to process
       doc = Nokogiri::XML(request.raw_post)

data/app/datatables/effective_qb_sync_datatable.rb

@@ -3,7 +3,7 @@ class EffectiveQbSyncDatatable < Effective::Datatable
     order :created_at, :desc
 
     col :created_at
-    col :state, search: { collection: Effective::QbTicket::STATES }
+    col :state
 
     val :num_orders, visible: false do |qb_ticket|
       qb_ticket.qb_requests.length
@@ -24,11 +24,14 @@ class EffectiveQbSyncDatatable < Effective::Datatable
       end
     end
 
-    actions_col partial: 'admin/qb_syncs/actions', partial_as: :qb_sync
+    actions_col do |qb_ticket|
+      dropdown_link_to 'Show', effective_qb_sync.admin_qb_sync_path(qb_ticket)
+    end
+
   end
 
   collection do
-    Effective::QbTicket.includes(qb_requests: :order)
+    Effective::QbTicket.deep.all
   end
 
 end

data/app/models/effective/qb_log.rb

@@ -2,9 +2,10 @@ module Effective
   class QbLog < ActiveRecord::Base
     belongs_to :qb_ticket
 
-    # Attributes
-    # message       :text
-    # timestamps
+    effective_resource do
+      message       :text
+      timestamps
+    end
 
     validates :qb_ticket, presence: true
     validates :message, presence: true

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'
@@ -253,8 +253,13 @@ module Effective
     protected
 
     # determines if this username and password is valid
+    # username is optional depending on your config file
     def authentication_valid?(username,password)
-      Array(EffectiveQbSync.quickbooks_username).include?(username) && Array(EffectiveQbSync.quickbooks_password).include?(password)
+      if EffectiveQbSync.quickbooks_username.present?
+        return false unless Array(EffectiveQbSync.quickbooks_username).include?(username)
+      end
+
+      Array(EffectiveQbSync.quickbooks_password).include?(password)
     end
 
     # returns how much more work is to be done. If there is no more work to be done, it will return 0, else,

data/app/models/effective/qb_order_item.rb

@@ -2,9 +2,10 @@ module Effective
   class QbOrderItem < ActiveRecord::Base
     belongs_to :order_item
 
-    # Attributes
-    # name                   :string
-    # timestamps
+    effective_resource do
+      name        :string
+      timestamps
+    end
 
     validates :order_item, presence: true
     validates :name, presence: true

data/app/models/effective/qb_request.rb

@@ -9,17 +9,20 @@ module Effective
     COMPLETED_STATES = ['Finished', 'Error']
     PROCESSING_STATES = ['Processing', 'CustomerQuery', 'CreateCustomer', 'OrderSync']
 
-    # Attributes
-    # request_qbxml         :text
-    # response_qbxml        :text
+    effective_resource do
+      state                 :string
+      error                 :text
 
-    # request_sent_at       :datetime
-    # response_received_at  :datetime
+      request_type          :string
 
-    # state                 :string
-    # error                 :text
+      request_qbxml         :text
+      response_qbxml        :text
 
-    # timestamps
+      request_sent_at       :datetime
+      response_received_at  :datetime
+
+      timestamps
+    end
 
     validates :state, inclusion: { in: COMPLETED_STATES + PROCESSING_STATES }
     validates :qb_ticket, presence: true
@@ -60,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
 
@@ -113,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
 
@@ -216,7 +219,7 @@ module Effective
             order.order_items.each do |order_item|
               xml.SalesReceiptLineAdd {
                 xml.ItemRef { xml.FullName(order_item.qb_item_name) }
-                xml.Desc(order_item.title)
+                xml.Desc(order_item.name)
                 xml.Amount(qb_amount(order_item.subtotal))
               }
             end

data/app/models/effective/qb_ticket.rb

@@ -1,34 +1,37 @@
 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
 
     STATES = ['Ready', 'Authenticated', 'Processing', 'Finished', 'ConnectionError', 'RequestError']
 
-    # Attributes
-    # username                  :string
-    # company_file_name         :string
-    # country                   :string
+    effective_resource do
+      username                  :string
+      company_file_name         :string
+      country                   :string
 
-    # qbxml_major_version       :string
-    # qbxml_minor_version       :string
+      qbxml_major_version       :string
+      qbxml_minor_version       :string
 
-    # state                     :string, default: 'Ready'
-    # percent                   :integer
+      state                     :string   # , default: 'Ready'
+      percent                   :integer
 
-    # hpc_response              :text
-    # connection_error_hresult  :text
-    # connection_error_message  :text
-    # last_error                :text
+      hpc_response              :text
+      connection_error_hresult  :text
+      connection_error_message  :text
+      last_error                :text
 
-    # timestamps
+      timestamps
+    end
+
+    scope :deep, -> { includes(qb_requests: :order) }
 
     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.
@@ -41,7 +44,7 @@ module Effective
         template: 'qb_sync_error'
       ).public_send(EffectiveOrders.mailer[:deliver_method])
 
-      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/show.html.haml

@@ -8,11 +8,7 @@
         %td= value
 
 %h3 Orders
-
-- if defined?(EffectiveBootstrap)
-  = render 'form', qb_order_items_form: @qb_order_items_form, qb_ticket: @qb_ticket
-- else
-  = render 'simple_form', qb_order_items_form: @qb_order_items_form, qb_ticket: @qb_ticket
+= render 'form', qb_order_items_form: @qb_order_items_form, qb_ticket: @qb_ticket
 
 %h3 Sync Log
 

data/app/views/effective/orders_mailer/qb_sync_error.html.haml

@@ -19,7 +19,7 @@
         = @order.billing_name
         %br
         - @order.order_items.each do |oi|
-          = "#{oi.title} (#{oi.try(:qb_item_name)})"
+          = "#{oi.name} (#{oi.try(:qb_item_name)})"
           %br
 
     %p

data/app/views/effective/qb_web_connector/quickbooks.qwc.erb

@@ -1,9 +1,9 @@
 <QBWCXML>
-   <AppName><%= Rails.application.class.parent_name.upcase %> Web Connector</AppName>
+   <AppName><%= EffectiveQbSync.qwc_name.upcase %> Web Connector</AppName>
    <AppID>{<%= SecureRandom.uuid.upcase %>}</AppID>
    <AppURL><%= effective_qb_sync.qb_sync_url(protocol: 'https') %></AppURL>
-   <AppDescription><%= Rails.application.class.parent_name.upcase %> EffectiveOrders to Quickbooks Web Connector</AppDescription>
-   <AppSupport>https://github.com/code-and-effect/effective_qb_sync</AppSupport>
+   <AppDescription><%= EffectiveQbSync.qwc_name.upcase %> EffectiveOrders to Quickbooks Web Connector</AppDescription>
+   <AppSupport><%= root_url(protocol: 'https') %></AppSupport>
    <UserName><%= EffectiveQbSync.quickbooks_username || 'MISSING' %></UserName>
    <OwnerID>{<%= SecureRandom.uuid.upcase %>}</OwnerID>
    <FileID>{<%= SecureRandom.uuid.upcase %>}</FileID>

data/config/effective_qb_sync.rb

@@ -5,36 +5,10 @@ EffectiveQbSync.setup do |config|
   config.qb_logs_table_name = :qb_logs
   config.qb_order_items_table_name = :qb_order_items
 
-  # Authorization Method
-  #
-  # This method is called by all controller actions with the appropriate action and resource
-  # If the method returns false, an Effective::AccessDenied Error will be raised (see README.md for complete info)
-  #
-  # Use via Proc (and with CanCan):
-  # config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) }
-  #
-  # Use via custom method:
-  # config.authorization_method = :my_authorization_method
-  #
-  # And then in your application_controller.rb:
-  #
-  # def my_authorization_method(action, resource)
-  #   current_user.is?(:admin)
-  # end
-  #
-  # Or disable the check completely:
-  # config.authorization_method = false
-  config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) } # CanCanCan
-
-  # All EffectiveQbSync controllers will use this layout
-  config.layout = 'application'
-
-  # SimpleForm Options
-  # This Hash of options will be passed into any admin facing simple_form_for() calls
-  config.admin_simple_form_options = {} # For the /admin/qb_syncs form
+  # Layout Settings
+  # config.layout = { admin: 'admin' }
 
   # Quickbooks Company File Settings
-
   # The username / password of the Quickbooks user that should be allowed to synchronize.
   # This must match the user configured in the Quickbooks .qwc file
   config.quickbooks_username = ''

data/config/routes.rb

@@ -1,5 +1,5 @@
 EffectiveQbSync::Engine.routes.draw do
-  scope :module => 'effective' do
+  scope module: 'effective' do
     match 'quickbooks/api', to: 'qb_sync#api', as: 'qb_sync', via: :all
   end
 

data/lib/effective_qb_sync.rb

@@ -1,48 +1,22 @@
+require 'effective_resources'
 require 'effective_orders'
 require 'effective_qb_sync/engine'
 require 'effective_qb_sync/version'
 
 module EffectiveQbSync
-  # The following are all valid config keys
-  mattr_accessor :qb_requests_table_name
-  mattr_accessor :qb_tickets_table_name
-  mattr_accessor :qb_logs_table_name
-  mattr_accessor :qb_order_items_table_name
 
-  mattr_accessor :authorization_method
-
-  mattr_accessor :quickbooks_username
-  mattr_accessor :quickbooks_password
-  mattr_accessor :quickbooks_tax_name
-
-  mattr_accessor :error_email
-
-  mattr_accessor :layout
-  mattr_accessor :admin_simple_form_options
-
-  def self.setup
-    yield self
-  end
-
-  def self.authorized?(controller, action, resource)
-    @_exceptions ||= [Effective::AccessDenied, (CanCan::AccessDenied if defined?(CanCan)), (Pundit::NotAuthorizedError if defined?(Pundit))].compact
-
-    return !!authorization_method unless authorization_method.respond_to?(:call)
-    controller = controller.controller if controller.respond_to?(:controller)
-
-    begin
-      !!(controller || self).instance_exec((controller || self), action, resource, &authorization_method)
-    rescue *@_exceptions
-      false
-    end
+  def self.config_keys
+    [
+      :qb_requests_table_name, :qb_tickets_table_name, :qb_logs_table_name, :qb_order_items_table_name,
+      :quickbooks_username, :quickbooks_password, :quickbooks_tax_name,
+      :layout, :error_email
+    ]
   end
 
-  def self.authorize!(controller, action, resource)
-    raise Effective::AccessDenied.new('Access Denied', action, resource) unless authorized?(controller, action, resource)
-  end
+  include EffectiveGem
 
   def self.permitted_params
-    [:note]
+    @permitted_params ||= [:note]
   end
 
   def self.skip_order!(order)
@@ -72,4 +46,8 @@ module EffectiveQbSync
     true
   end
 
+  def self.qwc_name
+    (defined?(Tenant) ? Tenant.current.to_s : Rails.application.class.parent_name).downcase
+  end
+
 end

data/lib/effective_qb_sync/engine.rb

@@ -2,28 +2,10 @@ module EffectiveQbSync
   class Engine < ::Rails::Engine
     engine_name 'effective_qb_sync'
 
-    config.autoload_paths += Dir["#{config.root}/app/models/**/"]
-
     # Set up our default configuration options.
     initializer "effective_qb_sync.defaults", before: :load_config_initializers do |app|
       eval File.read("#{config.root}/config/effective_qb_sync.rb")
     end
 
-    # Include acts_as_addressable concern and allow any ActiveRecord object to call it
-    initializer 'effective_qb_sync.active_record' do |app|
-      Rails.application.config.to_prepare do
-        ActiveSupport.on_load :active_record do
-          Effective::OrderItem.class_eval do
-            has_one :qb_order_item
-
-            # first or build
-            def qb_item_name
-              (qb_order_item || build_qb_order_item(name: purchasable.qb_item_name)).name
-            end
-          end
-        end
-      end
-    end
-
   end
 end

data/lib/effective_qb_sync/version.rb

@@ -1,3 +1,3 @@
 module EffectiveQbSync
-  VERSION = '1.2.3'.freeze
+  VERSION = '1.3.2'.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.2.3
+  version: 1.3.2
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,35 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: devise
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: effective_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: effective_datatables
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -120,7 +92,6 @@ files:
 - app/controllers/admin/qb_syncs_controller.rb
 - app/controllers/effective/qb_sync_controller.rb
 - app/datatables/effective_qb_sync_datatable.rb
-- app/models/effective/access_denied.rb
 - app/models/effective/qb_log.rb
 - app/models/effective/qb_machine.rb
 - app/models/effective/qb_order_item.rb
@@ -128,10 +99,8 @@ files:
 - app/models/effective/qb_request.rb
 - app/models/effective/qb_ticket.rb
 - app/models/effective/qbwc_supervisor.rb
-- app/views/admin/qb_syncs/_actions.html.haml
 - app/views/admin/qb_syncs/_form.html.haml
 - app/views/admin/qb_syncs/_qb_item_names.html.haml
-- app/views/admin/qb_syncs/_simple_form.html.haml
 - app/views/admin/qb_syncs/index.html.haml
 - app/views/admin/qb_syncs/instructions.html.haml
 - app/views/admin/qb_syncs/show.html.haml
@@ -192,8 +161,6 @@ files:
 - spec/dummy/config/secrets.yml
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
-- spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -211,7 +178,7 @@ homepage: https://github.com/code-and-effect/effective_qb_sync
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -226,62 +193,59 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Synchronize EffectiveOrders with QuickBooks Web Connector.
 test_files:
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
+- spec/spec_helper.rb
 - spec/dummy/app/models/product.rb
 - spec/dummy/app/models/product_with_float_price.rb
 - spec/dummy/app/models/user.rb
+- spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/bin/rake
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
-- spec/dummy/bin/rake
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
+- spec/dummy/config/secrets.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config/locales/en.yml
 - spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/boot.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/devise.rb
+- spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/effective_addresses.rb
-- spec/dummy/config/initializers/effective_orders.rb
-- spec/dummy/config/initializers/effective_qb_sync.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/simple_form.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/secrets.yml
+- spec/dummy/config/initializers/effective_qb_sync.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/devise.rb
+- spec/dummy/config/initializers/effective_orders.rb
+- spec/dummy/config/initializers/simple_form.rb
+- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config.ru
-- spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/log/development.log
-- spec/dummy/log/test.log
-- spec/dummy/public/404.html
+- spec/dummy/Rakefile
+- spec/dummy/public/favicon.ico
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/Rakefile
+- spec/dummy/public/404.html
+- spec/dummy/db/schema.rb
+- spec/dummy/db/test.sqlite3
 - spec/dummy/README.rdoc
-- spec/fixtures/qbxml_response_error.xml
-- spec/fixtures/qbxml_response_success.xml
-- spec/models/acts_as_purchasable_spec.rb
-- spec/models/factories_spec.rb
-- spec/models/qb_machine_spec.rb
 - spec/models/qb_request_spec.rb
 - spec/models/qb_ticket_spec.rb
-- spec/spec_helper.rb
+- spec/models/qb_machine_spec.rb
+- spec/models/factories_spec.rb
+- spec/models/acts_as_purchasable_spec.rb
 - spec/support/factories.rb
+- spec/fixtures/qbxml_response_success.xml
+- spec/fixtures/qbxml_response_error.xml

data/app/models/effective/access_denied.rb

@@ -1,17 +0,0 @@
-unless defined?(Effective::AccessDenied)
-  module Effective
-    class AccessDenied < StandardError
-      attr_reader :action, :subject
-
-      def initialize(message = nil, action = nil, subject = nil)
-        @message = message
-        @action = action
-        @subject = subject
-      end
-
-      def to_s
-        @message || I18n.t(:'unauthorized.default', :default => 'Access Denied')
-      end
-    end
-  end
-end

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

@@ -1,8 +0,0 @@
-- show_path = effective_qb_sync.admin_qb_sync_path(qb_sync)
-
-- if defined?(EffectiveBootstrap)
-  = dropdown(variation: :dropleft) do
-    = dropdown_link_to 'View', show_path
-- else
-  = link_to show_path, title: 'View' do
-    %span.glyphicon.glyphicon-eye-open

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

@@ -1,19 +0,0 @@
-= simple_form_for qb_order_items_form, (EffectiveOrders.admin_simple_form_options || {}).merge(url: effective_qb_sync.admin_qb_sync_path(qb_order_items_form)) do |f|
-  %table.table
-    %thead
-      %tr
-        %th Order
-        %th Order Item
-        %th Quickbooks Item Name
-    %tbody
-      - qb_ticket.orders.each do |order|
-        - order.order_items.each_with_index do |order_item, index|
-          %tr
-            %td= (link_to(('#' + order.to_param.to_s), effective_orders.admin_order_path(order)) if index == 0)
-            %td= order_item
-            %td
-              = f.simple_fields_for :qb_order_items, order_item.qb_order_item do |foi|
-                = foi.input :order_item_id, as: :hidden, value: order_item.id
-                = foi.input :name, label: false, required: false
-
-  %p= f.button :submit, 'Save Quickbooks Item Names', data: { disable_with: 'Saving...' }

data/spec/dummy/log/development.log

@@ -1,90 +0,0 @@
-   (17.9ms)  CREATE TABLE "qb_logs" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "qb_ticket_id" integer, "message" text, "created_at" datetime, "updated_at" datetime) 
-   (0.1ms)  select sqlite_version(*)
-   (1.1ms)  CREATE  INDEX "index_qb_logs_on_qb_ticket_id" ON "qb_logs" ("qb_ticket_id")
-   (1.2ms)  CREATE TABLE "qb_order_items" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "order_item_id" integer, "name" varchar, "created_at" datetime, "updated_at" datetime) 
-   (1.1ms)  CREATE  INDEX "index_qb_order_items_on_order_item_id" ON "qb_order_items" ("order_item_id")
-   (1.0ms)  CREATE TABLE "qb_requests" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "order_id" integer, "qb_ticket_id" integer, "state" varchar DEFAULT 'Processing', "error" text, "request_type" varchar, "request_qbxml" text, "response_qbxml" text, "request_sent_at" datetime, "response_received_at" datetime, "created_at" datetime, "updated_at" datetime) 
-   (1.0ms)  CREATE  INDEX "index_qb_requests_on_order_id" ON "qb_requests" ("order_id")
-   (1.0ms)  CREATE TABLE "qb_tickets" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "qb_request_id" integer, "username" varchar, "hpc_response" text, "company_file_name" varchar, "country" varchar, "qbxml_major_version" varchar, "qbxml_minor_version" varchar, "state" varchar DEFAULT 'Ready', "percent" integer DEFAULT 0, "connection_error_hresult" text, "connection_error_message" text, "last_error" text, "created_at" datetime, "updated_at" datetime) 
-   (0.8ms)  CREATE  INDEX "index_qb_tickets_on_qb_request_id" ON "qb_tickets" ("qb_request_id")
-   (1.0ms)  CREATE TABLE "addresses" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "addressable_type" varchar, "addressable_id" integer, "category" varchar(64), "full_name" varchar, "address1" varchar, "address2" varchar, "city" varchar, "state_code" varchar, "country_code" varchar, "postal_code" varchar, "updated_at" datetime, "created_at" datetime) 
-   (0.9ms)  CREATE  INDEX "index_addresses_on_addressable_id" ON "addresses" ("addressable_id")
-   (0.1ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_addresses_on_addressable_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_addresses_on_addressable_id' AND type='index'
-
-   (0.8ms)  CREATE  INDEX "index_addresses_on_addressable_type_and_addressable_id" ON "addresses" ("addressable_type", "addressable_id")
-   (0.9ms)  CREATE TABLE "cart_items" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "cart_id" integer, "purchasable_type" varchar, "purchasable_id" integer, "quantity" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
-   (1.2ms)  CREATE  INDEX "index_cart_items_on_cart_id" ON "cart_items" ("cart_id")
-   (0.1ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_cart_items_on_cart_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_cart_items_on_cart_id' AND type='index'
-
-   (1.1ms)  CREATE  INDEX "index_cart_items_on_purchasable_id" ON "cart_items" ("purchasable_id")
-   (0.1ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_cart_items_on_purchasable_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_cart_items_on_purchasable_id' AND type='index'
-
-   (0.1ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_cart_items_on_cart_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_cart_items_on_cart_id' AND type='index'
-
-   (0.9ms)  CREATE  INDEX "index_cart_items_on_purchasable_type_and_purchasable_id" ON "cart_items" ("purchasable_type", "purchasable_id")
-   (1.0ms)  CREATE TABLE "carts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
-   (0.9ms)  CREATE  INDEX "index_carts_on_user_id" ON "carts" ("user_id")
-   (0.8ms)  CREATE TABLE "custom_products" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar, "price" integer DEFAULT 0, "tax_exempt" boolean, "created_at" datetime, "updated_at" datetime) 
-   (1.0ms)  CREATE TABLE "customers" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer, "stripe_customer_id" varchar, "stripe_active_card" varchar, "stripe_connect_access_token" varchar, "created_at" datetime, "updated_at" datetime) 
-   (2.2ms)  CREATE TABLE "order_items" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "order_id" integer, "seller_id" integer, "purchasable_type" varchar, "purchasable_id" integer, "title" varchar, "quantity" integer, "price" integer DEFAULT 0, "tax_exempt" boolean, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
-   (1.1ms)  CREATE  INDEX "index_order_items_on_order_id" ON "order_items" ("order_id")
-   (0.1ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_order_items_on_order_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_order_items_on_order_id' AND type='index'
-
-   (0.9ms)  CREATE  INDEX "index_order_items_on_purchasable_id" ON "order_items" ("purchasable_id")
-   (0.1ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_order_items_on_purchasable_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_order_items_on_purchasable_id' AND type='index'
-
-   (0.1ms)              SELECT sql
-            FROM sqlite_master
-            WHERE name='index_order_items_on_order_id' AND type='index'
-            UNION ALL
-            SELECT sql
-            FROM sqlite_temp_master
-            WHERE name='index_order_items_on_order_id' AND type='index'
-
-   (1.0ms)  CREATE  INDEX "index_order_items_on_purchasable_type_and_purchasable_id" ON "order_items" ("purchasable_type", "purchasable_id")
-   (1.1ms)  CREATE TABLE "orders" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer, "purchase_state" varchar, "purchased_at" datetime, "payment" text, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL, "note" text, "total" integer, "tax_rate" decimal(6,3), "subtotal" integer, "tax" integer, "payment_provider" varchar, "payment_card" varchar) 
-   (1.8ms)  CREATE  INDEX "index_orders_on_user_id" ON "orders" ("user_id")
-   (0.8ms)  CREATE TABLE "products" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar, "price" integer DEFAULT 0, "tax_exempt" boolean, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
-   (0.9ms)  CREATE TABLE "product_with_float_prices" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar, "price" decimal DEFAULT 0, "tax_exempt" boolean, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
-   (1.0ms)  CREATE TABLE "subscriptions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "customer_id" integer, "stripe_plan_id" varchar, "stripe_subscription_id" varchar, "stripe_coupon_id" varchar, "title" varchar, "price" integer DEFAULT 0, "created_at" datetime, "updated_at" datetime) 
-   (1.2ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "encrypted_password" varchar, "reset_password_token" varchar, "reset_password_sent_at" datetime, "remember_created_at" datetime, "confirmation_sent_at" datetime, "confirmed_at" datetime, "confirmation_token" varchar, "unconfirmed_email" varchar, "sign_in_count" integer DEFAULT 0, "current_sign_in_at" datetime, "last_sign_in_at" datetime, "current_sign_in_ip" varchar, "last_sign_in_ip" varchar, "email" varchar, "roles_mask" integer DEFAULT 0, "archived" boolean DEFAULT 'f', "updated_at" datetime, "created_at" datetime) 
-   (2.4ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
-   (1.0ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-   (0.1ms)  SELECT version FROM "schema_migrations"
-   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('5')

data/spec/dummy/log/test.log

@@ -1 +0,0 @@
-   (0.5ms)  SELECT MAX("orders"."id") FROM "orders"