effective_qb_sync 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 097beccac064a814cbb2ce8e32c563b2d0fc25a1
-  data.tar.gz: 4149c1643c8ff8ec1e683aa1b4a0d9c75cd6e7fb
+  metadata.gz: 7396424bcd93f518f79f503a4ec0855410c3b690
+  data.tar.gz: cfab9318b68fa74de2e58edf05ce3ac1ae84de9d
 SHA512:
-  metadata.gz: a6b8bc2c86d80c2db2dd09a296d527aae4af98e0fe72d1e39c5d79c760a6b89c02445f75f295204f67ad5acb338ded91776997bbd89e0b604679ae27b37247ee
-  data.tar.gz: 1dd57a222f8af77c56fd5bbd5a47dbcc2127e0f79209cab032b04cb53589dab2b013934ebed93d80fa2af13770f7178705f77df2732d179afc0c51dba8116335
+  metadata.gz: e5b0a32248537b7730b9ea555b02dda870761d3d1cb48be664271c3ba786359fc5cb07c474e3d59a98f99bc501be230b03a90761dbd0c6c5257b7953585bed05
+  data.tar.gz: bf84fa497145aad617107f9443c46cb39f5bc8750c9261f038bf132f08c2d4b6c0feb0730d6dcc436374a65be3136905ded384aa0f05ede41914993a72e5d41d

data/app/controllers/admin/qb_syncs_controller.rb

@@ -1,12 +1,18 @@
 module Admin
   class QbSyncsController < ApplicationController
-    before_filter :authenticate_user!   # This is devise, ensure we're logged in.
-    before_filter :restrict_access
+    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)
 
     layout (EffectiveQbSync.layout.kind_of?(Hash) ? EffectiveQbSync.layout[:admin_qb_tickets] : EffectiveQbSync.layout)
 
     def index
-      @datatable = Effective::Datatables::QbSyncs.new()
+
+      if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
+        @datatable = Effective::Datatables::QbSyncs.new()
+      else
+        @datatable = EffectiveQbSyncDatatable.new(self)
+      end
+
       @page_title = 'Quickbooks Synchronizations'
     end
 

data/app/datatables/effective_qb_sync_datatable.rb

@@ -0,0 +1,36 @@
+unless Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
+  class EffectiveQbSyncDatatable < Effective::Datatable
+    datatable do
+      order :created_at, :desc
+
+      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 :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
+
+      actions_col partial: 'admin/qb_syncs/actions', partial_as: :qb_sync
+    end
+
+    collection do
+      Effective::QbTicket.includes(qb_requests: :order)
+    end
+
+  end
+end

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

@@ -1,4 +1,4 @@
-if defined?(EffectiveDatatables)
+if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
   module Effective
     module Datatables
       class QbSyncs < Effective::Datatable

data/lib/effective_qb_sync/engine.rb

@@ -12,12 +12,12 @@ module EffectiveQbSync
     # 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?
-        Rails.application.eager_load!
-
-        invalids = (ActsAsPurchasable.descendants || []).reject { |klass| (klass.new().try(:qb_item_name).present? rescue false) }
+        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."
+          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

data/lib/effective_qb_sync/version.rb

@@ -1,3 +1,3 @@
 module EffectiveQbSync
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_qb_sync
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -245,6 +245,7 @@ files:
 - Rakefile
 - 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/datatables/qb_syncs.rb
 - app/models/effective/qb_log.rb