effective_qb_online 0.1.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7fc21efb0c22e83527301d73ea8361950ac6509df72473f6b508c02a4395033
-  data.tar.gz: d64a65682a39acda71d381395cf88075f8ac52d2675c1edd0056d417a8c082dc
+  metadata.gz: f761163092d4217a1ba74cbc4903332f914c4ebb87f8cb5400d0801062aec74f
+  data.tar.gz: '0529a8121cd5ad7fdd16349c7643539f47d09c8420da35312575558d9ca93fd6'
 SHA512:
-  metadata.gz: 8906f78473bcdbd0f52968e7e5071296116bbdda9bb772fcc02c76bc6bf6d21cbe53767550687417b896cf0d171f63b3e7758526259777c4a709dc22d87640f4
-  data.tar.gz: 642358ce67927f0fd30dc7af890d082a35291fed20a0b8ef2497ebeec41dc88154d0ab4d278836cb56d63b1eed638f3be9620475c0c2bf19316473d212534b65
+  metadata.gz: '08195220d727d8b4229a00a54d5b331b825836e4a45aebe1a921ad5b0e31a0d2e8e9628b6310fd896d6c737013f97b9fa7b1db333032a1146f0946c27244d1bd'
+  data.tar.gz: 2f950c7623f4f195b4615fc85b393d720b5c92c3e5a63d8332057df2b7cff76c0cb38ee74c6361cb60f0564aa9ad6dcbb3800a373a52f9ffa47e26b0d47ad274

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

@@ -25,22 +25,41 @@ module Effective
       # Find and validate items
       items = api.items()
 
+      # Credit card surcharge item
+      surcharge_item = if EffectiveOrders.try(:credit_card_surcharge_qb_item_name).present?
+        name = EffectiveOrders.credit_card_surcharge_qb_item_name
+
+        item = items.find do |item|
+          [scrub(item.id), scrub(item.name), scrub(item.fully_qualified_name)].include?(scrub(name))
+        end
+
+        raise("Missing Credit Card Surcharge item #{name}. Please add this to your Quickbooks items.") unless item.present?
+
+        item
+      end
+
       receipt.qb_receipt_items.each do |receipt_item|
         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
+        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
 
@@ -92,6 +111,23 @@ module Effective
         sales_receipt.line_items << line_item
       end
 
+      # Add Credit Card Surcharge
+      if order.try(:surcharge).to_i != 0
+        raise("Expected a Credit Card Surcharge QuickBooks item to exist for Effective::Order #{order.id} with non-zero surcharge amount. Please check your configuration.") unless surcharge_item.present?
+
+        line_item = Quickbooks::Model::Line.new(amount: api.price_to_amount(order.surcharge), description: 'Credit Card Surcharge')
+
+        line_item.sales_item! do |line|
+          line.item_id = surcharge_item.item_id
+          line.tax_code_id = tax_code.id  # Surcharge is taxed at same rate as items
+
+          line.unit_price = api.price_to_amount(order.surcharge)
+          line.quantity = 1
+        end
+
+        sales_receipt.line_items << line_item
+      end
+
       # Double check
       raise("Invalid SalesReceipt generated for Effective::Order #{order.id}") unless sales_receipt.valid?
 
@@ -99,5 +135,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.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_qb_online
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-06 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails