effective_qb_online 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b576a3949ed29e03fff73780968b77c380cd4454c8117b39aba87690f96a0ae9
-  data.tar.gz: c16c7f2ad020a416e0fae62fa98016cff913f1bd372e4e06feb8cd042954ebae
+  metadata.gz: 20091c462c42fe7c361cc24f430c7ac8050b5fd101db4d18b0dd96730b1d7e8f
+  data.tar.gz: 86db22b8febd131c30659676ad3a39edb1d6ee8c3cf84fda9055d12c1fab6658
 SHA512:
-  metadata.gz: 07c548ac7ea522e377897dca08cb17f77b3db74b3633bd61135584297857c04100a7adc1942f410b141dbbb2c7e3968e748c2769f4e32c98fbd627977924c8fc
-  data.tar.gz: d4986d17edbe98241942c5888537f2593fcbab09a0ddf81c6194989a0daf7db7124025c992c0d39ac1157077314cd8b6dd3dcdbdecd6dabd05e4a00e428e6c99
+  metadata.gz: fda907556a72911aedbfa905ea2faef422f6ef4f7a78e0591353f655ffc3b0f3b66a3fc024381f2de0a143315f32f80c567c63bba47b5453471731d733f97708
+  data.tar.gz: b37c30a31998a33d7f4fc5e50256f2c09b4833a541384717473edf90b11bd692c8a7082ec000acf3e184e22c872346fad7b9f85509c023d20e9d452cc8378429

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,16 @@
+module Admin
+  class EffectiveQbItemsDatatable < Effective::Datatable
+    datatable do
+      col :id, label: 'QuickBooks Item Id'
+      col :name, label: 'QuickBooks Item Name'
+      col :fully_qualified_name, label: 'QuickBooks Fully Qualified Name'
+    end
+
+    collection do
+      EffectiveQbOnline.api.items.map do |item|
+        [item.id, item.name, item.fully_qualified_name]
+      end
+    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_api.rb

@@ -75,19 +75,10 @@ module Effective
       items
         .reject { |item| item.type == 'Category' }
         .sort_by { |item| [item.type, item.name] }
-        .map { |item| [item_name(item), item.id, {'data-html': item_html(item)}, item.type] }
+        .map { |item| [item.name, item.id, {'data-html': item_html(item)}, item.type] }
         .group_by(&:last)
     end
 
-    def item_name(item)
-      [
-        item.name,
-        ("##{item.id}"),
-        (item.sku if item.sku.present?),
-        (item.description if item.description.present?)
-      ].compact.join(' ')
-    end
-
     def item_html(item)
       details = [
         ("##{item.id}"),

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,25 @@ 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 = [
+          (scrub(purchasable.qb_item_id) if purchasable.try(:qb_item_id)),
+          (scrub(purchasable.qb_item_name) if purchasable.try(:qb_item_name))
+        ].compact
+
         # Find item by receipt item
-        item = items.find { |item| [item.id, item.name].include?(receipt_item.item_id) }
+        item = items.find do |item|
+          [scrub(item.id), scrub(item.name), scrub(item.fully_qualified_name)].include?(scrub(receipt_item.item_id))
+        end
 
         # 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? }
+        item ||= items.find do |item|
+          ([scrub(item.id), scrub(item.name), scrub(item.fully_qualified_name)] & purchasable_id_name).present?
         end
 
         if item.blank?
-          raise("Unknown QuickBooks Item for #{purchasable} (#{purchasable.class.name} ##{purchasable.id})")
+          purchasable_id_name = [purchasable.try(:qb_item_id), purchasable.try(:qb_item_name)].compact
+          raise("Unknown Item #{purchasable_id_name.join(' or ')} from #{purchasable} (#{purchasable.class.name} ##{purchasable.id})")
         end
 
         receipt_item.update!(item_id: item.id)
@@ -97,5 +105,11 @@ module Effective
       sales_receipt
     end
 
+    private
+
+    def self.scrub(value)
+      value.to_s.downcase.strip
+    end
+
   end
 end

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.5'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_qb_online
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-11 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