effective_qb_online 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61b15060db97ed61ab2e8109eed9e355dd40bce896c45b48c7e3f4e5fb12bc31
-  data.tar.gz: 43ca4dc7e414119fc41e69773a65cbf070dc695957aeedf2b22bc83c19735447
+  metadata.gz: f20c50a036b10136d52f4c052b16abf5e555cfbe8502babb3b6ceb0922194a42
+  data.tar.gz: 7d45f23076d1678691b6d1f1cfd86331048ae9d40c2020c871ad0567257b3770
 SHA512:
-  metadata.gz: 8d40e89ef96686f96688eb3c2550653cc92dfcad64b1b8068e91af864a88adaedf5af754e230ac85a2a828796c58bbcf83724f7f60ac9776f3178f7f4f982aba
-  data.tar.gz: 6648b00a54b0b5a5018614687116d53b7ad9e53dbad705b3abcac4049c50434f6b2d8684c64e30a28daead8cd337bc4e67839d5a9535989ab7d43c31024bc59b
+  metadata.gz: c2d817cd48f01bae89b467c06b4bd48cb14912698db983947051d083dfae9c07f29502247b6a78deaf602c00288f17525b3737988cfdd94cf64f8bcedbcc9e9e
+  data.tar.gz: 1ffdebaa33b29ba09c0ee322449894b37e7e5c565e4ea5a528a255b53f190728cb9f3b6d62ba3ea4716d70ff1eebc7ed0e7faf754d63178a155d188bc638aa81

data/app/models/effective/qb_api.rb

@@ -41,6 +41,14 @@ module Effective
       )
     end
 
+    def api_error
+      begin
+        company_info.present?; nil
+      rescue => e
+        return e.message
+      end
+    end
+
     # Singular
     def company_info
       with_service('CompanyInfo') { |service| service.fetch_by_id(realm.realm_id) }
@@ -67,10 +75,20 @@ module Effective
       items
         .reject { |item| item.type == 'Category' }
         .sort_by { |item| [item.type, item.name] }
-        .map { |item| [item.name, item.id, item.type] }
+        .map { |item| [item.name, item.id, {'data-html': item_html(item)}, item.type] }
         .group_by(&:last)
     end
 
+    def item_html(item)
+      details = [
+        ("##{item.id}"),
+        (item.sku if item.sku.present?),
+        (item.description if item.description.present?)
+      ].compact.join(', ')
+
+      "<span>#{item.name}</span> <small>(#{details})</small>"
+    end
+
     def payment_methods
       with_service('PaymentMethod') { |service| service.all }
     end

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

@@ -1,32 +1,46 @@
-%table.table.table-sm
-  - company_info = api.company_info
-
-  %tbody
-    %tr
-      %td Name
-      %td= company_info.company_name
-
-    %tr
-      %td Country
-      %td= company_info.country
-
-    %tr
-      %td QuickBooks Online
-      %td
-        = link_to('Revoke Access and Disconnect', effective_qb_online.revoke_quickbooks_oauth_path, class: 'btn btn-sm btn-danger', 'data-method': 'delete', 'data-confirm': 'Really disconnect from QuickBooks Online?')
-
-    %tr
-      %td Deposit to Account
-      %td
-        = effective_form_with(model: [:admin, api.realm], engine: true) do |f|
-          .row
-            .col= f.select :deposit_to_account_id, api.accounts_collection, grouped: true, label: false
-            .col= f.save
-
-    %tr
-      %td Payment Method
-      %td
-        = effective_form_with(model: [:admin, api.realm], engine: true) do |f|
-          .row
-            .col= f.select :payment_method_id, api.payment_methods_collection, label: false
-            .col= f.save
+- company_info = (api.company_info rescue nil)
+
+- if company_info.present?
+  %table.table.table-sm
+    %tbody
+      %tr
+        %td Name
+        %td= company_info.company_name
+
+      %tr
+        %td Country
+        %td= company_info.country
+
+      %tr
+        %td QuickBooks Online
+        %td
+          = link_to('Revoke Access and Disconnect', effective_qb_online.revoke_quickbooks_oauth_path, class: 'btn btn-sm btn-danger', 'data-method': 'delete', 'data-confirm': 'Really disconnect from QuickBooks Online?')
+
+      %tr
+        %td Deposit to Account
+        %td
+          = effective_form_with(model: [:admin, api.realm], engine: true) do |f|
+            .row
+              .col= f.select :deposit_to_account_id, api.accounts_collection, grouped: true, label: false
+              .col= f.save
+
+      %tr
+        %td Payment Method
+        %td
+          = effective_form_with(model: [:admin, api.realm], engine: true) do |f|
+            .row
+              .col= f.select :payment_method_id, api.payment_methods_collection, label: false
+              .col= f.save
+
+
+- if company_info.blank?
+  %table.table.table-sm
+    %tbody
+      %tr
+        %td QuickBooks API Error
+        %td= api.api_error
+
+      %tr
+        %td QuickBooks Online
+        %td
+          = link_to('Revoke Access and Disconnect', effective_qb_online.revoke_quickbooks_oauth_path, class: 'btn btn-sm btn-danger', 'data-method': 'delete', 'data-confirm': 'Really disconnect from QuickBooks Online?')

data/app/views/admin/qb_receipts/_form.html.haml

@@ -35,6 +35,6 @@
 
               = existing || fi.object.order_item_qb_name || '-'
 
-            %td= fi.select :item_id, items_collection, grouped: true, label: false
+            %td= fi.select :item_id, items_collection, grouped: true, label: false, template: :html
 
   = f.submit 'Save and Sync'

data/lib/effective_qb_online/version.rb

@@ -1,3 +1,3 @@
 module EffectiveQbOnline
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.4'.freeze
 end

data/lib/generators/effective_qb_online/install_generator.rb

@@ -1,4 +1,4 @@
-module EffectiveMemberships
+module EffectiveQbOnline
   module Generators
     class InstallGenerator < Rails::Generators::Base
       include Rails::Generators::Migration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_qb_online
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2022-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails