effective_qb_sync 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 357b14cee13610f77a1ce6db294b842eb1870778
-  data.tar.gz: 2afe65aa9344c0ec0ab301b8176b2f7e558d031d
+  metadata.gz: abb025ece9f83664fc48e4373b7844bd26537f6f
+  data.tar.gz: 49bc39d12877b462f3c7bd034de5463a6067c3be
 SHA512:
-  metadata.gz: d50312065f5de11a306ac1b20366b401de3e66e1483b7941f584c603f82f1be669aba24c4be8fafd2e2c94be0394e48b746f3dab1fa9700a55aed3db6e9e6429
-  data.tar.gz: cdebb3a09b61ac63a07d92bea5ac39065dd383f76eb744a4b201ba96fe88ac671e145a35c6544b1add38ba9ef650ca50018c685bd23d791619a7495db9f23647
+  metadata.gz: 0c3aadb7bb349781904a08d0082e7a491cd7e7413432446660391baf662f4a287eff505b32fdf4b98ed2cf76a602a5778e5f875aeeb4796fc41fac4b91e40c57
+  data.tar.gz: 4f19589875ac5fa5a47f6ad318e10d1cca50cf6ca08e043aea26517721d1488f7cded108cf0eca4b5c9f91cec5b14f3376835e1416eb64d5ee073c522e1752f5

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2016 Code and Effect Inc.
+Copyright 2018 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,16 +1,12 @@
 module Admin
   class QbSyncsController < ApplicationController
-    respond_to?(:before_action) ? before_action(:authenticate_user!) : before_filter(:authenticate_user!) # Devise
-    respond_to?(:before_action) ? before_action(:restrict_access) : before_filter(:restrict_access)
+    before_action :authenticate_user!
+    before_action :restrict_access
 
     layout (EffectiveQbSync.layout.kind_of?(Hash) ? EffectiveQbSync.layout[:admin_qb_tickets] : EffectiveQbSync.layout)
 
     def index
-      if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
-        @datatable = Effective::Datatables::QbSyncs.new()
-      else
-        @datatable = EffectiveQbSyncDatatable.new(self)
-      end
+      @datatable = EffectiveQbSyncDatatable.new(self)
 
       @page_title = 'Quickbooks Synchronizations'
     end
@@ -50,10 +46,32 @@ module Admin
       render '/effective/qb_web_connector/quickbooks.qwc', layout: false
     end
 
+    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
+
+          flash[:success] = 'Successfully set all orders finished'
+        rescue => e
+          flash[:danger] = "Unable to set all orders finished: #{e.message}"
+          raise ActiveRecord::Rollback
+        end
+      end
+
+      redirect_to effective_qb_sync.admin_qb_syncs_path
+    end
+
     private
 
     def restrict_access
-      EffectiveQbSync.authorized?(self, :admin, :effective_qb_sync)
+      EffectiveQbSync.authorize!(self, :admin, :effective_qb_sync)
     end
 
     def permitted_qb_order_items_params

data/app/controllers/effective/qb_sync_controller.rb

@@ -1,7 +1,7 @@
 module Effective
   class QbSyncController < ApplicationController
     skip_authorization_check if defined?(CanCan)
-    respond_to?(:skip_before_action) ? skip_before_action(:verify_authenticity_token) : skip_before_filter(:verify_authenticity_token)
+    skip_before_action :verify_authenticity_token
 
     def api
       # respond successfully to a GET which some versions of the Web Connector send to verify the url

data/app/datatables/effective_qb_sync_datatable.rb

@@ -1,36 +1,34 @@
-unless Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
-  class EffectiveQbSyncDatatable < Effective::Datatable
-    datatable do
-      order :created_at, :desc
+class EffectiveQbSyncDatatable < Effective::Datatable
+  datatable do
+    order :created_at, :desc
 
-      col :created_at
-      col :state, search: { collection: Effective::QbTicket::STATES }
+    col :created_at
+    col :state, search: { collection: Effective::QbTicket::STATES }
 
-      val :num_orders, visible: false do |qb_ticket|
-        qb_ticket.qb_requests.length
-      end
+    val :num_orders, visible: false do |qb_ticket|
+      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
+    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
+      if order.present?
+        collection.where(id: Effective::QbRequest.where(order_id: order.id).pluck(:qb_ticket_id))
+      else
+        collection.none
       end
-
-      actions_col partial: 'admin/qb_syncs/actions', partial_as: :qb_sync
     end
 
-    collection do
-      Effective::QbTicket.includes(qb_requests: :order)
-    end
+    actions_col partial: 'admin/qb_syncs/actions', partial_as: :qb_sync
+  end
 
+  collection do
+    Effective::QbTicket.includes(qb_requests: :order)
   end
+
 end

data/app/models/effective/qb_log.rb

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

data/app/models/effective/qb_order_item.rb

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

data/app/models/effective/qb_request.rb

@@ -3,26 +3,23 @@ module Effective
     belongs_to :qb_ticket
     belongs_to :order
 
-    # NOTE: Anything that is 'raise' here finds its way to qb_ticket#error!
+    # NOTE: Anything that is 'raise' here finds its way to qb_ticket#error
 
     # these are the states that signal a request is finished
     COMPLETED_STATES = ['Finished', 'Error']
     PROCESSING_STATES = ['Processing', 'CustomerQuery', 'CreateCustomer', 'OrderSync']
 
-    # structure do
-    #   request_qbxml         :text
-    #   response_qbxml        :text
+    # Attributes
+    # request_qbxml         :text
+    # response_qbxml        :text
 
-    #   request_sent_at       :datetime
-    #   response_received_at  :datetime
+    # request_sent_at       :datetime
+    # response_received_at  :datetime
 
-    #   state                 :string, :validates => [:presence, :inclusion => { :in => COMPLETED_STATES + PROCESSING_STATES}]
-    #   error                 :text
+    # state                 :string
+    # error                 :text
 
-    #   site_id               :integer    # ActsAsSiteSpecific
-
-    #   timestamps
-    # end
+    # timestamps
 
     validates :state, inclusion: { in: COMPLETED_STATES + PROCESSING_STATES }
     validates :qb_ticket, presence: true

data/app/models/effective/qb_ticket.rb

@@ -7,26 +7,23 @@ module Effective
 
     STATES = ['Ready', 'Authenticated', 'Processing', 'Finished', 'ConnectionError', 'RequestError']
 
-    # structure do
-    #   username                  :string
-    #   company_file_name         :string
-    #   country                   :string
+    # Attributes
+    # 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', :validates => [:presence, :inclusion => { :in => STATES}]
-    #   percent                   :integer, :default => 0
+    # 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
 
-    #   site_id                   :integer    # ActsAsSiteSpecific
-
-    #   timestamps
-    # end
+    # timestamps
 
     validates :state, inclusion: { in: STATES }
 
@@ -42,7 +39,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'
-      ).try(:deliver_now).try(:deliver)
+      ).public_send(EffectiveOrders.mailer[:deliver_method])
 
       self.update_attributes!(atts.reverse_merge({last_error: error}))
     end
@@ -51,5 +48,6 @@ module Effective
     def log(message)
       qb_logs.create(message: message, qb_ticket: self)
     end
+
   end
 end

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

@@ -1,2 +1,8 @@
-= link_to effective_qb_sync.admin_qb_sync_path(qb_sync), title: 'View' do
-  %span.glyphicon.glyphicon-eye-open
+- 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/_form.html.haml

@@ -0,0 +1,19 @@
+= effective_form_with(model: qb_order_items_form, 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.fields_for :qb_order_items, order_item.qb_order_item do |foi|
+                = f.hidden_field :order_item_id, order_item.id
+                = foi.text_field :name, label: false, required: false
+
+  = effective_save(f, 'Save QuickBooks Item Names')

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

@@ -1,9 +1,6 @@
 %table.table
   %thead
     %th Quickbooks Item Name/Number
-    -#%th Website object
   %tbody
-    - ActsAsPurchasable.descendants.each do |klass|
-      %tr
-        %td= klass.new().try(:qb_item_name)
-        -#%td= klass.name
+    %tr
+      %td

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

@@ -0,0 +1,19 @@
+= 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/app/views/admin/qb_syncs/index.html.haml

@@ -15,7 +15,4 @@
 
 %hr
 
-- if @datatable.present?
-  = render_datatable(@datatable)
-- else
-  %p There are no Quickbook Syncs present
+= render_datatable(@datatable)

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

@@ -133,4 +133,15 @@
     %strong= EffectiveQbSync.error_email || EffectiveOrders.mailer[:admin_email]
     will receive an email with instructions on how to fix the error
 
+%h3 6. Troubleshooting
+
+%p
+  Don't actually use this, but click below to skip all unsynced orders.
+
+%ul
+  %li This action will create a finished QbTicket containing all orders.
+  %li All orders will be considered already synced, and will not be sent to QuickBooks again.
+  %li You might need a developer's help to undo this.
+  - unsynced = Effective::QbRequest.new_requests_for_unsynced_items.length
+  %li= link_to "Mark all #{unsynced} unsynced orders as already synchronized", effective_qb_sync.set_all_orders_finished_admin_qb_syncs_path, 'data-method': :post, 'data-confirm': 'Are you sure?'
 

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

@@ -9,25 +9,10 @@
 
 %h3 Orders
 
-= 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...' }
+- 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
 
 %h3 Sync Log
 

data/config/routes.rb

@@ -1,9 +1,5 @@
-Rails.application.routes.draw do
-  mount EffectiveQbSync::Engine => '/', as: 'effective_qb_sync'
-end
-
 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
 
@@ -11,6 +7,11 @@ EffectiveQbSync::Engine.routes.draw do
     resources :qb_syncs, only: [:index, :show, :update] do
       get :instructions, on: :collection
       get :qwc, on: :collection
+      post :set_all_orders_finished, on: :collection
     end
   end
 end
+
+Rails.application.routes.draw do
+  mount EffectiveQbSync::Engine => '/', as: 'effective_qb_sync'
+end

data/db/migrate/01_create_effective_qb_sync.rb.erb

@@ -1,4 +1,4 @@
-class CreateEffectiveQbSync < ActiveRecord::Migration[3.2]
+class CreateEffectiveQbSync < ActiveRecord::Migration[4.2]
   def self.up
     create_table <%= @qb_requests_table_name %> do |t|
       t.integer   :order_id

data/lib/effective_qb_sync.rb

@@ -1,4 +1,3 @@
-require 'simple_form'
 require 'effective_orders'
 require 'effective_qb_sync/engine'
 require 'effective_qb_sync/version'
@@ -26,10 +25,20 @@ module EffectiveQbSync
   end
 
   def self.authorized?(controller, action, resource)
-    if authorization_method.respond_to?(:call) || authorization_method.kind_of?(Symbol)
-      raise Effective::AccessDenied.new() unless (controller || self).instance_exec(controller, action, resource, &authorization_method)
+    @_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
-    true
+  end
+
+  def self.authorize!(controller, action, resource)
+    raise Effective::AccessDenied unless authorized?(controller, action, resource)
   end
 
   def self.permitted_params

data/lib/effective_qb_sync/engine.rb

@@ -9,19 +9,6 @@ module EffectiveQbSync
       eval File.read("#{config.root}/config/effective_qb_sync.rb")
     end
 
-    # Ensure every acts_as_purchasable object responds to qb_item_name
-    initializer 'effective_qb_sync.assert_qb_item_names_present' do |app|
-      if Rails.env.development?
-        ActiveSupport.on_load :active_record do
-          invalids = (ActsAsPurchasable.descendants || []).reject { |klass| (klass.new().try(:qb_item_name).present? rescue false) }
-
-          if invalids.present?
-            puts "WARNING: (effective_qb_sync) expected acts_as_purchasable objects #{invalids.map(&:to_s).to_sentence} .qb_item_name() to be present."
-          end
-        end
-      end
-    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
@@ -31,7 +18,7 @@ module EffectiveQbSync
 
             # first or build
             def qb_item_name
-              (qb_order_item || build_qb_order_item(name: purchasable.try(:qb_item_name))).name
+              (qb_order_item || build_qb_order_item(name: purchasable.qb_item_name)).name
             end
           end
         end

data/lib/effective_qb_sync/version.rb

@@ -1,3 +1,3 @@
 module EffectiveQbSync
-  VERSION = '1.1.5'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/lib/generators/effective_qb_sync/install_generator.rb

@@ -25,7 +25,7 @@ module EffectiveQbSync
         if mailer_preview_path.present?
           template 'effective_qb_sync_mailer_preview.rb', File.join(mailer_preview_path, 'effective_qb_sync_mailer_preview.rb')
         else
-          puts "couldn't find action_mailer.preview_path.  Skipping effective_qb_sync_mailer_preview."
+          puts "couldn't find action_mailer.preview_path. Skipping effective_qb_sync_mailer_preview."
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_qb_sync
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2018-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,126 +94,14 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simple_form
-  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: effective_orders
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: effective_datatables
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: factory_girl_rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-stack_explorer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -233,7 +121,6 @@ files:
 - app/controllers/effective/qb_sync_controller.rb
 - app/datatables/effective_qb_sync_datatable.rb
 - app/models/effective/access_denied.rb
-- app/models/effective/datatables/qb_syncs.rb
 - app/models/effective/qb_log.rb
 - app/models/effective/qb_machine.rb
 - app/models/effective/qb_order_item.rb
@@ -242,7 +129,9 @@ files:
 - 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
@@ -338,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Synchronize EffectiveOrders with QuickBooks Web Connector.

data/app/models/effective/datatables/qb_syncs.rb

@@ -1,45 +0,0 @@
-if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
-  module Effective
-    module Datatables
-      class QbSyncs < Effective::Datatable
-        datatable do
-          default_order :created_at, :desc
-
-          table_column :created_at
-          table_column :state, filter: { values: QbTicket::STATES }
-
-          array_column :num_orders, visible: false do |qb_ticket|
-            qb_ticket.qb_requests.length
-          end
-
-          table_column :orders, sortable: false, as: :obfuscated_id do |qb_ticket|
-            qb_ticket.qb_requests.select { |qb_request| qb_request.order.present? }
-              .map { |qb_request| link_to "##{qb_request.order.to_param}", effective_orders.admin_order_path(qb_request.order) }
-              .join('<br>').html_safe
-          end
-
-          actions_column partial: 'admin/qb_syncs/actions', partial_local: :qb_sync
-        end
-
-        def collection
-          Effective::QbTicket.includes(qb_requests: :order)
-        end
-
-        def search_column(collection, table_column, search_term, sql_column)
-          if table_column[:name] == 'orders'
-            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
-          else
-            super
-          end
-        end
-
-      end
-    end
-  end
-end