effective_qb_sync 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a113b291316d9de42ed93d109383c450f78350c
-  data.tar.gz: a2abcdb6693ba01eca2bcdca3be61ee425a27cd4
+  metadata.gz: 097beccac064a814cbb2ce8e32c563b2d0fc25a1
+  data.tar.gz: 4149c1643c8ff8ec1e683aa1b4a0d9c75cd6e7fb
 SHA512:
-  metadata.gz: ba160b6f7a40947fb73c7e4f65b214403c39ca3b744a6dcdc36a844f16cdbd36b65e9a247c49c873cd6688bd50c4e0869f6debdd1e80d12ad573659e5869aa8c
-  data.tar.gz: 369745e8a4689be8f02714552583c9c7d9c0dbff590f25904481ca2382f4c3461f646d0da91d501b320600ce459e55383d9d40e2ac6eede5661f0d1d3236e4ad
+  metadata.gz: a6b8bc2c86d80c2db2dd09a296d527aae4af98e0fe72d1e39c5d79c760a6b89c02445f75f295204f67ad5acb338ded91776997bbd89e0b604679ae27b37247ee
+  data.tar.gz: 1dd57a222f8af77c56fd5bbd5a47dbcc2127e0f79209cab032b04cb53589dab2b013934ebed93d80fa2af13770f7178705f77df2732d179afc0c51dba8116335

data/app/controllers/admin/qb_syncs_controller.rb

@@ -6,7 +6,7 @@ module Admin
     layout (EffectiveQbSync.layout.kind_of?(Hash) ? EffectiveQbSync.layout[:admin_qb_tickets] : EffectiveQbSync.layout)
 
     def index
-      @datatable = Effective::Datatables::QbSyncs.new() if defined?(EffectiveDatatables)
+      @datatable = Effective::Datatables::QbSyncs.new()
       @page_title = 'Quickbooks Synchronizations'
     end
 

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

@@ -1,6 +1,6 @@
-%h2.effective-qb-sync-page-title= (@page_title || 'Quickbooks Synchronizations')
+%h1.effective-admin-heading= @page_title
 
-%p.text-right.effective-qb-sync-page-action
+%p.text-right.effective-admin-actions
   = link_to 'Quickbooks Setup Instructions', effective_qb_sync.instructions_admin_qb_syncs_path, class: 'btn btn-primary'
 
 %hr
@@ -15,10 +15,8 @@
 
 %hr
 
-- if @datatable.nil?
-  %p Please install #{link_to 'effective_datatables', 'https://github.com/code-and-effect/effective_datatables'} to see this page.
-- elsif @datatable.present?
-  = render_datatable @datatable
+- if @datatable.present?
+  = render_datatable(@datatable)
 - else
   %p There are no Quickbook Syncs present
 

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

@@ -45,7 +45,7 @@
         %li Re-run the QuickBooks Sync
 
       - else
-        %li This is an error without a predefined resolution. Please wait for AgileStyle to follow up with you.
+        %li This is an error without a predefined resolution.
 
 -# Common error messages for reference:
 

data/config/effective_qb_sync.rb

@@ -1,5 +1,3 @@
-# EffectiveQbSync Rails Engine
-
 EffectiveQbSync.setup do |config|
   # Configure Database Tables
   config.qb_requests_table_name = :qb_requests
@@ -26,7 +24,7 @@ EffectiveQbSync.setup do |config|
   #
   # Or disable the check completely:
   # config.authorization_method = false
-  config.authorization_method = Proc.new { |controller, action, resource| true }
+  config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) } # CanCanCan
 
   # All EffectiveQbSync controllers will use this layout
   config.layout = 'application'

data/lib/effective_qb_sync.rb

@@ -34,9 +34,7 @@ module EffectiveQbSync
   end
 
   def self.permitted_params
-    [
-      :note
-    ]
+    [:note]
   end
 
 end

data/lib/effective_qb_sync/engine.rb

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

data/lib/effective_qb_sync/version.rb

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

data/lib/generators/effective_qb_sync/install_generator.rb

@@ -35,8 +35,9 @@ module EffectiveQbSync
         @qb_logs_table_name = ':' + EffectiveQbSync.qb_logs_table_name.to_s
         @qb_order_items_table_name = ':' + EffectiveQbSync.qb_order_items_table_name.to_s
 
-        migration_template '../../../db/migrate/01_create_effective_qb_sync.rb.erb', 'db/migrate/create_effective_qb_sync.rb'
+        migration_template ('../' * 3) + 'db/migrate/01_create_effective_qb_sync.rb.erb', 'db/migrate/create_effective_qb_sync.rb'
       end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_qb_sync
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !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