effective_qb_online 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6236043039764c3ed21da2815ed933c0e5fb7a1203d8de504bc48068945c9cc
-  data.tar.gz: 7739b969b9364ca80a9588708eb0c718356e1f8ff7f131b0fed9661d576e2249
+  metadata.gz: a7fc21efb0c22e83527301d73ea8361950ac6509df72473f6b508c02a4395033
+  data.tar.gz: d64a65682a39acda71d381395cf88075f8ac52d2675c1edd0056d417a8c082dc
 SHA512:
-  metadata.gz: e3f15e8dc09f8fa4aefb34494bfadd0b780a029bb60efea223aecbcd3e01feaf99a53937ab02a79c7d4e09fac6ccf8b11f4784aa74de0bcd92b3bae35be4f838
-  data.tar.gz: f4a6c151041e0da67c8ea8ad3536bd2f15747a93c3045058c7d255d53f0f17c1eb81094d530a6ad01844b727b99cacd8e09f919bccba6235550619fac1cf45a4
+  metadata.gz: 8906f78473bcdbd0f52968e7e5071296116bbdda9bb772fcc02c76bc6bf6d21cbe53767550687417b896cf0d171f63b3e7758526259777c4a709dc22d87640f4
+  data.tar.gz: 642358ce67927f0fd30dc7af890d082a35291fed20a0b8ef2497ebeec41dc88154d0ab4d278836cb56d63b1eed638f3be9620475c0c2bf19316473d212534b65

data/app/controllers/admin/qb_online_controller.rb

@@ -5,9 +5,14 @@ module Admin
 
     include Effective::CrudController
 
+    page_title 'QuickBooks Online'
+
     # /admin/quickbooks
     def index
-      @page_title = 'QuickBooks Online'
+    end
+
+    # /admin/quickbooks/items
+    def items
     end
 
   end

data/app/datatables/admin/effective_qb_items_datatable.rb

@@ -0,0 +1,13 @@
+module Admin
+  class EffectiveQbItemsDatatable < Effective::Datatable
+    datatable do
+      col :name, label: 'QuickBooks Item Name'
+      col :id, label: 'QuickBooks Item Id'
+    end
+
+    collection do
+      EffectiveQbOnline.api.items_collection.values.flatten(1)
+    end
+
+  end
+end

data/app/datatables/admin/effective_qb_receipts_datatable.rb

@@ -26,6 +26,13 @@ module Admin
       col :status
       col :result
 
+      col :order_items, label: 'Purchasable Qb Item Names' do |receipt|
+        receipt.order.purchasables.map do |purchasable|
+          purchasable_id_name = [purchasable.try(:qb_item_id), purchasable.try(:qb_item_name)].compact
+          content_tag(:div, purchasable_id_name.join(' or '), class: "col-resource_item")
+        end.join.html_safe
+      end
+
       actions_col
     end
 

data/app/models/effective/qb_realm.rb

@@ -33,5 +33,9 @@ module Effective
       'QuickBooks Online Settings'
     end
 
+    def configured?
+      realm_id.present? && access_token.present? && deposit_to_account_id.present? && payment_method_id.present?
+    end
+
   end
 end

data/app/models/effective/qb_receipt.rb

@@ -79,7 +79,6 @@ module Effective
         error!
       end
 
-      true
     end
 
     def skip!
@@ -93,6 +92,9 @@ module Effective
 
     def error!
       errored!
+      EffectiveLogger.error(result, associated: self) if defined?(EffectiveLogger)
+
+      false
     end
 
   end

data/app/models/effective/qb_sales_receipt.rb

@@ -29,17 +29,19 @@ module Effective
         purchasable = receipt_item.order_item.purchasable
         raise("Expected a purchasable for Effective::OrderItem #{receipt_item.order_item.id}") unless purchasable.present?
 
+        # Either of these could match
+        purchasable_id_name = [purchasable.try(:qb_item_id), purchasable.try(:qb_item_name)].compact
+
         # Find item by receipt item
         item = items.find { |item| [item.id, item.name].include?(receipt_item.item_id) }
 
         # Find item by purchasable qb_item_id and qb_item_name
         item ||= begin
-          purchasable_id_name = [purchasable.try(:qb_item_id), purchasable.try(:qb_item_name)]
           items.find { |item| ([item.id, item.name] & purchasable_id_name).present? }
         end
 
         if item.blank?
-          raise("Unknown QuickBooks Item for #{purchasable} (#{purchasable.class.name} ##{purchasable.id})")
+          raise("Unknown Item #{purchasable_id_name.join(' or ')} from #{purchasable} (#{purchasable.class.name} ##{purchasable.id})")
         end
 
         receipt_item.update!(item_id: item.id)

data/app/views/admin/qb_online/_company.html.haml

@@ -32,6 +32,9 @@
               .col= f.select :payment_method_id, api.payment_methods_collection, label: false
               .col= f.save
 
+      %tr
+        %td Items
+        %td= link_to 'Quickbooks Items', effective_qb_online.admin_quickbooks_items_path
 
 - if company_info.blank?
   %table.table.table-sm

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

@@ -11,8 +11,13 @@
     = card('Test Credentials') do
       = render('test_credentials', api: api)
 
-  = card('Company') do
-    = render('company', api: api)
+  - if api.realm&.configured?
+    .mb-2
+      = collapse('Show Company Settings') do
+        = render('company', api: api)
+  - else
+    = card('Company') do
+      = render('company', api: api)
 
   = card('Sales Receipts') do
     .text-right.mb-2

data/app/views/admin/qb_online/items.html.haml

@@ -0,0 +1,5 @@
+%h1.effective-admin-heading= @page_title
+
+%p The following items are present on the connected QuickBooks company.
+
+= render_datatable(Admin::EffectiveQbItemsDatatable.new)

data/config/routes.rb

@@ -21,6 +21,7 @@ EffectiveQbOnline::Engine.routes.draw do
     end
 
     get '/quickbooks', to: 'qb_online#index', as: :quickbooks
+    get '/quickbooks/items', to: 'qb_online#items', as: :quickbooks_items
   end
 
 end

data/lib/effective_qb_online/version.rb

@@ -1,3 +1,3 @@
 module EffectiveQbOnline
-  VERSION = '0.1.6'.freeze
+  VERSION = '0.1.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_qb_online
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-14 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -212,6 +212,7 @@ files:
 - app/controllers/admin/qb_realms_controller.rb
 - app/controllers/admin/qb_receipts_controller.rb
 - app/controllers/effective/qb_oauth_controller.rb
+- app/datatables/admin/effective_qb_items_datatable.rb
 - app/datatables/admin/effective_qb_receipts_datatable.rb
 - app/helpers/effective_qb_online_helper.rb
 - app/jobs/qb_sync_order_job.rb
@@ -224,6 +225,7 @@ files:
 - app/views/admin/qb_online/_connect.html.haml
 - app/views/admin/qb_online/_test_credentials.html.haml
 - app/views/admin/qb_online/index.html.haml
+- app/views/admin/qb_online/items.html.haml
 - app/views/admin/qb_receipts/_form.html.haml
 - app/views/admin/qb_receipts/edit.html.haml
 - app/views/admin/qb_receipts/new.html.haml