effective_orders 5.2.17 → 5.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6b400848ddbb8a36cfadf1d89aaa88edf09f21f4e769e0d0c43065071de128a
-  data.tar.gz: 2e6ddefee5a035af6222eb8f96971bf134205cc320a4fcf8e826e65f61ec78bb
+  metadata.gz: 0ff21e266d5908efc6a31250b6b265879e0e6c2330f598bd673fee6058f54b3d
+  data.tar.gz: c20fba9f6371012d5895bf17555ef003d88c57d19ba0a8e0b5e087d69b8eab0e
 SHA512:
-  metadata.gz: fc4584d1c4739bf175be6bcf85369e3d0e5fd83bdc66b5d132258e2273b9b79cc5bdee8b02bed75ba809d40197058be6b3c75bd541d05bcfaf079ffa1202c1fb
-  data.tar.gz: 596b1c81741d349d0f18c35a63248ab62abd725aae8d5a5748a2a969d371c1e26139712548f13898157d783c39065ba10a0fdd44322cd7b8cd53d6fecd7fad60
+  metadata.gz: 11dfee0b764d2b93259b0cde740ecc9fcd39b2f80d0c5dc5795ea76919ed27528fbeb69f2a84d99fc27cfe09feeab2d07bc9b809e804ce3e19abba210f51a42b
+  data.tar.gz: 05a83379f89294bf22f3c6010f944b62a4839e8129e14b6f8a81226a8315e555731afd76963a8cb0bbbe4ac9a3725dd9e46ce3d742fe84eddd993f254947e160

data/app/datatables/admin/effective_orders_datatable.rb

@@ -59,7 +59,9 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
       col :shipping_address, visible: false
     end
 
-    col :order_items, search: { as: :string }
+    col(:order_items, search: :string).search do |collection, term|
+      collection.where(id: Effective::OrderItem.where('name ILIKE ?', "%#{term}%").select('order_id'))
+    end
 
     col :subtotal, as: :price, visible: false
     col :tax, as: :price, visible: false
@@ -82,7 +84,10 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
 
     actions_col partial: 'admin/orders/datatable_actions', partial_as: :order
 
-    aggregate :total
+    unless attributes[:total] == false
+      aggregate :total
+    end
+
   end
 
   collection do

data/app/datatables/effective_orders_datatable.rb

@@ -38,7 +38,9 @@ class EffectiveOrdersDatatable < Effective::Datatable
       col :shipping_address, visible: false
     end
 
-    col :order_items, search: { as: :string }
+    col(:order_items, search: :string).search do |collection, term|
+      collection.where(id: Effective::OrderItem.where('name ILIKE ?', "%#{term}%").select('order_id'))
+    end
 
     col :subtotal, as: :price, visible: false
     col :tax, as: :price, visible: false

data/app/models/effective/order.rb

@@ -479,13 +479,11 @@ module Effective
     # Call this as a way to skip over non consequential orders
     # And mark some purchasables purchased
     def mark_as_purchased!
-      purchase!(skip_buyer_validations: true, email: false)
-      skip_qb_sync!
-      true
+      purchase!(skip_buyer_validations: true, email: false, skip_quickbooks: true)
     end
 
     # Effective::Order.new(items: Product.first, user: User.first).purchase!(email: false)
-    def purchase!(payment: 'none', provider: 'none', card: 'none', email: true, skip_buyer_validations: false)
+    def purchase!(payment: 'none', provider: 'none', card: 'none', email: true, skip_buyer_validations: false, skip_quickbooks: false)
       # Assign attributes
       self.state = EffectiveOrders::PURCHASED
       self.skip_buyer_validations = skip_buyer_validations
@@ -514,6 +512,20 @@ module Effective
       end
 
       send_order_receipts! if email
+      after_commit { sync_quickbooks!(skip: skip_quickbooks) }
+
+      true
+    end
+
+    # We support two different Quickbooks synchronization gems: effective_qb_sync and effective_qb_online
+    def sync_quickbooks!(skip:)
+      if EffectiveOrders.qb_online?
+        skip ? EffectiveQbOnline.skip_order!(self) : EffectiveQbOnline.sync_order!(self)
+      end
+
+      if EffectiveOrders.qb_sync?
+        skip ? EffectiveQbSync.skip_order!(self) : true # Nothing to do
+      end
 
       true
     end

data/config/effective_orders.rb

@@ -25,6 +25,7 @@ EffectiveOrders.setup do |config|
 
   # Synchronize with Quickbooks
   config.use_effective_qb_sync = false
+  config.use_effective_qb_online = false
 
   # If set, the orders#new screen will render effective/orders/_order_note_fields to capture any Note info
   config.collect_note = false

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.2.17'.freeze
+  VERSION = '5.3.2'.freeze
 end

data/lib/effective_orders.rb

@@ -35,7 +35,7 @@ module EffectiveOrders
       :customers_table_name, :subscriptions_table_name, :products_table_name,
       :layout, :mailer_class_name, :mailer,
       :orders_collection_scope, :order_tax_rate_method,
-      :obfuscate_order_ids, :use_effective_qb_sync,
+      :obfuscate_order_ids, :use_effective_qb_sync, :use_effective_qb_online,
       :billing_address, :shipping_address,
       :collect_note, :collect_note_required, :collect_note_message,
       :terms_and_conditions, :terms_and_conditions_label, :minimum_charge,
@@ -136,6 +136,14 @@ module EffectiveOrders
     [('cheque' if cheque?), ('phone' if phone?)].compact
   end
 
+  def self.qb_sync?
+    use_effective_qb_sync && defined?(EffectiveQbSync)
+  end
+
+  def self.qb_online?
+    use_effective_qb_online && defined?(EffectiveQbOnline)
+  end
+
   def self.mailer_klass
     name = mailer_class_name.presence || 'Effective::OrdersMailer'
     name.safe_constantize || raise("unable to constantize mailer class. check config.mailer_class_name")
@@ -229,4 +237,9 @@ module EffectiveOrders
 
   class SoldOutException < Exception; end
   class AlreadyPurchasedException < Exception; end
+
+  def self.gem_path
+    __dir__.chomp('/lib')
+  end
+
 end

metadata

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