effective_qb_online 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7fc21efb0c22e83527301d73ea8361950ac6509df72473f6b508c02a4395033
-  data.tar.gz: d64a65682a39acda71d381395cf88075f8ac52d2675c1edd0056d417a8c082dc
+  metadata.gz: 20091c462c42fe7c361cc24f430c7ac8050b5fd101db4d18b0dd96730b1d7e8f
+  data.tar.gz: 86db22b8febd131c30659676ad3a39edb1d6ee8c3cf84fda9055d12c1fab6658
 SHA512:
-  metadata.gz: 8906f78473bcdbd0f52968e7e5071296116bbdda9bb772fcc02c76bc6bf6d21cbe53767550687417b896cf0d171f63b3e7758526259777c4a709dc22d87640f4
-  data.tar.gz: 642358ce67927f0fd30dc7af890d082a35291fed20a0b8ef2497ebeec41dc88154d0ab4d278836cb56d63b1eed638f3be9620475c0c2bf19316473d212534b65
+  metadata.gz: fda907556a72911aedbfa905ea2faef422f6ef4f7a78e0591353f655ffc3b0f3b66a3fc024381f2de0a143315f32f80c567c63bba47b5453471731d733f97708
+  data.tar.gz: b37c30a31998a33d7f4fc5e50256f2c09b4833a541384717473edf90b11bd692c8a7082ec000acf3e184e22c872346fad7b9f85509c023d20e9d452cc8378429

data/app/datatables/admin/effective_qb_items_datatable.rb

@@ -1,12 +1,15 @@
 module Admin
   class EffectiveQbItemsDatatable < Effective::Datatable
     datatable do
-      col :name, label: 'QuickBooks Item Name'
       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_collection.values.flatten(1)
+      EffectiveQbOnline.api.items.map do |item|
+        [item.id, item.name, item.fully_qualified_name]
+      end
     end
 
   end

data/app/models/effective/qb_sales_receipt.rb

@@ -30,17 +30,23 @@ module Effective
         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
+        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
-          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?
+          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
 
@@ -99,5 +105,11 @@ module Effective
       sales_receipt
     end
 
+    private
+
+    def self.scrub(value)
+      value.to_s.downcase.strip
+    end
+
   end
 end

data/lib/effective_qb_online/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_qb_online
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Code and Effect